From e22e19552a27a37620a1490f1a0f2b395177d8ea Mon Sep 17 00:00:00 2001
From: xiaoxian521 <1923740402@qq.com>
Date: Fri, 15 Oct 2021 11:38:43 +0800
Subject: [PATCH] perf: delete settings.ts use serverConfig.json

---
 .vscode/settings.json                        |  4 +++-
 public/serverConfig.json                     |  3 +++
 src/config/index.ts                          |  2 +-
 src/layout/components/sidebar/horizontal.vue |  7 ++++--
 src/layout/components/sidebar/logo.vue       | 14 ++++++-----
 src/layout/index.vue                         | 25 +++++++++-----------
 src/settings.ts                              |  7 ------
 src/store/modules/settings.ts                |  6 ++---
 types/global.d.ts                            | 13 +++++++++-
 9 files changed, 46 insertions(+), 35 deletions(-)
 delete mode 100644 src/settings.ts

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2f04c3a1b..d9426c8b6 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -43,5 +43,7 @@
   "cSpell.userWords": ["sourcemap", "vite"],
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true
-  }
+  },
+  "volar.tsPlugin": true,
+  "typescript.tsdk": "node_modules/typescript/lib"
 }
diff --git a/public/serverConfig.json b/public/serverConfig.json
index c2d672a76..b265b7071 100644
--- a/public/serverConfig.json
+++ b/public/serverConfig.json
@@ -1,5 +1,8 @@
 {
   "Version": "2.0.0",
+  "Title": "PureAdmin",
+  "FixedHeader": false,
+  "HiddenSideBar": false,
   "KeepAlive": true,
   "Locale": "zh",
   "Layout": "vertical-dark",
diff --git a/src/config/index.ts b/src/config/index.ts
index 9f12da4f4..c747e1622 100644
--- a/src/config/index.ts
+++ b/src/config/index.ts
@@ -6,7 +6,7 @@ const setConfig = (cfg?: unknown) => {
   config = Object.assign(config, cfg);
 };
 
-const getConfig = (key?: string) => {
+const getConfig = (key?: string): ServerConfigs => {
   if (typeof key === "string") {
     const arr = key.split(".");
     if (arr && arr.length) {
diff --git a/src/layout/components/sidebar/horizontal.vue b/src/layout/components/sidebar/horizontal.vue
index 48d717356..6df01d2da 100644
--- a/src/layout/components/sidebar/horizontal.vue
+++ b/src/layout/components/sidebar/horizontal.vue
@@ -8,7 +8,6 @@ import {
   getCurrentInstance
 } from "vue";
 import { useI18n } from "vue-i18n";
-import settings from "/@/settings";
 import { emitter } from "/@/utils/mitt";
 import { templateRef } from "@vueuse/core";
 import SidebarItem from "./sidebarItem.vue";
@@ -22,6 +21,10 @@ import { usePermissionStoreHook } from "/@/store/modules/permission";
 
 const instance =
   getCurrentInstance().appContext.config.globalProperties.$storage;
+
+const title =
+  getCurrentInstance().appContext.config.globalProperties.$config?.Title;
+
 const menuRef = templateRef<ElRef | null>("menu", null);
 const routeStore = usePermissionStoreHook();
 const route = useRoute();
@@ -114,7 +117,7 @@ onMounted(() => {
   <div class="horizontal-header">
     <div class="horizontal-header-left" @click="backHome">
       <i class="fa fa-optin-monster"></i>
-      <h4>{{ settings.title }}</h4>
+      <h4>{{ title }}</h4>
     </div>
     <el-menu
       ref="menu"
diff --git a/src/layout/components/sidebar/logo.vue b/src/layout/components/sidebar/logo.vue
index 30ebbb08a..f6a3a95e7 100644
--- a/src/layout/components/sidebar/logo.vue
+++ b/src/layout/components/sidebar/logo.vue
@@ -1,9 +1,11 @@
 <script setup lang="ts">
-import settings from "/@/settings";
-
+import { getCurrentInstance } from "vue";
 const props = defineProps({
   collapse: Boolean
 });
+
+const title =
+  getCurrentInstance().appContext.config.globalProperties.$config?.Title;
 </script>
 
 <template>
@@ -12,22 +14,22 @@ const props = defineProps({
       <router-link
         v-if="props.collapse"
         key="props.collapse"
-        :title="settings.title"
+        :title="title"
         class="sidebar-logo-link"
         to="/"
       >
         <i class="fa fa-optin-monster"></i>
-        <h1 class="sidebar-title">{{ settings.title }}</h1>
+        <h1 class="sidebar-title">{{ title }}</h1>
       </router-link>
       <router-link
         v-else
         key="expand"
-        :title="settings.title"
+        :title="title"
         class="sidebar-logo-link"
         to="/"
       >
         <i class="fa fa-optin-monster"></i>
-        <h1 class="sidebar-title">{{ settings.title }}</h1>
+        <h1 class="sidebar-title">{{ title }}</h1>
       </router-link>
     </transition>
   </div>
diff --git a/src/layout/index.vue b/src/layout/index.vue
index ec84b50cf..266fa0885 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -38,7 +38,6 @@ import {
   getCurrentInstance
 } from "vue";
 import { setType } from "./types";
-import options from "/@/settings";
 import { useI18n } from "vue-i18n";
 import { emitter } from "/@/utils/mitt";
 import { toggleClass } from "/@/utils/operate";
@@ -62,7 +61,9 @@ const { hiddenMainContainer } = useCssModule();
 const instance =
   getCurrentInstance().appContext.app.config.globalProperties.$storage;
 
-let containerHiddenSideBar = ref(options.hiddenSideBar);
+const hiddenSideBar = ref(
+  getCurrentInstance().appContext.config.globalProperties.$config?.HiddenSideBar
+);
 
 const set: setType = reactive({
   sidebar: computed(() => {
@@ -127,15 +128,15 @@ const $_resizeHandler = () => {
 };
 
 function onFullScreen() {
-  if (unref(containerHiddenSideBar)) {
-    containerHiddenSideBar.value = false;
+  if (unref(hiddenSideBar)) {
+    hiddenSideBar.value = false;
     toggleClass(
       false,
       hiddenMainContainer,
       document.querySelector(".main-container")
     );
   } else {
-    containerHiddenSideBar.value = true;
+    hiddenSideBar.value = true;
     toggleClass(
       true,
       hiddenMainContainer,
@@ -151,7 +152,7 @@ onMounted(() => {
     handleClickOutside(true);
   }
   toggleClass(
-    unref(containerHiddenSideBar),
+    unref(hiddenSideBar),
     hiddenMainContainer,
     document.querySelector(".main-container")
   );
@@ -173,20 +174,16 @@ onBeforeMount(() => {
       class="drawer-bg"
       @click="handleClickOutside(false)"
     />
-    <Vertical v-show="!containerHiddenSideBar && layout.includes('vertical')" />
+    <Vertical v-show="!hiddenSideBar && layout.includes('vertical')" />
     <div class="main-container">
       <div :class="{ 'fixed-header': set.fixedHeader }">
         <!-- 顶部导航栏 -->
-        <navbar
-          v-show="!containerHiddenSideBar && layout.includes('vertical')"
-        />
+        <navbar v-show="!hiddenSideBar && layout.includes('vertical')" />
         <!-- tabs标签页 -->
-        <Horizontal
-          v-show="!containerHiddenSideBar && layout.includes('horizontal')"
-        />
+        <Horizontal v-show="!hiddenSideBar && layout.includes('horizontal')" />
         <tag>
           <span @click="onFullScreen">
-            <fullScreen v-if="!containerHiddenSideBar" />
+            <fullScreen v-if="!hiddenSideBar" />
             <exitScreen v-else />
           </span>
         </tag>
diff --git a/src/settings.ts b/src/settings.ts
deleted file mode 100644
index 3002e3898..000000000
--- a/src/settings.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default {
-  title: "PureAdmin",
-
-  fixedHeader: false,
-
-  hiddenSideBar: false
-};
diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.ts
index bb54f3071..2b1fad1d8 100644
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.ts
@@ -1,6 +1,6 @@
-import defaultSettings from "../../settings";
 import { defineStore } from "pinia";
 import { store } from "/@/store";
+import { getConfig } from "/@/config";
 
 interface SettingState {
   title: string;
@@ -10,8 +10,8 @@ interface SettingState {
 export const useSettingStore = defineStore({
   id: "pure-setting",
   state: (): SettingState => ({
-    title: defaultSettings.title,
-    fixedHeader: defaultSettings.fixedHeader
+    title: getConfig().Title,
+    fixedHeader: getConfig().FixedHeader
   }),
   getters: {
     getTitle() {
diff --git a/types/global.d.ts b/types/global.d.ts
index a357c59fe..db725cc6f 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -84,10 +84,21 @@ declare global {
 
   declare interface ServerConfigs {
     Version?: string;
+    Title?: string;
+    FixedHeader?: boolean;
+    HiddenSideBar?: boolean;
     KeepAlive?: boolean;
     Locale?: string;
     Layout?: string;
-    MapConfigure?: any;
+    MapConfigure?: {
+      amapKey?: string;
+      baiduKey?: string;
+      options: {
+        resizeEnable?: boolean;
+        center?: number[];
+        zoom?: number;
+      };
+    };
   }
 
   function parseInt(s: string | number, radix?: number): number;