fix: 修复params传参模式下标签页右键菜单显示不正确的问题 (#1221)

refactor: 重构图标模块，使用`@iconify/json`替换不再维护更新的`@iconify-icons/*`依赖，优化使用体验，确保图标库可持续更新并支持`Tree-shaking`

.nvmrc

@@ -1 +1 @@
-v22.12.0
+v22.20.0

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
+  "tailwindCSS.experimental.configFile": "src/style/tailwind.css",
   "editor.formatOnType": true,
   "editor.formatOnSave": true,
   "[vue]": {

CHANGELOG.en_US.md

@@ -1,8 +1,54 @@
+# 6.1.0 (2025-07-31)
+
+### ✔️ Refactor
+
+- Upgrade to `vite7`, update dependencies, and related compatibility processing
+
+### 🐞 Bug fixes
+
+- Fixed a flickering issue in the `ReSegmented` segmented controller component when switching between light and dark styles
+- Fixed an issue where `resetRouter` did not clear all routing data
+- Fixed an issue where closing the left tab in the tabs window did not work properly
+
+### 🍏 Perf
+
+- Optimized navigation styles
+- Upgraded `@pureadmin/table` to be compatible with all `el-table` APIs in the latest `element-plus` version.
+
+# 6.0.0 (2025-04-10)
+
+### ✔️ Refactor
+
+- Refactor the icon module, use `@iconify/json` to replace the `@iconify-icons/*` dependency that is no longer maintained and updated, optimize the user experience, ensure that the icon library can be continuously updated and support `Tree-shaking`
+- Upgrade `tailwindcss` to `v4` version, bringing faster build speed, simpler installation and configuration, and providing a dedicated `vite` plug-in
+
+### 🎫 Feat
+
+- Add `Ai` chat component example
+- Add `tagOnClick` tag to switch global public events
+- Add code editor example
+- Add `Markdown` example
+- Add slider example
+
+### 🐞 Bug fixes
+
+- Fix `aria-hidden` error
+- Fix the problem that code hints cannot be displayed when using `this` syntax and update `pinia` related syntax
+
+### 🍏 Perf
+
+- Fix broken links in the waterfall infinite scrolling example
+- Update `vue-flow`, related compatibility processing
+- Delete the deprecated dependency package `eslint-define-config`, upgrade `eslint` to the latest version, related compatibility processing
+- Optimize `src/style/dark.scss` syntax
+- Optimize login parameter transfer
+- Use `keydown` to replace `keypress`, the `keypress` event has been deprecated
+
 # 5.9.0 (2024-12-10)
 
 ### ✔️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

@@ -1,8 +1,54 @@
+# 6.1.0 (2025-07-31)
+
+### ✔️ Refactor
+
+- Upgrade to `vite7`, update dependencies, and related compatibility processing
+
+### 🐞 Bug fixes
+
+- Fixed a flickering issue in the `ReSegmented` segmented controller component when switching between light and dark styles
+- Fixed an issue where `resetRouter` did not clear all routing data
+- Fixed an issue where closing the left tab in the tabs window did not work properly
+
+### 🍏 Perf
+
+- Optimized navigation styles
+- Upgraded `@pureadmin/table` to be compatible with all `el-table` APIs in the latest `element-plus` version.
+
+# 6.0.0 (2025-04-10)
+
+### ✔️ Refactor
+
+- Refactor the icon module, use `@iconify/json` to replace the `@iconify-icons/*` dependency that is no longer maintained and updated, optimize the user experience, ensure that the icon library can be continuously updated and support `Tree-shaking`
+- Upgrade `tailwindcss` to `v4` version, bringing faster build speed, simpler installation and configuration, and providing a dedicated `vite` plug-in
+
+### 🎫 Feat
+
+- Add `Ai` chat component example
+- Add `tagOnClick` tag to switch global public events
+- Add code editor example
+- Add `Markdown` example
+- Add slider example
+
+### 🐞 Bug fixes
+
+- Fix `aria-hidden` error
+- Fix the problem that code hints cannot be displayed when using `this` syntax and update `pinia` related syntax
+
+### 🍏 Perf
+
+- Fix broken links in the waterfall infinite scrolling example
+- Update `vue-flow`, related compatibility processing
+- Delete the deprecated dependency package `eslint-define-config`, upgrade `eslint` to the latest version, related compatibility processing
+- Optimize `src/style/dark.scss` syntax
+- Optimize login parameter transfer
+- Use `keydown` to replace `keypress`, the `keypress` event has been deprecated
+
 # 5.9.0 (2024-12-10)
 
 ### ✔️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

@@ -1,8 +1,54 @@
+# 6.1.0 (2025-07-31)
+
+### ✔️ Refactor
+
+- 升级至`vite7`，更新依赖，相关兼容处理
+
+### 🐞 Bug fixes
+
+- 修复`ReSegmented`分段控制器组件在浅色和深色整体风格切换时的闪烁问题
+- 修复`resetRouter`未清空全部路由数据问题
+- 修复标签页-关闭左侧标签页关闭异常问题
+
+### 🍏 Perf
+
+- 优化导航样式
+- 升级`@pureadmin/table`兼容最新版`element-plus`的`el-table`的所有`API`
+
+# 6.0.0 (2025-04-10)
+
+### ✔️ Refactor
+
+- 重构图标模块，使用`@iconify/json`替换不再维护更新的`@iconify-icons/*`依赖，优化使用体验，确保图标库可持续更新并支持`Tree-shaking`
+- 升级`tailwindcss`至`v4`版本，带来更快的构建速度、更简化的安装和配置、提供专属`vite`插件
+
+### 🎫 Feat
+
+- 添加`Ai`聊天组件示例
+- 添加`tagOnClick`标签切换全局公共事件
+- 添加代码编辑器示例
+- 添加`Markdown`示例
+- 添加滑块示例
+
+### 🐞 Bug fixes
+
+- 修复`aria-hidden`报错
+- 修复使用`this`语法时无法显示代码提示的问题并更新`pinia`相关语法
+
+### 🍏 Perf
+
+- 修复组件-瀑布流无限滚动示例中失效的链接
+- 更新`vue-flow`，相关兼容处理
+- 删除已弃用的依赖包`eslint-define-config`，升级`eslint`至最新版本，相关兼容处理
+- 优化`src/style/dark.scss`语法
+- 优化登录传参
+- 使用`keydown`替换`keypress`，`keypress`事件已弃用
+
 # 5.9.0 (2024-12-10)
 
 ### ✔️ 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` 贡献提交规范
 

build/optimize.ts

@@ -11,21 +11,25 @@ const include = [
   "dayjs",
   "axios",
   "pinia",
+  "vditor",
   "typeit",
   "swiper",
   "qrcode",
   "intro.js",
   "vue-i18n",
+  "deep-chat",
   "vxe-table",
   "vue-types",
   "js-cookie",
   "vue-tippy",
   "cropperjs",
   "jsbarcode",
+  "codemirror",
   "pinyin-pro",
   "sortablejs",
   "swiper/vue",
   "mint-filter",
+  "highlight.js",
   "@vueuse/core",
   "vue3-danmaku",
   "v-contextmenu",
@@ -42,6 +46,7 @@ const include = [
   "@howdyjs/mouse-menu",
   "@logicflow/extension",
   "vue-virtual-scroller",
+  "codemirror-editor-vue3",
   "@amap/amap-jsapi-loader",
   "el-table-infinite-scroll",
   "vue-waterfall-plugin-next",
@@ -52,8 +57,8 @@ const include = [
 
 /**
  * 在预构建中强制排除的依赖项
- * 温馨提示：所有以 `@iconify-icons/` 开头引入的的本地图标模块，都应该加入到下面的 `exclude` 里，因为平台推荐的使用方式是哪里需要哪里引入而且都是单个的引入，不需要预构建，直接让浏览器加载就好
+ * 温馨提示：平台推荐的使用方式是哪里需要哪里引入而且都是单个的引入，不需要预构建，直接让浏览器加载就好
  */
-const exclude = ["@iconify-icons/ep", "@iconify-icons/ri"];
+const exclude = ["@iconify/json"];
 
 export { include, exclude };

build/plugins.ts

@@ -3,8 +3,10 @@ import vue from "@vitejs/plugin-vue";
 import { pathResolve } from "./utils";
 import { viteBuildInfo } from "./info";
 import svgLoader from "vite-svg-loader";
+import Icons from "unplugin-icons/vite";
 import type { PluginOption } from "vite";
 import vueJsx from "@vitejs/plugin-vue-jsx";
+import tailwindcss from "@tailwindcss/vite";
 import { configCompressPlugin } from "./compress";
 import removeNoMatch from "vite-plugin-router-warn";
 import { visualizer } from "rollup-plugin-visualizer";
@@ -19,7 +21,14 @@ export function getPluginsList(
 ): PluginOption[] {
   const lifecycle = process.env.npm_lifecycle_event;
   return [
-    vue(),
+    tailwindcss(),
+    vue({
+      template: {
+        compilerOptions: {
+          isCustomElement: tag => tag === "deep-chat"
+        }
+      }
+    }),
     // jsx、tsx语法支持
     vueJsx(),
     VueI18nPlugin({
@@ -51,6 +60,11 @@ export function getPluginsList(
     }),
     // svg组件化支持
     svgLoader(),
+    // 自动按需加载图标
+    Icons({
+      compiler: "vue3",
+      scale: 1
+    }),
     VITE_CDN ? cdn : null,
     configCompressPlugin(VITE_COMPRESSION),
     // 线上环境删除console

eslint.config.js

@@ -1,26 +1,25 @@
 import js from "@eslint/js";
+import tseslint from "typescript-eslint";
 import pluginVue from "eslint-plugin-vue";
 import * as parserVue from "vue-eslint-parser";
 import configPrettier from "eslint-config-prettier";
 import pluginPrettier from "eslint-plugin-prettier";
-import { defineFlatConfig } from "eslint-define-config";
+import { defineConfig, globalIgnores } from "eslint/config";
-import * as parserTypeScript from "@typescript-eslint/parser";
-import pluginTypeScript from "@typescript-eslint/eslint-plugin";
 
-export default defineFlatConfig([
+export default defineConfig([
-  {
+  globalIgnores([
-    ...js.configs.recommended,
-    ignores: [
     "**/.*",
     "dist/*",
     "*.d.ts",
     "public/*",
     "src/assets/**",
     "src/**/iconfont/**"
-    ],
+  ]),
+  {
+    ...js.configs.recommended,
     languageOptions: {
       globals: {
-        // index.d.ts
+        // types/index.d.ts
         RefType: "readonly",
         EmitType: "readonly",
         TargetContext: "readonly",
@@ -73,21 +72,10 @@ export default defineFlatConfig([
       ]
     }
   },
-  {
+  ...tseslint.config({
+    extends: [...tseslint.configs.recommended],
     files: ["**/*.?([cm])ts", "**/*.?([cm])tsx"],
-    languageOptions: {
-      parser: parserTypeScript,
-      parserOptions: {
-        sourceType: "module",
-        warnOnUnsupportedTypeScriptVersion: false
-      }
-    },
-    plugins: {
-      "@typescript-eslint": pluginTypeScript
-    },
     rules: {
-      ...pluginTypeScript.configs.strict.rules,
-      "@typescript-eslint/ban-types": "off",
       "@typescript-eslint/no-redeclare": "error",
       "@typescript-eslint/ban-ts-comment": "off",
       "@typescript-eslint/no-explicit-any": "off",
@@ -114,20 +102,20 @@ export default defineFlatConfig([
         }
       ]
     }
-  },
+  }),
   {
     files: ["**/*.d.ts"],
     rules: {
       "eslint-comments/no-unlimited-disable": "off",
       "import/no-duplicates": "off",
+      "no-restricted-syntax": "off",
       "unused-imports/no-unused-vars": "off"
     }
   },
   {
     files: ["**/*.?([cm])js"],
     rules: {
-      "@typescript-eslint/no-require-imports": "off",
+      "@typescript-eslint/no-require-imports": "off"
-      "@typescript-eslint/no-var-requires": "off"
     }
   },
   {
@@ -148,18 +136,19 @@ export default defineFlatConfig([
           jsx: true
         },
         extraFileExtensions: [".vue"],
-        parser: "@typescript-eslint/parser",
+        parser: tseslint.parser,
         sourceType: "module"
       }
     },
     plugins: {
+      "@typescript-eslint": tseslint.plugin,
       vue: pluginVue
     },
     processor: pluginVue.processors[".vue"],
     rules: {
       ...pluginVue.configs.base.rules,
-      ...pluginVue.configs["vue3-essential"].rules,
+      ...pluginVue.configs.essential.rules,
-      ...pluginVue.configs["vue3-recommended"].rules,
+      ...pluginVue.configs.recommended.rules,
       "no-undef": "off",
       "no-unused-vars": "off",
       "vue/no-v-html": "off",

index.html

@@ -10,9 +10,6 @@
     />
     <title>vue-pure-admin</title>
     <link rel="icon" href="/favicon.ico" />
-    <script>
-      window.process = {};
-    </script>
   </head>
 
   <body>

locales/en.yaml

@@ -76,11 +76,13 @@ menus:
   pureLoginLog: Login Log
   pureOperationLog: Operation Log
   pureSystemLog: System Log
+  pureCodeMirror: CodeMirror
+  pureMarkdown: Markdown
   pureEditor: Editor
   pureAbnormal: Abnormal Page
-  pureFourZeroFour: "404"
+  purePageNotFound: "404"
-  pureFourZeroOne: "403"
+  pureAccessDenied: "403"
-  pureFive: "500"
+  pureServerError: "500"
   pureComponents: Components
   pureDialog: Dialog
   pureDrawer: Drawer
@@ -92,6 +94,7 @@ menus:
   pureDraggable: Draggable
   pureSplitPane: Split Pane
   pureText: Text Ellipsis
+  pureSlider: Slider
   pureElButton: Button
   pureButton: Button Animation
   pureCheckButton: Check Button

locales/zh-CN.yaml

@@ -76,11 +76,13 @@ menus:
   pureLoginLog: 登录日志
   pureOperationLog: 操作日志
   pureSystemLog: 系统日志
+  pureCodeMirror: 代码编辑器
+  pureMarkdown: Markdown
   pureEditor: 编辑器
   pureAbnormal: 异常页面
-  pureFourZeroFour: "404"
+  purePageNotFound: "404"
-  pureFourZeroOne: "403"
+  pureAccessDenied: "403"
-  pureFive: "500"
+  pureServerError: "500"
   pureComponents: 组件
   pureDialog: 函数式弹框
   pureDrawer: 函数式抽屉
@@ -92,6 +94,7 @@ menus:
   pureDraggable: 拖拽
   pureSplitPane: 切割面板
   pureText: 文本省略
+  pureSlider: 滑块
   pureElButton: 按钮
   pureCheckButton: 可选按钮
   pureButton: 按钮动效

mock/mine.ts

@@ -25,7 +25,7 @@ export default defineFakeRoute([
     url: "/mine-logs",
     method: "get",
     response: () => {
-      let list = [
+      const list = [
         {
           id: 1,
           ip: faker.internet.ipv4(),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-pure-admin",
-  "version": "5.9.0",
+  "version": "6.1.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -48,136 +48,141 @@
   },
   "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/table": "^3.3.0",
-    "@pureadmin/utils": "^2.5.0",
+    "@pureadmin/utils": "^2.6.2",
     "@vue-flow/background": "^1.3.2",
-    "@vue-flow/core": "^1.41.6",
+    "@vue-flow/core": "^1.47.0",
-    "@vueuse/core": "^12.0.0",
+    "@vueuse/core": "^13.9.0",
-    "@vueuse/motion": "^2.2.6",
+    "@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.7.9",
+    "axios": "^1.12.2",
     "china-area-data": "^5.0.1",
+    "codemirror": "^5.65.20",
+    "codemirror-editor-vue3": "^2.8.0",
     "cropperjs": "^1.6.2",
-    "dayjs": "^1.11.13",
+    "dayjs": "^1.11.18",
-    "echarts": "^5.5.1",
+    "deep-chat": "^2.2.2",
-    "el-table-infinite-scroll": "^3.0.6",
+    "echarts": "^6.0.0",
-    "element-plus": "^2.9.0",
+    "el-table-infinite-scroll": "^3.0.7",
+    "element-plus": "^2.11.4",
+    "highlight.js": "^11.11.1",
     "intro.js": "^7.2.0",
     "js-cookie": "^3.0.5",
-    "jsbarcode": "^3.11.6",
+    "jsbarcode": "^3.12.1",
     "localforage": "^1.10.0",
     "mint-filter": "^4.0.3",
     "mitt": "^3.0.1",
     "mqtt": "4.3.7",
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
-    "pinia": "^2.3.0",
+    "pinia": "^3.0.3",
-    "pinyin-pro": "^3.26.0",
+    "pinyin-pro": "^3.27.0",
-    "plus-pro-components": "^0.1.18",
+    "plus-pro-components": "^0.1.29",
     "qrcode": "^1.5.4",
-    "qs": "^6.13.1",
+    "qs": "^6.14.0",
     "responsive-storage": "^2.2.0",
     "sortablejs": "^1.15.6",
-    "swiper": "^11.1.15",
+    "swiper": "^12.0.2",
     "typeit": "^8.8.7",
     "v-contextmenu": "^3.2.0",
     "v3-infinite-loading": "^1.3.2",
+    "vditor": "^3.11.2",
     "version-rocket": "^1.7.4",
-    "vue": "^3.5.13",
+    "vue": "^3.5.22",
-    "vue-i18n": "^10.0.5",
+    "vue-i18n": "^11.1.12",
-    "vue-json-pretty": "^2.4.0",
+    "vue-json-pretty": "^2.5.0",
-    "vue-pdf-embed": "^2.1.1",
+    "vue-pdf-embed": "^2.1.3",
-    "vue-router": "^4.5.0",
+    "vue-router": "^4.5.1",
-    "vue-tippy": "^6.5.0",
+    "vue-tippy": "^6.7.1",
-    "vue-types": "^5.1.3",
+    "vue-types": "^6.0.0",
     "vue-virtual-scroller": "2.0.0-beta.8",
-    "vue-waterfall-plugin-next": "^2.6.4",
+    "vue-waterfall-plugin-next": "^2.6.9",
-    "vue3-danmaku": "^1.6.1",
+    "vue3-danmaku": "^1.6.6",
     "vue3-puzzle-vcode": "^1.1.7",
     "vuedraggable": "^4.1.0",
     "vxe-table": "4.6.25",
-    "wavesurfer.js": "^7.8.10",
+    "wavesurfer.js": "^7.11.0",
-    "xgplayer": "^3.0.20",
+    "xgplayer": "^3.0.23",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.6.0",
+    "@commitlint/cli": "^20.1.0",
-    "@commitlint/config-conventional": "^19.6.0",
+    "@commitlint/config-conventional": "^20.0.0",
-    "@commitlint/types": "^19.5.0",
+    "@commitlint/types": "^20.0.0",
-    "@eslint/js": "^9.16.0",
+    "@eslint/js": "^9.37.0",
-    "@faker-js/faker": "^9.3.0",
+    "@faker-js/faker": "^10.0.0",
-    "@iconify-icons/ep": "^1.2.12",
+    "@iconify/json": "^2.2.393",
-    "@iconify-icons/ri": "^1.2.10",
+    "@iconify/vue": "4.2.0",
-    "@iconify/vue": "^4.2.0",
+    "@intlify/unplugin-vue-i18n": "^11.0.1",
-    "@intlify/unplugin-vue-i18n": "^6.0.1",
+    "@tailwindcss/vite": "^4.1.14",
-    "@types/dagre": "^0.7.52",
+    "@types/codemirror": "^5.60.16",
+    "@types/dagre": "^0.7.53",
     "@types/intro.js": "^5.1.5",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.17.9",
+    "@types/node": "^20.19.19",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qrcode": "^1.5.5",
-    "@types/qs": "^6.9.17",
+    "@types/qs": "^6.14.0",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.18.0",
+    "@vitejs/plugin-vue": "^6.0.1",
-    "@typescript-eslint/parser": "^8.18.0",
+    "@vitejs/plugin-vue-jsx": "^5.1.1",
-    "@vitejs/plugin-vue": "^5.2.1",
-    "@vitejs/plugin-vue-jsx": "^4.1.1",
-    "autoprefixer": "^10.4.20",
     "boxen": "^8.0.1",
-    "code-inspector-plugin": "^0.18.2",
+    "code-inspector-plugin": "^1.2.10",
-    "cssnano": "^7.0.6",
+    "cssnano": "^7.1.1",
     "dagre": "^0.8.5",
-    "eslint": "^9.16.0",
+    "eslint": "^9.37.0",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-prettier": "^10.1.8",
-    "eslint-define-config": "^2.1.0",
+    "eslint-plugin-prettier": "^5.5.4",
-    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-vue": "^10.5.0",
-    "eslint-plugin-vue": "^9.32.0",
     "gradient-string": "^3.0.0",
     "husky": "^9.1.7",
-    "lint-staged": "^15.2.10",
+    "lint-staged": "^16.2.3",
-    "postcss": "^8.4.49",
+    "postcss": "^8.5.6",
-    "postcss-html": "^1.7.0",
+    "postcss-html": "^1.8.0",
-    "postcss-import": "^16.1.0",
+    "postcss-load-config": "^6.0.1",
     "postcss-scss": "^4.0.9",
-    "prettier": "^3.4.2",
+    "prettier": "^3.6.2",
     "rimraf": "^6.0.1",
-    "rollup-plugin-visualizer": "^5.12.0",
+    "rollup-plugin-visualizer": "^6.0.4",
-    "sass": "^1.82.0",
+    "sass": "^1.93.2",
-    "stylelint": "^16.11.0",
+    "stylelint": "^16.25.0",
-    "stylelint-config-recess-order": "^5.1.1",
+    "stylelint-config-recess-order": "^7.3.0",
-    "stylelint-config-recommended-vue": "^1.5.0",
+    "stylelint-config-recommended-vue": "^1.6.1",
-    "stylelint-config-standard-scss": "^13.1.0",
+    "stylelint-config-standard-scss": "^14.0.0",
-    "stylelint-prettier": "^5.0.2",
+    "stylelint-prettier": "^5.0.3",
-    "svgo": "^3.3.2",
+    "svgo": "^4.0.0",
-    "tailwindcss": "^3.4.16",
+    "tailwindcss": "^4.1.14",
-    "typescript": "5.6.3",
+    "typescript": "^5.9.3",
-    "vite": "^6.0.3",
+    "typescript-eslint": "^8.46.0",
+    "unplugin-icons": "^22.4.2",
+    "vite": "^7.1.9",
     "vite-plugin-cdn-import": "^1.0.1",
     "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-fake-server": "^2.1.4",
+    "vite-plugin-fake-server": "^2.2.0",
     "vite-plugin-remove-console": "^2.2.0",
     "vite-plugin-router-warn": "^1.0.0",
     "vite-svg-loader": "^5.1.0",
-    "vue-eslint-parser": "^9.4.3",
+    "vue-eslint-parser": "^10.2.0",
-    "vue-tsc": "^2.1.10"
+    "vue-tsc": "^3.1.1"
   },
   "engines": {
-    "node": "^18.18.0 || ^20.9.0 || >=22.0.0",
+    "node": "^20.19.0 || >=22.13.0",
     "pnpm": ">=9"
   },
   "pnpm": {
     "allowedDeprecatedVersions": {
       "are-we-there-yet": "*",
       "sourcemap-codec": "*",
+      "lodash.isequal": "*",
       "domexception": "*",
       "w3c-hr-time": "*",
       "inflight": "*",
@@ -188,10 +193,17 @@
       "abab": "*",
       "glob": "*"
     },
-    "peerDependencyRules": {
+    "onlyBuiltDependencies": [
-      "allowedVersions": {
+      "@parcel/watcher",
-        "eslint": "9"
+      "core-js",
-      }
+      "es5-ext",
-    }
+      "esbuild",
+      "typeit",
+      "vue-demi"
+    ],
+    "ignoredBuiltDependencies": [
+      "@tailwindcss/oxide",
+      "vue3-danmaku"
+    ]
   }
 }

postcss.config.js

@@ -3,10 +3,6 @@
 /** @type {import('postcss-load-config').Config} */
 export default {
   plugins: {
-    "postcss-import": {},
-    "tailwindcss/nesting": {},
-    tailwindcss: {},
-    autoprefixer: {},
     ...(process.env.NODE_ENV === "production" ? { cssnano: {} } : {})
   }
 };

public/platform-config.json

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

src/assets/svg/enter_outlined.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" aria-hidden="true" class="iconify iconify--ant-design" viewBox="0 0 1024 1024"><path fill="currentColor" d="M864 170h-60c-4.4 0-8 3.6-8 8v518H310v-73c0-6.7-7.8-10.5-13-6.3l-141.9 112a8 8 0 0 0 0 12.6l141.9 112c5.3 4.2 13 .4 13-6.3v-75h498c35.3 0 64-28.7 64-64V178c0-4.4-3.6-8-8-8"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" class="iconify iconify--ant-design" viewBox="0 0 1024 1024"><path fill="currentColor" d="M864 170h-60c-4.4 0-8 3.6-8 8v518H310v-73c0-6.7-7.8-10.5-13-6.3l-141.9 112a8 8 0 0 0 0 12.6l141.9 112c5.3 4.2 13 .4 13-6.3v-75h498c35.3 0 64-28.7 64-64V178c0-4.4-3.6-8-8-8"/></svg>

src/assets/svg/exit_screen.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" aria-hidden="true" class="re-screen" color="#00000073" viewBox="0 0 16 16"><path fill="currentColor" d="M3.5 4H1V3h2V1h1v2.5zM13 3V1h-1v2.5l.5.5H15V3zm-1 9.5V15h1v-2h2v-1h-2.5zM1 12v1h2v2h1v-2.5l-.5-.5zm11-1.5-.5.5h-7l-.5-.5v-5l.5-.5h7l.5.5zM10 7H6v2h4z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" class="re-screen" color="#00000073" viewBox="0 0 16 16"><path fill="currentColor" d="M3.5 4H1V3h2V1h1v2.5zM13 3V1h-1v2.5l.5.5H15V3zm-1 9.5V15h1v-2h2v-1h-2.5zM1 12v1h2v2h1v-2.5l-.5-.5zm11-1.5-.5.5h-7l-.5-.5v-5l.5-.5h7l.5.5zM10 7H6v2h4z"/></svg>

src/assets/svg/full_screen.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" aria-hidden="true" class="re-screen" color="#00000073" viewBox="0 0 16 16"><path fill="currentColor" d="M3 12h10V4H3zm2-6h6v4H5zM2 6H1V2.5l.5-.5H5v1H2zm13-3.5V6h-1V3h-3V2h3.5zM14 10h1v3.5l-.5.5H11v-1h3zM2 13h3v1H1.5l-.5-.5V10h1z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" class="re-screen" color="#00000073" viewBox="0 0 16 16"><path fill="currentColor" d="M3 12h10V4H3zm2-6h6v4H5zM2 6H1V2.5l.5-.5H5v1H2zm13-3.5V6h-1V3h-3V2h3.5zM14 10h1v3.5l-.5.5H11v-1h3zM2 13h3v1H1.5l-.5-.5V10h1z"/></svg>

src/assets/svg/globalization.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" aria-hidden="true" class="globalization" viewBox="0 0 512 512"><path fill="currentColor" d="m478.33 433.6-90-218a22 22 0 0 0-40.67 0l-90 218a22 22 0 1 0 40.67 16.79L316.66 406h102.67l18.33 44.39A22 22 0 0 0 458 464a22 22 0 0 0 20.32-30.4zM334.83 362 368 281.65 401.17 362zm-66.99-19.08a22 22 0 0 0-4.89-30.7c-.2-.15-15-11.13-36.49-34.73 39.65-53.68 62.11-114.75 71.27-143.49H330a22 22 0 0 0 0-44H214V70a22 22 0 0 0-44 0v20H54a22 22 0 0 0 0 44h197.25c-9.52 26.95-27.05 69.5-53.79 108.36-31.41-41.68-43.08-68.65-43.17-68.87a22 22 0 0 0-40.58 17c.58 1.38 14.55 34.23 52.86 83.93.92 1.19 1.83 2.35 2.74 3.51-39.24 44.35-77.74 71.86-93.85 80.74a22 22 0 1 0 21.07 38.63c2.16-1.18 48.6-26.89 101.63-85.59 22.52 24.08 38 35.44 38.93 36.1a22 22 0 0 0 30.75-4.9z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" class="globalization" viewBox="0 0 512 512"><path fill="currentColor" d="m478.33 433.6-90-218a22 22 0 0 0-40.67 0l-90 218a22 22 0 1 0 40.67 16.79L316.66 406h102.67l18.33 44.39A22 22 0 0 0 458 464a22 22 0 0 0 20.32-30.4zM334.83 362 368 281.65 401.17 362zm-66.99-19.08a22 22 0 0 0-4.89-30.7c-.2-.15-15-11.13-36.49-34.73 39.65-53.68 62.11-114.75 71.27-143.49H330a22 22 0 0 0 0-44H214V70a22 22 0 0 0-44 0v20H54a22 22 0 0 0 0 44h197.25c-9.52 26.95-27.05 69.5-53.79 108.36-31.41-41.68-43.08-68.65-43.17-68.87a22 22 0 0 0-40.58 17c.58 1.38 14.55 34.23 52.86 83.93.92 1.19 1.83 2.35 2.74 3.51-39.24 44.35-77.74 71.86-93.85 80.74a22 22 0 1 0 21.07 38.63c2.16-1.18 48.6-26.89 101.63-85.59 22.52 24.08 38 35.44 38.93 36.1a22 22 0 0 0 30.75-4.9z"/></svg>

src/assets/svg/keyboard_esc.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" aria-hidden="true" class="iconify iconify--mdi" viewBox="0 0 24 24"><path fill="currentColor" d="M1 7h6v2H3v2h4v2H3v2h4v2H1zm10 0h4v2h-4v2h2a2 2 0 0 1 2 2v2c0 1.11-.89 2-2 2H9v-2h4v-2h-2a2 2 0 0 1-2-2V9c0-1.1.9-2 2-2m8 0h2a2 2 0 0 1 2 2v1h-2V9h-2v6h2v-1h2v1c0 1.11-.89 2-2 2h-2a2 2 0 0 1-2-2V9c0-1.1.9-2 2-2"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" class="iconify iconify--mdi" viewBox="0 0 24 24"><path fill="currentColor" d="M1 7h6v2H3v2h4v2H3v2h4v2H1zm10 0h4v2h-4v2h2a2 2 0 0 1 2 2v2c0 1.11-.89 2-2 2H9v-2h4v-2h-2a2 2 0 0 1-2-2V9c0-1.1.9-2 2-2m8 0h2a2 2 0 0 1 2 2v1h-2V9h-2v6h2v-1h2v1c0 1.11-.89 2-2 2h-2a2 2 0 0 1-2-2V9c0-1.1.9-2 2-2"/></svg>

src/assets/table-bar/drag.svg

@@ -1 +1 @@
-<svg width="32" height="32" fill="currentColor" aria-hidden="true" data-icon="holder" viewBox="64 64 896 896"><path d="M300 276.5a56 56 0 1 0 56-97 56 56 0 0 0-56 97m0 284a56 56 0 1 0 56-97 56 56 0 0 0-56 97M640 228a56 56 0 1 0 112 0 56 56 0 0 0-112 0m0 284a56 56 0 1 0 112 0 56 56 0 0 0-112 0M300 844.5a56 56 0 1 0 56-97 56 56 0 0 0-56 97M640 796a56 56 0 1 0 112 0 56 56 0 0 0-112 0"/></svg>
+<svg width="32" height="32" fill="currentColor" data-icon="holder" viewBox="64 64 896 896"><path d="M300 276.5a56 56 0 1 0 56-97 56 56 0 0 0-56 97m0 284a56 56 0 1 0 56-97 56 56 0 0 0-56 97M640 228a56 56 0 1 0 112 0 56 56 0 0 0-112 0m0 284a56 56 0 1 0 112 0 56 56 0 0 0-112 0M300 844.5a56 56 0 1 0 56-97 56 56 0 0 0-56 97M640 796a56 56 0 1 0 112 0 56 56 0 0 0-112 0"/></svg>

src/components/ReAnimateSelector/src/index.vue

@@ -95,7 +95,7 @@ function onMouseleave() {
           :view-style="{ overflow: 'hidden' }"
           class="border-t border-[#e5e7eb]"
         >
-          <ul class="flex flex-wrap justify-around mb-1">
+          <ul class="flex flex-wrap justify-around mb-1!">
             <li
               v-for="(animate, index) in animatesList"
               :key="index"

src/components/ReCropper/src/index.tsx

@@ -119,7 +119,7 @@ export default defineComponent({
         "p-[6px]",
         "h-[30px]",
         "w-[30px]",
-        "outline-none",
+        "outline-hidden",
         "rounded-[4px]",
         "cursor-pointer",
         "hover:bg-[rgba(0,0,0,0.06)]"

src/components/ReDialog/index.vue

@@ -8,8 +8,8 @@ import {
 } from "./index";
 import { ref, computed } from "vue";
 import { isFunction } from "@pureadmin/utils";
-import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
+import Fullscreen from "~icons/ri/fullscreen-fill";
-import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
+import ExitFullscreen from "~icons/ri/fullscreen-exit-fill";
 
 defineOptions({
   name: "ReDialog"
@@ -79,7 +79,7 @@ const fullscreenClass = computed(() => {
     "el-dialog__close",
     "-translate-x-2",
     "cursor-pointer",
-    "hover:!text-[red]"
+    "hover:text-[red]!"
   ];
 });
 

src/components/ReFlowChart/src/Control.vue

@@ -3,7 +3,7 @@ import { ref, unref, onMounted } from "vue";
 import { LogicFlow } from "@logicflow/core";
 
 interface Props {
-  lf: LogicFlow;
+  lf?: LogicFlow;
   catTurboData?: boolean;
 }
 
@@ -114,7 +114,8 @@ onMounted(() => {
           :style="{
             cursor: item.disabled === false ? 'pointer' : 'not-allowed',
             color: item.disabled === false ? '' : '#00000040',
-            background: 'transparent'
+            background: 'transparent',
+            border: 'none'
           }"
           @click="onControl(item, key)"
         >

src/components/ReFlowChart/src/NodePanel.vue

@@ -9,8 +9,8 @@ type nodeListType = {
 };
 
 interface Props {
-  lf: LogicFlow;
+  lf?: LogicFlow;
-  nodeList: Array<nodeListType>;
+  nodeList?: Array<nodeListType>;
 }
 
 const props = withDefaults(defineProps<Props>(), {

src/components/ReFlowChart/src/assets/iconfont/iconfont.js

@@ -23,26 +23,25 @@
   function h() {
     n || ((n = !0), o());
   }
-  (t = function () {
+  ((t = function () {
     var c, t, e, o;
-    ((o = document.createElement("div")).innerHTML = i),
+    (((o = document.createElement("div")).innerHTML = i),
       (i = null),
       (e = o.getElementsByTagName("svg")[0]) &&
-        (e.setAttribute("aria-hidden", "true"),
+        ((e.style.position = "absolute"),
-        (e.style.position = "absolute"),
         (e.style.width = 0),
         (e.style.height = 0),
         (e.style.overflow = "hidden"),
         (c = e),
         (t = document.body).firstChild
           ? ((o = c), (e = t.firstChild).parentNode.insertBefore(o, e))
-          : t.appendChild(c));
+          : t.appendChild(c)));
   }),
     document.addEventListener
       ? ~["complete", "loaded", "interactive"].indexOf(document.readyState)
         ? setTimeout(t, 0)
         : ((e = function () {
-            document.removeEventListener("DOMContentLoaded", e, !1), t();
+            (document.removeEventListener("DOMContentLoaded", e, !1), t());
           }),
           document.addEventListener("DOMContentLoaded", e, !1))
       : document.attachEvent &&
@@ -59,5 +58,5 @@
         })(),
         (a.onreadystatechange = function () {
           "complete" == a.readyState && ((a.onreadystatechange = null), h());
-        }));
+        })));
 })(window);

src/components/ReIcon/src/Select.vue

@@ -2,7 +2,7 @@
 import { IconJson } from "@/components/ReIcon/data";
 import { cloneDeep, isAllEmpty } from "@pureadmin/utils";
 import { ref, computed, CSSProperties, watch } from "vue";
-import Search from "@iconify-icons/ri/search-eye-line";
+import Search from "~icons/ri/search-eye-line";
 
 type ParameterCSSProperties = (item?: string) => CSSProperties | undefined;
 
@@ -158,7 +158,7 @@ watch(
               :name="pane.name"
             >
               <el-scrollbar height="220px">
-                <ul class="flex flex-wrap px-2 ml-2">
+                <ul class="flex flex-wrap px-2! ml-2!">
                   <li
                     v-for="(item, key) in pageList"
                     :key="key"
@@ -198,7 +198,7 @@ watch(
               @current-change="onCurrentChange"
             />
             <el-button
-              class="justify-end mr-2 ml-2"
+              class="justify-end mx-2!"
               type="danger"
               size="small"
               text
@@ -219,8 +219,8 @@ watch(
   &:hover {
     color: var(--el-color-primary);
     border-color: var(--el-color-primary);
-    transition: all 0.4s;
     transform: scaleX(1.05);
+    transition: all 0.4s;
   }
 }
 

src/components/ReIcon/src/hooks.ts

@@ -1,6 +1,6 @@
 import type { iconType } from "./types";
 import { h, defineComponent, type Component } from "vue";
-import { IconifyIconOnline, IconifyIconOffline, FontIcon } from "../index";
+import { FontIcon, IconifyIconOnline, IconifyIconOffline } from "../index";
 
 /**
  * 支持 `iconfont`、自定义 `svg` 以及 `iconify` 中所有的图标
@@ -49,10 +49,12 @@ export function useRenderIcon(icon: any, attrs?: iconType): Component {
     return defineComponent({
       name: "Icon",
       render() {
-        const IconifyIcon =
+        if (!icon) return;
-          icon && icon.includes(":") ? IconifyIconOnline : IconifyIconOffline;
+        const IconifyIcon = icon.includes(":")
+          ? IconifyIconOnline
+          : IconifyIconOffline;
         return h(IconifyIcon, {
-          icon: icon,
+          icon,
           ...attrs
         });
       }

src/components/ReIcon/src/iconfont.ts

@@ -27,8 +27,7 @@ export default defineComponent({
       return h(
         "svg",
         {
-          class: "icon-svg",
+          class: "icon-svg"
-          "aria-hidden": true
         },
         {
           default: () => [

src/components/ReIcon/src/iconifyIconOffline.ts

@@ -13,10 +13,26 @@ export default defineComponent({
   render() {
     if (typeof this.icon === "object") addIcon(this.icon, this.icon);
     const attrs = this.$attrs;
+    if (typeof this.icon === "string") {
       return h(
         IconifyIcon,
         {
           icon: this.icon,
+          "aria-hidden": false,
+          style: attrs?.style
+            ? Object.assign(attrs.style, { outline: "none" })
+            : { outline: "none" },
+          ...attrs
+        },
+        {
+          default: () => []
+        }
+      );
+    } else {
+      return h(
+        this.icon,
+        {
+          "aria-hidden": false,
           style: attrs?.style
             ? Object.assign(attrs.style, { outline: "none" })
             : { outline: "none" },
@@ -27,4 +43,5 @@ export default defineComponent({
         }
       );
     }
+  }
 });

src/components/ReIcon/src/iconifyIconOnline.ts

@@ -17,6 +17,7 @@ export default defineComponent({
       IconifyIcon,
       {
         icon: `${this.icon}`,
+        "aria-hidden": false,
         style: attrs?.style
           ? Object.assign(attrs.style, { outline: "none" })
           : { outline: "none" },

src/components/ReIcon/src/offlineIcon.ts

@@ -1,70 +1,87 @@
 // 这里存放本地图标，在 src/layout/index.vue 文件中加载，避免在首启动加载
+import { getSvgInfo } from "@pureadmin/utils";
 import { addIcon } from "@iconify/vue/dist/offline";
 
+// https://icon-sets.iconify.design/ep/?keyword=ep
+import EpMenu from "~icons/ep/menu?raw";
+import EpEdit from "~icons/ep/edit?raw";
+import EpGuide from "~icons/ep/guide?raw";
+import EpSetUp from "~icons/ep/set-up?raw";
+import EpMonitor from "~icons/ep/monitor?raw";
+import EpLollipop from "~icons/ep/lollipop?raw";
+import EpHistogram from "~icons/ep/histogram?raw";
+import EpHomeFilled from "~icons/ep/home-filled?raw";
+
+// https://icon-sets.iconify.design/ri/?keyword=ri
+import RiMindMap from "~icons/ri/mind-map?raw";
+import RiAdminFill from "~icons/ri/admin-fill?raw";
+import RiTableLine from "~icons/ri/table-line?raw";
+import RiLinksFill from "~icons/ri/links-fill?raw";
+import RiAdminLine from "~icons/ri/admin-line?raw";
+import RiListCheck from "~icons/ri/list-check?raw";
+import RiSearchLine from "~icons/ri/search-line?raw";
+import RiWindowLine from "~icons/ri/window-line?raw";
+import RiUbuntuFill from "~icons/ri/ubuntu-fill?raw";
+import RiHistoryFill from "~icons/ri/history-fill?raw";
+import RiEditBoxLine from "~icons/ri/edit-box-line?raw";
+import RiCodeBoxLine from "~icons/ri/code-box-line?raw";
+import RiArtboardLine from "~icons/ri/artboard-line?raw";
+import RiMarkdownLine from "~icons/ri/markdown-line?raw";
+import RiFileInfoLine from "~icons/ri/file-info-line?raw";
+import RiBankCardLine from "~icons/ri/bank-card-line?raw";
+import RiFilePpt2Line from "~icons/ri/file-ppt-2-line?raw";
+import RiGitBranchLine from "~icons/ri/git-branch-line?raw";
+import RiSettings3Line from "~icons/ri/settings-3-line?raw";
+import RiUserVoiceLine from "~icons/ri/user-voice-line?raw";
+import RiBookmark2Line from "~icons/ri/bookmark-2-line?raw";
+import RiFileSearchLine from "~icons/ri/file-search-line?raw";
+import RiChatSearchLine from "~icons/ri/chat-search-line?raw";
+import RiInformationLine from "~icons/ri/information-line?raw";
+import RiTerminalWindowLine from "~icons/ri/terminal-window-line?raw";
+import RiCheckboxCircleLine from "~icons/ri/checkbox-circle-line?raw";
+import RiBarChartHorizontalLine from "~icons/ri/bar-chart-horizontal-line?raw";
+
+const icons = [
+  // Element Plus Icon: https://github.com/element-plus/element-plus-icons
+  ["ep/menu", EpMenu],
+  ["ep/edit", EpEdit],
+  ["ep/guide", EpGuide],
+  ["ep/set-up", EpSetUp],
+  ["ep/monitor", EpMonitor],
+  ["ep/lollipop", EpLollipop],
+  ["ep/histogram", EpHistogram],
+  ["ep/home-filled", EpHomeFilled],
+  // Remix Icon: https://github.com/Remix-Design/RemixIcon
+  ["ri/mind-map", RiMindMap],
+  ["ri/admin-fill", RiAdminFill],
+  ["ri/table-line", RiTableLine],
+  ["ri/links-fill", RiLinksFill],
+  ["ri/admin-line", RiAdminLine],
+  ["ri/list-check", RiListCheck],
+  ["ri/search-line", RiSearchLine],
+  ["ri/window-line", RiWindowLine],
+  ["ri/ubuntu-fill", RiUbuntuFill],
+  ["ri/history-fill", RiHistoryFill],
+  ["ri/edit-box-line", RiEditBoxLine],
+  ["ri/code-box-line", RiCodeBoxLine],
+  ["ri/artboard-line", RiArtboardLine],
+  ["ri/markdown-line", RiMarkdownLine],
+  ["ri/file-info-line", RiFileInfoLine],
+  ["ri/bank-card-line", RiBankCardLine],
+  ["ri/file-ppt-2-line", RiFilePpt2Line],
+  ["ri/git-branch-line", RiGitBranchLine],
+  ["ri/settings-3-line", RiSettings3Line],
+  ["ri/user-voice-line", RiUserVoiceLine],
+  ["ri/bookmark-2-line", RiBookmark2Line],
+  ["ri/file-search-line", RiFileSearchLine],
+  ["ri/chat-search-line", RiChatSearchLine],
+  ["ri/information-line", RiInformationLine],
+  ["ri/terminal-window-line", RiTerminalWindowLine],
+  ["ri/checkbox-circle-line", RiCheckboxCircleLine],
+  ["ri/bar-chart-horizontal-line", RiBarChartHorizontalLine]
+];
+
 // 本地菜单图标，后端在路由的 icon 中返回对应的图标字符串并且前端在此处使用 addIcon 添加即可渲染菜单图标
-// @iconify-icons/ep
+icons.forEach(([name, icon]) => {
-import Menu from "@iconify-icons/ep/menu";
+  addIcon(name as string, getSvgInfo(icon as string));
-import Edit from "@iconify-icons/ep/edit";
+});
-import SetUp from "@iconify-icons/ep/set-up";
-import Guide from "@iconify-icons/ep/guide";
-import Monitor from "@iconify-icons/ep/monitor";
-import Lollipop from "@iconify-icons/ep/lollipop";
-import Histogram from "@iconify-icons/ep/histogram";
-import HomeFilled from "@iconify-icons/ep/home-filled";
-addIcon("ep:menu", Menu);
-addIcon("ep:edit", Edit);
-addIcon("ep:set-up", SetUp);
-addIcon("ep:guide", Guide);
-addIcon("ep:monitor", Monitor);
-addIcon("ep:lollipop", Lollipop);
-addIcon("ep:histogram", Histogram);
-addIcon("ep:home-filled", HomeFilled);
-// @iconify-icons/ri
-import Tag from "@iconify-icons/ri/bookmark-2-line";
-import Ppt from "@iconify-icons/ri/file-ppt-2-line";
-import Card from "@iconify-icons/ri/bank-card-line";
-import Role from "@iconify-icons/ri/admin-fill";
-import Info from "@iconify-icons/ri/file-info-line";
-import Dept from "@iconify-icons/ri/git-branch-line";
-import Table from "@iconify-icons/ri/table-line";
-import Links from "@iconify-icons/ri/links-fill";
-import Search from "@iconify-icons/ri/search-line";
-import FlUser from "@iconify-icons/ri/admin-line";
-import Setting from "@iconify-icons/ri/settings-3-line";
-import MindMap from "@iconify-icons/ri/mind-map";
-import BarChart from "@iconify-icons/ri/bar-chart-horizontal-line";
-import LoginLog from "@iconify-icons/ri/window-line";
-import Artboard from "@iconify-icons/ri/artboard-line";
-import SystemLog from "@iconify-icons/ri/file-search-line";
-import ListCheck from "@iconify-icons/ri/list-check";
-import UbuntuFill from "@iconify-icons/ri/ubuntu-fill";
-import OnlineUser from "@iconify-icons/ri/user-voice-line";
-import EditBoxLine from "@iconify-icons/ri/edit-box-line";
-import OperationLog from "@iconify-icons/ri/history-fill";
-import InformationLine from "@iconify-icons/ri/information-line";
-import TerminalWindowLine from "@iconify-icons/ri/terminal-window-line";
-import CheckboxCircleLine from "@iconify-icons/ri/checkbox-circle-line";
-addIcon("ri:bookmark-2-line", Tag);
-addIcon("ri:file-ppt-2-line", Ppt);
-addIcon("ri:bank-card-line", Card);
-addIcon("ri:admin-fill", Role);
-addIcon("ri:file-info-line", Info);
-addIcon("ri:git-branch-line", Dept);
-addIcon("ri:links-fill", Links);
-addIcon("ri:table-line", Table);
-addIcon("ri:search-line", Search);
-addIcon("ri:admin-line", FlUser);
-addIcon("ri:settings-3-line", Setting);
-addIcon("ri:mind-map", MindMap);
-addIcon("ri:bar-chart-horizontal-line", BarChart);
-addIcon("ri:window-line", LoginLog);
-addIcon("ri:file-search-line", SystemLog);
-addIcon("ri:artboard-line", Artboard);
-addIcon("ri:list-check", ListCheck);
-addIcon("ri:ubuntu-fill", UbuntuFill);
-addIcon("ri:user-voice-line", OnlineUser);
-addIcon("ri:edit-box-line", EditBoxLine);
-addIcon("ri:history-fill", OperationLog);
-addIcon("ri:information-line", InformationLine);
-addIcon("ri:terminal-window-line", TerminalWindowLine);
-addIcon("ri:checkbox-circle-line", CheckboxCircleLine);

src/components/RePureTableBar/src/bar.tsx

@@ -18,8 +18,8 @@ import {
   getKeyList
 } from "@pureadmin/utils";
 
-import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
+import Fullscreen from "~icons/ri/fullscreen-fill";
-import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
+import ExitFullscreen from "~icons/ri/fullscreen-exit-fill";
 import DragIcon from "@/assets/table-bar/drag.svg?component";
 import ExpandIcon from "@/assets/table-bar/expand.svg?component";
 import RefreshIcon from "@/assets/table-bar/refresh.svg?component";
@@ -87,9 +87,9 @@ export default defineComponent({
         "text-black",
         "dark:text-white",
         "duration-100",
-        "hover:!text-primary",
+        "hover:text-primary!",
         "cursor-pointer",
-        "outline-none"
+        "outline-hidden"
       ];
     });
 
@@ -255,12 +255,12 @@ export default defineComponent({
         <div
           {...attrs}
           class={[
-            "w-[99/100]",
+            "w-full",
             "px-2",
             "pb-2",
             "bg-bg_color",
             isFullscreen.value
-              ? ["!w-full", "!h-full", "z-[2002]", "fixed", "inset-0"]
+              ? ["h-full!", "z-2002", "fixed", "inset-0"]
               : "mt-2"
           ]}
         >
@@ -317,7 +317,7 @@ export default defineComponent({
               >
                 <div class={[topClass.value]}>
                   <el-checkbox
-                    class="!-mr-1"
+                    class="-mr-1!"
                     label="列展示"
                     v-model={checkAll.value}
                     indeterminate={isIndeterminate.value}
@@ -347,8 +347,8 @@ export default defineComponent({
                                 class={[
                                   "drag-btn w-[16px] mr-2",
                                   isFixedColumn(item)
-                                    ? "!cursor-no-drop"
+                                    ? "cursor-no-drop!"
-                                    : "!cursor-grab"
+                                    : "cursor-grab!"
                                 ]}
                                 onMouseenter={(event: {
                                   preventDefault: () => void;

src/components/ReQrcode/src/index.tsx

@@ -11,7 +11,7 @@ import "./index.scss";
 import propTypes from "@/utils/propTypes";
 import { isString, cloneDeep } from "@pureadmin/utils";
 import QRCode, { type QRCodeRenderersOptions } from "qrcode";
-import RefreshRight from "@iconify-icons/ep/refresh-right";
+import RefreshRight from "~icons/ep/refresh-right";
 
 interface QrcodeLogo {
   src?: string;

src/components/ReSeamlessScroll/src/utils.ts

@@ -60,12 +60,15 @@ export function copyObj() {
     copyIsArray,
     clone,
     i = 1,
+    // eslint-disable-next-line prefer-rest-params
     target = arguments[0] || {}, // 使用||运算符，排除隐式强制类型转换为false的数据类型
     deep = false,
+    // eslint-disable-next-line prefer-const
     len = arguments.length;
   if (typeof target === "boolean") {
     deep = target;
 
+    // eslint-disable-next-line prefer-rest-params
     target = arguments[1] || {};
     i++;
   }
@@ -79,6 +82,7 @@ export function copyObj() {
   for (; i < len; i++) {
     //所以如果源对象中数据类型为Undefined或Null那么就会跳过本次循环，接着循环下一个源对象
 
+    // eslint-disable-next-line prefer-rest-params
     if ((options = arguments[i]) != null) {
       // 如果遇到源对象的数据类型为Boolean, Number for in循环会被跳过，不执行for in循环// src用于判断target对象是否存在name属性
       for (name in options) {

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/components/ReSplitPane/iconfont/iconfont.js

@@ -33,25 +33,26 @@
     }
     l();
   }
-  (t = function () {
+  ((t = function () {
     var e,
       t = document.createElement("div");
-    (t.innerHTML = i),
+    ((t.innerHTML = i),
       (i = null),
       (t = t.getElementsByTagName("svg")[0]) &&
-        (t.setAttribute("aria-hidden", "true"),
+        ((t.style.position = "absolute"),
-        (t.style.position = "absolute"),
         (t.style.width = 0),
         (t.style.height = 0),
         (t.style.overflow = "hidden"),
         (t = t),
-        (e = document.body).firstChild ? m(t, e.firstChild) : e.appendChild(t));
+        (e = document.body).firstChild
+          ? m(t, e.firstChild)
+          : e.appendChild(t)));
   }),
     document.addEventListener
       ? ~["complete", "loaded", "interactive"].indexOf(document.readyState)
         ? setTimeout(t, 0)
         : ((n = function () {
-            document.removeEventListener("DOMContentLoaded", n, !1), t();
+            (document.removeEventListener("DOMContentLoaded", n, !1), t());
           }),
           document.addEventListener("DOMContentLoaded", n, !1))
       : document.attachEvent &&
@@ -61,5 +62,5 @@
         a(),
         (o.onreadystatechange = function () {
           "complete" == o.readyState && ((o.onreadystatechange = null), l());
-        }));
+        })));
 })(window);

src/components/ReText/src/index.vue

@@ -1,6 +1,6 @@
-<script lang="ts" setup>
+<script setup lang="ts">
-import { h, onMounted, ref, useSlots } from "vue";
+import { h, onMounted, ref } from "vue";
-import { type TippyOptions, useTippy } from "vue-tippy";
+import { type TippyOptions, type TippyContent, useTippy } from "vue-tippy";
 
 defineOptions({
   name: "ReText"
@@ -17,7 +17,10 @@ const props = defineProps({
   }
 });
 
-const $slots = useSlots();
+const slots = defineSlots<{
+  content: () => TippyContent;
+  default: () => any;
+}>();
 
 const textRef = ref();
 const tippyFunc = ref();
@@ -33,7 +36,7 @@ const isTextEllipsis = (el: HTMLElement) => {
 };
 
 const getTippyProps = () => ({
-  content: h($slots.content || $slots.default),
+  content: h(slots.content || slots.default),
   ...props.tippyProps
 });
 

src/components/ReTreeLine/index.ts

@@ -90,9 +90,9 @@ export default defineComponent({
         ];
     // 取得每一层的当前节点是不是在当前层级列表的最后一个
     const lastnodeArr = [];
-    let currentNode = this.node;
+    let currentNode: any = this.node;
     while (currentNode) {
-      let parentNode = currentNode.parent;
+      let parentNode: any = currentNode.parent;
       // 兼容element-plus的 el-tree-v2 (Virtualized Tree 虚拟树)
       if (currentNode.level === 1 && !currentNode.parent) {
         // el-tree-v2的第一层node是没有parent的，必需 treeData 创建一个parent

src/components/ReVxeTableBar/src/bar.tsx

@@ -12,8 +12,8 @@ import {
   getCurrentInstance
 } from "vue";
 
-import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
+import Fullscreen from "~icons/ri/fullscreen-fill";
-import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
+import ExitFullscreen from "~icons/ri/fullscreen-exit-fill";
 import DragIcon from "@/assets/table-bar/drag.svg?component";
 import ExpandIcon from "@/assets/table-bar/expand.svg?component";
 import RefreshIcon from "@/assets/table-bar/refresh.svg?component";
@@ -80,9 +80,9 @@ export default defineComponent({
         "text-black",
         "dark:text-white",
         "duration-100",
-        "hover:!text-primary",
+        "hover:text-primary!",
         "cursor-pointer",
-        "outline-none"
+        "outline-hidden"
       ];
     });
 
@@ -248,12 +248,12 @@ export default defineComponent({
         <div
           {...attrs}
           class={[
-            "w-[99/100]",
+            "w-full",
             "px-2",
             "pb-2",
             "bg-bg_color",
             isFullscreen.value
-              ? ["!w-full", "!h-full", "z-[2002]", "fixed", "inset-0"]
+              ? ["h-full!", "z-2002", "fixed", "inset-0"]
               : "mt-2"
           ]}
         >
@@ -310,7 +310,7 @@ export default defineComponent({
               >
                 <div class={[topClass.value]}>
                   <el-checkbox
-                    class="!-mr-1"
+                    class="-mr-1!"
                     label="列展示"
                     v-model={checkAll.value}
                     indeterminate={isIndeterminate.value}
@@ -340,8 +340,8 @@ export default defineComponent({
                                 class={[
                                   "drag-btn w-[16px] mr-2",
                                   isFixedColumn(item)
-                                    ? "!cursor-no-drop"
+                                    ? "cursor-no-drop!"
-                                    : "!cursor-grab"
+                                    : "cursor-grab!"
                                 ]}
                                 onMouseenter={(event: {
                                   preventDefault: () => void;

src/directives/ripple/index.scss

@@ -13,10 +13,10 @@ $ripple-animation-visible-opacity: 0.25 !default;
     z-index: 0;
     width: 100%;
     height: 100%;
+    contain: strict;
     overflow: hidden;
     pointer-events: none;
     border-radius: inherit;
-    contain: strict;
   }
 
   &__animation {

src/directives/ripple/index.ts

@@ -32,8 +32,8 @@ const calculate = (
   const offset = el.getBoundingClientRect();
 
   // 获取点击位置距离 el 的垂直和水平距离
-  let localX = e.clientX - offset.left;
+  const localX = e.clientX - offset.left;
-  let localY = e.clientY - offset.top;
+  const localY = e.clientY - offset.top;
 
   let radius = 0;
   let scale = 0.3;

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

@@ -1,4 +1,4 @@
-<script lang="ts" setup>
+<script setup lang="ts">
 import { getConfig } from "@/config";
 
 const TITLE = getConfig("Title");
@@ -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-navbar/index.vue

@@ -9,10 +9,10 @@ import LaySidebarBreadCrumb from "../lay-sidebar/components/SidebarBreadCrumb.vu
 import LaySidebarTopCollapse from "../lay-sidebar/components/SidebarTopCollapse.vue";
 
 import GlobalizationIcon from "@/assets/svg/globalization.svg?component";
-import AccountSettingsIcon from "@iconify-icons/ri/user-settings-line";
+import AccountSettingsIcon from "~icons/ri/user-settings-line";
-import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
+import LogoutCircleRLine from "~icons/ri/logout-circle-r-line";
-import Setting from "@iconify-icons/ri/settings-3-line";
+import Setting from "~icons/ri/settings-3-line";
-import Check from "@iconify-icons/ep/check";
+import Check from "~icons/ep/check";
 
 const {
   layout,
@@ -33,7 +33,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
 </script>
 
 <template>
-  <div class="navbar bg-[#fff] shadow-sm shadow-[rgba(0,21,41,0.08)]">
+  <div class="navbar bg-[#fff] shadow-xs shadow-[rgba(0,21,41,0.08)]">
     <LaySidebarTopCollapse
       v-if="device === 'mobile'"
       class="hamburger-container"
@@ -54,13 +54,13 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
       <!-- 国际化 -->
       <el-dropdown id="header-translation" trigger="click">
         <GlobalizationIcon
-          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-none"
+          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
         />
         <template #dropdown>
           <el-dropdown-menu class="translation">
             <el-dropdown-item
               :style="getDropdownItemStyle(locale, 'zh')"
-              :class="['dark:!text-white', getDropdownItemClass(locale, 'zh')]"
+              :class="['dark:text-white!', getDropdownItemClass(locale, 'zh')]"
               @click="translationCh"
             >
               <IconifyIconOffline
@@ -72,7 +72,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
             </el-dropdown-item>
             <el-dropdown-item
               :style="getDropdownItemStyle(locale, 'en')"
-              :class="['dark:!text-white', getDropdownItemClass(locale, 'en')]"
+              :class="['dark:text-white!', getDropdownItemClass(locale, 'en')]"
               @click="translationEn"
             >
               <span v-show="locale === 'en'" class="check-en">

src/layout/components/lay-notice/components/NoticeItem.vue

@@ -49,7 +49,7 @@ function hoverDescription(event, description) {
 
 <template>
   <div
-    class="notice-container border-b-[1px] border-solid border-[#f0f0f0] dark:border-[#303030]"
+    class="notice-container border-0 border-b-[1px] border-solid border-[#f0f0f0] dark:border-[#303030]"
   >
     <el-avatar
       v-if="noticeItem.avatar"
@@ -112,7 +112,7 @@ function hoverDescription(event, description) {
   max-width: 238px;
 }
 </style>
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .notice-container {
   display: flex;
   align-items: flex-start;

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

@@ -3,7 +3,7 @@ import { useI18n } from "vue-i18n";
 import { ref, computed } from "vue";
 import { noticesData } from "./data";
 import NoticeList from "./components/NoticeList.vue";
-import BellIcon from "@iconify-icons/ep/bell";
+import BellIcon from "~icons/ep/bell";
 
 const { t } = useI18n();
 const noticesNum = ref(0);

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

@@ -4,7 +4,7 @@ import { emitter } from "@/utils/mitt";
 import { onClickOutside } from "@vueuse/core";
 import { ref, computed, onMounted, onBeforeUnmount } from "vue";
 import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
-import CloseIcon from "@iconify-icons/ep/close";
+import CloseIcon from "~icons/ep/close";
 
 const target = ref(null);
 const show = ref<Boolean>(false);
@@ -16,7 +16,7 @@ const iconClass = computed(() => {
     "flex",
     "justify-center",
     "items-center",
-    "outline-none",
+    "outline-hidden",
     "rounded-[4px]",
     "cursor-pointer",
     "transition-colors",
@@ -51,7 +51,7 @@ onBeforeUnmount(() => {
     <div class="right-panel-background" />
     <div ref="target" class="right-panel bg-bg_color">
       <div
-        class="project-configuration border-b-[1px] border-solid border-[var(--pure-border-color)]"
+        class="project-configuration border-0 border-b-[1px] border-solid border-[var(--pure-border-color)]"
       >
         <h4 class="dark:text-white">
           {{ t("panel.pureSystemSet") }}
@@ -78,7 +78,7 @@ onBeforeUnmount(() => {
       </el-scrollbar>
 
       <div
-        class="flex justify-end p-3 border-t-[1px] border-solid border-[var(--pure-border-color)]"
+        class="flex justify-end p-3 border-0 border-t-[1px] border-solid border-[var(--pure-border-color)]"
       >
         <el-button
           v-tippy="{
@@ -121,8 +121,8 @@ onBeforeUnmount(() => {
   width: 100%;
   max-width: 280px;
   box-shadow: 0 0 15px 0 rgb(0 0 0 / 5%);
-  transition: all 0.25s cubic-bezier(0.7, 0.3, 0.1, 1);
   transform: translate(100%);
+  transition: all 0.25s cubic-bezier(0.7, 0.3, 0.1, 1);
 }
 
 .show {

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

@@ -3,10 +3,10 @@ import { useI18n } from "vue-i18n";
 import { useNav } from "@/layout/hooks/useNav";
 import MdiKeyboardEsc from "@/assets/svg/keyboard_esc.svg?component";
 import EnterOutlined from "@/assets/svg/enter_outlined.svg?component";
-import ArrowUpLine from "@iconify-icons/ri/arrow-up-line";
+import ArrowUpLine from "~icons/ri/arrow-up-line";
-import ArrowDownLine from "@iconify-icons/ri/arrow-down-line";
+import ArrowDownLine from "~icons/ri/arrow-down-line";
 
-withDefaults(defineProps<{ total: number }>(), {
+withDefaults(defineProps<{ total?: number }>(), {
   total: 0
 });
 

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

@@ -2,8 +2,8 @@
 import type { optionsItem } from "../types";
 import { transformI18n } from "@/plugins/i18n";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
-import StarIcon from "@iconify-icons/ep/star";
+import StarIcon from "~icons/ep/star";
-import CloseIcon from "@iconify-icons/ep/close";
+import CloseIcon from "~icons/ep/close";
 
 interface Props {
   item: optionsItem;

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

@@ -6,14 +6,14 @@ 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";
 import { usePermissionStoreHook } from "@/store/modules/permission";
 import { cloneDeep, isAllEmpty, storageLocal } from "@pureadmin/utils";
-import SearchIcon from "@iconify-icons/ri/search-line";
+import SearchIcon from "~icons/ri/search-line";
 
 interface Props {
   /** 弹窗显隐 */

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

@@ -14,7 +14,7 @@ function handleSearch() {
       class="search-container w-[40px] h-[48px] flex-c cursor-pointer navbar-bg-hover"
       @click="handleSearch"
     >
-      <IconifyIconOffline icon="ri:search-line" />
+      <IconifyIconOffline icon="ri/search-line" />
     </div>
     <SearchModal v-model:value="show" />
   </div>

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

@@ -19,9 +19,9 @@ import Segmented, { type OptionsType } from "@/components/ReSegmented";
 import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
 import { useDark, useGlobal, debounce, isNumber } from "@pureadmin/utils";
 
-import Check from "@iconify-icons/ep/check";
+import Check from "~icons/ep/check";
-import LeftArrow from "@iconify-icons/ri/arrow-left-s-line";
+import LeftArrow from "~icons/ri/arrow-left-s-line?width=20&height=20";
-import RightArrow from "@iconify-icons/ri/arrow-right-s-line";
+import RightArrow from "~icons/ri/arrow-right-s-line?width=20&height=20";
 import DayIcon from "@/assets/svg/day.svg?component";
 import DarkIcon from "@/assets/svg/dark.svg?component";
 import SystemIcon from "@/assets/svg/system.svg?component";
@@ -189,7 +189,7 @@ const getThemeColor = computed(() => {
 });
 
 const pClass = computed(() => {
-  return ["mb-[12px]", "font-medium", "text-sm", "dark:text-white"];
+  return ["mb-[12px]!", "font-medium", "text-sm", "dark:text-white"];
 });
 
 const themeOptions = computed<Array<OptionsType>>(() => {
@@ -335,7 +335,7 @@ onUnmounted(() => removeMatchMedia);
         "
       />
 
-      <p :class="['mt-5', pClass]">{{ t("panel.pureThemeColor") }}</p>
+      <p :class="['mt-5!', pClass]">{{ t("panel.pureThemeColor") }}</p>
       <ul class="theme-color">
         <li
           v-for="(item, index) in themeColors"
@@ -354,7 +354,7 @@ onUnmounted(() => removeMatchMedia);
         </li>
       </ul>
 
-      <p :class="['mt-5', pClass]">{{ t("panel.pureLayoutModel") }}</p>
+      <p :class="['mt-5!', pClass]">{{ t("panel.pureLayoutModel") }}</p>
       <ul class="pure-theme">
         <li
           ref="verticalRef"
@@ -397,7 +397,7 @@ onUnmounted(() => removeMatchMedia);
       </ul>
 
       <span v-if="useAppStoreHook().getViewportWidth > 1280">
-        <p :class="['mt-5', pClass]">{{ t("panel.pureStretch") }}</p>
+        <p :class="['mt-5!', pClass]">{{ t("panel.pureStretch") }}</p>
         <Segmented
           resize
           class="mb-2 select-none"
@@ -426,21 +426,19 @@ onUnmounted(() => removeMatchMedia);
           >
             <IconifyIconOffline
               :icon="settings.stretch ? RightArrow : LeftArrow"
-              height="20"
             />
             <div
-              class="flex-grow border-b border-dashed"
+              class="grow border-0 border-b border-dashed"
               style="border-color: var(--el-color-primary)"
             />
             <IconifyIconOffline
               :icon="settings.stretch ? LeftArrow : RightArrow"
-              height="20"
             />
           </div>
         </button>
       </span>
 
-      <p :class="['mt-4', pClass]">{{ t("panel.pureTagsStyle") }}</p>
+      <p :class="['mt-4!', pClass]">{{ t("panel.pureTagsStyle") }}</p>
       <Segmented
         resize
         class="select-none"
@@ -449,7 +447,7 @@ onUnmounted(() => removeMatchMedia);
         @change="onChange"
       />
 
-      <p class="mt-5 font-medium text-sm dark:text-white">
+      <p class="mt-5! font-medium text-sm dark:text-white">
         {{ t("panel.pureInterfaceDisplay") }}
       </p>
       <ul class="setting">

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

@@ -12,10 +12,10 @@ import LaySidebarItem from "../lay-sidebar/components/SidebarItem.vue";
 import LaySidebarFullScreen from "../lay-sidebar/components/SidebarFullScreen.vue";
 
 import GlobalizationIcon from "@/assets/svg/globalization.svg?component";
-import AccountSettingsIcon from "@iconify-icons/ri/user-settings-line";
+import AccountSettingsIcon from "~icons/ri/user-settings-line";
-import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
+import LogoutCircleRLine from "~icons/ri/logout-circle-r-line";
-import Setting from "@iconify-icons/ri/settings-3-line";
+import Setting from "~icons/ri/settings-3-line";
-import Check from "@iconify-icons/ep/check";
+import Check from "~icons/ep/check";
 
 const menuRef = ref();
 const showLogo = ref(
@@ -84,13 +84,13 @@ onMounted(() => {
       <!-- 国际化 -->
       <el-dropdown id="header-translation" trigger="click">
         <GlobalizationIcon
-          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-none"
+          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
         />
         <template #dropdown>
           <el-dropdown-menu class="translation">
             <el-dropdown-item
               :style="getDropdownItemStyle(locale, 'zh')"
-              :class="['dark:!text-white', getDropdownItemClass(locale, 'zh')]"
+              :class="['dark:text-white!', getDropdownItemClass(locale, 'zh')]"
               @click="translationCh"
             >
               <span v-show="locale === 'zh'" class="check-zh">
@@ -100,7 +100,7 @@ onMounted(() => {
             </el-dropdown-item>
             <el-dropdown-item
               :style="getDropdownItemStyle(locale, 'en')"
-              :class="['dark:!text-white', getDropdownItemClass(locale, 'en')]"
+              :class="['dark:text-white!', getDropdownItemClass(locale, 'en')]"
               @click="translationEn"
             >
               <span v-show="locale === 'en'" class="check-en">

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

@@ -13,10 +13,10 @@ import LaySidebarExtraIcon from "../lay-sidebar/components/SidebarExtraIcon.vue"
 import LaySidebarFullScreen from "../lay-sidebar/components/SidebarFullScreen.vue";
 
 import GlobalizationIcon from "@/assets/svg/globalization.svg?component";
-import AccountSettingsIcon from "@iconify-icons/ri/user-settings-line";
+import AccountSettingsIcon from "~icons/ri/user-settings-line";
-import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
+import LogoutCircleRLine from "~icons/ri/logout-circle-r-line";
-import Setting from "@iconify-icons/ri/settings-3-line";
+import Setting from "~icons/ri/settings-3-line";
-import Check from "@iconify-icons/ep/check";
+import Check from "~icons/ep/check";
 
 const menuRef = ref();
 const defaultActive = ref(null);
@@ -105,13 +105,13 @@ watch(
       <!-- 国际化 -->
       <el-dropdown id="header-translation" trigger="click">
         <GlobalizationIcon
-          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-none"
+          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
         />
         <template #dropdown>
           <el-dropdown-menu class="translation">
             <el-dropdown-item
               :style="getDropdownItemStyle(locale, 'zh')"
-              :class="['dark:!text-white', getDropdownItemClass(locale, 'zh')]"
+              :class="['dark:text-white!', getDropdownItemClass(locale, 'zh')]"
               @click="translationCh"
             >
               <span v-show="locale === 'zh'" class="check-zh">
@@ -121,7 +121,7 @@ watch(
             </el-dropdown-item>
             <el-dropdown-item
               :style="getDropdownItemStyle(locale, 'en')"
-              :class="['dark:!text-white', getDropdownItemClass(locale, 'en')]"
+              :class="['dark:text-white!', getDropdownItemClass(locale, 'en')]"
               @click="translationEn"
             >
               <span v-show="locale === 'en'" class="check-en">

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

@@ -105,12 +105,12 @@ watch(
 </script>
 
 <template>
-  <el-breadcrumb class="!leading-[50px] select-none" separator="/">
+  <el-breadcrumb class="leading-[50px]! select-none" separator="/">
     <transition-group name="breadcrumb">
       <el-breadcrumb-item
         v-for="item in levelList"
         :key="item.path"
-        class="!inline !items-stretch"
+        class="inline! items-stretch!"
       >
         <a @click.prevent="handleLink(item)">
           {{ transformI18n(item.meta.title) }}

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

@@ -4,10 +4,10 @@ import { useI18n } from "vue-i18n";
 import { useGlobal } from "@pureadmin/utils";
 import { useNav } from "@/layout/hooks/useNav";
 
-import ArrowLeft from "@iconify-icons/ri/arrow-left-double-fill";
+import ArrowLeft from "~icons/ri/arrow-left-double-fill";
 
 interface Props {
-  isActive: boolean;
+  isActive?: boolean;
 }
 
 withDefaults(defineProps<Props>(), {

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

@@ -17,10 +17,10 @@ import {
   useAttrs
 } from "vue";
 
-import ArrowUp from "@iconify-icons/ep/arrow-up-bold";
+import ArrowUp from "~icons/ep/arrow-up-bold";
-import EpArrowDown from "@iconify-icons/ep/arrow-down-bold";
+import EpArrowDown from "~icons/ep/arrow-down-bold";
-import ArrowLeft from "@iconify-icons/ep/arrow-left-bold";
+import ArrowLeft from "~icons/ep/arrow-left-bold";
-import ArrowRight from "@iconify-icons/ep/arrow-right-bold";
+import ArrowRight from "~icons/ep/arrow-right-bold";
 
 const attrs = useAttrs();
 const { layout, isCollapse, tooltipEffect, getDivStyle } = useNav();
@@ -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>
@@ -156,7 +171,7 @@ function resolvePath(routePath) {
               offset: [0, -10],
               theme: tooltipEffect
             }"
-            class="!w-full !text-inherit"
+            class="w-full! text-inherit!"
           >
             {{ transformI18n(onlyOneChild.meta.title) }}
           </ReText>
@@ -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/SidebarLeftCollapse.vue

@@ -4,10 +4,10 @@ import { useI18n } from "vue-i18n";
 import { useGlobal } from "@pureadmin/utils";
 import { useNav } from "@/layout/hooks/useNav";
 
-import MenuFold from "@iconify-icons/ri/menu-fold-fill";
+import MenuFold from "~icons/ri/menu-fold-fill";
 
 interface Props {
-  isActive: boolean;
+  isActive?: boolean;
 }
 
 withDefaults(defineProps<Props>(), {
@@ -23,7 +23,7 @@ const iconClass = computed(() => {
     "mb-1",
     "w-[16px]",
     "h-[16px]",
-    "inline-block",
+    "inline-block!",
     "align-middle",
     "cursor-pointer",
     "duration-[100ms]"

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

@@ -60,11 +60,11 @@ const { title, getLogo } = useNav();
       height: 32px;
       margin: 2px 0 0 12px;
       overflow: hidden;
+      text-overflow: ellipsis;
       font-size: 18px;
       font-weight: 600;
       line-height: 32px;
       color: var(--pure-theme-sub-menu-active-text);
-      text-overflow: ellipsis;
       white-space: nowrap;
     }
   }

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

@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { useI18n } from "vue-i18n";
-import MenuFold from "@iconify-icons/ri/menu-fold-fill";
+import MenuFold from "~icons/ri/menu-fold-fill";
-import MenuUnfold from "@iconify-icons/ri/menu-unfold-fill";
+import MenuUnfold from "~icons/ri/menu-unfold-fill";
 
 interface Props {
-  isActive: boolean;
+  isActive?: boolean;
 }
 
 withDefaults(defineProps<Props>(), {
@@ -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/layout/components/lay-tag/index.scss

@@ -59,10 +59,10 @@
       color: var(--el-color-primary);
       cursor: pointer;
       border-radius: 4px;
+      transform: translate(0, -50%);
       transition:
         background-color 0.12s,
         color 0.12s;
-      transform: translate(0, -50%);
 
       &:hover {
         color: rgb(0 0 0 / 88%) !important;
@@ -127,10 +127,10 @@
     font-weight: normal;
     color: var(--el-text-color-primary);
     white-space: nowrap;
+    outline: 0;
     list-style-type: none;
     background: #fff;
     border-radius: 4px;
-    outline: 0;
     box-shadow: 0 2px 8px rgb(0 0 0 / 15%);
 
     li {

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

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { $t } from "@/plugins/i18n";
 import { emitter } from "@/utils/mitt";
+import NProgress from "@/utils/progress";
 import { RouteConfigs } from "../../types";
 import { useTags } from "../../hooks/useTag";
 import { routerArrays } from "@/layout/types";
@@ -18,11 +19,11 @@ import {
   useResizeObserver
 } from "@pureadmin/utils";
 
-import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
+import ExitFullscreen from "~icons/ri/fullscreen-exit-fill";
-import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
+import Fullscreen from "~icons/ri/fullscreen-fill";
-import ArrowDown from "@iconify-icons/ri/arrow-down-s-line";
+import ArrowDown from "~icons/ri/arrow-down-s-line";
-import ArrowRightSLine from "@iconify-icons/ri/arrow-right-s-line";
+import ArrowRightSLine from "~icons/ri/arrow-right-s-line";
-import ArrowLeftSLine from "@iconify-icons/ri/arrow-left-s-line";
+import ArrowLeftSLine from "~icons/ri/arrow-left-s-line";
 
 const {
   Close,
@@ -206,12 +207,14 @@ function dynamicRouteTag(value: string): void {
 
 /** 刷新路由 */
 function onFresh() {
+  NProgress.start();
   const { fullPath, query } = unref(route);
   router.replace({
     path: "/redirect" + fullPath,
     query
   });
   handleAliveRoute(route as ToRouteType, "refresh");
+  NProgress.done();
 }
 
 function deleteDynamicTag(obj: any, current: any, tag?: string) {
@@ -254,7 +257,7 @@ function deleteDynamicTag(obj: any, current: any, tag?: string) {
   if (tag === "other") {
     spliceRoute(1, 1, true);
   } else if (tag === "left") {
-    spliceRoute(fixedTags.length, valueIndex - 1, true);
+    spliceRoute(fixedTags.length, valueIndex - fixedTags.length);
   } else if (tag === "right") {
     spliceRoute(valueIndex + 1, multiTags.value.length);
   } else {
@@ -353,7 +356,7 @@ function onClickDrop(key, item, selectRoute?: RouteConfigs) {
       break;
   }
   setTimeout(() => {
-    showMenuModel(route.fullPath, route.query);
+    showMenuModel(route.fullPath, route.query, route.params);
   });
 }
 
@@ -388,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) {
@@ -462,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;
@@ -511,6 +517,7 @@ function tagOnClick(item) {
   } else {
     router.push({ path });
   }
+  emitter.emit("tagOnClick", item);
 }
 
 onClickOutside(contextmenuRef, closeMenu, {
@@ -588,7 +595,7 @@ onBeforeUnmount(() => {
         >
           <template v-if="showModel !== 'chrome'">
             <span
-              class="tag-title dark:!text-text_color_primary dark:hover:!text-primary"
+              class="tag-title dark:text-text_color_primary! dark:hover:text-primary!"
             >
               {{ transformI18n(item.meta.title) }}
             </span>

src/layout/frame.vue

@@ -19,13 +19,22 @@ const loading = ref(true);
 const currentRoute = useRoute();
 const frameSrc = ref<string>("");
 const frameRef = ref<HTMLElement | null>(null);
+const fallbackTimer = ref<number | null>(null);
+
 if (unref(currentRoute.meta)?.frameSrc) {
   frameSrc.value = unref(currentRoute.meta)?.frameSrc as string;
 }
-unref(currentRoute.meta)?.frameLoading === false && hideLoading();
+
+function clearFallbackTimer() {
+  if (fallbackTimer.value !== null) {
+    clearTimeout(fallbackTimer.value);
+    fallbackTimer.value = null;
+  }
+}
 
 function hideLoading() {
   loading.value = false;
+  clearFallbackTimer();
 }
 
 function init() {
@@ -34,32 +43,42 @@ function init() {
     if (!iframe) return;
     const _frame = iframe as any;
     if (_frame.attachEvent) {
-      _frame.attachEvent("onload", () => {
+      _frame.attachEvent("onload", hideLoading);
-        hideLoading();
-      });
     } else {
-      iframe.onload = () => {
+      iframe.onload = hideLoading;
-        hideLoading();
-      };
     }
   });
 }
 
+let isRedirect = false;
+
 watch(
   () => currentRoute.fullPath,
   path => {
     if (
       currentRoute.name === "Redirect" &&
-      path.includes(props.frameInfo?.fullPath)
+      props.frameInfo?.fullPath &&
+      path.includes(props.frameInfo.fullPath)
     ) {
-      frameSrc.value = path; // redirect时，置换成任意值，待重定向后 重新赋值
+      isRedirect = true;
       loading.value = true;
+      return;
     }
-    // 重新赋值
+    if (props.frameInfo?.fullPath === path && isRedirect) {
-    if (props.frameInfo?.fullPath === path) {
+      loading.value = true;
-      frameSrc.value = props.frameInfo?.frameSrc;
+      clearFallbackTimer();
+      const url = new URL(props.frameInfo.frameSrc, window.location.origin);
+      const joinChar = url.search ? "&" : "?";
+      frameSrc.value = `${props.frameInfo.frameSrc}${joinChar}t=${Date.now()}`;
+      fallbackTimer.value = window.setTimeout(() => {
+        if (loading.value) {
+          hideLoading();
         }
+      }, 1500);
+      isRedirect = false;
     }
+  },
+  { immediate: true }
 );
 
 onMounted(() => {

src/layout/hooks/useNav.ts

@@ -14,8 +14,8 @@ import { useUserStoreHook } from "@/store/modules/user";
 import { useGlobal, isAllEmpty } from "@pureadmin/utils";
 import { useEpThemeStoreHook } from "@/store/modules/epTheme";
 import { usePermissionStoreHook } from "@/store/modules/permission";
-import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
+import ExitFullscreen from "~icons/ri/fullscreen-exit-fill";
-import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
+import Fullscreen from "~icons/ri/fullscreen-fill";
 
 const errorInfo =
   "The current routing configuration is incorrect, please check the configuration";
@@ -64,7 +64,7 @@ export function useNav() {
 
   const getDropdownItemClass = computed(() => {
     return (locale, t) => {
-      return locale === t ? "" : "dark:hover:!text-primary";
+      return locale === t ? "" : "dark:hover:text-primary!";
     };
   });
 

src/layout/hooks/useTag.ts

@@ -21,13 +21,13 @@ import {
   hasClass
 } from "@pureadmin/utils";
 
-import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
+import Fullscreen from "~icons/ri/fullscreen-fill";
-import CloseAllTags from "@iconify-icons/ri/subtract-line";
+import CloseAllTags from "~icons/ri/subtract-line";
-import CloseOtherTags from "@iconify-icons/ri/text-spacing";
+import CloseOtherTags from "~icons/ri/text-spacing";
-import CloseRightTags from "@iconify-icons/ri/text-direction-l";
+import CloseRightTags from "~icons/ri/text-direction-l";
-import CloseLeftTags from "@iconify-icons/ri/text-direction-r";
+import CloseLeftTags from "~icons/ri/text-direction-r";
-import RefreshRight from "@iconify-icons/ep/refresh-right";
+import RefreshRight from "~icons/ep/refresh-right";
-import Close from "@iconify-icons/ep/close";
+import Close from "~icons/ep/close";
 
 export function useTags() {
   const route = useRoute();
@@ -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/layout/index.vue

@@ -210,8 +210,8 @@ const LayHeader = defineComponent({
   height: 100%;
 
   &::after {
-    display: table;
     clear: both;
+    display: table;
     content: "";
   }
 

src/layout/types.ts

@@ -1,4 +1,4 @@
-import type { IconifyIcon } from "@iconify/vue";
+import type { FunctionalComponent } from "vue";
 const { VITE_HIDE_HOME } = import.meta.env;
 
 export const routerArrays: Array<RouteConfigs> =
@@ -6,9 +6,10 @@ export const routerArrays: Array<RouteConfigs> =
     ? [
         {
           path: "/welcome",
+          name: "Welcome",
           meta: {
             title: "menus.pureHome",
-            icon: "ep:home-filled"
+            icon: "ep/home-filled"
           }
         }
       ]
@@ -16,7 +17,7 @@ export const routerArrays: Array<RouteConfigs> =
 
 export type routeMetaType = {
   title?: string;
-  icon?: string | IconifyIcon;
+  icon?: string | FunctionalComponent;
   showLink?: boolean;
   savedPosition?: boolean;
   auths?: Array<string>;
@@ -36,7 +37,7 @@ export type multiTagsType = {
 };
 
 export type tagsViewsType = {
-  icon: string | IconifyIcon;
+  icon: string | FunctionalComponent;
   text: string;
   divided: boolean;
   disabled: boolean;

src/plugins/i18n.ts

@@ -10,7 +10,7 @@ import zhLocale from "element-plus/es/locale/lang/zh-cn";
 
 const siphonI18n = (function () {
   // 仅初始化一次国际化配置
-  let cache = Object.fromEntries(
+  const cache = Object.fromEntries(
     Object.entries(
       import.meta.glob("../../locales/*.y(a)?ml", { eager: true })
     ).map(([key, value]: any) => {

src/router/enums.ts

@@ -1,33 +1,37 @@
 // 完整版菜单比较多，将 rank 抽离出来，在此方便维护
 
 const home = 0, // 平台规定只有 home 路由的 rank 才能为 0 ，所以后端在返回 rank 的时候需要从非 0 开始
-  vueflow = 1,
+  chatai = 1,
-  ganttastic = 2,
+  vueflow = 2,
-  components = 3,
+  ganttastic = 3,
-  able = 4,
+  components = 4,
-  table = 5,
+  able = 5,
-  form = 6,
+  table = 6,
-  list = 7,
+  form = 7,
-  result = 8,
+  list = 8,
-  error = 9,
+  result = 9,
-  frame = 10,
+  error = 10,
-  nested = 11,
+  frame = 11,
-  permission = 12,
+  nested = 12,
-  system = 13,
+  permission = 13,
-  monitor = 14,
+  system = 14,
-  tabs = 15,
+  monitor = 15,
-  about = 16,
+  tabs = 16,
-  editor = 17,
+  about = 17,
-  flowchart = 18,
+  codemirror = 18,
-  formdesign = 19,
+  markdown = 19,
-  board = 20,
+  editor = 20,
-  ppt = 21,
+  flowchart = 21,
-  mind = 22,
+  formdesign = 22,
-  guide = 23,
+  board = 23,
-  menuoverflow = 24;
+  ppt = 24,
+  mind = 25,
+  guide = 26,
+  menuoverflow = 27;
 
 export {
   home,
+  chatai,
   vueflow,
   ganttastic,
   components,
@@ -44,6 +48,8 @@ export {
   monitor,
   tabs,
   about,
+  codemirror,
+  markdown,
   editor,
   flowchart,
   formdesign,

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)
@@ -85,20 +94,25 @@ export const router: Router = createRouter({
   }
 });
 
+/** 记录已经加载的页面路径 */
+const loadedPaths = new Set<string>();
+
+/** 重置已加载页面记录 */
+export function resetLoadedPaths() {
+  loadedPaths.clear();
+}
+
 /** 重置路由 */
 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(
-        formatFlatteningRoutes(
-          buildHierarchyTree(ascending(routes.flat(Infinity)))
-        )
-      );
   }
-  });
+  router.options.routes = formatTwoStageRoutes(
+    formatFlatteningRoutes(buildHierarchyTree(ascending(routes.flat(Infinity))))
+  );
   usePermissionStoreHook().clearAllCachePage();
+  resetLoadedPaths();
 }
 
 /** 路由白名单 */
@@ -107,6 +121,12 @@ const whiteList = ["/login"];
 const { VITE_HIDE_HOME } = import.meta.env;
 
 router.beforeEach((to: ToRouteType, _from, next) => {
+  to.meta.loaded = loadedPaths.has(to.path);
+
+  if (!to.meta.loaded) {
+    NProgress.start();
+  }
+
   if (to.meta?.keepAlive) {
     handleAliveRoute(to, "add");
     // 页面整体刷新和点击标签页刷新
@@ -115,7 +135,6 @@ router.beforeEach((to: ToRouteType, _from, next) => {
     }
   }
   const userInfo = storageLocal().getItem<DataInfo<number>>(userKey);
-  NProgress.start();
   const externalLink = isUrl(to?.name as string);
   if (!externalLink) {
     to.matched.some(item => {
@@ -201,7 +220,8 @@ router.beforeEach((to: ToRouteType, _from, next) => {
   }
 });
 
-router.afterEach(() => {
+router.afterEach(to => {
+  loadedPaths.add(to.path);
   NProgress.done();
 });
 

src/router/modules/able.ts

@@ -5,7 +5,7 @@ export default {
   path: "/able",
   redirect: "/able/watermark",
   meta: {
-    icon: "ri:ubuntu-fill",
+    icon: "ri/ubuntu-fill",
     title: $t("menus.pureAble"),
     rank: able
   },
@@ -15,8 +15,7 @@ export default {
       name: "MqttClient",
       component: () => import("@/views/able/mqtt-client.vue"),
       meta: {
-        title: $t("menus.pureMqtt"),
+        title: $t("menus.pureMqtt")
-        extraIcon: "IF-pure-iconfont-new svg"
       }
     },
     {

src/router/modules/about.ts

@@ -5,7 +5,7 @@ export default {
   path: "/about",
   redirect: "/about/index",
   meta: {
-    icon: "ri:file-info-line",
+    icon: "ri/file-info-line",
     title: $t("menus.pureAbout"),
     rank: about
   },

src/router/modules/board.ts

@@ -6,7 +6,7 @@ export default {
   path: "/board",
   redirect: "/board/index",
   meta: {
-    icon: "ri:artboard-line",
+    icon: "ri/artboard-line",
     title: $t("menus.pureBoard"),
     rank: board
   },

src/router/modules/chatai.ts

@@ -0,0 +1,22 @@
+import { chatai } from "@/router/enums";
+
+export default {
+  path: "/chatai",
+  redirect: "/chatai/index",
+  meta: {
+    icon: "ri/chat-search-line",
+    title: "chat-ai",
+    rank: chatai
+  },
+  children: [
+    {
+      path: "/chatai/index",
+      name: "ChatAi",
+      component: () => import("@/views/chatai/index.vue"),
+      meta: {
+        title: "chat-ai",
+        extraIcon: "IF-pure-iconfont-new svg"
+      }
+    }
+  ]
+} satisfies RouteConfigsTable;

src/router/modules/codemirror.ts

@@ -0,0 +1,23 @@
+import { $t } from "@/plugins/i18n";
+import { codemirror } from "@/router/enums";
+
+export default {
+  path: "/codemirror",
+  redirect: "/codemirror/index",
+  meta: {
+    icon: "ri/code-box-line",
+    title: $t("menus.pureCodeMirror"),
+    rank: codemirror
+  },
+  children: [
+    {
+      path: "/codemirror/index",
+      name: "CodeMirror",
+      component: () => import("@/views/codemirror/index.vue"),
+      meta: {
+        title: $t("menus.pureCodeMirror"),
+        extraIcon: "IF-pure-iconfont-new svg"
+      }
+    }
+  ]
+} satisfies RouteConfigsTable;

src/router/modules/components.ts

@@ -5,7 +5,7 @@ export default {
   path: "/components",
   redirect: "/components/dialog",
   meta: {
-    icon: "ep:menu",
+    icon: "ep/menu",
     title: $t("menus.pureComponents"),
     rank: components
   },
@@ -47,8 +47,7 @@ export default {
       name: "CheckCard",
       component: () => import("@/views/components/check-card.vue"),
       meta: {
-        title: $t("menus.pureCheckCard"),
+        title: $t("menus.pureCheckCard")
-        extraIcon: "IF-pure-iconfont-new svg"
       }
     },
     {
@@ -112,7 +111,15 @@ export default {
       name: "PureText",
       component: () => import("@/views/components/text.vue"),
       meta: {
-        title: $t("menus.pureText"),
+        title: $t("menus.pureText")
+      }
+    },
+    {
+      path: "/components/slider",
+      name: "PureSlider",
+      component: () => import("@/views/components/slider/index.vue"),
+      meta: {
+        title: $t("menus.pureSlider"),
         extraIcon: "IF-pure-iconfont-new svg"
       }
     },
@@ -129,8 +136,7 @@ export default {
       name: "CheckButton",
       component: () => import("@/views/components/check-button.vue"),
       meta: {
-        title: $t("menus.pureCheckButton"),
+        title: $t("menus.pureCheckButton")
-        extraIcon: "IF-pure-iconfont-new svg"
       }
     },
     {

src/router/modules/editor.ts

@@ -5,7 +5,7 @@ export default {
   path: "/editor",
   redirect: "/editor/index",
   meta: {
-    icon: "ep:edit",
+    icon: "ep/edit",
     title: $t("menus.pureEditor"),
     rank: editor
   },

src/router/modules/error.ts

@@ -5,7 +5,7 @@ export default {
   path: "/error",
   redirect: "/error/403",
   meta: {
-    icon: "ri:information-line",
+    icon: "ri/information-line",
     // showLink: false,
     title: $t("menus.pureAbnormal"),
     rank: error
@@ -16,7 +16,7 @@ export default {
       name: "403",
       component: () => import("@/views/error/403.vue"),
       meta: {
-        title: $t("menus.pureFourZeroOne")
+        title: $t("menus.pureAccessDenied")
       }
     },
     {
@@ -24,7 +24,7 @@ export default {
       name: "404",
       component: () => import("@/views/error/404.vue"),
       meta: {
-        title: $t("menus.pureFourZeroFour")
+        title: $t("menus.purePageNotFound")
       }
     },
     {
@@ -32,7 +32,7 @@ export default {
       name: "500",
       component: () => import("@/views/error/500.vue"),
       meta: {
-        title: $t("menus.pureFive")
+        title: $t("menus.pureServerError")
       }
     }
   ]

src/router/modules/flowchart.ts

@@ -5,7 +5,7 @@ export default {
   path: "/flow-chart",
   redirect: "/flow-chart/index",
   meta: {
-    icon: "ep:set-up",
+    icon: "ep/set-up",
     title: $t("menus.pureFlowChart"),
     rank: flowchart
   },

src/router/modules/form.ts

@@ -5,7 +5,7 @@ export default {
   path: "/form",
   redirect: "/form/index",
   meta: {
-    icon: "ri:edit-box-line",
+    icon: "ri/edit-box-line",
     title: $t("menus.pureSchemaForm"),
     rank: form
   },
@@ -15,8 +15,7 @@ export default {
       name: "SchemaForm",
       component: () => import("@/views/schema-form/index.vue"),
       meta: {
-        title: $t("menus.pureSchemaForm"),
+        title: $t("menus.pureSchemaForm")
-        extraIcon: "IF-pure-iconfont-new svg"
       }
     }
   ]

src/router/modules/formdesign.ts

@@ -6,7 +6,7 @@ export default {
   path: "/form-design",
   redirect: "/form-design/index",
   meta: {
-    icon: "ri:terminal-window-line",
+    icon: "ri/terminal-window-line",
     title: $t("menus.pureFormDesign"),
     rank: formdesign
   },

src/router/modules/ganttastic.ts

@@ -5,7 +5,7 @@ export default {
   path: "/ganttastic",
   redirect: "/ganttastic/index",
   meta: {
-    icon: "ri:bar-chart-horizontal-line",
+    icon: "ri/bar-chart-horizontal-line",
     title: $t("menus.pureGanttastic"),
     rank: ganttastic
   },
@@ -15,8 +15,7 @@ export default {
       name: "Ganttastic",
       component: () => import("@/views/ganttastic/index.vue"),
       meta: {
-        title: $t("menus.pureGanttastic"),
+        title: $t("menus.pureGanttastic")
-        extraIcon: "IF-pure-iconfont-new svg"
       }
     }
   ]

src/router/modules/guide.ts

@@ -5,7 +5,7 @@ export default {
   path: "/guide",
   redirect: "/guide/index",
   meta: {
-    icon: "ep:guide",
+    icon: "ep/guide",
     title: $t("menus.pureGuide"),
     rank: guide
   },

src/router/modules/home.ts

@@ -9,7 +9,7 @@ export default {
   component: Layout,
   redirect: "/welcome",
   meta: {
-    icon: "ep:home-filled",
+    icon: "ep/home-filled",
     title: $t("menus.pureHome"),
     rank: home
   },

src/router/modules/list.ts

@@ -5,7 +5,7 @@ export default {
   path: "/list",
   redirect: "/list/card",
   meta: {
-    icon: "ri:list-check",
+    icon: "ri/list-check",
     title: $t("menus.pureList"),
     rank: list
   },
@@ -15,7 +15,7 @@ export default {
       name: "CardList",
       component: () => import("@/views/list/card/index.vue"),
       meta: {
-        icon: "ri:bank-card-line",
+        icon: "ri/bank-card-line",
         title: $t("menus.pureCardList"),
         showParent: true
       }

src/router/modules/markdown.ts

@@ -0,0 +1,23 @@
+import { $t } from "@/plugins/i18n";
+import { markdown } from "@/router/enums";
+
+export default {
+  path: "/markdown",
+  redirect: "/markdown/index",
+  meta: {
+    icon: "ri/markdown-line",
+    title: $t("menus.pureMarkdown"),
+    rank: markdown
+  },
+  children: [
+    {
+      path: "/markdown/index",
+      name: "Markdown",
+      component: () => import("@/views/markdown/index.vue"),
+      meta: {
+        title: $t("menus.pureMarkdown"),
+        extraIcon: "IF-pure-iconfont-new svg"
+      }
+    }
+  ]
+} satisfies RouteConfigsTable;

src/router/modules/mind.ts

@@ -6,7 +6,7 @@ export default {
   path: "/mind-map",
   redirect: "/mind-map/index",
   meta: {
-    icon: "ri:mind-map",
+    icon: "ri/mind-map",
     title: $t("menus.pureMindMap"),
     rank: mind
   },

src/router/modules/nested.ts

@@ -6,7 +6,7 @@ export default {
   redirect: "/nested/menu1/menu1-1",
   meta: {
     title: $t("menus.pureMenus"),
-    icon: "ep:histogram",
+    icon: "ep/histogram",
     rank: nested
   },
   children: [

src/router/modules/ppt.ts

@@ -5,7 +5,7 @@ export default {
   path: "/ppt",
   redirect: "/ppt/index",
   meta: {
-    icon: "ri:file-ppt-2-line",
+    icon: "ri/file-ppt-2-line",
     title: "PPT",
     rank: ppt
   },

src/router/modules/remaining.ts

@@ -8,8 +8,27 @@ export default [
     component: () => import("@/views/login/index.vue"),
     meta: {
       title: $t("menus.pureLogin"),
-      showLink: false,
+      showLink: false
-      rank: 101
+    }
+  },
+  // 全屏403（无权访问）页面
+  {
+    path: "/access-denied",
+    name: "AccessDenied",
+    component: () => import("@/views/error/403.vue"),
+    meta: {
+      title: $t("menus.pureAccessDenied"),
+      showLink: false
+    }
+  },
+  // 全屏500（服务器出错）页面
+  {
+    path: "/server-error",
+    name: "ServerError",
+    component: () => import("@/views/error/500.vue"),
+    meta: {
+      title: $t("menus.pureServerError"),
+      showLink: false
     }
   },
   {
@@ -17,8 +36,7 @@ export default [
     component: Layout,
     meta: {
       title: $t("status.pureLoad"),
-      showLink: false,
+      showLink: false
-      rank: 102
     },
     children: [
       {
@@ -28,6 +46,15 @@ export default [
       }
     ]
   },
+  {
+    path: "/account-settings",
+    name: "AccountSettings",
+    component: () => import("@/views/account-settings/index.vue"),
+    meta: {
+      title: $t("buttons.pureAccountSettings"),
+      showLink: false
+    }
+  },
   // 下面是一个无layout菜单的例子（一个全屏空白页面），因为这种情况极少发生，所以只需要在前端配置即可（配置路径：src/router/modules/remaining.ts）
   {
     path: "/empty",
@@ -35,18 +62,7 @@ export default [
     component: () => import("@/views/empty/index.vue"),
     meta: {
       title: $t("menus.pureEmpty"),
-      showLink: false,
+      showLink: false
-      rank: 103
-    }
-  },
-  {
-    path: "/account-settings",
-    name: "AccountSettings",
-    component: () => import("@/views/account-settings/index.vue"),
-    meta: {
-      title: $t("buttons.pureAccountSettings"),
-      showLink: false,
-      rank: 104
     }
   }
 ] satisfies Array<RouteConfigsTable>;

src/router/modules/result.ts

@@ -5,7 +5,7 @@ export default {
   path: "/result",
   redirect: "/result/success",
   meta: {
-    icon: "ri:checkbox-circle-line",
+    icon: "ri/checkbox-circle-line",
     title: $t("menus.pureResult"),
     rank: result
   },

src/router/modules/table.ts

@@ -5,7 +5,7 @@ export default {
   path: "/table",
   redirect: "/table/index",
   meta: {
-    icon: "ri:table-line",
+    icon: "ri/table-line",
     title: $t("menus.pureTable"),
     rank: table
   },
@@ -31,8 +31,7 @@ export default {
       name: "PureTableEdit",
       component: () => import("@/views/table/edit.vue"),
       meta: {
-        title: $t("menus.pureTableEdit"),
+        title: $t("menus.pureTableEdit")
-        extraIcon: "IF-pure-iconfont-new svg"
       }
     },
     {
@@ -40,8 +39,7 @@ export default {
       name: "VxeTable",
       component: () => import("@/views/table/virtual.vue"),
       meta: {
-        title: $t("menus.pureVxeTable"),
+        title: $t("menus.pureVxeTable")
-        extraIcon: "IF-pure-iconfont-new svg"
       }
     }
   ]

src/router/modules/vueflow.ts

@@ -4,7 +4,7 @@ export default {
   path: "/vue-flow",
   redirect: "/vue-flow/index",
   meta: {
-    icon: "ep:set-up",
+    icon: "ep/set-up",
     title: "vue-flow",
     rank: vueflow
   },
@@ -14,8 +14,7 @@ export default {
       name: "VueFlow",
       component: () => import("@/views/vue-flow/layouting/index.vue"),
       meta: {
-        title: "vue-flow",
+        title: "vue-flow"
-        extraIcon: "IF-pure-iconfont-new svg"
       }
     }
   ]

src/router/utils.ts

@@ -139,12 +139,17 @@ function findRouteByPath(path: string, routes: RouteRecordRaw[]) {
   }
 }
 
+/** 动态路由注册完成后，再添加全屏404（页面不存在）页面，避免刷新动态路由页面时误跳转到404页面 */
 function addPathMatch() {
   if (!router.hasRoute("pathMatch")) {
     router.addRoute({
-      path: "/:pathMatch(.*)",
+      path: "/:pathMatch(.*)*",
-      name: "pathMatch",
+      name: "PageNotFound",
-      redirect: "/error/404"
+      component: () => import("@/views/error/404.vue"),
+      meta: {
+        title: "menus.purePageNotFound",
+        showLink: false
+      }
     });
   }
 }
@@ -172,6 +177,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/store/modules/app.ts

@@ -8,8 +8,7 @@ import {
   responsiveStorageNameSpace
 } from "../utils";
 
-export const useAppStore = defineStore({
+export const useAppStore = defineStore("pure-app", {
-  id: "pure-app",
   state: (): appType => ({
     sidebar: {
       opened: