release: update 3.2.0

perf: menu

.env

@@ -1,14 +1,2 @@
-# port
+# 项目本地运行端口号
 VITE_PORT = 8848
-# title
-VITE_TITLE = vue-pure-admin
-# version
-VITE_VERSION = 2.6.0
-# open
-VITE_OPEN = false
-
-# public path
-VITE_PUBLIC_PATH = /
-
-# Cross-domain proxy, you can configure multiple
-VITE_PROXY = [ ["/api", "http://127.0.0.1:3000" ] ]

.env.development

@@ -1,14 +1,14 @@
-# port
+# 项目本地运行端口号
 VITE_PORT = 8848
-# title
-VITE_TITLE = vue-pure-admin
-# version
-VITE_VERSION = 2.6.0
-# open
-VITE_OPEN = false
 
-# public path
+# 开发环境读取配置文件路径
 VITE_PUBLIC_PATH = /
 
-# Cross-domain proxy, you can configure multiple
-VITE_PROXY = [ ["/api", "http://127.0.0.1:3000" ] ]
+# 开发环境代理
+VITE_PROXY_DOMAIN = /api
+
+# 开发环境路由历史模式
+VITE_ROUTER_HISTORY = "hash"
+
+# 开发环境后端地址
+VITE_PROXY_DOMAIN_REAL = "http://127.0.0.1:3000"

.env.production

@@ -1,2 +1,11 @@
-# public path
-VITE_PUBLIC_PATH = /manages/
+# 线上环境项目打包路径
+VITE_PUBLIC_PATH = /
+
+# 线上环境路由历史模式
+VITE_ROUTER_HISTORY = "hash"
+
+# 线上环境后端地址
+VITE_PROXY_DOMAIN_REAL = ""
+
+# 是否为打包后的文件提供传统浏览器兼容性支持 支持 true 不支持 false
+VITE_LEGACY = false

.eslintrc.js

@@ -37,7 +37,7 @@ module.exports = {
     "eslint:recommended",
     "@vue/typescript/recommended",
     "@vue/prettier",
-    "@vue/prettier/@typescript-eslint"
+    "@vue/eslint-config-typescript"
   ],
   parser: "vue-eslint-parser",
   parserOptions: {
@@ -50,6 +50,10 @@ module.exports = {
     }
   },
   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()
@@ -57,6 +61,18 @@ module.exports = {
     "@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",
       {
@@ -70,6 +86,12 @@ module.exports = {
         argsIgnorePattern: "^_",
         varsIgnorePattern: "^_"
       }
+    ],
+    "prettier/prettier": [
+      "error",
+      {
+        endOfLine: "auto"
+      }
     ]
   }
 };

.github/workflows/preview.yml

@@ -0,0 +1,34 @@
+name: preview
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [12.x]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: "16"
+          registry-url: https://registry.npmjs.com/
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: latest
+
+      - name: run deploy.sh
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: pnpm install && pnpm deploy

.husky/lintstagedrc.js

@@ -1,8 +1,6 @@
 module.exports = {
   "*.{js,jsx,ts,tsx}": ["eslint --fix", "prettier --write"],
-  "{!(package)*.json,*.code-snippets,.!(browserslist)*rc}": [
-    "prettier --write--parser json"
-  ],
+  "{!(package)*.json,.!(browserslist)*rc}": ["prettier --write--parser json"],
   "package.json": ["prettier --write"],
   "*.vue": ["eslint --fix", "prettier --write", "stylelint --fix"],
   "*.{vue,css,scss,postcss,less}": ["stylelint --fix", "prettier --write"],

.prettierrc.js

@@ -1,7 +1,6 @@
 module.exports = {
   bracketSpacing: true,
-  jsxBracketSameLine: true,
   singleQuote: false,
-  arrowParens: 'avoid',
-  trailingComma: 'none'
+  arrowParens: "avoid",
+  trailingComma: "none"
 };

.vscode/extensions.json

@@ -0,0 +1,15 @@
+{
+  "recommendations": [
+    "voorjaar.windicss-intellisense",
+    "vscode-icons-team.vscode-icons",
+    "davidanson.vscode-markdownlint",
+    "stylelint.vscode-stylelint",
+    "dbaeumer.vscode-eslint",
+    "esbenp.prettier-vscode",
+    "johnsoncodehk.volar",
+    "lokalise.i18n-ally",
+    "mikestead.dotenv",
+    "eamodio.gitlens",
+    "antfu.iconify"
+  ]
+}

.vscode/settings.json

@@ -1,21 +1,9 @@
 {
-  // You should install these plugins:
-  // ESLint
-  // Prettier - Code formatter
-  // stylelint
-  // vscode-icons
-  // TypeScript Vue Plugin (Volar)
-  // Vue Language Features (Volar)
-  "terminal.integrated.rendererType": "dom",
   "editor.formatOnType": true,
   "editor.formatOnSave": true,
-  "javascript.updateImportsOnFileMove.enabled": "always",
   "[vue]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  "[javascript]": {
-    "editor.defaultFormatter": "vscode.typescript-language-features"
-  },
   "editor.tabSize": 2,
   "editor.formatOnPaste": true,
   "files.autoSave": "afterDelay",
@@ -24,26 +12,26 @@
   "editor.suggestSelection": "first",
   "editor.acceptSuggestionOnCommitCharacter": false,
   "css.lint.propertyIgnoredDueToDisplay": "ignore",
-  // Prevent inline styles from being automatically formatted to all lowercase
   "editor.quickSuggestions": {
     "other": true,
     "comments": true,
     "strings": true
   },
-  // Automatically fix some syntax errors of ts
-  "tslint.autoFixOnSave": true,
   "files.associations": {
-    // Specifies the location of snippets in the suggestion widget
     "editor.snippetSuggestions": "top"
   },
   "[css]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  "cSpell.userWords": ["sourcemap", "vite"],
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true
   },
-  "volar.tsPlugin": true,
-  "typescript.tsdk": "node_modules/typescript/lib",
-  "i18n-ally.localesPaths": ["src/plugins/i18n"]
+  "i18n-ally.localesPaths": "locales",
+  "i18n-ally.keystyle": "nested",
+  "i18n-ally.sortKeys": true,
+  "i18n-ally.namespace": true,
+  "i18n-ally.enabledParsers": ["yaml", "js"],
+  "i18n-ally.sourceLanguage": "en",
+  "i18n-ally.displayLanguage": "zh-CN",
+  "i18n-ally.enabledFrameworks": ["vue"]
 }

.vscode/vue3.2.code-snippets

@@ -0,0 +1,17 @@
+{
+  "Vue3.2+快速生成模板": {
+    "prefix": "Vue3.2+",
+    "body": [
+      "<script setup lang='ts'>",
+      "</script>\n",
+      "<template>",
+      "\t<div>\n",
+      "\t</div>",
+      "</template>\n",
+      "<style scoped>\n",
+      "</style>",
+      "$2"
+    ],
+    "description": "Vue3.2+"
+  }
+}

.vscode/vue3.2.setup-snippets

@@ -1,20 +0,0 @@
-{
-  "Vue3.2快速生成模板": {
-    "prefix": "Vue3.2",
-    "body": [
-      "<!-- $1 -->",
-      "<script setup lang='ts'>",
-      "\t$2",
-      "</script>\n",
-      "<template>",
-      "\t<div>",
-      "\t\t$3",
-      "\t</div>",
-      "</template>\n",
-      "<style scoped>",
-      "\t$4",
-      "</style>"
-    ],
-    "description": "Vue3.2"
-  }
-}

CHANGELOG.en_US.md

@@ -1,3 +1,104 @@
+# 3.2.0 (2022-3-22)
+
+### 🎫 Feat
+
+- Icon selection component
+- Menu search function
+- Added results page
+- Extended `element-plus` timeline component
+- Extended `element-plus` tree component to support connecting lines
+- Add tree selector, support single and multiple selection
+
+### 🍏 Perf
+
+- Optimized the error page UI
+- Optimize the internationalization function
+- Optimized routing `rank` sorting, compatible with the case where the value of the `rank` field in the routing `meta` is `null`
+
+### 🐞 Bug fixes
+
+- Fixed the situation where the menu expands and folds will freeze on some computers
+
+# 3.1.0 (2022-3-3)
+
+### 🎫 Feat
+
+- iframe supports dynamic loading
+- Watermark example
+- Print examples (pictures, tables, echarts)
+- Add running and packaging information, use `lodash-unified` to replace `lodash-es`, `lodash-unified` supports `ESM` and is compatible with `CJS`
+
+### 🐞 Bug fixes
+
+- Fixed jumping to another menu page alone in one menu page, the routing page jumped but the tab page was not displayed
+- Fixed the route that returns dynamic level 3 and above in the background, and the menu does not correspond to the page
+
+# 3.0 (2022-2-14)
+
+### 🎫 Feat
+
+- Added mix navigation
+
+### 🐞 Bug fixes
+
+- Fix tab page bug
+
+# 2.9.0 (2022-2-5)
+
+### 🎫 Feat
+
+- Added package size analysis, command `pnpm report`
+
+### 🍏 Perf
+
+- Use `iconify` to introduce icons on demand, optimize icon size, and reduce network requests
+- Optimize the route, the route can not pass `showLink: true`, it is displayed by default
+
+# 2.8.5 (2022-1-21)
+
+### 🎫 Feat
+
+- Added `WindiCSS` support
+- Add online environment remove console plugin `vite-plugin-remove-console`
+
+### ✔️ refactor
+
+- Replace `@element-plus/icons-vue` with `@iconify-icons/ep`
+
+# 2.8.0(2022-1-4)
+
+### 🎫 Feat
+
+-Added dark theme
+-Add element-plus custom theme
+-Add guide page
+
+### 🍏 Perf
+
+-Optimize internationalization, compatible with the vscode plug-in i18n Ally smart reminder
+-Optimize the back-end return routing structure
+-Optimize local storage, with four built-in buttons `responsive-configure`, `responsive-locale`, `responsive-layout`, `responsive-tags`, which are basic configuration, international configuration, layout configuration, and tab persistent configuration
+
+# 2.7.0(2021-12-18)
+
+### 🎫 Feat
+
+- New tab reuse
+- New message reminder template
+- Added front-end menu tree structure example
+- Refactor routing, optimize permissions modules, and bring a more convenient experience
+- Refactor the env environment and http request to bring a more convenient experience
+- Currently, the tabs of the platform are forced to associate with local storage. The next step is to put the tabs in the memory by default and support configurable persistent tabs
+- Navigation menu icons support fontawesome, iconfont, remixicon, element-plus/icons, custom svg
+- Update font-awesome to version 5.0, because versions below 5.0 are no longer officially maintained, but the platform will still be compatible with font-awesome4 version
+
+### 🍏 Perf
+
+- Optimize the tab page to bring a better interactive experience
+- Routing title supports direct writing in Chinese, which can be separated from internationalization
+- Route history mode is read from env and supports base parameter
+- Packaged files provide traditional browser compatibility support, configure VITE_LEGACY to true
+
 # 2.6.0(2021-11-10)
 
 ### 🎫 Feat

CHANGELOG.md

@@ -1,3 +1,104 @@
+# 3.2.0 (2022-3-22)
+
+### 🎫 Feat
+
+- Icon selection component
+- Menu search function
+- Added results page
+- Extended `element-plus` timeline component
+- Extended `element-plus` tree component to support connecting lines
+- Add tree selector, support single and multiple selection
+
+### 🍏 Perf
+
+- Optimized the error page UI
+- Optimize the internationalization function
+- Optimized routing `rank` sorting, compatible with the case where the value of the `rank` field in the routing `meta` is `null`
+
+### 🐞 Bug fixes
+
+- Fixed the situation where the menu expands and folds will freeze on some computers
+
+# 3.1.0 (2022-3-3)
+
+### 🎫 Feat
+
+- iframe supports dynamic loading
+- Watermark example
+- Print examples (pictures, tables, echarts)
+- Add running and packaging information, use `lodash-unified` to replace `lodash-es`, `lodash-unified` supports `ESM` and is compatible with `CJS`
+
+### 🐞 Bug fixes
+
+- Fixed jumping to another menu page alone in one menu page, the routing page jumped but the tab page was not displayed
+- Fixed the route that returns dynamic level 3 and above in the background, and the menu does not correspond to the page
+
+# 3.0 (2022-2-14)
+
+### 🎫 Feat
+
+- Added mix navigation
+
+### 🐞 Bug fixes
+
+- Fix tab page bug
+
+# 2.9.0 (2022-2-5)
+
+### 🎫 Feat
+
+- Added package size analysis, command `pnpm report`
+
+### 🍏 Perf
+
+- Use `iconify` to introduce icons on demand, optimize icon size, and reduce network requests
+- Optimize the route, the route can not pass `showLink: true`, it is displayed by default
+
+# 2.8.5 (2022-1-21)
+
+### 🎫 Feat
+
+- Added `WindiCSS` support
+- Add online environment remove console plugin `vite-plugin-remove-console`
+
+### ✔️ refactor
+
+- Replace `@element-plus/icons-vue` with `@iconify-icons/ep`
+
+# 2.8.0(2022-1-4)
+
+### 🎫 Feat
+
+-Added dark theme
+-Add element-plus custom theme
+-Add guide page
+
+### 🍏 Perf
+
+-Optimize internationalization, compatible with the vscode plug-in i18n Ally smart reminder
+-Optimize the back-end return routing structure
+-Optimize local storage, with four built-in buttons `responsive-configure`, `responsive-locale`, `responsive-layout`, `responsive-tags`, which are basic configuration, international configuration, layout configuration, and tab persistent configuration
+
+# 2.7.0(2021-12-18)
+
+### 🎫 Feat
+
+- New tab reuse
+- New message reminder template
+- Added front-end menu tree structure example
+- Refactor routing, optimize permissions modules, and bring a more convenient experience
+- Refactor the env environment and http request to bring a more convenient experience
+- Currently, the tabs of the platform are forced to associate with local storage. The next step is to put the tabs in the memory by default and support configurable persistent tabs
+- Navigation menu icons support fontawesome, iconfont, remixicon, element-plus/icons, custom svg
+- Update font-awesome to version 5.0, because versions below 5.0 are no longer officially maintained, but the platform will still be compatible with font-awesome4 version
+
+### 🍏 Perf
+
+- Optimize the tab page to bring a better interactive experience
+- Routing title supports direct writing in Chinese, which can be separated from internationalization
+- Route history mode is read from env and supports base parameter
+- Packaged files provide traditional browser compatibility support, configure VITE_LEGACY to true
+
 # 2.6.0(2021-11-10)
 
 ### 🎫 Feat

CHANGELOG.zh_CN.md

@@ -1,3 +1,104 @@
+# 3.2.0 (2022-3-22)
+
+### 🎫 Feat
+
+- 图标选择组件
+- 菜单搜索功能
+- 添加结果页面
+- 扩展`element-plus`时间线组件
+- 扩展`element-plus`树组件，支持连接线
+- 添加树形选择器，支持单选和多选
+
+### 🍏 Perf
+
+- 优化错误页面 UI
+- 优化国际化功能
+- 优化路由`rank`排序，兼容路由`meta`中`rank`字段值为`null`的情况
+
+### 🐞 Bug fixes
+
+- 修复菜单展开折叠在部分电脑出现卡顿的情况
+
+# 3.1.0 (2022-3-3)
+
+### 🎫 Feat
+
+- iframe 支持动态加载
+- 水印示例
+- 打印示例（图片、表格、echarts）
+- 添加运行、打包信息, 使用`lodash-unified`替换`lodash-es`,`lodash-unified`支持`ESM`同时兼容`CJS`
+
+### 🐞 Bug fixes
+
+- 修复在一个菜单页面内单独跳转到另一个菜单页面，路由页面跳转了但是标签页不显示的情况
+- 修复后台返回动态三级及以上的路由，出现菜单与页面不对应的情况
+
+# 3.0 (2022-2-14)
+
+### 🎫 Feat
+
+- 添加混合导航
+
+### 🐞 Bug fixes
+
+- 修复标签页 bug
+
+# 2.9.0(2022-2-5)
+
+### 🎫 Feat
+
+- 添加打包大小分析，命令`pnpm report`
+
+### 🍏 Perf
+
+- 采用`iconify`按需引入图标，优化图标大小，减少网络请求
+- 优化路由，路由可不传`showLink: true`，默认显示
+
+# 2.8.5(2022-1-21)
+
+### 🎫 Feat
+
+- 添加 `WindiCSS` 支持
+- 添加线上环境删 console 插件`vite-plugin-remove-console`
+
+### ✔️ refactor
+
+- 使用`@iconify-icons/ep`替换`@element-plus/icons-vue`
+
+# 2.8.0(2022-1-4)
+
+### 🎫 Feat
+
+- 添加暗黑主题
+- 添加 element-plus 自定义主题
+- 添加引导页
+
+### 🍏 Perf
+
+- 优化国际化，兼容 vscode 插件 i18n Ally 智能提醒
+- 优化后端返回路由结构
+- 优化本地存储，内置四个键`responsive-configure`、`responsive-locale`、`responsive-layout`、`responsive-tags`，分别为基本配置、国际化配置、布局配置、标签页持久化配置
+
+# 2.7.0(2021-12-18)
+
+### 🎫 Feat
+
+- 新增标签页复用
+- 新增消息提醒模版
+- 新增前端菜单树结构例子
+- 重构路由，优化权限模块，带来更方便的体验
+- 重构 env 环境和 http 请求，带来更方便的体验
+- 目前平台的标签页强制关联了本地存储，下一步标签页默认放到内存中并支持可配置持久化标签页
+- 导航菜单图标支持 fontawesome、iconfont、remixicon、element-plus/icons、自定义 svg
+- 更新 font-awesome 到 5.0 版本，因为 5.0 以下的版本官方不再维护，但平台依旧会兼容 font-awesome4 版本
+
+### 🍏 Perf
+
+- 优化标签页，带来更好的交互体验
+- 路由 title 支持直接写中文，可脱离国际化
+- 路由历史模式从 env 读取并支持 base 参数
+- 打包后的文件提供传统浏览器兼容性支持，配置 VITE_LEGACY 为 true
+
 # 2.6.0(2021-11-10)
 
 ### 🎫 Feat

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 啝裳
+Copyright (c) 2022 啝裳
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.en-US.md

@@ -1,6 +1,8 @@
 <h1>vue-pure-admin</h1>
 
-[![license](https://img.shields.io/github/license/xiaoxian521/vue-pure-admin.svg)](LICENSE)
+![GitHub license](https://img.shields.io/github/license/xiaoxian521/vue-pure-admin?style=flat)
+![GitHub stars](https://img.shields.io/github/stars/xiaoxian521/vue-pure-admin?color=fa6470&style=flat)
+![GitHub forks](https://img.shields.io/github/forks/xiaoxian521/vue-pure-admin?style=flat)
 
 **English** | [中文](./README.md)
 
@@ -8,34 +10,27 @@
 
 vue-pure-admin is a free and open source middle and back-end template. Using the latest `vue3` `vite2` `Element-Plus` `TypeScript` and other mainstream technology development, the out-of-the-box middle and back-end front-end solutions can also be used for learning reference.
 
-## Supporting video tutorial
+## Supporting Video
 
-bilibili：<https://www.bilibili.com/video/BV1534y1S7HV/>
+- [Click Watch Tutorial](https://www.bilibili.com/video/BV1534y1S7HV)
+- [Click Watch UI Design](https://www.bilibili.com/video/BV17g411T7rq)
+
+## Docs
+
+- [Click Watch Docs](https://pure-admin-doc.vercel.app)
+
+## Thin
+
+- [Click Watch Thin](https://github.com/xiaoxian521/pure-admin-thin)
 
 ## Preview
 
-- [vue-pure-admin](http://yiming_chang.gitee.io/manages)
-
-Click to log in without password
+- [vue-pure-admin](https://vue-pure-admin.vercel.app)
 
 <p align="center">
-    <img alt="PureAdmin Logo" width="100%" src="https://p9-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/f5ee80eee1014fb4a53c5bb37574a5f5~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/dec0672a62e141f3b7f626c22ff6c7ef~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/f586f1353de74b1b88cc9f89fce2146e~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/a28fc0af7ac44e3b8f30469cba4a9993~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/a17e54329cda4d76aa9c1c4f2a4715d3~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/d884fb611da74ee0bdc17c29014d0260~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/abed44ac1f2744e897c28d1689bcb517~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/cf2f068650f44a0787c699f5a20c75a6~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/73c575dd06474731ad8ab9d853f1ddfd~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p9-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/99389b90f5ac4db9b0d61d99dd9a1454~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/f1546f1c6014446db6c9983934aedc86~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/cfb0093b77c34e87b094daaa4304bc2d~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/fe133cc6db3245f9b1b37f231d040550~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/d3110a12d63e4f6fb314e60bf18bdb66~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/45b93ec453e3406a939affe65ddcc803~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/cdc2dc88c1ef4aafbaaade820442c986~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/f4c91b162206485b88cc58a72ff54a01~tplv-k3u1fbpfcp-watermark.image">
+  <img alt="PureAdmin Logo" width="100%" src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/b4857fc7eb7d4c0f8deeefc644c1f7dd~tplv-k3u1fbpfcp-watermark.awebp?">
+  <img alt="PureAdmin Logo" width="100%" src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/549c3184697f4d268a78c9833e5ec2ea~tplv-k3u1fbpfcp-watermark.awebp?">
+  <img alt="PureAdmin Logo" width="100%" src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/381fc957fac143db9f06efdd389d88a3~tplv-k3u1fbpfcp-watermark.awebp?">
 </p>
 
 ### Use Gitpod
@@ -51,7 +46,7 @@ Open the project in Gitpod (free online dev environment for GitHub) and start co
 ```bash
 git clone https://github.com/xiaoxian521/vue-pure-admin.git
 or
-git clone https://github.com.cnpmjs.org/xiaoxian521/vue-pure-admin.git
+git clone https://gitee.com/yiming_chang/vue-pure-admin.git
 ```
 
 - Installation dependencies
@@ -125,32 +120,26 @@ Support modern browsers, not IE
 
 ## Donate
 
-If you think this project is helpful to you, you can help the author buy a cup of coffee to show your support!
+If you think this project is helpful to you, you can help the author buy a glass of juice 🍹 Show your support
 
-<img src="http://yiming_chang.gitee.io/manages/pay.png" width="360px" height="480px" />
-
-## Exchange Group
-
-[WeChat exchange group, click to scan the code to enter the group](https://juejin.cn/post/6948419379566477342/)
-
-My WeChat: 18237613535, pull you into the group
+<img src="https://p9-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/f69bf13c5b854ed5b699807cafa0e3ce~tplv-k3u1fbpfcp-zoom-in-crop-mark:1304:0:0:0.awebp?" width="150px" height="150px" />
 
 ## License
 
-In principle, no fees and copyrights are charged, so you can use it with confidence
+In principle, no fees and copyrights are charged, and you can use it with confidence, but if you need secondary open source, please contact the author for permission!
 
 [MIT © xiaoxian521-2020](./LICENSE)
 
 ## Backers
 
-Thank you very much for your support, I believe the project will get better and better! ! ! :heart:
+Thank you very much for your support, I believe the project will get better and better :heart:
 
-|                                                                xueyuheng                                                                 |                                                                taolei1990                                                                 |                                                                hang-kim                                                                 |                                                               madwolfcrazy                                                                |                                                                limuen                                                                 |
-| :--------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------: |
-| <a href="https://github.com/xueyuheng"><img src="https://avatars.githubusercontent.com/u/48202935?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/taolei1990"><img src="https://avatars.githubusercontent.com/u/23173640?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/hang-kim"><img src="https://avatars.githubusercontent.com/u/52914259?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/madwolfcrazy"><img src="https://avatars.githubusercontent.com/u/223671?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/limuen"><img src="https://avatars.githubusercontent.com/u/31790606?v=4" width="60px" height="60px" /></a> |
+|                                                                xueyuheng                                                                 |                                                                taolei1990                                                                 |                                                                hang-kim                                                                 |                                                               madwolfcrazy                                                                |                                                                limuen                                                                 |                                                                BenLakes                                                                 |
+| :--------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------: |
+| <a href="https://github.com/xueyuheng"><img src="https://avatars.githubusercontent.com/u/48202935?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/taolei1990"><img src="https://avatars.githubusercontent.com/u/23173640?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/hang-kim"><img src="https://avatars.githubusercontent.com/u/52914259?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/madwolfcrazy"><img src="https://avatars.githubusercontent.com/u/223671?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/limuen"><img src="https://avatars.githubusercontent.com/u/31790606?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/BenLakes"><img src="https://avatars.githubusercontent.com/u/15206046?v=4" width="60px" height="60px" /></a> |
 
 ## Contributors
 
-This project exists thanks to all the people who contribute!!! :heart:
+This project exists thanks to all the people who contribute :heart:
 
 <a href="https://github.com/xiaoxian521/vue-pure-admin/graphs/contributors"><img src="https://contrib.rocks/image?repo=xiaoxian521/vue-pure-admin" /></a>

README.md

@@ -1,6 +1,8 @@
 <h1>vue-pure-admin</h1>
 
-[![license](https://img.shields.io/github/license/xiaoxian521/vue-pure-admin.svg)](LICENSE)
+![GitHub license](https://img.shields.io/github/license/xiaoxian521/vue-pure-admin?style=flat)
+![GitHub stars](https://img.shields.io/github/stars/xiaoxian521/vue-pure-admin?color=fa6470&style=flat)
+![GitHub forks](https://img.shields.io/github/forks/xiaoxian521/vue-pure-admin?style=flat)
 
 **中文** | [English](./README.en-US.md)
 
@@ -8,34 +10,27 @@
 
 vue-pure-admin 是一个免费开源的中后台模版。使用了最新的`vue3` `vite2` `Element-Plus` `TypeScript`等主流技术开发，开箱即用的中后台前端解决方案，也可用于学习参考。
 
-## 配套视频教程
+## 配套视频
 
-bilibili：<https://www.bilibili.com/video/BV1534y1S7HV/>
+- [点我查看教程](https://www.bilibili.com/video/BV1534y1S7HV)
+- [点我查看 UI 设计](https://www.bilibili.com/video/BV17g411T7rq)
+
+## 配套文档
+
+- [点我查看文档](https://pure-admin-doc.vercel.app)
+
+## 精简版
+
+- [点我查看精简版](https://github.com/xiaoxian521/pure-admin-thin)
 
 ## 预览
 
-- [vue-pure-admin](http://yiming_chang.gitee.io/manages)
-
-点击免密登录
+- [vue-pure-admin](https://vue-pure-admin.vercel.app)
 
 <p align="center">
-   <img alt="PureAdmin Logo" width="100%" src="https://p9-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/f5ee80eee1014fb4a53c5bb37574a5f5~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/dec0672a62e141f3b7f626c22ff6c7ef~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/f586f1353de74b1b88cc9f89fce2146e~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/a28fc0af7ac44e3b8f30469cba4a9993~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/a17e54329cda4d76aa9c1c4f2a4715d3~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/d884fb611da74ee0bdc17c29014d0260~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/abed44ac1f2744e897c28d1689bcb517~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/cf2f068650f44a0787c699f5a20c75a6~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/73c575dd06474731ad8ab9d853f1ddfd~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p9-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/99389b90f5ac4db9b0d61d99dd9a1454~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/f1546f1c6014446db6c9983934aedc86~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/cfb0093b77c34e87b094daaa4304bc2d~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/fe133cc6db3245f9b1b37f231d040550~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/d3110a12d63e4f6fb314e60bf18bdb66~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/45b93ec453e3406a939affe65ddcc803~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/cdc2dc88c1ef4aafbaaade820442c986~tplv-k3u1fbpfcp-watermark.image">
-    <img alt="PureAdmin Logo" width="100%" src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/f4c91b162206485b88cc58a72ff54a01~tplv-k3u1fbpfcp-watermark.image">
+  <img alt="PureAdmin Logo" width="100%" src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/b4857fc7eb7d4c0f8deeefc644c1f7dd~tplv-k3u1fbpfcp-watermark.awebp?">
+  <img alt="PureAdmin Logo" width="100%" src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/549c3184697f4d268a78c9833e5ec2ea~tplv-k3u1fbpfcp-watermark.awebp?">
+  <img alt="PureAdmin Logo" width="100%" src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/381fc957fac143db9f06efdd389d88a3~tplv-k3u1fbpfcp-watermark.awebp?">
 </p>
 
 ### 使用 Gitpod
@@ -51,7 +46,7 @@ bilibili：<https://www.bilibili.com/video/BV1534y1S7HV/>
 ```bash
 git clone https://github.com/xiaoxian521/vue-pure-admin.git
 or
-git clone https://github.com.cnpmjs.org/xiaoxian521/vue-pure-admin.git
+git clone https://gitee.com/yiming_chang/vue-pure-admin.git
 ```
 
 - 安装依赖
@@ -125,32 +120,32 @@ pnpm build
 
 ## 捐赠
 
-如果你觉得这个项目对你有帮助，你可以帮作者买一杯咖啡表示支持!
+如果你觉得这个项目对您有帮助，可以帮作者买一杯果汁 🍹 表示支持
 
-<img src="http://yiming_chang.gitee.io/manages/pay.png" width="360px" height="480px" />
+<img src="https://p9-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/f69bf13c5b854ed5b699807cafa0e3ce~tplv-k3u1fbpfcp-zoom-in-crop-mark:1304:0:0:0.awebp?" width="150px" height="150px" />
 
-## 交流群
+## QQ 交流群
 
-[微信交流群，点击扫码进群](https://juejin.cn/post/6948419379566477342/)
+群里严禁`黄`、`赌`、`毒`、`vpn`等违法行为！
 
-本人微信：18237613535，拉你进群
+<img src="https://p9-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/f0697596aec84661b724f6eebdf8db17~tplv-k3u1fbpfcp-watermark.awebp?" width="150px" height="225px" />
 
 ## 许可证
 
-原则上不收取任何费用及版权，可以放心使用
+原则上不收取任何费用及版权，可以放心使用，不过如需二次开源（比如用此平台二次开发并开源）请联系作者获取许可！
 
 [MIT © xiaoxian521-2020](./LICENSE)
 
 ## 捐赠者
 
-非常感谢你们的支持，相信项目会越来越好！！！:heart:
+非常感谢你们的支持，相信项目会越来越好 :heart:
 
-|                                                                xueyuheng                                                                 |                                                                taolei1990                                                                 |                                                                hang-kim                                                                 |                                                               madwolfcrazy                                                                |                                                                limuen                                                                 |
-| :--------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------: |
-| <a href="https://github.com/xueyuheng"><img src="https://avatars.githubusercontent.com/u/48202935?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/taolei1990"><img src="https://avatars.githubusercontent.com/u/23173640?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/hang-kim"><img src="https://avatars.githubusercontent.com/u/52914259?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/madwolfcrazy"><img src="https://avatars.githubusercontent.com/u/223671?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/limuen"><img src="https://avatars.githubusercontent.com/u/31790606?v=4" width="60px" height="60px" /></a> |
+|                                                                xueyuheng                                                                 |                                                                taolei1990                                                                 |                                                                hang-kim                                                                 |                                                               madwolfcrazy                                                                |                                                                limuen                                                                 |                                                                BenLakes                                                                 |                                                                mollerzhu                                                                 |
+| :--------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------: |
+| <a href="https://github.com/xueyuheng"><img src="https://avatars.githubusercontent.com/u/48202935?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/taolei1990"><img src="https://avatars.githubusercontent.com/u/23173640?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/hang-kim"><img src="https://avatars.githubusercontent.com/u/52914259?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/madwolfcrazy"><img src="https://avatars.githubusercontent.com/u/223671?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/limuen"><img src="https://avatars.githubusercontent.com/u/31790606?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/BenLakes"><img src="https://avatars.githubusercontent.com/u/15206046?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/mollerzhu"><img src="https://avatars.githubusercontent.com/u/49627902?v=4" width="60px" height="60px" /></a> |
 
 ## 贡献者
 
-这个项目的存在感谢所有做出贡献的人！！！:heart:
+这个项目的存在感谢所有做出贡献的人 :heart:
 
 <a href="https://github.com/xiaoxian521/vue-pure-admin/graphs/contributors"><img src="https://contrib.rocks/image?repo=xiaoxian521/vue-pure-admin" /></a>

babel.config.js

@@ -1,6 +0,0 @@
-const productPlugins = [];
-process.env.NODE_ENV === "production" &&
-  productPlugins.push("transform-remove-console");
-module.exports = {
-  plugins: [...productPlugins]
-};

build/index.ts

@@ -1,5 +1,14 @@
+// 处理环境变量
 const warpperEnv = (envConf: Recordable): ViteEnv => {
-  const ret: any = {};
+  // 此处为默认值，无需修改
+  const ret: ViteEnv = {
+    VITE_PORT: 8848,
+    VITE_PUBLIC_PATH: "",
+    VITE_PROXY_DOMAIN: "",
+    VITE_PROXY_DOMAIN_REAL: "",
+    VITE_ROUTER_HISTORY: "",
+    VITE_LEGACY: false
+  };
 
   for (const envName of Object.keys(envConf)) {
     let realName = envConf[envName].replace(/\\n/g, "\n");
@@ -9,13 +18,6 @@ const warpperEnv = (envConf: Recordable): ViteEnv => {
     if (envName === "VITE_PORT") {
       realName = Number(realName);
     }
-    if (envName === "VITE_PROXY" && realName) {
-      try {
-        realName = JSON.parse(realName.replace(/'/g, '"'));
-      } catch (error) {
-        realName = "";
-      }
-    }
     ret[envName] = realName;
     if (typeof realName === "string") {
       process.env[envName] = realName;
@@ -25,8 +27,15 @@ const warpperEnv = (envConf: Recordable): ViteEnv => {
   }
   return ret;
 };
+
+// 跨域代理重写
+const regExps = (value: string, reg: string): string => {
+  return value.replace(new RegExp(reg, "g"), "");
+};
+
+// 环境变量
 const loadEnv = (): ViteEnv => {
   return import.meta.env;
 };
 
-export { loadEnv, warpperEnv };
+export { warpperEnv, regExps, loadEnv };

build/info.ts

@@ -0,0 +1,85 @@
+import { readdir, stat } from "fs";
+import type { Plugin } from "vite";
+import dayjs, { Dayjs } from "dayjs";
+import { sum } from "lodash-unified";
+import duration from "dayjs/plugin/duration";
+import { green, blue, bold } from "picocolors";
+dayjs.extend(duration);
+
+const staticPath = "dist";
+const fileListTotal: number[] = [];
+
+const recursiveDirectory = (folder: string, callback: Function): void => {
+  readdir(folder, (err, files: string[]) => {
+    if (err) throw err;
+    let count = 0;
+    const checkEnd = () => {
+      ++count == files.length && callback();
+    };
+    files.forEach((item: string) => {
+      stat(folder + "/" + item, async (err, stats) => {
+        if (err) throw err;
+        if (stats.isFile()) {
+          fileListTotal.push(stats.size);
+          checkEnd();
+        } else if (stats.isDirectory()) {
+          recursiveDirectory(`${staticPath}/${item}/`, checkEnd);
+        }
+      });
+    });
+    files.length === 0 && callback();
+  });
+};
+
+const formatBytes = (a: number, b?: number): string => {
+  if (0 == a) return "0 Bytes";
+  const c = 1024,
+    d = b || 2,
+    e = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"],
+    f = Math.floor(Math.log(a) / Math.log(c));
+  return parseFloat((a / Math.pow(c, f)).toFixed(d)) + " " + e[f];
+};
+
+export function viteBuildInfo(): Plugin {
+  let config: { command: string };
+  let startTime: Dayjs;
+  let endTime: Dayjs;
+  return {
+    name: "vite:buildInfo",
+    configResolved(resolvedConfig: { command: string }) {
+      config = resolvedConfig;
+    },
+    buildStart() {
+      console.log(
+        bold(
+          green(
+            `👏欢迎使用${blue(
+              "[vue-pure-admin]"
+            )}，如果您感觉不错，记得点击后面链接给个star哦💖 https://github.com/xiaoxian521/vue-pure-admin`
+          )
+        )
+      );
+      if (config.command === "build") {
+        startTime = dayjs(new Date());
+      }
+    },
+    closeBundle() {
+      if (config.command === "build") {
+        endTime = dayjs(new Date());
+        recursiveDirectory(staticPath, () => {
+          console.log(
+            bold(
+              green(
+                `恭喜打包完成🎉（总用时${dayjs
+                  .duration(endTime.diff(startTime))
+                  .format("mm分ss秒")}，打包后的大小为${formatBytes(
+                  sum(fileListTotal)
+                )}）`
+              )
+            )
+          );
+        });
+      }
+    }
+  };
+}

build/plugins.ts

@@ -0,0 +1,131 @@
+import { resolve } from "path";
+import vue from "@vitejs/plugin-vue";
+import { viteBuildInfo } from "./info";
+import svgLoader from "vite-svg-loader";
+import legacy from "@vitejs/plugin-legacy";
+import vueJsx from "@vitejs/plugin-vue-jsx";
+import WindiCSS from "vite-plugin-windicss";
+import { viteMockServe } from "vite-plugin-mock";
+import liveReload from "vite-plugin-live-reload";
+import styleImport from "vite-plugin-style-import";
+import VueI18n from "@intlify/vite-plugin-vue-i18n";
+import ElementPlus from "unplugin-element-plus/vite";
+import { visualizer } from "rollup-plugin-visualizer";
+import removeConsole from "vite-plugin-remove-console";
+import themePreprocessorPlugin from "@pureadmin/theme";
+
+export function getPluginsList(command, VITE_LEGACY) {
+  const prodMock = true;
+  const lifecycle = process.env.npm_lifecycle_event;
+  return [
+    vue(),
+    // https://github.com/intlify/bundle-tools/tree/main/packages/vite-plugin-vue-i18n
+    VueI18n({
+      runtimeOnly: true,
+      compositionOnly: true,
+      include: [resolve("locales/**")]
+    }),
+    // jsx、tsx语法支持
+    vueJsx(),
+    WindiCSS(),
+    // 线上环境删除console
+    removeConsole(),
+    viteBuildInfo(),
+    // 修改layout文件夹下的文件时自动重载浏览器 解决 https://github.com/xiaoxian521/vue-pure-admin/issues/170
+    liveReload(["src/layout/**/*", "src/router/**/*"]),
+    // 自定义主题
+    themePreprocessorPlugin({
+      scss: {
+        multipleScopeVars: [
+          {
+            scopeName: "layout-theme-default",
+            path: "src/layout/theme/default-vars.scss"
+          },
+          {
+            scopeName: "layout-theme-light",
+            path: "src/layout/theme/light-vars.scss"
+          },
+          {
+            scopeName: "layout-theme-dusk",
+            path: "src/layout/theme/dusk-vars.scss"
+          },
+          {
+            scopeName: "layout-theme-volcano",
+            path: "src/layout/theme/volcano-vars.scss"
+          },
+          {
+            scopeName: "layout-theme-yellow",
+            path: "src/layout/theme/yellow-vars.scss"
+          },
+          {
+            scopeName: "layout-theme-mingQing",
+            path: "src/layout/theme/mingQing-vars.scss"
+          },
+          {
+            scopeName: "layout-theme-auroraGreen",
+            path: "src/layout/theme/auroraGreen-vars.scss"
+          },
+          {
+            scopeName: "layout-theme-pink",
+            path: "src/layout/theme/pink-vars.scss"
+          },
+          {
+            scopeName: "layout-theme-saucePurple",
+            path: "src/layout/theme/saucePurple-vars.scss"
+          }
+        ],
+        // 默认取 multipleScopeVars[0].scopeName
+        defaultScopeName: "",
+        // 在生产模式是否抽取独立的主题css文件，extract为true以下属性有效
+        extract: true,
+        // 独立主题css文件的输出路径，默认取 viteConfig.build.assetsDir 相对于 (viteConfig.build.outDir)
+        outputDir: "",
+        // 会选取defaultScopeName对应的主题css文件在html添加link
+        themeLinkTagId: "head",
+        // "head"||"head-prepend" || "body" ||"body-prepend"
+        themeLinkTagInjectTo: "head",
+        // 是否对抽取的css文件内对应scopeName的权重类名移除
+        removeCssScopeName: false,
+        // 可以自定义css文件名称的函数
+        customThemeCssFileName: scopeName => scopeName
+      }
+    }),
+    // svg组件化支持
+    svgLoader(),
+    // 按需加载vxe-table
+    styleImport({
+      libs: [
+        {
+          libraryName: "vxe-table",
+          esModule: true,
+          ensureStyleFile: true,
+          resolveComponent: name => `vxe-table/es/${name}`,
+          resolveStyle: name => `vxe-table/es/${name}/style.css`
+        }
+      ]
+    }),
+    ElementPlus({}),
+    // mock支持
+    viteMockServe({
+      mockPath: "mock",
+      localEnabled: command === "serve",
+      prodEnabled: command !== "serve" && prodMock,
+      injectCode: `
+          import { setupProdMockServer } from './mockProdServer';
+          setupProdMockServer();
+        `,
+      logger: true
+    }),
+    // 是否为打包后的文件提供传统浏览器兼容性支持
+    VITE_LEGACY
+      ? legacy({
+          targets: ["ie >= 11"],
+          additionalLegacyPolyfills: ["regenerator-runtime/runtime"]
+        })
+      : null,
+    // 打包分析
+    lifecycle === "report"
+      ? visualizer({ open: true, brotliSize: true, filename: "report.html" })
+      : null
+  ];
+}

build/proxy.ts

@@ -1,19 +0,0 @@
-type ProxyItem = [string, string];
-
-type ProxyList = ProxyItem[];
-
-const regExps = (value: string, reg: string): string => {
-  return value.replace(new RegExp(reg, "g"), "");
-};
-
-export function createProxy(list: ProxyList = []) {
-  const ret: any = {};
-  for (const [prefix, target] of list) {
-    ret[prefix] = {
-      target: target,
-      changeOrigin: true,
-      rewrite: (path: string) => regExps(path, prefix)
-    };
-  }
-  return ret;
-}

deploy.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env sh
+
+# Replace packaging path
+sed -i "s#VITE_PUBLIC_PATH = /#VITE_PUBLIC_PATH = /vue-pure-admin/#g" $(pwd)/.env.production
+
+# Make sure the script throws the error encountered
+set -e
+
+pnpm build
+cd dist
+touch README.md .nojekyll 
+
+# deploy to github
+if [ -z "$GITHUB_TOKEN" ]; then
+  msg='deploy'
+  githubUrl=git@github.com:xiaoxian521/vue-pure-admin.git
+else
+  msg='ci: Automatic deployment from github actions'
+  githubUrl=https://xiaoxian521:${GITHUB_TOKEN}@github.com/xiaoxian521/vue-pure-admin.git
+  git config --global user.name "xiaoxian521"
+  git config --global user.email "1923740402@qq.com"
+fi
+git init
+git add -A
+git commit -m "${msg}"
+# Push to github gh-pages branch
+git push -f $githubUrl master:gh-pages
+
+cd -
+rm -rf dist

index.html

@@ -3,7 +3,6 @@
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" href="/favicon.ico" />
-    <link rel="stylesheet" href="/iconfont.css" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>vue-pure-admin</title>
     <script src="/sortable.min.js"></script>
@@ -15,106 +14,88 @@
   <body>
     <div id="app">
       <style>
-        * {
-          margin: 0;
-          padding: 0;
-        }
-
         html,
-        body {
+        body,
+        #app {
           width: 100%;
           height: 100%;
           display: flex;
+          position: relative;
           justify-content: center;
           align-items: center;
-          background: #000;
           overflow: hidden;
-          font-family: "Reggae One", cursive;
         }
 
-        p {
-          font-size: 8vw;
-          overflow: hidden;
-          -webkit-text-stroke: 3px #7272a5;
+        .loader,
+        .loader:before,
+        .loader:after {
+          border-radius: 50%;
+          width: 2.5em;
+          height: 2.5em;
+          -webkit-animation-fill-mode: both;
+          animation-fill-mode: both;
+          -webkit-animation: loadAnimation 1.8s infinite ease-in-out;
+          animation: loadAnimation 1.8s infinite ease-in-out;
         }
 
-        span {
-          display: block;
-          font-size: 20px;
-          overflow: hidden;
-          color: green;
-          text-align: center;
-        }
-
-        p::before {
-          content: " ";
-          width: 100%;
-          height: 100%;
-          position: absolute;
-          left: 0;
+        .loader {
+          color: #406eeb;
+          font-size: 10px;
+          margin: 80px auto;
+          position: relative;
+          text-indent: -9999em;
+          -webkit-transform: translateZ(0);
+          -ms-transform: translateZ(0);
+          transform: translateZ(0);
+          -webkit-animation-delay: -0.16s;
+          animation-delay: -0.16s;
           top: 0;
-          background-image: linear-gradient(45deg, #ff269b, #2ab5f5, #ffbf00);
-          mix-blend-mode: multiply;
+          transform: translate(-50%, 0);
         }
 
-        p::after {
+        .loader:before,
+        .loader:after {
           content: "";
-          background: radial-gradient(circle, #fff, #000 50%);
-          background-size: 25% 25%;
           position: absolute;
-          top: -100%;
-          left: -100%;
-          right: 0;
-          bottom: 0;
-          mix-blend-mode: color-dodge;
-          animation: mix 2s linear infinite;
+          top: 0;
         }
 
-        @keyframes mix {
-          to {
-            transform: translate(50%, 50%);
+        .loader:before {
+          left: -3.5em;
+          -webkit-animation-delay: -0.32s;
+          animation-delay: -0.32s;
+        }
+
+        .loader:after {
+          left: 3.5em;
+        }
+
+        @-webkit-keyframes loadAnimation {
+          0%,
+          80%,
+          100% {
+            box-shadow: 0 2.5em 0 -1.3em;
+          }
+
+          40% {
+            box-shadow: 0 2.5em 0 0;
+          }
+        }
+
+        @keyframes loadAnimation {
+          0%,
+          80%,
+          100% {
+            box-shadow: 0 2.5em 0 -1.3em;
+          }
+
+          40% {
+            box-shadow: 0 2.5em 0 0;
           }
         }
       </style>
-      <div class="g-container">
-        <p>Pure-Admin</p>
-        <span class="_develop"></span>
-      </div>
+      <div class="loader"></div>
     </div>
-    <script>
-      // 此代码仅用于开发环境的友好提示，项目打包前请去掉这段js代码 This code is only used as a friendly reminder of the development environment, please remove this js code before packaging the project
-      window.onload = function () {
-        (function () {
-          const ua = navigator.userAgent.toLowerCase();
-          const re = /(msie|firefox|chrome|opera|version).*?([\d.]+)/;
-          const m = ua.match(re);
-          const Sys = {
-            browser: m[1].replace(/version/, "'safari"),
-            version: m[2]
-          };
-
-          const browser = Array.of("chrome", "firefox").includes(Sys.browser);
-          const version = parseFloat(Sys.version);
-
-          const el = document.querySelector("._develop");
-
-          if (el) {
-            if (browser && version >= 90) {
-              let success =
-                document.createTextNode("当前浏览器版本很适合开发！！！ 😃");
-              el.appendChild(success);
-            } else {
-              let warn = document.createTextNode(
-                "当前浏览器版本不适合开发，建议使用最新版本的谷歌或者火狐浏览器！！！😯"
-              );
-              el.appendChild(warn);
-              el.style.color = "red";
-            }
-          }
-          return Sys;
-        })();
-      };
-    </script>
     <script type="module" src="/src/main.ts"></script>
   </body>
 </html>

locales/en.yaml

@@ -0,0 +1,74 @@
+buttons:
+  hsLoginOut: LoginOut
+  hsfullscreen: FullScreen
+  hsexitfullscreen: ExitFullscreen
+  hsrefreshRoute: RefreshRoute
+  hslogin: Login
+  hsadd: Add
+  hsmark: Mark/Cancel
+  hssave: Save
+  hssearch: Search
+  hsexpendAll: Expand All
+  hscollapseAll: Collapse All
+  hssystemSet: Open ProjectConfig
+  hsdelete: Delete
+  hsreload: Reload
+  hscloseCurrentTab: Close CurrentTab
+  hscloseLeftTabs: Close LeftTabs
+  hscloseRightTabs: Close RightTabs
+  hscloseOtherTabs: Close OtherTabs
+  hscloseAllTabs: Close AllTabs
+menus:
+  hshome: Home
+  hslogin: Login
+  hssysManagement: System Manage
+  hsBaseinfo: Base Info
+  hsDict: Dict Manage
+  hseditor: Editor
+  hserror: Error Page
+  hsfourZeroFour: "404"
+  hsfourZeroOne: "403"
+  hsFive: "500"
+  hscomponents: Components
+  hsvideo: Video Components
+  hsmap: Map Components
+  hsdraggable: Draggable Components
+  hssplitPane: Split Pane
+  hsbutton: Button Components
+  hscropping: Picture Cropping
+  hscountTo: Digital Animation
+  hsselector: Selector Components
+  hsflowChart: Flow Chart
+  hsseamless: Seamless Scroll
+  hscontextmenu: Context Menu
+  hsmenus: MultiLevel Menu
+  hsmenu1: Menu1
+  hsmenu1-1: Menu1-1
+  hsmenu1-2: Menu1-2
+  hsmenu1-2-1: Menu1-2-1
+  hsmenu1-2-2: Menu1-2-2
+  hsmenu1-3: Menu1-3
+  hsmenu2: Menu2
+  permission: Permission Manage
+  permissionPage: Page Permission
+  permissionButton: Button Permission
+  hstabs: Tabs Operate
+  hsguide: Guide
+  hsAble: Able
+  hsMenuTree: Menu Tree
+  hsWatermark: Water Mark
+  hsPrint: Print
+  hsExternalPage: External Page
+  hsPureDocument: Pure Doc(Embedded)
+  externalLink: Pure Doc(External)
+  hsEpDocument: Element Plus Doc(Embedded)
+  hsAbout: About
+  hsResult: Result Page
+  hsSuccess: Success Page
+  hsFail: Fail Page
+  hsIconSelect: Icon Select
+  hsTimeline: Time Line
+  hsLineTree: LineTree
+  hsAntTabs: Imitate Antdv Tabs
+  hsAntAnchor: Imitate Antdv Anchor
+  hsAntTreeSelect: Imitate Antdv TreeSelector

locales/zh-CN.yaml

@@ -0,0 +1,74 @@
+buttons:
+  hsLoginOut: 退出系统
+  hsfullscreen: 全屏
+  hsexitfullscreen: 退出全屏
+  hsrefreshRoute: 刷新路由
+  hslogin: 登陆
+  hsadd: 新增
+  hsmark: 标记/取消
+  hssave: 保存
+  hssearch: 搜索
+  hsexpendAll: 全部展开
+  hscollapseAll: 全部折叠
+  hssystemSet: 打开项目配置
+  hsdelete: 删除
+  hsreload: 重新加载
+  hscloseCurrentTab: 关闭当前标签页
+  hscloseLeftTabs: 关闭左侧标签页
+  hscloseRightTabs: 关闭右侧标签页
+  hscloseOtherTabs: 关闭其他标签页
+  hscloseAllTabs: 关闭全部标签页
+menus:
+  hshome: 首页
+  hslogin: 登陆
+  hssysManagement: 系统管理
+  hsBaseinfo: 基础信息
+  hsDict: 字典管理
+  hseditor: 编辑器
+  hserror: 错误页面
+  hsfourZeroFour: "404"
+  hsfourZeroOne: "403"
+  hsFive: "500"
+  hscomponents: 组件
+  hsvideo: 视频组件
+  hsmap: 地图组件
+  hsdraggable: 拖拽组件
+  hssplitPane: 切割面板
+  hsbutton: 按钮组件
+  hscropping: 图片裁剪
+  hscountTo: 数字动画
+  hsselector: 选择器组件
+  hsflowChart: 流程图
+  hsseamless: 无缝滚动
+  hscontextmenu: 右键菜单
+  hsmenus: 多级菜单
+  hsmenu1: 菜单1
+  hsmenu1-1: 菜单1-1
+  hsmenu1-2: 菜单1-2
+  hsmenu1-2-1: 菜单1-2-1
+  hsmenu1-2-2: 菜单1-2-2
+  hsmenu1-3: 菜单1-3
+  hsmenu2: 菜单2
+  permission: 权限管理
+  permissionPage: 页面权限
+  permissionButton: 按钮权限
+  hstabs: 标签页操作
+  hsguide: 引导页
+  hsAble: 功能
+  hsMenuTree: 菜单树结构
+  hsWatermark: 水印
+  hsPrint: 打印
+  hsExternalPage: 外部页面
+  hsPureDocument: 平台文档(内嵌)
+  externalLink: 平台文档(外链)
+  hsEpDocument: Element Plus文档(内嵌)
+  hsAbout: 关于
+  hsResult: 结果页面
+  hsSuccess: 成功页面
+  hsFail: 失败页面
+  hsIconSelect: 图标选择器
+  hsTimeline: 时间线
+  hsLineTree: 树形连接线
+  hsAntTabs: 仿antdv标签页
+  hsAntAnchor: 仿antdv锚点
+  hsAntTreeSelect: 仿antdv树型选择器

mock/asyncRoutes.ts

@@ -4,29 +4,29 @@ import { MockMethod } from "vite-plugin-mock";
 // http://mockjs.com/examples.html#Object
 const systemRouter = {
   path: "/system",
-  name: "system",
-  redirect: "/system/user",
+  redirect: "/system/user/index",
   meta: {
-    icon: "Setting",
-    title: "message.hssysManagement",
-    showLink: true,
+    icon: "setting",
+    title: "menus.hssysManagement",
+    i18n: true,
     rank: 6
   },
   children: [
     {
-      path: "/system/user",
+      path: "/system/user/index",
       name: "user",
       meta: {
-        title: "message.hsBaseinfo",
-        showLink: true
+        title: "menus.hsBaseinfo",
+        i18n: true
       }
     },
     {
-      path: "/system/dict",
+      path: "/system/dict/index",
       name: "dict",
       meta: {
-        title: "message.hsDict",
-        showLink: true
+        title: "menus.hsDict",
+        i18n: true,
+        keepAlive: true
       }
     }
   ]
@@ -34,35 +34,105 @@ const systemRouter = {
 
 const permissionRouter = {
   path: "/permission",
-  name: "permission",
-  redirect: "/permission/page",
+  redirect: "/permission/page/index",
   meta: {
-    title: "message.permission",
-    icon: "Lollipop",
-    showLink: true,
-    rank: 3
+    title: "menus.permission",
+    icon: "lollipop",
+    i18n: true,
+    rank: 7
   },
   children: [
     {
-      path: "/permission/page",
+      path: "/permission/page/index",
       name: "permissionPage",
       meta: {
-        title: "message.permissionPage",
-        showLink: true
+        title: "menus.permissionPage",
+        i18n: true
       }
     },
     {
-      path: "/permission/button",
+      path: "/permission/button/index",
       name: "permissionButton",
       meta: {
-        title: "message.permissionButton",
-        showLink: true,
+        title: "menus.permissionButton",
+        i18n: true,
         authority: []
       }
     }
   ]
 };
 
+const frameRouter = {
+  path: "/iframe",
+  redirect: "/iframe/pure",
+  meta: {
+    icon: "monitor",
+    title: "menus.hsExternalPage",
+    i18n: true,
+    rank: 10
+  },
+  children: [
+    {
+      path: "/iframe/pure",
+      name: "reFramePure",
+      meta: {
+        i18n: true,
+        title: "menus.hsPureDocument",
+        frameSrc: "https://pure-admin-doc.vercel.app"
+      }
+    },
+    {
+      path: "/external",
+      name: "https://pure-admin-doc.vercel.app",
+      meta: {
+        title: "menus.externalLink",
+        i18n: true
+      }
+    },
+    {
+      path: "/iframe/ep",
+      name: "reFrameEp",
+      meta: {
+        i18n: true,
+        title: "menus.hsEpDocument",
+        frameSrc: "https://element-plus.gitee.io/zh-CN/"
+      }
+    }
+  ]
+};
+
+const tabsRouter = {
+  path: "/tabs",
+  redirect: "/tabs/index",
+  meta: {
+    icon: "IF-team-icontabs",
+    title: "menus.hstabs",
+    i18n: true,
+    rank: 12
+  },
+  children: [
+    {
+      path: "/tabs/index",
+      name: "reTabs",
+      meta: {
+        title: "menus.hstabs",
+        i18n: true
+      }
+    },
+    {
+      path: "/tabs/detail",
+      name: "tabDetail",
+      meta: {
+        title: "",
+        showLink: false,
+        i18n: false,
+        dynamicLevel: 3,
+        refreshRedirect: "/tabs/index"
+      }
+    }
+  ]
+};
+
 // 添加不同按钮权限到/permission/button页面中
 function setDifAuthority(authority, routes) {
   routes.children[1].meta.authority = [authority];
@@ -77,12 +147,17 @@ export default [
       if (query.name === "admin") {
         return {
           code: 0,
-          info: [systemRouter, setDifAuthority("v-admin", permissionRouter)]
+          info: [
+            tabsRouter,
+            frameRouter,
+            systemRouter,
+            setDifAuthority("v-admin", permissionRouter)
+          ]
         };
       } else {
         return {
           code: 0,
-          info: [setDifAuthority("v-test", permissionRouter)]
+          info: [tabsRouter, setDifAuthority("v-test", permissionRouter)]
         };
       }
     }

package.json

@@ -1,15 +1,13 @@
 {
   "name": "vue-pure-admin",
-  "version": "2.6.0",
+  "version": "3.2.0",
   "private": true,
-  "engines": {
-    "node": ">= 16",
-    "pnpm": ">= 6"
-  },
   "scripts": {
     "dev": "cross-env --max_old_space_size=4096 vite",
     "serve": "pnpm dev",
     "build": "rimraf dist && cross-env vite build",
+    "report": "rimraf dist && cross-env vite build",
+    "deploy": "bash deploy.sh",
     "preview": "vite preview",
     "preview:build": "pnpm build && vite preview",
     "clean:cache": "rm -rf node_modules && rm -rf .eslintcache && pnpm install",
@@ -18,7 +16,7 @@
     "lint:stylelint": "stylelint --cache --fix \"**/*.{vue,css,scss,postcss,less}\" --cache --cache-location node_modules/.cache/stylelint/",
     "lint:lint-staged": "lint-staged -c ./.husky/lintstagedrc.js",
     "lint:pretty": "pretty-quick --staged",
-    "lint": "pnpm lint:eslint && pnpm lint:prettier && pnpm lint:stylelint && pnpm lint:pretty",
+    "lint": "pnpm lint:eslint && pnpm lint:prettier && pnpm lint:stylelint",
     "prepare": "husky install",
     "preinstall": "npx only-allow pnpm"
   },
@@ -29,87 +27,108 @@
   ],
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
-    "@element-plus/icons": "^0.0.11",
+    "@ctrl/tinycolor": "^3.4.0",
     "@logicflow/core": "0.7.1",
     "@logicflow/extension": "0.7.1",
-    "@vueuse/core": "^6.7.1",
-    "@vueuse/motion": "^2.0.0-beta.4",
+    "@pureadmin/components": "^1.0.2",
+    "@vueuse/core": "^8.0.0",
+    "@vueuse/motion": "^2.0.0-beta.9",
+    "@vueuse/shared": "^8.0.0",
     "animate.css": "^4.1.1",
-    "await-to-js": "^3.0.0",
-    "axios": "^0.21.1",
-    "cropperjs": "^1.5.11",
-    "dayjs": "^1.10.7",
-    "echarts": "^5.2.1",
-    "element-plus": "1.2.0-beta.3",
+    "axios": "^0.26.1",
+    "cropperjs": "^1.5.12",
+    "css-color-function": "^1.3.3",
+    "dayjs": "^1.11.0",
+    "driver.js": "^0.9.8",
+    "echarts": "^5.3.0",
+    "element-plus": "^2.1.4",
     "element-resize-detector": "^1.2.3",
-    "font-awesome": "^4.7.0",
+    "js-cookie": "^3.0.1",
+    "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
-    "lowdb": "^3.0.0",
+    "lodash-unified": "^1.0.2",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
     "path": "^0.12.7",
-    "path-to-regexp": "^6.2.0",
-    "pinia": "^2.0.0-rc.14",
+    "pinia": "^2.0.12",
+    "qs": "^6.10.1",
     "resize-observer-polyfill": "^1.5.1",
     "responsive-storage": "^1.0.11",
-    "sortablejs": "1.13.0",
-    "typescript-cookie": "^1.0.0",
+    "rgb-hex": "^4.0.0",
     "v-contextmenu": "3.0.0",
-    "vue": "^3.2.21",
-    "vue-i18n": "^9.2.0-beta.3",
+    "vue": "^3.2.31",
+    "vue-i18n": "^9.2.0-beta.32",
     "vue-json-pretty": "^2.0.2",
-    "vue-router": "^4.0.11",
-    "vue-types": "^4.1.0",
+    "vue-router": "^4.0.14",
+    "vue-types": "^4.1.1",
     "vuedraggable": "4.1.0",
-    "vxe-table": "4.0.30",
-    "wangeditor": "4.7.7",
-    "xe-ajax": "4.0.5",
-    "xe-utils": "3.4.0",
-    "xgplayer": "2.28.0"
+    "vxe-table": "^4.2.0",
+    "wangeditor": "^4.7.12",
+    "xe-utils": "^3.5.4",
+    "xgplayer": "^2.31.4"
   },
   "devDependencies": {
     "@commitlint/cli": "13.1.0",
     "@commitlint/config-conventional": "13.1.0",
+    "@iconify-icons/ep": "^1.1.3",
+    "@iconify-icons/fa": "^1.1.1",
+    "@iconify-icons/fa-solid": "^1.1.2",
+    "@iconify-icons/ri": "^1.1.1",
+    "@iconify/vue": "^3.1.4",
+    "@intlify/vite-plugin-vue-i18n": "^3.3.1",
+    "@pureadmin/theme": "^0.0.1",
     "@types/element-resize-detector": "1.1.3",
+    "@types/js-cookie": "^3.0.1",
+    "@types/lodash": "^4.14.180",
+    "@types/lodash-es": "^4.17.6",
     "@types/mockjs": "1.0.3",
     "@types/node": "14.14.14",
     "@types/nprogress": "0.2.0",
-    "@typescript-eslint/eslint-plugin": "4.31.0",
-    "@typescript-eslint/parser": "4.31.0",
-    "@vitejs/plugin-vue": "^1.9.4",
-    "@vitejs/plugin-vue-jsx": "^1.2.0",
-    "@vue/compiler-sfc": "^3.2.21",
-    "@vue/eslint-config-prettier": "6.0.0",
-    "@vue/eslint-config-typescript": "7.0.0",
-    "@zougt/vite-plugin-theme-preprocessor": "^1.3.10",
-    "autoprefixer": "10.2.4",
-    "babel-plugin-transform-remove-console": "6.9.4",
-    "chalk": "2.4.2",
+    "@types/qs": "^6.9.7",
+    "@typescript-eslint/eslint-plugin": "^5.10.2",
+    "@typescript-eslint/parser": "^5.10.2",
+    "@vitejs/plugin-legacy": "^1.7.1",
+    "@vitejs/plugin-vue": "^2.2.4",
+    "@vitejs/plugin-vue-jsx": "^1.3.8",
+    "@vue/eslint-config-prettier": "^7.0.0",
+    "@vue/eslint-config-typescript": "^10.0.0",
+    "autoprefixer": "^10.4.2",
     "cross-env": "7.0.3",
-    "eslint": "7.30.0",
-    "eslint-plugin-prettier": "3.4.0",
-    "eslint-plugin-vue": "7.17.0",
-    "husky": "7.0.2",
+    "eslint": "^8.8.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-vue": "^8.4.1",
+    "font-awesome": "^4.7.0",
+    "husky": "^7.0.4",
     "lint-staged": "11.1.2",
-    "postcss": "8.2.6",
+    "picocolors": "^1.0.0",
+    "postcss": "^8.4.6",
+    "postcss-html": "^1.3.0",
     "postcss-import": "14.0.0",
-    "prettier": "2.3.2",
+    "postcss-scss": "^4.0.3",
+    "prettier": "^2.5.1",
     "pretty-quick": "3.1.1",
     "rimraf": "3.0.2",
-    "sass": "^1.43.4",
-    "sass-loader": "^12.3.0",
-    "stylelint": "13.13.1",
-    "stylelint-config-prettier": "8.0.2",
-    "stylelint-config-standard": "22.0.0",
-    "stylelint-order": "4.1.0",
-    "typescript": "4.4.2",
-    "unplugin-element-plus": "^0.1.0",
-    "vite": "latest",
+    "rollup": "^2.70.1",
+    "rollup-plugin-visualizer": "^5.6.0",
+    "sass": "^1.49.9",
+    "stylelint": "^14.3.0",
+    "stylelint-config-html": "^1.0.0",
+    "stylelint-config-prettier": "^9.0.3",
+    "stylelint-config-recommended": "^6.0.0",
+    "stylelint-config-standard": "^24.0.0",
+    "stylelint-order": "^5.0.0",
+    "typescript": "^4.6.2",
+    "unplugin-element-plus": "^0.3.1",
+    "vite": "^2.9.0-beta.4",
+    "vite-plugin-live-reload": "^2.1.0",
     "vite-plugin-mock": "^2.9.6",
-    "vite-plugin-style-import": "^1.2.1",
-    "vite-svg-loader": "^2.2.0",
-    "vue-eslint-parser": "7.10.0"
+    "vite-plugin-remove-console": "^0.0.6",
+    "vite-plugin-style-import": "1.4.1",
+    "vite-plugin-windicss": "^1.8.3",
+    "vite-svg-loader": "2.2.0",
+    "vue-eslint-parser": "^8.2.0",
+    "windicss": "^3.5.1"
   },
   "repository": "git@github.com:xiaoxian521/vue-pure-admin.git",
   "author": "xiaoxian521",

public/iconfont.css

@@ -1,18 +0,0 @@
-@font-face {
-  font-family: "iconfont"; /* project id 1098500 */
-  src: url("//at.alicdn.com/t/font_1098500_3d6un9zwltz.eot");
-  src: url("//at.alicdn.com/t/font_1098500_3d6un9zwltz.eot?#iefix")
-      format("embedded-opentype"),
-    url("//at.alicdn.com/t/font_1098500_3d6un9zwltz.woff2") format("woff2"),
-    url("//at.alicdn.com/t/font_1098500_3d6un9zwltz.woff") format("woff"),
-    url("//at.alicdn.com/t/font_1098500_3d6un9zwltz.ttf") format("truetype"),
-    url("//at.alicdn.com/t/font_1098500_3d6un9zwltz.svg#iconfont") format("svg");
-}
-
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}

public/serverConfig.json

@@ -1,18 +1,23 @@
 {
-  "Version": "2.6.0",
+  "Version": "3.2.0",
   "Title": "PureAdmin",
   "FixedHeader": true,
   "HiddenSideBar": false,
+  "MultiTagsCache": false,
   "KeepAlive": true,
   "Locale": "zh",
   "Layout": "vertical",
   "Theme": "default",
+  "DarkMode": false,
   "Grey": false,
   "Weak": false,
   "HideTabs": false,
+  "SidebarStatus": true,
+  "EpThemeColor": "#409EFF",
+  "ShowLogo": true,
+  "ShowModel": "smart",
   "MapConfigure": {
     "amapKey": "97b3248d1553172e81f168cf94ea667e",
-    "baiduKey": "wTHbkkEweiFqZLKunMIjcrb2RcqNXkhc",
     "options": {
       "resizeEnable": true,
       "center": [113.6401, 34.72468],

src/App.vue

@@ -5,10 +5,11 @@
 </template>
 
 <script lang="ts">
+import { defineComponent } from "vue";
 import { ElConfigProvider } from "element-plus";
 import zhCn from "element-plus/lib/locale/lang/zh-cn";
 import en from "element-plus/lib/locale/lang/en";
-export default {
+export default defineComponent({
   name: "app",
   components: {
     [ElConfigProvider.name]: ElConfigProvider
@@ -18,5 +19,5 @@ export default {
       return this.$storage.locale?.locale === "zh" ? zhCn : en;
     }
   }
-};
+});
 </script>

src/api/mock.ts

@@ -1,11 +1,11 @@
 import { http } from "../utils/http";
 
 // 地图数据
-export const mapJson = (data?: object) => {
-  return http.request("get", "/getMapInfo", data);
+export const mapJson = (params?: object) => {
+  return http.request("get", "/getMapInfo", { params });
 };
 
 // echarts数据
-export const echartsJson = (data?: object) => {
-  return http.request("get", "/getEchartsInfo", data);
+export const echartsJson = (params?: object) => {
+  return http.request("get", "/getEchartsInfo", { params });
 };

src/api/routes.ts

@@ -1,5 +1,5 @@
 import { http } from "../utils/http";
 
-export const getAsyncRoutes = (data?: object) => {
-  return http.request("get", "/getAsyncRoutes", data);
+export const getAsyncRoutes = (params?: object) => {
+  return http.request("get", "/getAsyncRoutes", { params });
 };

src/api/user.ts

@@ -13,5 +13,14 @@ export const getVerify = (): userType => {
 
 // 登录
 export const getLogin = (data: object) => {
-  return http.request("post", "/login", data);
+  return http.request("post", "/login", { data });
 };
+
+// 刷新token
+export const refreshToken = (data: object) => {
+  return http.request("post", "/refreshToken", { data });
+};
+
+// export const searchVague = (data: object) => {
+//   return http.request("post", "/searchVague", { data });
+// };

src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2208059 */
-  src: url("iconfont.woff2?t=1636197082361") format("woff2"),
-    url("iconfont.woff?t=1636197082361") format("woff"),
-    url("iconfont.ttf?t=1636197082361") format("truetype");
+  src: url("iconfont.woff2?t=1638023560828") format("woff2"),
+    url("iconfont.woff?t=1638023560828") format("woff"),
+    url("iconfont.ttf?t=1638023560828") format("truetype");
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.team-icontabs::before {
+  content: "\e63e";
+}
+
 .team-iconlogo::before {
   content: "\e620";
 }

src/assets/iconfont/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "team-icon",
   "description": "pure-admin",
   "glyphs": [
+    {
+      "icon_id": "20594647",
+      "name": "标签页",
+      "font_class": "tabs",
+      "unicode": "e63e",
+      "unicode_decimal": 58942
+    },
     {
       "icon_id": "22129506",
       "name": "水能",

src/assets/svg/dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16"><path fill="none" d="M0 0h24v24H0z"/><path d="M11.38 2.019a7.5 7.5 0 1 0 10.6 10.6C21.662 17.854 17.316 22 12.001 22 6.477 22 2 17.523 2 12c0-5.315 4.146-9.661 9.38-9.981z"/></svg>

src/assets/svg/day.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 18a6 6 0 1 1 0-12 6 6 0 0 1 0 12zM11 1h2v3h-2V1zm0 19h2v3h-2v-3zM3.515 4.929l1.414-1.414L7.05 5.636 5.636 7.05 3.515 4.93zM16.95 18.364l1.414-1.414 2.121 2.121-1.414 1.414-2.121-2.121zm2.121-14.85l1.414 1.415-2.121 2.121-1.414-1.414 2.121-2.121zM5.636 16.95l1.414 1.414-2.121 2.121-1.414-1.414 2.121-2.121zM23 11v2h-3v-2h3zM4 11v2H1v-2h3z"/></svg>

src/assets/svg/enter_outlined.svg

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

src/assets/svg/exit_screen.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" width="1em" height="1em" class="re-screen" preserveAspectRatio="xMidYMid meet" viewBox="0 0 16 16"><g fill="currentColor"><path d="M3.5 4H1V3h2V1h1v2.5l-.5.5zM13 3V1h-1v2.5l.5.5H15V3h-2zm-1 9.5V15h1v-2h2v-1h-2.5l-.5.5zM1 12v1h2v2h1v-2.5l-.5-.5H1zm11-1.5l-.5.5h-7l-.5-.5v-5l.5-.5h7l.5.5v5zM10 7H6v2h4V7z"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" width="1em" height="1em" class="re-screen" color="#00000073" preserveAspectRatio="xMidYMid meet" viewBox="0 0 16 16"><g fill="currentColor"><path d="M3.5 4H1V3h2V1h1v2.5l-.5.5zM13 3V1h-1v2.5l.5.5H15V3h-2zm-1 9.5V15h1v-2h2v-1h-2.5l-.5.5zM1 12v1h2v2h1v-2.5l-.5-.5H1zm11-1.5l-.5.5h-7l-.5-.5v-5l.5-.5h7l.5.5v5zM10 7H6v2h4V7z"></path></g></svg>

src/assets/svg/full_screen.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" width="1em" height="1em" class="re-screen" preserveAspectRatio="xMidYMid meet" viewBox="0 0 16 16"><g fill="currentColor"><path d="M3 12h10V4H3v8zm2-6h6v4H5V6zM2 6H1V2.5l.5-.5H5v1H2v3zm13-3.5V6h-1V3h-3V2h3.5l.5.5zM14 10h1v3.5l-.5.5H11v-1h3v-3zM2 13h3v1H1.5l-.5-.5V10h1v3z"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" width="1em" height="1em" class="re-screen" color="#00000073" preserveAspectRatio="xMidYMid meet" viewBox="0 0 16 16"><g fill="currentColor"><path d="M3 12h10V4H3v8zm2-6h6v4H5V6zM2 6H1V2.5l.5-.5H5v1H2v3zm13-3.5V6h-1V3h-3V2h3.5l.5.5zM14 10h1v3.5l-.5.5H11v-1h3v-3zM2 13h3v1H1.5l-.5-.5V10h1v3z"></path></g></svg>

src/assets/svg/mdi_keyboard_esc.svg

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

src/components/ReCharts/src/Bar.vue

@@ -12,8 +12,15 @@ import { useEventListener, tryOnUnmounted, useTimeoutFn } from "@vueuse/core";
 
 let echartInstance: ECharts;
 
+const props = defineProps({
+  index: {
+    type: Number,
+    default: 0
+  }
+});
+
 function initechartInstance() {
-  const echartDom = document.querySelector(".bar");
+  const echartDom = document.querySelector(".bar" + props.index);
   if (!echartDom) return;
   // @ts-ignore
   echartInstance = echarts.init(echartDom);
@@ -85,12 +92,5 @@ tryOnUnmounted(() => {
 </script>
 
 <template>
-  <div class="bar"></div>
+  <div :class="'bar' + props.index" style="width: 100%; height: 35vh" />
 </template>
-
-<style scoped>
-.bar {
-  width: 100%;
-  height: 35vh;
-}
-</style>

src/components/ReCharts/src/Github.vue

@@ -10,52 +10,48 @@ const lists = ref([
 </script>
 
 <template>
-  <el-descriptions
-    class="margin-top"
-    direction="vertical"
-    :column="3"
-    size="medium"
-    border
-  >
+  <el-descriptions class="margin-top" direction="vertical" :column="3" border>
     <el-descriptions-item>
       <template #label>
-        <i class="el-icon-user"></i>
+        <el-icon>
+          <IconifyIconOffline icon="user" />
+        </el-icon>
         用户名
       </template>
       xiaoxian
     </el-descriptions-item>
     <el-descriptions-item>
       <template #label>
-        <i class="el-icon-mobile-phone"></i>
+        <el-icon>
+          <IconifyIconOffline icon="iphone" />
+        </el-icon>
         手机号
       </template>
       123456789
     </el-descriptions-item>
     <el-descriptions-item>
       <template #label>
-        <i class="el-icon-location-outline"></i>
+        <el-icon>
+          <IconifyIconOffline icon="location" />
+        </el-icon>
         居住地
       </template>
       上海
     </el-descriptions-item>
   </el-descriptions>
-  <el-descriptions
-    class="margin-top"
-    direction="vertical"
-    :column="2"
-    size="medium"
-    border
-  >
+  <el-descriptions class="margin-top" direction="vertical" :column="2" border>
     <el-descriptions-item>
       <template #label>
-        <i class="el-icon-tickets"></i>
+        <el-icon>
+          <IconifyIconOffline icon="tickets" />
+        </el-icon>
         标签
       </template>
       <el-tag
         v-for="item in lists"
         :key="item.label"
         :type="item.type"
-        size="mini"
+        size="small"
         effect="dark"
       >
         {{ item.label }}
@@ -63,22 +59,20 @@ const lists = ref([
     </el-descriptions-item>
     <el-descriptions-item>
       <template #label>
-        <i class="el-icon-office-building"></i>
+        <el-icon>
+          <IconifyIconOffline icon="office-building" />
+        </el-icon>
         联系地址
       </template>
       上海市徐汇区
     </el-descriptions-item>
   </el-descriptions>
-  <el-descriptions
-    class="margin-top"
-    direction="vertical"
-    :column="1"
-    size="medium"
-    border
-  >
+  <el-descriptions class="margin-top" direction="vertical" :column="1" border>
     <el-descriptions-item>
       <template #label>
-        <i class="el-icon-notebook-1"></i>
+        <el-icon>
+          <IconifyIconOffline icon="notebook" />
+        </el-icon>
         留言
       </template>
       好好学习，天天向上
@@ -87,7 +81,7 @@ const lists = ref([
 </template>
 
 <style scoped>
-.el-tag--mini {
+.el-tag {
   margin-right: 10px !important;
 }
 </style>

src/components/ReCharts/src/Infinite.vue

@@ -78,9 +78,9 @@ let classOption = reactive({
     >
       <ul class="item">
         <li v-for="(item, index) in listData" :key="index">
-          <span v-text="item.date"></span>
-          <span v-text="item.name"></span>
-          <span v-text="item.star"></span>
+          <span v-text="item.date" />
+          <span v-text="item.name" />
+          <span v-text="item.star" />
         </li>
       </ul>
     </SeamlessScroll>

src/components/ReCharts/src/Line.vue

@@ -12,8 +12,15 @@ import { useEventListener, tryOnUnmounted, useTimeoutFn } from "@vueuse/core";
 
 let echartInstance: ECharts;
 
+const props = defineProps({
+  index: {
+    type: Number,
+    default: 0
+  }
+});
+
 function initechartInstance() {
-  const echartDom = document.querySelector(".line");
+  const echartDom = document.querySelector(".line" + props.index);
   if (!echartDom) return;
   // @ts-ignore
   echartInstance = echarts.init(echartDom);
@@ -73,12 +80,5 @@ tryOnUnmounted(() => {
 </script>
 
 <template>
-  <div class="line"></div>
+  <div :class="'line' + props.index" style="width: 100%; height: 35vh" />
 </template>
-
-<style scoped>
-.line {
-  width: 100%;
-  height: 35vh;
-}
-</style>

src/components/ReCharts/src/Pie.vue

@@ -12,8 +12,15 @@ import { useEventListener, tryOnUnmounted, useTimeoutFn } from "@vueuse/core";
 
 let echartInstance: ECharts;
 
+const props = defineProps({
+  index: {
+    type: Number,
+    default: 0
+  }
+});
+
 function initechartInstance() {
-  const echartDom = document.querySelector(".pie");
+  const echartDom = document.querySelector(".pie" + props.index);
   if (!echartDom) return;
   // @ts-ignore
   echartInstance = echarts.init(echartDom);
@@ -76,12 +83,5 @@ tryOnUnmounted(() => {
 </script>
 
 <template>
-  <div class="pie"></div>
+  <div :class="'pie' + props.index" style="width: 100%; height: 35vh" />
 </template>
-
-<style scoped>
-.pie {
-  width: 100%;
-  height: 35vh;
-}
-</style>

src/components/ReCountTo/src/normal/index.tsx

@@ -169,7 +169,8 @@ export default defineComponent({
           style={{
             color: props.color,
             fontSize: props.fontSize
-          }}>
+          }}
+        >
           {state.displayValue}
         </span>
       </>

src/components/ReCountTo/src/rebound/index.tsx

@@ -43,7 +43,8 @@ export default defineComponent({
         <div
           class="scroll-num"
           // @ts-ignore
-          style={{ "--i": props.i, "--delay": props.delay }}>
+          style={{ "--i": props.i, "--delay": props.delay }}
+        >
           <ul ref="ul" style={{ fontSize: "32px" }}>
             <li>0</li>
             <li>1</li>

src/components/ReCropper/src/index.tsx

@@ -133,7 +133,8 @@ export default defineComponent({
       <>
         <div
           class={useAttrs({ excludeListeners: true, excludeKeys: ["class"] })}
-          style={this.getWrapperStyle}>
+          style={this.getWrapperStyle}
+        >
           <img
             ref="imgElRef"
             src={this.props.src}

src/components/ReFlicker/index.css

@@ -0,0 +1,39 @@
+.point {
+  width: var(--point-width);
+  height: var(--point-height);
+  background: var(--point-background);
+  position: relative;
+  border-radius: var(--point-border-radius);
+}
+
+.point-flicker:after {
+  background: var(--point-background);
+}
+
+.point-flicker:before,
+.point-flicker:after {
+  content: "";
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  position: absolute;
+  border-radius: var(--point-border-radius);
+  animation: flicker 1.2s ease-out infinite;
+}
+
+@keyframes flicker {
+  0% {
+    transform: scale(0.5);
+    opacity: 1;
+  }
+
+  30% {
+    opacity: 1;
+  }
+
+  100% {
+    transform: scale(var(--point-scale));
+    opacity: 0;
+  }
+}

src/components/ReFlicker/index.ts

@@ -0,0 +1,44 @@
+import "./index.css";
+import { h, defineComponent, Component } from "vue";
+
+export interface attrsType {
+  width?: string;
+  height?: string;
+  borderRadius?: number | string;
+  background?: string;
+  scale?: number | string;
+}
+
+/**
+ * 圆点、方形闪烁动画组件
+ * @param width 可选 string 宽
+ * @param height 可选 string 高
+ * @param borderRadius 可选 number | string 传0为方形、传50%或者不传为圆形
+ * @param background 可选 string 闪烁颜色
+ * @param scale 可选 number | string 闪烁范围，默认2，值越大闪烁范围越大
+ * @returns Component
+ */
+export function useRenderFlicker(attrs?: attrsType): Component {
+  return defineComponent({
+    name: "Flicker",
+    render() {
+      return h(
+        "div",
+        {
+          class: "point point-flicker",
+          style: {
+            "--point-width": attrs?.width ?? "12px",
+            "--point-height": attrs?.height ?? "12px",
+            "--point-background":
+              attrs?.background ?? "var(--el-color-primary)",
+            "--point-border-radius": attrs?.borderRadius ?? "50%",
+            "--point-scale": attrs?.scale ?? "2"
+          }
+        },
+        {
+          default: () => []
+        }
+      );
+    }
+  });
+}

src/components/ReFlop/src/filpper.css

@@ -9,7 +9,7 @@
   background: #fff;
   font-size: 66px;
   color: #fff;
-  box-shadow: 0 0 6px rgba(0, 0, 0, 0.5);
+  box-shadow: 0 0 6px rgb(0 0 0 / 50%);
   text-align: center;
   font-family: "Helvetica Neue";
 }
@@ -58,7 +58,7 @@
 .m-flipper.down.go .front::before {
   transform-origin: 50% 100%;
   animation: frontFlipDown 0.6s ease-in-out both;
-  box-shadow: 0 -2px 6px rgba(255, 255, 255, 0.3);
+  box-shadow: 0 -2px 6px rgb(255 255 255 / 30%);
   backface-visibility: hidden;
 }
 
@@ -85,7 +85,7 @@
 .m-flipper.up.go .front::after {
   transform-origin: 50% 0;
   animation: frontFlipUp 0.6s ease-in-out both;
-  box-shadow: 0 2px 6px rgba(255, 255, 255, 0.3);
+  box-shadow: 0 2px 6px rgb(255 255 255 / 30%);
   backface-visibility: hidden;
 }
 

src/components/ReFlowChart/src/Control.vue

@@ -107,7 +107,7 @@ onMounted(() => {
           }"
           @click="onControl(item, key)"
         >
-          <span :class="'iconfont ' + item.icon"></span>
+          <span :class="'iconfont ' + item.icon" />
           <p>{{ item.text }}</p>
         </button>
       </li>
@@ -126,7 +126,7 @@ onMounted(() => {
 }
 
 .iconfont {
-  font-size: 25px;
+  font-size: 18px;
 }
 
 .control-container p {

src/components/ReFlowChart/src/DataDialog.vue

@@ -13,5 +13,5 @@ const props = defineProps({
     :deep="3"
     :showLength="true"
     :data="props.graphData"
-  ></vue-json-pretty>
+  />
 </template>

src/components/ReFlowChart/src/NodePanel.vue

@@ -44,7 +44,7 @@ const nodeDragNode = item => {
         <div
           v-if="item.type === 'user' || item.type === 'time'"
           class="shape"
-        ></div>
+        />
       </div>
       <span class="node-label">{{ item.text }}</span>
     </div>

src/components/ReIcon/index.ts

@@ -1,12 +1,16 @@
-import { App } from "vue";
-import icon from "./src/Icon.vue";
+import iconifyIconOffline from "./src/iconifyIconOffline";
+import iconifyIconOnline from "./src/iconifyIconOnline";
+import fontIcon from "./src/iconfont";
+import iconSelect from "./src/select.vue";
 
-export const Icon = Object.assign(icon, {
-  install(app: App) {
-    app.component(icon.name, icon);
-  }
-});
+export const IconifyIconOffline = iconifyIconOffline;
+export const IconifyIconOnline = iconifyIconOnline;
+export const FontIcon = fontIcon;
+export const IconSelect = iconSelect;
 
 export default {
-  Icon
+  IconifyIconOffline,
+  IconifyIconOnline,
+  FontIcon,
+  IconSelect
 };

src/components/ReIcon/src/Icon.vue

@@ -1,97 +0,0 @@
-<script lang="ts">
-export default {
-  name: "Icon"
-};
-</script>
-
-<script setup lang="ts">
-import { ref, computed } from "vue";
-
-const props = defineProps({
-  content: {
-    type: String,
-    default: ""
-  },
-  size: {
-    type: Number,
-    default: 18
-  },
-  width: {
-    type: Number,
-    default: 20
-  },
-  height: {
-    type: Number,
-    default: 20
-  },
-  color: {
-    type: String,
-    default: ""
-  },
-  svg: {
-    type: Boolean,
-    default: false
-  }
-});
-
-const emit = defineEmits<{
-  (e: "click"): void;
-}>();
-
-let text = ref("");
-
-let className = computed(() => {
-  if (props.content.indexOf("fa-") > -1) {
-    return props.content.indexOf("fa ") === 0
-      ? props.content
-      : ["fa", props.content];
-  } else if (props.content.indexOf("el-icon-") > -1) {
-    return props.content;
-  } else if (props.content.indexOf("#") > -1) {
-    // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-    text.value = props.content;
-    return "iconfont";
-  } else {
-    // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-    text.value = props.content;
-    return "";
-  }
-});
-
-let iconStyle = computed(() => {
-  return (
-    "font-size: " +
-    props.size +
-    "px; color: " +
-    props.color +
-    "; width: " +
-    props.width +
-    "px; height: " +
-    props.height +
-    "px; font-style: normal;"
-  );
-});
-
-const clickHandle = () => {
-  emit("click");
-};
-</script>
-
-<template>
-  <i
-    v-if="!props.svg"
-    :class="className"
-    :style="iconStyle"
-    v-html="text"
-    @click="clickHandle"
-  ></i>
-  <svg
-    class="icon-svg"
-    v-if="props.svg"
-    aria-hidden="true"
-    :style="iconStyle"
-    @click="clickHandle"
-  >
-    <use :xlink:href="`#${props.content}`" />
-  </svg>
-</template>

src/components/ReIcon/src/hooks.ts

@@ -0,0 +1,47 @@
+import { iconType } from "./types";
+import { h, defineComponent, Component } from "vue";
+import { IconifyIconOffline, FontIcon } from "../index";
+
+/**
+ * 支持fontawesome4、5+、iconfont、remixicon、element-plus的icons、自定义svg
+ * @param icon 必传 string 图标
+ * @param attrs 可选 iconType 属性
+ * @returns Component
+ */
+export function useRenderIcon(icon: string, attrs?: iconType): Component {
+  // iconfont
+  const ifReg = /^IF-/;
+  // typeof icon === "function" 属于SVG
+  if (ifReg.test(icon)) {
+    // iconfont
+    const name = icon.split(ifReg)[1];
+    const iconName = name.slice(
+      0,
+      name.indexOf(" ") == -1 ? name.length : name.indexOf(" ")
+    );
+    const iconType = name.slice(name.indexOf(" ") + 1, name.length);
+    return defineComponent({
+      name: "FontIcon",
+      render() {
+        return h(FontIcon, {
+          icon: iconName,
+          iconType,
+          ...attrs
+        });
+      }
+    });
+  } else if (typeof icon === "function") {
+    // svg
+    return icon;
+  } else {
+    return defineComponent({
+      name: "Icon",
+      render() {
+        return h(IconifyIconOffline, {
+          icon: icon,
+          ...attrs
+        });
+      }
+    });
+  }
+}

src/components/ReIcon/src/iconfont.ts

@@ -0,0 +1,48 @@
+import { h, defineComponent } from "vue";
+
+// 封装iconfont组件，默认`font-class`引用模式，支持`unicode`引用、`font-class`引用、`symbol`引用 （https://www.iconfont.cn/help/detail?spm=a313x.7781069.1998910419.20&helptype=code）
+export default defineComponent({
+  name: "fontIcon",
+  props: {
+    icon: {
+      type: String,
+      default: ""
+    }
+  },
+  render() {
+    const attrs = this.$attrs;
+    if (Object.keys(attrs).includes("uni") || attrs?.iconType === "uni") {
+      return h(
+        "i",
+        {
+          class: "iconfont",
+          ...attrs
+        },
+        this.icon
+      );
+    } else if (
+      Object.keys(attrs).includes("svg") ||
+      attrs?.iconType === "svg"
+    ) {
+      return h(
+        "svg",
+        {
+          class: "icon-svg",
+          "aria-hidden": true
+        },
+        {
+          default: () => [
+            h("use", {
+              "xlink:href": `#${this.icon}`
+            })
+          ]
+        }
+      );
+    } else {
+      return h("i", {
+        class: `iconfont ${this.icon}`,
+        ...attrs
+      });
+    }
+  }
+});

src/components/ReIcon/src/iconifyIconOffline.ts

@@ -0,0 +1,115 @@
+import { h, defineComponent } from "vue";
+import { Icon as IconifyIcon, addIcon } from "@iconify/vue/dist/offline";
+
+// element-plus icon
+import Check from "@iconify-icons/ep/check";
+import Menu from "@iconify-icons/ep/menu";
+import HomeFilled from "@iconify-icons/ep/home-filled";
+import SetUp from "@iconify-icons/ep/set-up";
+import Edit from "@iconify-icons/ep/edit";
+import Setting from "@iconify-icons/ep/setting";
+import Lollipop from "@iconify-icons/ep/lollipop";
+import Link from "@iconify-icons/ep/link";
+import Position from "@iconify-icons/ep/position";
+import Histogram from "@iconify-icons/ep/histogram";
+import RefreshRight from "@iconify-icons/ep/refresh-right";
+import ArrowDown from "@iconify-icons/ep/arrow-down";
+import Close from "@iconify-icons/ep/close";
+import CloseBold from "@iconify-icons/ep/close-bold";
+import Bell from "@iconify-icons/ep/bell";
+import Guide from "@iconify-icons/ep/guide";
+import User from "@iconify-icons/ep/user";
+import Iphone from "@iconify-icons/ep/iphone";
+import Location from "@iconify-icons/ep/location";
+import Tickets from "@iconify-icons/ep/tickets";
+import OfficeBuilding from "@iconify-icons/ep/office-building";
+import Notebook from "@iconify-icons/ep/notebook";
+import Rank from "@iconify-icons/ep/rank";
+import videoPlay from "@iconify-icons/ep/video-play";
+import Monitor from "@iconify-icons/ep/monitor";
+import Search from "@iconify-icons/ep/search";
+addIcon("check", Check);
+addIcon("menu", Menu);
+addIcon("home-filled", HomeFilled);
+addIcon("set-up", SetUp);
+addIcon("edit", Edit);
+addIcon("setting", Setting);
+addIcon("lollipop", Lollipop);
+addIcon("link", Link);
+addIcon("position", Position);
+addIcon("histogram", Histogram);
+addIcon("refresh-right", RefreshRight);
+addIcon("arrow-down", ArrowDown);
+addIcon("close", Close);
+addIcon("close-bold", CloseBold);
+addIcon("bell", Bell);
+addIcon("guide", Guide);
+addIcon("user", User);
+addIcon("iphone", Iphone);
+addIcon("location", Location);
+addIcon("tickets", Tickets);
+addIcon("office-building", OfficeBuilding);
+addIcon("notebook", Notebook);
+addIcon("video-play", videoPlay);
+addIcon("rank", Rank);
+addIcon("monitor", Monitor);
+addIcon("search", Search);
+
+// remixicon
+import arrowRightSLine from "@iconify-icons/ri/arrow-right-s-line";
+import arrowLeftSLine from "@iconify-icons/ri/arrow-left-s-line";
+import logoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
+import nodeTree from "@iconify-icons/ri/node-tree";
+import ubuntuFill from "@iconify-icons/ri/ubuntu-fill";
+import questionLine from "@iconify-icons/ri/question-line";
+import checkboxCircleLine from "@iconify-icons/ri/checkbox-circle-line";
+import informationLine from "@iconify-icons/ri/information-line";
+import closeCircleLine from "@iconify-icons/ri/close-circle-line";
+import arrowUpLine from "@iconify-icons/ri/arrow-up-line";
+import arrowDownLine from "@iconify-icons/ri/arrow-down-line";
+import bookmark2Line from "@iconify-icons/ri/bookmark-2-line";
+addIcon("arrow-right-s-line", arrowRightSLine);
+addIcon("arrow-left-s-line", arrowLeftSLine);
+addIcon("logout-circle-r-line", logoutCircleRLine);
+addIcon("node-tree", nodeTree);
+addIcon("ubuntu-fill", ubuntuFill);
+addIcon("question-line", questionLine);
+addIcon("checkbox-circle-line", checkboxCircleLine);
+addIcon("information-line", informationLine);
+addIcon("close-circle-line", closeCircleLine);
+addIcon("arrow-up-line", arrowUpLine);
+addIcon("arrow-down-line", arrowDownLine);
+addIcon("bookmark-2-line", bookmark2Line);
+
+// Font Awesome 4
+import faUser from "@iconify-icons/fa/user";
+import faLock from "@iconify-icons/fa/lock";
+import faSignOut from "@iconify-icons/fa/sign-out";
+addIcon("fa-user", faUser);
+addIcon("fa-lock", faLock);
+addIcon("fa-sign-out", faSignOut);
+
+// Iconify Icon在Vue里离线使用（用于内网环境）https://docs.iconify.design/icon-components/vue/offline.html
+export default defineComponent({
+  name: "IconifyIcon",
+  components: { IconifyIcon },
+  props: {
+    icon: {
+      type: String,
+      default: ""
+    }
+  },
+  render() {
+    const attrs = this.$attrs;
+    return h(
+      IconifyIcon,
+      {
+        icon: `${this.icon}`,
+        ...attrs
+      },
+      {
+        default: () => []
+      }
+    );
+  }
+});

src/components/ReIcon/src/iconifyIconOnline.ts

@@ -0,0 +1,32 @@
+import { h, defineComponent } from "vue";
+import { Icon as IconifyIcon } from "@iconify/vue";
+
+// Iconify Icon在Vue里在线使用（用于外网环境） https://docs.iconify.design/icon-components/vue/offline.html
+export default defineComponent({
+  name: "IconifyIcon",
+  components: { IconifyIcon },
+  props: {
+    icon: {
+      type: String,
+      default: ""
+    },
+    // default element plus icon
+    type: {
+      type: String,
+      default: "ep:"
+    }
+  },
+  render() {
+    const attrs = this.$attrs;
+    return h(
+      IconifyIcon,
+      {
+        icon: `${this.type}${this.icon}`,
+        ...attrs
+      },
+      {
+        default: () => []
+      }
+    );
+  }
+});

src/components/ReIcon/src/select.vue

@@ -0,0 +1,184 @@
+<script setup lang="ts">
+import { cloneDeep } from "lodash-unified";
+import { ref, computed, CSSProperties } from "vue";
+import { IconJson } from "/@/components/ReIcon/data";
+type ParameterCSSProperties = (item?: string) => CSSProperties | undefined;
+
+let inputValue = ref("ep:add-location");
+let iconList = ref(IconJson);
+let icon = ref("add-location");
+let currentActiveType = ref("ep:");
+// 深拷贝图标数据，前端做搜索
+let copyIconList = cloneDeep(iconList.value);
+
+let pageSize = ref(96);
+let currentPage = ref(1);
+
+// 搜索条件
+let filterValue = ref("");
+
+let tabsList = [
+  {
+    label: "Element Plus",
+    name: "ep:"
+  },
+  {
+    label: "Font Awesome 4",
+    name: "fa:"
+  },
+  {
+    label: "Font Awesome 5 Solid",
+    name: "fa-solid:"
+  }
+];
+
+let pageList = computed(() => {
+  if (currentPage.value === 1) {
+    return copyIconList[currentActiveType.value]
+      .slice(currentPage.value - 1, pageSize.value)
+      .filter(v => v.includes(filterValue.value));
+  } else {
+    return copyIconList[currentActiveType.value]
+      .slice(
+        pageSize.value * (currentPage.value - 1),
+        pageSize.value * (currentPage.value - 1) + pageSize.value
+      )
+      .filter(v => v.includes(filterValue.value));
+  }
+});
+
+const iconItemStyle = computed((): ParameterCSSProperties => {
+  return item => {
+    if (inputValue.value === currentActiveType.value + item) {
+      return {
+        borderColor: "var(--el-color-primary)"
+      };
+    }
+  };
+});
+
+function handleClick({ props }) {
+  currentPage.value = 1;
+  currentActiveType.value = props.name;
+  inputValue.value =
+    currentActiveType.value + iconList.value[currentActiveType.value][0];
+  icon.value = iconList.value[currentActiveType.value][0];
+}
+
+function onChangeIcon(item) {
+  inputValue.value = currentActiveType.value + item;
+  icon.value = item;
+}
+
+function onCurrentChange(page) {
+  currentPage.value = page;
+}
+</script>
+
+<template>
+  <div class="selector w-350px">
+    <el-input v-model="inputValue" disabled>
+      <template #append>
+        <el-popover :width="350" trigger="click" popper-class="pure-popper">
+          <template #reference>
+            <div
+              class="w-40px h-32px cursor-pointer flex justify-center items-center"
+            >
+              <IconifyIconOnline :icon="icon" :type="currentActiveType" />
+            </div>
+          </template>
+
+          <el-input
+            class="p-2"
+            v-model="filterValue"
+            placeholder="搜索图标"
+            clearable
+          />
+          <el-divider border-style="dashed" />
+
+          <el-tabs v-model="currentActiveType" @tab-click="handleClick">
+            <el-tab-pane
+              v-for="(pane, index) in tabsList"
+              :key="index"
+              :label="pane.label"
+              :name="pane.name"
+            >
+              <el-divider class="tab-divider" border-style="dashed" />
+              <el-scrollbar height="220px">
+                <ul class="flex flex-wrap px-2 ml-2">
+                  <li
+                    v-for="(item, key) in pageList"
+                    :key="key"
+                    :title="item"
+                    class="icon-item p-2 w-1/10 cursor-pointer mr-2 mt-1 flex justify-center items-center border border-solid"
+                    :style="iconItemStyle(item)"
+                    @click="onChangeIcon(item)"
+                  >
+                    <IconifyIconOnline :icon="item" :type="currentActiveType" />
+                  </li>
+                </ul>
+              </el-scrollbar>
+            </el-tab-pane>
+          </el-tabs>
+          <el-divider border-style="dashed" />
+
+          <el-pagination
+            small
+            :total="copyIconList[currentActiveType].length"
+            :page-size="pageSize"
+            :current-page="currentPage"
+            background
+            layout="prev, pager, next"
+            class="flex items-center justify-center h-10"
+            @current-change="onCurrentChange"
+          />
+        </el-popover>
+      </template>
+    </el-input>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.el-divider--horizontal {
+  margin: 1px auto !important;
+}
+
+.tab-divider.el-divider--horizontal {
+  margin: 0 !important;
+}
+
+.icon-item {
+  &:hover {
+    border-color: var(--el-color-primary);
+  }
+}
+
+:deep(.el-tabs__nav-next) {
+  font-size: 15px;
+  line-height: 32px;
+  box-shadow: -5px 0 5px -6px #ccc;
+}
+
+:deep(.el-tabs__nav-prev) {
+  font-size: 15px;
+  line-height: 32px;
+  box-shadow: 5px 0 5px -6px #ccc;
+}
+
+:deep(.el-input-group__append) {
+  padding: 0;
+}
+
+:deep(.el-tabs__item) {
+  font-size: 12px;
+  font-weight: normal;
+  height: 30px;
+  line-height: 30px;
+}
+
+:deep(.el-tabs__header),
+:deep(.el-tabs__nav-wrap) {
+  margin: 0;
+  position: static;
+}
+</style>

src/components/ReIcon/src/types.ts

@@ -0,0 +1,18 @@
+export interface iconType {
+  // iconify (https://docs.iconify.design/icon-components/vue/#properties)
+  inline?: boolean;
+  width?: string | number;
+  height?: string | number;
+  horizontalFlip?: boolean;
+  verticalFlip?: boolean;
+  flip?: string;
+  rotate?: number | string;
+  color?: string;
+  horizontalAlign?: boolean;
+  verticalAlign?: boolean;
+  align?: string;
+  onLoad?: Function;
+
+  //  all icon
+  style?: object;
+}

src/components/ReMap/src/Amap.vue

@@ -19,10 +19,6 @@ type resultType = {
   info: Array<undefined>;
 };
 
-export interface mapInter {
-  loading: boolean;
-}
-
 let MarkerCluster;
 let map: MapConfigureInter;
 
@@ -126,7 +122,7 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <div id="mapview" ref="mapview" v-loading="mapSet.loading"></div>
+  <div id="mapview" ref="mapview" v-loading="mapSet.loading" />
 </template>
 
 <style lang="scss" scoped>

src/components/ReSeamlessScroll/src/index.vue

@@ -498,7 +498,7 @@ defineExpose({
       :class="leftSwitchClass"
       @click="leftSwitchClick"
     >
-      <slot name="left-switch"></slot>
+      <slot name="left-switch" />
     </div>
     <div
       :style="rightSwitch"
@@ -506,7 +506,7 @@ defineExpose({
       :class="rightSwitchClass"
       @click="rightSwitchClick"
     >
-      <slot name="right-switch"></slot>
+      <slot name="right-switch" />
     </div>
     <div
       :ref="'realBox' + classOption['key']"
@@ -519,9 +519,9 @@ defineExpose({
       @mousewheel="wheel"
     >
       <div :ref="'slotList' + classOption['key']" :style="float">
-        <slot></slot>
+        <slot />
       </div>
-      <div v-html="copyHtml" :style="float"></div>
+      <div v-html="copyHtml" :style="float" />
     </div>
   </div>
 </template>

src/components/ReSelector/src/index.tsx

@@ -299,10 +299,12 @@ export default defineComponent({
                       cursor: unref(rateDisabled) ? "auto" : "pointer",
                       textAlign: "center"
                     }}
-                    key={key}>
+                    key={key}
+                  >
                     <div
                       ref={`hsdiv${props.HsKey}${key}`}
-                      class={`hs-item ${[unref(classes)[key] + key]}`}>
+                      class={`hs-item ${[unref(classes)[key] + key]}`}
+                    >
                       <span>{item}</span>
                     </div>
                   </td>

src/components/ReSplitPane/index.tsx

@@ -111,20 +111,24 @@ export default defineComponent({
           class="vue-splitter-container clearfix"
           style={(unref(cursor), unref(userSelect))}
           onMouseup={() => onMouseUp()}
-          onMousemove={() => onMouseMove(event)}>
+          onMousemove={() => onMouseMove(event)}
+        >
           <div
             class={unref(leftClass)}
-            style={{ [unref(type)]: unref(percent) + "%" }}>
+            style={{ [unref(type)]: unref(percent) + "%" }}
+          >
             {ctx.slots.paneL()}
           </div>
           <resizer
             style={`${unref([resizeType])}:${unref(percent)}%`}
             split={props.splitSet?.split}
             onMousedown={() => onMouseDown()}
-            onClick={() => onClick()}></resizer>
+            onClick={() => onClick()}
+          ></resizer>
           <div
             class={unref(rightClass)}
-            style={{ [unref(type)]: 100 - unref(percent) + "%" }}>
+            style={{ [unref(type)]: 100 - unref(percent) + "%" }}
+          >
             {ctx.slots.paneR()}
           </div>
           <div v-show={unref(active)} class="vue-splitter-container-mask"></div>

src/components/ReSplitPane/resizer.css

@@ -1,21 +1,18 @@
 .splitter-pane-resizer {
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
   box-sizing: border-box;
   background: #000;
   position: absolute;
   opacity: 0.2;
   z-index: 1;
-  -moz-background-clip: padding;
-  -webkit-background-clip: padding;
+  background-clip: padding;
   background-clip: padding-box;
 }
 
 .splitter-pane-resizer.horizontal {
   height: 11px;
   margin: -5px 0;
-  border-top: 5px solid rgba(255, 255, 255, 0);
-  border-bottom: 5px solid rgba(255, 255, 255, 0);
+  border-top: 5px solid rgb(255 255 255 / 0%);
+  border-bottom: 5px solid rgb(255 255 255 / 0%);
   cursor: row-resize;
   width: 100%;
 }
@@ -24,7 +21,7 @@
   width: 11px;
   height: 100%;
   margin-left: -5px;
-  border-left: 5px solid rgba(255, 255, 255, 0);
-  border-right: 5px solid rgba(255, 255, 255, 0);
+  border-left: 5px solid rgb(255 255 255 / 0%);
+  border-right: 5px solid rgb(255 255 255 / 0%);
   cursor: col-resize;
 }

src/components/ReTreeLine/index.scss

@@ -0,0 +1,49 @@
+$--element-tree-line-color: #dcdfe6 !default;
+$--element-tree-line-style: dashed !default;
+$--element-tree-line-width: 1px !default;
+
+/* 添加 el-tree-node__conten 默认没有的 position */
+.el-tree .el-tree-node__content {
+  position: relative;
+}
+
+.element-tree-node-label-wrapper {
+  flex: 1;
+  display: flex;
+  align-items: center;
+}
+.element-tree-node-label {
+  font-size: 12px;
+}
+.element-tree-node-line-ver {
+  display: block;
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 100%;
+  border-left: $--element-tree-line-width $--element-tree-line-style
+    $--element-tree-line-color;
+  &.last-node-line {
+    border-left: $--element-tree-line-width $--element-tree-line-style
+      transparent;
+  }
+  &.last-node-isLeaf-line {
+    height: 50%;
+  }
+}
+.element-tree-node-line-hor {
+  display: block;
+  position: absolute;
+  top: 50%;
+  left: 0;
+  height: 0;
+  border-bottom: $--element-tree-line-width $--element-tree-line-style
+    $--element-tree-line-color;
+}
+.element-tree-node-label-line {
+  flex: 1;
+  border-top: $--element-tree-line-width $--element-tree-line-style
+    $--element-tree-line-color;
+  align-self: center;
+  margin: 0 10px;
+}

src/components/ReTreeLine/index.ts

@@ -0,0 +1,155 @@
+// 参考https://www.npmjs.com/package/element-tree-line (主要是替换需要通过函数传参的方式去注册组件，并添加更好的类型支持，并移除this.$scopedSlots，在3.x中,将所有this.$scopedSlots替换为this.$slots)
+import { isFunction } from "/@/utils/is";
+import { h, defineComponent } from "vue";
+import type { PropType } from "vue";
+import "./index.scss";
+import type {
+  TreeNode,
+  TreeData,
+  TreeNodeData
+} from "element-plus/es/components/tree-v2/src/types";
+
+export default defineComponent({
+  name: "el-tree-line",
+  props: {
+    node: {
+      type: Object as PropType<TreeNode>,
+      required: true
+    },
+    data: {
+      type: Array as PropType<TreeNodeData>,
+      default: () => {}
+    },
+    treeData: {
+      type: Array as PropType<TreeData>,
+      default: () => []
+    },
+    indent: {
+      type: Number,
+      default: 16
+    },
+    showLabelLine: {
+      type: Boolean,
+      default: true
+    }
+  },
+  setup(_, context) {
+    const { slots } = context;
+    const getScopedSlot = slotName => {
+      if (!slotName) {
+        return null;
+      }
+      const slotNameSplits = slotName.split("||");
+      let slot = null;
+      for (let index = 0; index < slotNameSplits.length; index++) {
+        const name = slotNameSplits[index];
+        slot = (slots || {})[name];
+      }
+      return slot;
+    };
+    const getSlotValue = (slot, scopedData, defaultNode = null) => {
+      if (isFunction(slot)) {
+        return slot(scopedData) || defaultNode;
+      }
+      return slot || defaultNode;
+    };
+
+    return {
+      getScopedSlot,
+      getSlotValue
+    };
+  },
+  render() {
+    // 自定义整行节点label区域
+    const scopeSlotDefault = this.getScopedSlot("default");
+    // 显示横线时自定义节点label区域
+    const labelSlot = this.getScopedSlot("node-label");
+    // 显示横线时追加在横线右边的内容
+    const afterLabelSlot = this.getScopedSlot("after-node-label");
+    const labelNodes = scopeSlotDefault
+      ? this.getSlotValue(scopeSlotDefault, {
+          node: this.node,
+          data: this.data
+        })
+      : [
+          labelSlot
+            ? this.getSlotValue(labelSlot, {
+                node: this.node,
+                data: this.data
+              })
+            : h("span", { class: "element-tree-node-label" }, this.node.label),
+          this.showLabelLine
+            ? h("span", {
+                class: "element-tree-node-label-line"
+              })
+            : null,
+          this.getSlotValue(afterLabelSlot, {
+            node: this.node,
+            data: this.data
+          })
+        ];
+    // 取得每一层的当前节点是不是在当前层级列表的最后一个
+    const lastnodeArr = [];
+    let currentNode = this.node;
+    while (currentNode) {
+      let parentNode = currentNode.parent;
+      // 兼容element-plus的 el-tree-v2 (Virtualized Tree 虚拟树)
+      if (currentNode.level === 1 && !currentNode.parent) {
+        // el-tree-v2的第一层node是没有parent的，必需 treeData 创建一个parent
+        if (!this.treeData || !Array.isArray(this.treeData)) {
+          throw Error(
+            "if you using el-tree-v2 (Virtualized Tree) of element-plus,element-tree-line required data."
+          );
+        }
+        parentNode = {
+          children: Array.isArray(this.treeData)
+            ? this.treeData.map(item => {
+                return { ...item, key: item.id };
+              })
+            : [],
+          level: 0,
+          key: "node-0",
+          parent: null
+        };
+      }
+      if (parentNode) {
+        // element-plus的 el-tree-v2 使用的是children和key， 其他使用的是 childNodes和id
+        const index = (parentNode.children || parentNode.childNodes).findIndex(
+          item => (item.key || item.id) === (currentNode.key || currentNode.id)
+        );
+        lastnodeArr.unshift(
+          index === (parentNode.children || parentNode.childNodes).length - 1
+        );
+      }
+      currentNode = parentNode;
+    }
+    const lineNodes = [];
+    for (let i = 0; i < this.node.level; i++) {
+      lineNodes.push(
+        h("span", {
+          class: {
+            "element-tree-node-line-ver": true,
+            "last-node-line": lastnodeArr[i] && this.node.level - 1 !== i,
+            "last-node-isLeaf-line": lastnodeArr[i] && this.node.level - 1 === i
+          },
+          style: { left: this.indent * i + "px" }
+        })
+      );
+    }
+    return h(
+      "span",
+      {
+        class: "element-tree-node-label-wrapper"
+      },
+      [labelNodes].concat(lineNodes).concat([
+        h("span", {
+          class: "element-tree-node-line-hor",
+          style: {
+            width: (this.node.isLeaf ? 24 : 8) + "px",
+            left: (this.node.level - 1) * this.indent + "px"
+          }
+        })
+      ])
+    );
+  }
+});

src/config/index.ts

@@ -1,6 +1,9 @@
 import { App } from "vue";
 import axios from "axios";
+import { loadEnv } from "@build/index";
+
 let config: object = {};
+const { VITE_PUBLIC_PATH } = loadEnv();
 
 const setConfig = (cfg?: unknown) => {
   config = Object.assign(config, cfg);
@@ -30,10 +33,7 @@ export const getServerConfig = async (app: App): Promise<undefined> => {
   return axios({
     baseURL: "",
     method: "get",
-    url:
-      process.env.NODE_ENV === "production"
-        ? "/manages/serverConfig.json"
-        : "/serverConfig.json"
+    url: `${VITE_PUBLIC_PATH}serverConfig.json`
   })
     .then(({ data: config }) => {
       let $config = app.config.globalProperties.$config;

src/directives/permission/index.ts

@@ -9,7 +9,7 @@ export const auth: Directive = {
       const authRoles = value;
       const hasAuth = usePermissionStoreHook().buttonAuth.includes(authRoles);
       if (!hasAuth) {
-        el.style.display = "none";
+        el.parentNode.removeChild(el);
       }
     } else {
       throw new Error("need roles! Like v-auth=\"['admin','test']\"");

src/layout/components/appMain.vue

@@ -7,8 +7,7 @@ import {
   defineComponent,
   getCurrentInstance
 } from "vue";
-import { RouterView } from "vue-router";
-import backTop from "/@/assets/svg/back_top.svg";
+import backTop from "/@/assets/svg/back_top.svg?component";
 import { usePermissionStoreHook } from "/@/store/modules/permission";
 
 const props = defineProps({
@@ -27,12 +26,23 @@ const transitions = computed(() => {
 });
 
 const hideTabs = computed(() => {
-  return instance?.sets.hideTabs;
+  return instance?.configure.hideTabs;
 });
+
 const layout = computed(() => {
   return instance?.layout.layout === "vertical";
 });
 
+const getSectionStyle = computed(() => {
+  return [
+    hideTabs.value && layout ? "padding-top: 48px;" : "",
+    !hideTabs.value && layout ? "padding-top: 85px;" : "",
+    hideTabs.value && !layout.value ? "padding-top: 48px" : "",
+    !hideTabs.value && !layout.value ? "padding-top: 85px;" : "",
+    props.fixedHeader ? "" : "padding-top: 0;"
+  ];
+});
+
 const transitionMain = defineComponent({
   render() {
     return h(
@@ -71,12 +81,7 @@ const transitionMain = defineComponent({
 <template>
   <section
     :class="[props.fixedHeader ? 'app-main' : 'app-main-nofixed-header']"
-    :style="[
-      hideTabs && layout ? 'padding-top: 48px;' : '',
-      !hideTabs && layout ? 'padding-top: 85px;' : '',
-      hideTabs && !layout ? 'padding-top: 62px' : '',
-      !hideTabs && !layout ? 'padding-top: 98px;' : ''
-    ]"
+    :style="getSectionStyle"
   >
     <router-view>
       <template #default="{ Component, route }">

src/layout/components/navbar.vue

@@ -1,53 +1,44 @@
 <script setup lang="ts">
 import { useI18n } from "vue-i18n";
-import { emitter } from "/@/utils/mitt";
+import { useNav } from "../hooks/nav";
+import { useRoute } from "vue-router";
+import Search from "./search/index.vue";
+import Notice from "./notice/index.vue";
+import mixNav from "./sidebar/mixNav.vue";
+import avatars from "/@/assets/avatars.jpg";
 import Hamburger from "./sidebar/hamBurger.vue";
-import { useRouter, useRoute } from "vue-router";
-import { storageSession } from "/@/utils/storage";
+import { watch, getCurrentInstance } from "vue";
 import Breadcrumb from "./sidebar/breadCrumb.vue";
-import { useAppStoreHook } from "/@/store/modules/app";
-import { unref, watch, getCurrentInstance } from "vue";
 import { deviceDetection } from "/@/utils/deviceDetection";
 import screenfull from "../components/screenfull/index.vue";
-import globalization from "/@/assets/svg/globalization.svg";
+import globalization from "/@/assets/svg/globalization.svg?component";
 
+const route = useRoute();
+const { locale, t } = useI18n();
 const instance =
   getCurrentInstance().appContext.config.globalProperties.$storage;
-const pureApp = useAppStoreHook();
-const router = useRouter();
-const route = useRoute();
-let usename = storageSession.getItem("info")?.username;
-const { locale, t } = useI18n();
+const {
+  logout,
+  onPanel,
+  changeTitle,
+  toggleSideBar,
+  pureApp,
+  usename,
+  getDropdownItemStyle
+} = useNav();
 
 watch(
   () => locale.value,
   () => {
-    //@ts-ignore
-    document.title = t(unref(route.meta.title)); // 动态title
+    changeTitle(route.meta);
   }
 );
 
-// 退出登录
-const logout = (): void => {
-  storageSession.removeItem("info");
-  router.push("/login");
-};
-
-function onPanel() {
-  emitter.emit("openPanel");
-}
-
-function toggleSideBar() {
-  pureApp.toggleSideBar();
-}
-
-// 简体中文
 function translationCh() {
   instance.locale = { locale: "zh" };
   locale.value = "zh";
 }
 
-// English
 function translationEn() {
   instance.locale = { locale: "en" };
   locale.value = "en";
@@ -57,67 +48,72 @@ function translationEn() {
 <template>
   <div class="navbar">
     <Hamburger
+      v-if="pureApp.layout !== 'mix'"
       :is-active="pureApp.sidebar.opened"
       class="hamburger-container"
       @toggleClick="toggleSideBar"
     />
 
-    <Breadcrumb class="breadcrumb-container" />
+    <Breadcrumb v-if="pureApp.layout !== 'mix'" class="breadcrumb-container" />
 
-    <div class="vertical-header-right">
+    <mixNav v-if="pureApp.layout === 'mix'" />
+
+    <div v-if="pureApp.layout === 'vertical'" class="vertical-header-right">
+      <!-- 菜单搜索 -->
+      <Search />
+      <!-- 通知 -->
+      <Notice id="header-notice" />
       <!-- 全屏 -->
-      <screenfull v-show="!deviceDetection()" />
+      <screenfull id="header-screenfull" v-show="!deviceDetection()" />
       <!-- 国际化 -->
-      <el-dropdown trigger="click">
+      <el-dropdown id="header-translation" trigger="click">
         <globalization />
         <template #dropdown>
           <el-dropdown-menu class="translation">
             <el-dropdown-item
-              :style="{
-                background: locale === 'zh' ? '#1b2a47' : '',
-                color: locale === 'zh' ? '#f4f4f5' : '#000'
-              }"
+              :style="getDropdownItemStyle(locale, 'zh')"
               @click="translationCh"
-              ><el-icon class="check-zh" v-show="locale === 'zh'"
-                ><check /></el-icon
-              >简体中文</el-dropdown-item
+              ><IconifyIconOffline
+                class="check-zh"
+                v-show="locale === 'zh'"
+                icon="check"
+              />简体中文</el-dropdown-item
             >
             <el-dropdown-item
-              :style="{
-                background: locale === 'en' ? '#1b2a47' : '',
-                color: locale === 'en' ? '#f4f4f5' : '#000'
-              }"
+              :style="getDropdownItemStyle(locale, 'en')"
               @click="translationEn"
-              ><el-icon class="check-en" v-show="locale === 'en'"
-                ><check /></el-icon
-              >English</el-dropdown-item
             >
+              <span class="check-en" v-show="locale === 'en'">
+                <IconifyIconOffline icon="check" /> </span
+              >English
+            </el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </el-dropdown>
       <!-- 退出登陆 -->
       <el-dropdown trigger="click">
         <span class="el-dropdown-link">
-          <img
-            src="https://avatars.githubusercontent.com/u/44761321?s=400&u=30907819abd29bb3779bc247910873e7c7f7c12f&v=4"
-          />
+          <img :src="avatars" />
           <p>{{ usename }}</p>
         </span>
         <template #dropdown>
           <el-dropdown-menu class="logout">
-            <el-dropdown-item icon="el-icon-switch-button" @click="logout">{{
-              $t("message.hsLoginOut")
-            }}</el-dropdown-item>
+            <el-dropdown-item @click="logout">
+              <IconifyIconOffline
+                icon="logout-circle-r-line"
+                style="margin: 5px"
+              />{{ t("buttons.hsLoginOut") }}</el-dropdown-item
+            >
           </el-dropdown-menu>
         </template>
       </el-dropdown>
-      <el-icon
+      <span
         class="el-icon-setting"
-        :title="$t('message.hssystemSet')"
+        :title="t('buttons.hssystemSet')"
         @click="onPanel"
       >
-        <Setting />
-      </el-icon>
+        <IconifyIconOffline icon="setting" />
+      </span>
     </div>
   </div>
 </template>
@@ -137,10 +133,6 @@ function translationEn() {
     cursor: pointer;
     transition: background 0.3s;
     -webkit-tap-highlight-color: transparent;
-
-    &:hover {
-      background: rgba(0, 0, 0, 0.025);
-    }
   }
 
   .vertical-header-right {
@@ -151,6 +143,12 @@ function translationEn() {
     color: #000000d9;
     justify-content: flex-end;
 
+    :deep(.dropdown-badge) {
+      &:hover {
+        background: #f6f6f6;
+      }
+    }
+
     .screen-full {
       cursor: pointer;
 
@@ -215,38 +213,28 @@ function translationEn() {
 }
 
 .translation {
-  .el-dropdown-menu__item {
-    padding: 0 40px !important;
-  }
-
-  .el-dropdown-menu__item:focus,
-  .el-dropdown-menu__item:not(.is-disabled):hover {
-    color: #606266;
-    background: #f0f0f0;
+  ::v-deep(.el-dropdown-menu__item) {
+    padding: 5px 40px;
   }
 
   .check-zh {
     position: absolute;
     left: 20px;
-    top: 13px;
   }
 
   .check-en {
     position: absolute;
-    bottom: 13px;
     left: 20px;
   }
 }
 
 .logout {
-  .el-dropdown-menu__item {
-    padding: 0 18px !important;
-  }
+  max-width: 120px;
 
-  .el-dropdown-menu__item:focus,
-  .el-dropdown-menu__item:not(.is-disabled):hover {
-    color: #606266;
-    background: #f0f0f0;
+  ::v-deep(.el-dropdown-menu__item) {
+    min-width: 100%;
+    display: inline-flex;
+    flex-wrap: wrap;
   }
 }
 </style>

src/layout/components/notice/data.ts

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

src/layout/components/notice/index.vue

@@ -0,0 +1,102 @@
+<script setup lang="ts">
+import { ref } from "vue";
+import { noticesData } from "./data";
+import NoticeList from "./noticeList.vue";
+import { templateRef } from "@vueuse/core";
+import { Tabs, TabPane } from "@pureadmin/components";
+
+const dropdownDom = templateRef<ElRef | null>("dropdownDom", null);
+const activeName = ref(noticesData[0].name);
+const notices = ref(noticesData);
+
+let noticesNum = ref(0);
+notices.value.forEach(notice => {
+  noticesNum.value += notice.list.length;
+});
+
+function tabClick() {
+  // @ts-expect-error
+  dropdownDom.value.handleOpen();
+}
+</script>
+
+<template>
+  <el-dropdown ref="dropdownDom" trigger="click" placement="bottom-end">
+    <span class="dropdown-badge">
+      <el-badge :value="noticesNum" :max="99">
+        <span class="header-notice-icon">
+          <IconifyIconOffline icon="bell" />
+        </span>
+      </el-badge>
+    </span>
+    <template #dropdown>
+      <el-dropdown-menu>
+        <Tabs
+          centered
+          class="dropdown-tabs"
+          v-model:activeName="activeName"
+          @tabClick="tabClick"
+        >
+          <template v-for="item in notices" :key="item.key">
+            <TabPane :tab="`${item.name}(${item.list.length})`">
+              <el-scrollbar max-height="330px">
+                <div class="noticeList-container">
+                  <NoticeList :list="item.list" />
+                </div>
+              </el-scrollbar>
+            </TabPane>
+          </template>
+        </Tabs>
+      </el-dropdown-menu>
+    </template>
+  </el-dropdown>
+</template>
+
+<style>
+.ant-tabs-dropdown {
+  z-index: 2900 !important;
+}
+</style>
+
+<style lang="scss" scoped>
+.dropdown-badge {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 48px;
+  width: 60px;
+  cursor: pointer;
+
+  .header-notice-icon {
+    font-size: 18px;
+  }
+}
+
+.dropdown-tabs {
+  width: 336px;
+  background-color: #fff;
+  box-shadow: 0 2px 8px rgb(0 0 0 / 15%);
+  border-radius: 4px;
+
+  :deep(.el-tabs__header) {
+    margin: 0;
+  }
+
+  :deep(.el-tabs__nav-scroll) {
+    display: flex;
+    justify-content: center;
+  }
+
+  :deep(.el-tabs__nav-wrap)::after {
+    height: 1px;
+  }
+
+  :deep(.noticeList-container) {
+    padding: 15px 24px 0 24px;
+  }
+}
+
+:deep(.ant-tabs-nav) {
+  margin-bottom: 0;
+}
+</style>

src/layout/components/notice/noticeItem.vue

@@ -0,0 +1,168 @@
+<script setup lang="ts">
+import { ListItem } from "./data";
+import { ref, PropType, nextTick } from "vue";
+
+const props = defineProps({
+  noticeItem: {
+    type: Object as PropType<ListItem>,
+    default: () => {}
+  }
+});
+
+const titleRef = ref(null);
+const titleTooltip = ref(false);
+const descriptionRef = ref(null);
+const descriptionTooltip = ref(false);
+
+function hoverTitle() {
+  nextTick(() => {
+    titleRef.value?.scrollWidth > titleRef.value?.clientWidth
+      ? (titleTooltip.value = true)
+      : (titleTooltip.value = false);
+  });
+}
+
+function hoverDescription(event, description) {
+  // currentWidth 为文本在页面中所占的宽度，创建标签，加入到页面，获取currentWidth ,最后在移除
+  let tempTag = document.createElement("span");
+  tempTag.innerText = description;
+  tempTag.className = "getDescriptionWidth";
+  document.querySelector("body").appendChild(tempTag);
+  let currentWidth = (
+    document.querySelector(".getDescriptionWidth") as HTMLSpanElement
+  ).offsetWidth;
+  document.querySelector(".getDescriptionWidth").remove();
+
+  // cellWidth为容器的宽度
+  const cellWidth = event.target.offsetWidth;
+
+  // 当文本宽度大于容器宽度两倍时，代表文本显示超过两行
+  currentWidth > 2 * cellWidth
+    ? (descriptionTooltip.value = true)
+    : (descriptionTooltip.value = false);
+}
+</script>
+
+<template>
+  <div class="notice-container">
+    <el-avatar
+      v-if="props.noticeItem.avatar"
+      :size="30"
+      :src="props.noticeItem.avatar"
+      class="notice-container-avatar"
+    />
+    <div class="notice-container-text">
+      <div class="notice-text-title">
+        <el-tooltip
+          popper-class="notice-title-popper"
+          :disabled="!titleTooltip"
+          :content="props.noticeItem.title"
+          placement="top-start"
+        >
+          <div
+            ref="titleRef"
+            class="notice-title-content"
+            @mouseover="hoverTitle"
+          >
+            {{ props.noticeItem.title }}
+          </div>
+        </el-tooltip>
+        <el-tag
+          v-if="props.noticeItem?.extra"
+          :type="props.noticeItem?.status"
+          size="small"
+          class="notice-title-extra"
+          >{{ props.noticeItem?.extra }}
+        </el-tag>
+      </div>
+
+      <el-tooltip
+        popper-class="notice-title-popper"
+        :disabled="!descriptionTooltip"
+        :content="props.noticeItem.description"
+        placement="top-start"
+      >
+        <div
+          ref="descriptionRef"
+          class="notice-text-description"
+          @mouseover="hoverDescription($event, props.noticeItem.description)"
+        >
+          {{ props.noticeItem.description }}
+        </div>
+      </el-tooltip>
+      <div class="notice-text-datetime">
+        {{ props.noticeItem.datetime }}
+      </div>
+    </div>
+  </div>
+</template>
+
+<style>
+.notice-title-popper {
+  max-width: 238px;
+}
+</style>
+<style scoped lang="scss">
+.notice-container {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  padding: 12px 0;
+  border-bottom: 1px solid #f0f0f0;
+
+  .notice-container-avatar {
+    margin-right: 16px;
+    background: #fff;
+  }
+
+  .notice-container-text {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    flex: 1;
+
+    .notice-text-title {
+      display: flex;
+      margin-bottom: 8px;
+      font-weight: 400;
+      font-size: 14px;
+      line-height: 1.5715;
+      color: rgba(0, 0, 0, 0.85);
+      cursor: pointer;
+
+      .notice-title-content {
+        flex: 1;
+        width: 200px;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
+
+      .notice-title-extra {
+        float: right;
+        margin-top: -1.5px;
+        font-weight: 400;
+      }
+    }
+
+    .notice-text-description,
+    .notice-text-datetime {
+      font-size: 12px;
+      line-height: 1.5715;
+      color: rgba(0, 0, 0, 0.45);
+    }
+
+    .notice-text-description {
+      display: -webkit-box;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+    }
+
+    .notice-text-datetime {
+      margin-top: 4px;
+    }
+  }
+}
+</style>

src/layout/components/notice/noticeList.vue

@@ -0,0 +1,23 @@
+<script setup lang="ts">
+import { PropType } from "vue";
+import { ListItem } from "./data";
+import NoticeItem from "./noticeItem.vue";
+
+const props = defineProps({
+  list: {
+    type: Array as PropType<Array<ListItem>>,
+    default: () => []
+  }
+});
+</script>
+
+<template>
+  <div v-if="props.list.length">
+    <NoticeItem
+      v-for="(item, index) in props.list"
+      :noticeItem="item"
+      :key="index"
+    />
+  </div>
+  <el-empty v-else description="暂无数据" />
+</template>

src/layout/components/panel/index.vue

@@ -23,10 +23,10 @@ emitter.on("openPanel", () => {
         <div class="project-configuration">
           <h3>项目配置</h3>
           <el-icon title="关闭配置" class="el-icon-close" @click="show = !show">
-            <Close />
+            <IconifyIconOffline icon="close" />
           </el-icon>
         </div>
-        <div style="border-bottom: 1px solid #dcdfe6"></div>
+        <div style="border-bottom: 1px solid #dcdfe6" />
         <slot />
       </div>
     </div>
@@ -125,7 +125,7 @@ emitter.on("openPanel", () => {
 
     &:hover {
       cursor: pointer;
-      color: red;
+      color: var(--el-color-primary);
     }
   }
 }

src/layout/components/screenfull/index.vue

@@ -1,29 +1,26 @@
 <script setup lang="ts">
 import { useFullscreen } from "@vueuse/core";
+import { useI18n } from "vue-i18n";
+
+const { t } = useI18n();
 const { isFullscreen, toggle } = useFullscreen();
 </script>
 
 <template>
   <div class="screen-full" @click="toggle">
-    <i
+    <FontIcon
       :title="
-        isFullscreen
-          ? $t('message.hsexitfullscreen')
-          : $t('message.hsfullscreen')
+        isFullscreen ? t('buttons.hsexitfullscreen') : t('buttons.hsfullscreen')
       "
-      :class="
-        isFullscreen
-          ? 'iconfont team-iconexit-fullscreen'
-          : 'iconfont team-iconfullscreen'
-      "
-    ></i>
+      :icon="isFullscreen ? 'team-iconexit-fullscreen' : 'team-iconfullscreen'"
+    />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .screen-full {
   width: 36px;
-  height: 62px;
+  height: 48px;
   display: flex;
   align-items: center;
   justify-content: space-around;

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

@@ -0,0 +1,42 @@
+<template>
+  <div class="search-footer">
+    <span class="search-footer-item">
+      <enterOutlined class="icon" />
+      确认
+    </span>
+    <span class="search-footer-item">
+      <IconifyIconOffline icon="arrow-up-line" class="icon" />
+      <IconifyIconOffline icon="arrow-down-line" class="icon" />
+      切换
+    </span>
+    <span class="search-footer-item">
+      <mdiKeyboardEsc class="icon" />
+      关闭
+    </span>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import enterOutlined from "/@/assets/svg/enter_outlined.svg?component";
+import mdiKeyboardEsc from "/@/assets/svg/mdi_keyboard_esc.svg?component";
+</script>
+<style lang="scss" scoped>
+.search-footer {
+  display: flex;
+  color: #333;
+
+  .search-footer-item {
+    display: flex;
+    align-items: center;
+    margin-right: 14px;
+  }
+
+  .icon {
+    padding: 2px;
+    margin-right: 3px;
+    font-size: 20px;
+    box-shadow: inset 0 -2px #cdcde6, inset 0 0 1px 1px #fff,
+      0 1px 2px 1px #1e235a66;
+  }
+}
+</style>

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

@@ -0,0 +1,165 @@
+<script lang="ts" setup>
+import { useRouter } from "vue-router";
+import SearchResult from "./SearchResult.vue";
+import SearchFooter from "./SearchFooter.vue";
+import { deleteChildren } from "/@/utils/tree";
+import { transformI18n } from "/@/plugins/i18n";
+import { useDebounceFn, onKeyStroke } from "@vueuse/core";
+import { ref, watch, computed, nextTick, shallowRef } from "vue";
+import { usePermissionStoreHook } from "/@/store/modules/permission";
+
+interface Props {
+  /** 弹窗显隐 */
+  value: boolean;
+}
+
+interface Emits {
+  (e: "update:value", val: boolean): void;
+}
+
+const emit = defineEmits<Emits>();
+const props = withDefaults(defineProps<Props>(), {});
+const router = useRouter();
+
+const keyword = ref("");
+const activePath = ref("");
+const inputRef = ref<HTMLInputElement | null>(null);
+const resultOptions = shallowRef([]);
+const handleSearch = useDebounceFn(search, 300);
+
+/** 菜单树形结构 */
+const menusData = computed(() => {
+  return deleteChildren(usePermissionStoreHook().menusTree);
+});
+
+const show = computed({
+  get() {
+    return props.value;
+  },
+  set(val: boolean) {
+    emit("update:value", val);
+  }
+});
+
+watch(show, async val => {
+  if (val) {
+    /** 自动聚焦 */
+    await nextTick();
+    inputRef.value?.focus();
+  }
+});
+
+/** 将菜单树形结构扁平化为一维数组，用于菜单查询 */
+function flatTree(arr) {
+  const res = [];
+  function deep(arr) {
+    arr.forEach(item => {
+      res.push(item);
+      item.children && deep(item.children);
+    });
+  }
+  deep(arr);
+  return res;
+}
+
+/** 查询 */
+function search() {
+  const flatMenusData = flatTree(menusData.value);
+  resultOptions.value = flatMenusData.filter(
+    menu =>
+      keyword.value &&
+      transformI18n(menu.meta?.title, menu.meta?.i18n)
+        .toLocaleLowerCase()
+        .includes(keyword.value.toLocaleLowerCase().trim())
+  );
+  if (resultOptions.value?.length > 0) {
+    activePath.value = resultOptions.value[0].path;
+  } else {
+    activePath.value = "";
+  }
+}
+
+function handleClose() {
+  show.value = false;
+  /** 延时处理防止用户看到某些操作 */
+  setTimeout(() => {
+    resultOptions.value = [];
+    keyword.value = "";
+  }, 200);
+}
+
+/** key up */
+function handleUp() {
+  const { length } = resultOptions.value;
+  if (length === 0) return;
+  const index = resultOptions.value.findIndex(
+    item => item.path === activePath.value
+  );
+  if (index === 0) {
+    activePath.value = resultOptions.value[length - 1].path;
+  } else {
+    activePath.value = resultOptions.value[index - 1].path;
+  }
+}
+
+/** key down */
+function handleDown() {
+  const { length } = resultOptions.value;
+  if (length === 0) return;
+  const index = resultOptions.value.findIndex(
+    item => item.path === activePath.value
+  );
+  if (index + 1 === length) {
+    activePath.value = resultOptions.value[0].path;
+  } else {
+    activePath.value = resultOptions.value[index + 1].path;
+  }
+}
+
+/** key enter */
+function handleEnter() {
+  const { length } = resultOptions.value;
+  if (length === 0 || activePath.value === "") return;
+  router.push(activePath.value);
+  handleClose();
+}
+
+onKeyStroke("Enter", handleEnter);
+onKeyStroke("ArrowUp", handleUp);
+onKeyStroke("ArrowDown", handleDown);
+</script>
+
+<template>
+  <el-dialog top="5vh" v-model="show" :before-close="handleClose">
+    <el-input
+      ref="inputRef"
+      v-model="keyword"
+      clearable
+      placeholder="请输入关键词搜索"
+      @input="handleSearch"
+    >
+      <template #prefix>
+        <span class="el-input__icon">
+          <IconifyIconOffline icon="search" />
+        </span>
+      </template>
+    </el-input>
+    <div class="search-result-container">
+      <el-empty v-if="resultOptions.length === 0" description="暂无搜索结果" />
+      <SearchResult
+        v-else
+        v-model:value="activePath"
+        :options="resultOptions"
+        @click="handleEnter"
+      />
+    </div>
+    <template #footer>
+      <SearchFooter />
+    </template>
+  </el-dialog>
+</template>
+<style lang="scss" scoped>
+.search-result-container {
+  margin-top: 20px;
+}
+</style>

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

@@ -0,0 +1,91 @@
+<template>
+  <div class="result">
+    <template v-for="item in options" :key="item.path">
+      <div
+        class="result-item"
+        :style="{
+          background:
+            item?.path === active ? useEpThemeStoreHook().epThemeColor : '',
+          color: item.path === active ? '#fff' : ''
+        }"
+        @click="handleTo"
+        @mouseenter="handleMouse(item)"
+      >
+        <component :is="useRenderIcon(item.meta?.icon ?? 'bookmark-2-line')" />
+        <span class="result-item-title">{{ t(item.meta?.title) }}</span>
+        <enterOutlined />
+      </div>
+    </template>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { computed } from "vue";
+import { useI18n } from "vue-i18n";
+import { useEpThemeStoreHook } from "/@/store/modules/epTheme";
+import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
+import enterOutlined from "/@/assets/svg/enter_outlined.svg?component";
+
+const { t } = useI18n();
+
+interface optionsItem {
+  path: string;
+  meta?: {
+    icon?: string;
+    title?: string;
+  };
+}
+
+interface Props {
+  value: string;
+  options: Array<optionsItem>;
+}
+
+interface Emits {
+  (e: "update:value", val: string): void;
+  (e: "enter"): void;
+}
+
+const props = withDefaults(defineProps<Props>(), {});
+const emit = defineEmits<Emits>();
+
+const active = computed({
+  get() {
+    return props.value;
+  },
+  set(val: string) {
+    emit("update:value", val);
+  }
+});
+
+/** 鼠标移入 */
+async function handleMouse(item) {
+  active.value = item.path;
+}
+
+function handleTo() {
+  emit("enter");
+}
+</script>
+<style lang="scss" scoped>
+.result {
+  padding-bottom: 12px;
+
+  &-item {
+    display: flex;
+    align-items: center;
+    height: 56px;
+    margin-top: 8px;
+    padding: 14px;
+    border-radius: 4px;
+    background: #e5e7eb;
+    cursor: pointer;
+
+    &-title {
+      display: flex;
+      flex: 1;
+      margin-left: 5px;
+    }
+  }
+}
+</style>