diff --git a/.github/ISSUE_TEMPLATE/1-bug.md b/.github/ISSUE_TEMPLATE/1-bug.md
new file mode 100644
index 0000000..0f5e1e0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1-bug.md
@@ -0,0 +1,39 @@
+---
+name: 🐛 Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'bug: pending triage'
+assignees: ''
+---
+
+<!--
+抱歉，您遇到了一个错误。感谢您抽出宝贵的时间进行举报！
+
+请尽可能填写以下模板。
+
+Ouch, sorry you’ve run into a bug.  Thank for taking the time to report it!
+
+Please fill in as much of the template below as you’re able.
+
+P.S. have you seen our support and contributing docs?
+-->
+
+**⚠️ IMPORTANT ⚠️ Please check the following list before proceeding. If you ignore this issue template, your issue will be directly closed.**
+
+- [ ] Read [the docs](https://anncwb.github.io/vue-vben-admin-doc/).
+- [ ] Make sure the code is up to date. (Some bugs have been fixed in the latest code)
+- [ ] This is a concrete bug. For Q&A open a [GitHub Discussion](https://github.com/anncwb/vue-vben-admin/discussions) or join our [Discord](https://discord.gg/8GuAdwDhj6) Chat Server.
+
+### Describe the bug
+
+A clear and concise description of what the bug is..
+
+### Reproduction
+
+Please describe the steps of the problem in detail to ensure that we can restore the correct problem
+
+## System Info
+
+- Operating System:
+- Node version:
+- Package manager (npm/yarn/pnpm) and version:
diff --git a/.github/ISSUE_TEMPLATE/2-feature.md b/.github/ISSUE_TEMPLATE/2-feature.md
new file mode 100644
index 0000000..cbe4164
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2-feature.md
@@ -0,0 +1,32 @@
+---
+name: 🚀 Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+---
+
+<!--
+感谢您提出使这个项目更好的想法！
+请尽可能填写以下模板。
+
+Thank you for suggesting an idea to make this project better!
+Please fill in as much of the template below as you’re able.
+
+-->
+
+### Subject of the feature
+
+Describe your issue here.
+
+### Problem
+
+If the feature requests relates to a problem, please describe the problem you are trying to solve here.
+
+### Expected behaviour
+
+What should happen? Please describe the desired behaviour.
+
+### Alternatives
+
+What are the alternative solutions? Please describe what else you have considered?
diff --git a/.github/ISSUE_TEMPLATE/3-bug-cn.md b/.github/ISSUE_TEMPLATE/3-bug-cn.md
new file mode 100644
index 0000000..fade42a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/3-bug-cn.md
@@ -0,0 +1,28 @@
+---
+name: 🐛 Bug 报告
+about: 向我们报告一个Bug以帮助我们改进
+title: ''
+labels: 'bug: pending triage'
+assignees: ''
+---
+
+**⚠️ 重要 ⚠️ 在进一步操作之前，请检查下列选项。如果您忽视此模板或者没有提供关键信息，您的 Issue 将直接被关闭**
+
+- [ ] 已阅读 [文档](https://anncwb.github.io/vue-vben-admin-doc/).
+- [ ] 确保您的代码已是最新或者所报告的 Bug 在最新版本中可以重现. (部分 Bug 可能已经在最近的代码中修复)
+- [ ] 已在 Issues 中搜索了相关的关键词
+- [ ] 不是 ant design vue 组件库的 Bug
+
+### 描述 Bug
+
+请清晰地描述此 Bug 的具体表现。
+
+### 复现 Bug
+
+请描述在演示页面中复现 Bug 的详细步骤，以确保我们可以理解并定位问题。部分 Bug 如果未在 Demo 中涉及，请务必提供关键代码
+
+## 系统信息
+
+- 操作系统:
+- Node 版本:
+- 包管理器 (npm/yarn/pnpm) 及其版本:
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..b83ccbf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Discord Chat
+    url: https://discord.gg/8GuAdwDhj6
+    about: Ask questions and discuss with other Vben users in real time.
+  - name: Questions & Discussions
+    url: https://github.com/anncwb/vue-vben-admin/discussions
+    about: Use GitHub discussions for message-board style questions and discussions.
diff --git a/.github/commit-convention.md b/.github/commit-convention.md
new file mode 100644
index 0000000..a1a969e
--- /dev/null
+++ b/.github/commit-convention.md
@@ -0,0 +1,89 @@
+## Git Commit Message Convention
+
+> This is adapted from [Angular's commit convention](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-angular).
+
+#### TL;DR:
+
+Messages must be matched by the following regex:
+
+```js
+/^(revert: )?(feat|fix|docs|style|refactor|perf|test|workflow|build|ci|chore|types|wip): .{1,50}/;
+```
+
+#### Examples
+
+Appears under "Features" header, `dev` subheader:
+
+```
+feat(dev): add 'comments' option
+```
+
+Appears under "Bug Fixes" header, `dev` subheader, with a link to issue #28:
+
+```
+fix(dev): fix dev error
+
+close #28
+```
+
+Appears under "Performance Improvements" header, and under "Breaking Changes" with the breaking change explanation:
+
+```
+perf(build): remove 'foo' option
+
+BREAKING CHANGE: The 'foo' option has been removed.
+```
+
+The following commit and commit `667ecc1` do not appear in the changelog if they are under the same release. If not, the revert commit appears under the "Reverts" header.
+
+```
+revert: feat(compiler): add 'comments' option
+
+This reverts commit 667ecc1654a317a13331b17617d973392f415f02.
+```
+
+### Full Message Format
+
+A commit message consists of a **header**, **body** and **footer**. The header has a **type**, **scope** and **subject**:
+
+```
+<type>(<scope>): <subject>
+<BLANK LINE>
+<body>
+<BLANK LINE>
+<footer>
+```
+
+The **header** is mandatory and the **scope** of the header is optional.
+
+### Revert
+
+If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body, it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
+
+### Type
+
+If the prefix is `feat`, `fix` or `perf`, it will appear in the changelog. However, if there is any [BREAKING CHANGE](#footer), the commit will always appear in the changelog.
+
+Other prefixes are up to your discretion. Suggested prefixes are `docs`, `chore`, `style`, `refactor`, and `test` for non-changelog related tasks.
+
+### Scope
+
+The scope could be anything specifying the place of the commit change. For example `dev`, `build`, `workflow`, `cli` etc...
+
+### Subject
+
+The subject contains a succinct description of the change:
+
+- use the imperative, present tense: "change" not "changed" nor "changes"
+- don't capitalize the first letter
+- no dot (.) at the end
+
+### Body
+
+Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes". The body should include the motivation for the change and contrast this with previous behavior.
+
+### Footer
+
+The footer should contain any information about **Breaking Changes** and is also the place to reference GitHub issues that this commit **Closes**.
+
+**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines. The rest of the commit message is then used for this.
diff --git a/.github/contributing.md b/.github/contributing.md
new file mode 100644
index 0000000..9a5211b
--- /dev/null
+++ b/.github/contributing.md
@@ -0,0 +1,5 @@
+# Contributing Guide
+
+1. Make sure you put things in the right category!
+2. Always add your items to the end of a list. To be fair, the order is first-come-first-serve.
+3. If you think something belongs in the wrong category, or think there needs to be a new category, feel free to edit things too.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..8269211
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,34 @@
+### `General`
+
+> ✏️ Mark the necessary items without changing the structure of the PR template.
+
+- [ ] Pull request template structure not broken
+
+### `Type`
+
+> ℹ️ What types of changes does your code introduce?
+
+> 👉 _Put an `x` in the boxes that apply_
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] This change requires a documentation update
+
+### `Checklist`
+
+> ℹ️ Check all checkboxes - this will indicate that you have done everything in accordance with the rules in [CONTRIBUTING](contributing.md).
+
+> 👉 _Put an `x` in the boxes that apply._
+
+- [ ] My code follows the style guidelines of this project
+- [ ] Is the code format correct
+- [ ] Is the git submission information standard?
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] I have added tests that prove my fix is effective or that my feature works
+- [ ] New and existing unit tests pass locally with my changes
+- [ ] Any dependent changes have been merged and published in downstream modules
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 0000000..b974f5e
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,118 @@
+name: deploy
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  # push-to-ftp:
+  #   if: "contains(github.event.head_commit.message, '[deploy]')"
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v2
+
+  #     - name: Sed Config Base
+  #       shell: bash
+  #       run: |
+  #         sed -i  's#VITE_PUBLIC_PATH\s*=.*#VITE_PUBLIC_PATH = /next/#g' ./.env.production
+  #         sed -i  "s#VITE_BUILD_COMPRESS\s*=.*#VITE_BUILD_COMPRESS = 'gzip'#g" ./.env.production
+  #         cat ./.env.production
+
+  #     - name: use Node.js 14
+  #       uses: actions/setup-node@v2.1.2
+  #       with:
+  #         node-version: '14.x'
+
+  #     - name: Get yarn cache
+  #       id: yarn-cache
+  #       run: echo "::set-output name=dir::$(yarn cache dir)"
+
+  #     - name: Cache dependencies
+  #       uses: actions/cache@v2
+  #       with:
+  #         path: ${{ steps.yarn-cache.outputs.dir }}
+  #         key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+  #         restore-keys: |
+  #           ${{ runner.os }}-yarn-
+
+  #     - name: Build
+  #       run: |
+  #         yarn install
+  #         yarn run build
+
+  #     - name: Deploy
+  #       uses: SamKirkland/FTP-Deploy-Action@2.0.0
+  #       env:
+  #         FTP_SERVER: ${{ secrets.FTP_SERVER }}
+  #         FTP_USERNAME: ${{ secrets.FTP_USERNAME }}
+  #         FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
+  #         METHOD: sftp
+  #         PORT: ${{ secrets.FTP_PORT }}
+  #         LOCAL_DIR: dist
+  #         REMOTE_DIR: /srv/www/vben-admin
+  #         ARGS: --delete --verbose --parallel=80
+
+  push-to-gh-pages:
+    if: "contains(github.event.head_commit.message, '[release]')"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Sed Config Base
+        shell: bash
+        run: |
+          sed -i  's#VITE_PUBLIC_PATH\s*=.*#VITE_PUBLIC_PATH = /vue-vben-admin/#g' ./.env.production
+          sed -i  "s#VITE_BUILD_COMPRESS\s*=.*#VITE_BUILD_COMPRESS = 'gzip'#g" ./.env.production
+          cat ./.env.production
+
+      - name: use Node.js 16
+        uses: actions/setup-node@v2.1.2
+        with:
+          node-version: '16.x'
+
+      - name: Get yarn cache
+        id: yarn-cache
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.yarn-cache.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Set SSH Environment
+        env:
+          DOCS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
+        run: |
+          mkdir -p ~/.ssh/
+          echo "$ACTIONS_DEPLOY_KEY" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          ssh-keyscan github.com > ~/.ssh/known_hosts
+          chmod 700 ~/.ssh && chmod 600 ~/.ssh/*
+          git config --local user.email "vbenadmin@163.com"
+          git config --local user.name "vbenAdmin"
+
+      - name: Delete gh-pages branch
+        run: |
+          git push origin --delete gh-pages
+
+      - name: Build
+        run: |
+          yarn install
+          yarn run build
+          touch dist/.nojekyll
+          cp dist/index.html dist/404.html
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v2.5.0
+        env:
+          ACTIONS_DEPLOY_KEY: ${{secrets.ACTIONS_DEPLOY_KEY}}
+          PUBLISH_BRANCH: gh-pages
+          PUBLISH_DIR: ./dist
+        with:
+          forceOrphan: true
diff --git a/.github/workflows/ftp-schedule.yml b/.github/workflows/ftp-schedule.yml
new file mode 100644
index 0000000..6db8dc8
--- /dev/null
+++ b/.github/workflows/ftp-schedule.yml
@@ -0,0 +1,56 @@
+name: schedule-push-to-ftp
+
+# Timed deployment project
+on:
+  push:
+  schedule:
+    - cron: '0 20 * * *'
+
+jobs:
+  schedule-push-to-ftp:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Sed Config Base
+        shell: bash
+        run: |
+          sed -i  's#VITE_PUBLIC_PATH\s*=.*#VITE_PUBLIC_PATH = /next/#g' ./.env.production
+          sed -i  "s#VITE_BUILD_COMPRESS\s*=.*#VITE_BUILD_COMPRESS = 'gzip'#g" ./.env.production
+          sed -i  "s#VITE_DROP_CONSOLE\s*=.*#VITE_DROP_CONSOLE = true#g" ./.env.production
+          cat ./.env.production
+
+      - name: use Node.js 16
+        uses: actions/setup-node@v2.1.2
+        with:
+          node-version: '16.x'
+
+      - name: Get yarn cache
+        id: yarn-cache
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.yarn-cache.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Build
+        run: |
+          yarn install
+          yarn run build
+
+      - name: Deploy
+        uses: SamKirkland/FTP-Deploy-Action@2.0.0
+        env:
+          FTP_SERVER: ${{ secrets.FTP_SERVER }}
+          FTP_USERNAME: ${{ secrets.FTP_USERNAME }}
+          FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
+          METHOD: sftp
+          PORT: ${{ secrets.FTP_PORT }}
+          LOCAL_DIR: dist
+          REMOTE_DIR: /srv/www/vben-admin
+          ARGS: --delete --verbose --parallel=80
diff --git a/.github/workflows/issue-close-require.yml b/.github/workflows/issue-close-require.yml
new file mode 100644
index 0000000..a5fb0a4
--- /dev/null
+++ b/.github/workflows/issue-close-require.yml
@@ -0,0 +1,17 @@
+name: Issue Close Require
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    steps:
+      - name: need reproduction
+        uses: actions-cool/issues-helper@v2.1.1
+        with:
+          actions: 'close-issues'
+          token: ${{ secrets.OPER_TOKEN }}
+          labels: 'need reproduction'
+          inactive-day: 3
diff --git a/.github/workflows/issue-labeled.yml b/.github/workflows/issue-labeled.yml
new file mode 100644
index 0000000..43a7a62
--- /dev/null
+++ b/.github/workflows/issue-labeled.yml
@@ -0,0 +1,29 @@
+name: Issue Labeled
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  reply-labeled:
+    runs-on: ubuntu-latest
+    steps:
+      - name: remove pending
+        if: github.event.label.name == 'enhancement' || github.event.label.name == 'bug'
+        uses: actions-cool/issues-helper@v2.1.1
+        with:
+          actions: 'remove-labels'
+          token: ${{ secrets.OPER_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          labels: 'bug: pending triage'
+
+      - name: need reproduction
+        if: github.event.label.name == 'need reproduction'
+        uses: actions-cool/issues-helper@v2.1.1
+        with:
+          actions: 'create-comment, remove-labels'
+          token: ${{ secrets.OPER_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            Hello @${{ github.event.issue.user.login }}. Please provide the complete reproduction steps and code. Issues labeled by `need reproduction` will be closed if no activities in 3 days.
+          labels: 'bug: pending triage'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..74ab4a3
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,24 @@
+name: Create Release
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  build:
+    name: Create Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@master
+
+      - name: Create Release for Tag
+        id: release_tag
+        uses: yyx990803/release-tag@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.OPER_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          body: |
+            Please refer to [CHANGELOG.md](https://github.com/anncwb/vue-vben-admin/blob/main/CHANGELOG.md) for details.
diff --git a/.ide/.ide.yaml b/.ide/.ide.yaml
new file mode 100644
index 0000000..46f5ed3
--- /dev/null
+++ b/.ide/.ide.yaml
@@ -0,0 +1,36 @@
+version: smartide/v0.3
+orchestrator:
+  type: docker-compose
+  version: 3
+workspace:
+  dev-container:
+    service-name: itc-framework-vue3
+    
+    ports: # 申明端口
+      tools-webide-vscode: 6800
+      tools-ssh: 6822
+      apps-application: 3100
+    
+    ide-type: vscode  #vscode/theia
+    volumes: 
+      git-config: true
+      ssh-key: true
+  services:
+    xjrsoft-vue3:
+      image: registry.cn-hangzhou.aliyuncs.com/smartide/smartide-node-v2-vscode:all-version
+      restart: always
+      environment:
+        ROOT_PASSWORD: root123
+        LOCAL_USER_PASSWORD: root123       
+      volumes:
+      - .:/home/project
+      ports:
+        - 3100:3100
+        - 6822:22
+        - 6800:3000
+      networks:
+        - smartide-network
+
+  networks:
+    smartide-network:
+      external: true
diff --git a/.ide/.keep b/.ide/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000..94dc813
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,13 @@
+{
+  "recommendations": [
+    "johnsoncodehk.volar",
+    "dbaeumer.vscode-eslint",
+    "stylelint.vscode-stylelint",
+    "esbenp.prettier-vscode",
+    "mrmlnc.vscode-less",
+    "lokalise.i18n-ally",
+    "antfu.iconify",
+    "mikestead.dotenv",
+    "heybourn.headwind"
+  ]
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..72e95d0
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,13 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "chrome",
+      "request": "launch",
+      "name": "Launch Chrome",
+      "url": "http://localhost:3100",
+      "webRoot": "${workspaceFolder}/src",
+      "sourceMaps": true
+    }
+  ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..83027dc
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,144 @@
+{
+    "typescript.tsdk": "./node_modules/typescript/lib",
+    "volar.tsPlugin": true,
+    "volar.tsPluginStatus": false,
+    "npm.packageManager": "pnpm",
+    "editor.tabSize": 2,
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "files.eol": "\n",
+    "search.exclude": {
+        "**/node_modules": true,
+        "**/*.log": true,
+        "**/*.log*": true,
+        "**/bower_components": true,
+        "**/dist": true,
+        "**/elehukouben": true,
+        "**/.git": true,
+        "**/.gitignore": true,
+        "**/.svn": true,
+        "**/.DS_Store": true,
+        "**/.idea": true,
+        "**/.vscode": false,
+        "**/yarn.lock": true,
+        "**/tmp": true,
+        "out": true,
+        "dist": true,
+        "node_modules": true,
+        "CHANGELOG.md": true,
+        "examples": true,
+        "res": true,
+        "screenshots": true,
+        "yarn-error.log": true,
+        "**/.yarn": true
+    },
+    "files.exclude": {
+        "**/.cache": true,
+        "**/.editorconfig": true,
+        "**/.eslintcache": true,
+        "**/bower_components": true,
+        "**/.idea": true,
+        "**/tmp": true,
+        "**/.git": true,
+        "**/.svn": true,
+        "**/.hg": true,
+        "**/CVS": true,
+        "**/.DS_Store": true
+    },
+    "files.watcherExclude": {
+        "**/.git/objects/**": true,
+        "**/.git/subtree-cache/**": true,
+        "**/.vscode/**": true,
+        "**/node_modules/**": true,
+        "**/tmp/**": true,
+        "**/bower_components/**": true,
+        "**/dist/**": true,
+        "**/yarn.lock": true
+    },
+    "stylelint.enable": true,
+    "stylelint.validate": ["css", "less", "postcss", "scss", "vue", "sass"],
+    "path-intellisense.mappings": {
+        "/@/": "${workspaceRoot}/src"
+    },
+    "[javascriptreact]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[typescript]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[typescriptreact]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[html]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[css]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[less]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[scss]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[markdown]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": "explicit"
+    },
+    // "[vue]": {
+    //     "editor.codeActionsOnSave": {
+    //         "source.fixAll.eslint": "explicit",
+    //         "source.fixAll.stylelint": "explicit"
+    //     },
+    //     "editor.defaultFormatter": "esbenp.prettier-vscode"
+    // },
+    "i18n-ally.localesPaths": ["src/locales/lang"],
+    "i18n-ally.keystyle": "nested",
+    "i18n-ally.sortKeys": true,
+    "i18n-ally.namespace": true,
+    "i18n-ally.pathMatcher": "{locale}/{namespaces}.{ext}",
+    "i18n-ally.enabledParsers": ["ts"],
+    "i18n-ally.sourceLanguage": "en",
+    "i18n-ally.displayLanguage": "zh-CN",
+    "i18n-ally.enabledFrameworks": ["vue", "react"],
+    "cSpell.words": [
+        "vben",
+        "windi",
+        "browserslist",
+        "tailwindcss",
+        "esnext",
+        "antv",
+        "tinymce",
+        "qrcode",
+        "sider",
+        "pinia",
+        "sider",
+        "nprogress",
+        "INTLIFY",
+        "stylelint",
+        "esno",
+        "vitejs",
+        "sortablejs",
+        "mockjs",
+        "codemirror",
+        "iconify",
+        "commitlint",
+        "vditor",
+        "echarts",
+        "cropperjs",
+        "logicflow",
+        "vueuse",
+        "zxcvbn",
+        "lintstagedrc",
+        "brotli",
+        "tailwindcss",
+        "sider",
+        "pnpm",
+        "antd"
+    ],
+    //   "files.autoSave": "onFocusChange",
+    //   "editor.formatOnSave": true,
+    "eslint.codeActionsOnSave.rules": null,
+    "vue3snippets.enable-compile-vue-file-on-did-save-code": false
+}
diff --git a/docs/index.html b/docs/index.html
index 034b534..04745c7 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,158 +1,43 @@
 <!doctype html>
 <html lang="en-US">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+    <meta name="generator" content="VuePress 2.0.0-rc.20" />
+    <style>
+      :root {
+        --vp-c-bg: #fff;
+      }
 
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width,initial-scale=1" />
-  <meta name="generator" content="VuePress 2.0.0-rc.20" />
-  <style>
-    :root {
-      --vp-c-bg: #fff;
-    }
+      [data-theme='dark'] {
+        --vp-c-bg: #1b1b1f;
+      }
 
-    [data-theme='dark'] {
-      --vp-c-bg: #1b1b1f;
-    }
+      html,
+      body {
+        background-color: var(--vp-c-bg);
+      }
+    </style>
+    <script>
+      const useChoice = localStorage.getItem('vuepress-color-scheme')
+      const systemStatus =
+        'matchMedia' in window
+          ? window.matchMedia('(prefers-color-scheme: dark)').matches
+          : false
 
-    html,
-    body {
-      background-color: var(--vp-c-bg);
-    }
-  </style>
-  <script>
-    const useChoice = localStorage.getItem('vuepress-color-scheme')
-    const systemStatus =
-      'matchMedia' in window
-        ? window.matchMedia('(prefers-color-scheme: dark)').matches
-        : false
-
-    if (useChoice === 'light') {
-      document.documentElement.dataset.theme = 'light'
-    } else if (useChoice === 'dark' || systemStatus) {
-      document.documentElement.dataset.theme = 'dark'
-    }
-  </script>
-  <title>关于全代码框架 | 全代码框架文档</title>
-  <meta name="description" content="">
-  <link rel="preload" href="assets/style-CQp7YV5d.css" as="style">
-  <link rel="stylesheet" href="assets/style-CQp7YV5d.css">
-  <link rel="modulepreload" href="assets/app-CDlLWk6N.js">
-  <link rel="modulepreload" href="assets/index.html-ByXOdSON.js">
-  <link rel="prefetch" href="assets/components.html-CbpbsXEn.js" as="script">
-  <link rel="prefetch" href="assets/field_events.html-C6V_tkoR.js" as="script">
-  <link rel="prefetch" href="assets/form_logic.html-CA8-U3gW.js" as="script">
-  <link rel="prefetch" href="assets/index.html-xafVSSBu.js" as="script">
-  <link rel="prefetch" href="assets/pass_value.html-CFBEHlue.js" as="script">
-  <link rel="prefetch" href="assets/show_and_hide.html-Bai-A-AK.js" as="script">
-  <link rel="prefetch" href="assets/index.html-BfpfzkA1.js" as="script">
-  <link rel="prefetch" href="assets/custom_field.html-CEs-XIt2.js" as="script">
-  <link rel="prefetch" href="assets/custom_page.html-DIr-Sgm-.js" as="script">
-  <link rel="prefetch" href="assets/dialog.html-fkmzKy_f.js" as="script">
-  <link rel="prefetch" href="assets/form.html-B4704WRj.js" as="script">
-  <link rel="prefetch" href="assets/table.html-BrzZNtYJ.js" as="script">
-  <link rel="prefetch" href="assets/add_field.html-Lpe0HY5a.js" as="script">
-  <link rel="prefetch" href="assets/ajax.html-CDfrJfFy.js" as="script">
-  <link rel="prefetch" href="assets/change_value.html-CS5TpMC0.js" as="script">
-  <link rel="prefetch" href="assets/computed.html-9QOs6N7a.js" as="script">
-  <link rel="prefetch" href="assets/teleport.html-BIP5te2y.js" as="script">
-  <link rel="prefetch" href="assets/validation.html-B_JW048n.js" as="script">
-  <link rel="prefetch" href="assets/404.html-urOlE4ef.js" as="script">
-</head>
-
-<body>
-  <div id="app"><!--[-->
-    <div class="vp-theme-container external-link-icon" vp-container><!--[-->
-      <header class="vp-navbar" vp-navbar>
-        <div class="vp-toggle-sidebar-button" title="toggle sidebar" aria-expanded="false" role="button" tabindex="0">
-          <div class="icon" aria-hidden="true"><span></span><span></span><span></span></div>
-        </div><span><a class="route-link" href><!----><span class="vp-site-name"
-              aria-hidden="true">全代码框架文档</span></a></span>
-        <div class="vp-navbar-items-wrapper" style=""><!--[--><!--]-->
-          <nav class="vp-navbar-items vp-hide-mobile" aria-label="site navigation"><!--[-->
-            <div class="vp-navbar-item"><a class="route-link route-link-active auto-link" href
-                aria-label="首页"><!--[--><!--[--><!--]--><!--]-->首页<!--[--><!--[--><!--]--><!--]--></a></div>
-            <div class="vp-navbar-item"><a class="route-link auto-link" href="tutorial/"
-                aria-label="快速上手"><!--[--><!--[--><!--]--><!--]-->快速上手<!--[--><!--[--><!--]--><!--]--></a></div>
-            <div class="vp-navbar-item"><a class="route-link auto-link" href="front_components/"
-                aria-label="前端组件"><!--[--><!--[--><!--]--><!--]-->前端组件<!--[--><!--[--><!--]--><!--]--></a></div>
-            <div class="vp-navbar-item"><a class="route-link auto-link" href="front_dev/"
-                aria-label="前端二开"><!--[--><!--[--><!--]--><!--]-->前端二开<!--[--><!--[--><!--]--><!--]--></a></div><!--]-->
-          </nav><!--[--><!--]--><button type="button" class="vp-toggle-color-mode-button" title="toggle color mode"><svg
-              class="light-icon" viewbox="0 0 32 32" style="">
-              <path d="M16 12.005a4 4 0 1 1-4 4a4.005 4.005 0 0 1 4-4m0-2a6 6 0 1 0 6 6a6 6 0 0 0-6-6z"
-                fill="currentColor"></path>
-              <path d="M5.394 6.813l1.414-1.415l3.506 3.506L8.9 10.318z" fill="currentColor"></path>
-              <path d="M2 15.005h5v2H2z" fill="currentColor"></path>
-              <path d="M5.394 25.197L8.9 21.691l1.414 1.415l-3.506 3.505z" fill="currentColor"></path>
-              <path d="M15 25.005h2v5h-2z" fill="currentColor"></path>
-              <path d="M21.687 23.106l1.414-1.415l3.506 3.506l-1.414 1.414z" fill="currentColor"></path>
-              <path d="M25 15.005h5v2h-5z" fill="currentColor"></path>
-              <path d="M21.687 8.904l3.506-3.506l1.414 1.415l-3.506 3.505z" fill="currentColor"></path>
-              <path d="M15 2.005h2v5h-2z" fill="currentColor"></path>
-            </svg><svg class="dark-icon" viewbox="0 0 32 32" style="display:none;">
-              <path
-                d="M13.502 5.414a15.075 15.075 0 0 0 11.594 18.194a11.113 11.113 0 0 1-7.975 3.39c-.138 0-.278.005-.418 0a11.094 11.094 0 0 1-3.2-21.584M14.98 3a1.002 1.002 0 0 0-.175.016a13.096 13.096 0 0 0 1.825 25.981c.164.006.328 0 .49 0a13.072 13.072 0 0 0 10.703-5.555a1.01 1.01 0 0 0-.783-1.565A13.08 13.08 0 0 1 15.89 4.38A1.015 1.015 0 0 0 14.98 3z"
-                fill="currentColor"></path>
-            </svg></button><!---->
-        </div>
-      </header><!--]-->
-      <div class="vp-sidebar-mask"></div><!--[-->
-      <aside class="vp-sidebar" vp-sidebar>
-        <nav class="vp-navbar-items" aria-label="site navigation"><!--[-->
-          <div class="vp-navbar-item"><a class="route-link route-link-active auto-link" href
-              aria-label="首页"><!--[--><!--[--><!--]--><!--]-->首页<!--[--><!--[--><!--]--><!--]--></a></div>
-          <div class="vp-navbar-item"><a class="route-link auto-link" href="tutorial/"
-              aria-label="快速上手"><!--[--><!--[--><!--]--><!--]-->快速上手<!--[--><!--[--><!--]--><!--]--></a></div>
-          <div class="vp-navbar-item"><a class="route-link auto-link" href="front_components/"
-              aria-label="前端组件"><!--[--><!--[--><!--]--><!--]-->前端组件<!--[--><!--[--><!--]--><!--]--></a></div>
-          <div class="vp-navbar-item"><a class="route-link auto-link" href="front_dev/"
-              aria-label="前端二开"><!--[--><!--[--><!--]--><!--]-->前端二开<!--[--><!--[--><!--]--><!--]--></a></div><!--]-->
-        </nav><!--[--><!--]-->
-        <ul class="vp-sidebar-items"><!--[-->
-          <li><a class="route-link route-link-active auto-link vp-sidebar-item vp-sidebar-heading active" href
-              aria-label="关于全代码框架"><!--[--><!--[--><!--]--><!--]-->关于全代码框架<!--[--><!--[--><!--]--><!--]--></a><!---->
-          </li>
-          <li><a class="route-link auto-link vp-sidebar-item vp-sidebar-heading" href="structure.html"
-              aria-label="框架架构"><!--[--><!--[--><!--]--><!--]-->框架架构<!--[--><!--[--><!--]--><!--]--></a><!----></li>
-          <li><a class="route-link auto-link vp-sidebar-item vp-sidebar-heading" href="func_list.html"
-              aria-label="功能清单"><!--[--><!--[--><!--]--><!--]-->功能清单<!--[--><!--[--><!--]--><!--]--></a><!----></li>
-          <!--]-->
-        </ul><!--[--><!--]-->
-      </aside><!--]--><!--[-->
-      <main class="vp-page"><!--[--><!--]-->
-        <div vp-content><!--[--><!--]-->
-          <div>
-            <h1 id="关于全代码框架" tabindex="-1"><a class="header-anchor" href="#关于全代码框架"><span>关于全代码框架</span></a></h1>
-            <h1 id="注意事项" tabindex="-1"><a class="header-anchor" href="#注意事项"><span>注意事项</span></a></h1>
-            <p>由于表单拆分脚本的限制，为了方便后续的二开，在表单设计时需要遵守一些原则：</p>
-            <ul>
-              <li>避免在表单设计器里直接拖拽grid布局，系统提供了响应式布局（根据屏幕大小切换2/3列表单）的支持，无需手动绘制grid，如果需要grid或者flex布局，需要在表单拆分后进行。</li>
-              <li>避免在表单设计器里使用嵌套布局，目前脚本只支持<strong>非嵌套</strong>的Card、Tab布局和SubForm（明细表/子表）拆分。</li>
-              <li>在二开之前，不建议对config.ts文件进行格式化，否则可能会导致数据解析失败。因此，表单拆分应该在<strong>表单字段明确后立刻进行</strong>，越复杂的改动和配置拆分失败的概率越大。
-              </li>
-            </ul>
-            <p>需要注意的是，表单拆分后依然使用config.ts文件，因此你可以生成新表单后，根据本文档对应章节提供的方法，手动补充缺失的字段，或者修改配置项。</p>
-          </div><!--[--><!--]-->
-        </div>
-        <footer class="vp-page-meta"><!---->
-          <div class="vp-meta-item git-info">
-            <div class="vp-meta-item last-updated"><span class="meta-item-label">Last Updated:: </span><time
-                class="meta-item-info" datetime="2025-04-01T09:03:43.000Z" data-allow-mismatch>4/1/25, 5:03 PM</time>
-            </div>
-            <div class="vp-meta-item contributors"><span class="meta-item-label">Contributors: </span><span
-                class="meta-item-info"><!--[--><!--[--><span class="contributor"
-                  title="email: gaoyunqi@gdyd.com">gaoyunqi</span><!----><!--]--><!--]--></span></div>
-          </div>
-        </footer>
-        <nav class="vp-page-nav" aria-label="page navigation"><!----><a class="route-link auto-link next"
-            href="structure.html" aria-label="框架架构"><!--[-->
-            <div class="hint">Next <span class="arrow right"></span></div>
-            <div class="link"><span class="external-link">框架架构</span></div><!--]-->
-          </a></nav><!--[--><!--]-->
-      </main><!--]-->
-    </div><!--[--><!----><!--]--><!--]-->
-  </div>
-  <script type="module" src="assets/app-CDlLWk6N.js" defer></script>
-</body>
-
-</html>
\ No newline at end of file
+      if (useChoice === 'light') {
+        document.documentElement.dataset.theme = 'light'
+      } else if (useChoice === 'dark' || systemStatus) {
+        document.documentElement.dataset.theme = 'dark'
+      }
+    </script>
+    <title>关于全代码框架 | 全代码框架文档</title><meta name="description" content="">
+    <link rel="preload" href="assets/style-CQp7YV5d.css" as="style"><link rel="stylesheet" href="assets/style-CQp7YV5d.css">
+    <link rel="modulepreload" href="assets/app-CDlLWk6N.js"><link rel="modulepreload" href="assets/index.html-ByXOdSON.js">
+    <link rel="prefetch" href="assets/components.html-CbpbsXEn.js" as="script"><link rel="prefetch" href="assets/field_events.html-C6V_tkoR.js" as="script"><link rel="prefetch" href="assets/form_logic.html-CA8-U3gW.js" as="script"><link rel="prefetch" href="assets/index.html-xafVSSBu.js" as="script"><link rel="prefetch" href="assets/pass_value.html-CFBEHlue.js" as="script"><link rel="prefetch" href="assets/show_and_hide.html-Bai-A-AK.js" as="script"><link rel="prefetch" href="assets/index.html-BfpfzkA1.js" as="script"><link rel="prefetch" href="assets/custom_field.html-CEs-XIt2.js" as="script"><link rel="prefetch" href="assets/custom_page.html-DIr-Sgm-.js" as="script"><link rel="prefetch" href="assets/dialog.html-fkmzKy_f.js" as="script"><link rel="prefetch" href="assets/form.html-B4704WRj.js" as="script"><link rel="prefetch" href="assets/table.html-BrzZNtYJ.js" as="script"><link rel="prefetch" href="assets/add_field.html-Lpe0HY5a.js" as="script"><link rel="prefetch" href="assets/ajax.html-CDfrJfFy.js" as="script"><link rel="prefetch" href="assets/change_value.html-CS5TpMC0.js" as="script"><link rel="prefetch" href="assets/computed.html-9QOs6N7a.js" as="script"><link rel="prefetch" href="assets/teleport.html-BIP5te2y.js" as="script"><link rel="prefetch" href="assets/validation.html-B_JW048n.js" as="script"><link rel="prefetch" href="assets/404.html-urOlE4ef.js" as="script">
+  </head>
+  <body>
+    <div id="app"><!--[--><div class="vp-theme-container external-link-icon" vp-container><!--[--><header class="vp-navbar" vp-navbar><div class="vp-toggle-sidebar-button" title="toggle sidebar" aria-expanded="false" role="button" tabindex="0"><div class="icon" aria-hidden="true"><span></span><span></span><span></span></div></div><span><a class="route-link" href><!----><span class="vp-site-name" aria-hidden="true">全代码框架文档</span></a></span><div class="vp-navbar-items-wrapper" style=""><!--[--><!--]--><nav class="vp-navbar-items vp-hide-mobile" aria-label="site navigation"><!--[--><div class="vp-navbar-item"><a class="route-link route-link-active auto-link" href aria-label="首页"><!--[--><!--[--><!--]--><!--]-->首页<!--[--><!--[--><!--]--><!--]--></a></div><div class="vp-navbar-item"><a class="route-link auto-link" href="tutorial/" aria-label="快速上手"><!--[--><!--[--><!--]--><!--]-->快速上手<!--[--><!--[--><!--]--><!--]--></a></div><div class="vp-navbar-item"><a class="route-link auto-link" href="front_components/" aria-label="前端组件"><!--[--><!--[--><!--]--><!--]-->前端组件<!--[--><!--[--><!--]--><!--]--></a></div><div class="vp-navbar-item"><a class="route-link auto-link" href="front_dev/" aria-label="前端二开"><!--[--><!--[--><!--]--><!--]-->前端二开<!--[--><!--[--><!--]--><!--]--></a></div><!--]--></nav><!--[--><!--]--><button type="button" class="vp-toggle-color-mode-button" title="toggle color mode"><svg class="light-icon" viewbox="0 0 32 32" style=""><path d="M16 12.005a4 4 0 1 1-4 4a4.005 4.005 0 0 1 4-4m0-2a6 6 0 1 0 6 6a6 6 0 0 0-6-6z" fill="currentColor"></path><path d="M5.394 6.813l1.414-1.415l3.506 3.506L8.9 10.318z" fill="currentColor"></path><path d="M2 15.005h5v2H2z" fill="currentColor"></path><path d="M5.394 25.197L8.9 21.691l1.414 1.415l-3.506 3.505z" fill="currentColor"></path><path d="M15 25.005h2v5h-2z" fill="currentColor"></path><path d="M21.687 23.106l1.414-1.415l3.506 3.506l-1.414 1.414z" fill="currentColor"></path><path d="M25 15.005h5v2h-5z" fill="currentColor"></path><path d="M21.687 8.904l3.506-3.506l1.414 1.415l-3.506 3.505z" fill="currentColor"></path><path d="M15 2.005h2v5h-2z" fill="currentColor"></path></svg><svg class="dark-icon" viewbox="0 0 32 32" style="display:none;"><path d="M13.502 5.414a15.075 15.075 0 0 0 11.594 18.194a11.113 11.113 0 0 1-7.975 3.39c-.138 0-.278.005-.418 0a11.094 11.094 0 0 1-3.2-21.584M14.98 3a1.002 1.002 0 0 0-.175.016a13.096 13.096 0 0 0 1.825 25.981c.164.006.328 0 .49 0a13.072 13.072 0 0 0 10.703-5.555a1.01 1.01 0 0 0-.783-1.565A13.08 13.08 0 0 1 15.89 4.38A1.015 1.015 0 0 0 14.98 3z" fill="currentColor"></path></svg></button><!----></div></header><!--]--><div class="vp-sidebar-mask"></div><!--[--><aside class="vp-sidebar" vp-sidebar><nav class="vp-navbar-items" aria-label="site navigation"><!--[--><div class="vp-navbar-item"><a class="route-link route-link-active auto-link" href aria-label="首页"><!--[--><!--[--><!--]--><!--]-->首页<!--[--><!--[--><!--]--><!--]--></a></div><div class="vp-navbar-item"><a class="route-link auto-link" href="tutorial/" aria-label="快速上手"><!--[--><!--[--><!--]--><!--]-->快速上手<!--[--><!--[--><!--]--><!--]--></a></div><div class="vp-navbar-item"><a class="route-link auto-link" href="front_components/" aria-label="前端组件"><!--[--><!--[--><!--]--><!--]-->前端组件<!--[--><!--[--><!--]--><!--]--></a></div><div class="vp-navbar-item"><a class="route-link auto-link" href="front_dev/" aria-label="前端二开"><!--[--><!--[--><!--]--><!--]-->前端二开<!--[--><!--[--><!--]--><!--]--></a></div><!--]--></nav><!--[--><!--]--><ul class="vp-sidebar-items"><!--[--><li><a class="route-link route-link-active auto-link vp-sidebar-item vp-sidebar-heading active" href aria-label="关于全代码框架"><!--[--><!--[--><!--]--><!--]-->关于全代码框架<!--[--><!--[--><!--]--><!--]--></a><!----></li><li><a class="route-link auto-link vp-sidebar-item vp-sidebar-heading" href="structure.html" aria-label="框架架构"><!--[--><!--[--><!--]--><!--]-->框架架构<!--[--><!--[--><!--]--><!--]--></a><!----></li><li><a class="route-link auto-link vp-sidebar-item vp-sidebar-heading" href="func_list.html" aria-label="功能清单"><!--[--><!--[--><!--]--><!--]-->功能清单<!--[--><!--[--><!--]--><!--]--></a><!----></li><!--]--></ul><!--[--><!--]--></aside><!--]--><!--[--><main class="vp-page"><!--[--><!--]--><div vp-content><!--[--><!--]--><div><h1 id="关于全代码框架" tabindex="-1"><a class="header-anchor" href="#关于全代码框架"><span>关于全代码框架</span></a></h1><h1 id="注意事项" tabindex="-1"><a class="header-anchor" href="#注意事项"><span>注意事项</span></a></h1><p>由于表单拆分脚本的限制，为了方便后续的二开，在表单设计时需要遵守一些原则：</p><ul><li>避免在表单设计器里直接拖拽grid布局，系统提供了响应式布局（根据屏幕大小切换2/3列表单）的支持，无需手动绘制grid，如果需要grid或者flex布局，需要在表单拆分后进行。</li><li>避免在表单设计器里使用嵌套布局，目前脚本只支持<strong>非嵌套</strong>的Card、Tab布局和SubForm（明细表/子表）拆分。</li><li>在二开之前，不建议对config.ts文件进行格式化，否则可能会导致数据解析失败。因此，表单拆分应该在<strong>表单字段明确后立刻进行</strong>，越复杂的改动和配置拆分失败的概率越大。</li></ul><p>需要注意的是，表单拆分后依然使用config.ts文件，因此你可以生成新表单后，根据本文档对应章节提供的方法，手动补充缺失的字段，或者修改配置项。</p></div><!--[--><!--]--></div><footer class="vp-page-meta"><!----><div class="vp-meta-item git-info"><div class="vp-meta-item last-updated"><span class="meta-item-label">Last Updated:: </span><time class="meta-item-info" datetime="2025-04-01T09:03:43.000Z" data-allow-mismatch>4/1/25, 5:03 PM</time></div><div class="vp-meta-item contributors"><span class="meta-item-label">Contributors: </span><span class="meta-item-info"><!--[--><!--[--><span class="contributor" title="email: gaoyunqi@gdyd.com">gaoyunqi</span><!----><!--]--><!--]--></span></div></div></footer><nav class="vp-page-nav" aria-label="page navigation"><!----><a class="route-link auto-link next" href="structure.html" aria-label="框架架构"><!--[--><div class="hint">Next <span class="arrow right"></span></div><div class="link"><span class="external-link">框架架构</span></div><!--]--></a></nav><!--[--><!--]--></main><!--]--></div><!--[--><!----><!--]--><!--]--></div>
+    <script type="module" src="assets/app-CDlLWk6N.js" defer></script>
+  </body>
+</html>
diff --git a/src/api/system/subSystem/index.ts b/src/api/system/subSystem/index.ts
index 48e7125..246d021 100644
--- a/src/api/system/subSystem/index.ts
+++ b/src/api/system/subSystem/index.ts
@@ -11,11 +11,10 @@ enum Api {
 /**
  * @description: 查询当前用户授权子系统(不分页包括主系统)
  */
-export async function getSubSystemList(params,mode: ErrorMessageMode = 'modal') {
+export async function getSubSystemList(mode: ErrorMessageMode = 'modal') {
   return defHttp.get<any[]>(
     {
       url: Api.List,
-      params
     },
     {
       errorMessageMode: mode,
diff --git a/src/components/SecondDev/OpinionDialog.vue b/src/components/SecondDev/OpinionDialog.vue
index 13bb104..3d41fdc 100644
--- a/src/components/SecondDev/OpinionDialog.vue
+++ b/src/components/SecondDev/OpinionDialog.vue
@@ -81,7 +81,11 @@
     }
 
     function getNextNodesName() {
+<<<<<<< HEAD
         return flowNextNodes.value.length > 1 ? '多个节点，请选择流向节点' : flowNextNodes?.value[0]?.activityName;
+=======
+        return flowNextNodes.value.length > 1 ? '多个并行节点' : flowNextNodes.value[0].activityName;
+>>>>>>> f660a35ca6ca9e659382f0a2ac5b1f63f196936f
     }
 
     function toggleDialog({ isClose, action, callback, rejectCancel, processId, taskId, nextNodes } = {}) {
@@ -104,7 +108,10 @@
             const nNode = nextNodes[0];
             //formState.nextNodeName = nNode.activityName;
             isEnd.value = nNode.isEnd;
+<<<<<<< HEAD
             const typeCount = nextNodes.length <= 1 ? nextNodes.length : (new Set(nextNodes.map(nNode => nNode.nodeType))).size;
+=======
+>>>>>>> f660a35ca6ca9e659382f0a2ac5b1f63f196936f
             nextNodes.forEach((nNode) => {
                 if (!nNode.userList?.length) {
                     return;
@@ -127,6 +134,7 @@
                     nNode.assignees = nNode.userList.map((item) => item['F_UserId']);
                 }
                 nNode.chooseAssign = nNode.chooseAssign;
+<<<<<<< HEAD
 
                 if (nNode.nodeType === 'commitToNode') {
                     nNode.nodeTypeLabel = '提交到退回节点:';
@@ -144,6 +152,8 @@
                         nNode.hiddenNode = false;
                     }
                 }
+=======
+>>>>>>> f660a35ca6ca9e659382f0a2ac5b1f63f196936f
             });
             flowNextNodes.value = nextNodes;
         }
@@ -152,6 +162,7 @@
         }
     }
 
+<<<<<<< HEAD
     function agreeNodeChange(node) {
         if (node.chooseNode) {
             // 如果是必选并行节点，取消选择时，警告并返回
@@ -189,6 +200,8 @@
 
     }
 
+=======
+>>>>>>> f660a35ca6ca9e659382f0a2ac5b1f63f196936f
     function search(inputValue, option){
         return inputValue?(option.item.F_Account.indexOf(inputValue)>-1||option.item.F_RealName.indexOf(inputValue)>-1):true;
     }
@@ -230,6 +243,7 @@
     function onClickOK() {
         const nextTaskUser = {};
         if (_action.value === 'agree' && !isEnd.value) {
+<<<<<<< HEAD
             // 如果是同意，并且没有选择节点 报错
             const choose = flowNextNodes.value.find((node) => (node.chooseNode));
             if (!choose) {
@@ -241,6 +255,13 @@
                 return message.error('请选择审批人');
             }
             flowNextNodes.value.filter((node)=>node.chooseNode).forEach((nNode) => {
+=======
+            const isEmpty = flowNextNodes.value.find((node) => !node.assignees?.length);
+            if (isEmpty) {
+                return message.error('请选择审批人');
+            }
+            flowNextNodes.value.forEach((nNode) => {
+>>>>>>> f660a35ca6ca9e659382f0a2ac5b1f63f196936f
                 nextTaskUser[nNode.activityId] = isEnd.value ? '' : (typeof(nNode.assignees) == 'string' ? nNode.assignees : nNode.assignees.join(','));
             });
         }
@@ -286,6 +307,7 @@
 </script>
 
 <style lang="less" scoped>
+<<<<<<< HEAD
 .dialog-wrap {
     padding: 10px 15px 0 0;
 }
@@ -311,4 +333,9 @@
     font-weight: 600;
     vertical-align: top;
 }
+=======
+    .dialog-wrap {
+        padding: 10px 15px 0 0;
+    }
+>>>>>>> f660a35ca6ca9e659382f0a2ac5b1f63f196936f
 </style>