From b54fb1e8e57662336126002f1949b6b190949cca Mon Sep 17 00:00:00 2001 From: hxr <1490493387@qq.com> Date: Thu, 17 Aug 2023 23:59:33 +0800 Subject: [PATCH 1/7] =?UTF-8?q?refactor:=20:recycle:=20=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=B9=E6=B3=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 35fa3ebfb81a57bd3621bd9f5150da2c97e2fdec --- src/views/system/user/index.vue | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index b5cb6949..48914fff 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -294,13 +294,6 @@ function downloadTemplate() { }); } -/** 打开导入弹窗 */ -async function openImportDialog() { - await getDeptOptions(); - importDeptId.value = undefined; - importDialog.visible = true; -} - /** * Excel文件change事件 * @@ -316,8 +309,22 @@ function handleExcelChange(file: UploadFile) { excelFile.value = file.raw; } +/** 打开导入弹窗 */ +async function openImportDialog() { + await getDeptOptions(); + importDeptId.value = undefined; + importDialog.visible = true; +} + +/** 关闭导入弹窗 */ +function closeImportDialog() { + importDialog.visible = false; + excelFile.value = undefined; + excelFilelist.value = []; +} + /** 导入用户提交 */ -function handleUserImport() { +function handleImport() { if (importDeptId.value) { if (!excelFile.value) { ElMessage.warning("上传Excel文件不能为空"); @@ -331,15 +338,8 @@ function handleUserImport() { } } -/** 关闭导入弹窗 */ -function closeImportDialog() { - importDialog.visible = false; - excelFile.value = undefined; - excelFilelist.value = []; -} - /** 导出用户 */ -function handleUserExport() { +function handleExport() { exportUser(queryParams).then((response: any) => { const blob = new Blob([response.data], { type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8", @@ -457,7 +457,7 @@ onMounted(() => { - 导出 @@ -695,7 +695,7 @@ onMounted(() => { From 23785bd86d026bb67124008a7d3716461e692b05 Mon Sep 17 00:00:00 2001 From: hxr <1490493387@qq.com> Date: Mon, 21 Aug 2023 22:09:22 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20:bug:=20=E9=A1=B6=E9=83=A8=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=AA=84=E5=B1=8F=E5=9B=BE=E6=A0=87=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: e86991e867777684f68bc255d30c4d5124b3b2aa --- src/layout/components/Sidebar/SidebarItem.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue index d932eeb1..f01341c9 100644 --- a/src/layout/components/Sidebar/SidebarItem.vue +++ b/src/layout/components/Sidebar/SidebarItem.vue @@ -121,3 +121,9 @@ function resolvePath(routePath: string) { + + From 286f56a2bd92969e921a11a841f8f9df4777acbd Mon Sep 17 00:00:00 2001 From: hxr <1490493387@qq.com> Date: Thu, 24 Aug 2023 00:30:29 +0800 Subject: [PATCH 3/7] =?UTF-8?q?refactor:=20:recycle:=20=E4=BE=A7=E8=BE=B9?= =?UTF-8?q?=E6=A0=8F=E5=9B=BE=E6=A0=87=E5=AF=B9=E9=BD=90=E5=92=8C=E5=AE=BD?= =?UTF-8?q?=E5=BA=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 9c04d7478253929f35c7ffc80540867855664619 --- src/layout/index.vue | 1 + src/styles/sidebar.scss | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/layout/index.vue b/src/layout/index.vue index af93cbcb..b943089d 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -233,6 +233,7 @@ function toggleSideBar() { .mix-wrap { .el-menu { width: $sideBarWidth; + border: none; } } } diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 6b1e05dd..66958b81 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -47,7 +47,7 @@ } .svg-icon { - margin-right: 16px; + margin-right: 12px; } .sub-el-icon { @@ -83,6 +83,13 @@ } } + .left-wrap { + .svg-icon { + margin-top: -2px; + margin-right: 12px; + } + } + .hideSidebar { .sidebar-container { width: 54px !important; @@ -174,7 +181,7 @@ .el-menu--vertical { & > .el-menu { .svg-icon { - margin-right: 16px; + margin-right: 12px; } .sub-el-icon { From bc305686c0b3cd8e1f40a147fb30498dbe7934b0 Mon Sep 17 00:00:00 2001 From: hxr <1490493387@qq.com> Date: Thu, 24 Aug 2023 00:36:39 +0800 Subject: [PATCH 4/7] =?UTF-8?q?chore:=20:hammer:=20=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A72.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 2f8a5d9ace7a39879f9a9f1a8fa3e23538aa83c2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bf746937..9ef5bee9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "vue3-element-admin", "private": true, - "version": "2.5.0", + "version": "2.6.0", "scripts": { "preinstall": "npx only-allow pnpm", "dev": "vite serve --mode development", From c0ead3acc87f179f1e22e43c2390d97986fa9289 Mon Sep 17 00:00:00 2001 From: hxr <1490493387@qq.com> Date: Thu, 24 Aug 2023 00:37:12 +0800 Subject: [PATCH 5/7] =?UTF-8?q?docs:=20:memo:=20=E7=89=88=E6=9C=AC2.6.0?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: bdd3529ea47d13fc6a70ad1cf6d5093a28da3338 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9812c96..453840f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 2.6.0 (2023/8/24)💥💥💥 + +### ✨ feat +- 导航顶部模式、混合模式支持（author by [april-tong](https://april-tong.com/)） +- 平台文档(内嵌)（author by [april-tong](https://april-tong.com/)） + # 2.5.0 (2023/8/8) ### ✨ feat From 1593ab8704b138ad5fc06783c022da198f775db8 Mon Sep 17 00:00:00 2001 From: hxr <1490493387@qq.com> Date: Thu, 24 Aug 2023 00:48:05 +0800 Subject: [PATCH 6/7] =?UTF-8?q?chore:=20:hammer:=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=B7=B7=E5=90=88=E5=AF=BC=E8=88=AA=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 8d80d2bb1c919cc1144321a88bab68090f2d0e0b --- src/settings.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings.ts b/src/settings.ts index e5ed4d78..02920e10 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -47,7 +47,7 @@ const defaultSettings: DefaultSettings = { tagsView: true, fixedHeader: false, sidebarLogo: true, - layout: "left", + layout: "mix", /** * 主题模式 * From 4486d4be04c22913a8f101ec60aab5f9ede4d533 Mon Sep 17 00:00:00 2001 From: hxr <1490493387@qq.com> Date: Thu, 24 Aug 2023 00:48:41 +0800 Subject: [PATCH 7/7] =?UTF-8?q?refactor:=20:recycle:=20=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E6=BB=9A=E5=8A=A8=E6=9D=A1=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 11b2623232bf89c2a53655d8ed647fcb6a740676 --- src/views/dashboard/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 0c892e68..53884457 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -180,7 +180,7 @@ orderCount.value = 2000; - + - + - +