From 7501a5661c687857cd80a13df1ad46ec8baa435c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=91=E5=85=88=E6=A3=AE?= Date: Fri, 3 Jan 2025 10:39:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E5=90=AF=E7=94=A8co?= =?UTF-8?q?nfig.json=EF=BC=8C=E4=BD=86=E6=98=AF=E6=9C=AC=E5=9C=B0=E5=AD=98?= =?UTF-8?q?=E5=9C=A8config.json=EF=BC=8C=E6=97=A0=E6=B3=95=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E5=8B=BE=E9=80=89=E7=9A=84bug=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=A0=E9=99=A4config.json=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/advance.vue | 24 ++++++++++++++++++++++-- pages/index.vue | 8 ++++---- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/pages/advance.vue b/pages/advance.vue index 856b1ce..8f8e8a2 100644 --- a/pages/advance.vue +++ b/pages/advance.vue @@ -222,12 +222,13 @@ import { QuestionFilled } from "@element-plus/icons-vue"; import { resourceDir as getResourceDir, join } from "@tauri-apps/api/path"; import { Command } from "@tauri-apps/plugin-shell"; - import { exists, mkdir, BaseDirectory } from "@tauri-apps/plugin-fs"; + import { exists, mkdir, BaseDirectory, remove } from "@tauri-apps/plugin-fs"; import { ElMessage } from "element-plus"; import { reactive } from "vue"; import { dataSubscribe } from "@/composables/windows"; - import { supportProtocols } from "~/utils"; + import { ATJ, supportProtocols } from "~/utils"; import CoreVersionWarning from "@/components/CoreVersionWarning.vue"; + import { ElConfirmDanger } from "~/utils/element"; const protocols = supportProtocols(); const listenerDialogData = reactive<{ [key: string]: any }>({ @@ -269,6 +270,25 @@ }; dataSubscribe(async (...a) => { + if (!mainStore.createConfigInEasytier) { + // 考虑删除本地config.json文件 + const configJsonPath = import.meta.env.VITE_CONFIG_FILE_NAME; + const isExists = await exists(configJsonPath, { baseDir: BaseDirectory.Resource }); + // console.log({ isExists }); + if (isExists) { + const [error, _] = await ElConfirmDanger("生成配置文件功能被关闭,是否删除本地config.json", "提示", { + confirmButtonText: "删除", + cancelButtonText: "取消" + }); + if (!error) { + // 删除本地config.json文件 + const [error, _] = await ATJ(remove(configJsonPath, { baseDir: BaseDirectory.Resource })); + if (error) { + ElMessage.error("删除失败,请打开目录手动删除"); + } + } + } + } return { config: { ...mainStore.config }, createConfigInEasytier: mainStore.createConfigInEasytier diff --git a/pages/index.vue b/pages/index.vue index 5ec7ede..871a9ed 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -983,14 +983,14 @@ console.error(err); ElMessage.error(`config.json格式或编码错误`); } finally { - mainStore.$patch({ - createConfigInEasytier: true // 发现本地存在config.json 默认启用该功能 - }); + // mainStore.$patch({ + // createConfigInEasytier: true // 发现本地存在config.json 默认启用该功能 + // }); } } } const b = bounce(600); - mainStore.$subscribe((...a) => { + mainStore.$subscribe(async (...a) => { if (mainStore.createConfigInEasytier) { b(async () => { await updateConfigJson(data.configJsonSeverUrl);