.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.js
+stylelint.config.js

.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"
+      }
+    ]
+  }
+};

.lintstagedrc

@@ -3,18 +3,14 @@
     "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"],
-  "*.vue": [
-    "prettier --write",
-    "eslint --cache --fix",
-    "stylelint --fix --allow-empty-input"
-  ],
+  "*.vue": ["prettier --write", "eslint --cache --fix", "stylelint --fix"],
   "*.{css,scss,html}": [
     "prettier --cache --ignore-unknown --write",
-    "stylelint --fix --allow-empty-input"
+    "stylelint --fix"
   ],
   "*.md": ["prettier --cache --ignore-unknown --write"]
 }

.npmrc

@@ -1,4 +1,3 @@
-shell-emulator=true
 shamefully-hoist=true
-enable-pre-post-scripts=false
 strict-peer-dependencies=false
+shell-emulator=true

.nvmrc

@@ -1 +1 @@
-v22.14.0
+v20.11.1

.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",

.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"]
 }

Dockerfile

@@ -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
 

README.en-US.md

@@ -8,31 +8,18 @@
 
 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
+## Supporting Video
 
-[Click me to view js version](https://pure-admin.cn/pages/js/)
+- [Click Watch Tutorial](https://www.bilibili.com/video/BV1kg411v7QT)
+- [Click Watch UI Design](https://www.bilibili.com/video/BV17g411T7rq)
 
-## `max` version
+## Docs
 
-[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)  
-[Click me to view the rapid development tutorial](https://www.bilibili.com/video/BV1kg411v7QT)
-
-## Nanny-level documents
-
-[Click me to view vue-pure-admin documentation](https://pure-admin.cn/)  
-[Click me to view @pureadmin/utils documentation](https://pure-admin-utils.netlify.app)
-
-## Quality service, software outsourcing, sponsorship support
-
-[Click me to view details](https://pure-admin.cn/pages/service/)
+- [documentation site](https://yiming_chang.gitee.io/pure-admin-doc)
 
 ## Preview
 
-[Click me to view the preview station](https://pure-admin-thin.netlify.app/#/login)
+- [Click me to view the preview station](https://pure-admin-thin.netlify.app/#/login)
 
 ## Maintainer
 
@@ -40,7 +27,7 @@ The simplified version is based on the shelf extracted from [vue-pure-admin](htt
 
 ## ⚠️ Attention
 
-The Lite version does not accept any issues and prs. If you have any questions, please go to the full version [issues](https://github.com/pure-admin/vue-pure-admin/issues/new/choose) to mention, thank you!
+- The Lite version does not accept any issues and prs. If you have any questions, please go to the full version [issues](https://github.com/pure-admin/vue-pure-admin/issues/new/choose) to mention, thank you!
 
 ## License
 

README.md

@@ -12,31 +12,18 @@
 
 当前是非国际化版本，如果您需要国际化版本 [请点击](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)  
-[点我查看快速开发教程](https://www.bilibili.com/video/BV1kg411v7QT)
+- [点我查看教程](https://www.bilibili.com/video/BV1kg411v7QT)
+- [点我查看 UI 设计](https://www.bilibili.com/video/BV17g411T7rq)
 
 ## 配套保姆级文档
 
-[点我查看 vue-pure-admin 文档](https://pure-admin.cn/)  
-[点我查看 @pureadmin/utils 文档](https://pure-admin-utils.netlify.app)
-
-## 优质服务、软件外包、赞助支持
-
-[点我查看详情](https://pure-admin.cn/pages/service/)
+- [查看文档](https://yiming_chang.gitee.io/pure-admin-doc)
 
 ## 预览
 
-[查看预览](https://pure-admin-thin.netlify.app/#/login)
+- [查看预览](https://pure-admin-thin.netlify.app/#/login)
 
 ## 维护者
 
@@ -44,7 +31,7 @@
 
 ## ⚠️ 注意
 
-精简版不接受任何 `issues` 和 `pr`，如果有问题请到完整版 [issues](https://github.com/pure-admin/vue-pure-admin/issues/new/choose) 去提，谢谢！
+- 精简版不接受任何 `issues` 和 `pr`，如果有问题请到完整版 [issues](https://github.com/pure-admin/vue-pure-admin/issues/new/choose) 去提，谢谢！
 
 ## 许可证
 

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({

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(
+  `Hello! 欢迎使用 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}）`

build/optimize.ts

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

build/plugins.ts

@@ -2,15 +2,14 @@ import { cdn } from "./cdn";
 import vue from "@vitejs/plugin-vue";
 import { viteBuildInfo } from "./info";
 import svgLoader from "vite-svg-loader";
-import Icons from "unplugin-icons/vite";
 import type { PluginOption } from "vite";
 import vueJsx from "@vitejs/plugin-vue-jsx";
-import tailwindcss from "@tailwindcss/vite";
 import { configCompressPlugin } from "./compress";
 import removeNoMatch from "vite-plugin-router-warn";
 import { visualizer } from "rollup-plugin-visualizer";
 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(
@@ -19,20 +18,9 @@ export function getPluginsList(
 ): PluginOption[] {
   const lifecycle = process.env.npm_lifecycle_event;
   return [
-    tailwindcss(),
     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
@@ -47,13 +35,15 @@ export function getPluginsList(
       infixName: false,
       enableProd: true
     }),
+    // 自定义主题
+    themePreprocessorPlugin({
+      scss: {
+        multipleScopeVars: genScssMultipleScopeVars(),
+        extract: true
+      }
+    }),
     // svg组件化支持
     svgLoader(),
-    // 自动按需加载图标
-    Icons({
-      compiler: "vue3",
-      scale: 1
-    }),
     VITE_CDN ? cdn : null,
     configCompressPlugin(VITE_COMPRESSION),
     // 线上环境删除console

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

eslint.config.js

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

index.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
@@ -10,6 +10,9 @@
     />
     <title>pure-admin-thin</title>
     <link rel="icon" href="/favicon.ico" />
+    <script>
+      window.process = {};
+    </script>
   </head>
 
   <body>

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: "路由返回按钮权限",
+        roles: ["admin", "common"],
         auths: [
           "permission:btn:add",
           "permission:btn:edit",
           "permission:btn:delete"
         ]
       }
-        },
-        {
-          path: "/permission/button/login",
-          component: "permission/button/perms",
-          name: "PermissionButtonLogin",
-          meta: {
-            title: "登录接口返回按钮权限"
-          }
-        }
-      ]
     }
   ]
 };

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"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pure-admin-thin",
-  "version": "6.0.0",
+  "version": "5.1.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": {
@@ -48,112 +48,101 @@
     "url": "https://github.com/xiaoxian521"
   },
   "dependencies": {
-    "@pureadmin/descriptions": "^1.2.1",
-    "@pureadmin/table": "^3.2.1",
-    "@pureadmin/utils": "^2.6.0",
-    "@vueuse/core": "^13.1.0",
-    "@vueuse/motion": "^3.0.3",
+    "@pureadmin/descriptions": "^1.2.0",
+    "@pureadmin/table": "^3.1.2",
+    "@pureadmin/utils": "^2.4.5",
+    "@vueuse/core": "^10.9.0",
+    "@vueuse/motion": "^2.1.0",
     "animate.css": "^4.1.1",
-    "axios": "^1.9.0",
-    "dayjs": "^1.11.13",
-    "echarts": "^5.6.0",
-    "element-plus": "^2.9.8",
+    "axios": "^1.6.7",
+    "dayjs": "^1.11.10",
+    "echarts": "^5.5.0",
+    "element-plus": "^2.6.0",
     "js-cookie": "^3.0.5",
     "localforage": "^1.10.0",
     "mitt": "^3.0.1",
     "nprogress": "^0.2.0",
-    "path-browserify": "^1.0.1",
-    "pinia": "^3.0.2",
-    "pinyin-pro": "^3.26.0",
-    "qs": "^6.14.0",
+    "path": "^0.12.7",
+    "pinia": "^2.1.7",
+    "pinyin-pro": "^3.19.6",
+    "qs": "^6.11.2",
     "responsive-storage": "^2.2.0",
-    "sortablejs": "^1.15.6",
-    "vue": "^3.5.13",
-    "vue-router": "^4.5.0",
-    "vue-tippy": "^6.7.0",
-    "vue-types": "^6.0.0"
+    "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.8.0",
-    "@commitlint/config-conventional": "^19.8.0",
-    "@commitlint/types": "^19.8.0",
-    "@eslint/js": "^9.25.1",
-    "@faker-js/faker": "^9.7.0",
-    "@iconify/json": "^2.2.331",
-    "@iconify/vue": "4.2.0",
-    "@tailwindcss/vite": "^4.1.4",
+    "@commitlint/cli": "^18.6.1",
+    "@commitlint/config-conventional": "^18.6.2",
+    "@commitlint/types": "^18.6.1",
+    "@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.1.1",
+    "@pureadmin/theme": "^3.2.0",
+    "@types/gradient-string": "^1.1.5",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.17.30",
+    "@types/node": "^20.11.24",
     "@types/nprogress": "^0.2.3",
-    "@types/path-browserify": "^1.0.3",
-    "@types/qs": "^6.9.18",
+    "@types/qs": "^6.9.12",
     "@types/sortablejs": "^1.15.8",
-    "@vitejs/plugin-vue": "^5.2.3",
-    "@vitejs/plugin-vue-jsx": "^4.1.2",
-    "boxen": "^8.0.1",
-    "code-inspector-plugin": "^0.20.10",
-    "cssnano": "^7.0.6",
-    "eslint": "^9.25.1",
-    "eslint-config-prettier": "^10.1.2",
-    "eslint-plugin-prettier": "^5.2.6",
-    "eslint-plugin-vue": "^10.0.0",
-    "gradient-string": "^3.0.0",
-    "husky": "^9.1.7",
-    "lint-staged": "^15.5.1",
-    "postcss": "^8.5.3",
-    "postcss-html": "^1.8.0",
-    "postcss-load-config": "^6.0.1",
+    "@typescript-eslint/eslint-plugin": "^7.1.1",
+    "@typescript-eslint/parser": "^7.1.1",
+    "@vitejs/plugin-vue": "^5.0.4",
+    "@vitejs/plugin-vue-jsx": "^3.1.0",
+    "autoprefixer": "^10.4.18",
+    "boxen": "^7.1.1",
+    "cloc": "^2.11.0",
+    "cssnano": "^6.0.5",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-define-config": "^2.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-vue": "^9.22.0",
+    "gradient-string": "^2.0.2",
+    "husky": "^9.0.11",
+    "lint-staged": "^15.2.2",
+    "postcss": "^8.4.35",
+    "postcss-html": "^1.6.0",
+    "postcss-import": "^16.0.1",
     "postcss-scss": "^4.0.9",
-    "prettier": "^3.5.3",
-    "rimraf": "^6.0.1",
-    "rollup-plugin-visualizer": "^5.14.0",
-    "sass": "^1.87.0",
-    "stylelint": "^16.19.0",
-    "stylelint-config-recess-order": "^6.0.0",
-    "stylelint-config-recommended-vue": "^1.6.0",
-    "stylelint-config-standard-scss": "^14.0.0",
-    "stylelint-prettier": "^5.0.3",
-    "svgo": "^3.3.2",
-    "tailwindcss": "^4.1.4",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.31.0",
-    "unplugin-icons": "^22.1.0",
-    "vite": "^6.3.3",
-    "vite-plugin-cdn-import": "^1.0.1",
+    "prettier": "^3.2.5",
+    "rimraf": "^5.0.5",
+    "rollup-plugin-visualizer": "^5.12.0",
+    "sass": "^1.71.1",
+    "stylelint": "^16.2.1",
+    "stylelint-config-recess-order": "^5.0.0",
+    "stylelint-config-recommended-vue": "^1.5.0",
+    "stylelint-config-standard-scss": "^13.0.0",
+    "stylelint-prettier": "^5.0.0",
+    "svgo": "^3.2.0",
+    "tailwindcss": "^3.4.1",
+    "typescript": "^5.3.3",
+    "vite": "^5.1.5",
+    "vite-plugin-cdn-import": "^0.3.5",
     "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-fake-server": "^2.2.0",
+    "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": "^10.1.3",
-    "vue-tsc": "^2.2.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": "*",
-      "lodash.isequal": "*",
       "domexception": "*",
       "w3c-hr-time": "*",
-      "inflight": "*",
-      "npmlog": "*",
-      "rimraf": "*",
       "stable": "*",
-      "gauge": "*",
-      "abab": "*",
-      "glob": "*"
-    },
-    "onlyBuiltDependencies": [
-      "@parcel/watcher",
-      "core-js",
-      "es5-ext",
-      "esbuild",
-      "typeit",
-      "vue-demi"
-    ]
+      "abab": "*"
+    }
   }
 }

postcss.config.js

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

public/platform-config.json

@@ -1,5 +1,5 @@
 {
-  "Version": "6.0.0",
+  "Version": "5.1.0",
   "Title": "PureAdmin",
   "FixedHeader": true,
   "HiddenSideBar": false,
@@ -13,7 +13,6 @@
   "Weak": false,
   "HideTabs": false,
   "HideFooter": false,
-  "Stretch": false,
   "SidebarStatus": true,
   "EpThemeColor": "#409EFF",
   "ShowLogo": true,

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: {

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 });
 };

src/assets/iconfont/iconfont.js

@@ -28,7 +28,8 @@
           c = document.createElement("div");
         (c.innerHTML = e._iconfont_svg_string_2208059),
           (c = c.getElementsByTagName("svg")[0]) &&
-            ((c.style.position = "absolute"),
+            (c.setAttribute("aria-hidden", "true"),
+            (c.style.position = "absolute"),
             (c.style.width = 0),
             (c.style.height = 0),
             (c.style.overflow = "hidden"),

src/assets/svg/enter_outlined.svg

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

src/assets/svg/exit_screen.svg

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

src/assets/svg/full_screen.svg

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

src/assets/svg/keyboard_esc.svg

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

src/assets/table-bar/drag.svg

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

src/components/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);
 };
 
 /**
@@ -53,8 +51,8 @@ const closeAllDialog = () => {
 
 /** 千万别忘了在下面这三处引入并注册下，放心注册，不使用`addDialog`调用就不会被挂载
  * https://github.com/pure-admin/vue-pure-admin/blob/main/src/App.vue#L4
- * https://github.com/pure-admin/vue-pure-admin/blob/main/src/App.vue#L12
- * https://github.com/pure-admin/vue-pure-admin/blob/main/src/App.vue#L22
+ * https://github.com/pure-admin/vue-pure-admin/blob/main/src/App.vue#L13
+ * https://github.com/pure-admin/vue-pure-admin/blob/main/src/App.vue#L20
  */
 const ReDialog = withInstall(reDialog);
 

src/components/ReDialog/index.vue

@@ -1,21 +1,16 @@
 <script setup lang="ts">
 import {
+  closeDialog,
+  dialogStore,
   type EventType,
   type ButtonProps,
-  type DialogOptions,
-  closeDialog,
-  dialogStore
+  type DialogOptions
 } from "./index";
 import { ref, computed } from "vue";
 import { isFunction } from "@pureadmin/utils";
-import Fullscreen from "~icons/ri/fullscreen-fill";
-import ExitFullscreen from "~icons/ri/fullscreen-exit-fill";
+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();
               }
@@ -79,17 +57,16 @@ const fullscreenClass = computed(() => {
     "el-dialog__close",
     "-translate-x-2",
     "cursor-pointer",
-    "hover:text-[red]!"
+    "hover:!text-[red]"
   ];
 });
 
 function eventsCallBack(
   event: EventType,
   options: DialogOptions,
-  index: number,
-  isClickFullScreen = false
+  index: number
 ) {
-  if (!isClickFullScreen) fullscreen.value = options?.fullscreen ?? false;
+  fullscreen.value = options?.fullscreen ?? false;
   if (options?.[event] && isFunction(options?.[event])) {
     return options?.[event]({ options, index });
   }
@@ -131,17 +108,7 @@ function handleClose(
         <i
           v-if="!options?.fullscreen"
           :class="fullscreenClass"
-          @click="
-            () => {
-              fullscreen = !fullscreen;
-              eventsCallBack(
-                'fullscreenCallBack',
-                { ...options, fullscreen },
-                index,
-                true
-              );
-            }
-          "
+          @click="fullscreen = !fullscreen"
         >
           <IconifyIconOffline
             class="pure-dialog-svg"
@@ -171,25 +138,10 @@ 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-for="(btn, key) in footerButtons(options)"
+          :key="key"
           v-bind="btn"
-            :loading="key === 1 && sureBtnMap[index]?.loading"
           @click="
             btn.btnClick({
               dialog: { options, index },
@@ -199,7 +151,6 @@ function handleClose(
         >
           {{ btn?.label }}
         </el-button>
-        </template>
       </span>
     </template>
   </el-dialog>

src/components/ReDialog/type.ts

@@ -1,23 +1,11 @@
 import type { CSSProperties, VNode, Component } from "vue";
 
 type DoneFn = (cancel?: boolean) => void;
-type EventType =
-  | "open"
-  | "close"
-  | "openAutoFocus"
-  | "closeAutoFocus"
-  | "fullscreenCallBack";
+type EventType = "open" | "close" | "openAutoFocus" | "closeAutoFocus";
 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 +53,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 +81,6 @@ type ButtonProps = {
   round?: boolean;
   /** 是否为圆形按钮，默认 `false` */
   circle?: boolean;
-  /** 确定按钮的 `Popconfirm` 气泡确认框相关配置 */
-  popconfirm?: Popconfirm;
   /** 是否为加载中状态，默认 `false` */
   loading?: boolean;
   /** 自定义加载中状态图标组件 */
@@ -160,10 +118,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}
@@ -221,14 +175,6 @@ interface DialogOptions extends DialogProps {
     index: number;
     args: any;
   }) => void;
-  /** 点击全屏按钮时的回调 */
-  fullscreenCallBack?: ({
-    options,
-    index
-  }: {
-    options: DialogOptions;
-    index: number;
-  }) => void;
   /** 输入焦点聚焦在 `Dialog` 内容时的回调 */
   openAutoFocus?: ({
     options,
@@ -261,13 +207,10 @@ interface DialogOptions extends DialogProps {
     done: Function,
     {
       options,
-      index,
-      closeLoading
+      index
     }: {
       options: DialogOptions;
       index: number;
-      /** 关闭确定按钮的 `loading` 加载动画 */
-      closeLoading: Function;
     }
   ) => void;
 }

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

src/components/ReIcon/src/hooks.ts

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

src/components/ReIcon/src/iconfont.ts

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

src/components/ReIcon/src/iconifyIconOffline.ts

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

src/components/ReIcon/src/iconifyIconOnline.ts

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

src/components/ReIcon/src/offlineIcon.ts

@@ -1,23 +1,14 @@
 // 这里存放本地图标，在 src/layout/index.vue 文件中加载，避免在首启动加载
-import { getSvgInfo } from "@pureadmin/utils";
 import { addIcon } from "@iconify/vue/dist/offline";
 
-// https://icon-sets.iconify.design/ep/?keyword=ep
-import EpHomeFilled from "~icons/ep/home-filled?raw";
-
-// https://icon-sets.iconify.design/ri/?keyword=ri
-import RiSearchLine from "~icons/ri/search-line?raw";
-import RiInformationLine from "~icons/ri/information-line?raw";
-
-const icons = [
-  // Element Plus Icon: https://github.com/element-plus/element-plus-icons
-  ["ep/home-filled", EpHomeFilled],
-  // Remix Icon: https://github.com/Remix-Design/RemixIcon
-  ["ri/search-line", RiSearchLine],
-  ["ri/information-line", RiInformationLine]
-];
-
 // 本地菜单图标，后端在路由的 icon 中返回对应的图标字符串并且前端在此处使用 addIcon 添加即可渲染菜单图标
-icons.forEach(([name, icon]) => {
-  addIcon(name as string, getSvgInfo(icon as string));
-});
+// @iconify-icons/ep
+import Lollipop from "@iconify-icons/ep/lollipop";
+import HomeFilled from "@iconify-icons/ep/home-filled";
+addIcon("ep:lollipop", Lollipop);
+addIcon("ep:home-filled", HomeFilled);
+// @iconify-icons/ri
+import Search from "@iconify-icons/ri/search-line";
+import InformationLine from "@iconify-icons/ri/information-line";
+addIcon("ri:search-line", Search);
+addIcon("ri:information-line", InformationLine);

src/components/RePerms/index.ts

@@ -1,5 +0,0 @@
-import perms from "./src/perms";
-
-const Perms = perms;
-
-export { Perms };

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;
-    };
-  }
-});

src/components/RePureTableBar/src/bar.tsx

@@ -1,14 +1,5 @@
-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 +8,12 @@ import {
   getKeyList
 } from "@pureadmin/utils";
 
-import Fullscreen from "~icons/ri/fullscreen-fill";
-import ExitFullscreen from "~icons/ri/fullscreen-exit-fill";
-import DragIcon from "@/assets/table-bar/drag.svg?component";
-import ExpandIcon from "@/assets/table-bar/expand.svg?component";
-import RefreshIcon from "@/assets/table-bar/refresh.svg?component";
-import SettingIcon from "@/assets/table-bar/settings.svg?component";
-import CollapseIcon from "@/assets/table-bar/collapse.svg?component";
+import Sortable from "sortablejs";
+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)
@@ -86,9 +70,9 @@ export default defineComponent({
         "text-black",
         "dark:text-white",
         "duration-100",
-        "hover:text-primary!",
+        "hover:!text-primary",
         "cursor-pointer",
-        "outline-hidden"
+        "outline-none"
       ];
     });
 
@@ -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);
@@ -139,7 +118,6 @@ export default defineComponent({
     }
 
     function handleCheckedColumnsChange(value: string[]) {
-      checkedColumns.value = value;
       const checkedCount = value.length;
       checkAll.value = checkedCount === checkColumnList.length;
       isIndeterminate.value =
@@ -188,9 +166,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 +225,7 @@ export default defineComponent({
 
     return () => (
       <>
-        <div
-          {...attrs}
-          class={[
-            "w-full",
-            "px-2",
-            "pb-2",
-            "bg-bg_color",
-            isFullscreen.value
-              ? ["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()
@@ -312,7 +279,7 @@ export default defineComponent({
               >
                 <div class={[topClass.value]}>
                   <el-checkbox
-                    class="-mr-1!"
+                    class="!-mr-1"
                     label="列展示"
                     v-model={checkAll.value}
                     indeterminate={isIndeterminate.value}
@@ -326,8 +293,7 @@ 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}
+                      v-model={checkedColumns.value}
                       onChange={value => handleCheckedColumnsChange(value)}
                     >
                       <el-space
@@ -335,23 +301,22 @@ export default defineComponent({
                         alignment="flex-start"
                         size={0}
                       >
-                        {checkColumnList.map((item, index) => {
+                        {checkColumnList.map(item => {
                           return (
                             <div class="flex items-center">
                               <DragIcon
                                 class={[
                                   "drag-btn w-[16px] mr-2",
                                   isFixedColumn(item)
-                                    ? "cursor-no-drop!"
-                                    : "cursor-grab!"
+                                    ? "!cursor-no-drop"
+                                    : "!cursor-grab"
                                 ]}
                                 onMouseenter={(event: {
                                   preventDefault: () => void;
                                 }) => rowDrop(event)}
                               />
                               <el-checkbox
-                                key={index}
-                                label={item}
+                                key={item}
                                 value={item}
                                 onChange={value =>
                                   handleCheckColumnListChange(value, item)
@@ -372,14 +337,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({

src/components/RePureTableBar/src/svg/drag.svg

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

src/components/ReSegmented/src/index.css

@@ -1,103 +1,11 @@
 .pure-segmented {
-  --pure-control-padding-horizontal: 12px;
-  --pure-control-padding-horizontal-sm: 8px;
-  --pure-segmented-track-padding: 2px;
-  --pure-segmented-line-width: 1px;
-
-  --pure-segmented-border-radius-small: 4px;
-  --pure-segmented-border-radius-base: 6px;
-  --pure-segmented-border-radius-large: 8px;
-
   box-sizing: border-box;
   display: inline-block;
-  padding: var(--pure-segmented-track-padding);
-  font-size: var(--el-font-size-base);
+  padding: 2px;
+  font-size: 14px;
   color: rgba(0, 0, 0, 0.65);
   background-color: rgb(0 0 0 / 4%);
-  border-radius: var(--pure-segmented-border-radius-base);
-}
-
-.pure-segmented-block {
-  display: flex;
-}
-
-.pure-segmented-block .pure-segmented-item {
-  flex: 1;
-  min-width: 0;
-}
-
-.pure-segmented-block .pure-segmented-item > .pure-segmented-item-label > span {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-
-/* small */
-.pure-segmented.pure-segmented--small {
-  border-radius: var(--pure-segmented-border-radius-small);
-}
-.pure-segmented.pure-segmented--small .pure-segmented-item {
-  border-radius: var(--el-border-radius-small);
-}
-.pure-segmented.pure-segmented--small .pure-segmented-item > div {
-  min-height: calc(
-    var(--el-component-size-small) - var(--pure-segmented-track-padding) * 2
-  );
-  line-height: calc(
-    var(--el-component-size-small) - var(--pure-segmented-track-padding) * 2
-  );
-  padding: 0
-    calc(
-      var(--pure-control-padding-horizontal-sm) -
-        var(--pure-segmented-line-width)
-    );
-}
-
-/* large */
-.pure-segmented.pure-segmented--large {
-  border-radius: var(--pure-segmented-border-radius-large);
-}
-.pure-segmented.pure-segmented--large .pure-segmented-item {
-  border-radius: calc(
-    var(--el-border-radius-base) + var(--el-border-radius-small)
-  );
-}
-.pure-segmented.pure-segmented--large .pure-segmented-item > div {
-  min-height: calc(
-    var(--el-component-size-large) - var(--pure-segmented-track-padding) * 2
-  );
-  line-height: calc(
-    var(--el-component-size-large) - var(--pure-segmented-track-padding) * 2
-  );
-  padding: 0
-    calc(
-      var(--pure-control-padding-horizontal) - var(--pure-segmented-line-width)
-    );
-  font-size: var(--el-font-size-medium);
-}
-
-/* default */
-.pure-segmented-item {
-  position: relative;
-  text-align: center;
-  cursor: pointer;
-  border-radius: var(--el-border-radius-base);
-  transition: all 0.1s cubic-bezier(0.645, 0.045, 0.355, 1);
-}
-.pure-segmented .pure-segmented-item > div {
-  min-height: calc(
-    var(--el-component-size) - var(--pure-segmented-track-padding) * 2
-  );
-  line-height: calc(
-    var(--el-component-size) - var(--pure-segmented-track-padding) * 2
-  );
-  padding: 0
-    calc(
-      var(--pure-control-padding-horizontal) - var(--pure-segmented-line-width)
-    );
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
+  border-radius: 2px;
 }
 
 .pure-segmented-group {
@@ -129,6 +37,23 @@
   will-change: transform, width;
 }
 
+.pure-segmented-item {
+  position: relative;
+  text-align: center;
+  cursor: pointer;
+  border-radius: 4px;
+  transition: all 0.1s cubic-bezier(0.645, 0.045, 0.355, 1);
+}
+
+.pure-segmented-item > div {
+  min-height: 28px;
+  line-height: 28px;
+  padding: 0 11px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
 .pure-segmented-item > input {
   position: absolute;
   inset-block-start: 0;
@@ -142,7 +67,6 @@
 .pure-segmented-item-label {
   display: flex;
   align-items: center;
-  justify-content: center;
 }
 
 .pure-segmented-item-icon svg {

src/components/ReSegmented/src/index.tsx

@@ -1,14 +1,5 @@
 import "./index.css";
-import type { OptionsType } from "./type";
-import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import {
-  useDark,
-  isNumber,
-  isFunction,
-  useResizeObserver
-} from "@pureadmin/utils";
-import {
-  type PropType,
   h,
   ref,
   toRef,
@@ -17,6 +8,9 @@ import {
   defineComponent,
   getCurrentInstance
 } from "vue";
+import type { OptionsType } from "./type";
+import { useRenderIcon } from "@/components/ReIcon/src/hooks";
+import { isFunction, isNumber, useDark } from "@pureadmin/utils";
 
 const props = {
   options: {
@@ -28,25 +22,6 @@ const props = {
     type: undefined,
     require: false,
     default: "0"
-  },
-  /** 将宽度调整为父元素宽度	 */
-  block: {
-    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 +42,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 +52,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 +64,6 @@ export default defineComponent({
     }
 
     function handleMouseleave(_, event: Event) {
-      if (props.disabled) return;
       event.preventDefault();
       curMouseActive.value = -1;
     }
@@ -98,23 +71,12 @@ export default defineComponent({
     function handleInit(index = curIndex.value) {
       nextTick(() => {
         const curLabelRef = instance?.proxy?.$refs[`labelRef${index}`] as ElRef;
-        if (!curLabelRef) return;
         width.value = curLabelRef.clientWidth;
         translateX.value = curLabelRef.offsetLeft;
         initStatus.value = true;
       });
     }
 
-    function handleResizeInit() {
-      useResizeObserver(".pure-segmented", () => {
-        nextTick(() => {
-          handleInit(curIndex.value);
-        });
-      });
-    }
-
-    (props.block || props.resize) && handleResizeInit();
-
     watch(
       () => curIndex.value,
       index => {
@@ -123,14 +85,11 @@ export default defineComponent({
         });
       },
       {
+        deep: true,
         immediate: true
       }
     );
 
-    watch(() => props.size, handleResizeInit, {
-      immediate: true
-    });
-
     const rendLabel = () => {
       return props.options.map((option, index) => {
         return (
@@ -138,15 +97,13 @@ 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 &&
+              color:
+                !option.disabled &&
                 (curIndex.value === index || curMouseActive.value === index)
                   ? isDark.value
                     ? "rgba(255, 255, 255, 0.85)"
@@ -191,14 +148,7 @@ export default defineComponent({
     };
 
     return () => (
-      <div
-        class={{
-          "pure-segmented": true,
-          "pure-segmented-block": props.block,
-          "pure-segmented--large": props.size === "large",
-          "pure-segmented--small": props.size === "small"
-        }}
-      >
+      <div class="pure-segmented">
         <div class="pure-segmented-group">
           <div
             class="pure-segmented-item-selected"

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;
   /** 图标属性、样式配置 */

src/components/ReText/src/index.vue

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

src/config/index.ts

@@ -1,5 +1,5 @@
-import axios from "axios";
 import type { App } from "vue";
+import axios from "axios";
 
 let config: object = {};
 const { VITE_PUBLIC_PATH } = import.meta.env;
@@ -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;

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);

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;

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";

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;

src/directives/optimize/index.ts

@@ -1,29 +1,16 @@
 import {
-  isArray,
-  throttle,
-  debounce,
+  isFunction,
   isObject,
-  isFunction
+  isArray,
+  debounce,
+  throttle
 } from "@pureadmin/utils";
 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);

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']\""
-      );
-    }
-  }
-};

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

src/layout/components/appMain.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 { useGlobal, isNumber } from "@pureadmin/utils";
-import BackTopIcon from "@/assets/svg/back_top.svg?component";
+import Footer from "./footer/index.vue";
+import { useGlobal } from "@pureadmin/utils";
+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(() => {
@@ -32,36 +30,16 @@ const hideFooter = computed(() => {
   return $storage?.configure.hideFooter;
 });
 
-const stretch = computed(() => {
-  return $storage?.configure.stretch;
-});
-
 const layout = computed(() => {
   return $storage?.layout.layout === "vertical";
 });
 
-const getMainWidth = computed(() => {
-  return isNumber(stretch.value)
-    ? stretch.value + "px"
-    : stretch.value
-      ? "1440px"
-      : "100%";
-});
-
 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: 85px;" : "",
     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: 85px;" : "",
     props.fixedHeader
       ? ""
       : `padding-top: 0;${
@@ -107,26 +85,23 @@ 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',
-                'max-width': getMainWidth,
-                margin: '0 auto',
-                transition: 'all 300ms cubic-bezier(0.4, 0, 0.2, 1)'
+                'flex-wrap': 'wrap'
               }"
               :view-style="{
                 display: 'flex',
                 flex: 'auto',
-                overflow: 'hidden',
+                overflow: 'auto',
                 'flex-direction': 'column'
               }"
             >
@@ -134,7 +109,7 @@ const transitionMain = defineComponent({
                 title="回到顶部"
                 target=".app-main .el-scrollbar__wrap"
               >
-                <BackTopIcon />
+                <backTop />
               </el-backtop>
               <div class="grow">
                 <transitionMain :route="route">
@@ -158,7 +133,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 +158,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>
 

src/layout/components/footer/index.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import { getConfig } from "@/config";
 
 const TITLE = getConfig("Title");

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) => {
@@ -63,9 +63,10 @@ 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 +75,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>

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>

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: "暂无待办"
-  }
-];

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

@@ -1,70 +0,0 @@
-<script setup lang="ts">
-import { computed } from "vue";
-import { useGlobal } from "@pureadmin/utils";
-import { useNav } from "@/layout/hooks/useNav";
-
-import ArrowLeft from "~icons/ri/arrow-left-double-fill";
-
-interface Props {
-  isActive?: boolean;
-}
-
-withDefaults(defineProps<Props>(), {
-  isActive: false
-});
-
-const { tooltipEffect } = useNav();
-
-const iconClass = computed(() => {
-  return ["w-[16px]", "h-[16px]"];
-});
-
-const { $storage } = useGlobal<GlobalPropertiesApi>();
-const themeColor = computed(() => $storage.layout?.themeColor);
-
-const emit = defineEmits<{
-  (e: "toggleClick"): void;
-}>();
-
-const toggleClick = () => {
-  emit("toggleClick");
-};
-</script>
-
-<template>
-  <div
-    v-tippy="{
-      content: isActive ? '点击折叠' : '点击展开',
-      theme: tooltipEffect,
-      hideOnClick: 'toggle',
-      placement: 'right'
-    }"
-    class="center-collapse"
-    @click="toggleClick"
-  >
-    <IconifyIconOffline
-      :icon="ArrowLeft"
-      :class="[iconClass, themeColor === 'light' ? '' : 'text-primary']"
-      :style="{ transform: isActive ? 'none' : 'rotateY(180deg)' }"
-    />
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.center-collapse {
-  position: absolute;
-  top: 50%;
-  right: 2px;
-  z-index: 1002;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 24px;
-  height: 34px;
-  cursor: pointer;
-  background: var(--el-bg-color);
-  border: 1px solid var(--pure-border-color);
-  border-radius: 4px;
-  transform: translate(12px, -50%);
-}
-</style>

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

@@ -1,30 +0,0 @@
-<script setup lang="ts">
-import { ref, watch } from "vue";
-import { useNav } from "@/layout/hooks/useNav";
-
-const screenIcon = ref();
-const { toggle, isFullscreen, Fullscreen, ExitFullscreen } = useNav();
-
-isFullscreen.value = !!(
-  document.fullscreenElement ||
-  document.webkitFullscreenElement ||
-  document.mozFullScreenElement ||
-  document.msFullscreenElement
-);
-
-watch(
-  isFullscreen,
-  full => {
-    screenIcon.value = full ? ExitFullscreen : Fullscreen;
-  },
-  {
-    immediate: true
-  }
-);
-</script>
-
-<template>
-  <span class="fullscreen-icon navbar-bg-hover" @click="toggle">
-    <IconifyIconOffline :icon="screenIcon" />
-  </span>
-</template>

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

@@ -1,33 +0,0 @@
-<script setup lang="ts">
-import MenuFold from "~icons/ri/menu-fold-fill";
-import MenuUnfold from "~icons/ri/menu-unfold-fill";
-
-interface Props {
-  isActive?: boolean;
-}
-
-withDefaults(defineProps<Props>(), {
-  isActive: false
-});
-
-const emit = defineEmits<{
-  (e: "toggleClick"): void;
-}>();
-
-const toggleClick = () => {
-  emit("toggleClick");
-};
-</script>
-
-<template>
-  <div
-    class="px-3 mr-1 navbar-bg-hover"
-    :title="isActive ? '点击折叠' : '点击展开'"
-    @click="toggleClick"
-  >
-    <IconifyIconOffline
-      :icon="isActive ? MenuFold : MenuUnfold"
-      class="inline-block! align-middle hover:text-primary dark:hover:text-white!"
-    />
-  </div>
-</template>

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>

src/layout/components/navbar.vue

@@ -1,14 +1,12 @@
 <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 LogoutCircleRLine from "~icons/ri/logout-circle-r-line";
-import Setting from "~icons/ri/settings-3-line";
+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";
 
 const {
   layout,
@@ -24,28 +22,26 @@ const {
 </script>
 
 <template>
-  <div class="navbar bg-[#fff] shadow-xs shadow-[rgba(0,21,41,0.08)]">
-    <LaySidebarTopCollapse
+  <div class="navbar bg-[#fff] shadow-sm shadow-[rgba(0,21,41,0.08)]">
+    <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" />
-      <!-- 全屏 -->
-      <LaySidebarFullScreen id="full-screen" />
-      <!-- 消息通知 -->
-      <LayNotice id="header-notice" />
+      <Search id="header-search" />
+      <!-- 通知 -->
+      <Notice id="header-notice" />
       <!-- 退出登录 -->
       <el-dropdown trigger="click">
         <span class="el-dropdown-link navbar-bg-hover select-none">
@@ -66,7 +62,7 @@ const {
       </el-dropdown>
       <span
         class="set-icon navbar-bg-hover"
-        title="打开系统配置"
+        title="打开项目配置"
         @click="onPanel"
       >
         <IconifyIconOffline :icon="Setting" />
@@ -124,7 +120,7 @@ const {
 }
 
 .logout {
-  width: 120px;
+  max-width: 120px;
 
   ::v-deep(.el-dropdown-menu__item) {
     display: inline-flex;

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"
+      }
+    ]
+  }
+];

src/layout/components/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 "~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 {

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

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>

src/layout/components/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 "~icons/ep/close";
+import Close from "@iconify-icons/ep/close";
 
 const target = ref(null);
 const show = ref<Boolean>(false);
@@ -15,7 +15,7 @@ const iconClass = computed(() => {
     "flex",
     "justify-center",
     "items-center",
-    "outline-hidden",
+    "outline-none",
     "rounded-[4px]",
     "cursor-pointer",
     "transition-colors",
@@ -49,9 +49,9 @@ onBeforeUnmount(() => {
     <div class="right-panel-background" />
     <div ref="target" class="right-panel bg-bg_color">
       <div
-        class="project-configuration border-0 border-b-[1px] border-solid border-[var(--pure-border-color)]"
+        class="project-configuration border-b-[1px] border-solid border-[var(--pure-border-color)]"
       >
-        <h4 class="dark:text-white">系统配置</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>
@@ -74,7 +74,7 @@ onBeforeUnmount(() => {
       </el-scrollbar>
 
       <div
-        class="flex justify-end p-3 border-0 border-t-[1px] border-solid border-[var(--pure-border-color)]"
+        class="flex justify-end p-3 border-t-[1px] border-solid border-[var(--pure-border-color)]"
       >
         <el-button
           v-tippy="{
@@ -117,8 +117,8 @@ onBeforeUnmount(() => {
   width: 100%;
   max-width: 280px;
   box-shadow: 0 0 15px 0 rgb(0 0 0 / 5%);
-  transform: translate(100%);
   transition: all 0.25s cubic-bezier(0.7, 0.3, 0.1, 1);
+  transform: translate(100%);
 }
 
 .show {

src/layout/components/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 ArrowUpLine from "~icons/ri/arrow-up-line";
-import ArrowDownLine from "~icons/ri/arrow-down-line";
+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>

src/layout/components/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

src/layout/components/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 "~icons/ep/star";
-import CloseIcon from "~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)"
   />

src/layout/components/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 "~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>

src/layout/components/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>

src/layout/components/search/components/index.ts

@@ -0,0 +1,3 @@
+import SearchModal from "./SearchModal.vue";
+
+export { SearchModal };

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

src/layout/components/setting/index.vue

@@ -9,21 +9,20 @@ 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 { useDark, useGlobal, debounce } from "@pureadmin/utils";
+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";
-import { useDark, useGlobal, debounce, isNumber } from "@pureadmin/utils";
 
-import Check from "~icons/ep/check";
-import LeftArrow from "~icons/ri/arrow-left-s-line?width=20&height=20";
-import RightArrow from "~icons/ri/arrow-right-s-line?width=20&height=20";
-import DayIcon from "@/assets/svg/day.svg?component";
-import DarkIcon from "@/assets/svg/dark.svg?component";
-import SystemIcon from "@/assets/svg/system.svg?component";
+import Check from "@iconify-icons/ep/check";
+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 +46,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);
 }
 
@@ -63,8 +64,7 @@ const settings = reactive({
   showLogo: $storage.configure.showLogo,
   showModel: $storage.configure.showModel,
   hideFooter: $storage.configure.hideFooter,
-  multiTagsCache: $storage.configure.multiTagsCache,
-  stretch: $storage.configure.stretch
+  multiTagsCache: $storage.configure.multiTagsCache
 });
 
 const getThemeColorStyle = computed(() => {
@@ -141,32 +141,6 @@ function setFalse(Doms): any {
   });
 }
 
-/** 页宽 */
-const stretchTypeOptions = computed<Array<OptionsType>>(() => {
-  return [
-    {
-      label: "固定",
-      tip: "紧凑页面，轻松找到所需信息",
-      value: "fixed"
-    },
-    {
-      label: "自定义",
-      tip: "最小1280、最大1600",
-      value: "custom"
-    }
-  ];
-});
-
-const setStretch = value => {
-  settings.stretch = value;
-  storageConfigureChange("stretch", value);
-};
-
-const stretchTypeChange = ({ option }) => {
-  const { value } = option;
-  value === "custom" ? setStretch(1440) : setStretch(false);
-};
-
 /** 主题色 激活选择项 */
 const getThemeColor = computed(() => {
   return current => {
@@ -186,29 +160,25 @@ const getThemeColor = computed(() => {
   };
 });
 
-const pClass = computed(() => {
-  return ["mb-[12px]!", "font-medium", "text-sm", "dark:text-white"];
-});
-
 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,8 +186,7 @@ const themeOptions = computed<Array<OptionsType>>(() => {
   ];
 });
 
-const markOptions = computed<Array<OptionsType>>(() => {
-  return [
+const markOptions: Array<OptionsType> = [
   {
     label: "灵动",
     tip: "灵动标签，添趣生辉",
@@ -227,14 +196,8 @@ const markOptions = computed<Array<OptionsType>>(() => {
     label: "卡片",
     tip: "卡片标签，高效浏览",
     value: "card"
-    },
-    {
-      label: "谷歌",
-      tip: "谷歌风格，经典美观",
-      value: "chrome"
   }
-  ];
-});
+];
 
 /** 设置导航模式 */
 function setLayoutModel(layout: string) {
@@ -297,7 +260,7 @@ function watchSystemThemeChange() {
 }
 
 onBeforeMount(() => {
-  /* 初始化系统配置 */
+  /* 初始化项目配置 */
   nextTick(() => {
     watchSystemThemeChange();
     settings.greyVal &&
@@ -313,11 +276,10 @@ onUnmounted(() => removeMatchMedia);
 </script>
 
 <template>
-  <LayPanel>
-    <div class="p-5">
-      <p :class="pClass">整体风格</p>
+  <panel>
+    <div class="p-6">
+      <p class="mb-3 font-medium text-sm dark:text-white">整体风格</p>
       <Segmented
-        resize
         class="select-none"
         :modelValue="overallStyle === 'system' ? 2 : dataTheme ? 1 : 0"
         :options="themeOptions"
@@ -333,7 +295,7 @@ onUnmounted(() => removeMatchMedia);
         "
       />
 
-      <p :class="['mt-5!', pClass]">主题色</p>
+      <p class="mt-5 mb-3 font-medium text-sm dark:text-white">主题色</p>
       <ul class="theme-color">
         <li
           v-for="(item, index) in themeColors"
@@ -352,7 +314,7 @@ onUnmounted(() => removeMatchMedia);
         </li>
       </ul>
 
-      <p :class="['mt-5!', pClass]">导航模式</p>
+      <p class="mt-5 mb-3 font-medium text-sm dark:text-white">导航模式</p>
       <ul class="pure-theme">
         <li
           ref="verticalRef"
@@ -394,58 +356,15 @@ onUnmounted(() => removeMatchMedia);
         </li>
       </ul>
 
-      <span v-if="useAppStoreHook().getViewportWidth > 1280">
-        <p :class="['mt-5!', pClass]">页宽</p>
+      <p class="mt-5 mb-3 font-medium text-base dark:text-white">页签风格</p>
       <Segmented
-          resize
-          class="mb-2 select-none"
-          :modelValue="isNumber(settings.stretch) ? 1 : 0"
-          :options="stretchTypeOptions"
-          @change="stretchTypeChange"
-        />
-        <el-input-number
-          v-if="isNumber(settings.stretch)"
-          v-model="settings.stretch as number"
-          :min="1280"
-          :max="1600"
-          controls-position="right"
-          @change="value => setStretch(value)"
-        />
-        <button
-          v-else
-          v-ripple="{ class: 'text-gray-300' }"
-          class="bg-transparent flex-c w-full h-20 rounded-md border border-[var(--pure-border-color)]"
-          @click="setStretch(!settings.stretch)"
-        >
-          <div
-            class="flex-bc transition-all duration-300"
-            :class="[settings.stretch ? 'w-[24%]' : 'w-[50%]']"
-            style="color: var(--el-color-primary)"
-          >
-            <IconifyIconOffline
-              :icon="settings.stretch ? RightArrow : LeftArrow"
-            />
-            <div
-              class="grow border-0 border-b border-dashed"
-              style="border-color: var(--el-color-primary)"
-            />
-            <IconifyIconOffline
-              :icon="settings.stretch ? LeftArrow : RightArrow"
-            />
-          </div>
-        </button>
-      </span>
-
-      <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"
       />
 
-      <p class="mt-5! font-medium text-sm dark:text-white">界面显示</p>
+      <p class="mt-5 mb-1 font-medium text-sm dark:text-white">界面显示</p>
       <ul class="setting">
         <li>
           <span class="dark:text-white">灰色模式</span>
@@ -511,7 +430,7 @@ onUnmounted(() => removeMatchMedia);
         </li>
       </ul>
     </div>
-  </LayPanel>
+  </panel>
 </template>
 
 <style lang="scss" scoped>
@@ -624,7 +543,7 @@ onUnmounted(() => removeMatchMedia);
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 3px 0;
+    padding: 4px 0;
     font-size: 14px;
   }
 }

src/layout/components/sidebar/breadCrumb.vue

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

src/layout/components/sidebar/extraIcon.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>

src/layout/components/sidebar/horizontal.vue

@@ -1,34 +1,25 @@
 <script setup lang="ts">
-import { emitter } from "@/utils/mitt";
+import Search from "../search/index.vue";
+import Notice from "../notice/index.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 "~icons/ri/logout-circle-r-line";
-import Setting from "~icons/ri/settings-3-line";
+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 +30,6 @@ const defaultActive = computed(() =>
 nextTick(() => {
   menuRef.value?.handleResize();
 });
-
-onMounted(() => {
-  emitter.on("logoChange", key => {
-    showLogo.value = key;
-  });
-});
 </script>
 
 <template>
@@ -52,18 +37,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 +58,9 @@ onMounted(() => {
     </el-menu>
     <div class="horizontal-header-right">
       <!-- 菜单搜索 -->
-      <LaySearch id="header-search" />
-      <!-- 全屏 -->
-      <LaySidebarFullScreen id="full-screen" />
-      <!-- 消息通知 -->
-      <LayNotice id="header-notice" />
+      <Search id="header-search" />
+      <!-- 通知 -->
+      <Notice id="header-notice" />
       <!-- 退出登录 -->
       <el-dropdown trigger="click">
         <span class="el-dropdown-link navbar-bg-hover">
@@ -97,7 +81,7 @@ onMounted(() => {
       </el-dropdown>
       <span
         class="set-icon navbar-bg-hover"
-        title="打开系统配置"
+        title="打开项目配置"
         @click="onPanel"
       >
         <IconifyIconOffline :icon="Setting" />
@@ -112,7 +96,7 @@ onMounted(() => {
 }
 
 .logout {
-  width: 120px;
+  max-width: 120px;
 
   ::v-deep(.el-dropdown-menu__item) {
     display: inline-flex;

src/layout/components/sidebar/leftCollapse.vue

@@ -3,13 +3,13 @@ import { computed } from "vue";
 import { useGlobal } from "@pureadmin/utils";
 import { useNav } from "@/layout/hooks/useNav";
 
-import MenuFold from "~icons/ri/menu-fold-fill";
+import MenuFold from "@iconify-icons/ri/menu-fold-fill";
 
 interface Props {
-  isActive?: boolean;
+  isActive: boolean;
 }
 
-withDefaults(defineProps<Props>(), {
+const props = withDefaults(defineProps<Props>(), {
   isActive: false
 });
 
@@ -21,7 +21,7 @@ const iconClass = computed(() => {
     "mb-1",
     "w-[16px]",
     "h-[16px]",
-    "inline-block!",
+    "inline-block",
     "align-middle",
     "cursor-pointer",
     "duration-[100ms]"
@@ -41,24 +41,24 @@ const toggleClick = () => {
 </script>
 
 <template>
-  <div class="left-collapse">
+  <div class="collapse-container">
     <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>
 </template>
 
 <style lang="scss" scoped>
-.left-collapse {
+.collapse-container {
   position: absolute;
   bottom: 0;
   width: 100%;

src/layout/components/sidebar/linkItem.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;
 }>();

src/layout/components/sidebar/logo.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 ?? '/'"
@@ -60,11 +60,11 @@ const { title, getLogo } = useNav();
       height: 32px;
       margin: 2px 0 0 12px;
       overflow: hidden;
-      text-overflow: ellipsis;
       font-size: 18px;
       font-weight: 600;
       line-height: 32px;
-      color: var(--pure-theme-sub-menu-active-text);
+      color: $subMenuActiveText;
+      text-overflow: ellipsis;
       white-space: nowrap;
     }
   }

src/layout/components/sidebar/mixNav.vue

@@ -1,17 +1,15 @@
 <script setup lang="ts">
+import extraIcon from "./extraIcon.vue";
+import Search from "../search/index.vue";
+import Notice from "../notice/index.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 "~icons/ri/logout-circle-r-line";
-import Setting from "~icons/ri/settings-3-line";
+import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
+import Setting from "@iconify-icons/ri/settings-3-line";
 
 const menuRef = ref();
 const defaultActive = ref(null);
@@ -85,18 +83,16 @@ 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" />
-      <!-- 全屏 -->
-      <LaySidebarFullScreen id="full-screen" />
-      <!-- 消息通知 -->
-      <LayNotice id="header-notice" />
+      <Search id="header-search" />
+      <!-- 通知 -->
+      <Notice id="header-notice" />
       <!-- 退出登录 -->
       <el-dropdown trigger="click">
         <span class="el-dropdown-link navbar-bg-hover select-none">
@@ -117,7 +113,7 @@ watch(
       </el-dropdown>
       <span
         class="set-icon navbar-bg-hover"
-        title="打开系统配置"
+        title="打开项目配置"
         @click="onPanel"
       >
         <IconifyIconOffline :icon="Setting" />
@@ -132,7 +128,7 @@ watch(
 }
 
 .logout {
-  width: 120px;
+  max-width: 120px;
 
   ::v-deep(.el-dropdown-menu__item) {
     display: inline-flex;

src/layout/components/sidebar/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,
@@ -16,10 +16,10 @@ import {
   useAttrs
 } from "vue";
 
-import ArrowUp from "~icons/ep/arrow-up-bold";
-import EpArrowDown from "~icons/ep/arrow-down-bold";
-import ArrowLeft from "~icons/ep/arrow-left-bold";
-import ArrowRight from "~icons/ep/arrow-right-bold";
+import ArrowUp from "@iconify-icons/ep/arrow-up-bold";
+import EpArrowDown from "@iconify-icons/ep/arrow-down-bold";
+import ArrowLeft from "@iconify-icons/ep/arrow-left-bold";
+import ArrowRight from "@iconify-icons/ep/arrow-right-bold";
 
 const attrs = useAttrs();
 const { layout, isCollapse, tooltipEffect, getDivStyle } = useNav();
@@ -60,21 +60,6 @@ const getSubMenuIconStyle = computed((): CSSProperties => {
   };
 });
 
-const textClass = computed(() => {
-  const item = props.item;
-  const baseClass = "w-full! text-inherit!";
-  if (
-    layout.value !== "horizontal" &&
-    isCollapse.value &&
-    !toRaw(item.meta.icon) &&
-    ((layout.value === "vertical" && item.parentId === null) ||
-      (layout.value === "mix" && item.pathList.length === 2))
-  ) {
-    return `${baseClass} min-w-[54px]! text-center! px-3!`;
-  }
-  return baseClass;
-});
-
 const expandCloseIcon = computed(() => {
   if (!getConfig()?.MenuArrowIconNoTransition) return "";
   return {
@@ -113,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"
@@ -133,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"
       >
@@ -141,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! px-3! min-w-[54px]! text-center! text-inherit!"
+        class="!px-4 !text-inherit"
       >
         {{ onlyOneChild.meta.title }}
       </el-text>
@@ -170,54 +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
+            toRaw(props.item.meta.icon) &&
+            props.item.parentId === null
           )
         "
         :tippyProps="{
           offset: [0, -10],
           theme: tooltipEffect
         }"
-        :class="textClass"
+        :class="{
+          '!text-inherit': true,
+          '!px-4':
+            layout !== 'horizontal' &&
+            isCollapse &&
+            !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"

src/layout/components/sidebar/topCollapse.vue

@@ -0,0 +1,33 @@
+<script setup lang="ts">
+import MenuFold from "@iconify-icons/ri/menu-fold-fill";
+import MenuUnfold from "@iconify-icons/ri/menu-unfold-fill";
+
+interface Props {
+  isActive: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  isActive: false
+});
+
+const emit = defineEmits<{
+  (e: "toggleClick"): void;
+}>();
+
+const toggleClick = () => {
+  emit("toggleClick");
+};
+</script>
+
+<template>
+  <div
+    class="px-3 mr-1 navbar-bg-hover"
+    :title="props.isActive ? '点击折叠' : '点击展开'"
+    @click="toggleClick"
+  >
+    <IconifyIconOffline
+      :icon="props.isActive ? MenuFold : MenuUnfold"
+      class="inline-block align-middle hover:text-primary dark:hover:!text-white"
+    />
+  </div>
+</template>

src/layout/components/sidebar/vertical.vue

@@ -1,19 +1,17 @@
 <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 { 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);
 const showLogo = ref(
   storageLocal().getItem<StorageConfigs>(
     `${responsiveStorageNameSpace()}configure`
@@ -90,15 +88,14 @@ onBeforeUnmount(() => {
   <div
     v-loading="loading"
     :class="['sidebar-container', showLogo ? 'has-logo' : 'no-logo']"
-    @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 +105,7 @@ onBeforeUnmount(() => {
         :popper-effect="tooltipEffect"
         :default-active="defaultActive"
       >
-        <LaySidebarItem
+        <sidebar-item
           v-for="routes in menuData"
           :key="routes.path"
           :item="routes"
@@ -117,12 +114,7 @@ onBeforeUnmount(() => {
         />
       </el-menu>
     </el-scrollbar>
-    <LaySidebarCenterCollapse
-      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"

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

src/layout/components/tag/index.vue

@@ -3,12 +3,10 @@ import { emitter } from "@/utils/mitt";
 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 { useFullscreen, onClickOutside } from "@vueuse/core";
 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,
@@ -17,11 +15,11 @@ import {
   useResizeObserver
 } from "@pureadmin/utils";
 
-import ExitFullscreen from "~icons/ri/fullscreen-exit-fill";
-import Fullscreen from "~icons/ri/fullscreen-fill";
-import ArrowDown from "~icons/ri/arrow-down-s-line";
-import ArrowRightSLine from "~icons/ri/arrow-right-s-line";
-import ArrowLeftSLine from "~icons/ri/arrow-left-s-line";
+import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
+import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
+import ArrowDown from "@iconify-icons/ri/arrow-down-s-line";
+import ArrowRightSLine from "@iconify-icons/ri/arrow-right-s-line";
+import ArrowLeftSLine from "@iconify-icons/ri/arrow-left-s-line";
 
 const {
   Close,
@@ -36,7 +34,6 @@ const {
   buttonLeft,
   showModel,
   translateX,
-  isFixedTag,
   pureSetting,
   activeIndex,
   getTabStyle,
@@ -60,10 +57,7 @@ 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 { isFullscreen, toggle } = useFullscreen();
 
 const dynamicTagView = async () => {
   await nextTick();
@@ -233,13 +227,10 @@ function deleteDynamicTag(obj: any, current: any, tag?: string) {
     other?: boolean
   ): void => {
     if (other) {
-      useMultiTagsStoreHook().handleTags(
-        "equal",
-        [
-          VITE_HIDE_HOME === "false" ? fixedTags : toRaw(getTopMenu()),
+      useMultiTagsStoreHook().handleTags("equal", [
+        VITE_HIDE_HOME === "false" ? routerArrays[0] : toRaw(getTopMenu()),
         obj
-        ].flat()
-      );
+      ]);
     } else {
       useMultiTagsStoreHook().handleTags("splice", "", {
         startIndex,
@@ -252,7 +243,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,23 +320,35 @@ 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:
+      // 整体页面全屏
+      toggle();
+      setTimeout(() => {
+        if (isFullscreen.value) {
+          tagsViews[6].icon = ExitFullscreen;
+          tagsViews[6].text = "退出全屏";
+        } else {
+          tagsViews[6].icon = Fullscreen;
+          tagsViews[6].text = "全屏";
+        }
+      }, 100);
+      break;
+    case 7:
       // 内容区全屏
       onContentFullScreen();
       setTimeout(() => {
         if (pureSetting.hiddenSideBar) {
-          tagsViews[6].icon = ExitFullscreen;
-          tagsViews[6].text = "内容区退出全屏";
+          tagsViews[7].icon = ExitFullscreen;
+          tagsViews[7].text = "内容区退出全屏";
         } else {
-          tagsViews[6].icon = Fullscreen;
-          tagsViews[6].text = "内容区全屏";
+          tagsViews[7].icon = Fullscreen;
+          tagsViews[7].text = "内容区全屏";
         }
       }, 100);
       break;
@@ -372,14 +375,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 +395,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 +413,6 @@ function showMenuModel(
       tagsViews[v].disabled = false;
     });
     tagsViews[2].disabled = true;
-    fixedTagDisabled();
   } else if (currentIndex === 1 && routeLength === 2) {
     disabledMenus(false);
     // 左侧的菜单是顶级菜单，右侧不存在别的菜单
@@ -429,7 +420,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 +427,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,7 +497,7 @@ function tagOnClick(item) {
   } else {
     router.push({ path });
   }
-  emitter.emit("tagOnClick", item);
+  // showMenuModel(item?.path, item?.query);
 }
 
 onClickOutside(contextmenuRef, closeMenu, {
@@ -521,6 +509,11 @@ watch(route, () => {
   dynamicTagView();
 });
 
+watch(isFullscreen, () => {
+  tagsViews[6].icon = Fullscreen;
+  tagsViews[6].text = "全屏";
+});
+
 onMounted(() => {
   if (!instance) return;
 
@@ -566,7 +559,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">
@@ -574,28 +566,20 @@ 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!"
+            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) ||
+              iconIsActive(item, index) ||
               (index === activeIndex && index !== 0)
             "
             class="el-icon-close"
@@ -608,23 +592,6 @@ onBeforeUnmount(() => {
             :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>
         </div>
       </div>
     </div>

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<{

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 = {

src/layout/hooks/useLayout.ts

@@ -35,8 +35,7 @@ export function useLayout() {
         hideFooter: $config.HideFooter ?? true,
         showLogo: $config?.ShowLogo ?? true,
         showModel: $config?.ShowModel ?? "smart",
-        multiTagsCache: $config?.MultiTagsCache ?? false,
-        stretch: $config?.Stretch ?? false
+        multiTagsCache: $config?.MultiTagsCache ?? false
       };
     }
   };