From 361e4faddac146fef9824286510f5781c46a8fa8 Mon Sep 17 00:00:00 2001 From: shizhong <124974919@qq.com> Date: Mon, 25 Sep 2023 15:25:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=84=E7=90=86?= =?UTF-8?q?=E9=A1=B6=E7=BA=A7=E9=9D=9E=E7=9B=AE=E5=BD=95=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E7=9A=84=E7=BB=84=E4=BB=B6=E5=90=8D=E7=A7=B0=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/routerHelper.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/utils/routerHelper.ts b/src/utils/routerHelper.ts index a6825653..d9fe42aa 100644 --- a/src/utils/routerHelper.ts +++ b/src/utils/routerHelper.ts @@ -93,7 +93,10 @@ export const generateRoute = (routes: AppCustomRouteRecordRaw[]): AppRouteRecord meta.alwaysShow = true const childrenData: AppRouteRecordRaw = { path: '', - name: toCamelCase(route.path, true), + name: + route.componentName && route.componentName.length > 0 + ? route.componentName + : toCamelCase(route.path, true), redirect: route.redirect, meta: meta } From 73b2030c7f9ab8785fe35275ae734a966114cb62 Mon Sep 17 00:00:00 2001 From: xingyu Date: Fri, 13 Oct 2023 10:31:36 +0800 Subject: [PATCH 2/4] chore: update deps --- package.json | 60 ++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index 22334907..923ad741 100644 --- a/package.json +++ b/package.json @@ -31,24 +31,24 @@ "@form-create/element-ui": "^3.1.24", "@iconify/iconify": "^3.1.1", "@videojs-player/vue": "^1.0.0", - "@vueuse/core": "^10.4.1", + "@vueuse/core": "^10.5.0", "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.10", "@zxcvbn-ts/core": "^3.0.4", "animate.css": "^4.1.1", - "axios": "^1.5.0", + "axios": "^1.5.1", "benz-amr-recorder": "^1.1.5", "bpmn-js-token-simulation": "^0.10.0", "camunda-bpmn-moddle": "^7.0.1", "cropperjs": "^1.6.1", "crypto-js": "^4.1.1", "dayjs": "^1.11.10", - "diagram-js": "^12.3.0", + "diagram-js": "^12.4.0", "echarts": "^5.4.3", "echarts-wordcloud": "^2.1.0", "element-plus": "2.3.14", - "fast-xml-parser": "^4.3.0", - "highlight.js": "^11.8.0", + "fast-xml-parser": "^4.3.2", + "highlight.js": "^11.9.0", "intro.js": "^7.2.0", "jsencrypt": "^3.3.2", "lodash-es": "^4.17.21", @@ -63,7 +63,7 @@ "video.js": "^7.21.5", "vue": "^3.3.4", "vue-dompurify-html": "^4.1.4", - "vue-i18n": "^9.4.1", + "vue-i18n": "^9.5.0", "vue-router": "^4.2.5", "vue-types": "^5.1.1", "vuedraggable": "^4.1.0", @@ -71,54 +71,54 @@ "xml-js": "^1.6.11" }, "devDependencies": { - "@commitlint/cli": "^17.7.1", + "@commitlint/cli": "^17.7.2", "@commitlint/config-conventional": "^17.7.0", - "@iconify/json": "^2.2.119", - "@intlify/unplugin-vue-i18n": "^1.2.0", + "@iconify/json": "^2.2.128", + "@intlify/unplugin-vue-i18n": "^1.4.0", "@purge-icons/generated": "^0.9.0", - "@types/intro.js": "^5.1.1", + "@types/intro.js": "^5.1.2", "@types/lodash-es": "^4.17.9", - "@types/node": "^20.6.0", - "@types/nprogress": "^0.2.0", + "@types/node": "^20.8.5", + "@types/nprogress": "^0.2.1", "@types/qrcode": "^1.5.2", "@types/qs": "^6.9.8", - "@typescript-eslint/eslint-plugin": "^6.7.2", - "@typescript-eslint/parser": "^6.7.2", - "@unocss/transformer-variant-group": "^0.56.1", - "@unocss/eslint-config": "^0.56.1", + "@typescript-eslint/eslint-plugin": "^6.7.5", + "@typescript-eslint/parser": "^6.7.5", + "@unocss/transformer-variant-group": "^0.56.5", + "@unocss/eslint-config": "^0.56.5", "@vitejs/plugin-legacy": "^4.1.1", - "@vitejs/plugin-vue": "^4.3.4", + "@vitejs/plugin-vue": "^4.4.0", "@vitejs/plugin-vue-jsx": "^3.0.2", - "@vue-macros/volar": "^0.14.3", + "@vue-macros/volar": "^0.17.0", "autoprefixer": "^10.4.16", "bpmn-js": "8.9.0", "bpmn-js-properties-panel": "0.46.0", "consola": "^3.2.3", - "eslint": "^8.49.0", + "eslint": "^8.51.0", "eslint-config-prettier": "^9.0.0", - "eslint-define-config": "^1.23.0", - "eslint-plugin-prettier": "^5.0.0", + "eslint-define-config": "^1.24.1", + "eslint-plugin-prettier": "^5.0.1", "eslint-plugin-vue": "^9.17.0", "lint-staged": "^14.0.1", - "postcss": "^8.4.30", + "postcss": "^8.4.31", "postcss-html": "^1.5.0", - "postcss-scss": "^4.0.8", + "postcss-scss": "^4.0.9", "prettier": "^3.0.3", - "rimraf": "^5.0.1", + "rimraf": "^5.0.5", "rollup": "^3.29.2", - "sass": "^1.68.0", + "sass": "^1.69.3", "stylelint": "^15.10.3", "stylelint-config-html": "^1.1.0", "stylelint-config-recommended": "^13.0.0", "stylelint-config-standard": "^34.0.0", "stylelint-order": "^6.0.3", - "terser": "^5.20.0", + "terser": "^5.21.0", "typescript": "5.2.2", - "unocss": "^0.56.1", + "unocss": "^0.56.5", "unplugin-auto-import": "^0.16.6", "unplugin-element-plus": "^0.8.0", "unplugin-vue-components": "^0.25.2", - "vite": "4.4.9", + "vite": "4.4.11", "vite-plugin-compression": "^0.5.1", "vite-plugin-ejs": "^1.6.4", "vite-plugin-eslint": "^1.8.1", @@ -126,8 +126,8 @@ "vite-plugin-purge-icons": "^0.9.2", "vite-plugin-svg-icons": "^2.0.1", "vite-plugin-top-level-await": "^1.3.1", - "vue-eslint-parser": "^9.3.1", - "vue-tsc": "^1.8.13" + "vue-eslint-parser": "^9.3.2", + "vue-tsc": "^1.8.19" }, "license": "MIT", "repository": { From e04ca7aac7a651d444753ed3f44e22faae408332 Mon Sep 17 00:00:00 2001 From: xingyu Date: Fri, 13 Oct 2023 10:34:01 +0800 Subject: [PATCH 3/4] fix: unocss eslint --- src/views/mall/trade/brokerage/withdraw/index.vue | 2 +- src/views/mall/trade/config/index.vue | 2 +- src/views/member/user/detail/UserOrderList.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/mall/trade/brokerage/withdraw/index.vue b/src/views/mall/trade/brokerage/withdraw/index.vue index ce4f8768..b14a7767 100644 --- a/src/views/mall/trade/brokerage/withdraw/index.vue +++ b/src/views/mall/trade/brokerage/withdraw/index.vue @@ -122,7 +122,7 @@ diff --git a/src/views/mall/trade/config/index.vue b/src/views/mall/trade/config/index.vue index 7905871b..48d04e08 100644 --- a/src/views/mall/trade/config/index.vue +++ b/src/views/mall/trade/config/index.vue @@ -16,9 +16,9 @@ {{ row.spuName }} From 9b09304c50d6cbc56a6f4e76f01bb7e7ae6f4771 Mon Sep 17 00:00:00 2001 From: xingyu Date: Fri, 13 Oct 2023 10:41:10 +0800 Subject: [PATCH 4/4] docs: update deps --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8466bbc3..b186484c 100644 --- a/README.md +++ b/README.md @@ -39,14 +39,14 @@ | 框架 | 说明 | 版本 | |----------------------------------------------------------------------|------------------|--------| | [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.3.4 | -| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.4.9 | +| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.4.11 | | [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.3.14 | | [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 5.2.2 | | [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.6 | -| [vueuse](https://vueuse.org/) | 常用工具集 | 10.4.1 | -| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.4.1 | +| [vueuse](https://vueuse.org/) | 常用工具集 | 10.5.0 | +| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.5.1 | | [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.2.5 | -| [unocss](https://uno.antfu.me/) | 原子 css | 0.56.1 | +| [unocss](https://uno.antfu.me/) | 原子 css | 0.56.5 | | [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.1.1 | | [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.23 |