From e61d6109d71c60082ae5460cdb98b8b799e6c6b3 Mon Sep 17 00:00:00 2001
From: lrl <742798240@qq.com>
Date: Wed, 29 Dec 2021 22:45:18 +0800
Subject: [PATCH] perf: modify showLogo type: from string to Boolean

---
 public/serverConfig.json                   |  2 +-
 src/layout/components/setting/index.vue    | 14 +++++++-------
 src/layout/components/sidebar/vertical.vue |  4 ++--
 src/layout/index.vue                       |  2 +-
 src/utils/storage/responsive.ts            |  2 +-
 types/global.d.ts                          |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/public/serverConfig.json b/public/serverConfig.json
index fc972e10d..adb08203d 100644
--- a/public/serverConfig.json
+++ b/public/serverConfig.json
@@ -14,7 +14,7 @@
   "HideTabs": false,
   "SidebarStatus": true,
   "EpThemeColor": "#409EFF",
-  "ShowLogo": "1",
+  "ShowLogo": true,
   "ShowModel": "smart",
   "MapConfigure": {
     "amapKey": "97b3248d1553172e81f168cf94ea667e",
diff --git a/src/layout/components/setting/index.vue b/src/layout/components/setting/index.vue
index 1164f06a9..77214509b 100644
--- a/src/layout/components/setting/index.vue
+++ b/src/layout/components/setting/index.vue
@@ -79,9 +79,9 @@ if (unref(layoutTheme)) {
 }
 
 // 默认灵动模式
-const markValue = ref(instance.configure?.showModel || "smart");
+const markValue = ref(instance.configure?.showModel ?? "smart");
 
-const logoVal = ref(instance.configure?.showLogo || "1");
+const logoVal = ref(instance.configure?.showLogo ?? true);
 
 const epThemeColor = ref(useEpThemeStoreHook().getEpThemeColor);
 
@@ -175,9 +175,9 @@ function onChange(label) {
 
 // 侧边栏Logo
 function logoChange() {
-  unref(logoVal) === "1"
-    ? changeStorageConfigure("showLogo", "1")
-    : changeStorageConfigure("showLogo", "-1");
+  unref(logoVal)
+    ? changeStorageConfigure("showLogo", true)
+    : changeStorageConfigure("showLogo", false);
   emitter.emit("logoChange", unref(logoVal));
 }
 
@@ -399,8 +399,8 @@ nextTick(() => {
         <el-switch
           v-model="logoVal"
           inline-prompt
-          active-value="1"
-          inactive-value="-1"
+          :active-value="true"
+          :inactive-value="false"
           inactive-color="#a6a6a6"
           active-text="开"
           inactive-text="关"
diff --git a/src/layout/components/sidebar/vertical.vue b/src/layout/components/sidebar/vertical.vue
index 2e153cca7..2fc6dcaa9 100644
--- a/src/layout/components/sidebar/vertical.vue
+++ b/src/layout/components/sidebar/vertical.vue
@@ -13,7 +13,7 @@ const route = useRoute();
 const pureApp = useAppStoreHook();
 const router = useRouter().options.routes;
 const showLogo = ref(
-  storageLocal.getItem("responsive-configure")?.showLogo || "1"
+  storageLocal.getItem("responsive-configure")?.showLogo ?? true
 );
 const isCollapse = computed(() => {
   return !pureApp.getSidebarStatus;
@@ -60,7 +60,7 @@ onBeforeMount(() => {
 
 <template>
   <div :class="['sidebar-container', showLogo ? 'has-logo' : '']">
-    <Logo v-if="showLogo === '1'" :collapse="isCollapse" />
+    <Logo v-if="showLogo" :collapse="isCollapse" />
     <el-scrollbar wrap-class="scrollbar-wrapper">
       <el-menu
         :default-active="activeMenu"
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 69d9acf9e..9b0d3a70e 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -64,7 +64,7 @@ const layout = computed(() => {
       grey: instance.$config?.Grey ?? false,
       weak: instance.$config?.Weak ?? false,
       hideTabs: instance.$config?.HideTabs ?? false,
-      showLogo: instance.$config?.ShowLogo ?? "1",
+      showLogo: instance.$config?.ShowLogo ?? true,
       showModel: instance.$config?.ShowModel ?? "smart",
       multiTagsCache: instance.$config?.MultiTagsCache ?? false
     };
diff --git a/src/utils/storage/responsive.ts b/src/utils/storage/responsive.ts
index dba3d351d..2162e82c3 100644
--- a/src/utils/storage/responsive.ts
+++ b/src/utils/storage/responsive.ts
@@ -29,7 +29,7 @@ export const injectResponsiveStorage = (app: App, config: ServerConfigs) => {
           grey: config.Grey ?? false,
           weak: config.Weak ?? false,
           hideTabs: config.HideTabs ?? false,
-          showLogo: config.ShowLogo ?? "1",
+          showLogo: config.ShowLogo ?? true,
           showModel: config.ShowModel ?? "smart",
           multiTagsCache: config.MultiTagsCache ?? false
         }
diff --git a/types/global.d.ts b/types/global.d.ts
index a2b8c7656..395419cb3 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -88,7 +88,7 @@ declare global {
     HideTabs?: boolean;
     SidebarStatus?: boolean;
     EpThemeColor?: string;
-    ShowLogo?: string;
+    ShowLogo?: boolean;
     ShowModel?: string;
     MapConfigure?: {
       amapKey?: string;