Merge branch 'windows11' of https://github.com/Johnhong9527/tauri-app into windows11

src-tauri/src/files/mod.rs

@@ -1,8 +1,19 @@
-pub mod file_struct;
-// pub use FileStruct;
+pub(crate) mod files;
 
-pub mod file_sqlite3;
-// pub use file_sqlite3::file_sqlite3;
+use tauri::{
+    plugin::{Builder, TauriPlugin}, Runtime,
+};
 
-pub mod file_tools;
-// pub mod file_tools::file_tools;
+use self::file_sqlite3::*;
+
+/// Initializes the plugin.
+pub fn init<R: Runtime>() -> TauriPlugin<R> {
+    Builder::new("st-files")
+        .invoke_handler(tauri::generate_handler![
+          is_create,create,inset
+        ])
+        .setup(|app| {
+            Ok(())
+        })
+        .build()
+}

src-tauri/src/files/modCopy

@@ -0,0 +1,8 @@
+pub mod file_struct;
+// pub use FileStruct;
+
+pub mod file_sqlite3;
+// pub use file_sqlite3::file_sqlite3;
+
+pub mod file_tools;
+// pub mod file_tools::file_tools;

src-tauri/src/main.rs

@@ -7,6 +7,7 @@ mod event_loop;
 mod self_plugin;
 mod common;
 mod utils;
+mod servics;
 
 
 use crate::menus::default::use_memu;
@@ -14,6 +15,7 @@ use crate::menus::event::m_event;
 use crate::event_loop::{greet, file_path, file_sort};
 use self_plugin::tauri_plugin_sqlite;
 use self_plugin::tauri_plugin_file;
+use servics::files_servics;
 
 
 use tauri::{Manager, generate_context};
@@ -59,6 +61,7 @@ fn main() {
     tauri::Builder::default()
         .plugin(tauri_plugin_sqlite::init())
         .plugin(tauri_plugin_file::init())
+        .plugin(files_servics::init())
         .plugin(
             tauri_plugin_sql::Builder::default()
             .add_migrations("sqlite:test.db", migrations)

src-tauri/src/servics/files_servics/file_sqlite3.rs

@@ -0,0 +1,58 @@
+
+
+
+
+use tauri_plugin_sql::plugin::*;
+
+pub mod file_sqlite3 {
+    // 判断是否新建表
+    pub fn is_create(table_name: &str) -> bool {
+        if table_name.len() < 1 {
+            return false;
+        }
+        let connection = load("sqlite::files.db").unwrap();
+        let query: String = format!(
+            "SELECT tbl_name FROM sqlite_master WHERE tbl_name = '{}'",
+            table_name
+        );
+        let mut is_table: bool = false;
+        connection
+            .iterate(query, |pairs| {
+                for &(_tpl_name, value) in pairs.iter() {
+                    if value.unwrap() == table_name {
+                        is_table = true
+                    }
+                }
+                true
+            })
+            .unwrap();
+        // is_table
+        if !is_table {
+            return create(table_name);
+        }
+        is_table
+    }
+
+    pub fn create(table_name: &str) -> bool {
+        println!("28");
+        if table_name.len() < 1 {
+            return false;
+        }
+        let connection = sqlite::open("tauri.db").unwrap();
+        // CREATE TABLE users (name TEXT, age INTEGER)
+        let query: String = format!("CREATE TABLE '{}' ( name TEXT, path TEXT, history_path TEXT, uuid TEXT, parent_id TEXT, create_time INTEGER, update_time INTEGER, file_type TEXT, user TEXT, rule TEXT );", table_name);
+        // let mut isTable: bool = false;
+        println!("36");
+        connection.execute(query).unwrap();
+        true
+    }
+
+    use crate::files::file_struct::File;
+    pub fn inset(file: File) -> bool {
+        // INSERT INTO files (name, path, history_path, uuid, parent_id, create_time, update_time, file_type, user, rule) VALUES ('1', '1', '2', '3', '4', 5, null, null, null, null)
+        let query: String = format!("INSERT INTO files (name, path, history_path, uuid, parent_id, create_time, update_time, file_type, user, rule) VALUES ('{}', '{}', '{}', '{}', '{}', '{:?}', '{:?}', '{}', '{}', '{}')", file.name, file.path, file.history_path,  file.uuid, file.parent_id, file.create_time, file.update_time, file.file_type, file.user, file.rule);
+        let connection = sqlite::open("tauri.db").unwrap();
+        connection.execute(query).unwrap();
+        true
+    }
+}

src-tauri/src/servics/files_servics/file_struct.rs

@@ -0,0 +1,31 @@
+// pub mod FileStruct {
+//     pub struct Site {
+//         pub domain: String,
+//         pub nation: String,
+//     }
+// }
+
+use std::time::Duration;
+
+#[derive(Debug)]
+pub struct Site {
+    pub domain: String,
+    pub nation: String,
+}
+
+
+// name TEXT, path TEXT, history_path TEXT, uuid TEXT, parent_id TEXT, create_time INTEGER, update_time INTEGER, file_type TEXT, user TEXT, rule TEXT
+
+#[derive(Debug)]
+pub struct File {
+    pub name: String,
+    pub path: String,
+    pub history_path: String,
+    pub uuid: String,
+    pub parent_id: String,
+    pub create_time: Duration,
+    pub update_time: Duration,
+    pub file_type: String,
+    pub user: String,
+    pub rule: String,
+}

src-tauri/src/servics/files_servics/file_tools.rs

@@ -0,0 +1,9 @@
+pub mod file_tools {
+    use crate::files::file_struct::Site;
+    pub fn get_base_path () -> Site {
+        Site {
+            domain: String::from("domain"),
+            nation: String::from("nation")
+        }
+    }
+}

src-tauri/src/servics/files_servics/mod.rs

@@ -0,0 +1,19 @@
+pub(crate) mod file_sqlite3;
+
+use tauri::{
+    plugin::{Builder, TauriPlugin}, Runtime,
+};
+
+use self::file_sqlite3::*;
+
+/// Initializes the plugin.
+pub fn init<R: Runtime>() -> TauriPlugin<R> {
+    Builder::new("ss-files")
+        .invoke_handler(tauri::generate_handler![
+          is_create,create,inset
+        ])
+        .setup(|app| {
+            Ok(())
+        })
+        .build()
+}

src-tauri/src/servics/files_servics/modCopy

@@ -0,0 +1,8 @@
+pub mod file_struct;
+// pub use FileStruct;
+
+pub mod file_sqlite3;
+// pub use file_sqlite3::file_sqlite3;
+
+pub mod file_tools;
+// pub mod file_tools::file_tools;

src-tauri/src/servics/mod.rs

@@ -0,0 +1 @@
+pub mod files_servics;

src/databases/files/sql.ts

@@ -0,0 +1,9 @@
+import Database from "tauri-plugin-sql-api";
+import { createSql } from "../createTableSql";
+
+export async function createTable() {
+
+  const db = await Database.load("sqlite:test.db");
+  // 创建表
+  await db.execute(createSql.select_history);
+}

src/databases/index copy.ts

@@ -0,0 +1,55 @@
+import { SQLite } from "@/plugins/tauri-plugin-sqlite";
+import { createSql } from "./createTableSql";
+import { TableName } from "@/types/table";
+import {fileFileds} from './addFiledInTable'
+export const table_init = async (dbName: string, tableName: TableName) => {
+  const dbversion = await SQLite.open(dbName);
+  //查询是否有该表
+  const rows = await dbversion.queryWithArgs<Array<{ count: number }>>(
+    `SELECT count(1) count FROM sqlite_master WHERE type='table' and name = '${tableName}' `
+  );
+  if (!!rows && rows.length > 0 && rows[0].count > 0) {
+  } else {
+    //创建表
+    await dbversion.execute(createSql[tableName]);
+  }
+};
+
+export const table_add_filed = async (tableName: string, dbName: string, addFileFileds: any[]) =>  {
+  const dbversion = await SQLite.open(dbName);
+  // 依据版本增加
+  const addField = await Promise.allSettled(addFileFileds.map(async (item) => {
+    try {
+      const is_field = await is_field_in_table(item.key, tableName, dbName);
+      if(!is_field) {
+        return await dbversion.execute(item.sql.replace('{tableName}', tableName))
+      }
+    } catch (err) {
+      console.log('table_add_filed 出现bug::', err);
+    }
+    return true
+  }))
+  console.log(4545, addField);
+}
+
+export const is_field_in_table = async (fidld: string, tableName: string, dbName: string) => {
+  // 不能为空
+  if (!fidld || !tableName || !dbName) {
+    return Promise.reject('必填数据不能为空');
+  }
+  try {
+    const dbversion = await SQLite.open(dbName);
+    const fidldList: any[] = await dbversion.queryWithArgs(`SELECT * FROM sqlite_master WHERE type='table' AND name='${tableName}' AND sql LIKE '%${fidld}%'`);
+    console.log(5656, fidldList);
+    if(fidldList.length) {
+      // 字段存在
+      return Promise.resolve(true);
+    }
+    // 字段不存在
+    return Promise.resolve(false);
+  } catch (error) {
+    return Promise.reject('查询失败');
+  }
+}
+
+export const DB = async (dbName: string) => await SQLite.open(dbName);

src/pages/DuplicateFile/DuplicateFile.tsx

@@ -35,7 +35,7 @@ export default function DuplicateFile() {
   const [current, setCurrent] = useState(1); // 页码
   const [usePath, setUsePath] = useState<string>();
   const [historyList, setHistoryList] = useState<historyListType[]>([]);
-  const [fileList, setFileList] = useState<insertSearchFilesPasamsType[]>([
+  const [fileList, setFileList] = useState<FileInfoType[]>([
     {
       id: 1,
       path: "D:/code/wb_project/bar_association_app",
@@ -58,6 +58,8 @@ export default function DuplicateFile() {
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [fileInfo, setFileInfo] = useState<any>({});
   const [fileInfoSource, setFileInfoSource] = useState<FileInfoType>({});
+  const [current, setCurrent] = useState(1)
+  const [total, setTotal] = useState(0)
 
 
 
@@ -67,8 +69,8 @@ export default function DuplicateFile() {
       dataIndex: "id",
       key: "id",
       width: 30,
-      render: (text: string, record: { id: number }) => (
-        <CopyText width="30px" color="#333" name={record.id}></CopyText>
+      render: (text: string, record: { id?: number }) => (
+        <CopyText width="30px" color="#333" name={record.id || ''}></CopyText>
       ),
     },
     {
@@ -76,12 +78,12 @@ export default function DuplicateFile() {
       dataIndex: "path",
       key: "path",
       width: 300,
-      render: (text: string, record: { path: string }) => (
+      render: (text: string, record: { path?: string }) => (
         <CopyText
           width="300px"
           ellipsisLine={1}
           color="#333"
-          name={record.path}
+          name={record.path || ''}
         ></CopyText>
       ),
     },
@@ -90,12 +92,12 @@ export default function DuplicateFile() {
       dataIndex: "time",
       key: "time",
       width: 100,
-      render: (text: string, record: { time: string }) => (
+      render: (text: string, record: { time?: string }) => (
         <CopyText
           width="100px"
           ellipsisLine={1}
           color="#333"
-          name={record.time}
+          name={record.time || ''}
         ></CopyText>
       ),
     },
@@ -104,7 +106,7 @@ export default function DuplicateFile() {
       dataIndex: "time",
       key: "time",
       with: 200,
-      render: (text: string, record: { progress: number }) => (
+      render: (text: string, record: { progress?: number }) => (
         <div style={{ width: "200px" }}>
           <Progress percent={record.progress} />
         </div>

src/pages/DuplicateFile/FileInfoEditer.tsx

@@ -52,11 +52,12 @@ export default function FileInfoEditer({
       multiple: false,
       defaultPath: await appDataDir(),
     });
+    console.log(55, selected);
 
     if (selected && selected.length) {
       setFileInfo({
         ...fileInfo,
-        path: selected[0],
+        path: `${selected}`,
       });
       // setUsePath(`${selected}`);
       // 最多记录 100 条用户操作的历史数据

src/services/file-service.ts

@@ -35,7 +35,7 @@ export async function insertSeletedFileHistory(path?: string, fileInfoParams?: F
         ":checkedTypeValues": fileInfoParams?.checkedTypeValues?.toString() || '',
         ":passType": fileInfoParams?.passType || '',
       }
-    );    
+    );
     return false;
   } catch (err) {
     if (err && `${err}`.indexOf("UNIQUE constraint failed") > -1) {
@@ -46,7 +46,7 @@ export async function insertSeletedFileHistory(path?: string, fileInfoParams?: F
 }
 
 /**
- * 
+ *
  * @param path 文件的路径
  * @returns FileInfoType
  */
@@ -106,7 +106,7 @@ export async function get_info_by_path(path: string):Promise<[FileInfoType|boole
 /**
  * 获取“select_history”表中的历史记录，并进行分页。
  * 此函数首先计算总记录数，然后根据提供的页码和页面大小参数返回相应的记录。
- * 
+ *
  * @param page 当前请求的页码，代表用户想要访问的数据页。
  * @param pageSize 每页展示的记录数量，决定了每次查询返回的数据条数。
  * @returns 返回一个对象，其中包含两个属性：
@@ -125,7 +125,7 @@ export async function get_all_history(page?: number, pageSize?: number): Promise
   const offset = (page || 1 - 1) * (pageSize || 10);
 
   // 获取当前页的数据
-  const data = await DB.queryWithArgs<Array<insertSearchFilesPasamsType>>(
+  const data = await DB.queryWithArgs<Array<FileInfoType>>(
     "SELECT * FROM select_history LIMIT ? OFFSET ?", [pageSize, offset]
   );
 

src/types/files.d.ts

@@ -6,6 +6,9 @@ export interface FileInfoType {
   checkedSizeValues?: unknown[];
   checkboxSizeAll?: boolean;
   checkedTypeValues?: unknown[];
+  time?: string;
+  id?: number;
+  progress?: number;
 }
 
 export interface FileInfoEditerType {