fix: 🐛 修复录制结束点击取消异常弹窗以及点击重启服务没有反应的问题

viarotel-org · Oct 25, 2023 · 054c55b · 054c55b
1 parent f91a200
commit 054c55b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 13 deletions.
diff --git a/electron/events/index.js b/electron/events/index.js
@@ -6,6 +6,7 @@ import tray from './tray/index.js'
 
 export default (mainWindow) => {
   ipcMain.on('restart-app', () => {
+    app.isQuiting = true
     app.relaunch()
     app.quit()
   })

diff --git a/src/components/Device/Remark/index.vue b/src/components/Device/Remark/index.vue
@@ -47,7 +47,6 @@ export default {
       this.$store.device.setRemark(this.device.id, value)
     },
     async handleFocus() {
-      console.log('handleFocus')
       this.$refs.elInput.focus()
     },
   },

diff --git a/src/components/Device/index.vue b/src/components/Device/index.vue
@@ -328,8 +328,6 @@ export default {
         if (error.message) {
           this.$message.warning(error.message)
         }
-
-        this.handleReset()
       }
       row.$recordLoading = false
     },

diff --git a/src/components/Preference/index.vue b/src/components/Preference/index.vue
@@ -41,16 +41,16 @@
         </el-select>
       </div>
       <div class="">
-        <el-button type="" plain @click="handleImport">
+        <el-button type="" icon="Upload" plain @click="handleImport">
           {{ $t("preferences.config.import.name") }}
         </el-button>
-        <el-button type="" plain @click="handleExport">
+        <el-button type="" icon="Download" plain @click="handleExport">
           {{ $t("preferences.config.export.name") }}
         </el-button>
-        <el-button type="" plain @click="handleEdit">
+        <el-button type="" icon="Edit" plain @click="handleEdit">
           {{ $t("preferences.config.edit.name") }}
         </el-button>
-        <el-button type="" plain @click="handleResetAll">
+        <el-button type="" icon="RefreshRight" plain @click="handleResetAll">
           {{ $t("preferences.config.reset.name") }}
         </el-button>
       </div>

diff --git a/src/locales/index.js b/src/locales/index.js
@@ -1,8 +1,8 @@
 import { createI18n } from 'vue-i18n'
 import messages from '@intlify/unplugin-vue-i18n/messages'
 
-// const locale = window.electron?.process?.env?.LOCALE
-const locale = 'en_US'
+const locale = window.electron?.process?.env?.LOCALE
+// const locale = 'en_US'
 
 // console.log('locale', locale)
 

diff --git a/src/locales/languages/zh_CN.json b/src/locales/languages/zh_CN.json
@@ -103,21 +103,21 @@
     },
     "config": {
       "import": {
-        "name": "导入配置",
+        "name": "导入",
         "placeholder": "请选择要导入的配置文件",
         "success": "导入成功"
       },
       "export": {
-        "name": "导出配置",
+        "name": "导出",
         "message": "导出配置",
         "placeholder": "请选择要导出的位置",
         "success": "导出成功"
       },
       "edit": {
-        "name": "编辑配置"
+        "name": "编辑"
       },
       "reset": {
-        "name": "重置配置"
+        "name": "重置"
       },
       "save": {
         "name": "保存配置",