2025-04-25 07:57:18 +08:00
120 changed files with 5898 additions and 6888 deletions
--- a/.eslintignore
+++ b/.eslintignore
@ -0,0 +1,11 @@
+public
+dist
+*.d.ts
+/src/assets
+package.json
+eslint.config.js 
+.prettierrc.js
+commitlint.config.js
+postcss.config.js
+tailwind.config.ts
+stylelint.config.js
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -0,0 +1,120 @@
+module.exports = {
+  root: true,
+  env: {
+    node: true
+  },
+  globals: {
+    // Ref sugar (take 2)
+    $: "readonly",
+    $$: "readonly",
+    $ref: "readonly",
+    $shallowRef: "readonly",
+    $computed: "readonly",
+
+    // index.d.ts
+    // global.d.ts
+    Fn: "readonly",
+    PromiseFn: "readonly",
+    RefType: "readonly",
+    LabelValueOptions: "readonly",
+    EmitType: "readonly",
+    TargetContext: "readonly",
+    ComponentElRef: "readonly",
+    ComponentRef: "readonly",
+    ElRef: "readonly",
+    global: "readonly",
+    ForDataType: "readonly",
+    ComponentRoutes: "readonly",
+
+    // script setup
+    defineProps: "readonly",
+    defineEmits: "readonly",
+    defineExpose: "readonly",
+    withDefaults: "readonly"
+  },
+  extends: [
+    "plugin:vue/vue3-essential",
+    "eslint:recommended",
+    "@vue/typescript/recommended",
+    "@vue/prettier",
+    "@vue/eslint-config-typescript"
+  ],
+  parser: "vue-eslint-parser",
+  parserOptions: {
+    parser: "@typescript-eslint/parser",
+    ecmaVersion: 2020,
+    sourceType: "module",
+    jsxPragma: "React",
+    ecmaFeatures: {
+      jsx: true
+    }
+  },
+  overrides: [
+    {
+      files: ["*.ts", "*.vue"],
+      rules: {
+        "no-undef": "off"
+      }
+    },
+    {
+      files: ["*.vue"],
+      parser: "vue-eslint-parser",
+      parserOptions: {
+        parser: "@typescript-eslint/parser",
+        extraFileExtensions: [".vue"],
+        ecmaVersion: "latest",
+        ecmaFeatures: {
+          jsx: true
+        }
+      },
+      rules: {
+        "no-undef": "off"
+      }
+    }
+  ],
+  rules: {
+    "vue/no-v-html": "off",
+    "vue/require-default-prop": "off",
+    "vue/require-explicit-emits": "off",
+    "vue/multi-word-component-names": "off",
+    "@typescript-eslint/no-explicit-any": "off", // any
+    "no-debugger": "off",
+    "@typescript-eslint/explicit-module-boundary-types": "off", // setup()
+    "@typescript-eslint/ban-types": "off",
+    "@typescript-eslint/ban-ts-comment": "off",
+    "@typescript-eslint/no-empty-function": "off",
+    "@typescript-eslint/no-non-null-assertion": "off",
+    "vue/html-self-closing": [
+      "error",
+      {
+        html: {
+          void: "always",
+          normal: "always",
+          component: "always"
+        },
+        svg: "always",
+        math: "always"
+      }
+    ],
+    "@typescript-eslint/no-unused-vars": [
+      "error",
+      {
+        argsIgnorePattern: "^_",
+        varsIgnorePattern: "^_"
+      }
+    ],
+    "no-unused-vars": [
+      "error",
+      {
+        argsIgnorePattern: "^_",
+        varsIgnorePattern: "^_"
+      }
+    ],
+    "prettier/prettier": [
+      "error",
+      {
+        endOfLine: "auto"
+      }
+    ]
+  }
+};
--- a/.lintstagedrc
+++ b/.lintstagedrc
@ -3,7 +3,7 @@
    "prettier --cache --ignore-unknown  --write",
    "eslint --cache --fix"
  ],
-  "{!(package)*.json,*.code-snippets,.!({browserslist,npm,nvm})*rc}": [
+  "{!(package)*.json,*.code-snippets,.!({browserslist,nvm})*rc}": [
    "prettier --cache --write--parser json"
  ],
  "package.json": ["prettier --cache --write"],
--- a/.npmrc
+++ b/.npmrc
@ -1,4 +1,3 @@
-shell-emulator=true
 shamefully-hoist=true
-enable-pre-post-scripts=false
-strict-peer-dependencies=false
+strict-peer-dependencies=false
+shell-emulator=true
--- a/.nvmrc
+++ b/.nvmrc
@ -1 +1 @@
-v22.12.0
+v20.11.1
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@ -1,7 +1,6 @@
 {
  "recommendations": [
    "christian-kohler.path-intellisense",
-    "warmthsea.vscode-custom-code-color",
    "vscode-icons-team.vscode-icons",
    "davidanson.vscode-markdownlint",
    "ms-azuretools.vscode-docker",
@ -16,4 +15,4 @@
    "antfu.iconify",
    "Vue.volar"
  ]
-}
+}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -27,17 +27,5 @@
  "editor.codeActionsOnSave": {
    "source.fixAll.eslint": "explicit"
  },
-  "iconify.excludes": [
-    "el"
-  ],
-  "vscodeCustomCodeColor.highlightValue": [
-    "v-loading",
-    "v-auth",
-    "v-copy",
-    "v-longpress",
-    "v-optimize",
-    "v-perms",
-    "v-ripple"
-  ],
-  "vscodeCustomCodeColor.highlightValueColor": "#b392f0",
-}
+  "iconify.excludes": ["el"]
+}
--- a/4
+++ b/4
@ -1,8 +1,8 @@
-FROM node:20-alpine as build-stage
+FROM node:18-alpine as build-stage

 WORKDIR /app
 RUN corepack enable
-RUN corepack prepare pnpm@latest --activate
+RUN corepack prepare pnpm@8.6.10 --activate

 RUN npm config set registry https://registry.npmmirror.com

--- a/README.en-US.md
+++ b/README.en-US.md
@ -8,14 +8,6 @@

 The simplified version is based on the shelf extracted from [vue-pure-admin](https://github.com/pure-admin/vue-pure-admin), which contains main functions and is more suitable for actual project development. The packaged size is introduced globally [element-plus](https://element-plus.org) is still below `2.3MB`, and the full version of the code will be permanently synchronized. After enabling `brotli` compression and `cdn` to replace the local library mode, the package size is less than `350kb`

-## `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/)
-
 ## Supporting video

 [Click me to view UI design](https://www.bilibili.com/video/BV17g411T7rq)  
@ -23,12 +15,12 @@ The simplified version is based on the shelf extracted from [vue-pure-admin](htt

 ## Nanny-level documents

-[Click me to view vue-pure-admin documentation](https://pure-admin.cn/)  
+[Click me to view vue-pure-admin documentation](https://yiming_chang.gitee.io/pure-admin-doc)  
 [Click me to view @pureadmin/utils documentation](https://pure-admin-utils.netlify.app)

 ## Quality service, software outsourcing, sponsorship support

-[Click me to view details](https://pure-admin.cn/pages/service/)
+[Click me to view details](https://yiming_chang.gitee.io/pure-admin-doc/pages/service/)

 ## Preview

--- a/README.md
+++ b/README.md
@ -12,14 +12,6 @@

 当前是非国际化版本，如果您需要国际化版本 [请点击](https://github.com/pure-admin/pure-admin-thin/tree/i18n)

-## `js` 版本
-
-[点我查看 js 版本](https://pure-admin.cn/pages/js/)
-
-## `max` 版本
-
-[点我查看 max 版本](https://pure-admin.cn/pages/max/)
-
 ## 配套视频

 [点我查看 UI 设计](https://www.bilibili.com/video/BV17g411T7rq)  
@ -27,12 +19,12 @@

 ## 配套保姆级文档

-[点我查看 vue-pure-admin 文档](https://pure-admin.cn/)  
+[点我查看 vue-pure-admin 文档](https://yiming_chang.gitee.io/pure-admin-doc)  
 [点我查看 @pureadmin/utils 文档](https://pure-admin-utils.netlify.app)

 ## 优质服务、软件外包、赞助支持

-[点我查看详情](https://pure-admin.cn/pages/service/)
+[点我查看详情](https://yiming_chang.gitee.io/pure-admin-doc/pages/service/)

 ## 预览

--- a/build/cdn.ts
+++ b/build/cdn.ts
@ -3,6 +3,7 @@ import { Plugin as importToCDN } from "vite-plugin-cdn-import";
 /**
 * @description 打包时采用`cdn`模式，仅限外网使用（默认不采用，如果需要采用cdn模式，请在 .env.production 文件，将 VITE_CDN 设置成true）
 * 平台采用国内cdn：https://www.bootcdn.cn，当然你也可以选择 https://unpkg.com 或者 https://www.jsdelivr.com
+ * 提醒：mockjs不能用cdn模式引入，会报错。正确的方式是，生产环境删除mockjs，使用真实的后端请求
 * 注意：上面提到的仅限外网使用也不是完全肯定的，如果你们公司内网部署的有相关js、css文件，也可以将下面配置对应改一下，整一套内网版cdn
 */
 export const cdn = importToCDN({
--- a/build/info.ts
+++ b/build/info.ts
@ -1,13 +1,13 @@
 import type { Plugin } from "vite";
-import gradient from "gradient-string";
 import { getPackageSize } from "./utils";
 import dayjs, { type Dayjs } from "dayjs";
 import duration from "dayjs/plugin/duration";
+import gradientString from "gradient-string";
 import boxen, { type Options as BoxenOptions } from "boxen";
 dayjs.extend(duration);

-const welcomeMessage = gradient(["cyan", "magenta"]).multiline(
-  `您好! 欢迎使用 pure-admin 开源项目\n我们为您精心准备了下面两个贴心的保姆级文档\nhttps://pure-admin.cn\nhttps://pure-admin-utils.netlify.app`
+const welcomeMessage = gradientString("cyan", "magenta").multiline(
+  `您好! 欢迎使用 pure-admin 开源项目\n我们为您精心准备了下面两个贴心的保姆级文档\nhttps://yiming_chang.gitee.io/pure-admin-doc\nhttps://pure-admin-utils.netlify.app`
 );

 const boxenOptions: BoxenOptions = {
@ -41,7 +41,7 @@ export function viteBuildInfo(): Plugin {
          callback: (size: string) => {
            console.log(
              boxen(
-                gradient(["cyan", "magenta"]).multiline(
+                gradientString("cyan", "magenta").multiline(
                  `🎉 恭喜打包完成（总用时${dayjs
                    .duration(endTime.diff(startTime))
                    .format("mm分ss秒")}，打包后的大小为${size}）`
--- a/build/optimize.ts
+++ b/build/optimize.ts
@ -24,6 +24,10 @@ const include = [
 * 在预构建中强制排除的依赖项
 * 温馨提示：所有以 `@iconify-icons/` 开头引入的的本地图标模块，都应该加入到下面的 `exclude` 里，因为平台推荐的使用方式是哪里需要哪里引入而且都是单个的引入，不需要预构建，直接让浏览器加载就好
 */
-const exclude = ["@iconify-icons/ep", "@iconify-icons/ri"];
+const exclude = [
+  "@iconify-icons/ep",
+  "@iconify-icons/ri",
+  "@pureadmin/theme/dist/browser-utils"
+];

 export { include, exclude };
--- a/build/plugins.ts
+++ b/build/plugins.ts
@ -8,7 +8,8 @@ import { configCompressPlugin } from "./compress";
 import removeNoMatch from "vite-plugin-router-warn";
 import { visualizer } from "rollup-plugin-visualizer";
 import removeConsole from "vite-plugin-remove-console";
-import { codeInspectorPlugin } from "code-inspector-plugin";
+import { themePreprocessorPlugin } from "@pureadmin/theme";
+import { genScssMultipleScopeVars } from "../src/layout/theme";
 import { vitePluginFakeServer } from "vite-plugin-fake-server";

 export function getPluginsList(
@ -20,16 +21,6 @@ export function getPluginsList(
    vue(),
    // jsx、tsx语法支持
    vueJsx(),
-    /**
-     * 在页面上按住组合键时，鼠标在页面移动即会在 DOM 上出现遮罩层并显示相关信息，点击一下将自动打开 IDE 并将光标定位到元素对应的代码位置
-     * Mac 默认组合键 Option + Shift
-     * Windows 默认组合键 Alt + Shift
-     * 更多用法看 https://inspector.fe-dev.cn/guide/start.html
-     */
-    codeInspectorPlugin({
-      bundler: "vite",
-      hideConsole: true
-    }),
    viteBuildInfo(),
    /**
     * 开发环境下移除非必要的vue-router动态路由警告No match found for location with path
@ -44,6 +35,13 @@ export function getPluginsList(
      infixName: false,
      enableProd: true
    }),
+    // 自定义主题
+    themePreprocessorPlugin({
+      scss: {
+        multipleScopeVars: genScssMultipleScopeVars(),
+        extract: true
+      }
+    }),
    // svg组件化支持
    svgLoader(),
    VITE_CDN ? cdn : null,
--- a/build/utils.ts
+++ b/build/utils.ts
@ -48,7 +48,7 @@ const __APP_INFO__ = {
 };

 /** 处理环境变量 */
-const wrapperEnv = (envConf: Recordable): ViteEnv => {
+const warpperEnv = (envConf: Recordable): ViteEnv => {
  // 默认值
  const ret: ViteEnv = {
    VITE_PORT: 8848,
@ -107,4 +107,4 @@ const getPackageSize = options => {
  });
 };

-export { root, pathResolve, alias, __APP_INFO__, wrapperEnv, getPackageSize };
+export { root, pathResolve, alias, __APP_INFO__, warpperEnv, getPackageSize };
--- a/eslint.config.js
+++ b/eslint.config.js
@ -10,14 +10,7 @@ import pluginTypeScript from "@typescript-eslint/eslint-plugin";
 export default defineFlatConfig([
  {
    ...js.configs.recommended,
-    ignores: [
-      "**/.*",
-      "dist/*",
-      "*.d.ts",
-      "public/*",
-      "src/assets/**",
-      "src/**/iconfont/**"
-    ],
+    ignores: ["src/assets/**", "src/**/iconfont/**"],
    languageOptions: {
      globals: {
        // index.d.ts
@ -78,8 +71,7 @@ export default defineFlatConfig([
    languageOptions: {
      parser: parserTypeScript,
      parserOptions: {
-        sourceType: "module",
-        warnOnUnsupportedTypeScriptVersion: false
+        sourceType: "module"
      }
    },
    plugins: {
@ -94,8 +86,6 @@ export default defineFlatConfig([
      "@typescript-eslint/prefer-as-const": "warn",
      "@typescript-eslint/no-empty-function": "off",
      "@typescript-eslint/no-non-null-assertion": "off",
-      "@typescript-eslint/no-unused-expressions": "off",
-      "@typescript-eslint/no-unsafe-function-type": "off",
      "@typescript-eslint/no-import-type-side-effects": "error",
      "@typescript-eslint/explicit-module-boundary-types": "off",
      "@typescript-eslint/consistent-type-imports": [
--- a/mock/asyncRoutes.ts
+++ b/mock/asyncRoutes.ts
@ -23,34 +23,17 @@ const permissionRouter = {
      }
    },
    {
-      path: "/permission/button",
+      path: "/permission/button/index",
+      name: "PermissionButton",
      meta: {
        title: "按钮权限",
-        roles: ["admin", "common"]
-      },
-      children: [
-        {
-          path: "/permission/button/router",
-          component: "permission/button/index",
-          name: "PermissionButtonRouter",
-          meta: {
-            title: "路由返回按钮权限",
-            auths: [
-              "permission:btn:add",
-              "permission:btn:edit",
-              "permission:btn:delete"
-            ]
-          }
-        },
-        {
-          path: "/permission/button/login",
-          component: "permission/button/perms",
-          name: "PermissionButtonLogin",
-          meta: {
-            title: "登录接口返回按钮权限"
-          }
-        }
-      ]
+        roles: ["admin", "common"],
+        auths: [
+          "permission:btn:add",
+          "permission:btn:edit",
+          "permission:btn:delete"
+        ]
+      }
    }
  ]
 };
--- a/mock/login.ts
+++ b/mock/login.ts
@ -10,13 +10,9 @@ export default defineFakeRoute([
        return {
          success: true,
          data: {
-            avatar: "https://avatars.githubusercontent.com/u/44761321",
            username: "admin",
-            nickname: "小铭",
            // 一个用户可能有多个角色
            roles: ["admin"],
-            // 按钮级别权限
-            permissions: ["*:*:*"],
            accessToken: "eyJhbGciOiJIUzUxMiJ9.admin",
            refreshToken: "eyJhbGciOiJIUzUxMiJ9.adminRefresh",
            expires: "2030/10/30 00:00:00"
@ -26,11 +22,9 @@ export default defineFakeRoute([
        return {
          success: true,
          data: {
-            avatar: "https://avatars.githubusercontent.com/u/52823142",
            username: "common",
-            nickname: "小林",
+            // 一个用户可能有多个角色
            roles: ["common"],
-            permissions: ["permission:btn:add", "permission:btn:edit"],
            accessToken: "eyJhbGciOiJIUzUxMiJ9.common",
            refreshToken: "eyJhbGciOiJIUzUxMiJ9.commonRefresh",
            expires: "2030/10/30 00:00:00"
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "pure-admin-thin",
-  "version": "5.9.0",
+  "version": "5.3.0",
  "private": true,
  "type": "module",
  "scripts": {
@ -13,6 +13,7 @@
    "preview:build": "pnpm build && vite preview",
    "typecheck": "tsc --noEmit && vue-tsc --noEmit --skipLibCheck",
    "svgo": "svgo -f . -r",
+    "cloc": "NODE_OPTIONS=--max-old-space-size=4096 cloc . --exclude-dir=node_modules --exclude-lang=YAML",
    "clean:cache": "rimraf .eslintcache && rimraf pnpm-lock.yaml && rimraf node_modules && pnpm store prune && pnpm install",
    "lint:eslint": "eslint --cache --max-warnings 0  \"{src,mock,build}/**/*.{vue,js,ts,tsx}\" --fix",
    "lint:prettier": "prettier --write  \"src/**/*.{js,ts,json,tsx,css,scss,vue,html,md}\"",
@ -22,7 +23,6 @@
    "preinstall": "npx only-allow pnpm"
  },
  "keywords": [
-    "pure-admin-thin",
    "vue-pure-admin",
    "element-plus",
    "tailwindcss",
@ -39,7 +39,7 @@
    "url": "git+https://github.com/pure-admin/pure-admin-thin.git"
  },
  "bugs": {
-    "url": "https://github.com/pure-admin/vue-pure-admin/issues"
+    "url": "https://github.com/pure-admin/pure-admin-thin/issues"
  },
  "license": "MIT",
  "author": {
@ -49,109 +49,100 @@
  },
  "dependencies": {
    "@pureadmin/descriptions": "^1.2.1",
-    "@pureadmin/table": "^3.2.1",
-    "@pureadmin/utils": "^2.5.0",
-    "@vueuse/core": "^12.0.0",
-    "@vueuse/motion": "^2.2.6",
+    "@pureadmin/table": "^3.1.2",
+    "@pureadmin/utils": "^2.4.7",
+    "@vueuse/core": "^10.9.0",
+    "@vueuse/motion": "^2.1.0",
    "animate.css": "^4.1.1",
-    "axios": "^1.7.9",
-    "dayjs": "^1.11.13",
-    "echarts": "^5.5.1",
-    "element-plus": "^2.9.0",
+    "axios": "^1.6.8",
+    "dayjs": "^1.11.10",
+    "echarts": "^5.5.0",
+    "element-plus": "^2.6.2",
    "js-cookie": "^3.0.5",
    "localforage": "^1.10.0",
    "mitt": "^3.0.1",
    "nprogress": "^0.2.0",
-    "path-browserify": "^1.0.1",
-    "pinia": "^2.3.0",
-    "pinyin-pro": "^3.26.0",
-    "qs": "^6.13.1",
+    "path": "^0.12.7",
+    "pinia": "^2.1.7",
+    "pinyin-pro": "^3.19.6",
+    "qs": "^6.12.0",
    "responsive-storage": "^2.2.0",
-    "sortablejs": "^1.15.6",
-    "vue": "^3.5.13",
-    "vue-router": "^4.5.0",
-    "vue-tippy": "^6.5.0",
-    "vue-types": "^5.1.3"
+    "sortablejs": "^1.15.2",
+    "vue": "^3.4.21",
+    "vue-router": "^4.3.0",
+    "vue-tippy": "^6.4.1",
+    "vue-types": "^5.1.1"
  },
  "devDependencies": {
-    "@commitlint/cli": "^19.6.0",
-    "@commitlint/config-conventional": "^19.6.0",
-    "@commitlint/types": "^19.5.0",
-    "@eslint/js": "^9.16.0",
-    "@faker-js/faker": "^9.3.0",
+    "@commitlint/cli": "^19.2.1",
+    "@commitlint/config-conventional": "^19.1.0",
+    "@commitlint/types": "^19.0.3",
+    "@eslint/js": "^8.57.0",
+    "@faker-js/faker": "^8.4.1",
    "@iconify-icons/ep": "^1.2.12",
    "@iconify-icons/ri": "^1.2.10",
-    "@iconify/vue": "^4.2.0",
+    "@iconify/vue": "^4.1.1",
+    "@pureadmin/theme": "^3.2.0",
+    "@types/gradient-string": "^1.1.5",
    "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.17.9",
+    "@types/node": "^20.11.30",
    "@types/nprogress": "^0.2.3",
-    "@types/path-browserify": "^1.0.3",
-    "@types/qs": "^6.9.17",
+    "@types/qs": "^6.9.14",
    "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.18.0",
-    "@typescript-eslint/parser": "^8.18.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.18.2",
-    "cssnano": "^7.0.6",
-    "eslint": "^9.16.0",
+    "@typescript-eslint/eslint-plugin": "^7.4.0",
+    "@typescript-eslint/parser": "^7.4.0",
+    "@vitejs/plugin-vue": "^5.0.4",
+    "@vitejs/plugin-vue-jsx": "^3.1.0",
+    "autoprefixer": "^10.4.19",
+    "boxen": "^7.1.1",
+    "cloc": "^2.11.0",
+    "cssnano": "^6.1.2",
+    "eslint": "^8.57.0",
    "eslint-config-prettier": "^9.1.0",
    "eslint-define-config": "^2.1.0",
-    "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-vue": "^9.32.0",
-    "gradient-string": "^3.0.0",
-    "husky": "^9.1.7",
-    "lint-staged": "^15.2.10",
-    "postcss": "^8.4.49",
-    "postcss-html": "^1.7.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-vue": "^9.24.0",
+    "gradient-string": "^2.0.2",
+    "husky": "^9.0.11",
+    "lint-staged": "^15.2.2",
+    "postcss": "^8.4.38",
+    "postcss-html": "^1.6.0",
    "postcss-import": "^16.1.0",
    "postcss-scss": "^4.0.9",
-    "prettier": "^3.4.2",
-    "rimraf": "^6.0.1",
+    "prettier": "^3.2.5",
+    "rimraf": "^5.0.5",
    "rollup-plugin-visualizer": "^5.12.0",
-    "sass": "^1.82.0",
-    "stylelint": "^16.11.0",
-    "stylelint-config-recess-order": "^5.1.1",
+    "sass": "^1.72.0",
+    "stylelint": "^16.3.1",
+    "stylelint-config-recess-order": "^5.0.0",
    "stylelint-config-recommended-vue": "^1.5.0",
-    "stylelint-config-standard-scss": "^13.1.0",
-    "stylelint-prettier": "^5.0.2",
-    "svgo": "^3.3.2",
-    "tailwindcss": "^3.4.16",
-    "typescript": "5.6.3",
-    "vite": "^6.0.3",
-    "vite-plugin-cdn-import": "^1.0.1",
+    "stylelint-config-standard-scss": "^13.0.0",
+    "stylelint-prettier": "^5.0.0",
+    "svgo": "^3.2.0",
+    "tailwindcss": "^3.4.3",
+    "typescript": "^5.4.3",
+    "vite": "^5.2.6",
+    "vite-plugin-cdn-import": "^0.3.5",
    "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-fake-server": "^2.1.4",
+    "vite-plugin-fake-server": "^2.1.1",
    "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-tsc": "^2.1.10"
+    "vue-eslint-parser": "^9.4.2",
+    "vue-tsc": "^1.8.27"
  },
  "engines": {
-    "node": "^18.18.0 || ^20.9.0 || >=22.0.0",
-    "pnpm": ">=9"
+    "node": "^18.18.0 || ^20.9.0 || >=21.1.0",
+    "pnpm": ">=8.6.10"
  },
+  "packageManager": "pnpm@8.6.10",
  "pnpm": {
    "allowedDeprecatedVersions": {
-      "are-we-there-yet": "*",
      "sourcemap-codec": "*",
      "domexception": "*",
      "w3c-hr-time": "*",
-      "inflight": "*",
-      "npmlog": "*",
-      "rimraf": "*",
      "stable": "*",
-      "gauge": "*",
-      "abab": "*",
-      "glob": "*"
-    },
-    "peerDependencyRules": {
-      "allowedVersions": {
-        "eslint": "9"
-      }
+      "abab": "*"
    }
  }
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/public/platform-config.json
+++ b/public/platform-config.json
@ -1,5 +1,5 @@
 {
-  "Version": "5.9.0",
+  "Version": "5.3.0",
  "Title": "PureAdmin",
  "FixedHeader": true,
  "HiddenSideBar": false,
--- a/src/App.vue
+++ b/src/App.vue
@ -8,9 +8,8 @@
 <script lang="ts">
 import { defineComponent } from "vue";
 import { ElConfigProvider } from "element-plus";
+import zhCn from "element-plus/dist/locale/zh-cn.mjs";
 import { ReDialog } from "@/components/ReDialog";
-import zhCn from "element-plus/es/locale/lang/zh-cn";
-
 export default defineComponent({
  name: "app",
  components: {
--- a/src/api/user.ts
+++ b/src/api/user.ts
@ -3,16 +3,10 @@ import { http } from "@/utils/http";
 export type UserResult = {
  success: boolean;
  data: {
-    /** 头像 */
-    avatar: string;
    /** 用户名 */
    username: string;
-    /** 昵称 */
-    nickname: string;
-    /** 当前登录用户的角色 */
+    /** 当前登陆用户的角色 */
    roles: Array<string>;
-    /** 按钮级别权限 */
-    permissions: Array<string>;
    /** `token` */
    accessToken: string;
    /** 用于调用刷新`accessToken`的接口时所需的`token` */
@ -39,7 +33,7 @@ export const getLogin = (data?: object) => {
  return http.request<UserResult>("post", "/login", { data });
 };

-/** 刷新`token` */
+/** 刷新token */
 export const refreshTokenApi = (data?: object) => {
  return http.request<RefreshTokenResult>("post", "/refresh-token", { data });
 };
--- a/src/components/ReDialog/index.ts
+++ b/src/components/ReDialog/index.ts
@ -29,11 +29,9 @@ const addDialog = (options: DialogOptions) => {
 const closeDialog = (options: DialogOptions, index: number, args?: any) => {
  dialogStore.value[index].visible = false;
  options.closeCallBack && options.closeCallBack({ options, index, args });
-
-  const closeDelay = options?.closeDelay ?? 200;
  useTimeoutFn(() => {
    dialogStore.value.splice(index, 1);
-  }, closeDelay);
+  }, 200);
 };

 /**
--- a/src/components/ReDialog/index.vue
+++ b/src/components/ReDialog/index.vue
@ -11,11 +11,6 @@ import { isFunction } from "@pureadmin/utils";
 import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
 import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";

-defineOptions({
-  name: "ReDialog"
-});
-
-const sureBtnMap = ref({});
 const fullscreen = ref(false);

 const footerButtons = computed(() => {
@ -42,28 +37,11 @@ const footerButtons = computed(() => {
            type: "primary",
            text: true,
            bg: true,
-            popconfirm: options?.popconfirm,
            btnClick: ({ dialog: { options, index } }) => {
-              if (options?.sureBtnLoading) {
-                sureBtnMap.value[index] = Object.assign(
-                  {},
-                  sureBtnMap.value[index],
-                  {
-                    loading: true
-                  }
-                );
-              }
-              const closeLoading = () => {
-                if (options?.sureBtnLoading) {
-                  sureBtnMap.value[index].loading = false;
-                }
-              };
-              const done = () => {
-                closeLoading();
+              const done = () =>
                closeDialog(options, index, { command: "sure" });
-              };
              if (options?.beforeSure && isFunction(options?.beforeSure)) {
-                options.beforeSure(done, { options, index, closeLoading });
+                options.beforeSure(done, { options, index });
              } else {
                done();
              }
@ -171,35 +149,19 @@ function handleClose(
        <component :is="options?.footerRenderer({ options, index })" />
      </template>
      <span v-else>
-        <template v-for="(btn, key) in footerButtons(options)" :key="key">
-          <el-popconfirm
-            v-if="btn.popconfirm"
-            v-bind="btn.popconfirm"
-            @confirm="
-              btn.btnClick({
-                dialog: { options, index },
-                button: { btn, index: key }
-              })
-            "
-          >
-            <template #reference>
-              <el-button v-bind="btn">{{ btn?.label }}</el-button>
-            </template>
-          </el-popconfirm>
-          <el-button
-            v-else
-            v-bind="btn"
-            :loading="key === 1 && sureBtnMap[index]?.loading"
-            @click="
-              btn.btnClick({
-                dialog: { options, index },
-                button: { btn, index: key }
-              })
-            "
-          >
-            {{ btn?.label }}
-          </el-button>
-        </template>
+        <el-button
+          v-for="(btn, key) in footerButtons(options)"
+          :key="key"
+          v-bind="btn"
+          @click="
+            btn.btnClick({
+              dialog: { options, index },
+              button: { btn, index: key }
+            })
+          "
+        >
+          {{ btn?.label }}
+        </el-button>
      </span>
    </template>
  </el-dialog>
--- a/src/components/ReDialog/type.ts
+++ b/src/components/ReDialog/type.ts
@ -11,13 +11,6 @@ type ArgsType = {
  /** `cancel` 点击取消按钮、`sure` 点击确定按钮、`close` 点击右上角关闭按钮或空白页或按下了esc键 */
  command: "cancel" | "sure" | "close";
 };
-type ButtonType =
-  | "primary"
-  | "success"
-  | "warning"
-  | "danger"
-  | "info"
-  | "text";

 /** https://element-plus.org/zh-CN/component/dialog.html#attributes */
 type DialogProps = {
@ -65,34 +58,6 @@ type DialogProps = {
  destroyOnClose?: boolean;
 };

-//element-plus.org/zh-CN/component/popconfirm.html#attributes
-type Popconfirm = {
-  /** 标题 */
-  title?: string;
-  /** 确定按钮文字 */
-  confirmButtonText?: string;
-  /** 取消按钮文字 */
-  cancelButtonText?: string;
-  /** 确定按钮类型，默认 `primary` */
-  confirmButtonType?: ButtonType;
-  /** 取消按钮类型，默认 `text` */
-  cancelButtonType?: ButtonType;
-  /** 自定义图标，默认 `QuestionFilled` */
-  icon?: string | Component;
-  /** `Icon` 颜色，默认 `#f90` */
-  iconColor?: string;
-  /** 是否隐藏 `Icon`，默认 `false` */
-  hideIcon?: boolean;
-  /** 关闭时的延迟，默认 `200` */
-  hideAfter?: number;
-  /** 是否将 `popover` 的下拉列表插入至 `body` 元素，默认 `true` */
-  teleported?: boolean;
-  /** 当 `popover` 组件长时间不触发且 `persistent` 属性设置为 `false` 时, `popover` 将会被删除，默认 `false` */
-  persistent?: boolean;
-  /** 弹层宽度，最小宽度 `150px`，默认 `150` */
-  width?: string | number;
-};
-
 type BtnClickDialog = {
  options?: DialogOptions;
  index?: number;
@ -121,8 +86,6 @@ type ButtonProps = {
  round?: boolean;
  /** 是否为圆形按钮，默认 `false` */
  circle?: boolean;
-  /** 确定按钮的 `Popconfirm` 气泡确认框相关配置 */
-  popconfirm?: Popconfirm;
  /** 是否为加载中状态，默认 `false` */
  loading?: boolean;
  /** 自定义加载中状态图标组件 */
@ -160,10 +123,6 @@ interface DialogOptions extends DialogProps {
  props?: any;
  /** 是否隐藏 `Dialog` 按钮操作区的内容 */
  hideFooter?: boolean;
-  /** 确定按钮的 `Popconfirm` 气泡确认框相关配置 */
-  popconfirm?: Popconfirm;
-  /** 点击确定按钮后是否开启 `loading` 加载动画 */
-  sureBtnLoading?: boolean;
  /**
   * @description 自定义对话框标题的内容渲染器
   * @see {@link https://element-plus.org/zh-CN/component/dialog.html#%E8%87%AA%E5%AE%9A%E4%B9%89%E5%A4%B4%E9%83%A8}
@ -261,13 +220,10 @@ interface DialogOptions extends DialogProps {
    done: Function,
    {
      options,
-      index,
-      closeLoading
+      index
    }: {
      options: DialogOptions;
      index: number;
-      /** 关闭确定按钮的 `loading` 加载动画 */
-      closeLoading: Function;
    }
  ) => void;
 }
--- a/src/components/ReIcon/index.ts
+++ b/src/components/ReIcon/index.ts
@ -6,7 +6,7 @@ import fontIcon from "./src/iconfont";
 const IconifyIconOffline = iconifyIconOffline;
 /** 在线图标组件 */
 const IconifyIconOnline = iconifyIconOnline;
-/** `iconfont`组件 */
+/** iconfont组件 */
 const FontIcon = fontIcon;

 export { IconifyIconOffline, IconifyIconOnline, FontIcon };
--- a/src/components/ReIcon/src/hooks.ts
+++ b/src/components/ReIcon/src/hooks.ts
@ -4,7 +4,7 @@ import { IconifyIconOnline, IconifyIconOffline, FontIcon } from "../index";

 /**
 * 支持 `iconfont`、自定义 `svg` 以及 `iconify` 中所有的图标
- * @see 点击查看文档图标篇 {@link https://pure-admin.cn/pages/icon/}
+ * @see 点击查看文档图标篇 {@link https://yiming_chang.gitee.io/pure-admin-doc/pages/icon/}
 * @param icon 必传 图标
 * @param attrs 可选 iconType 属性
 * @returns Component
--- a/src/components/RePerms/index.ts
+++ b/src/components/RePerms/index.ts
@ -1,5 +0,0 @@
-import perms from "./src/perms";
-
-const Perms = perms;
-
-export { Perms };
--- a/src/components/RePerms/src/perms.tsx
+++ b/src/components/RePerms/src/perms.tsx
@ -1,20 +0,0 @@
-import { defineComponent, Fragment } from "vue";
-import { hasPerms } from "@/utils/auth";
-
-export default defineComponent({
-  name: "Perms",
-  props: {
-    value: {
-      type: undefined,
-      default: []
-    }
-  },
-  setup(props, { slots }) {
-    return () => {
-      if (!slots) return null;
-      return hasPerms(props.value) ? (
-        <Fragment>{slots.default?.()}</Fragment>
-      ) : null;
-    };
-  }
-});
--- a/src/components/RePureTableBar/src/bar.tsx
+++ b/src/components/RePureTableBar/src/bar.tsx
@ -1,14 +1,6 @@
 import Sortable from "sortablejs";
 import { useEpThemeStoreHook } from "@/store/modules/epTheme";
-import {
-  type PropType,
-  ref,
-  unref,
-  computed,
-  nextTick,
-  defineComponent,
-  getCurrentInstance
-} from "vue";
+import { defineComponent, ref, computed, type PropType, nextTick } from "vue";
 import {
  delay,
  cloneDeep,
@ -17,13 +9,11 @@ import {
  getKeyList
 } from "@pureadmin/utils";

-import Fullscreen from "@iconify-icons/ri/fullscreen-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";
-import SettingIcon from "@/assets/table-bar/settings.svg?component";
-import CollapseIcon from "@/assets/table-bar/collapse.svg?component";
+import DragIcon from "./svg/drag.svg?component";
+import ExpandIcon from "./svg/expand.svg?component";
+import RefreshIcon from "./svg/refresh.svg?component";
+import SettingIcon from "./svg/settings.svg?component";
+import CollapseIcon from "./svg/collapse.svg?component";

 const props = {
  /** 头部最左边的标题 */
@ -43,24 +33,18 @@ const props = {
  isExpandAll: {
    type: Boolean,
    default: true
-  },
-  tableKey: {
-    type: [String, Number] as PropType<string | number>,
-    default: "0"
  }
 };

 export default defineComponent({
  name: "PureTableBar",
  props,
-  emits: ["refresh", "fullscreen"],
+  emits: ["refresh"],
  setup(props, { emit, slots, attrs }) {
    const size = ref("default");
    const loading = ref(false);
    const checkAll = ref(true);
-    const isFullscreen = ref(false);
    const isIndeterminate = ref(false);
-    const instance = getCurrentInstance()!;
    const isExpandAll = ref(props.isExpandAll);
    const filterColumns = cloneDeep(props?.columns).filter(column =>
      isBoolean(column?.hide)
@ -116,11 +100,6 @@ export default defineComponent({
      toggleRowExpansionAll(props.tableRef.data, isExpandAll.value);
    }

-    function onFullscreen() {
-      isFullscreen.value = !isFullscreen.value;
-      emit("fullscreen", isFullscreen.value);
-    }
-
    function toggleRowExpansionAll(data, isExpansion) {
      data.forEach(item => {
        props.tableRef.toggleRowExpansion(item, isExpansion);
@ -188,9 +167,9 @@ export default defineComponent({
    const rowDrop = (event: { preventDefault: () => void }) => {
      event.preventDefault();
      nextTick(() => {
-        const wrapper: HTMLElement = (
-          instance?.proxy?.$refs[`GroupRef${unref(props.tableKey)}`] as any
-        ).$el.firstElementChild;
+        const wrapper: HTMLElement = document.querySelector(
+          ".el-checkbox-group>div"
+        );
        Sortable.create(wrapper, {
          animation: 300,
          handle: ".drag-btn",
@ -247,18 +226,7 @@ export default defineComponent({

    return () => (
      <>
-        <div
-          {...attrs}
-          class={[
-            "w-[99/100]",
-            "px-2",
-            "pb-2",
-            "bg-bg_color",
-            isFullscreen.value
-              ? ["!w-full", "!h-full", "z-[2002]", "fixed", "inset-0"]
-              : "mt-2"
-          ]}
-        >
+        <div {...attrs} class="w-[99/100] mt-2 px-2 pb-2 bg-bg_color">
          <div class="flex justify-between w-full h-[60px] p-4">
            {slots?.title ? (
              slots.title()
@ -326,7 +294,6 @@ export default defineComponent({
                <div class="pt-[6px] pl-[11px]">
                  <el-scrollbar max-height="36vh">
                    <el-checkbox-group
-                      ref={`GroupRef${unref(props.tableKey)}`}
                      modelValue={checkedColumns.value}
                      onChange={value => handleCheckedColumnsChange(value)}
                    >
@ -372,14 +339,6 @@ export default defineComponent({
                  </el-scrollbar>
                </div>
              </el-popover>
-              <el-divider direction="vertical" />
-
-              <iconifyIconOffline
-                class={["w-[16px]", iconClass.value]}
-                icon={isFullscreen.value ? ExitFullscreen : Fullscreen}
-                v-tippy={isFullscreen.value ? "退出全屏" : "全屏"}
-                onClick={() => onFullscreen()}
-              />
            </div>
          </div>
          {slots.default({
--- a/src/components/RePureTableBar/src/svg/collapse.svg
+++ b/src/components/RePureTableBar/src/svg/collapse.svg
--- a/src/components/RePureTableBar/src/svg/drag.svg
+++ b/src/components/RePureTableBar/src/svg/drag.svg
--- a/src/components/RePureTableBar/src/svg/expand.svg
+++ b/src/components/RePureTableBar/src/svg/expand.svg
--- a/src/components/RePureTableBar/src/svg/refresh.svg
+++ b/src/components/RePureTableBar/src/svg/refresh.svg
--- a/src/components/RePureTableBar/src/svg/settings.svg
+++ b/src/components/RePureTableBar/src/svg/settings.svg
--- a/src/components/ReSegmented/src/index.tsx
+++ b/src/components/ReSegmented/src/index.tsx
@ -34,19 +34,9 @@ const props = {
    type: Boolean,
    default: false
  },
-  /** 控件尺寸 */
+  /** 控件尺寸	 */
  size: {
    type: String as PropType<"small" | "default" | "large">
-  },
-  /** 是否全局禁用，默认 `false` */
-  disabled: {
-    type: Boolean,
-    default: false
-  },
-  /** 当内容发生变化时，设置 `resize` 可使其自适应容器位置 */
-  resize: {
-    type: Boolean,
-    default: false
  }
 };

@ -67,7 +57,7 @@ export default defineComponent({
      : ref(0);

    function handleChange({ option, index }, event: Event) {
-      if (props.disabled || option.disabled) return;
+      if (option.disabled) return;
      event.preventDefault();
      isNumber(props.modelValue)
        ? emit("update:modelValue", index)
@ -77,7 +67,6 @@ export default defineComponent({
    }

    function handleMouseenter({ option, index }, event: Event) {
-      if (props.disabled) return;
      event.preventDefault();
      curMouseActive.value = index;
      if (option.disabled || curIndex.value === index) {
@ -90,7 +79,6 @@ export default defineComponent({
    }

    function handleMouseleave(_, event: Event) {
-      if (props.disabled) return;
      event.preventDefault();
      curMouseActive.value = -1;
    }
@ -113,7 +101,7 @@ export default defineComponent({
      });
    }

-    (props.block || props.resize) && handleResizeInit();
+    props.block && handleResizeInit();

    watch(
      () => curIndex.value,
@ -127,9 +115,7 @@ export default defineComponent({
      }
    );

-    watch(() => props.size, handleResizeInit, {
-      immediate: true
-    });
+    watch(() => props.size, handleResizeInit);

    const rendLabel = () => {
      return props.options.map((option, index) => {
@ -138,16 +124,14 @@ export default defineComponent({
            ref={`labelRef${index}`}
            class={[
              "pure-segmented-item",
-              (props.disabled || option?.disabled) &&
-                "pure-segmented-item-disabled"
+              option?.disabled && "pure-segmented-item-disabled"
            ]}
            style={{
              background:
                curMouseActive.value === index ? segmentedItembg.value : "",
-              color: props.disabled
-                ? null
-                : !option.disabled &&
-                    (curIndex.value === index || curMouseActive.value === index)
+              color:
+                !option.disabled &&
+                (curIndex.value === index || curMouseActive.value === index)
                  ? isDark.value
                    ? "rgba(255, 255, 255, 0.85)"
                    : "rgba(0,0,0,.88)"
--- a/src/components/ReSegmented/src/type.ts
+++ b/src/components/ReSegmented/src/type.ts
@ -6,7 +6,7 @@ export interface OptionsType {
  label?: string | (() => VNode | Component);
  /**
   * @description 图标，采用平台内置的 `useRenderIcon` 函数渲染
-   * @see {@link 用法参考 https://pure-admin.cn/pages/icon/#%E9%80%9A%E7%94%A8%E5%9B%BE%E6%A0%87-userendericon-hooks }
+   * @see {@link 用法参考 https://yiming_chang.gitee.io/pure-admin-doc/pages/icon/#%E9%80%9A%E7%94%A8%E5%9B%BE%E6%A0%87-userendericon-hooks }
   */
  icon?: string | Component;
  /** 图标属性、样式配置 */
--- a/src/components/ReText/src/index.vue
+++ b/src/components/ReText/src/index.vue
@ -2,10 +2,6 @@
 import { h, onMounted, ref, useSlots } from "vue";
 import { type TippyOptions, useTippy } from "vue-tippy";

-defineOptions({
-  name: "ReText"
-});
-
 const props = defineProps({
  // 行数
  lineClamp: {
--- a/src/config/index.ts
+++ b/src/config/index.ts
@ -35,7 +35,7 @@ export const getPlatformConfig = async (app: App): Promise<undefined> => {
  })
    .then(({ data: config }) => {
      let $config = app.config.globalProperties.$config;
-      // 自动注入系统配置
+      // 自动注入项目配置
      if (app && $config && typeof config === "object") {
        $config = Object.assign($config, config);
        app.config.globalProperties.$config = $config;
--- a/src/directives/auth/index.ts
+++ b/src/directives/auth/index.ts
@ -2,7 +2,7 @@ import { hasAuth } from "@/router/utils";
 import type { Directive, DirectiveBinding } from "vue";

 export const auth: Directive = {
-  mounted(el: HTMLElement, binding: DirectiveBinding<string | Array<string>>) {
+  mounted(el: HTMLElement, binding: DirectiveBinding) {
    const { value } = binding;
    if (value) {
      !hasAuth(value) && el.parentNode?.removeChild(el);
--- a/src/directives/copy/index.ts
+++ b/src/directives/copy/index.ts
@ -3,13 +3,13 @@ import { useEventListener } from "@vueuse/core";
 import { copyTextToClipboard } from "@pureadmin/utils";
 import type { Directive, DirectiveBinding } from "vue";

-export interface CopyEl extends HTMLElement {
+interface CopyEl extends HTMLElement {
  copyValue: string;
 }

 /** 文本复制指令（默认双击复制） */
 export const copy: Directive = {
-  mounted(el: CopyEl, binding: DirectiveBinding<string>) {
+  mounted(el: CopyEl, binding: DirectiveBinding) {
    const { value } = binding;
    if (value) {
      el.copyValue = value;
--- a/src/directives/index.ts
+++ b/src/directives/index.ts
@ -2,5 +2,4 @@ export * from "./auth";
 export * from "./copy";
 export * from "./longpress";
 export * from "./optimize";
-export * from "./perms";
 export * from "./ripple";
--- a/src/directives/longpress/index.ts
+++ b/src/directives/longpress/index.ts
@ -3,7 +3,7 @@ import type { Directive, DirectiveBinding } from "vue";
 import { subBefore, subAfter, isFunction } from "@pureadmin/utils";

 export const longpress: Directive = {
-  mounted(el: HTMLElement, binding: DirectiveBinding<Function>) {
+  mounted(el: HTMLElement, binding: DirectiveBinding) {
    const cb = binding.value;
    if (cb && isFunction(cb)) {
      let timer = null;
--- a/src/directives/optimize/index.ts
+++ b/src/directives/optimize/index.ts
@ -8,22 +8,9 @@ import {
 import { useEventListener } from "@vueuse/core";
 import type { Directive, DirectiveBinding } from "vue";

-export interface OptimizeOptions {
-  /** 事件名 */
-  event: string;
-  /** 事件触发的方法 */
-  fn: (...params: any) => any;
-  /** 是否立即执行 */
-  immediate?: boolean;
-  /** 防抖或节流的延迟时间（防抖默认：`200`毫秒、节流默认：`1000`毫秒） */
-  timeout?: number;
-  /** 传递的参数 */
-  params?: any;
-}
-
 /** 防抖（v-optimize或v-optimize:debounce）、节流（v-optimize:throttle）指令 */
 export const optimize: Directive = {
-  mounted(el: HTMLElement, binding: DirectiveBinding<OptimizeOptions>) {
+  mounted(el: HTMLElement, binding: DirectiveBinding) {
    const { value } = binding;
    const optimizeType = binding.arg ?? "debounce";
    const type = ["debounce", "throttle"].find(t => t === optimizeType);
--- a/src/directives/perms/index.ts
+++ b/src/directives/perms/index.ts
@ -1,15 +0,0 @@
-import { hasPerms } from "@/utils/auth";
-import type { Directive, DirectiveBinding } from "vue";
-
-export const perms: Directive = {
-  mounted(el: HTMLElement, binding: DirectiveBinding<string | Array<string>>) {
-    const { value } = binding;
-    if (value) {
-      !hasPerms(value) && el.parentNode?.removeChild(el);
-    } else {
-      throw new Error(
-        "[Directive: perms]: need perms! Like v-perms=\"['btn.add','btn.edit']\""
-      );
-    }
-  }
-};
--- a/src/directives/ripple/index.ts
+++ b/src/directives/ripple/index.ts
@ -2,10 +2,8 @@ import "./index.scss";
 import { isObject } from "@pureadmin/utils";
 import type { Directive, DirectiveBinding } from "vue";

-export interface RippleOptions {
-  /** 自定义`ripple`颜色，支持`tailwindcss` */
+interface RippleOptions {
  class?: string;
-  /** 是否从中心扩散 */
  center?: boolean;
  circle?: boolean;
 }
@ -222,6 +220,13 @@ function updated(el: HTMLElement, binding: RippleDirectiveBinding) {
  updateRipple(el, binding, wasEnabled);
 }

+/**
+ * @description 指令 v-ripple
+ * @use 用法如下
+ * 1. v-ripple 代表启用基本的 ripple 功能
+ * 2. v-ripple="{ class: 'text-red' }" 代表自定义 ripple 颜色，支持 tailwindcss，生效样式是 color
+ * 3. v-ripple.center 代表从中心扩散
+ */
 export const Ripple: Directive = {
  mounted,
  unmounted,
--- a/src/layout/components/lay-content/index.vue
+++ b/src/layout/components/lay-content/index.vue
@ -1,9 +1,8 @@
 <script setup lang="ts">
-import LayFrame from "../lay-frame/index.vue";
-import LayFooter from "../lay-footer/index.vue";
-import { useTags } from "@/layout/hooks/useTag";
+import Footer from "./footer/index.vue";
 import { useGlobal, isNumber } from "@pureadmin/utils";
-import BackTopIcon from "@/assets/svg/back_top.svg?component";
+import KeepAliveFrame from "./keepAliveFrame/index.vue";
+import backTop from "@/assets/svg/back_top.svg?component";
 import { h, computed, Transition, defineComponent } from "vue";
 import { usePermissionStoreHook } from "@/store/modules/permission";

@ -11,7 +10,6 @@ const props = defineProps({
  fixedHeader: Boolean
 });

-const { showModel } = useTags();
 const { $storage, $config } = useGlobal<GlobalPropertiesApi>();

 const isKeepAlive = computed(() => {
@ -51,17 +49,9 @@ const getMainWidth = computed(() => {
 const getSectionStyle = computed(() => {
  return [
    hideTabs.value && layout ? "padding-top: 48px;" : "",
-    !hideTabs.value && layout
-      ? showModel.value == "chrome"
-        ? "padding-top: 85px;"
-        : "padding-top: 81px;"
-      : "",
+    !hideTabs.value && layout ? "padding-top: 81px;" : "",
    hideTabs.value && !layout.value ? "padding-top: 48px;" : "",
-    !hideTabs.value && !layout.value
-      ? showModel.value == "chrome"
-        ? "padding-top: 85px;"
-        : "padding-top: 81px;"
-      : "",
+    !hideTabs.value && !layout.value ? "padding-top: 81px;" : "",
    props.fixedHeader
      ? ""
      : `padding-top: 0;${
@ -107,15 +97,15 @@ const transitionMain = defineComponent({

 <template>
  <section
-    :class="[fixedHeader ? 'app-main' : 'app-main-nofixed-header']"
+    :class="[props.fixedHeader ? 'app-main' : 'app-main-nofixed-header']"
    :style="getSectionStyle"
  >
    <router-view>
      <template #default="{ Component, route }">
-        <LayFrame :currComp="Component" :currRoute="route">
+        <KeepAliveFrame :currComp="Component" :currRoute="route">
          <template #default="{ Comp, fullPath, frameInfo }">
            <el-scrollbar
-              v-if="fixedHeader"
+              v-if="props.fixedHeader"
              :wrap-style="{
                display: 'flex',
                'flex-wrap': 'wrap',
@ -134,7 +124,7 @@ const transitionMain = defineComponent({
                title="回到顶部"
                target=".app-main .el-scrollbar__wrap"
              >
-                <BackTopIcon />
+                <backTop />
              </el-backtop>
              <div class="grow">
                <transitionMain :route="route">
@ -158,7 +148,7 @@ const transitionMain = defineComponent({
                  />
                </transitionMain>
              </div>
-              <LayFooter v-if="!hideFooter" />
+              <Footer v-if="!hideFooter" />
            </el-scrollbar>
            <div v-else class="grow">
              <transitionMain :route="route">
@ -183,12 +173,12 @@ const transitionMain = defineComponent({
              </transitionMain>
            </div>
          </template>
-        </LayFrame>
+        </KeepAliveFrame>
      </template>
    </router-view>

    <!-- 页脚 -->
-    <LayFooter v-if="!hideFooter && !fixedHeader" />
+    <Footer v-if="!hideFooter && !props.fixedHeader" />
  </section>
 </template>

--- a/src/layout/components/lay-footer/index.vue
+++ b/src/layout/components/lay-footer/index.vue
--- a/src/layout/components/keepAliveFrame/index.vue
+++ b/src/layout/components/keepAliveFrame/index.vue
@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { getConfig } from "@/config";
-import { useMultiFrame } from "@/layout/hooks/useMultiFrame";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
 import { type Component, shallowRef, watch, computed } from "vue";
 import { type RouteRecordRaw, RouteLocationNormalizedLoaded } from "vue-router";
+import { useMultiFrame } from "@/layout/components/keepAliveFrame/useMultiFrame";

 const props = defineProps<{
  currRoute: RouteLocationNormalizedLoaded;
@ -20,7 +20,7 @@ const keep = computed(() => {
    !!props.currRoute.meta?.frameSrc
  );
 });
-// 避免重新渲染 LayFrame
+// 避免重新渲染 frameView
 const normalComp = computed(() => !keep.value && props.currComp);

 watch(useMultiTagsStoreHook().multiTags, (tags: any) => {
@ -65,7 +65,7 @@ watch(
 </script>
 <template>
  <template v-for="[fullPath, Comp] in compList" :key="fullPath">
-    <div v-show="fullPath === currRoute.fullPath" class="w-full h-full">
+    <div v-show="fullPath === props.currRoute.fullPath" class="w-full h-full">
      <slot
        :fullPath="fullPath"
        :Comp="Comp"
@ -74,6 +74,6 @@ watch(
    </div>
  </template>
  <div v-show="!keep" class="w-full h-full">
-    <slot :Comp="normalComp" :fullPath="currRoute.fullPath" frameInfo />
+    <slot :Comp="normalComp" :fullPath="props.currRoute.fullPath" frameInfo />
  </div>
 </template>
--- a/src/layout/components/keepAliveFrame/useMultiFrame.ts
+++ b/src/layout/components/keepAliveFrame/useMultiFrame.ts
--- a/src/layout/components/lay-notice/components/NoticeList.vue
+++ b/src/layout/components/lay-notice/components/NoticeList.vue
@ -1,23 +0,0 @@
-<script setup lang="ts">
-import { PropType } from "vue";
-import { ListItem } from "../data";
-import NoticeItem from "./NoticeItem.vue";
-
-defineProps({
-  list: {
-    type: Array as PropType<Array<ListItem>>,
-    default: () => []
-  },
-  emptyText: {
-    type: String,
-    default: ""
-  }
-});
-</script>
-
-<template>
-  <div v-if="list.length">
-    <NoticeItem v-for="(item, index) in list" :key="index" :noticeItem="item" />
-  </div>
-  <el-empty v-else :description="emptyText" />
-</template>
--- a/src/layout/components/lay-notice/data.ts
+++ b/src/layout/components/lay-notice/data.ts
@ -1,97 +0,0 @@
-export interface ListItem {
-  avatar: string;
-  title: string;
-  datetime: string;
-  type: string;
-  description: string;
-  status?: "primary" | "success" | "warning" | "info" | "danger";
-  extra?: string;
-}
-
-export interface TabItem {
-  key: string;
-  name: string;
-  list: ListItem[];
-  emptyText: string;
-}
-
-export const noticesData: TabItem[] = [
-  {
-    key: "1",
-    name: "通知",
-    list: [],
-    emptyText: "暂无通知"
-  },
-  {
-    key: "2",
-    name: "消息",
-    list: [
-      {
-        avatar: "https://xiaoxian521.github.io/hyperlink/svg/smile1.svg",
-        title: "小铭 评论了你",
-        description: "诚在于心，信在于行，诚信在于心行合一。",
-        datetime: "今天",
-        type: "2"
-      },
-      {
-        avatar: "https://xiaoxian521.github.io/hyperlink/svg/smile2.svg",
-        title: "李白 回复了你",
-        description: "长风破浪会有时，直挂云帆济沧海。",
-        datetime: "昨天",
-        type: "2"
-      },
-      {
-        avatar: "https://xiaoxian521.github.io/hyperlink/svg/smile5.svg",
-        title: "标题",
-        description:
-          "请将鼠标移动到此处，以便测试超长的消息在此处将如何处理。本例中设置的描述最大行数为2，超过2行的描述内容将被省略并且可以通过tooltip查看完整内容",
-        datetime: "时间",
-        type: "2"
-      }
-    ],
-    emptyText: "暂无消息"
-  },
-  {
-    key: "3",
-    name: "待办",
-    list: [
-      {
-        avatar: "",
-        title: "第三方紧急代码变更",
-        description:
-          "小林提交于 2024-05-10，需在 2024-05-11 前完成代码变更任务",
-        datetime: "",
-        extra: "马上到期",
-        status: "danger",
-        type: "3"
-      },
-      {
-        avatar: "",
-        title: "版本发布",
-        description: "指派小铭于 2024-06-18 前完成更新并发布",
-        datetime: "",
-        extra: "已耗时 8 天",
-        status: "warning",
-        type: "3"
-      },
-      {
-        avatar: "",
-        title: "新功能开发",
-        description: "开发多租户管理",
-        datetime: "",
-        extra: "进行中",
-        type: "3"
-      },
-      {
-        avatar: "",
-        title: "任务名称",
-        description: "任务需要在 2030-10-30 10:00 前启动",
-        datetime: "",
-        extra: "未开始",
-        status: "info",
-        type: "3"
-      }
-    ],
-    emptyText: "暂无待办"
-  }
-];
--- a/src/layout/components/lay-tag/components/TagChrome.vue
+++ b/src/layout/components/lay-tag/components/TagChrome.vue
@ -1,33 +0,0 @@
-<template>
-  <svg class="w-full h-full">
-    <defs>
-      <symbol id="geometry-left" viewBox="0 0 214 36">
-        <path d="M17 0h197v36H0v-2c4.5 0 9-3.5 9-8V8c0-4.5 3.5-8 8-8z" />
-      </symbol>
-      <symbol id="geometry-right" viewBox="0 0 214 36">
-        <use xlink:href="#geometry-left" />
-      </symbol>
-      <clipPath>
-        <rect width="100%" height="100%" x="0" />
-      </clipPath>
-    </defs>
-    <svg width="51%" height="100%">
-      <use
-        xlink:href="#geometry-left"
-        width="214"
-        height="36"
-        fill="currentColor"
-      />
-    </svg>
-    <g transform="scale(-1, 1)">
-      <svg width="51%" height="100%" x="-100%" y="0">
-        <use
-          xlink:href="#geometry-right"
-          width="214"
-          height="36"
-          fill="currentColor"
-        />
-      </svg>
-    </g>
-  </svg>
-</template>
--- a/src/layout/components/lay-navbar/index.vue
+++ b/src/layout/components/lay-navbar/index.vue
@ -1,12 +1,11 @@
 <script setup lang="ts">
+import Search from "./search/index.vue";
+import Notice from "./notice/index.vue";
+import mixNav from "./sidebar/mixNav.vue";
 import { useNav } from "@/layout/hooks/useNav";
-import LaySearch from "../lay-search/index.vue";
-import LayNotice from "../lay-notice/index.vue";
-import LayNavMix from "../lay-sidebar/NavMix.vue";
-import LaySidebarFullScreen from "../lay-sidebar/components/SidebarFullScreen.vue";
-import LaySidebarBreadCrumb from "../lay-sidebar/components/SidebarBreadCrumb.vue";
-import LaySidebarTopCollapse from "../lay-sidebar/components/SidebarTopCollapse.vue";
-
+import FullScreen from "./sidebar/fullScreen.vue";
+import Breadcrumb from "./sidebar/breadCrumb.vue";
+import topCollapse from "./sidebar/topCollapse.vue";
 import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
 import Setting from "@iconify-icons/ri/settings-3-line";

@ -25,27 +24,27 @@ const {

 <template>
  <div class="navbar bg-[#fff] shadow-sm shadow-[rgba(0,21,41,0.08)]">
-    <LaySidebarTopCollapse
+    <topCollapse
      v-if="device === 'mobile'"
      class="hamburger-container"
      :is-active="pureApp.sidebar.opened"
      @toggleClick="toggleSideBar"
    />

-    <LaySidebarBreadCrumb
+    <Breadcrumb
      v-if="layout !== 'mix' && device !== 'mobile'"
      class="breadcrumb-container"
    />

-    <LayNavMix v-if="layout === 'mix'" />
+    <mixNav v-if="layout === 'mix'" />

    <div v-if="layout === 'vertical'" class="vertical-header-right">
      <!-- 菜单搜索 -->
-      <LaySearch id="header-search" />
+      <Search id="header-search" />
      <!-- 全屏 -->
-      <LaySidebarFullScreen id="full-screen" />
+      <FullScreen id="full-screen" />
      <!-- 消息通知 -->
-      <LayNotice id="header-notice" />
+      <Notice id="header-notice" />
      <!-- 退出登录 -->
      <el-dropdown trigger="click">
        <span class="el-dropdown-link navbar-bg-hover select-none">
@ -66,7 +65,7 @@ const {
      </el-dropdown>
      <span
        class="set-icon navbar-bg-hover"
-        title="打开系统配置"
+        title="打开项目配置"
        @click="onPanel"
      >
        <IconifyIconOffline :icon="Setting" />
@ -124,7 +123,7 @@ const {
 }

 .logout {
-  width: 120px;
+  max-width: 120px;

  ::v-deep(.el-dropdown-menu__item) {
    display: inline-flex;
--- a/src/layout/components/notice/data.ts
+++ b/src/layout/components/notice/data.ts
@ -0,0 +1,146 @@
+export interface ListItem {
+  avatar: string;
+  title: string;
+  datetime: string;
+  type: string;
+  description: string;
+  status?: "primary" | "success" | "warning" | "info" | "danger";
+  extra?: string;
+}
+
+export interface TabItem {
+  key: string;
+  name: string;
+  list: ListItem[];
+}
+
+export const noticesData: TabItem[] = [
+  {
+    key: "1",
+    name: "通知",
+    list: [
+      {
+        avatar:
+          "https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png",
+        title: "你收到了 12 份新周报",
+        datetime: "一年前",
+        description: "",
+        type: "1"
+      },
+      {
+        avatar:
+          "https://gw.alipayobjects.com/zos/rmsportal/OKJXDXrmkNshAMvwtvhu.png",
+        title: "你推荐的 前端高手 已通过第三轮面试",
+        datetime: "一年前",
+        description: "",
+        type: "1"
+      },
+      {
+        avatar:
+          "https://gw.alipayobjects.com/zos/rmsportal/kISTdvpyTAhtGxpovNWd.png",
+        title: "这种模板可以区分多种通知类型",
+        datetime: "一年前",
+        description: "",
+        type: "1"
+      },
+      {
+        avatar:
+          "https://gw.alipayobjects.com/zos/rmsportal/GvqBnKhFgObvnSGkDsje.png",
+        title:
+          "展示标题内容超过一行后的处理方式，如果内容超过1行将自动截断并支持tooltip显示完整标题。",
+        datetime: "一年前",
+        description: "",
+        type: "1"
+      },
+      {
+        avatar:
+          "https://gw.alipayobjects.com/zos/rmsportal/GvqBnKhFgObvnSGkDsje.png",
+        title: "左侧图标用于区分不同的类型",
+        datetime: "一年前",
+        description: "",
+        type: "1"
+      },
+      {
+        avatar:
+          "https://gw.alipayobjects.com/zos/rmsportal/GvqBnKhFgObvnSGkDsje.png",
+        title: "左侧图标用于区分不同的类型",
+        datetime: "一年前",
+        description: "",
+        type: "1"
+      }
+    ]
+  },
+  {
+    key: "2",
+    name: "消息",
+    list: [
+      {
+        avatar:
+          "https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg",
+        title: "李白 评论了你",
+        description: "长风破浪会有时,直挂云帆济沧海",
+        datetime: "一年前",
+        type: "2"
+      },
+      {
+        avatar:
+          "https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg",
+        title: "李白 回复了你",
+        description: "行路难，行路难，多歧路，今安在。",
+        datetime: "一年前",
+        type: "2"
+      },
+      {
+        avatar:
+          "https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg",
+        title: "标题",
+        description:
+          "请将鼠标移动到此处，以便测试超长的消息在此处将如何处理。本例中设置的描述最大行数为2，超过2行的描述内容将被省略并且可以通过tooltip查看完整内容",
+        datetime: "一年前",
+        type: "2"
+      }
+    ]
+  },
+  {
+    key: "3",
+    name: "待办",
+    list: [
+      {
+        avatar: "",
+        title: "任务名称",
+        description: "任务需要在 2022-11-16 20:00 前启动",
+        datetime: "",
+        extra: "未开始",
+        status: "info",
+        type: "3"
+      },
+      {
+        avatar: "",
+        title: "第三方紧急代码变更",
+        description:
+          "一拳提交于 2022-11-16，需在 2022-11-18 前完成代码变更任务",
+        datetime: "",
+        extra: "马上到期",
+        status: "danger",
+        type: "3"
+      },
+      {
+        avatar: "",
+        title: "信息安全考试",
+        description: "指派小仙于 2022-12-12 前完成更新并发布",
+        datetime: "",
+        extra: "已耗时 8 天",
+        status: "warning",
+        type: "3"
+      },
+      {
+        avatar: "",
+        title: "vue-pure-admin 版本发布",
+        description: "vue-pure-admin 版本发布",
+        datetime: "",
+        extra: "进行中",
+        type: "3"
+      }
+    ]
+  }
+];
--- a/src/layout/components/lay-notice/index.vue
+++ b/src/layout/components/lay-notice/index.vue
@ -1,34 +1,22 @@
 <script setup lang="ts">
-import { ref, computed } from "vue";
+import { ref } from "vue";
 import { noticesData } from "./data";
-import NoticeList from "./components/NoticeList.vue";
-import BellIcon from "@iconify-icons/ep/bell";
+import NoticeList from "./noticeList.vue";
+import Bell from "@iconify-icons/ep/bell";

 const noticesNum = ref(0);
 const notices = ref(noticesData);
-const activeKey = ref(noticesData[0]?.key);
+const activeKey = ref(noticesData[0].key);

 notices.value.map(v => (noticesNum.value += v.list.length));
-
-const getLabel = computed(
-  () => item =>
-    item.name + (item.list.length > 0 ? `(${item.list.length})` : "")
-);
 </script>

 <template>
  <el-dropdown trigger="click" placement="bottom-end">
-    <span
-      :class="[
-        'dropdown-badge',
-        'navbar-bg-hover',
-        'select-none',
-        Number(noticesNum) !== 0 && 'mr-[10px]'
-      ]"
-    >
-      <el-badge :value="Number(noticesNum) === 0 ? '' : noticesNum" :max="99">
+    <span class="dropdown-badge navbar-bg-hover select-none">
+      <el-badge :value="noticesNum" :max="99">
        <span class="header-notice-icon">
-          <IconifyIconOffline :icon="BellIcon" />
+          <IconifyIconOffline :icon="Bell" />
        </span>
      </el-badge>
    </span>
@ -47,10 +35,13 @@ const getLabel = computed(
          />
          <span v-else>
            <template v-for="item in notices" :key="item.key">
-              <el-tab-pane :label="getLabel(item)" :name="`${item.key}`">
+              <el-tab-pane
+                :label="`${item.name}(${item.list.length})`"
+                :name="`${item.key}`"
+              >
                <el-scrollbar max-height="330px">
                  <div class="noticeList-container">
-                    <NoticeList :list="item.list" :emptyText="item.emptyText" />
+                    <NoticeList :list="item.list" />
                  </div>
                </el-scrollbar>
              </el-tab-pane>
@ -69,6 +60,7 @@ const getLabel = computed(
  justify-content: center;
  width: 40px;
  height: 48px;
+  margin-right: 10px;
  cursor: pointer;

  .header-notice-icon {
--- a/src/layout/components/lay-notice/components/NoticeItem.vue
+++ b/src/layout/components/lay-notice/components/NoticeItem.vue
@ -1,10 +1,10 @@
 <script setup lang="ts">
-import { ListItem } from "../data";
+import { ListItem } from "./data";
 import { ref, PropType, nextTick } from "vue";
 import { useNav } from "@/layout/hooks/useNav";
 import { deviceDetection } from "@pureadmin/utils";

-defineProps({
+const props = defineProps({
  noticeItem: {
    type: Object as PropType<ListItem>,
    default: () => {}
@ -52,9 +52,9 @@ function hoverDescription(event, description) {
    class="notice-container border-b-[1px] border-solid border-[#f0f0f0] dark:border-[#303030]"
  >
    <el-avatar
-      v-if="noticeItem.avatar"
+      v-if="props.noticeItem.avatar"
      :size="30"
-      :src="noticeItem.avatar"
+      :src="props.noticeItem.avatar"
      class="notice-container-avatar"
    />
    <div class="notice-container-text">
@ -63,7 +63,7 @@ function hoverDescription(event, description) {
          popper-class="notice-title-popper"
          :effect="tooltipEffect"
          :disabled="!titleTooltip"
-          :content="noticeItem.title"
+          :content="props.noticeItem.title"
          placement="top-start"
          :enterable="!isMobile"
        >
@ -72,16 +72,16 @@ function hoverDescription(event, description) {
            class="notice-title-content"
            @mouseover="hoverTitle"
          >
-            {{ noticeItem.title }}
+            {{ props.noticeItem.title }}
          </div>
        </el-tooltip>
        <el-tag
-          v-if="noticeItem?.extra"
-          :type="noticeItem?.status"
+          v-if="props.noticeItem?.extra"
+          :type="props.noticeItem?.status"
          size="small"
          class="notice-title-extra"
        >
-          {{ noticeItem?.extra }}
+          {{ props.noticeItem?.extra }}
        </el-tag>
      </div>

@ -89,19 +89,19 @@ function hoverDescription(event, description) {
        popper-class="notice-title-popper"
        :effect="tooltipEffect"
        :disabled="!descriptionTooltip"
-        :content="noticeItem.description"
+        :content="props.noticeItem.description"
        placement="top-start"
      >
        <div
          ref="descriptionRef"
          class="notice-text-description"
-          @mouseover="hoverDescription($event, noticeItem.description)"
+          @mouseover="hoverDescription($event, props.noticeItem.description)"
        >
-          {{ noticeItem.description }}
+          {{ props.noticeItem.description }}
        </div>
      </el-tooltip>
      <div class="notice-text-datetime text-[#00000073] dark:text-white">
-        {{ noticeItem.datetime }}
+        {{ props.noticeItem.datetime }}
      </div>
    </div>
  </div>
--- a/src/layout/components/notice/noticeList.vue
+++ b/src/layout/components/notice/noticeList.vue
@ -0,0 +1,23 @@
+<script setup lang="ts">
+import { PropType } from "vue";
+import { ListItem } from "./data";
+import NoticeItem from "./noticeItem.vue";
+
+const props = defineProps({
+  list: {
+    type: Array as PropType<Array<ListItem>>,
+    default: () => []
+  }
+});
+</script>
+
+<template>
+  <div v-if="props.list.length">
+    <NoticeItem
+      v-for="(item, index) in props.list"
+      :key="index"
+      :noticeItem="item"
+    />
+  </div>
+  <el-empty v-else description="暂无消息" />
+</template>
--- a/src/layout/components/lay-panel/index.vue
+++ b/src/layout/components/lay-panel/index.vue
@ -3,7 +3,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 Close from "@iconify-icons/ep/close";

 const target = ref(null);
 const show = ref<Boolean>(false);
@ -51,7 +51,7 @@ onBeforeUnmount(() => {
      <div
        class="project-configuration border-b-[1px] border-solid border-[var(--pure-border-color)]"
      >
-        <h4 class="dark:text-white">系统配置</h4>
+        <h4 class="dark:text-white">项目配置</h4>
        <span
          v-tippy="{
            content: '关闭配置',
@ -64,7 +64,7 @@ onBeforeUnmount(() => {
            class="dark:text-white"
            width="18px"
            height="18px"
-            :icon="CloseIcon"
+            :icon="Close"
            @click="show = !show"
          />
        </span>
--- a/src/layout/components/lay-search/components/SearchFooter.vue
+++ b/src/layout/components/lay-search/components/SearchFooter.vue
@ -1,11 +1,11 @@
 <script setup lang="ts">
 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 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 ArrowDownLine from "@iconify-icons/ri/arrow-down-line";

-withDefaults(defineProps<{ total: number }>(), {
+const props = withDefaults(defineProps<{ total: number }>(), {
  total: 0
 });

@ -15,7 +15,7 @@ const { device } = useNav();
 <template>
  <div class="search-footer text-[#333] dark:text-white">
    <span class="search-footer-item">
-      <EnterOutlined class="icon" />
+      <enterOutlined class="icon" />
      确认
    </span>
    <span class="search-footer-item">
@ -24,11 +24,14 @@ const { device } = useNav();
      切换
    </span>
    <span class="search-footer-item">
-      <MdiKeyboardEsc class="icon" />
+      <mdiKeyboardEsc class="icon" />
      关闭
    </span>
-    <p v-if="device !== 'mobile' && total > 0" class="search-footer-total">
-      {{ `共 ${total} 项` }}
+    <p
+      v-if="device !== 'mobile' && props.total > 0"
+      class="search-footer-total"
+    >
+      共{{ props.total }}项
    </p>
  </div>
 </template>
--- a/src/layout/components/lay-search/components/SearchHistory.vue
+++ b/src/layout/components/lay-search/components/SearchHistory.vue
@ -160,7 +160,7 @@ defineExpose({ handleScroll });
    </template>
    <template v-if="collectList.length">
      <div :style="titleStyle">
-        {{ `收藏${collectList.length > 1 ? "（可拖拽排序）" : ""}` }}
+        收藏{{ collectList.length > 1 ? "（可拖拽排序）" : "" }}
      </div>
      <div class="collect-container">
        <div
--- a/src/layout/components/lay-search/components/SearchHistoryItem.vue
+++ b/src/layout/components/lay-search/components/SearchHistoryItem.vue
@ -1,8 +1,8 @@
 <script setup lang="ts">
 import type { optionsItem } from "../types";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
-import StarIcon from "@iconify-icons/ep/star";
-import CloseIcon from "@iconify-icons/ep/close";
+import Star from "@iconify-icons/ep/star";
+import Close from "@iconify-icons/ep/close";

 interface Props {
  item: optionsItem;
@ -32,12 +32,12 @@ function handleDelete(item) {
  </span>
  <IconifyIconOffline
    v-show="item.type === 'history'"
-    :icon="StarIcon"
+    :icon="Star"
    class="w-[18px] h-[18px] mr-2 hover:text-[#d7d5d4]"
    @click.stop="handleCollect(item)"
  />
  <IconifyIconOffline
-    :icon="CloseIcon"
+    :icon="Close"
    class="w-[18px] h-[18px] hover:text-[#d7d5d4] cursor-pointer"
    @click.stop="handleDelete(item)"
  />
--- a/src/layout/components/lay-search/components/SearchModal.vue
+++ b/src/layout/components/lay-search/components/SearchModal.vue
@ -11,7 +11,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 "@iconify-icons/ri/search-line";
+import Search from "@iconify-icons/ri/search-line";

 interface Props {
  /** 弹窗显隐 */
@ -294,7 +294,7 @@ onKeyStroke("ArrowDown", handleDown);
    >
      <template #prefix>
        <IconifyIconOffline
-          :icon="SearchIcon"
+          :icon="Search"
          class="text-primary w-[24px] h-[24px]"
        />
      </template>
--- a/src/layout/components/lay-search/components/SearchResult.vue
+++ b/src/layout/components/lay-search/components/SearchResult.vue
@ -4,7 +4,7 @@ import { useResizeObserver } from "@pureadmin/utils";
 import { useEpThemeStoreHook } from "@/store/modules/epTheme";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import { ref, computed, getCurrentInstance, onMounted } from "vue";
-import EnterOutlined from "@/assets/svg/enter_outlined.svg?component";
+import enterOutlined from "@/assets/svg/enter_outlined.svg?component";

 interface Emits {
  (e: "update:value", val: string): void;
@ -83,7 +83,7 @@ defineExpose({ handleScroll });
      <span class="result-item-title">
        {{ item.meta?.title }}
      </span>
-      <EnterOutlined />
+      <enterOutlined />
    </div>
  </div>
 </template>
--- a/src/layout/components/search/components/index.ts
+++ b/src/layout/components/search/components/index.ts
@ -0,0 +1,3 @@
+import SearchModal from "./SearchModal.vue";
+
+export { SearchModal };
--- a/src/layout/components/lay-search/index.vue
+++ b/src/layout/components/lay-search/index.vue
@ -1,6 +1,6 @@
 <script setup lang="ts">
+import { SearchModal } from "./components";
 import { useBoolean } from "../../hooks/useBoolean";
-import SearchModal from "./components/SearchModal.vue";

 const { bool: show, toggle } = useBoolean();
 function handleSearch() {
--- a/src/layout/components/lay-search/types.ts
+++ b/src/layout/components/lay-search/types.ts
--- a/src/layout/components/lay-setting/index.vue
+++ b/src/layout/components/lay-setting/index.vue
@ -9,10 +9,11 @@ import {
  onUnmounted,
  onBeforeMount
 } from "vue";
+import panel from "../panel/index.vue";
 import { emitter } from "@/utils/mitt";
-import LayPanel from "../lay-panel/index.vue";
 import { useNav } from "@/layout/hooks/useNav";
 import { useAppStoreHook } from "@/store/modules/app";
+import { toggleTheme } from "@pureadmin/theme/dist/browser-utils";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
 import Segmented, { type OptionsType } from "@/components/ReSegmented";
 import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
@ -21,9 +22,9 @@ import { useDark, useGlobal, debounce, isNumber } from "@pureadmin/utils";
 import Check from "@iconify-icons/ep/check";
 import LeftArrow from "@iconify-icons/ri/arrow-left-s-line";
 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";
+import dayIcon from "@/assets/svg/day.svg?component";
+import darkIcon from "@/assets/svg/dark.svg?component";
+import systemIcon from "@/assets/svg/system.svg?component";

 const { device } = useNav();
 const { isDark } = useDark();
@ -47,7 +48,9 @@ const {
 if (unref(layoutTheme)) {
  const layout = unref(layoutTheme).layout;
  const theme = unref(layoutTheme).theme;
-  document.documentElement.setAttribute("data-theme", theme);
+  toggleTheme({
+    scopeName: `layout-theme-${theme}`
+  });
  setLayoutModel(layout);
 }

@ -142,20 +145,18 @@ function setFalse(Doms): any {
 }

 /** 页宽 */
-const stretchTypeOptions = computed<Array<OptionsType>>(() => {
-  return [
-    {
-      label: "固定",
-      tip: "紧凑页面，轻松找到所需信息",
-      value: "fixed"
-    },
-    {
-      label: "自定义",
-      tip: "最小1280、最大1600",
-      value: "custom"
-    }
-  ];
-});
+const stretchTypeOptions: Array<OptionsType> = [
+  {
+    label: "固定",
+    tip: "紧凑页面，轻松找到所需信息",
+    value: "fixed"
+  },
+  {
+    label: "自定义",
+    tip: "最小1280、最大1600",
+    value: "custom"
+  }
+];

 const setStretch = value => {
  settings.stretch = value;
@ -194,21 +195,21 @@ const themeOptions = computed<Array<OptionsType>>(() => {
  return [
    {
      label: "浅色",
-      icon: DayIcon,
+      icon: dayIcon,
      theme: "light",
      tip: "清新启航，点亮舒适的工作界面",
      iconAttrs: { fill: isDark.value ? "#fff" : "#000" }
    },
    {
      label: "深色",
-      icon: DarkIcon,
+      icon: darkIcon,
      theme: "dark",
      tip: "月光序曲，沉醉于夜的静谧雅致",
      iconAttrs: { fill: isDark.value ? "#fff" : "#000" }
    },
    {
      label: "自动",
-      icon: SystemIcon,
+      icon: systemIcon,
      theme: "system",
      tip: "同步时光，界面随晨昏自然呼应",
      iconAttrs: { fill: isDark.value ? "#fff" : "#000" }
@ -216,25 +217,18 @@ const themeOptions = computed<Array<OptionsType>>(() => {
  ];
 });

-const markOptions = computed<Array<OptionsType>>(() => {
-  return [
-    {
-      label: "灵动",
-      tip: "灵动标签，添趣生辉",
-      value: "smart"
-    },
-    {
-      label: "卡片",
-      tip: "卡片标签，高效浏览",
-      value: "card"
-    },
-    {
-      label: "谷歌",
-      tip: "谷歌风格，经典美观",
-      value: "chrome"
-    }
-  ];
-});
+const markOptions: Array<OptionsType> = [
+  {
+    label: "灵动",
+    tip: "灵动标签，添趣生辉",
+    value: "smart"
+  },
+  {
+    label: "卡片",
+    tip: "卡片标签，高效浏览",
+    value: "card"
+  }
+];

 /** 设置导航模式 */
 function setLayoutModel(layout: string) {
@ -297,7 +291,7 @@ function watchSystemThemeChange() {
 }

 onBeforeMount(() => {
-  /* 初始化系统配置 */
+  /* 初始化项目配置 */
  nextTick(() => {
    watchSystemThemeChange();
    settings.greyVal &&
@ -313,11 +307,10 @@ onUnmounted(() => removeMatchMedia);
 </script>

 <template>
-  <LayPanel>
+  <panel>
    <div class="p-5">
      <p :class="pClass">整体风格</p>
      <Segmented
-        resize
        class="select-none"
        :modelValue="overallStyle === 'system' ? 2 : dataTheme ? 1 : 0"
        :options="themeOptions"
@ -397,7 +390,6 @@ onUnmounted(() => removeMatchMedia);
      <span v-if="useAppStoreHook().getViewportWidth > 1280">
        <p :class="['mt-5', pClass]">页宽</p>
        <Segmented
-          resize
          class="mb-2 select-none"
          :modelValue="isNumber(settings.stretch) ? 1 : 0"
          :options="stretchTypeOptions"
@ -440,9 +432,8 @@ onUnmounted(() => removeMatchMedia);

      <p :class="['mt-4', pClass]">页签风格</p>
      <Segmented
-        resize
        class="select-none"
-        :modelValue="markValue === 'smart' ? 0 : markValue === 'card' ? 1 : 2"
+        :modelValue="markValue === 'smart' ? 0 : 1"
        :options="markOptions"
        @change="onChange"
      />
@ -513,7 +504,7 @@ onUnmounted(() => removeMatchMedia);
        </li>
      </ul>
    </div>
-  </LayPanel>
+  </panel>
 </template>

 <style lang="scss" scoped>
--- a/src/layout/components/lay-sidebar/components/SidebarBreadCrumb.vue
+++ b/src/layout/components/lay-sidebar/components/SidebarBreadCrumb.vue
--- a/src/layout/components/lay-sidebar/components/SidebarCenterCollapse.vue
+++ b/src/layout/components/lay-sidebar/components/SidebarCenterCollapse.vue
@ -9,7 +9,7 @@ interface Props {
  isActive: boolean;
 }

-withDefaults(defineProps<Props>(), {
+const props = withDefaults(defineProps<Props>(), {
  isActive: false
 });

@ -34,7 +34,7 @@ const toggleClick = () => {
 <template>
  <div
    v-tippy="{
-      content: isActive ? '点击折叠' : '点击展开',
+      content: props.isActive ? '点击折叠' : '点击展开',
      theme: tooltipEffect,
      hideOnClick: 'toggle',
      placement: 'right'
@ -45,7 +45,7 @@ const toggleClick = () => {
    <IconifyIconOffline
      :icon="ArrowLeft"
      :class="[iconClass, themeColor === 'light' ? '' : 'text-primary']"
-      :style="{ transform: isActive ? 'none' : 'rotateY(180deg)' }"
+      :style="{ transform: props.isActive ? 'none' : 'rotateY(180deg)' }"
    />
  </div>
 </template>
--- a/src/layout/components/lay-sidebar/components/SidebarExtraIcon.vue
+++ b/src/layout/components/lay-sidebar/components/SidebarExtraIcon.vue
@ -2,7 +2,7 @@
 import { toRaw } from "vue";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";

-defineProps({
+const props = defineProps({
  extraIcon: {
    type: String,
    default: ""
@ -11,9 +11,9 @@ defineProps({
 </script>

 <template>
-  <div v-if="extraIcon" class="flex justify-center items-center">
+  <div v-if="props.extraIcon" class="flex justify-center items-center">
    <component
-      :is="useRenderIcon(toRaw(extraIcon))"
+      :is="useRenderIcon(toRaw(props.extraIcon))"
      class="w-[30px] h-[30px]"
    />
  </div>
--- a/src/layout/components/lay-sidebar/components/SidebarFullScreen.vue
+++ b/src/layout/components/lay-sidebar/components/SidebarFullScreen.vue
--- a/src/layout/components/lay-sidebar/NavHorizontal.vue
+++ b/src/layout/components/lay-sidebar/NavHorizontal.vue
@ -1,34 +1,26 @@
 <script setup lang="ts">
-import { emitter } from "@/utils/mitt";
+import Search from "../search/index.vue";
+import Notice from "../notice/index.vue";
+import FullScreen from "./fullScreen.vue";
+import SidebarItem from "./sidebarItem.vue";
+import { isAllEmpty } from "@pureadmin/utils";
+import { ref, nextTick, computed } from "vue";
 import { useNav } from "@/layout/hooks/useNav";
-import LaySearch from "../lay-search/index.vue";
-import LayNotice from "../lay-notice/index.vue";
-import { responsiveStorageNameSpace } from "@/config";
-import { ref, nextTick, computed, onMounted } from "vue";
-import { storageLocal, isAllEmpty } from "@pureadmin/utils";
 import { usePermissionStoreHook } from "@/store/modules/permission";
-import LaySidebarItem from "../lay-sidebar/components/SidebarItem.vue";
-import LaySidebarFullScreen from "../lay-sidebar/components/SidebarFullScreen.vue";
-
 import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
 import Setting from "@iconify-icons/ri/settings-3-line";

 const menuRef = ref();
-const showLogo = ref(
-  storageLocal().getItem<StorageConfigs>(
-    `${responsiveStorageNameSpace()}configure`
-  )?.showLogo ?? true
-);

 const {
  route,
  title,
  logout,
+  backTopMenu,
  onPanel,
  getLogo,
  username,
  userAvatar,
-  backTopMenu,
  avatarsStyle
 } = useNav();

@ -39,12 +31,6 @@ const defaultActive = computed(() =>
 nextTick(() => {
  menuRef.value?.handleResize();
 });
-
-onMounted(() => {
-  emitter.on("logoChange", key => {
-    showLogo.value = key;
-  });
-});
 </script>

 <template>
@ -52,18 +38,19 @@ onMounted(() => {
    v-loading="usePermissionStoreHook().wholeMenus.length === 0"
    class="horizontal-header"
  >
-    <div v-if="showLogo" class="horizontal-header-left" @click="backTopMenu">
+    <div class="horizontal-header-left" @click="backTopMenu">
      <img :src="getLogo()" alt="logo" />
      <span>{{ title }}</span>
    </div>
    <el-menu
      ref="menuRef"
+      router
      mode="horizontal"
      popper-class="pure-scrollbar"
      class="horizontal-header-menu"
      :default-active="defaultActive"
    >
-      <LaySidebarItem
+      <sidebar-item
        v-for="route in usePermissionStoreHook().wholeMenus"
        :key="route.path"
        :item="route"
@ -72,11 +59,11 @@ onMounted(() => {
    </el-menu>
    <div class="horizontal-header-right">
      <!-- 菜单搜索 -->
-      <LaySearch id="header-search" />
+      <Search id="header-search" />
      <!-- 全屏 -->
-      <LaySidebarFullScreen id="full-screen" />
+      <FullScreen id="full-screen" />
      <!-- 消息通知 -->
-      <LayNotice id="header-notice" />
+      <Notice id="header-notice" />
      <!-- 退出登录 -->
      <el-dropdown trigger="click">
        <span class="el-dropdown-link navbar-bg-hover">
@ -97,7 +84,7 @@ onMounted(() => {
      </el-dropdown>
      <span
        class="set-icon navbar-bg-hover"
-        title="打开系统配置"
+        title="打开项目配置"
        @click="onPanel"
      >
        <IconifyIconOffline :icon="Setting" />
@ -112,7 +99,7 @@ onMounted(() => {
 }

 .logout {
-  width: 120px;
+  max-width: 120px;

  ::v-deep(.el-dropdown-menu__item) {
    display: inline-flex;
--- a/src/layout/components/lay-sidebar/components/SidebarLeftCollapse.vue
+++ b/src/layout/components/lay-sidebar/components/SidebarLeftCollapse.vue
@ -9,7 +9,7 @@ interface Props {
  isActive: boolean;
 }

-withDefaults(defineProps<Props>(), {
+const props = withDefaults(defineProps<Props>(), {
  isActive: false
 });

@ -44,14 +44,14 @@ const toggleClick = () => {
  <div class="left-collapse">
    <IconifyIconOffline
      v-tippy="{
-        content: isActive ? '点击折叠' : '点击展开',
+        content: props.isActive ? '点击折叠' : '点击展开',
        theme: tooltipEffect,
        hideOnClick: 'toggle',
        placement: 'right'
      }"
      :icon="MenuFold"
      :class="[iconClass, themeColor === 'light' ? '' : 'text-primary']"
-      :style="{ transform: isActive ? 'none' : 'rotateY(180deg)' }"
+      :style="{ transform: props.isActive ? 'none' : 'rotateY(180deg)' }"
      @click="toggleClick"
    />
  </div>
--- a/src/layout/components/lay-sidebar/components/SidebarLinkItem.vue
+++ b/src/layout/components/lay-sidebar/components/SidebarLinkItem.vue
@ -3,6 +3,10 @@ import { computed } from "vue";
 import { isUrl } from "@pureadmin/utils";
 import { menuType } from "@/layout/types";

+defineOptions({
+  name: "LinkItem"
+});
+
 const props = defineProps<{
  to: menuType;
 }>();
--- a/src/layout/components/lay-sidebar/components/SidebarLogo.vue
+++ b/src/layout/components/lay-sidebar/components/SidebarLogo.vue
@ -2,7 +2,7 @@
 import { getTopMenu } from "@/router/utils";
 import { useNav } from "@/layout/hooks/useNav";

-defineProps({
+const props = defineProps({
  collapse: Boolean
 });

@ -10,11 +10,11 @@ const { title, getLogo } = useNav();
 </script>

 <template>
-  <div class="sidebar-logo-container" :class="{ collapses: collapse }">
+  <div class="sidebar-logo-container" :class="{ collapses: props.collapse }">
    <transition name="sidebarLogoFade">
      <router-link
-        v-if="collapse"
-        key="collapse"
+        v-if="props.collapse"
+        key="props.collapse"
        :title="title"
        class="sidebar-logo-link"
        :to="getTopMenu()?.path ?? '/'"
@ -63,7 +63,7 @@ const { title, getLogo } = useNav();
      font-size: 18px;
      font-weight: 600;
      line-height: 32px;
-      color: var(--pure-theme-sub-menu-active-text);
+      color: $subMenuActiveText;
      text-overflow: ellipsis;
      white-space: nowrap;
    }
--- a/src/layout/components/lay-sidebar/NavMix.vue
+++ b/src/layout/components/lay-sidebar/NavMix.vue
@ -1,15 +1,14 @@
 <script setup lang="ts">
+import extraIcon from "./extraIcon.vue";
+import Search from "../search/index.vue";
+import Notice from "../notice/index.vue";
+import FullScreen from "./fullScreen.vue";
 import { isAllEmpty } from "@pureadmin/utils";
 import { useNav } from "@/layout/hooks/useNav";
-import LaySearch from "../lay-search/index.vue";
-import LayNotice from "../lay-notice/index.vue";
 import { ref, toRaw, watch, onMounted, nextTick } from "vue";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import { getParentPaths, findRouteByPath } from "@/router/utils";
 import { usePermissionStoreHook } from "@/store/modules/permission";
-import LaySidebarExtraIcon from "../lay-sidebar/components/SidebarExtraIcon.vue";
-import LaySidebarFullScreen from "../lay-sidebar/components/SidebarFullScreen.vue";
-
 import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
 import Setting from "@iconify-icons/ri/settings-3-line";

@ -85,18 +84,18 @@ watch(
            <span class="select-none">
              {{ route.meta.title }}
            </span>
-            <LaySidebarExtraIcon :extraIcon="route.meta.extraIcon" />
+            <extraIcon :extraIcon="route.meta.extraIcon" />
          </div>
        </template>
      </el-menu-item>
    </el-menu>
    <div class="horizontal-header-right">
      <!-- 菜单搜索 -->
-      <LaySearch id="header-search" />
+      <Search id="header-search" />
      <!-- 全屏 -->
-      <LaySidebarFullScreen id="full-screen" />
+      <FullScreen id="full-screen" />
      <!-- 消息通知 -->
-      <LayNotice id="header-notice" />
+      <Notice id="header-notice" />
      <!-- 退出登录 -->
      <el-dropdown trigger="click">
        <span class="el-dropdown-link navbar-bg-hover select-none">
@ -117,7 +116,7 @@ watch(
      </el-dropdown>
      <span
        class="set-icon navbar-bg-hover"
-        title="打开系统配置"
+        title="打开项目配置"
        @click="onPanel"
      >
        <IconifyIconOffline :icon="Setting" />
@ -132,7 +131,7 @@ watch(
 }

 .logout {
-  width: 120px;
+  max-width: 120px;

  ::v-deep(.el-dropdown-menu__item) {
    display: inline-flex;
--- a/src/layout/components/lay-sidebar/components/SidebarItem.vue
+++ b/src/layout/components/lay-sidebar/components/SidebarItem.vue
@ -1,11 +1,11 @@
 <script setup lang="ts">
+import path from "path";
 import { getConfig } from "@/config";
-import { posix } from "path-browserify";
-import { menuType } from "@/layout/types";
+import LinkItem from "./linkItem.vue";
+import { menuType } from "../../types";
+import extraIcon from "./extraIcon.vue";
 import { ReText } from "@/components/ReText";
 import { useNav } from "@/layout/hooks/useNav";
-import SidebarLinkItem from "./SidebarLinkItem.vue";
-import SidebarExtraIcon from "./SidebarExtraIcon.vue";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import {
  type PropType,
@ -98,15 +98,16 @@ function resolvePath(routePath) {
  if (httpReg.test(routePath) || httpReg.test(props.basePath)) {
    return routePath || props.basePath;
  } else {
-    return posix.resolve(props.basePath, routePath);
+    // 使用path.posix.resolve替代path.resolve 避免windows环境下使用electron出现盘符问题
+    return path.posix.resolve(props.basePath, routePath);
  }
 }
 </script>

 <template>
-  <SidebarLinkItem
+  <link-item
    v-if="
-      hasOneShowingChild(item.children, item) &&
+      hasOneShowingChild(props.item.children, props.item) &&
      (!onlyOneChild.children || onlyOneChild.noShowingChildren)
    "
    :to="item"
@ -118,7 +119,7 @@ function resolvePath(routePath) {
      v-bind="attrs"
    >
      <div
-        v-if="toRaw(item.meta.icon)"
+        v-if="toRaw(props.item.meta.icon)"
        class="sub-menu-icon"
        :style="getSubMenuIconStyle"
      >
@ -126,24 +127,24 @@ function resolvePath(routePath) {
          :is="
            useRenderIcon(
              toRaw(onlyOneChild.meta.icon) ||
-                (item.meta && toRaw(item.meta.icon))
+                (props.item.meta && toRaw(props.item.meta.icon))
            )
          "
        />
      </div>
      <el-text
        v-if="
-          (!item?.meta.icon &&
+          (!props.item?.meta.icon &&
            isCollapse &&
            layout === 'vertical' &&
-            item?.pathList?.length === 1) ||
+            props.item?.pathList?.length === 1) ||
          (!onlyOneChild.meta.icon &&
            isCollapse &&
            layout === 'mix' &&
-            item?.pathList?.length === 2)
+            props.item?.pathList?.length === 2)
        "
        truncated
-        class="!w-full !pl-4 !text-inherit"
+        class="!px-4 !text-inherit"
      >
        {{ onlyOneChild.meta.title }}
      </el-text>
@ -155,62 +156,61 @@ function resolvePath(routePath) {
              offset: [0, -10],
              theme: tooltipEffect
            }"
-            class="!w-full !text-inherit"
+            class="!text-inherit"
          >
            {{ onlyOneChild.meta.title }}
          </ReText>
-          <SidebarExtraIcon :extraIcon="onlyOneChild.meta.extraIcon" />
+          <extraIcon :extraIcon="onlyOneChild.meta.extraIcon" />
        </div>
      </template>
    </el-menu-item>
-  </SidebarLinkItem>
+  </link-item>
  <el-sub-menu
    v-else
    ref="subMenu"
    teleported
-    :index="resolvePath(item.path)"
+    :index="resolvePath(props.item.path)"
    v-bind="expandCloseIcon"
  >
    <template #title>
      <div
-        v-if="toRaw(item.meta.icon)"
+        v-if="toRaw(props.item.meta.icon)"
        :style="getSubMenuIconStyle"
        class="sub-menu-icon"
      >
-        <component :is="useRenderIcon(item.meta && toRaw(item.meta.icon))" />
+        <component
+          :is="useRenderIcon(props.item.meta && toRaw(props.item.meta.icon))"
+        />
      </div>
      <ReText
        v-if="
-          layout === 'mix' && toRaw(item.meta.icon)
-            ? !isCollapse || item?.pathList?.length !== 2
-            : !(
-                layout === 'vertical' &&
-                isCollapse &&
-                toRaw(item.meta.icon) &&
-                item.parentId === null
-              )
+          !(
+            layout === 'vertical' &&
+            isCollapse &&
+            toRaw(props.item.meta.icon) &&
+            props.item.parentId === null
+          )
        "
        :tippyProps="{
          offset: [0, -10],
          theme: tooltipEffect
        }"
        :class="{
-          '!w-full': true,
          '!text-inherit': true,
-          '!pl-4':
+          '!px-4':
            layout !== 'horizontal' &&
            isCollapse &&
-            !toRaw(item.meta.icon) &&
-            item.parentId === null
+            !toRaw(props.item.meta.icon) &&
+            props.item.parentId === null
        }"
      >
-        {{ item.meta.title }}
+        {{ props.item.meta.title }}
      </ReText>
-      <SidebarExtraIcon v-if="!isCollapse" :extraIcon="item.meta.extraIcon" />
+      <extraIcon v-if="!isCollapse" :extraIcon="props.item.meta.extraIcon" />
    </template>

    <sidebar-item
-      v-for="child in item.children"
+      v-for="child in props.item.children"
      :key="child.path"
      :is-nest="true"
      :item="child"
--- a/src/layout/components/lay-sidebar/components/SidebarTopCollapse.vue
+++ b/src/layout/components/lay-sidebar/components/SidebarTopCollapse.vue
@ -6,7 +6,7 @@ interface Props {
  isActive: boolean;
 }

-withDefaults(defineProps<Props>(), {
+const props = withDefaults(defineProps<Props>(), {
  isActive: false
 });

@ -22,11 +22,11 @@ const toggleClick = () => {
 <template>
  <div
    class="px-3 mr-1 navbar-bg-hover"
-    :title="isActive ? '点击折叠' : '点击展开'"
+    :title="props.isActive ? '点击折叠' : '点击展开'"
    @click="toggleClick"
  >
    <IconifyIconOffline
-      :icon="isActive ? MenuFold : MenuUnfold"
+      :icon="props.isActive ? MenuFold : MenuUnfold"
      class="inline-block align-middle hover:text-primary dark:hover:!text-white"
    />
  </div>
--- a/src/layout/components/lay-sidebar/NavVertical.vue
+++ b/src/layout/components/lay-sidebar/NavVertical.vue
@ -1,16 +1,16 @@
 <script setup lang="ts">
+import Logo from "./logo.vue";
 import { useRoute } from "vue-router";
 import { emitter } from "@/utils/mitt";
+import SidebarItem from "./sidebarItem.vue";
+import LeftCollapse from "./leftCollapse.vue";
 import { useNav } from "@/layout/hooks/useNav";
+import CenterCollapse from "./centerCollapse.vue";
 import { responsiveStorageNameSpace } from "@/config";
 import { storageLocal, isAllEmpty } from "@pureadmin/utils";
 import { findRouteByPath, getParentPaths } from "@/router/utils";
 import { usePermissionStoreHook } from "@/store/modules/permission";
 import { ref, computed, watch, onMounted, onBeforeUnmount } from "vue";
-import LaySidebarLogo from "../lay-sidebar/components/SidebarLogo.vue";
-import LaySidebarItem from "../lay-sidebar/components/SidebarItem.vue";
-import LaySidebarLeftCollapse from "../lay-sidebar/components/SidebarLeftCollapse.vue";
-import LaySidebarCenterCollapse from "../lay-sidebar/components/SidebarCenterCollapse.vue";

 const route = useRoute();
 const isShow = ref(false);
@ -93,12 +93,13 @@ onBeforeUnmount(() => {
    @mouseenter.prevent="isShow = true"
    @mouseleave.prevent="isShow = false"
  >
-    <LaySidebarLogo v-if="showLogo" :collapse="isCollapse" />
+    <Logo v-if="showLogo" :collapse="isCollapse" />
    <el-scrollbar
      wrap-class="scrollbar-wrapper"
      :class="[device === 'mobile' ? 'mobile' : 'pc']"
    >
      <el-menu
+        router
        unique-opened
        mode="vertical"
        popper-class="pure-scrollbar"
@ -108,7 +109,7 @@ onBeforeUnmount(() => {
        :popper-effect="tooltipEffect"
        :default-active="defaultActive"
      >
-        <LaySidebarItem
+        <sidebar-item
          v-for="routes in menuData"
          :key="routes.path"
          :item="routes"
@ -117,12 +118,12 @@ onBeforeUnmount(() => {
        />
      </el-menu>
    </el-scrollbar>
-    <LaySidebarCenterCollapse
+    <CenterCollapse
      v-if="device !== 'mobile' && (isShow || isCollapse)"
      :is-active="pureApp.sidebar.opened"
      @toggleClick="toggleSideBar"
    />
-    <LaySidebarLeftCollapse
+    <LeftCollapse
      v-if="device !== 'mobile'"
      :is-active="pureApp.sidebar.opened"
      @toggleClick="toggleSideBar"
--- a/src/layout/components/lay-tag/index.scss
+++ b/src/layout/components/lay-tag/index.scss
@ -41,13 +41,6 @@
      padding-right: 24px;
    }

-    &.chrome-item {
-      padding-right: 0;
-      padding-left: 0;
-      margin-right: -18px;
-      box-shadow: none;
-    }
-
    .el-icon-close {
      position: absolute;
      top: 50%;
@ -83,14 +76,6 @@
    overflow: hidden;
    white-space: nowrap;

-    &.chrome-scroll-container {
-      padding-top: 4px;
-
-      .fixed-tag {
-        padding: 0 !important;
-      }
-    }
-
    .tab {
      position: relative;
      float: left;
@ -104,16 +89,6 @@
        &:nth-child(1) {
          padding: 0 12px;
        }
-
-        &.chrome-item {
-          &:nth-child(1) {
-            padding: 0;
-          }
-        }
-      }
-
-      .fixed-tag {
-        padding: 0 12px;
      }
    }
  }
@ -194,29 +169,9 @@
  color: #fff;
  box-shadow: 0 0 0.7px #888;

-  .chrome-tab {
-    z-index: 10;
-  }
-
-  .chrome-tab__bg {
-    color: var(--el-color-primary-light-9) !important;
-  }
-
  .tag-title {
    color: var(--el-color-primary) !important;
  }
-
-  .chrome-close-btn {
-    color: var(--el-color-primary);
-
-    &:hover {
-      background-color: var(--el-color-primary);
-    }
-  }
-
-  .chrome-tab-divider {
-    opacity: 0;
-  }
 }

 .arrow-left,
@ -303,69 +258,3 @@
  background: var(--el-color-primary);
  animation: schedule-out-width 200ms ease-in;
 }
-
-/* 谷歌风格的页签 */
-.chrome-tab {
-  position: relative;
-  display: inline-flex;
-  gap: 16px;
-  align-items: center;
-  justify-content: center;
-  padding: 0 24px;
-  white-space: nowrap;
-  cursor: pointer;
-
-  .tag-title {
-    padding: 0;
-  }
-
-  .chrome-tab-divider {
-    position: absolute;
-    right: 7px;
-    width: 1px;
-    height: 14px;
-    background-color: #2b2d2f;
-  }
-
-  &:hover {
-    z-index: 10;
-
-    .chrome-tab__bg {
-      color: #dee1e6;
-    }
-
-    .tag-title {
-      color: #1f1f1f;
-    }
-
-    .chrome-tab-divider {
-      opacity: 0;
-    }
-  }
-
-  .chrome-tab__bg {
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: -10;
-    width: 100%;
-    height: 100%;
-    color: transparent;
-    pointer-events: none;
-  }
-
-  .chrome-close-btn {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    width: 16px;
-    height: 16px;
-    color: #666;
-    border-radius: 50%;
-
-    &:hover {
-      color: white;
-      background-color: #b1b3b8;
-    }
-  }
-}
--- a/src/layout/components/lay-tag/index.vue
+++ b/src/layout/components/lay-tag/index.vue
@ -4,11 +4,9 @@ import { RouteConfigs } from "../../types";
 import { useTags } from "../../hooks/useTag";
 import { routerArrays } from "@/layout/types";
 import { onClickOutside } from "@vueuse/core";
-import TagChrome from "./components/TagChrome.vue";
 import { handleAliveRoute, getTopMenu } from "@/router/utils";
 import { useSettingStoreHook } from "@/store/modules/settings";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
-import { usePermissionStoreHook } from "@/store/modules/permission";
 import { ref, watch, unref, toRaw, nextTick, onBeforeUnmount } from "vue";
 import {
  delay,
@ -36,7 +34,6 @@ const {
  buttonLeft,
  showModel,
  translateX,
-  isFixedTag,
  pureSetting,
  activeIndex,
  getTabStyle,
@ -60,10 +57,6 @@ const contextmenuRef = ref();
 const isShowArrow = ref(false);
 const topPath = getTopMenu()?.path;
 const { VITE_HIDE_HOME } = import.meta.env;
-const fixedTags = [
-  ...routerArrays,
-  ...usePermissionStoreHook().flatteningRoutes.filter(v => v?.meta?.fixedTag)
-];

 const dynamicTagView = async () => {
  await nextTick();
@ -233,13 +226,10 @@ function deleteDynamicTag(obj: any, current: any, tag?: string) {
    other?: boolean
  ): void => {
    if (other) {
-      useMultiTagsStoreHook().handleTags(
-        "equal",
-        [
-          VITE_HIDE_HOME === "false" ? fixedTags : toRaw(getTopMenu()),
-          obj
-        ].flat()
-      );
+      useMultiTagsStoreHook().handleTags("equal", [
+        VITE_HIDE_HOME === "false" ? routerArrays[0] : toRaw(getTopMenu()),
+        obj
+      ]);
    } else {
      useMultiTagsStoreHook().handleTags("splice", "", {
        startIndex,
@ -252,7 +242,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(1, valueIndex - 1);
  } else if (tag === "right") {
    spliceRoute(valueIndex + 1, multiTags.value.length);
  } else {
@ -329,11 +319,10 @@ function onClickDrop(key, item, selectRoute?: RouteConfigs) {
    case 5:
      // 关闭全部标签页
      useMultiTagsStoreHook().handleTags("splice", "", {
-        startIndex: fixedTags.length,
+        startIndex: 1,
        length: multiTags.value.length
      });
      router.push(topPath);
-      // router.push(fixedTags[fixedTags.length - 1]?.path);
      handleAliveRoute(route as ToRouteType);
      break;
    case 6:
@ -372,14 +361,10 @@ function showMenus(value: boolean) {
  });
 }

-function disabledMenus(value: boolean, fixedTag = false) {
+function disabledMenus(value: boolean) {
  Array.of(1, 2, 3, 4, 5).forEach(v => {
    tagsViews[v].disabled = value;
  });
-  if (fixedTag) {
-    tagsViews[2].show = false;
-    tagsViews[2].disabled = true;
-  }
 }

 /** 检查当前右键的菜单两边是否存在别的菜单，如果左侧的菜单是顶级菜单，则不显示关闭左侧标签页，如果右侧没有菜单，则不显示关闭右侧标签页 */
@ -396,13 +381,6 @@ function showMenuModel(
  } else {
    currentIndex = allRoute.findIndex(v => isEqual(v.query, query));
  }
-  function fixedTagDisabled() {
-    if (allRoute[currentIndex]?.meta?.fixedTag) {
-      Array.of(1, 2, 3, 4, 5).forEach(v => {
-        tagsViews[v].disabled = true;
-      });
-    }
-  }

  showMenus(true);

@ -421,7 +399,6 @@ function showMenuModel(
      tagsViews[v].disabled = false;
    });
    tagsViews[2].disabled = true;
-    fixedTagDisabled();
  } else if (currentIndex === 1 && routeLength === 2) {
    disabledMenus(false);
    // 左侧的菜单是顶级菜单，右侧不存在别的菜单
@ -429,7 +406,6 @@ function showMenuModel(
      tagsViews[v].show = false;
      tagsViews[v].disabled = true;
    });
-    fixedTagDisabled();
  } else if (routeLength - 1 === currentIndex && currentIndex !== 0) {
    // 当前路由是所有路由中的最后一个
    tagsViews[3].show = false;
@ -437,31 +413,29 @@ function showMenuModel(
      tagsViews[v].disabled = false;
    });
    tagsViews[3].disabled = true;
-    if (allRoute[currentIndex - 1]?.meta?.fixedTag) {
-      tagsViews[2].show = false;
-      tagsViews[2].disabled = true;
-    }
-    fixedTagDisabled();
  } else if (currentIndex === 0 || currentPath === `/redirect${topPath}`) {
    // 当前路由为顶级菜单
    disabledMenus(true);
  } else {
-    disabledMenus(false, allRoute[currentIndex - 1]?.meta?.fixedTag);
-    fixedTagDisabled();
+    disabledMenus(false);
  }
 }

 function openMenu(tag, e) {
  closeMenu();
-  if (tag.path === topPath || tag?.meta?.fixedTag) {
-    // 右键菜单为顶级菜单或拥有 fixedTag 属性，只显示刷新
+  if (tag.path === topPath) {
+    // 右键菜单为顶级菜单，只显示刷新
    showMenus(false);
    tagsViews[0].show = true;
  } else if (route.path !== tag.path && route.name !== tag.name) {
    // 右键菜单不匹配当前路由，隐藏刷新
    tagsViews[0].show = false;
    showMenuModel(tag.path, tag.query);
-  } else if (multiTags.value.length === 2 && route.path !== tag.path) {
+  } else if (
+    // eslint-disable-next-line no-dupe-else-if
+    multiTags.value.length === 2 &&
+    route.path !== tag.path
+  ) {
    showMenus(true);
    // 只有两个标签时不显示关闭其他标签页
    tagsViews[4].show = false;
@ -509,6 +483,7 @@ function tagOnClick(item) {
  } else {
    router.push({ path });
  }
+  // showMenuModel(item?.path, item?.query);
 }

 onClickOutside(contextmenuRef, closeMenu, {
@ -565,7 +540,6 @@ onBeforeUnmount(() => {
    <div
      ref="scrollbarDom"
      class="scroll-container"
-      :class="showModel === 'chrome' && 'chrome-scroll-container'"
      @wheel.prevent="handleWheel"
    >
      <div ref="tabDom" class="tab select-none" :style="getTabStyle">
@ -573,57 +547,32 @@ onBeforeUnmount(() => {
          v-for="(item, index) in multiTags"
          :ref="'dynamic' + index"
          :key="index"
-          :class="[
-            'scroll-item is-closable',
-            linkIsActive(item),
-            showModel === 'chrome' && 'chrome-item',
-            isFixedTag(item) && 'fixed-tag'
-          ]"
+          :class="['scroll-item is-closable', linkIsActive(item)]"
          @contextmenu.prevent="openMenu(item, $event)"
          @mouseenter.prevent="onMouseenter(index)"
          @mouseleave.prevent="onMouseleave(index)"
          @click="tagOnClick(item)"
        >
-          <template v-if="showModel !== 'chrome'">
-            <span
-              class="tag-title dark:!text-text_color_primary dark:hover:!text-primary"
-            >
-              {{ item.meta.title }}
-            </span>
-            <span
-              v-if="
-                isFixedTag(item)
-                  ? false
-                  : iconIsActive(item, index) ||
-                    (index === activeIndex && index !== 0)
-              "
-              class="el-icon-close"
-              @click.stop="deleteMenu(item)"
-            >
-              <IconifyIconOffline :icon="Close" />
-            </span>
-            <span
-              v-if="showModel !== 'card'"
-              :ref="'schedule' + index"
-              :class="[scheduleIsActive(item)]"
-            />
-          </template>
-          <div v-else class="chrome-tab">
-            <div class="chrome-tab__bg">
-              <TagChrome />
-            </div>
-            <span class="tag-title">
-              {{ item.meta.title }}
-            </span>
-            <span
-              v-if="isFixedTag(item) ? false : index !== 0"
-              class="chrome-close-btn"
-              @click.stop="deleteMenu(item)"
-            >
-              <IconifyIconOffline :icon="Close" />
-            </span>
-            <span class="chrome-tab-divider" />
-          </div>
+          <span
+            class="tag-title dark:!text-text_color_primary dark:hover:!text-primary"
+          >
+            {{ item.meta.title }}
+          </span>
+          <span
+            v-if="
+              iconIsActive(item, index) ||
+              (index === activeIndex && index !== 0)
+            "
+            class="el-icon-close"
+            @click.stop="deleteMenu(item)"
+          >
+            <IconifyIconOffline :icon="Close" />
+          </span>
+          <span
+            v-if="showModel !== 'card'"
+            :ref="'schedule' + index"
+            :class="[scheduleIsActive(item)]"
+          />
        </div>
      </div>
    </div>
--- a/src/layout/frameView.vue
+++ b/src/layout/frameView.vue
@ -3,7 +3,7 @@ import { useRoute } from "vue-router";
 import { ref, unref, watch, onMounted, nextTick } from "vue";

 defineOptions({
-  name: "LayFrame"
+  name: "FrameView"
 });

 const props = defineProps<{
--- a/src/layout/hooks/useDataThemeChange.ts
+++ b/src/layout/hooks/useDataThemeChange.ts
@ -6,9 +6,14 @@ import { routerArrays } from "@/layout/types";
 import { router, resetRouter } from "@/router";
 import type { themeColorsType } from "../types";
 import { useAppStoreHook } from "@/store/modules/app";
+import { useGlobal, storageLocal } from "@pureadmin/utils";
 import { useEpThemeStoreHook } from "@/store/modules/epTheme";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
-import { darken, lighten, useGlobal, storageLocal } from "@pureadmin/utils";
+import {
+  darken,
+  lighten,
+  toggleTheme
+} from "@pureadmin/theme/dist/browser-utils";

 export function useDataThemeChange() {
  const { layoutTheme, layout } = useLayout();
@ -49,7 +54,9 @@ export function useDataThemeChange() {
    isClick = true
  ) {
    layoutTheme.value.theme = theme;
-    document.documentElement.setAttribute("data-theme", theme);
+    toggleTheme({
+      scopeName: `layout-theme-${theme}`
+    });
    // 如果非isClick，保留之前的themeColor
    const storageThemeColor = $storage.layout.themeColor;
    $storage.layout = {
--- a/src/layout/hooks/useNav.ts
+++ b/src/layout/hooks/useNav.ts
@ -1,22 +1,21 @@
 import { storeToRefs } from "pinia";
 import { getConfig } from "@/config";
 import { emitter } from "@/utils/mitt";
-import Avatar from "@/assets/user.jpg";
+import userAvatar from "@/assets/user.jpg";
 import { getTopMenu } from "@/router/utils";
 import { useFullscreen } from "@vueuse/core";
+import { useGlobal } from "@pureadmin/utils";
 import type { routeMetaType } from "../types";
 import { useRouter, useRoute } from "vue-router";
 import { router, remainingPaths } from "@/router";
 import { computed, type CSSProperties } from "vue";
 import { useAppStoreHook } from "@/store/modules/app";
 import { useUserStoreHook } from "@/store/modules/user";
-import { useGlobal, isAllEmpty } from "@pureadmin/utils";
 import { usePermissionStoreHook } from "@/store/modules/permission";
 import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
 import Fullscreen from "@iconify-icons/ri/fullscreen-fill";

-const errorInfo =
-  "The current routing configuration is incorrect, please check the configuration";
+const errorInfo = "当前路由配置不正确，请检查配置";

 export function useNav() {
  const route = useRoute();
@ -37,18 +36,9 @@ export function useNav() {
    };
  });

-  /** 头像（如果头像为空则使用 src/assets/user.jpg ） */
-  const userAvatar = computed(() => {
-    return isAllEmpty(useUserStoreHook()?.avatar)
-      ? Avatar
-      : useUserStoreHook()?.avatar;
-  });
-
-  /** 昵称（如果昵称为空则显示用户名） */
+  /** 用户名 */
  const username = computed(() => {
-    return isAllEmpty(useUserStoreHook()?.nickname)
-      ? useUserStoreHook()?.username
-      : useUserStoreHook()?.nickname;
+    return useUserStoreHook()?.username;
  });

  const avatarsStyle = computed(() => {
--- a/src/layout/hooks/useTag.ts
+++ b/src/layout/hooks/useTag.ts
@ -124,12 +124,6 @@ export function useTags() {
    }
  }

-  const isFixedTag = computed(() => {
-    return item => {
-      return isBoolean(item?.meta?.fixedTag) && item?.meta?.fixedTag === true;
-    };
-  });
-
  const iconIsActive = computed(() => {
    return (item, index) => {
      if (index === 0) return;
@ -226,7 +220,6 @@ export function useTags() {
    buttonTop,
    buttonLeft,
    translateX,
-    isFixedTag,
    pureSetting,
    activeIndex,
    getTabStyle,
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@ -23,13 +23,13 @@ import {
  useResizeObserver
 } from "@pureadmin/utils";

-import LayTag from "./components/lay-tag/index.vue";
-import LayNavbar from "./components/lay-navbar/index.vue";
-import LayContent from "./components/lay-content/index.vue";
-import LaySetting from "./components/lay-setting/index.vue";
-import NavVertical from "./components/lay-sidebar/NavVertical.vue";
-import NavHorizontal from "./components/lay-sidebar/NavHorizontal.vue";
-import BackTopIcon from "@/assets/svg/back_top.svg?component";
+import navbar from "./components/navbar.vue";
+import tag from "./components/tag/index.vue";
+import appMain from "./components/appMain.vue";
+import setting from "./components/setting/index.vue";
+import Vertical from "./components/sidebar/vertical.vue";
+import Horizontal from "./components/sidebar/horizontal.vue";
+import backTop from "@/assets/svg/back_top.svg?component";

 const appWrapperRef = ref();
 const { isDark } = useDark();
@ -124,8 +124,7 @@ onBeforeMount(() => {
  useDataThemeChange().dataThemeChange($storage.layout?.overallStyle);
 });

-const LayHeader = defineComponent({
-  name: "LayHeader",
+const layoutHeader = defineComponent({
  render() {
    return h(
      "div",
@ -143,12 +142,12 @@ const LayHeader = defineComponent({
        default: () => [
          !pureSetting.hiddenSideBar &&
          (layout.value.includes("vertical") || layout.value.includes("mix"))
-            ? h(LayNavbar)
+            ? h(navbar)
            : null,
          !pureSetting.hiddenSideBar && layout.value.includes("horizontal")
-            ? h(NavHorizontal)
+            ? h(Horizontal)
            : null,
-          h(LayTag)
+          h(tag)
        ]
      }
    );
@ -167,7 +166,7 @@ const LayHeader = defineComponent({
      class="app-mask"
      @click="useAppStoreHook().toggleSideBar()"
    />
-    <NavVertical
+    <Vertical
      v-show="
        !pureSetting.hiddenSideBar &&
        (layout.includes('vertical') || layout.includes('mix'))
@ -180,24 +179,24 @@ const LayHeader = defineComponent({
      ]"
    >
      <div v-if="set.fixedHeader">
-        <LayHeader />
+        <layout-header />
        <!-- 主体内容 -->
-        <LayContent :fixed-header="set.fixedHeader" />
+        <app-main :fixed-header="set.fixedHeader" />
      </div>
      <el-scrollbar v-else>
        <el-backtop
          title="回到顶部"
          target=".main-container .el-scrollbar__wrap"
        >
-          <BackTopIcon />
+          <backTop />
        </el-backtop>
-        <LayHeader />
+        <layout-header />
        <!-- 主体内容 -->
-        <LayContent :fixed-header="set.fixedHeader" />
+        <app-main :fixed-header="set.fixedHeader" />
      </el-scrollbar>
    </div>
    <!-- 系统设置 -->
-    <LaySetting />
+    <setting />
  </div>
 </template>

@ -222,7 +221,7 @@ const LayHeader = defineComponent({
 .app-mask {
  position: absolute;
  top: 0;
-  z-index: 2001;
+  z-index: 999;
  width: 100%;
  height: 100%;
  background: #000;
--- a/src/layout/theme/index.ts
+++ b/src/layout/theme/index.ts
@ -0,0 +1,129 @@
+/**
+ * @description ⚠️：此文件仅供主题插件使用，请不要在此文件中导出别的工具函数（仅在页面加载前运行）
+ */
+
+import type { multipleScopeVarsOptions } from "@pureadmin/theme";
+
+/** 预设主题色 */
+const themeColors = {
+  /* 亮白色 */
+  light: {
+    subMenuActiveText: "#000000d9",
+    menuBg: "#fff",
+    menuHover: "#f6f6f6",
+    subMenuBg: "#fff",
+    subMenuActiveBg: "#e0ebf6",
+    menuText: "rgb(0 0 0 / 60%)",
+    sidebarLogo: "#fff",
+    menuTitleHover: "#000",
+    menuActiveBefore: "#4091f7"
+  },
+  /* 道奇蓝 */
+  default: {
+    subMenuActiveText: "#fff",
+    menuBg: "#001529",
+    menuHover: "rgb(64 145 247 / 15%)",
+    subMenuBg: "#0f0303",
+    subMenuActiveBg: "#4091f7",
+    menuText: "rgb(254 254 254 / 65%)",
+    sidebarLogo: "#002140",
+    menuTitleHover: "#fff",
+    menuActiveBefore: "#4091f7"
+  },
+  /* 深紫罗兰色 */
+  saucePurple: {
+    subMenuActiveText: "#fff",
+    menuBg: "#130824",
+    menuHover: "rgb(105 58 201 / 15%)",
+    subMenuBg: "#000",
+    subMenuActiveBg: "#693ac9",
+    menuText: "#7a80b4",
+    sidebarLogo: "#1f0c38",
+    menuTitleHover: "#fff",
+    menuActiveBefore: "#693ac9"
+  },
+  /* 深粉色 */
+  pink: {
+    subMenuActiveText: "#fff",
+    menuBg: "#28081a",
+    menuHover: "rgb(216 68 147 / 15%)",
+    subMenuBg: "#000",
+    subMenuActiveBg: "#d84493",
+    menuText: "#7a80b4",
+    sidebarLogo: "#3f0d29",
+    menuTitleHover: "#fff",
+    menuActiveBefore: "#d84493"
+  },
+  /* 猩红色 */
+  dusk: {
+    subMenuActiveText: "#fff",
+    menuBg: "#2a0608",
+    menuHover: "rgb(225 60 57 / 15%)",
+    subMenuBg: "#000",
+    subMenuActiveBg: "#e13c39",
+    menuText: "rgb(254 254 254 / 65.1%)",
+    sidebarLogo: "#42090c",
+    menuTitleHover: "#fff",
+    menuActiveBefore: "#e13c39"
+  },
+  /* 橙红色 */
+  volcano: {
+    subMenuActiveText: "#fff",
+    menuBg: "#2b0e05",
+    menuHover: "rgb(232 95 51 / 15%)",
+    subMenuBg: "#0f0603",
+    subMenuActiveBg: "#e85f33",
+    menuText: "rgb(254 254 254 / 65%)",
+    sidebarLogo: "#441708",
+    menuTitleHover: "#fff",
+    menuActiveBefore: "#e85f33"
+  },
+  /* 绿宝石 */
+  mingQing: {
+    subMenuActiveText: "#fff",
+    menuBg: "#032121",
+    menuHover: "rgb(89 191 193 / 15%)",
+    subMenuBg: "#000",
+    subMenuActiveBg: "#59bfc1",
+    menuText: "#7a80b4",
+    sidebarLogo: "#053434",
+    menuTitleHover: "#fff",
+    menuActiveBefore: "#59bfc1"
+  },
+  /* 酸橙绿 */
+  auroraGreen: {
+    subMenuActiveText: "#fff",
+    menuBg: "#0b1e15",
+    menuHover: "rgb(96 172 128 / 15%)",
+    subMenuBg: "#000",
+    subMenuActiveBg: "#60ac80",
+    menuText: "#7a80b4",
+    sidebarLogo: "#112f21",
+    menuTitleHover: "#fff",
+    menuActiveBefore: "#60ac80"
+  }
+};
+
+/**
+ * @description 将预设主题色处理成主题插件所需格式
+ */
+export const genScssMultipleScopeVars = (): multipleScopeVarsOptions[] => {
+  const result = [] as multipleScopeVarsOptions[];
+  Object.keys(themeColors).forEach(key => {
+    result.push({
+      scopeName: `layout-theme-${key}`,
+      varsContent: `
+        $subMenuActiveText: ${themeColors[key].subMenuActiveText} !default;
+        $menuBg: ${themeColors[key].menuBg} !default;
+        $menuHover: ${themeColors[key].menuHover} !default;
+        $subMenuBg: ${themeColors[key].subMenuBg} !default;
+        $subMenuActiveBg: ${themeColors[key].subMenuActiveBg} !default;
+        $menuText: ${themeColors[key].menuText} !default;
+        $sidebarLogo: ${themeColors[key].sidebarLogo} !default;
+        $menuTitleHover: ${themeColors[key].menuTitleHover} !default;
+        $menuActiveBefore: ${themeColors[key].menuActiveBefore} !default;
+      `
+    } as multipleScopeVarsOptions);
+  });
+  return result;
+};
--- a/src/main.ts
+++ b/src/main.ts
@ -42,9 +42,7 @@ app.component("FontIcon", FontIcon);

 // 全局注册按钮级别权限组件
 import { Auth } from "@/components/ReAuth";
-import { Perms } from "@/components/RePerms";
 app.component("Auth", Auth);
-app.component("Perms", Perms);

 // 全局注册vue-tippy
 import "tippy.js/dist/tippy.css";
--- a/src/plugins/elementPlus.ts
+++ b/src/plugins/elementPlus.ts
@ -107,7 +107,6 @@ import {
  ElWatermark,
  ElTour,
  ElTourStep,
-  ElSegmented,
  /**
   * 为了方便演示平台将 element-plus 导出的所有插件引入，实际使用中如果你没用到哪个插件，将其注释掉就行
   * 导出来源：https://github.com/element-plus/element-plus/blob/dev/packages/element-plus/plugin.ts#L11-L16
@ -222,8 +221,7 @@ const components = [
  ElUpload,
  ElWatermark,
  ElTour,
-  ElTourStep,
-  ElSegmented
+  ElTourStep
 ];

 const plugins = [
--- a/src/router/utils.ts
+++ b/src/router/utils.ts
@ -17,12 +17,12 @@ import {
  isIncludeAllChildren
 } from "@pureadmin/utils";
 import { getConfig } from "@/config";
+import type { menuType } from "@/layout/types";
 import { buildHierarchyTree } from "@/utils/tree";
 import { userKey, type DataInfo } from "@/utils/auth";
-import { type menuType, routerArrays } from "@/layout/types";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
 import { usePermissionStoreHook } from "@/store/modules/permission";
-const IFrame = () => import("@/layout/frame.vue");
+const IFrame = () => import("@/layout/frameView.vue");
 // https://cn.vitejs.dev/guide/features.html#glob-import
 const modulesRoutes = import.meta.glob("/src/views/**/*.{vue,tsx}");

@ -81,7 +81,7 @@ function isOneOfArray(a: Array<string>, b: Array<string>) {
    : true;
 }

-/** 从localStorage里取出当前登录用户的角色roles，过滤无权限的菜单 */
+/** 从localStorage里取出当前登陆用户的角色roles，过滤无权限的菜单 */
 function filterNoPermissionTree(data: RouteComponent[]) {
  const currentRoles =
    storageLocal().getItem<DataInfo<number>>(userKey)?.roles ?? [];
@ -178,14 +178,6 @@ function handleAsyncRoutes(routeList) {
    );
    usePermissionStoreHook().handleWholeMenus(routeList);
  }
-  if (!useMultiTagsStoreHook().getMultiTagsCache) {
-    useMultiTagsStoreHook().handleTags("equal", [
-      ...routerArrays,
-      ...usePermissionStoreHook().flatteningRoutes.filter(
-        v => v?.meta?.fixedTag
-      )
-    ]);
-  }
  addPathMatch();
 }

@ -355,7 +347,7 @@ function getAuths(): Array<string> {
  return router.currentRoute.value.meta.auths as Array<string>;
 }

-/** 是否有按钮级别的权限（根据路由`meta`中的`auths`字段进行判断）*/
+/** 是否有按钮级别的权限 */
 function hasAuth(value: string | Array<string>): boolean {
  if (!value) return false;
  /** 从当前路由的`meta`字段里获取按钮级别的所有自定义`code`值 */
@ -367,23 +359,9 @@ function hasAuth(value: string | Array<string>): boolean {
  return isAuths ? true : false;
 }

-function handleTopMenu(route) {
-  if (route?.children && route.children.length > 1) {
-    if (route.redirect) {
-      return route.children.filter(cur => cur.path === route.redirect)[0];
-    } else {
-      return route.children[0];
-    }
-  } else {
-    return route;
-  }
-}
-
 /** 获取所有菜单中的第一个菜单（顶级菜单）*/
 function getTopMenu(tag = false): menuType {
-  const topMenu = handleTopMenu(
-    usePermissionStoreHook().wholeMenus[0]?.children[0]
-  );
+  const topMenu = usePermissionStoreHook().wholeMenus[0]?.children[0];
  tag && useMultiTagsStoreHook().handleTags("push", topMenu);
  return topMenu;
 }
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@ -1,12 +1,8 @@
+import { store } from "@/store";
 import { defineStore } from "pinia";
-import {
-  type appType,
-  store,
-  getConfig,
-  storageLocal,
-  deviceDetection,
-  responsiveStorageNameSpace
-} from "../utils";
+import type { appType } from "./types";
+import { getConfig, responsiveStorageNameSpace } from "@/config";
+import { deviceDetection, storageLocal } from "@pureadmin/utils";

 export const useAppStore = defineStore({
  id: "pure-app",
--- a/src/store/modules/epTheme.ts
+++ b/src/store/modules/epTheme.ts
@ -1,10 +1,7 @@
+import { store } from "@/store";
 import { defineStore } from "pinia";
-import {
-  store,
-  getConfig,
-  storageLocal,
-  responsiveStorageNameSpace
-} from "../utils";
+import { storageLocal } from "@pureadmin/utils";
+import { getConfig, responsiveStorageNameSpace } from "@/config";

 export const useEpThemeStore = defineStore({
  id: "pure-epTheme",
--- a/src/store/modules/multiTags.ts
+++ b/src/store/modules/multiTags.ts
@ -1,18 +1,9 @@
 import { defineStore } from "pinia";
-import {
-  type multiType,
-  type positionType,
-  store,
-  isUrl,
-  isEqual,
-  isNumber,
-  isBoolean,
-  getConfig,
-  routerArrays,
-  storageLocal,
-  responsiveStorageNameSpace
-} from "../utils";
-import { usePermissionStoreHook } from "./permission";
+import { store } from "@/store";
+import { routerArrays } from "@/layout/types";
+import { responsiveStorageNameSpace } from "@/config";
+import type { multiType, positionType } from "./types";
+import { isEqual, isBoolean, isUrl, storageLocal } from "@pureadmin/utils";

 export const useMultiTagsStore = defineStore({
  id: "pure-multiTags",
@ -24,12 +15,7 @@ export const useMultiTagsStore = defineStore({
      ? storageLocal().getItem<StorageConfigs>(
          `${responsiveStorageNameSpace()}tags`
        )
-      : [
-          ...routerArrays,
-          ...usePermissionStoreHook().flatteningRoutes.filter(
-            v => v?.meta?.fixedTag
-          )
-        ],
+      : [...routerArrays],
    multiTagsCache: storageLocal().getItem<StorageConfigs>(
      `${responsiveStorageNameSpace()}configure`
    )?.multiTagsCache
@ -114,14 +100,6 @@ export const useMultiTagsStore = defineStore({
            }
            this.multiTags.push(value);
            this.tagsCache(this.multiTags);
-            if (
-              getConfig()?.MaxTagsLevel &&
-              isNumber(getConfig().MaxTagsLevel)
-            ) {
-              if (this.multiTags.length > getConfig().MaxTagsLevel) {
-                this.multiTags.splice(1, 1);
-              }
-            }
          }
          break;
        case "splice":
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@ -1,16 +1,10 @@
 import { defineStore } from "pinia";
-import {
-  type cacheType,
-  store,
-  debounce,
-  ascending,
-  getKeyList,
-  filterTree,
-  constantMenus,
-  filterNoPermissionTree,
-  formatFlatteningRoutes
-} from "../utils";
+import { store } from "@/store";
+import type { cacheType } from "./types";
+import { constantMenus } from "@/router";
 import { useMultiTagsStoreHook } from "./multiTags";
+import { debounce, getKeyList } from "@pureadmin/utils";
+import { ascending, filterTree, filterNoPermissionTree } from "@/router/utils";

 export const usePermissionStore = defineStore({
  id: "pure-permission",
@ -19,8 +13,6 @@ export const usePermissionStore = defineStore({
    constantMenus,
    // 整体路由生成的菜单（静态、动态）
    wholeMenus: [],
-    // 整体路由（一维数组格式）
-    flatteningRoutes: [],
    // 缓存页面keepAlive
    cachePageList: []
  }),
@ -30,9 +22,6 @@ export const usePermissionStore = defineStore({
      this.wholeMenus = filterNoPermissionTree(
        filterTree(ascending(this.constantMenus.concat(routes)))
      );
-      this.flatteningRoutes = formatFlatteningRoutes(
-        this.constantMenus.concat(routes)
-      );
    },
    cacheOperate({ mode, name }: cacheType) {
      const delIndex = this.cachePageList.findIndex(v => v === name);
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.ts
@ -1,5 +1,7 @@
 import { defineStore } from "pinia";
-import { type setType, store, getConfig } from "../utils";
+import { store } from "@/store";
+import { getConfig } from "@/config";
+import type { setType } from "./types";

 export const useSettingStore = defineStore({
  id: "pure-setting",
--- a/src/store/modules/types.ts
+++ b/src/store/modules/types.ts
@ -37,11 +37,8 @@ export type setType = {
 };

 export type userType = {
-  avatar?: string;
  username?: string;
-  nickname?: string;
  roles?: Array<string>;
-  permissions?: Array<string>;
  isRemembered?: boolean;
  loginDay?: number;
 };
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@ -1,61 +1,35 @@
 import { defineStore } from "pinia";
-import {
-  type userType,
-  store,
-  router,
-  resetRouter,
-  routerArrays,
-  storageLocal
-} from "../utils";
-import {
-  type UserResult,
-  type RefreshTokenResult,
-  getLogin,
-  refreshTokenApi
-} from "@/api/user";
-import { useMultiTagsStoreHook } from "./multiTags";
+import { store } from "@/store";
+import type { userType } from "./types";
+import { routerArrays } from "@/layout/types";
+import { router, resetRouter } from "@/router";
+import { storageLocal } from "@pureadmin/utils";
+import { getLogin, refreshTokenApi } from "@/api/user";
+import type { UserResult, RefreshTokenResult } from "@/api/user";
+import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
 import { type DataInfo, setToken, removeToken, userKey } from "@/utils/auth";

 export const useUserStore = defineStore({
  id: "pure-user",
  state: (): userType => ({
-    // 头像
-    avatar: storageLocal().getItem<DataInfo<number>>(userKey)?.avatar ?? "",
    // 用户名
    username: storageLocal().getItem<DataInfo<number>>(userKey)?.username ?? "",
-    // 昵称
-    nickname: storageLocal().getItem<DataInfo<number>>(userKey)?.nickname ?? "",
    // 页面级别权限
    roles: storageLocal().getItem<DataInfo<number>>(userKey)?.roles ?? [],
-    // 按钮级别权限
-    permissions:
-      storageLocal().getItem<DataInfo<number>>(userKey)?.permissions ?? [],
    // 是否勾选了登录页的免登录
    isRemembered: false,
    // 登录页的免登录存储几天，默认7天
    loginDay: 7
  }),
  actions: {
-    /** 存储头像 */
-    SET_AVATAR(avatar: string) {
-      this.avatar = avatar;
-    },
    /** 存储用户名 */
    SET_USERNAME(username: string) {
      this.username = username;
    },
-    /** 存储昵称 */
-    SET_NICKNAME(nickname: string) {
-      this.nickname = nickname;
-    },
    /** 存储角色 */
    SET_ROLES(roles: Array<string>) {
      this.roles = roles;
    },
-    /** 存储按钮级别权限 */
-    SET_PERMS(permissions: Array<string>) {
-      this.permissions = permissions;
-    },
    /** 存储是否勾选了登录页的免登录 */
    SET_ISREMEMBERED(bool: boolean) {
      this.isRemembered = bool;
@ -69,8 +43,10 @@ export const useUserStore = defineStore({
      return new Promise<UserResult>((resolve, reject) => {
        getLogin(data)
          .then(data => {
-            if (data?.success) setToken(data.data);
-            resolve(data);
+            if (data) {
+              setToken(data.data);
+              resolve(data);
+            }
          })
          .catch(error => {
            reject(error);
@ -81,7 +57,6 @@ export const useUserStore = defineStore({
    logOut() {
      this.username = "";
      this.roles = [];
-      this.permissions = [];
      removeToken();
      useMultiTagsStoreHook().handleTags("equal", [...routerArrays]);
      resetRouter();
--- a/src/store/utils.ts
+++ b/src/store/utils.ts
@ -1,28 +0,0 @@
-export { store } from "@/store";
-export { routerArrays } from "@/layout/types";
-export { router, resetRouter, constantMenus } from "@/router";
-export { getConfig, responsiveStorageNameSpace } from "@/config";
-export {
-  ascending,
-  filterTree,
-  filterNoPermissionTree,
-  formatFlatteningRoutes
-} from "@/router/utils";
-export {
-  isUrl,
-  isEqual,
-  isNumber,
-  debounce,
-  isBoolean,
-  getKeyList,
-  storageLocal,
-  deviceDetection
-} from "@pureadmin/utils";
-export type {
-  setType,
-  appType,
-  userType,
-  multiType,
-  cacheType,
-  positionType
-} from "./types";
--- a/Show More
+++ b/Show More