✨ 增加UserConfig顺序

Author: CodFrm

src/app/repo/scripts.ts

@@ -35,6 +35,7 @@ export interface Config {
   max?: number;
   min?: number;
   rows?: number; // textarea行数
+  index: number; // 配置项排序位置
 }
 
 export type UserConfig = { [key: string]: { [key: string]: Config } };

src/pages/components/UserConfigPanel/index.tsx

@@ -45,7 +45,6 @@ const UserConfigPanel: React.FC<{
       onOk={() => {
         if (formRefs.current[tab]) {
           const saveValues = formRefs.current[tab].getFieldsValue();
-          console.log("saveValues", saveValues);
           // 更新value
           const valueClient = new ValueClient(message);
           Object.keys(saveValues).forEach((key) => {
@@ -72,6 +71,10 @@ const UserConfigPanel: React.FC<{
       >
         {Object.keys(userConfig).map((itemKey) => {
           const value = userConfig[itemKey];
+          const keys = Object.keys(value).sort((a, b) => {
+            return (value[a].index || 0) - (value[b].index || 0);
+          });
+          console.log("keys", value, keys);
           return (
             <TabPane key={itemKey} title={itemKey}>
               <Form
@@ -86,7 +89,7 @@ const UserConfigPanel: React.FC<{
                   formRefs.current[itemKey] = el;
                 }}
               >
-                {Object.keys(value).map((key) => (
+                {keys.map((key) => (
                   <FormItem key={key} label={value[key].title} field={`${itemKey}.${key}`}>
                     {() => {
                       const item = value[key];

src/pages/options/routes/script/ScriptEditor.tsx

@@ -405,7 +405,10 @@ function ScriptEditor() {
   useEffect(() => {
     // 防止开发模式下重复初始化
     if (initRef.current) {
-      return;
+      // 恢复标题
+      return () => {
+        document.title = "Home - ScriptCat";
+      };
     }
     initRef.current = true;
 

src/pkg/utils/yaml.ts

@@ -13,6 +13,9 @@ export function parseUserConfig(code: string): UserConfig | undefined {
     const obj: UserConfig = parse(val);
     Object.keys(obj || {}).forEach((key) => {
       ret[key] = obj[key];
+      Object.keys(ret[key] || {}).forEach((subKey, subIndex) => {
+        ret[key][subKey].index = ret[key][subKey].index || subIndex; // 确保index存在
+      });
     });
   });
   return ret;

src/template/scriptcat.d.tpl

@@ -17,6 +17,7 @@ declare interface Config {
   max?: number;
   min?: number;
   rows?: number; // textarea行数
+  index: number; // 配置项排序位置
 }
 
 declare type UserConfig = { [key: string]: { [key: string]: Config } };

src/types/scriptcat.d.ts

@@ -17,6 +17,7 @@ declare interface Config {
   max?: number;
   min?: number;
   rows?: number; // textarea行数
+  index: number; // 配置项排序位置
 }
 
 declare type UserConfig = { [key: string]: { [key: string]: Config } };