From 9a71029684f8d3e164700d45332f3a4e6596198d Mon Sep 17 00:00:00 2001
From: vben <anncwb@126.com>
Date: Sun, 21 Feb 2021 21:42:56 +0800
Subject: [PATCH] chore: update deps

---
 package.json                                  |  6 ++---
 .../Application/src/AppLocalePicker.vue       |  1 +
 src/components/Dropdown/src/Dropdown.vue      | 12 +++++++--
 src/hooks/web/useFullContent.ts               |  1 +
 src/router/guard/permissionGuard.ts           |  2 +-
 src/router/guard/titleGuard.ts                |  2 +-
 src/router/index.ts                           |  2 +-
 src/views/sys/login/RegisterForm.vue          |  3 +--
 yarn.lock                                     | 25 +++++++++++--------
 9 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 93510ee9..bd6f100f 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "axios": "^0.21.1",
     "crypto-es": "^1.2.7",
     "echarts": "^5.0.2",
-    "lodash-es": "^4.17.20",
+    "lodash-es": "^4.17.21",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
     "path-to-regexp": "^6.2.0",
@@ -52,7 +52,7 @@
   "devDependencies": {
     "@commitlint/cli": "^11.0.0",
     "@commitlint/config-conventional": "^11.0.0",
-    "@iconify/json": "^1.1.305",
+    "@iconify/json": "^1.1.306",
     "@ls-lint/ls-lint": "^1.9.2",
     "@purge-icons/generated": "^0.7.0",
     "@types/fs-extra": "^9.0.7",
@@ -101,7 +101,7 @@
     "vite": "2.0.1",
     "vite-plugin-compression": "^0.2.1",
     "vite-plugin-html": "^2.0.0",
-    "vite-plugin-imagemin": "^0.2.6",
+    "vite-plugin-imagemin": "^0.2.7",
     "vite-plugin-mock": "^2.1.4",
     "vite-plugin-purge-icons": "^0.7.0",
     "vite-plugin-pwa": "^0.5.2",
diff --git a/src/components/Application/src/AppLocalePicker.vue b/src/components/Application/src/AppLocalePicker.vue
index 22668067..c7f69156 100644
--- a/src/components/Application/src/AppLocalePicker.vue
+++ b/src/components/Application/src/AppLocalePicker.vue
@@ -65,6 +65,7 @@
       }
 
       function handleMenuEvent(menu: DropMenu) {
+        if (unref(getLang) === menu.event) return;
         toggleLocale(menu.event as string);
       }
 
diff --git a/src/components/Dropdown/src/Dropdown.vue b/src/components/Dropdown/src/Dropdown.vue
index 941fe866..32f664e7 100644
--- a/src/components/Dropdown/src/Dropdown.vue
+++ b/src/components/Dropdown/src/Dropdown.vue
@@ -6,7 +6,11 @@
     <template #overlay>
       <a-menu :selectedKeys="selectedKeys">
         <template v-for="item in getMenuList" :key="`${item.event}`">
-          <a-menu-item @click="handleClickMenu(item)" :disabled="item.disabled">
+          <a-menu-item
+            v-bind="getAttr(item.event)"
+            @click="handleClickMenu(item)"
+            :disabled="item.disabled"
+          >
             <Icon :icon="item.icon" v-if="item.icon" />
             <span class="ml-1">{{ item.text }}</span>
           </a-menu-item>
@@ -66,7 +70,11 @@
         item.onClick?.();
       }
 
-      return { handleClickMenu, getMenuList };
+      return {
+        handleClickMenu,
+        getMenuList,
+        getAttr: (key: string) => ({ key }),
+      };
     },
   });
 </script>
diff --git a/src/hooks/web/useFullContent.ts b/src/hooks/web/useFullContent.ts
index 44bd5725..f0487cec 100644
--- a/src/hooks/web/useFullContent.ts
+++ b/src/hooks/web/useFullContent.ts
@@ -3,6 +3,7 @@ import { computed, unref } from 'vue';
 import { appStore } from '/@/store/modules/app';
 
 import router from '/@/router';
+
 /**
  * @description: Full screen display content
  */
diff --git a/src/router/guard/permissionGuard.ts b/src/router/guard/permissionGuard.ts
index 80d77573..3fd033c0 100644
--- a/src/router/guard/permissionGuard.ts
+++ b/src/router/guard/permissionGuard.ts
@@ -58,7 +58,7 @@ export function createPermissionGuard(router: Router) {
     const routes = await permissionStore.buildRoutesAction();
 
     routes.forEach((route) => {
-      router.addRoute(route as RouteRecordRaw);
+      router.addRoute((route as unknown) as RouteRecordRaw);
     });
 
     const redirectPath = (from.query.redirect || to.path) as string;
diff --git a/src/router/guard/titleGuard.ts b/src/router/guard/titleGuard.ts
index f9eaa309..997f53f2 100644
--- a/src/router/guard/titleGuard.ts
+++ b/src/router/guard/titleGuard.ts
@@ -12,7 +12,7 @@ const globSetting = useGlobSetting();
 export function createTitleGuard(router: Router) {
   router.afterEach(async (to) => {
     const { t } = useI18n();
-    to.name !== REDIRECT_NAME && setTitle(t(to.meta.title), globSetting.title);
+    to.name !== REDIRECT_NAME && setTitle(t(to.meta.title as string), globSetting.title);
     return true;
   });
 }
diff --git a/src/router/index.ts b/src/router/index.ts
index 8525c3be..432d8bc9 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -12,7 +12,7 @@ import { REDIRECT_NAME } from './constant';
 // app router
 const router = createRouter({
   history: createWebHashHistory(),
-  routes: basicRoutes as RouteRecordRaw[],
+  routes: (basicRoutes as unknown) as RouteRecordRaw[],
   strict: true,
   scrollBehavior: scrollBehavior,
 });
diff --git a/src/views/sys/login/RegisterForm.vue b/src/views/sys/login/RegisterForm.vue
index eab9acbc..a13ad597 100644
--- a/src/views/sys/login/RegisterForm.vue
+++ b/src/views/sys/login/RegisterForm.vue
@@ -54,7 +54,7 @@
 <script lang="ts">
   import { defineComponent, reactive, ref } from 'vue';
 
-  import { Form, Input, Button, Divider, Checkbox } from 'ant-design-vue';
+  import { Form, Input, Button, Checkbox } from 'ant-design-vue';
   import { StrengthMeter } from '/@/components/StrengthMeter';
   import { CountdownInput } from '/@/components/CountDown';
 
@@ -68,7 +68,6 @@
       Form,
       FormItem: Form.Item,
       Input,
-      Divider,
       InputPassword: Input.Password,
       Checkbox,
       StrengthMeter,
diff --git a/yarn.lock b/yarn.lock
index 6e701bb6..aa33a428 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1112,10 +1112,10 @@
   dependencies:
     cross-fetch "^3.0.6"
 
-"@iconify/json@^1.1.305":
-  version "1.1.305"
-  resolved "https://registry.npmjs.org/@iconify/json/-/json-1.1.305.tgz#a23ae3a635167ee88fb41eeab72adbc094a22657"
-  integrity sha512-9zV2MHpP01Qdq6CBEszb9oOahsvLY+f2D3vbtOv22tPgopz2F4Uuzl/TB6+zOuQDohCVsGJzKuU5K6gjrM4P5Q==
+"@iconify/json@^1.1.306":
+  version "1.1.306"
+  resolved "https://registry.npmjs.org/@iconify/json/-/json-1.1.306.tgz#cad12ad858a61689009c12d3d2df0fde6a202bb9"
+  integrity sha512-OT1H/non+J8i9BBery8VhXn2JJeUMr8iKA166wsW74UWgez2HsPnkNNdtQmZxIuAyL6FuHQ+WvDi18uD9eAo0Q==
 
 "@intlify/core-base@9.0.0-beta.16":
   version "9.0.0-beta.16"
@@ -5933,11 +5933,16 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
-lodash-es@^4.17.15, lodash-es@^4.17.20:
+lodash-es@^4.17.15:
   version "4.17.20"
   resolved "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.20.tgz#29f6332eefc60e849f869c264bc71126ad61e8f7"
   integrity sha512-JD1COMZsq8maT6mnuz1UMV0jvYD0E0aUsSOdrr1/nAG3dhqQXwRRgeW0cSqH1U43INKcqxaiVIQNOUDld7gRDA==
 
+lodash-es@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
+  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
+
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -9219,10 +9224,10 @@ vite-plugin-html@^2.0.0:
     fs-extra "^9.1.0"
     html-minifier-terser "^5.1.1"
 
-vite-plugin-imagemin@^0.2.6:
-  version "0.2.6"
-  resolved "https://registry.npmjs.org/vite-plugin-imagemin/-/vite-plugin-imagemin-0.2.6.tgz#e8c3f2e4dcd9c8017d5624b52868bbfa60374d0b"
-  integrity sha512-fnMFMQjQGYdvIEkISkVawFiyttgfjcAzBbDDVR2ThSnV4NHhCh8Y3WuduyH1kpEJLdJ4H83vP+94CkJZy7RP9Q==
+vite-plugin-imagemin@^0.2.7:
+  version "0.2.7"
+  resolved "https://registry.npmjs.org/vite-plugin-imagemin/-/vite-plugin-imagemin-0.2.7.tgz#74b4a5e00e9ebef241e6bcd1c7eddd61e833614c"
+  integrity sha512-WRHnZ1QATluxqUNpOyFUtShLm+X+FfVoP6ZBcVqeaFU9EmmhR/Bp6TuqWP8jufRyy4lzprW8nxaRUwPD8ZOxYA==
   dependencies:
     "@types/imagemin" "^7.0.0"
     "@types/imagemin-gifsicle" "^7.0.0"
@@ -9232,7 +9237,7 @@ vite-plugin-imagemin@^0.2.6:
     "@types/imagemin-svgo" "^8.0.0"
     "@types/imagemin-webp" "^5.1.1"
     chalk "^4.1.0"
-    debug "^4.3.1"
+    debug "^4.3.2"
     fs-extra "^9.1.0"
     imagemin "^7.0.1"
     imagemin-gifsicle "^7.0.0"
-- 
GitLab