Merge pull request #18 from PANDAJSR/tauri

修复了 Tauri 版本的亿些bug到可以正常运行的程度
2026-07-19 21:14:21 +08:00 · 2026-03-17 22:26:17 +08:00
parent 192b48cab0 feb3542728
commit 29de08ca32
19 changed files with 226 additions and 64 deletions
@@ -6,15 +6,22 @@ node_modules
 # Build outputs
 dist
 dist-ssr
+out
 *.local

 # Tauri
 src-tauri/target
 src-tauri/Cargo.lock
 src-tauri/gen
+.cargo-local/

 # Database
 data.sql
+*.sqlite
+*.sqlite3
+*.db
+*.db-shm
+*.db-wal

 # Logs
 logs
@@ -3,6 +3,7 @@
  <head>
    <meta charset="UTF-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
    <title>SecScore</title>
  </head>

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <rect width="64" height="64" rx="12" fill="#0052D9" />
+  <path
+    d="M16 22c0-3.314 2.686-6 6-6h20c3.314 0 6 2.686 6 6v20c0 3.314-2.686 6-6 6H22c-3.314 0-6-2.686-6-6V22z"
+    fill="#ffffff"
+  />
+  <path
+    d="M24 28h16a2 2 0 110 4H24a2 2 0 110-4zm0 8h10a2 2 0 110 4H24a2 2 0 110-4z"
+    fill="#0052D9"
+  />
+</svg>
@@ -1,5 +1,4 @@
 use parking_lot::RwLock;
-use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use tauri::State;

@@ -1,4 +1,4 @@
-use chrono::{Datelike, Duration, TimeZone, Timelike, Utc};
+use chrono::{Datelike, Duration, Timelike, Utc};
 use parking_lot::RwLock;
 use sea_orm::{
    ActiveModelTrait, ColumnTrait, EntityTrait, QueryFilter, QueryOrder, QuerySelect, Set,
@@ -1,5 +1,5 @@
 use parking_lot::RwLock;
-use sea_orm::{ActiveModelTrait, ColumnTrait, EntityTrait, QueryOrder, Set};
+use sea_orm::{ActiveModelTrait, EntityTrait, QueryOrder, Set};
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use tauri::State;
@@ -4,8 +4,6 @@ use tauri::{AppHandle, Manager};

 use crate::state::AppState;

-use super::response::IpcResponse;
-
 #[tauri::command]
 pub async fn window_minimize(
    app: AppHandle,
@@ -29,7 +29,7 @@ pub fn setup_app(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {
 }

 fn setup_database(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {
-    let handle = app.handle();
+    let handle = app.handle().clone();
    let db_path = if cfg!(debug_assertions) {
        std::path::PathBuf::from("data.sql")
    } else {
@@ -52,7 +52,7 @@ fn setup_database(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {
        match create_sqlite_connection(&db_path_str).await {
            Ok(conn) => {
                let state = handle.state::<crate::state::SafeAppState>();
-                let mut state_guard = state.write();
+                let state_guard = state.write();
                let mut db_guard = state_guard.db.write();
                *db_guard = Some(conn);
                eprintln!("Database connected to: {}", db_path_str);
@@ -9,9 +9,9 @@ fn main() {
    tauri::Builder::default()
        .plugin(tauri_plugin_shell::init())
        .setup(|app| {
-            setup_app(app)?;
            let state = AppState::new(app.handle().clone());
            app.manage(Arc::new(RwLock::new(state)));
+            setup_app(app)?;
            Ok(())
        })
        .invoke_handler(tauri::generate_handler![
@@ -15,16 +15,34 @@ function MainContent(): React.JSX.Element {
  const [messageApi, contextHolder] = message.useMessage()

  useEffect(() => {
-    if (!(window as any).api) return
-    const unlisten = (window as any).api.onNavigate((route: string) => {
-      const currentPath = location.pathname === "/" ? "/home" : location.pathname
-      const targetPath = route === "/" ? "/home" : route
+    const api = (window as any).api
+    if (!api) return

-      if (currentPath !== targetPath) {
-        navigate(route)
-      }
-    })
-    return () => unlisten()
+    let disposed = false
+    let unlisten: (() => void) | null = null
+
+    api
+      .onNavigate((route: string) => {
+        const currentPath = location.pathname === "/" ? "/home" : location.pathname
+        const targetPath = route === "/" ? "/home" : route
+
+        if (currentPath !== targetPath) {
+          navigate(route)
+        }
+      })
+      .then((fn: () => void) => {
+        if (disposed) {
+          fn()
+          return
+        }
+        unlisten = fn
+      })
+      .catch(() => void 0)
+
+    return () => {
+      disposed = true
+      if (unlisten) unlisten()
+    }
  }, [navigate, location.pathname])

  const [wizardVisible, setWizardVisible] = useState(false)
@@ -2,6 +2,7 @@ import React, { Suspense, lazy } from "react"
 import { Layout, Space, Button, Tag, Spin } from "antd"
 import { Routes, Route, Navigate } from "react-router-dom"
 import { useTranslation } from "react-i18next"
+import { WindowControls } from "./WindowControls"

 const Home = lazy(() => import("./Home").then((m) => ({ default: m.Home })))
 const StudentManager = lazy(() =>
@@ -67,6 +68,7 @@ export function ContentArea({
            background: "var(--ss-header-bg)",
            borderBottom: "1px solid var(--ss-border-color)",
            flexShrink: 0,
+            WebkitAppRegion: "drag",
          } as React.CSSProperties
        }
      >
@@ -76,7 +78,8 @@ export function ContentArea({
            {
              display: "flex",
              alignItems: "center",
-              paddingRight: "12px",
+              paddingRight: "8px",
+              WebkitAppRegion: "no-drag",
            } as React.CSSProperties
          }
        >
@@ -94,6 +97,7 @@ export function ContentArea({
            )}
          </Space>
        </div>
+        <WindowControls />
      </div>

      <Content style={{ flex: 1, overflowY: "auto" }}>
@@ -95,20 +95,36 @@ export const Settings: React.FC<{ permission: permissionLevel }> = ({ permission

  useEffect(() => {
    loadAll()
-    if (!(window as any).api) return
-    const unsubscribe = (window as any).api.onSettingChanged((change: any) => {
-      setSettings((prev) => {
-        if (change?.key === "log_level") return { ...prev, log_level: change.value }
-        if (change?.key === "is_wizard_completed")
-          return { ...prev, is_wizard_completed: change.value }
-        if (change?.key === "window_zoom") return { ...prev, window_zoom: change.value }
-        if (change?.key === "auto_score_enabled")
-          return { ...prev, auto_score_enabled: change.value }
-        return prev
+    const api = (window as any).api
+    if (!api) return
+
+    let disposed = false
+    let unlisten: (() => void) | null = null
+
+    api
+      .onSettingChanged((change: any) => {
+        setSettings((prev) => {
+          if (change?.key === "log_level") return { ...prev, log_level: change.value }
+          if (change?.key === "is_wizard_completed")
+            return { ...prev, is_wizard_completed: change.value }
+          if (change?.key === "window_zoom") return { ...prev, window_zoom: change.value }
+          if (change?.key === "auto_score_enabled")
+            return { ...prev, auto_score_enabled: change.value }
+          return prev
+        })
      })
-    })
+      .then((fn: () => void) => {
+        if (disposed) {
+          fn()
+          return
+        }
+        unlisten = fn
+      })
+      .catch(() => void 0)
+
    return () => {
-      if (typeof unsubscribe === "function") unsubscribe()
+      disposed = true
+      if (unlisten) unlisten()
    }
  }, [])

@@ -39,15 +39,30 @@ export function Sidebar({ activeMenu, permission, onMenuChange }: SidebarProps):
    const handleStatusChange = () => {
      loadDbStatus()
    }
-    if ((window as any).api) {
-      const unsubscribe = (window as any).api.onSettingChanged(
-        (change: { key: string; value: any }) => {
-          if (change.key === "pg_connection_status") {
-            handleStatusChange()
-          }
+    const api = (window as any).api
+    if (!api) return
+
+    let disposed = false
+    let unlisten: (() => void) | null = null
+
+    api
+      .onSettingChanged((change: { key: string; value: any }) => {
+        if (change.key === "pg_connection_status") {
+          handleStatusChange()
        }
-      )
-      return unsubscribe
+      })
+      .then((fn: () => void) => {
+        if (disposed) {
+          fn()
+          return
+        }
+        unlisten = fn
+      })
+      .catch(() => void 0)
+
+    return () => {
+      disposed = true
+      if (unlisten) unlisten()
    }
  }, [])

@@ -16,13 +16,34 @@ export function TitleBar({ children }: TitleBarProps): React.JSX.Element {
  const [isMaximized, setIsMaximized] = useState(false)

  useEffect(() => {
-    if (!(window as any).api) return
-    ;(window as any).api.windowIsMaximized().then((v: boolean) => setIsMaximized(v))
+    const api = (window as any).api
+    if (!api) return

-    const cleanup = (window as any).api.onWindowMaximizedChanged((maximized: boolean) => {
-      setIsMaximized(maximized)
-    })
-    return cleanup
+    let disposed = false
+    let unlisten: (() => void) | null = null
+
+    api
+      .windowIsMaximized()
+      .then((v: boolean) => setIsMaximized(v))
+      .catch(() => void 0)
+
+    api
+      .onWindowMaximizedChanged((maximized: boolean) => {
+        setIsMaximized(maximized)
+      })
+      .then((fn: () => void) => {
+        if (disposed) {
+          fn()
+          return
+        }
+        unlisten = fn
+      })
+      .catch(() => void 0)
+
+    return () => {
+      disposed = true
+      if (unlisten) unlisten()
+    }
  }, [])

  const minimize = () => {
@@ -11,13 +11,34 @@ export function WindowControls(): React.JSX.Element {
  const [isMaximized, setIsMaximized] = useState(false)

  useEffect(() => {
-    if (!(window as any).api) return
-    ;(window as any).api.windowIsMaximized().then((v: boolean) => setIsMaximized(v))
+    const api = (window as any).api
+    if (!api) return

-    const cleanup = (window as any).api.onWindowMaximizedChanged((maximized: boolean) => {
-      setIsMaximized(maximized)
-    })
-    return cleanup
+    let disposed = false
+    let unlisten: (() => void) | null = null
+
+    api
+      .windowIsMaximized()
+      .then((v: boolean) => setIsMaximized(v))
+      .catch(() => void 0)
+
+    api
+      .onWindowMaximizedChanged((maximized: boolean) => {
+        setIsMaximized(maximized)
+      })
+      .then((fn: () => void) => {
+        if (disposed) {
+          fn()
+          return
+        }
+        unlisten = fn
+      })
+      .catch(() => void 0)
+
+    return () => {
+      disposed = true
+      if (unlisten) unlisten()
+    }
  }, [])

  const minimize = () => {
@@ -120,23 +120,36 @@ export const ThemeProvider: React.FC<{ children: React.ReactNode }> = ({ childre
  }, [applyThemeConfig])

  useEffect(() => {
-    if (!(window as any).api) return
+    const api = (window as any).api
+    if (!api) return
+
    ;(async () => {
      await loadThemes()
      await loadCurrentTheme()
    })()

-    const unsubscribe = (window as any).api.onThemeChanged((theme: themeConfig) => {
-      setCurrentTheme(theme)
-      currentThemeRef.current = theme
-      applyThemeConfig(theme)
-      loadThemes()
-    })
+    let disposed = false
+    let unlisten: (() => void) | null = null
+
+    api
+      .onThemeChanged((theme: themeConfig) => {
+        setCurrentTheme(theme)
+        currentThemeRef.current = theme
+        applyThemeConfig(theme)
+        loadThemes()
+      })
+      .then((fn: () => void) => {
+        if (disposed) {
+          fn()
+          return
+        }
+        unlisten = fn
+      })
+      .catch(() => void 0)

    return () => {
-      if (typeof unsubscribe === "function") {
-        unsubscribe()
-      }
+      disposed = true
+      if (unlisten) unlisten()
    }
  }, [applyThemeConfig, loadCurrentTheme, loadThemes])

@@ -7,6 +7,11 @@ import App from "./App"
 import { ClientContext } from "./ClientContext"
 import { StudentService } from "./services/StudentService"
 import { ServiceProvider } from "./contexts/ServiceContext"
+import { api } from "./preload/types"
+
+if (!(window as any).api) {
+  ;(window as any).api = api
+}

 const ctx = new ClientContext()
 new StudentService(ctx)
@@ -19,7 +24,7 @@ const safeWriteLog = (payload: {
  try {
    const api = (window as any).api
    if (!api?.writeLog) return
-    api.writeLog(payload)
+    Promise.resolve(api.writeLog(payload)).catch(() => void 0)
  } catch {
    return
  }
@@ -173,6 +173,9 @@ const api = {
  windowMaximize: (): Promise<boolean> => invoke("window_maximize"),
  windowClose: (): Promise<void> => invoke("window_close"),
  windowIsMaximized: (): Promise<boolean> => invoke("window_is_maximized"),
+  toggleDevTools: (): Promise<void> => invoke("toggle_devtools"),
+  windowResize: (width: number, height: number): Promise<void> =>
+    invoke("window_resize", { width, height }),
  onWindowMaximizedChanged: (callback: (maximized: boolean) => void): Promise<UnlistenFn> => {
    return listen<boolean>("window:maximized-changed", (event) => {
      callback(event.payload)
@@ -185,15 +188,19 @@ const api = {
  },

  // Logger
-  queryLogs: (params?: { lines?: number }): Promise<{ success: boolean; data: string[] }> =>
-    invoke("log_query", { params }),
+  queryLogs: (
+    input?: number | { lines?: number }
+  ): Promise<{ success: boolean; data: string[] }> => {
+    const lines = typeof input === "number" ? input : input?.lines
+    return invoke("log_query", { lines })
+  },
  clearLogs: (): Promise<{ success: boolean }> => invoke("log_clear"),
  setLogLevel: (level: string): Promise<{ success: boolean }> => invoke("log_set_level", { level }),
  writeLog: (payload: {
    level: string
    message: string
    meta?: any
-  }): Promise<{ success: boolean }> => invoke("log_write", payload),
+  }): Promise<{ success: boolean }> => invoke("log_write", { payload }),

  // Database Connection
  dbTestConnection: (
@@ -291,6 +298,28 @@ const api = {
    ruleIds: number[]
  ): Promise<{ success: boolean; data?: boolean; message?: string }> =>
    invoke("auto_score_sort_rules", { ruleIds }),
+
+  // Generic invoke wrapper for backward compatibility with callers using `api.invoke`
+  invoke: async (channel: string, ...args: any[]): Promise<any> => {
+    switch (channel) {
+      case "auto-score:getRules":
+        return api.autoScoreGetRules()
+      case "auto-score:addRule":
+        return api.autoScoreAddRule(args[0])
+      case "auto-score:updateRule":
+        return api.autoScoreUpdateRule(args[0])
+      case "auto-score:deleteRule":
+        return api.autoScoreDeleteRule(args[0])
+      case "auto-score:toggleRule":
+        return api.autoScoreToggleRule(args[0])
+      case "auto-score:sortRules":
+        return api.autoScoreSortRules(args[0])
+      case "auto-score:getStatus":
+        return api.autoScoreGetStatus()
+      default:
+        throw new Error(`Unsupported legacy invoke channel: ${channel}`)
+    }
+  },
 }

 export default api
@@ -9,6 +9,10 @@ export default defineConfig({
      "@": resolve(__dirname, "src"),
    },
  },
+  optimizeDeps: {
+    // Avoid scanning legacy `old-ss` entries under project root.
+    entries: ["index.html"],
+  },
  build: {
    outDir: "dist",
    emptyOutDir: true,