chore: typo

Vben
1 parent 15567e47
Showing 7 changed files with 19 additions and 13 deletions
package.json
src/hooks/web/useI18n.ts
src/layouts/default/tabs/index.vue
src/router/menus/index.ts
src/store/modules/tab.ts
vite.config.ts
yarn.lock
@@ -97,7 +97,7 @@
     "stylelint-order": "^4.1.0",
     "ts-node": "^9.1.1",
     "typescript": "4.1.5",
-    "vite": "2.0.4",
+    "vite": "^2.0.4",
     "vite-plugin-compression": "^0.2.2",
     "vite-plugin-html": "^2.0.2",
     "vite-plugin-imagemin": "^0.2.8",
@@ -40,7 +40,7 @@ export function useI18n(
   const tFn: I18nGlobalTranslation = (key: string, ...arg: any[]) => {
     if (!key) return '';
-    if (!key.includes('.')) return key;
+    if (!key.includes('.') && !namespace) return key;
     return t(getKey(namespace, key), ...(arg as I18nTranslationRestParameters));
   };
   return {
@@ -91,7 +91,7 @@
         const isHide = !hideTab ? null : currentActiveMenu;
         const p = isHide || fullPath || path;
         if (activeKeyRef.value !== p) {
-          activeKeyRef.value = p;
+          activeKeyRef.value = p as string;
         }
         if (isHide) {
@@ -99,7 +99,7 @@ function basicFilter(routes: RouteRecordNormalized[]) {
     });
     if (!matchRoute) return false;
-    menu.icon = menu.icon || matchRoute.meta.icon;
+    menu.icon = (menu.icon || matchRoute.meta.icon) as string;
     menu.meta = matchRoute.meta;
     return true;
   };
@@ -124,7 +124,7 @@ class Tab extends VuexModule {
     const { path, fullPath, params, query } = route;
     let updateIndex = -1;
-    // 已经存在的页面，不重复添加tab
+    // Existing pages, do not add tabs repeatedly
     const hasTab = this.tabsState.some((tab, index) => {
       updateIndex = index;
       return (tab.fullPath || tab.path) === (fullPath || path);
@@ -91,7 +91,13 @@ export default ({ command, mode }: ConfigEnv): UserConfig =&gt; {
     optimizeDeps: {
       // @iconify/iconify: The dependency is dynamically and virtually loaded by @purge-icons/generated, so it needs to be specified explicitly
-      include: ['@iconify/iconify'],
+      include: [
+        '@iconify/iconify',
+        'ant-design-vue/es/locale/zh_CN',
+        'moment/dist/locale/zh-cn',
+        'ant-design-vue/es/locale/en_US',
+        'moment/dist/locale/eu',
+      ],
       exclude: ['vue-demi'],
     },
   };
@@ -6985,9 +6985,9 @@ postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.
     supports-color "^6.1.0"
 postcss@^8.2.1:
-  version "8.2.4"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-8.2.4.tgz#20a98a39cf303d15129c2865a9ec37eda0031d04"
-  integrity sha512-kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg==
+  version "8.2.6"
+  resolved "https://registry.npmjs.org/postcss/-/postcss-8.2.6.tgz#5d69a974543b45f87e464bc4c3e392a97d6be9fe"
+  integrity sha512-xpB8qYxgPuly166AGlpRjUdEYtmOWx2iCwGmrv4vqZL9YPVviDVPZPRXxnXr6xPZOdxQ9lp3ZBFCRgWJ7LE3Sg==
   dependencies:
     colorette "^1.2.1"
     nanoid "^3.1.20"
@@ -7518,9 +7518,9 @@ rollup@^2.25.0:
     fsevents "~2.1.2"
 rollup@^2.38.5:
-  version "2.38.5"
-  resolved "https://registry.npmjs.org/rollup/-/rollup-2.38.5.tgz#be41ad4fe0c103a8794377afceb5f22b8f603d6a"
-  integrity sha512-VoWt8DysFGDVRGWuHTqZzT02J0ASgjVq/hPs9QcBOGMd7B+jfTr/iqMVEyOi901rE3xq+Deq66GzIT1yt7sGwQ==
+  version "2.40.0"
+  resolved "https://registry.npmjs.org/rollup/-/rollup-2.40.0.tgz#efc218eaede7ab590954df50f96195188999c304"
+  integrity sha512-WiOGAPbXoHu+TOz6hyYUxIksOwsY/21TRWoO593jgYt8mvYafYqQl+axaA8y1z2HFazNUUrsMSjahV2A6/2R9A==
   optionalDependencies:
     fsevents "~2.3.1"
@@ -8982,7 +8982,7 @@ vite-plugin-windicss@0.6.2:
     "@windicss/plugin-utils" "0.6.2"
     windicss "^2.2.0"
-vite@2.0.4:
+vite@^2.0.4:
   version "2.0.4"
   resolved "https://registry.npmjs.org/vite/-/vite-2.0.4.tgz#063532a4139b59a067297d8ebb5960d450907a09"
   integrity sha512-+PP89D7AKXFE4gps8c5+4eP5yXTh5qCogjdYX7iSsIxbLZAa26JoGSq6OLk0qdb/fqDh7gtJqGiLbG2V6NvkKQ==