release: update 3.6.2

* refactor: permission

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

* fix: 修复`mix`混合模式导航在生产环境左侧菜单一定机率不显示的问题

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

.env.production

@@ -8,4 +8,12 @@ VITE_ROUTER_HISTORY = "hash"
 VITE_PROXY_DOMAIN_REAL = ""
 
 # 是否为打包后的文件提供传统浏览器兼容性支持 支持 true 不支持 false
-VITE_LEGACY = false
+VITE_LEGACY = false
+
+# 是否在打包时使用cdn替换本地库 替换 true 不替换 false
+VITE_CDN = false
+
+# 是否启用gzip压缩或brotli压缩（分两种情况，删除原始文件和不删除原始文件）
+# 压缩时不删除原始文件的配置：gzip、brotli、both（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认）
+# 压缩时删除原始文件的配置：gzip-clear、brotli-clear、both-clear（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认）
+VITE_COMPRESSION = "none"

.env.staging

@@ -12,3 +12,11 @@ VITE_PROXY_DOMAIN_REAL = ""
 
 # 是否为打包后的文件提供传统浏览器兼容性支持 支持 true 不支持 false
 VITE_LEGACY = false
+
+# 是否在打包时使用cdn替换本地库 替换 true 不替换 false
+VITE_CDN = false
+
+# 是否启用gzip压缩或brotli压缩（分两种情况，删除原始文件和不删除原始文件）
+# 压缩时不删除原始文件的配置：gzip、brotli、both（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认）
+# 压缩时删除原始文件的配置：gzip-clear、brotli-clear、both-clear（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认）
+VITE_COMPRESSION = "none"

.eslintignore

@@ -1,4 +1,10 @@
 public
 dist
 *.d.ts
-package.json
+package.json
+.eslintrc.js
+.prettierrc.js
+commitlint.config.js
+postcss.config.js
+tailwind.config.js
+stylelint.config.js

.eslintrc.js

@@ -49,6 +49,29 @@ module.exports = {
       jsx: true
     }
   },
+  overrides: [
+    {
+      files: ["*.ts", "*.vue"],
+      rules: {
+        "no-undef": "off"
+      }
+    },
+    {
+      files: ["*.vue"],
+      parser: "vue-eslint-parser",
+      parserOptions: {
+        parser: "@typescript-eslint/parser",
+        extraFileExtensions: [".vue"],
+        ecmaVersion: "latest",
+        ecmaFeatures: {
+          jsx: true
+        }
+      },
+      rules: {
+        "no-undef": "off"
+      }
+    }
+  ],
   rules: {
     "vue/no-v-html": "off",
     "vue/require-default-prop": "off",
@@ -94,4 +117,4 @@ module.exports = {
       }
     ]
   }
-};
+}

.github/workflows/gitee.yml

@@ -0,0 +1,39 @@
+name: Build and Deploy
+permissions:
+  contents: write
+on:
+  push:
+    branches:
+      - master
+jobs:
+  deploy:
+    concurrency: ci-${{ github.ref }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v3
+
+      - 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: Deploy 🔧
+        run: |
+          pnpm install
+          sed -i "s#VITE_PUBLIC_PATH = /#VITE_PUBLIC_PATH = /vue-pure-admin/#g" $(pwd)/.env.production
+          pnpm build
+          cd dist
+          touch README.md .nojekyll
+
+      - name: Deploy 🚀
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          folder: dist
+          clean: true

.github/workflows/linter.yml

@@ -60,6 +60,7 @@ jobs:
         run: |
           pnpm install
           pnpm lint
+          pnpm typecheck
         env:
           VALIDATE_ALL_CODEBASE: false
           DEFAULT_BRANCH: main

.github/workflows/preview.yml

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

.gitignore

@@ -4,6 +4,7 @@ dist
 dist-ssr
 *.local
 .eslintcache
+report.html
 
 yarn.lock
 npm-debug.log*
@@ -17,3 +18,4 @@ tests/**/coverage/
 *.ntvs*
 *.njsproj
 *.sln
+tsconfig.tsbuildinfo

.gitpod.yml

@@ -2,4 +2,4 @@ ports:
   - port: 3344
     onOpen: open-preview
 tasks:
-  - init: npm install && npm run serve
+  - init: pnpm install && pnpm serve

.husky/lintstagedrc.js

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

.npmrc

@@ -0,0 +1,3 @@
+shamefully-hoist=true
+strict-peer-dependencies=false
+shell-emulator=true

.vscode/extensions.json

@@ -1,15 +1,18 @@
 {
   "recommendations": [
+    "christian-kohler.path-intellisense",
     "vscode-icons-team.vscode-icons",
     "davidanson.vscode-markdownlint",
     "stylelint.vscode-stylelint",
+    "bradlc.vscode-tailwindcss",
     "dbaeumer.vscode-eslint",
     "esbenp.prettier-vscode",
-    "johnsoncodehk.volar",
     "lokalise.i18n-ally",
+    "redhat.vscode-yaml",
+    "csstools.postcss",
     "mikestead.dotenv",
     "eamodio.gitlens",
     "antfu.iconify",
-    "antfu.unocss"
+    "Vue.volar"
   ]
 }

.vscode/settings.json

@@ -6,6 +6,7 @@
   },
   "editor.tabSize": 2,
   "editor.formatOnPaste": true,
+  "editor.guides.bracketPairs": "active",
   "files.autoSave": "afterDelay",
   "git.confirmSync": false,
   "workbench.startupEditor": "newUntitledFile",
@@ -33,5 +34,6 @@
   "i18n-ally.enabledParsers": ["yaml", "js"],
   "i18n-ally.sourceLanguage": "en",
   "i18n-ally.displayLanguage": "zh-CN",
-  "i18n-ally.enabledFrameworks": ["vue"]
+  "i18n-ally.enabledFrameworks": ["vue"],
+  "iconify.excludes": ["el"]
 }

CHANGELOG.en_US.md

@@ -1,3 +1,124 @@
+# 3.6.2 (2022-10-27)
+
+### ✔️ refactor
+
+- Replace `/@/` alias with `@/` alias
+
+# 3.6.1 (2022-10-27)
+
+### 🎫 Feat
+
+- Add whether to start `cdn` for packaging to replace the local library configuration, the default `false` does not start
+- Added optional `gzip` and `brotli` compression modes for packaging builds
+
+### 🐞 Bug fixes
+
+- Fix `title` too long display style problem
+- Fix the parent `name` in the route should not be repeated with the child `name`, which will cause redirection to jump `404` problem
+
+### 🍏 Perf
+
+- Upgrade `axios` to the latest version
+
+# 3.6.0 (2022-10-25)
+
+### 🎫 Feat
+
+- Add file download `demo`
+- Add typewriter component `demo`
+- Added `json` editor `demo`
+
+### ✔️ refactor
+
+- Refactor the permission module, adopt the most commonly used `RBAC` (Role-Based Access List): role-based permission control (User -> Role -> Permission), and update the page permission and button permission `demo` example, button Permissions support three operation modes (judging permissions in component mode, judging permissions in function mode, and judging permissions in instruction mode)
+
+### 🐞 Bug fixes
+
+- Fixed the theme not being emptied when clearing the cache and returning to the login page
+- Fix `menu` display problem in production environment in `horizontal` mode
+- Fixed the problem that the `mix` mixed mode navigation might not be displayed in the left menu of the production environment
+- After the `token` expires, calling the refresh `token` interface will cause an infinite loop
+
+### 🍏 Perf
+
+- Removed uncommon `@apply` from `tailwind.css`
+- Replace `//` comments with `/** */`, which is more friendly to the editor's intellisense
+- Optimize the login enter event
+- Simplified some functions, eliminated useless functions, and optimized page loading speed
+
+# 3.5.0 (2022-9-10)
+
+### 🎫 Feat
+
+- Add `cssnano` to compress the size of `css` when packaging
+- Add `element-plus` seamless scrolling `Table` page demo
+- Open `vscode` bracket pair guide
+
+### ✔️ refactor
+
+- Replace `unocss` with `tailwindcss`, add `tailwindcss` [documentation](https://xiaoxian521.github.io/pure-admin-doc/pages/39156f/)
+
+### 🐞 Bug fixes
+
+- `token` expires, refresh the infinite loop
+
+### 🍏 Perf
+
+- When resetting the route, clear the cached page
+
+# 3.4.6 (2022-8-23)
+
+### 🐞 Bug fixes
+
+- `process` is not defined in path
+- Fixed an error when dynamic routing `children` is an empty array
+- Fixed `iframe` loading failure
+
+# 3.4.5 (2022-8-22)
+
+### 🐞 Bug fixes
+
+- Fix local responsive storage object setting issue
+
+# 3.4.0 (2022-8-22)
+
+### 🍏 Perf
+
+- Optimized routing
+- Optimized for mobile compatibility
+- Optimized routing parameters (`query`, `params` way to refresh the page does not need to open the tab page cache, the parameters can be retained on the `url` and `tab page`)
+
+# 3.3.5 (2022-8-19)
+
+### 🎫 Feat
+
+- Secondary encapsulation of `Table` of `element-plus` into [@pureadmin/table](https://github.com/xiaoxian521/pure-admin-table), providing flexible configuration items and integrating into the platform
+- Secondary encapsulation of `Descriptions` of `element-plus` into [@pureadmin/descriptions](https://github.com/xiaoxian521/pure-admin-descriptions), providing flexible configuration items and integrating into the platform
+- Centralize most of the tools and hooks of the platform to [@pureadmin/utils](https://pure-admin-utils-docs.vercel.app/), and delete the code concentrated in this library to reduce the size of the platform
+- Add [unplugin-vue-define-options](https://www.npmjs.com/package/unplugin-vue-define-options) plugin, the page can directly write `defineOptions({name: custom name})`
+- Add project files, language analysis tool [cloc](https://www.npmjs.com/package/cloc)
+- Added landing page internationalization
+- Add full routing configuration table type declaration
+- Add virtual listing page demo
+- Add `PDF` preview page demo
+- Added export `execl` page demo
+- Added blank page demo without `Layout`
+
+### ✔️ refactor
+
+- Refactored the theme color to adapt to `element-plus` dark mode (also solved the problem that the same element `css` in `3.3.0` and earlier versions was overwritten many times, resulting in poor style debugging)
+- Refactored route reset function
+
+### 🍏 Perf
+
+- The compatible project storage directory is named in Chinese, but we really do not recommend Chinese naming, because a library may not escape the Chinese path, causing the project to crash
+- Optimized interface type
+
+### 🐞 Bug fixes
+
+- Fixed async routes with `showlink` set to `false`, not showing after refresh
+- Fixed vertical navigation menu text being hidden after collapse when there is no `icon`
+
 # 3.3.0 (2022-5-11)
 
 ### 🎫 Feat

CHANGELOG.md

@@ -1,3 +1,124 @@
+# 3.6.2 (2022-10-27)
+
+### ✔️ refactor
+
+- Replace `/@/` alias with `@/` alias
+
+# 3.6.1 (2022-10-27)
+
+### 🎫 Feat
+
+- Add whether to start `cdn` for packaging to replace the local library configuration, the default `false` does not start
+- Added optional `gzip` and `brotli` compression modes for packaging builds
+
+### 🐞 Bug fixes
+
+- Fix `title` too long display style problem
+- Fix the parent `name` in the route should not be repeated with the child `name`, which will cause redirection to jump `404` problem
+
+### 🍏 Perf
+
+- Upgrade `axios` to the latest version
+
+# 3.6.0 (2022-10-25)
+
+### 🎫 Feat
+
+- Add file download `demo`
+- Add typewriter component `demo`
+- Added `json` editor `demo`
+
+### ✔️ refactor
+
+- Refactor the permission module, adopt the most commonly used `RBAC` (Role-Based Access List): role-based permission control (User -> Role -> Permission), and update the page permission and button permission `demo` example, button Permissions support three operation modes (judging permissions in component mode, judging permissions in function mode, and judging permissions in instruction mode)
+
+### 🐞 Bug fixes
+
+- Fixed the theme not being emptied when clearing the cache and returning to the login page
+- Fix `menu` display problem in production environment in `horizontal` mode
+- Fixed the problem that the `mix` mixed mode navigation might not be displayed in the left menu of the production environment
+- After the `token` expires, calling the refresh `token` interface will cause an infinite loop
+
+### 🍏 Perf
+
+- Removed uncommon `@apply` from `tailwind.css`
+- Replace `//` comments with `/** */`, which is more friendly to the editor's intellisense
+- Optimize the login enter event
+- Simplified some functions, eliminated useless functions, and optimized page loading speed
+
+# 3.5.0 (2022-9-10)
+
+### 🎫 Feat
+
+- Add `cssnano` to compress the size of `css` when packaging
+- Add `element-plus` seamless scrolling `Table` page demo
+- Open `vscode` bracket pair guide
+
+### ✔️ refactor
+
+- Replace `unocss` with `tailwindcss`, add `tailwindcss` [documentation](https://xiaoxian521.github.io/pure-admin-doc/pages/39156f/)
+
+### 🐞 Bug fixes
+
+- `token` expires, refresh the infinite loop
+
+### 🍏 Perf
+
+- When resetting the route, clear the cached page
+
+# 3.4.6 (2022-8-23)
+
+### 🐞 Bug fixes
+
+- `process` is not defined in path
+- Fixed an error when dynamic routing `children` is an empty array
+- Fixed `iframe` loading failure
+
+# 3.4.5 (2022-8-22)
+
+### 🐞 Bug fixes
+
+- Fix local responsive storage object setting issue
+
+# 3.4.0 (2022-8-22)
+
+### 🍏 Perf
+
+- Optimized routing
+- Optimized for mobile compatibility
+- Optimized routing parameters (`query`, `params` way to refresh the page does not need to open the tab page cache, the parameters can be retained on the `url` and `tab page`)
+
+# 3.3.5 (2022-8-19)
+
+### 🎫 Feat
+
+- Secondary encapsulation of `Table` of `element-plus` into [@pureadmin/table](https://github.com/xiaoxian521/pure-admin-table), providing flexible configuration items and integrating into the platform
+- Secondary encapsulation of `Descriptions` of `element-plus` into [@pureadmin/descriptions](https://github.com/xiaoxian521/pure-admin-descriptions), providing flexible configuration items and integrating into the platform
+- Centralize most of the tools and hooks of the platform to [@pureadmin/utils](https://pure-admin-utils-docs.vercel.app/), and delete the code concentrated in this library to reduce the size of the platform
+- Add [unplugin-vue-define-options](https://www.npmjs.com/package/unplugin-vue-define-options) plugin, the page can directly write `defineOptions({name: custom name})`
+- Add project files, language analysis tool [cloc](https://www.npmjs.com/package/cloc)
+- Added landing page internationalization
+- Add full routing configuration table type declaration
+- Add virtual listing page demo
+- Add `PDF` preview page demo
+- Added export `execl` page demo
+- Added blank page demo without `Layout`
+
+### ✔️ refactor
+
+- Refactored the theme color to adapt to `element-plus` dark mode (also solved the problem that the same element `css` in `3.3.0` and earlier versions was overwritten many times, resulting in poor style debugging)
+- Refactored route reset function
+
+### 🍏 Perf
+
+- The compatible project storage directory is named in Chinese, but we really do not recommend Chinese naming, because a library may not escape the Chinese path, causing the project to crash
+- Optimized interface type
+
+### 🐞 Bug fixes
+
+- Fixed async routes with `showlink` set to `false`, not showing after refresh
+- Fixed vertical navigation menu text being hidden after collapse when there is no `icon`
+
 # 3.3.0 (2022-5-11)
 
 ### 🎫 Feat

CHANGELOG.zh_CN.md

@@ -1,3 +1,124 @@
+# 3.6.2 (2022-10-27)
+
+### ✔️ refactor
+
+- 使用`@/`别名替换`/@/`别名
+
+# 3.6.1 (2022-10-27)
+
+### 🎫 Feat
+
+- 添加打包是否启动`cdn`替换本地库配置，默认`false`不启动
+- 添加打包构建可选`gzip`与`brotli`压缩模式
+
+### 🐞 Bug fixes
+
+- 修复`title`过长显示样式问题
+- 修复路由中父级`name`不应和子级`name`重复，会造成重定向跳转`404`问题
+
+### 🍏 Perf
+
+- 升级`axios`至最新版
+
+# 3.6.0 (2022-10-25)
+
+### 🎫 Feat
+
+- 添加文件下载`demo`
+- 添加打字机组件`demo`
+- 添加`json`编辑器`demo`
+
+### ✔️ refactor
+
+- 重构权限模块，采用目前最常用的`RBAC`（Role-Based Access List）: 基于角色的权限控制（ 用户 -> 角色 -> 权限 ），并更新页面权限和按钮权限`demo`示例，按钮权限支持三种操作模式（组件方式判断权限、函数方式判断权限、指令方式判断权限）
+
+### 🐞 Bug fixes
+
+- 修复清空缓存并返回登录页时未清空主题
+- 修复`horizontal`模式下`menu`在生产环境显示问题
+- 修复`mix`混合模式导航在生产环境左侧菜单一定机率不显示的问题
+- `token`过期后调用刷新`token`接口会无限循环的问题
+
+### 🍏 Perf
+
+- 从`tailwind.css`中移除不常用的`@apply`
+- 使用`/** */`替换`//`注释，对编辑器的智能提示更友好
+- 优化登录回车事件
+- 简化了一些函数，剔除了无用函数，优化了页面加载速度
+
+# 3.5.0 (2022-9-10)
+
+### 🎫 Feat
+
+- 添加 `cssnano` ，打包时压缩 `css` 体积
+- 添加 `element-plus` 无缝滚动 `Table` 页面 demo
+- 开启 `vscode` 括号对指南
+
+### ✔️ refactor
+
+- 使用 `tailwindcss` 替换 `unocss`，新增 `tailwindcss` [使用文档](http://yiming_chang.gitee.io/pure-admin-doc/pages/39156f/)
+
+### 🐞 Bug fixes
+
+- `token` 过期，刷新死循环
+
+### 🍏 Perf
+
+- 重置路由时，清空缓存页面
+
+# 3.4.6 (2022-8-23)
+
+### 🐞 Bug fixes
+
+- `process` is not defined in path
+- 修复动态路由`children`为空数组时报错
+- 修复`iframe`加载失败
+
+# 3.4.5 (2022-8-22)
+
+### 🐞 Bug fixes
+
+- 修复本地响应式存储对象设置问题
+
+# 3.4.0 (2022-8-22)
+
+### 🍏 Perf
+
+- 优化路由
+- 优化移动端兼容性
+- 优化路由传参（`query`、`params` 方式刷新页面不需要再开启标签页缓存也能保留参数在`url`和`标签页`上）
+
+# 3.3.5 (2022-8-19)
+
+### 🎫 Feat
+
+- 将 `element-plus` 的 `Table` 二次封装到[@pureadmin/table](https://github.com/xiaoxian521/pure-admin-table)，提供灵活的配置项并集成到平台里
+- 将 `element-plus` 的 `Descriptions` 二次封装到[@pureadmin/descriptions](https://github.com/xiaoxian521/pure-admin-descriptions)，提供灵活的配置项并集成到平台里
+- 将平台的大部分工具以及 hooks 都集中到[@pureadmin/utils](https://pure-admin-utils-docs.vercel.app/)，并删除集中到这个库里的代码，减少平台体积
+- 添加[unplugin-vue-define-options](https://www.npmjs.com/package/unplugin-vue-define-options)插件，页面可直接写 `defineOptions({name: 自定义名称})`
+- 添加项目文件、语言分析工具 [cloc](https://www.npmjs.com/package/cloc)
+- 添加登录页国际化
+- 添加完整路由配置表类型声明
+- 添加虚拟列表页面 demo
+- 添加 `PDF` 预览页面 demo
+- 添加导出 `execl` 页面 demo
+- 添加无 `Layout` 的空白页面 demo
+
+### ✔️ refactor
+
+- 重构主题色，适配 `element-plus` 暗黑模式（同时也解决了 `3.3.0` 及更低版本中同样的元素 `css` 被多次覆盖，导致样式不好调试的问题）
+- 重构路由重置功能
+
+### 🍏 Perf
+
+- 兼容项目存放目录以中文命名，但我们真心不推荐中文命名，因为可能某个库没有对中文路径做转义处理，导致项目奔溃
+- 优化接口类型
+
+### 🐞 Bug fixes
+
+- 修复路由 `showlink` 为 `false` 的异步路由，刷新后不显示
+- 修复当没有 `icon` 时，垂直导航菜单折叠后文字被隐藏
+
 # 3.3.0 (2022-5-11)
 
 ### 🎫 Feat
@@ -21,7 +142,7 @@
 
 ### ✔️ refactor
 
-- 重构登陆页，更偏向实际业务场景
+- 重构登录页，更偏向实际业务场景
 - 使用`unocss`替换`windicss`，`unocss`开发环境下性能更好，没有内存泄露，而且`api`使用上兼容`windicss`
 
 ### 🍏 Perf

README.en-US.md

@@ -17,7 +17,9 @@ vue-pure-admin is a free and open source middle and back-end template. Using the
 
 ## Docs
 
-- [Click Watch Docs](https://pure-admin-doc.vercel.app)
+- [Click me to view the domestic documentation site](http://yiming_chang.gitee.io/pure-admin-doc)
+- [Click me to view foreign document site 1](https://xiaoxian521.github.io/pure-admin-doc)
+- [Click me to view foreign document site 2](https://pure-admin-doc.vercel.app)
 
 ## Thin
 
@@ -29,12 +31,23 @@ vue-pure-admin is a free and open source middle and back-end template. Using the
 
 ## Preview
 
-- [vue-pure-admin](https://vue-pure-admin.vercel.app)
+- [Click me to view the domestic preview station](http://yiming_chang.gitee.io/vue-pure-admin)
+- [Click me to view foreign preview site 1](https://xiaoxian521.github.io/vue-pure-admin)
+- [Click me to view foreign preview station 2](https://vue-pure-admin.vercel.app)
 
+- PC
 <p align="center">
-  <img alt="PureAdmin Logo" width="100%" src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/b4857fc7eb7d4c0f8deeefc644c1f7dd~tplv-k3u1fbpfcp-watermark.awebp?">
+  <img alt="PureAdmin Logo" width="100%" src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/d45c15ccbe674fe291a4faa528d11eda~tplv-k3u1fbpfcp-zoom-in-crop-mark:3024:0:0:0.awebp?">
-  <img alt="PureAdmin Logo" width="100%" src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/549c3184697f4d268a78c9833e5ec2ea~tplv-k3u1fbpfcp-watermark.awebp?">
+</p>
-  <img alt="PureAdmin Logo" width="100%" src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/381fc957fac143db9f06efdd389d88a3~tplv-k3u1fbpfcp-watermark.awebp?">
+
+- DarkMode
+<p align="center">
+  <img alt="PureAdmin Logo" width="100%" src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/10a351f0d9c94b90ba3b408a786b9ede~tplv-k3u1fbpfcp-zoom-in-crop-mark:3024:0:0:0.awebp?">
+</p>
+
+- Mobile
+<p align="center">
+  <img alt="PureAdmin Logo" width="100%" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/3061c7b92f6d4cb4bcdf227d966ac696~tplv-k3u1fbpfcp-zoom-in-crop-mark:3024:0:0:0.awebp?">
 </p>
 
 ### Use Gitpod
@@ -141,6 +154,8 @@ Thank you very much for your support, I believe the project will get better and
 |                                                                xueyuheng                                                                 |                                                                taolei1990                                                                 |                                                                hang-kim                                                                 |                                                               madwolfcrazy                                                                |                                                                limuen                                                                 |                                                                BenLakes                                                                 |
 | :--------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------: |
 | <a href="https://github.com/xueyuheng"><img src="https://avatars.githubusercontent.com/u/48202935?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/taolei1990"><img src="https://avatars.githubusercontent.com/u/23173640?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/hang-kim"><img src="https://avatars.githubusercontent.com/u/52914259?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/madwolfcrazy"><img src="https://avatars.githubusercontent.com/u/223671?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/limuen"><img src="https://avatars.githubusercontent.com/u/31790606?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/BenLakes"><img src="https://avatars.githubusercontent.com/u/15206046?v=4" width="60px" height="60px" /></a> |
+|                                                                mollerzhu                                                                 |                                                                  TLovers                                                                  |                                                                  cnyyk                                                                  |                                                                                                                                           |                                                                                                                                       |                                                                                                                                         |
+| <a href="https://github.com/mollerzhu"><img src="https://avatars.githubusercontent.com/u/49627902?v=4" width="60px" height="60px" /></a> |  <a href="https://github.com/TLovers"><img src="https://avatars.githubusercontent.com/u/26561694?v=4" width="60px" height="60px" /></a>   |   <a href="https://github.com/cnyyk"><img src="https://avatars.githubusercontent.com/u/275233?v=4" width="60px" height="60px" /></a>    |                                                                                                                                           |                                                                                                                                       |                                                                                                                                         |
 
 ## Contributors
 

README.md

@@ -17,7 +17,9 @@ vue-pure-admin 是一个免费开源的中后台模版。使用了最新的`vue3
 
 ## 配套文档
 
-- [点我查看文档](https://pure-admin-doc.vercel.app)
+- [点我查看国内文档站](http://yiming_chang.gitee.io/pure-admin-doc)
+- [点我查看国外文档站 1](https://xiaoxian521.github.io/pure-admin-doc)
+- [点我查看国外文档站 2](https://pure-admin-doc.vercel.app)
 
 ## 精简版
 
@@ -29,12 +31,23 @@ vue-pure-admin 是一个免费开源的中后台模版。使用了最新的`vue3
 
 ## 预览
 
-- [vue-pure-admin](https://vue-pure-admin.vercel.app)
+- [点我查看国内预览站](http://yiming_chang.gitee.io/vue-pure-admin)
+- [点我查看国外预览站 1](https://xiaoxian521.github.io/vue-pure-admin)
+- [点我查看国外预览站 2](https://vue-pure-admin.vercel.app)
 
+- PC 端
 <p align="center">
-  <img alt="PureAdmin Logo" width="100%" src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/b4857fc7eb7d4c0f8deeefc644c1f7dd~tplv-k3u1fbpfcp-watermark.awebp?">
+  <img alt="PureAdmin Logo" width="100%" src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/d45c15ccbe674fe291a4faa528d11eda~tplv-k3u1fbpfcp-zoom-in-crop-mark:3024:0:0:0.awebp?">
-  <img alt="PureAdmin Logo" width="100%" src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/549c3184697f4d268a78c9833e5ec2ea~tplv-k3u1fbpfcp-watermark.awebp?">
+</p>
-  <img alt="PureAdmin Logo" width="100%" src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/381fc957fac143db9f06efdd389d88a3~tplv-k3u1fbpfcp-watermark.awebp?">
+
+- 暗黑模式
+<p align="center">
+  <img alt="PureAdmin Logo" width="100%" src="https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/10a351f0d9c94b90ba3b408a786b9ede~tplv-k3u1fbpfcp-zoom-in-crop-mark:3024:0:0:0.awebp?">
+</p>
+
+- 移动端
+<p align="center">
+  <img alt="PureAdmin Logo" width="100%" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/3061c7b92f6d4cb4bcdf227d966ac696~tplv-k3u1fbpfcp-zoom-in-crop-mark:3024:0:0:0.awebp?">
 </p>
 
 ### 使用 Gitpod
@@ -130,9 +143,9 @@ pnpm build
 
 ## QQ 交流群
 
-群里严禁`黄`、`赌`、`毒`、`vpn`等违法行为！
+一群已满，下面是二群，群里严禁`黄`、`赌`、`毒`、`vpn`等违法行为！
 
-<img src="https://p9-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/f0697596aec84661b724f6eebdf8db17~tplv-k3u1fbpfcp-watermark.awebp?" width="150px" height="225px" />
+<img src="http://yiming_chang.gitee.io/pure-admin-doc/img/support/qq.png" width="150px" height="225px" />
 
 ## 许可证
 
@@ -144,9 +157,11 @@ pnpm build
 
 非常感谢你们的支持，相信项目会越来越好 :heart:
 
-|                                                                xueyuheng                                                                 |                                                                taolei1990                                                                 |                                                                hang-kim                                                                 |                                                               madwolfcrazy                                                                |                                                                limuen                                                                 |                                                                BenLakes                                                                 |                                                                mollerzhu                                                                 |
+|                                                                xueyuheng                                                                 |                                                                taolei1990                                                                 |                                                                hang-kim                                                                 |                                                               madwolfcrazy                                                                |                                                                limuen                                                                 |                                                                BenLakes                                                                 |
-| :--------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------: |
+| :--------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------: |
-| <a href="https://github.com/xueyuheng"><img src="https://avatars.githubusercontent.com/u/48202935?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/taolei1990"><img src="https://avatars.githubusercontent.com/u/23173640?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/hang-kim"><img src="https://avatars.githubusercontent.com/u/52914259?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/madwolfcrazy"><img src="https://avatars.githubusercontent.com/u/223671?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/limuen"><img src="https://avatars.githubusercontent.com/u/31790606?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/BenLakes"><img src="https://avatars.githubusercontent.com/u/15206046?v=4" width="60px" height="60px" /></a> | <a href="https://github.com/mollerzhu"><img src="https://avatars.githubusercontent.com/u/49627902?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> |
+|                                                                mollerzhu                                                                 |                                                                  TLovers                                                                  |                                                                  cnyyk                                                                  |                                                                                                                                           |                                                                                                                                       |                                                                                                                                         |
+| <a href="https://github.com/mollerzhu"><img src="https://avatars.githubusercontent.com/u/49627902?v=4" width="60px" height="60px" /></a> |  <a href="https://github.com/TLovers"><img src="https://avatars.githubusercontent.com/u/26561694?v=4" width="60px" height="60px" /></a>   |   <a href="https://github.com/cnyyk"><img src="https://avatars.githubusercontent.com/u/275233?v=4" width="60px" height="60px" /></a>    |                                                                                                                                           |                                                                                                                                       |                                                                                                                                         |
 
 ## 贡献者
 

build/cdn.ts

@@ -0,0 +1,67 @@
+import { Plugin as importToCDN } from "vite-plugin-cdn-import";
+
+/**
+ * @description 打包时采用`cdn`模式，仅限外网使用（默认不采用，如果需要采用cdn模式，请在 .env.production 文件，将 VITE_CDN 设置成true）
+ * 平台采用国内cdn：https://www.bootcdn.cn，当然你也可以选择 https://unpkg.com 或者 https://www.jsdelivr.com
+ * 提醒：mockjs不能用cdn模式引入，会报错。正确的方式是，生产环境删除mockjs，使用真实的后端请求
+ * 注意：上面提到的仅限外网使用也不是完全肯定的，如果你们公司内网部署的有相关js、css文件，也可以将下面配置对应改一下，整一套内网版cdn
+ */
+export const cdn = importToCDN({
+  //（prodUrl解释： name: 对应下面modules的name，version: 自动读取本地package.json中dependencies依赖中对应包的版本号，path: 对应下面modules的path）
+  prodUrl: "https://cdn.bootcdn.net/ajax/libs/{name}/{version}/{path}",
+  modules: [
+    {
+      name: "vue",
+      var: "Vue",
+      path: "vue.global.prod.min.js"
+    },
+    {
+      name: "vue-router",
+      var: "VueRouter",
+      path: "vue-router.global.min.js"
+    },
+    {
+      name: "vue-i18n",
+      var: "VueI18n",
+      path: "vue-i18n.runtime.global.prod.min.js"
+    },
+    // 项目中没有直接安装vue-demi，但是pinia用到了，所以需要在引入pinia前引入vue-demi（https://github.com/vuejs/pinia/blob/v2/packages/pinia/package.json#L77）
+    {
+      name: "vue-demi",
+      var: "VueDemi",
+      path: "index.iife.min.js"
+    },
+    {
+      name: "pinia",
+      var: "Pinia",
+      path: "pinia.iife.min.js"
+    },
+    {
+      name: "element-plus",
+      var: "ElementPlus",
+      path: "index.full.min.js",
+      css: "index.min.css"
+    },
+    {
+      name: "axios",
+      var: "axios",
+      path: "axios.min.js"
+    },
+    {
+      name: "dayjs",
+      var: "dayjs",
+      path: "dayjs.min.js"
+    },
+    {
+      name: "echarts",
+      var: "echarts",
+      path: "echarts.min.js"
+    },
+    {
+      name: "lodash",
+      var: "lodash",
+      // 可写`完整路径`，会替换`prodUrl`
+      path: "https://cdn.bootcdn.net/ajax/libs/lodash.js/4.17.21/lodash.min.js"
+    }
+  ]
+});

build/compress.ts

@@ -0,0 +1,63 @@
+import type { Plugin } from "vite";
+import { isArray } from "@pureadmin/utils";
+import compressPlugin from "vite-plugin-compression";
+
+export const configCompressPlugin = (
+  compress: ViteCompression
+): Plugin | Plugin[] => {
+  if (compress === "none") return null;
+
+  const gz = {
+    // 生成的压缩包后缀
+    ext: ".gz",
+    // 体积大于threshold才会被压缩
+    threshold: 0,
+    // 默认压缩.js|mjs|json|css|html后缀文件，设置成true，压缩全部文件
+    filter: () => true,
+    // 压缩后是否删除原始文件
+    deleteOriginFile: false
+  };
+  const br = {
+    ext: ".br",
+    algorithm: "brotliCompress",
+    threshold: 0,
+    filter: () => true,
+    deleteOriginFile: false
+  };
+
+  const codeList = [
+    { k: "gzip", v: gz },
+    { k: "brotli", v: br },
+    { k: "both", v: [gz, br] }
+  ];
+
+  const plugins: Plugin[] = [];
+
+  codeList.forEach(item => {
+    if (compress.includes(item.k)) {
+      if (compress.includes("clear")) {
+        if (isArray(item.v)) {
+          item.v.forEach(vItem => {
+            plugins.push(
+              compressPlugin(Object.assign(vItem, { deleteOriginFile: true }))
+            );
+          });
+        } else {
+          plugins.push(
+            compressPlugin(Object.assign(item.v, { deleteOriginFile: true }))
+          );
+        }
+      } else {
+        if (isArray(item.v)) {
+          item.v.forEach(vItem => {
+            plugins.push(compressPlugin(vItem));
+          });
+        } else {
+          plugins.push(compressPlugin(item.v));
+        }
+      }
+    }
+  });
+
+  return plugins;
+};

build/index.ts

@@ -1,13 +1,15 @@
-// 处理环境变量
+/** 处理环境变量 */
 const warpperEnv = (envConf: Recordable): ViteEnv => {
-  // 此处为默认值，无需修改
+  /** 此处为默认值，无需修改 */
   const ret: ViteEnv = {
     VITE_PORT: 8848,
     VITE_PUBLIC_PATH: "",
     VITE_PROXY_DOMAIN: "",
     VITE_PROXY_DOMAIN_REAL: "",
     VITE_ROUTER_HISTORY: "",
-    VITE_LEGACY: false
+    VITE_LEGACY: false,
+    VITE_CDN: false,
+    VITE_COMPRESSION: "none"
   };
 
   for (const envName of Object.keys(envConf)) {
@@ -28,12 +30,12 @@ const warpperEnv = (envConf: Recordable): ViteEnv => {
   return ret;
 };
 
-// 跨域代理重写
+/** 跨域代理重写 */
 const regExps = (value: string, reg: string): string => {
-  return value.replace(new RegExp(reg, "g"), "");
+  return value.replace(new RegExp(`^${reg}`, "g"), "");
 };
 
-// 环境变量
+/** 环境变量 */
 const loadEnv = (): ViteEnv => {
   return import.meta.env;
 };

build/info.ts

@@ -1,45 +1,10 @@
-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";
+import { getPackageSize } from "@pureadmin/utils";
 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;
@@ -66,18 +31,18 @@ export function viteBuildInfo(): Plugin {
     closeBundle() {
       if (config.command === "build") {
         endTime = dayjs(new Date());
-        recursiveDirectory(staticPath, () => {
+        getPackageSize({
-          console.log(
+          callback: (size: string) => {
-            bold(
+            console.log(
-              green(
+              bold(
-                `恭喜打包完成🎉（总用时${dayjs
+                green(
-                  .duration(endTime.diff(startTime))
+                  `🎉恭喜打包完成（总用时${dayjs
-                  .format("mm分ss秒")}，打包后的大小为${formatBytes(
+                    .duration(endTime.diff(startTime))
-                  sum(fileListTotal)
+                    .format("mm分ss秒")}，打包后的大小为${size}）`
-                )}）`
+                )
               )
-            )
+            );
-          );
+          }
         });
       }
     }

build/plugins.ts

@@ -1,18 +1,25 @@
+import { cdn } from "./cdn";
 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 { viteMockServe } from "vite-plugin-mock";
+import { configCompressPlugin } from "./compress";
 import VueI18n from "@intlify/vite-plugin-vue-i18n";
 import { visualizer } from "rollup-plugin-visualizer";
 import removeConsole from "vite-plugin-remove-console";
 import themePreprocessorPlugin from "@pureadmin/theme";
-import { genScssMultipleScopeVars } from "/@/layout/theme";
+import DefineOptions from "unplugin-vue-define-options/vite";
+import { genScssMultipleScopeVars } from "../src/layout/theme";
 
-export function getPluginsList(command, VITE_LEGACY) {
+export function getPluginsList(
+  command: string,
+  VITE_LEGACY: boolean,
+  VITE_CDN: boolean,
+  VITE_COMPRESSION: ViteCompression
+) {
   const prodMock = true;
   const lifecycle = process.env.npm_lifecycle_event;
   return [
@@ -25,9 +32,11 @@ export function getPluginsList(command, VITE_LEGACY) {
     }),
     // jsx、tsx语法支持
     vueJsx(),
-    Unocss(),
+    VITE_CDN ? cdn : null,
+    configCompressPlugin(VITE_COMPRESSION),
+    DefineOptions(),
     // 线上环境删除console
-    removeConsole(),
+    removeConsole({ external: ["src/assets/iconfont/iconfont.js"] }),
     viteBuildInfo(),
     // 自定义主题
     themePreprocessorPlugin({

deploy.sh

@@ -1,30 +0,0 @@
-#!/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

@@ -2,10 +2,14 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" href="/favicon.ico" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="renderer" content="webkit" />
+    <meta
+      name="viewport"
+      content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0"
+    />
     <title>vue-pure-admin</title>
-    <script src="/sortable.min.js"></script>
+    <link rel="icon" href="/favicon.ico" />
     <script>
       window.process = {};
     </script>
@@ -32,9 +36,7 @@
           border-radius: 50%;
           width: 2.5em;
           height: 2.5em;
-          -webkit-animation-fill-mode: both;
           animation-fill-mode: both;
-          -webkit-animation: loadAnimation 1.8s infinite ease-in-out;
           animation: loadAnimation 1.8s infinite ease-in-out;
         }
 
@@ -44,10 +46,7 @@
           margin: 80px auto;
           position: relative;
           text-indent: -9999em;
-          -webkit-transform: translateZ(0);
-          -ms-transform: translateZ(0);
           transform: translateZ(0);
-          -webkit-animation-delay: -0.16s;
           animation-delay: -0.16s;
           top: 0;
           transform: translate(-50%, 0);
@@ -62,7 +61,6 @@
 
         .loader:before {
           left: -3.5em;
-          -webkit-animation-delay: -0.32s;
           animation-delay: -0.32s;
         }
 
@@ -70,18 +68,6 @@
           left: 3.5em;
         }
 
-        @-webkit-keyframes loadAnimation {
-          0%,
-          80%,
-          100% {
-            box-shadow: 0 2.5em 0 -1.3em;
-          }
-
-          40% {
-            box-shadow: 0 2.5em 0 0;
-          }
-        }
-
         @keyframes loadAnimation {
           0%,
           80%,

locales/en.yaml

@@ -18,16 +18,21 @@ buttons:
   hscloseRightTabs: Close RightTabs
   hscloseOtherTabs: Close OtherTabs
   hscloseAllTabs: Close AllTabs
+  hswholeFullScreen: Whole FullScreen
+  hswholeExitFullScreen: Whole ExitFullScreen
+  hscontentFullScreen: Content FullScreen
+  hscontentExitFullScreen: Content ExitFullScreen
 menus:
   hshome: Home
   hslogin: Login
+  hsempty: Empty Page
   hssysManagement: System Manage
   hsUser: User Manage
   hsDict: Dict Manage
   hsRole: Role Manage
   hsDept: Dept Manage
   hseditor: Editor
-  hserror: Error Page
+  hsabnormal: Abnormal Page
   hsfourZeroFour: "404"
   hsfourZeroOne: "403"
   hsFive: "500"
@@ -43,6 +48,8 @@ menus:
   hsflowChart: Flow Chart
   hsseamless: Seamless Scroll
   hscontextmenu: Context Menu
+  hstypeit: Typeit Components
+  hsjsoneditor: JSON Editor
   hsmenus: MultiLevel Menu
   hsmenu1: Menu1
   hsmenu1-1: Menu1-1
@@ -60,6 +67,7 @@ menus:
   hsMenuTree: Menu Tree
   hsWatermark: Water Mark
   hsPrint: Print
+  hsDownload: Download
   hsExternalPage: External Page
   hsPureDocument: Pure Doc(Embedded)
   externalLink: Pure Doc(External)
@@ -82,5 +90,49 @@ menus:
   hsQrcode: Qrcode
   hsCascader: Area Cascader
   hsSwiper: Swiper Plugin
+  hsVirtualList: Virtual List
+  hsPdf: PDF Preview
+  hsExecl: Export Excel
+  hsInfiniteScroll: Table Infinite Scroll
 status:
   hsLoad: Loading...
+login:
+  username: Username
+  password: Password
+  verifyCode: VerifyCode
+  remember: Remember Password
+  sure: Sure Password
+  forget: Forget Password?
+  login: Login
+  thirdLogin: Third Login
+  phoneLogin: Phone Login
+  qRCodeLogin: QRCode Login
+  register: Register
+  weChatLogin: WeChat Login
+  alipayLogin: Alipay Login
+  qqLogin: QQ Login
+  weiboLogin: Weibo Login
+  phone: Phone
+  smsVerifyCode: SMS VerifyCode
+  back: Back
+  test: Mock Test
+  tip: After scanning the code, click "Confirm" to complete the login
+  definite: Definite
+  loginSuccess: Login Success
+  registerSuccess: Regist Success
+  tickPrivacy: Please tick Privacy Policy
+  readAccept: I have read it carefully and accept
+  privacyPolicy: Privacy Policy
+  getVerifyCode: Get VerifyCode
+  info: Seconds
+  usernameReg: Please enter username
+  passwordReg: Please enter password
+  verifyCodeReg: Please enter verify code
+  verifyCodeCorrectReg: Please enter correct verify code
+  verifyCodeSixReg: Please enter a 6-digit verify code
+  phoneReg: Please enter the phone
+  phoneCorrectReg: Please enter the correct phone number format
+  passwordRuleReg: The password format should be any combination of 8-18 digits
+  passwordSureReg: Please enter confirm password
+  passwordDifferentReg: The two passwords do not match!
+  passwordUpdateReg: Password has been updated

locales/zh-CN.yaml

@@ -3,7 +3,7 @@ buttons:
   hsfullscreen: 全屏
   hsexitfullscreen: 退出全屏
   hsrefreshRoute: 刷新路由
-  hslogin: 登陆
+  hslogin: 登录
   hsadd: 新增
   hsmark: 标记/取消
   hssave: 保存
@@ -18,16 +18,21 @@ buttons:
   hscloseRightTabs: 关闭右侧标签页
   hscloseOtherTabs: 关闭其他标签页
   hscloseAllTabs: 关闭全部标签页
+  hswholeFullScreen: 整体页面全屏
+  hswholeExitFullScreen: 整体页面退出全屏
+  hscontentFullScreen: 内容区全屏
+  hscontentExitFullScreen: 内容区退出全屏
 menus:
   hshome: 首页
-  hslogin: 登陆
+  hslogin: 登录
+  hsempty: 无Layout页
   hssysManagement: 系统管理
   hsUser: 用户管理
   hsDict: 字典管理
   hsRole: 角色管理
   hsDept: 部门管理
   hseditor: 编辑器
-  hserror: 错误页面
+  hsabnormal: 异常页面
   hsfourZeroFour: "404"
   hsfourZeroOne: "403"
   hsFive: "500"
@@ -43,6 +48,8 @@ menus:
   hsflowChart: 流程图
   hsseamless: 无缝滚动
   hscontextmenu: 右键菜单
+  hstypeit: 打字机组件
+  hsjsoneditor: JSON编辑器
   hsmenus: 多级菜单
   hsmenu1: 菜单1
   hsmenu1-1: 菜单1-1
@@ -60,6 +67,7 @@ menus:
   hsMenuTree: 菜单树结构
   hsWatermark: 水印
   hsPrint: 打印
+  hsDownload: 下载
   hsExternalPage: 外部页面
   hsPureDocument: 平台文档(内嵌)
   externalLink: 平台文档(外链)
@@ -82,5 +90,49 @@ menus:
   hsQrcode: 二维码
   hsCascader: 区域级联选择器
   hsSwiper: Swiper插件
+  hsVirtualList: 虚拟列表
+  hsPdf: PDF预览
+  hsExecl: 导出Excel
+  hsInfiniteScroll: 表格无限滚动
 status:
   hsLoad: 加载中...
+login:
+  username: 账号
+  password: 密码
+  verifyCode: 验证码
+  remember: 记住密码
+  sure: 确认密码
+  forget: 忘记密码?
+  login: 登录
+  thirdLogin: 第三方登录
+  phoneLogin: 手机登录
+  qRCodeLogin: 二维码登录
+  register: 注册
+  weChatLogin: 微信登录
+  alipayLogin: 支付宝登录
+  qqLogin: QQ登录
+  weiboLogin: 微博登录
+  phone: 手机号码
+  smsVerifyCode: 短信验证码
+  back: 返回
+  test: 模拟测试
+  tip: 扫码后点击"确认"，即可完成登录
+  definite: 确定
+  loginSuccess: 登录成功
+  registerSuccess: 注册成功
+  tickPrivacy: 请勾选隐私政策
+  readAccept: 我已仔细阅读并接受
+  privacyPolicy: 《隐私政策》
+  getVerifyCode: 获取验证码
+  info: 秒后重新获取
+  usernameReg: 请输入账号
+  passwordReg: 请输入密码
+  verifyCodeReg: 请输入验证码
+  verifyCodeCorrectReg: 请输入正确的验证码
+  verifyCodeSixReg: 请输入6位数字验证码
+  phoneReg: 请输入手机号码
+  phoneCorrectReg: 请输入正确的手机号码格式
+  passwordRuleReg: 密码格式应为8-18位数字、字母、符号的任意两种组合
+  passwordSureReg: 请输入确认密码
+  passwordDifferentReg: 两次密码不一致!
+  passwordUpdateReg: 修改密码成功

mock/asyncRoutes.ts

@@ -1,10 +1,14 @@
-// 根据角色动态生成路由
+// 模拟后端动态生成路由
 import { MockMethod } from "vite-plugin-mock";
 
-// http://mockjs.com/examples.html#Object
+/**
+ * roles：页面级别权限，这里模拟二种 "admin"、"common"
+ * admin：管理员角色
+ * common：普通角色
+ */
+
 const systemRouter = {
   path: "/system",
-  redirect: "/system/user/index",
   meta: {
     icon: "setting",
     title: "menus.hssysManagement",
@@ -13,36 +17,40 @@ const systemRouter = {
   children: [
     {
       path: "/system/user/index",
-      name: "user",
+      name: "User",
       meta: {
         icon: "flUser",
-        title: "menus.hsUser"
+        title: "menus.hsUser",
+        roles: ["admin"]
       }
     },
     {
       path: "/system/role/index",
-      name: "role",
+      name: "Role",
       meta: {
         icon: "role",
-        title: "menus.hsRole"
+        title: "menus.hsRole",
+        roles: ["admin"]
       }
     },
     {
       path: "/system/dept/index",
-      name: "dept",
+      name: "Dept",
       meta: {
         icon: "dept",
-        title: "menus.hsDept"
+        title: "menus.hsDept",
+        roles: ["admin"]
       }
     },
     {
       path: "/system/dict",
       component: "/system/dict/index",
-      name: "dict",
+      name: "Dict",
       meta: {
         icon: "dict",
         title: "menus.hsDict",
-        keepAlive: true
+        keepAlive: true,
+        roles: ["admin"]
       }
     }
   ]
@@ -50,26 +58,27 @@ const systemRouter = {
 
 const permissionRouter = {
   path: "/permission",
-  redirect: "/permission/page/index",
   meta: {
     title: "menus.permission",
     icon: "lollipop",
-    rank: 7
+    rank: 10
   },
   children: [
     {
       path: "/permission/page/index",
-      name: "permissionPage",
+      name: "PermissionPage",
       meta: {
+        roles: ["admin", "common"],
         title: "menus.permissionPage"
       }
     },
     {
       path: "/permission/button/index",
-      name: "permissionButton",
+      name: "PermissionButton",
       meta: {
         title: "menus.permissionButton",
-        authority: []
+        roles: ["admin", "common"],
+        auths: ["btn_add", "btn_edit", "btn_delete"]
       }
     }
   ]
@@ -77,34 +86,36 @@ const permissionRouter = {
 
 const frameRouter = {
   path: "/iframe",
-  redirect: "/iframe/pure",
   meta: {
     icon: "monitor",
     title: "menus.hsExternalPage",
-    rank: 10
+    rank: 7
   },
   children: [
     {
       path: "/iframe/pure",
-      name: "reFramePure",
+      name: "FramePure",
       meta: {
         title: "menus.hsPureDocument",
-        frameSrc: "https://pure-admin-doc.vercel.app"
+        frameSrc: "http://yiming_chang.gitee.io/pure-admin-doc",
+        roles: ["admin", "common"]
       }
     },
     {
       path: "/external",
-      name: "https://pure-admin-doc.vercel.app",
+      name: "http://yiming_chang.gitee.io/pure-admin-doc",
       meta: {
-        title: "menus.externalLink"
+        title: "menus.externalLink",
+        roles: ["admin", "common"]
       }
     },
     {
       path: "/iframe/ep",
-      name: "reFrameEp",
+      name: "FrameEp",
       meta: {
         title: "menus.hsEpDocument",
-        frameSrc: "https://element-plus.org/zh-CN/"
+        frameSrc: "https://element-plus.org/zh-CN/",
+        roles: ["admin", "common"]
       }
     }
   ]
@@ -112,7 +123,6 @@ const frameRouter = {
 
 const tabsRouter = {
   path: "/tabs",
-  redirect: "/tabs/index",
   meta: {
     icon: "IF-team-icontabs",
     title: "menus.hstabs",
@@ -121,51 +131,42 @@ const tabsRouter = {
   children: [
     {
       path: "/tabs/index",
-      name: "reTabs",
+      name: "Tabs",
       meta: {
-        title: "menus.hstabs"
+        title: "menus.hstabs",
+        roles: ["admin", "common"]
       }
     },
     {
-      path: "/tabs/detail",
+      path: "/tabs/query-detail",
-      name: "tabDetail",
+      name: "TabQueryDetail",
       meta: {
-        title: "",
+        // 不在menu菜单中显示
         showLink: false,
-        dynamicLevel: 3,
+        roles: ["admin", "common"]
-        refreshRedirect: "/tabs/index"
+      }
+    },
+    {
+      path: "/tabs/params-detail/:id",
+      component: "params-detail",
+      name: "TabParamsDetail",
+      meta: {
+        showLink: false,
+        roles: ["admin", "common"]
       }
     }
   ]
 };
 
-// 添加不同按钮权限到/permission/button页面中
-function setDifAuthority(authority, routes) {
-  routes.children[1].meta.authority = [authority];
-  return routes;
-}
-
 export default [
   {
     url: "/getAsyncRoutes",
     method: "get",
-    response: ({ query }) => {
+    response: () => {
-      if (query.name === "admin") {
+      return {
-        return {
+        success: true,
-          code: 0,
+        data: [systemRouter, permissionRouter, frameRouter, tabsRouter]
-          info: [
+      };
-            tabsRouter,
-            frameRouter,
-            systemRouter,
-            setDifAuthority("v-admin", permissionRouter)
-          ]
-        };
-      } else {
-        return {
-          code: 0,
-          info: [tabsRouter, setDifAuthority("v-test", permissionRouter)]
-        };
-      }
     }
   }
 ] as MockMethod[];

mock/list.ts

@@ -6,7 +6,7 @@ export default [
     method: "post",
     response: () => {
       return {
-        code: 0,
+        success: true,
         data: {
           list: [
             {

mock/login.ts

@@ -0,0 +1,36 @@
+// 根据角色动态生成路由
+import { MockMethod } from "vite-plugin-mock";
+
+export default [
+  {
+    url: "/login",
+    method: "post",
+    response: ({ body }) => {
+      if (body.username === "admin") {
+        return {
+          success: true,
+          data: {
+            username: "admin",
+            // 一个用户可能有多个角色
+            roles: ["admin"],
+            accessToken: "eyJhbGciOiJIUzUxMiJ9.admin",
+            refreshToken: "eyJhbGciOiJIUzUxMiJ9.adminRefresh",
+            expires: "2023/10/30 00:00:00"
+          }
+        };
+      } else {
+        return {
+          success: true,
+          data: {
+            username: "common",
+            // 一个用户可能有多个角色
+            roles: ["common"],
+            accessToken: "eyJhbGciOiJIUzUxMiJ9.common",
+            refreshToken: "eyJhbGciOiJIUzUxMiJ9.commonRefresh",
+            expires: "2023/10/30 00:00:00"
+          }
+        };
+      }
+    }
+  }
+] as MockMethod[];

mock/map.ts

@@ -29,8 +29,8 @@ export default [
     method: "get",
     response: () => {
       return {
-        code: 0,
+        success: true,
-        info: mapList()
+        data: mapList()
       };
     }
   }

mock/refreshToken.ts

@@ -0,0 +1,27 @@
+import { MockMethod } from "vite-plugin-mock";
+
+// 模拟刷新token接口
+export default [
+  {
+    url: "/refreshToken",
+    method: "post",
+    response: ({ body }) => {
+      if (body.refreshToken) {
+        return {
+          success: true,
+          data: {
+            accessToken: "eyJhbGciOiJIUzUxMiJ9.admin",
+            refreshToken: "eyJhbGciOiJIUzUxMiJ9.adminRefresh",
+            // `expires`选择这种日期格式是为了方便调试，后端直接设置时间戳或许更方便（每次都应该递增）。如果后端返回的是时间戳格式，前端开发请来到这个目录`src/utils/auth.ts`，把第`38`行的代码换成expires = data.expires即可。
+            expires: "2023/10/30 23:59:59"
+          }
+        };
+      } else {
+        return {
+          success: false,
+          data: {}
+        };
+      }
+    }
+  }
+] as MockMethod[];

mock/system.ts

@@ -6,7 +6,7 @@ export default [
     method: "post",
     response: () => {
       return {
-        code: 0,
+        success: true,
         data: {
           list: [
             {
@@ -71,7 +71,7 @@ export default [
     method: "post",
     response: () => {
       return {
-        code: 0,
+        success: true,
         data: [
           {
             name: "杭州总公司",
@@ -212,7 +212,7 @@ export default [
     method: "post",
     response: () => {
       return {
-        code: 0,
+        success: true,
         data: {
           list: [
             {

package.json

@@ -1,19 +1,20 @@
 {
   "name": "vue-pure-admin",
-  "version": "3.2.0",
+  "version": "3.6.2",
   "private": true,
   "scripts": {
-    "dev": "cross-env --max_old_space_size=4096 vite",
+    "dev": "NODE_OPTIONS=--max-old-space-size=4096 vite",
     "serve": "pnpm dev",
-    "build": "rimraf dist && cross-env vite build",
+    "build": "rimraf dist && NODE_OPTIONS=--max-old-space-size=8192 vite build",
-    "build:staging": "rimraf dist && cross-env vite build --mode staging",
+    "build:staging": "rimraf dist && vite build --mode staging",
-    "report": "rimraf dist && cross-env vite build",
+    "report": "rimraf dist && vite build",
-    "deploy": "bash deploy.sh",
     "preview": "vite preview",
     "preview:build": "pnpm build && vite preview",
+    "typecheck": "tsc --noEmit && vue-tsc --noEmit --skipLibCheck",
+    "cloc": "NODE_OPTIONS=--max-old-space-size=4096 cloc . --exclude-dir=node_modules --exclude-lang=YAML",
     "clean:cache": "rm -rf node_modules && rm -rf .eslintcache && pnpm install",
-    "lint:eslint": "eslint --cache --max-warnings 0  \"{src,mock}/**/*.{vue,ts,tsx}\" --fix",
+    "lint:eslint": "eslint --cache --max-warnings 0  \"{src,mock,build}/**/*.{vue,js,ts,tsx}\" --fix",
-    "lint:prettier": "prettier --write  \"src/**/*.{js,json,tsx,css,less,scss,vue,html,md}\"",
+    "lint:prettier": "prettier --write  \"src/**/*.{js,ts,json,tsx,css,less,scss,vue,html,md}\"",
     "lint:stylelint": "stylelint --cache --fix \"**/*.{vue,css,scss,postcss,less}\" --cache --cache-location node_modules/.cache/stylelint/",
     "lint:lint-staged": "lint-staged -c ./.husky/lintstagedrc.js",
     "lint:pretty": "pretty-quick --staged",
@@ -29,23 +30,26 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@ctrl/tinycolor": "^3.4.1",
-    "@logicflow/core": "^1.1.15",
+    "@logicflow/core": "^1.1.24",
-    "@logicflow/extension": "^1.1.15",
+    "@logicflow/extension": "^1.1.24",
-    "@pureadmin/components": "^1.0.6",
+    "@pureadmin/components": "^1.1.0",
-    "@vueuse/core": "^8.4.2",
+    "@pureadmin/descriptions": "^1.1.0",
+    "@pureadmin/table": "^1.2.0",
+    "@pureadmin/utils": "^1.1.5",
+    "@vueuse/core": "^9.4.0",
     "@vueuse/motion": "^2.0.0-beta.12",
-    "@vueuse/shared": "^8.4.2",
+    "@vueuse/shared": "^9.4.0",
-    "@wangeditor/editor": "^5.0.1",
+    "@wangeditor/editor": "^5.1.21",
-    "@wangeditor/editor-for-vue": "^5.1.10",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "animate.css": "^4.1.1",
-    "axios": "^0.27.1",
+    "axios": "^1.1.3",
     "china-area-data": "^5.0.1",
     "cropperjs": "^1.5.12",
-    "css-color-function": "^1.3.3",
+    "dayjs": "^1.11.5",
-    "dayjs": "^1.11.2",
     "driver.js": "^0.9.8",
-    "echarts": "^5.3.2",
+    "echarts": "^5.4.0",
-    "element-plus": "2.1.11",
+    "el-table-infinite-scroll": "^3.0.1",
+    "element-plus": "^2.2.18",
     "element-resize-detector": "^1.2.3",
     "js-cookie": "^3.0.1",
     "jsbarcode": "^3.11.5",
@@ -56,39 +60,44 @@
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
     "path": "^0.12.7",
-    "pinia": "^2.0.14",
+    "pinia": "^2.0.23",
-    "qrcode": "^1.5.0",
+    "qrcode": "^1.5.1",
-    "qs": "^6.10.1",
+    "qs": "^6.11.0",
     "resize-observer-polyfill": "^1.5.1",
-    "responsive-storage": "^1.0.11",
+    "responsive-storage": "^2.1.0",
-    "rgb-hex": "^4.0.0",
+    "sortablejs": "^1.15.0",
-    "swiper": "^8.1.4",
+    "swiper": "^8.4.4",
+    "typeit": "^8.7.0",
     "v-contextmenu": "3.0.0",
-    "vue": "^3.2.33",
+    "vue": "^3.2.40",
     "vue-form-create2": "^1.2.8",
-    "vue-i18n": "^9.2.0-beta.35",
+    "vue-i18n": "^9.2.2",
-    "vue-json-pretty": "^2.0.2",
+    "vue-json-pretty": "^2.2.2",
-    "vue-router": "^4.0.15",
+    "vue-pdf-embed": "^1.1.4",
-    "vue-types": "^4.1.1",
+    "vue-router": "^4.1.6",
-    "vuedraggable": "4.1.0",
+    "vue-types": "^4.2.1",
-    "vxe-table": "^4.2.3",
+    "vue-virtual-scroller": "^2.0.0-alpha.1",
-    "xe-utils": "^3.5.4",
+    "vuedraggable": "^4.1.0",
-    "xgplayer": "^2.31.6"
+    "vxe-table": "^4.3.5",
+    "xe-utils": "^3.5.7",
+    "xgplayer": "^2.32.1",
+    "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "@commitlint/cli": "13.1.0",
     "@commitlint/config-conventional": "13.1.0",
-    "@iconify-icons/carbon": "^1.2.4",
+    "@faker-js/faker": "^7.5.0",
-    "@iconify-icons/ep": "^1.2.4",
+    "@iconify-icons/carbon": "^1.2.8",
-    "@iconify-icons/fa": "^1.2.2",
+    "@iconify-icons/ep": "^1.2.7",
-    "@iconify-icons/fa-solid": "^1.2.2",
+    "@iconify-icons/fa": "^1.2.3",
-    "@iconify-icons/fluent": "^1.2.5",
+    "@iconify-icons/fa-solid": "^1.2.3",
+    "@iconify-icons/fluent": "^1.2.16",
     "@iconify-icons/mdi": "^1.2.8",
-    "@iconify-icons/ri": "^1.2.1",
+    "@iconify-icons/ri": "^1.2.3",
-    "@iconify-icons/uil": "^1.2.1",
+    "@iconify-icons/uil": "^1.2.2",
     "@iconify/vue": "^3.2.1",
-    "@intlify/vite-plugin-vue-i18n": "^3.4.0",
+    "@intlify/vite-plugin-vue-i18n": "^6.0.3",
-    "@pureadmin/theme": "^1.1.0",
+    "@pureadmin/theme": "^2.4.0",
     "@types/element-resize-detector": "1.1.3",
     "@types/js-cookie": "^3.0.1",
     "@types/lodash": "^4.14.180",
@@ -98,15 +107,18 @@
     "@types/nprogress": "0.2.0",
     "@types/qrcode": "^1.4.2",
     "@types/qs": "^6.9.7",
+    "@types/sortablejs": "^1.13.0",
     "@typescript-eslint/eslint-plugin": "^5.10.2",
     "@typescript-eslint/parser": "^5.10.2",
-    "@vitejs/plugin-legacy": "^1.8.2",
+    "@vitejs/plugin-legacy": "^2.2.0",
-    "@vitejs/plugin-vue": "^2.3.2",
+    "@vitejs/plugin-vue": "^3.1.2",
-    "@vitejs/plugin-vue-jsx": "^1.3.10",
+    "@vitejs/plugin-vue-jsx": "^2.0.1",
     "@vue/eslint-config-prettier": "^7.0.0",
     "@vue/eslint-config-typescript": "^10.0.0",
-    "autoprefixer": "^10.4.5",
+    "@vue/runtime-core": "^3.2.40",
-    "cross-env": "7.0.3",
+    "autoprefixer": "^10.4.12",
+    "cloc": "^2.10.0",
+    "cssnano": "^5.1.13",
     "eslint": "^8.8.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-vue": "^8.4.1",
@@ -114,29 +126,42 @@
     "husky": "^7.0.4",
     "lint-staged": "11.1.2",
     "picocolors": "^1.0.0",
-    "postcss": "^8.4.6",
+    "postcss": "^8.4.17",
-    "postcss-html": "^1.3.0",
+    "postcss-html": "^1.5.0",
-    "postcss-import": "14.0.0",
+    "postcss-import": "^15.0.0",
-    "postcss-scss": "^4.0.3",
+    "postcss-scss": "^4.0.5",
     "prettier": "^2.5.1",
     "pretty-quick": "3.1.1",
     "rimraf": "3.0.2",
-    "rollup": "^2.70.1",
+    "rollup-plugin-visualizer": "^5.8.2",
-    "rollup-plugin-visualizer": "^5.6.0",
+    "sass": "^1.53.0",
-    "sass": "^1.51.0",
+    "sass-loader": "^13.0.2",
     "stylelint": "^14.3.0",
     "stylelint-config-html": "^1.0.0",
     "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-recommended": "^6.0.0",
     "stylelint-config-standard": "^24.0.0",
     "stylelint-order": "^5.0.0",
-    "typescript": "^4.6.3",
+    "tailwindcss": "^3.2.1",
-    "unocss": "^0.33.2",
+    "terser": "^5.15.0",
-    "vite": "^2.9.6",
+    "typescript": "^4.7.4",
+    "unplugin-vue-define-options": "0.7.3",
+    "vite": "^3.1.8",
+    "vite-plugin-cdn-import": "^0.3.5",
+    "vite-plugin-compression": "^0.5.1",
     "vite-plugin-mock": "^2.9.6",
-    "vite-plugin-remove-console": "^0.0.7",
+    "vite-plugin-remove-console": "^1.1.0",
-    "vite-svg-loader": "^3.3.0",
+    "vite-svg-loader": "^3.6.0",
-    "vue-eslint-parser": "^8.2.0"
+    "vue-eslint-parser": "^8.2.0",
+    "vue-tsc": "^0.40.13"
+  },
+  "pnpm": {
+    "peerDependencyRules": {
+      "ignoreMissing": [
+        "rollup",
+        "webpack"
+      ]
+    }
   },
   "repository": "git@github.com:xiaoxian521/vue-pure-admin.git",
   "author": "xiaoxian521",

postcss.config.js

@@ -1,3 +1,8 @@
 module.exports = {
-  plugins: [require("autoprefixer"), require("postcss-import")]
+  plugins: {
+    "postcss-import": {},
+    tailwindcss: {},
+    autoprefixer: {},
+    ...(process.env.NODE_ENV === "production" ? { cssnano: {} } : {})
+  }
 };

public/html/button.html

@@ -95,7 +95,6 @@
 
     .c:active {
       transform: translate(0px, 4px);
-      -webkit-transform: translate(0px, 4px);
       box-shadow: 0px 1px 0px 0px #3486d5;
     }
 
@@ -223,8 +222,6 @@
     }
 
     input[type="checkbox"].toggle {
-      -moz-appearance: none;
-      -webkit-appearance: none;
       position: absolute;
       width: 100%;
       height: 100%;
@@ -299,36 +296,6 @@
       animation: anim-out-pseudo 0.75s;
     }
 
-    @-webkit-keyframes anim-in {
-      0% {
-        width: 0%;
-      }
-
-      100% {
-        width: 100%;
-      }
-    }
-
-    @-moz-keyframes anim-in {
-      0% {
-        width: 0%;
-      }
-
-      100% {
-        width: 100%;
-      }
-    }
-
-    @-ms-keyframes anim-in {
-      0% {
-        width: 0%;
-      }
-
-      100% {
-        width: 100%;
-      }
-    }
-
     @keyframes anim-in {
       0% {
         width: 0%;
@@ -339,36 +306,6 @@
       }
     }
 
-    @-webkit-keyframes anim-in-pseudo {
-      0% {
-        background: rgba(0, 0, 0, 0.3);
-      }
-
-      100% {
-        background: transparent;
-      }
-    }
-
-    @-moz-keyframes anim-in-pseudo {
-      0% {
-        background: rgba(0, 0, 0, 0.3);
-      }
-
-      100% {
-        background: transparent;
-      }
-    }
-
-    @-ms-keyframes anim-in-pseudo {
-      0% {
-        background: rgba(0, 0, 0, 0.3);
-      }
-
-      100% {
-        background: transparent;
-      }
-    }
-
     @keyframes anim-in-pseudo {
       0% {
         background: rgba(0, 0, 0, 0.3);
@@ -379,36 +316,6 @@
       }
     }
 
-    @-webkit-keyframes anim-out {
-      0% {
-        width: 0%;
-      }
-
-      100% {
-        width: 100%;
-      }
-    }
-
-    @-moz-keyframes anim-out {
-      0% {
-        width: 0%;
-      }
-
-      100% {
-        width: 100%;
-      }
-    }
-
-    @-ms-keyframes anim-out {
-      0% {
-        width: 0%;
-      }
-
-      100% {
-        width: 100%;
-      }
-    }
-
     @keyframes anim-out {
       0% {
         width: 0%;
@@ -419,36 +326,6 @@
       }
     }
 
-    @-webkit-keyframes anim-out-pseudo {
-      0% {
-        background: rgba(0, 0, 0, 0.35);
-      }
-
-      100% {
-        background: transparent;
-      }
-    }
-
-    @-moz-keyframes anim-out-pseudo {
-      0% {
-        background: rgba(0, 0, 0, 0.35);
-      }
-
-      100% {
-        background: transparent;
-      }
-    }
-
-    @-ms-keyframes anim-out-pseudo {
-      0% {
-        background: rgba(0, 0, 0, 0.35);
-      }
-
-      100% {
-        background: transparent;
-      }
-    }
-
     @keyframes anim-out-pseudo {
       0% {
         background: rgba(0, 0, 0, 0.35);
@@ -515,9 +392,6 @@
 
     .php,
     .php::after {
-      -webkit-transition: all 0.5s;
-      -moz-transition: all 0.5s;
-      -o-transition: all 0.5s;
       transition: all 0.5s;
     }
 

public/serverConfig.json

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

src/api/list.ts

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

src/api/mock.ts

@@ -1,6 +1,11 @@
 import { http } from "../utils/http";
 
-// 地图数据
+type Result = {
-export const mapJson = (params?: object) => {
+  success: boolean;
-  return http.request("get", "/getMapInfo", { params });
+  data: Array<any>;
+};
+
+/** 地图数据 */
+export const mapJson = (params?: object) => {
+  return http.request<Result>("get", "/getMapInfo", { params });
 };

src/api/routes.ts

@@ -1,5 +1,10 @@
 import { http } from "../utils/http";
 
-export const getAsyncRoutes = (params?: object) => {
+type Result = {
-  return http.request("get", "/getAsyncRoutes", { params });
+  success: boolean;
+  data: Array<any>;
+};
+
+export const getAsyncRoutes = () => {
+  return http.request<Result>("get", "/getAsyncRoutes");
 };

src/api/system.ts

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

src/api/user.ts

@@ -1,26 +1,39 @@
 import { http } from "../utils/http";
 
-interface userType extends Promise<any> {
+export type UserResult = {
-  svg?: string;
+  success: boolean;
-  code?: number;
+  data: {
-  info?: object;
+    /** 用户名 */
-}
+    username: string;
-
+    /** 当前登陆用户的角色 */
-// 获取验证码
+    roles: Array<string>;
-export const getVerify = (): userType => {
+    /** `token` */
-  return http.request("get", "/captcha");
+    accessToken: string;
+    /** 用于调用刷新`accessToken`的接口时所需的`token` */
+    refreshToken: string;
+    /** `accessToken`的过期时间（格式'xxxx/xx/xx xx:xx:xx'） */
+    expires: Date;
+  };
 };
 
-// 登录
+export type RefreshTokenResult = {
-export const getLogin = (data: object) => {
+  success: boolean;
-  return http.request("post", "/login", { data });
+  data: {
+    /** `token` */
+    accessToken: string;
+    /** 用于调用刷新`accessToken`的接口时所需的`token` */
+    refreshToken: string;
+    /** `accessToken`的过期时间（格式'xxxx/xx/xx xx:xx:xx'） */
+    expires: Date;
+  };
 };
 
-// 刷新token
+/** 登录 */
-export const refreshToken = (data: object) => {
+export const getLogin = (data?: object) => {
-  return http.request("post", "/refreshToken", { data });
+  return http.request<UserResult>("post", "/login", { data });
 };
 
-// export const searchVague = (data: object) => {
+/** 刷新token */
-//   return http.request("post", "/searchVague", { data });
+export const refreshTokenApi = (data?: object) => {
-// };
+  return http.request<RefreshTokenResult>("post", "/refreshToken", { data });
+};

src/assets/svg/back.svg

@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 48 48"><path fill="#2F88FF" fill-rule="evenodd" stroke="#000" stroke-linejoin="round" stroke-width="4" d="M44 40.8361C39.1069 34.8632 34.7617 31.4739 30.9644 30.6682C27.1671 29.8625 23.5517 29.7408 20.1182 30.303V41L4 23.5453L20.1182 7V17.167C26.4667 17.2172 31.8638 19.4948 36.3095 24C40.7553 28.5052 43.3187 34.1172 44 40.8361Z" clip-rule="evenodd"/></svg>

src/assets/svg/close.svg

@@ -1 +0,0 @@
- <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" width="1em" height="1em" preserveAspectRatio="xMidYMid meet" viewBox="0 0 36 36"><path d="M19.41 18l8.29-8.29a1 1 0 0 0-1.41-1.41L18 16.59l-8.29-8.3a1 1 0 0 0-1.42 1.42l8.3 8.29l-8.3 8.29A1 1 0 1 0 9.7 27.7l8.3-8.29l8.29 8.29a1 1 0 0 0 1.41-1.41z" fill="currentColor"></path></svg>

src/assets/svg/close_all.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" width="1em" height="1em" preserveAspectRatio="xMidYMid meet" viewBox="0 0 36 36"><path d="M26 17H10a1 1 0 0 0 0 2h16a1 1 0 0 0 0-2z" fill="currentColor"></path></svg>

src/assets/svg/close_left.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" width="1em" height="1em" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><g fill="none"><path d="M7 12l7 7" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path><path d="M7 12l7-7" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path><path d="M21 12H7.5" stroke="currentColor" stroke-width="2" stroke-linecap="round" ></path><path d="M3 3v18" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path></g></svg>

src/assets/svg/close_other.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" width="1em" height="1em" preserveAspectRatio="xMidYMid meet" viewBox="0 0 20 20"><path d="M3 5h14V3H3v2zm12 8V7H5v6h10zM3 17h14v-2H3v2z" fill="currentColor"></path></svg>

src/assets/svg/close_right.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" width="1em" height="1em" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><g transform="translate(24 0) scale(-1 1)"><g fill="none"><path d="M7 12l7 7" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path><path d="M7 12l7-7" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path><path d="M21 12H7.5" stroke="currentColor" stroke-width="2" stroke-linecap="round"></path><path d="M3 3v18" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path></g></g></svg>

src/assets/svg/refresh.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" width="1em" height="1em" preserveAspectRatio="xMidYMid meet" viewBox="0 0 512 512"><path d="M400 148l-21.12-24.57A191.43 191.43 0 0 0 240 64C134 64 48 150 48 256s86 192 192 192a192.09 192.09 0 0 0 181.07-128" fill="none" stroke="currentColor" stroke-linecap="square" stroke-miterlimit="10" stroke-width="32"></path><path d="M464 68.45V220a4 4 0 0 1-4 4H308.45a4 4 0 0 1-2.83-6.83L457.17 65.62a4 4 0 0 1 6.83 2.83z" fill="currentColor"></path></svg>

src/components/ReAuth/index.ts

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

src/components/ReAuth/src/auth.tsx

@@ -0,0 +1,20 @@
+import { defineComponent, Fragment } from "vue";
+import { hasAuth } from "@/router/utils";
+
+export default defineComponent({
+  name: "Auth",
+  props: {
+    value: {
+      type: undefined,
+      default: []
+    }
+  },
+  setup(props, { slots }) {
+    return () => {
+      if (!slots) return null;
+      return hasAuth(props.value) ? (
+        <Fragment>{slots.default?.()}</Fragment>
+      ) : null;
+    };
+  }
+});

src/components/ReBarcode/index.ts

@@ -1,10 +1,7 @@
-import { App } from "vue";
 import reBarcode from "./src/index.vue";
+import { withInstall } from "@pureadmin/utils";
 
-export const ReBarcode = Object.assign(reBarcode, {
+/** 条形码组件 */
-  install(app: App) {
+export const ReBarcode = withInstall(reBarcode);
-    app.component(reBarcode.name, reBarcode);
-  }
-});
 
 export default ReBarcode;

src/components/ReBarcode/src/index.vue

@@ -1,13 +1,11 @@
-<script lang="ts">
-export default {
-  name: "ReBarcode"
-};
-</script>
-
 <script setup lang="ts">
 import JsBarcode from "jsbarcode";
 import { ref, onMounted } from "vue";
 
+defineOptions({
+  name: "ReBarcode"
+});
+
 const props = defineProps({
   tag: {
     type: String,

src/components/ReCard/index.ts

@@ -1,10 +0,0 @@
-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/ReCharts/index.ts

@@ -1,36 +0,0 @@
-import { App } from "vue";
-import reBar from "./src/Bar.vue";
-import reGithub from "./src/Github.vue";
-import reInfinite from "./src/Infinite.vue";
-import reLine from "./src/Line.vue";
-import rePie from "./src/Pie.vue";
-
-export const ReBar = Object.assign(reBar, {
-  install(app: App) {
-    app.component(reBar.name, reBar);
-  }
-});
-
-export const ReGithub = Object.assign(reGithub, {
-  install(app: App) {
-    app.component(reGithub.name, reGithub);
-  }
-});
-
-export const ReInfinite = Object.assign(reInfinite, {
-  install(app: App) {
-    app.component(reInfinite.name, reInfinite);
-  }
-});
-
-export const ReLine = Object.assign(reLine, {
-  install(app: App) {
-    app.component(reLine.name, reLine);
-  }
-});
-
-export const RePie = Object.assign(rePie, {
-  install(app: App) {
-    app.component(rePie.name, rePie);
-  }
-});

src/components/ReCharts/src/Bar.vue

@@ -1,96 +0,0 @@
-<script lang="ts">
-export default {
-  name: "Bar"
-};
-</script>
-
-<script setup lang="ts">
-import { ECharts } from "echarts";
-import echarts from "/@/plugins/echarts";
-import { onBeforeMount, onMounted, nextTick } from "vue";
-import { useEventListener, tryOnUnmounted, useTimeoutFn } from "@vueuse/core";
-
-let echartInstance: ECharts;
-
-const props = defineProps({
-  index: {
-    type: Number,
-    default: 0
-  }
-});
-
-function initechartInstance() {
-  const echartDom = document.querySelector(".bar" + props.index);
-  if (!echartDom) return;
-  // @ts-ignore
-  echartInstance = echarts.init(echartDom);
-  echartInstance.clear(); //清除旧画布 重新渲染
-
-  echartInstance.setOption({
-    tooltip: {
-      trigger: "axis",
-      axisPointer: {
-        type: "shadow"
-      }
-    },
-    grid: {
-      bottom: "20%",
-      height: "68%",
-      containLabel: true
-    },
-    xAxis: [
-      {
-        type: "category",
-        axisTick: {
-          alignWithLabel: true
-        },
-        axisLabel: {
-          interval: 0
-          // width: "70",
-          // overflow: "truncate"
-        },
-        data: ["open_issues", "forks", "watchers", "star"]
-      }
-    ],
-    yAxis: [
-      {
-        type: "value"
-      }
-    ],
-    series: [
-      {
-        name: "GitHub信息",
-        type: "bar",
-        data: [3, 204, 1079, 1079]
-      }
-    ]
-  });
-}
-
-onBeforeMount(() => {
-  nextTick(() => {
-    initechartInstance();
-  });
-});
-
-onMounted(() => {
-  nextTick(() => {
-    useEventListener("resize", () => {
-      if (!echartInstance) return;
-      useTimeoutFn(() => {
-        echartInstance.resize();
-      }, 180);
-    });
-  });
-});
-
-tryOnUnmounted(() => {
-  if (!echartInstance) return;
-  echartInstance.dispose();
-  echartInstance = null;
-});
-</script>
-
-<template>
-  <div :class="'bar' + props.index" style="width: 100%; height: 35vh" />
-</template>

src/components/ReCharts/src/Github.vue

@@ -1,87 +0,0 @@
-<script setup lang="ts">
-import { ref } from "vue";
-const lists = ref([
-  { type: "", label: "善良" },
-  { type: "success", label: "好学" },
-  { type: "info", label: "幽默" },
-  { type: "danger", label: "旅游" },
-  { type: "warning", label: "追剧" }
-]);
-</script>
-
-<template>
-  <el-descriptions class="margin-top" direction="vertical" :column="3" border>
-    <el-descriptions-item>
-      <template #label>
-        <el-icon>
-          <IconifyIconOffline icon="user" />
-        </el-icon>
-        用户名
-      </template>
-      xiaoxian
-    </el-descriptions-item>
-    <el-descriptions-item>
-      <template #label>
-        <el-icon>
-          <IconifyIconOffline icon="iphone" />
-        </el-icon>
-        手机号
-      </template>
-      123456789
-    </el-descriptions-item>
-    <el-descriptions-item>
-      <template #label>
-        <el-icon>
-          <IconifyIconOffline icon="location" />
-        </el-icon>
-        居住地
-      </template>
-      上海
-    </el-descriptions-item>
-  </el-descriptions>
-  <el-descriptions class="margin-top" direction="vertical" :column="2" border>
-    <el-descriptions-item>
-      <template #label>
-        <el-icon>
-          <IconifyIconOffline icon="tickets" />
-        </el-icon>
-        标签
-      </template>
-      <el-tag
-        v-for="item in lists"
-        :key="item.label"
-        :type="item.type"
-        size="small"
-        effect="dark"
-      >
-        {{ item.label }}
-      </el-tag>
-    </el-descriptions-item>
-    <el-descriptions-item>
-      <template #label>
-        <el-icon>
-          <IconifyIconOffline icon="office-building" />
-        </el-icon>
-        联系地址
-      </template>
-      上海市徐汇区
-    </el-descriptions-item>
-  </el-descriptions>
-  <el-descriptions class="margin-top" direction="vertical" :column="1" border>
-    <el-descriptions-item>
-      <template #label>
-        <el-icon>
-          <IconifyIconOffline icon="notebook" />
-        </el-icon>
-        留言
-      </template>
-      好好学习，天天向上
-    </el-descriptions-item>
-  </el-descriptions>
-</template>
-
-<style scoped>
-.el-tag {
-  margin-right: 10px !important;
-}
-</style>

src/components/ReCharts/src/Line.vue

@@ -1,84 +0,0 @@
-<script lang="ts">
-export default {
-  name: "Line"
-};
-</script>
-
-<script setup lang="ts">
-import { ECharts } from "echarts";
-import echarts from "/@/plugins/echarts";
-import { onBeforeMount, onMounted, nextTick } from "vue";
-import { useEventListener, tryOnUnmounted, useTimeoutFn } from "@vueuse/core";
-
-let echartInstance: ECharts;
-
-const props = defineProps({
-  index: {
-    type: Number,
-    default: 0
-  }
-});
-
-function initechartInstance() {
-  const echartDom = document.querySelector(".line" + props.index);
-  if (!echartDom) return;
-  // @ts-ignore
-  echartInstance = echarts.init(echartDom);
-  echartInstance.clear(); //清除旧画布 重新渲染
-
-  echartInstance.setOption({
-    grid: {
-      bottom: "20%",
-      height: "68%",
-      containLabel: true
-    },
-    tooltip: {
-      trigger: "item"
-    },
-    xAxis: {
-      type: "category",
-      axisLabel: {
-        interval: 0
-      },
-      data: ["open_issues", "forks", "watchers", "star"]
-    },
-    yAxis: {
-      type: "value"
-    },
-    series: [
-      {
-        data: [3, 204, 1079, 1079],
-        type: "line",
-        areaStyle: {}
-      }
-    ]
-  });
-}
-
-onBeforeMount(() => {
-  nextTick(() => {
-    initechartInstance();
-  });
-});
-
-onMounted(() => {
-  nextTick(() => {
-    useEventListener("resize", () => {
-      if (!echartInstance) return;
-      useTimeoutFn(() => {
-        echartInstance.resize();
-      }, 180);
-    });
-  });
-});
-
-tryOnUnmounted(() => {
-  if (!echartInstance) return;
-  echartInstance.dispose();
-  echartInstance = null;
-});
-</script>
-
-<template>
-  <div :class="'line' + props.index" style="width: 100%; height: 35vh" />
-</template>

src/components/ReCharts/src/Pie.vue

@@ -1,87 +0,0 @@
-<script lang="ts">
-export default {
-  name: "Pie"
-};
-</script>
-
-<script setup lang="ts">
-import { ECharts } from "echarts";
-import echarts from "/@/plugins/echarts";
-import { onBeforeMount, onMounted, nextTick } from "vue";
-import { useEventListener, tryOnUnmounted, useTimeoutFn } from "@vueuse/core";
-
-let echartInstance: ECharts;
-
-const props = defineProps({
-  index: {
-    type: Number,
-    default: 0
-  }
-});
-
-function initechartInstance() {
-  const echartDom = document.querySelector(".pie" + props.index);
-  if (!echartDom) return;
-  // @ts-ignore
-  echartInstance = echarts.init(echartDom);
-  echartInstance.clear(); //清除旧画布 重新渲染
-
-  echartInstance.setOption({
-    tooltip: {
-      trigger: "item"
-    },
-    legend: {
-      orient: "vertical",
-      right: true
-    },
-    series: [
-      {
-        name: "Github信息",
-        type: "pie",
-        radius: "60%",
-        center: ["40%", "50%"],
-        data: [
-          { value: 1079, name: "watchers" },
-          { value: 1079, name: "star" },
-          { value: 204, name: "forks" },
-          { value: 3, name: "open_issues" }
-        ],
-        emphasis: {
-          itemStyle: {
-            shadowBlur: 10,
-            shadowOffsetX: 0,
-            shadowColor: "rgba(0, 0, 0, 0.5)"
-          }
-        }
-      }
-    ]
-  });
-}
-
-onBeforeMount(() => {
-  nextTick(() => {
-    initechartInstance();
-  });
-});
-
-onMounted(() => {
-  nextTick(() => {
-    useEventListener("resize", () => {
-      if (!echartInstance) return;
-      useTimeoutFn(() => {
-        echartInstance.resize();
-      }, 180);
-    });
-  });
-});
-
-tryOnUnmounted(() => {
-  if (!echartInstance) return;
-  echartInstance.dispose();
-  echartInstance = null;
-});
-</script>
-
-<template>
-  <div :class="'pie' + props.index" style="width: 100%; height: 35vh" />
-</template>

src/components/ReCountTo/index.ts

@@ -1,15 +1,11 @@
-import { App } from "vue";
 import reNormalCountTo from "./src/normal";
 import reboundCountTo from "./src/rebound";
+import { withInstall } from "@pureadmin/utils";
 
-export const ReNormalCountTo = Object.assign(reNormalCountTo, {
+/** 普通数字动画组件 */
-  install(app: App) {
+const ReNormalCountTo = withInstall(reNormalCountTo);
-    app.component(reNormalCountTo.name, reNormalCountTo);
-  }
-});
 
-export const ReboundCountTo = Object.assign(reboundCountTo, {
+/** 回弹式数字动画组件 */
-  install(app: App) {
+const ReboundCountTo = withInstall(reboundCountTo);
-    app.component(reboundCountTo.name, reboundCountTo);
+
-  }
+export { ReNormalCountTo, ReboundCountTo };
-});

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

@@ -7,10 +7,10 @@ import {
   unref
 } from "vue";
 import { countToProps } from "./props";
-import { isNumber } from "/@/utils/is";
+import { isNumber } from "@pureadmin/utils";
 
 export default defineComponent({
-  name: "Normal",
+  name: "ReNormalCountTo",
   props: countToProps,
   emits: ["mounted", "callback"],
   setup(props, { emit }) {

src/components/ReCountTo/src/normal/props.ts

@@ -1,5 +1,5 @@
 import { PropType } from "vue";
-import { propTypes } from "/@/utils/propTypes";
+import { propTypes } from "@/utils/propTypes";
 export const countToProps = {
   startVal: propTypes.number.def(0),
   endVal: propTypes.number.def(2020),

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

@@ -4,15 +4,15 @@ import {
   ref,
   unref,
   onBeforeMount,
-  onBeforeUnmount,
+  onBeforeUnmount
-  getCurrentInstance
 } from "vue";
 import { reboundProps } from "./props";
 
 export default defineComponent({
-  name: "Rebound",
+  name: "ReboundCountTo",
   props: reboundProps,
   setup(props) {
+    const ulRef = ref();
     const timer = ref(null);
 
     onBeforeMount(() => {
@@ -23,8 +23,7 @@ export default defineComponent({
       // Safari浏览器的兼容代码
       isSafari &&
         (timer.value = setTimeout(() => {
-          // @ts-ignore
+          ulRef.value.setAttribute(
-          getCurrentInstance().refs["ul"].setAttribute(
             "style",
             `
         animation: none;
@@ -42,10 +41,9 @@ export default defineComponent({
       <>
         <div
           class="scroll-num"
-          // @ts-ignore
           style={{ "--i": props.i, "--delay": props.delay }}
         >
-          <ul ref="ul" style={{ fontSize: "32px" }}>
+          <ul ref="ulRef" style={{ fontSize: "32px" }}>
             <li>0</li>
             <li>1</li>
             <li>2</li>

src/components/ReCountTo/src/rebound/props.ts

@@ -1,5 +1,5 @@
 import { PropType } from "vue";
-import { propTypes } from "/@/utils/propTypes";
+import { propTypes } from "@/utils/propTypes";
 export const reboundProps = {
   delay: propTypes.number.def(1),
   blur: propTypes.number.def(2),

src/components/ReCropper/index.ts

@@ -1,10 +1,7 @@
-import { App } from "vue";
 import reCropper from "./src";
+import { withInstall } from "@pureadmin/utils";
 
-export const ReCropper = Object.assign(reCropper, {
+/** 图片裁剪组件 */
-  install(app: App) {
+export const ReCropper = withInstall(reCropper);
-    app.component(reCropper.name, reCropper);
-  }
-});
 
 export default ReCropper;

src/components/ReCropper/src/index.tsx

@@ -9,7 +9,7 @@ import {
   PropType
 } from "vue";
 import { templateRef } from "@vueuse/core";
-import { useAttrs } from "/@/utils/useAttrs";
+import { useAttrs } from "@pureadmin/utils";
 
 import Cropper from "cropperjs";
 import "cropperjs/dist/cropper.css";
@@ -74,7 +74,7 @@ const props = {
 };
 
 export default defineComponent({
-  name: "Cropper",
+  name: "ReCropper",
   props,
   setup(props) {
     const cropper: any = ref<Nullable<Cropper>>(null);

src/components/ReFlicker/index.ts

@@ -20,7 +20,7 @@ export interface attrsType {
  */
 export function useRenderFlicker(attrs?: attrsType): Component {
   return defineComponent({
-    name: "Flicker",
+    name: "ReFlicker",
     render() {
       return h(
         "div",

src/components/ReFlop/index.ts

@@ -1,10 +1,7 @@
-import { App } from "vue";
 import reFlop from "./src/index.vue";
+import { withInstall } from "@pureadmin/utils";
 
-export const ReFlop = Object.assign(reFlop, {
+/** 时间翻牌组件 */
-  install(app: App) {
+export const ReFlop = withInstall(reFlop);
-    app.component(reFlop.name, reFlop);
-  }
-});
 
 export default ReFlop;

src/components/ReFlop/src/filpper.tsx

@@ -1,5 +1,5 @@
 import { defineComponent, ref } from "vue";
-import { propTypes } from "/@/utils/propTypes";
+import { propTypes } from "@/utils/propTypes";
 import "./filpper.css";
 
 const props = {
@@ -15,7 +15,7 @@ const props = {
 };
 
 export default defineComponent({
-  name: "Filpper",
+  name: "ReFlop",
   props,
   setup(props) {
     // eslint-disable-next-line vue/no-setup-props-destructure

src/components/ReFlop/src/index.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, unref, nextTick, onUnmounted } from "vue";
 import { templateRef } from "@vueuse/core";
-import flippers from "./Filpper";
+import flippers from "./filpper";
 
 let timer = ref(null);
 let flipObjs = ref([]);

src/components/ReFlowChart/index.ts

@@ -1,22 +1,17 @@
-import { App } from "vue";
 import control from "./src/Control.vue";
 import nodePanel from "./src/NodePanel.vue";
 import dataDialog from "./src/DataDialog.vue";
+import { withInstall } from "@pureadmin/utils";
 
-export const Control = Object.assign(control, {
+/** LogicFlow流程图-控制面板 */
-  install(app: App) {
+const Control = withInstall(control);
-    app.component(control.name, control);
-  }
-});
 
-export const NodePanel = Object.assign(nodePanel, {
+/** LogicFlow流程图-拖拽面板 */
-  install(app: App) {
+const NodePanel = withInstall(nodePanel);
-    app.component(nodePanel.name, nodePanel);
-  }
-});
 
-export const DataDialog = Object.assign(dataDialog, {
+/** LogicFlow流程图-查看数据 */
-  install(app: App) {
+const DataDialog = withInstall(dataDialog);
-    app.component(dataDialog.name, dataDialog);
+
-  }
+export { Control, NodePanel, DataDialog };
-});
+
+// LogicFlow流程图文档：http://logic-flow.org/

src/components/ReFlowChart/src/Control.vue

@@ -102,6 +102,7 @@ onMounted(() => {
         v-for="(item, key) in titleLists"
         :key="key"
         :title="item.text"
+        class="dark:text-bg_color"
         @mouseenter.prevent="onEnter(key)"
         @mouseleave.prevent="focusIndex = -1"
       >
@@ -115,7 +116,8 @@ onMounted(() => {
             :disabled="item.disabled"
             :style="{
               cursor: item.disabled === false ? 'pointer' : 'not-allowed',
-              color: item.disabled === false ? '' : '#00000040'
+              color: item.disabled === false ? '' : '#00000040',
+              background: 'transparent'
             }"
             @click="onControl(item, key)"
           >

src/components/ReFlowChart/src/NodePanel.vue

@@ -35,7 +35,7 @@ const nodeDragNode = item => {
   <!-- 左侧bpmn元素选择器 -->
   <div class="node-panel">
     <div
-      class="node-item"
+      class="node-item dark:text-bg_color"
       v-for="item in props.nodeList"
       :key="item.text"
       @mousedown="nodeDragNode(item)"

src/components/ReIcon/index.ts

@@ -1,16 +1,15 @@
 import iconifyIconOffline from "./src/iconifyIconOffline";
 import iconifyIconOnline from "./src/iconifyIconOnline";
+import iconSelect from "./src/Select.vue";
 import fontIcon from "./src/iconfont";
-import iconSelect from "./src/select.vue";
 
-export const IconifyIconOffline = iconifyIconOffline;
+/** 离线图标组件 */
-export const IconifyIconOnline = iconifyIconOnline;
+const IconifyIconOffline = iconifyIconOffline;
-export const FontIcon = fontIcon;
+/** 在线图标组件 */
-export const IconSelect = iconSelect;
+const IconifyIconOnline = iconifyIconOnline;
+/** 图标选择器组件 */
+const IconSelect = iconSelect;
+/** iconfont组件 */
+const FontIcon = fontIcon;
 
-export default {
+export { IconifyIconOffline, IconifyIconOnline, IconSelect, FontIcon };
-  IconifyIconOffline,
-  IconifyIconOnline,
-  FontIcon,
-  IconSelect
-};

src/components/ReIcon/src/Select.vue

@@ -1,9 +1,13 @@
 <script setup lang="ts">
 import { cloneDeep } from "lodash-unified";
 import { ref, computed, CSSProperties, toRef, watch } from "vue";
-import { IconJson } from "/@/components/ReIcon/data";
+import { IconJson } from "@/components/ReIcon/data";
 type ParameterCSSProperties = (item?: string) => CSSProperties | undefined;
 
+defineOptions({
+  name: "IconSelect"
+});
+
 const props = defineProps({
   modelValue: {
     require: false,
@@ -114,7 +118,7 @@ watch(
 </script>
 
 <template>
-  <div class="selector w-350px">
+  <div class="selector w-[350px]">
     <el-input v-model="inputValue" disabled>
       <template #append>
         <el-popover
@@ -128,7 +132,7 @@ watch(
         >
           <template #reference>
             <div
-              class="w-40px h-32px cursor-pointer flex justify-center items-center"
+              class="w-[40px] h-[32px] cursor-pointer flex justify-center items-center"
               @click="visible = !visible"
             >
               <IconifyIconOnline :icon="currentActiveType + icon" />
@@ -157,7 +161,7 @@ watch(
                     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"
+                    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)"
                   >

src/components/ReIcon/src/hooks.ts

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

src/components/ReIcon/src/iconfont.ts

@@ -2,7 +2,7 @@ import { h, defineComponent } from "vue";
 
 // 封装iconfont组件，默认`font-class`引用模式，支持`unicode`引用、`font-class`引用、`symbol`引用 （https://www.iconfont.cn/help/detail?spm=a313x.7781069.1998910419.20&helptype=code）
 export default defineComponent({
-  name: "fontIcon",
+  name: "FontIcon",
   props: {
     icon: {
       type: String,

src/components/ReIcon/src/iconifyIconOffline.ts

@@ -7,13 +7,11 @@ import Menu from "@iconify-icons/ep/menu";
 import HomeFilled from "@iconify-icons/ep/home-filled";
 import SetUp from "@iconify-icons/ep/set-up";
 import Edit from "@iconify-icons/ep/edit";
-import Setting from "@iconify-icons/ep/setting";
 import Lollipop from "@iconify-icons/ep/lollipop";
 import Link from "@iconify-icons/ep/link";
 import Position from "@iconify-icons/ep/position";
 import Histogram from "@iconify-icons/ep/histogram";
 import RefreshRight from "@iconify-icons/ep/refresh-right";
-import ArrowDown from "@iconify-icons/ep/arrow-down";
 import Close from "@iconify-icons/ep/close";
 import CloseBold from "@iconify-icons/ep/close-bold";
 import Bell from "@iconify-icons/ep/bell";
@@ -36,13 +34,11 @@ addIcon("menu", Menu);
 addIcon("home-filled", HomeFilled);
 addIcon("set-up", SetUp);
 addIcon("edit", Edit);
-addIcon("setting", Setting);
 addIcon("lollipop", Lollipop);
 addIcon("link", Link);
 addIcon("position", Position);
 addIcon("histogram", Histogram);
 addIcon("refresh-right", RefreshRight);
-addIcon("arrow-down", ArrowDown);
 addIcon("close", Close);
 addIcon("close-bold", CloseBold);
 addIcon("bell", Bell);
@@ -87,6 +83,16 @@ 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";
+import MenuUnfold from "@iconify-icons/ri/menu-unfold-fill";
+import MenuFold from "@iconify-icons/ri/menu-fold-fill";
+import Setting from "@iconify-icons/ri/settings-3-line";
+import ArrowDown from "@iconify-icons/ri/arrow-down-s-line";
+import CloseLeftTags from "@iconify-icons/ri/text-direction-r";
+import CloseRightTags from "@iconify-icons/ri/text-direction-l";
+import CloseOtherTags from "@iconify-icons/ri/text-spacing";
+import CloseAllTags from "@iconify-icons/ri/subtract-line";
+import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
+import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
 addIcon("arrow-right-s-line", ArrowRightSLine);
 addIcon("arrow-left-s-line", ArrowLeftSLine);
 addIcon("logout-circle-r-line", LogoutCircleRLine);
@@ -112,6 +118,16 @@ addIcon("ppt", Ppt);
 addIcon("terminal-window-line", TerminalWindowLine);
 addIcon("user", User);
 addIcon("lock", Lock);
+addIcon("menu-unfold", MenuUnfold);
+addIcon("menu-fold", MenuFold);
+addIcon("setting", Setting);
+addIcon("arrow-down", ArrowDown);
+addIcon("close-left-tags", CloseLeftTags);
+addIcon("close-right-tags", CloseRightTags);
+addIcon("close-other-tags", CloseOtherTags);
+addIcon("close-all-tags", CloseAllTags);
+addIcon("fullscreen", Fullscreen);
+addIcon("exit-fullscreen", ExitFullscreen);
 
 // Font Awesome 4
 import FaUser from "@iconify-icons/fa/user";
@@ -147,7 +163,7 @@ addIcon("location-company", LocationCompany);
 
 // Iconify Icon在Vue里离线使用（用于内网环境）https://docs.iconify.design/icon-components/vue/offline.html
 export default defineComponent({
-  name: "IconifyIcon",
+  name: "IconifyIconOffline",
   components: { IconifyIcon },
   props: {
     icon: {
@@ -161,6 +177,9 @@ export default defineComponent({
       IconifyIcon,
       {
         icon: `${this.icon}`,
+        style: attrs?.style
+          ? Object.assign(attrs.style, { outline: "none" })
+          : { outline: "none" },
         ...attrs
       },
       {

src/components/ReIcon/src/iconifyIconOnline.ts

@@ -1,9 +1,9 @@
 import { h, defineComponent } from "vue";
 import { Icon as IconifyIcon } from "@iconify/vue";
 
-// Iconify Icon在Vue里在线使用（用于外网环境） https://docs.iconify.design/icon-components/vue/offline.html
+// Iconify Icon在Vue里在线使用（用于外网环境）
 export default defineComponent({
-  name: "IconifyIcon",
+  name: "IconifyIconOnline",
   components: { IconifyIcon },
   props: {
     icon: {
@@ -17,6 +17,9 @@ export default defineComponent({
       IconifyIcon,
       {
         icon: `${this.icon}`,
+        style: attrs?.style
+          ? Object.assign(attrs.style, { outline: "none" })
+          : { outline: "none" },
         ...attrs
       },
       {

src/components/ReIcon/src/types.ts

@@ -11,7 +11,9 @@ export interface iconType {
   horizontalAlign?: boolean;
   verticalAlign?: boolean;
   align?: string;
+  online?: boolean;
   onLoad?: Function;
+  includes?: Function;
 
   //  all icon
   style?: object;

src/components/ReImageVerify/index.ts

@@ -1,12 +1,7 @@
-import { App } from "vue";
 import reImageVerify from "./src/index.vue";
+import { withInstall } from "@pureadmin/utils";
 
-export const ReImageVerify = Object.assign(reImageVerify, {
+/** 图形验证码组件 */
-  install(app: App) {
+export const ReImageVerify = withInstall(reImageVerify);
-    app.component(reImageVerify.name, reImageVerify);
-  }
-});
 
-export default {
+export default ReImageVerify;
-  ReImageVerify
-};

src/components/ReImageVerify/src/index.vue

@@ -1,13 +1,11 @@
-<script lang="ts">
-export default {
-  name: "ReImageVerify"
-};
-</script>
-
 <script setup lang="ts">
 import { watch } from "vue";
 import { useImageVerify } from "./hooks";
 
+defineOptions({
+  name: "ReImageVerify"
+});
+
 interface Props {
   code?: string;
 }

src/components/ReMap/index.ts

@@ -1,12 +1,7 @@
-import { App } from "vue";
 import amap from "./src/Amap.vue";
+import { withInstall } from "@pureadmin/utils";
 
-export const Amap = Object.assign(amap, {
+/** 高德地图组件 */
-  install(app: App) {
+export const Amap = withInstall(amap);
-    app.component(amap.name, amap);
-  }
-});
 
-export default {
+export default Amap;
-  Amap
-};

src/components/ReMap/src/Amap.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import AMapLoader from "@amap/amap-jsapi-loader";
 import { reactive, getCurrentInstance, onBeforeMount, onUnmounted } from "vue";
-import { mapJson } from "/@/api/mock";
+import { deviceDetection } from "@pureadmin/utils";
-import { deviceDetection } from "/@/utils/deviceDetection";
+import AMapLoader from "@amap/amap-jsapi-loader";
-import car from "/@/assets/car.png";
+import { mapJson } from "@/api/mock";
+import car from "@/assets/car.png";
 
 export interface MapConfigureInter {
   on: Fn;
@@ -15,9 +15,9 @@ export interface MapConfigureInter {
   plugin?: Fn;
 }
 
-type resultType = {
+defineOptions({
-  info: Array<undefined>;
+  name: "Amap"
-};
+});
 
 let MarkerCluster;
 let map: MapConfigureInter;
@@ -92,8 +92,8 @@ onBeforeMount(() => {
 
       // 获取模拟车辆信息
       mapJson()
-        .then((res: resultType) => {
+        .then(({ data }) => {
-          let points: object = res.info.map((v: any) => {
+          let points: object = data.map(v => {
             return {
               lnglat: [v.lng, v.lat],
               ...v

src/components/ReQrcode/index.ts

@@ -1,10 +1,7 @@
-import { App } from "vue";
 import reQrcode from "./src/index";
+import { withInstall } from "@pureadmin/utils";
 
-export const ReQrcode = Object.assign(reQrcode, {
+/** 二维码组件 */
-  install(app: App) {
+export const ReQrcode = withInstall(reQrcode);
-    app.component(reQrcode.name, reQrcode);
-  }
-});
 
 export default ReQrcode;

src/components/ReQrcode/src/index.tsx

@@ -8,9 +8,9 @@ import {
   defineComponent
 } from "vue";
 import "./index.scss";
-import { isString } from "/@/utils/is";
 import { cloneDeep } from "lodash-unified";
-import { propTypes } from "/@/utils/propTypes";
+import { isString } from "@pureadmin/utils";
+import { propTypes } from "@/utils/propTypes";
 import { IconifyIconOffline } from "../../ReIcon";
 import QRCode, { QRCodeRenderersOptions } from "qrcode";
 
@@ -78,7 +78,7 @@ export default defineComponent({
         const _width: number = await getOriginWidth(unref(renderText), options);
         options.scale =
           props.width === 0 ? undefined : (props.width / _width) * 4;
-        const canvasRef: HTMLCanvasElement = await toCanvas(
+        const canvasRef: any = await toCanvas(
           unref(wrapRef) as HTMLCanvasElement,
           unref(renderText),
           options
@@ -246,7 +246,7 @@ export default defineComponent({
             >
               <div class="absolute top-[50%] left-[50%] font-bold">
                 <IconifyIconOffline
-                  class="cursor-pointer outline-none"
+                  class="cursor-pointer"
                   icon="refresh-right"
                   width="30"
                   color="var(--el-color-primary)"

src/components/ReSeamlessScroll/index.ts

@@ -1,10 +1,7 @@
-import { App } from "vue";
 import reSeamlessScroll from "./src/index.vue";
+import { withInstall } from "@pureadmin/utils";
 
-export const ReSeamlessScroll = Object.assign(reSeamlessScroll, {
+/** 无缝滚动组件 */
-  install(app: App) {
+export const ReSeamlessScroll = withInstall(reSeamlessScroll);
-    app.component(reSeamlessScroll.name, reSeamlessScroll);
-  }
-});
 
 export default ReSeamlessScroll;

src/components/ReSeamlessScroll/src/index.vue

@@ -11,6 +11,10 @@ import * as utilsMethods from "./utils";
 const { animationFrame, copyObj } = utilsMethods;
 animationFrame();
 
+defineOptions({
+  name: "ReSeamlessScroll"
+});
+
 const props = defineProps({
   data: {
     type: Array as PropType<unknown>
@@ -102,7 +106,7 @@ let defaultOption = computed(() => {
 });
 
 let options = computed(() => {
-  // @ts-ignore
+  // @ts-expect-error
   return copyObj({}, unref(defaultOption), classOption);
 });
 
@@ -162,8 +166,8 @@ let autoPlay = computed(() => {
 });
 
 let scrollSwitch = computed(() => {
-  // 从 props 解构出来的 属性 不再具有相应性.
+  // 从 props 解构出来的 属性 不再具有响应性.
-  return props.data.length >= unref(options).limitMoveNum;
+  return (props.data as any).length >= unref(options).limitMoveNum;
 });
 
 let hoverStopSwitch = computed(() => {
@@ -424,7 +428,7 @@ function scrollInitMove() {
       if (timer) clearTimeout(timer);
       copyHtml.value = unref(slotList).innerHTML;
       setTimeout(() => {
-        realBoxHeight.value = unref(realBox).offsetHeight;
+        realBoxHeight.value = unref(realBox)?.offsetHeight;
         scrollMove();
       }, 0);
     } else {
@@ -450,7 +454,6 @@ function scrollStopMove() {
 
 // 鼠标滚轮事件
 function wheel(e) {
-  e.preventDefault();
   if (
     unref(options).direction === "left" ||
     unref(options).direction === "right"
@@ -513,10 +516,10 @@ defineExpose({
       :style="pos"
       @mouseenter="enter"
       @mouseleave="leave"
-      @touchstart="touchStart"
+      @touchstart.passive="touchStart"
-      @touchmove="touchMove"
+      @touchmove.passive="touchMove"
       @touchend="touchEnd"
-      @mousewheel="wheel"
+      @mousewheel.passive="wheel"
     >
       <div :ref="'slotList' + classOption['key']" :style="float">
         <slot />

src/components/ReSelector/index.ts

@@ -1,10 +1,7 @@
-import { App } from "vue";
 import reSelector from "./src";
+import { withInstall } from "@pureadmin/utils";
 
-export const ReSelector = Object.assign(reSelector, {
+/** 选择器组件 */
-  install(app: App) {
+export const ReSelector = withInstall(reSelector);
-    app.component(reSelector.name, reSelector);
-  }
-});
 
 export default ReSelector;

src/components/ReSelector/src/index.tsx

@@ -6,7 +6,7 @@ import {
   getCurrentInstance,
   unref
 } from "vue";
-import { addClass, removeClass, toggleClass } from "/@/utils/operate";
+import { addClass, removeClass, toggleClass } from "@pureadmin/utils";
 import "./index.css";
 
 const stayClass = "stay"; //鼠标点击
@@ -50,7 +50,7 @@ const props = {
 };
 
 export default defineComponent({
-  name: "Selector",
+  name: "ReSelector",
   props,
   emits: ["selectedVal"],
   setup(props, { emit }) {
@@ -254,23 +254,32 @@ export default defineComponent({
       });
 
       addClass(
-        instance.refs["hsdiv" + props.HsKey + item[0]],
+        instance.refs["hsdiv" + props.HsKey + item[0]] as Element,
         activeClass,
         stayClass
       );
 
-      addClass(instance.refs["hstd" + props.HsKey + item[0]], bothLeftSides);
-
       addClass(
-        instance.refs["hsdiv" + props.HsKey + item[1]],
+        instance.refs["hstd" + props.HsKey + item[0]] as Element,
+        bothLeftSides
+      );
+
+      addClass(
+        instance.refs["hsdiv" + props.HsKey + item[1]] as Element,
         activeClass,
         stayClass
       );
 
-      addClass(instance.refs["hstd" + props.HsKey + item[1]], bothRightSides);
+      addClass(
+        instance.refs["hstd" + props.HsKey + item[1]] as Element,
+        bothRightSides
+      );
 
       while (item[1] >= item[0]) {
-        addClass(instance.refs["hstd" + props.HsKey + item[0]], inRange);
+        addClass(
+          instance.refs["hstd" + props.HsKey + item[0]] as Element,
+          inRange
+        );
         item[0]++;
       }
     };

src/components/ReSplitPane/index.tsx

@@ -8,8 +8,9 @@ export interface ContextProps {
   split: string;
 }
 
+/** 切割面板组件 */
 export default defineComponent({
-  name: "splitPane",
+  name: "SplitPane",
   components: { resizer },
   props: {
     splitSet: {

src/components/ReSplitPane/resizer.tsx

@@ -2,7 +2,7 @@ import { computed, unref, defineComponent } from "vue";
 import "./resizer.css";
 
 export default defineComponent({
-  name: "resizer",
+  name: "Resizer",
   props: {
     split: {
       type: String,

src/components/ReTable/README.md

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

src/components/ReTable/index.ts

@@ -1,8 +1,5 @@
-import { App } from "vue";
+import tableProBar from "./src/bar";
-import epTableProBar from "./src/bar";
+import { withInstall } from "@pureadmin/utils";
 
-export const EpTableProBar = Object.assign(epTableProBar, {
+/** table-crud组件 */
-  install(app: App) {
+export const TableProBar = withInstall(tableProBar);
-    app.component(epTableProBar.name, epTableProBar);
-  }
-});

src/components/ReTable/src/bar.tsx

@@ -1,7 +1,6 @@
-import { emitter } from "/@/utils/mitt";
-import { IconifyIconOffline } from "../../ReIcon";
 import { defineComponent, ref, computed, PropType } from "vue";
-import { useEpThemeStoreHook } from "/@/store/modules/epTheme";
+import { useEpThemeStoreHook } from "@/store/modules/epTheme";
+import { IconifyIconOffline } from "../../ReIcon";
 
 export const loadingSvg = `
   <path class="path" d="
@@ -44,13 +43,12 @@ const props = {
 };
 
 export default defineComponent({
-  name: "epTableProBar",
+  name: "TableProBar",
   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);
 
@@ -59,7 +57,7 @@ export default defineComponent({
         return {
           background:
             s === size.value ? useEpThemeStoreHook().epThemeColor : "",
-          color: s === size.value ? "#f4f4f5" : "#000"
+          color: s === size.value ? "#fff" : "var(--el-text-color-primary)"
         };
       };
     });
@@ -78,12 +76,6 @@ export default defineComponent({
       });
     }
 
-    // 监听容器
-    emitter.on("resize", ({ detail }) => {
-      const { width } = detail;
-      currentWidth.value = width;
-    });
-
     const dropdown = {
       dropdown: () => (
         <el-dropdown-menu class="translation">
@@ -112,10 +104,10 @@ export default defineComponent({
     const reference = {
       reference: () => (
         <IconifyIconOffline
-          class="cursor-pointer outline-none"
+          class="cursor-pointer"
           icon="setting"
           width="16"
-          color="#606266"
+          color="text_color_regular"
           onMouseover={e => (buttonRef.value = e.currentTarget)}
         />
       )
@@ -125,15 +117,13 @@ export default defineComponent({
       <>
         <div
           {...attrs}
-          class="w-99/100 mt-6 p-2 bg-white"
+          class="w-[99/100] mt-6 p-2 bg-bg_color"
           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">
+          <div class="flex justify-between w-full h-[60px] p-4">
-            <p class="font-bold">
+            <p class="font-bold truncate">{props.title}</p>
-              {currentWidth.value > 390 ? props.title : "列表"}
-            </p>
             <div class="flex items-center justify-around">
               <div class="flex mr-4">{slots?.buttons()}</div>
               {props.tableRef?.size ? (
@@ -144,10 +134,10 @@ export default defineComponent({
                     placement="top"
                   >
                     <IconifyIconOffline
-                      class="cursor-pointer outline-none"
+                      class="cursor-pointer"
                       icon={isExpandAll.value ? "unExpand" : "expand"}
                       width="16"
-                      color="#606266"
+                      color="text_color_regular"
                       onClick={() => onExpand()}
                     />
                   </el-tooltip>
@@ -156,10 +146,10 @@ export default defineComponent({
               ) : undefined}
               <el-tooltip effect="dark" content="刷新" placement="top">
                 <IconifyIconOffline
-                  class="cursor-pointer outline-none"
+                  class="cursor-pointer"
                   icon="refresh-right"
                   width="16"
-                  color="#606266"
+                  color="text_color_regular"
                   onClick={() => emit("refresh")}
                 />
               </el-tooltip>
@@ -168,10 +158,10 @@ export default defineComponent({
               <el-tooltip effect="dark" content="密度" placement="top">
                 <el-dropdown v-slots={dropdown} trigger="click">
                   <IconifyIconOffline
-                    class="cursor-pointer outline-none"
+                    class="cursor-pointer"
                     icon="density"
                     width="16"
-                    color="#606266"
+                    color="text_color_regular"
                   />
                 </el-dropdown>
               </el-tooltip>

src/components/ReTreeLine/index.ts

@@ -1,5 +1,5 @@
 // 参考https://www.npmjs.com/package/element-tree-line (主要是替换需要通过函数传参的方式去注册组件，并添加更好的类型支持，并移除this.$scopedSlots，在3.x中,将所有this.$scopedSlots替换为this.$slots)
-import { isFunction } from "/@/utils/is";
+import { isFunction } from "@pureadmin/utils";
 import { h, defineComponent } from "vue";
 import type { PropType } from "vue";
 import "./index.scss";
@@ -9,8 +9,9 @@ import type {
   TreeNodeData
 } from "element-plus/es/components/tree-v2/src/types";
 
+/** 树形连接线组件 */
 export default defineComponent({
-  name: "el-tree-line",
+  name: "ReTreeLine",
   props: {
     node: {
       type: Object as PropType<TreeNode>,

src/components/ReTypeit/index.ts

@@ -0,0 +1,44 @@
+import { h, defineComponent } from "vue";
+import TypeIt from "typeit";
+
+// 打字机效果组件（只是简单的封装下，更多配置项参考 https://www.typeitjs.com/docs/vanilla/usage#options）
+export default defineComponent({
+  name: "TypeIt",
+  props: {
+    /** 打字速度，以每一步之间的毫秒数为单位 */
+    speed: {
+      type: Number,
+      default: 200
+    },
+    values: {
+      type: Array,
+      defalut: []
+    },
+    className: {
+      type: String,
+      default: "type-it"
+    },
+    cursor: {
+      type: Boolean,
+      default: true
+    }
+  },
+  render() {
+    return h(
+      "span",
+      {
+        class: this.className
+      },
+      {
+        default: () => []
+      }
+    );
+  },
+  mounted() {
+    new TypeIt(`.${this.className}`, {
+      strings: this.values,
+      speed: this.speed,
+      cursor: this.cursor
+    }).go();
+  }
+});

src/config/index.ts

@@ -27,7 +27,7 @@ const getConfig = (key?: string): ServerConfigs => {
   return config;
 };
 
-// 获取项目动态全局配置
+/** 获取项目动态全局配置 */
 export const getServerConfig = async (app: App): Promise<undefined> => {
   app.config.globalProperties.$config = getConfig();
   return axios({