升级nuxt -> 3.15.0 修复防止休眠无法停止的问题

This commit is contained in:
黑先森
2024-12-31 11:46:04 +08:00
parent cefcc930b8
commit 539092d769
5 changed files with 753 additions and 812 deletions
+7 -8
View File
@@ -11,8 +11,8 @@
},
"devDependencies": {
"@element-plus/icons-vue": "^2.3.1",
"@element-plus/nuxt": "^1.1.0",
"@nuxtjs/tailwindcss": "^6.12.0",
"@element-plus/nuxt": "^1.1.1",
"@nuxtjs/tailwindcss": "^6.12.2",
"@pinia/nuxt": "0.9.0",
"@tauri-apps/api": "^2.1.1",
"@tauri-apps/cli": "^2.1.0",
@@ -23,19 +23,18 @@
"@tauri-apps/plugin-shell": "^2.2.0",
"@tauri-apps/plugin-window-state": "^2.2.0",
"@types/lodash-es": "^4.17.12",
"@vitejs/plugin-vue-jsx": "^4.1.0",
"@vueuse/core": "12.0.0",
"@vitejs/plugin-vue-jsx": "^4.1.1",
"@vueuse/core": "12.2.0",
"archiver": "^7.0.1",
"element-plus": "^2.8.7",
"element-plus": "^2.9.1",
"less": "^4.2.0",
"lodash-es": "^4.17.21",
"nuxt": "^3.14.1592",
"nuxt": "3.15.0",
"pinia": "^2.3.0",
"pinia-plugin-persistedstate": "^4.1.3",
"pinia-plugin-persistedstate": "^4.2.0",
"postcss": "^8.4.38",
"prettier": "^3.4.1",
"prettier-plugin-tailwindcss": "^0.6.9",
"typescript": "^5.6.3",
"vue-clipboard3": "^2.0.0"
}
}
+1
View File
@@ -570,6 +570,7 @@
await invoke("stop_command", { child_id: listenObj.thread_id || 0 });
await invoke("stop_command", { child_id: data.winipBcPid || 0 });
await invoke("stop_command", { child_id: listenObj.server_thread_id.value || 0 });
await stopPreventSleep(); //关闭防休眠
},
async () => {
await handleConnection();
+741 -801
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -3,7 +3,7 @@ const store = defineStore("main", {
state() {
return {
config: {
protocol: ["tcp", "udp"], // 网络协议
protocol: ["tcp"], // 网络协议
serverUrl: "public.easytier.top:11010",
networkName: "",
networkPassword: "",
@@ -49,7 +49,7 @@ const store = defineStore("main", {
port: "11010" // 服务器端口
},
cidrEnable: false,
basePeers: ["public.easytier.top:11010"],
basePeers: ["public.easytier.top:11010","public.easytier.net:11010"],
theme: false, //主题 false light true dark
configStartEnable: false, //使用配置文件启动
configPath: "", //配置文件路径
+2 -1
View File
@@ -81,9 +81,10 @@ export const preventSleep = () => {
}, _prevent_timer_count * 1000);
}
export const stopPreventSleep = () => {
export const stopPreventSleep = async () => {
_prevent_timer && clearInterval(_prevent_timer);
_prevent_timer = null;
const _result = await invoke('allow_sleep');
}
export const parseCliInfo = (content: string) => {