From 45f8eb2f46178cc232921d4c97713fda304be35c Mon Sep 17 00:00:00 2001
From: BTMuli <BT-Muli@outlook.com>
Date: Wed, 8 Mar 2023 22:09:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(merge):=20=E7=9B=B8=E5=85=B3=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=20merge=20=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue          | 6 ++++--
 src/pages/Config.vue | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 60e29463..af2ac7c5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -15,7 +15,7 @@
 import { defineComponent } from "vue";
 import TSidebar from "./components/t-sidebar.vue";
 import useAppStore from "./store/modules/app";
-import TGAppData from "./data";
+import { TGAppDataList } from "./data";
 import { fs } from "@tauri-apps/api";
 import { BaseDirectory } from "@tauri-apps/api/fs";
 
@@ -30,12 +30,14 @@ export default defineComponent({
 			try {
 				await fs.readDir(`${appStore.dataPath.app}`);
 				await fs.readDir(`${appStore.dataPath.user}`);
+				await fs.readDir(`${appStore.dataPath.merge}`);
 			} catch (e) {
 				await fs.createDir("appData", { dir: BaseDirectory.AppLocalData });
 				await fs.createDir("userData", { dir: BaseDirectory.AppLocalData });
+				await fs.createDir("mergeData", { dir: BaseDirectory.AppLocalData });
 			}
 			await console.log("检测到数据未加载，开始加载数据...");
-			TGAppData.map(async item => {
+			TGAppDataList.map(async item => {
 				await fs.writeFile(
 					`${appStore.dataPath.app}\\${item.name}`,
 					JSON.stringify(item.data, null, 2)
diff --git a/src/pages/Config.vue b/src/pages/Config.vue
index ea87324f..7d3472b1 100644
--- a/src/pages/Config.vue
+++ b/src/pages/Config.vue
@@ -46,8 +46,13 @@ export default defineComponent({
 					dir: BaseDirectory.AppLocalData,
 					recursive: true,
 				});
+				await fs.removeDir("mergeData", {
+					dir: BaseDirectory.AppLocalData,
+					recursive: true,
+				});
 				await dialog.message("用户数据已删除!");
 				await fs.createDir("userData", { dir: BaseDirectory.AppLocalData });
+				await fs.createDir("mergeData", { dir: BaseDirectory.AppLocalData });
 			}
 		},
 		// 恢复默认配置