diff --git a/resources/icon.png b/resources/icon.png index cf9e8b2..cd5e977 100644 Binary files a/resources/icon.png and b/resources/icon.png differ diff --git a/src/renderer/src/App.vue b/src/renderer/src/App.vue index a4791be..743de78 100644 --- a/src/renderer/src/App.vue +++ b/src/renderer/src/App.vue @@ -134,7 +134,7 @@ html, body { */ .tabbar-item-css{ .van-tabbar-item{ - font-size: 20px; + font-size: 35px; background-color: transparent; --van-tabbar-background-color: transparent; } diff --git a/src/renderer/src/JS/Config.js b/src/renderer/src/JS/Config.js index 6829f12..c82f7b2 100644 --- a/src/renderer/src/JS/Config.js +++ b/src/renderer/src/JS/Config.js @@ -40,16 +40,25 @@ export function Release(){ wsManager.disconnect(); } } +function extractParenthesesContent(str) { + const match = str.match(/\(([^)]+)\)/); + return match ? match[1] : null; +} function setSetting(setting){ if(!Config.DHCPMutex){ Config.DHCP = setting.DHCPFlag === 1; } else{ - Config.DHCP = false; + Config.DHCP = true; } Config.ServerName = setting.ServerName; Config.ServerVer = setting.Version1 + setting.Version2; - Config.ServerVer2 = setting.Version2; + try { + Config.ServerVer2 = extractParenthesesContent(setting.Version2); + } + catch (e){ + Config.ServerVer2 = setting.Version2; + } Config.ServerStatus = setting.ServerStatus; Config.ServerIP = setting.ServerIP; Config.IPList = setting.ServerAddress; @@ -59,6 +68,9 @@ function setSetting(setting){ Config.ServerGW = setting.IPGw; Config.ServerNM = setting.IPNm; } +const formatFloat = function(value, n) { + return Number(value).toFixed(n); +} class WebSocketManager { constructor() { this.ws = null; @@ -111,11 +123,11 @@ class WebSocketManager { else if(Code === 3){ Config.UpDateIndex = 3; Config.DownValue = 100; - ElNotification.success('开始解压升级包') + ElNotification.success('开始安装升级包,即将重启') } else if(Code === 4){ Config.UpDateIndex = 4; - ElNotification.success('开始安装升级包,即将重启') + ElNotification.success('即将重启') } } else if(json.Key === "exitSys"){ diff --git a/src/renderer/src/components/Home/Home.vue b/src/renderer/src/components/Home/Home.vue index 8d3b761..0b22720 100644 --- a/src/renderer/src/components/Home/Home.vue +++ b/src/renderer/src/components/Home/Home.vue @@ -3,7 +3,7 @@ - Ver:  {{ Config.ServerVer }} [{{ formatTime(Date.now()) }}] + Ver:  {{ Config.ServerVer }} [{{ currentTime }}]  System: {{ getSystemType() }} @@ -21,7 +21,10 @@ diff --git a/src/renderer/src/components/Setting/Setting.vue b/src/renderer/src/components/Setting/Setting.vue index 1797fb4..59c64d7 100644 --- a/src/renderer/src/components/Setting/Setting.vue +++ b/src/renderer/src/components/Setting/Setting.vue @@ -21,7 +21,9 @@    - 运行中... + + 运行中... + 加载中... @@ -134,8 +136,48 @@ + + + + + @@ -164,11 +207,14 @@ const formBoxInput3 = ref(); const formBoxInput4 = ref(); const formBoxInput5 = ref(); const formBoxInput6 = ref(); +const formBoxInput7 = ref(); const scrollContainer = ref() +const keyboardRef = ref() const ClickIndex = ref(0); const manyDict = ref("@renderer/dict/chowder.json") const singleDict = ref("@renderer/dict/baseDict.json") const showKeyboard = ref(false); +const Process1 = ref(false); const inputElement = ref(); const targetH = ref(0); @@ -185,7 +231,6 @@ onUnmounted(()=>{ const clickKey = (key) => { console.log("key-->>",key); } -//点击键盘时数字的值 const clickNumber = (key) => { console.log("key-->>",key); } @@ -226,6 +271,14 @@ function focusInput(id){ else if(id === "formBoxInput6"){ element = formBoxInput6.value; } + else if(id === "formBoxInput7"){ + element = formBoxInput7.value; + if (!element) { + console.log('dialog 尚未打开,元素不可用'); + return; + } + + } // 正确获取输入框元素 if (element) { @@ -237,72 +290,21 @@ function focusInput(id){ console.log('inputElement', inputElement.value); console.log('tar', inputElement.value.getBoundingClientRect()); targetH.value = inputElement.value.getBoundingClientRect().top; + if (inputElement.value) { + // keyboardRef.value.manualShow(); + } } else { console.log('inputElement not found for', id); } } //------------------------------------------------------------------------------ -function PasswordFun(Confirm = null,Cannel = null) { - const passwordRef = ref(''); - - ElMessageBox({ - title: '请输入密码', - message: () => - h('div', [ - h('input', { - type: 'password', - placeholder: '请输入密码', - value: passwordRef.value, - // 监听输入框点击事件 - onclick: (event) => { - // console.log('密码输入框被点击'); - - // 在这里添加点击事件的处理逻辑 - }, - // 监听输入事件 - oninput: (event) => { - passwordRef.value = event.target.value; - }, - // 监听获得焦点事件 - onfocus: (event) => { - console.log('密码输入框获得焦点'); - toggleScreenKeyboard(true); - }, - // 监听失去焦点事件 - onblur: (event) => { - console.log('密码输入框失去焦点'); - toggleScreenKeyboard(false); - }, - style: { - width: '380px', - padding: '8px', - border: '1px solid #dcdfe6', - borderRadius: '4px' - } - }) - ]), - showCancelButton: true, - confirmButtonText: '确认', - cancelButtonText: '取消', - }).then(() => { - if(Confirm && passwordRef.value === Config.PasswordOrder){ - Confirm(); - } - else{ - ElMessage.error('密码错误'); - } - }).catch(() => { - if(Cannel){ - Cannel(); - } - toggleScreenKeyboard(false); - }) -} -function Save(){ - ClickIndex.value = 0; - Config.Password = ''; - PasswordFun(()=>{ +function PasswordFun() { + if(Config.Password !== Config.PasswordOrder){ + ElMessage.error('密码错误'); + return; + } + if(ClickIndex.value === 0){ sendMessage(JSON.stringify({ Key:'setSetting', DHCPFlag:Config.DHCP ? 1 : 0, @@ -314,7 +316,20 @@ function Save(){ ServerOrderPort:Config.ServerOrderPort, })); ElMessage.success('保存成功'); - }); + Process1.value = false; + } + else if(ClickIndex.value === 1){ + sendMessage(JSON.stringify({ + Key:"exitSys" + })); + Process1.value = false; + window.electronAPI.winClose(); + } +} +function Save(){ + ClickIndex.value = 0; + Config.Password = ''; + Process1.value = true; } function Reset(){ ClickIndex.value = 1; @@ -324,13 +339,9 @@ function Reset(){ }); } function Exit(){ - ClickIndex.value = 2; + ClickIndex.value = 1; Config.Password = ''; - PasswordFun(()=>{ - sendMessage(JSON.stringify({ - Key:"exitSys" - })); - }); + Process1.value = true; } //------------------------------------------------------------------------------ diff --git a/src/renderer/src/components/Upgrade/Upgrade.vue b/src/renderer/src/components/Upgrade/Upgrade.vue index 5d66dba..50d004f 100644 --- a/src/renderer/src/components/Upgrade/Upgrade.vue +++ b/src/renderer/src/components/Upgrade/Upgrade.vue @@ -19,6 +19,7 @@ v-model="Config.selectedVersion" placeholder="请选择版本" class="version-select" + @change="handleVer" >
- 当前版本:{{ Config.ServerVer2 }} + 当前版本:{{ `V${Config.ServerVer2}` }}  +
+ +
+ 编译日期:{{ DataDB.Date }} 
@@ -57,15 +62,19 @@ :striped-flow="Config.UpDateIndex === 3 || Config.UpDateIndex === 4" style="border-radius: 1px;" > - - 下载进度: {{ Config.DownValue }} % - - - 正在解压 - - - 正在安装升级包... - + + + 下载进度: {{ Config.DownValue }}% + + + 正在安装升级包... + + + 等待升级完成... + + @@ -88,7 +97,7 @@ - 更新列表 + 检查更新 @@ -97,16 +106,21 @@