Merge branch 'main' into pages

.gitignore

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

.husky/commit-msg

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

.husky/common.sh

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

.husky/pre-commit

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

CHANGELOG.en_US.md

@@ -1,32 +1,3 @@
-# 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

CHANGELOG.md

@@ -1,32 +1,3 @@
-# 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

CHANGELOG.zh_CN.md

@@ -1,32 +1,3 @@
-# 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

build/optimize.ts

@@ -57,8 +57,8 @@ const include = [
 
 /**
  * 在预构建中强制排除的依赖项
- * 温馨提示：平台推荐的使用方式是哪里需要哪里引入而且都是单个的引入，不需要预构建，直接让浏览器加载就好
+ * 温馨提示：所有以 `@iconify-icons/` 开头引入的的本地图标模块，都应该加入到下面的 `exclude` 里，因为平台推荐的使用方式是哪里需要哪里引入而且都是单个的引入，不需要预构建，直接让浏览器加载就好
  */
-const exclude = ["@iconify/json"];
+const exclude = ["@iconify-icons/ep", "@iconify-icons/ri"];
 
 export { include, exclude };

build/plugins.ts

@@ -3,10 +3,8 @@ 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";
@@ -21,7 +19,6 @@ export function getPluginsList(
 ): PluginOption[] {
   const lifecycle = process.env.npm_lifecycle_event;
   return [
-    tailwindcss(),
     vue({
       template: {
         compilerOptions: {
@@ -60,11 +57,6 @@ export function getPluginsList(
     }),
     // svg组件化支持
     svgLoader(),
-    // 自动按需加载图标
-    Icons({
-      compiler: "vue3",
-      scale: 1
-    }),
     VITE_CDN ? cdn : null,
     configCompressPlugin(VITE_COMPRESSION),
     // 线上环境删除console

eslint.config.js

@@ -1,25 +1,26 @@
 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 { defineConfig, globalIgnores } from "eslint/config";
+import { defineFlatConfig } from "eslint-define-config";
+import * as parserTypeScript from "@typescript-eslint/parser";
+import pluginTypeScript from "@typescript-eslint/eslint-plugin";
 
-export default defineConfig([
+export default defineFlatConfig([
-  globalIgnores([
+  {
+    ...js.configs.recommended,
+    ignores: [
       "**/.*",
       "dist/*",
       "*.d.ts",
       "public/*",
       "src/assets/**",
       "src/**/iconfont/**"
-  ]),
+    ],
-  {
-    ...js.configs.recommended,
     languageOptions: {
       globals: {
-        // types/index.d.ts
+        // index.d.ts
         RefType: "readonly",
         EmitType: "readonly",
         TargetContext: "readonly",
@@ -72,10 +73,21 @@ export default defineConfig([
       ]
     }
   },
-  ...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",
@@ -102,20 +114,20 @@ export default defineConfig([
         }
       ]
     }
-  }),
+  },
   {
     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"
     }
   },
   {
@@ -136,19 +148,18 @@ export default defineConfig([
           jsx: true
         },
         extraFileExtensions: [".vue"],
-        parser: tseslint.parser,
+        parser: "@typescript-eslint/parser",
         sourceType: "module"
       }
     },
     plugins: {
-      "@typescript-eslint": tseslint.plugin,
       vue: pluginVue
     },
     processor: pluginVue.processors[".vue"],
     rules: {
       ...pluginVue.configs.base.rules,
-      ...pluginVue.configs.essential.rules,
+      ...pluginVue.configs["vue3-essential"].rules,
-      ...pluginVue.configs.recommended.rules,
+      ...pluginVue.configs["vue3-recommended"].rules,
       "no-undef": "off",
       "no-unused-vars": "off",
       "vue/no-v-html": "off",

index.html

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

mock/mine.ts

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-pure-admin",
-  "version": "6.0.0",
+  "version": "5.9.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -54,25 +54,25 @@
     "@logicflow/extension": "^1.2.28",
     "@pureadmin/descriptions": "^1.2.1",
     "@pureadmin/table": "^3.2.1",
-    "@pureadmin/utils": "^2.6.0",
+    "@pureadmin/utils": "^2.5.0",
     "@vue-flow/background": "^1.3.2",
-    "@vue-flow/core": "^1.42.5",
+    "@vue-flow/core": "^1.42.1",
-    "@vueuse/core": "^13.1.0",
+    "@vueuse/core": "^12.5.0",
-    "@vueuse/motion": "^3.0.3",
+    "@vueuse/motion": "^2.2.6",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
     "@zxcvbn-ts/core": "^3.0.4",
     "animate.css": "^4.1.1",
-    "axios": "^1.8.4",
+    "axios": "^1.7.9",
     "china-area-data": "^5.0.1",
-    "codemirror": "^5.65.19",
+    "codemirror": "^5.65.18",
     "codemirror-editor-vue3": "^2.8.0",
     "cropperjs": "^1.6.2",
     "dayjs": "^1.11.13",
     "deep-chat": "^2.1.1",
     "echarts": "^5.6.0",
     "el-table-infinite-scroll": "^3.0.6",
-    "element-plus": "^2.9.7",
+    "element-plus": "^2.9.4",
     "highlight.js": "^11.11.1",
     "intro.js": "^7.2.0",
     "js-cookie": "^3.0.5",
@@ -85,94 +85,96 @@
     "path-browserify": "^1.0.1",
     "pinia": "^3.0.1",
     "pinyin-pro": "^3.26.0",
-    "plus-pro-components": "^0.1.22",
+    "plus-pro-components": "^0.1.20",
     "qrcode": "^1.5.4",
     "qs": "^6.14.0",
     "responsive-storage": "^2.2.0",
     "sortablejs": "^1.15.6",
-    "swiper": "^11.2.6",
+    "swiper": "^11.2.3",
     "typeit": "^8.8.7",
     "v-contextmenu": "^3.2.0",
     "v3-infinite-loading": "^1.3.2",
     "vditor": "^3.10.9",
     "version-rocket": "^1.7.4",
     "vue": "^3.5.13",
-    "vue-i18n": "^11.1.3",
+    "vue-i18n": "^11.1.1",
     "vue-json-pretty": "^2.4.0",
     "vue-pdf-embed": "^2.1.2",
     "vue-router": "^4.5.0",
-    "vue-tippy": "^6.7.0",
+    "vue-tippy": "^6.6.0",
-    "vue-types": "^6.0.0",
+    "vue-types": "^5.1.3",
     "vue-virtual-scroller": "2.0.0-beta.8",
     "vue-waterfall-plugin-next": "^2.6.5",
     "vue3-danmaku": "^1.6.1",
     "vue3-puzzle-vcode": "^1.1.7",
     "vuedraggable": "^4.1.0",
     "vxe-table": "4.6.25",
-    "wavesurfer.js": "^7.9.4",
+    "wavesurfer.js": "^7.9.1",
-    "xgplayer": "^3.0.21",
+    "xgplayer": "^3.0.20",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.8.0",
+    "@commitlint/cli": "^19.7.1",
-    "@commitlint/config-conventional": "^19.8.0",
+    "@commitlint/config-conventional": "^19.7.1",
-    "@commitlint/types": "^19.8.0",
+    "@commitlint/types": "^19.5.0",
-    "@eslint/js": "^9.24.0",
+    "@eslint/js": "^9.20.0",
-    "@faker-js/faker": "^9.6.0",
+    "@faker-js/faker": "^9.5.0",
-    "@iconify/json": "^2.2.324",
+    "@iconify-icons/ep": "^1.2.12",
+    "@iconify-icons/ri": "^1.2.10",
     "@iconify/vue": "4.2.0",
-    "@intlify/unplugin-vue-i18n": "^6.0.5",
+    "@intlify/unplugin-vue-i18n": "^6.0.3",
-    "@tailwindcss/vite": "^4.1.3",
     "@types/codemirror": "^5.60.15",
     "@types/dagre": "^0.7.52",
     "@types/intro.js": "^5.1.5",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.17.30",
+    "@types/node": "^20.17.19",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qrcode": "^1.5.5",
     "@types/qs": "^6.9.18",
     "@types/sortablejs": "^1.15.8",
-    "@vitejs/plugin-vue": "^5.2.3",
+    "@typescript-eslint/eslint-plugin": "^8.24.0",
-    "@vitejs/plugin-vue-jsx": "^4.1.2",
+    "@typescript-eslint/parser": "^8.24.0",
+    "@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.20.7",
+    "code-inspector-plugin": "^0.20.0",
     "cssnano": "^7.0.6",
     "dagre": "^0.8.5",
-    "eslint": "^9.24.0",
+    "eslint": "^9.20.1",
-    "eslint-config-prettier": "^10.1.1",
+    "eslint-config-prettier": "^10.0.1",
-    "eslint-plugin-prettier": "^5.2.6",
+    "eslint-define-config": "^2.1.0",
-    "eslint-plugin-vue": "^10.0.0",
+    "eslint-plugin-prettier": "^5.2.3",
+    "eslint-plugin-vue": "^9.32.0",
     "gradient-string": "^3.0.0",
     "husky": "^9.1.7",
-    "lint-staged": "^15.5.0",
+    "lint-staged": "^15.4.3",
-    "postcss": "^8.5.3",
+    "postcss": "^8.5.2",
     "postcss-html": "^1.8.0",
-    "postcss-load-config": "^6.0.1",
+    "postcss-import": "^16.1.0",
     "postcss-scss": "^4.0.9",
-    "prettier": "^3.5.3",
+    "prettier": "^3.5.1",
     "rimraf": "^6.0.1",
     "rollup-plugin-visualizer": "^5.14.0",
-    "sass": "^1.86.3",
+    "sass": "^1.85.0",
-    "stylelint": "^16.18.0",
+    "stylelint": "^16.14.1",
     "stylelint-config-recess-order": "^6.0.0",
     "stylelint-config-recommended-vue": "^1.6.0",
     "stylelint-config-standard-scss": "^14.0.0",
     "stylelint-prettier": "^5.0.3",
     "svgo": "^3.3.2",
-    "tailwindcss": "^4.1.3",
+    "tailwindcss": "3.4.17",
-    "typescript": "^5.8.3",
+    "typescript": "^5.7.3",
-    "typescript-eslint": "^8.29.1",
+    "vite": "^6.1.0",
-    "unplugin-icons": "^22.1.0",
-    "vite": "^6.2.5",
     "vite-plugin-cdn-import": "^1.0.1",
     "vite-plugin-compression": "^0.5.1",
     "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": "^10.1.3",
+    "vue-eslint-parser": "^9.4.3",
-    "vue-tsc": "^2.2.8"
+    "vue-tsc": "^2.2.0"
   },
   "engines": {
     "node": "^18.18.0 || ^20.9.0 || >=22.0.0",
@@ -182,7 +184,6 @@
     "allowedDeprecatedVersions": {
       "are-we-there-yet": "*",
       "sourcemap-codec": "*",
-      "lodash.isequal": "*",
       "domexception": "*",
       "w3c-hr-time": "*",
       "inflight": "*",
@@ -193,6 +194,11 @@
       "abab": "*",
       "glob": "*"
     },
+    "peerDependencyRules": {
+      "allowedVersions": {
+        "eslint": "9"
+      }
+    },
     "onlyBuiltDependencies": [
       "@parcel/watcher",
       "core-js",

postcss.config.js

@@ -3,6 +3,10 @@
 /** @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": "6.0.0",
+  "Version": "5.9.0",
   "Title": "PureAdmin",
   "FixedHeader": true,
   "HiddenSideBar": false,

src/App.vue

@@ -16,6 +16,7 @@ import en from "element-plus/es/locale/lang/en";
 import zhCn from "element-plus/es/locale/lang/zh-cn";
 import plusEn from "plus-pro-components/es/locale/lang/en";
 import plusZhCn from "plus-pro-components/es/locale/lang/zh-cn";
+// import { ElNotification } from "element-plus";
 
 export default defineComponent({
   name: "app",
@@ -54,5 +55,23 @@ export default defineComponent({
       );
     }
   }
+  // mounted() {
+  //   ElNotification({
+  //     title: "优惠活动即将结束",
+  //     duration: 0,
+  //     //@ts-expect-error
+  //     style: { width: "200px" },
+  //     position: "bottom-right",
+  //     dangerouslyUseHTMLString: true,
+  //     message: `
+  //       <a target='_blank' style='font-size: 16px' class='block text-center border mb-2 rounded hover:text-[red]' href='https://pure-admin.github.io/pure-admin-doc/pages/js/'>
+  //       JS版本
+  //       </a>
+  //       <a target='_blank' style='font-size: 16px' class='block text-center border mb-2 rounded hover:text-[red]' href='https://pure-admin.github.io/pure-admin-doc/pages/max/'>
+  //       Max版本
+  //       </a>
+  //       `
+  //   });
+  // }
 });
 </script>

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-hidden",
+        "outline-none",
         "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 "~icons/ri/fullscreen-fill";
+import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
-import ExitFullscreen from "~icons/ri/fullscreen-exit-fill";
+import ExitFullscreen from "@iconify-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,8 +114,7 @@ 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/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 "~icons/ri/search-eye-line";
+import Search from "@iconify-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 mx-2!"
+              class="justify-end mr-2 ml-2"
               type="danger"
               size="small"
               text

src/components/ReIcon/src/hooks.ts

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

src/components/ReIcon/src/iconifyIconOffline.ts

@@ -13,7 +13,6 @@ 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,
       {
@@ -28,20 +27,5 @@ export default defineComponent({
         default: () => []
       }
     );
-    } else {
-      return h(
-        this.icon,
-        {
-          "aria-hidden": false,
-          style: attrs?.style
-            ? Object.assign(attrs.style, { outline: "none" })
-            : { outline: "none" },
-          ...attrs
-        },
-        {
-          default: () => []
-        }
-      );
-    }
   }
 });

src/components/ReIcon/src/offlineIcon.ts

@@ -1,87 +1,70 @@
 // 这里存放本地图标，在 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 添加即可渲染菜单图标
-icons.forEach(([name, icon]) => {
+// @iconify-icons/ep
-  addIcon(name as string, getSvgInfo(icon as string));
+import Menu from "@iconify-icons/ep/menu";
-});
+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 "~icons/ri/fullscreen-fill";
+import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
-import ExitFullscreen from "~icons/ri/fullscreen-exit-fill";
+import ExitFullscreen from "@iconify-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-hidden"
+        "outline-none"
       ];
     });
 
@@ -255,12 +255,12 @@ export default defineComponent({
         <div
           {...attrs}
           class={[
-            "w-full",
+            "w-[99/100]",
             "px-2",
             "pb-2",
             "bg-bg_color",
             isFullscreen.value
-              ? ["h-full!", "z-2002", "fixed", "inset-0"]
+              ? ["!w-full", "!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 "~icons/ep/refresh-right";
+import RefreshRight from "@iconify-icons/ep/refresh-right";
 
 interface QrcodeLogo {
   src?: string;

src/components/ReSeamlessScroll/src/utils.ts

@@ -60,15 +60,12 @@ 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++;
   }
@@ -82,7 +79,6 @@ 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/ReVxeTableBar/src/bar.tsx

@@ -12,8 +12,8 @@ import {
   getCurrentInstance
 } from "vue";
 
-import Fullscreen from "~icons/ri/fullscreen-fill";
+import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
-import ExitFullscreen from "~icons/ri/fullscreen-exit-fill";
+import ExitFullscreen from "@iconify-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-hidden"
+        "outline-none"
       ];
     });
 
@@ -248,12 +248,12 @@ export default defineComponent({
         <div
           {...attrs}
           class={[
-            "w-full",
+            "w-[99/100]",
             "px-2",
             "pb-2",
             "bg-bg_color",
             isFullscreen.value
-              ? ["h-full!", "z-2002", "fixed", "inset-0"]
+              ? ["!w-full", "!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.ts

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

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

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

src/layout/components/lay-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 "~icons/ri/user-settings-line";
+import AccountSettingsIcon from "@iconify-icons/ri/user-settings-line";
-import LogoutCircleRLine from "~icons/ri/logout-circle-r-line";
+import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
-import Setting from "~icons/ri/settings-3-line";
+import Setting from "@iconify-icons/ri/settings-3-line";
-import Check from "~icons/ep/check";
+import Check from "@iconify-icons/ep/check";
 
 const {
   layout,
@@ -33,7 +33,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
 </script>
 
 <template>
-  <div class="navbar bg-[#fff] shadow-xs shadow-[rgba(0,21,41,0.08)]">
+  <div class="navbar bg-[#fff] shadow-sm 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-hidden"
+          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-none"
         />
         <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-0 border-b-[1px] border-solid border-[#f0f0f0] dark:border-[#303030]"
+    class="notice-container border-b-[1px] border-solid border-[#f0f0f0] dark:border-[#303030]"
   >
     <el-avatar
       v-if="noticeItem.avatar"

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 "~icons/ep/bell";
+import BellIcon from "@iconify-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 "~icons/ep/close";
+import CloseIcon from "@iconify-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-hidden",
+    "outline-none",
     "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-0 border-b-[1px] border-solid border-[var(--pure-border-color)]"
+        class="project-configuration 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-0 border-t-[1px] border-solid border-[var(--pure-border-color)]"
+        class="flex justify-end p-3 border-t-[1px] border-solid border-[var(--pure-border-color)]"
       >
         <el-button
           v-tippy="{

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 "~icons/ri/arrow-up-line";
+import ArrowUpLine from "@iconify-icons/ri/arrow-up-line";
-import ArrowDownLine from "~icons/ri/arrow-down-line";
+import ArrowDownLine from "@iconify-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 "~icons/ep/star";
+import StarIcon from "@iconify-icons/ep/star";
-import CloseIcon from "~icons/ep/close";
+import CloseIcon from "@iconify-icons/ep/close";
 
 interface Props {
   item: optionsItem;

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

@@ -13,7 +13,7 @@ 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 "~icons/ri/search-line";
+import SearchIcon from "@iconify-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 "~icons/ep/check";
+import Check from "@iconify-icons/ep/check";
-import LeftArrow from "~icons/ri/arrow-left-s-line?width=20&height=20";
+import LeftArrow from "@iconify-icons/ri/arrow-left-s-line";
-import RightArrow from "~icons/ri/arrow-right-s-line?width=20&height=20";
+import RightArrow from "@iconify-icons/ri/arrow-right-s-line";
 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,19 +426,21 @@ onUnmounted(() => removeMatchMedia);
           >
             <IconifyIconOffline
               :icon="settings.stretch ? RightArrow : LeftArrow"
+              height="20"
             />
             <div
-              class="grow border-0 border-b border-dashed"
+              class="flex-grow 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"
@@ -447,7 +449,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 "~icons/ri/user-settings-line";
+import AccountSettingsIcon from "@iconify-icons/ri/user-settings-line";
-import LogoutCircleRLine from "~icons/ri/logout-circle-r-line";
+import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
-import Setting from "~icons/ri/settings-3-line";
+import Setting from "@iconify-icons/ri/settings-3-line";
-import Check from "~icons/ep/check";
+import Check from "@iconify-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-hidden"
+          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-none"
         />
         <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 "~icons/ri/user-settings-line";
+import AccountSettingsIcon from "@iconify-icons/ri/user-settings-line";
-import LogoutCircleRLine from "~icons/ri/logout-circle-r-line";
+import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
-import Setting from "~icons/ri/settings-3-line";
+import Setting from "@iconify-icons/ri/settings-3-line";
-import Check from "~icons/ep/check";
+import Check from "@iconify-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-hidden"
+          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-none"
         />
         <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 "~icons/ri/arrow-left-double-fill";
+import ArrowLeft from "@iconify-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 "~icons/ep/arrow-up-bold";
+import ArrowUp from "@iconify-icons/ep/arrow-up-bold";
-import EpArrowDown from "~icons/ep/arrow-down-bold";
+import EpArrowDown from "@iconify-icons/ep/arrow-down-bold";
-import ArrowLeft from "~icons/ep/arrow-left-bold";
+import ArrowLeft from "@iconify-icons/ep/arrow-left-bold";
-import ArrowRight from "~icons/ep/arrow-right-bold";
+import ArrowRight from "@iconify-icons/ep/arrow-right-bold";
 
 const attrs = useAttrs();
 const { layout, isCollapse, tooltipEffect, getDivStyle } = useNav();
@@ -144,7 +144,7 @@ function resolvePath(routePath) {
             item?.pathList?.length === 2)
         "
         truncated
-        class="w-full! pl-4! text-inherit!"
+        class="!w-full !pl-4 !text-inherit"
       >
         {{ transformI18n(onlyOneChild.meta.title) }}
       </el-text>
@@ -156,7 +156,7 @@ function resolvePath(routePath) {
               offset: [0, -10],
               theme: tooltipEffect
             }"
-            class="w-full! text-inherit!"
+            class="!w-full !text-inherit"
           >
             {{ transformI18n(onlyOneChild.meta.title) }}
           </ReText>
@@ -196,9 +196,9 @@ function resolvePath(routePath) {
           theme: tooltipEffect
         }"
         :class="{
-          'w-full!': true,
+          '!w-full': true,
-          'text-inherit!': true,
+          '!text-inherit': true,
-          'pl-4!':
+          '!pl-4':
             layout !== 'horizontal' &&
             isCollapse &&
             !toRaw(item.meta.icon) &&

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 "~icons/ri/menu-fold-fill";
+import MenuFold from "@iconify-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/SidebarTopCollapse.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { useI18n } from "vue-i18n";
-import MenuFold from "~icons/ri/menu-fold-fill";
+import MenuFold from "@iconify-icons/ri/menu-fold-fill";
-import MenuUnfold from "~icons/ri/menu-unfold-fill";
+import MenuUnfold from "@iconify-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.vue

@@ -18,11 +18,11 @@ import {
   useResizeObserver
 } from "@pureadmin/utils";
 
-import ExitFullscreen from "~icons/ri/fullscreen-exit-fill";
+import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
-import Fullscreen from "~icons/ri/fullscreen-fill";
+import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
-import ArrowDown from "~icons/ri/arrow-down-s-line";
+import ArrowDown from "@iconify-icons/ri/arrow-down-s-line";
-import ArrowRightSLine from "~icons/ri/arrow-right-s-line";
+import ArrowRightSLine from "@iconify-icons/ri/arrow-right-s-line";
-import ArrowLeftSLine from "~icons/ri/arrow-left-s-line";
+import ArrowLeftSLine from "@iconify-icons/ri/arrow-left-s-line";
 
 const {
   Close,
@@ -589,7 +589,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/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 "~icons/ri/fullscreen-exit-fill";
+import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
-import Fullscreen from "~icons/ri/fullscreen-fill";
+import Fullscreen from "@iconify-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 "~icons/ri/fullscreen-fill";
+import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
-import CloseAllTags from "~icons/ri/subtract-line";
+import CloseAllTags from "@iconify-icons/ri/subtract-line";
-import CloseOtherTags from "~icons/ri/text-spacing";
+import CloseOtherTags from "@iconify-icons/ri/text-spacing";
-import CloseRightTags from "~icons/ri/text-direction-l";
+import CloseRightTags from "@iconify-icons/ri/text-direction-l";
-import CloseLeftTags from "~icons/ri/text-direction-r";
+import CloseLeftTags from "@iconify-icons/ri/text-direction-r";
-import RefreshRight from "~icons/ep/refresh-right";
+import RefreshRight from "@iconify-icons/ep/refresh-right";
-import Close from "~icons/ep/close";
+import Close from "@iconify-icons/ep/close";
 
 export function useTags() {
   const route = useRoute();

src/layout/types.ts

@@ -1,4 +1,4 @@
-import type { FunctionalComponent } from "vue";
+import type { IconifyIcon } from "@iconify/vue";
 const { VITE_HIDE_HOME } = import.meta.env;
 
 export const routerArrays: Array<RouteConfigs> =
@@ -8,7 +8,7 @@ export const routerArrays: Array<RouteConfigs> =
           path: "/welcome",
           meta: {
             title: "menus.pureHome",
-            icon: "ep/home-filled"
+            icon: "ep:home-filled"
           }
         }
       ]
@@ -16,7 +16,7 @@ export const routerArrays: Array<RouteConfigs> =
 
 export type routeMetaType = {
   title?: string;
-  icon?: string | FunctionalComponent;
+  icon?: string | IconifyIcon;
   showLink?: boolean;
   savedPosition?: boolean;
   auths?: Array<string>;
@@ -36,7 +36,7 @@ export type multiTagsType = {
 };
 
 export type tagsViewsType = {
-  icon: string | FunctionalComponent;
+  icon: string | IconifyIcon;
   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 () {
   // 仅初始化一次国际化配置
-  const cache = Object.fromEntries(
+  let cache = Object.fromEntries(
     Object.entries(
       import.meta.glob("../../locales/*.y(a)?ml", { eager: true })
     ).map(([key, value]: any) => {

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
   },

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

@@ -4,7 +4,7 @@ export default {
   path: "/chatai",
   redirect: "/chatai/index",
   meta: {
-    icon: "ri/chat-search-line",
+    icon: "ri:chat-search-line",
     title: "chat-ai",
     rank: chatai
   },

src/router/modules/codemirror.ts

@@ -5,7 +5,7 @@ export default {
   path: "/codemirror",
   redirect: "/codemirror/index",
   meta: {
-    icon: "ri/code-box-line",
+    icon: "ri:code-box-line",
     title: $t("menus.pureCodeMirror"),
     rank: codemirror
   },

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
   },

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

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
   },

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
   },

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

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

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/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
   },

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
   },

src/style/reset.scss

@@ -1,3 +1,12 @@
+*,
+::before,
+::after {
+  box-sizing: border-box;
+  border-color: currentColor;
+  border-style: solid;
+  border-width: 0;
+}
+
 #app {
   width: 100%;
   height: 100%;

src/style/sidebar.scss

@@ -235,6 +235,7 @@
     .is-active.submenu-title-noDropdown.outer-most > * {
       z-index: 1;
       color: #fff;
+      background: transparent !important;
     }
 
     .is-active.submenu-title-noDropdown.outer-most::before {

src/style/tailwind.css

@@ -1,46 +1,21 @@
-@layer theme, base, components, utilities;
+@tailwind base;
-@import "tailwindcss/theme.css" layer(theme);
+@tailwind components;
-@import "tailwindcss/utilities.css" layer(utilities);
+@tailwind utilities;
 
-@custom-variant dark (&:is(.dark *));
+@layer components {
-
+  .flex-c {
-@theme {
-  --color-bg_color: var(--el-bg-color);
-  --color-primary: var(--el-color-primary);
-  --color-text_color_primary: var(--el-text-color-primary);
-  --color-text_color_regular: var(--el-text-color-regular);
-}
-
-/*
-  The default border color has changed to `currentColor` in Tailwind CSS v4,
-  so we've added these compatibility styles to make sure everything still
-  looks the same as it did with Tailwind CSS v3.
-
-  If we ever want to remove these styles, we need to add an explicit border
-  color utility to any element that depends on these defaults.
-*/
-@layer base {
-  *,
-  ::after,
-  ::before,
-  ::backdrop,
-  ::file-selector-button {
-    border-color: var(--color-gray-200, currentColor);
-  }
-}
-
-@utility flex-c {
     @apply flex justify-center items-center;
   }
 
-@utility flex-ac {
+  .flex-ac {
     @apply flex justify-around items-center;
   }
 
-@utility flex-bc {
+  .flex-bc {
     @apply flex justify-between items-center;
   }
 
-@utility navbar-bg-hover {
+  .navbar-bg-hover {
-  @apply dark:text-white dark:hover:bg-[#242424]!;
+    @apply dark:text-white dark:hover:!bg-[#242424];
+  }
 }

src/utils/print.ts

@@ -140,10 +140,8 @@ Print.prototype = {
       "position:absolute;width:0;height:0;top:-10px;left:-10px;"
     );
 
-    // eslint-disable-next-line prefer-const
     w = f.contentWindow || f.contentDocument;
 
-    // eslint-disable-next-line prefer-const
     doc = f.contentDocument || f.contentWindow.document;
     doc.open();
     doc.write(content);

src/views/able/directives.vue

@@ -76,7 +76,7 @@ function onReset() {
           immediate: true,
           timeout: 1000
         }"
-        class="w-[200px]!"
+        class="!w-[200px]"
         clearable
         @clear="onInput"
       />
@@ -86,7 +86,7 @@ function onReset() {
       <el-input
         v-model="searchTwo"
         v-optimize="{ event: 'input', fn: onInputTwo, timeout: 400 }"
-        class="w-[200px]!"
+        class="!w-[200px]"
         clearable
       />
     </div>
@@ -100,7 +100,7 @@ function onReset() {
           timeout: 400,
           params: { name: '小明', sex: '男' }
         }"
-        class="w-[200px]!"
+        class="!w-[200px]"
         clearable
       />
     </div>
@@ -112,7 +112,7 @@ function onReset() {
       <el-input
         v-model="searchFour"
         v-optimize:throttle="{ event: 'input', fn: onInputFour, timeout: 1000 }"
-        class="w-[200px]!"
+        class="!w-[200px]"
         clearable
       />
     </div>
@@ -125,7 +125,7 @@ function onReset() {
           fn: onInputFive,
           params: { name: '小明', sex: '男' }
         }"
-        class="w-[200px]!"
+        class="!w-[200px]"
         clearable
       />
     </div>
@@ -134,7 +134,7 @@ function onReset() {
 
     <div class="mb-2">
       文本复制指令（双击输入框内容即可复制）
-      <el-input v-model="searchSix" v-copy="searchSix" class="w-[200px]!" />
+      <el-input v-model="searchSix" v-copy="searchSix" class="!w-[200px]" />
     </div>
     <div>
       文本复制指令（自定义触发事件，单击复制）

src/views/able/infinite-scroll.vue

@@ -51,9 +51,7 @@ const load = () => {
         代码位置 src/views/able/infinite-scroll.vue
       </el-link>
     </template>
-    <div class="mb-2">
+    <p class="mb-2">{{ isBottom ? "已加载全部页" : `加载到第 ${page} 页` }}</p>
-      {{ isBottom ? "已加载全部页" : `加载到第 ${page} 页` }}
-    </div>
     <el-table
       v-el-table-infinite-scroll="load"
       border

src/views/able/menu-tree.vue

@@ -7,7 +7,7 @@ import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import { extractPathList, deleteChildren } from "@/utils/tree";
 import { usePermissionStoreHook } from "@/store/modules/permission";
 import type { TreeNode } from "element-plus/es/components/tree-v2/src/types";
-import NodeTree from "~icons/ri/node-tree";
+import NodeTree from "@iconify-icons/ri/node-tree";
 
 defineOptions({
   name: "MenuTree"

src/views/able/pinyin.vue

@@ -21,8 +21,8 @@ defineOptions({
       </div>
     </template>
     <p v-html="html('带 音 调')" />
-    <p class="mt-2!" v-html="html('不 带 音 调', { toneType: 'none' })" />
+    <p class="mt-2" v-html="html('不 带 音 调', { toneType: 'none' })" />
-    <p class="mt-2! custom" v-html="html('自 定 义 样 式')" />
+    <p class="mt-2 custom" v-html="html('自 定 义 样 式')" />
   </el-card>
 </template>
 

src/views/able/print/index.vue

@@ -83,7 +83,7 @@ const tableData: User[] = [
         <span class="font-medium">打印功能（报表、图表、图片）</span>
         <el-select
           v-model="value"
-          class="w-[100px]! mr-2"
+          class="!w-[100px] mr-2"
           placeholder="Select"
           size="small"
         >

src/views/able/sensitive.vue

@@ -45,6 +45,6 @@ function onInput() {
       </el-tag>
     </div>
     <el-input v-model="modelValue" @input="onInput" />
-    <p class="mt-2!">{{ modelValue }}</p>
+    <p class="mt-2">{{ modelValue }}</p>
   </el-card>
 </template>

src/views/able/video.vue

@@ -2,7 +2,7 @@
 import { onMounted } from "vue";
 import { deviceDetection } from "@pureadmin/utils";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
-import VideoPlay from "~icons/ep/video-play";
+import VideoPlay from "@iconify-icons/ep/video-play";
 
 import Player from "xgplayer";
 import "xgplayer/dist/index.min.css";

src/views/able/watermark.vue

@@ -53,7 +53,7 @@ onBeforeUnmount(() => {
         代码位置 src/views/able/watermark.vue
       </el-link>
     </template>
-    <el-space wrap class="mb-2!">
+    <el-space wrap class="!mb-2">
       <span> 请输入要创建水印的值：</span>
       <el-input v-model="value" class="mr-4" style="width: 200px" clearable />
       <span>请选择要创建水印的颜色：</span>

src/views/able/wavesurfer/index.vue

@@ -103,13 +103,13 @@ onBeforeUnmount(() => {
     </template>
     <div
       v-loading="loading"
-      class="w-8/12 m-auto! mt-[20px]!"
+      class="w-8/12 !m-auto !mt-[20px]"
       element-loading-background="transparent"
     >
       <div ref="wavesurferRef" />
       <div v-show="totalTime" class="flex justify-between">
         <span class="text-[#81888f]">00:00</span>
-        <h1 class="text-4xl mt-2!">{{ curTime }}</h1>
+        <h1 class="text-4xl mt-2">{{ curTime }}</h1>
         <span class="text-[#81888f]">{{ totalTime }}</span>
       </div>
       <div v-show="totalTime" class="flex mt-2 w-[180px] justify-around m-auto">

src/views/about/columns.tsx

@@ -7,7 +7,7 @@ export function useColumns() {
       minWidth: 100,
       cellRenderer: () => {
         return (
-          <el-tag size="large" class="text-base!">
+          <el-tag size="large" class="!text-base">
             {version}
           </el-tag>
         );
@@ -18,7 +18,7 @@ export function useColumns() {
       minWidth: 120,
       cellRenderer: () => {
         return (
-          <el-tag size="large" class="text-base!">
+          <el-tag size="large" class="!text-base">
             {lastBuildTime}
           </el-tag>
         );
@@ -29,7 +29,7 @@ export function useColumns() {
       minWidth: 140,
       cellRenderer: () => {
         return (
-          <el-tag size="large" class="text-base!">
+          <el-tag size="large" class="!text-base">
             {engines.node}
           </el-tag>
         );
@@ -40,7 +40,7 @@ export function useColumns() {
       minWidth: 140,
       cellRenderer: () => {
         return (
-          <el-tag size="large" class="text-base!">
+          <el-tag size="large" class="!text-base">
             {engines.pnpm}
           </el-tag>
         );

src/views/account-settings/components/AccountManagement.vue

@@ -43,7 +43,7 @@ function onClick(item) {
       deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
     ]"
   >
-    <h3 class="my-8!">账户管理</h3>
+    <h3 class="my-8">账户管理</h3>
     <div v-for="(item, index) in list" :key="index">
       <div class="flex items-center">
         <div class="flex-1">

src/views/account-settings/components/Preferences.vue

@@ -38,7 +38,7 @@ function onChange(val, item) {
       deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
     ]"
   >
-    <h3 class="my-8!">偏好设置</h3>
+    <h3 class="my-8">偏好设置</h3>
     <div v-for="(item, index) in list" :key="index">
       <div class="flex items-center">
         <div class="flex-1">

src/views/account-settings/components/Profile.vue

@@ -6,7 +6,7 @@ import { type UserInfo, getMine } from "@/api/user";
 import type { FormInstance, FormRules } from "element-plus";
 import ReCropperPreview from "@/components/ReCropperPreview";
 import { createFormData, deviceDetection } from "@pureadmin/utils";
-import uploadLine from "~icons/ri/upload-line";
+import uploadLine from "@iconify-icons/ri/upload-line";
 
 defineOptions({
   name: "Profile"
@@ -110,7 +110,7 @@ getMine().then(res => {
       deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
     ]"
   >
-    <h3 class="my-8!">个人信息</h3>
+    <h3 class="my-8">个人信息</h3>
     <el-form
       ref="userInfoFormRef"
       label-position="top"
@@ -128,7 +128,7 @@ getMine().then(res => {
           :show-file-list="false"
           :on-change="onChange"
         >
-          <el-button plain class="ml-4!">
+          <el-button plain class="ml-4">
             <IconifyIconOffline :icon="uploadLine" />
             <span class="ml-2">更新头像</span>
           </el-button>

src/views/account-settings/components/SecurityLog.vue

@@ -78,7 +78,7 @@ onMounted(() => {
       deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
     ]"
   >
-    <h3 class="my-8!">安全日志</h3>
+    <h3 class="my-8">安全日志</h3>
     <pure-table
       row-key="id"
       table-layout="auto"

src/views/account-settings/index.vue

@@ -11,11 +11,11 @@ import AccountManagement from "./components/AccountManagement.vue";
 import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
 import LaySidebarTopCollapse from "@/layout/components/lay-sidebar/components/SidebarTopCollapse.vue";
 
-import leftLine from "~icons/ri/arrow-left-s-line";
+import leftLine from "@iconify-icons/ri/arrow-left-s-line";
-import ProfileIcon from "~icons/ri/user-3-line";
+import ProfileIcon from "@iconify-icons/ri/user-3-line";
-import PreferencesIcon from "~icons/ri/settings-3-line";
+import PreferencesIcon from "@iconify-icons/ri/settings-3-line";
-import SecurityLogIcon from "~icons/ri/window-line";
+import SecurityLogIcon from "@iconify-icons/ri/window-line";
-import AccountManagementIcon from "~icons/ri/profile-line";
+import AccountManagementIcon from "@iconify-icons/ri/profile-line";
 
 defineOptions({
   name: "AccountSettings"
@@ -70,12 +70,12 @@ getMine().then(res => {
   <el-container class="h-full">
     <el-aside
       v-if="isOpen"
-      class="pure-account-settings overflow-hidden px-2 dark:bg-(--el-bg-color)! border-r-[1px] border-[var(--pure-border-color)]"
+      class="pure-account-settings overflow-hidden px-2 dark:!bg-[var(--el-bg-color)] border-r-[1px] border-[var(--pure-border-color)]"
       :width="deviceDetection() ? '180px' : '240px'"
     >
       <el-menu :default-active="witchPane" class="pure-account-settings-menu">
         <el-menu-item
-          class="hover:transition-all! hover:duration-200! hover:text-base! h-[50px]!"
+          class="hover:!transition-all hover:!duration-200 hover:!text-base !h-[50px]"
           @click="router.go(-1)"
         >
           <div class="flex items-center">
@@ -86,10 +86,10 @@ getMine().then(res => {
         <div class="flex items-center ml-8 mt-4 mb-4">
           <el-avatar :size="48" :src="userInfo.avatar" />
           <div class="ml-4 flex flex-col max-w-[130px]">
-            <ReText class="font-bold self-baseline!">
+            <ReText class="font-bold !self-baseline">
               {{ userInfo.nickname }}
             </ReText>
-            <ReText class="self-baseline!" type="info">
+            <ReText class="!self-baseline" type="info">
               {{ userInfo.username }}
             </ReText>
           </div>

src/views/components/animatecss.vue

@@ -36,6 +36,6 @@ watch(animate, () => {
         代码位置 src/views/components/animatecss.vue
       </el-link>
     </template>
-    <ReAnimateSelector v-model="animate" class="w-[200px]!" />
+    <ReAnimateSelector v-model="animate" class="!w-[200px]" />
   </el-card>
 </template>

src/views/components/check-button.vue

@@ -109,7 +109,7 @@ watch(size, val =>
         代码位置 src/views/components/check-button.vue
       </el-link>
     </template>
-    <div class="mb-2">单选（紧凑风格的按钮样式）</div>
+    <p class="mb-2">单选（紧凑风格的按钮样式）</p>
     <el-radio-group
       v-model="radio"
       :size="dynamicSize"
@@ -121,7 +121,7 @@ watch(size, val =>
     </el-radio-group>
     <el-divider />
 
-    <div class="mb-2">单选（带有边框）</div>
+    <p class="mb-2">单选（带有边框）</p>
     <el-radio-group
       v-model="radioBox"
       :size="dynamicSize"
@@ -133,7 +133,7 @@ watch(size, val =>
     </el-radio-group>
     <el-divider />
 
-    <div class="mb-2">单选（自定义内容）</div>
+    <p class="mb-2">单选（自定义内容）</p>
     <el-radio-group
       v-model="radioCustom"
       :size="dynamicSize"
@@ -160,7 +160,7 @@ watch(size, val =>
     </el-radio-group>
     <el-divider />
 
-    <div class="mb-2">多选（紧凑风格的按钮样式）</div>
+    <p class="mb-2">多选（紧凑风格的按钮样式）</p>
     <el-checkbox-group
       v-model="checkboxGroup"
       :size="dynamicSize"
@@ -172,7 +172,7 @@ watch(size, val =>
     </el-checkbox-group>
     <el-divider />
 
-    <div class="mb-2">多选（带有边框）</div>
+    <p class="mb-2">多选（带有边框）</p>
     <el-checkbox-group
       v-model="checkboxGroupBox"
       :size="dynamicSize"
@@ -184,7 +184,7 @@ watch(size, val =>
     </el-checkbox-group>
     <el-divider />
 
-    <div class="mb-2">多选（来点不一样的体验）</div>
+    <p class="mb-2">多选（来点不一样的体验）</p>
     <el-checkbox-group
       v-model="checkboxGroupCustom"
       class="pure-checkbox"
@@ -218,14 +218,14 @@ watch(size, val =>
     </el-checkbox-group>
     <el-divider />
 
-    <div>可控制间距的按钮样式</div>
+    <p>可控制间距的按钮样式</p>
     <el-slider
       v-model="spaceSize"
-      class="mb-2 w-[300px]!"
+      class="mb-2 !w-[300px]"
       :show-tooltip="false"
       :disabled="size === 'disabled'"
     />
-    <div class="mb-2">单选</div>
+    <p class="mb-2">单选</p>
     <el-space wrap :size="spaceSize">
       <el-check-tag
         v-for="(tag, index) in checkTag"
@@ -241,7 +241,7 @@ watch(size, val =>
         {{ tag.title }}
       </el-check-tag>
     </el-space>
-    <div class="mb-2 mt-4">
+    <p class="mb-2 mt-4">
       多选
       {{
         getKeyList(
@@ -249,7 +249,7 @@ watch(size, val =>
           "title"
         )
       }}
-    </div>
+    </p>
     <el-space wrap :size="spaceSize">
       <el-check-tag
         v-for="(tag, index) in checkGroupTag"
@@ -267,7 +267,7 @@ watch(size, val =>
     </el-space>
     <el-divider />
 
-    <div class="mb-2">单个可选按钮</div>
+    <p class="mb-2">单个可选按钮</p>
     <el-check-tag
       :class="[
         'select-none',

src/views/components/check-card.vue

@@ -69,7 +69,7 @@ watch(size, val =>
       </el-link>
     </template>
 
-    <div class="mb-2 mt-4">单选</div>
+    <p class="mb-2 mt-4">单选</p>
     <PlusCheckCardGroup
       v-model="list"
       :options="options"
@@ -77,7 +77,7 @@ watch(size, val =>
       :disabled="size === 'disabled'"
     />
 
-    <div class="mb-2 mt-4">多选</div>
+    <p class="mb-2 mt-4">多选</p>
     <PlusCheckCardGroup
       v-model="list1"
       :options="options"

src/views/components/collapse.vue

@@ -50,12 +50,12 @@ const handleChange = (val: string[]) => {
       </el-link>
     </template>
 
-    <div class="mb-2">基础用法</div>
+    <p class="mb-2">基础用法</p>
     <el-radio-group v-model="radio" class="mb-3">
       <el-radio value="">可同时展开多个面板</el-radio>
       <el-radio value="accordion">每次只能展开一个面板</el-radio>
     </el-radio-group>
-    <el-button size="small" text bg class="ml-8! mb-1!" @click="onClick">
+    <el-button size="small" text bg class="ml-8 mb-1" @click="onClick">
       外部触发打开、关闭
     </el-button>
     <el-collapse

src/views/components/color-picker.vue

@@ -73,7 +73,7 @@ function onClick() {
       </el-link>
     </template>
 
-    <div class="mb-2">不同尺寸、选择透明度、预定义颜色</div>
+    <p class="mb-2">不同尺寸、选择透明度、预定义颜色</p>
     <el-color-picker
       v-model="color"
       show-alpha
@@ -83,7 +83,7 @@ function onClick() {
     />
     <el-divider />
 
-    <div class="mb-2">外部触发器</div>
+    <p class="mb-2">外部触发器</p>
     <el-space wrap>
       <el-color-picker
         ref="colorPickerRef"

src/views/components/contextmenu/basic.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="mb-2">基础用法</div>
+    <p class="mb-2">基础用法</p>
     <div v-contextmenu:contextmenu class="wrapper">
       <code>右键点击此区域</code>
     </div>