Merge pull request #227 from fast-crud/for-pr

feat(projects): integration fast-crud

.env

@@ -7,7 +7,7 @@ VITE_APP_TITLE=Soybean管理系统
 VITE_APP_DESC=SoybeanAdmin是一个中后台管理系统模版
 
 # 权限路由模式: static ｜ dynamic
-VITE_AUTH_ROUTE_MODE=dynamic
+VITE_AUTH_ROUTE_MODE=static
 
 # 路由首页(根路由重定向), 用于static模式的权限路由，dynamic模式取决于后端返回的路由首页
 VITE_ROUTE_HOME_PATH=/dashboard/analysis

.env-config.ts

@@ -4,22 +4,13 @@ type ServiceEnv = Record<ServiceEnvType, ServiceEnvConfig>;
 /** 不同请求服务的环境配置 */
 const serviceEnv: ServiceEnv = {
   dev: {
-    url: 'http://localhost:8080',
+    url: 'http://localhost:8080'
-    urlPattern: '/url-pattern',
-    secondUrl: 'http://localhost:8081',
-    secondUrlPattern: '/second-url-pattern'
   },
   test: {
-    url: 'http://localhost:8080',
+    url: 'http://localhost:8080'
-    urlPattern: '/url-pattern',
-    secondUrl: 'http://localhost:8081',
-    secondUrlPattern: '/second-url-pattern'
   },
   prod: {
-    url: 'http://localhost:8080',
+    url: 'http://localhost:8080'
-    urlPattern: '/url-pattern',
-    secondUrl: 'http://localhost:8081',
-    secondUrlPattern: '/second-url-pattern'
   }
 };
 
@@ -27,10 +18,13 @@ const serviceEnv: ServiceEnv = {
  * 获取当前环境模式下的请求服务的配置
  * @param env 环境
  */
-export function getServiceEnvConfig(env: ImportMetaEnv) {
+export function getServiceEnvConfig(env: ImportMetaEnv): ServiceEnvConfigWithProxyPattern {
   const { VITE_SERVICE_ENV = 'dev' } = env;
 
   const config = serviceEnv[VITE_SERVICE_ENV];
 
-  return config;
+  return {
+    ...config,
+    proxyPattern: '/proxy-pattern'
+  };
 }

.env.production

@@ -4,3 +4,7 @@ VITE_COMPRESS=N
 
 # gzip | brotliCompress | deflate | deflateRaw
 VITE_COMPRESS_TYPE=gzip
+
+VITE_PWA=N
+
+VITE_PROD_MOCK=Y

.eslintignore

@@ -1,3 +1,4 @@
 !.env-config.ts
 components.d.ts
 router-page.d.ts
+*.svg

.eslintrc.js

@@ -1,11 +1,17 @@
 module.exports = {
-  extends: ['soybeanjs-vue'],
+  extends: ['soybeanjs/vue'],
   overrides: [
     {
       files: ['./scripts/*.ts'],
       rules: {
         'no-unused-expressions': 'off'
       }
+    },
+    {
+      files: ['*.vue'],
+      rules: {
+        'no-undef': 'off' // use tsc to check the ts code of the vue
+      }
     }
   ],
   settings: {
@@ -38,6 +44,11 @@ module.exports = {
             group: 'external',
             position: 'before'
           },
+          {
+            pattern: '@/constants',
+            group: 'internal',
+            position: 'before'
+          },
           {
             pattern: '@/config',
             group: 'internal',
@@ -48,11 +59,6 @@ module.exports = {
             group: 'internal',
             position: 'before'
           },
-          {
-            pattern: '@/enum',
-            group: 'internal',
-            position: 'before'
-          },
           {
             pattern: '@/plugins',
             group: 'internal',

.gitattributes

@@ -14,3 +14,4 @@
 "*.scss"   eol=lf
 "*.sass"   eol=lf
 "*.styl"   eol=lf
+"*.md"   eol=lf

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -0,0 +1,90 @@
+name: Bug提交
+description: 在使用软件或功能的过程中遇到了错误
+title: '[Bug]: '
+labels: [ "bug?" ]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## 请按照以下要求进行提交
+        ### 1. 提交后需要指定标签和截止时间。
+        ---
+
+  - type: markdown
+    attributes:
+      value: |
+        ## 环境信息
+        请根据实际使用环境修改以下信息。
+
+  - type: input
+    id: env-program-ver
+    attributes:
+      label: 软件版本
+    validations:
+      required: true
+
+  - type: dropdown
+    id: env-vm-ver
+    attributes:
+      label: 运行环境
+      description: 选择运行软件的系统版本
+      options:
+        - Windows (64)
+        - Windows (32/x84)
+        - MacOS
+        - Linux
+        - Ubuntu
+        - CentOS
+        - ArchLinux
+        - UNIX (Android)
+        - 其它（请在下方说明）
+    validations:
+      required: true
+
+  - type: dropdown
+    id: env-vm-arch
+    attributes:
+      label: 运行架构
+      description: (可选) 选择运行软件的系统架构
+      options:
+        - AMD64
+        - x86
+        - ARM [32] (别名：AArch32 / ARMv7）
+        - ARM [64] (别名：AArch64 / ARMv8）
+        - 其它
+
+  - type: textarea
+    id: reproduce-steps
+    attributes:
+      label: 重现步骤
+      description: |
+        我们需要执行哪些操作才能让 bug 出现？
+        简洁清晰的重现步骤能够帮助我们更迅速地定位问题所在。
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: 期望的结果是什么？
+    validations:
+      required: true
+
+  - type: textarea
+    id: actual
+    attributes:
+      label: 实际的结果是什么？
+    validations:
+      required: true
+
+  - type: textarea
+    id: logging
+    attributes:
+      label: 日志记录（可选）
+      render: golang
+
+  - type: textarea
+    id: extra-desc
+    attributes:
+      label: 补充说明（可选）

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,11 @@
+## Pull Request 详情
+
+请根据实际使用情况修改以下信息。
+
+## 版本信息
+
+## 解决了哪些问题
+
+## 是否关闭了某个 Issue
+
+Closes #

.github/workflows/linter.yml

@@ -0,0 +1,30 @@
+---
+name: Lint Code
+
+permissions:
+  contents: write
+
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  lint:
+    name: Lint All Code
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Lint Code Base
+        uses: github/super-linter@v4
+        env:
+          VALIDATE_ALL_CODEBASE: false
+          DEFAULT_BRANCH: main
+          # To change branch master or main
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          FILTER_REGEX_EXCLUDE: (docs|.github)
+          VALIDATE_MARKDOWN: false

.github/workflows/release.yml

@@ -0,0 +1,27 @@
+name: Release
+on:
+  push:
+    tags:
+      - "v*.**"
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+
+      - name: Create github releases
+        run: npx changelogithub
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.gitignore

@@ -11,6 +11,7 @@ node_modules
 .DS_Store
 dist
 dist-ssr
+dist.zip
 coverage
 *.local
 stats.html
@@ -21,6 +22,7 @@ stats.html
 # Editor directories and files
 .vscode/*
 !.vscode/extensions.json
+!.vscode/launch.json
 !.vscode/settings.json
 .idea
 *.suo
@@ -30,6 +32,5 @@ stats.html
 *.sw?
 
 /src/typings/components.d.ts
-/src/typings/router-page.d.ts
 package-lock.json
 yarn.lock

.husky/commit-msg

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-pnpm soybean git-commit-verify

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-pnpm lint && pnpm typecheck

.vscode/extensions.json

@@ -8,17 +8,19 @@
     "eamodio.gitlens",
     "editorconfig.editorconfig",
     "esbenp.prettier-vscode",
-    "formulahendry.auto-complete-tag",
     "formulahendry.auto-close-tag",
+    "formulahendry.auto-complete-tag",
     "formulahendry.auto-rename-tag",
     "kisstkondoros.vscode-gutter-preview",
     "lokalise.i18n-ally",
+    "mariusalchimavicius.json-to-ts",
     "mhutchie.git-graph",
     "mikestead.dotenv",
     "naumovs.color-highlight",
     "pkief.material-icon-theme",
-    "steoates.autoimport",
+    "sdras.vue-vscode-snippets",
     "vue.volar",
+    "vue.vscode-typescript-vue-plugin",
     "whtouche.vscode-js-console-utils",
     "zhuangtongfa.material-theme"
   ]

.vscode/launch.json

@@ -0,0 +1,12 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "chrome",
+      "request": "launch",
+      "name": "Vue debugger",
+      "url": "http://localhost:3200",
+      "webRoot": "${workspaceFolder}"
+    }
+  ]
+}

.vscode/settings.json

@@ -9,21 +9,7 @@
     "strings": true
   },
   "editor.tabSize": 2,
-  "eslint.alwaysShowStatus": true,
+  "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact", "vue", "json"],
-  "eslint.validate": [
-    "javascript",
-    "javascriptreact",
-    "typescript",
-    "typescriptreact",
-    "vue",
-    "html",
-    "json",
-    "jsonc",
-    "json5",
-    "yaml",
-    "yml",
-    "markdown"
-  ],
   "files.associations": {
     "*.env.*": "dotenv"
   },
@@ -33,7 +19,6 @@
     "@": "/src",
     "~@": "/src"
   },
-  "i18n-ally.localesPaths": ["src/locales", "src/locales/lang"],
   "material-icon-theme.activeIconPack": "angular",
   "material-icon-theme.files.associations": {},
   "material-icon-theme.folders.associations": {
@@ -54,7 +39,6 @@
     "@": "${workspaceFolder}/src",
     "~@": "${workspaceFolder}/src"
   },
-  "terminal.integrated.cursorStyle": "line",
   "terminal.integrated.fontSize": 14,
   "terminal.integrated.fontWeight": 500,
   "terminal.integrated.tabs.enabled": true,
@@ -86,5 +70,6 @@
   },
   "[vue]": {
     "editor.defaultFormatter": "Vue.volar"
-  }
+  },
+  "i18n-ally.localesPaths": ["src/locales", "src/locales/lang"]
 }

CHANGELOG.md

@@ -2,6 +2,55 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.9.9](https://github.com/honghuangdc/soybean-admin/compare/v0.9.8...v0.9.9) (2023-03-13)
+
+
+### Features
+
+* **hooks:** add useNaiveTable ([cc13fcc](https://github.com/honghuangdc/soybean-admin/commit/cc13fcc8aaaf667902d69350ad0de3cc16c261ab))
+* **projects:** custom unocss colors support opacity ([488e6e3](https://github.com/honghuangdc/soybean-admin/commit/488e6e32045d995361b898ef3d384dafcb069008))
+* **projects:** new layout,tab and add update theme settings ([912c353](https://github.com/honghuangdc/soybean-admin/commit/912c3531c5d7a3ab30e15d39bed98ca9b20131ab))
+
+
+### Bug Fixes
+
+* **components:** 修复iconSelect选择器点击事件失效 ([7e505f9](https://github.com/honghuangdc/soybean-admin/commit/7e505f9b96f5380b6c27b4c2ee2ab0698c4eedc4))
+* **components:** 页面跳转被拦截, 则会出现 tab 页签与页面不一致的问题 ([bd5dd2c](https://github.com/honghuangdc/soybean-admin/commit/bd5dd2cf28a0943721c397d70c53fe3988a4f81a))
+* **components:** refresh cached routes ([b0f98e4](https://github.com/honghuangdc/soybean-admin/commit/b0f98e4bfac31751dd39a7dec203277db813694b))
+* **projects:** fix eslint svg cause incorrect icon render ([0b5afda](https://github.com/honghuangdc/soybean-admin/commit/0b5afda287a0eea57daa8d35409297e2cbf6d578))
+* **projects:** fix github bug-report ([f73e3f6](https://github.com/honghuangdc/soybean-admin/commit/f73e3f648decf5632fe5193e825b1f912c5f6153))
+* **projects:** fix pwa logo ([bf2f617](https://github.com/honghuangdc/soybean-admin/commit/bf2f6172554337450c4a300b8bdb580d3e25ad45))
+* **projects:** not only `/login` claim dynamic path scenario , but also others , eg:/user/1 ([6059891](https://github.com/honghuangdc/soybean-admin/commit/60598915561f1bad6ffba0dc102f0a776be52f0d))
+* **projects:** sortRoutes recursively ([9188941](https://github.com/honghuangdc/soybean-admin/commit/918894147ab739b4592e8c76378246e28c46491a))
+* **projects:** the length of routes children list should greater than 0 ([e1afc10](https://github.com/honghuangdc/soybean-admin/commit/e1afc10b80243a5d8d270a351a37a0a2d159f167))
+* **utils:** make AxiosRequestConfig optional for request.handleDelete() ([4a6fec8](https://github.com/honghuangdc/soybean-admin/commit/4a6fec8af0b44b546f81ec41d7a5947371e189b2))
+
+### [0.9.8](https://github.com/honghuangdc/soybean-admin/compare/v0.9.7...v0.9.8) (2023-01-15)
+
+
+### Features
+
+* 新增 affix 属性，用于将其固定在tab卡 ([e772ff0](https://github.com/honghuangdc/soybean-admin/commit/e772ff05fb6ef513bd37cd9b1e245ea72f0ad6d2))
+* **projects:** add compress script [添加压缩命令] ([be6d431](https://github.com/honghuangdc/soybean-admin/commit/be6d431485a5688bd1ed567e11c1ca35ab9259b0))
+* **projects:** add generate logo script ([25daa23](https://github.com/honghuangdc/soybean-admin/commit/25daa236064c9a76677dbf16bc6d9717b1e0040f))
+* **projects:** add new route plugin @soybeanjs/vite-plugin-vue-page-route [集成新的路由插件] ([3131e00](https://github.com/honghuangdc/soybean-admin/commit/3131e00f0f4a66756f547892a8d312cde3aaf868))
+* **projects:** add script about generating png logo from [添加根据svg生成png图标的命令] ([70aeefe](https://github.com/honghuangdc/soybean-admin/commit/70aeefea02fcc13c152ee9d7a1197381bac724b9))
+* setting 页面新增 是否显示footer的开关 ([d064f62](https://github.com/honghuangdc/soybean-admin/commit/d064f6285a6d1616d7606f1390d5f01819b258bb))
+
+
+### Bug Fixes
+
+* **components:** 修复路由在path中包含重复路单词径菜单时，被激活会错误展开 ([264da00](https://github.com/honghuangdc/soybean-admin/commit/264da00e5d2cd8139907c2ac11a046649d942f4b))
+* count can't display when endValue is 0. ([0282feb](https://github.com/honghuangdc/soybean-admin/commit/0282feb1730724ba66c2e57ab354099afa074e81))
+* **projects:** 修复动态路由模式下路由不排序的问题 ([58b27c9](https://github.com/honghuangdc/soybean-admin/commit/58b27c96932ba89b362138a6056a82c25a7be282))
+* **projects:** 修复tabs在static路由模式下可以关闭首页 ([7211a17](https://github.com/honghuangdc/soybean-admin/commit/7211a17a8158b01a1f6dd6c83591f86d76633de0))
+* **projects:** add router-page.d.ts to git [将router-page.d.ts添加git提交] ([7a58035](https://github.com/honghuangdc/soybean-admin/commit/7a5803551419f65ca55ba797b49273b3a0dc6067))
+* **projects:** fix login success message [修复登录成功的消息提示] ([810398a](https://github.com/honghuangdc/soybean-admin/commit/810398abb882613f82ba385e8a7666cf8b86d92d))
+* **projects:** fix router when the dynamic routes api was failed [修复当动态路由接口失败后路由异常问题] ([f2b580f](https://github.com/honghuangdc/soybean-admin/commit/f2b580fc067e81202238bf8079a13ff014b0b329))
+* **projects:** fix vite-pwa plugin config ([94098d0](https://github.com/honghuangdc/soybean-admin/commit/94098d02e8cec12e3c9f9331ece154b65d1c9150))
+* remove height limit h-360px ([b5c570a](https://github.com/honghuangdc/soybean-admin/commit/b5c570adf55fd235dcec49bc20837623b1d5d3c4))
+* set password attributes ([a9a3703](https://github.com/honghuangdc/soybean-admin/commit/a9a37036d58274385a779e6460f7be281dafdcaf))
+
 ### [0.9.7](https://github.com/honghuangdc/soybean-admin/compare/v0.9.6...v0.9.7) (2022-11-07)
 
 

README.md

@@ -1,35 +1,40 @@
 <div align="center">
-	<img src="https://i.loli.net/2021/11/24/x5lLfuSnEawBAgi.png"/>
+	<img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/soybean.svg" style="width: 160px;"/>
 	<h1>Soybean Admin</h1>
 </div>
 
-[![license](https://img.shields.io/badge/license-MIT-green.svg)](./LICENSE)
+[![license](https://img.shields.io/badge/license-MIT-green.svg)](./LICENSE) ![](https://img.shields.io/github/stars/honghuangdc/soybean-admin) ![](https://img.shields.io/github/forks/honghuangdc/soybean-admin)
 
 ## 简介
 
-[Soybean Admin](https://github.com/honghuangdc/soybean-admin) 是一个基于 Vue3、Vite3、TypeScript、NaiveUI、Pinia 和 UnoCSS 的清新优雅的中后台模版，它使用了最新的前端技术栈，内置丰富的主题配置，有着极高的代码规范，基于 mock 实现的动态权限路由，开箱即用的中后台前端解决方案，也可用于学习参考。
+[Soybean Admin](https://github.com/honghuangdc/soybean-admin) 是一个基于 Vue3、Vite3、TypeScript、NaiveUI、Pinia 和 UnoCSS 的清新优雅的中后台模版，它使用了最新流行的前端技术栈，内置丰富的主题配置，有着极高的代码规范，基于文件的路由系统以及基于 Mock 的动态权限路由，开箱即用的中后台前端解决方案，也可用于学习参考。
 
 ## 特性
 
-- **最新技术栈**：使用 Vue3/Vite3 等前端前沿技术开发, 使用高效率的 npm 包管理器 pnpm
+- **最新流行技术栈**：使用 Vue3/Vite 等前端前沿技术开发, 使用高效率的 npm 包管理器 pnpm
-- **TypeScript**：应用程序级 JavaScript 的语言
+- **TypeScript**: 应用程序级 JavaScript 的语言
-- **主题**：丰富可配置的主题、暗黑模式，基于原子 css 框架 - UnoCSS 的动态主题颜色
+- **主题**：丰富可配置的主题、暗黑模式，基于原子 css 框架 - UnoCss 的动态主题颜色
 - **代码规范**：丰富的规范插件及极高的代码规范
-- **权限路由**：简易的路由配置、基于 mock 的动态路由能快速实现后端动态路由
+- **文件路由系统**：基于文件的路由系统，根据页面文件自动生成路由声明、路由导入和路由模块
+- **权限路由**：提供前端静态和后端动态两种路由模式，基于 mock 的动态路由能快速实现后端动态路由
 - **请求函数**：基于 axios 的完善的请求函数封装，提供 Promise 和 hooks 两种请求函数，加入请求结果数据转换的适配器
 
-## 预览
+## 在线预览
 
-- [soybean-admin](https://soybean.pro/)
+- [Soybean Admin 预览地址](https://soybean.pro/)
 
 ## 文档
 
-- [项目文档: docs.soybean.pro](https://docs.soybean.pro)
+- [项目文档预览地址](https://docs.soybean.pro)
 
 ## 代码仓库
 
 - [github](https://github.com/honghuangdc/soybean-admin)
+- [tauri 版](https://github.com/honghuangdc/soybean-admin/tree/tauri)
+- [精简版](https://github.com/honghuangdc/soybean-admin/tree/thin)
 - [gitee](https://gitee.com/honghuangdc/soybean-admin)
+- [tauri 版](https://gitee.com/honghuangdc/soybean-admin/tree/tauri)
+- [精简版](https://gitee.com/honghuangdc/soybean-admin/tree/thin)
 
 ## 更新日志
 
@@ -37,9 +42,7 @@
 
 ## 后端服务
 
-- [soybean-admin-java(开发中)](https://github.com/honghuangdc/soybean-admin-java)
+- [soybean-admin-java](https://github.com/honghuangdc/soybean-admin-java)
-- [soybean-admin-go(开发中)](https://github.com/honghuangdc/soybean-admin-go)
-- [soybean-admin-nestjs(开发中)](https://github.com/honghuangdc/soybean-admin-nestjs)
 
 ## 项目示例图
 
@@ -112,13 +115,13 @@ docker run --name soybean -p 80:80 -d soybeanjs/soybean-admin:v0.9.6
 
 ## Git 贡献提交规范
 
-项目已经内置 angular 提交规范，通过 git cz 代替 git commit 命令即可。
+项目已经内置 Angular 提交规范，直接执行 commit 命令即可生成符合 Angular 提交规范的 commit。
 
-git cz 命令需要全局安装 commitizen
+项目已用 simple-git-hooks 代替了 husky, 旧版本用了 husky，执行 pnpm soy init-git-hooks 进行初始化配置
 
-```bash
+## 基于 SoybeanAdmin 二次开发的项目
-pnpm i -g commitizen
+[electron-mock-admin](https://github.com/lixin59/electron-mock-api): 一个 Mock Api 管理系统，帮助前端开发伙伴快速实现接口的mock。
-```
+[T-Shell](https://github.com/TheBlindM/T-Shell): 是一个可配置命令提示的终端模拟器和 SSH客户端。
 
 ## 浏览器支持
 
@@ -138,15 +141,19 @@ pnpm i -g commitizen
 
 `Soybean Admin` 是完全开源免费的项目，在帮助开发者更方便地进行中大型管理系统开发，同时也提供微信和 QQ 交流群，使用问题欢迎在群内提问。
 
-- 微信交流群（添加本人微信拉进群），欢迎来技术交流，业务咨询。
+  <div style="display:flex;">
-  <div style="text-align:left">
+  	<!-- <div style="padding-right:24px;">
-    <img src="https://s2.loli.net/2022/05/16/3YGBgXnVPJdslk8.jpg" style="width:200px" />
+  		<p>微信交流群</p>
-  </div>
+      <img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/soybeanjs-wechat0503.jpeg" style="width:200px" />
-
+  	</div> -->
-- QQ 交流群 `711301266`
+  	<div style="padding-right:24px;">
-
+  		<p>QQ交流群</p>
-  <div style="text-align:left">
+      <img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/qq-soybean-admin.jpg" style="width:200px" />
-    <img src="https://i.loli.net/2021/11/24/1J6REWXiHomU2kM.jpg" style="width:200px" />
+  	</div>
+		<div>
+			<p>添加本人微信，欢迎来技术交流，业务咨询</p>
+			<img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/soybeanjs.jpeg" style="width:180px" />
+		</div>
   </div>
 
 ## 捐赠

build/config/proxy.ts

@@ -5,19 +5,14 @@ import type { ProxyOptions } from 'vite';
  * @param isOpenProxy - 是否开启代理
  * @param envConfig - env环境配置
  */
-export function createViteProxy(isOpenProxy: boolean, envConfig: ServiceEnvConfig) {
+export function createViteProxy(isOpenProxy: boolean, envConfig: ServiceEnvConfigWithProxyPattern) {
   if (!isOpenProxy) return undefined;
 
   const proxy: Record<string, string | ProxyOptions> = {
-    [envConfig.urlPattern]: {
+    [envConfig.proxyPattern]: {
       target: envConfig.url,
       changeOrigin: true,
-      rewrite: path => path.replace(new RegExp(`^${envConfig.urlPattern}`), '')
+      rewrite: path => path.replace(new RegExp(`^${envConfig.proxyPattern}`), '')
-    },
-    [envConfig.secondUrlPattern]: {
-      target: envConfig.secondUrl,
-      changeOrigin: true,
-      rewrite: path => path.replace(new RegExp(`^${envConfig.secondUrlPattern}`), '')
     }
   };
 

build/plugins/html.ts

@@ -1,14 +0,0 @@
-import type { PluginOption } from 'vite';
-import { createHtmlPlugin } from 'vite-plugin-html';
-
-export default (viteEnv: ImportMetaEnv): PluginOption[] => {
-  return createHtmlPlugin({
-    minify: true,
-    inject: {
-      data: {
-        appName: viteEnv.VITE_APP_NAME,
-        appTitle: viteEnv.VITE_APP_TITLE
-      }
-    }
-  });
-};

build/plugins/index.ts

@@ -2,14 +2,13 @@ import type { PluginOption } from 'vite';
 import vue from '@vitejs/plugin-vue';
 import vueJsx from '@vitejs/plugin-vue-jsx';
 import unocss from '@unocss/vite';
-import { VitePWA } from 'vite-plugin-pwa';
 import progress from 'vite-plugin-progress';
-import html from './html';
+import pageRoute from '@soybeanjs/vite-plugin-vue-page-route';
 import unplugin from './unplugin';
 import mock from './mock';
 import visualizer from './visualizer';
 import compress from './compress';
-import soybeanjs from './soybeanjs';
+import pwa from './pwa';
 
 /**
  * vite插件
@@ -17,15 +16,17 @@ import soybeanjs from './soybeanjs';
  */
 export function setupVitePlugins(viteEnv: ImportMetaEnv): (PluginOption | PluginOption[])[] {
   const plugins = [
-    vue(),
+    vue({
+      script: {
+        defineModel: true
+      }
+    }),
     vueJsx(),
-    VitePWA(),
-    html(viteEnv),
     ...unplugin(viteEnv),
     unocss(),
-    mock,
+    mock(viteEnv),
     progress(),
-    soybeanjs()
+    pageRoute()
   ];
 
   if (viteEnv.VITE_VISUALIZER === 'Y') {
@@ -34,6 +35,9 @@ export function setupVitePlugins(viteEnv: ImportMetaEnv): (PluginOption | Plugin
   if (viteEnv.VITE_COMPRESS === 'Y') {
     plugins.push(compress(viteEnv));
   }
+  if (viteEnv.VITE_PWA === 'Y' || viteEnv.VITE_VERCEL === 'Y') {
+    plugins.push(pwa());
+  }
 
   return plugins;
 }

build/plugins/mock.ts

@@ -1,9 +1,14 @@
 import { viteMockServe } from 'vite-plugin-mock';
 
-export default viteMockServe({
+export default (viteEnv: ImportMetaEnv) => {
-  mockPath: 'mock',
+  const prodMock = viteEnv.VITE_PROD_MOCK === 'Y';
-  injectCode: `
+
-		import { setupMockServer } from '../mock';
+  return viteMockServe({
-		setupMockServer();
+    mockPath: 'mock',
-	`
+    prodEnabled: prodMock,
-});
+    injectCode: `
+			import { setupMockServer } from '../mock';
+			setupMockServer();
+		`
+  });
+};

build/plugins/pwa.ts

@@ -0,0 +1,31 @@
+import { VitePWA } from 'vite-plugin-pwa';
+
+export default function setupVitePwa() {
+  return VitePWA({
+    registerType: 'autoUpdate',
+    includeAssets: ['favicon.ico'],
+    manifest: {
+      name: 'SoybeanAdmin',
+      short_name: 'SoybeanAdmin',
+      theme_color: '#fff',
+      icons: [
+        {
+          src: '/logo.png',
+          sizes: '192x192',
+          type: 'image/png'
+        },
+        {
+          src: '/logo.png',
+          sizes: '512x512',
+          type: 'image/png'
+        },
+        {
+          src: '/logo.png',
+          sizes: '512x512',
+          type: 'image/png',
+          purpose: 'any maskable'
+        }
+      ]
+    }
+  });
+}

build/plugins/soybeanjs.ts

@@ -1,18 +0,0 @@
-import routerPage from '@soybeanjs/router-page';
-
-export default function createSoybeanjsPlugin() {
-  return routerPage({
-    pagesFormatter: names => {
-      /** 系统的内置路由，该文件夹名称不作为RouteKey */
-      const SYSTEM_VIEW = 'system-view';
-
-      const result = names
-        .filter(name => name !== SYSTEM_VIEW)
-        .map(name => {
-          return name.replace(`${SYSTEM_VIEW}_`, '');
-        });
-
-      return result;
-    }
-  });
-}

build/plugins/unplugin.ts

@@ -1,4 +1,3 @@
-import VueMacros from 'unplugin-vue-macros/vite';
 import Icons from 'unplugin-icons/vite';
 import IconsResolver from 'unplugin-icons/resolver';
 import Components from 'unplugin-vue-components/vite';
@@ -17,11 +16,12 @@ export default function unplugin(viteEnv: ImportMetaEnv) {
   const collectionName = VITE_ICON_LOCAL_PREFFIX.replace(`${VITE_ICON_PREFFIX}-`, '');
 
   return [
-    VueMacros(),
     Icons({
       compiler: 'vue3',
       customCollections: {
-        [collectionName]: FileSystemIconLoader(localIconPath)
+        [collectionName]: FileSystemIconLoader(localIconPath, svg =>
+          svg.replace(/^<svg\s/, '<svg width="1em" height="1em" ')
+        )
       },
       scale: 1,
       defaultClass: 'inline-block'

changelogithub.config.json

@@ -0,0 +1,21 @@
+{
+  "types": {
+    "feat": { "title": "🚀 Features" },
+    "perf": { "title": "🔥 Performance" },
+    "fix": { "title": "🩹 Fixes" },
+    "refactor": { "title": "💅 Refactors" },
+    "docs": { "title": "📖 Documentation" },
+    "types": { "title": "🌊 Types" },
+    "chore": { "title": "🏡 Chore" },
+    "test": { "title": "🧪 Tests" },
+    "style": { "title": "🎨 Styles" },
+    "ci": { "title": "🤖 CI" }
+  },
+  "scopeMap": {},
+  "titles": {
+    "breakingChanges": "🚨 Breaking Changes"
+  },
+  "contributors": true,
+  "capitalize": true,
+  "group": true
+}

index.html

@@ -1,28 +1,15 @@
 <!DOCTYPE html>
 <html lang="zh-cmn-Hans">
-  <head>
+	<head>
-    <meta charset="UTF-8" />
+		<meta charset="UTF-8" />
-    <link rel="icon" href="/favicon.ico" />
+		<link rel="icon" href="/favicon.svg" />
-    <link rel="stylesheet" href="/resource/loading.css" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<title>%VITE_APP_NAME%</title>
-    <title><%= appName %></title>
+	</head>
-  </head>
+	<body>
-  <body>
+		<div id="app">
-    <div id="app">
+			<div id="appLoading"></div>
-      <div class="loading-container">
+		</div>
-        <div id="loadingLogo" class="loading-svg"></div>
+		<script type="module" src="/src/main.ts"></script>
-        <div class="loading-spin__container">
+	</body>
-          <div class="loading-spin">
-            <div class="left-0 top-0 loading-spin-item"></div>
-            <div class="left-0 bottom-0 loading-spin-item loading-delay-500"></div>
-            <div class="right-0 top-0 loading-spin-item loading-delay-1000"></div>
-            <div class="right-0 bottom-0 loading-spin-item loading-delay-1500"></div>
-          </div>
-        </div>
-        <div class="loading-title"><%= appTitle %></div>
-      </div>
-      <script src="/resource/loading.js"></script>
-    </div>
-    <script type="module" src="/src/main.ts"></script>
-  </body>
 </html>

mock/api/crud/base.ts

@@ -0,0 +1,295 @@
+export type ListItem = {
+  id?: number;
+  children?: ListItem[];
+  [key: string]: any;
+};
+export type BaseMockOptions = { name: string; copyTimes?: number; list: ListItem[]; idGenerator: number };
+type CopyListParams = { originList: ListItem[]; newList: ListItem[]; options: BaseMockOptions; parentId?: number };
+
+function copyList(props: CopyListParams) {
+  const { originList, newList, options, parentId } = props;
+  for (const item of originList) {
+    const newItem: ListItem = { ...item, parentId };
+    newItem.id = options.idGenerator;
+    options.idGenerator += 1;
+    newList.push(newItem);
+    if (item.children) {
+      newItem.children = [];
+      copyList({
+        originList: item.children,
+        newList: newItem.children,
+        options,
+        parentId: newItem.id
+      });
+    }
+  }
+}
+
+function delById(req: Service.MockOption, list: any[]) {
+  for (let i = 0; i < list.length; i += 1) {
+    const item = list[i];
+    if (item.id === parseInt(req.query.id, 10)) {
+      list.splice(i, 1);
+      break;
+    }
+    if (item.children && item.children.length > 0) {
+      delById(req, item.children);
+    }
+  }
+}
+
+function findById(id: number, list: ListItem[]): any {
+  for (const item of list) {
+    if (item.id === id) {
+      return item;
+    }
+    if (item.children && item.children.length > 0) {
+      const sub = findById(id, item.children);
+      if (sub !== null && sub !== undefined) {
+        return sub;
+      }
+    }
+  }
+  return null;
+}
+
+function matchWithArrayCondition(value: any[], item: ListItem, key: string) {
+  if (value.length === 0) {
+    return true;
+  }
+  let matched = false;
+  for (const i of value) {
+    if (item[key] instanceof Array) {
+      for (const j of item[key]) {
+        if (i === j) {
+          matched = true;
+          break;
+        }
+      }
+      if (matched) {
+        break;
+      }
+    } else if (item[key] === i || (typeof item[key] === 'string' && item[key].indexOf(`${i}`) >= 0)) {
+      matched = true;
+      break;
+    }
+    if (matched) {
+      break;
+    }
+  }
+  return matched;
+}
+
+function matchWithObjectCondition(value: any, item: ListItem, key: string) {
+  let matched = true;
+  for (const key2 of Object.keys(value)) {
+    const v = value[key2];
+    if (v && item[key] && v !== item[key][key2]) {
+      matched = false;
+      break;
+    }
+  }
+  return matched;
+}
+
+function searchFromList(list: ListItem[], query: any) {
+  const filter = (item: ListItem) => {
+    let allFound = true; // 是否所有条件都符合
+    for (const key of Object.keys(query)) {
+      const value = query[key];
+      if (value === undefined || value === null || value === '') {
+        // no nothing
+      } else if (value instanceof Array) {
+        // 如果条件中的value是数组的话，只要查到一个就行
+        const matched = matchWithArrayCondition(value, item, key);
+        if (!matched) {
+          allFound = false;
+        }
+      } else if (value instanceof Object) {
+        // 如果条件中的value是对象的话，需要每个key都匹配
+        const matched = matchWithObjectCondition(value, item, key);
+        if (!matched) {
+          allFound = false;
+        }
+      } else if (item[key] !== value) {
+        allFound = false;
+      }
+    }
+    return allFound;
+  };
+  return list.filter(filter);
+}
+
+export default {
+  buildMock(options: BaseMockOptions) {
+    const name = options.name;
+    if (!options.copyTimes) {
+      options.copyTimes = 29;
+    }
+    const list: any[] = [];
+    for (let i = 0; i < options.copyTimes; i += 1) {
+      copyList({
+        originList: options.list,
+        newList: list,
+        options
+      });
+    }
+    options.list = list;
+    return [
+      {
+        path: `/mock/${name}/page`,
+        method: 'post',
+        handle(req: Service.MockOption) {
+          let data = [...list];
+          let limit = 20;
+          let offset = 0;
+          for (const item of list) {
+            if (item.children && item.children.length === 0) {
+              item.hasChildren = false;
+              item.lazy = false;
+            }
+          }
+          let orderAsc: any;
+          let orderProp: any;
+          if (req && req.body) {
+            const { page, query } = req.body;
+            if (page.limit) {
+              limit = parseInt(page.limit, 10);
+            }
+            if (page.offset) {
+              offset = parseInt(page.offset, 10);
+            }
+            if (Object.keys(query).length > 0) {
+              data = searchFromList(list, query);
+            }
+          }
+
+          const start = offset;
+          let end = offset + limit;
+          if (data.length < end) {
+            end = data.length;
+          }
+
+          if (orderProp) {
+            // 排序
+            data.sort((a, b) => {
+              let ret = 0;
+              if (a[orderProp] > b[orderProp]) {
+                ret = 1;
+              } else if (a[orderProp] < b[orderProp]) {
+                ret = -1;
+              }
+              return orderAsc ? ret : -ret;
+            });
+          }
+
+          const records = data.slice(start, end);
+          const lastOffset = data.length - (data.length % limit);
+          if (offset > lastOffset) {
+            offset = lastOffset;
+          }
+          return {
+            code: 200,
+            message: 'success',
+            data: {
+              records,
+              total: data.length,
+              limit,
+              offset
+            }
+          };
+        }
+      },
+      {
+        path: `/mock/${name}/get`,
+        method: 'get',
+        handle(req: Service.MockOption) {
+          let id = req.query.id;
+          id = parseInt(id, 10);
+          let current = null;
+          for (const item of list) {
+            if (item.id === id) {
+              current = item;
+              break;
+            }
+          }
+          return {
+            code: 200,
+            message: 'success',
+            data: current
+          };
+        }
+      },
+      {
+        path: `/mock/${name}/add`,
+        method: 'post',
+        handle(req: Service.MockOption) {
+          req.body.id = options.idGenerator;
+          options.idGenerator += 1;
+          list.unshift(req.body);
+          return {
+            code: 200,
+            message: 'success',
+            data: req.body.id
+          };
+        }
+      },
+      {
+        path: `/mock/${name}/update`,
+        method: 'post',
+        handle(req: Service.MockOption) {
+          const item = findById(req.body.id, list);
+          if (item) {
+            Object.assign(item, req.body);
+          }
+          return {
+            code: 200,
+            message: 'success',
+            data: null
+          };
+        }
+      },
+      {
+        path: `/mock/${name}/delete`,
+        method: 'post',
+        handle(req: Service.MockOption) {
+          delById(req, list);
+          return {
+            code: 200,
+            message: 'success',
+            data: null
+          };
+        }
+      },
+      {
+        path: `/mock/${name}/batchDelete`,
+        method: 'post',
+        handle(req: Service.MockOption) {
+          const ids = req.body.ids;
+          for (let i = list.length - 1; i >= 0; i -= 1) {
+            const item = list[i];
+            if (ids.indexOf(item.id) >= 0) {
+              list.splice(i, 1);
+            }
+          }
+          return {
+            code: 200,
+            message: 'success',
+            data: null
+          };
+        }
+      },
+      {
+        path: `/mock/${name}/all`,
+        method: 'post',
+        handle() {
+          return {
+            code: 200,
+            message: 'success',
+            data: list
+          };
+        }
+      }
+    ];
+  }
+};

mock/api/crud/index.ts

@@ -0,0 +1,5 @@
+import demo from './modules/demo';
+import headerGroup from './modules/header-group';
+
+const crudApis = [...demo, ...headerGroup];
+export default crudApis;

mock/api/crud/modules/demo.ts

@@ -0,0 +1,56 @@
+import type { MethodType, MockMethod } from 'vite-plugin-mock';
+import type { BaseMockOptions } from '../base';
+import mockBase from '../base';
+import MockOption = Service.MockOption;
+
+const options: BaseMockOptions = {
+  name: 'crud/demo',
+  idGenerator: 0,
+  list: [
+    {
+      select: '1',
+      text: '文本测试',
+      copyable: '文本可复制',
+      avatar: 'http://greper.handsfree.work/extends/avatar.jpg',
+      richtext: '富文本',
+      datetime: '2023-01-30 11:11:11'
+    },
+    {
+      select: '2'
+    },
+    {
+      select: '0'
+    }
+  ]
+};
+const mockedApis = mockBase.buildMock(options);
+
+const apis: MockMethod[] = [
+  {
+    url: `/mock/${options.name}/dict`,
+    method: 'get',
+    response: () => {
+      return {
+        code: 200,
+        message: '',
+        data: [
+          { value: '0', label: '关', color: 'warning' },
+          { value: '1', label: '开', color: 'success' },
+          { value: '2', label: '停' }
+        ]
+      };
+    }
+  }
+];
+
+for (const mockedApi of mockedApis) {
+  apis.push({
+    url: mockedApi.path,
+    method: mockedApi.method as MethodType,
+    response: (request: MockOption) => {
+      return mockedApi.handle(request);
+    }
+  });
+}
+
+export default apis;

mock/api/crud/modules/header-group.ts

@@ -0,0 +1,46 @@
+import type { MethodType, MockMethod } from 'vite-plugin-mock';
+import type { BaseMockOptions } from '../base';
+import mockBase from '../base';
+import MockOption = Service.MockOption;
+
+const options: BaseMockOptions = {
+  name: 'crud/header-group',
+  idGenerator: 0,
+  list: [
+    {
+      name: '张三',
+      age: 18,
+      province: '广东省',
+      city: '深圳市',
+      county: '南山区',
+      street: '粤海街道'
+    },
+    {
+      name: '李四',
+      age: 26,
+      province: '浙江省',
+      city: '杭州市',
+      county: '西湖区',
+      street: '西湖街道'
+    },
+    {
+      name: '王五',
+      age: 24
+    }
+  ]
+};
+const mockedApis = mockBase.buildMock(options);
+
+const apis: MockMethod[] = [];
+
+for (const mockedApi of mockedApis) {
+  apis.push({
+    url: mockedApi.path,
+    method: mockedApi.method as MethodType,
+    response: (request: MockOption) => {
+      return mockedApi.handle(request);
+    }
+  });
+}
+
+export default apis;

mock/api/index.ts

@@ -1,5 +1,6 @@
 import auth from './auth';
 import route from './route';
 import management from './management';
+import crud from './crud';
 
-export default [...auth, ...route, ...management];
+export default [...auth, ...route, ...management, ...crud];

package.json

@@ -1,6 +1,6 @@
 {
   "name": "soybean-admin",
-  "version": "0.9.7",
+  "version": "0.9.9",
   "description": "A fresh and elegant admin template, based on Vue3、Vite3、TypeScript、NaiveUI and UnoCSS. 一个基于Vue3、Vite3、TypeScript、NaiveUI and UnoCSS的清新优雅的中后台模版。",
   "author": {
     "name": "Soybean",
@@ -44,90 +44,98 @@
     "build:vercel": "cross-env VITE_HASH_ROUTE=Y VITE_VERCEL=Y vite build",
     "preview": "vite preview",
     "typecheck": "vue-tsc --noEmit --skipLibCheck",
-    "lint": "eslint . --fix",
+    "lint": "eslint . --fix --ext .js,.jsx,.mjs,.json,.ts,.tsx,.vue",
-    "commit": "soybean git-commit",
+    "format": "soy prettier-format",
-    "esno": "esno",
+    "commit": "soy git-commit",
-    "cleanup": "esno ./scripts/cleanup.ts",
+    "cleanup": "soy cleanup",
-    "update-pkg": "ncu --deep -u",
+    "update-pkg": "soy update-pkg",
+    "tsx": "tsx",
+    "logo": "tsx ./scripts/logo.ts",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
     "release": "standard-version",
-    "prepare": "husky install"
+    "prepare": "soy init-git-hooks"
   },
   "dependencies": {
+    "@ant-design/icons-vue": "^6.1.0",
+    "@fast-crud/fast-crud": "^1.13.6",
+    "@fast-crud/fast-extends": "^1.13.6",
+    "@fast-crud/ui-naive": "^1.13.6",
+    "@fast-crud/ui-interface": "^1.13.6",
     "@antv/data-set": "^0.11.8",
-    "@antv/g2": "^4.2.8",
+    "@antv/g2": "^4.2.10",
-    "@better-scroll/core": "^2.5.0",
+    "@better-scroll/core": "^2.5.1",
-    "@soybeanjs/vue-admin-layout": "^1.1.1",
+    "@soybeanjs/vue-materials": "^0.1.9",
-    "@soybeanjs/vue-admin-tab": "^1.0.5",
+    "@vueuse/core": "^10.1.2",
-    "@vueuse/core": "^9.4.0",
+    "axios": "1.4.0",
-    "axios": "0.27.2",
     "clipboard": "^2.0.11",
     "colord": "^2.9.3",
     "crypto-js": "^4.1.1",
-    "dayjs": "^1.11.6",
+    "dayjs": "^1.11.7",
-    "echarts": "^5.4.0",
+    "echarts": "^5.4.2",
     "form-data": "^4.0.0",
     "lodash-es": "^4.17.21",
-    "naive-ui": "2.33.5",
+    "naive-ui": "2.34.4",
-    "pinia": "^2.0.23",
+    "pinia": "^2.1.3",
     "print-js": "^1.6.0",
-    "qs": "^6.11.0",
+    "qs": "^6.11.2",
-    "swiper": "^8.4.4",
+    "swiper": "^9.3.2",
-    "ua-parser-js": "^1.0.32",
+    "ua-parser-js": "^1.0.35",
-    "vditor": "^3.8.18",
+    "vditor": "^3.9.2",
-    "vue": "3.2.41",
+    "vue": "3.3.4",
     "vue-i18n": "^9.2.2",
-    "vue-router": "^4.1.6",
+    "vue-router": "^4.2.1",
     "vuedraggable": "^4.1.0",
     "wangeditor": "^4.7.15",
-    "xgplayer": "^2.32.1"
+    "xgplayer": "^3.0.2"
   },
   "devDependencies": {
-    "@amap/amap-jsapi-types": "^0.0.10",
+    "@amap/amap-jsapi-types": "^0.0.13",
-    "@iconify/json": "^2.1.133",
+    "@iconify/json": "^2.2.67",
-    "@iconify/vue": "^4.0.0",
+    "@iconify/vue": "^4.1.1",
-    "@soybeanjs/cli": "^0.1.2",
+    "@soybeanjs/cli": "^0.1.9",
-    "@soybeanjs/router-page": "1.0.3",
+    "@soybeanjs/vite-plugin-vue-page-route": "^0.0.5",
-    "@tauri-apps/cli": "^1.1.1",
+    "@types/bmapgl": "^0.0.7",
-    "@types/bmapgl": "^0.0.5",
     "@types/crypto-js": "^4.1.1",
-    "@types/node": "18.8.3",
+    "@types/node": "20.2.1",
     "@types/qs": "^6.9.7",
     "@types/ua-parser-js": "^0.7.36",
-    "@unocss/preset-uno": "^0.46.3",
+    "@unocss/preset-uno": "^0.52.0",
-    "@unocss/vite": "^0.46.3",
+    "@unocss/transformer-directives": "^0.52.0",
-    "@vitejs/plugin-vue": "^3.2.0",
+    "@unocss/vite": "^0.52.0",
-    "@vitejs/plugin-vue-jsx": "^2.1.0",
+    "@vitejs/plugin-vue": "^4.2.3",
+    "@vitejs/plugin-vue-jsx": "^3.0.1",
     "conventional-changelog": "^3.1.25",
     "cross-env": "^7.0.3",
-    "eslint": "^8.27.0",
+    "eslint": "^8.41.0",
-    "eslint-config-soybeanjs-vue": "^0.1.2",
+    "eslint-config-soybeanjs": "^0.3.7",
-    "esno": "^0.16.3",
+    "lint-staged": "13.2.2",
-    "husky": "^8.0.1",
     "mockjs": "^1.1.0",
-    "npm-check-updates": "^16.3.16",
+    "rollup-plugin-visualizer": "^5.9.0",
-    "rimraf": "^3.0.2",
+    "sass": "^1.62.1",
-    "rollup-plugin-visualizer": "^5.8.3",
+    "simple-git-hooks": "^2.8.1",
-    "sass": "^1.56.0",
     "standard-version": "^9.5.0",
-    "typescript": "4.8.4",
+    "tsx": "^3.12.7",
-    "unplugin-icons": "^0.14.13",
+    "typescript": "5.0.4",
-    "unplugin-vue-components": "0.22.8",
+    "unplugin-icons": "^0.16.1",
-    "unplugin-vue-macros": "^0.16.0",
+    "unplugin-vue-components": "0.24.1",
-    "utility-types": "^3.10.0",
+    "vite": "^4.3.8",
-    "vite": "^3.2.2",
     "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-html": "^3.2.0",
+    "vite-plugin-mock": "2.9.8",
-    "vite-plugin-mock": "^2.9.6",
+    "vite-plugin-progress": "^0.0.7",
-    "vite-plugin-progress": "^0.0.6",
+    "vite-plugin-pwa": "^0.15.0",
-    "vite-plugin-pwa": "^0.13.2",
     "vite-plugin-svg-icons": "^2.0.1",
-    "vue-tsc": "^1.0.9",
+    "vue-tsc": "1.6.5"
-    "zx": "^7.1.1"
   },
   "pnpm": {
     "patchedDependencies": {
       "mockjs@1.1.0": "patches/mockjs@1.1.0.patch"
     }
+  },
+  "simple-git-hooks": {
+    "commit-msg": "pnpm soy git-commit-verify",
+    "pre-commit": "pnpm typecheck && pnpm lint-staged"
+  },
+  "lint-staged": {
+    "*.{js,jsx,mjs,json,ts,tsx,vue}": "eslint . --fix"
   }
 }

patches/mockjs@1.1.0.patch

@@ -5,56 +5,56 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
 @@ -126,17 +126,17 @@ return /******/ (function(modules) { // webpackBootstrap
  /* 1 */
  /***/ (function(module, exports, __webpack_require__) {
- 
+
--	/* 
+-	/*
 +	/*
  	    ## Handler
- 
+
  	    处理数据模板。
--	    
+-
 +
  	    * Handler.gen( template, name?, context? )
- 
+
  	        入口方法。
- 
+
  	    * Data Template Definition, DTD
--	        
+-
 +
  	        处理数据模板定义。
- 
+
  	        * Handler.array( options )
 @@ -146,7 +146,7 @@ return /******/ (function(modules) { // webpackBootstrap
  	        * Handler.string( options )
  	        * Handler.function( options )
  	        * Handler.regexp( options )
--	        
+-
 +
  	        处理路径（相对和绝对）。
- 
+
  	        * Handler.getValueByKeyPath( key, options )
 @@ -177,7 +177,7 @@ return /******/ (function(modules) { // webpackBootstrap
- 
+
  	    Handle.gen(template, name, options)
  	    context
--	        currentContext, templateCurrentContext, 
+-	        currentContext, templateCurrentContext,
 +	        currentContext, templateCurrentContext,
  	        path, templatePath
  	        root, templateRoot
  	*/
 @@ -456,7 +456,7 @@ return /******/ (function(modules) { // webpackBootstrap
  	                phed = Handler.placeholder(ph, options.context.currentContext, options.context.templateCurrentContext, options)
- 
+
  	                // 只有一个占位符，并且没有其他字符
--	                if (placeholders.length === 1 && ph === result && typeof phed !== typeof result) { // 
+-	                if (placeholders.length === 1 && ph === result && typeof phed !== typeof result) { //
 +	                if (placeholders.length === 1 && ph === result && typeof phed !== typeof result) { //
  	                    result = phed
  	                    break
- 
+
 @@ -627,7 +627,7 @@ return /******/ (function(modules) { // webpackBootstrap
  	            }
  	            // 引用的值已经计算好
  	            if (currentContext && (key in currentContext)) return currentContext[key]
--	    
+-
 +
  	            // 尚未计算，递归引用数据模板中的属性
  	            if (templateCurrentContext &&
@@ -63,41 +63,41 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        var tpl = Mock.heredoc(function() {
  	            /*!
  	        {{email}}{{age}}
--	        <!-- Mock { 
+-	        <!-- Mock {
 +	        <!-- Mock {
  	            email: '@EMAIL',
  	            age: '@INT(1,100)'
  	        } -->
  	            *\/
  	        })
--	    
+-
 +
  	    **相关阅读**
  	    * [Creating multiline strings in JavaScript](http://stackoverflow.com/questions/805107/creating-multiline-strings-in-javascript)、
  	*/
 @@ -850,7 +850,7 @@ return /******/ (function(modules) { // webpackBootstrap
  		解析数据模板（属性名部分）。
- 
+
  		* Parser.parse( name )
--			
+-
 +
  			```json
  			{
  				parameters: [ name, inc, range, decimal ],
 @@ -922,7 +922,7 @@ return /******/ (function(modules) { // webpackBootstrap
- 
+
  	/*
  	    ## Mock.Random
--	    
+-
 +
  	    工具类，用于生成各种随机数据。
  	*/
- 
+
 @@ -1251,7 +1251,7 @@ return /******/ (function(modules) { // webpackBootstrap
- 
+
  	        替代图片源
  	            http://fpoimg.com/
--	        参考自 
+-	        参考自
 +	        参考自
  	            http://rensanning.iteye.com/blog/1933310
  	            http://code.tutsplus.com/articles/the-top-8-placeholders-for-web-designers--net-19485
@@ -106,16 +106,16 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        var bg_colour = Math.floor(Math.random() * 16777215).toString(16);
  	        bg_colour = "#" + ("000000" + bg_colour).slice(-6);
  	        document.bgColor = bg_colour;
--	    
+-
 +
  	    http://martin.ankerl.com/2009/12/09/how-to-create-random-colors-programmatically/
  	        Creating random colors is actually more difficult than it seems. The randomness itself is easy, but aesthetically pleasing randomness is more difficult.
  	        https://github.com/devongovett/color-generator
 @@ -1561,7 +1561,7 @@ return /******/ (function(modules) { // webpackBootstrap
- 
+
  	    http://tool.c7sky.com/webcolor
  	        网页设计常用色彩搭配表
--	    
+-
 +
  	    https://github.com/One-com/one-color
  	        An OO-based JavaScript color parser/computation toolkit with support for RGB, HSV, HSL, CMYK, and alpha channels.
@@ -124,7 +124,7 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	            color += letters[Math.floor(Math.random() * 16)]
  	        }
  	        return color
--	    
+-
 +
  	        // 随机生成一个无脑的颜色，格式为 '#RRGGBB'。
  	        // _brainlessColor()
@@ -133,24 +133,24 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        }
  	        return result.join(' ')
  	    },
--	    // 
+-	    //
 +	    //
  	    cparagraph: function(min, max) {
  	        var len = range(3, 7, min, max)
  	        var result = []
 @@ -2282,17 +2282,17 @@ return /******/ (function(modules) { // webpackBootstrap
  	        随机生成一个 URL。
- 
+
  	        [URL 规范](http://www.w3.org/Addressing/URL/url-spec.txt)
--	            http                    Hypertext Transfer Protocol 
+-	            http                    Hypertext Transfer Protocol
--	            ftp                     File Transfer protocol 
+-	            ftp                     File Transfer protocol
--	            gopher                  The Gopher protocol 
+-	            gopher                  The Gopher protocol
--	            mailto                  Electronic mail address 
+-	            mailto                  Electronic mail address
--	            mid                     Message identifiers for electronic mail 
+-	            mid                     Message identifiers for electronic mail
--	            cid                     Content identifiers for MIME body part 
+-	            cid                     Content identifiers for MIME body part
--	            news                    Usenet news 
+-	            news                    Usenet news
--	            nntp                    Usenet news for local NNTP access only 
+-	            nntp                    Usenet news for local NNTP access only
--	            prospero                Access using the prospero protocols 
+-	            prospero                Access using the prospero protocols
 +	            http                    Hypertext Transfer Protocol
 +	            ftp                     File Transfer protocol
 +	            gopher                  The Gopher protocol
@@ -161,7 +161,7 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
 +	            nntp                    Usenet news for local NNTP access only
 +	            prospero                Access using the prospero protocols
  	            telnet rlogin tn3270    Reference to interactive sessions
--	            wais                    Wide Area Information Servers 
+-	            wais                    Wide Area Information Servers
 +	            wais                    Wide Area Information Servers
  	    */
  	    url: function(protocol, host) {
@@ -170,10 +170,10 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	    西南   重庆市 四川省 贵州省 云南省 西藏自治区
  	    西北   陕西省 甘肃省 青海省 宁夏回族自治区 新疆维吾尔自治区
  	    港澳台 香港特别行政区 澳门特别行政区 台湾省
--	    
+-
 +
  	    **排序**
--	    
+-
 +
  	    ```js
  	    var map = {}
@@ -182,25 +182,25 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  		                "0" / "1" / "2" / "3" / "4" / "5" / "6" / "7" / "8" / "9" /
  		                "a" / "b" / "c" / "d" / "e" / "f" /
  		                "A" / "B" / "C" / "D" / "E" / "F"
--		    
+-
 +
  		    https://github.com/victorquinn/chancejs/blob/develop/chance.js#L1349
  		*/
  		guid: function() {
 @@ -6629,7 +6629,7 @@ return /******/ (function(modules) { // webpackBootstrap
  	}
- 
+
  	function CaptureGroup(n) {
--	    Group.call(this, "capture-group"), this.index = cgs[this.offset] || (cgs[this.offset] = index++), 
+-	    Group.call(this, "capture-group"), this.index = cgs[this.offset] || (cgs[this.offset] = index++),
 +	    Group.call(this, "capture-group"), this.index = cgs[this.offset] || (cgs[this.offset] = index++),
  	    this.body = n;
  	}
- 
+
 @@ -6711,7 +6711,7 @@ return /******/ (function(modules) { // webpackBootstrap
  	            }
  	            return r = l ? '"' + u(l) + '"' : "end of input", "Expected " + t + " but " + r + " found.";
  	        }
--	        this.expected = n, this.found = l, this.offset = u, this.line = t, this.column = r, 
+-	        this.expected = n, this.found = l, this.offset = u, this.line = t, this.column = r,
 +	        this.expected = n, this.found = l, this.offset = u, this.line = t, this.column = r,
  	        this.name = "SyntaxError", this.message = e(n, l);
  	    }
@@ -209,8 +209,8 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        function r(l) {
  	            function u(l, u, t) {
  	                var r, e;
--	                for (r = u; t > r; r++) e = n.charAt(r), "\n" === e ? (l.seenCR || l.line++, l.column = 1, 
+-	                for (r = u; t > r; r++) e = n.charAt(r), "\n" === e ? (l.seenCR || l.line++, l.column = 1,
--	                l.seenCR = !1) : "\r" === e || "\u2028" === e || "\u2029" === e ? (l.line++, l.column = 1, 
+-	                l.seenCR = !1) : "\r" === e || "\u2028" === e || "\u2029" === e ? (l.line++, l.column = 1,
 +	                for (r = u; t > r; r++) e = n.charAt(r), "\n" === e ? (l.seenCR || l.line++, l.column = 1,
 +	                l.seenCR = !1) : "\r" === e || "\u2028" === e || "\u2029" === e ? (l.line++, l.column = 1,
  	                l.seenCR = !0) : (l.column++, l.seenCR = !1);
@@ -220,10 +220,10 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        }
  	        function c() {
  	            var l, u, t, r, o;
--	            return l = qt, u = i(), null !== u ? (t = qt, 124 === n.charCodeAt(qt) ? (r = fl, 
+-	            return l = qt, u = i(), null !== u ? (t = qt, 124 === n.charCodeAt(qt) ? (r = fl,
--	            qt++) : (r = null, 0 === Wt && e(sl)), null !== r ? (o = c(), null !== o ? (r = [ r, o ], 
+-	            qt++) : (r = null, 0 === Wt && e(sl)), null !== r ? (o = c(), null !== o ? (r = [ r, o ],
--	            t = r) : (qt = t, t = il)) : (qt = t, t = il), null === t && (t = al), null !== t ? (Lt = l, 
+-	            t = r) : (qt = t, t = il)) : (qt = t, t = il), null === t && (t = al), null !== t ? (Lt = l,
--	            u = hl(u, t), null === u ? (qt = l, l = u) : l = u) : (qt = l, l = il)) : (qt = l, 
+-	            u = hl(u, t), null === u ? (qt = l, l = u) : l = u) : (qt = l, l = il)) : (qt = l,
 +	            return l = qt, u = i(), null !== u ? (t = qt, 124 === n.charCodeAt(qt) ? (r = fl,
 +	            qt++) : (r = null, 0 === Wt && e(sl)), null !== r ? (o = c(), null !== o ? (r = [ r, o ],
 +	            t = r) : (qt = t, t = il)) : (qt = t, t = il), null === t && (t = al), null !== t ? (Lt = l,
@@ -232,13 +232,13 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        }
  	        function i() {
  	            var n, l, u, t, r;
--	            if (n = qt, l = f(), null === l && (l = al), null !== l) if (u = qt, Wt++, t = d(), 
+-	            if (n = qt, l = f(), null === l && (l = al), null !== l) if (u = qt, Wt++, t = d(),
 +	            if (n = qt, l = f(), null === l && (l = al), null !== l) if (u = qt, Wt++, t = d(),
  	            Wt--, null === t ? u = al : (qt = u, u = il), null !== u) {
--	                for (t = [], r = h(), null === r && (r = a()); null !== r; ) t.push(r), r = h(), 
+-	                for (t = [], r = h(), null === r && (r = a()); null !== r; ) t.push(r), r = h(),
 +	                for (t = [], r = h(), null === r && (r = a()); null !== r; ) t.push(r), r = h(),
  	                null === r && (r = a());
--	                null !== t ? (r = s(), null === r && (r = al), null !== r ? (Lt = n, l = dl(l, t, r), 
+-	                null !== t ? (r = s(), null === r && (r = al), null !== r ? (Lt = n, l = dl(l, t, r),
 +	                null !== t ? (r = s(), null === r && (r = al), null !== r ? (Lt = n, l = dl(l, t, r),
  	                null === l ? (qt = n, n = l) : n = l) : (qt = n, n = il)) : (qt = n, n = il);
  	            } else qt = n, n = il; else qt = n, n = il;
@@ -247,43 +247,43 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        }
  	        function f() {
  	            var l, u;
--	            return l = qt, 94 === n.charCodeAt(qt) ? (u = pl, qt++) : (u = null, 0 === Wt && e(vl)), 
+-	            return l = qt, 94 === n.charCodeAt(qt) ? (u = pl, qt++) : (u = null, 0 === Wt && e(vl)),
 +	            return l = qt, 94 === n.charCodeAt(qt) ? (u = pl, qt++) : (u = null, 0 === Wt && e(vl)),
  	            null !== u && (Lt = l, u = wl()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function s() {
  	            var l, u;
--	            return l = qt, 36 === n.charCodeAt(qt) ? (u = Al, qt++) : (u = null, 0 === Wt && e(Cl)), 
+-	            return l = qt, 36 === n.charCodeAt(qt) ? (u = Al, qt++) : (u = null, 0 === Wt && e(Cl)),
 +	            return l = qt, 36 === n.charCodeAt(qt) ? (u = Al, qt++) : (u = null, 0 === Wt && e(Cl)),
  	            null !== u && (Lt = l, u = gl()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function h() {
  	            var n, l, u;
--	            return n = qt, l = a(), null !== l ? (u = d(), null !== u ? (Lt = n, l = bl(l, u), 
+-	            return n = qt, l = a(), null !== l ? (u = d(), null !== u ? (Lt = n, l = bl(l, u),
 +	            return n = qt, l = a(), null !== l ? (u = d(), null !== u ? (Lt = n, l = bl(l, u),
  	            null === l ? (qt = n, n = l) : n = l) : (qt = n, n = il)) : (qt = n, n = il), n;
  	        }
  	        function d() {
  	            var n, l, u;
--	            return Wt++, n = qt, l = p(), null !== l ? (u = k(), null === u && (u = al), null !== u ? (Lt = n, 
+-	            return Wt++, n = qt, l = p(), null !== l ? (u = k(), null === u && (u = al), null !== u ? (Lt = n,
--	            l = Tl(l, u), null === l ? (qt = n, n = l) : n = l) : (qt = n, n = il)) : (qt = n, 
+-	            l = Tl(l, u), null === l ? (qt = n, n = l) : n = l) : (qt = n, n = il)) : (qt = n,
 +	            return Wt++, n = qt, l = p(), null !== l ? (u = k(), null === u && (u = al), null !== u ? (Lt = n,
 +	            l = Tl(l, u), null === l ? (qt = n, n = l) : n = l) : (qt = n, n = il)) : (qt = n,
  	            n = il), Wt--, null === n && (l = null, 0 === Wt && e(kl)), n;
  	        }
  	        function p() {
  	            var n;
--	            return n = v(), null === n && (n = w(), null === n && (n = A(), null === n && (n = C(), 
+-	            return n = v(), null === n && (n = w(), null === n && (n = A(), null === n && (n = C(),
 +	            return n = v(), null === n && (n = w(), null === n && (n = A(), null === n && (n = C(),
  	            null === n && (n = g(), null === n && (n = b()))))), n;
  	        }
  	        function v() {
  	            var l, u, t, r, o, c;
--	            return l = qt, 123 === n.charCodeAt(qt) ? (u = xl, qt++) : (u = null, 0 === Wt && e(yl)), 
+-	            return l = qt, 123 === n.charCodeAt(qt) ? (u = xl, qt++) : (u = null, 0 === Wt && e(yl)),
--	            null !== u ? (t = T(), null !== t ? (44 === n.charCodeAt(qt) ? (r = ml, qt++) : (r = null, 
+-	            null !== u ? (t = T(), null !== t ? (44 === n.charCodeAt(qt) ? (r = ml, qt++) : (r = null,
--	            0 === Wt && e(Rl)), null !== r ? (o = T(), null !== o ? (125 === n.charCodeAt(qt) ? (c = Fl, 
+-	            0 === Wt && e(Rl)), null !== r ? (o = T(), null !== o ? (125 === n.charCodeAt(qt) ? (c = Fl,
--	            qt++) : (c = null, 0 === Wt && e(Ql)), null !== c ? (Lt = l, u = Sl(t, o), null === u ? (qt = l, 
+-	            qt++) : (c = null, 0 === Wt && e(Ql)), null !== c ? (Lt = l, u = Sl(t, o), null === u ? (qt = l,
--	            l = u) : l = u) : (qt = l, l = il)) : (qt = l, l = il)) : (qt = l, l = il)) : (qt = l, 
+-	            l = u) : l = u) : (qt = l, l = il)) : (qt = l, l = il)) : (qt = l, l = il)) : (qt = l,
 +	            return l = qt, 123 === n.charCodeAt(qt) ? (u = xl, qt++) : (u = null, 0 === Wt && e(yl)),
 +	            null !== u ? (t = T(), null !== t ? (44 === n.charCodeAt(qt) ? (r = ml, qt++) : (r = null,
 +	            0 === Wt && e(Rl)), null !== r ? (o = T(), null !== o ? (125 === n.charCodeAt(qt) ? (c = Fl,
@@ -293,9 +293,9 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        }
  	        function w() {
  	            var l, u, t, r;
--	            return l = qt, 123 === n.charCodeAt(qt) ? (u = xl, qt++) : (u = null, 0 === Wt && e(yl)), 
+-	            return l = qt, 123 === n.charCodeAt(qt) ? (u = xl, qt++) : (u = null, 0 === Wt && e(yl)),
--	            null !== u ? (t = T(), null !== t ? (n.substr(qt, 2) === Ul ? (r = Ul, qt += 2) : (r = null, 
+-	            null !== u ? (t = T(), null !== t ? (n.substr(qt, 2) === Ul ? (r = Ul, qt += 2) : (r = null,
--	            0 === Wt && e(El)), null !== r ? (Lt = l, u = Gl(t), null === u ? (qt = l, l = u) : l = u) : (qt = l, 
+-	            0 === Wt && e(El)), null !== r ? (Lt = l, u = Gl(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
 +	            return l = qt, 123 === n.charCodeAt(qt) ? (u = xl, qt++) : (u = null, 0 === Wt && e(yl)),
 +	            null !== u ? (t = T(), null !== t ? (n.substr(qt, 2) === Ul ? (r = Ul, qt += 2) : (r = null,
 +	            0 === Wt && e(El)), null !== r ? (Lt = l, u = Gl(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
@@ -303,9 +303,9 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        }
  	        function A() {
  	            var l, u, t, r;
--	            return l = qt, 123 === n.charCodeAt(qt) ? (u = xl, qt++) : (u = null, 0 === Wt && e(yl)), 
+-	            return l = qt, 123 === n.charCodeAt(qt) ? (u = xl, qt++) : (u = null, 0 === Wt && e(yl)),
--	            null !== u ? (t = T(), null !== t ? (125 === n.charCodeAt(qt) ? (r = Fl, qt++) : (r = null, 
+-	            null !== u ? (t = T(), null !== t ? (125 === n.charCodeAt(qt) ? (r = Fl, qt++) : (r = null,
--	            0 === Wt && e(Ql)), null !== r ? (Lt = l, u = Bl(t), null === u ? (qt = l, l = u) : l = u) : (qt = l, 
+-	            0 === Wt && e(Ql)), null !== r ? (Lt = l, u = Bl(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
 +	            return l = qt, 123 === n.charCodeAt(qt) ? (u = xl, qt++) : (u = null, 0 === Wt && e(yl)),
 +	            null !== u ? (t = T(), null !== t ? (125 === n.charCodeAt(qt) ? (r = Fl, qt++) : (r = null,
 +	            0 === Wt && e(Ql)), null !== r ? (Lt = l, u = Bl(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
@@ -313,45 +313,45 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        }
  	        function C() {
  	            var l, u;
--	            return l = qt, 43 === n.charCodeAt(qt) ? (u = jl, qt++) : (u = null, 0 === Wt && e($l)), 
+-	            return l = qt, 43 === n.charCodeAt(qt) ? (u = jl, qt++) : (u = null, 0 === Wt && e($l)),
 +	            return l = qt, 43 === n.charCodeAt(qt) ? (u = jl, qt++) : (u = null, 0 === Wt && e($l)),
  	            null !== u && (Lt = l, u = ql()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function g() {
  	            var l, u;
--	            return l = qt, 42 === n.charCodeAt(qt) ? (u = Ll, qt++) : (u = null, 0 === Wt && e(Ml)), 
+-	            return l = qt, 42 === n.charCodeAt(qt) ? (u = Ll, qt++) : (u = null, 0 === Wt && e(Ml)),
 +	            return l = qt, 42 === n.charCodeAt(qt) ? (u = Ll, qt++) : (u = null, 0 === Wt && e(Ml)),
  	            null !== u && (Lt = l, u = Dl()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function b() {
  	            var l, u;
--	            return l = qt, 63 === n.charCodeAt(qt) ? (u = Hl, qt++) : (u = null, 0 === Wt && e(Ol)), 
+-	            return l = qt, 63 === n.charCodeAt(qt) ? (u = Hl, qt++) : (u = null, 0 === Wt && e(Ol)),
 +	            return l = qt, 63 === n.charCodeAt(qt) ? (u = Hl, qt++) : (u = null, 0 === Wt && e(Ol)),
  	            null !== u && (Lt = l, u = Wl()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function k() {
  	            var l;
--	            return 63 === n.charCodeAt(qt) ? (l = Hl, qt++) : (l = null, 0 === Wt && e(Ol)), 
+-	            return 63 === n.charCodeAt(qt) ? (l = Hl, qt++) : (l = null, 0 === Wt && e(Ol)),
 +	            return 63 === n.charCodeAt(qt) ? (l = Hl, qt++) : (l = null, 0 === Wt && e(Ol)),
  	            l;
  	        }
  	        function T() {
  	            var l, u, t;
--	            if (l = qt, u = [], zl.test(n.charAt(qt)) ? (t = n.charAt(qt), qt++) : (t = null, 
+-	            if (l = qt, u = [], zl.test(n.charAt(qt)) ? (t = n.charAt(qt), qt++) : (t = null,
--	            0 === Wt && e(Il)), null !== t) for (;null !== t; ) u.push(t), zl.test(n.charAt(qt)) ? (t = n.charAt(qt), 
+-	            0 === Wt && e(Il)), null !== t) for (;null !== t; ) u.push(t), zl.test(n.charAt(qt)) ? (t = n.charAt(qt),
 +	            if (l = qt, u = [], zl.test(n.charAt(qt)) ? (t = n.charAt(qt), qt++) : (t = null,
 +	            0 === Wt && e(Il)), null !== t) for (;null !== t; ) u.push(t), zl.test(n.charAt(qt)) ? (t = n.charAt(qt),
  	            qt++) : (t = null, 0 === Wt && e(Il)); else u = il;
--	            return null !== u && (Lt = l, u = Jl(u)), null === u ? (qt = l, l = u) : l = u, 
+-	            return null !== u && (Lt = l, u = Jl(u)), null === u ? (qt = l, l = u) : l = u,
 +	            return null !== u && (Lt = l, u = Jl(u)), null === u ? (qt = l, l = u) : l = u,
  	            l;
  	        }
  	        function x() {
  	            var l, u, t, r;
--	            return l = qt, 40 === n.charCodeAt(qt) ? (u = Kl, qt++) : (u = null, 0 === Wt && e(Nl)), 
+-	            return l = qt, 40 === n.charCodeAt(qt) ? (u = Kl, qt++) : (u = null, 0 === Wt && e(Nl)),
--	            null !== u ? (t = R(), null === t && (t = F(), null === t && (t = m(), null === t && (t = y()))), 
+-	            null !== u ? (t = R(), null === t && (t = F(), null === t && (t = m(), null === t && (t = y()))),
--	            null !== t ? (41 === n.charCodeAt(qt) ? (r = Pl, qt++) : (r = null, 0 === Wt && e(Vl)), 
+-	            null !== t ? (41 === n.charCodeAt(qt) ? (r = Pl, qt++) : (r = null, 0 === Wt && e(Vl)),
--	            null !== r ? (Lt = l, u = Xl(t), null === u ? (qt = l, l = u) : l = u) : (qt = l, 
+-	            null !== r ? (Lt = l, u = Xl(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
 +	            return l = qt, 40 === n.charCodeAt(qt) ? (u = Kl, qt++) : (u = null, 0 === Wt && e(Nl)),
 +	            null !== u ? (t = R(), null === t && (t = F(), null === t && (t = m(), null === t && (t = y()))),
 +	            null !== t ? (41 === n.charCodeAt(qt) ? (r = Pl, qt++) : (r = null, 0 === Wt && e(Vl)),
@@ -360,46 +360,46 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        }
  	        function y() {
  	            var n, l;
--	            return n = qt, l = c(), null !== l && (Lt = n, l = Yl(l)), null === l ? (qt = n, 
+-	            return n = qt, l = c(), null !== l && (Lt = n, l = Yl(l)), null === l ? (qt = n,
 +	            return n = qt, l = c(), null !== l && (Lt = n, l = Yl(l)), null === l ? (qt = n,
  	            n = l) : n = l, n;
  	        }
  	        function m() {
  	            var l, u, t;
--	            return l = qt, n.substr(qt, 2) === Zl ? (u = Zl, qt += 2) : (u = null, 0 === Wt && e(_l)), 
+-	            return l = qt, n.substr(qt, 2) === Zl ? (u = Zl, qt += 2) : (u = null, 0 === Wt && e(_l)),
--	            null !== u ? (t = c(), null !== t ? (Lt = l, u = nu(t), null === u ? (qt = l, l = u) : l = u) : (qt = l, 
+-	            null !== u ? (t = c(), null !== t ? (Lt = l, u = nu(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
 +	            return l = qt, n.substr(qt, 2) === Zl ? (u = Zl, qt += 2) : (u = null, 0 === Wt && e(_l)),
 +	            null !== u ? (t = c(), null !== t ? (Lt = l, u = nu(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
  	            l = il)) : (qt = l, l = il), l;
  	        }
  	        function R() {
  	            var l, u, t;
--	            return l = qt, n.substr(qt, 2) === lu ? (u = lu, qt += 2) : (u = null, 0 === Wt && e(uu)), 
+-	            return l = qt, n.substr(qt, 2) === lu ? (u = lu, qt += 2) : (u = null, 0 === Wt && e(uu)),
--	            null !== u ? (t = c(), null !== t ? (Lt = l, u = tu(t), null === u ? (qt = l, l = u) : l = u) : (qt = l, 
+-	            null !== u ? (t = c(), null !== t ? (Lt = l, u = tu(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
 +	            return l = qt, n.substr(qt, 2) === lu ? (u = lu, qt += 2) : (u = null, 0 === Wt && e(uu)),
 +	            null !== u ? (t = c(), null !== t ? (Lt = l, u = tu(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
  	            l = il)) : (qt = l, l = il), l;
  	        }
  	        function F() {
  	            var l, u, t;
--	            return l = qt, n.substr(qt, 2) === ru ? (u = ru, qt += 2) : (u = null, 0 === Wt && e(eu)), 
+-	            return l = qt, n.substr(qt, 2) === ru ? (u = ru, qt += 2) : (u = null, 0 === Wt && e(eu)),
--	            null !== u ? (t = c(), null !== t ? (Lt = l, u = ou(t), null === u ? (qt = l, l = u) : l = u) : (qt = l, 
+-	            null !== u ? (t = c(), null !== t ? (Lt = l, u = ou(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
 +	            return l = qt, n.substr(qt, 2) === ru ? (u = ru, qt += 2) : (u = null, 0 === Wt && e(eu)),
 +	            null !== u ? (t = c(), null !== t ? (Lt = l, u = ou(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
  	            l = il)) : (qt = l, l = il), l;
  	        }
  	        function Q() {
  	            var l, u, t, r, o;
--	            if (Wt++, l = qt, 91 === n.charCodeAt(qt) ? (u = iu, qt++) : (u = null, 0 === Wt && e(au)), 
+-	            if (Wt++, l = qt, 91 === n.charCodeAt(qt) ? (u = iu, qt++) : (u = null, 0 === Wt && e(au)),
--	            null !== u) if (94 === n.charCodeAt(qt) ? (t = pl, qt++) : (t = null, 0 === Wt && e(vl)), 
+-	            null !== u) if (94 === n.charCodeAt(qt) ? (t = pl, qt++) : (t = null, 0 === Wt && e(vl)),
 +	            if (Wt++, l = qt, 91 === n.charCodeAt(qt) ? (u = iu, qt++) : (u = null, 0 === Wt && e(au)),
 +	            null !== u) if (94 === n.charCodeAt(qt) ? (t = pl, qt++) : (t = null, 0 === Wt && e(vl)),
  	            null === t && (t = al), null !== t) {
--	                for (r = [], o = S(), null === o && (o = U()); null !== o; ) r.push(o), o = S(), 
+-	                for (r = [], o = S(), null === o && (o = U()); null !== o; ) r.push(o), o = S(),
 +	                for (r = [], o = S(), null === o && (o = U()); null !== o; ) r.push(o), o = S(),
  	                null === o && (o = U());
--	                null !== r ? (93 === n.charCodeAt(qt) ? (o = fu, qt++) : (o = null, 0 === Wt && e(su)), 
+-	                null !== r ? (93 === n.charCodeAt(qt) ? (o = fu, qt++) : (o = null, 0 === Wt && e(su)),
--	                null !== o ? (Lt = l, u = hu(t, r), null === u ? (qt = l, l = u) : l = u) : (qt = l, 
+-	                null !== o ? (Lt = l, u = hu(t, r), null === u ? (qt = l, l = u) : l = u) : (qt = l,
 +	                null !== r ? (93 === n.charCodeAt(qt) ? (o = fu, qt++) : (o = null, 0 === Wt && e(su)),
 +	                null !== o ? (Lt = l, u = hu(t, r), null === u ? (qt = l, l = u) : l = u) : (qt = l,
  	                l = il)) : (qt = l, l = il);
@@ -408,9 +408,9 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        }
  	        function S() {
  	            var l, u, t, r;
--	            return Wt++, l = qt, u = U(), null !== u ? (45 === n.charCodeAt(qt) ? (t = pu, qt++) : (t = null, 
+-	            return Wt++, l = qt, u = U(), null !== u ? (45 === n.charCodeAt(qt) ? (t = pu, qt++) : (t = null,
--	            0 === Wt && e(vu)), null !== t ? (r = U(), null !== r ? (Lt = l, u = wu(u, r), null === u ? (qt = l, 
+-	            0 === Wt && e(vu)), null !== t ? (r = U(), null !== r ? (Lt = l, u = wu(u, r), null === u ? (qt = l,
--	            l = u) : l = u) : (qt = l, l = il)) : (qt = l, l = il)) : (qt = l, l = il), Wt--, 
+-	            l = u) : l = u) : (qt = l, l = il)) : (qt = l, l = il)) : (qt = l, l = il), Wt--,
 +	            return Wt++, l = qt, u = U(), null !== u ? (45 === n.charCodeAt(qt) ? (t = pu, qt++) : (t = null,
 +	            0 === Wt && e(vu)), null !== t ? (r = U(), null !== r ? (Lt = l, u = wu(u, r), null === u ? (qt = l,
 +	            l = u) : l = u) : (qt = l, l = il)) : (qt = l, l = il)) : (qt = l, l = il), Wt--,
@@ -418,22 +418,22 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        }
  	        function U() {
  	            var n, l;
--	            return Wt++, n = G(), null === n && (n = E()), Wt--, null === n && (l = null, 0 === Wt && e(Au)), 
+-	            return Wt++, n = G(), null === n && (n = E()), Wt--, null === n && (l = null, 0 === Wt && e(Au)),
 +	            return Wt++, n = G(), null === n && (n = E()), Wt--, null === n && (l = null, 0 === Wt && e(Au)),
  	            n;
  	        }
  	        function E() {
  	            var l, u;
--	            return l = qt, Cu.test(n.charAt(qt)) ? (u = n.charAt(qt), qt++) : (u = null, 0 === Wt && e(gu)), 
+-	            return l = qt, Cu.test(n.charAt(qt)) ? (u = n.charAt(qt), qt++) : (u = null, 0 === Wt && e(gu)),
 +	            return l = qt, Cu.test(n.charAt(qt)) ? (u = n.charAt(qt), qt++) : (u = null, 0 === Wt && e(gu)),
  	            null !== u && (Lt = l, u = bu(u)), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function G() {
  	            var n;
--	            return n = L(), null === n && (n = Y(), null === n && (n = H(), null === n && (n = O(), 
+-	            return n = L(), null === n && (n = Y(), null === n && (n = H(), null === n && (n = O(),
--	            null === n && (n = W(), null === n && (n = z(), null === n && (n = I(), null === n && (n = J(), 
+-	            null === n && (n = W(), null === n && (n = z(), null === n && (n = I(), null === n && (n = J(),
--	            null === n && (n = K(), null === n && (n = N(), null === n && (n = P(), null === n && (n = V(), 
+-	            null === n && (n = K(), null === n && (n = N(), null === n && (n = P(), null === n && (n = V(),
--	            null === n && (n = X(), null === n && (n = _(), null === n && (n = nl(), null === n && (n = ll(), 
+-	            null === n && (n = X(), null === n && (n = _(), null === n && (n = nl(), null === n && (n = ll(),
 +	            return n = L(), null === n && (n = Y(), null === n && (n = H(), null === n && (n = O(),
 +	            null === n && (n = W(), null === n && (n = z(), null === n && (n = I(), null === n && (n = J(),
 +	            null === n && (n = K(), null === n && (n = N(), null === n && (n = P(), null === n && (n = V(),
@@ -445,25 +445,25 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        }
  	        function j() {
  	            var l, u;
--	            return l = qt, 46 === n.charCodeAt(qt) ? (u = ku, qt++) : (u = null, 0 === Wt && e(Tu)), 
+-	            return l = qt, 46 === n.charCodeAt(qt) ? (u = ku, qt++) : (u = null, 0 === Wt && e(Tu)),
 +	            return l = qt, 46 === n.charCodeAt(qt) ? (u = ku, qt++) : (u = null, 0 === Wt && e(Tu)),
  	            null !== u && (Lt = l, u = xu()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function $() {
  	            var l, u;
--	            return Wt++, l = qt, mu.test(n.charAt(qt)) ? (u = n.charAt(qt), qt++) : (u = null, 
+-	            return Wt++, l = qt, mu.test(n.charAt(qt)) ? (u = n.charAt(qt), qt++) : (u = null,
--	            0 === Wt && e(Ru)), null !== u && (Lt = l, u = bu(u)), null === u ? (qt = l, l = u) : l = u, 
+-	            0 === Wt && e(Ru)), null !== u && (Lt = l, u = bu(u)), null === u ? (qt = l, l = u) : l = u,
 +	            return Wt++, l = qt, mu.test(n.charAt(qt)) ? (u = n.charAt(qt), qt++) : (u = null,
 +	            0 === Wt && e(Ru)), null !== u && (Lt = l, u = bu(u)), null === u ? (qt = l, l = u) : l = u,
  	            Wt--, null === l && (u = null, 0 === Wt && e(yu)), l;
  	        }
  	        function q() {
  	            var n;
--	            return n = M(), null === n && (n = D(), null === n && (n = Y(), null === n && (n = H(), 
+-	            return n = M(), null === n && (n = D(), null === n && (n = Y(), null === n && (n = H(),
--	            null === n && (n = O(), null === n && (n = W(), null === n && (n = z(), null === n && (n = I(), 
+-	            null === n && (n = O(), null === n && (n = W(), null === n && (n = z(), null === n && (n = I(),
--	            null === n && (n = J(), null === n && (n = K(), null === n && (n = N(), null === n && (n = P(), 
+-	            null === n && (n = J(), null === n && (n = K(), null === n && (n = N(), null === n && (n = P(),
--	            null === n && (n = V(), null === n && (n = X(), null === n && (n = Z(), null === n && (n = _(), 
+-	            null === n && (n = V(), null === n && (n = X(), null === n && (n = Z(), null === n && (n = _(),
--	            null === n && (n = nl(), null === n && (n = ll(), null === n && (n = ul(), null === n && (n = tl()))))))))))))))))))), 
+-	            null === n && (n = nl(), null === n && (n = ll(), null === n && (n = ul(), null === n && (n = tl()))))))))))))))))))),
 +	            return n = M(), null === n && (n = D(), null === n && (n = Y(), null === n && (n = H(),
 +	            null === n && (n = O(), null === n && (n = W(), null === n && (n = z(), null === n && (n = I(),
 +	            null === n && (n = J(), null === n && (n = K(), null === n && (n = N(), null === n && (n = P(),
@@ -473,93 +473,93 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        }
  	        function L() {
  	            var l, u;
--	            return l = qt, n.substr(qt, 2) === Fu ? (u = Fu, qt += 2) : (u = null, 0 === Wt && e(Qu)), 
+-	            return l = qt, n.substr(qt, 2) === Fu ? (u = Fu, qt += 2) : (u = null, 0 === Wt && e(Qu)),
 +	            return l = qt, n.substr(qt, 2) === Fu ? (u = Fu, qt += 2) : (u = null, 0 === Wt && e(Qu)),
  	            null !== u && (Lt = l, u = Su()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function M() {
  	            var l, u;
--	            return l = qt, n.substr(qt, 2) === Fu ? (u = Fu, qt += 2) : (u = null, 0 === Wt && e(Qu)), 
+-	            return l = qt, n.substr(qt, 2) === Fu ? (u = Fu, qt += 2) : (u = null, 0 === Wt && e(Qu)),
 +	            return l = qt, n.substr(qt, 2) === Fu ? (u = Fu, qt += 2) : (u = null, 0 === Wt && e(Qu)),
  	            null !== u && (Lt = l, u = Uu()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function D() {
  	            var l, u;
--	            return l = qt, n.substr(qt, 2) === Eu ? (u = Eu, qt += 2) : (u = null, 0 === Wt && e(Gu)), 
+-	            return l = qt, n.substr(qt, 2) === Eu ? (u = Eu, qt += 2) : (u = null, 0 === Wt && e(Gu)),
 +	            return l = qt, n.substr(qt, 2) === Eu ? (u = Eu, qt += 2) : (u = null, 0 === Wt && e(Gu)),
  	            null !== u && (Lt = l, u = Bu()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function H() {
  	            var l, u;
--	            return l = qt, n.substr(qt, 2) === ju ? (u = ju, qt += 2) : (u = null, 0 === Wt && e($u)), 
+-	            return l = qt, n.substr(qt, 2) === ju ? (u = ju, qt += 2) : (u = null, 0 === Wt && e($u)),
 +	            return l = qt, n.substr(qt, 2) === ju ? (u = ju, qt += 2) : (u = null, 0 === Wt && e($u)),
  	            null !== u && (Lt = l, u = qu()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function O() {
  	            var l, u;
--	            return l = qt, n.substr(qt, 2) === Lu ? (u = Lu, qt += 2) : (u = null, 0 === Wt && e(Mu)), 
+-	            return l = qt, n.substr(qt, 2) === Lu ? (u = Lu, qt += 2) : (u = null, 0 === Wt && e(Mu)),
 +	            return l = qt, n.substr(qt, 2) === Lu ? (u = Lu, qt += 2) : (u = null, 0 === Wt && e(Mu)),
  	            null !== u && (Lt = l, u = Du()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function W() {
  	            var l, u;
--	            return l = qt, n.substr(qt, 2) === Hu ? (u = Hu, qt += 2) : (u = null, 0 === Wt && e(Ou)), 
+-	            return l = qt, n.substr(qt, 2) === Hu ? (u = Hu, qt += 2) : (u = null, 0 === Wt && e(Ou)),
 +	            return l = qt, n.substr(qt, 2) === Hu ? (u = Hu, qt += 2) : (u = null, 0 === Wt && e(Ou)),
  	            null !== u && (Lt = l, u = Wu()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function z() {
  	            var l, u;
--	            return l = qt, n.substr(qt, 2) === zu ? (u = zu, qt += 2) : (u = null, 0 === Wt && e(Iu)), 
+-	            return l = qt, n.substr(qt, 2) === zu ? (u = zu, qt += 2) : (u = null, 0 === Wt && e(Iu)),
 +	            return l = qt, n.substr(qt, 2) === zu ? (u = zu, qt += 2) : (u = null, 0 === Wt && e(Iu)),
  	            null !== u && (Lt = l, u = Ju()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function I() {
  	            var l, u;
--	            return l = qt, n.substr(qt, 2) === Ku ? (u = Ku, qt += 2) : (u = null, 0 === Wt && e(Nu)), 
+-	            return l = qt, n.substr(qt, 2) === Ku ? (u = Ku, qt += 2) : (u = null, 0 === Wt && e(Nu)),
 +	            return l = qt, n.substr(qt, 2) === Ku ? (u = Ku, qt += 2) : (u = null, 0 === Wt && e(Nu)),
  	            null !== u && (Lt = l, u = Pu()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function J() {
  	            var l, u;
--	            return l = qt, n.substr(qt, 2) === Vu ? (u = Vu, qt += 2) : (u = null, 0 === Wt && e(Xu)), 
+-	            return l = qt, n.substr(qt, 2) === Vu ? (u = Vu, qt += 2) : (u = null, 0 === Wt && e(Xu)),
 +	            return l = qt, n.substr(qt, 2) === Vu ? (u = Vu, qt += 2) : (u = null, 0 === Wt && e(Xu)),
  	            null !== u && (Lt = l, u = Yu()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function K() {
  	            var l, u;
--	            return l = qt, n.substr(qt, 2) === Zu ? (u = Zu, qt += 2) : (u = null, 0 === Wt && e(_u)), 
+-	            return l = qt, n.substr(qt, 2) === Zu ? (u = Zu, qt += 2) : (u = null, 0 === Wt && e(_u)),
 +	            return l = qt, n.substr(qt, 2) === Zu ? (u = Zu, qt += 2) : (u = null, 0 === Wt && e(_u)),
  	            null !== u && (Lt = l, u = nt()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function N() {
  	            var l, u;
--	            return l = qt, n.substr(qt, 2) === lt ? (u = lt, qt += 2) : (u = null, 0 === Wt && e(ut)), 
+-	            return l = qt, n.substr(qt, 2) === lt ? (u = lt, qt += 2) : (u = null, 0 === Wt && e(ut)),
 +	            return l = qt, n.substr(qt, 2) === lt ? (u = lt, qt += 2) : (u = null, 0 === Wt && e(ut)),
  	            null !== u && (Lt = l, u = tt()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function P() {
  	            var l, u;
--	            return l = qt, n.substr(qt, 2) === rt ? (u = rt, qt += 2) : (u = null, 0 === Wt && e(et)), 
+-	            return l = qt, n.substr(qt, 2) === rt ? (u = rt, qt += 2) : (u = null, 0 === Wt && e(et)),
 +	            return l = qt, n.substr(qt, 2) === rt ? (u = rt, qt += 2) : (u = null, 0 === Wt && e(et)),
  	            null !== u && (Lt = l, u = ot()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function V() {
  	            var l, u;
--	            return l = qt, n.substr(qt, 2) === ct ? (u = ct, qt += 2) : (u = null, 0 === Wt && e(it)), 
+-	            return l = qt, n.substr(qt, 2) === ct ? (u = ct, qt += 2) : (u = null, 0 === Wt && e(it)),
 +	            return l = qt, n.substr(qt, 2) === ct ? (u = ct, qt += 2) : (u = null, 0 === Wt && e(it)),
  	            null !== u && (Lt = l, u = at()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function X() {
  	            var l, u;
--	            return l = qt, n.substr(qt, 2) === ft ? (u = ft, qt += 2) : (u = null, 0 === Wt && e(st)), 
+-	            return l = qt, n.substr(qt, 2) === ft ? (u = ft, qt += 2) : (u = null, 0 === Wt && e(st)),
 +	            return l = qt, n.substr(qt, 2) === ft ? (u = ft, qt += 2) : (u = null, 0 === Wt && e(st)),
  	            null !== u && (Lt = l, u = ht()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function Y() {
  	            var l, u, t;
--	            return l = qt, n.substr(qt, 2) === dt ? (u = dt, qt += 2) : (u = null, 0 === Wt && e(pt)), 
+-	            return l = qt, n.substr(qt, 2) === dt ? (u = dt, qt += 2) : (u = null, 0 === Wt && e(pt)),
--	            null !== u ? (n.length > qt ? (t = n.charAt(qt), qt++) : (t = null, 0 === Wt && e(vt)), 
+-	            null !== u ? (n.length > qt ? (t = n.charAt(qt), qt++) : (t = null, 0 === Wt && e(vt)),
--	            null !== t ? (Lt = l, u = wt(t), null === u ? (qt = l, l = u) : l = u) : (qt = l, 
+-	            null !== t ? (Lt = l, u = wt(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
 +	            return l = qt, n.substr(qt, 2) === dt ? (u = dt, qt += 2) : (u = null, 0 === Wt && e(pt)),
 +	            null !== u ? (n.length > qt ? (t = n.charAt(qt), qt++) : (t = null, 0 === Wt && e(vt)),
 +	            null !== t ? (Lt = l, u = wt(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
@@ -567,9 +567,9 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        }
  	        function Z() {
  	            var l, u, t;
--	            return l = qt, 92 === n.charCodeAt(qt) ? (u = At, qt++) : (u = null, 0 === Wt && e(Ct)), 
+-	            return l = qt, 92 === n.charCodeAt(qt) ? (u = At, qt++) : (u = null, 0 === Wt && e(Ct)),
--	            null !== u ? (gt.test(n.charAt(qt)) ? (t = n.charAt(qt), qt++) : (t = null, 0 === Wt && e(bt)), 
+-	            null !== u ? (gt.test(n.charAt(qt)) ? (t = n.charAt(qt), qt++) : (t = null, 0 === Wt && e(bt)),
--	            null !== t ? (Lt = l, u = kt(t), null === u ? (qt = l, l = u) : l = u) : (qt = l, 
+-	            null !== t ? (Lt = l, u = kt(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
 +	            return l = qt, 92 === n.charCodeAt(qt) ? (u = At, qt++) : (u = null, 0 === Wt && e(Ct)),
 +	            null !== u ? (gt.test(n.charAt(qt)) ? (t = n.charAt(qt), qt++) : (t = null, 0 === Wt && e(bt)),
 +	            null !== t ? (Lt = l, u = kt(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
@@ -577,15 +577,15 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        }
  	        function _() {
  	            var l, u, t, r;
--	            if (l = qt, n.substr(qt, 2) === Tt ? (u = Tt, qt += 2) : (u = null, 0 === Wt && e(xt)), 
+-	            if (l = qt, n.substr(qt, 2) === Tt ? (u = Tt, qt += 2) : (u = null, 0 === Wt && e(xt)),
 +	            if (l = qt, n.substr(qt, 2) === Tt ? (u = Tt, qt += 2) : (u = null, 0 === Wt && e(xt)),
  	            null !== u) {
--	                if (t = [], yt.test(n.charAt(qt)) ? (r = n.charAt(qt), qt++) : (r = null, 0 === Wt && e(mt)), 
+-	                if (t = [], yt.test(n.charAt(qt)) ? (r = n.charAt(qt), qt++) : (r = null, 0 === Wt && e(mt)),
--	                null !== r) for (;null !== r; ) t.push(r), yt.test(n.charAt(qt)) ? (r = n.charAt(qt), 
+-	                null !== r) for (;null !== r; ) t.push(r), yt.test(n.charAt(qt)) ? (r = n.charAt(qt),
 +	                if (t = [], yt.test(n.charAt(qt)) ? (r = n.charAt(qt), qt++) : (r = null, 0 === Wt && e(mt)),
 +	                null !== r) for (;null !== r; ) t.push(r), yt.test(n.charAt(qt)) ? (r = n.charAt(qt),
  	                qt++) : (r = null, 0 === Wt && e(mt)); else t = il;
--	                null !== t ? (Lt = l, u = Rt(t), null === u ? (qt = l, l = u) : l = u) : (qt = l, 
+-	                null !== t ? (Lt = l, u = Rt(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
 +	                null !== t ? (Lt = l, u = Rt(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
  	                l = il);
  	            } else qt = l, l = il;
@@ -593,15 +593,15 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        }
  	        function nl() {
  	            var l, u, t, r;
--	            if (l = qt, n.substr(qt, 2) === Ft ? (u = Ft, qt += 2) : (u = null, 0 === Wt && e(Qt)), 
+-	            if (l = qt, n.substr(qt, 2) === Ft ? (u = Ft, qt += 2) : (u = null, 0 === Wt && e(Qt)),
 +	            if (l = qt, n.substr(qt, 2) === Ft ? (u = Ft, qt += 2) : (u = null, 0 === Wt && e(Qt)),
  	            null !== u) {
--	                if (t = [], St.test(n.charAt(qt)) ? (r = n.charAt(qt), qt++) : (r = null, 0 === Wt && e(Ut)), 
+-	                if (t = [], St.test(n.charAt(qt)) ? (r = n.charAt(qt), qt++) : (r = null, 0 === Wt && e(Ut)),
--	                null !== r) for (;null !== r; ) t.push(r), St.test(n.charAt(qt)) ? (r = n.charAt(qt), 
+-	                null !== r) for (;null !== r; ) t.push(r), St.test(n.charAt(qt)) ? (r = n.charAt(qt),
 +	                if (t = [], St.test(n.charAt(qt)) ? (r = n.charAt(qt), qt++) : (r = null, 0 === Wt && e(Ut)),
 +	                null !== r) for (;null !== r; ) t.push(r), St.test(n.charAt(qt)) ? (r = n.charAt(qt),
  	                qt++) : (r = null, 0 === Wt && e(Ut)); else t = il;
--	                null !== t ? (Lt = l, u = Et(t), null === u ? (qt = l, l = u) : l = u) : (qt = l, 
+-	                null !== t ? (Lt = l, u = Et(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
 +	                null !== t ? (Lt = l, u = Et(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
  	                l = il);
  	            } else qt = l, l = il;
@@ -609,15 +609,15 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        }
  	        function ll() {
  	            var l, u, t, r;
--	            if (l = qt, n.substr(qt, 2) === Gt ? (u = Gt, qt += 2) : (u = null, 0 === Wt && e(Bt)), 
+-	            if (l = qt, n.substr(qt, 2) === Gt ? (u = Gt, qt += 2) : (u = null, 0 === Wt && e(Bt)),
 +	            if (l = qt, n.substr(qt, 2) === Gt ? (u = Gt, qt += 2) : (u = null, 0 === Wt && e(Bt)),
  	            null !== u) {
--	                if (t = [], St.test(n.charAt(qt)) ? (r = n.charAt(qt), qt++) : (r = null, 0 === Wt && e(Ut)), 
+-	                if (t = [], St.test(n.charAt(qt)) ? (r = n.charAt(qt), qt++) : (r = null, 0 === Wt && e(Ut)),
--	                null !== r) for (;null !== r; ) t.push(r), St.test(n.charAt(qt)) ? (r = n.charAt(qt), 
+-	                null !== r) for (;null !== r; ) t.push(r), St.test(n.charAt(qt)) ? (r = n.charAt(qt),
 +	                if (t = [], St.test(n.charAt(qt)) ? (r = n.charAt(qt), qt++) : (r = null, 0 === Wt && e(Ut)),
 +	                null !== r) for (;null !== r; ) t.push(r), St.test(n.charAt(qt)) ? (r = n.charAt(qt),
  	                qt++) : (r = null, 0 === Wt && e(Ut)); else t = il;
--	                null !== t ? (Lt = l, u = jt(t), null === u ? (qt = l, l = u) : l = u) : (qt = l, 
+-	                null !== t ? (Lt = l, u = jt(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
 +	                null !== t ? (Lt = l, u = jt(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
  	                l = il);
  	            } else qt = l, l = il;
@@ -625,15 +625,15 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        }
  	        function ul() {
  	            var l, u;
--	            return l = qt, n.substr(qt, 2) === Tt ? (u = Tt, qt += 2) : (u = null, 0 === Wt && e(xt)), 
+-	            return l = qt, n.substr(qt, 2) === Tt ? (u = Tt, qt += 2) : (u = null, 0 === Wt && e(xt)),
 +	            return l = qt, n.substr(qt, 2) === Tt ? (u = Tt, qt += 2) : (u = null, 0 === Wt && e(xt)),
  	            null !== u && (Lt = l, u = $t()), null === u ? (qt = l, l = u) : l = u, l;
  	        }
  	        function tl() {
  	            var l, u, t;
--	            return l = qt, 92 === n.charCodeAt(qt) ? (u = At, qt++) : (u = null, 0 === Wt && e(Ct)), 
+-	            return l = qt, 92 === n.charCodeAt(qt) ? (u = At, qt++) : (u = null, 0 === Wt && e(Ct)),
--	            null !== u ? (n.length > qt ? (t = n.charAt(qt), qt++) : (t = null, 0 === Wt && e(vt)), 
+-	            null !== u ? (n.length > qt ? (t = n.charAt(qt), qt++) : (t = null, 0 === Wt && e(vt)),
--	            null !== t ? (Lt = l, u = bu(t), null === u ? (qt = l, l = u) : l = u) : (qt = l, 
+-	            null !== t ? (Lt = l, u = bu(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
 +	            return l = qt, 92 === n.charCodeAt(qt) ? (u = At, qt++) : (u = null, 0 === Wt && e(Ct)),
 +	            null !== u ? (n.length > qt ? (t = n.charAt(qt), qt++) : (t = null, 0 === Wt && e(vt)),
 +	            null !== t ? (Lt = l, u = bu(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
@@ -644,7 +644,7 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	var Util = __webpack_require__(3)
  	var Random = __webpack_require__(5)
  	    /*
--	        
+-
 +
  	    */
  	var Handler = {
@@ -653,21 +653,21 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	        return Random.integer(min, max)
  	    },
  	    /*
--	        
+-
 +
  	    */
  	    charset: function(node, result, cache) {
  	        // node.invert
 @@ -7642,11 +7642,11 @@ return /******/ (function(modules) { // webpackBootstrap
  	    ## valid(template, data)
- 
+
  	    校验真实数据 data 是否与数据模板 template 匹配。
--	    
+-
 +
  	    实现思路：
  	    1. 解析规则。
  	        先把数据模板 template 解析为更方便机器解析的 JSON-Schame
--	        name               属性名 
+-	        name               属性名
 +	        name               属性名
  	        type               属性值类型
  	        template           属性值模板
@@ -675,8 +675,8 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
 @@ -7655,7 +7655,7 @@ return /******/ (function(modules) { // webpackBootstrap
  	    2. 递归验证规则。
  	        然后用 JSON-Schema 校验真实数据，校验项包括属性名、值类型、值、值生成规则。
- 
+
--	    提示信息 
+-	    提示信息
 +	    提示信息
  	    https://github.com/fge/json-schema-validator/blob/master/src/main/resources/com/github/fge/jsonschema/validator/validation.properties
  	    [JSON-Schama validator](http://json-schema-validator.herokuapp.com/)
@@ -685,25 +685,25 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
  	                    +step
  	                    整数部分
  	                    小数部分
--	                boolean 
+-	                boolean
--	                string  
+-	                string
 +	                boolean
 +	                string
  	                    min-max
  	                    count
  	    ## properties
 @@ -7949,9 +7949,9 @@ return /******/ (function(modules) { // webpackBootstrap
- 
+
  	/*
  	    完善、友好的提示信息
--	    
+-
 +
  	    Equal, not equal to, greater than, less than, greater than or equal to, less than or equal to
--	    路径 验证类型 描述 
+-	    路径 验证类型 描述
 +	    路径 验证类型 描述
- 
+
  	    Expect path.name is less than or equal to expected, but path.name is actual.
- 
+
 @@ -8264,7 +8264,7 @@ return /******/ (function(modules) { // webpackBootstrap
  	Util.extend(MockXMLHttpRequest.prototype, {
  	    // https://xhr.spec.whatwg.org/#the-open()-method
@@ -711,22 +711,22 @@ index 35d5b9af3eff34324656879705dcb81470fc9697..3e6a52e0fbfdd39d3aaf1592ffd19ecd
 -	    open: function(method, url, async, username, password) {
 +	    open: function(method, url, async = true, username, password) {
  	        var that = this
- 
+
  	        Util.extend(this.custom, {
 @@ -8310,6 +8310,8 @@ return /******/ (function(modules) { // webpackBootstrap
  	            var xhr = createNativeXMLHttpRequest()
  	            this.custom.xhr = xhr
- 
+
 +                MockXMLHttpRequest.prototype.upload = xhr.upload
 +
  	            // 初始化所有事件，用于监听原生 XHR 对象的事件
  	            for (var i = 0; i < XHR_EVENTS.length; i++) {
  	                xhr.addEventListener(XHR_EVENTS[i], handle)
 @@ -8360,6 +8362,7 @@ return /******/ (function(modules) { // webpackBootstrap
- 
+
  	        // 原生 XHR
  	        if (!this.match) {
 +                this.custom.xhr.responseType = this.responseType || ''
  	            this.custom.xhr.send(data)
  	            return
- 	        }
+ 	        }

public/favicon.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 160 160" xmlns="http://www.w3.org/2000/svg"><path d="M81.28 55.9c-.1-11.67-2.93-22.55-9.37-32.38-1-1.5-2.14-2.86-2.5-4.71a8.1 8.1 0 014-8.61 7.89 7.89 0 019.3 1.23 35.999 35.999 0 015.9 8.83 75.18 75.18 0 018.44 28.58 83.211 83.211 0 01-5.23 36.74 102.983 102.983 0 01-3 7.28 1.2 1.2 0 000 1.41c9.58 13.3 21.76 23 37.85 27.24a54.37 54.37 0 0019.68 1.57 7.72 7.72 0 018.36 6.9 7.903 7.903 0 01-6.7 9 64.744 64.744 0 01-23-1.33 77.68 77.68 0 01-36.93-19.88 93.628 93.628 0 01-11.91-13.71 2.18 2.18 0 00-2.3-1.06 72.744 72.744 0 00-27.38 7.55c-11.6 6-20.67 14.58-26.4 26.45a10.134 10.134 0 01-3.7 4.7 8 8 0 01-9.19-.7 7.86 7.86 0 01-2.36-9.28 60.324 60.324 0 018.72-14.52c12.2-15.43 28.21-24.59 47.32-28.57A85.085 85.085 0 0173.07 87c.524.015 1-.307 1.18-.8a76.06 76.06 0 006.53-22.3c.351-2.652.518-5.325.5-8z" fill="#1890ff"/><path d="M136.26 108.34a44.742 44.742 0 01-11.13-2.87 46.108 46.108 0 01-19.66-13.76 8 8 0 015.72-13.22 7.93 7.93 0 016.54 2.93 33.27 33.27 0 0018.87 10.75c1.546.155 3.058.553 4.48 1.18a8.08 8.08 0 013.84 9.21c-.92 3.52-4.13 5.81-8.66 5.78zm-80.6-75.02a7.61 7.61 0 016.64 5 49.139 49.139 0 013.64 17 46.33 46.33 0 01-2.46 17.28c-2 5.77-8.24 7.79-12.89 4.15a8.1 8.1 0 01-2.39-9 31.679 31.679 0 001.68-12.36 35.77 35.77 0 00-2.43-11c-2.1-5.45 1.75-11.07 8.21-11.07zm22.26 93.25a8 8 0 01-6.68 7.86 32.88 32.88 0 00-19.7 12.19 8.13 8.13 0 01-11.21 1.62 8 8 0 01-1.41-11.58A51.043 51.043 0 0154 123.81a45.842 45.842 0 0114-5.1c5.35-1.04 9.91 2.56 9.92 7.86z" fill="#1890ff"/></svg>

public/resource/loading.css

@@ -1,91 +0,0 @@
-.loading-container {
-	position: fixed;
-	left: 0;
-	top: 0;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-	width: 100%;
-	height: 100%;
-}
-
-.loading-svg {
-	width: 128px;
-	height: 128px;
-	color: var(--primary-color);
-}
-
-.loading-spin__container {
-	width: 56px;
-	height: 56px;
-	margin: 36px 0;
-}
-
-.loading-spin {
-	position: relative;
-	height: 100%;
-	animation: loadingSpin 1s linear infinite;
-}
-
-.left-0 {
-  left: 0;
-}
-.right-0 {
-  right: 0;
-}
-.top-0 {
-  top: 0;
-}
-.bottom-0 {
-  bottom: 0;
-}
-
-.loading-spin-item {
-	position: absolute;
-  height: 16px;
-  width: 16px;
-	background-color: var(--primary-color);
-  border-radius: 8px;
-  -webkit-animation: loadingPulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
-  animation: loadingPulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
-}
-
-@keyframes loadingSpin {
-  from {
-    -webkit-transform: rotate(0deg);
-    transform: rotate(0deg);
-  }
-  to {
-    -webkit-transform: rotate(360deg);
-    transform: rotate(360deg);
-  }
-}
-
-@keyframes loadingPulse {
-  0%, 100% {
-    opacity: 1;
-  }
-  50% {
-    opacity: .5;
-  }
-}
-
-.loading-delay-500 {
-  -webkit-animation-delay: 500ms;
-  animation-delay: 500ms;
-}
-.loading-delay-1000 {
-  -webkit-animation-delay: 1000ms;
-  animation-delay: 1000ms;
-}
-.loading-delay-1500 {
-  -webkit-animation-delay: 1500ms;
-  animation-delay: 1500ms;
-}
-
-.loading-title {
-  font-size: 28px;
-	font-weight: 500;
-  color: #646464;
-}

public/resource/loading.js

@@ -1,44 +0,0 @@
-/**
- * 初始化加载效果的svg格式logo
- * @param {string} id - 元素id
- */
-function initSvgLogo(id) {
-  const svgStr = `<svg width="128px" height="128px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	y="0px" viewBox="0 0 158.9 158.9" style="enable-background:new 0 0 158.9 158.9;" xml:space="preserve">
-	<path style="fill:none" d="M0,158.9C0,106.3,0,53.7,0,1.1C0,0.2,0.2,0,1.1,0c52.2,0,104.5,0,156.7,0c0.9,0,1.1,0.2,1.1,1.1
-	c0,52.2,0,104.5,0,156.7c0,0.9-0.2,1.1-1.1,1.1C105.2,158.8,52.6,158.8,0,158.9z" />
-	<path style="fill:currentColor" d="M81.3,55.9c-0.1-11.7-2.9-22.5-9.4-32.4c-1-1.5-2.1-2.9-2.5-4.7c-0.7-3.4,0.9-6.9,4-8.6c3-1.7,6.8-1.2,9.3,1.2
-	c2.4,2.6,4.4,5.6,5.9,8.8c4.7,8.9,7.6,18.6,8.4,28.6c1,12.5-0.7,25-5.2,36.7c-0.9,2.5-1.9,4.9-3,7.3c-0.3,0.4-0.3,1,0,1.4
-	c9.6,13.3,21.8,23,37.8,27.2c6.4,1.7,13.1,2.3,19.7,1.6c4.2-0.4,7.9,2.7,8.4,6.9c0.7,4.3-2.3,8.3-6.6,9c0,0,0,0-0.1,0
-	c-7.7,0.9-15.5,0.5-23-1.3c-13.9-3.1-26.7-10-36.9-19.9c-4.4-4.2-8.4-8.8-11.9-13.7c-0.5-0.8-1.4-1.2-2.3-1.1
-	c-9.5,0.7-18.8,3.3-27.4,7.6c-11.6,6-20.7,14.6-26.4,26.4c-0.7,1.9-2,3.5-3.7,4.7c-2.9,1.7-6.6,1.5-9.2-0.7c-2.8-2.2-3.8-6-2.4-9.3
-	c2.2-5.2,5.1-10.1,8.7-14.5c12.2-15.4,28.2-24.6,47.3-28.6c4-0.8,8.1-1.4,12.2-1.6c0.5,0,1-0.3,1.2-0.8c3.3-7.1,5.5-14.6,6.5-22.3
-	C81.1,61.2,81.3,58.6,81.3,55.9z" />
-	<path style="fill:currentColor" d="M136.3,108.3c-3.8-0.5-7.6-1.4-11.1-2.9c-7.7-2.8-14.4-7.5-19.7-13.8c-2.9-3.3-2.5-8.4,0.8-11.3
-	c1.4-1.2,3.1-1.9,4.9-1.9c2.5-0.1,5,1,6.5,2.9c4.9,5.6,11.6,9.4,18.9,10.8c1.5,0.2,3.1,0.6,4.5,1.2c3.2,1.8,4.8,5.6,3.8,9.2
-	C144,106.1,140.8,108.4,136.3,108.3z" />
-	<path style="fill:currentColor" d="M55.7,33.3c3,0.2,5.6,2.2,6.6,5c2.2,5.4,3.4,11.2,3.6,17c0.3,5.9-0.6,11.7-2.5,17.3c-2,5.8-8.2,7.8-12.9,4.2
-	c-2.6-2.2-3.6-5.8-2.4-9c1.4-4,1.9-8.2,1.7-12.4c-0.2-3.8-1-7.5-2.4-11C45.3,38.9,49.2,33.3,55.7,33.3z" />
-	<path style="fill:currentColor" d="M77.9,126.6c0,3.9-2.8,7.2-6.7,7.9c-7.8,1.5-14.8,5.9-19.7,12.2c-2.7,3.5-7.6,4.2-11.2,1.6
-	c-3.6-2.6-4.3-7.6-1.7-11.2c0.1-0.1,0.2-0.3,0.3-0.4c4.1-5.2,9.3-9.6,15.1-12.8c4.4-2.5,9.1-4.2,14-5.1
-	C73.3,117.7,77.9,121.3,77.9,126.6z" />
-	</svg>`;
-  const appEl = document.querySelector(id);
-  const div = document.createElement('div');
-  div.innerHTML = svgStr;
-  if (appEl) {
-    appEl.appendChild(div);
-  }
-}
-
-function addThemeColorCssVars() {
-  const key = '__THEME_COLOR__';
-  const defaultColor = '#1890ff';
-  const themeColor = window.localStorage.getItem(key) || defaultColor;
-  const cssVars = `--primary-color: ${themeColor}`;
-  document.documentElement.style.cssText = cssVars;
-}
-
-addThemeColorCssVars();
-
-initSvgLogo('#loadingLogo');

scripts/cleanup.ts

@@ -1,4 +0,0 @@
-#!/usr/bin/env zx
-import { $ } from 'zx';
-
-$`pnpm rimraf node_modules dist pnpm-lock.yaml`;

scripts/logo.ts

@@ -0,0 +1,12 @@
+import { readFile, writeFile } from 'fs/promises';
+import themeSettings from '../src/settings/theme.json';
+
+async function updateFavicon(svgPath: string, color: string) {
+  const svgStr = await readFile(svgPath, 'utf-8');
+
+  const svgStrWithColor = svgStr.replace(/currentColor/g, color);
+
+  await writeFile('./public/favicon.svg', svgStrWithColor);
+}
+
+updateFavicon('./src/assets/svg-icon/logo.svg', themeSettings.themeColor);

src/App.vue

@@ -7,20 +7,34 @@
     class="h-full"
   >
     <naive-provider>
-      <router-view />
+      <fs-ui-context>
+        <router-view />
+      </fs-ui-context>
     </naive-provider>
   </n-config-provider>
 </template>
 
 <script setup lang="ts">
+import { watch } from 'vue';
+import { useRoute } from 'vue-router';
 import { dateZhCN, zhCN } from 'naive-ui';
+import { useI18n } from 'vue-i18n';
 import { subscribeStore, useThemeStore } from '@/store';
 import { useGlobalEvents } from '@/composables';
 
 const theme = useThemeStore();
+const { locale, t } = useI18n();
+const route = useRoute();
 
 subscribeStore();
 useGlobalEvents();
+
+watch(
+  () => locale.value,
+  () => {
+    document.title = route.meta.i18nTitle ? t(route.meta.i18nTitle) : route.meta.title;
+  }
+);
 </script>
 
 <style scoped></style>

src/assets/svg-icon/activity.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-activity"><polyline points="22 12 18 12 15 21 9 3 6 12 2 12"></polyline></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"><path d="M22 12h-4l-3 9L9 3l-3 9H2"/></svg>

src/assets/svg-icon/at-sign.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-at-sign"><circle cx="12" cy="12" r="4"></circle><path d="M16 8v5a3 3 0 0 0 6 0v-1a10 10 0 1 0-3.92 7.94"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="prefix__prefix__feather prefix__prefix__feather-at-sign"><circle cx="12" cy="12" r="4"/><path d="M16 8v5a3 3 0 006 0v-1a10 10 0 10-3.92 7.94"/></svg>

src/assets/svg-icon/cast.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-cast"><path d="M2 16.1A5 5 0 0 1 5.9 20M2 12.05A9 9 0 0 1 9.95 20M2 8V6a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2h-6"></path><line x1="2" y1="20" x2="2.01" y2="20"></line></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="prefix__prefix__feather prefix__prefix__feather-cast"><path d="M2 16.1A5 5 0 015.9 20M2 12.05A9 9 0 019.95 20M2 8V6a2 2 0 012-2h16a2 2 0 012 2v12a2 2 0 01-2 2h-6M2 20h.01"/></svg>

src/assets/svg-icon/chrome.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-chrome"><circle cx="12" cy="12" r="10"></circle><circle cx="12" cy="12" r="4"></circle><line x1="21.17" y1="8" x2="12" y2="8"></line><line x1="3.95" y1="6.06" x2="8.54" y2="14"></line><line x1="10.88" y1="21.94" x2="15.46" y2="14"></line></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><circle cx="12" cy="12" r="4"/><path d="M21.17 8H12M3.95 6.06L8.54 14m2.34 7.94L15.46 14"/></svg>

src/assets/svg-icon/copy.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-copy"><rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"><rect x="9" y="9" width="13" height="13" rx="2" ry="2"/><path d="M5 15H4a2 2 0 01-2-2V4a2 2 0 012-2h9a2 2 0 012 2v1"/></svg>

src/assets/svg-icon/custom-icon.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--mdi" width="32" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><path fill="currentColor" d="M19 10c0 1.38-2.12 2.5-3.5 2.5s-2.75-1.12-2.75-2.5h-1.5c0 1.38-1.37 2.5-2.75 2.5S5 11.38 5 10h-.75c-.16.64-.25 1.31-.25 2a8 8 0 0 0 8 8a8 8 0 0 0 8-8c0-.69-.09-1.36-.25-2H19m-7-6C9.04 4 6.45 5.61 5.07 8h13.86C17.55 5.61 14.96 4 12 4m10 8a10 10 0 0 1-10 10A10 10 0 0 1 2 12A10 10 0 0 1 12 2a10 10 0 0 1 10 10m-10 5.23c-1.75 0-3.29-.73-4.19-1.81L9.23 14c.45.72 1.52 1.23 2.77 1.23s2.32-.51 2.77-1.23l1.42 1.42c-.9 1.08-2.44 1.81-4.19 1.81Z"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" viewBox="0 0 24 24"><path fill="currentColor" d="M19 10c0 1.38-2.12 2.5-3.5 2.5s-2.75-1.12-2.75-2.5h-1.5c0 1.38-1.37 2.5-2.75 2.5S5 11.38 5 10h-.75c-.16.64-.25 1.31-.25 2a8 8 0 008 8 8 8 0 008-8c0-.69-.09-1.36-.25-2H19m-7-6C9.04 4 6.45 5.61 5.07 8h13.86C17.55 5.61 14.96 4 12 4m10 8a10 10 0 01-10 10A10 10 0 012 12 10 10 0 0112 2a10 10 0 0110 10m-10 5.23c-1.75 0-3.29-.73-4.19-1.81L9.23 14c.45.72 1.52 1.23 2.77 1.23s2.32-.51 2.77-1.23l1.42 1.42c-.9 1.08-2.44 1.81-4.19 1.81z"/></svg>

src/assets/svg-icon/heart.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-heart"><path d="M20.84 4.61a5.5 5.5 0 0 0-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 0 0-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 0 0 0-7.78z"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 000-7.78z"/></svg>

src/assets/svg-icon/logo-fill.svg

@@ -1 +1 @@
-<svg viewBox="0 0 158.88 158.88"><path d="M158.86.3v157.48c0 .9-.2 1.1-1.1 1.1H.24a2.61 2.61 0 01-.11-1.3V1.67C.14 0 0 .18 1.61.18h156a2.62 2.62 0 011.25.12z" fill="currentColor"/><path d="M158.86.3H2C0 .31.27 0 .27 2v156.85c-.07-.05-.25.12-.24-.12s0-.64 0-1Q0 79.46 0 1.14C0 .24.2 0 1.1 0h156.68c.35.08.81-.2 1.08.3z" fill="#fff"/><path d="M93.65 51.52a68.65 68.65 0 01-6.47 28.81 1.72 1.72 0 00.19 2c6.08 8.28 13.58 14.79 23.19 18.69a46.22 46.22 0 0017.15 3.39 28.87 28.87 0 003.34-.25 6.2 6.2 0 017 5.12 6.07 6.07 0 01-5.15 7.14 50.39 50.39 0 01-18.06-1c-15.85-3.66-28-12.75-37.44-25.7a2.15 2.15 0 00-2.23-1.09c-14 1.37-26.17 6.43-35.5 17.21a38.47 38.47 0 00-6.23 9.74 6.21 6.21 0 01-8.17 3.42 6.14 6.14 0 01-3.27-8.2 49.31 49.31 0 019.63-14.62c10.56-11.44 23.8-17.54 39.09-19.54a13.93 13.93 0 012.84-.34c1.61.14 2.18-.73 2.73-2A54.38 54.38 0 0081.12 51a44 44 0 00-8-25 6.11 6.11 0 01-.65-6.46A6 6 0 0177.75 16a6.34 6.34 0 015.66 3 53.61 53.61 0 017.17 14.28 59.33 59.33 0 013.07 18.24z" fill="#fff"/><path d="M46.92 118.63a6 6 0 011.35-3.88 37.89 37.89 0 0122.5-14 6.08 6.08 0 016.65 2.47 6.18 6.18 0 01-3.84 9.63 26.09 26.09 0 00-15.71 9.77 6.2 6.2 0 01-10.95-4zM124.3 92.8a34.66 34.66 0 01-9.82-2.48 35.46 35.46 0 01-14.65-10.45 6.19 6.19 0 012.84-9.93 5.79 5.79 0 016.44 1.73 26.79 26.79 0 0016.51 8.85 6 6 0 015 5.54 6.21 6.21 0 01-4.29 6.46 6.55 6.55 0 01-2.03.28zM69.32 53.27a33.46 33.46 0 01-2.27 12.52 6.21 6.21 0 01-10.94 1 6.09 6.09 0 01-.65-5.4 26 26 0 00-.53-18.25 6.21 6.21 0 0111.49-4.72 40.24 40.24 0 012.9 14.85z" fill="#fff"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg"><path d="M0 0h160v160H0V0z" fill="currentColor"/><path d="M94.322 51.888A69.12 69.12 0 0187.806 80.9a1.732 1.732 0 00.191 2.014c6.124 8.338 13.677 14.894 23.356 18.821a46.564 46.564 0 0017.273 3.414 29.101 29.101 0 003.364-.252 6.245 6.245 0 017.051 5.156 6.112 6.112 0 01-5.187 7.19 50.758 50.758 0 01-18.19-1.007c-15.964-3.686-28.2-12.84-37.709-25.88a2.165 2.165 0 00-2.246-1.098c-14.1 1.38-26.357 6.475-35.754 17.331a38.721 38.721 0 00-6.275 9.808 6.255 6.255 0 01-8.229 3.444 6.184 6.184 0 01-3.293-8.258 49.662 49.662 0 019.699-14.722c10.636-11.52 23.97-17.663 39.37-19.677a14.06 14.06 0 012.86-.342c1.622.14 2.197-.735 2.75-2.014a54.752 54.752 0 004.865-23.463 44.302 44.302 0 00-8.057-25.175 6.152 6.152 0 01-.655-6.506 6.043 6.043 0 015.318-3.564 6.386 6.386 0 015.7 3.02 53.98 53.98 0 017.222 14.38 59.734 59.734 0 013.092 18.368z" fill="#fff"/><path d="M47.257 119.468a6.04 6.04 0 011.36-3.907 38.165 38.165 0 0122.66-14.098 6.124 6.124 0 016.699 2.487 6.223 6.223 0 01-3.868 9.698 26.276 26.276 0 00-15.823 9.838 6.245 6.245 0 01-11.028-4.028v.01zm77.935-26.01a34.908 34.908 0 01-9.89-2.498 35.717 35.717 0 01-14.756-10.523 6.233 6.233 0 012.861-10 5.832 5.832 0 016.486 1.742 26.986 26.986 0 0016.628 8.912 6.042 6.042 0 015.036 5.58 6.253 6.253 0 01-4.32 6.504 6.588 6.588 0 01-2.045.282zM69.817 53.65a33.69 33.69 0 01-2.286 12.607 6.255 6.255 0 01-11.018 1.007 6.132 6.132 0 01-.655-5.438 26.178 26.178 0 00-.534-18.377 6.256 6.256 0 0111.572-4.753 40.515 40.515 0 012.921 14.954z" fill="#fff"/></svg>

src/assets/svg-icon/logo.svg

@@ -1 +1 @@
-<svg viewBox="0 0 158.88 158.88"><path d="M0 158.86V1.1C0 .2.2 0 1.1 0h156.68c.9 0 1.1.2 1.1 1.1v156.68c0 .9-.2 1.1-1.1 1.1Q78.9 158.83 0 158.86z" fill="#ffffff00"/><path d="M81.28 55.9c-.1-11.67-2.93-22.55-9.37-32.38-1-1.5-2.14-2.86-2.5-4.71a8.1 8.1 0 014-8.61 7.89 7.89 0 019.3 1.23 36 36 0 015.9 8.83 75.18 75.18 0 018.44 28.58 83.21 83.21 0 01-5.23 36.74 103 103 0 01-3 7.28 1.2 1.2 0 000 1.41c9.58 13.3 21.76 23 37.85 27.24a54.35 54.35 0 0019.68 1.57 7.72 7.72 0 018.36 6.9 7.9 7.9 0 01-6.7 9 64.74 64.74 0 01-23-1.33 77.68 77.68 0 01-36.93-19.88 93.64 93.64 0 01-11.91-13.71 2.18 2.18 0 00-2.3-1.06 72.75 72.75 0 00-27.38 7.55c-11.6 6-20.67 14.58-26.4 26.45a10.13 10.13 0 01-3.7 4.7 8 8 0 01-9.19-.7 7.86 7.86 0 01-2.36-9.28 60.32 60.32 0 018.72-14.52c12.2-15.43 28.21-24.59 47.32-28.57A85.08 85.08 0 0173.07 87a1.22 1.22 0 001.18-.8 76.06 76.06 0 006.53-22.3 57.87 57.87 0 00.5-8z" fill="currentColor"/><path d="M136.26 108.34a44.72 44.72 0 01-11.13-2.87 46.11 46.11 0 01-19.66-13.76 8 8 0 015.72-13.22 7.93 7.93 0 016.54 2.93 33.27 33.27 0 0018.87 10.75 14.76 14.76 0 014.48 1.18 8.08 8.08 0 013.84 9.21c-.92 3.52-4.13 5.81-8.66 5.78zM55.66 33.32a7.61 7.61 0 016.64 5 49.14 49.14 0 013.64 17 46.33 46.33 0 01-2.46 17.28c-2 5.77-8.24 7.79-12.89 4.15a8.1 8.1 0 01-2.39-9 31.68 31.68 0 001.68-12.36 35.77 35.77 0 00-2.43-11c-2.1-5.45 1.75-11.07 8.21-11.07zM77.92 126.57a8 8 0 01-6.68 7.86 32.88 32.88 0 00-19.7 12.19 8.13 8.13 0 01-11.21 1.62 8 8 0 01-1.41-11.58A51.05 51.05 0 0154 123.81a45.85 45.85 0 0114-5.1c5.35-1.04 9.91 2.56 9.92 7.86z" fill="currentColor"/></svg>
+<svg viewBox="0 0 160 160" xmlns="http://www.w3.org/2000/svg"><path d="M81.28 55.9c-.1-11.67-2.93-22.55-9.37-32.38-1-1.5-2.14-2.86-2.5-4.71a8.1 8.1 0 014-8.61 7.89 7.89 0 019.3 1.23 35.999 35.999 0 015.9 8.83 75.18 75.18 0 018.44 28.58 83.211 83.211 0 01-5.23 36.74 102.983 102.983 0 01-3 7.28 1.2 1.2 0 000 1.41c9.58 13.3 21.76 23 37.85 27.24a54.37 54.37 0 0019.68 1.57 7.72 7.72 0 018.36 6.9 7.903 7.903 0 01-6.7 9 64.744 64.744 0 01-23-1.33 77.68 77.68 0 01-36.93-19.88 93.628 93.628 0 01-11.91-13.71 2.18 2.18 0 00-2.3-1.06 72.744 72.744 0 00-27.38 7.55c-11.6 6-20.67 14.58-26.4 26.45a10.134 10.134 0 01-3.7 4.7 8 8 0 01-9.19-.7 7.86 7.86 0 01-2.36-9.28 60.324 60.324 0 018.72-14.52c12.2-15.43 28.21-24.59 47.32-28.57A85.085 85.085 0 0173.07 87c.524.015 1-.307 1.18-.8a76.06 76.06 0 006.53-22.3c.351-2.652.518-5.325.5-8z" fill="currentColor"/><path d="M136.26 108.34a44.742 44.742 0 01-11.13-2.87 46.108 46.108 0 01-19.66-13.76 8 8 0 015.72-13.22 7.93 7.93 0 016.54 2.93 33.27 33.27 0 0018.87 10.75c1.546.155 3.058.553 4.48 1.18a8.08 8.08 0 013.84 9.21c-.92 3.52-4.13 5.81-8.66 5.78zm-80.6-75.02a7.61 7.61 0 016.64 5 49.139 49.139 0 013.64 17 46.33 46.33 0 01-2.46 17.28c-2 5.77-8.24 7.79-12.89 4.15a8.1 8.1 0 01-2.39-9 31.679 31.679 0 001.68-12.36 35.77 35.77 0 00-2.43-11c-2.1-5.45 1.75-11.07 8.21-11.07zm22.26 93.25a8 8 0 01-6.68 7.86 32.88 32.88 0 00-19.7 12.19 8.13 8.13 0 01-11.21 1.62 8 8 0 01-1.41-11.58A51.043 51.043 0 0154 123.81a45.842 45.842 0 0114-5.1c5.35-1.04 9.91 2.56 9.92 7.86z" fill="currentColor"/></svg>

src/assets/svg-icon/wind.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-wind"><path d="M9.59 4.59A2 2 0 1 1 11 8H2m10.59 11.41A2 2 0 1 0 14 16H2m15.73-8.27A2.5 2.5 0 1 1 19.5 12H2"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-wind"><path d="M9.59 4.59A2 2 0 1 1 11 8H2m10.59 11.41A2 2 0 1 0 14 16H2m15.73-8.27A2.5 2.5 0 1 1 19.5 12H2"></path></svg>

src/components/business/loading-empty-wrapper.vue

@@ -54,7 +54,7 @@ const props = withDefaults(defineProps<Props>(), {
   placeholderClass: 'bg-white dark:bg-dark transition-background-color duration-300 ease-in-out',
   emptyDesc: '暂无数据',
   iconClass: 'text-320px text-primary',
-  descClass: 'text-16px text-[#666]',
+  descClass: 'text-16px text-#666',
   showNetworkReload: false
 });
 

src/components/common/DarkModeSwitch.vue

@@ -1,42 +0,0 @@
-<template>
-  <div class="flex-center text-18px cursor-pointer" @click="handleSwitch">
-    <icon-mdi-moon-waning-crescent v-if="darkMode" />
-    <icon-mdi-white-balance-sunny v-else />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue';
-
-defineOptions({ name: 'DarkModeSwitch' });
-
-interface Props {
-  /** 暗黑模式 */
-  dark?: boolean;
-}
-
-const props = withDefaults(defineProps<Props>(), {
-  dark: false
-});
-
-interface Emits {
-  (e: 'update:dark', darkMode: boolean): void;
-}
-
-const emit = defineEmits<Emits>();
-
-const darkMode = computed({
-  get() {
-    return props.dark;
-  },
-  set(newValue: boolean) {
-    emit('update:dark', newValue);
-  }
-});
-
-function handleSwitch() {
-  darkMode.value = !darkMode.value;
-}
-</script>
-
-<style scoped></style>

src/components/common/app-loading.vue

@@ -0,0 +1,45 @@
+<template>
+  <div class="fixed-center flex-col">
+    <system-logo class="text-128px text-primary" />
+    <div class="w-56px h-56px my-36px">
+      <div class="relative h-full animate-spin">
+        <div
+          v-for="(item, index) in lodingClasses"
+          :key="index"
+          class="absolute w-16px h-16px bg-primary rounded-8px animate-pulse"
+          :class="item"
+        ></div>
+      </div>
+    </div>
+    <h2 class="text-28px font-500 text-#646464">{{ title }}</h2>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useAppInfo } from '@/composables';
+import { localStg, getRgbOfColor } from '@/utils';
+import themeSettings from '@/settings/theme.json';
+
+const { title } = useAppInfo();
+
+const lodingClasses = [
+  'left-0 top-0',
+  'left-0 bottom-0 animate-delay-500',
+  'right-0 top-0 animate-delay-1000',
+  'right-0 bottom-0 animate-delay-1500'
+];
+
+function addThemeColorCssVars() {
+  const defaultColor = themeSettings.themeColor;
+  const themeColor = localStg.get('themeColor') || defaultColor;
+
+  const { r, g, b } = getRgbOfColor(themeColor);
+
+  const cssVars = `--primary-color: ${r},${g},${b}`;
+  document.documentElement.style.cssText = cssVars;
+}
+
+addThemeColorCssVars();
+</script>
+
+<style scoped></style>

src/components/common/dark-mode-container.vue

@@ -1,7 +1,7 @@
 <template>
   <div
-    class="dark:bg-[#18181c] dark:text-white dark:text-opacity-82 transition-all duration-300 ease-in-out"
+    class="dark:bg-dark dark:text-white dark:text-opacity-82 transition-all"
-    :class="inverted ? 'bg-[#001428] text-white' : 'bg-white text-[#333639]'"
+    :class="inverted ? 'bg-#001428 text-white' : 'bg-white text-#333639'"
   >
     <slot></slot>
   </div>

src/components/common/dark-mode-switch.vue

@@ -0,0 +1,84 @@
+<template>
+  <div class="flex-center text-18px cursor-pointer" @click="handleSwitch">
+    <icon-mdi-moon-waning-crescent v-if="darkMode" />
+    <icon-mdi-white-balance-sunny v-else />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+
+defineOptions({ name: 'DarkModeSwitch' });
+
+interface Props {
+  /** 暗黑模式 */
+  dark?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  dark: false
+});
+
+interface Emits {
+  (e: 'update:dark', darkMode: boolean): void;
+}
+
+const emit = defineEmits<Emits>();
+
+const darkMode = computed({
+  get() {
+    return props.dark;
+  },
+  set(newValue: boolean) {
+    emit('update:dark', newValue);
+  }
+});
+
+function handleSwitch(event: MouseEvent) {
+  const x = event.clientX;
+  const y = event.clientY;
+  const endRadius = Math.hypot(Math.max(x, innerWidth - x), Math.max(y, innerHeight - y));
+  // @ts-expect-error: Transition API
+  if (!document.startViewTransition) {
+    darkMode.value = !darkMode.value;
+    return;
+  }
+  // @ts-expect-error: Transition API
+  const transition = document.startViewTransition(() => {
+    darkMode.value = !darkMode.value;
+  });
+  transition.ready.then(() => {
+    const clipPath = [`circle(0px at ${x}px ${y}px)`, `circle(${endRadius}px at ${x}px ${y}px)`];
+    document.documentElement.animate(
+      {
+        clipPath: darkMode.value ? clipPath : [...clipPath].reverse()
+      },
+      {
+        duration: 300,
+        easing: 'ease-in',
+        pseudoElement: darkMode.value ? '::view-transition-new(root)' : '::view-transition-old(root)'
+      }
+    );
+  });
+}
+</script>
+
+<style>
+::view-transition-old(root),
+::view-transition-new(root) {
+  animation: none;
+  mix-blend-mode: normal;
+}
+::view-transition-old(root) {
+  z-index: 9999;
+}
+::view-transition-new(root) {
+  z-index: 1;
+}
+.dark::view-transition-old(root) {
+  z-index: 1;
+}
+.dark::view-transition-new(root) {
+  z-index: 9999;
+}
+</style>

src/components/common/exception-base.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="flex-col-center wh-full">
+  <div class="flex-col-center gap-24px min-h-520px wh-full overflow-hidden">
-    <div class="text-400px text-primary">
+    <div class="flex text-400px text-primary">
       <icon-local-no-permission v-if="type === '403'" />
       <icon-local-not-found v-if="type === '404'" />
       <icon-local-service-error v-if="type === '500'" />

src/components/common/hover-container.vue

@@ -2,14 +2,14 @@
   <div v-if="showTooltip">
     <n-tooltip :placement="placement" trigger="hover">
       <template #trigger>
-        <div class="flex-center h-full cursor-pointer dark:hover:bg-[#333]" :class="contentClassName">
+        <div class="flex-center h-full cursor-pointer dark:hover:bg-#333" :class="contentClassName">
           <slot></slot>
         </div>
       </template>
       {{ tooltipContent }}
     </n-tooltip>
   </div>
-  <div v-else class="flex-center cursor-pointer dark:hover:bg-[#333]" :class="contentClassName">
+  <div v-else class="flex-center cursor-pointer dark:hover:bg-#333" :class="contentClassName">
     <slot></slot>
   </div>
 </template>
@@ -41,7 +41,7 @@ const props = withDefaults(defineProps<Props>(), {
 const showTooltip = computed(() => Boolean(props.tooltipContent));
 
 const contentClassName = computed(
-  () => `${props.contentClass} ${props.inverted ? 'hover:bg-primary' : 'hover:bg-[#f6f6f6]'}`
+  () => `${props.contentClass} ${props.inverted ? 'hover:bg-primary' : 'hover:bg-#f6f6f6'}`
 );
 </script>
 

src/components/custom/count-to.vue

@@ -77,7 +77,7 @@ function start() {
 }
 
 function formatNumber(num: number | string) {
-  if (!num) {
+  if (num !== 0 && !num) {
     return '';
   }
   const { decimals, decimal, separator, suffix, prefix } = props;

src/components/custom/github-link.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script setup lang="ts">
-import WebSiteLink from './WebSiteLink.vue';
+import WebSiteLink from './web-site-link.vue';
 
 defineOptions({ name: 'GithubLink' });
 

src/components/custom/icon-select.vue

@@ -11,14 +11,13 @@
       <n-input v-model:value="searchValue" placeholder="搜索图标"></n-input>
     </template>
     <div v-if="iconsList.length > 0" class="grid grid-cols-9 h-auto overflow-auto">
-      <template v-for="iconItem in iconsList" :key="iconItem">
+      <span v-for="iconItem in iconsList" :key="iconItem" @click="handleChange(iconItem)">
         <svg-icon
           :icon="iconItem"
-          class="border-1px border-[#d9d9d9] text-30px m-2px p-5px"
+          class="border-1px border-#d9d9d9 text-30px m-2px p-5px cursor-pointer"
           :class="{ 'border-primary': modelValue === iconItem }"
-          @click="handleChange(iconItem)"
         />
-      </template>
+      </span>
     </div>
     <n-empty v-else class="w-306px" description="你什么也找不到" />
   </n-popover>

src/components/custom/svg-icon.vue

@@ -5,7 +5,7 @@
     </svg>
   </template>
   <template v-else>
-    <Icon :icon="icon" v-bind="bindAttrs" />
+    <Icon v-if="icon" :icon="icon" v-bind="bindAttrs" />
   </template>
 </template>
 

src/composables/echarts.ts

@@ -1,4 +1,4 @@
-import { nextTick, onUnmounted, ref, watch } from 'vue';
+import { nextTick, effectScope, onScopeDispose, ref, watch } from 'vue';
 import type { ComputedRef, Ref } from 'vue';
 import * as echarts from 'echarts/core';
 import { BarChart, GaugeChart, LineChart, PictorialBarChart, PieChart, RadarChart, ScatterChart } from 'echarts/charts';
@@ -98,6 +98,7 @@ export function useEcharts(
 
   function update(updateOptions: ECOption) {
     if (isRendered()) {
+      chart?.clear();
       chart!.setOption({ ...updateOptions, backgroundColor: 'transparent' });
     }
   }
@@ -127,38 +128,44 @@ export function useEcharts(
     render();
   }
 
-  const stopSizeWatch = watch([width, height], ([newWidth, newHeight]) => {
+  const scope = effectScope();
-    initialSize.width = newWidth;
+
-    initialSize.height = newHeight;
+  scope.run(() => {
-    if (newWidth === 0 && newHeight === 0) {
+    watch([width, height], ([newWidth, newHeight]) => {
-      // 节点被删除 将chart置为空
+      initialSize.width = newWidth;
-      chart = null;
+      initialSize.height = newHeight;
-    }
+      if (newWidth === 0 && newHeight === 0) {
-    if (canRender()) {
+        // 节点被删除 将chart置为空
-      if (!isRendered()) {
+        chart = null;
-        render();
-      } else {
-        resize();
       }
-    }
+      if (canRender()) {
+        if (!isRendered()) {
+          render();
+        } else {
+          resize();
+        }
+      }
+    });
+
+    watch(
+      options,
+      newValue => {
+        update(newValue);
+      },
+      { deep: true }
+    );
+
+    watch(
+      () => theme.darkMode,
+      () => {
+        updateTheme();
+      }
+    );
   });
 
-  const stopOptionWatch = watch(options, newValue => {
+  onScopeDispose(() => {
-    update(newValue);
-  });
-
-  const stopDarkModeWatch = watch(
-    () => theme.darkMode,
-    () => {
-      updateTheme();
-    }
-  );
-
-  onUnmounted(() => {
     destroy();
-    stopSizeWatch();
+    scope.stop();
-    stopOptionWatch();
-    stopDarkModeWatch();
   });
 
   return {

src/composables/icon.ts

@@ -1,5 +1,5 @@
 import { h } from 'vue';
-import SvgIcon from '@/components/custom/SvgIcon.vue';
+import SvgIcon from '~/src/components/custom/svg-icon.vue';
 
 /**
  * 图标渲染

src/composables/layout.ts

@@ -3,7 +3,7 @@ import { breakpointsTailwind, useBreakpoints } from '@vueuse/core';
 import { useAppStore, useThemeStore } from '@/store';
 
 type LayoutMode = 'vertical' | 'horizontal';
-type LayoutHeaderProps = Record<EnumType.ThemeLayoutMode, App.GlobalHeaderProps>;
+type LayoutHeaderProps = Record<UnionKey.ThemeLayoutMode, App.GlobalHeaderProps>;
 
 export function useBasicLayout() {
   const app = useAppStore();

src/composables/router.ts

@@ -19,9 +19,9 @@ export function useRouterPush(inSetup = true) {
     if (newTab) {
       const routerData = router.resolve(to);
       window.open(routerData.href, '_blank');
-    } else {
+      return Promise.resolve();
-      router.push(to);
     }
+    return router.push(to);
   }
 
   /** 返回上一级路由 */
@@ -42,8 +42,8 @@ export function useRouterPush(inSetup = true) {
    * @param loginModule - 展示的登录模块
    * @param redirectUrl - 重定向地址(登录成功后跳转的地址),默认undefined表示取当前地址为重定向地址
    */
-  function toLogin(loginModule?: EnumType.LoginModuleKey, redirectUrl?: string) {
+  function toLogin(loginModule?: UnionKey.LoginModule, redirectUrl?: string) {
-    const module: EnumType.LoginModuleKey = loginModule || 'pwd-login';
+    const module: UnionKey.LoginModule = loginModule || 'pwd-login';
     const routeLocation: RouteLocationRaw = {
       name: routeName('login'),
       params: { module }
@@ -57,7 +57,7 @@ export function useRouterPush(inSetup = true) {
    * 登录页切换其他模块
    * @param module - 切换后的登录模块
    */
-  function toLoginModule(module: EnumType.LoginModuleKey) {
+  function toLoginModule(module: UnionKey.LoginModule) {
     const { query } = route.value;
     routerPush({ name: routeName('login'), params: { module }, query });
   }

src/constants/business.ts

@@ -1,10 +1,30 @@
+export const loginModuleLabels: Record<UnionKey.LoginModule, string> = {
+  'pwd-login': '账密登录',
+  'code-login': '手机验证码登录',
+  register: '注册',
+  'reset-pwd': '重置密码',
+  'bind-wechat': '微信绑定'
+};
+
+export const userRoleLabels: Record<Auth.RoleType, string> = {
+  super: '超级管理员',
+  admin: '管理员',
+  user: '普通用户'
+};
+
+export const userRoleOptions: Common.OptionWithKey<Auth.RoleType>[] = [
+  { value: 'super', label: userRoleLabels.super },
+  { value: 'admin', label: userRoleLabels.admin },
+  { value: 'user', label: userRoleLabels.user }
+];
+
 /** 用户性别 */
 export const genderLabels: Record<UserManagement.GenderKey, string> = {
   0: '女',
   1: '男'
 };
 
-export const genderOptions: { value: UserManagement.GenderKey; label: string }[] = [
+export const genderOptions: Common.OptionWithKey<UserManagement.GenderKey>[] = [
   { value: '0', label: genderLabels['0'] },
   { value: '1', label: genderLabels['1'] }
 ];
@@ -17,7 +37,7 @@ export const userStatusLabels: Record<UserManagement.UserStatusKey, string> = {
   4: '软删除'
 };
 
-export const userStatusOptions: { value: UserManagement.UserStatusKey; label: string }[] = [
+export const userStatusOptions: Common.OptionWithKey<UserManagement.UserStatusKey>[] = [
   { value: '1', label: userStatusLabels['1'] },
   { value: '2', label: userStatusLabels['2'] },
   { value: '3', label: userStatusLabels['3'] },

src/constants/common.ts

@@ -0,0 +1,18 @@
+export const dataTypeLabels: { [K in TypeUtil.DataTypeStringKey]: TypeUtil.DataTypeString<K> } = {
+  string: '[object String]',
+  number: '[object Number]',
+  boolean: '[object Boolean]',
+  null: '[object Null]',
+  undefined: '[object Undefined]',
+  symbol: '[object Symbol]',
+  bigInt: '[object BigInt]',
+  object: '[object Object]',
+  function: '[object Function]',
+  array: '[object Array]',
+  date: '[object Date]',
+  regExp: '[object RegExp]',
+  promise: '[object Promise]',
+  set: '[object Set]',
+  map: '[object Map]',
+  file: '[object File]'
+};

src/constants/index.ts

@@ -1 +1,3 @@
+export * from './common';
+export * from './system';
 export * from './business';

src/constants/system.ts

@@ -0,0 +1,114 @@
+export const themeLayoutModeLabels: Record<UnionKey.ThemeLayoutMode, string> = {
+  vertical: '左侧菜单模式',
+  horizontal: '顶部菜单模式',
+  'vertical-mix': '左侧菜单混合模式',
+  'horizontal-mix': '顶部菜单混合模式'
+};
+
+export const themeLayoutModeOptions: Common.OptionWithKey<UnionKey.ThemeLayoutMode>[] = [
+  {
+    value: 'vertical',
+    label: themeLayoutModeLabels.vertical
+  },
+  {
+    value: 'horizontal',
+    label: themeLayoutModeLabels.horizontal
+  },
+  {
+    value: 'vertical-mix',
+    label: themeLayoutModeLabels['vertical-mix']
+  },
+  {
+    value: 'horizontal-mix',
+    label: themeLayoutModeLabels['horizontal-mix']
+  }
+];
+
+export const themeScrollModeLabels: Record<UnionKey.ThemeScrollMode, string> = {
+  wrapper: '外层滚动',
+  content: '主体滚动'
+};
+
+export const themeScrollModeOptions: Common.OptionWithKey<UnionKey.ThemeScrollMode>[] = [
+  {
+    value: 'wrapper',
+    label: themeScrollModeLabels.wrapper
+  },
+  {
+    value: 'content',
+    label: themeScrollModeLabels.content
+  }
+];
+
+export const themeTabModeLabels: Record<UnionKey.ThemeTabMode, string> = {
+  chrome: '谷歌风格',
+  button: '按钮风格'
+};
+
+export const themeTabModeOptions: Common.OptionWithKey<UnionKey.ThemeTabMode>[] = [
+  {
+    value: 'chrome',
+    label: themeTabModeLabels.chrome
+  },
+  {
+    value: 'button',
+    label: themeTabModeLabels.button
+  }
+];
+
+export const themeHorizontalMenuPositionLabels: Record<UnionKey.ThemeHorizontalMenuPosition, string> = {
+  'flex-start': '居左',
+  center: '居中',
+  'flex-end': '居右'
+};
+
+export const themeHorizontalMenuPositionOptions: Common.OptionWithKey<UnionKey.ThemeHorizontalMenuPosition>[] = [
+  {
+    value: 'flex-start',
+    label: themeHorizontalMenuPositionLabels['flex-start']
+  },
+  {
+    value: 'center',
+    label: themeHorizontalMenuPositionLabels.center
+  },
+  {
+    value: 'flex-end',
+    label: themeHorizontalMenuPositionLabels['flex-end']
+  }
+];
+
+export const themeAnimateModeLabels: Record<UnionKey.ThemeAnimateMode, string> = {
+  'zoom-fade': '渐变',
+  'zoom-out': '闪现',
+  'fade-slide': '滑动',
+  fade: '消退',
+  'fade-bottom': '底部消退',
+  'fade-scale': '缩放消退'
+};
+
+export const themeAnimateModeOptions: Common.OptionWithKey<UnionKey.ThemeAnimateMode>[] = [
+  {
+    value: 'zoom-fade',
+    label: themeAnimateModeLabels['zoom-fade']
+  },
+  {
+    value: 'zoom-out',
+    label: themeAnimateModeLabels['zoom-out']
+  },
+  {
+    value: 'fade-slide',
+    label: themeAnimateModeLabels['fade-slide']
+  },
+  {
+    value: 'fade',
+    label: themeAnimateModeLabels.fade
+  },
+  {
+    value: 'fade-bottom',
+    label: themeAnimateModeLabels['fade-bottom']
+  },
+  {
+    value: 'fade-scale',
+    label: themeAnimateModeLabels['fade-scale']
+  }
+];

src/enum/business.ts

@@ -1,15 +0,0 @@
-/** 用户角色 */
-export enum EnumUserRole {
-  super = '超级管理员',
-  admin = '管理员',
-  user = '普通用户'
-}
-
-/** 登录模块 */
-export enum EnumLoginModule {
-  'pwd-login' = '账密登录',
-  'code-login' = '手机验证码登录',
-  'register' = '注册',
-  'reset-pwd' = '重置密码',
-  'bind-wechat' = '微信绑定'
-}

src/enum/common.ts

@@ -1,40 +0,0 @@
-/** http请求头的content-type类型 */
-export enum EnumContentType {
-  json = 'application/json',
-  formUrlencoded = 'application/x-www-form-urlencoded',
-  formData = 'multipart/form-data'
-}
-
-/** 缓存的key */
-export enum EnumStorageKey {
-  /** 主题颜色 */
-  'theme-color' = '__THEME_COLOR__',
-  /** 用户token */
-  'token' = '__TOKEN__',
-  /** 用户刷新token */
-  'refresh-token' = '__REFRESH_TOKEN__',
-  /** 用户信息 */
-  'user-info' = '__USER_INFO__',
-  /** 主题配置 */
-  'theme-settings' = '__THEME_SETTINGS__',
-  /** 多页签路由信息 */
-  'multi-tab-routes' = '__MULTI_TAB_ROUTES__'
-}
-
-/** 数据类型 */
-export enum EnumDataType {
-  number = '[object Number]',
-  string = '[object String]',
-  boolean = '[object Boolean]',
-  null = '[object Null]',
-  undefined = '[object Undefined]',
-  object = '[object Object]',
-  array = '[object Array]',
-  function = '[object Function]',
-  date = '[object Date]',
-  regexp = '[object RegExp]',
-  promise = '[object Promise]',
-  set = '[object Set]',
-  map = '[object Map]',
-  file = '[object File]'
-}

src/enum/index.ts

@@ -1,3 +0,0 @@
-export * from './common';
-export * from './system';
-export * from './business';

src/enum/system.ts

@@ -1,36 +0,0 @@
-/** 布局组件的名称 */
-export enum EnumLayoutComponentName {
-  basic = 'basic-layout',
-  blank = 'blank-layout'
-}
-
-/** 布局模式 */
-export enum EnumThemeLayoutMode {
-  'vertical' = '左侧菜单模式',
-  'horizontal' = '顶部菜单模式',
-  'vertical-mix' = '左侧菜单混合模式',
-  'horizontal-mix' = '顶部菜单混合模式'
-}
-
-/** 多页签风格 */
-export enum EnumThemeTabMode {
-  'chrome' = '谷歌风格',
-  'button' = '按钮风格'
-}
-
-/** 水平模式的菜单位置 */
-export enum EnumThemeHorizontalMenuPosition {
-  'flex-start' = '居左',
-  'center' = '居中',
-  'flex-end' = '居右'
-}
-
-/** 过渡动画类型 */
-export enum EnumThemeAnimateMode {
-  'zoom-fade' = '渐变',
-  'zoom-out' = '闪现',
-  'fade-slide' = '滑动',
-  'fade' = '消退',
-  'fade-bottom' = '底部消退',
-  'fade-scale' = '缩放消退'
-}

src/hooks/business/index.ts

@@ -1,5 +1,5 @@
-import useCountDown from './useCountDown';
+import useCountDown from './use-count-down';
-import useSmsCode from './useSmsCode';
+import useSmsCode from './use-sms-code';
-import useImageVerify from './useImageVerify';
+import useImageVerify from './use-image-verify';
 
 export { useCountDown, useSmsCode, useImageVerify };

src/hooks/business/use-count-down.ts

@@ -1,4 +1,4 @@
-import { computed, ref } from 'vue';
+import { computed, onScopeDispose, ref } from 'vue';
 import { useBoolean } from '../common';
 
 /**
@@ -42,6 +42,8 @@ export default function useCountDown(second: number) {
     counts.value = 0;
   }
 
+  onScopeDispose(stop);
+
   return {
     counts,
     isCounting,

src/hooks/business/use-sms-code.ts

@@ -2,7 +2,7 @@ import { computed } from 'vue';
 import { REGEXP_PHONE } from '@/config';
 import { fetchSmsCode } from '@/service';
 import { useLoading } from '../common';
-import useCountDown from './useCountDown';
+import useCountDown from './use-count-down';
 
 export default function useSmsCode() {
   const { loading, startLoading, endLoading } = useLoading();

src/hooks/business/use-table.ts

@@ -0,0 +1,151 @@
+import { ref, reactive } from 'vue';
+import type { Ref } from 'vue';
+import type { DataTableBaseColumn, DataTableSelectionColumn, DataTableExpandColumn, PaginationProps } from 'naive-ui';
+import type { TableColumnGroup, InternalRowData } from 'naive-ui/es/data-table/src/interface';
+import { useLoadingEmpty } from '../common';
+
+/**
+ * 表格分页参数
+ */
+type PaginationParams = Pick<PaginationProps, 'page' | 'pageSize'>;
+
+/**
+ * 表格请求接口的参数
+ */
+type ApiParams = Record<string, unknown> & PaginationParams;
+
+/**
+ * 表格请求接口的结果
+ * @description 这里用属性list来表示后端接口返回的表格数据
+ */
+type ApiData<TableData = Record<string, unknown>> = Record<string, unknown> & { list: TableData[] };
+
+/**
+ * 表格接口的请求函数
+ */
+type ApiFn<Params = ApiParams, TableData = Record<string, unknown>> = (
+  params: Params
+) => Promise<Service.RequestResult<ApiData<TableData>>>;
+
+/**
+ * 表格接口请求后转换后的数据
+ */
+type TransformedTableData<TableData = Record<string, unknown>> = {
+  data: TableData[];
+  pageNum: number;
+  pageSize: number;
+  total: number;
+};
+
+/**
+ * 表格的列
+ */
+type DataTableColumn<T = InternalRowData> =
+  | (Omit<TableColumnGroup<T>, 'key'> & { key: keyof T })
+  | (Omit<DataTableBaseColumn<T>, 'key'> & { key: keyof T })
+  | DataTableSelectionColumn<T>
+  | DataTableExpandColumn<T>;
+
+/**
+ * 表格数据转换器
+ * @description 将不同接口的表格数据转换成统一的类型
+ */
+type Transformer<TableData = Record<string, unknown>> = (
+  apiData: ApiData<TableData>
+) => TransformedTableData<TableData>;
+
+type TableParams<TableData = Record<string, unknown>, Params = ApiParams> = {
+  apiFn: ApiFn<Params, TableData>;
+  apiParams: Params;
+  transformer: Transformer<TableData>;
+  columns: DataTableColumn<TableData>[];
+  pagination?: PaginationProps;
+};
+
+export function useTable<TableData extends Record<string, unknown>, Params extends ApiParams>(
+  params: TableParams<TableData, Params>,
+  immediate = true
+) {
+  const { loading, startLoading, endLoading, empty, setEmpty } = useLoadingEmpty();
+  const data: Ref<TableData[]> = ref([]);
+
+  function updateData(update: TableData[]) {
+    data.value = update;
+  }
+
+  let dataSource: TableData[] = [];
+  function setDataSource(source: TableData[]) {
+    dataSource = source;
+  }
+
+  function resetData() {
+    data.value = dataSource;
+  }
+
+  const columns = ref(params.columns) as Ref<DataTableColumn<TableData>[]>;
+
+  const pagination = reactive({
+    ...getPagination(params.pagination),
+    onChange: (page: number) => {
+      pagination.page = page;
+    },
+    onUpdatePageSize: (pageSize: number) => {
+      pagination.pageSize = pageSize;
+      pagination.page = 1;
+    }
+  }) as PaginationProps;
+
+  function updatePagination(update: Partial<PaginationProps>) {
+    Object.assign(pagination, update);
+  }
+
+  async function getData() {
+    const apiParams: Params = { ...params.apiParams };
+    apiParams.page = apiParams.page || pagination.page;
+    apiParams.pageSize = apiParams.pageSize || pagination.pageSize;
+
+    startLoading();
+    const { data: apiData } = await params.apiFn(apiParams);
+
+    if (apiData) {
+      const transformedData = params.transformer(apiData);
+
+      updateData(transformedData.data);
+
+      setDataSource(transformedData.data);
+
+      setEmpty(transformedData.data.length === 0);
+
+      updatePagination({ page: transformedData.pageNum, pageSize: transformedData.pageSize });
+    }
+
+    endLoading();
+  }
+
+  if (immediate) {
+    getData();
+  }
+
+  return {
+    data,
+    columns,
+    loading,
+    empty,
+    pagination,
+    getData,
+    updateData,
+    resetData
+  };
+}
+
+function getPagination(pagination?: Partial<PaginationProps>) {
+  const defaultPagination: Partial<PaginationProps> = {
+    page: 1,
+    pageSize: 10,
+    showSizePicker: true,
+    pageSizes: [10, 15, 20, 25, 30]
+  };
+  Object.assign(defaultPagination, pagination);
+
+  return defaultPagination;
+}

src/hooks/business/useTable.ts

@@ -1 +0,0 @@
-export function useTable() {}

src/hooks/common/index.ts

@@ -1,7 +1,7 @@
-import useContext from './useContext';
+import useContext from './use-context';
-import useBoolean from './useBoolean';
+import useBoolean from './use-boolean';
-import useLoading from './useLoading';
+import useLoading from './use-loading';
-import useLoadingEmpty from './useLoadingEmpty';
+import useLoadingEmpty from './use-loading-empty';
-import useReload from './useReload';
+import useReload from './use-reload';
 
 export { useContext, useBoolean, useLoading, useLoadingEmpty, useReload };

src/hooks/common/use-loading-empty.ts

@@ -1,4 +1,4 @@
-import useBoolean from './useBoolean';
+import useBoolean from './use-boolean';
 
 export default function useLoadingEmpty(initLoading = false, initEmpty = false) {
   const { bool: loading, setTrue: startLoading, setFalse: endLoading } = useBoolean(initLoading);

src/hooks/common/use-loading.ts

@@ -1,4 +1,4 @@
-import useBoolean from './useBoolean';
+import useBoolean from './use-boolean';
 
 export default function useLoading(initValue = false) {
   const { bool: loading, setTrue: startLoading, setFalse: endLoading } = useBoolean(initValue);

src/hooks/common/use-reload.ts

@@ -1,5 +1,5 @@
 import { nextTick } from 'vue';
-import useBoolean from './useBoolean';
+import useBoolean from './use-boolean';
 
 /** 重载 */
 export default function useReload() {

src/layouts/basic-layout/index.vue

@@ -1,18 +1,21 @@
 <template>
   <admin-layout
     :mode="mode"
-    :is-mobile="isMobile"
+    :scroll-mode="theme.scrollMode"
-    :fixed-header-and-tab="theme.fixedHeaderAndTab"
+    :scroll-el-id="app.scrollElId"
+    :full-content="app.contentFull"
+    :fixed-top="theme.fixedHeaderAndTab"
     :header-height="theme.header.height"
     :tab-visible="theme.tab.visible"
     :tab-height="theme.tab.height"
+    :content-class="app.disableMainXScroll ? 'overflow-x-hidden' : ''"
     :sider-visible="siderVisible"
+    :sider-collapse="app.siderCollapse"
     :sider-width="siderWidth"
     :sider-collapsed-width="siderCollapsedWidth"
-    :sider-collapse="app.siderCollapse"
+    :footer-visible="theme.footer.visible"
-    :add-main-overflow-hidden="addMainOverflowHidden"
     :fixed-footer="theme.footer.fixed"
-    @update:sider-collapse="app.setSiderCollapse"
+    :right-footer="theme.footer.right"
   >
     <template #header>
       <global-header v-bind="headerProps" />
@@ -23,38 +26,35 @@
     <template #sider>
       <global-sider />
     </template>
-    <global-content @hide-main-overflow="setAddMainOverflowHidden" />
+    <global-content />
     <template #footer>
       <global-footer />
     </template>
   </admin-layout>
-  <global-back-top />
+  <n-back-top :key="theme.scrollMode" :listen-to="`#${app.scrollElId}`" class="z-100" />
   <setting-drawer />
 </template>
 
 <script setup lang="ts">
-import AdminLayout from '@soybeanjs/vue-admin-layout';
+import { AdminLayout } from '@soybeanjs/vue-materials';
 import { useAppStore, useThemeStore } from '@/store';
 import { useBasicLayout } from '@/composables';
-import { useBoolean } from '@/hooks';
+import { GlobalContent, GlobalFooter, GlobalHeader, GlobalSider, GlobalTab, SettingDrawer } from '../common';
-import {
-  GlobalBackTop,
-  GlobalContent,
-  GlobalFooter,
-  GlobalHeader,
-  GlobalSider,
-  GlobalTab,
-  SettingDrawer
-} from '../common';
 
 defineOptions({ name: 'BasicLayout' });
 
 const app = useAppStore();
 const theme = useThemeStore();
 
-const { mode, isMobile, headerProps, siderVisible, siderWidth, siderCollapsedWidth } = useBasicLayout();
+const { mode, headerProps, siderVisible, siderWidth, siderCollapsedWidth } = useBasicLayout();
-
-const { bool: addMainOverflowHidden, setBool: setAddMainOverflowHidden } = useBoolean();
 </script>
 
-<style scoped></style>
+<style lang="scss">
+#__SCROLL_EL_ID__ {
+  @include scrollbar(8px, #e1e1e1);
+}
+
+.dark #__SCROLL_EL_ID__ {
+  @include scrollbar(8px, #555);
+}
+</style>

src/layouts/common/GlobalBackTop/index.vue

@@ -1,15 +0,0 @@
-<template>
-  <n-back-top :show="show" class="z-1000" />
-</template>
-
-<script lang="ts" setup>
-import { computed } from 'vue';
-import { useWindowScroll } from '@vueuse/core';
-
-defineOptions({ name: 'GlobalBackTop' });
-
-const { y: scrollY } = useWindowScroll();
-
-const show = computed(() => scrollY.value > 180);
-</script>
-<style scoped></style>

src/layouts/common/GlobalContent/index.vue

@@ -1,55 +0,0 @@
-<template>
-  <div
-    :class="{ 'p-16px': showPadding }"
-    class="h-full bg-[#f6f9f8] dark:bg-[#101014] transition duration-300 ease-in-out"
-  >
-    <router-view v-slot="{ Component, route }">
-      <transition
-        :name="theme.pageAnimateMode"
-        mode="out-in"
-        :appear="true"
-        @before-leave="handleBeforeLeave"
-        @after-enter="handleAfterEnter"
-      >
-        <keep-alive :include="routeStore.cacheRoutes">
-          <component :is="Component" v-if="app.reloadFlag" :key="route.fullPath" />
-        </keep-alive>
-      </transition>
-    </router-view>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useAppStore, useRouteStore, useThemeStore } from '@/store';
-
-defineOptions({ name: 'GlobalContent' });
-
-interface Props {
-  /** 显示padding */
-  showPadding?: boolean;
-}
-
-withDefaults(defineProps<Props>(), {
-  showPadding: true
-});
-
-interface Emits {
-  /** 禁止主体溢出 */
-  (e: 'hide-main-overflow', hidden: boolean): void;
-}
-
-const emit = defineEmits<Emits>();
-
-const app = useAppStore();
-const theme = useThemeStore();
-const routeStore = useRouteStore();
-
-function handleBeforeLeave() {
-  emit('hide-main-overflow', true);
-}
-function handleAfterEnter() {
-  emit('hide-main-overflow', false);
-}
-</script>
-
-<style scoped></style>