From fae492410242a3bee22754d53b4525b42e0d257c Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Tue, 7 May 2024 09:09:35 +0800 Subject: [PATCH 1/2] release: update `5.5.0` --- CHANGELOG.en_US.md | 56 +++++++++++++++++++++++++++---------- CHANGELOG.md | 56 +++++++++++++++++++++++++++---------- CHANGELOG.zh_CN.md | 56 +++++++++++++++++++++++++++---------- package.json | 2 +- public/platform-config.json | 2 +- 5 files changed, 125 insertions(+), 47 deletions(-) diff --git a/CHANGELOG.en_US.md b/CHANGELOG.en_US.md index 4f71f99d78..9e2110eac6 100644 --- a/CHANGELOG.en_US.md +++ b/CHANGELOG.en_US.md @@ -1,3 +1,29 @@ +# 5.5.0 (2024-05-07) + +### 📄 Docs + +The addresses of the document site and full version preview site have been changed! + +- The latest document site address: https://pure-admin.github.io/pure-admin-doc +- The latest full version preview site address: https://pure-admin.github.io/vue-pure-admin + +### ✔️ Refactor + +- Reconstruct the `layout` file naming convention to make it more readable + +### 🎫 Feat + +- Add new component `ReVxeTableBar` to be used with `vxe-table` + +### 🐞 Bug fixes + +- Fixed the issue where the background color is white when `FixedHeader` is set to `false` in dark mode +- Fixed the problem of delayed closing of functional pop-up window `ReDialog` when clicking the cancel button + +### 🍏 Perf + +- Optimize account settings-avatar upload function + # 5.4.0 (2024-04-18) ### 🎫 Feat @@ -30,7 +56,7 @@ # 5.3.0 (2024-03-28) -### ✔️ refactor +### ✔️ Refactor - Reconstruct internationalized file naming conventions and demo pages with code location hints @@ -43,7 +69,7 @@ # 5.2.0 (2024-03-22) -### ✔️ refactor +### ✔️ Refactor - Place the full screen button at the top to make it visible and easy to operate @@ -79,7 +105,7 @@ # 5.1.0 (2024-03-02) -### ✔️ refactor +### ✔️ Refactor - Reconstruct the tab page `UI` to make it more convenient to click the close button @@ -101,7 +127,7 @@ Totally `ESM` version -### ✔️ refactor +### ✔️ Refactor - Upgrade `vite` to `v5` version, specify `node` version `>18.18.0`, `pnpm` version `>=8.6.10` - Use [vite-plugin-fake-server](https://www.npmjs.com/package/vite-plugin-fake-server) to replace [vite-plugin-mock](https://www.npmjs.com/package/vite-plugin-mock), use [@faker-js/faker](https://www.npmjs.com/package/@faker-js/faker) to replace [mockjs](https://www.npmjs.com/package/mockjs) @@ -192,7 +218,7 @@ Totally `ESM` version # 4.5.0 (2023-06-26) -### ✔️ refactor +### ✔️ Refactor - Refactor image crop `ReCropper` component, add more useful functions @@ -305,7 +331,7 @@ Totally `ESM` version [View 4.0.0 version optimization details](https://github.com/pure-admin/vue-pure-admin/issues/428#issuecomment-1422191158) -### ✔️ refactor +### ✔️ Refactor - Use `css` pseudo-class `before` to refactor the activation background of the menu, similar to [ant.design-menu](https://ant.design/components/menu-cn#components-menu-demo-inline-collapsed) @@ -376,7 +402,7 @@ Totally `ESM` version # 3.9.5 (2022-12-13) -### ✔️ refactor +### ✔️ Refactor - completely removed `lodash` and its related libraries [Click here to see Why Removed? How to integrate it yourself? ](https://pure-admin.github.io/pure-admin-doc/pages/FAQ/#%E5%B9%B3%E5%8F%B0%E5%9C%A8-v3-9-5-%E7 %89%88%E6%9C%AC%E5%AE%8C%E5%85%A8%E7%A7%BB%E9%99%A4%E4%BA%86-lodash-%E5%92%8C% E5%85%B6%E7%9B%B8%E5%85%B3%E5%BA%93-%E4%B8%BA%E4%BB%80%E4%B9%88%E7%A7%BB%E9 %99%A4-%E5%A6%82%E4%BD%95%E8%87%AA%E8%A1%8C%E9%9B%86%E6%88%90) @@ -396,7 +422,7 @@ Totally `ESM` version # 3.9.4 (2022-12-05) -### ✔️ refactor +### ✔️ Refactor - Completely removed `vxe-table`, after removal, the overall package size of the full version is reduced by `1.82MB`, and the initial startup time is basically the same as the lite version 🐮 [Click here to see Why Removed? How to integrate it yourself?](https://pure-admin.github.io/pure-admin-doc/pages/FAQ/#%E5%B9%B3%E5%8F%B0%E5%9C%A8-v3-9-4-%E7%89%88%E6%9C%AC%E5%AE%8C%E5%85%A8%E7%A7%BB%E9%99%A4%E4%BA%86-vxe-table-%E4%B8%BA%E4%BB%80%E4%B9%88%E7%A7%BB%E9%99%A4-%E5%A6%82%E4%BD%95%E8%87%AA%E8%A1%8C%E9%9B%86%E6%88%90) @@ -505,7 +531,7 @@ Totally `ESM` version # 3.7.0 (2022-11-21) -### ✔️ refactor +### ✔️ Refactor - Replace `driver.js` with `intro.js` @@ -556,7 +582,7 @@ Totally `ESM` version # 3.6.2 (2022-10-27) -### ✔️ refactor +### ✔️ Refactor - Replace `/@/` alias with `@/` alias @@ -584,7 +610,7 @@ Totally `ESM` version - Add typewriter component `demo` - Added `json` editor `demo` -### ✔️ refactor +### ✔️ Refactor - Refactor the permission module, adopt the most commonly used `RBAC` (Role-Based Access List): role-based permission control (User -> Role -> Permission), and update the page permission and button permission `demo` example, button Permissions support three operation modes (judging permissions in component mode, judging permissions in function mode, and judging permissions in instruction mode) @@ -610,7 +636,7 @@ Totally `ESM` version - Add `element-plus` seamless scrolling `Table` page demo - Open `vscode` bracket pair guide -### ✔️ refactor +### ✔️ Refactor - Replace `unocss` with `tailwindcss`, add `tailwindcss` [documentation](https://pure-admin.github.io/pure-admin-doc/pages/tailwindcss/) @@ -660,7 +686,7 @@ Totally `ESM` version - Added export `excel` page demo - Added blank page demo without `Layout` -### ✔️ refactor +### ✔️ Refactor - Refactored the theme color to adapt to `element-plus` dark mode (also solved the problem that the same element `css` in `3.3.0` and earlier versions was overwritten many times, resulting in poor style debugging) - Refactored route reset function @@ -696,7 +722,7 @@ Totally `ESM` version - Added pre-release packaging mode - Add [hooks] to close a tag (https://github.com/pure-admin/vue-pure-admin/commit/5e8723a031923e79f507e5a17151d3bd88a51523) -### ✔️ refactor +### ✔️ Refactor - Refactored the landing page to be more inclined to the actual business scenario - Use `unocss` instead of `windicss`, `unocss` has better performance in development environment, no memory leaks, and `api` is compatible with `windicss` @@ -775,7 +801,7 @@ Totally `ESM` version - Added `WindiCSS` support - Add online environment remove console plugin `vite-plugin-remove-console` -### ✔️ refactor +### ✔️ Refactor - Replace `@element-plus/icons-vue` with `@iconify-icons/ep` diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f71f99d78..9e2110eac6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,29 @@ +# 5.5.0 (2024-05-07) + +### 📄 Docs + +The addresses of the document site and full version preview site have been changed! + +- The latest document site address: https://pure-admin.github.io/pure-admin-doc +- The latest full version preview site address: https://pure-admin.github.io/vue-pure-admin + +### ✔️ Refactor + +- Reconstruct the `layout` file naming convention to make it more readable + +### 🎫 Feat + +- Add new component `ReVxeTableBar` to be used with `vxe-table` + +### 🐞 Bug fixes + +- Fixed the issue where the background color is white when `FixedHeader` is set to `false` in dark mode +- Fixed the problem of delayed closing of functional pop-up window `ReDialog` when clicking the cancel button + +### 🍏 Perf + +- Optimize account settings-avatar upload function + # 5.4.0 (2024-04-18) ### 🎫 Feat @@ -30,7 +56,7 @@ # 5.3.0 (2024-03-28) -### ✔️ refactor +### ✔️ Refactor - Reconstruct internationalized file naming conventions and demo pages with code location hints @@ -43,7 +69,7 @@ # 5.2.0 (2024-03-22) -### ✔️ refactor +### ✔️ Refactor - Place the full screen button at the top to make it visible and easy to operate @@ -79,7 +105,7 @@ # 5.1.0 (2024-03-02) -### ✔️ refactor +### ✔️ Refactor - Reconstruct the tab page `UI` to make it more convenient to click the close button @@ -101,7 +127,7 @@ Totally `ESM` version -### ✔️ refactor +### ✔️ Refactor - Upgrade `vite` to `v5` version, specify `node` version `>18.18.0`, `pnpm` version `>=8.6.10` - Use [vite-plugin-fake-server](https://www.npmjs.com/package/vite-plugin-fake-server) to replace [vite-plugin-mock](https://www.npmjs.com/package/vite-plugin-mock), use [@faker-js/faker](https://www.npmjs.com/package/@faker-js/faker) to replace [mockjs](https://www.npmjs.com/package/mockjs) @@ -192,7 +218,7 @@ Totally `ESM` version # 4.5.0 (2023-06-26) -### ✔️ refactor +### ✔️ Refactor - Refactor image crop `ReCropper` component, add more useful functions @@ -305,7 +331,7 @@ Totally `ESM` version [View 4.0.0 version optimization details](https://github.com/pure-admin/vue-pure-admin/issues/428#issuecomment-1422191158) -### ✔️ refactor +### ✔️ Refactor - Use `css` pseudo-class `before` to refactor the activation background of the menu, similar to [ant.design-menu](https://ant.design/components/menu-cn#components-menu-demo-inline-collapsed) @@ -376,7 +402,7 @@ Totally `ESM` version # 3.9.5 (2022-12-13) -### ✔️ refactor +### ✔️ Refactor - completely removed `lodash` and its related libraries [Click here to see Why Removed? How to integrate it yourself? ](https://pure-admin.github.io/pure-admin-doc/pages/FAQ/#%E5%B9%B3%E5%8F%B0%E5%9C%A8-v3-9-5-%E7 %89%88%E6%9C%AC%E5%AE%8C%E5%85%A8%E7%A7%BB%E9%99%A4%E4%BA%86-lodash-%E5%92%8C% E5%85%B6%E7%9B%B8%E5%85%B3%E5%BA%93-%E4%B8%BA%E4%BB%80%E4%B9%88%E7%A7%BB%E9 %99%A4-%E5%A6%82%E4%BD%95%E8%87%AA%E8%A1%8C%E9%9B%86%E6%88%90) @@ -396,7 +422,7 @@ Totally `ESM` version # 3.9.4 (2022-12-05) -### ✔️ refactor +### ✔️ Refactor - Completely removed `vxe-table`, after removal, the overall package size of the full version is reduced by `1.82MB`, and the initial startup time is basically the same as the lite version 🐮 [Click here to see Why Removed? How to integrate it yourself?](https://pure-admin.github.io/pure-admin-doc/pages/FAQ/#%E5%B9%B3%E5%8F%B0%E5%9C%A8-v3-9-4-%E7%89%88%E6%9C%AC%E5%AE%8C%E5%85%A8%E7%A7%BB%E9%99%A4%E4%BA%86-vxe-table-%E4%B8%BA%E4%BB%80%E4%B9%88%E7%A7%BB%E9%99%A4-%E5%A6%82%E4%BD%95%E8%87%AA%E8%A1%8C%E9%9B%86%E6%88%90) @@ -505,7 +531,7 @@ Totally `ESM` version # 3.7.0 (2022-11-21) -### ✔️ refactor +### ✔️ Refactor - Replace `driver.js` with `intro.js` @@ -556,7 +582,7 @@ Totally `ESM` version # 3.6.2 (2022-10-27) -### ✔️ refactor +### ✔️ Refactor - Replace `/@/` alias with `@/` alias @@ -584,7 +610,7 @@ Totally `ESM` version - Add typewriter component `demo` - Added `json` editor `demo` -### ✔️ refactor +### ✔️ Refactor - Refactor the permission module, adopt the most commonly used `RBAC` (Role-Based Access List): role-based permission control (User -> Role -> Permission), and update the page permission and button permission `demo` example, button Permissions support three operation modes (judging permissions in component mode, judging permissions in function mode, and judging permissions in instruction mode) @@ -610,7 +636,7 @@ Totally `ESM` version - Add `element-plus` seamless scrolling `Table` page demo - Open `vscode` bracket pair guide -### ✔️ refactor +### ✔️ Refactor - Replace `unocss` with `tailwindcss`, add `tailwindcss` [documentation](https://pure-admin.github.io/pure-admin-doc/pages/tailwindcss/) @@ -660,7 +686,7 @@ Totally `ESM` version - Added export `excel` page demo - Added blank page demo without `Layout` -### ✔️ refactor +### ✔️ Refactor - Refactored the theme color to adapt to `element-plus` dark mode (also solved the problem that the same element `css` in `3.3.0` and earlier versions was overwritten many times, resulting in poor style debugging) - Refactored route reset function @@ -696,7 +722,7 @@ Totally `ESM` version - Added pre-release packaging mode - Add [hooks] to close a tag (https://github.com/pure-admin/vue-pure-admin/commit/5e8723a031923e79f507e5a17151d3bd88a51523) -### ✔️ refactor +### ✔️ Refactor - Refactored the landing page to be more inclined to the actual business scenario - Use `unocss` instead of `windicss`, `unocss` has better performance in development environment, no memory leaks, and `api` is compatible with `windicss` @@ -775,7 +801,7 @@ Totally `ESM` version - Added `WindiCSS` support - Add online environment remove console plugin `vite-plugin-remove-console` -### ✔️ refactor +### ✔️ Refactor - Replace `@element-plus/icons-vue` with `@iconify-icons/ep` diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index b964c1bbba..557984f5f0 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -1,3 +1,29 @@ +# 5.5.0 (2024-05-07) + +### 📄 Docs + +文档站和完整版预览站地址更换！ + +- 最新文档站地址：https://pure-admin.github.io/pure-admin-doc +- 最新完整版预览站地址：https://pure-admin.github.io/vue-pure-admin + +### ✔️ Refactor + +- 重构`layout`文件命名规范，更易读 + +### 🎫 Feat + +- 添加新组件`ReVxeTableBar`搭配`vxe-table`使用 + +### 🐞 Bug fixes + +- 修复深色模式下设置`FixedHeader`为`false`时，背景色为白色的问题 +- 修复函数式弹窗`ReDialog`点击取消按钮，延时关闭无效问题 + +### 🍏 Perf + +- 优化账号设置-头像上传功能 + # 5.4.0 (2024-04-18) ### 🎫 Feat @@ -30,7 +56,7 @@ # 5.3.0 (2024-03-28) -### ✔️ refactor +### ✔️ Refactor - 重构国际化文件命名规范以及演示页加上代码位置提示 @@ -43,7 +69,7 @@ # 5.2.0 (2024-03-22) -### ✔️ refactor +### ✔️ Refactor - 将全屏按钮置于顶部，使其显眼且易于操作 @@ -79,7 +105,7 @@ # 5.1.0 (2024-03-02) -### ✔️ refactor +### ✔️ Refactor - 重构标签页`UI`，点击关闭按钮更方便 @@ -101,7 +127,7 @@ 全面`ESM`版本 -### ✔️ refactor +### ✔️ Refactor - 升级`vite`至`v5`版本，规定`node`版本`>18.18.0`，`pnpm`版本`>=8.6.10` - 使用 [vite-plugin-fake-server](https://www.npmjs.com/package/vite-plugin-fake-server) 替换 [vite-plugin-mock](https://www.npmjs.com/package/vite-plugin-mock)，使用 [@faker-js/faker](https://www.npmjs.com/package/@faker-js/faker) 替换 [mockjs](https://www.npmjs.com/package/mockjs) @@ -192,7 +218,7 @@ # 4.5.0 (2023-06-26) -### ✔️ refactor +### ✔️ Refactor - 重构图片裁剪 `ReCropper` 组件，添加更多实用功能 @@ -304,7 +330,7 @@ [查看 4.0.0 版本优化细节](https://github.com/pure-admin/vue-pure-admin/issues/428#issuecomment-1422191158) -### ✔️ refactor +### ✔️ Refactor - 采用 `css` 伪类 `before` 写法重构菜单的激活背景，类似于 [ant.design-menu](https://ant.design/components/menu-cn#components-menu-demo-inline-collapsed) @@ -375,7 +401,7 @@ # 3.9.5 (2022-12-13) -### ✔️ refactor +### ✔️ Refactor - 完全移除了 `lodash` 和其相关库 [点击此处查看为什么移除？如何自行集成？](https://pure-admin.github.io/pure-admin-doc/pages/FAQ/#%E5%B9%B3%E5%8F%B0%E5%9C%A8-v3-9-5-%E7%89%88%E6%9C%AC%E5%AE%8C%E5%85%A8%E7%A7%BB%E9%99%A4%E4%BA%86-lodash-%E5%92%8C%E5%85%B6%E7%9B%B8%E5%85%B3%E5%BA%93-%E4%B8%BA%E4%BB%80%E4%B9%88%E7%A7%BB%E9%99%A4-%E5%A6%82%E4%BD%95%E8%87%AA%E8%A1%8C%E9%9B%86%E6%88%90) @@ -395,7 +421,7 @@ # 3.9.4 (2022-12-05) -### ✔️ refactor +### ✔️ Refactor - 完全移除了 `vxe-table`，移除后，完整版整体打包大小减少 `1.82MB`，首启动时长基本和精简版持平 🐮 [点击此处查看为什么移除？如何自行集成？](https://pure-admin.github.io/pure-admin-doc/pages/FAQ/#%E5%B9%B3%E5%8F%B0%E5%9C%A8-v3-9-4-%E7%89%88%E6%9C%AC%E5%AE%8C%E5%85%A8%E7%A7%BB%E9%99%A4%E4%BA%86-vxe-table-%E4%B8%BA%E4%BB%80%E4%B9%88%E7%A7%BB%E9%99%A4-%E5%A6%82%E4%BD%95%E8%87%AA%E8%A1%8C%E9%9B%86%E6%88%90) @@ -504,7 +530,7 @@ # 3.7.0 (2022-11-21) -### ✔️ refactor +### ✔️ Refactor - 使用 `intro.js` 替换 `driver.js` @@ -555,7 +581,7 @@ # 3.6.2 (2022-10-27) -### ✔️ refactor +### ✔️ Refactor - 使用`@/`别名替换`/@/`别名 @@ -583,7 +609,7 @@ - 添加打字机组件`demo` - 添加`json`编辑器`demo` -### ✔️ refactor +### ✔️ Refactor - 重构权限模块，采用目前最常用的`RBAC`（Role-Based Access List）: 基于角色的权限控制（ 用户 -> 角色 -> 权限 ），并更新页面权限和按钮权限`demo`示例，按钮权限支持三种操作模式（组件方式判断权限、函数方式判断权限、指令方式判断权限） @@ -609,7 +635,7 @@ - 添加 `element-plus` 无缝滚动 `Table` 页面 demo - 开启 `vscode` 括号对指南 -### ✔️ refactor +### ✔️ Refactor - 使用 `tailwindcss` 替换 `unocss`，新增 `tailwindcss` [使用文档](https://pure-admin.github.io/pure-admin-doc/pages/tailwindcss/) @@ -659,7 +685,7 @@ - 添加导出 `excel` 页面 demo - 添加无 `Layout` 的空白页面 demo -### ✔️ refactor +### ✔️ Refactor - 重构主题色，适配 `element-plus` 暗黑模式（同时也解决了 `3.3.0` 及更低版本中同样的元素 `css` 被多次覆盖，导致样式不好调试的问题） - 重构路由重置功能 @@ -695,7 +721,7 @@ - 添加预发布打包模式 - 添加关闭某个标签的[hooks](https://github.com/pure-admin/vue-pure-admin/commit/5e8723a031923e79f507e5a17151d3bd88a51523) -### ✔️ refactor +### ✔️ Refactor - 重构登录页，更偏向实际业务场景 - 使用`unocss`替换`windicss`，`unocss`开发环境下性能更好，没有内存泄露，而且`api`使用上兼容`windicss` @@ -774,7 +800,7 @@ - 添加 `WindiCSS` 支持 - 添加线上环境删 console 插件`vite-plugin-remove-console` -### ✔️ refactor +### ✔️ Refactor - 使用`@iconify-icons/ep`替换`@element-plus/icons-vue` diff --git a/package.json b/package.json index 87194e8431..265cd99c67 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-pure-admin", - "version": "5.4.0", + "version": "5.5.0", "private": true, "type": "module", "scripts": { diff --git a/public/platform-config.json b/public/platform-config.json index 848f6bea67..0acebef686 100644 --- a/public/platform-config.json +++ b/public/platform-config.json @@ -1,5 +1,5 @@ { - "Version": "5.4.0", + "Version": "5.5.0", "Title": "PureAdmin", "FixedHeader": true, "HiddenSideBar": false, From 3ca9a7b5bcf5511054d6a069037453536df64288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E4=B8=87?= <52823142+Ten-K@users.noreply.github.com> Date: Wed, 8 May 2024 15:59:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=A4=96=E9=93=BE=E4=BC=9A=E8=B7=B3=E8=BD=AC=E4=B8=A4=E6=AC=A1?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20(#1133)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mock/asyncRoutes.ts | 48 +++++++++---------- .../components/lay-sidebar/NavHorizontal.vue | 1 - .../components/lay-sidebar/NavVertical.vue | 1 - 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/mock/asyncRoutes.ts b/mock/asyncRoutes.ts index 0addbde83e..4f2fab7394 100644 --- a/mock/asyncRoutes.ts +++ b/mock/asyncRoutes.ts @@ -146,30 +146,6 @@ const frameRouter = { rank: frame }, children: [ - { - path: "/iframe/external", - meta: { - title: "menus.pureExternalDoc" - }, - children: [ - { - path: "/external", - name: "https://pure-admin.github.io/pure-admin-doc", - meta: { - title: "menus.pureExternalLink", - roles: ["admin", "common"] - } - }, - { - path: "/pureUtilsLink", - name: "https://pure-admin-utils.netlify.app/", - meta: { - title: "menus.pureUtilsLink", - roles: ["admin", "common"] - } - } - ] - }, { path: "/iframe/embedded", meta: { @@ -257,6 +233,30 @@ const frameRouter = { } } ] + }, + { + path: "/iframe/external", + meta: { + title: "menus.pureExternalDoc" + }, + children: [ + { + path: "/external", + name: "https://pure-admin.github.io/pure-admin-doc", + meta: { + title: "menus.pureExternalLink", + roles: ["admin", "common"] + } + }, + { + path: "/pureUtilsLink", + name: "https://pure-admin-utils.netlify.app/", + meta: { + title: "menus.pureUtilsLink", + roles: ["admin", "common"] + } + } + ] } ] }; diff --git a/src/layout/components/lay-sidebar/NavHorizontal.vue b/src/layout/components/lay-sidebar/NavHorizontal.vue index a334e179ff..19a17bb29e 100644 --- a/src/layout/components/lay-sidebar/NavHorizontal.vue +++ b/src/layout/components/lay-sidebar/NavHorizontal.vue @@ -53,7 +53,6 @@ nextTick(() => { { :class="[device === 'mobile' ? 'mobile' : 'pc']" >