canrd-outside / order-erp-front · Commits

Commit 9a71029684f8d3e164700d45332f3a4e6596198d

Authored by vben
1 parent ec9478f7

chore: update deps

Inline Side-by-side
Showing 9 changed files with 34 additions and 20 deletions
package.json
  View file @9a71029
... ... @@ -34,7 +34,7 @@
34 34 "axios": "^0.21.1",
35 35 "crypto-es": "^1.2.7",
36 36 "echarts": "^5.0.2",
37   - "lodash-es": "^4.17.20",
  37 + "lodash-es": "^4.17.21",
38 38 "mockjs": "^1.1.0",
39 39 "nprogress": "^0.2.0",
40 40 "path-to-regexp": "^6.2.0",
... ... @@ -52,7 +52,7 @@
52 52 "devDependencies": {
53 53 "@commitlint/cli": "^11.0.0",
54 54 "@commitlint/config-conventional": "^11.0.0",
55   - "@iconify/json": "^1.1.305",
  55 + "@iconify/json": "^1.1.306",
56 56 "@ls-lint/ls-lint": "^1.9.2",
57 57 "@purge-icons/generated": "^0.7.0",
58 58 "@types/fs-extra": "^9.0.7",
... ... @@ -101,7 +101,7 @@
101 101 "vite": "2.0.1",
102 102 "vite-plugin-compression": "^0.2.1",
103 103 "vite-plugin-html": "^2.0.0",
104   - "vite-plugin-imagemin": "^0.2.6",
  104 + "vite-plugin-imagemin": "^0.2.7",
105 105 "vite-plugin-mock": "^2.1.4",
106 106 "vite-plugin-purge-icons": "^0.7.0",
107 107 "vite-plugin-pwa": "^0.5.2",
... ...
src/components/Application/src/AppLocalePicker.vue
  View file @9a71029
... ... @@ -65,6 +65,7 @@
65 65 }
66 66  
67 67 function handleMenuEvent(menu: DropMenu) {
  68 + if (unref(getLang) === menu.event) return;
68 69 toggleLocale(menu.event as string);
69 70 }
70 71  
... ...
src/components/Dropdown/src/Dropdown.vue
  View file @9a71029
... ... @@ -6,7 +6,11 @@
6 6 <template #overlay>
7 7 <a-menu :selectedKeys="selectedKeys">
8 8 <template v-for="item in getMenuList" :key="`${item.event}`">
9   - <a-menu-item @click="handleClickMenu(item)" :disabled="item.disabled">
  9 + <a-menu-item
  10 + v-bind="getAttr(item.event)"
  11 + @click="handleClickMenu(item)"
  12 + :disabled="item.disabled"
  13 + >
10 14 <Icon :icon="item.icon" v-if="item.icon" />
11 15 <span class="ml-1">{{ item.text }}</span>
12 16 </a-menu-item>
... ... @@ -66,7 +70,11 @@
66 70 item.onClick?.();
67 71 }
68 72  
69   - return { handleClickMenu, getMenuList };
  73 + return {
  74 + handleClickMenu,
  75 + getMenuList,
  76 + getAttr: (key: string) => ({ key }),
  77 + };
70 78 },
71 79 });
72 80 </script>
... ...
src/hooks/web/useFullContent.ts
  View file @9a71029
... ... @@ -3,6 +3,7 @@ import { computed, unref } from &#39;vue&#39;;
3 3 import { appStore } from '/@/store/modules/app';
4 4  
5 5 import router from '/@/router';
  6 +
6 7 /**
7 8 * @description: Full screen display content
8 9 */
... ...
src/router/guard/permissionGuard.ts
  View file @9a71029
... ... @@ -58,7 +58,7 @@ export function createPermissionGuard(router: Router) {
58 58 const routes = await permissionStore.buildRoutesAction();
59 59  
60 60 routes.forEach((route) => {
61   - router.addRoute(route as RouteRecordRaw);
  61 + router.addRoute((route as unknown) as RouteRecordRaw);
62 62 });
63 63  
64 64 const redirectPath = (from.query.redirect || to.path) as string;
... ...
src/router/guard/titleGuard.ts
  View file @9a71029
... ... @@ -12,7 +12,7 @@ const globSetting = useGlobSetting();
12 12 export function createTitleGuard(router: Router) {
13 13 router.afterEach(async (to) => {
14 14 const { t } = useI18n();
15   - to.name !== REDIRECT_NAME && setTitle(t(to.meta.title), globSetting.title);
  15 + to.name !== REDIRECT_NAME && setTitle(t(to.meta.title as string), globSetting.title);
16 16 return true;
17 17 });
18 18 }
... ...
src/router/index.ts
  View file @9a71029
... ... @@ -12,7 +12,7 @@ import { REDIRECT_NAME } from &#39;./constant&#39;;
12 12 // app router
13 13 const router = createRouter({
14 14 history: createWebHashHistory(),
15   - routes: basicRoutes as RouteRecordRaw[],
  15 + routes: (basicRoutes as unknown) as RouteRecordRaw[],
16 16 strict: true,
17 17 scrollBehavior: scrollBehavior,
18 18 });
... ...
src/views/sys/login/RegisterForm.vue
  View file @9a71029
... ... @@ -54,7 +54,7 @@
54 54 <script lang="ts">
55 55 import { defineComponent, reactive, ref } from 'vue';
56 56  
57   - import { Form, Input, Button, Divider, Checkbox } from 'ant-design-vue';
  57 + import { Form, Input, Button, Checkbox } from 'ant-design-vue';
58 58 import { StrengthMeter } from '/@/components/StrengthMeter';
59 59 import { CountdownInput } from '/@/components/CountDown';
60 60  
... ... @@ -68,7 +68,6 @@
68 68 Form,
69 69 FormItem: Form.Item,
70 70 Input,
71   - Divider,
72 71 InputPassword: Input.Password,
73 72 Checkbox,
74 73 StrengthMeter,
... ...
yarn.lock
  View file @9a71029
... ... @@ -1112,10 +1112,10 @@
1112 1112 dependencies:
1113 1113 cross-fetch "^3.0.6"
1114 1114  
1115   -"@iconify/json@^1.1.305":
1116   - version "1.1.305"
1117   - resolved "https://registry.npmjs.org/@iconify/json/-/json-1.1.305.tgz#a23ae3a635167ee88fb41eeab72adbc094a22657"
1118   - integrity sha512-9zV2MHpP01Qdq6CBEszb9oOahsvLY+f2D3vbtOv22tPgopz2F4Uuzl/TB6+zOuQDohCVsGJzKuU5K6gjrM4P5Q==
  1115 +"@iconify/json@^1.1.306":
  1116 + version "1.1.306"
  1117 + resolved "https://registry.npmjs.org/@iconify/json/-/json-1.1.306.tgz#cad12ad858a61689009c12d3d2df0fde6a202bb9"
  1118 + integrity sha512-OT1H/non+J8i9BBery8VhXn2JJeUMr8iKA166wsW74UWgez2HsPnkNNdtQmZxIuAyL6FuHQ+WvDi18uD9eAo0Q==
1119 1119  
1120 1120 "@intlify/core-base@9.0.0-beta.16":
1121 1121 version "9.0.0-beta.16"
... ... @@ -5933,11 +5933,16 @@ locate-path@^6.0.0:
5933 5933 dependencies:
5934 5934 p-locate "^5.0.0"
5935 5935  
5936   -lodash-es@^4.17.15, lodash-es@^4.17.20:
  5936 +lodash-es@^4.17.15:
5937 5937 version "4.17.20"
5938 5938 resolved "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.20.tgz#29f6332eefc60e849f869c264bc71126ad61e8f7"
5939 5939 integrity sha512-JD1COMZsq8maT6mnuz1UMV0jvYD0E0aUsSOdrr1/nAG3dhqQXwRRgeW0cSqH1U43INKcqxaiVIQNOUDld7gRDA==
5940 5940  
  5941 +lodash-es@^4.17.21:
  5942 + version "4.17.21"
  5943 + resolved "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
  5944 + integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
  5945 +
5941 5946 lodash._reinterpolate@^3.0.0:
5942 5947 version "3.0.0"
5943 5948 resolved "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
... ... @@ -9219,10 +9224,10 @@ vite-plugin-html@^2.0.0:
9219 9224 fs-extra "^9.1.0"
9220 9225 html-minifier-terser "^5.1.1"
9221 9226  
9222   -vite-plugin-imagemin@^0.2.6:
9223   - version "0.2.6"
9224   - resolved "https://registry.npmjs.org/vite-plugin-imagemin/-/vite-plugin-imagemin-0.2.6.tgz#e8c3f2e4dcd9c8017d5624b52868bbfa60374d0b"
9225   - integrity sha512-fnMFMQjQGYdvIEkISkVawFiyttgfjcAzBbDDVR2ThSnV4NHhCh8Y3WuduyH1kpEJLdJ4H83vP+94CkJZy7RP9Q==
  9227 +vite-plugin-imagemin@^0.2.7:
  9228 + version "0.2.7"
  9229 + resolved "https://registry.npmjs.org/vite-plugin-imagemin/-/vite-plugin-imagemin-0.2.7.tgz#74b4a5e00e9ebef241e6bcd1c7eddd61e833614c"
  9230 + integrity sha512-WRHnZ1QATluxqUNpOyFUtShLm+X+FfVoP6ZBcVqeaFU9EmmhR/Bp6TuqWP8jufRyy4lzprW8nxaRUwPD8ZOxYA==
9226 9231 dependencies:
9227 9232 "@types/imagemin" "^7.0.0"
9228 9233 "@types/imagemin-gifsicle" "^7.0.0"
... ... @@ -9232,7 +9237,7 @@ vite-plugin-imagemin@^0.2.6:
9232 9237 "@types/imagemin-svgo" "^8.0.0"
9233 9238 "@types/imagemin-webp" "^5.1.1"
9234 9239 chalk "^4.1.0"
9235   - debug "^4.3.1"
  9240 + debug "^4.3.2"
9236 9241 fs-extra "^9.1.0"
9237 9242 imagemin "^7.0.1"
9238 9243 imagemin-gifsicle "^7.0.0"
... ...