Merge branch 'feat/优化' of ssh://git.xieyaxin.top:8892/topuser/electron-app into feat/优化

.editorconfig

@@ -4,7 +4,7 @@ root = true
 [*]
 charset = utf-8
 indent_style = space
-indent_size = 4
+indent_size = 2
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true

.vscode/settings.json

@@ -14,5 +14,12 @@
   "i18n-ally.keystyle": "nested",
   "i18n-ally.extract.autoDetect": true,
   "i18n-ally.enabledFrameworks": ["vue"],
-  "i18n-ally.enabledParsers": ["json"]
+  "i18n-ally.enabledParsers": ["json"],
+  "i18n-ally.translate.engines":[
+    "openai"
+  ],
+  // "i18n-ally.translate.openai.apiKey": "", 自己配置，防止泄露
+  "i18n-ally.translate.openai.apiModel": "Qwen/Qwen2.5-72B-Instruct",
+  "i18n-ally.translate.openai.apiRoot": "https://api.siliconflow.cn",
+  "i18n-ally.translate.overrideExisting": true
 }

packages/locales/languages/en.json

@@ -1,78 +1,20 @@
 {
-  "title": "exeaasdaa33 {name} aaaa",
   "update": {
-    "status": {
+    "ready": {
-      "IDLE": "check update",
+      "hot": {
-      "InitCheckingUpdate": "init checking update",
+        "desc": "The new version v{version} is ready for update and will be automatically updated the next time you launch the program.",
-      "CheckingUpdate": "start checking update",
+        "title": "Prompt"
-      "Error": "checking update error",
-      "Avaliable": "checked new update v{version}",
-      "Notavaliable": "current version is newest. v{version}",
-      "Downloading": "current download progress {percent}%",
-      "Downloaded": "newest version download, click to install "
       }
-  },
-  "setting": {
-    "tips": {
-      "notSave": "not save"
-    },
-    "tabs": {
-      "common": "common",
-      "editor": "editor",
-      "update": "update"
-    },
-    "log_path_btn": "open log path",
-    "update": {
-      "author": {
-        "title": "author",
-        "desc": "who's author",
-        "placeholder": "please input author's name"
-      },
-      "repo": {
-        "title": "repository",
-        "desc": "Updated repository name",
-        "placeholder": "please input repository's name"
-      },
-      "version": {
-        "title": "Check Version",
-        "desc": "Current Version：",
-        "button": "Check Update"
     }
   },
-    "editor": {
+  "browser": {
-      "bg": {
+    "navbar": {
-        "title": "background",
+      "menu": {
-        "desc": "change editor background",
+        "fullscreen": "Full screen",
-        "placeholder": "please input picture link"
+        "quit-fullscreen": "Exit Full Screen",
-      },
+        "toggleDevTools": "Developer panel",
-      "font": {
+        "label": "Menu"
-        "title": "font",
-        "desc": "change editor font",
-        "placeholder": "please input font name"
-      }
-    },
-    "language": {
-      "title": "Language",
-      "desc": "Switch Language",
-      "options": {
-        "zh": "Chinese",
-        "en": "English"
       }
-    },
-    "storagePath": {
-      "title": "Data Storage Path",
-      "desc": "Local Data Storage Path",
-      "buttons": {
-        "select": "Select Path",
-        "open": "Open Path"
     }
   }
-  },
-  "app-menu": {
-    "about": "about"
-  },
-  "qie-huan-kai-fa-zhe-gong-ju": "ToggleDevtool",
-  "qu-xiao-quan-ping": "Canel FullScreen",
-  "quan-ping": "FullScreen",
-  "caidan": "Menu"
 }

packages/locales/languages/zh.json

@@ -1,83 +1,20 @@
 {
-  "title": "aaaaaa2 {name} bbbb",
   "update": {
     "ready": {
       "hot": {
         "title": "提示",
         "desc": "新版本 v{version} 已经准备好更新, 下次启动程序即可自动更新"
       }
-    },
-    "status": {
-      "IDLE": "检查更新",
-      "InitCheckingUpdate": "初始化检查更新",
-      "CheckingUpdate": "开始检查更新",
-      "Error": "检查更新出错",
-      "Avaliable": "检查到新版本 v{version}",
-      "Notavaliable": "当前版本已经是最新 v{version}",
-      "Downloading": "当前下载进度{percent}%",
-      "Downloaded": "新版本下载完毕,点击安装"
-    }
-  },
-  "setting": {
-    "tips": {
-      "notSave": "未保存"
-    },
-    "tabs": {
-      "common": "通用",
-      "editor": "编辑器",
-      "update": "更新"
-    },
-    "log_path_btn": "打开日志目录",
-    "update": {
-      "author": {
-        "title": "作者",
-        "desc": "更新的仓库作者",
-        "placeholder": "请输入作者"
-      },
-      "repo": {
-        "title": "仓库",
-        "desc": "更新的仓库",
-        "placeholder": "请输入仓库"
-      },
-      "version": {
-        "title": "检查更新",
-        "desc": "当前版本："
     }
   },
-    "editor": {
+  "browser": {
-      "bg": {
+    "navbar": {
-        "title": "背景",
+      "menu": {
-        "desc": "改变编辑器背景",
+        "label": "菜单",
-        "placeholder": "请输入图片链接"
+        "fullscreen": "全屏",
-      },
+        "quit-fullscreen": "取消全屏",
-      "font": {
+        "toggleDevTools": "开发者面板"
-        "title": "字体",
-        "desc": "改变编辑器字体",
-        "placeholder": "请输入字体"
       }
-    },
-    "language": {
-      "title": "语言",
-      "desc": "切换语言显示",
-      "options": {
-        "zh": "中文",
-        "en": "英文"
     }
-    },
-    "storagePath": {
-      "title": "数据保存路径",
-      "desc": "本地数据保存地址",
-      "buttons": {
-        "select": "选择目录",
-        "open": "打开目录"
   }
 }
-  },
-  "app-menu": {
-    "about": "关于"
-  },
-  "qie-huan-kai-fa-zhe-gong-ju": "切换开发者工具",
-  "qu-xiao-quan-ping": "取消全屏",
-  "quan-ping": "全屏",
-  "caidan": "菜单"
-}

src/renderer/src/components/NavBar.vue

@@ -15,7 +15,7 @@
         <img w="16px" h="16px" :src="icon" />
         <div relative h-full inline-flex items-center text-sm>{{ config.app_title }}</div>
         <div relative class="list">
-          <div class="item" @click="onClickMenu">{{ t("caidan") }}</div>
+          <div class="item" @click="onClickMenu">{{ t("browser.navbar.menu.label") }}</div>
         </div>
       </div>
       <div float-right h-full flex items-center relative style="-webkit-app-region: no-drag">
@@ -68,14 +68,14 @@
   const onClickMenu = e => {
     const menu = new PopupMenu([
       {
-        label: isFullScreen.value ? t("qu-xiao-quan-ping") : t("quan-ping"),
+        label: isFullScreen.value ? t("browser.navbar.menu.quit-fullscreen") : t("browser.navbar.menu.fullscreen"),
         async click() {
           await PlatForm.toggleFullScreen()
           isFullScreen.value = !isFullScreen.value
         },
       },
       {
-        label: t("qie-huan-kai-fa-zhe-gong-ju"),
+        label: t("browser.navbar.menu.toggleDevTools"),
         async click() {
           PlatForm.toggleDevTools()
         },