release: update 5.5.0

release: update `5.2.0`

.eslintignore

@@ -1,11 +0,0 @@
-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

@@ -1,120 +0,0 @@
-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

@@ -7,10 +7,14 @@
     "prettier --cache --write--parser json"
   ],
   "package.json": ["prettier --cache --write"],
-  "*.vue": ["prettier --write", "eslint --cache --fix", "stylelint --fix"],
+  "*.vue": [
+    "prettier --write",
+    "eslint --cache --fix",
+    "stylelint --fix --allow-empty-input"
+  ],
   "*.{css,scss,html}": [
     "prettier --cache --ignore-unknown --write",
-    "stylelint --fix"
+    "stylelint --fix --allow-empty-input"
   ],
   "*.md": ["prettier --cache --ignore-unknown --write"]
 }

.nvmrc

@@ -1 +1 @@
-v20.11.1
+v20.12.2

README.en-US.md

@@ -8,18 +8,23 @@
 
 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`
 
-## Supporting Video
+## Supporting video
 
-- [Click Watch Tutorial](https://www.bilibili.com/video/BV1kg411v7QT)
+[Click me to view UI design](https://www.bilibili.com/video/BV17g411T7rq)  
-- [Click Watch UI Design](https://www.bilibili.com/video/BV17g411T7rq)
+[Click me to view the rapid development tutorial](https://www.bilibili.com/video/BV1kg411v7QT)
 
-## Docs
+## Nanny-level documents
 
-- [documentation site](https://yiming_chang.gitee.io/pure-admin-doc)
+[Click me to view vue-pure-admin documentation](https://pure-admin.github.io/pure-admin-doc)  
+[Click me to view @pureadmin/utils documentation](https://pure-admin-utils.netlify.app)
+
+## Quality service, software outsourcing, sponsorship support
+
+[Click me to view details](https://pure-admin.github.io/pure-admin-doc/pages/service/)
 
 ## 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
 
@@ -27,7 +32,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

@@ -14,16 +14,21 @@
 
 ## 配套视频
 
-- [点我查看教程](https://www.bilibili.com/video/BV1kg411v7QT)
+[点我查看 UI 设计](https://www.bilibili.com/video/BV17g411T7rq)  
-- [点我查看 UI 设计](https://www.bilibili.com/video/BV17g411T7rq)
+[点我查看快速开发教程](https://www.bilibili.com/video/BV1kg411v7QT)
 
 ## 配套保姆级文档
 
-- [查看文档](https://yiming_chang.gitee.io/pure-admin-doc)
+[点我查看 vue-pure-admin 文档](https://pure-admin.github.io/pure-admin-doc)  
+[点我查看 @pureadmin/utils 文档](https://pure-admin-utils.netlify.app)
+
+## 优质服务、软件外包、赞助支持
+
+[点我查看详情](https://pure-admin.github.io/pure-admin-doc/pages/service/)
 
 ## 预览
 
-- [查看预览](https://pure-admin-thin.netlify.app/#/login)
+[查看预览](https://pure-admin-thin.netlify.app/#/login)
 
 ## 维护者
 
@@ -31,7 +36,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,7 +3,6 @@ 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

@@ -7,7 +7,7 @@ import boxen, { type Options as BoxenOptions } from "boxen";
 dayjs.extend(duration);
 
 const welcomeMessage = gradientString("cyan", "magenta").multiline(
-  `Hello! 欢迎使用 pure-admin 开源项目\n我们为您精心准备了下面两个贴心的保姆级文档\nhttps://yiming_chang.gitee.io/pure-admin-doc\nhttps://pure-admin-utils.netlify.app`
+  `您好! 欢迎使用 pure-admin 开源项目\n我们为您精心准备了下面两个贴心的保姆级文档\nhttps://pure-admin.github.io/pure-admin-doc\nhttps://pure-admin-utils.netlify.app`
 );
 
 const boxenOptions: BoxenOptions = {

build/utils.ts

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

eslint.config.js

@@ -10,7 +10,14 @@ import pluginTypeScript from "@typescript-eslint/eslint-plugin";
 export default defineFlatConfig([
   {
     ...js.configs.recommended,
-    ignores: ["src/assets/**", "src/**/iconfont/**"],
+    ignores: [
+      "**/.*",
+      "dist/*",
+      "*.d.ts",
+      "public/*",
+      "src/assets/**",
+      "src/**/iconfont/**"
+    ],
     languageOptions: {
       globals: {
         // index.d.ts

mock/login.ts

@@ -10,7 +10,9 @@ export default defineFakeRoute([
         return {
           success: true,
           data: {
+            avatar: "https://avatars.githubusercontent.com/u/44761321",
             username: "admin",
+            nickname: "小铭",
             // 一个用户可能有多个角色
             roles: ["admin"],
             accessToken: "eyJhbGciOiJIUzUxMiJ9.admin",
@@ -22,8 +24,9 @@ export default defineFakeRoute([
         return {
           success: true,
           data: {
+            avatar: "https://avatars.githubusercontent.com/u/52823142",
             username: "common",
-            // 一个用户可能有多个角色
+            nickname: "小林",
             roles: ["common"],
             accessToken: "eyJhbGciOiJIUzUxMiJ9.common",
             refreshToken: "eyJhbGciOiJIUzUxMiJ9.commonRefresh",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pure-admin-thin",
-  "version": "5.1.0",
+  "version": "5.5.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -13,7 +13,6 @@
     "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}\"",
@@ -39,7 +38,7 @@
     "url": "git+https://github.com/pure-admin/pure-admin-thin.git"
   },
   "bugs": {
-    "url": "https://github.com/pure-admin/pure-admin-thin/issues"
+    "url": "https://github.com/pure-admin/vue-pure-admin/issues"
   },
   "license": "MIT",
   "author": {
@@ -48,80 +47,79 @@
     "url": "https://github.com/xiaoxian521"
   },
   "dependencies": {
-    "@pureadmin/descriptions": "^1.2.0",
+    "@pureadmin/descriptions": "^1.2.1",
     "@pureadmin/table": "^3.1.2",
-    "@pureadmin/utils": "^2.4.5",
+    "@pureadmin/utils": "^2.4.7",
     "@vueuse/core": "^10.9.0",
     "@vueuse/motion": "^2.1.0",
     "animate.css": "^4.1.1",
-    "axios": "^1.6.7",
+    "axios": "^1.6.8",
-    "dayjs": "^1.11.10",
+    "dayjs": "^1.11.11",
     "echarts": "^5.5.0",
-    "element-plus": "^2.6.0",
+    "element-plus": "2.7.1",
     "js-cookie": "^3.0.5",
     "localforage": "^1.10.0",
     "mitt": "^3.0.1",
     "nprogress": "^0.2.0",
     "path": "^0.12.7",
     "pinia": "^2.1.7",
-    "pinyin-pro": "^3.19.6",
+    "pinyin-pro": "^3.20.4",
-    "qs": "^6.11.2",
+    "qs": "^6.12.1",
     "responsive-storage": "^2.2.0",
     "sortablejs": "^1.15.2",
-    "vue": "^3.4.21",
+    "vue": "^3.4.27",
-    "vue-router": "^4.3.0",
+    "vue-router": "^4.3.2",
     "vue-tippy": "^6.4.1",
-    "vue-types": "^5.1.1"
+    "vue-types": "^5.1.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "^18.6.1",
+    "@commitlint/cli": "^19.3.0",
-    "@commitlint/config-conventional": "^18.6.2",
+    "@commitlint/config-conventional": "^19.2.2",
-    "@commitlint/types": "^18.6.1",
+    "@commitlint/types": "^19.0.3",
-    "@eslint/js": "^8.57.0",
+    "@eslint/js": "^9.2.0",
     "@faker-js/faker": "^8.4.1",
     "@iconify-icons/ep": "^1.2.12",
     "@iconify-icons/ri": "^1.2.10",
-    "@iconify/vue": "^4.1.1",
+    "@iconify/vue": "^4.1.2",
     "@pureadmin/theme": "^3.2.0",
-    "@types/gradient-string": "^1.1.5",
+    "@types/gradient-string": "^1.1.6",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.11.24",
+    "@types/node": "^20.12.11",
     "@types/nprogress": "^0.2.3",
-    "@types/qs": "^6.9.12",
+    "@types/qs": "^6.9.15",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^7.1.1",
+    "@typescript-eslint/eslint-plugin": "^7.8.0",
-    "@typescript-eslint/parser": "^7.1.1",
+    "@typescript-eslint/parser": "^7.8.0",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
-    "autoprefixer": "^10.4.18",
+    "autoprefixer": "^10.4.19",
     "boxen": "^7.1.1",
-    "cloc": "^2.11.0",
+    "cssnano": "^7.0.1",
-    "cssnano": "^6.0.5",
+    "eslint": "^9.2.0",
-    "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",
+    "eslint-plugin-vue": "^9.25.0",
     "gradient-string": "^2.0.2",
     "husky": "^9.0.11",
     "lint-staged": "^15.2.2",
-    "postcss": "^8.4.35",
+    "postcss": "^8.4.38",
-    "postcss-html": "^1.6.0",
+    "postcss-html": "^1.7.0",
-    "postcss-import": "^16.0.1",
+    "postcss-import": "^16.1.0",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.2.5",
     "rimraf": "^5.0.5",
     "rollup-plugin-visualizer": "^5.12.0",
-    "sass": "^1.71.1",
+    "sass": "^1.77.0",
-    "stylelint": "^16.2.1",
+    "stylelint": "^16.5.0",
-    "stylelint-config-recess-order": "^5.0.0",
+    "stylelint-config-recess-order": "^5.0.1",
     "stylelint-config-recommended-vue": "^1.5.0",
-    "stylelint-config-standard-scss": "^13.0.0",
+    "stylelint-config-standard-scss": "^13.1.0",
     "stylelint-prettier": "^5.0.0",
-    "svgo": "^3.2.0",
+    "svgo": "^3.3.0",
-    "tailwindcss": "^3.4.1",
+    "tailwindcss": "^3.4.3",
-    "typescript": "^5.3.3",
+    "typescript": "^5.4.5",
-    "vite": "^5.1.5",
+    "vite": "^5.2.11",
     "vite-plugin-cdn-import": "^0.3.5",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-fake-server": "^2.1.1",
@@ -143,6 +141,11 @@
       "w3c-hr-time": "*",
       "stable": "*",
       "abab": "*"
+    },
+    "peerDependencyRules": {
+      "allowedVersions": {
+        "eslint": "9"
+      }
     }
   }
 }

public/platform-config.json

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

src/App.vue

@@ -8,8 +8,9 @@
 <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,9 +3,13 @@ import { http } from "@/utils/http";
 export type UserResult = {
   success: boolean;
   data: {
+    /** 头像 */
+    avatar: string;
     /** 用户名 */
     username: string;
-    /** 当前登陆用户的角色 */
+    /** 昵称 */
+    nickname: string;
+    /** 当前登录用户的角色 */
     roles: Array<string>;
     /** `token` */
     accessToken: string;
@@ -33,7 +37,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/components/ReDialog/index.ts

@@ -29,9 +29,11 @@ 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);
-  }, 200);
+  }, closeDelay);
 };
 
 /**
@@ -51,8 +53,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#L13
+ * 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#L20
+ * https://github.com/pure-admin/vue-pure-admin/blob/main/src/App.vue#L22
  */
 const ReDialog = withInstall(reDialog);
 

src/components/ReDialog/index.vue

@@ -1,16 +1,20 @@
 <script setup lang="ts">
 import {
-  closeDialog,
-  dialogStore,
   type EventType,
   type ButtonProps,
-  type DialogOptions
+  type DialogOptions,
+  closeDialog,
+  dialogStore
 } from "./index";
 import { ref, computed } from "vue";
 import { isFunction } from "@pureadmin/utils";
 import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
 import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
 
+defineOptions({
+  name: "ReDialog"
+});
+
 const fullscreen = ref(false);
 
 const footerButtons = computed(() => {
@@ -37,6 +41,7 @@ const footerButtons = computed(() => {
             type: "primary",
             text: true,
             bg: true,
+            popconfirm: options?.popconfirm,
             btnClick: ({ dialog: { options, index } }) => {
               const done = () =>
                 closeDialog(options, index, { command: "sure" });
@@ -64,9 +69,10 @@ const fullscreenClass = computed(() => {
 function eventsCallBack(
   event: EventType,
   options: DialogOptions,
-  index: number
+  index: number,
+  isClickFullScreen = false
 ) {
-  fullscreen.value = options?.fullscreen ?? false;
+  if (!isClickFullScreen) fullscreen.value = options?.fullscreen ?? false;
   if (options?.[event] && isFunction(options?.[event])) {
     return options?.[event]({ options, index });
   }
@@ -108,7 +114,17 @@ function handleClose(
         <i
           v-if="!options?.fullscreen"
           :class="fullscreenClass"
-          @click="fullscreen = !fullscreen"
+          @click="
+            () => {
+              fullscreen = !fullscreen;
+              eventsCallBack(
+                'fullscreenCallBack',
+                { ...options, fullscreen },
+                index,
+                true
+              );
+            }
+          "
         >
           <IconifyIconOffline
             class="pure-dialog-svg"
@@ -138,9 +154,23 @@ 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-for="(btn, key) in footerButtons(options)"
+            v-else
-          :key="key"
             v-bind="btn"
             @click="
               btn.btnClick({
@@ -151,6 +181,7 @@ function handleClose(
           >
             {{ btn?.label }}
           </el-button>
+        </template>
       </span>
     </template>
   </el-dialog>

src/components/ReDialog/type.ts

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

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

@@ -4,7 +4,7 @@ import { IconifyIconOnline, IconifyIconOffline, FontIcon } from "../index";
 
 /**
  * 支持 `iconfont`、自定义 `svg` 以及 `iconify` 中所有的图标
- * @see 点击查看文档图标篇 {@link https://yiming_chang.gitee.io/pure-admin-doc/pages/icon/}
+ * @see 点击查看文档图标篇 {@link https://pure-admin.github.io/pure-admin-doc/pages/icon/}
  * @param icon 必传 图标
  * @param attrs 可选 iconType 属性
  * @returns Component

src/components/RePureTableBar/src/bar.tsx

@@ -1,5 +1,14 @@
+import Sortable from "sortablejs";
 import { useEpThemeStoreHook } from "@/store/modules/epTheme";
-import { defineComponent, ref, computed, type PropType, nextTick } from "vue";
+import {
+  type PropType,
+  ref,
+  unref,
+  computed,
+  nextTick,
+  defineComponent,
+  getCurrentInstance
+} from "vue";
 import {
   delay,
   cloneDeep,
@@ -8,12 +17,11 @@ import {
   getKeyList
 } from "@pureadmin/utils";
 
-import Sortable from "sortablejs";
+import DragIcon from "@/assets/table-bar/drag.svg?component";
-import DragIcon from "./svg/drag.svg?component";
+import ExpandIcon from "@/assets/table-bar/expand.svg?component";
-import ExpandIcon from "./svg/expand.svg?component";
+import RefreshIcon from "@/assets/table-bar/refresh.svg?component";
-import RefreshIcon from "./svg/refresh.svg?component";
+import SettingIcon from "@/assets/table-bar/settings.svg?component";
-import SettingIcon from "./svg/settings.svg?component";
+import CollapseIcon from "@/assets/table-bar/collapse.svg?component";
-import CollapseIcon from "./svg/collapse.svg?component";
 
 const props = {
   /** 头部最左边的标题 */
@@ -33,6 +41,10 @@ const props = {
   isExpandAll: {
     type: Boolean,
     default: true
+  },
+  tableKey: {
+    type: [String, Number] as PropType<string | number>,
+    default: "0"
   }
 };
 
@@ -45,6 +57,7 @@ export default defineComponent({
     const loading = ref(false);
     const checkAll = ref(true);
     const isIndeterminate = ref(false);
+    const instance = getCurrentInstance()!;
     const isExpandAll = ref(props.isExpandAll);
     const filterColumns = cloneDeep(props?.columns).filter(column =>
       isBoolean(column?.hide)
@@ -118,6 +131,7 @@ export default defineComponent({
     }
 
     function handleCheckedColumnsChange(value: string[]) {
+      checkedColumns.value = value;
       const checkedCount = value.length;
       checkAll.value = checkedCount === checkColumnList.length;
       isIndeterminate.value =
@@ -166,9 +180,9 @@ export default defineComponent({
     const rowDrop = (event: { preventDefault: () => void }) => {
       event.preventDefault();
       nextTick(() => {
-        const wrapper: HTMLElement = document.querySelector(
+        const wrapper: HTMLElement = (
-          ".el-checkbox-group>div"
+          instance?.proxy?.$refs[`GroupRef${unref(props.tableKey)}`] as any
-        );
+        ).$el.firstElementChild;
         Sortable.create(wrapper, {
           animation: 300,
           handle: ".drag-btn",
@@ -293,7 +307,8 @@ export default defineComponent({
                 <div class="pt-[6px] pl-[11px]">
                   <el-scrollbar max-height="36vh">
                     <el-checkbox-group
-                      v-model={checkedColumns.value}
+                      ref={`GroupRef${unref(props.tableKey)}`}
+                      modelValue={checkedColumns.value}
                       onChange={value => handleCheckedColumnsChange(value)}
                     >
                       <el-space
@@ -301,7 +316,7 @@ export default defineComponent({
                         alignment="flex-start"
                         size={0}
                       >
-                        {checkColumnList.map(item => {
+                        {checkColumnList.map((item, index) => {
                           return (
                             <div class="flex items-center">
                               <DragIcon
@@ -316,7 +331,8 @@ export default defineComponent({
                                 }) => rowDrop(event)}
                               />
                               <el-checkbox
-                                key={item}
+                                key={index}
+                                label={item}
                                 value={item}
                                 onChange={value =>
                                   handleCheckColumnListChange(value, item)

src/components/ReSegmented/src/index.css

@@ -1,11 +1,104 @@
 .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: 2px;
+  padding: var(--pure-segmented-track-padding);
-  font-size: 14px;
+  font-size: var(--el-font-size-base);
   color: rgba(0, 0, 0, 0.65);
   background-color: rgb(0 0 0 / 4%);
-  border-radius: 2px;
+  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;
+  transition: 0.1s;
 }
 
 .pure-segmented-group {
@@ -37,23 +130,6 @@
   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;
@@ -67,6 +143,7 @@
 .pure-segmented-item-label {
   display: flex;
   align-items: center;
+  justify-content: center;
 }
 
 .pure-segmented-item-icon svg {

src/components/ReSegmented/src/index.tsx

@@ -1,5 +1,14 @@
 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,
@@ -8,9 +17,6 @@ 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: {
@@ -22,6 +28,25 @@ 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
   }
 };
 
@@ -42,7 +67,7 @@ export default defineComponent({
       : ref(0);
 
     function handleChange({ option, index }, event: Event) {
-      if (option.disabled) return;
+      if (props.disabled || option.disabled) return;
       event.preventDefault();
       isNumber(props.modelValue)
         ? emit("update:modelValue", index)
@@ -52,6 +77,7 @@ export default defineComponent({
     }
 
     function handleMouseenter({ option, index }, event: Event) {
+      if (props.disabled) return;
       event.preventDefault();
       curMouseActive.value = index;
       if (option.disabled || curIndex.value === index) {
@@ -64,6 +90,7 @@ export default defineComponent({
     }
 
     function handleMouseleave(_, event: Event) {
+      if (props.disabled) return;
       event.preventDefault();
       curMouseActive.value = -1;
     }
@@ -71,12 +98,23 @@ 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 => {
@@ -85,11 +123,14 @@ export default defineComponent({
         });
       },
       {
-        deep: true,
         immediate: true
       }
     );
 
+    watch(() => props.size, handleResizeInit, {
+      immediate: true
+    });
+
     const rendLabel = () => {
       return props.options.map((option, index) => {
         return (
@@ -97,13 +138,15 @@ export default defineComponent({
             ref={`labelRef${index}`}
             class={[
               "pure-segmented-item",
-              option?.disabled && "pure-segmented-item-disabled"
+              (props.disabled || option?.disabled) &&
+                "pure-segmented-item-disabled"
             ]}
             style={{
               background:
                 curMouseActive.value === index ? segmentedItembg.value : "",
-              color:
+              color: props.disabled
-                !option.disabled &&
+                ? null
+                : !option.disabled &&
                     (curIndex.value === index || curMouseActive.value === index)
                   ? isDark.value
                     ? "rgba(255, 255, 255, 0.85)"
@@ -148,7 +191,14 @@ export default defineComponent({
     };
 
     return () => (
-      <div class="pure-segmented">
+      <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-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://yiming_chang.gitee.io/pure-admin-doc/pages/icon/#%E9%80%9A%E7%94%A8%E5%9B%BE%E6%A0%87-userendericon-hooks }
+   * @see {@link 用法参考 https://pure-admin.github.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,6 +1,10 @@
 <script lang="ts" setup>
 import { h, onMounted, ref, useSlots } from "vue";
-import { useTippy, type TippyOptions } from "vue-tippy";
+import { type TippyOptions, useTippy } from "vue-tippy";
+
+defineOptions({
+  name: "ReText"
+});
 
 const props = defineProps({
   // 行数

src/config/index.ts

@@ -1,5 +1,5 @@
-import type { App } from "vue";
 import axios from "axios";
+import type { App } from "vue";
 
 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/optimize/index.ts

@@ -1,9 +1,9 @@
 import {
-  isFunction,
-  isObject,
   isArray,
+  throttle,
   debounce,
-  throttle
+  isObject,
+  isFunction
 } from "@pureadmin/utils";
 import { useEventListener } from "@vueuse/core";
 import type { Directive, DirectiveBinding } from "vue";

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

@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import Footer from "./footer/index.vue";
+import LayFrame from "../lay-frame/index.vue";
-import { useGlobal } from "@pureadmin/utils";
+import LayFooter from "../lay-footer/index.vue";
-import KeepAliveFrame from "./keepAliveFrame/index.vue";
+import { useGlobal, isNumber } from "@pureadmin/utils";
-import backTop from "@/assets/svg/back_top.svg?component";
+import BackTopIcon from "@/assets/svg/back_top.svg?component";
 import { h, computed, Transition, defineComponent } from "vue";
 import { usePermissionStoreHook } from "@/store/modules/permission";
 
@@ -30,16 +30,28 @@ 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 ? "padding-top: 85px;" : "",
+    !hideTabs.value && layout ? "padding-top: 81px;" : "",
     hideTabs.value && !layout.value ? "padding-top: 48px;" : "",
-    !hideTabs.value && !layout.value ? "padding-top: 85px;" : "",
+    !hideTabs.value && !layout.value ? "padding-top: 81px;" : "",
     props.fixedHeader
       ? ""
       : `padding-top: 0;${
@@ -85,23 +97,26 @@ const transitionMain = defineComponent({
 
 <template>
   <section
-    :class="[props.fixedHeader ? 'app-main' : 'app-main-nofixed-header']"
+    :class="[fixedHeader ? 'app-main' : 'app-main-nofixed-header']"
     :style="getSectionStyle"
   >
     <router-view>
       <template #default="{ Component, route }">
-        <KeepAliveFrame :currComp="Component" :currRoute="route">
+        <LayFrame :currComp="Component" :currRoute="route">
           <template #default="{ Comp, fullPath, frameInfo }">
             <el-scrollbar
-              v-if="props.fixedHeader"
+              v-if="fixedHeader"
               :wrap-style="{
                 display: 'flex',
-                'flex-wrap': 'wrap'
+                'flex-wrap': 'wrap',
+                'max-width': getMainWidth,
+                margin: '0 auto',
+                transition: 'all 300ms cubic-bezier(0.4, 0, 0.2, 1)'
               }"
               :view-style="{
                 display: 'flex',
                 flex: 'auto',
-                overflow: 'auto',
+                overflow: 'hidden',
                 'flex-direction': 'column'
               }"
             >
@@ -109,7 +124,7 @@ const transitionMain = defineComponent({
                 title="回到顶部"
                 target=".app-main .el-scrollbar__wrap"
               >
-                <backTop />
+                <BackTopIcon />
               </el-backtop>
               <div class="grow">
                 <transitionMain :route="route">
@@ -133,7 +148,7 @@ const transitionMain = defineComponent({
                   />
                 </transitionMain>
               </div>
-              <Footer v-if="!hideFooter" />
+              <LayFooter v-if="!hideFooter" />
             </el-scrollbar>
             <div v-else class="grow">
               <transitionMain :route="route">
@@ -158,12 +173,12 @@ const transitionMain = defineComponent({
               </transitionMain>
             </div>
           </template>
-        </KeepAliveFrame>
+        </LayFrame>
       </template>
     </router-view>
 
     <!-- 页脚 -->
-    <Footer v-if="!hideFooter && !props.fixedHeader" />
+    <LayFooter v-if="!hideFooter && !fixedHeader" />
   </section>
 </template>
 

src/layout/components/lay-frame/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
   );
 });
-// 避免重新渲染 frameView
+// 避免重新渲染 LayFrame
 const normalComp = computed(() => !keep.value && props.currComp);
 
 watch(useMultiTagsStoreHook().multiTags, (tags: any) => {
@@ -63,10 +63,9 @@ watch(
   }
 );
 </script>
-
 <template>
   <template v-for="[fullPath, Comp] in compList" :key="fullPath">
-    <div v-show="fullPath === props.currRoute.fullPath" class="w-full h-full">
+    <div v-show="fullPath === currRoute.fullPath" class="w-full h-full">
       <slot
         :fullPath="fullPath"
         :Comp="Comp"
@@ -75,6 +74,6 @@ watch(
     </div>
   </template>
   <div v-show="!keep" class="w-full h-full">
-    <slot :Comp="normalComp" :fullPath="props.currRoute.fullPath" frameInfo />
+    <slot :Comp="normalComp" :fullPath="currRoute.fullPath" frameInfo />
   </div>
 </template>

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

@@ -1,10 +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 Breadcrumb from "./sidebar/breadCrumb.vue";
+import LaySearch from "../lay-search/index.vue";
-import topCollapse from "./sidebar/topCollapse.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 "@iconify-icons/ri/logout-circle-r-line";
 import Setting from "@iconify-icons/ri/settings-3-line";
 
@@ -23,25 +25,27 @@ const {
 
 <template>
   <div class="navbar bg-[#fff] shadow-sm shadow-[rgba(0,21,41,0.08)]">
-    <topCollapse
+    <LaySidebarTopCollapse
       v-if="device === 'mobile'"
       class="hamburger-container"
       :is-active="pureApp.sidebar.opened"
       @toggleClick="toggleSideBar"
     />
 
-    <Breadcrumb
+    <LaySidebarBreadCrumb
       v-if="layout !== 'mix' && device !== 'mobile'"
       class="breadcrumb-container"
     />
 
-    <mixNav v-if="layout === 'mix'" />
+    <LayNavMix v-if="layout === 'mix'" />
 
     <div v-if="layout === 'vertical'" class="vertical-header-right">
       <!-- 菜单搜索 -->
-      <Search id="header-search" />
+      <LaySearch id="header-search" />
-      <!-- 通知 -->
+      <!-- 全屏 -->
-      <Notice id="header-notice" />
+      <LaySidebarFullScreen id="full-screen" />
+      <!-- 消息通知 -->
+      <LayNotice id="header-notice" />
       <!-- 退出登录 -->
       <el-dropdown trigger="click">
         <span class="el-dropdown-link navbar-bg-hover select-none">
@@ -62,7 +66,7 @@ const {
       </el-dropdown>
       <span
         class="set-icon navbar-bg-hover"
-        title="打开项目配置"
+        title="打开系统配置"
         @click="onPanel"
       >
         <IconifyIconOffline :icon="Setting" />
@@ -120,7 +124,7 @@ const {
 }
 
 .logout {
-  max-width: 120px;
+  width: 120px;
 
   ::v-deep(.el-dropdown-menu__item) {
     display: inline-flex;

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

@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import { ListItem } from "./data";
+import { ListItem } from "../data";
 import { ref, PropType, nextTick } from "vue";
 import { useNav } from "@/layout/hooks/useNav";
 import { deviceDetection } from "@pureadmin/utils";
 
-const props = defineProps({
+defineProps({
   noticeItem: {
     type: Object as PropType<ListItem>,
     default: () => {}
@@ -52,9 +52,9 @@ function hoverDescription(event, description) {
     class="notice-container border-b-[1px] border-solid border-[#f0f0f0] dark:border-[#303030]"
   >
     <el-avatar
-      v-if="props.noticeItem.avatar"
+      v-if="noticeItem.avatar"
       :size="30"
-      :src="props.noticeItem.avatar"
+      :src="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="props.noticeItem.title"
+          :content="noticeItem.title"
           placement="top-start"
           :enterable="!isMobile"
         >
@@ -72,16 +72,16 @@ function hoverDescription(event, description) {
             class="notice-title-content"
             @mouseover="hoverTitle"
           >
-            {{ props.noticeItem.title }}
+            {{ noticeItem.title }}
           </div>
         </el-tooltip>
         <el-tag
-          v-if="props.noticeItem?.extra"
+          v-if="noticeItem?.extra"
-          :type="props.noticeItem?.status"
+          :type="noticeItem?.status"
           size="small"
           class="notice-title-extra"
         >
-          {{ props.noticeItem?.extra }}
+          {{ noticeItem?.extra }}
         </el-tag>
       </div>
 
@@ -89,19 +89,19 @@ function hoverDescription(event, description) {
         popper-class="notice-title-popper"
         :effect="tooltipEffect"
         :disabled="!descriptionTooltip"
-        :content="props.noticeItem.description"
+        :content="noticeItem.description"
         placement="top-start"
       >
         <div
           ref="descriptionRef"
           class="notice-text-description"
-          @mouseover="hoverDescription($event, props.noticeItem.description)"
+          @mouseover="hoverDescription($event, noticeItem.description)"
         >
-          {{ props.noticeItem.description }}
+          {{ noticeItem.description }}
         </div>
       </el-tooltip>
       <div class="notice-text-datetime text-[#00000073] dark:text-white">
-        {{ props.noticeItem.datetime }}
+        {{ noticeItem.datetime }}
       </div>
     </div>
   </div>

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

@@ -0,0 +1,23 @@
+<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

@@ -0,0 +1,97 @@
+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-notice/index.vue

@@ -1,22 +1,34 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { ref, computed } from "vue";
 import { noticesData } from "./data";
-import NoticeList from "./noticeList.vue";
+import NoticeList from "./components/NoticeList.vue";
-import Bell from "@iconify-icons/ep/bell";
+import BellIcon 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">
+    <span
-      <el-badge :value="noticesNum" :max="99">
+      :class="[
+        'dropdown-badge',
+        'navbar-bg-hover',
+        'select-none',
+        Number(noticesNum) !== 0 && 'mr-[10px]'
+      ]"
+    >
+      <el-badge :value="Number(noticesNum) === 0 ? '' : noticesNum" :max="99">
         <span class="header-notice-icon">
-          <IconifyIconOffline :icon="Bell" />
+          <IconifyIconOffline :icon="BellIcon" />
         </span>
       </el-badge>
     </span>
@@ -35,13 +47,10 @@ notices.value.map(v => (noticesNum.value += v.list.length));
           />
           <span v-else>
             <template v-for="item in notices" :key="item.key">
-              <el-tab-pane
+              <el-tab-pane :label="getLabel(item)" :name="`${item.key}`">
-                :label="`${item.name}(${item.list.length})`"
-                :name="`${item.key}`"
-              >
                 <el-scrollbar max-height="330px">
                   <div class="noticeList-container">
-                    <NoticeList :list="item.list" />
+                    <NoticeList :list="item.list" :emptyText="item.emptyText" />
                   </div>
                 </el-scrollbar>
               </el-tab-pane>
@@ -60,7 +69,6 @@ notices.value.map(v => (noticesNum.value += v.list.length));
   justify-content: center;
   width: 40px;
   height: 48px;
-  margin-right: 10px;
   cursor: pointer;
 
   .header-notice-icon {

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

@@ -3,7 +3,7 @@ import { emitter } from "@/utils/mitt";
 import { onClickOutside } from "@vueuse/core";
 import { ref, computed, onMounted, onBeforeUnmount } from "vue";
 import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
-import Close from "@iconify-icons/ep/close";
+import CloseIcon from "@iconify-icons/ep/close";
 
 const target = ref(null);
 const show = ref<Boolean>(false);
@@ -51,7 +51,7 @@ onBeforeUnmount(() => {
       <div
         class="project-configuration border-b-[1px] border-solid border-[var(--pure-border-color)]"
       >
-        <h4 class="dark:text-white">项目配置</h4>
+        <h4 class="dark:text-white">系统配置</h4>
         <span
           v-tippy="{
             content: '关闭配置',
@@ -64,7 +64,7 @@ onBeforeUnmount(() => {
             class="dark:text-white"
             width="18px"
             height="18px"
-            :icon="Close"
+            :icon="CloseIcon"
             @click="show = !show"
           />
         </span>

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

@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import { useNav } from "@/layout/hooks/useNav";
-import mdiKeyboardEsc from "@/assets/svg/keyboard_esc.svg?component";
+import MdiKeyboardEsc from "@/assets/svg/keyboard_esc.svg?component";
-import enterOutlined from "@/assets/svg/enter_outlined.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";
 
-const props = withDefaults(defineProps<{ total: number }>(), {
+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,14 +24,11 @@ const { device } = useNav();
       切换
     </span>
     <span class="search-footer-item">
-      <mdiKeyboardEsc class="icon" />
+      <MdiKeyboardEsc class="icon" />
       关闭
     </span>
-    <p
+    <p v-if="device !== 'mobile' && total > 0" class="search-footer-total">
-      v-if="device !== 'mobile' && props.total > 0"
+      {{ `共 ${total} 项` }}
-      class="search-footer-total"
-    >
-      共{{ props.total }}项
     </p>
   </div>
 </template>

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

@@ -160,7 +160,7 @@ defineExpose({ handleScroll });
     </template>
     <template v-if="collectList.length">
       <div :style="titleStyle">
-        收藏{{ collectList.length > 1 ? "（可拖拽排序）" : "" }}
+        {{ `收藏${collectList.length > 1 ? "（可拖拽排序）" : ""}` }}
       </div>
       <div class="collect-container">
         <div

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

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import type { optionsItem } from "../types";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
-import Star from "@iconify-icons/ep/star";
+import StarIcon from "@iconify-icons/ep/star";
-import Close from "@iconify-icons/ep/close";
+import CloseIcon from "@iconify-icons/ep/close";
 
 interface Props {
   item: optionsItem;
@@ -32,12 +32,12 @@ function handleDelete(item) {
   </span>
   <IconifyIconOffline
     v-show="item.type === 'history'"
-    :icon="Star"
+    :icon="StarIcon"
     class="w-[18px] h-[18px] mr-2 hover:text-[#d7d5d4]"
     @click.stop="handleCollect(item)"
   />
   <IconifyIconOffline
-    :icon="Close"
+    :icon="CloseIcon"
     class="w-[18px] h-[18px] hover:text-[#d7d5d4] cursor-pointer"
     @click.stop="handleDelete(item)"
   />

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

@@ -11,7 +11,7 @@ import { ref, computed, shallowRef, watch } from "vue";
 import { useDebounceFn, onKeyStroke } from "@vueuse/core";
 import { usePermissionStoreHook } from "@/store/modules/permission";
 import { cloneDeep, isAllEmpty, storageLocal } from "@pureadmin/utils";
-import Search from "@iconify-icons/ri/search-line";
+import SearchIcon from "@iconify-icons/ri/search-line";
 
 interface Props {
   /** 弹窗显隐 */
@@ -294,7 +294,7 @@ onKeyStroke("ArrowDown", handleDown);
     >
       <template #prefix>
         <IconifyIconOffline
-          :icon="Search"
+          :icon="SearchIcon"
           class="text-primary w-[24px] h-[24px]"
         />
       </template>

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

@@ -4,7 +4,7 @@ import { useResizeObserver } from "@pureadmin/utils";
 import { useEpThemeStoreHook } from "@/store/modules/epTheme";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import { ref, computed, getCurrentInstance, onMounted } from "vue";
-import enterOutlined from "@/assets/svg/enter_outlined.svg?component";
+import EnterOutlined from "@/assets/svg/enter_outlined.svg?component";
 
 interface Emits {
   (e: "update:value", val: string): void;
@@ -83,7 +83,7 @@ defineExpose({ handleScroll });
       <span class="result-item-title">
         {{ item.meta?.title }}
       </span>
-      <enterOutlined />
+      <EnterOutlined />
     </div>
   </div>
 </template>

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

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { SearchModal } from "./components";
 import { useBoolean } from "../../hooks/useBoolean";
+import SearchModal from "./components/SearchModal.vue";
 
 const { bool: show, toggle } = useBoolean();
 function handleSearch() {

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

@@ -9,20 +9,22 @@ 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 "@iconify-icons/ep/check";
-import dayIcon from "@/assets/svg/day.svg?component";
+import LeftArrow from "@iconify-icons/ri/arrow-left-s-line";
-import darkIcon from "@/assets/svg/dark.svg?component";
+import RightArrow from "@iconify-icons/ri/arrow-right-s-line";
-import systemIcon from "@/assets/svg/system.svg?component";
+import DayIcon from "@/assets/svg/day.svg?component";
+import DarkIcon from "@/assets/svg/dark.svg?component";
+import SystemIcon from "@/assets/svg/system.svg?component";
 
 const { device } = useNav();
 const { isDark } = useDark();
@@ -64,7 +66,8 @@ const settings = reactive({
   showLogo: $storage.configure.showLogo,
   showModel: $storage.configure.showModel,
   hideFooter: $storage.configure.hideFooter,
-  multiTagsCache: $storage.configure.multiTagsCache
+  multiTagsCache: $storage.configure.multiTagsCache,
+  stretch: $storage.configure.stretch
 });
 
 const getThemeColorStyle = computed(() => {
@@ -141,6 +144,32 @@ 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 => {
@@ -160,25 +189,29 @@ 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" }
@@ -186,7 +219,8 @@ const themeOptions = computed<Array<OptionsType>>(() => {
   ];
 });
 
-const markOptions: Array<OptionsType> = [
+const markOptions = computed<Array<OptionsType>>(() => {
+  return [
     {
       label: "灵动",
       tip: "灵动标签，添趣生辉",
@@ -198,6 +232,7 @@ const markOptions: Array<OptionsType> = [
       value: "card"
     }
   ];
+});
 
 /** 设置导航模式 */
 function setLayoutModel(layout: string) {
@@ -260,7 +295,7 @@ function watchSystemThemeChange() {
 }
 
 onBeforeMount(() => {
-  /* 初始化项目配置 */
+  /* 初始化系统配置 */
   nextTick(() => {
     watchSystemThemeChange();
     settings.greyVal &&
@@ -276,10 +311,11 @@ onUnmounted(() => removeMatchMedia);
 </script>
 
 <template>
-  <panel>
+  <LayPanel>
-    <div class="p-6">
+    <div class="p-5">
-      <p class="mb-3 font-medium text-sm dark:text-white">整体风格</p>
+      <p :class="pClass">整体风格</p>
       <Segmented
+        resize
         class="select-none"
         :modelValue="overallStyle === 'system' ? 2 : dataTheme ? 1 : 0"
         :options="themeOptions"
@@ -295,7 +331,7 @@ onUnmounted(() => removeMatchMedia);
         "
       />
 
-      <p class="mt-5 mb-3 font-medium text-sm dark:text-white">主题色</p>
+      <p :class="['mt-5', pClass]">主题色</p>
       <ul class="theme-color">
         <li
           v-for="(item, index) in themeColors"
@@ -314,7 +350,7 @@ onUnmounted(() => removeMatchMedia);
         </li>
       </ul>
 
-      <p class="mt-5 mb-3 font-medium text-sm dark:text-white">导航模式</p>
+      <p :class="['mt-5', pClass]">导航模式</p>
       <ul class="pure-theme">
         <li
           ref="verticalRef"
@@ -356,15 +392,60 @@ onUnmounted(() => removeMatchMedia);
         </li>
       </ul>
 
-      <p class="mt-5 mb-3 font-medium text-base dark:text-white">页签风格</p>
+      <span v-if="useAppStoreHook().getViewportWidth > 1280">
+        <p :class="['mt-5', pClass]">页宽</p>
         <Segmented
+          resize
+          class="mb-2 select-none"
+          :modelValue="isNumber(settings.stretch) ? 1 : 0"
+          :options="stretchTypeOptions"
+          @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"
+              height="20"
+            />
+            <div
+              class="flex-grow border-b border-dashed"
+              style="border-color: var(--el-color-primary)"
+            />
+            <IconifyIconOffline
+              :icon="settings.stretch ? LeftArrow : RightArrow"
+              height="20"
+            />
+          </div>
+        </button>
+      </span>
+
+      <p :class="['mt-4', pClass]">页签风格</p>
+      <Segmented
+        resize
         class="select-none"
         :modelValue="markValue === 'smart' ? 0 : 1"
         :options="markOptions"
         @change="onChange"
       />
 
-      <p class="mt-5 mb-1 font-medium text-sm dark:text-white">界面显示</p>
+      <p class="mt-5 font-medium text-sm dark:text-white">界面显示</p>
       <ul class="setting">
         <li>
           <span class="dark:text-white">灰色模式</span>
@@ -430,7 +511,7 @@ onUnmounted(() => removeMatchMedia);
         </li>
       </ul>
     </div>
-  </panel>
+  </LayPanel>
 </template>
 
 <style lang="scss" scoped>
@@ -543,7 +624,7 @@ onUnmounted(() => removeMatchMedia);
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 4px 0;
+    padding: 3px 0;
     font-size: 14px;
   }
 }

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

@@ -1,11 +1,13 @@
 <script setup lang="ts">
-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 { usePermissionStoreHook } from "@/store/modules/permission";
+import LaySidebarItem from "../lay-sidebar/components/SidebarItem.vue";
+import LaySidebarFullScreen from "../lay-sidebar/components/SidebarFullScreen.vue";
+
 import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
 import Setting from "@iconify-icons/ri/settings-3-line";
 
@@ -15,11 +17,11 @@ const {
   route,
   title,
   logout,
-  backTopMenu,
   onPanel,
   getLogo,
   username,
   userAvatar,
+  backTopMenu,
   avatarsStyle
 } = useNav();
 
@@ -43,13 +45,12 @@ nextTick(() => {
     </div>
     <el-menu
       ref="menuRef"
-      router
       mode="horizontal"
       popper-class="pure-scrollbar"
       class="horizontal-header-menu"
       :default-active="defaultActive"
     >
-      <sidebar-item
+      <LaySidebarItem
         v-for="route in usePermissionStoreHook().wholeMenus"
         :key="route.path"
         :item="route"
@@ -58,9 +59,11 @@ nextTick(() => {
     </el-menu>
     <div class="horizontal-header-right">
       <!-- 菜单搜索 -->
-      <Search id="header-search" />
+      <LaySearch id="header-search" />
-      <!-- 通知 -->
+      <!-- 全屏 -->
-      <Notice id="header-notice" />
+      <LaySidebarFullScreen id="full-screen" />
+      <!-- 消息通知 -->
+      <LayNotice id="header-notice" />
       <!-- 退出登录 -->
       <el-dropdown trigger="click">
         <span class="el-dropdown-link navbar-bg-hover">
@@ -81,7 +84,7 @@ nextTick(() => {
       </el-dropdown>
       <span
         class="set-icon navbar-bg-hover"
-        title="打开项目配置"
+        title="打开系统配置"
         @click="onPanel"
       >
         <IconifyIconOffline :icon="Setting" />
@@ -96,7 +99,7 @@ nextTick(() => {
 }
 
 .logout {
-  max-width: 120px;
+  width: 120px;
 
   ::v-deep(.el-dropdown-menu__item) {
     display: inline-flex;

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

@@ -1,13 +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 "@iconify-icons/ri/logout-circle-r-line";
 import Setting from "@iconify-icons/ri/settings-3-line";
 
@@ -83,16 +85,18 @@ watch(
             <span class="select-none">
               {{ route.meta.title }}
             </span>
-            <extraIcon :extraIcon="route.meta.extraIcon" />
+            <LaySidebarExtraIcon :extraIcon="route.meta.extraIcon" />
           </div>
         </template>
       </el-menu-item>
     </el-menu>
     <div class="horizontal-header-right">
       <!-- 菜单搜索 -->
-      <Search id="header-search" />
+      <LaySearch id="header-search" />
-      <!-- 通知 -->
+      <!-- 全屏 -->
-      <Notice id="header-notice" />
+      <LaySidebarFullScreen id="full-screen" />
+      <!-- 消息通知 -->
+      <LayNotice id="header-notice" />
       <!-- 退出登录 -->
       <el-dropdown trigger="click">
         <span class="el-dropdown-link navbar-bg-hover select-none">
@@ -113,7 +117,7 @@ watch(
       </el-dropdown>
       <span
         class="set-icon navbar-bg-hover"
-        title="打开项目配置"
+        title="打开系统配置"
         @click="onPanel"
       >
         <IconifyIconOffline :icon="Setting" />
@@ -128,7 +132,7 @@ watch(
 }
 
 .logout {
-  max-width: 120px;
+  width: 120px;
 
   ::v-deep(.el-dropdown-menu__item) {
     display: inline-flex;

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

@@ -1,17 +1,19 @@
 <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`
@@ -88,14 +90,15 @@ onBeforeUnmount(() => {
   <div
     v-loading="loading"
     :class="['sidebar-container', showLogo ? 'has-logo' : 'no-logo']"
+    @mouseenter.prevent="isShow = true"
+    @mouseleave.prevent="isShow = false"
   >
-    <Logo v-if="showLogo" :collapse="isCollapse" />
+    <LaySidebarLogo 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"
@@ -105,7 +108,7 @@ onBeforeUnmount(() => {
         :popper-effect="tooltipEffect"
         :default-active="defaultActive"
       >
-        <sidebar-item
+        <LaySidebarItem
           v-for="routes in menuData"
           :key="routes.path"
           :item="routes"
@@ -114,7 +117,12 @@ onBeforeUnmount(() => {
         />
       </el-menu>
     </el-scrollbar>
-    <leftCollapse
+    <LaySidebarCenterCollapse
+      v-if="device !== 'mobile' && (isShow || isCollapse)"
+      :is-active="pureApp.sidebar.opened"
+      @toggleClick="toggleSideBar"
+    />
+    <LaySidebarLeftCollapse
       v-if="device !== 'mobile'"
       :is-active="pureApp.sidebar.opened"
       @toggleClick="toggleSideBar"

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

@@ -0,0 +1,70 @@
+<script setup lang="ts">
+import { computed } from "vue";
+import { useGlobal } from "@pureadmin/utils";
+import { useNav } from "@/layout/hooks/useNav";
+
+import ArrowLeft from "@iconify-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/SidebarExtraIcon.vue

@@ -2,7 +2,7 @@
 import { toRaw } from "vue";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 
-const props = defineProps({
+defineProps({
   extraIcon: {
     type: String,
     default: ""
@@ -11,9 +11,9 @@ const props = defineProps({
 </script>
 
 <template>
-  <div v-if="props.extraIcon" class="flex justify-center items-center">
+  <div v-if="extraIcon" class="flex justify-center items-center">
     <component
-      :is="useRenderIcon(toRaw(props.extraIcon))"
+      :is="useRenderIcon(toRaw(extraIcon))"
       class="w-[30px] h-[30px]"
     />
   </div>

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

@@ -0,0 +1,30 @@
+<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/SidebarItem.vue

@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import path from "path";
 import { getConfig } from "@/config";
-import LinkItem from "./linkItem.vue";
+import { menuType } from "@/layout/types";
-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,
@@ -105,9 +105,9 @@ function resolvePath(routePath) {
 </script>
 
 <template>
-  <link-item
+  <SidebarLinkItem
     v-if="
-      hasOneShowingChild(props.item.children, props.item) &&
+      hasOneShowingChild(item.children, item) &&
       (!onlyOneChild.children || onlyOneChild.noShowingChildren)
     "
     :to="item"
@@ -119,7 +119,7 @@ function resolvePath(routePath) {
       v-bind="attrs"
     >
       <div
-        v-if="toRaw(props.item.meta.icon)"
+        v-if="toRaw(item.meta.icon)"
         class="sub-menu-icon"
         :style="getSubMenuIconStyle"
       >
@@ -127,24 +127,24 @@ function resolvePath(routePath) {
           :is="
             useRenderIcon(
               toRaw(onlyOneChild.meta.icon) ||
-                (props.item.meta && toRaw(props.item.meta.icon))
+                (item.meta && toRaw(item.meta.icon))
             )
           "
         />
       </div>
       <el-text
         v-if="
-          (!props.item?.meta.icon &&
+          (!item?.meta.icon &&
             isCollapse &&
             layout === 'vertical' &&
-            props.item?.pathList?.length === 1) ||
+            item?.pathList?.length === 1) ||
           (!onlyOneChild.meta.icon &&
             isCollapse &&
             layout === 'mix' &&
-            props.item?.pathList?.length === 2)
+            item?.pathList?.length === 2)
         "
         truncated
-        class="!px-4 !text-inherit"
+        class="!w-full !px-4 !text-inherit"
       >
         {{ onlyOneChild.meta.title }}
       </el-text>
@@ -156,39 +156,39 @@ function resolvePath(routePath) {
               offset: [0, -10],
               theme: tooltipEffect
             }"
-            class="!text-inherit"
+            class="!w-full !text-inherit"
           >
             {{ onlyOneChild.meta.title }}
           </ReText>
-          <extraIcon :extraIcon="onlyOneChild.meta.extraIcon" />
+          <SidebarExtraIcon :extraIcon="onlyOneChild.meta.extraIcon" />
         </div>
       </template>
     </el-menu-item>
-  </link-item>
+  </SidebarLinkItem>
   <el-sub-menu
     v-else
     ref="subMenu"
     teleported
-    :index="resolvePath(props.item.path)"
+    :index="resolvePath(item.path)"
     v-bind="expandCloseIcon"
   >
     <template #title>
       <div
-        v-if="toRaw(props.item.meta.icon)"
+        v-if="toRaw(item.meta.icon)"
         :style="getSubMenuIconStyle"
         class="sub-menu-icon"
       >
-        <component
+        <component :is="useRenderIcon(item.meta && toRaw(item.meta.icon))" />
-          :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(props.item.meta.icon) &&
+                toRaw(item.meta.icon) &&
-            props.item.parentId === null
+                item.parentId === null
               )
         "
         :tippyProps="{
@@ -196,21 +196,22 @@ function resolvePath(routePath) {
           theme: tooltipEffect
         }"
         :class="{
+          '!w-full': true,
           '!text-inherit': true,
           '!px-4':
             layout !== 'horizontal' &&
             isCollapse &&
-            !toRaw(props.item.meta.icon) &&
+            !toRaw(item.meta.icon) &&
-            props.item.parentId === null
+            item.parentId === null
         }"
       >
-        {{ props.item.meta.title }}
+        {{ item.meta.title }}
       </ReText>
-      <extraIcon v-if="!isCollapse" :extraIcon="props.item.meta.extraIcon" />
+      <SidebarExtraIcon v-if="!isCollapse" :extraIcon="item.meta.extraIcon" />
     </template>
 
     <sidebar-item
-      v-for="child in props.item.children"
+      v-for="child in item.children"
       :key="child.path"
       :is-nest="true"
       :item="child"

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

@@ -9,7 +9,7 @@ interface Props {
   isActive: boolean;
 }
 
-const props = withDefaults(defineProps<Props>(), {
+withDefaults(defineProps<Props>(), {
   isActive: false
 });
 
@@ -41,24 +41,24 @@ const toggleClick = () => {
 </script>
 
 <template>
-  <div class="collapse-container">
+  <div class="left-collapse">
     <IconifyIconOffline
       v-tippy="{
-        content: props.isActive ? '点击折叠' : '点击展开',
+        content: isActive ? '点击折叠' : '点击展开',
         theme: tooltipEffect,
         hideOnClick: 'toggle',
         placement: 'right'
       }"
       :icon="MenuFold"
       :class="[iconClass, themeColor === 'light' ? '' : 'text-primary']"
-      :style="{ transform: props.isActive ? 'none' : 'rotateY(180deg)' }"
+      :style="{ transform: isActive ? 'none' : 'rotateY(180deg)' }"
       @click="toggleClick"
     />
   </div>
 </template>
 
 <style lang="scss" scoped>
-.collapse-container {
+.left-collapse {
   position: absolute;
   bottom: 0;
   width: 100%;

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

@@ -3,10 +3,6 @@ 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/lay-sidebar/components/SidebarLogo.vue

@@ -2,7 +2,7 @@
 import { getTopMenu } from "@/router/utils";
 import { useNav } from "@/layout/hooks/useNav";
 
-const props = defineProps({
+defineProps({
   collapse: Boolean
 });
 
@@ -10,11 +10,11 @@ const { title, getLogo } = useNav();
 </script>
 
 <template>
-  <div class="sidebar-logo-container" :class="{ collapses: props.collapse }">
+  <div class="sidebar-logo-container" :class="{ collapses: collapse }">
     <transition name="sidebarLogoFade">
       <router-link
-        v-if="props.collapse"
+        v-if="collapse"
-        key="props.collapse"
+        key="collapse"
         :title="title"
         class="sidebar-logo-link"
         :to="getTopMenu()?.path ?? '/'"

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

@@ -6,7 +6,7 @@ interface Props {
   isActive: boolean;
 }
 
-const props = withDefaults(defineProps<Props>(), {
+withDefaults(defineProps<Props>(), {
   isActive: false
 });
 
@@ -22,11 +22,11 @@ const toggleClick = () => {
 <template>
   <div
     class="px-3 mr-1 navbar-bg-hover"
-    :title="props.isActive ? '点击折叠' : '点击展开'"
+    :title="isActive ? '点击折叠' : '点击展开'"
     @click="toggleClick"
   >
     <IconifyIconOffline
-      :icon="props.isActive ? MenuFold : MenuUnfold"
+      :icon="isActive ? MenuFold : MenuUnfold"
       class="inline-block align-middle hover:text-primary dark:hover:!text-white"
     />
   </div>

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

@@ -90,6 +90,10 @@
           padding: 0 12px;
         }
       }
+
+      .fixed-tag {
+        padding: 0 12px;
+      }
     }
   }
 

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

@@ -3,10 +3,11 @@ import { emitter } from "@/utils/mitt";
 import { RouteConfigs } from "../../types";
 import { useTags } from "../../hooks/useTag";
 import { routerArrays } from "@/layout/types";
-import { useFullscreen, onClickOutside } from "@vueuse/core";
+import { 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,
@@ -57,7 +58,10 @@ const contextmenuRef = ref();
 const isShowArrow = ref(false);
 const topPath = getTopMenu()?.path;
 const { VITE_HIDE_HOME } = import.meta.env;
-const { isFullscreen, toggle } = useFullscreen();
+const fixedTags = [
+  ...routerArrays,
+  ...usePermissionStoreHook().flatteningRoutes.filter(v => v?.meta?.fixedTag)
+];
 
 const dynamicTagView = async () => {
   await nextTick();
@@ -227,10 +231,13 @@ function deleteDynamicTag(obj: any, current: any, tag?: string) {
     other?: boolean
   ): void => {
     if (other) {
-      useMultiTagsStoreHook().handleTags("equal", [
+      useMultiTagsStoreHook().handleTags(
-        VITE_HIDE_HOME === "false" ? routerArrays[0] : toRaw(getTopMenu()),
+        "equal",
+        [
+          VITE_HIDE_HOME === "false" ? fixedTags : toRaw(getTopMenu()),
           obj
-      ]);
+        ].flat()
+      );
     } else {
       useMultiTagsStoreHook().handleTags("splice", "", {
         startIndex,
@@ -243,7 +250,7 @@ function deleteDynamicTag(obj: any, current: any, tag?: string) {
   if (tag === "other") {
     spliceRoute(1, 1, true);
   } else if (tag === "left") {
-    spliceRoute(1, valueIndex - 1);
+    spliceRoute(fixedTags.length, valueIndex - 1, true);
   } else if (tag === "right") {
     spliceRoute(valueIndex + 1, multiTags.value.length);
   } else {
@@ -320,35 +327,23 @@ function onClickDrop(key, item, selectRoute?: RouteConfigs) {
     case 5:
       // 关闭全部标签页
       useMultiTagsStoreHook().handleTags("splice", "", {
-        startIndex: 1,
+        startIndex: fixedTags.length,
         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[7].icon = ExitFullscreen;
+          tagsViews[6].icon = ExitFullscreen;
-          tagsViews[7].text = "内容区退出全屏";
+          tagsViews[6].text = "内容区退出全屏";
         } else {
-          tagsViews[7].icon = Fullscreen;
+          tagsViews[6].icon = Fullscreen;
-          tagsViews[7].text = "内容区全屏";
+          tagsViews[6].text = "内容区全屏";
         }
       }, 100);
       break;
@@ -375,10 +370,14 @@ function showMenus(value: boolean) {
   });
 }
 
-function disabledMenus(value: boolean) {
+function disabledMenus(value: boolean, fixedTag = false) {
   Array.of(1, 2, 3, 4, 5).forEach(v => {
     tagsViews[v].disabled = value;
   });
+  if (fixedTag) {
+    tagsViews[2].show = false;
+    tagsViews[2].disabled = true;
+  }
 }
 
 /** 检查当前右键的菜单两边是否存在别的菜单，如果左侧的菜单是顶级菜单，则不显示关闭左侧标签页，如果右侧没有菜单，则不显示关闭右侧标签页 */
@@ -395,6 +394,13 @@ 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);
 
@@ -413,6 +419,7 @@ function showMenuModel(
       tagsViews[v].disabled = false;
     });
     tagsViews[2].disabled = true;
+    fixedTagDisabled();
   } else if (currentIndex === 1 && routeLength === 2) {
     disabledMenus(false);
     // 左侧的菜单是顶级菜单，右侧不存在别的菜单
@@ -420,6 +427,7 @@ function showMenuModel(
       tagsViews[v].show = false;
       tagsViews[v].disabled = true;
     });
+    fixedTagDisabled();
   } else if (routeLength - 1 === currentIndex && currentIndex !== 0) {
     // 当前路由是所有路由中的最后一个
     tagsViews[3].show = false;
@@ -427,29 +435,31 @@ 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);
+    disabledMenus(false, allRoute[currentIndex - 1]?.meta?.fixedTag);
+    fixedTagDisabled();
   }
 }
 
 function openMenu(tag, e) {
   closeMenu();
-  if (tag.path === topPath) {
+  if (tag.path === topPath || tag?.meta?.fixedTag) {
-    // 右键菜单为顶级菜单，只显示刷新
+    // 右键菜单为顶级菜单或拥有 fixedTag 属性，只显示刷新
     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 (
+  } else if (multiTags.value.length === 2 && route.path !== tag.path) {
-    // eslint-disable-next-line no-dupe-else-if
-    multiTags.value.length === 2 &&
-    route.path !== tag.path
-  ) {
     showMenus(true);
     // 只有两个标签时不显示关闭其他标签页
     tagsViews[4].show = false;
@@ -497,7 +507,6 @@ function tagOnClick(item) {
   } else {
     router.push({ path });
   }
-  // showMenuModel(item?.path, item?.query);
 }
 
 onClickOutside(contextmenuRef, closeMenu, {
@@ -509,11 +518,6 @@ watch(route, () => {
   dynamicTagView();
 });
 
-watch(isFullscreen, () => {
-  tagsViews[6].icon = Fullscreen;
-  tagsViews[6].text = "全屏";
-});
-
 onMounted(() => {
   if (!instance) return;
 
@@ -566,7 +570,11 @@ onBeforeUnmount(() => {
           v-for="(item, index) in multiTags"
           :ref="'dynamic' + index"
           :key="index"
-          :class="['scroll-item is-closable', linkIsActive(item)]"
+          :class="[
+            'scroll-item is-closable',
+            linkIsActive(item),
+            !isAllEmpty(item?.meta?.fixedTag) && 'fixed-tag'
+          ]"
           @contextmenu.prevent="openMenu(item, $event)"
           @mouseenter.prevent="onMouseenter(index)"
           @mouseleave.prevent="onMouseleave(index)"
@@ -579,8 +587,10 @@ onBeforeUnmount(() => {
           </span>
           <span
             v-if="
-              iconIsActive(item, index) ||
+              isAllEmpty(item?.meta?.fixedTag)
+                ? iconIsActive(item, index) ||
                   (index === activeIndex && index !== 0)
+                : false
             "
             class="el-icon-close"
             @click.stop="deleteMenu(item)"

src/layout/components/notice/data.ts

@@ -1,146 +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[];
-}
-
-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/noticeList.vue

@@ -1,23 +0,0 @@
-<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/search/components/index.ts

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

src/layout/frame.vue

@@ -3,7 +3,7 @@ import { useRoute } from "vue-router";
 import { ref, unref, watch, onMounted, nextTick } from "vue";
 
 defineOptions({
-  name: "FrameView"
+  name: "LayFrame"
 });
 
 const props = defineProps<{

src/layout/hooks/useLayout.ts

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

src/layout/hooks/useNav.ts

@@ -1,23 +1,28 @@
 import { storeToRefs } from "pinia";
 import { getConfig } from "@/config";
 import { emitter } from "@/utils/mitt";
-import userAvatar from "@/assets/user.jpg";
+import Avatar from "@/assets/user.jpg";
 import { getTopMenu } from "@/router/utils";
-import { useGlobal } from "@pureadmin/utils";
+import { useFullscreen } from "@vueuse/core";
 import type { routeMetaType } from "../types";
 import { useRouter, useRoute } from "vue-router";
 import { router, remainingPaths } from "@/router";
 import { computed, type CSSProperties } from "vue";
 import { useAppStoreHook } from "@/store/modules/app";
 import { useUserStoreHook } from "@/store/modules/user";
+import { useGlobal, isAllEmpty } from "@pureadmin/utils";
 import { usePermissionStoreHook } from "@/store/modules/permission";
+import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
+import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
 
-const errorInfo = "当前路由配置不正确，请检查配置";
+const errorInfo =
+  "The current routing configuration is incorrect, please check the configuration";
 
 export function useNav() {
   const route = useRoute();
   const pureApp = useAppStoreHook();
   const routers = useRouter().options.routes;
+  const { isFullscreen, toggle } = useFullscreen();
   const { wholeMenus } = storeToRefs(usePermissionStoreHook());
   /** 平台`layout`中所有`el-tooltip`的`effect`配置，默认`light` */
   const tooltipEffect = getConfig()?.TooltipEffect ?? "light";
@@ -32,9 +37,18 @@ export function useNav() {
     };
   });
 
-  /** 用户名 */
+  /** 头像（如果头像为空则使用 src/assets/user.jpg ） */
+  const userAvatar = computed(() => {
+    return isAllEmpty(useUserStoreHook()?.avatar)
+      ? Avatar
+      : useUserStoreHook()?.avatar;
+  });
+
+  /** 昵称（如果昵称为空则显示用户名） */
   const username = computed(() => {
-    return useUserStoreHook()?.username;
+    return isAllEmpty(useUserStoreHook()?.nickname)
+      ? useUserStoreHook()?.username
+      : useUserStoreHook()?.nickname;
   });
 
   const avatarsStyle = computed(() => {
@@ -120,6 +134,10 @@ export function useNav() {
     logout,
     routers,
     $storage,
+    isFullscreen,
+    Fullscreen,
+    ExitFullscreen,
+    toggle,
     backTopMenu,
     onPanel,
     getDivStyle,

src/layout/hooks/useTag.ts

@@ -103,17 +103,10 @@ export function useTags() {
       disabled: multiTags.value.length > 1 ? false : true,
       show: true
     },
-    {
-      icon: Fullscreen,
-      text: "整体页面全屏",
-      divided: true,
-      disabled: false,
-      show: true
-    },
     {
       icon: Fullscreen,
       text: "内容区全屏",
-      divided: false,
+      divided: true,
       disabled: false,
       show: true
     }

src/layout/index.vue

@@ -23,13 +23,13 @@ import {
   useResizeObserver
 } from "@pureadmin/utils";
 
-import navbar from "./components/navbar.vue";
+import LayTag from "./components/lay-tag/index.vue";
-import tag from "./components/tag/index.vue";
+import LayNavbar from "./components/lay-navbar/index.vue";
-import appMain from "./components/appMain.vue";
+import LayContent from "./components/lay-content/index.vue";
-import setting from "./components/setting/index.vue";
+import LaySetting from "./components/lay-setting/index.vue";
-import Vertical from "./components/sidebar/vertical.vue";
+import NavVertical from "./components/lay-sidebar/NavVertical.vue";
-import Horizontal from "./components/sidebar/horizontal.vue";
+import NavHorizontal from "./components/lay-sidebar/NavHorizontal.vue";
-import backTop from "@/assets/svg/back_top.svg?component";
+import BackTopIcon from "@/assets/svg/back_top.svg?component";
 
 const appWrapperRef = ref();
 const { isDark } = useDark();
@@ -89,7 +89,8 @@ let isAutoCloseSidebar = true;
 useResizeObserver(appWrapperRef, entries => {
   if (isMobile) return;
   const entry = entries[0];
-  const [{ inlineSize: width }] = entry.borderBoxSize;
+  const [{ inlineSize: width, blockSize: height }] = entry.borderBoxSize;
+  useAppStoreHook().setViewportSize({ width, height });
   width <= 760 ? setTheme("vertical") : setTheme(useAppStoreHook().layout);
   /** width app-wrapper类容器宽度
    * 0 < width <= 760 隐藏侧边栏
@@ -123,7 +124,8 @@ onBeforeMount(() => {
   useDataThemeChange().dataThemeChange($storage.layout?.overallStyle);
 });
 
-const layoutHeader = defineComponent({
+const LayHeader = defineComponent({
+  name: "LayHeader",
   render() {
     return h(
       "div",
@@ -141,12 +143,12 @@ const layoutHeader = defineComponent({
         default: () => [
           !pureSetting.hiddenSideBar &&
           (layout.value.includes("vertical") || layout.value.includes("mix"))
-            ? h(navbar)
+            ? h(LayNavbar)
             : null,
           !pureSetting.hiddenSideBar && layout.value.includes("horizontal")
-            ? h(Horizontal)
+            ? h(NavHorizontal)
             : null,
-          h(tag)
+          h(LayTag)
         ]
       }
     );
@@ -165,7 +167,7 @@ const layoutHeader = defineComponent({
       class="app-mask"
       @click="useAppStoreHook().toggleSideBar()"
     />
-    <Vertical
+    <NavVertical
       v-show="
         !pureSetting.hiddenSideBar &&
         (layout.includes('vertical') || layout.includes('mix'))
@@ -178,24 +180,24 @@ const layoutHeader = defineComponent({
       ]"
     >
       <div v-if="set.fixedHeader">
-        <layout-header />
+        <LayHeader />
         <!-- 主体内容 -->
-        <app-main :fixed-header="set.fixedHeader" />
+        <LayContent :fixed-header="set.fixedHeader" />
       </div>
       <el-scrollbar v-else>
         <el-backtop
           title="回到顶部"
           target=".main-container .el-scrollbar__wrap"
         >
-          <backTop />
+          <BackTopIcon />
         </el-backtop>
-        <layout-header />
+        <LayHeader />
         <!-- 主体内容 -->
-        <app-main :fixed-header="set.fixedHeader" />
+        <LayContent :fixed-header="set.fixedHeader" />
       </el-scrollbar>
     </div>
     <!-- 系统设置 -->
-    <setting />
+    <LaySetting />
   </div>
 </template>
 

src/plugins/elementPlus.ts

@@ -10,6 +10,8 @@ import {
   ElAutocomplete,
   ElAutoResizer,
   ElAvatar,
+  ElAnchor,
+  ElAnchorLink,
   ElBacktop,
   ElBadge,
   ElBreadcrumb,
@@ -123,6 +125,8 @@ const components = [
   ElAutocomplete,
   ElAutoResizer,
   ElAvatar,
+  ElAnchor,
+  ElAnchorLink,
   ElBacktop,
   ElBadge,
   ElBreadcrumb,

src/router/utils.ts

@@ -17,12 +17,12 @@ import {
   isIncludeAllChildren
 } from "@pureadmin/utils";
 import { getConfig } from "@/config";
-import type { menuType } from "@/layout/types";
 import { buildHierarchyTree } from "@/utils/tree";
 import { userKey, type DataInfo } from "@/utils/auth";
+import { type menuType, routerArrays } from "@/layout/types";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
 import { usePermissionStoreHook } from "@/store/modules/permission";
-const IFrame = () => import("@/layout/frameView.vue");
+const IFrame = () => import("@/layout/frame.vue");
 // https://cn.vitejs.dev/guide/features.html#glob-import
 const modulesRoutes = import.meta.glob("/src/views/**/*.{vue,tsx}");
 
@@ -81,7 +81,7 @@ function isOneOfArray(a: Array<string>, b: Array<string>) {
     : true;
 }
 
-/** 从localStorage里取出当前登陆用户的角色roles，过滤无权限的菜单 */
+/** 从localStorage里取出当前登录用户的角色roles，过滤无权限的菜单 */
 function filterNoPermissionTree(data: RouteComponent[]) {
   const currentRoles =
     storageLocal().getItem<DataInfo<number>>(userKey)?.roles ?? [];
@@ -178,6 +178,14 @@ function handleAsyncRoutes(routeList) {
     );
     usePermissionStoreHook().handleWholeMenus(routeList);
   }
+  if (!useMultiTagsStoreHook().getMultiTagsCache) {
+    useMultiTagsStoreHook().handleTags("equal", [
+      ...routerArrays,
+      ...usePermissionStoreHook().flatteningRoutes.filter(
+        v => v?.meta?.fixedTag
+      )
+    ]);
+  }
   addPathMatch();
 }
 
@@ -359,9 +367,23 @@ function hasAuth(value: string | Array<string>): boolean {
   return isAuths ? true : false;
 }
 
+function handleTopMenu(route) {
+  if (route?.children && route.children.length > 1) {
+    if (route.redirect) {
+      return route.children.filter(cur => cur.path === route.redirect)[0];
+    } else {
+      return route.children[0];
+    }
+  } else {
+    return route;
+  }
+}
+
 /** 获取所有菜单中的第一个菜单（顶级菜单）*/
 function getTopMenu(tag = false): menuType {
-  const topMenu = usePermissionStoreHook().wholeMenus[0]?.children[0];
+  const topMenu = handleTopMenu(
+    usePermissionStoreHook().wholeMenus[0]?.children[0]
+  );
   tag && useMultiTagsStoreHook().handleTags("push", topMenu);
   return topMenu;
 }

src/store/modules/app.ts

@@ -1,8 +1,12 @@
-import { store } from "@/store";
 import { defineStore } from "pinia";
-import type { appType } from "./types";
+import {
-import { getConfig, responsiveStorageNameSpace } from "@/config";
+  type appType,
-import { deviceDetection, storageLocal } from "@pureadmin/utils";
+  store,
+  getConfig,
+  storageLocal,
+  deviceDetection,
+  responsiveStorageNameSpace
+} from "../utils";
 
 export const useAppStore = defineStore({
   id: "pure-app",
@@ -20,7 +24,12 @@ export const useAppStore = defineStore({
       storageLocal().getItem<StorageConfigs>(
         `${responsiveStorageNameSpace()}layout`
       )?.layout ?? getConfig().Layout,
-    device: deviceDetection() ? "mobile" : "desktop"
+    device: deviceDetection() ? "mobile" : "desktop",
+    // 浏览器窗口的可视区域大小
+    viewportSize: {
+      width: document.documentElement.clientWidth,
+      height: document.documentElement.clientHeight
+    }
   }),
   getters: {
     getSidebarStatus(state) {
@@ -28,6 +37,12 @@ export const useAppStore = defineStore({
     },
     getDevice(state) {
       return state.device;
+    },
+    getViewportWidth(state) {
+      return state.viewportSize.width;
+    },
+    getViewportHeight(state) {
+      return state.viewportSize.height;
     }
   },
   actions: {
@@ -59,6 +74,12 @@ export const useAppStore = defineStore({
     },
     setLayout(layout) {
       this.layout = layout;
+    },
+    setViewportSize(size) {
+      this.viewportSize = size;
+    },
+    setSortSwap(val) {
+      this.sortSwap = val;
     }
   }
 });

src/store/modules/epTheme.ts

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

src/store/modules/multiTags.ts

@@ -1,9 +1,18 @@
 import { defineStore } from "pinia";
-import { store } from "@/store";
+import {
-import { routerArrays } from "@/layout/types";
+  type multiType,
-import { responsiveStorageNameSpace } from "@/config";
+  type positionType,
-import type { multiType, positionType } from "./types";
+  store,
-import { isEqual, isBoolean, isUrl, storageLocal } from "@pureadmin/utils";
+  isUrl,
+  isEqual,
+  isNumber,
+  isBoolean,
+  getConfig,
+  routerArrays,
+  storageLocal,
+  responsiveStorageNameSpace
+} from "../utils";
+import { usePermissionStoreHook } from "./permission";
 
 export const useMultiTagsStore = defineStore({
   id: "pure-multiTags",
@@ -15,7 +24,12 @@ export const useMultiTagsStore = defineStore({
       ? storageLocal().getItem<StorageConfigs>(
           `${responsiveStorageNameSpace()}tags`
         )
-      : [...routerArrays],
+      : [
+          ...routerArrays,
+          ...usePermissionStoreHook().flatteningRoutes.filter(
+            v => v?.meta?.fixedTag
+          )
+        ],
     multiTagsCache: storageLocal().getItem<StorageConfigs>(
       `${responsiveStorageNameSpace()}configure`
     )?.multiTagsCache
@@ -100,6 +114,14 @@ export const useMultiTagsStore = defineStore({
             }
             this.multiTags.push(value);
             this.tagsCache(this.multiTags);
+            if (
+              getConfig()?.MaxTagsLevel &&
+              isNumber(getConfig().MaxTagsLevel)
+            ) {
+              if (this.multiTags.length > getConfig().MaxTagsLevel) {
+                this.multiTags.splice(1, 1);
+              }
+            }
           }
           break;
         case "splice":

src/store/modules/permission.ts

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

src/store/modules/settings.ts

@@ -1,7 +1,5 @@
 import { defineStore } from "pinia";
-import { store } from "@/store";
+import { type setType, store, getConfig } from "../utils";
-import { getConfig } from "@/config";
-import type { setType } from "./types";
 
 export const useSettingStore = defineStore({
   id: "pure-setting",

src/store/modules/user.ts

@@ -1,19 +1,30 @@
 import { defineStore } from "pinia";
-import { store } from "@/store";
+import {
-import type { userType } from "./types";
+  type userType,
-import { routerArrays } from "@/layout/types";
+  store,
-import { router, resetRouter } from "@/router";
+  router,
-import { storageLocal } from "@pureadmin/utils";
+  resetRouter,
-import { getLogin, refreshTokenApi } from "@/api/user";
+  routerArrays,
-import type { UserResult, RefreshTokenResult } from "@/api/user";
+  storageLocal
-import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
+} from "../utils";
+import {
+  type UserResult,
+  type RefreshTokenResult,
+  getLogin,
+  refreshTokenApi
+} from "@/api/user";
+import { useMultiTagsStoreHook } from "./multiTags";
 import { type DataInfo, setToken, removeToken, userKey } from "@/utils/auth";
 
 export const useUserStore = defineStore({
   id: "pure-user",
   state: (): userType => ({
+    // 头像
+    avatar: storageLocal().getItem<DataInfo<number>>(userKey)?.avatar ?? "",
     // 用户名
     username: storageLocal().getItem<DataInfo<number>>(userKey)?.username ?? "",
+    // 昵称
+    nickname: storageLocal().getItem<DataInfo<number>>(userKey)?.nickname ?? "",
     // 页面级别权限
     roles: storageLocal().getItem<DataInfo<number>>(userKey)?.roles ?? [],
     // 是否勾选了登录页的免登录
@@ -22,10 +33,18 @@ export const useUserStore = defineStore({
     loginDay: 7
   }),
   actions: {
+    /** 存储头像 */
+    SET_AVATAR(avatar: string) {
+      this.avatar = avatar;
+    },
     /** 存储用户名 */
     SET_USERNAME(username: string) {
       this.username = username;
     },
+    /** 存储昵称 */
+    SET_NICKNAME(nickname: string) {
+      this.nickname = nickname;
+    },
     /** 存储角色 */
     SET_ROLES(roles: Array<string>) {
       this.roles = roles;
@@ -43,10 +62,8 @@ export const useUserStore = defineStore({
       return new Promise<UserResult>((resolve, reject) => {
         getLogin(data)
           .then(data => {
-            if (data) {
+            if (data?.success) setToken(data.data);
-              setToken(data.data);
             resolve(data);
-            }
           })
           .catch(error => {
             reject(error);

src/store/types.ts

@@ -19,6 +19,7 @@ export type appType = {
   };
   layout: string;
   device: string;
+  viewportSize: { width: number; height: number };
 };
 
 export type multiType = {
@@ -36,7 +37,9 @@ export type setType = {
 };
 
 export type userType = {
+  avatar?: string;
   username?: string;
+  nickname?: string;
   roles?: Array<string>;
   isRemembered?: boolean;
   loginDay?: number;

src/store/utils.ts

@@ -0,0 +1,28 @@
+export { store } from "@/store";
+export { routerArrays } from "@/layout/types";
+export { router, resetRouter, constantMenus } from "@/router";
+export { getConfig, responsiveStorageNameSpace } from "@/config";
+export {
+  ascending,
+  filterTree,
+  filterNoPermissionTree,
+  formatFlatteningRoutes
+} from "@/router/utils";
+export {
+  isUrl,
+  isEqual,
+  isNumber,
+  debounce,
+  isBoolean,
+  getKeyList,
+  storageLocal,
+  deviceDetection
+} from "@pureadmin/utils";
+export type {
+  setType,
+  appType,
+  userType,
+  multiType,
+  cacheType,
+  positionType
+} from "./types";

src/style/dark.scss

@@ -25,7 +25,8 @@ html.dark {
     background: var(--el-bg-color) !important;
   }
 
-  .app-main {
+  .app-main,
+  .app-main-nofixed-header {
     background: #020409 !important;
   }
 
@@ -51,7 +52,7 @@ html.dark {
     }
   }
 
-  /* 项目配置面板 */
+  /* 系统配置面板 */
   .right-panel-items {
     .el-divider__text {
       --el-bg-color: var(--el-bg-color);

src/style/login.css

@@ -31,6 +31,7 @@
   display: flex;
   align-items: center;
   text-align: center;
+  overflow: hidden;
 }
 
 .login-form {

src/style/reset.scss

@@ -194,7 +194,6 @@ button,
   cursor: default;
 }
 
-img,
 svg,
 video,
 canvas,

src/style/sidebar.scss

@@ -35,7 +35,8 @@
     }
   }
 
-  .set-icon {
+  .set-icon,
+  .fullscreen-icon {
     display: flex;
     align-items: center;
     justify-content: center;
@@ -91,7 +92,7 @@
     z-index: 1001;
     width: $sideBarWidth !important;
     height: 100%;
-    overflow: hidden;
+    overflow: visible;
     font-size: 0;
     background: $menuBg;
     border-right: 1px solid var(--pure-border-color);
@@ -262,8 +263,9 @@
     }
 
     & > .el-menu {
-      i {
+      i,
-        margin-right: 20px;
+      svg {
+        margin-right: 5px;
       }
     }
 
@@ -460,7 +462,9 @@
 
       /* 搜索 */
       .search-container,
-      /* 告警 */
+      /* 全屏 */
+      .fullscreen-icon,
+      /* 消息通知 */
       .dropdown-badge,
       /* 用户名 */
       .el-dropdown-link,
@@ -631,7 +635,9 @@ body[layout="vertical"] {
 
   /* 搜索 */
   .search-container,
-  /* 告警 */
+  /* 全屏 */
+  .fullscreen-icon,
+  /* 消息通知 */
   .dropdown-badge,
   /* 用户名 */
   .el-dropdown-link,

src/utils/auth.ts

@@ -9,9 +9,13 @@ export interface DataInfo<T> {
   expires: T;
   /** 用于调用刷新accessToken的接口时所需的token */
   refreshToken: string;
+  /** 头像 */
+  avatar?: string;
   /** 用户名 */
   username?: string;
-  /** 当前登陆用户的角色 */
+  /** 昵称 */
+  nickname?: string;
+  /** 当前登录用户的角色 */
   roles?: Array<string>;
 }
 
@@ -36,15 +40,15 @@ export function getToken(): DataInfo<number> {
 /**
  * @description 设置`token`以及一些必要信息并采用无感刷新`token`方案
  * 无感刷新：后端返回`accessToken`（访问接口使用的`token`）、`refreshToken`（用于调用刷新`accessToken`的接口时所需的`token`，`refreshToken`的过期时间（比如30天）应大于`accessToken`的过期时间（比如2小时））、`expires`（`accessToken`的过期时间）
- * 将`accessToken`、`expires`这两条信息放在key值为authorized-token的cookie里（过期自动销毁）
+ * 将`accessToken`、`expires`、`refreshToken`这三条信息放在key值为authorized-token的cookie里（过期自动销毁）
- * 将`username`、`roles`、`refreshToken`、`expires`这四条信息放在key值为`user-info`的localStorage里（利用`multipleTabsKey`当浏览器完全关闭后自动销毁）
+ * 将`avatar`、`username`、`nickname`、`roles`、`refreshToken`、`expires`这六条信息放在key值为`user-info`的localStorage里（利用`multipleTabsKey`当浏览器完全关闭后自动销毁）
  */
 export function setToken(data: DataInfo<Date>) {
   let expires = 0;
   const { accessToken, refreshToken } = data;
   const { isRemembered, loginDay } = useUserStoreHook();
   expires = new Date(data.expires).getTime(); // 如果后端直接设置时间戳，将此处代码改为expires = data.expires，然后把上面的DataInfo<Date>改成DataInfo<number>即可
-  const cookieString = JSON.stringify({ accessToken, expires });
+  const cookieString = JSON.stringify({ accessToken, expires, refreshToken });
 
   expires > 0
     ? Cookies.set(TokenKey, cookieString, {
@@ -62,26 +66,44 @@ export function setToken(data: DataInfo<Date>) {
       : {}
   );
 
-  function setUserKey(username: string, roles: Array<string>) {
+  function setUserKey({ avatar, username, nickname, roles }) {
+    useUserStoreHook().SET_AVATAR(avatar);
     useUserStoreHook().SET_USERNAME(username);
+    useUserStoreHook().SET_NICKNAME(nickname);
     useUserStoreHook().SET_ROLES(roles);
     storageLocal().setItem(userKey, {
       refreshToken,
       expires,
+      avatar,
       username,
+      nickname,
       roles
     });
   }
 
   if (data.username && data.roles) {
     const { username, roles } = data;
-    setUserKey(username, roles);
+    setUserKey({
+      avatar: data?.avatar ?? "",
+      username,
+      nickname: data?.nickname ?? "",
+      roles
+    });
   } else {
+    const avatar =
+      storageLocal().getItem<DataInfo<number>>(userKey)?.avatar ?? "";
     const username =
       storageLocal().getItem<DataInfo<number>>(userKey)?.username ?? "";
+    const nickname =
+      storageLocal().getItem<DataInfo<number>>(userKey)?.nickname ?? "";
     const roles =
       storageLocal().getItem<DataInfo<number>>(userKey)?.roles ?? [];
-    setUserKey(username, roles);
+    setUserKey({
+      avatar,
+      username,
+      nickname,
+      roles
+    });
   }
 }
 

src/utils/http/index.ts

@@ -35,16 +35,16 @@ class PureHttp {
     this.httpInterceptorsResponse();
   }
 
-  /** token过期后，暂存待执行的请求 */
+  /** `token`过期后，暂存待执行的请求 */
   private static requests = [];
 
-  /** 防止重复刷新token */
+  /** 防止重复刷新`token` */
   private static isRefreshing = false;
 
   /** 初始化配置对象 */
   private static initConfig: PureHttpRequestConfig = {};
 
-  /** 保存当前Axios实例对象 */
+  /** 保存当前`Axios`实例对象 */
   private static axiosInstance: AxiosInstance = Axios.create(defaultConfig);
 
   /** 重连原始请求 */
@@ -72,9 +72,9 @@ class PureHttp {
           PureHttp.initConfig.beforeRequestCallback(config);
           return config;
         }
-        /** 请求白名单，放置一些不需要token的接口（通过设置请求白名单，防止token过期后再请求造成的死循环问题） */
+        /** 请求白名单，放置一些不需要`token`的接口（通过设置请求白名单，防止`token`过期后再请求造成的死循环问题） */
         const whiteList = ["/refresh-token", "/login"];
-        return whiteList.find(url => url === config.url)
+        return whiteList.some(url => config.url.endsWith(url))
           ? config
           : new Promise(resolve => {
               const data = getToken();
@@ -172,22 +172,22 @@ class PureHttp {
     });
   }
 
-  /** 单独抽离的post工具函数 */
+  /** 单独抽离的`post`工具函数 */
   public post<T, P>(
     url: string,
-    params?: AxiosRequestConfig<T>,
+    params?: AxiosRequestConfig<P>,
     config?: PureHttpRequestConfig
-  ): Promise<P> {
+  ): Promise<T> {
-    return this.request<P>("post", url, params, config);
+    return this.request<T>("post", url, params, config);
   }
 
-  /** 单独抽离的get工具函数 */
+  /** 单独抽离的`get`工具函数 */
   public get<T, P>(
     url: string,
-    params?: AxiosRequestConfig<T>,
+    params?: AxiosRequestConfig<P>,
     config?: PureHttpRequestConfig
-  ): Promise<P> {
+  ): Promise<T> {
-    return this.request<P>("get", url, params, config);
+    return this.request<T>("get", url, params, config);
   }
 }
 

src/utils/print.ts

@@ -19,7 +19,6 @@ const Print = function (dom, options?: object): PrintFunction {
     printDoneCallBack: null
   };
   for (const key in this.conf) {
-    // eslint-disable-next-line no-prototype-builtins
     if (key && options.hasOwnProperty(key)) {
       this.conf[key] = options[key];
     }
@@ -132,9 +131,9 @@ Print.prototype = {
       "style",
       "position:absolute;width:0;height:0;top:-10px;left:-10px;"
     );
-    // eslint-disable-next-line prefer-const
+
     w = f.contentWindow || f.contentDocument;
-    // eslint-disable-next-line prefer-const
+
     doc = f.contentDocument || f.contentWindow.document;
     doc.open();
     doc.write(content);

src/utils/responsive.ts

@@ -15,10 +15,10 @@ export const injectResponsiveStorage = (app: App, config: PlatformConfigs) => {
         darkMode: config.DarkMode ?? false,
         sidebarStatus: config.SidebarStatus ?? true,
         epThemeColor: config.EpThemeColor ?? "#409EFF",
-        themeColor: config.Theme ?? "light", // 主题色（对应项目配置中的主题色，与theme不同的是它不会受到浅色、深色整体风格切换的影响，只会在手动点击主题色时改变）
+        themeColor: config.Theme ?? "light", // 主题色（对应系统配置中的主题色，与theme不同的是它不会受到浅色、深色整体风格切换的影响，只会在手动点击主题色时改变）
         overallStyle: config.OverallStyle ?? "light" // 整体风格（浅色：light、深色：dark、自动：system）
       },
-      // 项目配置-界面显示
+      // 系统配置-界面显示
       configure: Storage.getData("configure", nameSpace) ?? {
         grey: config.Grey ?? false,
         weak: config.Weak ?? false,
@@ -26,7 +26,8 @@ export const injectResponsiveStorage = (app: App, config: PlatformConfigs) => {
         hideFooter: config.HideFooter ?? true,
         showLogo: config.ShowLogo ?? true,
         showModel: config.ShowModel ?? "smart",
-        multiTagsCache: config.MultiTagsCache ?? false
+        multiTagsCache: config.MultiTagsCache ?? false,
+        stretch: config.Stretch ?? false
       }
     },
     config.MultiTagsCache

src/views/login/index.vue

@@ -28,8 +28,8 @@ const ruleFormRef = ref<FormInstance>();
 const { initStorage } = useLayout();
 initStorage();
 
-const { dataTheme, dataThemeChange } = useDataThemeChange();
+const { dataTheme, overallStyle, dataThemeChange } = useDataThemeChange();
-dataThemeChange();
+dataThemeChange(overallStyle.value);
 const { title } = useNav();
 
 const ruleForm = reactive({
@@ -38,23 +38,26 @@ const ruleForm = reactive({
 });
 
 const onLogin = async (formEl: FormInstance | undefined) => {
-  loading.value = true;
   if (!formEl) return;
   await formEl.validate((valid, fields) => {
     if (valid) {
+      loading.value = true;
       useUserStoreHook()
         .loginByUsername({ username: ruleForm.username, password: "admin123" })
         .then(res => {
           if (res.success) {
             // 获取后端路由
-            initRouter().then(() => {
+            return initRouter().then(() => {
-              router.push(getTopMenu(true).path);
+              router.push(getTopMenu(true).path).then(() => {
                 message("登录成功", { type: "success" });
               });
-          }
             });
           } else {
-      loading.value = false;
+            message("登录失败", { type: "error" });
+          }
+        })
+        .finally(() => (loading.value = false));
+    } else {
       return fields;
     }
   });

tailwind.config.ts

@@ -1,5 +1,6 @@
-/** @type {import('tailwindcss').Config} */
+import type { Config } from "tailwindcss";
-module.exports = {
+
+export default {
   darkMode: "class",
   corePlugins: {
     preflight: false
@@ -15,4 +16,4 @@ module.exports = {
       }
     }
   }
-};
+} satisfies Config;

types/global-components.d.ts

@@ -21,6 +21,8 @@ declare module "vue" {
     ElAside: (typeof import("element-plus"))["ElAside"];
     ElAutocomplete: (typeof import("element-plus"))["ElAutocomplete"];
     ElAvatar: (typeof import("element-plus"))["ElAvatar"];
+    ElAnchor: (typeof import("element-plus"))["ElAnchor"];
+    ElAnchorLink: (typeof import("element-plus"))["ElAnchorLink"];
     ElBacktop: (typeof import("element-plus"))["ElBacktop"];
     ElBadge: (typeof import("element-plus"))["ElBadge"];
     ElBreadcrumb: (typeof import("element-plus"))["ElBreadcrumb"];

types/global.d.ts

@@ -38,6 +38,15 @@ declare global {
     msRequestAnimationFrame: (callback: FrameRequestCallback) => number;
   }
 
+  /**
+   * Document 的类型提示
+   */
+  interface Document {
+    webkitFullscreenElement?: Element;
+    mozFullScreenElement?: Element;
+    msFullscreenElement?: Element;
+  }
+
   /**
    * 打包压缩格式的类型声明
    */
@@ -52,7 +61,7 @@ declare global {
 
   /**
    * 全局自定义环境变量的类型声明
-   * @see {@link https://yiming_chang.gitee.io/pure-admin-doc/pages/config/#%E5%85%B7%E4%BD%93%E9%85%8D%E7%BD%AE}
+   * @see {@link https://pure-admin.github.io/pure-admin-doc/pages/config/#%E5%85%B7%E4%BD%93%E9%85%8D%E7%BD%AE}
    */
   interface ViteEnv {
     VITE_PORT: number;
@@ -70,7 +79,7 @@ declare global {
 
   /**
    * 对应 `public/platform-config.json` 文件的类型声明
-   * @see {@link https://yiming_chang.gitee.io/pure-admin-doc/pages/config/#platform-config-json}
+   * @see {@link https://pure-admin.github.io/pure-admin-doc/pages/config/#platform-config-json}
    */
   interface PlatformConfigs {
     Version?: string;
@@ -78,6 +87,7 @@ declare global {
     FixedHeader?: boolean;
     HiddenSideBar?: boolean;
     MultiTagsCache?: boolean;
+    MaxTagsLevel?: number;
     KeepAlive?: boolean;
     Locale?: string;
     Layout?: string;
@@ -88,6 +98,7 @@ declare global {
     Weak?: boolean;
     HideTabs?: boolean;
     HideFooter?: boolean;
+    Stretch?: boolean | number;
     SidebarStatus?: boolean;
     EpThemeColor?: string;
     ShowLogo?: boolean;
@@ -101,7 +112,7 @@ declare global {
 
   /**
    * 与 `PlatformConfigs` 类型不同，这里是缓存到浏览器本地存储的类型声明
-   * @see {@link https://yiming_chang.gitee.io/pure-admin-doc/pages/config/#platform-config-json}
+   * @see {@link https://pure-admin.github.io/pure-admin-doc/pages/config/#platform-config-json}
    */
   interface StorageConfigs {
     version?: string;
@@ -152,6 +163,7 @@ declare global {
       showLogo?: boolean;
       showModel?: string;
       multiTagsCache?: boolean;
+      stretch?: boolean | number;
     };
     tags?: Array<any>;
   }

types/router.d.ts

@@ -45,8 +45,10 @@ declare global {
       /** 离场动画 */
       leaveTransition?: string;
     };
-    // 是否不添加信息到标签页，（默认`false`）
+    /** 当前菜单名称或自定义信息禁止添加到标签页（默认`false`） */
     hiddenTag?: boolean;
+    /** 当前菜单名称是否固定显示在标签页且不可关闭（默认`false`） */
+    fixedTag?: boolean;
     /** 动态路由可打开的最大数量 `可选` */
     dynamicLevel?: number;
     /** 将某个菜单激活

types/shims-vue.d.ts

@@ -8,5 +8,3 @@ declare module "*.scss" {
   const scss: Record<string, string>;
   export default scss;
 }
-
-declare module "element-plus/dist/locale/zh-cn.mjs";

vite.config.ts

@@ -4,14 +4,14 @@ import { type UserConfigExport, type ConfigEnv, loadEnv } from "vite";
 import {
   root,
   alias,
-  warpperEnv,
+  wrapperEnv,
   pathResolve,
   __APP_INFO__
 } from "./build/utils";
 
 export default ({ mode }: ConfigEnv): UserConfigExport => {
   const { VITE_CDN, VITE_PORT, VITE_COMPRESSION, VITE_PUBLIC_PATH } =
-    warpperEnv(loadEnv(mode, root));
+    wrapperEnv(loadEnv(mode, root));
   return {
     base: VITE_PUBLIC_PATH,
     root,