From 896bd93c2006e6f976d80f7ad6098f95f534f4cf Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Mon, 4 Sep 2023 22:54:13 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20:recycle:=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: f5937eddb68a14165dc2b0bc03d4fe5dfa379e37
---
 package.json                             |  1 +
 src/components/Upload/MultiUpload.vue    |  2 +-
 src/layout/components/Settings/index.vue | 28 ++++++------------------
 src/settings.ts                          |  4 ++--
 4 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index b0e8f1f3..ecc92020 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,7 @@
     "screenfull": "^6.0.0",
     "sockjs-client": "1.6.1",
     "sortablejs": "^1.15.0",
+    "terser": "^5.19.3",
     "stompjs": "^2.3.3",
     "vue": "^3.3.4",
     "vue-i18n": "9.2.2",
diff --git a/src/components/Upload/MultiUpload.vue b/src/components/Upload/MultiUpload.vue
index 0da012af..735f7a3e 100644
--- a/src/components/Upload/MultiUpload.vue
+++ b/src/components/Upload/MultiUpload.vue
@@ -40,7 +40,7 @@ const props = defineProps({
    */
   modelValue: {
     type: Array<string>,
-    default: [] as Array<string>,
+    default: () => [],
   },
   /**
    * 文件上传数量限制
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index d370b269..336bb0e4 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -6,31 +6,14 @@ import IconEpSunny from "~icons/ep/sunny";
 import IconEpMoon from "~icons/ep/moon";
 import { useRoute } from "vue-router";
 import defaultSettings from "@/settings";
-/**
- * 暗黑模式
- */
+
+const route = useRoute();
+
 const settingsStore = useSettingsStore();
 const permissionStore = usePermissionStore();
 const appStore = useAppStore();
 
 const isDark = useDark();
-console.log("isDark1", isDark.value);
-
-watch(
-  () => defaultSettings.theme,
-  (newVal: string) => {
-    if (
-      (newVal == "dark" && isDark.value == false) ||
-      (newVal == "light" && isDark.value == true)
-    ) {
-      toggleDark();
-      console.log("isDark2", isDark.value);
-    }
-  }
-);
-
-computed(() => {});
-
 const toggleDark = () => useToggle(isDark);
 
 function findOutermostParent(tree: any[], findName: string) {
@@ -66,7 +49,7 @@ const againActiveTop = (newVal: string) => {
     appStore.changeTopActive(parent.path);
   }
 };
-const route = useRoute();
+
 /**
  * 切换布局
  */
@@ -98,6 +81,9 @@ function changeThemeColor(color: string) {
 
 onMounted(() => {
   window.document.body.setAttribute("layout", settingsStore.layout);
+  const theme =
+    localStorage.getItem("vueuse-color-scheme") || defaultSettings.theme;
+  localStorage.setItem("vueuse-color-scheme", theme);
 });
 </script>
 
diff --git a/src/settings.ts b/src/settings.ts
index 8531e7ca..a39b8e43 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -48,8 +48,8 @@ const defaultSettings: DefaultSettings = {
   tagsView: true,
   fixedHeader: false,
   sidebarLogo: true,
-  layout: "mix", // 默认混合模式
-  theme: "dark", // 默认暗黑模式
+  layout: "left", // 默认左侧模式
+  theme: "light", // 默认暗黑模式
   size: "default",
   language: "zh-cn",
 };