Merge branch 'main' into pages

.gitignore

@@ -1,10 +1,9 @@
 node_modules
 .DS_Store
-dist
-dist-ssr
 *.local
 .eslintcache
 report.html
+dist
 vite.config.*.timestamp*
 
 yarn.lock

.husky/commit-msg

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# shellcheck source=./_/husky.sh
-. "$(dirname "$0")/_/husky.sh"
-
-PATH="/usr/local/bin:$PATH"
-
-npx --no-install commitlint --edit "$1"

.husky/common.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-command_exists () {
-  command -v "$1" >/dev/null 2>&1
-}
-
-# Workaround for Windows 10, Git Bash and Pnpm
-if command_exists winpty && test -t 1; then
-  exec < /dev/tty
-fi

.husky/pre-commit

@@ -1,10 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-. "$(dirname "$0")/common.sh"
-
-[ -n "$CI" ] && exit 0
-
-PATH="/usr/local/bin:$PATH"
-
-# Perform lint check on files in the staging area through .lintstagedrc configuration
-pnpm exec lint-staged

CHANGELOG.en_US.md

@@ -1,3 +1,23 @@
+# 6.2.0 (2025-10-16)
+
+### 🎫 Features
+
+- Added full-screen `403`, `404`, and `500` error pages. These full-screen error pages are clear and secure, improving the user experience.
+
+### 🐞 Bug Fixes
+
+- Fixed an issue where the built-in homepage did not have a `name` configured, causing cache invalidation after setting the page cache.
+- Fixed an issue where, in an embedded same-origin `iframe` page, when the `beforeunload` event was registered, right-clicking a tab and reloading it would cause the browser to prompt two confirmation blocks.
+- Fixed an issue where pages with `keepAlive: true` set to cache invalidation when the initial load was slow.
+- Fixed an issue where multiple tabs could be activated simultaneously when using the same parameters in different routes.
+- Fixed an issue where the right-click menu on a tab displayed incorrectly when passing `params` parameters.
+
+### 🍏 Perf
+
+- Optimized the `nprogress` progress bar. It no longer displays when reloading a page or requesting an interface, improving the user experience.
+- Optimized the timing of capturing all unmatched routes and redirecting to a full-screen `404` page.
+- Explicitly configured the `Tailwind CSS` entry file path to improve the contextual recognition and prompting performance of the `Tailwind CSS IntelliSense` plugin
+
 # 6.1.0 (2025-07-31)
 
 ### ✔️ Refactor

CHANGELOG.md

@@ -1,3 +1,23 @@
+# 6.2.0 (2025-10-16)
+
+### 🎫 Features
+
+- Added full-screen `403`, `404`, and `500` error pages. These full-screen error pages are clear and secure, improving the user experience.
+
+### 🐞 Bug Fixes
+
+- Fixed an issue where the built-in homepage did not have a `name` configured, causing cache invalidation after setting the page cache.
+- Fixed an issue where, in an embedded same-origin `iframe` page, when the `beforeunload` event was registered, right-clicking a tab and reloading it would cause the browser to prompt two confirmation blocks.
+- Fixed an issue where pages with `keepAlive: true` set to cache invalidation when the initial load was slow.
+- Fixed an issue where multiple tabs could be activated simultaneously when using the same parameters in different routes.
+- Fixed an issue where the right-click menu on a tab displayed incorrectly when passing `params` parameters.
+
+### 🍏 Perf
+
+- Optimized the `nprogress` progress bar. It no longer displays when reloading a page or requesting an interface, improving the user experience.
+- Optimized the timing of capturing all unmatched routes and redirecting to a full-screen `404` page.
+- Explicitly configured the `Tailwind CSS` entry file path to improve the contextual recognition and prompting performance of the `Tailwind CSS IntelliSense` plugin
+
 # 6.1.0 (2025-07-31)
 
 ### ✔️ Refactor

CHANGELOG.zh_CN.md

@@ -1,3 +1,23 @@
+# 6.2.0 (2025-10-16)
+
+### 🎫 Feat
+
+-  添加全屏`403`、`404`、`500`页面，全屏错误页面清晰且安全，提升用户体验
+
+### 🐞 Bug fixes
+
+- 修复内置的首页未设置`name`导致设置页面缓存后缓存无效的问题
+- 修复在内嵌同源`iframe`页面中，当其注册了`beforeunload`事件时，右键标签页点击重新加载导致浏览器弹出两次确认拦截的问题
+- 修复设置了`keepAlive: true`的页面在初次加载缓慢的情况下出现的页面缓存失效的问题
+- 修复不同路由使用相同参数时，多个标签页会同时被激活的问题
+- 修复`params`传参模式下标签页右键菜单显示不正确的问题
+
+### 🍏 Perf
+
+- 优化`nprogress`进度条，页面重进或接口请求时不再显示进度条，提升用户体验
+- 优化当捕获所有未匹配路由并跳转全屏`404`页面的时机
+- 显式配置`Tailwind CSS`入口文件路径，优化`Tailwind CSS IntelliSense`插件的上下文识别与提示性能
+
 # 6.1.0 (2025-07-31)
 
 ### ✔️ Refactor

index.html

@@ -1,15 +1,23 @@
 <!doctype html>
 <html lang="en">
+
 <head>
   <meta charset="UTF-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
   <meta name="renderer" content="webkit" />
-    <meta
+  <meta name="viewport"
-      name="viewport"
+    content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0" />
-      content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0"
-    />
   <title>vue-pure-admin</title>
   <link rel="icon" href="/favicon.ico" />
+  <script>
+    var _hmt = _hmt || [];
+    (function () {
+      var hm = document.createElement("script")
+      hm.src = "https://hm.baidu.com/hm.js?d3824e75ef2bf6d851035f74ae1aec68"
+      var s = document.getElementsByTagName("script")[0]
+      s.parentNode.insertBefore(hm, s)
+    })();
+  </script>
 </head>
 
 <body>
@@ -66,6 +74,7 @@
       }
 
       @keyframes load-animation {
+
         0%,
         80%,
         100% {
@@ -81,4 +90,5 @@
   </div>
   <script type="module" src="/src/main.ts"></script>
 </body>
+
 </html>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-pure-admin",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -72,7 +72,7 @@
     "deep-chat": "^2.2.2",
     "echarts": "^6.0.0",
     "el-table-infinite-scroll": "^3.0.7",
-    "element-plus": "^2.11.4",
+    "element-plus": "^2.11.7",
     "highlight.js": "^11.11.1",
     "intro.js": "^7.2.0",
     "js-cookie": "^3.0.5",

pnpm-lock.yaml

@@ -25,10 +25,10 @@ importers:
         version: 1.2.28
       '@pureadmin/descriptions':
         specifier: ^1.2.1
-        version: 1.2.1(echarts@6.0.0)(element-plus@2.11.4(vue@3.5.22(typescript@5.9.3)))(typescript@5.9.3)
+        version: 1.2.1(echarts@6.0.0)(element-plus@2.11.7(vue@3.5.22(typescript@5.9.3)))(typescript@5.9.3)
       '@pureadmin/table':
         specifier: ^3.3.0
-        version: 3.3.0(element-plus@2.11.4(vue@3.5.22(typescript@5.9.3)))(typescript@5.9.3)
+        version: 3.3.0(element-plus@2.11.7(vue@3.5.22(typescript@5.9.3)))(typescript@5.9.3)
       '@pureadmin/utils':
         specifier: ^2.6.2
         version: 2.6.2(echarts@6.0.0)(vue@3.5.22(typescript@5.9.3))
@@ -84,8 +84,8 @@ importers:
         specifier: ^3.0.7
         version: 3.0.7(typescript@5.9.3)
       element-plus:
-        specifier: ^2.11.4
+        specifier: ^2.11.7
-        version: 2.11.4(vue@3.5.22(typescript@5.9.3))
+        version: 2.11.7(vue@3.5.22(typescript@5.9.3))
       highlight.js:
         specifier: ^11.11.1
         version: 11.11.1
@@ -124,7 +124,7 @@ importers:
         version: 3.27.0
       plus-pro-components:
         specifier: ^0.1.29
-        version: 0.1.29(element-plus@2.11.4(vue@3.5.22(typescript@5.9.3)))(vue@3.5.22(typescript@5.9.3))
+        version: 0.1.29(element-plus@2.11.7(vue@3.5.22(typescript@5.9.3)))(vue@3.5.22(typescript@5.9.3))
       qrcode:
         specifier: ^1.5.4
         version: 1.5.4
@@ -2842,8 +2842,8 @@ packages:
   electron-to-chromium@1.5.234:
     resolution: {integrity: sha512-RXfEp2x+VRYn8jbKfQlRImzoJU01kyDvVPBmG39eU2iuRVhuS6vQNocB8J0/8GrIMLnPzgz4eW6WiRnJkTuNWg==}
 
-  element-plus@2.11.4:
+  element-plus@2.11.7:
-    resolution: {integrity: sha512-sLq+Ypd0cIVilv8wGGMEGvzRVBBsRpJjnAS5PsI/1JU1COZXqzH3N1UYMUc/HCdvdjf6dfrBy80Sj7KcACsT7w==}
+    resolution: {integrity: sha512-Bh47wuzsqaNBNDkbtlOlZER1cGcOB8GsXp/+C9b95MOrk0wvoHUV4NKKK7xMkfYNFYdYysQ752oMhnExgAL6+g==}
     peerDependencies:
       vue: ^3.2.0
 
@@ -2929,9 +2929,6 @@ packages:
     resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
     engines: {node: '>=6'}
 
-  escape-html@1.0.3:
-    resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
-
   escape-string-regexp@2.0.0:
     resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==}
     engines: {node: '>=8'}
@@ -6793,19 +6790,19 @@ snapshots:
 
   '@popperjs/core@2.11.8': {}
 
-  '@pureadmin/descriptions@1.2.1(echarts@6.0.0)(element-plus@2.11.4(vue@3.5.22(typescript@5.9.3)))(typescript@5.9.3)':
+  '@pureadmin/descriptions@1.2.1(echarts@6.0.0)(element-plus@2.11.7(vue@3.5.22(typescript@5.9.3)))(typescript@5.9.3)':
     dependencies:
       '@element-plus/icons-vue': 2.3.2(vue@3.5.22(typescript@5.9.3))
       '@pureadmin/utils': 2.6.2(echarts@6.0.0)(vue@3.5.22(typescript@5.9.3))
-      element-plus: 2.11.4(vue@3.5.22(typescript@5.9.3))
+      element-plus: 2.11.7(vue@3.5.22(typescript@5.9.3))
       vue: 3.5.22(typescript@5.9.3)
     transitivePeerDependencies:
       - echarts
       - typescript
 
-  '@pureadmin/table@3.3.0(element-plus@2.11.4(vue@3.5.22(typescript@5.9.3)))(typescript@5.9.3)':
+  '@pureadmin/table@3.3.0(element-plus@2.11.7(vue@3.5.22(typescript@5.9.3)))(typescript@5.9.3)':
     dependencies:
-      element-plus: 2.11.4(vue@3.5.22(typescript@5.9.3))
+      element-plus: 2.11.7(vue@3.5.22(typescript@5.9.3))
       vue: 3.5.22(typescript@5.9.3)
     transitivePeerDependencies:
       - typescript
@@ -8277,7 +8274,7 @@ snapshots:
   el-table-infinite-scroll@3.0.7(typescript@5.9.3):
     dependencies:
       core-js: 3.46.0
-      element-plus: 2.11.4(vue@3.5.22(typescript@5.9.3))
+      element-plus: 2.11.7(vue@3.5.22(typescript@5.9.3))
       vue: 3.5.22(typescript@5.9.3)
     transitivePeerDependencies:
       - '@vue/composition-api'
@@ -8285,7 +8282,7 @@ snapshots:
 
   electron-to-chromium@1.5.234: {}
 
-  element-plus@2.11.4(vue@3.5.22(typescript@5.9.3)):
+  element-plus@2.11.7(vue@3.5.22(typescript@5.9.3)):
     dependencies:
       '@ctrl/tinycolor': 3.6.1
       '@element-plus/icons-vue': 2.3.2(vue@3.5.22(typescript@5.9.3))
@@ -8296,7 +8293,6 @@ snapshots:
       '@vueuse/core': 9.13.0(vue@3.5.22(typescript@5.9.3))
       async-validator: 4.2.5
       dayjs: 1.11.18
-      escape-html: 1.0.3
       lodash: 4.17.21
       lodash-es: 4.17.21
       lodash-unified: 1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.17.21)(lodash@4.17.21)
@@ -8430,8 +8426,6 @@ snapshots:
 
   escalade@3.2.0: {}
 
-  escape-html@1.0.3: {}
-
   escape-string-regexp@2.0.0: {}
 
   escape-string-regexp@4.0.0: {}
@@ -9991,10 +9985,10 @@ snapshots:
       exsolve: 1.0.7
       pathe: 2.0.3
 
-  plus-pro-components@0.1.29(element-plus@2.11.4(vue@3.5.22(typescript@5.9.3)))(vue@3.5.22(typescript@5.9.3)):
+  plus-pro-components@0.1.29(element-plus@2.11.7(vue@3.5.22(typescript@5.9.3)))(vue@3.5.22(typescript@5.9.3)):
     dependencies:
       '@element-plus/icons-vue': 2.3.2(vue@3.5.22(typescript@5.9.3))
-      element-plus: 2.11.4(vue@3.5.22(typescript@5.9.3))
+      element-plus: 2.11.7(vue@3.5.22(typescript@5.9.3))
       lodash-es: 4.17.21
       sortablejs: 1.15.6
       vue: 3.5.22(typescript@5.9.3)

public/platform-config.json

@@ -1,5 +1,5 @@
 {
-  "Version": "6.1.0",
+  "Version": "6.2.0",
   "Title": "PureAdmin",
   "FixedHeader": true,
   "HiddenSideBar": false,

src/App.vue

@@ -16,6 +16,7 @@ import en from "element-plus/es/locale/lang/en";
 import zhCn from "element-plus/es/locale/lang/zh-cn";
 import plusEn from "plus-pro-components/es/locale/lang/en";
 import plusZhCn from "plus-pro-components/es/locale/lang/zh-cn";
+import { ElNotification } from "element-plus";
 
 export default defineComponent({
   name: "app",
@@ -54,5 +55,31 @@ export default defineComponent({
       );
     }
   }
+  // mounted() {
+  //   ElNotification({
+  //     title: "平台最新活动与动态",
+  //     duration: 0,
+  //     customClass: "fullpage-notification",
+  //     // @ts-expect-error
+  //     style: { width: "260px" },
+  //     position: "bottom-right",
+  //     dangerouslyUseHTMLString: true,
+  //     message: `
+  //       <a target='_blank' class='block text-base text-center border mt-4 rounded hover:text-[red]!' href='https://pure-admin.cn/pages/service/#%E6%9C%80%E6%96%B0%E6%B4%BB%E5%8A%A8%E4%B8%8E%E5%8A%A8%E6%80%81'>
+  //       点我查看
+  //       </a>
+  //     `
+  //   });
+  // }
 });
 </script>
+
+<style>
+.fullpage-notification > .el-notification__group > .el-notification__closeBtn {
+  top: 15px;
+}
+.fullpage-notification > div > h2 {
+  color: red;
+  font-size: 18px;
+}
+</style>

src/components/ReDialog/type.ts

@@ -35,8 +35,20 @@ type DialogProps = {
   top?: string;
   /** 是否需要遮罩层，默认 `true` */
   modal?: boolean;
+  /** 是否允许穿透遮罩层，默认 `false`。使用时需将 `modal` 属性设置为 `false` */
+  modalPenetrable?: boolean;
+  /** 遮罩的自定义类名 */
+  modalClass?: string;
+  /** `header` 部分的自定义 `class` 名 */
+  headerClass?: string;
+  /** `body` 部分的自定义 `class` 名 */
+  bodyClass?: string;
+  /** `footer` 部分的自定义 `class` 名 */
+  footerClass?: string;
   /** `Dialog` 自身是否插入至 `body` 元素上。嵌套的 `Dialog` 必须指定该属性并赋值为 `true`，默认 `false` */
   appendToBody?: boolean;
+  /** `Dialog` 挂载到哪个 `DOM` 元素，该属性会覆盖 `append-to-body` 属性，默认 `body` */
+  appendTo?: string | HTMLElement;
   /** 是否在 `Dialog` 出现时将 `body` 滚动锁定，默认 `true` */
   lockScroll?: boolean;
   /** `Dialog` 的自定义类名 */
@@ -57,12 +69,22 @@ type DialogProps = {
   beforeClose?: (done: DoneFn) => void;
   /** 为 `Dialog` 启用可拖拽功能，默认 `false` */
   draggable?: boolean;
+  /** 拖动范围可以超出可视区，默认 `false` */
+  overflow?: boolean;
   /** 是否让 `Dialog` 的 `header` 和 `footer` 部分居中排列，默认 `false` */
   center?: boolean;
   /** 是否水平垂直对齐对话框，默认 `false` */
   alignCenter?: boolean;
   /** 当关闭 `Dialog` 时，销毁其中的元素，默认 `false` */
   destroyOnClose?: boolean;
+  /** 自定义关闭图标，默认 `Close` */
+  closeIcon?: string | Component;
+  /** 和原生的 `CSS` 的 `z-index` 相同，改变 `z` 轴的顺序 */
+  zIndex?: number;
+  /** `header` 的 `aria-level` 属性 */
+  headerAriaLevel?: string;
+  /** 对话框动画的自定义过渡配置。可以是一个字符串（过渡名称），也可以是一个包含 `Vue` 过渡属性的对象，默认 `dialog-fade` */
+  transition?: string | object;
 };
 
 //element-plus.org/zh-CN/component/popconfirm.html#attributes

src/components/ReDrawer/type.ts

@@ -6,7 +6,6 @@ type ArgsType = {
   /** `cancel` 点击取消按钮、`sure` 点击确定按钮、`close` 点击右上角关闭按钮或空白页或按下了 `esc` 键 */
   command: "cancel" | "sure" | "close";
 };
-
 type ButtonType =
   | "primary"
   | "success"
@@ -20,11 +19,11 @@ type DrawerProps = {
   visible?: boolean;
   /** `Drawer` 自身是否插入至 `body` 元素上。嵌套的 `Drawer` 必须指定该属性并赋值为 `true`，默认 `false` */
   appendToBody?: boolean;
-  /** 挂载到哪个 `DOM` 元素 将覆盖 `appendToBody` */
+  /** 挂载到哪个 `DOM` 元素，会覆盖 `appendToBody` 属性，默认 `body` */
   appendTo?: string;
   /** 是否在 `Drawer` 出现时将 `body` 滚动锁定，默认 `true` */
   lockScroll?: boolean;
-  /** 关闭前的回调，会暂停 `Drawer` 的关闭 回调函数内执行 `done` 参数方法的时候才是真正关闭对话框的时候 */
+  /** 关闭前的回调，会暂停 `Drawer` 的关闭，回调函数内执行 `done` 参数方法的时候才是真正关闭对话框的时候 */
   beforeClose?: (done: DoneFn) => void;
   /** 是否可以通过点击 `modal` 关闭 `Drawer` ，默认 `true` */
   closeOnClickModal?: boolean;
@@ -44,9 +43,13 @@ type DrawerProps = {
   destroyOnClose?: boolean;
   /** 是否需要遮罩层，默认 `true` */
   modal?: boolean;
+  /** 是否允许穿透遮罩层，默认 `false`。使用时需将 `modal` 属性设置为 `false` */
+  modalPenetrable?: boolean;
   /** `Drawer` 打开的方向，默认 `rtl` */
   direction?: "rtl" | "ltr" | "ttb" | "btt";
-  /** `Drawer` 窗体的大小, 当使用 `number` 类型时, 以像素为单位, 当使用 `string` 类型时, 请传入 `'x%'`, 否则便会以 `number` 类型解释 */
+  /** 是否启用可调整大小的功能，默认 `false` */
+  resizable?: boolean;
+  /** `Drawer` 窗体的大小, 当使用 `number` 类型时, 以像素为单位, 当使用 `string` 类型时, 请传入 `'x%'`, 否则便会以 `number` 类型解释，默认 `30%` */
   size?: string | number;
   /** `Drawer` 的标题 */
   title?: string;
@@ -54,6 +57,12 @@ type DrawerProps = {
   withHeader?: boolean;
   /** 遮罩层的自定义类名 */
   modalClass?: string;
+  /** `header` 部分的自定义 `class` 名 */
+  headerClass?: string;
+  /** `body` 部分的自定义 `class` 名 */
+  bodyClass?: string;
+  /** `footer` 部分的自定义 `class` 名 */
+  footerClass?: string;
   /** 设置 `z-index` */
   zIndex?: number;
   /** `header` 的 `aria-level` 属性，默认 `2` */

src/components/RePureTableBar/src/bar.tsx

@@ -100,7 +100,7 @@ export default defineComponent({
         "pt-[3px]",
         "px-[11px]",
         "border-b-[1px]",
-        "border-solid",
+        "border-b-solid",
         "border-[#dcdfe6]",
         "dark:border-[#303030]"
       ];

src/components/ReVxeTableBar/src/bar.tsx

@@ -93,7 +93,7 @@ export default defineComponent({
         "pt-[3px]",
         "px-[11px]",
         "border-b-[1px]",
-        "border-solid",
+        "border-b-solid",
         "border-[#dcdfe6]",
         "dark:border-[#303030]"
       ];

src/layout/components/lay-footer/index.vue

@@ -8,7 +8,7 @@ const TITLE = getConfig("Title");
   <footer
     class="layout-footer text-[rgba(0,0,0,0.6)] dark:text-[rgba(220,220,242,0.8)]"
   >
-    Copyright © 2020-present
+    Copyright © 2020-2025
     <a
       class="hover:text-primary!"
       href="https://github.com/pure-admin"
@@ -16,12 +16,23 @@ const TITLE = getConfig("Title");
     >
       &nbsp;{{ TITLE }}
     </a>
+    <!-- <div class="ml-8">
+      <span>赞助商：</span>
+      <a
+        class="hover:text-primary"
+        href="https://ai-tools.cn/resume/start"
+        target="_blank"
+      >
+        二猫 AI 简历
+      </a>
+    </div> -->
   </footer>
 </template>
 
 <style lang="scss" scoped>
 .layout-footer {
   display: flex;
+  flex-wrap: wrap;
   align-items: center;
   justify-content: center;
   width: 100%;

src/layout/components/lay-tag/index.vue

@@ -356,7 +356,7 @@ function onClickDrop(key, item, selectRoute?: RouteConfigs) {
       break;
   }
   setTimeout(() => {
-    showMenuModel(route.fullPath, route.query);
+    showMenuModel(route.fullPath, route.query, route.params);
   });
 }
 
@@ -391,15 +391,18 @@ function disabledMenus(value: boolean, fixedTag = false) {
 function showMenuModel(
   currentPath: string,
   query: object = {},
+  params: object = {},
   refresh = false
 ) {
   const allRoute = multiTags.value;
   const routeLength = multiTags.value.length;
   let currentIndex = -1;
-  if (isAllEmpty(query)) {
+  if (!isAllEmpty(params)) {
-    currentIndex = allRoute.findIndex(v => v.path === currentPath);
+    currentIndex = allRoute.findIndex(v => isEqual(v.params, params));
-  } else {
+  } else if (!isAllEmpty(query)) {
     currentIndex = allRoute.findIndex(v => isEqual(v.query, query));
+  } else {
+    currentIndex = allRoute.findIndex(v => v.path === currentPath);
   }
   function fixedTagDisabled() {
     if (allRoute[currentIndex]?.meta?.fixedTag) {
@@ -465,14 +468,14 @@ function openMenu(tag, e) {
   } else if (route.path !== tag.path && route.name !== tag.name) {
     // 右键菜单不匹配当前路由，隐藏刷新
     tagsViews[0].show = false;
-    showMenuModel(tag.path, tag.query);
+    showMenuModel(tag.path, tag.query, tag.params);
   } else if (multiTags.value.length === 2 && route.path !== tag.path) {
     showMenus(true);
     // 只有两个标签时不显示关闭其他标签页
     tagsViews[4].show = false;
-  } else if (route.path === tag.path) {
+    showMenuModel(tag.path, tag.query, tag.params);
-    // 右键当前激活的菜单
+  } else {
-    showMenuModel(tag.path, tag.query, true);
+    showMenuModel(tag.path, tag.query, tag.params, true);
   }
 
   currentSelect.value = tag;

src/layout/hooks/useTag.ts

@@ -114,14 +114,21 @@ export function useTags() {
   ]);
 
   function conditionHandle(item, previous, next) {
+    const currentName = route.name || "";
+    const itemName = item.name || "";
+
     if (isBoolean(route?.meta?.showLink) && route?.meta?.showLink === false) {
       if (Object.keys(route.query).length > 0) {
-        return isEqual(route.query, item.query) ? previous : next;
+        return currentName === itemName && isEqual(route.query, item.query)
+          ? previous
+          : next;
       } else {
-        return isEqual(route.params, item.params) ? previous : next;
+        return currentName === itemName && isEqual(route.params, item.params)
+          ? previous
+          : next;
       }
     } else {
-      return route.path === item.path ? previous : next;
+      return currentName === itemName ? previous : next;
     }
   }
 

src/store/modules/multiTags.ts

@@ -80,22 +80,15 @@ export const useMultiTagsStore = defineStore("pure-multiTags", {
             if (isBoolean(tagVal?.meta?.showLink) && !tagVal?.meta?.showLink)
               return;
             const tagPath = tagVal.path;
-            // 判断tag是否已存在
             const tagHasExits = this.multiTags.some(tag => {
-              return tag.path === tagPath;
+              return (
+                tag.path === tagPath &&
+                isEqual(tag?.query, tagVal?.query) &&
+                isEqual(tag?.params, tagVal?.params)
+              );
             });
 
-            // 判断tag中的query键值是否相等
+            if (tagHasExits) return;
-            const tagQueryHasExits = this.multiTags.some(tag => {
-              return isEqual(tag?.query, tagVal?.query);
-            });
-
-            // 判断tag中的params键值是否相等
-            const tagParamsHasExits = this.multiTags.some(tag => {
-              return isEqual(tag?.params, tagVal?.params);
-            });
-
-            if (tagHasExits && tagQueryHasExits && tagParamsHasExits) return;
 
             // 动态路由可打开的最大数量
             const dynamicLevel = tagVal?.meta?.dynamicLevel ?? -1;

src/store/modules/permission.ts

@@ -2,7 +2,6 @@ import { defineStore } from "pinia";
 import {
   type cacheType,
   store,
-  debounce,
   ascending,
   getKeyList,
   filterTree,
@@ -33,21 +32,8 @@ export const usePermissionStore = defineStore("pure-permission", {
         this.constantMenus.concat(routes) as any
       );
     },
-    cacheOperate({ mode, name }: cacheType) {
-      const delIndex = this.cachePageList.findIndex(v => v === name);
-      switch (mode) {
-        case "refresh":
-          this.cachePageList = this.cachePageList.filter(v => v !== name);
-          break;
-        case "add":
-          this.cachePageList.push(name);
-          break;
-        case "delete":
-          delIndex !== -1 && this.cachePageList.splice(delIndex, 1);
-          break;
-      }
     /** 监听缓存页面是否存在于标签页，不存在则删除 */
-      debounce(() => {
+    clearCache() {
       let cacheLength = this.cachePageList.length;
       const nameList = getKeyList(useMultiTagsStoreHook().multiTags, "name");
       while (cacheLength > 0) {
@@ -59,7 +45,22 @@ export const usePermissionStore = defineStore("pure-permission", {
           );
         cacheLength--;
       }
-      })();
+    },
+    cacheOperate({ mode, name }: cacheType) {
+      const delIndex = this.cachePageList.findIndex(v => v === name);
+      switch (mode) {
+        case "refresh":
+          this.cachePageList = this.cachePageList.filter(v => v !== name);
+          this.clearCache();
+          break;
+        case "add":
+          this.cachePageList.push(name);
+          break;
+        case "delete":
+          delIndex !== -1 && this.cachePageList.splice(delIndex, 1);
+          this.clearCache();
+          break;
+      }
     },
     /** 清空缓存页面 */
     clearAllCachePage() {

src/style/sidebar.scss

@@ -172,10 +172,6 @@
     .is-active > .el-sub-menu__title,
     .is-active.submenu-title-noDropdown {
       color: var(--pure-theme-sub-menu-active-text) !important;
-
-      i {
-        color: var(--pure-theme-sub-menu-active-text) !important;
-      }
     }
 
     .is-active {
@@ -235,6 +231,7 @@
     .is-active.submenu-title-noDropdown.outer-most > * {
       z-index: 1;
       color: #fff;
+      background: transparent !important;
     }
 
     .is-active.submenu-title-noDropdown.outer-most::before {
@@ -270,10 +267,6 @@
     .is-active > .el-sub-menu__title,
     .is-active.submenu-title-noDropdown {
       color: var(--pure-theme-sub-menu-active-text) !important;
-
-      i {
-        color: var(--pure-theme-sub-menu-active-text) !important;
-      }
     }
 
     /* 子菜单中还有子菜单 */
@@ -374,10 +367,6 @@
     .is-active > .el-sub-menu__title,
     .is-active.submenu-title-noDropdown {
       color: var(--pure-theme-sub-menu-active-text) !important;
-
-      i {
-        color: var(--pure-theme-sub-menu-active-text) !important;
-      }
     }
 
     .nest-menu .el-sub-menu > .el-sub-menu__title,
@@ -541,10 +530,6 @@
     .is-active > .el-sub-menu__title,
     .is-active.submenu-title-noDropdown {
       color: var(--pure-theme-sub-menu-active-text) !important;
-
-      i {
-        color: var(--pure-theme-sub-menu-active-text) !important;
-      }
     }
 
     .is-active {

src/views/components/dialog/index.vue

@@ -463,6 +463,16 @@ function onSureBtnLoading() {
     }
   });
 }
+
+// 自定义动画
+function onTransitionClick(title, transition) {
+  addDialog({
+    width: "30%",
+    title,
+    transition,
+    contentRenderer: () => <p>{JSON.stringify(transition)}</p>
+  });
+}
 </script>
 
 <template>
@@ -551,5 +561,112 @@ function onSureBtnLoading() {
         点击底部确定按钮可开启按钮动画
       </el-button>
     </el-space>
+    <el-divider />
+    <el-space wrap>
+      <el-button
+        @click="onTransitionClick('淡入淡出动画（默认）', 'dialog-fade')"
+      >
+        淡入淡出动画（默认）
+      </el-button>
+      <el-button @click="onTransitionClick('缩放动画', 'dialog-scale')">
+        缩放动画
+      </el-button>
+      <el-button @click="onTransitionClick('滑动动画', 'dialog-slide')">
+        滑动动画
+      </el-button>
+      <el-button @click="onTransitionClick('弹跳动画', 'dialog-bounce')">
+        弹跳动画
+      </el-button>
+      <el-button
+        @click="
+          onTransitionClick('自定义动画事件处理器（可配置对象）', {
+            name: 'dialog-custom-object',
+            appear: true,
+            mode: 'out-in',
+            duration: 500
+          })
+        "
+      >
+        自定义动画事件处理器（可配置对象）
+      </el-button>
+    </el-space>
   </el-card>
 </template>
+
+<style>
+/* Scale Animation */
+.dialog-scale-enter-active,
+.dialog-scale-leave-active,
+.dialog-scale-enter-active .el-dialog,
+.dialog-scale-leave-active .el-dialog {
+  transition: all 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+}
+
+.dialog-scale-enter-from,
+.dialog-scale-leave-to {
+  opacity: 0;
+}
+
+.dialog-scale-enter-from .el-dialog,
+.dialog-scale-leave-to .el-dialog {
+  opacity: 0;
+  transform: scale(0.5);
+}
+
+/* Slide Animation */
+.dialog-slide-enter-active,
+.dialog-slide-leave-active,
+.dialog-slide-enter-active .el-dialog,
+.dialog-slide-leave-active .el-dialog {
+  transition: all 0.3s cubic-bezier(0.25, 0.46, 0.45, 0.94);
+}
+
+.dialog-slide-enter-from,
+.dialog-slide-leave-to {
+  opacity: 0;
+}
+
+.dialog-slide-enter-from .el-dialog,
+.dialog-slide-leave-to .el-dialog {
+  opacity: 0;
+  transform: translateY(-100px);
+}
+
+/* Bounce Animation */
+.dialog-bounce-enter-active,
+.dialog-bounce-leave-active,
+.dialog-bounce-enter-active .el-dialog,
+.dialog-bounce-leave-active .el-dialog {
+  transition: all 0.5s cubic-bezier(0.175, 0.885, 0.32, 1.275);
+}
+
+.dialog-bounce-enter-from,
+.dialog-bounce-leave-to {
+  opacity: 0;
+}
+
+.dialog-bounce-enter-from .el-dialog,
+.dialog-bounce-leave-to .el-dialog {
+  opacity: 0;
+  transform: scale(0.3) translateY(-50px);
+}
+
+/* Object Configuration Animation */
+.dialog-custom-object-enter-active,
+.dialog-custom-object-leave-active,
+.dialog-custom-object-enter-active .el-dialog,
+.dialog-custom-object-leave-active .el-dialog {
+  transition: all 0.5s cubic-bezier(0.25, 0.8, 0.25, 1);
+}
+
+.dialog-custom-object-enter-from,
+.dialog-custom-object-leave-to {
+  opacity: 0;
+}
+
+.dialog-custom-object-enter-from .el-dialog,
+.dialog-custom-object-leave-to .el-dialog {
+  opacity: 0;
+  transform: rotate(180deg) scale(0.5);
+}
+</style>

src/views/components/drawer/index.vue

@@ -422,6 +422,17 @@ function onSureBtnLoading() {
     }
   });
 }
+
+function onResizableClick(title, content, direction) {
+  addDrawer({
+    title,
+    direction,
+    resizable: true, // 启用可调整大小的功能
+    contentRenderer: () => (
+      <p class="text-[var(--el-color-primary)]">{content}</p> // jsx 语法 （注意在.vue文件启用jsx语法，需要在script开启lang="tsx"）
+    )
+  });
+}
 </script>
 
 <template>
@@ -498,5 +509,28 @@ function onSureBtnLoading() {
         点击底部确定按钮可开启按钮动画
       </el-button>
     </el-space>
+    <el-divider />
+    <el-space wrap>
+      <el-button
+        @click="onResizableClick('从左侧打开', '拖动抽屉右侧边缘', 'ltr')"
+      >
+        拖拽调整大小（从左侧打开）
+      </el-button>
+      <el-button
+        @click="onResizableClick('从右侧打开', '拖动抽屉左侧边缘', 'rtl')"
+      >
+        拖拽调整大小（从右侧打开）
+      </el-button>
+      <el-button
+        @click="onResizableClick('从顶部打开', '拖动抽屉底部边缘', 'ttb')"
+      >
+        拖拽调整大小（从顶部打开）
+      </el-button>
+      <el-button
+        @click="onResizableClick('从底部打开', '拖动抽屉顶部边缘', 'btt')"
+      >
+        拖拽调整大小（从底部打开）
+      </el-button>
+    </el-space>
   </el-card>
 </template>

src/views/login/index.vue

@@ -336,9 +336,9 @@ watch(loginDay, value => {
       </div>
     </div>
     <div
-      class="w-full flex-c absolute bottom-3 text-sm text-[rgba(0,0,0,0.6)] dark:text-[rgba(220,220,242,0.8)]"
+      class="w-full flex-c flex-wrap absolute bottom-3 text-sm text-[rgba(0,0,0,0.6)] dark:text-[rgba(220,220,242,0.8)]"
     >
-      Copyright © 2020-present
+      Copyright © 2020-2025
       <a
         class="hover:text-primary!"
         href="https://github.com/pure-admin"
@@ -346,6 +346,16 @@ watch(loginDay, value => {
       >
         &nbsp;{{ title }}
       </a>
+      <!-- <div class="ml-8">
+        <span>赞助商：</span>
+        <a
+          class="hover:text-primary"
+          href="https://ai-tools.cn/resume/start"
+          target="_blank"
+        >
+          二猫 AI 简历
+        </a>
+      </div> -->
     </div>
   </div>
 </template>