chore(deps): update

.nvmrc

@@ -1 +1 @@
-v22.14.0
+v22.15.1

CHANGELOG.en_US.md

@@ -31,7 +31,7 @@
 
 ### ✔️Refactor
 
-- Upgrade `vite` to `v6` version, upgrade `sass` to the latest version, reconstruct the theme writing method, and deprecate [@pureadmin/theme](https://www.npmjs.com/package/@pureadmin/theme) , click to view [Related optimization point details](https://github.com/pure-admin/vue-pure-admin/pull/1188#issue-2630095115). For users who have the [Max version](https://pure-admin.cn/pages/max/), it is strongly recommended to upgrade. Subsequent Max version users will enjoy a more modern, beautiful and highly customized theme color
+- Upgrade `vite` to `v6` version, upgrade `sass` to the latest version, reconstruct the theme writing method, and deprecate [@pureadmin/theme](https://www.npmjs.com/package/@pureadmin/theme) , click to view [Related optimization point details](https://github.com/pure-admin/vue-pure-admin/pull/1188#issue-2630095115). For users who have the [Max version](https://pure-admin.cn/pages/service/#max-%E7%89%88%E6%9C%AC), it is strongly recommended to upgrade. Subsequent Max version users will enjoy a more modern, beautiful and highly customized theme color
 - Use [code-inspector-plugin](https://www.npmjs.com/package/code-inspector-plugin) to replace [vite-plugin-vue-inspector](https://www.npmjs.com/package/vite-plugin-vue-inspector)
 
 ### 🎫Feat

CHANGELOG.md

@@ -31,7 +31,7 @@
 
 ### ✔️Refactor
 
-- Upgrade `vite` to `v6` version, upgrade `sass` to the latest version, reconstruct the theme writing method, and deprecate [@pureadmin/theme](https://www.npmjs.com/package/@pureadmin/theme) , click to view [Related optimization point details](https://github.com/pure-admin/vue-pure-admin/pull/1188#issue-2630095115). For users who have the [Max version](https://pure-admin.cn/pages/max/), it is strongly recommended to upgrade. Subsequent Max version users will enjoy a more modern, beautiful and highly customized theme color
+- Upgrade `vite` to `v6` version, upgrade `sass` to the latest version, reconstruct the theme writing method, and deprecate [@pureadmin/theme](https://www.npmjs.com/package/@pureadmin/theme) , click to view [Related optimization point details](https://github.com/pure-admin/vue-pure-admin/pull/1188#issue-2630095115). For users who have the [Max version](https://pure-admin.cn/pages/service/#max-%E7%89%88%E6%9C%AC), it is strongly recommended to upgrade. Subsequent Max version users will enjoy a more modern, beautiful and highly customized theme color
 - Use [code-inspector-plugin](https://www.npmjs.com/package/code-inspector-plugin) to replace [vite-plugin-vue-inspector](https://www.npmjs.com/package/vite-plugin-vue-inspector)
 
 ### 🎫Feat

CHANGELOG.zh_CN.md

@@ -31,7 +31,7 @@
 
 ### ✔️ Refactor
 
-- 升级`vite`至`v6`版本，升级`sass`至最新版，重构主题写法，弃用 [@pureadmin/theme](https://www.npmjs.com/package/@pureadmin/theme)，点击查看 [相关优化点细节](https://github.com/pure-admin/vue-pure-admin/pull/1188#issue-2630095115)。对于拥有 [Max版本](https://pure-admin.cn/pages/max/) 的用户平台强烈建议升级，后续`Max版本用户`会享有一套更现代、美观且自定义程度高的主题色
+- 升级`vite`至`v6`版本，升级`sass`至最新版，重构主题写法，弃用 [@pureadmin/theme](https://www.npmjs.com/package/@pureadmin/theme)，点击查看 [相关优化点细节](https://github.com/pure-admin/vue-pure-admin/pull/1188#issue-2630095115)。对于拥有 [Max版本](https://pure-admin.cn/pages/service/#max-%E7%89%88%E6%9C%AC) 的用户平台强烈建议升级，后续`Max版本用户`会享有一套更现代、美观且自定义程度高的主题色
 - 使用 [code-inspector-plugin](https://www.npmjs.com/package/code-inspector-plugin) 替换 [vite-plugin-vue-inspector](https://www.npmjs.com/package/vite-plugin-vue-inspector)
 
 ### 🎫 Feat

README.en-US.md

@@ -31,18 +31,10 @@ The simplified version is based on the shelf extracted from [vue-pure-admin](htt
 [Click me to view vue-pure-admin documentation](https://pure-admin.cn/)  
 [Click me to view @pureadmin/utils documentation](https://pure-admin-utils.netlify.app)
 
-## Quality service, software outsourcing, sponsorship support
+## Premium service
 
 [Click me for details](https://pure-admin.cn/pages/service/)
 
-## `js` version
-
-[Click me to view js version](https://pure-admin.cn/pages/js/)
-
-## `max` version
-
-[Click me to view the max version](https://pure-admin.cn/pages/max/)
-
 ## Tauri
 
 [Click Watch Tauri](https://github.com/pure-admin/tauri-pure-admin)
@@ -192,6 +184,7 @@ Thank you very much for your in-depth understanding of the source code and your
 |      [edgexie](https://github.com/edgexie)      |   [code](https://github.com/pure-admin/vue-pure-admin/commits?author=edgexie)    |
 |       [way-jm](https://github.com/way-jm)       |    [code](https://github.com/pure-admin/vue-pure-admin/commits?author=way-jm)    |
 |   [simple-hui](https://github.com/simple-hui)   |  [code](https://github.com/pure-admin/vue-pure-admin/commits?author=simple-hui)  |
+|   [tinysimple](https://github.com/tinysimple)   |  [code](https://github.com/pure-admin/vue-pure-admin/commits?author=tinysimple)  |
 
 ## Git Contribution submission specification
 

README.md

@@ -32,18 +32,10 @@
 [点我查看 vue-pure-admin 文档](https://pure-admin.cn/)  
 [点我查看 @pureadmin/utils 文档](https://pure-admin-utils.netlify.app)
 
-## 优质服务、软件外包、赞助支持
+## 高级服务
 
 [点我查看详情](https://pure-admin.cn/pages/service/)
 
-## `js` 版本
-
-[点我查看 js 版本](https://pure-admin.cn/pages/js/)
-
-## `max` 版本
-
-[点我查看 max 版本](https://pure-admin.cn/pages/max/)
-
 ## `Tauri` 版本
 
 [点我查看 Tauri 版本](https://github.com/pure-admin/tauri-pure-admin)
@@ -193,6 +185,7 @@ docker run -dp 8080:80  --name pure-admin vue-pure-admin
 |      [edgexie](https://github.com/edgexie)      |   [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=edgexie)    |
 |       [way-jm](https://github.com/way-jm)       |    [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=way-jm)    |
 |   [simple-hui](https://github.com/simple-hui)   |  [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=simple-hui)  |
+|   [tinysimple](https://github.com/tinysimple)   |  [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=tinysimple)  |
 
 ## `Git` 贡献提交规范
 

package.json

@@ -48,31 +48,31 @@
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
-    "@howdyjs/mouse-menu": "^2.1.6",
+    "@howdyjs/mouse-menu": "^2.1.7",
     "@infectoone/vue-ganttastic": "^2.3.2",
     "@logicflow/core": "^1.2.28",
     "@logicflow/extension": "^1.2.28",
     "@pureadmin/descriptions": "^1.2.1",
     "@pureadmin/table": "^3.2.1",
-    "@pureadmin/utils": "^2.6.0",
+    "@pureadmin/utils": "^2.6.1",
     "@vue-flow/background": "^1.3.2",
-    "@vue-flow/core": "^1.42.5",
+    "@vue-flow/core": "^1.44.0",
-    "@vueuse/core": "^13.1.0",
+    "@vueuse/core": "^13.3.0",
     "@vueuse/motion": "^3.0.3",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
     "@zxcvbn-ts/core": "^3.0.4",
     "animate.css": "^4.1.1",
-    "axios": "^1.8.4",
+    "axios": "^1.9.0",
     "china-area-data": "^5.0.1",
     "codemirror": "^5.65.19",
     "codemirror-editor-vue3": "^2.8.0",
     "cropperjs": "^1.6.2",
     "dayjs": "^1.11.13",
-    "deep-chat": "^2.1.1",
+    "deep-chat": "^2.2.1",
     "echarts": "^5.6.0",
     "el-table-infinite-scroll": "^3.0.6",
-    "element-plus": "^2.9.7",
+    "element-plus": "^2.9.11",
     "highlight.js": "^11.11.1",
     "intro.js": "^7.2.0",
     "js-cookie": "^3.0.5",
@@ -83,25 +83,25 @@
     "mqtt": "4.3.7",
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
-    "pinia": "^3.0.1",
+    "pinia": "^3.0.2",
     "pinyin-pro": "^3.26.0",
-    "plus-pro-components": "^0.1.22",
+    "plus-pro-components": "^0.1.23",
     "qrcode": "^1.5.4",
     "qs": "^6.14.0",
     "responsive-storage": "^2.2.0",
     "sortablejs": "^1.15.6",
-    "swiper": "^11.2.6",
+    "swiper": "^11.2.8",
     "typeit": "^8.8.7",
     "v-contextmenu": "^3.2.0",
     "v3-infinite-loading": "^1.3.2",
-    "vditor": "^3.10.9",
+    "vditor": "^3.11.1",
     "version-rocket": "^1.7.4",
-    "vue": "^3.5.13",
+    "vue": "^3.5.16",
-    "vue-i18n": "^11.1.3",
+    "vue-i18n": "^11.1.5",
     "vue-json-pretty": "^2.4.0",
     "vue-pdf-embed": "^2.1.2",
-    "vue-router": "^4.5.0",
+    "vue-router": "^4.5.1",
-    "vue-tippy": "^6.7.0",
+    "vue-tippy": "^6.7.1",
     "vue-types": "^6.0.0",
     "vue-virtual-scroller": "2.0.0-beta.8",
     "vue-waterfall-plugin-next": "^2.6.5",
@@ -109,62 +109,62 @@
     "vue3-puzzle-vcode": "^1.1.7",
     "vuedraggable": "^4.1.0",
     "vxe-table": "4.6.25",
-    "wavesurfer.js": "^7.9.4",
+    "wavesurfer.js": "^7.9.5",
-    "xgplayer": "^3.0.21",
+    "xgplayer": "^3.0.22",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.8.0",
+    "@commitlint/cli": "^19.8.1",
-    "@commitlint/config-conventional": "^19.8.0",
+    "@commitlint/config-conventional": "^19.8.1",
-    "@commitlint/types": "^19.8.0",
+    "@commitlint/types": "^19.8.1",
-    "@eslint/js": "^9.24.0",
+    "@eslint/js": "^9.28.0",
-    "@faker-js/faker": "^9.6.0",
+    "@faker-js/faker": "^9.8.0",
-    "@iconify/json": "^2.2.324",
+    "@iconify/json": "^2.2.343",
     "@iconify/vue": "4.2.0",
-    "@intlify/unplugin-vue-i18n": "^6.0.5",
+    "@intlify/unplugin-vue-i18n": "^6.0.8",
-    "@tailwindcss/vite": "^4.1.3",
+    "@tailwindcss/vite": "^4.1.8",
-    "@types/codemirror": "^5.60.15",
+    "@types/codemirror": "^5.60.16",
     "@types/dagre": "^0.7.52",
     "@types/intro.js": "^5.1.5",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.17.30",
+    "@types/node": "^20.17.57",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qrcode": "^1.5.5",
-    "@types/qs": "^6.9.18",
+    "@types/qs": "^6.14.0",
     "@types/sortablejs": "^1.15.8",
-    "@vitejs/plugin-vue": "^5.2.3",
+    "@vitejs/plugin-vue": "^5.2.4",
-    "@vitejs/plugin-vue-jsx": "^4.1.2",
+    "@vitejs/plugin-vue-jsx": "^4.2.0",
     "boxen": "^8.0.1",
-    "code-inspector-plugin": "^0.20.7",
+    "code-inspector-plugin": "^0.20.12",
-    "cssnano": "^7.0.6",
+    "cssnano": "^7.0.7",
     "dagre": "^0.8.5",
-    "eslint": "^9.24.0",
+    "eslint": "^9.28.0",
-    "eslint-config-prettier": "^10.1.1",
+    "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-prettier": "^5.2.6",
+    "eslint-plugin-prettier": "^5.4.1",
-    "eslint-plugin-vue": "^10.0.0",
+    "eslint-plugin-vue": "^10.1.0",
     "gradient-string": "^3.0.0",
     "husky": "^9.1.7",
-    "lint-staged": "^15.5.0",
+    "lint-staged": "^15.5.2",
-    "postcss": "^8.5.3",
+    "postcss": "^8.5.4",
     "postcss-html": "^1.8.0",
     "postcss-load-config": "^6.0.1",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.5.3",
     "rimraf": "^6.0.1",
     "rollup-plugin-visualizer": "^5.14.0",
-    "sass": "^1.86.3",
+    "sass": "^1.89.1",
-    "stylelint": "^16.18.0",
+    "stylelint": "^16.20.0",
     "stylelint-config-recess-order": "^6.0.0",
     "stylelint-config-recommended-vue": "^1.6.0",
     "stylelint-config-standard-scss": "^14.0.0",
     "stylelint-prettier": "^5.0.3",
     "svgo": "^3.3.2",
-    "tailwindcss": "^4.1.3",
+    "tailwindcss": "^4.1.8",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.29.1",
+    "typescript-eslint": "^8.33.0",
     "unplugin-icons": "^22.1.0",
-    "vite": "^6.2.5",
+    "vite": "^6.3.5",
     "vite-plugin-cdn-import": "^1.0.1",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-fake-server": "^2.2.0",
@@ -172,7 +172,7 @@
     "vite-plugin-router-warn": "^1.0.0",
     "vite-svg-loader": "^5.1.0",
     "vue-eslint-parser": "^10.1.3",
-    "vue-tsc": "^2.2.8"
+    "vue-tsc": "^2.2.10"
   },
   "engines": {
     "node": "^18.18.0 || ^20.9.0 || >=22.0.0",
@@ -200,6 +200,9 @@
       "esbuild",
       "typeit",
       "vue-demi"
+    ],
+    "ignoredBuiltDependencies": [
+      "@tailwindcss/oxide"
     ]
   }
 }

src/components/ReSegmented/src/index.css

@@ -98,7 +98,6 @@
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
-  transition: 0.1s;
 }
 
 .pure-segmented-group {

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

@@ -10,7 +10,7 @@ const TITLE = getConfig("Title");
   >
     Copyright © 2020-present
     <a
-      class="hover:text-primary"
+      class="hover:text-primary!"
       href="https://github.com/pure-admin"
       target="_blank"
     >

src/layout/components/lay-search/components/SearchModal.vue

@@ -6,8 +6,8 @@ import { useRouter } from "vue-router";
 import SearchResult from "./SearchResult.vue";
 import SearchFooter from "./SearchFooter.vue";
 import { useNav } from "@/layout/hooks/useNav";
+import { transformI18n } from "@/plugins/i18n";
 import SearchHistory from "./SearchHistory.vue";
-import { transformI18n, $t } from "@/plugins/i18n";
 import type { optionsItem, dragItem } from "../types";
 import { ref, computed, shallowRef, watch } from "vue";
 import { useDebounceFn, onKeyStroke } from "@vueuse/core";

src/layout/components/lay-sidebar/components/SidebarItem.vue

@@ -61,6 +61,21 @@ const getSubMenuIconStyle = computed((): CSSProperties => {
   };
 });
 
+const textClass = computed(() => {
+  const item = props.item;
+  const baseClass = "w-full! text-inherit!";
+  if (
+    layout.value !== "horizontal" &&
+    isCollapse.value &&
+    !toRaw(item.meta.icon) &&
+    ((layout.value === "vertical" && item.parentId === null) ||
+      (layout.value === "mix" && item.pathList.length === 2))
+  ) {
+    return `${baseClass} min-w-[54px]! text-center! px-3!`;
+  }
+  return baseClass;
+});
+
 const expandCloseIcon = computed(() => {
   if (!getConfig()?.MenuArrowIconNoTransition) return "";
   return {
@@ -144,7 +159,7 @@ function resolvePath(routePath) {
             item?.pathList?.length === 2)
         "
         truncated
-        class="w-full! pl-4! text-inherit!"
+        class="w-full! px-3! min-w-[54px]! text-center! text-inherit!"
       >
         {{ transformI18n(onlyOneChild.meta.title) }}
       </el-text>
@@ -195,15 +210,7 @@ function resolvePath(routePath) {
           offset: [0, -10],
           theme: tooltipEffect
         }"
-        :class="{
+        :class="textClass"
-          'w-full!': true,
-          'text-inherit!': true,
-          'pl-4!':
-            layout !== 'horizontal' &&
-            isCollapse &&
-            !toRaw(item.meta.icon) &&
-            item.parentId === null
-        }"
       >
         {{ transformI18n(item.meta.title) }}
       </ReText>

src/layout/components/lay-sidebar/components/SidebarTopCollapse.vue

@@ -32,7 +32,7 @@ const toggleClick = () => {
   >
     <IconifyIconOffline
       :icon="isActive ? MenuFold : MenuUnfold"
-      class="inline-block align-middle hover:text-primary dark:hover:text-white!"
+      class="inline-block! align-middle hover:text-primary dark:hover:text-white!"
     />
   </div>
 </template>

src/router/index.ts

@@ -7,7 +7,13 @@ import { buildHierarchyTree } from "@/utils/tree";
 import remainingRouter from "./modules/remaining";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
 import { usePermissionStoreHook } from "@/store/modules/permission";
-import { isUrl, openLink, storageLocal, isAllEmpty } from "@pureadmin/utils";
+import {
+  isUrl,
+  openLink,
+  cloneDeep,
+  isAllEmpty,
+  storageLocal
+} from "@pureadmin/utils";
 import {
   ascending,
   getTopMenu,
@@ -21,9 +27,9 @@ import {
 } from "./utils";
 import {
   type Router,
-  createRouter,
   type RouteRecordRaw,
-  type RouteComponent
+  type RouteComponent,
+  createRouter
 } from "vue-router";
 import {
   type DataInfo,
@@ -55,6 +61,9 @@ export const constantRoutes: Array<RouteRecordRaw> = formatTwoStageRoutes(
   formatFlatteningRoutes(buildHierarchyTree(ascending(routes.flat(Infinity))))
 );
 
+/** 初始的静态路由，用于退出登录时重置路由 */
+const initConstantRoutes: Array<RouteRecordRaw> = cloneDeep(constantRoutes);
+
 /** 用于渲染菜单，保持原始层级 */
 export const constantMenus: Array<RouteComponent> = ascending(
   routes.flat(Infinity)
@@ -87,17 +96,13 @@ export const router: Router = createRouter({
 
 /** 重置路由 */
 export function resetRouter() {
-  router.getRoutes().forEach(route => {
+  router.clearRoutes();
-    const { name, meta } = route;
+  for (const route of initConstantRoutes.concat(...(remainingRouter as any))) {
-    if (name && router.hasRoute(name) && meta?.backstage) {
+    router.addRoute(route);
-      router.removeRoute(name);
+  }
-      router.options.routes = formatTwoStageRoutes(
+  router.options.routes = formatTwoStageRoutes(
-        formatFlatteningRoutes(
+    formatFlatteningRoutes(buildHierarchyTree(ascending(routes.flat(Infinity))))
-          buildHierarchyTree(ascending(routes.flat(Infinity)))
+  );
-        )
-      );
-    }
-  });
   usePermissionStoreHook().clearAllCachePage();
 }
 

src/router/utils.ts

@@ -172,6 +172,8 @@ function handleAsyncRoutes(routeList) {
           const flattenRouters: any = router
             .getRoutes()
             .find(n => n.path === "/");
+          // 保持router.options.routes[0].children与path为"/"的children一致，防止数据不一致导致异常
+          flattenRouters.children = router.options.routes[0].children;
           router.addRoute(flattenRouters);
         }
       }

src/style/sidebar.scss

@@ -666,6 +666,10 @@ body[layout="horizontal"] {
 
   @include merge-style($sideBarWidth);
 
+  .el-menu {
+    --el-menu-hover-text-color: var(--pure-theme-menu-text) !important;
+  }
+
   .fixed-header,
   .main-container {
     transition: none !important;
@@ -687,6 +691,7 @@ body[layout="mix"] {
 
   .el-menu {
     --el-menu-hover-bg-color: transparent !important;
+    --el-menu-hover-text-color: var(--pure-theme-menu-text) !important;
   }
 
   .hideSidebar {

src/utils/message.ts

@@ -8,6 +8,8 @@ type messageTypes = "info" | "success" | "warning" | "error";
 interface MessageParams {
   /** 消息类型，可选 `info` 、`success` 、`warning` 、`error` ，默认 `info` */
   type?: messageTypes;
+  /** 是否纯色，默认 `false` */
+  plain?: boolean;
   /** 自定义图标，该属性会覆盖 `type` 的图标 */
   icon?: any;
   /** 是否将 `message` 属性作为 `HTML` 片段处理，默认 `false` */
@@ -18,14 +20,14 @@ interface MessageParams {
   duration?: number;
   /** 是否显示关闭按钮，默认值 `false` */
   showClose?: boolean;
-  /** 文字是否居中，默认值 `false` */
+  /** `Message` 距离窗口顶部的偏移量，默认 `16` */
-  center?: boolean;
-  /** `Message` 距离窗口顶部的偏移量，默认 `20` */
   offset?: number;
   /** 设置组件的根元素，默认 `document.body` */
   appendTo?: string | HTMLElement;
   /** 合并内容相同的消息，不支持 `VNode` 类型的消息，默认值 `false` */
   grouping?: boolean;
+  /** 重复次数，类似于 `Badge` 。当和 `grouping` 属性一起使用时作为初始数量使用，默认值 `1` */
+  repeatNum?: number;
   /** 关闭时的回调函数, 参数为被关闭的 `message` 实例 */
   onClose?: Function | null;
 }
@@ -48,28 +50,30 @@ const message = (
     const {
       icon,
       type = "info",
+      plain = false,
       dangerouslyUseHTMLString = false,
       customClass = "antd",
       duration = 2000,
       showClose = false,
-      center = false,
+      offset = 16,
-      offset = 20,
       appendTo = document.body,
       grouping = false,
+      repeatNum = 1,
       onClose
     } = params;
 
     return ElMessage({
       message,
-      type,
       icon,
+      type,
+      plain,
       dangerouslyUseHTMLString,
       duration,
       showClose,
-      center,
       offset,
       appendTo,
       grouping,
+      repeatNum,
       // 全局搜 pure-message 即可知道该类的样式位置
       customClass: customClass === "antd" ? "pure-message" : "",
       onClose: () => (isFunction(onClose) ? onClose() : null)

src/views/login/index.vue

@@ -340,7 +340,7 @@ watch(loginDay, value => {
     >
       Copyright © 2020-present
       <a
-        class="hover:text-primary"
+        class="hover:text-primary!"
         href="https://github.com/pure-admin"
         target="_blank"
       >