From 4cef3e3e5fce0ef4dc46374dd09d1c4f457d019a Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 29 Jul 2023 09:28:45 +0800 Subject: [PATCH 001/159] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=BB=8E=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E8=8E=B7=E5=8F=96=E8=8F=9C=E5=8D=95=E3=80=82?= =?UTF-8?q?=E7=9B=AE=E7=9A=84=EF=BC=9A=E5=8A=A0=E5=BF=AB=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E7=9A=84=E5=8A=A0=E8=BD=BD=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit ee802d6335f7b5e785620c45053dd31f4a95f785) --- src/api/login/index.ts | 5 ----- src/store/modules/permission.ts | 5 +---- src/store/modules/user.ts | 1 + 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/api/login/index.ts b/src/api/login/index.ts index 47d011a6..6ab3edc5 100644 --- a/src/api/login/index.ts +++ b/src/api/login/index.ts @@ -37,11 +37,6 @@ export const getInfoApi = () => { return request.get({ url: '/system/auth/get-permission-info' }) } -// 路由 -export const getAsyncRoutesApi = () => { - return request.get({ url: '/system/auth/list-menus' }) -} - //获取登录验证码 export const sendSmsCodeApi = (data: SmsCodeVO) => { return request.post({ url: '/system/auth/send-sms-code', data }) diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts index 491bafdc..5f24a767 100644 --- a/src/store/modules/permission.ts +++ b/src/store/modules/permission.ts @@ -3,7 +3,6 @@ import { store } from '../index' import { cloneDeep } from 'lodash-es' import remainingRouter from '@/router/modules/remaining' import { generateRoute, flatMultiLevelRoutes } from '@/utils/routerHelper' -import { getAsyncRoutesApi } from '@/api/login' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' const { wsCache } = useCache() @@ -34,12 +33,10 @@ export const usePermissionStore = defineStore('permission', { actions: { async generateRoutes(): Promise { return new Promise(async (resolve) => { + // 获得菜单列表，它在登录的时候，setUserInfoAction 方法中已经进行获取 let res: AppCustomRouteRecordRaw[] if (wsCache.get(CACHE_KEY.ROLE_ROUTERS)) { res = wsCache.get(CACHE_KEY.ROLE_ROUTERS) as AppCustomRouteRecordRaw[] - } else { - res = await getAsyncRoutesApi() - wsCache.set(CACHE_KEY.ROLE_ROUTERS, res) } const routerMap: AppRouteRecordRaw[] = generateRoute(res as AppCustomRouteRecordRaw[]) // 动态路由，404一定要放到最后面 diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 16ff3902..430eab2e 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -58,6 +58,7 @@ export const useUserStore = defineStore('admin-user', { this.user = userInfo.user this.isSetUser = true wsCache.set(CACHE_KEY.USER, userInfo) + wsCache.set(CACHE_KEY.ROLE_ROUTERS, userInfo.menus) }, async loginOut() { await loginOutApi() From a13e2f48ec7ac310bf1a2555e5304fcf4f0529b1 Mon Sep 17 00:00:00 2001 From: xingyu Date: Sat, 29 Jul 2023 12:55:02 +0800 Subject: [PATCH 002/159] chore: update deps (cherry picked from commit af10ccb39ae36d968196993fe8b1196f01e58468) --- package.json | 56 ++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index fc3c4432..ea1cd216 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@vueuse/core": "^10.2.1", "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.10", - "@zxcvbn-ts/core": "^3.0.2", + "@zxcvbn-ts/core": "^3.0.3", "animate.css": "^4.1.1", "axios": "^1.4.0", "benz-amr-recorder": "^1.1.5", @@ -47,10 +47,10 @@ "crypto-js": "^4.1.1", "dayjs": "^1.11.9", "diagram-js": "^11.6.0", - "echarts": "^5.4.2", + "echarts": "^5.4.3", "echarts-wordcloud": "^2.1.0", - "element-plus": "2.3.7", - "fast-xml-parser": "^4.2.5", + "element-plus": "2.3.8", + "fast-xml-parser": "^4.2.6", "highlight.js": "^11.8.0", "intro.js": "^7.0.1", "jsencrypt": "^3.3.2", @@ -58,17 +58,17 @@ "min-dash": "^4.1.1", "mitt": "^3.0.1", "nprogress": "^0.2.0", - "pinia": "^2.1.4", + "pinia": "^2.1.6", "qrcode": "^1.5.3", "qs": "^6.11.2", "steady-xml": "^0.1.0", "url": "^0.11.1", - "video.js": "^8.3.0", + "video.js": "^7.21.5", "vue": "3.3.4", "vue-dompurify-html": "^4.1.4", "vue-i18n": "9.2.2", "vue-router": "^4.2.4", - "vue-types": "^5.1.0", + "vue-types": "^5.1.1", "vuedraggable": "^4.1.0", "vxe-table": "^4.3.11", "web-storage-cache": "^1.1.1", @@ -76,50 +76,50 @@ "xml-js": "^1.6.11" }, "devDependencies": { - "@commitlint/cli": "^17.6.6", - "@commitlint/config-conventional": "^17.6.6", - "@iconify/json": "^2.2.87", - "@intlify/unplugin-vue-i18n": "^0.12.1", + "@commitlint/cli": "^17.6.7", + "@commitlint/config-conventional": "^17.6.7", + "@iconify/json": "^2.2.95", + "@intlify/unplugin-vue-i18n": "^0.12.2", "@purge-icons/generated": "^0.9.0", "@types/intro.js": "^5.1.1", - "@types/lodash-es": "^4.17.7", - "@types/node": "^20.4.1", + "@types/lodash-es": "^4.17.8", + "@types/node": "^20.4.0", "@types/nprogress": "^0.2.0", "@types/qrcode": "^1.5.1", "@types/qs": "^6.9.7", - "@typescript-eslint/eslint-plugin": "^5.61.0", - "@typescript-eslint/parser": "^5.61.0", - "@vitejs/plugin-legacy": "^4.1.0", + "@typescript-eslint/eslint-plugin": "^6.2.0", + "@typescript-eslint/parser": "^6.2.0", + "@vitejs/plugin-legacy": "^4.1.1", "@vitejs/plugin-vue": "^4.2.3", "@vitejs/plugin-vue-jsx": "^3.0.1", "autoprefixer": "^10.4.14", "bpmn-js": "^8.9.0", "bpmn-js-properties-panel": "^0.46.0", "consola": "^3.2.3", - "eslint": "^8.44.0", - "eslint-config-prettier": "^8.8.0", + "eslint": "^8.46.0", + "eslint-config-prettier": "^8.9.0", "eslint-define-config": "^1.21.0", - "eslint-plugin-prettier": "^4.2.1", + "eslint-plugin-prettier": "^5.0.0", "eslint-plugin-vue": "^9.15.1", "lint-staged": "^13.2.3", - "postcss": "^8.4.25", + "postcss": "^8.4.27", "postcss-html": "^1.5.0", "postcss-scss": "^4.0.6", - "prettier": "^2.8.8", + "prettier": "^3.0.0", "rimraf": "^5.0.1", - "rollup": "^3.26.2", - "sass": "^1.63.6", - "stylelint": "^15.10.1", + "rollup": "^3.27.0", + "sass": "^1.64.1", + "stylelint": "^15.10.2", "stylelint-config-recommended": "^13.0.0", - "stylelint-config-recommended-vue": "^1.4.0", + "stylelint-config-recommended-vue": "^1.5.0", "stylelint-config-standard": "^34.0.0", "stylelint-order": "^6.0.3", - "terser": "^5.18.2", + "terser": "^5.19.2", "typescript": "5.1.6", "unplugin-auto-import": "^0.16.6", "unplugin-element-plus": "^0.7.2", "unplugin-vue-components": "^0.25.1", - "vite": "4.4.2", + "vite": "4.4.7", "vite-plugin-compression": "^0.5.1", "vite-plugin-ejs": "^1.6.4", "vite-plugin-eslint": "^1.8.1", @@ -128,7 +128,7 @@ "vite-plugin-svg-icons": "^2.0.1", "vite-plugin-top-level-await": "^1.3.1", "vite-plugin-windicss": "^1.9.0", - "vue-tsc": "^1.8.4", + "vue-tsc": "^1.8.8", "windicss": "^3.5.6" }, "license": "MIT", From 4eccb44c881c5ebb38e0398f04171873644fe622 Mon Sep 17 00:00:00 2001 From: xingyu Date: Sat, 29 Jul 2023 12:55:10 +0800 Subject: [PATCH 003/159] docs: update deps (cherry picked from commit 5037aa593e44e993d70f1c01bec121f230e4c3fc) --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index dc69a06d..8c68c777 100644 --- a/README.md +++ b/README.md @@ -39,15 +39,15 @@ | 框架 | 说明 | 版本 | |----------------------------------------------------------------------|------------------|--------| | [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.3.4 | -| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.3.9 | -| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.3.7 | -| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 5.0.4 | -| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.4 | -| [vueuse](https://vueuse.org/) | 常用工具集 | 10.2.0 | +| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.4.7 | +| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.3.8 | +| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 5.1.6 | +| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.6 | +| [vueuse](https://vueuse.org/) | 常用工具集 | 10.2.1 | | [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 | -| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.2.1 | +| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.2.4 | | [windicss](https://cn.windicss.org/) | 下一代工具优先的 CSS 框架 | 3.5.6 | -| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.1.0 | +| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.1.1 | | [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.23 | ## 开发工具 From 9dd40c360a714cdcd5659b46b533303b25d9f155 Mon Sep 17 00:00:00 2001 From: xingyu Date: Sat, 29 Jul 2023 12:55:43 +0800 Subject: [PATCH 004/159] docs: preview (cherry picked from commit 3f36b57363868def201865bf04f2c6da35320e68) --- README.md | 2 +- {preview => public}/home.png | Bin 2 files changed, 1 insertion(+), 1 deletion(-) rename {preview => public}/home.png (100%) mode change 100755 => 100644 diff --git a/README.md b/README.md index 8c68c777..536c4ead 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ * 改换 saas，自动引入等功能 * 使用 Element Plus 免费开源的中后台模版，具备如下特性： -![首页](preview/home.png) +![首页](public/home.png) * **最新技术栈**：使用 Vue3、Vite4 等前端前沿技术开发 * **TypeScript**: 应用程序级 JavaScript 的语言 diff --git a/preview/home.png b/public/home.png old mode 100755 new mode 100644 similarity index 100% rename from preview/home.png rename to public/home.png From c7d6d35642bd52c30f2971f75b275ca54ad60cb4 Mon Sep 17 00:00:00 2001 From: xingyu Date: Sat, 29 Jul 2023 12:55:51 +0800 Subject: [PATCH 005/159] fix: eslint (cherry picked from commit 8e7897552193e6aa4112ac27d5a1dc76fae645e8) --- src/components/Cropper/src/CopperModal.vue | 4 ++- .../InputPassword/src/InputPassword.vue | 4 ++- src/layout/components/Message/src/Message.vue | 9 ++++--- src/styles/index.scss | 4 ++- .../mall/product/spu/components/SkuList.vue | 17 ++++++------ .../activity/CombinationActivityForm.vue | 6 +---- .../seckill/activity/SeckillActivityForm.vue | 6 +---- src/views/mall/trade/order/index.vue | 8 +++--- src/views/mp/components/wx-msg/comment.scss | 26 ++++++++++++++++--- 9 files changed, 53 insertions(+), 31 deletions(-) diff --git a/src/components/Cropper/src/CopperModal.vue b/src/components/Cropper/src/CopperModal.vue index c303b58c..37b90452 100644 --- a/src/components/Cropper/src/CopperModal.vue +++ b/src/components/Cropper/src/CopperModal.vue @@ -220,7 +220,9 @@ $prefix-cls: #{$namespace}-cropper-am; transparent 75%, rgb(0 0 0 / 25%) 0 ); - background-position: 0 0, 12px 12px; + background-position: + 0 0, + 12px 12px; background-size: 24px 24px; } diff --git a/src/components/InputPassword/src/InputPassword.vue b/src/components/InputPassword/src/InputPassword.vue index 19ce032c..1fbcbedc 100644 --- a/src/components/InputPassword/src/InputPassword.vue +++ b/src/components/InputPassword/src/InputPassword.vue @@ -112,7 +112,9 @@ $prefix-cls: #{$namespace}-input-password; height: inherit; background-color: transparent; border-radius: inherit; - transition: width 0.5s ease-in-out, background 0.25s; + transition: + width 0.5s ease-in-out, + background 0.25s; &[data-score='0'] { width: 20%; diff --git a/src/layout/components/Message/src/Message.vue b/src/layout/components/Message/src/Message.vue index ddbbc426..0c1d7588 100644 --- a/src/layout/components/Message/src/Message.vue +++ b/src/layout/components/Message/src/Message.vue @@ -33,9 +33,12 @@ onMounted(() => { // 首次加载小红点 getUnreadCount() // 轮询刷新小红点 - timer = setInterval(() => { - getUnreadCount() - }, 1000 * 60 * 2) + timer = setInterval( + () => { + getUnreadCount() + }, + 1000 * 60 * 2 + ) }) onUnmounted(() => { clearInterval(timer) diff --git a/src/styles/index.scss b/src/styles/index.scss index 67ea23aa..65d2d4e9 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -24,7 +24,9 @@ } & .peg { - box-shadow: 0 0 10px var(--el-color-primary), 0 0 5px var(--el-color-primary) !important; + box-shadow: + 0 0 10px var(--el-color-primary), + 0 0 5px var(--el-color-primary) !important; } & .spinner-icon { diff --git a/src/views/mall/product/spu/components/SkuList.vue b/src/views/mall/product/spu/components/SkuList.vue index ed1a356d..7fbb9011 100644 --- a/src/views/mall/product/spu/components/SkuList.vue +++ b/src/views/mall/product/spu/components/SkuList.vue @@ -443,14 +443,15 @@ const generateTableData = (propertyList: any[]) => { */ const validateData = (propertyList: any[]) => { const skuPropertyIds: number[] = [] - formData.value!.skus!.forEach((sku) => - sku.properties - ?.map((property) => property.propertyId) - ?.forEach((propertyId) => { - if (skuPropertyIds.indexOf(propertyId!) === -1) { - skuPropertyIds.push(propertyId!) - } - }) + formData.value!.skus!.forEach( + (sku) => + sku.properties + ?.map((property) => property.propertyId) + ?.forEach((propertyId) => { + if (skuPropertyIds.indexOf(propertyId!) === -1) { + skuPropertyIds.push(propertyId!) + } + }) ) const propertyIds = propertyList.map((item) => item.id) return skuPropertyIds.length === propertyIds.length diff --git a/src/views/mall/promotion/combination/activity/CombinationActivityForm.vue b/src/views/mall/promotion/combination/activity/CombinationActivityForm.vue index 36ede848..115f8fd4 100644 --- a/src/views/mall/promotion/combination/activity/CombinationActivityForm.vue +++ b/src/views/mall/promotion/combination/activity/CombinationActivityForm.vue @@ -134,11 +134,7 @@ const open = async (type: string, id?: number) => { const data = (await CombinationActivityApi.getCombinationActivity( id )) as CombinationActivityApi.CombinationActivityVO - await getSpuDetails( - data.spuId!, - data.products?.map((sku) => sku.skuId), - data.products - ) + await getSpuDetails(data.spuId!, data.products?.map((sku) => sku.skuId), data.products) formRef.value.setValues(data) } finally { formLoading.value = false diff --git a/src/views/mall/promotion/seckill/activity/SeckillActivityForm.vue b/src/views/mall/promotion/seckill/activity/SeckillActivityForm.vue index ac7a06b6..049ab6b4 100644 --- a/src/views/mall/promotion/seckill/activity/SeckillActivityForm.vue +++ b/src/views/mall/promotion/seckill/activity/SeckillActivityForm.vue @@ -144,11 +144,7 @@ const open = async (type: string, id?: number) => { const data = (await SeckillActivityApi.getSeckillActivity( id )) as SeckillActivityApi.SeckillActivityVO - await getSpuDetails( - data.spuId!, - data.products?.map((sku) => sku.skuId), - data.products - ) + await getSpuDetails(data.spuId!, data.products?.map((sku) => sku.skuId), data.products) formRef.value.setValues(data) } finally { formLoading.value = false diff --git a/src/views/mall/trade/order/index.vue b/src/views/mall/trade/order/index.vue index 91e0a19e..d51ec11b 100644 --- a/src/views/mall/trade/order/index.vue +++ b/src/views/mall/trade/order/index.vue @@ -12,7 +12,7 @@ @@ -27,7 +27,7 @@ > @@ -48,7 +48,7 @@ @@ -58,7 +58,7 @@ diff --git a/src/views/mp/components/wx-msg/comment.scss b/src/views/mp/components/wx-msg/comment.scss index aaeaccaf..7812c2a3 100644 --- a/src/views/mp/components/wx-msg/comment.scss +++ b/src/views/mp/components/wx-msg/comment.scss @@ -90,8 +90,19 @@ padding: 15px; overflow: hidden; background: #fff; - font-family: Segoe UI, Lucida Grande, Helvetica, Arial, Microsoft YaHei, FreeSans, Arimo, - Droid Sans, wenquanyi micro hei, Hiragino Sans GB, Hiragino Sans GB W3, FontAwesome, + font-family: + Segoe UI, + Lucida Grande, + Helvetica, + Arial, + Microsoft YaHei, + FreeSans, + Arimo, + Droid Sans, + wenquanyi micro hei, + Hiragino Sans GB, + Hiragino Sans GB W3, + FontAwesome, sans-serif; color: #333; font-size: 14px; @@ -99,7 +110,16 @@ blockquote { margin: 0; - font-family: Georgia, Times New Roman, Times, Kai, Kaiti SC, KaiTi, BiauKai, FontAwesome, serif; + font-family: + Georgia, + Times New Roman, + Times, + Kai, + Kaiti SC, + KaiTi, + BiauKai, + FontAwesome, + serif; padding: 1px 0 1px 15px; border-left: 4px solid #ddd; } From 4f81427aa02ff06022ae931cf878175045704444 Mon Sep 17 00:00:00 2001 From: xingyu Date: Sat, 29 Jul 2023 14:40:55 +0800 Subject: [PATCH 006/159] wip: use unocss (cherry picked from commit 4249465b7c328fb744a485a0741da26f7c5f6af6) --- build/vite/index.ts | 4 +- package.json | 7 +- .../src/ContentDetailWrap.vue | 2 +- .../Descriptions/src/Descriptions.vue | 4 +- src/components/Dialog/src/Dialog.vue | 28 ++--- src/components/Editor/src/Editor.vue | 5 +- src/layout/components/AppView.vue | 25 ++-- .../LocaleDropdown/src/LocaleDropdown.vue | 2 +- src/layout/components/Logo/src/Logo.vue | 3 +- src/layout/components/Menu/src/Menu.vue | 9 -- src/layout/components/Setting/src/Setting.vue | 1 - src/layout/components/TabMenu/src/TabMenu.vue | 15 +-- .../components/TagsView/src/TagsView.vue | 112 +++++++++--------- src/layout/components/ToolHeader.vue | 14 +-- .../components/UserInfo/src/UserInfo.vue | 2 +- src/layout/components/useRenderLayout.tsx | 80 +++++++++---- src/main.ts | 2 +- src/plugins/unocss/index.ts | 1 + src/plugins/windi.css/index.ts | 3 - src/styles/var.css | 17 +-- src/views/Home/Index.vue | 4 +- src/views/Login/Login.vue | 28 +++-- tsconfig.json | 4 +- uno.config.ts | 105 ++++++++++++++++ windi.config.ts | 61 ---------- 25 files changed, 291 insertions(+), 247 deletions(-) create mode 100644 src/plugins/unocss/index.ts delete mode 100644 src/plugins/windi.css/index.ts create mode 100644 uno.config.ts delete mode 100644 windi.config.ts diff --git a/build/vite/index.ts b/build/vite/index.ts index 7b4a17bd..bdda98d0 100644 --- a/build/vite/index.ts +++ b/build/vite/index.ts @@ -1,7 +1,6 @@ import { resolve } from 'path' import Vue from '@vitejs/plugin-vue' import VueJsx from '@vitejs/plugin-vue-jsx' -import WindiCSS from 'vite-plugin-windicss' import progress from 'vite-plugin-progress' import EslintPlugin from 'vite-plugin-eslint' import PurgeIcons from 'vite-plugin-purge-icons' @@ -14,6 +13,7 @@ import viteCompression from 'vite-plugin-compression' import topLevelAwait from 'vite-plugin-top-level-await' import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite' import { createSvgIconsPlugin } from 'vite-plugin-svg-icons' +import UnoCSS from 'unocss/vite' export function createVitePlugins() { const root = process.cwd() @@ -24,7 +24,7 @@ export function createVitePlugins() { return [ Vue(), VueJsx(), - WindiCSS(), + UnoCSS(), progress(), PurgeIcons(), ElementPlus({}), diff --git a/package.json b/package.json index ea1cd216..68f7702e 100644 --- a/package.json +++ b/package.json @@ -89,9 +89,11 @@ "@types/qs": "^6.9.7", "@typescript-eslint/eslint-plugin": "^6.2.0", "@typescript-eslint/parser": "^6.2.0", + "@unocss/transformer-variant-group": "^0.51.4", "@vitejs/plugin-legacy": "^4.1.1", "@vitejs/plugin-vue": "^4.2.3", "@vitejs/plugin-vue-jsx": "^3.0.1", + "@vue-macros/volar": "^0.12.3", "autoprefixer": "^10.4.14", "bpmn-js": "^8.9.0", "bpmn-js-properties-panel": "^0.46.0", @@ -116,6 +118,7 @@ "stylelint-order": "^6.0.3", "terser": "^5.19.2", "typescript": "5.1.6", + "unocss": "^0.54.0", "unplugin-auto-import": "^0.16.6", "unplugin-element-plus": "^0.7.2", "unplugin-vue-components": "^0.25.1", @@ -127,9 +130,7 @@ "vite-plugin-purge-icons": "^0.9.2", "vite-plugin-svg-icons": "^2.0.1", "vite-plugin-top-level-await": "^1.3.1", - "vite-plugin-windicss": "^1.9.0", - "vue-tsc": "^1.8.8", - "windicss": "^3.5.6" + "vue-tsc": "^1.8.8" }, "license": "MIT", "repository": { diff --git a/src/components/ContentDetailWrap/src/ContentDetailWrap.vue b/src/components/ContentDetailWrap/src/ContentDetailWrap.vue index 9469a552..2867f5ed 100644 --- a/src/components/ContentDetailWrap/src/ContentDetailWrap.vue +++ b/src/components/ContentDetailWrap/src/ContentDetailWrap.vue @@ -26,7 +26,7 @@ onMounted(() => {
diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue index 6b1ffbd1..32c97d5c 100644 --- a/src/components/Descriptions/src/Descriptions.vue +++ b/src/components/Descriptions/src/Descriptions.vue @@ -69,14 +69,14 @@ const toggleClick = () => {
diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue index 28deba46..acb2b994 100644 --- a/src/components/Dialog/src/Dialog.vue +++ b/src/components/Dialog/src/Dialog.vue @@ -96,13 +96,19 @@ const dialogStyle = computed(() => { diff --git a/src/components/Editor/src/Editor.vue b/src/components/Editor/src/Editor.vue index 73925f86..a76dfdcf 100644 --- a/src/components/Editor/src/Editor.vue +++ b/src/components/Editor/src/Editor.vue @@ -162,7 +162,6 @@ const handleChange = (editor: IDomEditor) => { // 组件销毁时，及时销毁编辑器 onBeforeUnmount(() => { const editor = unref(editorRef.value) - if (editor === null) return // 销毁，并移除 editor editor?.destroy() @@ -179,12 +178,12 @@ defineExpose({ diff --git a/src/views/mall/trade/order/components/DeliveryOrderForm.vue b/src/views/mall/trade/order/components/OrderDeliveryForm.vue similarity index 77% rename from src/views/mall/trade/order/components/DeliveryOrderForm.vue rename to src/views/mall/trade/order/components/OrderDeliveryForm.vue index b061341f..14f9411d 100644 --- a/src/views/mall/trade/order/components/DeliveryOrderForm.vue +++ b/src/views/mall/trade/order/components/OrderDeliveryForm.vue @@ -2,12 +2,12 @@ - - 快递物流 - 无需发货 + + 快递物流 + 无需发货 -