release: update 3.3.0

* feat: 用户登录使用mock api, 可以使用test用户登录

* Update permission.ts

.env.staging

@@ -0,0 +1,14 @@
+# 预发布也需要生产环境的行为
+# https://cn.vitejs.dev/guide/env-and-mode.html#modes
+NODE_ENV=production
+
+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",
       {

.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

.prettierrc.js

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

.vscode/extensions.json

@@ -1,7 +1,5 @@
 {
   "recommendations": [
-    "johnsoncodehk.vscode-typescript-vue-plugin",
-    "voorjaar.windicss-intellisense",
     "vscode-icons-team.vscode-icons",
     "davidanson.vscode-markdownlint",
     "stylelint.vscode-stylelint",
@@ -11,6 +9,7 @@
     "lokalise.i18n-ally",
     "mikestead.dotenv",
     "eamodio.gitlens",
-    "antfu.iconify"
+    "antfu.iconify",
+    "antfu.unocss"
   ]
 }

.vscode/settings.json

@@ -1,13 +1,9 @@
 {
   "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",
@@ -30,14 +26,12 @@
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true
   },
-  "typescript.tsdk": "node_modules/typescript/lib",
+  "i18n-ally.localesPaths": "locales",
-  "i18n-ally.localesPaths": ["src/plugins/i18n"],
   "i18n-ally.keystyle": "nested",
   "i18n-ally.sortKeys": true,
   "i18n-ally.namespace": true,
-  "i18n-ally.pathMatcher": "{locale}/{namespaces}.{ext}",
+  "i18n-ally.enabledParsers": ["yaml", "js"],
-  "i18n-ally.enabledParsers": ["ts"],
   "i18n-ally.sourceLanguage": "en",
   "i18n-ally.displayLanguage": "zh-CN",
-  "i18n-ally.enabledFrameworks": ["vue", "react"]
+  "i18n-ally.enabledFrameworks": ["vue"]
 }

CHANGELOG.en_US.md

@@ -1,3 +1,85 @@
+# 3.3.0 (2022-5-11)
+
+### 🎫 Feat
+
+- Add user management page demo
+- Add role management page demo
+- Add department management page demo
+- Add card list page demo
+- Integrated form designer
+- Added `PPT` demo
+- Added anti-shake interception demo in the function menu
+- Upgrade `wangeditorV5` (and support internationalization and custom themes)
+- Integrate `tauri` version
+- Added barcode function
+- Added QR code function
+- Use the `Cascader` cascade selector in `element-plus` to write a three-level and two-level linkage demo of Chinese provinces and cities
+- Integrate `Swiper` plugin
+- Routing supports passing `component`, representing the component path
+- Added pre-release packaging mode
+- Add [hooks] to close a tag (https://github.com/xiaoxian521/vue-pure-admin/commit/5e8723a031923e79f507e5a17151d3bd88a51523)
+
+### ✔️ refactor
+
+- Refactored the landing page to be more inclined to the actual business scenario
+- Use `unocss` instead of `windicss`, `unocss` has better performance in development environment, no memory leaks, and `api` is compatible with `windicss`
+
+### 🍏 Perf
+
+- Optimized the style of the `split-pane` component for the platform
+- Optimize internationalization, no longer pass the `i18n` field in the route, the platform automatically reads the files in the `locales` folder of the root directory for internationalization matching
+- Optimized icon selector
+- Optimize `layout` to display user information [commit](https://github.com/xiaoxian521/vue-pure-admin/commit/56f9dc85e7fbe0637605c43577c794de9f8968aa)
+
+### 🐞 Bug fixes
+
+- Fix route initialization problem (Cannot access 'constantRoutes' before initialization)
+
+# 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

CHANGELOG.md

@@ -1,3 +1,85 @@
+# 3.3.0 (2022-5-11)
+
+### 🎫 Feat
+
+- Add user management page demo
+- Add role management page demo
+- Add department management page demo
+- Add card list page demo
+- Integrated form designer
+- Added `PPT` demo
+- Added anti-shake interception demo in the function menu
+- Upgrade `wangeditorV5` (and support internationalization and custom themes)
+- Integrate `tauri` version
+- Added barcode function
+- Added QR code function
+- Use the `Cascader` cascade selector in `element-plus` to write a three-level and two-level linkage demo of Chinese provinces and cities
+- Integrate `Swiper` plugin
+- Routing supports passing `component`, representing the component path
+- Added pre-release packaging mode
+- Add [hooks] to close a tag (https://github.com/xiaoxian521/vue-pure-admin/commit/5e8723a031923e79f507e5a17151d3bd88a51523)
+
+### ✔️ refactor
+
+- Refactored the landing page to be more inclined to the actual business scenario
+- Use `unocss` instead of `windicss`, `unocss` has better performance in development environment, no memory leaks, and `api` is compatible with `windicss`
+
+### 🍏 Perf
+
+- Optimized the style of the `split-pane` component for the platform
+- Optimize internationalization, no longer pass the `i18n` field in the route, the platform automatically reads the files in the `locales` folder of the root directory for internationalization matching
+- Optimized icon selector
+- Optimize `layout` to display user information [commit](https://github.com/xiaoxian521/vue-pure-admin/commit/56f9dc85e7fbe0637605c43577c794de9f8968aa)
+
+### 🐞 Bug fixes
+
+- Fix route initialization problem (Cannot access 'constantRoutes' before initialization)
+
+# 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

CHANGELOG.zh_CN.md

@@ -1,3 +1,85 @@
+# 3.3.0 (2022-5-11)
+
+### 🎫 Feat
+
+- 添加用户管理页面 demo
+- 添加角色管理页面 demo
+- 添加部门管理页面 demo
+- 添加卡片列表页面 demo
+- 集成表单设计器
+- 新增`PPT`demo
+- 在功能菜单中新增防抖截流 demo
+- 升级`wangeditorV5`（并支持国际化和自定义主题）
+- 集成`tauri`版本
+- 新增条形码功能
+- 新增二维码功能
+- 使用`element-plus`中的`Cascader`级联选择器编写中国省市区三级、二级联动 demo
+- 集成`Swiper`插件
+- 路由支持传`component`，代表组件路径
+- 添加预发布打包模式
+- 添加关闭某个标签的[hooks](https://github.com/xiaoxian521/vue-pure-admin/commit/5e8723a031923e79f507e5a17151d3bd88a51523)
+
+### ✔️ refactor
+
+- 重构登陆页，更偏向实际业务场景
+- 使用`unocss`替换`windicss`，`unocss`开发环境下性能更好，没有内存泄露，而且`api`使用上兼容`windicss`
+
+### 🍏 Perf
+
+- 优化平台的`split-pane`组件样式
+- 优化国际化，路由不再传`i18n`字段，平台自动读取根目录`locales`文件夹下文件进行国际化匹配
+- 优化图标选择器
+- 优化`layout`显示用户信息[commit](https://github.com/xiaoxian521/vue-pure-admin/commit/56f9dc85e7fbe0637605c43577c794de9f8968aa)
+
+### 🐞 Bug fixes
+
+- 修复路由初始化问题（Cannot access 'constantRoutes' before initialization）
+
+# 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

README.en-US.md

@@ -23,9 +23,13 @@ vue-pure-admin is a free and open source middle and back-end template. Using the
 
 - [Click Watch Thin](https://github.com/xiaoxian521/pure-admin-thin)
 
+## Tauri
+
+- [Click Watch Tauri](https://github.com/xiaoxian521/tauri-pure-admin)
+
 ## Preview
 
-- [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://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/b4857fc7eb7d4c0f8deeefc644c1f7dd~tplv-k3u1fbpfcp-watermark.awebp?">
@@ -46,7 +50,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
@@ -116,36 +120,30 @@ Support modern browsers, not IE
 
 ## Maintainer
 
-[xiaoxian521](https://github.com/xiaoxian521)
+[xiaoxian521](https://github.com/xiaoxian521)、[Ten-K](https://github.com/Ten-K)
 
 ## 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.jpg" width="150px" height="150px" />
+<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" />
-
-## WeChat Exchange Group
-
-For the better development of the project, you can choose to donate 10 yuan and add the following WeChat to pull you into the group. After adding, please consciously send a screenshot of the donation
-
-<img src="http://yiming_chang.gitee.io/manages/kf.jpg" width="150px" height="195px" />
 
 ## 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                                                                 |
+|                                                                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/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

@@ -23,9 +23,13 @@ vue-pure-admin 是一个免费开源的中后台模版。使用了最新的`vue3
 
 - [点我查看精简版](https://github.com/xiaoxian521/pure-admin-thin)
 
+## Tauri 版
+
+- [点我查看 Tauri 版](https://github.com/xiaoxian521/tauri-pure-admin)
+
 ## 预览
 
-- [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://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/b4857fc7eb7d4c0f8deeefc644c1f7dd~tplv-k3u1fbpfcp-watermark.awebp?">
@@ -46,7 +50,7 @@ vue-pure-admin 是一个免费开源的中后台模版。使用了最新的`vue3
 ```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
 ```
 
 - 安装依赖
@@ -116,36 +120,36 @@ pnpm build
 
 ## 维护者
 
-[xiaoxian521](https://github.com/xiaoxian521)
+[xiaoxian521](https://github.com/xiaoxian521)、[Ten-K](https://github.com/Ten-K)
 
 ## 捐赠
 
-如果你觉得这个项目对你有帮助，你可以帮作者买一杯咖啡表示支持
+如果你觉得这个项目对您有帮助，可以帮作者买一杯果汁 🍹 表示支持
 
-<img src="http://yiming_chang.gitee.io/manages/pay.jpg" width="150px" height="150px" />
+<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 交流群
 
-为了项目更好的发展，你可选择捐赠 10 元后添加下图微信拉你进群，添加后请自觉发捐赠截图
+群里严禁`黄`、`赌`、`毒`、`vpn`等违法行为！
 
-<img src="http://yiming_chang.gitee.io/manages/kf.jpg" width="150px" height="195px" />
+<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                                                                 |
+|                                                                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/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>

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

@@ -1,100 +1,50 @@
+import { resolve } from "path";
+import Unocss from "unocss/vite";
 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 VueI18n from "@intlify/vite-plugin-vue-i18n";
-import styleImport from "vite-plugin-style-import";
-import ElementPlus from "unplugin-element-plus/vite";
 import { visualizer } from "rollup-plugin-visualizer";
 import removeConsole from "vite-plugin-remove-console";
-import themePreprocessorPlugin from "@zougt/vite-plugin-theme-preprocessor";
+import themePreprocessorPlugin from "@pureadmin/theme";
+import { genScssMultipleScopeVars } from "/@/layout/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(),
+    Unocss(),
     // 线上环境删除console
     removeConsole(),
-    // 修改layout文件夹下的文件时自动重载浏览器 解决 https://github.com/xiaoxian521/vue-pure-admin/issues/170
+    viteBuildInfo(),
-    liveReload(["src/layout/**/*", "src/router/**/*"]),
     // 自定义主题
     themePreprocessorPlugin({
       scss: {
-        multipleScopeVars: [
+        multipleScopeVars: genScssMultipleScopeVars(),
-          {
-            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,
+        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",
@@ -104,7 +54,7 @@ export function getPluginsList(command, VITE_LEGACY) {
           import { setupProdMockServer } from './mockProdServer';
           setupProdMockServer();
         `,
-      logger: true
+      logger: false
     }),
     // 是否为打包后的文件提供传统浏览器兼容性支持
     VITE_LEGACY

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

@@ -14,20 +14,16 @@
   <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;
           overflow: hidden;
-          font-family: "Reggae One", cursive;
         }
 
         .loader,
@@ -53,6 +49,8 @@
           transform: translateZ(0);
           -webkit-animation-delay: -0.16s;
           animation-delay: -0.16s;
+          top: 0;
+          transform: translate(-50%, 0);
         }
 
         .loader:before,
@@ -96,7 +94,7 @@
           }
         }
       </style>
-      <div class="loader">Loading...</div>
+      <div class="loader"></div>
     </div>
     <script type="module" src="/src/main.ts"></script>
   </body>

locales/en.yaml

@@ -0,0 +1,86 @@
+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
+  hsUser: User Manage
+  hsDict: Dict Manage
+  hsRole: Role Manage
+  hsDept: Dept 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
+  hsList: List Page
+  hsListCard: Card List Page
+  hsDebounce: Debounce & Throttle
+  hsFormDesign: Form Design
+  hsBarcode: Barcode
+  hsQrcode: Qrcode
+  hsCascader: Area Cascader
+  hsSwiper: Swiper Plugin
+status:
+  hsLoad: Loading...

locales/zh-CN.yaml

@@ -0,0 +1,86 @@
+buttons:
+  hsLoginOut: 退出系统
+  hsfullscreen: 全屏
+  hsexitfullscreen: 退出全屏
+  hsrefreshRoute: 刷新路由
+  hslogin: 登陆
+  hsadd: 新增
+  hsmark: 标记/取消
+  hssave: 保存
+  hssearch: 搜索
+  hsexpendAll: 全部展开
+  hscollapseAll: 全部折叠
+  hssystemSet: 打开项目配置
+  hsdelete: 删除
+  hsreload: 重新加载
+  hscloseCurrentTab: 关闭当前标签页
+  hscloseLeftTabs: 关闭左侧标签页
+  hscloseRightTabs: 关闭右侧标签页
+  hscloseOtherTabs: 关闭其他标签页
+  hscloseAllTabs: 关闭全部标签页
+menus:
+  hshome: 首页
+  hslogin: 登陆
+  hssysManagement: 系统管理
+  hsUser: 用户管理
+  hsDict: 字典管理
+  hsRole: 角色管理
+  hsDept: 部门管理
+  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树型选择器
+  hsList: 列表页
+  hsListCard: 卡片列表页
+  hsDebounce: 防抖节流
+  hsFormDesign: 表单设计器
+  hsBarcode: 条形码
+  hsQrcode: 二维码
+  hsCascader: 区域级联选择器
+  hsSwiper: Swiper插件
+status:
+  hsLoad: 加载中...

mock/asyncRoutes.ts

@@ -4,29 +4,44 @@ import { MockMethod } from "vite-plugin-mock";
 // http://mockjs.com/examples.html#Object
 const systemRouter = {
   path: "/system",
-  name: "system",
   redirect: "/system/user/index",
   meta: {
     icon: "setting",
     title: "menus.hssysManagement",
-    i18n: true,
+    rank: 11
-    rank: 6
   },
   children: [
     {
       path: "/system/user/index",
       name: "user",
       meta: {
-        title: "menus.hsBaseinfo",
+        icon: "flUser",
-        i18n: true
+        title: "menus.hsUser"
       }
     },
     {
-      path: "/system/dict/index",
+      path: "/system/role/index",
+      name: "role",
+      meta: {
+        icon: "role",
+        title: "menus.hsRole"
+      }
+    },
+    {
+      path: "/system/dept/index",
+      name: "dept",
+      meta: {
+        icon: "dept",
+        title: "menus.hsDept"
+      }
+    },
+    {
+      path: "/system/dict",
+      component: "/system/dict/index",
       name: "dict",
       meta: {
+        icon: "dict",
         title: "menus.hsDict",
-        i18n: true,
         keepAlive: true
       }
     }
@@ -35,21 +50,18 @@ const systemRouter = {
 
 const permissionRouter = {
   path: "/permission",
-  name: "permission",
   redirect: "/permission/page/index",
   meta: {
     title: "menus.permission",
     icon: "lollipop",
-    i18n: true,
+    rank: 7
-    rank: 3
   },
   children: [
     {
       path: "/permission/page/index",
       name: "permissionPage",
       meta: {
-        title: "menus.permissionPage",
+        title: "menus.permissionPage"
-        i18n: true
       }
     },
     {
@@ -57,30 +69,61 @@ const permissionRouter = {
       name: "permissionButton",
       meta: {
         title: "menus.permissionButton",
-        i18n: true,
         authority: []
       }
     }
   ]
 };
 
+const frameRouter = {
+  path: "/iframe",
+  redirect: "/iframe/pure",
+  meta: {
+    icon: "monitor",
+    title: "menus.hsExternalPage",
+    rank: 10
+  },
+  children: [
+    {
+      path: "/iframe/pure",
+      name: "reFramePure",
+      meta: {
+        title: "menus.hsPureDocument",
+        frameSrc: "https://pure-admin-doc.vercel.app"
+      }
+    },
+    {
+      path: "/external",
+      name: "https://pure-admin-doc.vercel.app",
+      meta: {
+        title: "menus.externalLink"
+      }
+    },
+    {
+      path: "/iframe/ep",
+      name: "reFrameEp",
+      meta: {
+        title: "menus.hsEpDocument",
+        frameSrc: "https://element-plus.org/zh-CN/"
+      }
+    }
+  ]
+};
+
 const tabsRouter = {
   path: "/tabs",
-  name: "reTabs",
   redirect: "/tabs/index",
   meta: {
     icon: "IF-team-icontabs",
     title: "menus.hstabs",
-    i18n: true,
+    rank: 13
-    rank: 8
   },
   children: [
     {
       path: "/tabs/index",
       name: "reTabs",
       meta: {
-        title: "menus.hstabs",
+        title: "menus.hstabs"
-        i18n: true
       }
     },
     {
@@ -89,7 +132,6 @@ const tabsRouter = {
       meta: {
         title: "",
         showLink: false,
-        i18n: false,
         dynamicLevel: 3,
         refreshRedirect: "/tabs/index"
       }
@@ -113,6 +155,7 @@ export default [
           code: 0,
           info: [
             tabsRouter,
+            frameRouter,
             systemRouter,
             setDifAuthority("v-admin", permissionRouter)
           ]

mock/echarts.ts

@@ -1,23 +0,0 @@
-import { MockMethod } from "vite-plugin-mock";
-
-// http://mockjs.com/examples.html#Object
-const echartsList = () => {
-  const result = [];
-  for (let index = 0; index < 200; index++) {
-    result.push(["@date", Math.floor(Math.random() * 300)]);
-  }
-  return result;
-};
-
-export default [
-  {
-    url: "/getEchartsInfo",
-    method: "get",
-    response: () => {
-      return {
-        code: 0,
-        info: echartsList()
-      };
-    }
-  }
-] as MockMethod[];

mock/list.ts

@@ -0,0 +1,455 @@
+import { MockMethod } from "vite-plugin-mock";
+
+export default [
+  {
+    url: "/getCardList",
+    method: "post",
+    response: () => {
+      return {
+        code: 0,
+        data: {
+          list: [
+            {
+              index: 1,
+              isSetup: true,
+              type: 4,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/cloud-server.jpg",
+              name: "SSL证书",
+              description:
+                "SSL证书又叫服务器证书，腾讯云为您提供证书的一站式服务，包括免费、付费证书的申请、管理及部"
+            },
+            {
+              index: 2,
+              isSetup: false,
+              type: 4,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/t-sec.jpg",
+              name: "人脸识别",
+              description:
+                "SSL证书又叫服务器证书，腾讯云为您提供证书的一站式服务，包括免费、付费证书的申请、管理及部"
+            },
+            {
+              index: 3,
+              isSetup: false,
+              type: 5,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/ssl.jpg",
+              name: "CVM",
+              description:
+                "云硬盘为您提供用于CVM的持久性数据块级存储服务。云硬盘中的数据自动地可用区内以多副本冗"
+            },
+            {
+              index: 4,
+              isSetup: false,
+              type: 2,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/ssl.jpg",
+              name: "SSL证书",
+              description:
+                "云数据库MySQL为用户提供安全可靠，性能卓越、易于维护的企业级云数据库服务。"
+            },
+            {
+              index: 5,
+              isSetup: true,
+              type: 3,
+              banner:
+                "https://tdesign.gtimg.com/tdesign-pro/face-recognition.jpg",
+              name: "SSL证书",
+              description:
+                "云数据库MySQL为用户提供安全可靠，性能卓越、易于维护的企业级云数据库服务。"
+            },
+            {
+              index: 6,
+              isSetup: true,
+              type: 3,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/ssl.jpg",
+              name: "T-Sec 云防火墙",
+              description:
+                "腾讯安全云防火墙产品，是腾讯云安全团队结合云原生的优势，自主研发的SaaS化防火墙产品，无需客无需客无需客无需客无需客无需客无需客"
+            },
+            {
+              index: 7,
+              isSetup: false,
+              type: 1,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/t-sec.jpg",
+              name: "CVM",
+              description:
+                "腾讯安全云防火墙产品，是腾讯云安全团队结合云原生的优势，自主研发的SaaS化防火墙产品，无需客无需客无需客无需客无需客无需客无需客"
+            },
+            {
+              index: 8,
+              isSetup: true,
+              type: 3,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/t-sec.jpg",
+              name: "SSL证书",
+              description:
+                "云硬盘为您提供用于CVM的持久性数据块级存储服务。云硬盘中的数据自动地可用区内以多副本冗"
+            },
+            {
+              index: 9,
+              isSetup: false,
+              type: 1,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/cloud-server.jpg",
+              name: "SSL证书",
+              description:
+                "腾讯安全云防火墙产品，是腾讯云安全团队结合云原生的优势，自主研发的SaaS化防火墙产品，无需客无需客无需客无需客无需客无需客无需客"
+            },
+            {
+              index: 10,
+              isSetup: true,
+              type: 4,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/ssl.jpg",
+              name: "CVM",
+              description:
+                "云数据库MySQL为用户提供安全可靠，性能卓越、易于维护的企业级云数据库服务。"
+            },
+            {
+              index: 11,
+              isSetup: true,
+              type: 5,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/t-sec.jpg",
+              name: "云数据库",
+              description:
+                "SSL证书又叫服务器证书，腾讯云为您提供证书的一站式服务，包括免费、付费证书的申请、管理及部"
+            },
+            {
+              index: 12,
+              isSetup: true,
+              type: 2,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/t-sec.jpg",
+              name: "SSL证书",
+              description:
+                "SSL证书又叫服务器证书，腾讯云为您提供证书的一站式服务，包括免费、付费证书的申请、管理及部"
+            },
+            {
+              index: 13,
+              isSetup: true,
+              type: 3,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/cloud-db.jpg",
+              name: "云数据库",
+              description:
+                "腾讯安全云防火墙产品，是腾讯云安全团队结合云原生的优势，自主研发的SaaS化防火墙产品，无需客无需客无需客无需客无需客无需客无需客"
+            },
+            {
+              index: 14,
+              isSetup: false,
+              type: 5,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/t-sec.jpg",
+              name: "SSL证书",
+              description:
+                "基于腾讯优图强大的面部分析技术，提供包括人脸检测与分析、五官定位、人脸搜索、人脸比对、人脸"
+            },
+            {
+              index: 15,
+              isSetup: true,
+              type: 2,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/t-sec.jpg",
+              name: "云数据库",
+              description:
+                "SSL证书又叫服务器证书，腾讯云为您提供证书的一站式服务，包括免费、付费证书的申请、管理及部"
+            },
+            {
+              index: 16,
+              isSetup: false,
+              type: 3,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/cloud-server.jpg",
+              name: "CVM",
+              description:
+                "基于腾讯优图强大的面部分析技术，提供包括人脸检测与分析、五官定位、人脸搜索、人脸比对、人脸"
+            },
+            {
+              index: 17,
+              isSetup: false,
+              type: 5,
+              banner:
+                "https://tdesign.gtimg.com/tdesign-pro/face-recognition.jpg",
+              name: "云数据库",
+              description:
+                "SSL证书又叫服务器证书，腾讯云为您提供证书的一站式服务，包括免费、付费证书的申请、管理及部"
+            },
+            {
+              index: 18,
+              isSetup: false,
+              type: 4,
+              banner:
+                "https://tdesign.gtimg.com/tdesign-pro/face-recognition.jpg",
+              name: "云数据库",
+              description:
+                "腾讯安全云防火墙产品，是腾讯云安全团队结合云原生的优势，自主研发的SaaS化防火墙产品，无需客无需客无需客无需客无需客无需客无需客"
+            },
+            {
+              index: 19,
+              isSetup: true,
+              type: 2,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/ssl.jpg",
+              name: "CVM",
+              description:
+                "SSL证书又叫服务器证书，腾讯云为您提供证书的一站式服务，包括免费、付费证书的申请、管理及部"
+            },
+            {
+              index: 20,
+              isSetup: true,
+              type: 4,
+              banner:
+                "https://tdesign.gtimg.com/tdesign-pro/face-recognition.jpg",
+              name: "SSL证书",
+              description:
+                "SSL证书又叫服务器证书，腾讯云为您提供证书的一站式服务，包括免费、付费证书的申请、管理及部"
+            },
+            {
+              index: 21,
+              isSetup: false,
+              type: 4,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/t-sec.jpg",
+              name: "云数据库",
+              description:
+                "云硬盘为您提供用于CVM的持久性数据块级存储服务。云硬盘中的数据自动地可用区内以多副本冗"
+            },
+            {
+              index: 22,
+              isSetup: false,
+              type: 3,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/cloud-db.jpg",
+              name: "CVM",
+              description:
+                "SSL证书又叫服务器证书，腾讯云为您提供证书的一站式服务，包括免费、付费证书的申请、管理及部"
+            },
+            {
+              index: 23,
+              isSetup: true,
+              type: 1,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/ssl.jpg",
+              name: "人脸识别",
+              description:
+                "基于腾讯优图强大的面部分析技术，提供包括人脸检测与分析、五官定位、人脸搜索、人脸比对、人脸"
+            },
+            {
+              index: 24,
+              isSetup: true,
+              type: 4,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/ssl.jpg",
+              name: "人脸识别",
+              description:
+                "基于腾讯优图强大的面部分析技术，提供包括人脸检测与分析、五官定位、人脸搜索、人脸比对、人脸"
+            },
+            {
+              index: 25,
+              isSetup: false,
+              type: 5,
+              banner:
+                "https://tdesign.gtimg.com/tdesign-pro/face-recognition.jpg",
+              name: "CVM",
+              description:
+                "云硬盘为您提供用于CVM的持久性数据块级存储服务。云硬盘中的数据自动地可用区内以多副本冗"
+            },
+            {
+              index: 26,
+              isSetup: true,
+              type: 4,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/cloud-server.jpg",
+              name: "SSL证书",
+              description:
+                "云硬盘为您提供用于CVM的持久性数据块级存储服务。云硬盘中的数据自动地可用区内以多副本冗"
+            },
+            {
+              index: 27,
+              isSetup: true,
+              type: 5,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/ssl.jpg",
+              name: "CVM",
+              description:
+                "SSL证书又叫服务器证书，腾讯云为您提供证书的一站式服务，包括免费、付费证书的申请、管理及部"
+            },
+            {
+              index: 28,
+              isSetup: false,
+              type: 4,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/ssl.jpg",
+              name: "云数据库",
+              description:
+                "基于腾讯优图强大的面部分析技术，提供包括人脸检测与分析、五官定位、人脸搜索、人脸比对、人脸"
+            },
+            {
+              index: 29,
+              isSetup: false,
+              type: 5,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/cloud-db.jpg",
+              name: "CVM",
+              description:
+                "SSL证书又叫服务器证书，腾讯云为您提供证书的一站式服务，包括免费、付费证书的申请、管理及部"
+            },
+            {
+              index: 30,
+              isSetup: true,
+              type: 1,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/ssl.jpg",
+              name: "CVM",
+              description:
+                "云硬盘为您提供用于CVM的持久性数据块级存储服务。云硬盘中的数据自动地可用区内以多副本冗"
+            },
+            {
+              index: 31,
+              isSetup: true,
+              type: 4,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/cloud-server.jpg",
+              name: "CVM",
+              description:
+                "基于腾讯优图强大的面部分析技术，提供包括人脸检测与分析、五官定位、人脸搜索、人脸比对、人脸"
+            },
+            {
+              index: 32,
+              isSetup: false,
+              type: 3,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/cloud-server.jpg",
+              name: "T-Sec 云防火墙",
+              description:
+                "腾讯安全云防火墙产品，是腾讯云安全团队结合云原生的优势，自主研发的SaaS化防火墙产品，无需客无需客无需客无需客无需客无需客无需客"
+            },
+            {
+              index: 33,
+              isSetup: true,
+              type: 3,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/t-sec.jpg",
+              name: "CVM",
+              description:
+                "云数据库MySQL为用户提供安全可靠，性能卓越、易于维护的企业级云数据库服务。"
+            },
+            {
+              index: 34,
+              isSetup: false,
+              type: 2,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/ssl.jpg",
+              name: "SSL证书",
+              description:
+                "腾讯安全云防火墙产品，是腾讯云安全团队结合云原生的优势，自主研发的SaaS化防火墙产品，无需客无需客无需客无需客无需客无需客无需客"
+            },
+            {
+              index: 35,
+              isSetup: false,
+              type: 1,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/cloud-server.jpg",
+              name: "云数据库",
+              description:
+                "基于腾讯优图强大的面部分析技术，提供包括人脸检测与分析、五官定位、人脸搜索、人脸比对、人脸"
+            },
+            {
+              index: 36,
+              isSetup: false,
+              type: 4,
+              banner:
+                "https://tdesign.gtimg.com/tdesign-pro/face-recognition.jpg",
+              name: "SSL证书",
+              description:
+                "腾讯安全云防火墙产品，是腾讯云安全团队结合云原生的优势，自主研发的SaaS化防火墙产品，无需客无需客无需客无需客无需客无需客无需客"
+            },
+            {
+              index: 37,
+              isSetup: true,
+              type: 5,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/cloud-server.jpg",
+              name: "CVM",
+              description:
+                "云数据库MySQL为用户提供安全可靠，性能卓越、易于维护的企业级云数据库服务。"
+            },
+            {
+              index: 38,
+              isSetup: false,
+              type: 4,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/ssl.jpg",
+              name: "云数据库",
+              description:
+                "云硬盘为您提供用于CVM的持久性数据块级存储服务。云硬盘中的数据自动地可用区内以多副本冗"
+            },
+            {
+              index: 39,
+              isSetup: false,
+              type: 3,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/t-sec.jpg",
+              name: "人脸识别",
+              description:
+                "云硬盘为您提供用于CVM的持久性数据块级存储服务。云硬盘中的数据自动地可用区内以多副本冗"
+            },
+            {
+              index: 40,
+              isSetup: true,
+              type: 4,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/ssl.jpg",
+              name: "CVM",
+              description:
+                "SSL证书又叫服务器证书，腾讯云为您提供证书的一站式服务，包括免费、付费证书的申请、管理及部"
+            },
+            {
+              index: 41,
+              isSetup: true,
+              type: 4,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/ssl.jpg",
+              name: "T-Sec 云防火墙",
+              description:
+                "云硬盘为您提供用于CVM的持久性数据块级存储服务。云硬盘中的数据自动地可用区内以多副本冗"
+            },
+            {
+              index: 42,
+              isSetup: true,
+              type: 3,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/cloud-server.jpg",
+              name: "T-Sec 云防火墙",
+              description:
+                "云硬盘为您提供用于CVM的持久性数据块级存储服务。云硬盘中的数据自动地可用区内以多副本冗"
+            },
+            {
+              index: 43,
+              isSetup: false,
+              type: 3,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/cloud-db.jpg",
+              name: "SSL证书",
+              description:
+                "云硬盘为您提供用于CVM的持久性数据块级存储服务。云硬盘中的数据自动地可用区内以多副本冗"
+            },
+            {
+              index: 44,
+              isSetup: true,
+              type: 4,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/t-sec.jpg",
+              name: "SSL证书",
+              description:
+                "云硬盘为您提供用于CVM的持久性数据块级存储服务。云硬盘中的数据自动地可用区内以多副本冗"
+            },
+            {
+              index: 45,
+              isSetup: false,
+              type: 3,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/ssl.jpg",
+              name: "T-Sec 云防火墙",
+              description:
+                "SSL证书又叫服务器证书，腾讯云为您提供证书的一站式服务，包括免费、付费证书的申请、管理及部"
+            },
+            {
+              index: 46,
+              isSetup: true,
+              type: 2,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/cloud-server.jpg",
+              name: "SSL证书",
+              description:
+                "SSL证书又叫服务器证书，腾讯云为您提供证书的一站式服务，包括免费、付费证书的申请、管理及部"
+            },
+            {
+              index: 47,
+              isSetup: false,
+              type: 4,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/cloud-server.jpg",
+              name: "SSL证书",
+              description:
+                "腾讯安全云防火墙产品，是腾讯云安全团队结合云原生的优势，自主研发的SaaS化防火墙产品，无需客无需客无需客无需客无需客无需客无需客"
+            },
+            {
+              index: 48,
+              isSetup: false,
+              type: 3,
+              banner: "https://tdesign.gtimg.com/tdesign-pro/ssl.jpg",
+              name: "T-Sec 云防火墙",
+              description:
+                "SSL证书又叫服务器证书，腾讯云为您提供证书的一站式服务，包括免费、付费证书的申请、管理及部"
+            }
+          ]
+        }
+      };
+    }
+  }
+] as MockMethod[];

mock/system.ts

@@ -0,0 +1,288 @@
+import { MockMethod } from "vite-plugin-mock";
+
+export default [
+  {
+    url: "/role",
+    method: "post",
+    response: () => {
+      return {
+        code: 0,
+        data: {
+          list: [
+            {
+              createTime: 1609837428000,
+              updateTime: 1645477701000,
+              creator: "admin",
+              updater: "",
+              deleted: false,
+              tenantId: 1,
+              id: 1,
+              name: "超级管理员",
+              code: "super_admin",
+              sort: 1,
+              status: 0,
+              type: 1,
+              remark: "超级管理员",
+              dataScope: 1,
+              dataScopeDeptIds: null
+            },
+            {
+              createTime: 1609837428000,
+              updateTime: 1645477700000,
+              creator: "admin",
+              updater: "",
+              deleted: false,
+              tenantId: 1,
+              id: 2,
+              name: "普通角色",
+              code: "common",
+              sort: 2,
+              status: 0,
+              type: 1,
+              remark: "普通角色",
+              dataScope: 2,
+              dataScopeDeptIds: null
+            },
+            {
+              createTime: 1609912175000,
+              updateTime: 1647698441000,
+              creator: "",
+              updater: "1",
+              deleted: false,
+              tenantId: 1,
+              id: 101,
+              name: "测试账号",
+              code: "test",
+              sort: 0,
+              status: 0,
+              type: 2,
+              remark: "132",
+              dataScope: 1,
+              dataScopeDeptIds: []
+            }
+          ],
+          total: 3
+        }
+      };
+    }
+  },
+  {
+    url: "/dept",
+    method: "post",
+    response: () => {
+      return {
+        code: 0,
+        data: [
+          {
+            name: "杭州总公司",
+            type: 1, // 1 公司 2 分公司 3 部门
+            parentId: 0,
+            sort: 0,
+            leaderUserId: 1,
+            phone: "15888888888",
+            email: "ry@qq.com",
+            status: 0,
+            id: 100,
+            createTime: 1609837427000,
+            remark: "备注、备注、备注、备注、备注、备注、备注"
+          },
+          {
+            name: "郑州分公司",
+            type: 2,
+            parentId: 100,
+            sort: 1,
+            leaderUserId: 104,
+            phone: "15888888888",
+            email: "ry@qq.com",
+            status: 0,
+            id: 101,
+            createTime: 1609837427000,
+            remark: "备注、备注、备注、备注、备注、备注、备注"
+          },
+          {
+            name: "研发部门",
+            type: 3,
+            parentId: 101,
+            sort: 1,
+            leaderUserId: 104,
+            phone: "15888888888",
+            email: "ry@qq.com",
+            status: 0,
+            id: 103,
+            createTime: 1609837427000,
+            remark: "备注、备注、备注、备注、备注、备注、备注"
+          },
+          {
+            name: "市场部门",
+            type: 3,
+            parentId: 102,
+            sort: 1,
+            leaderUserId: null,
+            phone: "15888888888",
+            email: "ry@qq.com",
+            status: 0,
+            id: 108,
+            createTime: 1609837427000,
+            remark: "备注、备注、备注、备注、备注、备注、备注"
+          },
+          {
+            name: "深圳分公司",
+            type: 2,
+            parentId: 100,
+            sort: 2,
+            leaderUserId: null,
+            phone: "15888888888",
+            email: "ry@qq.com",
+            status: 0,
+            id: 102,
+            createTime: 1609837427000,
+            remark: "备注、备注、备注、备注、备注、备注、备注"
+          },
+          {
+            name: "市场部门",
+            type: 3,
+            parentId: 101,
+            sort: 2,
+            leaderUserId: null,
+            phone: "15888888888",
+            email: "ry@qq.com",
+            status: 1,
+            id: 104,
+            createTime: 1609837427000,
+            remark: "备注、备注、备注、备注、备注、备注、备注"
+          },
+          {
+            name: "财务部门",
+            type: 3,
+            parentId: 102,
+            sort: 2,
+            leaderUserId: null,
+            phone: "15888888888",
+            email: "ry@qq.com",
+            status: 0,
+            id: 109,
+            createTime: 1609837427000,
+            remark: "备注、备注、备注、备注、备注、备注、备注"
+          },
+          {
+            name: "测试部门",
+            type: 3,
+            parentId: 101,
+            sort: 3,
+            leaderUserId: null,
+            phone: "15888888888",
+            email: "ry@qq.com",
+            status: 0,
+            id: 105,
+            createTime: 1609837427000,
+            remark: "备注、备注、备注、备注、备注、备注、备注"
+          },
+          {
+            name: "财务部门",
+            type: 3,
+            parentId: 101,
+            sort: 4,
+            leaderUserId: 103,
+            phone: "15888888888",
+            email: "ry@qq.com",
+            status: 1,
+            id: 106,
+            createTime: 1609837427000,
+            remark: "备注、备注、备注、备注、备注、备注、备注"
+          },
+          {
+            name: "运维部门",
+            type: 3,
+            parentId: 101,
+            sort: 5,
+            leaderUserId: null,
+            phone: "15888888888",
+            email: "ry@qq.com",
+            status: 0,
+            id: 107,
+            createTime: 1609837427000,
+            remark: "备注、备注、备注、备注、备注、备注、备注"
+          }
+        ]
+      };
+    }
+  },
+  {
+    url: "/user",
+    method: "post",
+    response: () => {
+      return {
+        code: 0,
+        data: {
+          list: [
+            {
+              username: "admin",
+              nickname: "admin",
+              remark: "管理员",
+              deptId: 103,
+              postIds: [1],
+              mobile: "15888888888",
+              sex: 0,
+              id: 1,
+              status: 0,
+              createTime: 1609837427000,
+              dept: {
+                id: 103,
+                name: "研发部门"
+              }
+            },
+            {
+              username: "pure",
+              nickname: "pure",
+              remark: "不要吓我",
+              deptId: 104,
+              postIds: [1],
+              mobile: "15888888888",
+              sex: 0,
+              id: 100,
+              status: 1,
+              createTime: 1609981637000,
+              dept: {
+                id: 104,
+                name: "市场部门"
+              }
+            },
+            {
+              username: "小姐姐",
+              nickname: "girl",
+              remark: null,
+              deptId: 106,
+              postIds: null,
+              mobile: "15888888888",
+              sex: 1,
+              id: 103,
+              status: 1,
+              createTime: 1610553035000,
+              dept: {
+                id: 106,
+                name: "财务部门"
+              }
+            },
+            {
+              username: "小哥哥",
+              nickname: "boy",
+              remark: null,
+              deptId: 107,
+              postIds: [],
+              mobile: "15888888888",
+              sex: 0,
+              id: 104,
+              status: 0,
+              createTime: 1611166433000,
+              dept: {
+                id: 107,
+                name: "运维部门"
+              }
+            }
+          ],
+          total: 4
+        }
+      };
+    }
+  }
+] as MockMethod[];

package.json

@@ -1,16 +1,14 @@
 {
   "name": "vue-pure-admin",
-  "version": "2.9.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",
+    "build:staging": "rimraf dist && cross-env vite build --mode staging",
     "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",
@@ -30,96 +28,115 @@
   ],
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
-    "@ctrl/tinycolor": "^3.4.0",
+    "@ctrl/tinycolor": "^3.4.1",
-    "@logicflow/core": "0.7.1",
+    "@logicflow/core": "^1.1.15",
-    "@logicflow/extension": "0.7.1",
+    "@logicflow/extension": "^1.1.15",
-    "@vueuse/core": "^7.5.5",
+    "@pureadmin/components": "^1.0.6",
-    "@vueuse/motion": "^2.0.0-beta.9",
+    "@vueuse/core": "^8.4.2",
-    "@vueuse/shared": "^7.5.5",
+    "@vueuse/motion": "^2.0.0-beta.12",
+    "@vueuse/shared": "^8.4.2",
+    "@wangeditor/editor": "^5.0.1",
+    "@wangeditor/editor-for-vue": "^5.1.10",
     "animate.css": "^4.1.1",
-    "axios": "^0.25.0",
+    "axios": "^0.27.1",
-    "cropperjs": "^1.5.11",
+    "china-area-data": "^5.0.1",
+    "cropperjs": "^1.5.12",
     "css-color-function": "^1.3.3",
-    "dayjs": "^1.10.7",
+    "dayjs": "^1.11.2",
     "driver.js": "^0.9.8",
-    "echarts": "^5.2.1",
+    "echarts": "^5.3.2",
-    "element-plus": "1.3.0-beta.1",
+    "element-plus": "2.1.11",
     "element-resize-detector": "^1.2.3",
     "js-cookie": "^3.0.1",
+    "jsbarcode": "^3.11.5",
+    "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
+    "lodash-unified": "^1.0.2",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
     "path": "^0.12.7",
-    "pinia": "^2.0.11",
+    "pinia": "^2.0.14",
+    "qrcode": "^1.5.0",
     "qs": "^6.10.1",
     "resize-observer-polyfill": "^1.5.1",
     "responsive-storage": "^1.0.11",
     "rgb-hex": "^4.0.0",
+    "swiper": "^8.1.4",
     "v-contextmenu": "3.0.0",
-    "vue": "^3.2.29",
+    "vue": "^3.2.33",
-    "vue-i18n": "^9.2.0-beta.30",
+    "vue-form-create2": "^1.2.8",
+    "vue-i18n": "^9.2.0-beta.35",
     "vue-json-pretty": "^2.0.2",
-    "vue-router": "^4.0.12",
+    "vue-router": "^4.0.15",
     "vue-types": "^4.1.1",
     "vuedraggable": "4.1.0",
-    "vxe-table": "^4.1.18",
+    "vxe-table": "^4.2.3",
-    "wangeditor": "^4.7.9",
+    "xe-utils": "^3.5.4",
-    "xe-utils": "^3.5.2",
+    "xgplayer": "^2.31.6"
-    "xgplayer": "2.28.0"
   },
   "devDependencies": {
     "@commitlint/cli": "13.1.0",
     "@commitlint/config-conventional": "13.1.0",
-    "@iconify-icons/ep": "^1.1.3",
+    "@iconify-icons/carbon": "^1.2.4",
-    "@iconify-icons/fa": "^1.1.1",
+    "@iconify-icons/ep": "^1.2.4",
-    "@iconify-icons/fa-solid": "^1.1.2",
+    "@iconify-icons/fa": "^1.2.2",
-    "@iconify-icons/ri": "^1.1.1",
+    "@iconify-icons/fa-solid": "^1.2.2",
-    "@iconify/vue": "^3.1.3",
+    "@iconify-icons/fluent": "^1.2.5",
+    "@iconify-icons/mdi": "^1.2.8",
+    "@iconify-icons/ri": "^1.2.1",
+    "@iconify-icons/uil": "^1.2.1",
+    "@iconify/vue": "^3.2.1",
+    "@intlify/vite-plugin-vue-i18n": "^3.4.0",
+    "@pureadmin/theme": "^1.1.0",
     "@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",
+    "@types/qrcode": "^1.4.2",
     "@types/qs": "^6.9.7",
-    "@typescript-eslint/eslint-plugin": "4.31.0",
+    "@typescript-eslint/eslint-plugin": "^5.10.2",
-    "@typescript-eslint/parser": "4.31.0",
+    "@typescript-eslint/parser": "^5.10.2",
-    "@vitejs/plugin-legacy": "^1.6.4",
+    "@vitejs/plugin-legacy": "^1.8.2",
-    "@vitejs/plugin-vue": "^2.1.0",
+    "@vitejs/plugin-vue": "^2.3.2",
-    "@vitejs/plugin-vue-jsx": "^1.3.3",
+    "@vitejs/plugin-vue-jsx": "^1.3.10",
-    "@vue/eslint-config-prettier": "6.0.0",
+    "@vue/eslint-config-prettier": "^7.0.0",
-    "@vue/eslint-config-typescript": "7.0.0",
+    "@vue/eslint-config-typescript": "^10.0.0",
-    "@zougt/vite-plugin-theme-preprocessor": "^1.4.4",
+    "autoprefixer": "^10.4.5",
-    "autoprefixer": "^10.4.2",
     "cross-env": "7.0.3",
-    "eslint": "7.30.0",
+    "eslint": "^8.8.0",
-    "eslint-plugin-prettier": "3.4.0",
+    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-vue": "7.17.0",
+    "eslint-plugin-vue": "^8.4.1",
-    "husky": "7.0.2",
+    "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",
-    "rollup-plugin-visualizer": "^5.5.4",
+    "rollup": "^2.70.1",
-    "sass": "^1.49.7",
+    "rollup-plugin-visualizer": "^5.6.0",
-    "sass-loader": "^12.4.0",
+    "sass": "^1.51.0",
-    "stylelint": "13.13.1",
+    "stylelint": "^14.3.0",
-    "stylelint-config-prettier": "8.0.2",
+    "stylelint-config-html": "^1.0.0",
-    "stylelint-config-standard": "22.0.0",
+    "stylelint-config-prettier": "^9.0.3",
-    "stylelint-order": "4.1.0",
+    "stylelint-config-recommended": "^6.0.0",
-    "typescript": "^4.5.5",
+    "stylelint-config-standard": "^24.0.0",
-    "unplugin-element-plus": "^0.2.0",
+    "stylelint-order": "^5.0.0",
-    "vite": "^2.7.13",
+    "typescript": "^4.6.3",
-    "vite-plugin-live-reload": "^2.1.0",
+    "unocss": "^0.33.2",
+    "vite": "^2.9.6",
     "vite-plugin-mock": "^2.9.6",
-    "vite-plugin-remove-console": "^0.0.6",
+    "vite-plugin-remove-console": "^0.0.7",
-    "vite-plugin-style-import": "^1.4.1",
+    "vite-svg-loader": "^3.3.0",
-    "vite-plugin-windicss": "^1.6.1",
+    "vue-eslint-parser": "^8.2.0"
-    "vite-svg-loader": "2.2.0",
-    "vue-eslint-parser": "7.10.0",
-    "windicss": "^3.4.3"
   },
   "repository": "git@github.com:xiaoxian521/vue-pure-admin.git",
   "author": "xiaoxian521",

public/serverConfig.json

@@ -1,5 +1,5 @@
 {
-  "Version": "2.9.0",
+  "Version": "3.2.0",
   "Title": "PureAdmin",
   "FixedHeader": true,
   "HiddenSideBar": false,

src/api/list.ts

@@ -0,0 +1,12 @@
+import { http } from "../utils/http";
+
+interface postType extends Promise<any> {
+  data?: object;
+  code?: number;
+  msg?: string;
+}
+
+// 卡片列表
+export const getCardList = (data?: object): postType => {
+  return http.request("post", "/getCardList", { data });
+};

src/api/mock.ts

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

src/api/system.ts

@@ -0,0 +1,22 @@
+import { http } from "../utils/http";
+
+interface ResponseType extends Promise<any> {
+  data?: object;
+  code?: number;
+  msg?: string;
+}
+
+// 获取用户管理列表
+export const getUserList = (data?: object): ResponseType => {
+  return http.request("post", "/user", { data });
+};
+
+// 获取角色管理列表
+export const getRoleList = (data?: object): ResponseType => {
+  return http.request("post", "/role", { data });
+};
+
+// 获取部门管理列表
+export const getDeptList = (data?: object): ResponseType => {
+  return http.request("post", "/dept", { data });
+};

src/assets/svg/calendar.svg

@@ -0,0 +1 @@
+<svg fill="none" viewBox="0 0 16 16" width="1em" height="1em" class="t-icon t-icon-calendar" data-v-7be81122=""><path fill="currentColor" d="M10 3H6V1.5H5V3H3a1 1 0 00-1 1v9a1 1 0 001 1h10a1 1 0 001-1V4a1 1 0 00-1-1h-2V1.5h-1V3zM5 5h1V4h4v1h1V4h2v2H3V4h2v1zM3 7h10v6H3V7z" fillOpacity="0.9"></path></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/laptop.svg

@@ -0,0 +1 @@
+<svg fill="none" viewBox="0 0 16 16" width="1em" height="1em" class="t-icon t-icon-laptop" data-v-7be81122=""><path fill="currentColor" d="M2.5 12a1 1 0 01-1-1V4a1 1 0 011-1h11a1 1 0 011 1v7a1 1 0 01-1 1h-11zm0-1h11V4h-11v7zM15 13H1v1h14v-1z" fillOpacity="0.9"></path></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/assets/svg/service.svg

@@ -0,0 +1 @@
+<svg fill="none" viewBox="0 0 16 16" width="1em" height="1em" class="t-icon t-icon-service" data-v-7be81122=""><path fill="currentColor" d="M2.52 6.37a5.5 5.5 0 0110.98.13v4c0 .05 0 .1-.02.15A4.5 4.5 0 019 14.7H8v-1h1a3.5 3.5 0 003.4-2.7h-1.9a.5.5 0 01-.5-.5v-4c0-.28.22-.5.5-.5h1.93a4.5 4.5 0 00-8.86 0H5.5c.28 0 .5.22.5.5v4a.5.5 0 01-.5.5H3a.5.5 0 01-.5-.5v-4c0-.04 0-.09.02-.13zM12.5 7H11v3h1.5V7zm-9 0v3H5V7H3.5z" fillOpacity="0.9"></path></svg>

src/assets/svg/shop.svg

@@ -0,0 +1 @@
+<svg fill="none" viewBox="0 0 16 16" width="1em" height="1em" class="t-icon t-icon-shop" data-v-7be81122=""><path fill="currentColor" d="M8 1a2.5 2.5 0 00-2.5 2.5V5h-2a.5.5 0 00-.5.5v9c0 .28.22.5.5.5h9a.5.5 0 00.5-.5v-9a.5.5 0 00-.5-.5h-2V3.5A2.5 2.5 0 008 1zm1.5 5v2h1V6H12v8H4V6h1.5v2h1V6h3zm0-1h-3V3.5a1.5 1.5 0 113 0V5z" fillOpacity="0.9"></path></svg>

src/assets/svg/user_avatar.svg

@@ -0,0 +1 @@
+<svg fill="none" viewBox="0 0 16 16" width="1em" height="1em" class="t-icon t-icon-user-avatar" data-v-7be81122=""><path fill="currentColor" d="M8 10.5c1.24 0 2.42.31 3.5.88v1.12h1v-1.14a.94.94 0 00-.49-.84 8.48 8.48 0 00-8.02 0 .94.94 0 00-.49.84v1.14h1v-1.12A7.47 7.47 0 018 10.5zM10.5 6a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0zm-1 0a1.5 1.5 0 10-3 0 1.5 1.5 0 003 0z"></path><path fill="currentColor" d="M2.5 1.5a1 1 0 00-1 1v11a1 1 0 001 1h11a1 1 0 001-1v-11a1 1 0 00-1-1h-11zm11 1v11h-11v-11h11z"></path></svg>

src/components/ReBarcode/index.ts

@@ -0,0 +1,10 @@
+import { App } from "vue";
+import reBarcode from "./src/index.vue";
+
+export const ReBarcode = Object.assign(reBarcode, {
+  install(app: App) {
+    app.component(reBarcode.name, reBarcode);
+  }
+});
+
+export default ReBarcode;

src/components/ReBarcode/src/index.vue

@@ -0,0 +1,44 @@
+<script lang="ts">
+export default {
+  name: "ReBarcode"
+};
+</script>
+
+<script setup lang="ts">
+import JsBarcode from "jsbarcode";
+import { ref, onMounted } from "vue";
+
+const props = defineProps({
+  tag: {
+    type: String,
+    default: "canvas"
+  },
+  text: {
+    type: String,
+    default: null
+  },
+  // 完整配置 https://github.com/lindell/JsBarcode/wiki/Options
+  options: {
+    type: Object,
+    default() {
+      return {};
+    }
+  },
+  // type 相当于 options.format，如果 type 和 options.format 同时存在，type 值优先；
+  type: {
+    type: String,
+    default: "CODE128"
+  }
+});
+
+const wrapEl = ref(null);
+
+onMounted(() => {
+  const opt = { ...props.options, format: props.type };
+  JsBarcode(wrapEl.value, props.text, opt);
+});
+</script>
+
+<template>
+  <component :is="tag" ref="wrapEl" />
+</template>

src/components/ReCard/index.ts

@@ -0,0 +1,10 @@
+import { App } from "vue";
+import reCard from "./src/index.vue";
+
+export const ReCard = Object.assign(reCard, {
+  install(app: App) {
+    app.component(reCard.name, reCard);
+  }
+});
+
+export default ReCard;

src/components/ReCard/src/index.vue

@@ -0,0 +1,177 @@
+<script lang="ts">
+export default {
+  name: "ReCard"
+};
+</script>
+
+<script setup lang="ts">
+import { computed, PropType } from "vue";
+import shopIcon from "/@/assets/svg/shop.svg?component";
+import laptopIcon from "/@/assets/svg/laptop.svg?component";
+import serviceIcon from "/@/assets/svg/service.svg?component";
+import calendarIcon from "/@/assets/svg/calendar.svg?component";
+import userAvatarIcon from "/@/assets/svg/user_avatar.svg?component";
+
+export interface CardProductType {
+  type: number;
+  isSetup: boolean;
+  description: string;
+  name: string;
+}
+
+const props = defineProps({
+  product: {
+    type: Object as PropType<CardProductType>
+  }
+});
+
+const emit = defineEmits(["manage-product", "delete-item"]);
+
+const handleClickManage = (product: CardProductType) => {
+  emit("manage-product", product);
+};
+
+const handleClickDelete = (product: CardProductType) => {
+  emit("delete-item", product);
+};
+
+const cardClass = computed(() => [
+  "list-card-item",
+  { "list-card-item__disabled": !props.product.isSetup }
+]);
+
+const cardLogoClass = computed(() => [
+  "list-card-item_detail--logo",
+  { "list-card-item_detail--logo__disabled": !props.product.isSetup }
+]);
+</script>
+
+<template>
+  <div :class="cardClass">
+    <div class="list-card-item_detail">
+      <el-row justify="space-between">
+        <div :class="cardLogoClass">
+          <shopIcon v-if="product.type === 1" />
+          <calendarIcon v-if="product.type === 2" />
+          <serviceIcon v-if="product.type === 3" />
+          <userAvatarIcon v-if="product.type === 4" />
+          <laptopIcon v-if="product.type === 5" />
+        </div>
+        <div class="list-card-item_detail--operation">
+          <el-tag
+            :color="product.isSetup ? '#00a870' : '#eee'"
+            effect="dark"
+            class="mx-1 list-card-item_detail--operation--tag"
+          >
+            {{ product.isSetup ? "已启用" : "已停用" }}
+          </el-tag>
+          <el-dropdown
+            trigger="click"
+            :disabled="!product.isSetup"
+            max-height="2"
+          >
+            <IconifyIconOffline icon="more-vertical" class="icon-more" />
+            <template #dropdown>
+              <el-dropdown-menu :disabled="!product.isSetup">
+                <el-dropdown-item @click="handleClickManage(product)"
+                  >管理</el-dropdown-item
+                >
+                <el-dropdown-item @click="handleClickDelete(product)"
+                  >删除</el-dropdown-item
+                >
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
+        </div>
+      </el-row>
+      <p class="list-card-item_detail--name">{{ product.name }}</p>
+      <p class="list-card-item_detail--desc">{{ product.description }}</p>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="scss">
+$text-color-disabled: rgba(0, 0, 0, 0.26);
+
+.list-card-item {
+  display: flex;
+  flex-direction: column;
+  margin-bottom: 12px;
+  border-radius: 3px;
+  overflow: hidden;
+  cursor: pointer;
+  color: rgba(0, 0, 0, 0.6);
+
+  &_detail {
+    flex: 1;
+    background: #fff;
+    padding: 24px 32px;
+    min-height: 140px;
+
+    &--logo {
+      width: 56px;
+      height: 56px;
+      border-radius: 50%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      background: #e0ebff;
+      font-size: 32px;
+      color: #0052d9;
+
+      &__disabled {
+        color: #a1c4ff;
+      }
+    }
+
+    &--operation {
+      display: flex;
+      height: 100%;
+
+      &--tag {
+        border: 0;
+      }
+    }
+
+    .icon-more {
+      font-size: 24px;
+      color: rgba(36, 36, 36, 1);
+    }
+
+    &--name {
+      margin: 24px 0 8px 0;
+      font-size: 16px;
+      font-weight: 400;
+      color: rgba(0, 0, 0, 0.9);
+    }
+
+    &--desc {
+      font-size: 12px;
+      line-height: 20px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+      margin-bottom: 24px;
+      height: 40px;
+    }
+  }
+
+  &__disabled {
+    color: $text-color-disabled;
+
+    .icon-more {
+      color: $text-color-disabled;
+    }
+
+    .list-card-item_detail--name {
+      color: $text-color-disabled;
+    }
+
+    .list-card-item_detail--operation--tag {
+      color: #bababa;
+    }
+  }
+}
+</style>

src/components/ReCharts/src/Bar.vue

@@ -92,5 +92,5 @@ tryOnUnmounted(() => {
 </script>
 
 <template>
-  <div :class="'bar' + props.index" style="width: 100%; height: 35vh"></div>
+  <div :class="'bar' + props.index" style="width: 100%; height: 35vh" />
 </template>

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.date" />
-          <span v-text="item.name"></span>
+          <span v-text="item.name" />
-          <span v-text="item.star"></span>
+          <span v-text="item.star" />
         </li>
       </ul>
     </SeamlessScroll>

src/components/ReCharts/src/Line.vue

@@ -80,5 +80,5 @@ tryOnUnmounted(() => {
 </script>
 
 <template>
-  <div :class="'line' + props.index" style="width: 100%; height: 35vh"></div>
+  <div :class="'line' + props.index" style="width: 100%; height: 35vh" />
 </template>

src/components/ReCharts/src/Pie.vue

@@ -83,5 +83,5 @@ tryOnUnmounted(() => {
 </script>
 
 <template>
-  <div :class="'pie' + props.index" style="width: 100%; height: 35vh"></div>
+  <div :class="'pie' + props.index" style="width: 100%; height: 35vh" />
 </template>

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

@@ -24,36 +24,43 @@ let titleLists = ref([
   {
     icon: "icon-zoom-out-hs",
     text: "缩小",
+    size: "18",
     disabled: false
   },
   {
     icon: "icon-enlarge-hs",
     text: "放大",
+    size: "18",
     disabled: false
   },
   {
     icon: "icon-full-screen-hs",
     text: "适应",
+    size: "15",
     disabled: false
   },
   {
     icon: "icon-previous-hs",
     text: "上一步",
+    size: "15",
     disabled: true
   },
   {
     icon: "icon-next-step-hs",
     text: "下一步",
+    size: "17",
     disabled: true
   },
   {
     icon: "icon-download-hs",
     text: "下载图片",
+    size: "17",
     disabled: false
   },
   {
     icon: "icon-watch-hs",
     text: "查看数据",
+    size: "17",
     disabled: false
   }
 ]);
@@ -95,21 +102,29 @@ onMounted(() => {
         v-for="(item, key) in titleLists"
         :key="key"
         :title="item.text"
-        :style="{ background: focusIndex === key ? '#ccc' : '' }"
         @mouseenter.prevent="onEnter(key)"
         @mouseleave.prevent="focusIndex = -1"
       >
-        <button
+        <el-tooltip
-          :ref="'controlButton' + key"
+          :content="item.text"
-          :disabled="item.disabled"
+          :visible="focusIndex === key"
-          :style="{
+          placement="right"
-            cursor: item.disabled === false ? 'pointer' : 'not-allowed'
-          }"
-          @click="onControl(item, key)"
         >
-          <span :class="'iconfont ' + item.icon"></span>
+          <button
-          <p>{{ item.text }}</p>
+            :ref="'controlButton' + key"
-        </button>
+            :disabled="item.disabled"
+            :style="{
+              cursor: item.disabled === false ? 'pointer' : 'not-allowed',
+              color: item.disabled === false ? '' : '#00000040'
+            }"
+            @click="onControl(item, key)"
+          >
+            <span
+              :class="'iconfont ' + item.icon"
+              :style="{ fontSize: `${item.size}px` }"
+            />
+          </button>
+        </el-tooltip>
       </li>
     </ul>
   </div>
@@ -119,36 +134,16 @@ onMounted(() => {
 @import "./assets/iconfont/iconfont.css";
 
 .control-container {
-  position: absolute;
-  right: 20px;
   background: hsla(0, 0%, 100%, 0.8);
   box-shadow: 0 1px 4px rgb(0 0 0 / 20%);
 }
 
-.iconfont {
-  font-size: 25px;
-}
-
-.control-container p {
-  margin: 0;
-  font-size: 12px;
-}
-
-.control-container ul {
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
-  margin: 2px;
-}
-
 .control-container ul li {
-  width: 60px;
+  margin: 10px;
   text-align: center;
 }
 
-.control-container ul li button {
+.control-container ul li span:hover {
-  border: none;
+  color: var(--el-color-primary);
-  background-color: transparent;
-  outline: none;
 }
 </style>

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>
@@ -54,9 +54,8 @@ const nodeDragNode = item => {
 <style scoped>
 .node-panel {
   position: absolute;
-  top: 100px;
+  top: 10px;
-  left: 50px;
+  width: 60px;
-  width: 70px;
   padding: 20px 10px;
   background-color: white;
   box-shadow: 0 0 10px 1px rgb(228, 224, 219);

src/components/ReIcon/index.ts

@@ -1,13 +1,16 @@
 import iconifyIconOffline from "./src/iconifyIconOffline";
 import iconifyIconOnline from "./src/iconifyIconOnline";
 import fontIcon from "./src/iconfont";
+import iconSelect from "./src/select.vue";
 
 export const IconifyIconOffline = iconifyIconOffline;
 export const IconifyIconOnline = iconifyIconOnline;
 export const FontIcon = fontIcon;
+export const IconSelect = iconSelect;
 
 export default {
   IconifyIconOffline,
   IconifyIconOnline,
-  FontIcon
+  FontIcon,
+  IconSelect
 };

src/components/ReIcon/src/hooks.ts

@@ -1,8 +1,14 @@
+import { iconType } from "./types";
 import { h, defineComponent, Component } from "vue";
 import { IconifyIconOffline, FontIcon } from "../index";
 
-// 支持fontawesome4、5+、iconfont、remixicon、element-plus的icons、自定义svg
+/**
-export function useRenderIcon(icon: string): Component {
+ * 支持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
@@ -19,7 +25,8 @@ export function useRenderIcon(icon: string): Component {
       render() {
         return h(FontIcon, {
           icon: iconName,
-          iconType
+          iconType,
+          ...attrs
         });
       }
     });
@@ -31,7 +38,8 @@ export function useRenderIcon(icon: string): Component {
       name: "Icon",
       render() {
         return h(IconifyIconOffline, {
-          icon: icon
+          icon: icon,
+          ...attrs
         });
       }
     });

src/components/ReIcon/src/iconifyIconOffline.ts

@@ -18,12 +18,19 @@ 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";
+import Refresh from "@iconify-icons/ep/refresh";
+import EditPen from "@iconify-icons/ep/edit-pen";
+import Delete from "@iconify-icons/ep/delete";
+import More from "@iconify-icons/ep/more-filled";
 addIcon("check", Check);
 addIcon("menu", Menu);
 addIcon("home-filled", HomeFilled);
@@ -40,30 +47,103 @@ 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);
+addIcon("refresh", Refresh);
+addIcon("edits", EditPen);
+addIcon("delete", Delete);
+addIcon("more", More);
 
 // remixicon
-import arrowRightSLine from "@iconify-icons/ri/arrow-right-s-line";
+import ArrowRightSLine from "@iconify-icons/ri/arrow-right-s-line";
-import arrowLeftSLine from "@iconify-icons/ri/arrow-left-s-line";
+import ArrowLeftSLine from "@iconify-icons/ri/arrow-left-s-line";
-import logoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
+import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
-import nodeTree from "@iconify-icons/ri/node-tree";
+import NodeTree from "@iconify-icons/ri/node-tree";
-addIcon("arrow-right-s-line", arrowRightSLine);
+import UbuntuFill from "@iconify-icons/ri/ubuntu-fill";
-addIcon("arrow-left-s-line", arrowLeftSLine);
+import QuestionLine from "@iconify-icons/ri/question-line";
-addIcon("logout-circle-r-line", logoutCircleRLine);
+import CheckboxCircleLine from "@iconify-icons/ri/checkbox-circle-line";
-addIcon("node-tree", nodeTree);
+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";
+import AddFill from "@iconify-icons/ri/add-circle-line";
+import ListCheck from "@iconify-icons/ri/list-check";
+import More2Fill from "@iconify-icons/ri/more-2-fill";
+import Database from "@iconify-icons/ri/database-2-line";
+import Dict from "@iconify-icons/ri/git-repository-line";
+import Card from "@iconify-icons/ri/bank-card-line";
+import Reset from "@iconify-icons/ri/restart-line";
+import Dept from "@iconify-icons/ri/git-branch-line";
+import Password from "@iconify-icons/ri/lock-password-line";
+import Ppt from "@iconify-icons/ri/file-ppt-2-line";
+import TerminalWindowLine from "@iconify-icons/ri/terminal-window-line";
+import User from "@iconify-icons/ri/user-3-fill";
+import Lock from "@iconify-icons/ri/lock-fill";
+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);
+addIcon("add", AddFill);
+addIcon("list-check", ListCheck);
+addIcon("more-vertical", More2Fill);
+addIcon("database", Database);
+addIcon("dict", Dict);
+addIcon("card", Card);
+addIcon("reset", Reset);
+addIcon("dept", Dept);
+addIcon("password", Password);
+addIcon("ppt", Ppt);
+addIcon("terminal-window-line", TerminalWindowLine);
+addIcon("user", User);
+addIcon("lock", Lock);
 
 // Font Awesome 4
-import faUser from "@iconify-icons/fa/user";
+import FaUser from "@iconify-icons/fa/user";
-import faLock from "@iconify-icons/fa/lock";
+import FaLock from "@iconify-icons/fa/lock";
-import faSignOut from "@iconify-icons/fa/sign-out";
+import FaSignOut from "@iconify-icons/fa/sign-out";
-addIcon("fa-user", faUser);
+addIcon("fa-user", FaUser);
-addIcon("fa-lock", faLock);
+addIcon("fa-lock", FaLock);
-addIcon("fa-sign-out", faSignOut);
+addIcon("fa-sign-out", FaSignOut);
+
+// Unicons
+import Import from "@iconify-icons/uil/import";
+import Export from "@iconify-icons/uil/export";
+import ArrowsShrinkV from "@iconify-icons/uil/arrows-shrink-v";
+addIcon("import", Import);
+addIcon("export", Export);
+addIcon("density", ArrowsShrinkV);
+
+// fluent
+import Role from "@iconify-icons/fluent/people-swap-28-filled";
+import FlUser from "@iconify-icons/fluent/person-12-filled";
+addIcon("role", Role);
+addIcon("flUser", FlUser);
+
+// Material Design Icons
+import Expand from "@iconify-icons/mdi/arrow-expand-down";
+import UnExpand from "@iconify-icons/mdi/arrow-expand-right";
+addIcon("expand", Expand);
+addIcon("unExpand", UnExpand);
+
+// carbon
+import LocationCompany from "@iconify-icons/carbon/location-company";
+addIcon("location-company", LocationCompany);
 
 // Iconify Icon在Vue里离线使用（用于内网环境）https://docs.iconify.design/icon-components/vue/offline.html
 export default defineComponent({

src/components/ReIcon/src/iconifyIconOnline.ts

@@ -9,11 +9,6 @@ export default defineComponent({
     icon: {
       type: String,
       default: ""
-    },
-    // default element plus icon
-    type: {
-      type: String,
-      default: "ep:"
     }
   },
   render() {
@@ -21,7 +16,7 @@ export default defineComponent({
     return h(
       IconifyIcon,
       {
-        icon: `${this.type}${this.icon}`,
+        icon: `${this.icon}`,
         ...attrs
       },
       {

src/components/ReIcon/src/select.vue

@@ -0,0 +1,234 @@
+<script setup lang="ts">
+import { cloneDeep } from "lodash-unified";
+import { ref, computed, CSSProperties, toRef, watch } from "vue";
+import { IconJson } from "/@/components/ReIcon/data";
+type ParameterCSSProperties = (item?: string) => CSSProperties | undefined;
+
+const props = defineProps({
+  modelValue: {
+    require: false,
+    type: String
+  }
+});
+const emit = defineEmits<{ (e: "update:modelValue", v: string) }>();
+
+let visible = ref(false);
+let inputValue = toRef(props, "modelValue");
+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]
+      .filter(v => v.includes(filterValue.value))
+      .slice(currentPage.value - 1, pageSize.value);
+  } else {
+    return copyIconList[currentActiveType.value]
+      .filter(v => v.includes(filterValue.value))
+      .slice(
+        pageSize.value * (currentPage.value - 1),
+        pageSize.value * (currentPage.value - 1) + pageSize.value
+      );
+  }
+});
+
+const iconItemStyle = computed((): ParameterCSSProperties => {
+  return item => {
+    if (inputValue.value === currentActiveType.value + item) {
+      return {
+        borderColor: "var(--el-color-primary)",
+        color: "var(--el-color-primary)"
+      };
+    }
+  };
+});
+
+function handleClick({ props }) {
+  currentPage.value = 1;
+  currentActiveType.value = props.name;
+  emit(
+    "update:modelValue",
+    currentActiveType.value + iconList.value[currentActiveType.value][0]
+  );
+  icon.value = iconList.value[currentActiveType.value][0];
+}
+
+function onChangeIcon(item) {
+  icon.value = item;
+  emit("update:modelValue", currentActiveType.value + item);
+  visible.value = false;
+}
+
+function onCurrentChange(page) {
+  currentPage.value = page;
+}
+
+watch(
+  () => {
+    return props.modelValue;
+  },
+  () => {
+    if (props.modelValue) {
+      currentActiveType.value = props.modelValue.substring(
+        0,
+        props.modelValue.indexOf(":") + 1
+      );
+      icon.value = props.modelValue.substring(
+        props.modelValue.indexOf(":") + 1
+      );
+    }
+  }
+);
+watch(
+  () => {
+    return filterValue.value;
+  },
+  () => {
+    currentPage.value = 1;
+  }
+);
+</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"
+          :popper-options="{
+            placement: 'auto'
+          }"
+          :visible="visible"
+        >
+          <template #reference>
+            <div
+              class="w-40px h-32px cursor-pointer flex justify-center items-center"
+              @click="visible = !visible"
+            >
+              <IconifyIconOnline :icon="currentActiveType + icon" />
+            </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="currentActiveType + item" />
+                  </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);
+    color: var(--el-color-primary);
+    transition: all 0.4s;
+    transform: scaleX(1.05);
+  }
+}
+
+: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/ReImageVerify/index.ts

@@ -0,0 +1,12 @@
+import { App } from "vue";
+import reImageVerify from "./src/index.vue";
+
+export const ReImageVerify = Object.assign(reImageVerify, {
+  install(app: App) {
+    app.component(reImageVerify.name, reImageVerify);
+  }
+});
+
+export default {
+  ReImageVerify
+};

src/components/ReImageVerify/src/hooks.ts

@@ -0,0 +1,85 @@
+import { ref, onMounted } from "vue";
+
+/**
+ * 绘制图形验证码
+ * @param width - 图形宽度
+ * @param height - 图形高度
+ */
+export const useImageVerify = (width = 120, height = 40) => {
+  const domRef = ref<HTMLCanvasElement>();
+  const imgCode = ref("");
+
+  function setImgCode(code: string) {
+    imgCode.value = code;
+  }
+
+  function getImgCode() {
+    if (!domRef.value) return;
+    imgCode.value = draw(domRef.value, width, height);
+  }
+
+  onMounted(() => {
+    getImgCode();
+  });
+
+  return {
+    domRef,
+    imgCode,
+    setImgCode,
+    getImgCode
+  };
+};
+
+function randomNum(min: number, max: number) {
+  const num = Math.floor(Math.random() * (max - min) + min);
+  return num;
+}
+
+function randomColor(min: number, max: number) {
+  const r = randomNum(min, max);
+  const g = randomNum(min, max);
+  const b = randomNum(min, max);
+  return `rgb(${r},${g},${b})`;
+}
+
+function draw(dom: HTMLCanvasElement, width: number, height: number) {
+  let imgCode = "";
+
+  const NUMBER_STRING = "0123456789";
+
+  const ctx = dom.getContext("2d");
+  if (!ctx) return imgCode;
+
+  ctx.fillStyle = randomColor(180, 230);
+  ctx.fillRect(0, 0, width, height);
+  for (let i = 0; i < 4; i += 1) {
+    const text = NUMBER_STRING[randomNum(0, NUMBER_STRING.length)];
+    imgCode += text;
+    const fontSize = randomNum(18, 41);
+    const deg = randomNum(-30, 30);
+    ctx.font = `${fontSize}px Simhei`;
+    ctx.textBaseline = "top";
+    ctx.fillStyle = randomColor(80, 150);
+    ctx.save();
+    ctx.translate(30 * i + 15, 15);
+    ctx.rotate((deg * Math.PI) / 180);
+    ctx.fillText(text, -15 + 5, -15);
+    ctx.restore();
+  }
+  for (let i = 0; i < 5; i += 1) {
+    ctx.beginPath();
+    ctx.moveTo(randomNum(0, width), randomNum(0, height));
+    ctx.lineTo(randomNum(0, width), randomNum(0, height));
+    ctx.strokeStyle = randomColor(180, 230);
+    ctx.closePath();
+    ctx.stroke();
+  }
+  for (let i = 0; i < 41; i += 1) {
+    ctx.beginPath();
+    ctx.arc(randomNum(0, width), randomNum(0, height), 1, 0, 2 * Math.PI);
+    ctx.closePath();
+    ctx.fillStyle = randomColor(150, 200);
+    ctx.fill();
+  }
+  return imgCode;
+}

src/components/ReImageVerify/src/index.vue

@@ -0,0 +1,48 @@
+<script lang="ts">
+export default {
+  name: "ReImageVerify"
+};
+</script>
+
+<script setup lang="ts">
+import { watch } from "vue";
+import { useImageVerify } from "./hooks";
+
+interface Props {
+  code?: string;
+}
+
+interface Emits {
+  (e: "update:code", code: string): void;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  code: ""
+});
+
+const emit = defineEmits<Emits>();
+
+const { domRef, imgCode, setImgCode, getImgCode } = useImageVerify();
+
+watch(
+  () => props.code,
+  newValue => {
+    setImgCode(newValue);
+  }
+);
+watch(imgCode, newValue => {
+  emit("update:code", newValue);
+});
+
+defineExpose({ getImgCode });
+</script>
+
+<template>
+  <canvas
+    ref="domRef"
+    width="120"
+    height="40"
+    class="cursor-pointer"
+    @click="getImgCode"
+  />
+</template>

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/ReQrcode/index.ts

@@ -0,0 +1,10 @@
+import { App } from "vue";
+import reQrcode from "./src/index";
+
+export const ReQrcode = Object.assign(reQrcode, {
+  install(app: App) {
+    app.component(reQrcode.name, reQrcode);
+  }
+});
+
+export default ReQrcode;

src/components/ReQrcode/src/index.scss

@@ -0,0 +1,8 @@
+.qrcode {
+  &--disabled {
+    background: rgba(255, 255, 255, 0.95);
+    & > div {
+      transform: translate(-50%, -50%);
+    }
+  }
+}

src/components/ReQrcode/src/index.tsx

@@ -0,0 +1,262 @@
+import {
+  ref,
+  unref,
+  watch,
+  nextTick,
+  computed,
+  PropType,
+  defineComponent
+} from "vue";
+import "./index.scss";
+import { isString } from "/@/utils/is";
+import { cloneDeep } from "lodash-unified";
+import { propTypes } from "/@/utils/propTypes";
+import { IconifyIconOffline } from "../../ReIcon";
+import QRCode, { QRCodeRenderersOptions } from "qrcode";
+
+interface QrcodeLogo {
+  src?: string;
+  logoSize?: number;
+  bgColor?: string;
+  borderSize?: number;
+  crossOrigin?: string;
+  borderRadius?: number;
+  logoRadius?: number;
+}
+
+const props = {
+  // img 或者 canvas,img不支持logo嵌套
+  tag: propTypes.string
+    .validate((v: string) => ["canvas", "img"].includes(v))
+    .def("canvas"),
+  // 二维码内容
+  text: {
+    type: [String, Array] as PropType<string | Recordable[]>,
+    default: null
+  },
+  // qrcode.js配置项
+  options: {
+    type: Object as PropType<QRCodeRenderersOptions>,
+    default: (): QRCodeRenderersOptions => ({})
+  },
+  // 宽度
+  width: propTypes.number.def(200),
+  // logo
+  logo: {
+    type: [String, Object] as PropType<Partial<QrcodeLogo> | string>,
+    default: (): QrcodeLogo | string => ""
+  },
+  // 是否过期
+  disabled: propTypes.bool.def(false),
+  // 过期提示内容
+  disabledText: propTypes.string.def("")
+};
+
+export default defineComponent({
+  name: "ReQrcode",
+  props,
+  emits: ["done", "click", "disabled-click"],
+  setup(props, { emit }) {
+    const { toCanvas, toDataURL } = QRCode;
+    const loading = ref(true);
+    const wrapRef = ref<Nullable<HTMLCanvasElement | HTMLImageElement>>(null);
+    const renderText = computed(() => String(props.text));
+    const wrapStyle = computed(() => {
+      return {
+        width: props.width + "px",
+        height: props.width + "px"
+      };
+    });
+    const initQrcode = async () => {
+      await nextTick();
+      const options = cloneDeep(props.options || {});
+      if (props.tag === "canvas") {
+        // 容错率，默认对内容少的二维码采用高容错率，内容多的二维码采用低容错率
+        options.errorCorrectionLevel =
+          options.errorCorrectionLevel ||
+          getErrorCorrectionLevel(unref(renderText));
+        const _width: number = await getOriginWidth(unref(renderText), options);
+        options.scale =
+          props.width === 0 ? undefined : (props.width / _width) * 4;
+        const canvasRef: HTMLCanvasElement = await toCanvas(
+          unref(wrapRef) as HTMLCanvasElement,
+          unref(renderText),
+          options
+        );
+        if (props.logo) {
+          const url = await createLogoCode(canvasRef);
+          emit("done", url);
+          loading.value = false;
+        } else {
+          emit("done", canvasRef.toDataURL());
+          loading.value = false;
+        }
+      } else {
+        const url = await toDataURL(renderText.value, {
+          errorCorrectionLevel: "H",
+          width: props.width,
+          ...options
+        });
+        (unref(wrapRef) as HTMLImageElement).src = url;
+        emit("done", url);
+        loading.value = false;
+      }
+    };
+    watch(
+      () => renderText.value,
+      val => {
+        if (!val) return;
+        initQrcode();
+      },
+      {
+        deep: true,
+        immediate: true
+      }
+    );
+    const createLogoCode = (canvasRef: HTMLCanvasElement) => {
+      const canvasWidth = canvasRef.width;
+      const logoOptions: QrcodeLogo = Object.assign(
+        {
+          logoSize: 0.15,
+          bgColor: "#ffffff",
+          borderSize: 0.05,
+          crossOrigin: "anonymous",
+          borderRadius: 8,
+          logoRadius: 0
+        },
+        isString(props.logo) ? {} : props.logo
+      );
+      const {
+        logoSize = 0.15,
+        bgColor = "#ffffff",
+        borderSize = 0.05,
+        crossOrigin = "anonymous",
+        borderRadius = 8,
+        logoRadius = 0
+      } = logoOptions;
+      const logoSrc = isString(props.logo) ? props.logo : props.logo.src;
+      const logoWidth = canvasWidth * logoSize;
+      const logoXY = (canvasWidth * (1 - logoSize)) / 2;
+      const logoBgWidth = canvasWidth * (logoSize + borderSize);
+      const logoBgXY = (canvasWidth * (1 - logoSize - borderSize)) / 2;
+      const ctx = canvasRef.getContext("2d");
+      if (!ctx) return;
+      // logo 底色
+      canvasRoundRect(ctx)(
+        logoBgXY,
+        logoBgXY,
+        logoBgWidth,
+        logoBgWidth,
+        borderRadius
+      );
+      ctx.fillStyle = bgColor;
+      ctx.fill();
+      // logo
+      const image = new Image();
+      if (crossOrigin || logoRadius) {
+        image.setAttribute("crossOrigin", crossOrigin);
+      }
+      (image as any).src = logoSrc;
+      // 使用image绘制可以避免某些跨域情况
+      const drawLogoWithImage = (image: HTMLImageElement) => {
+        ctx.drawImage(image, logoXY, logoXY, logoWidth, logoWidth);
+      };
+      // 使用canvas绘制以获得更多的功能
+      const drawLogoWithCanvas = (image: HTMLImageElement) => {
+        const canvasImage = document.createElement("canvas");
+        canvasImage.width = logoXY + logoWidth;
+        canvasImage.height = logoXY + logoWidth;
+        const imageCanvas = canvasImage.getContext("2d");
+        if (!imageCanvas || !ctx) return;
+        imageCanvas.drawImage(image, logoXY, logoXY, logoWidth, logoWidth);
+        canvasRoundRect(ctx)(logoXY, logoXY, logoWidth, logoWidth, logoRadius);
+        if (!ctx) return;
+        const fillStyle = ctx.createPattern(canvasImage, "no-repeat");
+        if (fillStyle) {
+          ctx.fillStyle = fillStyle;
+          ctx.fill();
+        }
+      };
+      // 将 logo绘制到 canvas上
+      return new Promise((resolve: any) => {
+        image.onload = () => {
+          logoRadius ? drawLogoWithCanvas(image) : drawLogoWithImage(image);
+          resolve(canvasRef.toDataURL());
+        };
+      });
+    };
+    // 得到原QrCode的大小，以便缩放得到正确的QrCode大小
+    const getOriginWidth = async (
+      content: string,
+      options: QRCodeRenderersOptions
+    ) => {
+      const _canvas = document.createElement("canvas");
+      await toCanvas(_canvas, content, options);
+      return _canvas.width;
+    };
+    // 对于内容少的QrCode，增大容错率
+    const getErrorCorrectionLevel = (content: string) => {
+      if (content.length > 36) {
+        return "M";
+      } else if (content.length > 16) {
+        return "Q";
+      } else {
+        return "H";
+      }
+    };
+    // 用于绘制圆角
+    const canvasRoundRect = (ctx: CanvasRenderingContext2D) => {
+      return (x: number, y: number, w: number, h: number, r: number) => {
+        const minSize = Math.min(w, h);
+        if (r > minSize / 2) {
+          r = minSize / 2;
+        }
+        ctx.beginPath();
+        ctx.moveTo(x + r, y);
+        ctx.arcTo(x + w, y, x + w, y + h, r);
+        ctx.arcTo(x + w, y + h, x, y + h, r);
+        ctx.arcTo(x, y + h, x, y, r);
+        ctx.arcTo(x, y, x + w, y, r);
+        ctx.closePath();
+        return ctx;
+      };
+    };
+    const clickCode = () => {
+      emit("click");
+    };
+    const disabledClick = () => {
+      emit("disabled-click");
+    };
+    return () => (
+      <>
+        <div
+          v-loading={unref(loading)}
+          class="qrcode relative inline-block"
+          style={unref(wrapStyle)}
+        >
+          {props.tag === "canvas" ? (
+            <canvas ref={wrapRef} onClick={clickCode}></canvas>
+          ) : (
+            <img ref={wrapRef} onClick={clickCode}></img>
+          )}
+          {props.disabled && (
+            <div
+              class="qrcode--disabled absolute top-0 left-0 flex w-full h-full items-center justify-center"
+              onClick={disabledClick}
+            >
+              <div class="absolute top-[50%] left-[50%] font-bold">
+                <IconifyIconOffline
+                  class="cursor-pointer outline-none"
+                  icon="refresh-right"
+                  width="30"
+                  color="var(--el-color-primary)"
+                />
+                <div>{props.disabledText}</div>
+              </div>
+            </div>
+          )}
+        </div>
+      </>
+    );
+  }
+});

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/iconfont/iconfont.css

@@ -0,0 +1,22 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 3268330 */
+  src: url("iconfont.woff2?t=1647939915215") format("woff2"),
+    url("iconfont.woff?t=1647939915215") format("woff"),
+    url("iconfont.ttf?t=1647939915215") format("truetype");
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-tuozhuai1:before {
+  content: "\e647";
+}
+
+.icon-tuozhuai1-copy:before {
+  content: "\eda3";
+}

src/components/ReSplitPane/iconfont/iconfont.js

@@ -0,0 +1,66 @@
+!(function (e) {
+  var t,
+    n,
+    c,
+    o,
+    s,
+    i =
+      '<svg><symbol id="icon-tuozhuai1" viewBox="0 0 1024 1024"><path d="M576 896c0-35.2 28.8-64 64-64s64 28.8 64 64-28.8 64-64 64-64-28.8-64-64z m-256 0c0-35.2 28.8-64 64-64s64 28.8 64 64-28.8 64-64 64-64-28.8-64-64z m256-192c0-35.2 28.8-64 64-64s64 28.8 64 64-28.8 64-64 64-64-28.8-64-64z m-256 0c0-35.2 28.8-64 64-64s64 28.8 64 64-28.8 64-64 64-64-28.8-64-64z m256-192c0-35.2 28.8-64 64-64s64 28.8 64 64-28.8 64-64 64-64-28.8-64-64z m-256 0c0-35.2 28.8-64 64-64s64 28.8 64 64-28.8 64-64 64-64-28.8-64-64z m256-192c0-35.2 28.8-64 64-64s64 28.8 64 64-28.8 64-64 64-64-28.8-64-64z m-256 0c0-35.2 28.8-64 64-64s64 28.8 64 64-28.8 64-64 64-64-28.8-64-64z m256-192c0-35.2 28.8-64 64-64s64 28.8 64 64-28.8 64-64 64-64-28.8-64-64z m-256 0c0-35.2 28.8-64 64-64s64 28.8 64 64-28.8 64-64 64-64-28.8-64-64z" fill="#2c2c2c" ></path></symbol><symbol id="icon-tuozhuai1-copy" viewBox="0 0 1024 1024"><path d="M128 576c35.2 0 64 28.8 64 64s-28.8 64-64 64-64-28.8-64-64 28.8-64 64-64z m0-256c35.2 0 64 28.8 64 64s-28.8 64-64 64-64-28.8-64-64 28.8-64 64-64z m192 256c35.2 0 64 28.8 64 64s-28.8 64-64 64-64-28.8-64-64 28.8-64 64-64z m0-256c35.2 0 64 28.8 64 64s-28.8 64-64 64-64-28.8-64-64 28.8-64 64-64z m192 256.00000001c35.2 0 64 28.8 64 63.99999999s-28.8 64-64 64-64-28.8-64-64 28.8-64 64-63.99999999z m0-256.00000001c35.2 0 64 28.8 64 64s-28.8 64-64 63.99999999-64-28.8-64-63.99999999 28.8-64 64-64z m192 256c35.2 0 64 28.8 64 64s-28.8 64-64 64-64-28.8-64-64 28.8-64 64-64z m0-256c35.2 0 64 28.8 64 64s-28.8 64-64 64-64-28.8-64-64 28.8-64 64-64z m192 256c35.2 0 64 28.8 64 64s-28.8 64-64 64-64-28.8-64-64 28.8-64 64-64z m0-256c35.2 0 64 28.8 64 64s-28.8 64-64 64-64-28.8-64-64 28.8-64 64-64z" fill="#2c2c2c" ></path></symbol></svg>',
+    d = (d = document.getElementsByTagName("script"))[
+      d.length - 1
+    ].getAttribute("data-injectcss"),
+    m = function (e, t) {
+      t.parentNode.insertBefore(e, t);
+    };
+  if (d && !e.__iconfont__svg__cssinject__) {
+    e.__iconfont__svg__cssinject__ = !0;
+    try {
+      document.write(
+        "<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>"
+      );
+    } catch (e) {
+      console && console.log(e);
+    }
+  }
+  function l() {
+    s || ((s = !0), c());
+  }
+  function a() {
+    try {
+      o.documentElement.doScroll("left");
+    } catch (e) {
+      return void setTimeout(a, 50);
+    }
+    l();
+  }
+  (t = function () {
+    var e,
+      t = document.createElement("div");
+    (t.innerHTML = i),
+      (i = null),
+      (t = t.getElementsByTagName("svg")[0]) &&
+        (t.setAttribute("aria-hidden", "true"),
+        (t.style.position = "absolute"),
+        (t.style.width = 0),
+        (t.style.height = 0),
+        (t.style.overflow = "hidden"),
+        // eslint-disable-next-line no-self-assign
+        (t = t),
+        (e = document.body).firstChild ? m(t, e.firstChild) : e.appendChild(t));
+  }),
+    document.addEventListener
+      ? ~["complete", "loaded", "interactive"].indexOf(document.readyState)
+        ? setTimeout(t, 0)
+        : ((n = function () {
+            document.removeEventListener("DOMContentLoaded", n, !1), t();
+          }),
+          document.addEventListener("DOMContentLoaded", n, !1))
+      : document.attachEvent &&
+        ((c = t),
+        (o = e.document),
+        (s = !1),
+        a(),
+        (o.onreadystatechange = function () {
+          "complete" == o.readyState && ((o.onreadystatechange = null), l());
+        }));
+})(window);

src/components/ReSplitPane/iconfont/iconfont.json

@@ -0,0 +1,23 @@
+{
+  "id": "3268330",
+  "name": "split",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "22378774",
+      "name": "拖拽",
+      "font_class": "tuozhuai1",
+      "unicode": "e647",
+      "unicode_decimal": 58951
+    },
+    {
+      "icon_id": "23570521",
+      "name": "拖拽",
+      "font_class": "tuozhuai1-copy",
+      "unicode": "eda3",
+      "unicode_decimal": 60835
+    }
+  ]
+}

src/components/ReSplitPane/index.tsx

@@ -35,16 +35,12 @@ export default defineComponent({
       props.splitSet?.split
     ]);
 
-    const userSelect = computed(() => {
-      return active.value ? "none" : "";
-    });
-
     const cursor = computed(() => {
       return active.value
         ? props.splitSet?.split === "vertical"
-          ? "col-resize"
+          ? { cursor: "col-resize" }
-          : "row-resize"
+          : { cursor: "row-resize" }
-        : "";
+        : { cursor: "default" };
     });
 
     const onClick = (): void => {
@@ -109,22 +105,26 @@ export default defineComponent({
       <>
         <div
           class="vue-splitter-container clearfix"
-          style={(unref(cursor), unref(userSelect))}
+          style={unref(cursor)}
           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,30 +1,47 @@
+@import "./iconfont/iconfont.css";
+
 .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;
+  background-clip: padding;
-  -webkit-background-clip: padding;
   background-clip: padding-box;
 }
 
 .splitter-pane-resizer.horizontal {
-  height: 11px;
+  height: 6px;
-  margin: -5px 0;
-  border-top: 5px solid rgba(255, 255, 255, 0);
-  border-bottom: 5px solid rgba(255, 255, 255, 0);
-  cursor: row-resize;
   width: 100%;
+  background: #e5e6eb;
+  cursor: row-resize;
+}
+
+.splitter-pane-resizer.horizontal:before {
+  content: "\eda3";
+  font-family: "iconfont";
+  font-size: 13px;
+  color: #000;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
 }
 
 .splitter-pane-resizer.vertical {
-  width: 11px;
+  width: 6px;
   height: 100%;
-  margin-left: -5px;
+  background: #e5e6eb;
-  border-left: 5px solid rgba(255, 255, 255, 0);
-  border-right: 5px solid rgba(255, 255, 255, 0);
   cursor: col-resize;
 }
+
+.splitter-pane-resizer.vertical:before {
+  content: "\e647";
+  font-family: "iconfont";
+  font-size: 13px;
+  color: #000;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}

src/components/ReTable/README.md

@@ -0,0 +1,16 @@
+## 一款基于`element-plus`表格封装的`table-crud`组件库，采用`tsx`语法编写，通过一些灵活的配置项即可实现增删改查
+
+### wait todo
+
+- 搜索组件
+- 表格组件
+- 弹框组件
+- form 组件
+
+### completed
+
+- 操作栏组件
+
+目前只完成了操作栏组件，后续有时间慢慢完善对应组件，因为作者比较忙，暂无具体计划完成时间，忘谅解，当然非常欢迎 pr，等这些组件全部完成后，我会单独抽离成`npm`包的形式发布。
+
+注意：该组件库为了快速成型，内部依赖了`unocss`。

src/components/ReTable/index.ts

@@ -0,0 +1,8 @@
+import { App } from "vue";
+import epTableProBar from "./src/bar";
+
+export const EpTableProBar = Object.assign(epTableProBar, {
+  install(app: App) {
+    app.component(epTableProBar.name, epTableProBar);
+  }
+});

src/components/ReTable/src/bar.tsx

@@ -0,0 +1,216 @@
+import { emitter } from "/@/utils/mitt";
+import { IconifyIconOffline } from "../../ReIcon";
+import { defineComponent, ref, computed, PropType } from "vue";
+import { useEpThemeStoreHook } from "/@/store/modules/epTheme";
+
+export const loadingSvg = `
+  <path class="path" d="
+    M 30 15
+    L 28 17
+    M 25.61 25.61
+    A 15 15, 0, 0, 1, 15 30
+    A 15 15, 0, 1, 1, 27.99 7.5
+    L 15 15
+  "
+    style="stroke-width: 4px; fill: rgba(0, 0, 0, 0)"
+  />
+`;
+
+const props = {
+  // 头部最左边的标题
+  title: {
+    type: String,
+    default: "列表"
+  },
+  // 表格数据
+  dataList: {
+    type: Array,
+    default: () => {
+      return [];
+    }
+  },
+  // 对于树形表格，如果想启用展开和折叠功能，传入当前表格的ref即可
+  tableRef: {
+    type: Object as PropType<any>,
+    default() {
+      return {};
+    }
+  },
+  // 是否显示加载动画，默认false 不加载
+  loading: {
+    type: Boolean,
+    default: false
+  }
+};
+
+export default defineComponent({
+  name: "epTableProBar",
+  props,
+  emits: ["refresh"],
+  setup(props, { emit, slots, attrs }) {
+    const buttonRef = ref();
+    const checkList = ref([]);
+    const currentWidth = ref(0);
+    const size = ref("default");
+    const isExpandAll = ref(true);
+
+    const getDropdownItemStyle = computed(() => {
+      return s => {
+        return {
+          background:
+            s === size.value ? useEpThemeStoreHook().epThemeColor : "",
+          color: s === size.value ? "#f4f4f5" : "#000"
+        };
+      };
+    });
+
+    function onExpand() {
+      isExpandAll.value = !isExpandAll.value;
+      toggleRowExpansionAll(props.dataList, isExpandAll.value);
+    }
+
+    function toggleRowExpansionAll(data, isExpansion) {
+      data.forEach(item => {
+        props.tableRef.toggleRowExpansion(item, isExpansion);
+        if (item.children !== undefined && item.children !== null) {
+          toggleRowExpansionAll(item.children, isExpansion);
+        }
+      });
+    }
+
+    // 监听容器
+    emitter.on("resize", ({ detail }) => {
+      const { width } = detail;
+      currentWidth.value = width;
+    });
+
+    const dropdown = {
+      dropdown: () => (
+        <el-dropdown-menu class="translation">
+          <el-dropdown-item
+            style={getDropdownItemStyle.value("large")}
+            onClick={() => (size.value = "large")}
+          >
+            松散
+          </el-dropdown-item>
+          <el-dropdown-item
+            style={getDropdownItemStyle.value("default")}
+            onClick={() => (size.value = "default")}
+          >
+            默认
+          </el-dropdown-item>
+          <el-dropdown-item
+            style={getDropdownItemStyle.value("small")}
+            onClick={() => (size.value = "small")}
+          >
+            紧凑
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      )
+    };
+
+    const reference = {
+      reference: () => (
+        <IconifyIconOffline
+          class="cursor-pointer outline-none"
+          icon="setting"
+          width="16"
+          color="#606266"
+          onMouseover={e => (buttonRef.value = e.currentTarget)}
+        />
+      )
+    };
+
+    return () => (
+      <>
+        <div
+          {...attrs}
+          class="w-99/100 mt-6 p-2 bg-white"
+          v-loading={props.loading}
+          element-loading-svg={loadingSvg}
+          element-loading-svg-view-box="-10, -10, 50, 50"
+        >
+          <div class="flex justify-between w-full h-60px p-4">
+            <p class="font-bold">
+              {currentWidth.value > 390 ? props.title : "列表"}
+            </p>
+            <div class="flex items-center justify-around">
+              <div class="flex mr-4">{slots?.buttons()}</div>
+              {props.tableRef?.size ? (
+                <>
+                  <el-tooltip
+                    effect="dark"
+                    content={isExpandAll.value ? "折叠" : "展开"}
+                    placement="top"
+                  >
+                    <IconifyIconOffline
+                      class="cursor-pointer outline-none"
+                      icon={isExpandAll.value ? "unExpand" : "expand"}
+                      width="16"
+                      color="#606266"
+                      onClick={() => onExpand()}
+                    />
+                  </el-tooltip>
+                  <el-divider direction="vertical" />
+                </>
+              ) : undefined}
+              <el-tooltip effect="dark" content="刷新" placement="top">
+                <IconifyIconOffline
+                  class="cursor-pointer outline-none"
+                  icon="refresh-right"
+                  width="16"
+                  color="#606266"
+                  onClick={() => emit("refresh")}
+                />
+              </el-tooltip>
+              <el-divider direction="vertical" />
+
+              <el-tooltip effect="dark" content="密度" placement="top">
+                <el-dropdown v-slots={dropdown} trigger="click">
+                  <IconifyIconOffline
+                    class="cursor-pointer outline-none"
+                    icon="density"
+                    width="16"
+                    color="#606266"
+                  />
+                </el-dropdown>
+              </el-tooltip>
+              <el-divider direction="vertical" />
+
+              <el-popover v-slots={reference} width="200" trigger="click">
+                <el-checkbox-group v-model={checkList.value}>
+                  <el-checkbox label="序号列" />
+                  <el-checkbox label="勾选列" />
+                </el-checkbox-group>
+              </el-popover>
+            </div>
+
+            <el-tooltip
+              popper-options={{
+                modifiers: [
+                  {
+                    name: "computeStyles",
+                    options: {
+                      adaptive: false,
+                      enabled: false
+                    }
+                  }
+                ]
+              }}
+              placement="top"
+              virtual-ref={buttonRef.value}
+              virtual-triggering
+              trigger="hover"
+              content="列设置"
+            />
+          </div>
+          {props.dataList.length > 0 ? (
+            slots.default({ size: size.value, checkList: checkList.value })
+          ) : (
+            <el-empty description="暂无数据" />
+          )}
+        </div>
+      </>
+    );
+  }
+});

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/layout/components/appMain.vue

@@ -7,7 +7,6 @@ import {
   defineComponent,
   getCurrentInstance
 } from "vue";
-import { RouterView } from "vue-router";
 import backTop from "/@/assets/svg/back_top.svg?component";
 import { usePermissionStoreHook } from "/@/store/modules/permission";
 

src/layout/components/navbar.vue

@@ -1,71 +1,49 @@
 <script setup lang="ts">
-import { computed } from "vue";
 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 { transformI18n } from "/@/plugins/i18n";
 import Hamburger from "./sidebar/hamBurger.vue";
-import { useRouter, useRoute } from "vue-router";
+import { watch, getCurrentInstance } from "vue";
-import { storageSession } from "/@/utils/storage";
 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 { useEpThemeStoreHook } from "/@/store/modules/epTheme";
 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 {
-const router = useRouter();
+  logout,
-const route = useRoute();
+  onPanel,
-let usename = storageSession.getItem("info")?.username;
+  changeTitle,
-const { locale } = useI18n();
+  toggleSideBar,
-
+  pureApp,
-const getDropdownItemStyle = computed(() => {
+  username,
-  return t => {
+  avatarsStyle,
-    return {
+  getDropdownItemStyle,
-      background: locale.value === t ? useEpThemeStoreHook().epThemeColor : "",
+  changeWangeditorLanguage
-      color: locale.value === t ? "#f4f4f5" : "#000"
+} = useNav();
-    };
-  };
-});
 
 watch(
   () => locale.value,
   () => {
-    //@ts-ignore
+    changeTitle(route.meta);
-    document.title = transformI18n(
+    locale.value === "en"
-      //@ts-ignore
+      ? changeWangeditorLanguage(locale.value)
-      unref(route.meta.title),
+      : changeWangeditorLanguage("zh-CN");
-      unref(route.meta.i18n)
-    ); // 动态title
   }
 );
 
-// 退出登录
-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";
@@ -75,14 +53,19 @@ 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" />
       <!-- 全屏 -->
@@ -93,7 +76,7 @@ function translationEn() {
         <template #dropdown>
           <el-dropdown-menu class="translation">
             <el-dropdown-item
-              :style="getDropdownItemStyle('zh')"
+              :style="getDropdownItemStyle(locale, 'zh')"
               @click="translationCh"
               ><IconifyIconOffline
                 class="check-zh"
@@ -102,20 +85,21 @@ function translationEn() {
               />简体中文</el-dropdown-item
             >
             <el-dropdown-item
-              :style="getDropdownItemStyle('en')"
+              :style="getDropdownItemStyle(locale, 'en')"
               @click="translationEn"
-              ><el-icon class="check-en" v-show="locale === 'en'"
-                ><IconifyIconOffline icon="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="avatars" />
+          <img v-if="avatars" :src="avatars" :style="avatarsStyle" />
-          <p>{{ usename }}</p>
+          <p v-if="username">{{ username }}</p>
         </span>
         <template #dropdown>
           <el-dropdown-menu class="logout">
@@ -123,18 +107,18 @@ function translationEn() {
               <IconifyIconOffline
                 icon="logout-circle-r-line"
                 style="margin: 5px"
-              />{{ $t("buttons.hsLoginOut") }}</el-dropdown-item
+              />{{ t("buttons.hsLoginOut") }}</el-dropdown-item
             >
           </el-dropdown-menu>
         </template>
       </el-dropdown>
-      <el-icon
+      <span
         class="el-icon-setting"
-        :title="$t('buttons.hssystemSet')"
+        :title="t('buttons.hssystemSet')"
         @click="onPanel"
       >
         <IconifyIconOffline icon="setting" />
-      </el-icon>
+      </span>
     </div>
   </div>
 </template>
@@ -190,7 +174,6 @@ function translationEn() {
     }
 
     .el-dropdown-link {
-      width: 100px;
       height: 48px;
       padding: 10px;
       display: flex;
@@ -234,14 +217,8 @@ function translationEn() {
 }
 
 .translation {
-  .el-dropdown-menu__item {
+  ::v-deep(.el-dropdown-menu__item) {
-    padding: 5px 40px !important;
+    padding: 5px 40px;
-  }
-
-  .el-dropdown-menu__item:focus,
-  .el-dropdown-menu__item:not(.is-disabled):hover {
-    color: #606266;
-    background: #f0f0f0;
   }
 
   .check-zh {
@@ -258,16 +235,10 @@ function translationEn() {
 .logout {
   max-width: 120px;
 
-  .el-dropdown-menu__item {
+  ::v-deep(.el-dropdown-menu__item) {
     min-width: 100%;
     display: inline-flex;
     flex-wrap: wrap;
   }
-
-  .el-dropdown-menu__item:focus,
-  .el-dropdown-menu__item:not(.is-disabled):hover {
-    color: #606266;
-    background: #f0f0f0;
-  }
 }
 </style>

src/layout/components/notice/index.vue

@@ -1,8 +1,11 @@
 <script setup lang="ts">
 import { ref } from "vue";
-import NoticeList from "./noticeList.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);
 
@@ -10,38 +13,51 @@ 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 trigger="click" placement="bottom-end">
+  <el-dropdown ref="dropdownDom" trigger="click" placement="bottom-end">
     <span class="dropdown-badge">
       <el-badge :value="noticesNum" :max="99">
-        <el-icon class="header-notice-icon"
+        <span class="header-notice-icon">
-          ><IconifyIconOffline icon="bell"
+          <IconifyIconOffline icon="bell" />
-        /></el-icon>
+        </span>
       </el-badge>
     </span>
     <template #dropdown>
       <el-dropdown-menu>
-        <el-tabs v-model="activeName" class="dropdown-tabs">
+        <Tabs
+          centered
+          class="dropdown-tabs"
+          v-model:activeName="activeName"
+          @tabClick="tabClick"
+        >
           <template v-for="item in notices" :key="item.key">
-            <el-tab-pane
+            <TabPane :tab="`${item.name}(${item.list.length})`">
-              :label="`${item.name}(${item.list.length})`"
-              :name="item.name"
-            >
               <el-scrollbar max-height="330px">
                 <div class="noticeList-container">
                   <NoticeList :list="item.list" />
                 </div>
               </el-scrollbar>
-            </el-tab-pane>
+            </TabPane>
           </template>
-        </el-tabs>
+        </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;
@@ -79,4 +95,8 @@ notices.value.forEach(notice => {
     padding: 15px 24px 0 24px;
   }
 }
+
+:deep(.ant-tabs-nav) {
+  margin-bottom: 0;
+}
 </style>

src/layout/components/notice/noticeItem.vue

@@ -10,8 +10,8 @@ const props = defineProps({
 });
 
 const titleRef = ref(null);
-const descriptionRef = ref(null);
 const titleTooltip = ref(false);
+const descriptionRef = ref(null);
 const descriptionTooltip = ref(false);
 
 function hoverTitle() {
@@ -50,7 +50,7 @@ function hoverDescription(event, description) {
       :size="30"
       :src="props.noticeItem.avatar"
       class="notice-container-avatar"
-    ></el-avatar>
+    />
     <div class="notice-container-text">
       <div class="notice-text-title">
         <el-tooltip

src/layout/components/notice/noticeList.vue

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

src/layout/components/panel/index.vue

@@ -26,7 +26,7 @@ emitter.on("openPanel", () => {
             <IconifyIconOffline icon="close" />
           </el-icon>
         </div>
-        <div style="border-bottom: 1px solid #dcdfe6"></div>
+        <div style="border-bottom: 1px solid #dcdfe6" />
         <slot />
       </div>
     </div>
@@ -54,7 +54,7 @@ emitter.on("openPanel", () => {
 
 .right-panel {
   width: 100%;
-  max-width: 300px;
+  max-width: 315px;
   height: 100vh;
   position: fixed;
   top: 0;
@@ -105,8 +105,8 @@ emitter.on("openPanel", () => {
 
 .right-panel-items {
   margin-top: 60px;
-  height: 100vh;
+  height: calc(100vh - 60px);
-  overflow: auto;
+  overflow-y: auto;
 }
 
 .project-configuration {
@@ -125,7 +125,7 @@ emitter.on("openPanel", () => {
 
     &:hover {
       cursor: pointer;
-      color: red;
+      color: var(--el-color-primary);
     }
   }
 }

src/layout/components/screenfull/index.vue

@@ -1,5 +1,8 @@
 <script setup lang="ts">
 import { useFullscreen } from "@vueuse/core";
+import { useI18n } from "vue-i18n";
+
+const { t } = useI18n();
 const { isFullscreen, toggle } = useFullscreen();
 </script>
 
@@ -7,9 +10,7 @@ const { isFullscreen, toggle } = useFullscreen();
   <div class="screen-full" @click="toggle">
     <FontIcon
       :title="
-        isFullscreen
+        isFullscreen ? t('buttons.hsexitfullscreen') : t('buttons.hsfullscreen')
-          ? $t('buttons.hsexitfullscreen')
-          : $t('buttons.hsfullscreen')
       "
       :icon="isFullscreen ? 'team-iconexit-fullscreen' : 'team-iconfullscreen'"
     />

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)
+        .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>

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

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

src/layout/components/search/index.vue

@@ -0,0 +1,30 @@
+<script lang="ts" setup>
+import { SearchModal } from "./components";
+import useBoolean from "../../hooks/useBoolean";
+const { bool: show, toggle } = useBoolean();
+function handleSearch() {
+  toggle();
+}
+</script>
+
+<template>
+  <div class="search-container" @click="handleSearch">
+    <IconifyIconOffline icon="search" />
+  </div>
+  <SearchModal v-model:value="show" />
+</template>
+
+<style lang="scss" scoped>
+.search-container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 48px;
+  width: 40px;
+  cursor: pointer;
+
+  &:hover {
+    background: #f6f6f6;
+  }
+}
+</style>

src/layout/components/setting/index.vue

@@ -9,8 +9,7 @@ import {
   useCssModule,
   getCurrentInstance
 } from "vue";
-import rgbHex from "rgb-hex";
+import { find } from "lodash-unified";
-import { find } from "lodash-es";
 import { getConfig } from "/@/config";
 import { useRouter } from "vue-router";
 import panel from "../panel/index.vue";
@@ -24,7 +23,7 @@ import { useEpThemeStoreHook } from "/@/store/modules/epTheme";
 import { storageLocal, storageSession } from "/@/utils/storage";
 import { useMultiTagsStoreHook } from "/@/store/modules/multiTags";
 import { createNewStyle, writeNewStyle } from "../../theme/element-plus";
-import { toggleTheme } from "@zougt/vite-plugin-theme-preprocessor/dist/browser-utils";
+import { toggleTheme } from "@pureadmin/theme/dist/browser-utils";
 
 import dayIcon from "/@/assets/svg/day.svg?component";
 import darkIcon from "/@/assets/svg/dark.svg?component";
@@ -40,27 +39,28 @@ const instanceConfig =
 
 let themeColors = ref<Array<themeColorsType>>([
   // 道奇蓝（默认）
-  { rgb: "27, 42, 71", themeColor: "default" },
+  { color: "#1b2a47", themeColor: "default" },
   // 亮白色
-  { rgb: "255, 255, 255", themeColor: "light" },
+  { color: "#ffffff", themeColor: "light" },
   // 猩红色
-  { rgb: "245, 34, 45", themeColor: "dusk" },
+  { color: "#f5222d", themeColor: "dusk" },
   // 橙红色
-  { rgb: "250, 84, 28", themeColor: "volcano" },
+  { color: "#fa541c", themeColor: "volcano" },
   // 金色
-  { rgb: "250, 219, 20", themeColor: "yellow" },
+  { color: "#fadb14", themeColor: "yellow" },
   // 绿宝石
-  { rgb: "19, 194, 194", themeColor: "mingQing" },
+  { color: "#13c2c2", themeColor: "mingQing" },
   // 酸橙绿
-  { rgb: "82, 196, 26", themeColor: "auroraGreen" },
+  { color: "#52c41a", themeColor: "auroraGreen" },
   // 深粉色
-  { rgb: "235, 47, 150", themeColor: "pink" },
+  { color: "#eb2f96", themeColor: "pink" },
   // 深紫罗兰色
-  { rgb: "114, 46, 209", themeColor: "saucePurple" }
+  { color: "#722ed1", themeColor: "saucePurple" }
 ]);
 
 const verticalRef = templateRef<HTMLElement | null>("verticalRef", null);
 const horizontalRef = templateRef<HTMLElement | null>("horizontalRef", null);
+const mixRef = templateRef<HTMLElement | null>("mixRef", null);
 
 let layoutTheme =
   ref(storageLocal.getItem("responsive-layout")) ||
@@ -96,12 +96,12 @@ const settings = reactive({
 });
 
 const getThemeColorStyle = computed(() => {
-  return rgb => {
+  return color => {
-    return { background: `rgb(${rgb})` };
+    return { background: color };
   };
 });
 
-function changeStorageConfigure(key, val) {
+function storageConfigureChange<T>(key: string, val: T): void {
   const storageConfigure = instance.configure;
   storageConfigure[key] = val;
   instance.configure = storageConfigure;
@@ -110,14 +110,14 @@ function changeStorageConfigure(key, val) {
 function toggleClass(flag: boolean, clsName: string, target?: HTMLElement) {
   const targetEl = target || document.body;
   let { className } = targetEl;
-  className = className.replace(clsName, "");
+  className = className.replace(clsName, "").trim();
   targetEl.className = flag ? `${className} ${clsName} ` : className;
 }
 
 // 灰色模式设置
 const greyChange = (value): void => {
   toggleClass(settings.greyVal, "html-grey", document.querySelector("html"));
-  changeStorageConfigure("grey", value);
+  storageConfigureChange("grey", value);
 };
 
 // 色弱模式设置
@@ -127,57 +127,54 @@ const weekChange = (value): void => {
     "html-weakness",
     document.querySelector("html")
   );
-  changeStorageConfigure("weak", value);
+  storageConfigureChange("weak", value);
 };
 
 const tagsChange = () => {
   let showVal = settings.tabsVal;
-  changeStorageConfigure("hideTabs", showVal);
+  storageConfigureChange("hideTabs", showVal);
   emitter.emit("tagViewsChange", showVal);
 };
 
 const multiTagsCacheChange = () => {
   let multiTagsCache = settings.multiTagsCache;
-  changeStorageConfigure("multiTagsCache", multiTagsCache);
+  storageConfigureChange("multiTagsCache", multiTagsCache);
   useMultiTagsStoreHook().multiTagsCacheChange(multiTagsCache);
 };
 
 // 清空缓存并返回登录页
 function onReset() {
-  toggleClass(getConfig().Grey, "html-grey", document.querySelector("html"));
+  router.push("/login");
-  toggleClass(
+  const { Grey, Weak, MultiTagsCache, EpThemeColor, Layout } = getConfig();
-    getConfig().Weak,
+  useAppStoreHook().setLayout(Layout);
-    "html-weakness",
+  useEpThemeStoreHook().setEpThemeColor(EpThemeColor);
-    document.querySelector("html")
+  useMultiTagsStoreHook().multiTagsCacheChange(MultiTagsCache);
-  );
+  toggleClass(Grey, "html-grey", document.querySelector("html"));
+  toggleClass(Weak, "html-weakness", document.querySelector("html"));
   useMultiTagsStoreHook().handleTags("equal", [
     {
       path: "/welcome",
       parentPath: "/",
       meta: {
         title: "menus.hshome",
-        icon: "home-filled",
+        icon: "home-filled"
-        i18n: true
       }
     }
   ]);
-  useMultiTagsStoreHook().multiTagsCacheChange(getConfig().MultiTagsCache);
-  useEpThemeStoreHook().setEpThemeColor(getConfig().EpThemeColor);
   storageLocal.clear();
   storageSession.clear();
-  router.push("/login");
 }
 
 function onChange(label) {
-  changeStorageConfigure("showModel", label);
+  storageConfigureChange("showModel", label);
   emitter.emit("tagViewsShowModel", label);
 }
 
 // 侧边栏Logo
 function logoChange() {
   unref(logoVal)
-    ? changeStorageConfigure("showLogo", true)
+    ? storageConfigureChange("showLogo", true)
-    : changeStorageConfigure("showLogo", false);
+    : storageConfigureChange("showLogo", false);
   emitter.emit("logoChange", unref(logoVal));
 }
 
@@ -188,14 +185,23 @@ function setFalse(Doms): any {
 }
 
 watch(instance, ({ layout }) => {
+  // 设置wangeditorV5主题色
+  body.style.setProperty("--w-e-toolbar-active-color", layout["epThemeColor"]);
   switch (layout["layout"]) {
     case "vertical":
       toggleClass(true, isSelect, unref(verticalRef));
       debounce(setFalse([horizontalRef]), 50);
+      debounce(setFalse([mixRef]), 50);
       break;
     case "horizontal":
       toggleClass(true, isSelect, unref(horizontalRef));
       debounce(setFalse([verticalRef]), 50);
+      debounce(setFalse([mixRef]), 50);
+      break;
+    case "mix":
+      toggleClass(true, isSelect, unref(mixRef));
+      debounce(setFalse([verticalRef]), 50);
+      debounce(setFalse([horizontalRef]), 50);
       break;
   }
 });
@@ -255,13 +261,13 @@ function setLayoutThemeColor(theme: string) {
     setEpThemeColor(getConfig().EpThemeColor);
   } else {
     const colors = find(themeColors.value, { themeColor: theme });
-    const color = "#" + rgbHex(colors.rgb);
+    setEpThemeColor(colors.color);
-    setEpThemeColor(color);
   }
 }
 
 // 设置ep主题色
 const setEpThemeColor = (color: string) => {
+  // @ts-expect-error
   writeNewStyle(createNewStyle(color));
   useEpThemeStoreHook().setEpThemeColor(color);
   body.style.setProperty("--el-color-primary-active", shadeBgColor(color));
@@ -294,7 +300,7 @@ nextTick(() => {
   settings.weakVal &&
     document.querySelector("html")?.setAttribute("class", "html-weakness");
   settings.tabsVal && tagsChange();
-
+  // @ts-expect-error
   writeNewStyle(createNewStyle(epThemeColor.value));
   dataThemeChange();
 });
@@ -310,30 +316,40 @@ nextTick(() => {
       :active-icon="dayIcon"
       :inactive-icon="darkIcon"
       @change="dataThemeChange"
-    >
+    />
-    </el-switch>
 
     <el-divider>导航栏模式</el-divider>
     <ul class="pure-theme">
-      <el-tooltip class="item" content="左侧菜单模式" placement="bottom">
+      <el-tooltip class="item" content="左侧模式" placement="bottom">
         <li
           :class="layoutTheme.layout === 'vertical' ? $style.isSelect : ''"
           ref="verticalRef"
           @click="setLayoutModel('vertical')"
         >
-          <div></div>
+          <div />
-          <div></div>
+          <div />
         </li>
       </el-tooltip>
 
-      <el-tooltip class="item" content="顶部菜单模式" placement="bottom">
+      <el-tooltip class="item" content="顶部模式" placement="bottom">
         <li
           :class="layoutTheme.layout === 'horizontal' ? $style.isSelect : ''"
           ref="horizontalRef"
           @click="setLayoutModel('horizontal')"
         >
-          <div></div>
+          <div />
-          <div></div>
+          <div />
+        </li>
+      </el-tooltip>
+
+      <el-tooltip class="item" content="混合模式" placement="bottom">
+        <li
+          :class="layoutTheme.layout === 'mix' ? $style.isSelect : ''"
+          ref="mixRef"
+          @click="setLayoutModel('mix')"
+        >
+          <div />
+          <div />
         </li>
       </el-tooltip>
     </ul>
@@ -343,7 +359,7 @@ nextTick(() => {
       <li
         v-for="(item, index) in themeColors"
         :key="index"
-        :style="getThemeColorStyle(item.rgb)"
+        :style="getThemeColorStyle(item.color)"
         @click="setLayoutThemeColor(item.themeColor)"
       >
         <el-icon
@@ -367,8 +383,7 @@ nextTick(() => {
           active-text="开"
           inactive-text="关"
           @change="greyChange"
-        >
+        />
-        </el-switch>
       </li>
       <li v-show="!dataTheme">
         <span>色弱模式</span>
@@ -379,8 +394,7 @@ nextTick(() => {
           active-text="开"
           inactive-text="关"
           @change="weekChange"
-        >
+        />
-        </el-switch>
       </li>
       <li>
         <span>隐藏标签页</span>
@@ -391,8 +405,7 @@ nextTick(() => {
           active-text="开"
           inactive-text="关"
           @change="tagsChange"
-        >
+        />
-        </el-switch>
       </li>
       <li>
         <span>侧边栏Logo</span>
@@ -405,8 +418,7 @@ nextTick(() => {
           active-text="开"
           inactive-text="关"
           @change="logoChange"
-        >
+        />
-        </el-switch>
       </li>
       <li>
         <span>标签页持久化</span>
@@ -417,8 +429,7 @@ nextTick(() => {
           active-text="开"
           inactive-text="关"
           @change="multiTagsCacheChange"
-        >
+        />
-        </el-switch>
       </li>
 
       <li>
@@ -481,15 +492,14 @@ nextTick(() => {
 .pure-theme {
   margin-top: 25px;
   width: 100%;
-  height: 100px;
+  height: 50px;
   display: flex;
   flex-wrap: wrap;
   justify-content: space-around;
 
   li {
-    margin: 10px;
+    width: 18%;
-    width: 36%;
+    height: 45px;
-    height: 70px;
     background: #f0f2f5;
     position: relative;
     overflow: hidden;
@@ -527,6 +537,27 @@ nextTick(() => {
         }
       }
     }
+
+    &:nth-child(3) {
+      div {
+        &:nth-child(1) {
+          width: 100%;
+          height: 30%;
+          background: #1b2a47;
+          box-shadow: 0 0 1px #888;
+        }
+
+        &:nth-child(2) {
+          width: 30%;
+          height: 70%;
+          bottom: 0;
+          left: 0;
+          background: #fff;
+          box-shadow: 0 0 1px #888;
+          position: absolute;
+        }
+      }
+    }
   }
 }
 

src/layout/components/sidebar/breadCrumb.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, watch } from "vue";
-import { isEqual } from "lodash-es";
+import { isEqual } from "lodash-unified";
 import { transformI18n } from "/@/plugins/i18n";
 import { getParentPaths, findRouteByPath } from "/@/router/utils";
 import { useMultiTagsStoreHook } from "/@/store/modules/multiTags";
@@ -65,7 +65,7 @@ const getBreadcrumb = (): void => {
       {
         path: "/welcome",
         parentPath: "/",
-        meta: { title: "menus.hshome", i18n: true }
+        meta: { title: "menus.hshome" }
       } as unknown as RouteLocationMatched
     ].concat(matched);
   }
@@ -104,10 +104,10 @@ const handleLink = (item: RouteLocationMatched): any => {
         <span
           v-if="item.redirect === 'noRedirect' || index == levelList.length - 1"
           class="no-redirect"
-          >{{ transformI18n(item.meta.title, item.meta.i18n) }}</span
+          >{{ transformI18n(item.meta.title) }}</span
         >
         <a v-else @click.prevent="handleLink(item)">
-          {{ transformI18n(item.meta.title, item.meta.i18n) }}
+          {{ transformI18n(item.meta.title) }}
         </a>
       </el-breadcrumb-item>
     </transition-group>