fix: 自测问题修复

rupoly1 · rupoly1 · commit 026c7c64fb98 · 2025-08-26T18:02:34.000+08:00
diff --git a/web-ui/index.html b/web-ui/index.html
@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="GLKVM Cloud Platform provides secure, high-performance remote device access capabilities, seamlessly enabling remote work, IT operations, and centralized device management - delivering local-like control experience across geographical boundaries." />
-    <title>GLKVM - 轻量级远程访问平台</title>
+    <title>GLKVM</title>
   </head>
   <body>
     <div id="app"></div>
diff --git a/web-ui/src/lang/locales/en.json b/web-ui/src/lang/locales/en.json
@@ -10,7 +10,11 @@
     "copyFailed": "Copy Failed",
     "detail": "Detail",
     "success": "Success",
-    "failed": "Failed"
+    "failed": "Failed",
+    "cancel": "Cancel",
+    "ok": "OK",
+    "close": "Close",
+    "about": "About"
   },
   "login": {
     "authorizationRequired": "Authorization Required",
@@ -57,6 +61,30 @@
     "standardOutput": "Standard output",
     "standardErrorOutput": "Standard error output"
   },
+  "rtty": {
+    "requestingDeviceToCreateTerminal": "Requesting device to create terminal...",
+    "uploadFileToDevice": "Upload file to device",
+    "selectFile": "Select file",
+    "copyTips": "Copy - Ctrl+Insert",
+    "pasteTips": "Paste - Shift+Insert",
+    "clearScrollBack": "Clear Scrollback",
+    "fontUp": "Increase font size",
+    "fontDown": "Decrease font size",
+    "uploadFile": "Upload file",
+    "downloadFile": "Download file",
+    "splitLeft": "Split: Left",
+    "splitRight": "Split: Right",
+    "splitUp": "Split: Up",
+    "splitDown": "Split: Down",
+    "copiedToClipboard": "Copied to clipboard",
+    "executeCommandR": "Please execute command \"rtty -R\" in current terminal!",
+    "executeCommandS": "Please execute command \"rtty -S file\" in current terminal!",
+    "useShortcutSI": "Please use shortcut \"Shift+Insert\"",
+    "pastedFromClipboard": "Pasted from clipboard",
+    "clipboardPermissionRequired": "Clipboard Permission Required",
+    "clipboardInstructions": "To enable clipboard permissions, click the site information icon on the left of address bar to access permission settings, or configure clipboard permissions for this site in browser privacy settings. You can also use Shift+Insert keyboard shortcut to paste.",
+    "fileTooLargeTips": "The file you will upload is too large(> 4294967295 Byte)"
+  },
   "errorPage": {
     "sorry": "Sorry!",
     "backHome": "Back Home",
@@ -153,4 +181,4 @@
     "CLOUD_EMAIL_NOT_MATCH_USER": "The email not match the user.",
     "CLOUD_USER_NOT_EXIST": "The user does not exist."
   }
-}
+}
diff --git a/web-ui/src/lang/locales/zh.json b/web-ui/src/lang/locales/zh.json
@@ -10,7 +10,11 @@
     "copyFailed": "复制失败",
     "detail": "详情",
     "success": "成功",
-    "failed": "失败"
+    "failed": "失败",
+    "cancel": "取消",
+    "ok": "确定",
+    "close": "关闭",
+    "about": "关于"
   },
   "login": {
     "authorizationRequired": "需要授权",
@@ -57,6 +61,30 @@
     "standardOutput": "标准输出",
     "standardErrorOutput": "标准错误输出"
   },
+  "rtty": {
+    "requestingDeviceToCreateTerminal": "正在请求设备创建终端...",
+    "uploadFileToDevice": "上传文件到设备",
+    "selectFile": "选择文件",
+    "copyTips": "复制 - Ctrl+Insert",
+    "pasteTips": "粘贴 - Shift+Insert",
+    "clearScrollBack": "清除回滚",
+    "fontUp": "增大字号",
+    "fontDown": "减小字号",
+    "uploadFile": "上传文件",
+    "downloadFile": "下载文件",
+    "splitLeft": "拆分窗格: 左",
+    "splitRight": "拆分窗格: 右",
+    "splitUp": "拆分窗格: 上",
+    "splitDown": "拆分窗格: 下",
+    "copiedToClipboard": "已复制到剪切板",
+    "executeCommandR": "请在当前终端中执行命令 \"rtty -R\"",
+    "executeCommandS": "请在当前终端中执行命令 \"rtty -S file\"",
+    "useShortcutSI": "请使用快捷键 \"Shift+Insert\"",
+    "pastedFromClipboard": "已从剪切板粘贴",
+    "clipboardPermissionRequired": "需要剪切板权限",
+    "clipboardInstructions": "要启用剪切板权限，请点击地址栏左侧的站点信息图标进入权限设置，或在浏览器设置的隐私安全选项中配置此网站的剪切板权限。也可使用快捷键 Shift+Insert 进行粘贴。",
+    "fileTooLargeTips": "您要上传的文件太大了(> 4294967295 Byte)"
+  },
   "errorPage": {
     "sorry": "抱歉！",
     "backHome": "返回首页",
diff --git a/web-ui/src/stores/modules/device.ts b/web-ui/src/stores/modules/device.ts
@@ -2,7 +2,7 @@
  * @Author: shufei.han
  * @Date: 2025-06-10 16:46:00
  * @LastEditors: LPY
- * @LastEditTime: 2025-08-26 09:30:15
+ * @LastEditTime: 2025-08-26 17:18:56
  * @FilePath: \glkvm-cloud\web-ui\src\stores\modules\device.ts
  * @Description: 设备有关的状态管理
  */
@@ -68,7 +68,10 @@ export const useDeviceStore = defineStore('device', () => {
                 state.hasDevice = true
             }
             pageLink.value.setTotal(res.info.length)
-            state.deviceList = res.info || []
+            state.deviceList = res.info.filter(d => {
+                return d.id.toLowerCase().indexOf(computedDeviceQuery.value.searchText) > -1 
+                || d.description.toLowerCase().indexOf(computedDeviceQuery.value.searchText) > -1
+            }) || []
             state.completeDeviceList = res.info || []
             !isPolling && (state.getDeviceLoading = false)
         } catch (error) {
@@ -99,13 +102,8 @@ export const useDeviceStore = defineStore('device', () => {
         }, GET_DEVICE_POLLING_INTERVAL)
     }
     /** 监听设备列表的查询条件变化 */
-    watch(computedDeviceQuery, (newQuery) => {
-        console.log('Device query changed:', newQuery)
-        // pageLink.value.resetPage()
-        // getDeviceList()
-        state.deviceList = state.completeDeviceList.filter(d => {
-            return d.id.toLowerCase().indexOf(newQuery.searchText) > -1 || d.description.toLowerCase().indexOf(newQuery.searchText) > -1
-        })
+    watch(computedDeviceQuery, () => {
+        getDeviceList()
     })
 
     return {
diff --git a/web-ui/src/views/device/components/rttyTerm.vue b/web-ui/src/views/device/components/rttyTerm.vue
@@ -2,12 +2,12 @@
  * @Author: LPY
  * @Date: 2025-08-26 11:55:49
  * @LastEditors: LPY
- * @LastEditTime: 2025-08-26 14:42:10
+ * @LastEditTime: 2025-08-26 17:45:17
  * @FilePath: \glkvm-cloud\web-ui\src\views\device\components\rttyTerm.vue
  * @Description: 
 -->
 <template>
-    <a-spin :tip="$t('Requesting device to create terminal...')">
+    <a-spin :tip="$t('rtty.requestingDeviceToCreateTerminal')">
         <div class="terminal-container">
             <div ref="terminal" class="terminal" @contextmenu.prevent="showContextmenu"></div>
             <BaseButton 
@@ -18,14 +18,14 @@
                 circle
                 class="keyboard-toggle-btn">⌨</BaseButton>
             <RttyKeyboard v-show="showKeyboard" @keypress="handleKeypress" @close="hideKeyboard" class="floating-keyboard"/>
-            <BaseModal v-model:open="fileCtx.modal" :title="$t('Upload file to device')" @close="onUploadDialogClosed" :width="400">
+            <BaseModal v-model:open="fileCtx.modal" :title="$t('rtty.uploadFileToDevice')" @close="onUploadDialogClosed" :width="400">
                 <a-upload :beforeUpload="beforeUpload" action="#">
-                    <BaseButton type="primary">{{ $t("Select file") }}</BaseButton>
+                    <BaseButton type="primary">{{ $t("rtty.selectFile") }}</BaseButton>
                 </a-upload>
                 <p v-if="fileCtx.file !== null"> {{ fileCtx.file.name }}</p>
                 <template #footer>
-                    <BaseButton @click="fileCtx.modal = false">{{ $t('Cancel') }}</BaseButton>
-                    <BaseButton type="primary" @click="doUploadFile">{{ $t('OK') }}</BaseButton>
+                    <BaseButton @click="fileCtx.modal = false">{{ $t('common.cancel') }}</BaseButton>
+                    <BaseButton type="primary" @click="doUploadFile">{{ $t('common.ok') }}</BaseButton>
                 </template>
             </BaseModal>
             <ContextMenu v-model="contextmenuPos" :menus="contextmenus" @click="onContextmenuClick"/>
@@ -36,7 +36,6 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted, onUnmounted, nextTick, useTemplateRef } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { useI18n } from 'vue-i18n'
 import useClipboard from 'vue-clipboard3'
 import { Terminal } from '@xterm/xterm'
 import { FitAddon } from '@xterm/addon-fit'
@@ -47,6 +46,7 @@ import ContextMenu from './components/contextMenu.vue'
 import RttyKeyboard from './components/rttyKeyboard.vue'
 import { BaseModal } from '@gl/main/components'
 import { message, Modal } from 'ant-design-vue'
+import { t } from '@/hooks/useLanguage'
 
 const LoginErrorOffline = 4000
 const LoginErrorBusy = 4001
@@ -66,26 +66,25 @@ const props = defineProps({
 const emit = defineEmits(['split', 'close'])
 
 const router = useRouter()
-const { t } = useI18n()
 const { toClipboard } = useClipboard()
 
 const terminal = useTemplateRef('terminal')
 const contextmenuPos = ref(null)
 
 const contextmenus = [
-    {name: 'copy', caption: t('Copy - Ctrl+Insert')},
-    {name: 'paste', caption: t('Paste - Shift+Insert')},
-    {name: 'clear', caption: t('Clear Scrollback')},
-    {name: 'font+', caption: t('font+')},
-    {name: 'font-', caption: t('font-')},
-    {name: 'upload', caption: t('Upload file') + ' - rtty -R'},
-    {name: 'download', caption: t('Download file') + ' - rtty -S file'},
-    {name: 'split-left', caption: t('split-left')},
-    {name: 'split-right', caption: t('split-right')},
-    {name: 'split-up', caption: t('split-up')},
-    {name: 'split-down', caption: t('split-down')},
-    {name: 'close', caption: t('Close')},
-    {name: 'about', caption: t('About')},
+    {name: 'copy', caption: t('rtty.copyTips')},
+    {name: 'paste', caption: t('rtty.pasteTips')},
+    {name: 'clear', caption: t('rtty.clearScrollBack')},
+    {name: 'font+', caption: t('rtty.fontUp')},
+    {name: 'font-', caption: t('rtty.fontDown')},
+    {name: 'upload', caption: t('rtty.uploadFile') + ' - rtty -R'},
+    {name: 'download', caption: t('rtty.downloadFile') + ' - rtty -S file'},
+    {name: 'split-left', caption: t('rtty.splitLeft')},
+    {name: 'split-right', caption: t('rtty.splitRight')},
+    {name: 'split-up', caption: t('rtty.splitUp')},
+    {name: 'split-down', caption: t('rtty.splitDown')},
+    {name: 'close', caption: t('common.close')},
+    {name: 'about', caption: t('common.about')},
 ]
 
 const fileCtx = reactive({
@@ -130,7 +129,7 @@ const onContextmenuClick = (name) => {
     if (name === 'copy') {
         const text = term.getSelection()
         if (text)
-            copyText(text).then(() => message.success(t('Copied to clipboard')))
+            copyText(text).then(() => message.success(t('rtty.copiedToClipboard')))
     } else if (name === 'paste') {
         pasteFromClipboard()
     } else if (name === 'clear') {
@@ -140,9 +139,9 @@ const onContextmenuClick = (name) => {
     } else if (name === 'font-') {
         updateFontSize(-1)
     } else if (name === 'upload') {
-        message.success(t('Please execute command "rtty -R" in current terminal!'))
+        message.success(t('rtty.executeCommandR'))
     } else if (name === 'download') {
-        message.success(t('Please execute command "rtty -S file" in current terminal!'))
+        message.success(t('rtty.executeCommandS'))
     } else if (name === 'split-left') {
         emit('split', props.panelId, 'left')
     } else if (name === 'split-right') {
@@ -163,23 +162,23 @@ const onContextmenuClick = (name) => {
 const pasteFromClipboard = async () => {
     try {
         if (!navigator.clipboard || !navigator.clipboard.readText) {
-            message.info(t('Please use shortcut "Shift+Insert"'))
+            message.info(t('rtty.useShortcutSI"'))
             return
         }
 
         const text = await navigator.clipboard.readText()
         if (text) {
             sendTermData(text)
-            message.success(t('Pasted from clipboard'))
+            message.success(t('rtty.pastedFromClipboard'))
         }
     } catch (error) {
         if (error.name === 'NotAllowedError') {
             Modal.warning({
-                title: t('Clipboard Permission Required'),
-                content: t('clipboard_instructions'),
+                title: t('rtty.clipboardPermissionRequired'),
+                content: t('rtty.clipboardInstructions'),
             })
         } else {
-            message.info(t('Please use shortcut "Shift+Insert"'))
+            message.info(t('rtty.useShortcutSI"'))
         }
     }
 }
@@ -222,7 +221,7 @@ const doUploadFile = () => {
     term.focus()
 
     if (fileCtx.file.size > 0xffffffff) {
-        message.error(t('The file you will upload is too large(> 4294967295 Byte)'))
+        message.error(t('rtty.fileTooLargeTips'))
         return
     }
 
diff --git a/web-ui/src/views/layout/layHeader/layHeader.vue b/web-ui/src/views/layout/layHeader/layHeader.vue
@@ -2,7 +2,7 @@
  * @Author: LPY
  * @Date: 2025-05-30 15:21:14
  * @LastEditors: LPY
- * @LastEditTime: 2025-08-26 10:22:35
+ * @LastEditTime: 2025-08-26 17:57:09
  * @FilePath: \glkvm-cloud\web-ui\src\views\layout\layHeader\layHeader.vue
  * @Description: 顶部集成页
 -->
@@ -16,21 +16,21 @@
             <ATooltip>
                 <template #title>{{ githubLink }}</template>
                 <a :href="githubLink" target="_blank" rel="noopener noreferrer" class="icon-area">
-                    <BaseSvg name="gl-icon-github" style="font-size: 16px;" />
+                    <BaseSvg name="gl-icon-github" :size="24" />
                 </a>
             </ATooltip>
             <!-- 问题指引 -->
             <ATooltip>
                 <template #title>{{ helpLink }}</template>
                 <a :href="helpLink" target="_blank" rel="noopener noreferrer" class="icon-area">
-                    <BaseSvg name="gl-icon-help" style="font-size: 16px;" />
+                    <BaseSvg name="gl-icon-help" :size="24" />
                 </a>
             </ATooltip>
             <!-- 竖线 -->
             <div class="vertical-line" />
 
             <a href="javascript:;" class="log-out" @click="userStore.manualLogout">
-                <BaseSvg name="gl-icon-logout" style="margin-right: 12px;"></BaseSvg>
+                <BaseSvg name="gl-icon-logout" style="margin-right: 12px;" :size="24"></BaseSvg>
                 {{ $t('login.signOut') }}
             </a>
         </div>
@@ -82,7 +82,7 @@ const helpLink = 'https://www.gl-inet.com'
       justify-content: center;
       align-items: center;
       border-radius: 4px;
-      color: var(--gl-color-text-level2);
+      color: var(--gl-color-text-level3);
       cursor: pointer;
 
       &:hover {
@@ -100,7 +100,7 @@ const helpLink = 'https://www.gl-inet.com'
     .log-out {
       display: flex;
       align-items: center;
-      color: var(--gl-color-text-level2);
+      color: var(--gl-color-text-level3);
     }
 
   }
diff --git a/web-ui/src/views/login/loginPage.vue b/web-ui/src/views/login/loginPage.vue
@@ -2,7 +2,7 @@
  * @Author: LPY
  * @Date: 2025-05-30 10:48:43
  * @LastEditors: LPY
- * @LastEditTime: 2025-08-25 19:21:32
+ * @LastEditTime: 2025-08-26 17:11:12
  * @FilePath: \glkvm-cloud\web-ui\src\views\login\loginPage.vue
  * @Description: 登录页面
 -->
@@ -83,6 +83,7 @@ const handleLogin = () => {
             router.push(redirect)
         } catch (error) {
             console.log(error)
+            state.loading = false
             message.error(t('login.incorrectPwd'))
         }
     })
