From a8a3e5b303d4f022cf4570c5b63c238486755cfc Mon Sep 17 00:00:00 2001
From: xiaoxian521 <1923740402@qq.com>
Date: Wed, 1 Dec 2021 17:20:25 +0800
Subject: [PATCH] perf: tags

---
 src/layout/components/navbar.vue              |  2 +-
 src/layout/components/sidebar/breadCrumb.vue  |  2 +-
 src/layout/components/sidebar/sidebarItem.vue |  2 +-
 src/layout/components/tag/index.vue           |  2 +-
 src/plugins/i18n/index.ts                     | 24 +++++++++++++++++++
 src/router/index.ts                           |  2 +-
 src/store/modules/app.ts                      | 16 +++----------
 src/store/modules/multiTags.ts                | 15 ++++--------
 src/store/modules/settings.ts                 |  9 ++-----
 src/store/modules/types.ts                    | 24 +++++++++++++++++++
 src/utils/i18n.ts                             | 19 ---------------
 11 files changed, 62 insertions(+), 55 deletions(-)
 delete mode 100644 src/utils/i18n.ts

diff --git a/src/layout/components/navbar.vue b/src/layout/components/navbar.vue
index 4064e3ed9..bbd763b1a 100644
--- a/src/layout/components/navbar.vue
+++ b/src/layout/components/navbar.vue
@@ -11,7 +11,7 @@ import { unref, watch, getCurrentInstance } from "vue";
 import { deviceDetection } from "/@/utils/deviceDetection";
 import screenfull from "../components/screenfull/index.vue";
 import globalization from "/@/assets/svg/globalization.svg";
-import { transformI18n } from "/@/utils/i18n";
+import { transformI18n } from "/@/plugins/i18n";
 
 const instance =
   getCurrentInstance().appContext.config.globalProperties.$storage;
diff --git a/src/layout/components/sidebar/breadCrumb.vue b/src/layout/components/sidebar/breadCrumb.vue
index 393b147de..08ba0bb61 100644
--- a/src/layout/components/sidebar/breadCrumb.vue
+++ b/src/layout/components/sidebar/breadCrumb.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, watch } from "vue";
 import { useRoute, useRouter, RouteLocationMatched } from "vue-router";
-import { transformI18n } from "/@/utils/i18n";
+import { transformI18n } from "/@/plugins/i18n";
 
 const levelList = ref([]);
 const route = useRoute();
diff --git a/src/layout/components/sidebar/sidebarItem.vue b/src/layout/components/sidebar/sidebarItem.vue
index 423a33a88..df738556e 100644
--- a/src/layout/components/sidebar/sidebarItem.vue
+++ b/src/layout/components/sidebar/sidebarItem.vue
@@ -4,7 +4,7 @@ import { PropType, ref, nextTick, getCurrentInstance } from "vue";
 import { childrenType } from "../../types";
 import { useAppStoreHook } from "/@/store/modules/app";
 import Icon from "/@/components/ReIcon/src/Icon.vue";
-import { transformI18n } from "/@/utils/i18n";
+import { transformI18n } from "/@/plugins/i18n";
 import { findIconReg } from "/@/components/ReIcon";
 const instance = getCurrentInstance().appContext.app.config.globalProperties;
 const menuMode = instance.$storage.layout?.layout === "vertical";
diff --git a/src/layout/components/tag/index.vue b/src/layout/components/tag/index.vue
index 9daf2743d..5e0888c36 100644
--- a/src/layout/components/tag/index.vue
+++ b/src/layout/components/tag/index.vue
@@ -18,7 +18,7 @@ import closeOther from "/@/assets/svg/close_other.svg";
 import closeRight from "/@/assets/svg/close_right.svg";
 
 import { emitter } from "/@/utils/mitt";
-import { transformI18n } from "/@/utils/i18n";
+import { transformI18n } from "/@/plugins/i18n";
 import { storageLocal } from "/@/utils/storage";
 import { useRoute, useRouter } from "vue-router";
 import { RouteConfigs, tagsViewsType } from "../../types";
diff --git a/src/plugins/i18n/index.ts b/src/plugins/i18n/index.ts
index 1ae0de113..9dfc342f6 100644
--- a/src/plugins/i18n/index.ts
+++ b/src/plugins/i18n/index.ts
@@ -13,3 +13,27 @@ export const i18n = createI18n({
 export function usI18n(app: App) {
   app.use(i18n);
 }
+
+/**
+ * 国际化转换工具函数
+ * @param message message
+ * @param isI18n  如果true,获取对应的消息,否则返回本身
+ * @returns message
+ */
+export function transformI18n(message: string | object = "", isI18n = false) {
+  if (!message) {
+    return "";
+  }
+
+  // 处理存储动态路由的title,格式 {zh:"",en:""}
+  if (typeof message === "object") {
+    return message[i18n.global?.locale];
+  }
+
+  if (isI18n) {
+    //@ts-ignore
+    return i18n.global.tc.call(i18n.global, message);
+  } else {
+    return message;
+  }
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 995b352d4..76eb96ef6 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -27,7 +27,7 @@ import flowChartRouter from "./modules/flowchart";
 import componentsRouter from "./modules/components";
 // 动态路由
 import { getAsyncRoutes } from "/@/api/routes";
-import { transformI18n } from "../utils/i18n";
+import { transformI18n } from "/@/plugins/i18n";
 
 // https://cn.vitejs.dev/guide/features.html#glob-import
 const modulesRoutes = import.meta.glob("/src/views/*/*/*.vue");
diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
index 1561dd59d..f488d9941 100644
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -1,23 +1,13 @@
 import { storageLocal } from "/@/utils/storage";
 import { deviceDetection } from "/@/utils/deviceDetection";
-import { defineStore } from "pinia";
 import { store } from "/@/store";
+import { appType } from "./types";
+import { defineStore } from "pinia";
 import { getConfig } from "/@/config";
 
-interface AppState {
-  sidebar: {
-    opened: boolean;
-    withoutAnimation: boolean;
-    // 判断是否手动点击Hamburger
-    isClickHamburger: boolean;
-  };
-  layout: string;
-  device: string;
-}
-
 export const useAppStore = defineStore({
   id: "pure-app",
-  state: (): AppState => ({
+  state: (): appType => ({
     sidebar: {
       opened: storageLocal.getItem("sidebarStatus")
         ? !!+storageLocal.getItem("sidebarStatus")
diff --git a/src/store/modules/multiTags.ts b/src/store/modules/multiTags.ts
index a78d5eabf..21baa1120 100644
--- a/src/store/modules/multiTags.ts
+++ b/src/store/modules/multiTags.ts
@@ -1,15 +1,8 @@
 import { defineStore } from "pinia";
 import { store } from "/@/store";
 import { getConfig } from "/@/config";
-import { positionType } from "./types";
 import { storageLocal } from "/@/utils/storage";
-
-interface Itag {
-  path: string;
-  parentPath: string;
-  name: string;
-  meta: any;
-}
+import { multiType, positionType } from "./types";
 
 export const useMultiTagsStore = defineStore({
   id: "pure-multiTags",
@@ -43,16 +36,16 @@ export const useMultiTagsStore = defineStore({
     },
     handleTags<T>(
       mode: string,
-      value?: T | Itag,
+      value?: T | multiType,
       position?: positionType
-    ): any {
+    ): T {
       switch (mode) {
         case "equal":
           this.multiTags = value;
           break;
         case "push":
           {
-            const tagVal = value as Itag;
+            const tagVal = value as multiType;
             // 判断tag是否已存在:
             const tagHasExits = this.multiTags.some(tag => {
               return tag.path === tagVal?.path;
diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.ts
index 35eea646f..9e896253e 100644
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.ts
@@ -1,16 +1,11 @@
 import { defineStore } from "pinia";
 import { store } from "/@/store";
+import { setType } from "./types";
 import { getConfig } from "/@/config";
 
-interface SettingState {
-  title: string;
-  fixedHeader: boolean;
-  hiddenSideBar: boolean;
-}
-
 export const useSettingStore = defineStore({
   id: "pure-setting",
-  state: (): SettingState => ({
+  state: (): setType => ({
     title: getConfig().Title,
     fixedHeader: getConfig().FixedHeader,
     hiddenSideBar: getConfig().HiddenSideBar
diff --git a/src/store/modules/types.ts b/src/store/modules/types.ts
index a868bbf4b..710af07d9 100644
--- a/src/store/modules/types.ts
+++ b/src/store/modules/types.ts
@@ -9,3 +9,27 @@ export type positionType = {
   startIndex?: number;
   length?: number;
 };
+
+export type appType = {
+  sidebar: {
+    opened: boolean;
+    withoutAnimation: boolean;
+    // 判断是否手动点击Hamburger
+    isClickHamburger: boolean;
+  };
+  layout: string;
+  device: string;
+};
+
+export type multiType = {
+  path: string;
+  parentPath: string;
+  name: string;
+  meta: any;
+};
+
+export type setType = {
+  title: string;
+  fixedHeader: boolean;
+  hiddenSideBar: boolean;
+};
diff --git a/src/utils/i18n.ts b/src/utils/i18n.ts
deleted file mode 100644
index 62b9e0a2b..000000000
--- a/src/utils/i18n.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { i18n } from "../plugins/i18n";
-
-/**
- * 消息转换
- * @param message message
- * @param isI18n  如果true,获取对应的消息,否则返回this
- * @returns message
- */
-export function transformI18n(message = "", isI18n = false) {
-  if (!message) {
-    return "";
-  }
-  if (isI18n) {
-    //@ts-ignore
-    return i18n.global.tc.call(i18n.global, message);
-  } else {
-    return message;
-  }
-}