🐛 修复界面模式切换

Author: CodFrm

src/pages/components/ScriptMenuList/index.tsx

@@ -324,7 +324,7 @@ const MenuItem: React.FC<MenuItemProps> = ({ menu, uuid }) => {
         htmlType="submit"
         icon={<IconMenu />}
         title={menu.options?.title}
-        style={{ display: "block", width: "100%", borderTopColor: "#E5E6EB" }}
+        style={{ display: "block", width: "100%" }}
       >
         {menu.name}
         {menu.options?.accessKey && `(${menu.options.accessKey.toUpperCase()})`}

src/pages/store/features/config.ts

@@ -26,11 +26,23 @@ export const configSlice = createAppSlice({
     lightMode: localStorage.lightMode || "auto",
   },
   reducers: (create) => {
-    // 初始化黑夜模式
-    setAutoMode();
+    // 判断模式
+    switch (localStorage.lightMode) {
+      case "dark":
+        document.body.setAttribute("arco-theme", "dark");
+        editor.setTheme("vs-dark");
+        break;
+      case "light":
+        document.body.removeAttribute("arco-theme");
+        editor.setTheme("vs");
+        break;
+      case "auto":
+        setAutoMode();
+        break;
+    }
     return {
       setDarkMode: create.reducer((state, action: PayloadAction<"light" | "dark" | "auto">) => {
-        localStorage.loghtMode = action.payload;
+        localStorage.lightMode = action.payload;
         state.lightMode = action.payload;
         if (action.payload === "auto") {
           setAutoMode();

src/template/scriptcat.d.tpl

@@ -97,21 +97,44 @@ declare function GM_getResourceText(name: string): string | undefined;
 
 declare function GM_getResourceURL(name: string, isBlobUrl?: boolean): string | undefined;
 
-declare function GM_registerMenuCommand(
+function GM_registerMenuCommand(
   name: string,
-  listener: () => void,
+  listener: (inputValue?: any) => void,
   optionsOrAccessKey?:
-    | string
     | {
-        id?: number | string;
-        accessKey?: string;
+        id?: number;
         autoClose?: boolean;
         title?: string;
+        accessKey?: string;
       }
+    | string
 ): number;
 
 declare function GM_unregisterMenuCommand(id: number): void;
 
+/**
+ * 注册一个菜单输入框, 允许用户输入值, 并在输入完成后用回调函数
+ */
+declare function CAT_registerMenuInput(
+  name: string,
+  listener: (inputValue?: any) => void,
+  optionsOrAccessKey?:
+    | {
+        id?: number;
+        autoClose?: boolean;
+        title?: string;
+        accessKey?: string;
+        // 可选输入框
+        inputType?: "text" | "number" | "boolean";
+        inputLabel?: string;
+        inputDefaultValue?: string | number | boolean;
+        inputPlaceholder?: string;
+      }
+    | string
+): number;
+
+declare const CAT_unregisterMenuInput: typeof GM_unregisterMenuCommand;
+
 declare function GM_openInTab(url: string, options: GMTypes.OpenTabOptions): tab;
 declare function GM_openInTab(url: string, loadInBackground: boolean): tab;
 declare function GM_openInTab(url: string): tab;
@@ -294,6 +317,10 @@ declare namespace GMTypes {
     [key: string]: string | boolean | number | undefined;
   };
 
+  interface CookieDetailsPartitionKeyType {
+    topLevelSite?: string;
+  }
+
   interface CookieDetails {
     url?: string;
     name?: string;
@@ -304,6 +331,7 @@ declare namespace GMTypes {
     session?: boolean;
     httpOnly?: boolean;
     expirationDate?: number;
+    partitionKey?: CookieDetailsPartitionKeyType;
   }
 
   interface Cookie {

src/types/scriptcat.d.ts

@@ -1,5 +1,3 @@
-import { ScriptMenuItem } from "@App/app/service/service_worker/popup";
-
 // @copyright https://github.com/silverwzw/Tampermonkey-Typescript-Declaration
 
 declare const unsafeWindow: Window;
@@ -99,15 +97,41 @@ declare function GM_getResourceText(name: string): string | undefined;
 
 declare function GM_getResourceURL(name: string, isBlobUrl?: boolean): string | undefined;
 
-declare function GM_registerMenuCommand(
+function GM_registerMenuCommand(
   name: string,
   listener: (inputValue?: any) => void,
-  optionsOrAccessKey?: ScriptMenuItem["options"] | string
+  optionsOrAccessKey?:
+    | {
+        id?: number;
+        autoClose?: boolean;
+        title?: string;
+        accessKey?: string;
+      }
+    | string
 ): number;
 
 declare function GM_unregisterMenuCommand(id: number): void;
 
-declare const CAT_registerMenuInput: typeof GM_registerMenuCommand;
+/**
+ * 注册一个菜单输入框, 允许用户输入值, 并在输入完成后用回调函数
+ */
+declare function CAT_registerMenuInput(
+  name: string,
+  listener: (inputValue?: any) => void,
+  optionsOrAccessKey?:
+    | {
+        id?: number;
+        autoClose?: boolean;
+        title?: string;
+        accessKey?: string;
+        // 可选输入框
+        inputType?: "text" | "number" | "boolean";
+        inputLabel?: string;
+        inputDefaultValue?: string | number | boolean;
+        inputPlaceholder?: string;
+      }
+    | string
+): number;
 
 declare const CAT_unregisterMenuInput: typeof GM_unregisterMenuCommand;