From 20dc49df6ca0c65c6da1e33e4db0ae09eb694c74 Mon Sep 17 00:00:00 2001 From: ray <1490493387@qq.com> Date: Tue, 8 Oct 2024 14:42:49 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20:bug:=20=E7=A7=BB=E9=99=A4unplugin-i?= =?UTF-8?q?con=E6=8F=92=E4=BB=B6=EF=BC=8C=E9=81=BF=E5=85=8Dvue-template-co?= =?UTF-8?q?mpiler=E7=BC=96=E8=AF=91=E5=99=A8=E5=9C=A8=E6=9F=90=E4=BA=9B?= =?UTF-8?q?=E6=9C=BA=E5=99=A8=E5=BC=95=E5=8F=91=E7=9A=84=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 19 ++++---- src/components/Breadcrumb/index.vue | 3 +- src/components/CURD/PageSearch.vue | 8 +++- src/components/Notice/index.vue | 10 +++-- src/components/TableSelect/index.vue | 4 +- src/components/Upload/ImageUpload.vue | 2 +- src/layout/components/TagsView/index.vue | 15 ++++--- src/views/codegen/index.vue | 24 +++++++--- src/views/dashboard/components/VisitTrend.vue | 7 ++- src/views/dashboard/index.vue | 6 ++- src/views/demo/icon-selector.vue | 3 +- src/views/demo/multi-level/level1.vue | 3 +- src/views/demo/signature.vue | 7 ++- src/views/demo/wang-editor.vue | 2 +- src/views/login/index.vue | 8 +++- src/views/system/config/index.vue | 20 ++++++--- src/views/system/dept/index.vue | 28 +++++++++--- src/views/system/dict/data.vue | 24 +++++++--- src/views/system/dict/index.vue | 30 +++++++++---- src/views/system/log/index.vue | 8 +++- src/views/system/menu/index.vue | 45 ++++++++++++------- .../system/notice/components/NoticeDetail.vue | 4 +- src/views/system/notice/index.vue | 8 ++-- src/views/system/notice/my-notice.vue | 8 +++- src/views/system/role/index.vue | 30 ++++++++----- src/views/system/user/dept-tree.vue | 2 +- src/views/system/user/index.vue | 18 ++++---- vite.config.ts | 13 ------ 28 files changed, 229 insertions(+), 130 deletions(-) diff --git a/package.json b/package.json index 7c0d9848..42b50e8c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue3-element-admin", - "version": "2.16.1", + "version": "2.16.2", "private": true, "type": "module", "scripts": { @@ -51,21 +51,21 @@ "@wangeditor/editor-for-vue": "5.1.10", "animate.css": "^4.1.1", "axios": "^1.7.7", - "codemirror": "^5.65.17", - "codemirror-editor-vue3": "^2.7.1", + "codemirror": "^5.65.18", + "codemirror-editor-vue3": "^2.8.0", "echarts": "^5.5.1", - "element-plus": "^2.8.1", + "element-plus": "^2.8.4", "exceljs": "^4.4.0", "lodash-es": "^4.17.21", "nprogress": "^0.2.0", "path-browserify": "^1.0.1", - "path-to-regexp": "^6.2.2", - "pinia": "^2.2.2", + "path-to-regexp": "^6.3.0", + "pinia": "^2.2.4", "qs": "^6.13.0", "sortablejs": "^1.15.3", - "vue": "^3.5.1", + "vue": "^3.5.11", "vue-i18n": "9.9.1", - "vue-router": "^4.4.3" + "vue-router": "^4.4.5" }, "devDependencies": { "@commitlint/cli": "^18.6.1", @@ -84,7 +84,7 @@ "@vitejs/plugin-vue-jsx": "^3.1.0", "autoprefixer": "^10.4.20", "commitizen": "^4.3.0", - "cz-git": "^1.9.4", + "cz-git": "1.9.4", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.30.0", @@ -108,7 +108,6 @@ "typescript": "^5.5.4", "unocss": "^0.58.9", "unplugin-auto-import": "^0.17.8", - "unplugin-icons": "^0.18.5", "unplugin-vue-components": "^0.26.0", "vite": "^5.4.3", "vite-plugin-mock-dev-server": "^1.7.1", diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index ea2b1aff..dba072f6 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -9,8 +9,9 @@ item.redirect === 'noredirect' || index === breadcrumbs.length - 1 " class="color-gray-400" - >{{ translateRouteTitle(item.meta.title) }} + {{ translateRouteTitle(item.meta.title) }} + {{ translateRouteTitle(item.meta.title) }} diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue index f2baf1d4..c259bfa3 100644 --- a/src/components/CURD/PageSearch.vue +++ b/src/components/CURD/PageSearch.vue @@ -109,11 +109,15 @@ > diff --git a/src/components/Notice/index.vue b/src/components/Notice/index.vue index e995e7af..60f5aba0 100644 --- a/src/components/Notice/index.vue +++ b/src/components/Notice/index.vue @@ -9,10 +9,14 @@ :max="99" class="wh-full" > - + + + - - + + + + diff --git a/src/components/TableSelect/index.vue b/src/components/TableSelect/index.vue index 28ad4b67..f54c8b32 100644 --- a/src/components/TableSelect/index.vue +++ b/src/components/TableSelect/index.vue @@ -145,8 +145,8 @@ {{ confirmText }} - 清 空 - 关 闭 + 清 空 + 关 闭 diff --git a/src/components/Upload/ImageUpload.vue b/src/components/Upload/ImageUpload.vue index 457897eb..512f6124 100644 --- a/src/components/Upload/ImageUpload.vue +++ b/src/components/Upload/ImageUpload.vue @@ -16,7 +16,7 @@ :accept="props.accept" :limit="props.limit" > - + @@ -167,7 +175,9 @@
注意2：演示环境默认不生成菜单，如需生成，请在本地部署数据库。 - + + + @@ -195,7 +205,9 @@ :data="genConfigFormData.fieldConfigs" > - + + + diff --git a/src/views/dashboard/components/VisitTrend.vue b/src/views/dashboard/components/VisitTrend.vue index 91dea645..a09cc884 100644 --- a/src/views/dashboard/components/VisitTrend.vue +++ b/src/views/dashboard/components/VisitTrend.vue @@ -6,10 +6,13 @@
访问趋势 - + > + +
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index bec66b8d..3e9754d2 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -121,8 +121,10 @@ getGrowthRateClass(item.growthRate), ]" > - - + + + + {{ formatGrowthRate(item.growthRate) }} diff --git a/src/views/demo/icon-selector.vue b/src/views/demo/icon-selector.vue index 6a419e2f..f72ac013 100644 --- a/src/views/demo/icon-selector.vue +++ b/src/views/demo/icon-selector.vue @@ -10,8 +10,9 @@ const iconName = ref("edit"); type="primary" target="_blank" class="mb-10" - >示例源码 请点击>>>> + 示例源码 请点击>>>> + diff --git a/src/views/demo/multi-level/level1.vue b/src/views/demo/multi-level/level1.vue index b26146d7..6264f9f2 100644 --- a/src/views/demo/multi-level/level1.vue +++ b/src/views/demo/multi-level/level1.vue @@ -5,8 +5,9 @@ type="primary" target="_blank" class="mb-10" - >示例源码 请点击>>>> + 示例源码 请点击>>>> + diff --git a/src/views/demo/signature.vue b/src/views/demo/signature.vue index ce5fb4a5..600d3439 100644 --- a/src/views/demo/signature.vue +++ b/src/views/demo/signature.vue @@ -138,8 +138,8 @@ function paint(

基于canvas实现的签名组件

保存为图片 - 保存到后端 - 清空签名 + 保存到后端 + 清空签名
- + > 签名 diff --git a/src/views/demo/wang-editor.vue b/src/views/demo/wang-editor.vue index 1e649fe0..55fa00b9 100644 --- a/src/views/demo/wang-editor.vue +++ b/src/views/demo/wang-editor.vue @@ -17,7 +17,7 @@ const value = ref("初始内容"); diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 7222319e..217997ed 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -70,7 +70,9 @@
- + + +
- + + + - + 搜索 - + 重置 @@ -31,7 +35,9 @@ v-hasPerm="['sys:config:add']" @click="handleOpenDialog()" > - + 新增 - + 编辑 - + 删除 diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 92256336..82457e49 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -23,11 +23,15 @@ - + 搜索 - + 重置 @@ -41,7 +45,9 @@ type="success" @click="handleOpenDialog(0, undefined)" > - + 新增 - + 删除 @@ -84,7 +92,9 @@ size="small" @click.stop="handleOpenDialog(scope.row.id, undefined)" > - + 新增 - + 编辑 - + 删除 diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue index 50913e89..908910e7 100644 --- a/src/views/system/dict/data.vue +++ b/src/views/system/dict/data.vue @@ -19,11 +19,15 @@ - + 搜索 - + 重置 @@ -33,7 +37,9 @@
- + 新增 - + 删除
@@ -73,7 +81,9 @@ size="small" @click.stop="handleOpenDialog(scope.row)" > - + 编辑 - + 删除 diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index 0d32e299..d3f2889e 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -13,12 +13,16 @@ - + 搜索 - - 重置 + @@ -27,7 +31,9 @@
- + 新增 - + 删除
@@ -65,7 +73,9 @@ size="small" @click.stop="handleOpenDictData(scope.row)" > - + 字典数据 @@ -75,7 +85,9 @@ size="small" @click.stop="handleEditClick(scope.row.id, scope.row.name)" > - + 编辑 - + 删除 diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue index d234135c..358d8e7b 100644 --- a/src/views/system/log/index.vue +++ b/src/views/system/log/index.vue @@ -25,11 +25,15 @@ - + 搜索 - + 重置 diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 7c9aedbd..5ba209aa 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -12,11 +12,11 @@ - + 搜索 - + 重置 @@ -30,7 +30,7 @@ type="success" @click="handleOpenDialog(0)" > - + 新增 @@ -133,7 +133,7 @@ size="small" @click.stop="handleOpenDialog(scope.row.id)" > - + 新增 @@ -144,7 +144,7 @@ size="small" @click.stop="handleOpenDialog(undefined, scope.row.id)" > - + 编辑 - + 删除 @@ -217,14 +217,17 @@ prop="routeName" > @@ -239,7 +242,7 @@ prop="routePath" > @@ -264,14 +269,16 @@ prop="component" > @@ -292,13 +299,15 @@ @@ -370,7 +379,7 @@ " > @@ -393,7 +404,7 @@ 开启 diff --git a/src/views/system/notice/components/NoticeDetail.vue b/src/views/system/notice/components/NoticeDetail.vue index 5ed9f2a5..f4f1acdf 100644 --- a/src/views/system/notice/components/NoticeDetail.vue +++ b/src/views/system/notice/components/NoticeDetail.vue @@ -18,7 +18,9 @@ - +
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue index 1b9e3fc4..f25054fa 100644 --- a/src/views/system/notice/index.vue +++ b/src/views/system/notice/index.vue @@ -29,11 +29,11 @@ - + 搜索 - + 重置 @@ -47,7 +47,7 @@ type="success" @click="handleOpenDialog()" > - + 新增通知 - + 删除 diff --git a/src/views/system/notice/my-notice.vue b/src/views/system/notice/my-notice.vue index caf17bc8..885cc4fb 100644 --- a/src/views/system/notice/my-notice.vue +++ b/src/views/system/notice/my-notice.vue @@ -12,11 +12,15 @@ - + 搜索 - + 重置 diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 2957cb89..ab0962f3 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -13,11 +13,11 @@ - + 搜索 - + 重置 @@ -27,7 +27,9 @@ @@ -69,7 +73,7 @@ link @click="handleOpenAssignPermDialog(scope.row)" > - + 分配权限 - + 编辑 - + 删除 @@ -172,13 +176,15 @@ placeholder="菜单权限名称" >
- + {{ isExpanded ? "收缩" : "展开" }} 如果只需勾选菜单权限，不需要勾选子菜单或者按钮权限，请关闭父子联动 - + > + +
diff --git a/src/views/system/user/dept-tree.vue b/src/views/system/user/dept-tree.vue index 2f386063..00cda400 100644 --- a/src/views/system/user/dept-tree.vue +++ b/src/views/system/user/dept-tree.vue @@ -3,7 +3,7 @@ diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index b90596f5..b3f0f98c 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -48,11 +48,11 @@ - + 搜索 - + 重置 @@ -68,7 +68,7 @@ type="success" @click="handleOpenDialog()" > - + 新增 - + 删除
- + 导入 - + 导出
@@ -163,7 +163,7 @@ link @click="hancleResetPassword(scope.row)" > - + 重置密码 - + 编辑 - + 删除 diff --git a/vite.config.ts b/vite.config.ts index 74aed0ea..3cf1fe97 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -5,8 +5,6 @@ import { UserConfig, ConfigEnv, loadEnv, defineConfig } from "vite"; import AutoImport from "unplugin-auto-import/vite"; import Components from "unplugin-vue-components/vite"; import { ElementPlusResolver } from "unplugin-vue-components/resolvers"; -import Icons from "unplugin-icons/vite"; -import IconsResolver from "unplugin-icons/resolver"; import { createSvgIconsPlugin } from "vite-plugin-svg-icons"; import mockDevServerPlugin from "vite-plugin-mock-dev-server"; @@ -88,8 +86,6 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => { ElementPlusResolver({ importStyle: "sass", }), - // 自动导入图标组件 - IconsResolver({}), ], eslintrc: { // 是否自动生成 eslint 规则，建议生成之后设置 false @@ -110,11 +106,6 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => { ElementPlusResolver({ importStyle: "sass", }), - // 自动注册图标组件 - IconsResolver({ - // element-plus图标库，其他图标库 https://icon-sets.iconify.design/ - enabledCollections: ["ep"], - }), ], // 指定自定义组件位置(默认:src/components) dirs: ["src/components", "src/**/components"], @@ -122,10 +113,6 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => { dts: false, // dts: "src/types/components.d.ts", }), - Icons({ - // 自动安装图标库 - autoInstall: true, - }), createSvgIconsPlugin({ // 指定需要缓存的图标文件夹 iconDirs: [resolve(pathSrc, "assets/icons")], From 0783709ac745f42706b0aa7d8ed21910bc2c7278 Mon Sep 17 00:00:00 2001 From: ray <1490493387@qq.com> Date: Tue, 8 Oct 2024 15:36:11 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20:bug:=20=E9=94=81=E5=AE=9Asass?= =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=8C=E7=9B=AE=E5=89=8D1.79.x=E6=9C=89?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 5 ++--- tsconfig.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 42b50e8c..26609808 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "postcss-html": "^1.7.0", "postcss-scss": "^4.0.9", "prettier": "^3.3.3", - "sass": "^1.78.0", + "sass": "1.78.0", "stylelint": "^16.9.0", "stylelint-config-html": "^1.1.0", "stylelint-config-recess-order": "^4.6.0", @@ -120,6 +120,5 @@ }, "repository": "https://gitee.com/youlaiorg/vue3-element-admin.git", "author": "有来开源组织", - "license": "MIT", - "packageManager": "pnpm@9.1.3+sha512.7c2ea089e1a6af306409c4fc8c4f0897bdac32b772016196c469d9428f1fe2d5a21daf8ad6512762654ac645b5d9136bb210ec9a00afa8dbc4677843ba362ecd" + "license": "MIT" } diff --git a/tsconfig.json b/tsconfig.json index f6db304b..7d515579 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -21,7 +21,7 @@ "paths": { "@/*": ["src/*"] }, - "types": ["vite/client", "unplugin-icons/types/vue", "element-plus/global"] + "types": ["vite/client", "element-plus/global"] }, "include": [ "mock/**/*.ts", From d2b96ac74c9e6cf2f0378f74bbc77f1c053b1a16 Mon Sep 17 00:00:00 2001 From: Theo <971366405@qq.com> Date: Tue, 8 Oct 2024 16:32:21 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E8=AE=BE=E7=BD=AE=E4=B8=BA=E6=B7=B7=E5=90=88=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E6=97=B6=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复导航设置为混合模式时图标显示不正确的bug --- .../Sidebar/components/SidebarMixTopMenu.vue | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue index 6c431158..6982b815 100644 --- a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue +++ b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue @@ -15,10 +15,16 @@ :index="route.path" >