From 1154c0b9f877e6cab68cbcfd9ce185d7abf507af Mon Sep 17 00:00:00 2001
From: xiaoxian521 <1923740402@qq.com>
Date: Sun, 4 Dec 2022 17:58:02 +0800
Subject: [PATCH] release: update `3.9.3`

---
 mock/asyncRoutes.ts                           |  4 +---
 package.json                                  |  6 ++---
 pnpm-lock.yaml                                | 16 +++++++-------
 public/serverConfig.json                      |  2 +-
 src/components/ReIcon/src/offlineIcon.ts      | 14 ++++++++++++
 src/layout/components/setting/index.vue       | 32 ++++++++++++++++++---------
 src/layout/components/sidebar/horizontal.vue  |  8 ++++++-
 src/layout/components/sidebar/mixNav.vue      |  9 +++++++-
 src/layout/components/sidebar/sidebarItem.vue |  2 +-
 src/layout/components/sidebar/vertical.vue    | 11 ++++++++-
 src/layout/index.vue                          |  2 ++
 src/layout/types.ts                           |  3 +--
 src/router/modules/error.ts                   |  3 +--
 src/router/modules/home.ts                    |  3 +--
 src/router/modules/remaining.ts               |  3 +--
 src/router/utils.ts                           |  4 ++--
 16 files changed, 82 insertions(+), 40 deletions(-)
 create mode 100644 src/components/ReIcon/src/offlineIcon.ts

diff --git a/mock/asyncRoutes.ts b/mock/asyncRoutes.ts
index b094e21..9335735 100644
--- a/mock/asyncRoutes.ts
+++ b/mock/asyncRoutes.ts
@@ -1,8 +1,6 @@
 // 模拟后端动态生成路由
 import { MockMethod } from "vite-plugin-mock";
 
-import Lollipop from "@iconify-icons/ep/lollipop";
-
 /**
  * roles：页面级别权限，这里模拟二种 "admin"、"common"
  * admin：管理员角色
@@ -13,7 +11,7 @@ const permissionRouter = {
   path: "/permission",
   meta: {
     title: "menus.permission",
-    icon: Lollipop,
+    icon: "lollipop",
     rank: 10
   },
   children: [
diff --git a/package.json b/package.json
index 3dac2e2..3d4f5bc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pure-admin-thin",
-  "version": "3.9.2",
+  "version": "3.9.3",
   "private": true,
   "scripts": {
     "dev": "NODE_OPTIONS=--max-old-space-size=4096 vite",
@@ -31,8 +31,8 @@
   "dependencies": {
     "@ctrl/tinycolor": "^3.4.1",
     "@pureadmin/descriptions": "^1.1.0",
-    "@pureadmin/table": "^1.8.2",
-    "@pureadmin/utils": "^1.7.2",
+    "@pureadmin/table": "^1.8.3",
+    "@pureadmin/utils": "^1.7.4",
     "@vueuse/core": "^9.6.0",
     "@vueuse/motion": "2.0.0-beta.12",
     "animate.css": "^4.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cda1fbd..6487c98 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,9 +9,9 @@ specifiers:
   '@iconify/vue': ^4.0.0
   '@intlify/vite-plugin-vue-i18n': ^6.0.3
   '@pureadmin/descriptions': ^1.1.0
-  '@pureadmin/table': ^1.8.2
+  '@pureadmin/table': ^1.8.3
   '@pureadmin/theme': ^2.4.0
-  '@pureadmin/utils': ^1.7.2
+  '@pureadmin/utils': ^1.7.4
   '@types/element-resize-detector': 1.1.3
   '@types/js-cookie': ^3.0.1
   '@types/lodash': ^4.14.180
@@ -95,8 +95,8 @@ specifiers:
 dependencies:
   '@ctrl/tinycolor': 3.4.1
   '@pureadmin/descriptions': 1.1.1_element-plus@2.2.26
-  '@pureadmin/table': 1.8.2_element-plus@2.2.26
-  '@pureadmin/utils': 1.7.2_aotapuqn7htzdjltsyimavekky
+  '@pureadmin/table': 1.8.3_element-plus@2.2.26
+  '@pureadmin/utils': 1.7.4_aotapuqn7htzdjltsyimavekky
   '@vueuse/core': 9.6.0_vue@3.2.45
   '@vueuse/motion': 2.0.0-beta.12_vue@3.2.45
   animate.css: 4.1.1
@@ -920,8 +920,8 @@ packages:
       vue: 3.2.45
     dev: false
 
-  /@pureadmin/table/1.8.2_element-plus@2.2.26:
-    resolution: {integrity: sha512-FGh1aOfgQtX16pCnP+bxg49TetcZDhdykIue0m5d8NIj6zkvJP53JU+DkUpvqvKmUiMsvIwme6e17BLZMmMiOw==}
+  /@pureadmin/table/1.8.3_element-plus@2.2.26:
+    resolution: {integrity: sha512-M+I+CDu74s/ffNybbDg0rHhiMHTdkgVIaksfmmrEwjuLB2nEaz7R0tob2qC5rKE96U2Z246meDHBidyQNx2z9w==}
     peerDependencies:
       element-plus: ^2.0.0
     dependencies:
@@ -937,8 +937,8 @@ packages:
       string-hash: 1.1.3
     dev: true
 
-  /@pureadmin/utils/1.7.2_aotapuqn7htzdjltsyimavekky:
-    resolution: {integrity: sha512-L8tmogs9HCX6nuga1g79DcZr3KXNoWnIFcyP2z4zpmUmdBBAmMpXXz3Z+emI6HELmZu8DFx+v1MfKxccgsODRQ==}
+  /@pureadmin/utils/1.7.4_aotapuqn7htzdjltsyimavekky:
+    resolution: {integrity: sha512-uJNHcb2sO7R2avALf+v4TGyuZtJix0Wpw/kMb6eO4C003ZQImuGGi9WlxHaOlESrMyFHZ1AjWm5AqLwJLnpVlw==}
     peerDependencies:
       dayjs: '*'
       echarts: '*'
diff --git a/public/serverConfig.json b/public/serverConfig.json
index 8954b56..fdbbf43 100644
--- a/public/serverConfig.json
+++ b/public/serverConfig.json
@@ -1,5 +1,5 @@
 {
-  "Version": "3.9.2",
+  "Version": "3.9.3",
   "Title": "PureAdmin",
   "FixedHeader": true,
   "HiddenSideBar": false,
diff --git a/src/components/ReIcon/src/offlineIcon.ts b/src/components/ReIcon/src/offlineIcon.ts
new file mode 100644
index 0000000..bb0e020
--- /dev/null
+++ b/src/components/ReIcon/src/offlineIcon.ts
@@ -0,0 +1,14 @@
+import { addIcon } from "@iconify/vue/dist/offline";
+
+/**
+ * 这里存放本地图标，在 src/layout/index.vue 文件中加载，避免在首启动加载
+ */
+
+// 本地菜单图标，后端在路由的icon中返回对应的图标字符串并且前端在此处使用addIcon添加即可渲染菜单图标
+import HomeFilled from "@iconify-icons/ep/home-filled";
+import InformationLine from "@iconify-icons/ri/information-line";
+import Lollipop from "@iconify-icons/ep/lollipop";
+
+addIcon("homeFilled", HomeFilled);
+addIcon("informationLine", InformationLine);
+addIcon("lollipop", Lollipop);
diff --git a/src/layout/components/setting/index.vue b/src/layout/components/setting/index.vue
index ba2d84d..69af67a 100644
--- a/src/layout/components/setting/index.vue
+++ b/src/layout/components/setting/index.vue
@@ -1,5 +1,14 @@
 <script setup lang="ts">
 import {
+  ref,
+  unref,
+  watch,
+  reactive,
+  computed,
+  nextTick,
+  onBeforeMount
+} from "vue";
+import {
   useDark,
   debounce,
   useGlobal,
@@ -17,7 +26,6 @@ import { useNav } from "@/layout/hooks/useNav";
 import { useAppStoreHook } from "@/store/modules/app";
 import { toggleTheme } from "@pureadmin/theme/dist/browser-utils";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
-import { ref, unref, watch, reactive, computed, nextTick } from "vue";
 import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
 
 import dayIcon from "@/assets/svg/day.svg?component";
@@ -189,16 +197,6 @@ function setLayoutModel(layout: string) {
   useAppStoreHook().setLayout(layout);
 }
 
-/* 初始化项目配置 */
-nextTick(() => {
-  settings.greyVal &&
-    document.querySelector("html")?.setAttribute("class", "html-grey");
-  settings.weakVal &&
-    document.querySelector("html")?.setAttribute("class", "html-weakness");
-  settings.tabsVal && tagsChange();
-  dataThemeChange();
-});
-
 watch($storage, ({ layout }) => {
   switch (layout["layout"]) {
     case "vertical":
@@ -218,6 +216,18 @@ watch($storage, ({ layout }) => {
       break;
   }
 });
+
+onBeforeMount(() => {
+  dataThemeChange();
+  /* 初始化项目配置 */
+  nextTick(() => {
+    settings.greyVal &&
+      document.querySelector("html")?.setAttribute("class", "html-grey");
+    settings.weakVal &&
+      document.querySelector("html")?.setAttribute("class", "html-weakness");
+    settings.tabsVal && tagsChange();
+  });
+});
 </script>
 
 <template>
diff --git a/src/layout/components/sidebar/horizontal.vue b/src/layout/components/sidebar/horizontal.vue
index 796e382..0e16c1a 100644
--- a/src/layout/components/sidebar/horizontal.vue
+++ b/src/layout/components/sidebar/horizontal.vue
@@ -41,7 +41,10 @@ watch(
 </script>
 
 <template>
-  <div class="horizontal-header">
+  <div
+    v-loading="usePermissionStoreHook().wholeMenus.length === 0"
+    class="horizontal-header"
+  >
     <div class="horizontal-header-left" @click="backHome">
       <FontIcon icon="team-iconlogo" svg style="width: 35px; height: 35px" />
       <h4>{{ title }}</h4>
@@ -129,6 +132,9 @@ watch(
 </template>
 
 <style lang="scss" scoped>
+:deep(.el-loading-mask) {
+  opacity: 0.45;
+}
 .translation {
   ::v-deep(.el-dropdown-menu__item) {
     padding: 5px 40px;
diff --git a/src/layout/components/sidebar/mixNav.vue b/src/layout/components/sidebar/mixNav.vue
index 5e7b364..eb93c4f 100644
--- a/src/layout/components/sidebar/mixNav.vue
+++ b/src/layout/components/sidebar/mixNav.vue
@@ -58,7 +58,11 @@ watch(
 </script>
 
 <template>
-  <div v-if="device !== 'mobile'" class="horizontal-header">
+  <div
+    v-if="device !== 'mobile'"
+    class="horizontal-header"
+    v-loading="usePermissionStoreHook().wholeMenus.length === 0"
+  >
     <el-menu
       router
       ref="menuRef"
@@ -161,6 +165,9 @@ watch(
 </template>
 
 <style lang="scss" scoped>
+:deep(.el-loading-mask) {
+  opacity: 0.45;
+}
 .translation {
   ::v-deep(.el-dropdown-menu__item) {
     padding: 5px 40px;
diff --git a/src/layout/components/sidebar/sidebarItem.vue b/src/layout/components/sidebar/sidebarItem.vue
index 9c1be77..a84a63c 100644
--- a/src/layout/components/sidebar/sidebarItem.vue
+++ b/src/layout/components/sidebar/sidebarItem.vue
@@ -203,7 +203,7 @@ function resolvePath(routePath) {
             placement="top"
             :effect="tooltipEffect"
             :offset="-10"
-            :disabled="!isCollapse && !onlyOneChild.showTooltip"
+            :disabled="!onlyOneChild.showTooltip"
           >
             <template #content>
               {{ transformI18n(onlyOneChild.meta.title) }}
diff --git a/src/layout/components/sidebar/vertical.vue b/src/layout/components/sidebar/vertical.vue
index 6973b1c..6a94524 100644
--- a/src/layout/components/sidebar/vertical.vue
+++ b/src/layout/components/sidebar/vertical.vue
@@ -59,7 +59,10 @@ watch(
 </script>
 
 <template>
-  <div :class="['sidebar-container', showLogo ? 'has-logo' : '']">
+  <div
+    v-loading="menuData.length === 0"
+    :class="['sidebar-container', showLogo ? 'has-logo' : '']"
+  >
     <Logo v-if="showLogo" :collapse="isCollapse" />
     <el-scrollbar
       wrap-class="scrollbar-wrapper"
@@ -91,3 +94,9 @@ watch(
     />
   </div>
 </template>
+
+<style scoped>
+:deep(.el-loading-mask) {
+  opacity: 0.45;
+}
+</style>
diff --git a/src/layout/index.vue b/src/layout/index.vue
index eadf079..3ff7dc5 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import "animate.css";
+// 引入 src/components/ReIcon/src/offlineIcon.ts 文件中所有使用addIcon添加过的本地图标
+import "@/components/ReIcon/src/offlineIcon";
 // vxe-table的所有icon不支持component模式，间接依赖了font-awesome
 // import "font-awesome/css/font-awesome.min.css";
 import { setType } from "./types";
diff --git a/src/layout/types.ts b/src/layout/types.ts
index 61b00ff..8757a65 100644
--- a/src/layout/types.ts
+++ b/src/layout/types.ts
@@ -1,5 +1,4 @@
 import type { IconifyIcon } from "@iconify/vue";
-import HomeFilled from "@iconify-icons/ep/home-filled";
 
 export const routerArrays: Array<RouteConfigs> = [
   {
@@ -7,7 +6,7 @@ export const routerArrays: Array<RouteConfigs> = [
     parentPath: "/",
     meta: {
       title: "menus.hshome",
-      icon: HomeFilled
+      icon: "homeFilled"
     }
   }
 ];
diff --git a/src/router/modules/error.ts b/src/router/modules/error.ts
index 9bc066c..311dd8d 100644
--- a/src/router/modules/error.ts
+++ b/src/router/modules/error.ts
@@ -1,11 +1,10 @@
 import { $t } from "@/plugins/i18n";
-import InformationLine from "@iconify-icons/ri/information-line";
 
 export default {
   path: "/error",
   redirect: "/error/403",
   meta: {
-    icon: InformationLine,
+    icon: "informationLine",
     title: $t("menus.hsabnormal"),
     rank: 9
   },
diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts
index e229d77..c95bfb3 100644
--- a/src/router/modules/home.ts
+++ b/src/router/modules/home.ts
@@ -1,6 +1,5 @@
 import { $t } from "@/plugins/i18n";
 const Layout = () => import("@/layout/index.vue");
-import HomeFilled from "@iconify-icons/ep/home-filled";
 
 export default {
   path: "/",
@@ -8,7 +7,7 @@ export default {
   component: Layout,
   redirect: "/welcome",
   meta: {
-    icon: HomeFilled,
+    icon: "homeFilled",
     title: $t("menus.hshome"),
     rank: 0
   },
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index c8bd3bc..c5510e2 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -1,6 +1,5 @@
 import { $t } from "@/plugins/i18n";
 const Layout = () => import("@/layout/index.vue");
-import HomeFilled from "@iconify-icons/ep/home-filled";
 
 export default [
   {
@@ -17,7 +16,7 @@ export default [
     path: "/redirect",
     component: Layout,
     meta: {
-      icon: HomeFilled,
+      icon: "homeFilled",
       title: $t("menus.hshome"),
       showLink: false,
       rank: 102
diff --git a/src/router/utils.ts b/src/router/utils.ts
index 127b738..7590db5 100644
--- a/src/router/utils.ts
+++ b/src/router/utils.ts
@@ -198,7 +198,7 @@ function initRouter() {
     } else {
       return new Promise(resolve => {
         getAsyncRoutes().then(({ data }) => {
-          handleAsyncRoutes(data);
+          handleAsyncRoutes(cloneDeep(data));
           storageSession.setItem(key, data);
           resolve(router);
         });
@@ -207,7 +207,7 @@ function initRouter() {
   } else {
     return new Promise(resolve => {
       getAsyncRoutes().then(({ data }) => {
-        handleAsyncRoutes(data);
+        handleAsyncRoutes(cloneDeep(data));
         resolve(router);
       });
     });