fixed: Fixed an issue where multiple selections across pages could not be reversed

fixed: Fixed + and - not being special characters

.editorconfig

@@ -4,11 +4,17 @@ root = true
 [*]
 charset = utf-8
 indent_style = space
-indent_size = 2
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+
+[*.{js,jsx,ts,tsx,vue}]
+indent_size = 2
+
+[*.py]
+indent_size = 4
+
 [*.md]
 insert_final_newline = false
 trim_trailing_whitespace = false

.env.development.example

@@ -22,4 +22,5 @@ VUE_APP_LOGOUT_PATH = '/core/auth/logout/'
 # Dev server for core proxy
 VUE_APP_CORE_HOST = 'http://localhost:8080'
 VUE_APP_CORE_WS = 'ws://localhost:8080'
+VUE_APP_KAEL_HOST = 'http://localhost:8083'
 VUE_APP_ENV = 'development'

.github/workflows/jms-build-test.yml

@@ -0,0 +1,32 @@
+name: "Run Build Test"
+on:
+  push:
+    branches:
+      - pr@*
+      - repr@*
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - uses: docker/setup-qemu-action@v2
+
+    - uses: docker/setup-buildx-action@v2
+
+    - uses: docker/build-push-action@v3
+      with:
+        context: .
+        push: false
+        tags: jumpserver/lina:test
+        file: Dockerfile
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+
+    - uses: LouisBrunner/checks-action@v1.5.0
+      if: always()
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        name: Check Build
+        conclusion: ${{ job.status }}

.github/workflows/jms-generic-action-handler.yml

@@ -10,3 +10,4 @@ jobs:
       - uses: jumpserver/action-generic-handler@master
         env:
           GITHUB_TOKEN: ${{ secrets.PRIVATE_TOKEN }}
+          I18N_TOKEN: ${{ secrets.I18N_TOKEN }}

.github/workflows/release-drafter.yml

@@ -19,9 +19,7 @@ jobs:
         id: get_version
         run: |
           TAG=$(basename ${GITHUB_REF})
-          VERSION=${TAG/v/}
           echo "::set-output name=TAG::$TAG"
-          echo "::set-output name=VERSION::$VERSION"
       - name: Create Release
         id: create_release
         uses: release-drafter/release-drafter@v5
@@ -31,16 +29,29 @@ jobs:
           config-name: release-config.yml
           version: ${{ steps.get_version.outputs.TAG }}
           tag: ${{ steps.get_version.outputs.TAG }}
-
-  build-and-release:
-    needs: create-realese
-    name: Build and Release
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Build it and upload
-        uses: jumpserver/action-build-upload-assets@node10
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16.20'
+      - name: Install dependencies
+        run: yarn install
+      - name: Build web
+        run: |
+          sed -i "s@version-dev@${{ steps.get_version.outputs.TAG }}@g" src/layout/components/NavHeader/About.vue
+          yarn build
+      - name: Create Upload Assets
+        run: |
+          rm -rf build/*
+          mv lina lina-${{ steps.get_version.outputs.TAG }}
+          tar -czf lina-${{ steps.get_version.outputs.TAG }}.tar.gz lina-${{ steps.get_version.outputs.TAG }}
+          echo $(md5sum lina-${{ steps.get_version.outputs.TAG }}.tar.gz | awk '{print $1}') > build/lina-${{ steps.get_version.outputs.TAG }}.tar.gz.md5
+          mv lina-${{ steps.get_version.outputs.TAG }}.tar.gz build/
+      - name: Release Upload Assets
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          draft: true
+          files: |
+            build/lina-${{ steps.get_version.outputs.TAG }}.tar.gz
+            build/lina-${{ steps.get_version.outputs.TAG }}.tar.gz.md5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-realese.outputs.upload_url }}

.gitignore

@@ -16,3 +16,4 @@ tests/**/coverage/
 *.njsproj
 *.sln
 .env.development
+.python-version

Dockerfile

@@ -1,23 +1,39 @@
-FROM node:10 as stage-build
-ARG VERSION
-ENV VERSION=$VERSION
-ARG NPM_REGISTRY="https://registry.npm.taobao.org"
-ENV NPM_REGISTY=$NPM_REGISTRY
-ARG SASS_BINARY_SITE="https://npm.taobao.org/mirrors/node-sass"
-ENV SASS_BINARY_SITE=$SASS_BINARY_SITE
+FROM node:16.20-bullseye-slim as stage-build
+ARG TARGETARCH
+
+ARG DEPENDENCIES="                    \
+        g++                           \
+        make                          \
+        python3"
+
+ARG APT_MIRROR=http://mirrors.ustc.edu.cn
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=lina \
+    sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list \
+    && rm -f /etc/apt/apt.conf.d/docker-clean \
+    && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends ${DEPENDENCIES} \
+    && echo "no" | dpkg-reconfigure dash \
+    && rm -rf /var/lib/apt/lists/*
+
+ARG NPM_REGISTRY="https://registry.npmmirror.com"
+RUN set -ex \
+    && npm config set registry ${NPM_REGISTRY} \
+    && yarn config set registry ${NPM_REGISTRY}
 
 WORKDIR /data
 
-RUN npm config set sass_binary_site=${SASS_BINARY_SITE}
-RUN npm config set registry ${NPM_REGISTRY}
-RUN yarn config set registry ${NPM_REGISTRY}
-COPY package.json yarn.lock /data/
-RUN yarn install
-RUN npm rebuild node-sass
+ADD package.json yarn.lock /data
+RUN --mount=type=cache,target=/usr/local/share/.cache/yarn,sharing=locked,id=lina \
+    yarn install
 
+ARG VERSION
+ENV VERSION=$VERSION
 ADD . /data
-RUN cd utils && bash -xieu build.sh build
+RUN --mount=type=cache,target=/usr/local/share/.cache/yarn,sharing=locked,id=lina \
+    sed -i "s@version-dev@${VERSION}@g" src/layout/components/NavHeader/About.vue \
+    && yarn build
 
-FROM nginx:alpine
-COPY --from=stage-build /data/release/lina /opt/lina
+FROM nginx:1.24-bullseye
+COPY --from=stage-build /data/lina /opt/lina
 COPY nginx.conf /etc/nginx/conf.d/default.conf

build/index.js

@@ -24,9 +24,9 @@ if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
   )
 
   app.listen(port, function () {
-    console.log(chalk.green(`> Preview at  http://localhost:${port}${publicPath}`))
+    // debug(chalk.green(`> Preview at  http://localhost:${port}${publicPath}`))
     if (report) {
-      console.log(chalk.green(`> Report at  http://localhost:${port}${publicPath}report.html`))
+      // debug(chalk.green(`> Report at  http://localhost:${port}${publicPath}report.html`))
     }
 
   })

mock/index.js

@@ -56,7 +56,7 @@ const responseFake = (url, type, respond) => {
     url: new RegExp(`${process.env.VUE_APP_BASE_API}${url}`),
     type: type || 'get',
     response(req, res) {
-      console.log('request invoke:' + req.path)
+      // debug('request invoke:' + req.path)
       res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond))
     }
   }

mock/mock-server.js

@@ -59,9 +59,9 @@ module.exports = app => {
         mockRoutesLength = mockRoutes.mockRoutesLength
         mockStartIndex = mockRoutes.mockStartIndex
 
-        console.log(chalk.magentaBright(`\n > Mock Server hot reload success! changed  ${path}`))
+        // debug(chalk.magentaBright(`\n > Mock Server hot reload success! changed  ${path}`))
       } catch (error) {
-        console.log(chalk.redBright(error))
+        // debug(chalk.redBright(error))
       }
     }
   })

package.json

@@ -7,35 +7,45 @@
   "scripts": {
     "dev": "vue-cli-service serve",
     "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",
+    "fix": "eslint --ext .js,.vue --fix src",
     "test:unit": "jest --clearCache && vue-cli-service test:unit",
     "test:ci": "npm run lint && npm run test:unit",
     "svgo": "svgo -f src/icons/svg --config=src/icas/svgo.yml",
     "vue-i18n-extract": "vue-i18n-extract",
     "vue-i18n-report": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json'",
     "vue-i18n-report-json": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json' -o /tmp/abc.json",
-    "vue-i18n-report-add-miss": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json' -a"
+    "vue-i18n-report-add-miss": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json' -a",
+    "diff-i18n": "python ./src/i18n/langs/i18n-util.py diff en ja zh_Hant",
+    "apply-i18n": "python ./src/i18n/langs/i18n-util.py apply en ja zh_Hant"
   },
   "dependencies": {
     "@babel/plugin-proposal-optional-chaining": "^7.13.12",
+    "@traptitech/markdown-it-katex": "^3.6.0",
     "@ztree/ztree_v3": "3.5.44",
-    "axios": "0.21.1",
+    "axios": "0.28.0",
     "axios-retry": "^3.1.9",
     "cron-parser": "^4.0.0",
+    "crypto-js": "^4.1.1",
+    "css-color-function": "^1.3.3",
+    "decimal.js": "^10.4.3",
     "deepmerge": "^4.2.2",
-    "echarts": "^4.7.0",
+    "dompurify": "^3.1.6",
+    "echarts": "4.7.0",
     "element-ui": "2.13.2",
     "eslint-plugin-html": "^6.0.0",
+    "highlight.js": "^11.9.0",
     "install": "^0.13.0",
-    "jquery": "^3.5.0",
+    "jquery": "^3.6.1",
     "js-cookie": "2.2.0",
-    "krry-transfer": "^1.7.3",
+    "jsencrypt": "^3.2.1",
     "less": "^3.10.3",
     "less-loader": "^5.0.0",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.21",
     "lodash.clonedeep": "^4.5.0",
     "lodash.frompairs": "^4.0.1",
     "lodash.get": "^4.4.2",
@@ -47,30 +57,34 @@
     "lodash.set": "^4.3.2",
     "lodash.topairs": "^4.3.0",
     "lodash.values": "^4.3.0",
-    "moment": "^2.29.1",
-    "moment-parseformat": "^3.0.0",
+    "markdown-it": "^13.0.2",
+    "markdown-it-link-attributes": "^4.0.1",
+    "moment": "^2.29.4",
+    "moment-parseformat": "^4.0.0",
     "normalize.css": "7.0.0",
     "npm": "^7.8.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
     "vue": "2.6.10",
-    "vue-codemirror-lite": "^1.0.4",
+    "vue-codemirror": "4.0.6",
     "vue-cookie": "^1.1.4",
     "vue-echarts": "^5.0.0-beta.0",
     "vue-i18n": "^8.15.5",
     "vue-json-editor": "^1.4.3",
+    "vue-markdown": "^2.2.4",
     "vue-moment": "^4.1.0",
     "vue-password-strength-meter": "^1.7.2",
     "vue-router": "3.0.6",
     "vue-select": "^3.9.5",
     "vuejs-logger": "^1.5.4",
     "vuex": "3.1.0",
+    "xss": "^1.0.14",
     "xterm": "^4.5.0",
     "xterm-addon-fit": "^0.3.0",
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
-    "@babel/core": "7.0.0",
+    "@babel/core": "7.18.6",
     "@babel/register": "7.0.0",
     "@vue/cli-plugin-babel": "3.6.0",
     "@vue/cli-plugin-eslint": "^3.9.1",
@@ -84,21 +98,24 @@
     "chalk": "2.4.2",
     "compression-webpack-plugin": "^6.1.1",
     "connect": "3.6.6",
+    "deasync": "^0.1.29",
     "element-theme-chalk": "^2.13.1",
     "eslint": "^5.15.3",
     "eslint-plugin-vue": "5.2.2",
     "eslint-plugin-vue-i18n": "^0.3.0",
+    "github-markdown-css": "^5.1.0",
     "html-webpack-plugin": "3.2.0",
     "husky": "^4.2.3",
     "less-loader": "^5.0.0",
     "lint-staged": "^10.1.2",
     "mockjs": "1.0.1-beta3",
     "runjs": "^4.3.2",
-    "sass": "^1.26.10",
+    "sass": "~1.32.6",
     "sass-loader": "^7.1.0",
     "script-ext-html-webpack-plugin": "2.1.3",
     "script-loader": "0.7.2",
     "serve-static": "^1.13.2",
+    "strip-ansi": "^7.1.0",
     "svg-sprite-loader": "4.1.3",
     "svgo": "1.2.2",
     "vue-i18n-extract": "^1.1.1",

public/index.html

@@ -9,23 +9,7 @@
     <meta http-equiv="Cache" content="no-cache">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <title><%= webpackConfig.name %></title>
-    <style>
-      ::-webkit-scrollbar {
-        width:14px;
-      }
-      ::-webkit-scrollbar-track {
-        border-radius:10px;
-      }
-      ::-webkit-scrollbar-thumb {
-        border-radius: 8px;
-        box-shadow: 8px 10px 20px #C6C6C6 inset;
-        border: 3px solid rgba(0, 0, 0, 0);
-      }
-      ::-webkit-scrollbar-thumb:hover {
-        box-shadow: 8px 10px 20px #878787 inset;
-      }
-
-    </style>
+    <link rel="stylesheet" href="<%= BASE_URL %>theme/element-ui.css">
   </head>
   <body>
     <noscript>
@@ -33,9 +17,18 @@
     </noscript>
     <script>
       window.onload = function() {
-        const baseUrl = "/ui/"
-        if (location.pathname === '/' && baseUrl !== '/') {
-           location.pathname = baseUrl
+        if (location.pathname === '/') {
+           location.pathname = '/ui/'
+        }
+        const pathname = window.location.pathname
+        if (pathname.startsWith('/core')) {
+            return
+        }
+        if(pathname.indexOf('/ui') === -1) {
+          window.location.href = window.location.origin + '/ui/#' + pathname
+        }
+        if (pathname.startsWith('/ui/#/chat')) {
+          window.location.href = window.location.origin + pathname
         }
       }
     </script>

public/theme/README.md

@@ -0,0 +1,23 @@
+# 主题颜色
+```
+alpha-1: "rgba(64, 158, 255, 0.1)"
+alpha-2: "rgba(64, 158, 255, 0.2)"
+alpha-3: "rgba(64, 158, 255, 0.3)"
+alpha-4: "rgba(64, 158, 255, 0.4)"
+alpha-5: "rgba(64, 158, 255, 0.5)"
+alpha-6: "rgba(64, 158, 255, 0.6)"
+alpha-7: "rgba(64, 158, 255, 0.7)"
+alpha-8: "rgba(64, 158, 255, 0.8)"
+alpha-9: "rgba(64, 158, 255, 0.9)"
+light-1: "#53a8ff"
+light-2: "#66b1ff"
+light-3: "#79bbff"
+light-4: "#8cc5ff"
+light-5: "#a0cfff"
+light-6: "#b3d8ff"
+light-7: "#c6e2ff"
+light-8: "#d9ecff"
+light-9: "#ecf5ff"
+primary: "#409EFF"
+```
+primary是初始主题颜色，其他颜色均属于primary的系列颜色

public/theme/element-extra.css

@@ -1,66 +1,84 @@
-// cover some element-ui styles
+/* 这里只写element-variables里面改不动的、且和主题系列颜色相关的样式！！！ */
+/* 主题相关看该文件夹下的README.md */
+
+/* info type special treatment */
+.el-button--info {
+  background-color: info;
+  border-color: info;
+}
+
+.el-button--text {
+  padding: 5px
+}
+
+.el-button--text:hover {
+  background-color: rgba(0, 0, 0, .05);
+}
+
+.el-button--success {
+  background-color: success;
+  border-color: success;
+}
+
+.el-alert--info.is-light {
+  background-color: light-9;
+  color: light-2;
+  border: 1px solid;
+}
+
+.el-alert--info .el-alert__description {
+  color: light-2;
+}
+
+.el-pagination.is-background .el-pager li:not(.disabled):hover {
+  color: white;
+  background-color: primary;
+}
+
+.el-pagination.is-background .btn-next,
+.el-pagination.is-background .btn-prev,
+.el-pagination.is-background .el-pager li {
+  margin: 0 5px;
+  background-color: white;
+  color: #606266;
+  min-width: 28px;
+  border-radius: 2px;
+  border: 1px solid #DCDFE6;
+  font-size: 12px;
+  line-height: 26px;
+  font-weight: 400;
+}
 
 .el-breadcrumb__inner,
 .el-breadcrumb__inner a {
   font-weight: 400 !important;
 }
 
-$--color-primary: #1ab394;
-$--color-success: #1c84c6;
-$--color-info: #23c6c8;
-$--color-warning: #f8ac59;
-$--color-danger: #ed5565;
-
-$--color-link: #1c84c6;
-$--color-link-highlight: #23527c;
-
-$--color-text-primary: #303133;
-/// color|1|Font Color|2
-$--color-text-regular: #606266;
-
-.el-upload {
-  input[type="file"] {
-    display: none !important;
-  }
+.el-upload input[type="file"] {
+  display: none !important;
 }
 
 .el-upload__input {
   display: none;
 }
 
-
-// to fixed https://github.com/ElemeFE/element/issues/2461
-.el-dialog {
-  transform: none;
-  left: 0;
-  position: relative;
-  margin: 0 auto;
-}
-
-// refine element ui upload
-.upload-container {
-  .el-upload {
+.upload-container .el-upload {
     width: 100%;
-
-    .el-upload-dragger {
-      width: 100%;
-      height: 200px;
-    }
-  }
 }
 
-// dropdown
-.el-dropdown-menu {
-  a {
-    display: block
-  }
+.upload-container .el-upload .el-upload-dragger {
+  width: 100%;
+  height: 200px;
+}
+
+.el-dropdown-menu a {
+  display: block
 }
 
 .el-table th > .cell {
   color: rgb(104, 106, 108);
 }
 
-// to fix el-date-picker css style
 .el-range-separator {
   box-sizing: content-box;
 }
@@ -111,22 +129,6 @@ td .el-button.el-button--mini {
   border-left-color: rgb(220, 223, 230);
 }
 
-.el-alert--success.is-light {
-  border: #bce8f1 solid 1px;
-}
-
-.el-alert--info.is-light {
-  border: #bce8f1 solid 1px;
-}
-
-.el-alert--warning.is-light {
-  border: #faebcc solid 1px;
-}
-
-.el-alert--error.is-light {
-  border: #f1dfe2 solid 1px;
-}
-
 .el-alert__content {
   line-height: 1.5;
 }
@@ -140,32 +142,32 @@ td .el-button.el-button--mini {
 }
 
 .el-card.primary > .el-card__header {
-  background-color: $--color-primary;
-  border-color: $--color-primary;
+  background-color: primary;
+  border-color: primary;
   color: white;
 }
 
 .el-card.success > .el-card__header {
-  background-color: $--color-success;
-  border-color: $--color-success;
+  background-color: success;
+  border-color: success;
   color: #ffffff;
 }
 
 .el-card.info > .el-card__header {
-  background-color: $--color-info;
-  border-color: $--color-info;
+  background-color: info;
+  border-color: info;
   color: #ffffff;
 }
 
 .el-card.warning > .el-card__header {
-  background-color: $--color-warning;
-  border-color: $--color-warning;
+  background-color: warning;
+  border-color: warning;
   color: #ffffff;
 }
 
 .el-card.danger > .el-card__header {
-  background-color: $--color-danger;
-  border-color: $--color-danger;
+  background-color: danger;
+  border-color: danger;
   color: #ffffff;
 }
 
@@ -192,57 +194,42 @@ td .el-button.el-button--mini {
   line-height: 34px;
 }
 
-
-.el-select-dropdown__item.selected {
-  font-weight: 400;
-  color: $--color-text-primary;
-  background-color: #ddd;
-}
-
-
-.el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
-  color: #606266;
-  background-color: #ddd;
-  font-weight: 400;
-}
-
-//.el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
-//  color: #606266;
-//  background-color: #ddd;
-//  font-weight: 400;
-//}
-
-.el-select-dropdown__item.hover, .el-select-dropdown__item:hover {
-  background-color: $--color-primary;
+.option-group .el-select-dropdown__item.hover, .option-group .el-select-dropdown__item.selected {
+  background-color: primary;
   color: white;
 }
 
+.option-group:has(.hover) .el-select-dropdown__item.selected {
+  background-color: light-2;
+}
+
+
 .el-select-dropdown__item.is-disabled:hover{
   color:#c0c4cc;
 }
 
 .el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after {
-  color: $--color-primary;
+  color: primary;
 }
 
 .el-select-dropdown.is-multiple .el-select-dropdown__item.selected.hover {
   color: white;
-  background-color: $--color-primary;
+  background-color: light-4;
 }
 
 .el-tag.el-tag--info {
-  background-color: #f1f1f1;
-  border-color: #e5e6e7;
-  color: #333333;
+  background-color: #f1f1f1!important;
+  border-color: #e5e6e7!important;
+  color: #333333!important;
 }
 
 .el-tag.el-tag--info .el-tag__close {
-  color: #333333;
+  color: #333333!important;
   background-color: inherit;
 }
 
 .el-tag.el-tag--info.is-hit {
-  border-color: #e5e6e7;
+  border-color: #e5e6e7!important;
 }
 
 .el-tag.el-tag--info .el-tag__close:hover {
@@ -259,120 +246,71 @@ td .el-button.el-button--mini {
   border-top-color: #676a6c;
 }
 
+.text-link {
+  color: info!important;
+}
+
+.text-link:hover {
+  color: info!important;
+  filter: opacity(65%)!important;
+}
+
 .text-danger {
-  color: $--color-danger;
+  color: danger;
 }
 
 .text-primary {
-  color: $--color-primary;
+  color: primary;
 }
 
 .text-info {
-  color: $--color-info;
+  color: info;
 }
 
 .text-warning {
-  color: $--color-warning;
+  color: warning;
 }
 
 .text-success {
-  color: $--color-success;
+  color: success;
 }
 
 .el-radio__input.is-checked+.el-radio__label {
   color: inherit;
 }
 
-.el-radio__input.is-checked .el-radio__inner {
-  border-color: #409EFF;
-  background-color: #409EFF;
-}
-
-.el-checkbox__input.is-checked .el-checkbox__inner {
-  border-color: #409EFF;
-  background-color: #409EFF;
-}
-
-.el-radio__inner:hover {
-  border-color: #409EFF;
-}
-
 .el-textarea__inner {
   border-radius: 0;
 }
 
-.el-checkbox__input.is-checked .el-checkbox__inner, .el-checkbox__input.is-indeterminate .el-checkbox__inner {
-  border-color: #409EFF;
-  background-color: #409EFF;
-}
-
-.el-checkbox__input.is-checked+.el-checkbox__label {
-  color: #606266;
-}
-
-.el-checkbox__inner:hover {
-  border-color: #409EFF;
-}
-
-.el-checkbox__input.is-focus .el-checkbox__inner {
-  border-color: #409EFF;
-}
-
-.el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li {
-  margin: 0 5px;
-  background-color: white;
-  color: #606266;
-  min-width: 28px;
-  border-radius: 2px;
-  border: 1px solid #DCDFE6;
-  font-size: 12px;
-  line-height: 26px;
-  font-weight: 400;
-}
-
-.el-pagination.is-background .el-pager li:not(.disabled):hover {
-  color: white;
-  background-color: $--color-primary;
-}
-
 .el-pagination.is-background .number {
   padding: 0;
 }
 
+.el-card.primary .el-card__header {
+  background-color: primary;
+}
+
+.el-card.success .el-card__header {
+  background-color: success;
+}
+
+.el-card.info .el-card__header {
+  background-color: info;
+}
+
+.el-card.warning .el-card__header {
+  background-color: warning;
+}
+
+.el-card.danger .el-card__header {
+  background-color: danger;
+}
+
 .el-message-box__headerbtn .el-message-box__close {
   color: #606266;
 }
 
-.el-card.primary {
-  .el-card__header {
-    background-color: $--color-primary;
-  }
-}
-
-.el-card.success {
-  .el-card__header {
-    background-color: $--color-success;
-  }
-}
-
-.el-card.info {
-  .el-card__header {
-    background-color: $--color-info;
-  }
-}
-
-.el-card.warning {
-  .el-card__header {
-    background-color: $--color-warning;
-  }
-}
-
-.el-card.danger {
-  .el-card__header {
-    background-color: $--color-danger;
-  }
-}
-
 .el-tooltip__popper.is-light {
   background: #FFF;
   border: 1px solid #e7eaec;
@@ -391,22 +329,13 @@ td .el-button.el-button--mini {
   border-bottom: 1px solid #e7e7e7 !important;
 }
 
-.el-table .cell, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell {
+.el-table .cell,
+.el-table td:first-child .cell,
+.el-table th:first-child .cell {
   padding-left: 10px;
   padding-right: 14px;
 }
 
-.el-tag--dark.el-tag--info {
-  background-color: #23c6c8;
-  border-color: #23c6c8;
-  color: #fff;
-}
-
-a {
-  color: $--color-link !important;
-  text-decoration: none;
-}
-
 .el-tag--default.el-tag--dark {
   background-color: #d1dade;
   color: #5e5e5e;
@@ -417,7 +346,6 @@ a {
   color: #676a6c;
 }
 
-
 .el-table__empty-block {
  width: 100% !important;
 }
@@ -433,62 +361,146 @@ a {
   color: #000;
   font-size: 22px;
   font-weight: 800;
-  //color: red;
+}
+
+.el-tag--default.el-tag--dark {
+  background-color: #d1dade;
+  color: #5e5e5e;
+  border: none;
+}
+
+.el-card {
+  color: #676a6c;
+}
+
+.el-table__empty-block {
+ width: 100% !important;
+}
+
+.el-dialog__headerbtn .el-dialog__close {
+  font-size: 21px;
+  font-weight: 700;
+  color: #000;
+  text-shadow: 0 1px 0 #fff;
+}
+
+.el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close {
+  color: #000;
+  font-size: 22px;
+  font-weight: 800;
 }
 
 .el-button--danger.is-plain {
-  color: $--color-danger;
+  color: danger;
   background: #ffffff;
-  border-color: $--color-danger;
+  border-color: danger;
+}
+
+.el-button--danger.is-plain.is-disabled,
+.el-button--danger.is-plain.is-disabled:active,
+.el-button--danger.is-plain.is-disabled:focus,
+.el-button--danger.is-plain.is-disabled:hover {
+  color: white;
 }
 
 .el-alert .el-alert__description {
   margin: 1px 0 0;
 }
 
-.el-input-group__prepend div.el-select .el-input__inner {
-  color: $--color-text-primary;
-}
-
-.el-input-group__prepend div.el-select .el-input__inner:hover {
-  color: $--color-text-primary;
-}
-
 .el-table {
   font-size: 13px;
 }
 
-.el-table-filter__list-item:hover {
-  color: $--color-text-primary;
-}
-
-
 .el-dialog {
-  // 居中弹框
   position: absolute;
   top: 50%;
   left: 50%;
   margin: 0 !important;
   transform: translate(-50%, -50%);
-  // 防止超出视窗
   max-height: calc(100% - 30px);
   max-width: calc(100% - 30px);
-  //实现body内部滚动
   display: flex;
   flex-direction: column;
-
-  .el-dialog__body {
-    max-height: 90vh;
-    overflow: auto;
-  }
 }
 
-.el-button--text {
-  color: $--color-link;
-  padding: 5px;
+.el-dialog  .el-dialog__body {
+  max-height: 80vh;
+  overflow: auto;
+  padding: 30px;
 }
 
-.el-button--text:hover {
-  color: $--color-link-highlight;
-  background-color: rgba(0,0,0,.05)
+.el-dialog .el-dialog__body form {
+  padding-right: 20px;
+}
+
+.el-dialog .el-dialog__footer {
+  padding: 10px 30px 30px;
+}
+
+.el-cascader {
+  line-height: 34px;
+}
+
+.el-input__icon {
+  line-height: 34px;
+}
+
+.el-checkbox__input.is-checked+.el-checkbox__label {
+  color: #606266;
+}
+
+.el-select-dropdown__item.selected {
+  font-weight: 400;
+  color: white;
+  background-color: primary;
+}
+
+.el-input-group__prepend div.el-select .el-input__inner,
+.el-input-group__prepend div.el-select .el-input__inner:hover {
+  color: #303133;
+}
+
+.el-input-group__append, .el-input-group__prepend {
+  color: primary
+}
+
+.el-input.is-disabled .el-input__inner {
+  color: $--color-text-primary;
+  cursor: not-allowed;
+}
+
+.el-step__description.is-finish {
+  color: #676a6c;
+}
+
+.el-alert {
+  border: solid 1px #e7eaec;
+}
+
+.el-alert.el-alert--success.is-light {
+  border-color: var(--color-success-light);
+}
+
+.el-alert.el-alert--primary.is-light {
+  border-color: var(--color-primary-light);
+}
+
+.el-alert.el-alert--info.is-light {
+  border-color: var(--color-info-light);
+}
+
+.el-alert.el-alert--warning.is-light {
+  border-color: var(--color-warning-light);
+}
+
+.el-alert.el-alert--error.is-light {
+  border-color: var(--color-danger-light);
+}
+
+#nprogress .bar {
+  background: light-5!important;
+}
+
+#nprogress .peg {
+  box-shadow: 0 0 10px light-5, 0 0 5px light-5!important;
 }

src/App.vue

@@ -1,11 +1,21 @@
 <template>
   <div id="app">
-    <router-view />
+    <router-view v-if="isRouterAlive" />
   </div>
 </template>
 
 <script>
+import { mapState } from 'vuex'
+
 export default {
-  name: 'App'
+  name: 'App',
+  computed: {
+    ...mapState({
+      isRouterAlive: state => state.common.isRouterAlive
+    })
+  }
 }
 </script>
+
+<style>
+</style>

src/api/asset.js

@@ -40,3 +40,12 @@ export function getCommandFilterList(data) {
   })
 }
 
+export function getCategoryTypes() {
+  return request({
+    url: '/api/v1/assets/categories/?limit=1000',
+    method: 'get'
+  }).then(res => {
+    return res.results
+  })
+}
+

src/api/common.js

@@ -1,6 +1,13 @@
 import request from '@/utils/request'
 
 export function createSourceIdCache(ids) {
+  ids = ids.map(item => {
+    if (typeof item === 'object' && item.id) {
+      return item.id
+    } else {
+      return item
+    }
+  })
   return request({
     url: '/api/v1/common/resources/cache/',
     method: 'post',

src/api/interface.js

@@ -1,8 +1,8 @@
 import request from '@/utils/request'
 
-export function postInterface(formData) {
+export function updateInterface(formData) {
   return request({
-    url: '/api/v1/xpack/interface/setting',
+    url: '/api/v1/xpack/interface/setting/',
     method: 'put',
     headers: {
       'Content-Type': 'multipart/form-data'
@@ -12,15 +12,15 @@ export function postInterface(formData) {
 }
 export function getInterfaceInfo() {
   return request({
-    url: '/api/v1/xpack/interface/setting',
+    url: '/api/v1/xpack/interface/setting/',
     method: 'get'
   })
 }
 
 export function restoreInterface() {
   return request({
-    url: '/api/v1/xpack/interface/restore',
-    method: 'get'
+    url: '/api/v1/xpack/interface/setting/restore/',
+    method: 'put'
   })
 }
 
@@ -34,3 +34,10 @@ export function importLicense(formData) {
     data: formData
   })
 }
+
+export function previewThemes() {
+  return request({
+    url: `/api/v1/xpack/interface/setting/themes/`,
+    method: 'get'
+  })
+}

src/api/ops.js

@@ -1,12 +1,5 @@
 import request from '@/utils/request'
 
-export function getTaskDetail(id) {
-  return request({
-    url: `/api/v1/ops/tasks/${id}/`,
-    method: 'get'
-  })
-}
-
 export function getAdhocDetail(id) {
   return request({
     url: `/api/v1/ops/adhoc/${id}/`,
@@ -20,3 +13,61 @@ export function getHistoryExecutionDetail(id) {
     method: 'get'
   })
 }
+
+export function getTaskDetail(id) {
+  return request({
+    url: `/api/v1/ops/job-execution/task-detail/${id}/`,
+    method: 'get'
+  })
+}
+
+export function getJob(id) {
+  return request({
+    url: `/api/v1/ops/jobs/${id}/`,
+    method: 'get'
+  })
+}
+
+export function uploadPlaybook(form) {
+  return request({
+    url: '/api/v1/ops/playbooks/',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: form
+  })
+}
+
+export function renameFile(playbookId, node) {
+  return request({
+    url: `/api/v1/ops/playbook/${playbookId}/file/`,
+    method: 'patch',
+    data: node
+  })
+}
+
+export function createJob(form) {
+  return request({
+    url: '/api/v1/ops/jobs/',
+    method: 'post',
+    data: form
+  })
+}
+
+export function StopJob(form) {
+  return request({
+    url: '/api/v1/ops/job-executions/stop/',
+    method: 'post',
+    data: form
+  })
+}
+
+export function JobUploadFile(form) {
+  return request({
+    url: '/api/v1/ops/jobs/upload/',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    timeout: 60 * 60 * 1000,
+    data: form
+  })
+}
+

src/api/perms.js

@@ -1,43 +0,0 @@
-import request from '@/utils/request'
-
-export function getAssetPermissionDetail(id) {
-  return request({
-    url: `/api/v1/perms/asset-permissions/${id}/`,
-    method: 'get'
-  })
-}
-
-export function getRemoteAppPermissionDetail(id) {
-  return request({
-    url: `/api/v1/perms/remote-app-permissions/${id}/`,
-    method: 'get'
-  })
-}
-
-export function getDatabaseAppPermissionDetail(id) {
-  return request({
-    url: `/api/v1/perms/database-app-permissions/${id}/`,
-    method: 'get'
-  })
-}
-
-export function getUserAssetGrantedSystemUsers(userId, assetId) {
-  return request({
-    url: `/api/v1/perms/users/${userId}/assets/${assetId}/system-users/?cache_policy=1`,
-    method: 'get'
-  })
-}
-
-export function getMyAssetGrantedSystemUsers(userId, assetId) {
-  return request({
-    url: `/api/v1/perms/users/assets/${assetId}/system-users/?cache_policy=1`,
-    method: 'get'
-  })
-}
-
-export function getUserGroupAssetGrantedSystemUsers(gId, assetId) {
-  return request({
-    url: `/api/v1/perms/user-groups/${gId}/assets/${assetId}/system-users/?cache_policy=1`,
-    method: 'get'
-  })
-}

src/api/sessions.js

@@ -8,24 +8,11 @@ export function terminateSession(data) {
   })
 }
 
-export function getSessionDetail(id) {
+export function toggleLockSession(data) {
   return request({
-    url: `/api/v1/terminal/sessions/${id}/`,
-    method: 'get'
-  })
-}
-
-export function getSessionCommands(id) {
-  return request({
-    url: `/api/v1/terminal/commands/?session_id=${id}`,
-    method: 'get'
-  })
-}
-
-export function getTerminalDetail(id) {
-  return request({
-    url: `/api/v1/terminal/terminals/${id}/`,
-    method: 'get'
+    url: '/api/v1/terminal/tasks/toggle-lock-session/',
+    method: 'post',
+    data: data
   })
 }
 

src/api/settings.js

@@ -25,12 +25,28 @@ export function importLicense(formData) {
     data: formData
   })
 }
-export function testLdapSetting(data) {
-  return request({
-    disableFlashErrorMsg: true,
-    url: '/api/v1/settings/ldap/testing/config/',
-    method: 'post',
-    data: data
+export function testLdapSetting(data, refresh = true) {
+  let url = '/api/v1/settings/ldap/testing/config/'
+  if (refresh) {
+    url = url + '?refresh=1'
+  }
+  return new Promise((resolve, reject) => {
+    request({
+      disableFlashErrorMsg: true,
+      url: url,
+      method: 'post',
+      data: data
+    }).then(res => {
+      if (res.status !== 'running') {
+        resolve(res)
+      } else {
+        setTimeout(() => {
+          resolve(testLdapSetting(data, false))
+        }, 1000)
+      }
+    }).catch(error => {
+      reject(error)
+    })
   })
 }
 
@@ -68,15 +84,21 @@ export function importLdapUser(data) {
   })
 }
 
-export function getPublicSettings() {
+export function getPublicSettings(isOpen) {
+  let url
+  if (isOpen) {
+    url = '/api/v1/settings/public/open/'
+  } else {
+    url = '/api/v1/settings/public/'
+  }
   return request({
-    url: '/api/v1/settings/public/',
+    url: url,
     method: 'get'
   })
 }
 export function getLogo() {
   return request({
-    url: '/api/v1/xpack/interface/setting',
+    url: '/api/v1/xpack/interface/setting/',
     method: 'get'
   })
 }

src/api/users.js

@@ -12,7 +12,6 @@ export function getProfile(token) {
   return request({
     url: '/api/v1/users/profile/',
     method: 'get'
-    // params: { token }
   })
 }
 

src/assets/img/chatbot.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="transparent" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot "><path d="M12 8V4H8"></path><rect width="16" height="12" x="4" y="8" rx="2"></rect><path d="M2 14h2"></path><path d="M20 14h2"></path><path d="M15 13v2"></path><path d="M9 13v2"></path></svg>

src/components/AccountListTable/ShowSecretInfo.vue

@@ -1,85 +0,0 @@
-<template>
-  <div>
-    <MFAVerifyDialog
-      @MFAVerifyDone="getAuthInfo"
-      @MFAVerifyCancel="exit"
-    />
-    <Dialog
-      :title="dialogTitle"
-      :show-confirm="false"
-      :show-cancel="false"
-      :destroy-on-close="true"
-      :width="'50'"
-      :visible.sync="showAuthInfo"
-      v-bind="$attrs"
-      v-on="$listeners"
-    >
-      <div>
-        <el-form label-position="right" label-width="80px" :model="authInfo">
-          <el-form-item :label="this.$t('assets.Hostname')">
-            <el-input v-model="account.hostname" readonly />
-          </el-form-item>
-          <el-form-item :label="this.$t('assets.Username')">
-            <el-input v-model="account['username']" readonly />
-          </el-form-item>
-          <el-form-item :label="this.$t('assets.Password')">
-            <el-input v-model="authInfo.password" type="password" show-password />
-          </el-form-item>
-          <el-form-item :label="this.$t('users.SSHKey')">
-            <el-input v-model="authInfo['private_key']" class="item-textarea" type="textarea" show-password />
-          </el-form-item>
-        </el-form>
-      </div>
-    </Dialog>
-  </div>
-</template>
-
-<script>
-import Dialog from '@/components/Dialog'
-import MFAVerifyDialog from '@/components/MFAVerifyDialog'
-export default {
-  name: 'ShowSecretInfo',
-  components: {
-    Dialog,
-    MFAVerifyDialog
-  },
-  props: {
-    account: {
-      type: Object,
-      default: () => ({})
-    },
-    visible: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      dialogTitle: this.$t('common.ViewSecret'),
-      authInfo: {},
-      showAuthInfo: false
-    }
-  },
-  mounted() {
-    this.getAuthInfo()
-  },
-  methods: {
-    getAuthInfo() {
-      const url = `/api/v1/assets/account-secrets/${this.account.id}/`
-      this.$axios.get(url, { disableFlashErrorMsg: true }).then(resp => {
-        this.authInfo = resp
-        this.showAuthInfo = true
-      })
-    },
-    exit() {
-      this.$emit('update:visible', false)
-    }
-  }
-}
-</script>
-
-<style scoped>
-  .item-textarea >>> .el-textarea__inner {
-    height: 110px;
-  }
-</style>

src/components/AccountListTable/const.js

@@ -1,36 +0,0 @@
-import { toSafeLocalDateStr } from '@/utils/common'
-import ChoicesFormatter from '@/components/TableFormatters/ChoicesFormatter'
-import i18n from '@/i18n/i18n'
-
-export const connectivityMeta = {
-  label: i18n.t('assets.Reachable'),
-  formatter: ChoicesFormatter,
-  formatterArgs: {
-    iconChoices: {
-      ok: 'fa-check',
-      failed: 'fa-times',
-      unknown: 'fa-circle-o'
-    },
-    classChoices: {
-      ok: 'text-primary',
-      failed: 'text-danger',
-      unknown: 'text-warning'
-    },
-    hasTips: true,
-    getTips: ({ row, cellValue }) => {
-      const mapper = {
-        'ok': i18n.t('assets.Reachable'),
-        'failed': i18n.t('assets.Unreachable'),
-        'unknown': i18n.t('assets.Unknown')
-      }
-      let tips = mapper[cellValue]
-      if (row['date_verified']) {
-        const datetime = toSafeLocalDateStr(row['date_verified'])
-        tips += '<br> ' + datetime
-      }
-      return tips
-    }
-  },
-  width: '90px',
-  align: 'center'
-}

src/components/AccountListTable/index.vue

@@ -1,199 +0,0 @@
-<template>
-  <div>
-    <ListTable ref="ListTable" :table-config="tableConfig" :header-actions="headerActions" />
-    <ShowSecretInfo v-if="showViewSecretDialog" :visible.sync="showViewSecretDialog" :account="account" />
-    <UpdateSecretInfo v-if="showUpdateSecretDialog" :visible.sync="showUpdateSecretDialog" :account="account" @updateAuthDone="onUpdateAuthDone" />
-  </div>
-</template>
-
-<script>
-import ListTable from '@/components/ListTable/index'
-import { ActionsFormatter, DetailFormatter, DisplayFormatter } from '@/components/TableFormatters'
-import ShowSecretInfo from './ShowSecretInfo'
-import UpdateSecretInfo from './UpdateSecretInfo'
-import { connectivityMeta } from './const'
-import { openTaskPage } from '@/utils/jms'
-
-export default {
-  name: 'AccountListTable',
-  components: {
-    ListTable,
-    UpdateSecretInfo,
-    ShowSecretInfo
-  },
-  props: {
-    url: {
-      type: String,
-      required: true
-    },
-    exportUrl: {
-      type: String,
-      default() {
-        return this.url.replace('/assets/accounts/', '/assets/account-secrets/')
-      }
-    },
-    hasLeftActions: {
-      type: Boolean,
-      default: false
-    },
-    otherActions: {
-      type: Array,
-      default: null
-    },
-    hasClone: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    const vm = this
-    return {
-      showViewSecretDialog: false,
-      showUpdateSecretDialog: false,
-      account: {},
-      tableConfig: {
-        url: this.url,
-        permissions: {
-          app: 'assets',
-          resource: 'authbook'
-        },
-        columns: [
-          'hostname', 'ip', 'username', 'version', 'connectivity',
-          'systemuser', 'date_created', 'date_updated', 'actions'
-        ],
-        columnsShow: {
-          min: ['username', 'actions'],
-          default: ['hostname', 'ip', 'username', 'version', 'actions']
-        },
-        columnsMeta: {
-          hostname: {
-            prop: 'hostname',
-            label: this.$t('assets.Hostname'),
-            showOverflowTooltip: true,
-            formatter: DetailFormatter,
-            formatterArgs: {
-              can: this.$hasPerm('assets.view_asset'),
-              getRoute({ row }) {
-                return {
-                  name: 'AssetDetail',
-                  params: { id: row.asset }
-                }
-              }
-            }
-          },
-          ip: {
-            width: '120px'
-          },
-          username: {
-            showOverflowTooltip: true
-          },
-          systemuser: {
-            formatter: DisplayFormatter
-          },
-          version: {
-            width: '70px'
-          },
-          connectivity: connectivityMeta,
-          actions: {
-            formatter: ActionsFormatter,
-            formatterArgs: {
-              hasUpdate: false, // can set function(row, value)
-              hasDelete: false, // can set function(row, value)
-              hasClone: this.hasClone,
-              moreActionsTitle: this.$t('common.More'),
-              extraActions: [
-                {
-                  name: 'View',
-                  title: this.$t('common.View'),
-                  can: this.$hasPerm('assets.view_assetaccountsecret'),
-                  type: 'primary',
-                  callback: ({ row }) => {
-                    vm.account = row
-                    vm.showViewSecretDialog = true
-                  }
-                },
-                {
-                  name: 'Delete',
-                  title: this.$t('common.Delete'),
-                  can: this.$hasPerm('assets.delete_authbook'),
-                  type: 'primary',
-                  callback: ({ row }) => {
-                    this.$axios.delete(`/api/v1/assets/accounts/${row.id}/`).then(() => {
-                      this.$message.success(this.$tc('common.deleteSuccessMsg'))
-                      this.$refs.ListTable.reloadTable()
-                    })
-                  }
-                },
-                {
-                  name: 'Test',
-                  title: this.$t('common.Test'),
-                  can: this.$hasPerm('assets.test_authbook'),
-                  callback: ({ row }) => {
-                    this.$axios.post(
-                      `/api/v1/assets/accounts/${row.id}/verify/`,
-                      { action: 'test' }
-                    ).then(res => {
-                      openTaskPage(res['task'])
-                    })
-                  }
-                },
-                {
-                  name: 'Update',
-                  title: this.$t('common.Update'),
-                  can: this.$hasPerm('assets.change_assetaccountsecret') && !this.$store.getters.currentOrgIsRoot,
-                  callback: ({ row }) => {
-                    vm.account = row
-                    vm.showUpdateSecretDialog = false
-                    setTimeout(() => {
-                      vm.showUpdateSecretDialog = true
-                      console.log('Show update1: ', vm.showUpdateSecretDialog)
-                    })
-                    console.log('Show update2: ', vm.showUpdateSecretDialog)
-                  }
-                }
-              ]
-            }
-          }
-        }
-      },
-      headerActions: {
-        hasLeftActions: this.hasLeftActions,
-        hasMoreActions: false,
-        hasImport: false,
-        hasExport: this.$hasPerm('assets.view_assetaccountsecret'),
-        exportOptions: {
-          url: this.exportUrl,
-          mfaVerifyRequired: true
-        },
-        searchConfig: {
-          exclude: ['systemuser', 'asset']
-        },
-        hasSearch: true
-      }
-    }
-  },
-  watch: {
-    url(iNew) {
-      this.$set(this.tableConfig, 'url', iNew)
-      this.$set(this.headerActions.exportOptions, 'url', iNew.replace('/accounts/', '/account-secrets/'))
-    }
-  },
-  mounted() {
-    if (this.otherActions) {
-      const actionColumn = this.tableConfig.columns[this.tableConfig.columns.length - 1]
-      for (const item of this.otherActions) {
-        actionColumn.formatterArgs.extraActions.push(item)
-      }
-    }
-  },
-  methods: {
-    onUpdateAuthDone(account) {
-      Object.assign(this.account, account)
-    }
-  }
-}
-</script>
-
-<style lang='less' scoped>
-
-</style>

src/components/ActionsGroup/index.vue

@@ -18,16 +18,16 @@ export default {
       type: Array,
       default: () => []
     },
+    moreActionBtn: {
+      type: Object,
+      default: () => ({})
+    },
     moreActionsTitle: {
       type: String,
       default() {
         return this.$t('common.MoreActions')
       }
     },
-    moreActionsType: {
-      type: String,
-      default: 'default'
-    },
     moreActionsPlacement: {
       type: String,
       default: 'bottom'
@@ -43,14 +43,21 @@ export default {
       return actions
     },
     iMoreAction() {
-      return {
+      const defaultBtn = {
         name: 'moreActions',
-        title: this.iMoreActionsTitle,
+        title: this.$t('common.MoreActions'),
+        type: 'primary',
+        plain: true
+      }
+      const btn = {
+        ...defaultBtn,
+        ...this.moreActionBtn,
         dropdown: this.moreActions || []
       }
-    },
-    iMoreActionsTitle() {
-      return this.moreActionsTitle || this.$t('common.MoreActions')
+      if (this.moreActionsTitle) {
+        btn.title = this.moreActionsTitle
+      }
+      return btn
     }
   }
 }

src/components/AppAccountListTable/ShowSecretInfo.vue

@@ -1,80 +0,0 @@
-<template>
-  <div>
-    <MFAVerifyDialog
-      @MFAVerifyDone="getAuthInfo"
-      @MFAVerifyCancel="exit"
-    />
-    <Dialog
-      :title="dialogTitle"
-      :show-confirm="false"
-      :show-cancel="false"
-      :destroy-on-close="true"
-      :width="'50'"
-      :visible.sync="showAuthInfo"
-      v-bind="$attrs"
-      v-on="$listeners"
-    >
-      <div>
-        <el-form label-position="right" label-width="80px" :model="authInfo">
-          <el-form-item :label="this.$t('applications.appName')">
-            <el-input v-model="account['app_display']" readonly />
-          </el-form-item>
-          <el-form-item :label="this.$t('assets.Username')">
-            <el-input v-model="account['username']" readonly />
-          </el-form-item>
-          <el-form-item :label="this.$t('assets.Password')">
-            <el-input v-model="authInfo.password" type="password" show-password />
-          </el-form-item>
-        </el-form>
-      </div>
-    </Dialog>
-  </div>
-</template>
-
-<script>
-import Dialog from '@/components/Dialog'
-import MFAVerifyDialog from '@/components/MFAVerifyDialog'
-export default {
-  name: 'ShowSecretInfo',
-  components: {
-    Dialog,
-    MFAVerifyDialog
-  },
-  props: {
-    account: {
-      type: Object,
-      default: () => ({})
-    },
-    visible: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      dialogTitle: this.$t('common.ViewSecret'),
-      authInfo: {},
-      showAuthInfo: false
-    }
-  },
-  mounted() {
-    this.getAuthInfo()
-  },
-  methods: {
-    getAuthInfo() {
-      const url = `/api/v1/applications/account-secrets/${this.account.id}/`
-      this.$axios.get(url, { disableFlashErrorMsg: true }).then(resp => {
-        this.authInfo = resp
-        this.showAuthInfo = true
-      })
-    },
-    exit() {
-      this.$emit('update:visible', false)
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/components/AppAccountListTable/const.js

@@ -1,31 +0,0 @@
-import { ChoicesFormatter } from '@/components/TableFormatters'
-import { toSafeLocalDateStr } from '@/utils/common'
-import i18n from '@/i18n/i18n'
-
-export const connectivityMeta = {
-  label: i18n.t('assets.Reachable'),
-  formatter: ChoicesFormatter,
-  formatterArgs: {
-    iconChoices: {
-      ok: 'fa-check text-primary',
-      failed: 'fa-times text-danger',
-      unknown: 'fa-circle text-warning'
-    },
-    hasTips: true,
-    getTips: ({ row, cellValue }) => {
-      const mapper = {
-        'ok': i18n.t('assets.Reachable'),
-        'failed': i18n.t('assets.Unreachable'),
-        'unknown': i18n.t('assets.Unknown')
-      }
-      let tips = mapper[cellValue]
-      if (row['date_verified']) {
-        const datetime = toSafeLocalDateStr(row['date_verified'])
-        tips += '<br> ' + datetime
-      }
-      return tips
-    }
-  },
-  width: '90px',
-  align: 'center'
-}

src/components/AppAccountListTable/index.vue

@@ -1,169 +0,0 @@
-<template>
-  <div>
-    <ListTable ref="ListTable" :table-config="tableConfig" :header-actions="headerActions" />
-    <ShowSecretInfo v-if="showViewSecretDialog" :visible.sync="showViewSecretDialog" :account="account" />
-  </div>
-</template>
-
-<script>
-import ListTable from '@/components/ListTable/index'
-import { ActionsFormatter, DetailFormatter } from '@/components/TableFormatters'
-import ShowSecretInfo from './ShowSecretInfo'
-
-export default {
-  name: 'Detail',
-  components: {
-    ListTable,
-    ShowSecretInfo
-  },
-  props: {
-    url: {
-      type: String,
-      required: true
-    },
-    exportUrl: {
-      type: String,
-      default() {
-        return this.url.replace('/applications/accounts/', '/applications/account-secrets/')
-      }
-    },
-    hasLeftActions: {
-      type: Boolean,
-      default: false
-    },
-    otherActions: {
-      type: Array,
-      default: null
-    },
-    hasClone: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      showViewSecretDialog: false,
-      showUpdateSecretDialog: false,
-      account: {},
-      tableConfig: {
-        url: this.url,
-        columns: [
-          'app_display', 'username', 'category_display',
-          'type_display', 'systemuser', 'actions'
-        ],
-        columnsMeta: {
-          app_display: {
-            showOverflowTooltip: true,
-            formatter: DetailFormatter,
-            formatterArgs: {
-              getRoute({ row }) {
-                switch (row['category']) {
-                  case 'remote_app':
-                    return {
-                      name: 'RemoteAppDetail',
-                      params: { id: row.app }
-                    }
-                  case 'db':
-                    return {
-                      name: 'DatabaseAppDetail',
-                      params: { id: row.app }
-                    }
-                  default:
-                    return {
-                      name: 'KubernetesAppDetail',
-                      params: { id: row.app }
-                    }
-                }
-              }
-            }
-          },
-          username: {
-            showOverflowTooltip: true
-          },
-          systemuser: {
-            showOverflowTooltip: true,
-            formatter: DetailFormatter,
-            formatterArgs: {
-              can: this.$hasPerm('assets.view_systemuser'),
-              getTitle({ row }) {
-                return row.systemuser_display
-              },
-              getRoute({ row }) {
-                return {
-                  name: 'SystemUserDetail',
-                  params: { id: row.systemuser }
-                }
-              }
-            }
-          },
-          actions: {
-            formatter: ActionsFormatter,
-            formatterArgs: {
-              hasUpdate: false, // can set function(row, value)
-              hasDelete: false, // can set function(row, value)
-              hasClone: this.hasClone,
-              moreActionsTitle: this.$t('common.More'),
-              extraActions: [
-                {
-                  name: 'View',
-                  title: this.$t('common.View'),
-                  type: 'primary',
-                  can: this.$hasPerm('applications.view_applicationaccountsecret'),
-                  callback: function({ row }) {
-                    this.account = row
-                    this.showViewSecretDialog = true
-                  }.bind(this)
-                },
-                {
-                  name: 'Update',
-                  title: this.$t('common.Update'),
-                  can: !this.$store.getters.currentOrgIsRoot,
-                  callback: function({ row }) {
-                    this.$message.success(this.$tc('applications.updateAccountMsg'))
-                  }.bind(this)
-                }
-              ]
-            }
-          }
-        }
-      },
-      headerActions: {
-        hasLeftActions: this.hasLeftActions,
-        hasMoreActions: false,
-        hasImport: false,
-        hasExport: this.$hasPerm('applications.view_applicationaccountsecret'),
-        exportOptions: {
-          url: this.exportUrl,
-          mfaVerifyRequired: true
-        },
-        searchConfig: {
-          exclude: ['systemuser', 'app']
-        },
-        hasSearch: true
-      }
-    }
-  },
-  watch: {
-    url(iNew) {
-      this.$set(this.tableConfig, 'url', iNew)
-    }
-  },
-  mounted() {
-    if (this.otherActions) {
-      const actionColumn = this.tableConfig.columns[this.tableConfig.columns.length - 1]
-      for (const item of this.otherActions) {
-        actionColumn.formatterArgs.extraActions.push(item)
-      }
-    }
-  },
-  methods: {
-    onUpdateAuthDone(account) {
-      Object.assign(this.account, account)
-    }
-  }
-}
-</script>
-
-<style lang='less' scoped>
-
-</style>

src/components/Apps/AccountCreateUpdateForm/const.js

@@ -0,0 +1,191 @@
+import { UpdateToken, UploadSecret } from '@/components/Form/FormFields'
+import Select2 from '@/components/Form/FormFields/Select2.vue'
+import AssetSelect from '@/components/Apps/AssetSelect/index.vue'
+import { Required, RequiredChange } from '@/components/Form/DataForm/rules'
+import AutomationParamsForm from '@/views/assets/Platform/AutomationParamsSetting.vue'
+
+export const accountFieldsMeta = (vm) => {
+  const defaultPrivilegedAccounts = ['root', 'administrator']
+  return {
+    assets: {
+      rules: [Required],
+      component: AssetSelect,
+      label: vm.$t('assets.Asset'),
+      el: {
+        multiple: false
+      },
+      hidden: () => {
+        return vm.platform || vm.asset
+      }
+    },
+    template: {
+      component: Select2,
+      rules: [Required],
+      el: {
+        multiple: false,
+        ajax: {
+          url: '/api/v1/accounts/account-templates/',
+          transformOption: (item) => {
+            return { label: item.name, value: item.id }
+          }
+        }
+      },
+      hidden: () => {
+        return vm.platform || vm.asset || !vm.addTemplate
+      }
+    },
+    on_invalid: {
+      rules: [Required],
+      label: vm.$t('accounts.AccountPolicy'),
+      helpText: vm.$t('accounts.BulkCreateStrategy'),
+      hidden: () => {
+        return vm.platform || vm.asset
+      }
+    },
+    name: {
+      label: vm.$t('common.Name'),
+      rules: [RequiredChange],
+      on: {
+        input: ([value], updateForm) => {
+          if (!vm.usernameChanged) {
+            if (!vm.account?.name) {
+              updateForm({ username: value })
+            }
+            const maybePrivileged = defaultPrivilegedAccounts.includes(value)
+            if (maybePrivileged) {
+              updateForm({ privileged: true })
+            }
+          }
+        }
+      },
+      hidden: () => {
+        return vm.addTemplate
+      }
+    },
+    username: {
+      el: {
+        disabled: !!vm.account?.name
+      },
+      on: {
+        input: ([value], updateForm) => {
+          vm.usernameChanged = true
+        },
+        change: ([value], updateForm) => {
+          const maybePrivileged = defaultPrivilegedAccounts.includes(value)
+          if (maybePrivileged) {
+            updateForm({ privileged: true })
+          }
+        }
+      },
+      hidden: () => {
+        return vm.addTemplate
+      }
+    },
+    privileged: {
+      label: vm.$t('assets.Privileged'),
+      hidden: () => {
+        return vm.addTemplate
+      }
+    },
+    su_from: {
+      component: Select2,
+      hidden: (formValue) => {
+        return !vm.asset?.id || !vm.iPlatform.su_enabled
+      },
+      el: {
+        multiple: false,
+        clearable: true,
+        ajax: {
+          url: `/api/v1/accounts/accounts/su-from-accounts/?account=${vm.account?.id || ''}&asset=${vm.asset?.id || ''}`,
+          transformOption: (item) => {
+            return { label: `${item.name}(${item.username})`, value: item.id }
+          }
+        }
+      }
+    },
+    su_from_username: {
+      label: vm.$t('assets.UserSwitchFrom'),
+      hidden: (formValue) => {
+        return vm.platform || vm.asset || vm.addTemplate
+      }
+    },
+    password: {
+      label: vm.$t('assets.Password'),
+      component: UpdateToken,
+      hidden: (formValue) => {
+        return formValue.secret_type !== 'password' || vm.addTemplate
+      }
+    },
+    ssh_key: {
+      label: vm.$t('assets.PrivateKey'),
+      component: UploadSecret,
+      hidden: (formValue) => formValue.secret_type !== 'ssh_key' || vm.addTemplate
+    },
+    passphrase: {
+      label: vm.$t('assets.Passphrase'),
+      component: UpdateToken,
+      hidden: (formValue) => formValue.secret_type !== 'ssh_key' || vm.addTemplate
+    },
+    token: {
+      label: vm.$t('assets.Token'),
+      component: UploadSecret,
+      hidden: (formValue) => formValue.secret_type !== 'token' || vm.addTemplate
+    },
+    access_key: {
+      id: 'access_key',
+      label: vm.$t('assets.AccessKey'),
+      component: UploadSecret,
+      hidden: (formValue) => formValue.secret_type !== 'access_key' || vm.addTemplate
+    },
+    api_key: {
+      id: 'api_key',
+      label: vm.$t('assets.ApiKey'),
+      component: UploadSecret,
+      hidden: (formValue) => formValue.secret_type !== 'api_key' || vm.addTemplate
+    },
+    secret_type: {
+      type: 'radio-group',
+      options: [],
+      hidden: () => {
+        return vm.addTemplate
+      }
+    },
+    push_now: {
+      helpText: vm.$t('accounts.AccountPush.WindowsPushHelpText'),
+      hidden: (formValue) => {
+        const automation = vm.iPlatform.automation || {}
+        return !automation.push_account_enabled ||
+          !automation.ansible_enabled ||
+          !vm.$hasPerm('accounts.push_account') ||
+          (formValue.secret_type === 'ssh_key' && vm.iPlatform.type.value === 'windows') ||
+          vm.addTemplate
+      }
+    },
+    params: {
+      label: vm.$t('assets.PushParams'),
+      component: AutomationParamsForm,
+      el: {},
+      hidden: (formValue) => {
+        const automation = vm.iPlatform.automation || {}
+        vm.fieldsMeta.params.el.method = vm.iPlatform.automation.push_account_method
+        vm.fieldsMeta.params.el.pushAccountParams = vm.iPlatform.automation.push_account_params
+        return !formValue.push_now ||
+          !automation.push_account_enabled ||
+          !automation.ansible_enabled ||
+          (formValue.secret_type === 'ssh_key' &&
+            vm.iPlatform.type.value === 'windows') ||
+          !vm.$hasPerm('accounts.push_account') ||
+          vm.addTemplate
+      }
+    },
+    is_active: {
+      label: vm.$t('common.IsActive')
+    },
+    comment: {
+      label: vm.$t('common.Comment'),
+      hidden: () => {
+        return vm.addTemplate
+      }
+    }
+  }
+}

src/components/Apps/AccountCreateUpdateForm/index.vue

@@ -0,0 +1,153 @@
+<template>
+  <AutoDataForm
+    v-if="!loading"
+    ref="AutoDataForm"
+    v-bind="$data"
+    @submit="confirm"
+  />
+</template>
+
+<script>
+import AutoDataForm from '@/components/Form/AutoDataForm/index.vue'
+import { encryptPassword } from '@/utils/crypto'
+import { accountFieldsMeta } from '@/components/Apps/AccountCreateUpdateForm/const'
+
+export default {
+  name: 'AccountCreateForm',
+  components: {
+    AutoDataForm
+  },
+  props: {
+    asset: {
+      type: Object,
+      default: null
+    },
+    platform: {
+      type: Object,
+      default: null
+    },
+    account: {
+      type: Object,
+      default: () => ({})
+    },
+    // 默认组件密码加密
+    encryptPassword: {
+      type: Boolean,
+      default: true
+    },
+    addTemplate: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      loading: true,
+      usernameChanged: false,
+      iPlatform: {
+        automation: {},
+        su_enabled: false,
+        protocols: [
+          {
+            name: 'ssh',
+            secret_types: ['password', 'ssh_key', 'token', 'access_key', 'api_key']
+          }
+        ]
+      },
+      url: '/api/v1/accounts/accounts/',
+      form: Object.assign({ 'on_invalid': 'error' }, this.account || {}),
+      encryptedFields: ['secret'],
+      fields: [
+        [this.$t('assets.Asset'), ['assets']],
+        [this.$t('accounts.AccountTemplate'), ['template']],
+        [this.$t('common.Basic'), ['name', 'username', 'privileged', 'su_from', 'su_from_username']],
+        [this.$t('assets.Secret'), [
+          'secret_type', 'password', 'ssh_key', 'token',
+          'access_key', 'passphrase', 'api_key'
+        ]],
+        [this.$t('common.Other'), ['push_now', 'params', 'on_invalid', 'is_active', 'comment']]
+      ],
+      fieldsMeta: accountFieldsMeta(this),
+      hasSaveContinue: false
+    }
+  },
+  async mounted() {
+    try {
+      await this.getPlatform()
+      this.setSecretTypeOptions()
+      this.getDefaultAssets()
+    } finally {
+      this.loading = false
+    }
+  },
+  methods: {
+    async getDefaultAssets() {
+      const assetId = this.$route.query.asset_id
+      if (assetId && !this.form.name) {
+        this.form.assets = [assetId]
+      }
+    },
+    async getPlatform() {
+      if (this.platform) {
+        this.iPlatform = this.platform
+      }
+      if (!this.asset || !this.asset.platform) {
+        return
+      }
+      const platformId = this.asset.platform.id
+      this.iPlatform = await this.$axios.get(`/api/v1/assets/platforms/${platformId}/`)
+    },
+    setSecretTypeOptions() {
+      const choices = [
+        {
+          label: this.$t('assets.Password'),
+          value: 'password'
+        },
+        {
+          label: this.$t('assets.SSHKey'),
+          value: 'ssh_key'
+        },
+        {
+          label: this.$t('assets.Token'),
+          value: 'token'
+        },
+        {
+          label: this.$t('assets.AccessKey'),
+          value: 'access_key'
+        },
+        {
+          label: this.$t('assets.ApiKey'),
+          value: 'api_key'
+        }
+      ]
+      const secretTypes = []
+      this.iPlatform.protocols?.forEach(p => {
+        secretTypes.push(...p['secret_types'])
+      })
+      if (!this.form?.secret_type) {
+        this.form.secret_type = secretTypes[0]
+      }
+      this.fieldsMeta.secret_type.options = choices.filter(item => {
+        return secretTypes.indexOf(item.value) > -1
+      })
+    },
+    confirm(form) {
+      const secretType = form.secret_type || 'password'
+      form.secret = form[secretType]
+      form.secret = this.encryptPassword ? encryptPassword(form.secret) : form.secret
+
+      // 如果不删除会明文显示
+      delete form[secretType]
+
+      if (!form.secret) {
+        delete form['secret']
+      }
+      if (this.account?.name) {
+        this.$emit('edit', form)
+      } else {
+        this.$emit('add', form)
+      }
+    }
+  }
+}
+</script>

src/components/Apps/AccountListTable/AccountBulkUpdateDialog.vue

@@ -0,0 +1,87 @@
+<template>
+  <GenericUpdateFormDialog
+    v-if="visible"
+    :form-setting="formSetting"
+    :selected-rows="selectedRows"
+    :visible="visible"
+    v-on="$listeners"
+  />
+</template>
+
+<script>
+import { GenericUpdateFormDialog } from '@/layout/components'
+import { accountFieldsMeta } from '@/components/Apps/AccountCreateUpdateForm/const'
+import { encryptPassword } from '@/utils/crypto'
+
+export default {
+  name: 'AccountBulkUpdateDialog',
+  components: {
+    GenericUpdateFormDialog
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    selectedRows: {
+      type: Array,
+      default: () => ([])
+    }
+  },
+  data() {
+    return {
+      formSetting: {
+        url: '/api/v1/accounts/accounts/',
+        hasSaveContinue: false,
+        fields: [],
+        fieldsMeta: accountFieldsMeta(this),
+        cleanOtherFormValue: (formValue) => {
+          for (const value of formValue) {
+            Object.keys(value).forEach((item, index, arr) => {
+              if (['ssh_key', 'token', 'access_key', 'api_key', 'password'].includes(item)) {
+                value['secret'] = encryptPassword(value[item])
+                delete value[item]
+              }
+            })
+          }
+          return formValue
+        }
+      }
+    }
+  },
+  created() {
+    this.filterFieldsMeta()
+  },
+  methods: {
+    filterFieldsMeta() {
+      let fields = ['privileged']
+      const fieldsMeta = {}
+      const secretFields = ['password', 'ssh_key', 'passphrase', 'token', 'access_key', 'api_key']
+      const secret_type = this.selectedRows[0].secret_type?.value || 'password'
+      for (const field of secretFields) {
+        if (secret_type === 'ssh_key' && field === 'passphrase') {
+          fields.push('passphrase')
+          this.formSetting.fieldsMeta['passphrase'].hidden = () => false
+          continue
+        }
+        if (secret_type === field) {
+          fields.push(field)
+          this.formSetting.fieldsMeta[field].hidden = () => false
+          continue
+        }
+        delete this.formSetting.fieldsMeta[field]
+      }
+      fields = fields.concat(['is_active', 'comment'])
+      for (const field of fields) {
+        fieldsMeta[field] = this.formSetting.fieldsMeta[field]
+      }
+      this.formSetting.fields = fields
+      this.formSetting.fieldsMeta = fieldsMeta
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/Apps/AccountListTable/AccountCreateUpdate.vue

@@ -0,0 +1,177 @@
+<template>
+  <Dialog
+    v-if="iVisible"
+    :close-on-click-modal="false"
+    :destroy-on-close="true"
+    :show-cancel="false"
+    :show-confirm="false"
+    :title="title"
+    :visible.sync="iVisible"
+    v-bind="$attrs"
+    v-on="$listeners"
+  >
+    <AccountCreateUpdateForm
+      v-if="!loading"
+      ref="form"
+      :account="account"
+      :add-template="addTemplate"
+      :asset="asset"
+      @add="addAccount"
+      @edit="editAccount"
+    />
+  </Dialog>
+</template>
+
+<script>
+import Dialog from '@/components/Dialog/index.vue'
+import AccountCreateUpdateForm from '@/components/Apps/AccountCreateUpdateForm/index.vue'
+
+export default {
+  name: 'CreateAccountDialog',
+  components: {
+    Dialog,
+    AccountCreateUpdateForm
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    addTemplate: {
+      type: Boolean,
+      default: false
+    },
+    asset: {
+      type: Object,
+      default: null
+    },
+    account: {
+      type: Object,
+      default: () => ({})
+    },
+    title: {
+      type: String,
+      default: function() {
+        return this.$t('assets.AddAccount')
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      platform: {}
+    }
+  },
+  computed: {
+    protocols() {
+      return this.asset ? this.asset.protocol : []
+    },
+    iVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:visible', val)
+      }
+    }
+  },
+  methods: {
+    addAccount(form) {
+      const formValue = Object.assign({}, form)
+      let data, url, iVisible
+      if (this.asset) {
+        data = {
+          asset: this.asset.id,
+          ...formValue
+        }
+        iVisible = false
+        url = `/api/v1/accounts/accounts/`
+      } else {
+        iVisible = true
+        data = formValue
+        url = `/api/v1/accounts/accounts/bulk/`
+        if (data.assets.length === 0) {
+          this.$message.error(this.$tc('assets.PleaseSelectAsset'))
+          return
+        }
+      }
+      this.$axios.post(url, data, {
+        disableFlashErrorMsg: iVisible
+      }).then((data) => {
+        this.handleResult(data, null)
+        this.iVisible = iVisible
+        if (!iVisible) {
+          this.$emit('add', true)
+        }
+      }).catch(error => {
+        this.iVisible = true
+        this.handleResult(null, error)
+      })
+    },
+    editAccount(form) {
+      const data = { ...form }
+      this.$axios.patch(`/api/v1/accounts/accounts/${this.account.id}/`, data).then(() => {
+        this.iVisible = false
+        this.$emit('add', true)
+        this.$message.success(this.$tc('common.updateSuccessMsg'))
+      }).catch(error => this.setFieldError(error))
+    },
+    handleResult(resp, error) {
+      let bulkCreate = !this.asset
+      if (error && !Array.isArray(error?.response?.data)) {
+        bulkCreate = false
+      }
+      if (resp && !Array.isArray(resp)) {
+        bulkCreate = false
+      }
+      if (!bulkCreate) {
+        if (!error) {
+          this.$message.success(this.$tc('common.createSuccessMsg'))
+        } else {
+          this.setFieldError(error)
+        }
+      } else {
+        let result
+        if (error) {
+          result = error.response.data
+        } else {
+          result = resp
+        }
+        this.$emit('bulk-create-done', result)
+      }
+    },
+    setFieldError(error) {
+      const response = error.response
+      const data = response.data
+      const refsAutoDataForm = this.$refs.form.$refs.AutoDataForm
+      if (response.status === 400) {
+        for (const key of Object.keys(data)) {
+          let err = ''
+          let current = key
+          let errorTips = data[current]
+          if (errorTips instanceof Array) {
+            errorTips = _.filter(errorTips, (item) => Object.keys(item).length > 0)
+            for (const i of errorTips) {
+              if (i instanceof Object) {
+                err += i?.port?.join(',')
+              } else {
+                err += errorTips
+              }
+            }
+          } else {
+            err = errorTips
+          }
+          if (current === 'secret') {
+            current = refsAutoDataForm.form.secret_type?.value || key
+          }
+          refsAutoDataForm.setFieldError(current, err)
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/Apps/AccountListTable/AccountList.vue

@@ -0,0 +1,502 @@
+<template>
+  <div>
+    <ListTable ref="ListTable" :header-actions="headerActions" :table-config="tableConfig" />
+    <ViewSecret
+      v-if="showViewSecretDialog"
+      :account="account"
+      :url="secretUrl"
+      :visible.sync="showViewSecretDialog"
+    />
+    <UpdateSecretInfo
+      v-if="showUpdateSecretDialog"
+      :account="account"
+      :visible.sync="showUpdateSecretDialog"
+      @updateAuthDone="onUpdateAuthDone"
+    />
+    <AccountCreateUpdate
+      v-if="showAddDialog"
+      :account="account"
+      :asset="iAsset"
+      :title="accountCreateUpdateTitle"
+      :visible.sync="showAddDialog"
+      @add="addAccountSuccess"
+      @bulk-create-done="showBulkCreateResult($event)"
+    />
+    <AccountCreateUpdate
+      v-if="showAddTemplateDialog"
+      :account="account"
+      :add-template="true"
+      :asset="iAsset"
+      :title="accountCreateUpdateTitle"
+      :visible.sync="showAddTemplateDialog"
+      @add="addAccountSuccess"
+      @bulk-create-done="showBulkCreateResult($event)"
+    />
+    <ResultDialog
+      v-if="showResultDialog"
+      :result="createAccountResults"
+      :visible.sync="showResultDialog"
+    />
+    <AccountBulkUpdateDialog
+      v-if="updateSelectedDialogSetting.visible"
+      :visible.sync="updateSelectedDialogSetting.visible"
+      v-bind="updateSelectedDialogSetting"
+      @update="handleAccountBulkUpdate"
+    />
+  </div>
+</template>
+
+<script>
+import ListTable from '@/components/Table/ListTable/index.vue'
+import { ActionsFormatter } from '@/components/Table/TableFormatters'
+import ViewSecret from './ViewSecret.vue'
+import UpdateSecretInfo from './UpdateSecretInfo.vue'
+import AccountCreateUpdate from './AccountCreateUpdate.vue'
+import { connectivityMeta } from './const'
+import { openTaskPage } from '@/utils/jms'
+import ResultDialog from './BulkCreateResultDialog.vue'
+import AccountBulkUpdateDialog from '@/components/Apps/AccountListTable/AccountBulkUpdateDialog.vue'
+
+export default {
+  name: 'AccountListTable',
+  components: {
+    AccountBulkUpdateDialog,
+    ResultDialog,
+    ListTable,
+    UpdateSecretInfo,
+    ViewSecret,
+    AccountCreateUpdate
+  },
+  props: {
+    url: {
+      type: String,
+      required: true
+    },
+    exportUrl: {
+      type: String,
+      default() {
+        return this.url.replace('/accounts/accounts/', '/accounts/account-secrets/')
+      }
+    },
+    hasLeftActions: {
+      type: Boolean,
+      default: false
+    },
+    otherActions: {
+      type: Array,
+      default: null
+    },
+    hasClone: {
+      type: Boolean,
+      default: false
+    },
+    asset: {
+      type: Object,
+      default: null
+    },
+    columns: {
+      type: Array,
+      default: () => []
+    },
+    hasExport: {
+      type: Boolean,
+      default: true
+    },
+    hasImport: {
+      type: Boolean,
+      default: true
+    },
+    hasDeleteAction: {
+      type: Boolean,
+      default: true
+    },
+    columnsMeta: {
+      type: Object,
+      default: () => {
+      }
+    },
+    columnsDefault: {
+      type: Array,
+      default: () => ([
+        'name', 'username', 'asset', 'privileged',
+        'secret_type', 'is_active', 'date_updated'
+      ])
+    },
+    headerExtraActions: {
+      type: Array,
+      default: () => []
+    },
+    extraQuery: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    const vm = this
+    return {
+      showViewSecretDialog: false,
+      showUpdateSecretDialog: false,
+      showResultDialog: false,
+      showAddDialog: false,
+      showAddTemplateDialog: false,
+      createAccountResults: [],
+      accountCreateUpdateTitle: this.$t('assets.AddAccount'),
+      iAsset: this.asset,
+      account: {},
+      secretUrl: '',
+      tableConfig: {
+        url: this.url,
+        permissions: {
+          app: 'assets',
+          resource: 'account'
+        },
+        extraQuery: this.extraQuery,
+        columnsExclude: ['spec_info'],
+        columnsShow: {
+          min: ['name', 'username', 'actions'],
+          default: this.columnsDefault
+        },
+        columnsMeta: {
+          name: {
+            formatter: function(row) {
+              const to = {
+                name: 'AssetAccountDetail',
+                params: { id: row.id }
+              }
+              if (vm.$hasPerm('accounts.view_account')) {
+                return <router-link to={to}>{row.name}</router-link>
+              } else {
+                return <span>{row.name}</span>
+              }
+            }
+          },
+          asset: {
+            label: this.$t('assets.Asset'),
+            formatter: function(row) {
+              const to = {
+                name: 'AssetDetail',
+                params: { id: row.asset.id }
+              }
+              if (vm.$hasPerm('assets.view_asset')) {
+                return <router-link to={to}>{row.asset.name}</router-link>
+              } else {
+                return <span>{row.asset.name}</span>
+              }
+            }
+          },
+          secret_type: {
+            width: '100px',
+            formatter: function(row) {
+              return row.secret_type.label
+            }
+          },
+          source: {
+            formatter: function(row) {
+              return row.source.label
+            }
+          },
+          has_secret: {
+            width: '100px',
+            formatterArgs: {
+              showFalse: false
+            }
+          },
+          privileged: {
+            label: this.$t('assets.Privileged'),
+            width: '120px',
+            formatterArgs: {
+              showText: false,
+              showFalse: false
+            }
+          },
+          connectivity: connectivityMeta,
+          actions: {
+            formatter: ActionsFormatter,
+            formatterArgs: {
+              hasUpdate: false, // can set function(row, value)
+              hasDelete: false, // can set function(row, value)
+              hasClone: this.hasClone,
+              moreActionsTitle: this.$t('common.More'),
+              extraActions: [
+                {
+                  name: 'View',
+                  title: this.$t('common.View'),
+                  can: this.$hasPerm('accounts.view_accountsecret'),
+                  type: 'primary',
+                  callback: ({ row }) => {
+                    // debugger
+                    vm.secretUrl = `/api/v1/accounts/account-secrets/${row.id}/`
+                    vm.account = row
+                    vm.showViewSecretDialog = false
+                    setTimeout(() => {
+                      vm.showViewSecretDialog = true
+                    })
+                  }
+                },
+                {
+                  name: 'ClearSecret',
+                  title: this.$t('common.ClearSecret'),
+                  can: this.$hasPerm('accounts.change_account'),
+                  type: 'primary',
+                  callback: ({ row }) => {
+                    this.$axios.patch(
+                      `/api/v1/accounts/accounts/clear-secret/`,
+                      { account_ids: [row.id] }
+                    ).then(() => {
+                      this.$message.success(this.$tc('common.ClearSuccessMsg'))
+                    })
+                  }
+                },
+                {
+                  name: 'Test',
+                  title: this.$t('accounts.Test'),
+                  can: ({ row }) =>
+                    !this.$store.getters.currentOrgIsRoot &&
+                    this.$hasPerm('accounts.change_account') &&
+                    row.asset['auto_config'].ansible_enabled &&
+                    row.asset['auto_config'].ping_enabled,
+                  callback: ({ row }) => {
+                    this.$axios.post(
+                      `/api/v1/accounts/accounts/tasks/`,
+                      { action: 'verify', accounts: [row.id] }
+                    ).then(res => {
+                      openTaskPage(res['task'])
+                    })
+                  }
+                },
+                {
+                  name: 'Update',
+                  title: this.$t('common.Update'),
+                  can: this.$hasPerm('accounts.change_account') && !this.$store.getters.currentOrgIsRoot,
+                  callback: ({ row }) => {
+                    const data = {
+                      ...this.asset,
+                      ...row.asset
+                    }
+                    vm.account = row
+                    vm.iAsset = data
+                    vm.showAddDialog = false
+                    vm.accountCreateUpdateTitle = this.$t('assets.UpdateAccount')
+                    setTimeout(() => {
+                      vm.showAddDialog = true
+                    })
+                  }
+                }
+              ]
+            }
+          },
+          ...this.columnsMeta
+        }
+      },
+      headerActions: {
+        hasLabelSearch: true,
+        hasLeftActions: this.hasLeftActions,
+        hasMoreActions: true,
+        hasCreate: false,
+        hasImport: this.hasImport,
+        hasExport: this.hasExport && this.$hasPerm('accounts.view_accountsecret'),
+        handleImportClick: ({ selectedRows }) => {
+          this.$eventBus.$emit('showImportDialog', {
+            selectedRows,
+            url: '/api/v1/accounts/accounts/',
+            name: this?.name
+          })
+        },
+        exportOptions: {
+          url: this.exportUrl,
+          mfaVerifyRequired: true,
+          tips: this.$t('accounts.AccountExportTips')
+        },
+        importOptions: {
+          canImportCreate: this.$hasPerm('accounts.add_account'),
+          canImportUpdate: this.$hasPerm('accounts.change_account')
+        },
+        extraActions: [
+          {
+            name: 'add',
+            title: this.$t('common.Add'),
+            type: 'primary',
+            can: () => {
+              return vm.$hasPerm('accounts.add_account') && !this.$store.getters.currentOrgIsRoot
+            },
+            callback: async() => {
+              await this.getAssetDetail()
+              setTimeout(() => {
+                vm.iAsset = this.asset
+                vm.account = {}
+                vm.accountCreateUpdateTitle = this.$t('assets.AddAccount')
+                vm.showAddDialog = true
+              })
+            }
+          },
+          {
+            name: 'add-template',
+            title: this.$t('common.TemplateAdd'),
+            has: !(this.platform || this.asset),
+            can: () => {
+              return vm.$hasPerm('accounts.add_account') && !this.$store.getters.currentOrgIsRoot
+            },
+            callback: async() => {
+              await this.getAssetDetail()
+              setTimeout(() => {
+                vm.iAsset = this.asset
+                vm.account = {}
+                vm.accountCreateUpdateTitle = this.$t('assets.AddAccount')
+                vm.showAddTemplateDialog = true
+              })
+            }
+          },
+          ...this.headerExtraActions
+        ],
+        extraMoreActions: [
+          {
+            name: 'BulkVerify',
+            title: this.$t('accounts.BulkVerify'),
+            type: 'primary',
+            fa: 'fa-link',
+            can: ({ selectedRows }) => {
+              return selectedRows.length > 0 &&
+                  ['clickhouse', 'redis', 'website', 'chatgpt'].indexOf(selectedRows[0].asset.type.value) === -1 &&
+                  !this.$store.getters.currentOrgIsRoot
+            },
+            callback: function({ selectedRows }) {
+              const ids = selectedRows.map(v => {
+                return v.id
+              })
+              this.$axios.post(
+                '/api/v1/accounts/accounts/tasks/',
+                { action: 'verify', accounts: ids }).then(res => {
+                openTaskPage(res['task'])
+              }).catch(err => {
+                this.$message.error(this.$tc('common.bulkVerifyErrorMsg' + ' ' + err))
+              })
+            }.bind(this)
+          },
+          {
+            name: 'ClearSecrets',
+            title: this.$t('common.ClearSecret'),
+            type: 'primary',
+            fa: 'clean',
+            can: ({ selectedRows }) => {
+              return selectedRows.length > 0 && vm.$hasPerm('accounts.change_account')
+            },
+            callback: function({ selectedRows }) {
+              const ids = selectedRows.map(v => {
+                return v.id
+              })
+              this.$axios.patch(
+                '/api/v1/accounts/accounts/clear-secret/',
+                { account_ids: ids }).then(() => {
+                this.$message.success(this.$tc('common.ClearSuccessMsg'))
+              }).catch(err => {
+                this.$message.error(this.$tc('common.bulkClearErrorMsg' + ' ' + err))
+              })
+            }.bind(this)
+          },
+          {
+            name: 'actionUpdateSelected',
+            title: this.$t('accounts.AccountBatchUpdate'),
+            fa: 'batch-update',
+            can: ({ selectedRows }) => {
+              return selectedRows.length > 0 &&
+                !this.$store.getters.currentOrgIsRoot &&
+                vm.$hasPerm('accounts.change_account') &&
+                selectedRows.every(i => i.secret_type.value === selectedRows[0].secret_type.value)
+            },
+            callback: ({ selectedRows }) => {
+              vm.updateSelectedDialogSetting.selectedRows = selectedRows
+              vm.updateSelectedDialogSetting.visible = true
+            }
+          }
+        ],
+        canBulkDelete: vm.$hasPerm('accounts.delete_account'),
+        searchConfig: {
+          getUrlQuery: false,
+          exclude: ['asset']
+        },
+        hasSearch: true
+      },
+      updateSelectedDialogSetting: {
+        visible: false,
+        selectedRows: []
+      }
+    }
+  },
+  watch: {
+    url(iNew) {
+      this.$set(this.tableConfig, 'url', iNew)
+      this.$set(this.headerActions.exportOptions, 'url', iNew.replace(/(.*)accounts/, '$1account-secrets'))
+    }
+  },
+  mounted() {
+    if (this.columns.length > 0) {
+      this.tableConfig.columns = this.columns
+    }
+    if (this.otherActions) {
+      const actionColumn = this.tableConfig.columns[this.tableConfig.columns.length - 1]
+      for (const item of this.otherActions) {
+        actionColumn.formatterArgs.extraActions.push(item)
+      }
+    }
+    if (this.hasDeleteAction) {
+      this.tableConfig.columnsMeta.actions.formatterArgs.extraActions.push(
+        {
+          name: 'Delete',
+          title: this.$t('common.Delete'),
+          can: this.$hasPerm('accounts.delete_account'),
+          type: 'primary',
+          callback: ({ row }) => {
+            const msg = this.$t('accounts.AccountDeleteConfirmMsg')
+            this.$confirm(msg, this.$tc('common.Info'), {
+              type: 'warning',
+              confirmButtonClass: 'el-button--danger',
+              beforeClose: async(action, instance, done) => {
+                if (action !== 'confirm') return done()
+                this.$axios.delete(`/api/v1/accounts/accounts/${row.id}/`).then(() => {
+                  done()
+                  this.$refs.ListTable.reloadTable()
+                  this.$message.success(this.$tc('common.deleteSuccessMsg'))
+                })
+              }
+            })
+          }
+        }
+      )
+    }
+  },
+  methods: {
+    onUpdateAuthDone(account) {
+      Object.assign(this.account, account)
+    },
+    addAccountSuccess() {
+      this.$refs.ListTable.reloadTable()
+    },
+    async getAssetDetail() {
+      const { query: { asset }} = this.$route
+      if (asset) {
+        this.iAsset = await this.$axios.get(`/api/v1/assets/assets/${asset}/`)
+      }
+    },
+    refresh() {
+      this.$refs.ListTable.reloadTable()
+    },
+    showBulkCreateResult(results) {
+      this.showResultDialog = false
+      this.createAccountResults = results
+      setTimeout(() => {
+        this.showResultDialog = true
+      }, 100)
+    },
+    handleAccountBulkUpdate() {
+      this.updateSelectedDialogSetting.visible = false
+      this.$refs.ListTable.reloadTable()
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.cell a {
+  color: var(--color-info);
+}
+</style>

src/components/Apps/AccountListTable/BulkCreateResultDialog.vue

@@ -0,0 +1,120 @@
+<template>
+  <Dialog
+    :show-cancel="false"
+    :title="title"
+    v-bind="$attrs"
+    @confirm="closeDialog"
+    v-on="$listeners"
+  >
+    <el-alert style="margin-bottom: 10px" type="success">
+      <span v-for="item of summary" :key="item.key"><b>{{ item.label }}</b>: {{ item.value }} </span>
+    </el-alert>
+    <DataTable :config="config" />
+  </Dialog>
+</template>
+
+<script>
+import Dialog from '@/components/Dialog/index.vue'
+import DataTable from '@/components/Table/DataTable/index.vue'
+
+export default {
+  name: 'ResultDialog',
+  components: {
+    DataTable,
+    Dialog
+  },
+  props: {
+    result: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    const errorProp = this.$t('common.Error')
+    const stateMap = {
+      'created': this.$tc('common.Created'),
+      'updated': this.$tc('common.Updated'),
+      'skipped': this.$tc('common.Skipped')
+    }
+    const stateClsMap = {
+      'created': 'color-primary',
+      'updated': 'color-success',
+      'skipped': 'color-default'
+    }
+    return {
+      title: this.$t('accounts.AddAccountResult'),
+      config: {
+        columns: [
+          {
+            prop: 'asset',
+            label: this.$t('assets.Asset')
+          },
+          {
+            prop: 'state',
+            label: this.$t('common.Status'),
+            width: '200px',
+            formatter: (row) => {
+              if (row.error) {
+                return <span class='color-error'>{ errorProp }: { row.error }</span>
+              } else if (row.state) {
+                const colorCls = stateClsMap[row.state]
+                const state = stateMap[row.state]
+                return <span class={ colorCls }>{ state }</span>
+              }
+            }
+          }
+        ],
+        totalData: this.result
+      }
+    }
+  },
+  computed: {
+    summary() {
+      const labels = {
+        total: this.$tc('common.Total'),
+        created: this.$tc('common.Created'),
+        updated: this.$tc('common.Updated'),
+        skipped: this.$tc('common.Skipped'),
+        error: this.$tc('common.Error')
+      }
+      const grouped = _.groupBy(this.result, 'state')
+      const groupedLength = _.mapValues(grouped, 'length')
+      groupedLength['total'] = this.result.length
+      return _.map(groupedLength, (value, key) => {
+        return {
+          label: labels[key],
+          value: value,
+          key: key
+        }
+      })
+    }
+  },
+  methods: {
+    closeDialog() {
+      this.$emit('update:visible', false)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.color-error {
+  color: var(--color-danger);
+}
+
+.color-primary {
+  color: var(--color-primary);
+}
+
+.color-success {
+  color: var(--color-success);
+}
+
+.color-default {
+}
+
+::v-deep .el-data-table .el-table .el-table__row > td > div > span {
+  white-space: inherit;
+}
+
+</style>

src/components/Apps/AccountListTable/PasswordHistoryDialog.vue

@@ -0,0 +1,78 @@
+<template>
+  <GenericListTableDialog :visible.sync="iVisible" v-bind="config" />
+</template>
+
+<script>
+import { GenericListTableDialog } from '@/layout/components'
+import { ShowKeyCopyFormatter } from '@/components/Table/TableFormatters'
+
+export default {
+  components: {
+    GenericListTableDialog
+  },
+  props: {
+    account: {
+      type: Object,
+      default: () => ({})
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      config: {
+        title: this.$t('accounts.HistoryPassword'),
+        visible: false,
+        width: '60%',
+        tableConfig: {
+          id: 'history_date',
+          url: `/api/v1/accounts/account-secrets/${this.account.id}/histories/`,
+          columns: ['secret', 'version', 'history_date'],
+          columnsMeta: {
+            secret: {
+              label: this.$t('assets.Password'),
+              formatter: ShowKeyCopyFormatter,
+              formatterArgs: {
+                hasDownload: false,
+                name: this.account.name
+              }
+            },
+            history_date: {
+              label: this.$t('accounts.HistoryDate')
+            },
+            secret_type: {
+              width: '200px'
+            },
+            version: {
+              width: '100px'
+            },
+            actions: {
+              has: false
+            }
+          }
+        },
+        headerActions: {
+          hasLeftActions: false,
+          hasSearch: false
+        }
+      }
+    }
+  },
+  computed: {
+    iVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:visible', val)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/Apps/AccountListTable/RemoveAccount.vue

@@ -0,0 +1,112 @@
+<template>
+  <Dialog
+    :destroy-on-close="true"
+    :show-cancel="false"
+    :visible.sync="show"
+    :width="'50'"
+    v-bind="$attrs"
+    @confirm="accountConfirmHandle"
+    v-on="$listeners"
+  />
+</template>
+
+<script>
+import Dialog from '@/components/Dialog/index.vue'
+import { openTaskPage } from '@/utils/jms'
+
+export default {
+  name: 'RemoveAccount',
+  components: {
+    Dialog
+  },
+  props: {
+    accounts: {
+      type: Array,
+      default: () => []
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      show: false,
+      mfaDialogVisible: true
+    }
+  },
+  computed: {},
+  mounted() {
+    const url = `/api/v1/accounts/accounts/tasks/`
+    this.$axios.post(
+      url, { disableFlashErrorMsg: true, action: 'remove' }
+    ).then(resp => {
+      this.$axios.post(
+        `/api/v1/accounts/accounts/tasks/`,
+        {
+          action: 'remove',
+          gather_accounts: this.accounts.map(account => account.id)
+        }
+      ).then(res => {
+        openTaskPage(res['task'])
+      })
+    })
+  },
+  methods: {
+    accountConfirmHandle() {
+      this.show = false
+      this.mfaDialogVisible = false
+    },
+    exit() {
+      this.$emit('update:visible', false)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.item-textarea > > > .el-textarea__inner {
+  height: 110px;
+}
+
+.el-form-item {
+  border-bottom: 1px solid #EBEEF5;
+  padding: 5px 0;
+  margin-bottom: 0;
+
+  &:last-child {
+    border-bottom: none;
+  }
+
+  > > > .el-form-item__label {
+    padding-right: 20px;
+    line-height: 30px;
+  }
+
+  > > > .el-form-item__content {
+    line-height: 30px;
+
+    pre {
+      margin: 0;
+    }
+  }
+}
+
+ul {
+  margin: 0;
+}
+
+li {
+  display: block;
+  font-size: 13px;
+  margin-bottom: 8px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+
+  .title {
+    color: #303133;
+    font-weight: 500;
+  }
+}
+</style>

src/components/Apps/AccountListTable/UpdateSecretInfo.vue

@@ -1,27 +1,27 @@
 <template>
   <Dialog
-    width="50"
-    :title="this.$t('assets.UpdateAssetUserToken')"
-    :visible.sync="visible"
     :destroy-on-close="true"
-    @confirm="handleConfirm()"
+    :title="$tc('assets.UpdateAssetUserToken')"
+    :visible.sync="visible"
+    width="50"
     @cancel="handleCancel()"
+    @confirm="handleConfirm()"
     v-on="$listeners"
   >
     <el-form label-position="right" label-width="90px">
-      <el-form-item :label="this.$t('assets.Hostname')">
-        <el-input v-model="account.hostname" readonly />
+      <el-form-item :label="$tc('assets.Name')">
+        <el-input v-model="account['asset_name']" readonly />
       </el-form-item>
-      <el-form-item :label="this.$t('assets.Username')">
+      <el-form-item :label="$tc('assets.Username')">
         <el-input v-model="account['username']" readonly />
       </el-form-item>
-      <el-form-item :label="this.$t('assets.Password')">
+      <el-form-item :label="$tc('assets.Password')">
         <UpdateToken v-model="authInfo.password" />
       </el-form-item>
-      <el-form-item :label="this.$t('assets.SSHSecretKey')">
+      <el-form-item :label="$tc('assets.SSHSecretKey')">
         <UploadKey @input="getFile" />
       </el-form-item>
-      <el-form-item :label="this.$t('assets.Passphrase')">
+      <el-form-item :label="$tc('assets.Passphrase')">
         <UpdateToken v-model="authInfo.passphrase" />
       </el-form-item>
     </el-form>
@@ -29,8 +29,10 @@
 </template>
 
 <script>
-import Dialog from '@/components/Dialog'
-import { UpdateToken, UploadKey } from '@/components/FormFields'
+import Dialog from '@/components/Dialog/index.vue'
+import { UpdateToken, UploadKey } from '@/components/Form/FormFields'
+import { encryptPassword } from '@/utils/crypto'
+
 export default {
   name: 'UpdateSecretInfo',
   components: {
@@ -50,7 +52,7 @@ export default {
   },
   data() {
     return {
-      authInfo: {
+      secretInfo: {
         password: '',
         private_key: '',
         passphrase: ''
@@ -60,15 +62,15 @@ export default {
   methods: {
     handleConfirm() {
       const data = {}
-      if (this.authInfo.password !== '') {
-        data.password = this.authInfo.password
+      if (this.secretInfo.password !== '') {
+        data.password = encryptPassword(this.secretInfo.password)
       }
-      if (this.authInfo.private_key !== '') {
-        data.private_key = this.authInfo.private_key
-        if (this.authInfo.passphrase) data.passphrase = this.authInfo.passphrase
+      if (this.secretInfo.private_key !== '') {
+        data.private_key = encryptPassword(this.secretInfo.private_key)
+        if (this.secretInfo.passphrase) data.passphrase = this.secretInfo.passphrase
       }
       this.$axios.patch(
-        `/api/v1/assets/accounts/${this.account.id}/`,
+        `/api/v1/accounts/accounts/${this.account.id}/`,
         data,
         { disableFlashErrorMsg: true }
       ).then(res => {
@@ -86,7 +88,7 @@ export default {
       this.$emit('update:visible', false)
     },
     getFile(file) {
-      this.authInfo.private_key = file
+      this.secretInfo.private_key = file
     }
   }
 }

src/components/Apps/AccountListTable/ViewSecret.vue

@@ -0,0 +1,214 @@
+<template>
+  <div>
+    <Dialog
+      :destroy-on-close="true"
+      :show-cancel="false"
+      :title="title"
+      :visible.sync="showSecret"
+      :width="'50'"
+      v-bind="$attrs"
+      @confirm="accountConfirmHandle"
+      v-on="$listeners"
+    >
+      <el-form :model="secretInfo" class="password-form" label-position="right" label-width="100px">
+        <el-form-item :label="$tc('assets.Name')">
+          <span>{{ account['name'] }}</span>
+        </el-form-item>
+        <el-form-item :label="$tc('assets.Username')">
+          <span>{{ account['username'] }}</span>
+        </el-form-item>
+        <el-form-item :label="secretTypeLabel">
+          <ShowKeyCopyFormatter
+            :cell-value="secretInfo.secret"
+            :col="{ formatterArgs: {
+              name: account['name'],
+              secretType: secretType || ''
+            }}"
+            @input="onShowKeyCopyFormatterChange"
+          />
+        </el-form-item>
+        <el-form-item v-if="secretType === 'ssh_key'" :label="$tc('assets.sshKeyFingerprint')">
+          <span>{{ sshKeyFingerprint }}</span>
+        </el-form-item>
+        <el-form-item :label="$tc('common.DateCreated')">
+          <span>{{ account['date_created'] | date }}</span>
+        </el-form-item>
+        <el-form-item :label="$tc('common.DateUpdated')">
+          <span>{{ account['date_updated'] | date }}</span>
+        </el-form-item>
+        <el-form-item v-if="showPasswordRecord" v-perms="'accounts.view_accountsecret'" :label="$tc('accounts.PasswordRecord')">
+          <el-link
+            :underline="false"
+            type="success"
+            @click="showHistoryDialog"
+          >
+            <span style="padding-right: 30px">
+              {{ versions }}
+            </span>
+          </el-link>
+        </el-form-item>
+      </el-form>
+    </Dialog>
+    <PasswordHistoryDialog
+      v-if="showPasswordHistoryDialog"
+      :account="account"
+      :visible.sync="showPasswordHistoryDialog"
+    />
+  </div>
+</template>
+
+<script>
+import Dialog from '@/components/Dialog/index.vue'
+import PasswordHistoryDialog from './PasswordHistoryDialog.vue'
+import { ShowKeyCopyFormatter } from '@/components/Table/TableFormatters'
+import { encryptPassword } from '@/utils/crypto'
+
+export default {
+  name: 'ShowSecretInfo',
+  components: {
+    Dialog,
+    PasswordHistoryDialog,
+    ShowKeyCopyFormatter
+  },
+  props: {
+    account: {
+      type: Object,
+      default: () => ({})
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    url: {
+      type: String,
+      default: ''
+    },
+    type: {
+      type: String,
+      default: 'account'
+    },
+    title: {
+      type: String,
+      default: function() {
+        return this.$tc('assets.AccountDetail')
+      }
+    },
+    showPasswordRecord: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      modifiedSecret: '',
+      secretInfo: {},
+      versions: '-',
+      showSecret: false,
+      mfaDialogVisible: true,
+      sshKeyFingerprint: '-',
+      historyCount: 0,
+      showPasswordHistoryDialog: false
+    }
+  },
+  computed: {
+    secretTypeLabel() {
+      return this.account['secret_type'].label || 'Password'
+    },
+    secretType() {
+      return this.account['secret_type'].value
+    }
+  },
+  mounted() {
+    if (this.showPasswordRecord) {
+      const url = `/api/v1/accounts/account-secrets/${this.account.id}/histories/?limit=1`
+      this.$axios.get(url, { disableFlashErrorMsg: true }).then(resp => {
+        this.versions = resp.count
+        this.showSecretDialog()
+      })
+    } else {
+      this.showSecretDialog()
+    }
+  },
+  methods: {
+    accountConfirmHandle() {
+      this.modifiedSecret && this.onChangeSecretSubmit()
+      this.showSecret = false
+      this.mfaDialogVisible = false
+    },
+    onChangeSecretSubmit() {
+      const params = {
+        name: this.secretInfo.name,
+        secret: encryptPassword(this.modifiedSecret)
+      }
+      const url = this.type === 'account' ? `/api/v1/accounts/accounts` : `/api/v1/accounts/account-templates`
+      this.$axios.patch(`${url}/${this.account.id}/`, params).then(() => {
+        this.$message.success(this.$tc('common.updateSuccessMsg'))
+      })
+    },
+    showSecretDialog() {
+      return this.$axios.get(this.url, { disableFlashErrorMsg: true }).then((res) => {
+        this.secretInfo = res
+        this.sshKeyFingerprint = res?.spec_info?.ssh_key_fingerprint || '-'
+        this.showSecret = true
+      })
+    },
+    exit() {
+      this.$emit('update:visible', false)
+    },
+    showHistoryDialog() {
+      this.showPasswordHistoryDialog = true
+    },
+    onShowKeyCopyFormatterChange(value) {
+      if (value === this.secretInfo.secret) return
+      this.modifiedSecret = value
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .item-textarea >>> .el-textarea__inner {
+    height: 110px;
+  }
+
+  .el-form-item {
+    border-bottom: 1px solid #EBEEF5;
+    padding: 5px 0;
+    margin-bottom: 0;
+
+    &:last-child {
+      border-bottom: none;
+    }
+
+    >>> .el-form-item__label {
+      padding-right: 20px;
+      line-height: 30px;
+    }
+
+    >>> .el-form-item__content {
+      line-height: 30px;
+
+      pre {
+        margin: 0;
+      }
+    }
+  }
+
+  ul {
+    margin: 0;
+  }
+
+  li {
+    display: block;
+    font-size: 13px;
+    margin-bottom: 8px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+
+    .title {
+      color: #303133;
+      font-weight: 500;
+    }
+  }
+</style>

src/components/Apps/AccountListTable/const.js

@@ -0,0 +1,26 @@
+import i18n from '@/i18n/i18n'
+import { ChoicesFormatter } from '@/components/Table/TableFormatters'
+
+export const connectivityMeta = {
+  label: i18n.t('assets.Connectivity'),
+  formatter: ChoicesFormatter,
+  formatterArgs: {
+    faChoices: {
+      '-': '',
+      ok: 'fa-check-circle',
+      err: 'fa-times-circle'
+    },
+    classChoices: {
+      ok: 'text-primary',
+      err: 'text-danger'
+    },
+    getText({ cellValue }) {
+      if (cellValue?.value === '-' || cellValue?.value === 'unknown') {
+        return '-'
+      } else {
+        return cellValue?.label
+      }
+    }
+  },
+  width: '100px'
+}

src/components/Apps/AssetRelationCard/index.vue

@@ -1,14 +1,14 @@
 <template>
-  <IBox :fa="icon" :type="type" :title="title" v-bind="$attrs">
+  <IBox :fa="icon" :title="title" :type="type" v-bind="$attrs">
     <table style="width: 100%">
       <tr>
         <td colspan="2">
-          <AssetSelect ref="assetSelect" :disabled="disabled" :can-select="canSelect" />
+          <AssetSelect ref="assetSelect" :can-select="canSelect" :disabled="disabled" />
         </td>
       </tr>
       <tr>
         <td colspan="2">
-          <el-button :type="type" size="small" :disabled="disabled" @click="addObjects">{{ $t('common.Add') }}</el-button>
+          <el-button :disabled="disabled" :type="type" size="small" @click="addObjects">{{ $t('common.Add') }}</el-button>
         </td>
       </tr>
     </table>
@@ -16,8 +16,8 @@
 </template>
 
 <script>
-import IBox from '@/components/IBox'
-import AssetSelect from '@/components/AssetSelect'
+import IBox from '@/components/IBox/index.vue'
+import AssetSelect from '@/components/Apps/AssetSelect/index.vue'
 
 export default {
   name: 'AssetRelationCard',

src/components/Apps/AssetSelect/dialog.vue

@@ -0,0 +1,195 @@
+<template>
+  <Dialog
+    :close-on-click-modal="false"
+    :loading-status="!isLoaded"
+    :title="$tc('assets.Assets')"
+    custom-class="asset-select-dialog"
+    top="2vh"
+    v-bind="$attrs"
+    width="1000px"
+    @cancel="handleCancel"
+    @close="handleClose"
+    @confirm="handleConfirm"
+    v-on="$listeners"
+  >
+    <AssetTreeTable
+      ref="ListPage"
+      :header-actions="headerActions"
+      :node-url="baseNodeUrl"
+      :table-config="tableConfig"
+      :tree-url="`${baseNodeUrl}children/tree/`"
+      :url="baseUrl"
+      :tree-setting="treeSetting"
+      class="tree-table"
+      v-bind="$attrs"
+      @loaded="handleTableLoaded"
+    />
+  </Dialog>
+</template>
+
+<script>
+import AssetTreeTable from '@/components/Apps/AssetTreeTable/index.vue'
+import Dialog from '@/components/Dialog/index.vue'
+
+export default {
+  componentName: 'AssetSelectDialog',
+  components: { AssetTreeTable, Dialog },
+  props: {
+    baseUrl: {
+      type: String,
+      default: '/api/v1/assets/assets/'
+    },
+    baseNodeUrl: {
+      type: String,
+      default: '/api/v1/assets/nodes/'
+    },
+    value: {
+      type: Array,
+      default: () => []
+    },
+    canSelect: {
+      type: Function,
+      default(row, index) {
+        return true
+      }
+    },
+    disabled: {
+      type: [Boolean, Function],
+      default: false
+    },
+    treeSetting: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    const vm = this
+    return {
+      isLoaded: false,
+      dialogVisible: false,
+      rowSelected: _.cloneDeep(this.value) || [],
+      rowsAdd: [],
+      tableConfig: {
+        url: this.baseUrl,
+        hasTree: true,
+        canSelect: this.canSelect,
+        columns: [
+          {
+            prop: 'name',
+            label: this.$t('assets.Name'),
+            sortable: true
+          },
+          {
+            prop: 'address',
+            label: this.$t('assets.ipDomain'),
+            sortable: 'custom'
+          },
+          {
+            prop: 'platform',
+            label: this.$t('assets.Platform'),
+            sortable: true,
+            formatter: function(row) {
+              return row.platform.name
+            }
+          },
+          {
+            prop: 'actions',
+            has: false
+          }
+        ],
+        listeners: {
+          'toggle-row-selection': (isSelected, row) => {
+            if (isSelected) {
+              vm.addRowToSelect(row)
+            } else {
+              vm.removeRowFromSelect(row)
+            }
+          }
+        },
+        theRowDefaultIsSelected: (row) => {
+          return this.value.indexOf(row.id) > -1
+        }
+      },
+      headerActions: {
+        hasLeftActions: false,
+        hasRightActions: false,
+        hasLabelSearch: true,
+        searchConfig: {
+          getUrlQuery: false
+        }
+      }
+    }
+  },
+  methods: {
+    handleClose() {
+      this.$eventBus.$emit('treeComponentKey')
+    },
+    handleConfirm() {
+      this.$emit('confirm', this.rowSelected, this.rowsAdd)
+      if (this.rowSelected.length > 0) {
+        this.handleClose()
+      }
+    },
+    handleCancel() {
+      this.$emit('cancel')
+      this.handleClose()
+    },
+    addRowToSelect(row) {
+      const selectValueIndex = this.rowSelected.indexOf(row.id)
+      if (selectValueIndex === -1) {
+        this.rowSelected.push(row.id)
+        this.rowsAdd.push(row)
+      }
+    },
+    removeRowFromSelect(row) {
+      const selectValueIndex = this.rowSelected.indexOf(row.id)
+      if (selectValueIndex > -1) {
+        this.rowSelected.splice(selectValueIndex, 1)
+      }
+    },
+    handleTableLoaded() {
+      this.isLoaded = true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page ::v-deep .page-heading {
+  display: none;
+}
+
+.el-dialog__wrapper ::v-deep .el-dialog__body {
+  padding: 0 0 0 3px;
+
+  .tree-table {
+    .search {
+    }
+
+    .left {
+      padding: 5px;
+    }
+
+    .right {
+      min-height: 500px;
+      overflow: auto;
+    }
+
+    .mini {
+      padding-top: 8px;
+    }
+
+    .transition-box {
+      padding: 10px 5px;
+    }
+  }
+}
+
+.page ::v-deep .treebox .ztree {
+
+}
+
+.asset-select-dialog ::v-deep .el-icon-circle-check {
+  display: none;
+}
+</style>

src/components/Apps/AssetSelect/index.vue

@@ -0,0 +1,158 @@
+<template>
+  <div class="asset-select-formatter">
+    <Select2
+      ref="select2"
+      v-model="select2Config.value"
+      v-bind="select2Config"
+      @input="onInputChange"
+      v-on="$listeners"
+      @focus.stop="handleFocus"
+    />
+    <AssetSelectDialog
+      v-if="dialogVisible"
+      ref="dialog"
+      :base-node-url="baseNodeUrl"
+      :base-url="baseUrl"
+      :tree-setting="treeSetting"
+      :tree-url-query="treeUrlQuery"
+      :value="value"
+      :visible.sync="dialogVisible"
+      v-bind="$attrs"
+      @cancel="handleCancel"
+      @confirm="handleConfirm"
+      v-on="$listeners"
+    />
+  </div>
+</template>
+
+<script>
+import Select2 from '@/components/Form/FormFields/Select2.vue'
+import AssetSelectDialog from './dialog.vue'
+
+export default {
+  componentName: 'AssetSelect',
+  components: { AssetSelectDialog, Select2 },
+  props: {
+    baseUrl: {
+      type: String,
+      default: '/api/v1/assets/assets/'
+    },
+    baseNodeUrl: {
+      type: String,
+      default: '/api/v1/assets/nodes/'
+    },
+    treeUrlQuery: {
+      type: Object,
+      default: () => {}
+    },
+    value: {
+      type: Array,
+      default: () => []
+    },
+    treeSetting: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    const iValue = []
+    for (const item of this.value) {
+      if (typeof item === 'object') {
+        iValue.push(item.id)
+      } else {
+        iValue.push(item)
+      }
+    }
+    return {
+      dialogVisible: false,
+      initialValue: _.cloneDeep(iValue),
+      select2Config: {
+        value: iValue,
+        multiple: true,
+        clearable: true,
+        ajax: {
+          url: this.baseUrl,
+          transformOption: (item) => {
+            return { label: item.name + '(' + item.address + ')', value: item.id }
+          }
+        }
+      }
+    }
+  },
+  methods: {
+    handleFocus() {
+      this.$refs.select2.selectRef.blur()
+      this.dialogVisible = true
+    },
+    handleConfirm(valueSelected, rowsAdd) {
+      if (valueSelected === undefined) {
+        return
+      }
+      this.$refs.select2.iValue = valueSelected
+      this.addRowsToSelect(rowsAdd)
+      this.onInputChange(valueSelected)
+      this.dialogVisible = false
+    },
+    handleCancel() {
+      this.dialogVisible = false
+    },
+    onInputChange(val) {
+      this.$emit('change', val)
+    },
+    addToSelect(options, row) {
+      const selectOptionsHas = options.find(item => item.value === row.id)
+      // 如果select2的options中没有，那么可能无法显示正常的值
+      if (selectOptionsHas === undefined) {
+        const option = {
+          label: `${row.name}(${row.address})`,
+          value: row.id
+        }
+        options.push(option)
+      }
+    },
+    addRowsToSelect(rows) {
+      const outSelectOptions = this.$refs.select2.options
+      for (const row of rows) {
+        this.addToSelect(outSelectOptions, row)
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.el-select {
+  width: 100%;
+}
+
+.page ::v-deep .page-heading {
+  display: none;
+}
+
+.el-dialog__wrapper ::v-deep .el-dialog__body {
+  padding: 0 0 0 3px;
+
+  .tree-table {
+    .left {
+      padding: 5px;
+
+      .ztree {
+        min-height: 500px;
+        height: inherit !important;
+      }
+    }
+
+    .mini {
+      padding-top: 8px;
+    }
+
+    .transition-box {
+      padding: 10px 5px;
+    }
+  }
+}
+
+.page ::v-deep .treebox {
+  height: inherit !important;
+}
+</style>

src/components/Apps/AssetTreeTable/index.vue

@@ -0,0 +1,186 @@
+<template>
+  <TreeTable
+    ref="TreeList"
+    :active-menu.sync="treeTableConfig.activeMenu"
+    :table-config="tableConfig"
+    :tree-tab-config="treeTableConfig"
+    component="TabTree"
+    v-bind="$attrs"
+    v-on="$listeners"
+  >
+    <template #table>
+      <slot name="table" />
+    </template>
+    <div slot="rMenu" slot-scope="{data}">
+      <slot :data="data" name="rMenu" />
+    </div>
+  </TreeTable>
+</template>
+
+<script>
+import TreeTable from '../../Table/TreeTable/index.vue'
+import { setRouterQuery, setUrlParam } from '@/utils/common'
+import $ from '@/utils/jquery-vendor'
+
+export default {
+  components: {
+    TreeTable
+  },
+  props: {
+    url: {
+      type: String,
+      default: '/api/v1/assets/assets/'
+    },
+    typeUrl: {
+      type: String,
+      default: '/api/v1/assets/nodes/category/tree/'
+    },
+    nodeUrl: {
+      type: String,
+      default: '/api/v1/assets/nodes/'
+    },
+    treeUrl: {
+      type: String,
+      default: '/api/v1/assets/nodes/children/tree/'
+    },
+    treeUrlQuery: {
+      type: Object,
+      default: () => ({})
+    },
+    treeSetting: {
+      type: Object,
+      default: () => ({})
+    },
+    tableConfig: {
+      type: Object,
+      default: () => ({})
+    },
+    showAssets: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    const showAssets = this.treeSetting?.showAssets || this.showAssets
+    const treeUrlQuery = this.setTreeUrlQuery()
+    const assetTreeUrl = `${this.treeUrl}?assets=${showAssets ? '1' : '0'}&${treeUrlQuery}`
+    const vm = this
+
+    return {
+      treeTabConfig: {
+        activeMenu: 'CustomTree',
+        submenu: [
+          {
+            title: this.$t('assets.AssetTree'),
+            name: 'CustomTree',
+            treeSetting: {
+              showAssets,
+              showMenu: false,
+              showRefresh: true,
+              showCreate: true,
+              showUpdate: true,
+              showDelete: true,
+              hasRightMenu: true,
+              showSearch: true,
+              url: this.url,
+              nodeUrl: this.nodeUrl,
+              treeUrl: assetTreeUrl,
+              callback: {
+                onSelected: (event, treeNode) => this.getAssetsUrl(treeNode),
+                beforeRefresh: () => {
+                  const query = { ...this.$route.query, node_id: '', asset_id: '' }
+                  setTimeout(() => {
+                    vm.$router.replace({ query: query })
+                  }, 100)
+                }
+              },
+              ...this.treeSetting
+            }
+          },
+          {
+            title: this.$t('assets.BuiltinTree'),
+            name: 'BuiltinTree',
+            treeSetting: {
+              showRefresh: true,
+              showAssets: false,
+              showSearch: false,
+              customTreeHeaderName: this.$t('assets.BuiltinTree'),
+              url: this.typeUrl,
+              nodeUrl: this.treeSetting?.nodeUrl || this.nodeUrl,
+              treeUrl: `${this.typeUrl}?assets=${showAssets ? '1' : '0'}&count_resource=${this.treeSetting.countResource || 'asset'}`,
+              callback: {
+                onSelected: (event, treeNode) => this.getAssetsUrl(treeNode)
+              }
+            }
+          }
+        ]
+      }
+    }
+  },
+  computed: {
+    treeTableConfig() {
+      if (this.treeSetting.notShowBuiltinTree) {
+        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+        this.treeTabConfig.submenu.splice(1, 1)
+      }
+      return this.treeTabConfig
+    }
+  },
+  mounted() {
+    this.decorateRMenu()
+    const treeSetting = this.treeTabConfig.submenu[0].treeSetting
+    treeSetting.hasRightMenu = !this.currentOrgIsRoot
+    treeSetting.showCreate = this.$hasPerm('assets.add_node')
+    treeSetting.showUpdate = this.$hasPerm('assets.change_node')
+    treeSetting.showDelete = this.$hasPerm('assets.delete_node')
+  },
+  methods: {
+    setTreeUrlQuery() {
+      let str = ''
+      for (const key in this.treeUrlQuery) {
+        str += `${key}=${this.treeUrlQuery[key]}&`
+      }
+      str = str.substr(0, str.length - 1)
+
+      return str
+    },
+    decorateRMenu() {
+      const show_current_asset = this.$cookie.get('show_current_asset') || '0'
+      if (show_current_asset === '1') {
+        $('#m_show_asset_all_children_node').css('color', '#606266')
+        $('#m_show_asset_only_current_node').css('color', 'green')
+      } else {
+        $('#m_show_asset_all_children_node').css('color', 'green')
+        $('#m_show_asset_only_current_node').css('color', '#606266')
+      }
+    },
+    getAssetsUrl(treeNode) {
+      let url = this.treeSetting?.url || this.url
+      if (treeNode.meta.type === 'node') {
+        const nodeId = treeNode.meta.data.id
+        url = setUrlParam(url, 'node_id', nodeId)
+        url = setUrlParam(url, 'asset_id', '')
+      } else if (treeNode.meta.type === 'asset') {
+        const assetId = treeNode.meta.data?.id || treeNode.id
+        url = setUrlParam(url, 'node_id', '')
+        url = setUrlParam(url, 'asset_id', assetId)
+      } else if (treeNode.meta.type === 'category') {
+        url = setUrlParam(url, 'category', treeNode.meta.category)
+      } else if (treeNode.meta.type === 'type') {
+        url = setUrlParam(url, 'category', treeNode.meta.category)
+        url = setUrlParam(url, 'type', treeNode.meta._type)
+      } else if (treeNode.meta.type === 'platform') {
+        url = setUrlParam(url, 'platform', treeNode.id)
+      }
+      const query = this.setTreeUrlQuery()
+      url = query ? `${url}&${query}` : url
+      this.$set(this.tableConfig, 'url', url)
+      setRouterQuery(this, url)
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+
+</style>

src/components/Apps/AutomationParams/index.vue

@@ -0,0 +1,203 @@
+<template>
+  <div>
+    <div>
+      <el-button
+        :disabled="isDisabled"
+        size="mini"
+        type="primary"
+        @click="onOpenDialog"
+      >
+        {{ $tc('common.Setting') }}
+      </el-button>
+    </div>
+    <Dialog
+      v-if="visible"
+      :destroy-on-close="true"
+      :show-cancel="false"
+      :show-confirm="false"
+      :title="title"
+      :visible.sync="visible"
+      v-bind="$attrs"
+      width="60%"
+      v-on="$listeners"
+    >
+      <AutoDataForm
+        ref="autoDataForm"
+        :form="form"
+        class="data-form"
+        v-bind="config"
+        @submit="onSubmit"
+      />
+    </Dialog>
+  </div>
+</template>
+
+<script>
+import Dialog from '../../Dialog'
+import AutoDataForm from '../../Form/AutoDataForm'
+
+export default {
+  componentName: 'AutomationParams',
+  components: {
+    Dialog,
+    AutoDataForm
+  },
+  props: {
+    value: {
+      type: Object,
+      default: () => ({})
+    },
+    title: {
+      type: String,
+      default: function() {
+        return this.$t('assets.PushParams')
+      }
+    },
+    assets: {
+      type: Array,
+      default: () => []
+    },
+    nodes: {
+      type: Array,
+      default: () => []
+    },
+    platforms: {
+      type: Array,
+      default: () => []
+    },
+    method: {
+      type: String,
+      default: ''
+    },
+    url: {
+      type: String,
+      default: `/api/v1/assets/platform-automation-methods/`
+    }
+  },
+  data() {
+    const vm = this
+    return {
+      remoteMeta: {},
+      visible: false,
+      isDisabled: true,
+      form: this.value,
+      config: {
+        url: this.url,
+        hasSaveContinue: false,
+        hasButtons: true,
+        method: 'get',
+        fields: [],
+        fieldsMeta: {}
+      },
+      onFieldChangeHandler: _.debounce(vm.handleFieldChange, 1000)
+    }
+  },
+  computed: {
+    refForm() {
+      return this.$refs.autoDataForm
+    }
+  },
+  watch: {
+    nodes: {
+      handler() {
+        this.onFieldChangeHandler()
+      },
+      deep: true
+    },
+    assets: {
+      handler() {
+        this.onFieldChangeHandler()
+      },
+      deep: true
+    },
+    platforms: {
+      handler(newVal) {
+        this.onFieldChangeHandler()
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  async mounted() {
+    await this.getUrlMeta()
+  },
+  methods: {
+    async getUrlMeta() {
+      const data = await this.$store.dispatch('common/getUrlMeta', { url: this.url })
+      this.remoteMeta = data.actions[this.config.method.toUpperCase()] || {}
+    },
+    async getFilterPlatforms() {
+      return await this.$axios.post(
+        '/api/v1/assets/platforms/filter-nodes-assets/',
+        {
+          'node_ids': this.nodes,
+          'asset_ids': this.assets,
+          'platform_ids': this.platforms.map(i => i.id || i.pk || i)
+        }
+      )
+    },
+    async handleFieldChange() {
+      const platforms = await this.getFilterPlatforms()
+      let pushAccountMethods = platforms.map(i => i.automation[this.method])
+      pushAccountMethods = _.uniq(pushAccountMethods)
+      // 检测是否有可设置的推送方式
+      const hasCanSettingPushMethods = _.intersection(pushAccountMethods, Object.keys(this.remoteMeta))
+      this.setFormConfig(hasCanSettingPushMethods)
+      this.isDisabled = hasCanSettingPushMethods.length <= 0
+    },
+    setFormConfig(methods) {
+      const newForm = {}
+      const fields = []
+      const fieldsMeta = {}
+      this.config.fields = []
+      // Todo: 未来改成后端处理，生成 serializer, 这里就不用判断类型了
+      const typeMapper = {
+        'string': 'input',
+        'boolean': 'switch'
+      }
+
+      for (const method of methods) {
+        const filterField = this.remoteMeta[method] || {}
+        // 修改资产、节点时不点击设置按钮也需要获取form表单值暴露出去
+        if (this.form.hasOwnProperty(method)) {
+          newForm[method] = this.form[method]
+        }
+        fields.push([filterField.label, [method]])
+        fieldsMeta[method] = {
+          fields: [],
+          fieldsMeta: {}
+        }
+        if (Object.keys(filterField?.children || {}).length > 0) {
+          for (const [k, v] of Object.entries(filterField.children)) {
+            const item = {
+              ...v,
+              type: typeMapper[v.type] || 'input'
+            }
+            delete item.default
+            fieldsMeta[method].fields.push(k)
+            fieldsMeta[method].fieldsMeta[k] = item
+          }
+        }
+      }
+
+      this.form = newForm
+      this.config.fields = fields
+      this.config.fieldsMeta = fieldsMeta
+    },
+    onOpenDialog() {
+      this.visible = true
+    },
+    onSubmit(form) {
+      this.form = form
+      this.$emit('input', form)
+      setTimeout(() => {
+        this.visible = false
+      }, 100)
+      this.$log.debug('Auto push form:', form)
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

src/components/Apps/BlockedIPs/BlockedIPList.vue

@@ -0,0 +1,97 @@
+<template>
+  <ListTable ref="ListTable" :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import ListTable from '@/components/Table/ListTable/index.vue'
+
+export default {
+  name: 'BlockedIPList',
+  components: {
+    ListTable
+  },
+  props: {
+    object: {
+      type: Object,
+      required: false,
+      default: () => ({})
+    }
+  },
+  data() {
+    const vm = this
+    return {
+      tableConfig: {
+        url: '/api/v1/settings/security/block-ip/',
+        columns: [
+          'ip', 'actions'
+        ],
+        columnsMeta: {
+          ip: {
+            label: this.$t('assets.ip')
+          },
+          actions: {
+            formatterArgs: {
+              hasDelete: false,
+              hasUpdate: false,
+              hasClone: false,
+              extraActions: [
+                {
+                  name: 'UnlockIP',
+                  title: this.$t('setting.Unblock'),
+                  can: this.$hasPerm('settings.change_security'),
+                  type: 'primary',
+                  callback: ({ row }) => {
+                    this.$axios.post(
+                      '/api/v1/settings/security/unlock-ip/',
+                      { ips: [row.ip] }
+                    ).then(() => {
+                      vm.$message.success(this.$tc('common.UnlockSuccessMsg'))
+                      vm.$refs.ListTable.reloadTable()
+                    })
+                  }
+                }
+              ]
+            }
+          }
+        }
+      },
+      headerActions: {
+        hasExport: false,
+        hasImport: false,
+        hasCreate: false,
+        hasSearch: false,
+        hasRefresh: true,
+        hasBulkDelete: false,
+        hasBulkUpdate: false,
+        hasLeftActions: true,
+        hasRightActions: true,
+        extraMoreActions: [
+          {
+            name: 'UnlockSelected',
+            title: this.$t('setting.BulkUnblock'),
+            type: 'primary',
+            can: ({ selectedRows }) => {
+              return selectedRows.length > 0
+            },
+            callback: function({ selectedRows }) {
+              vm.$axios.post(
+                '/api/v1/settings/security/unlock-ip/',
+                {
+                  ips: selectedRows.map(v => { return v.ip })
+                }
+              ).then(res => {
+                vm.$message.success(vm.$tc('common.UnlockSuccessMsg'))
+                vm.$refs.ListTable.reloadTable()
+              })
+            }
+          }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang='less' scoped>
+
+</style>

src/components/Apps/BlockedIPs/index.vue

@@ -0,0 +1,86 @@
+<template>
+  <div>
+    <div>
+      <el-button
+        size="mini"
+        type="primary"
+        @click="onOpenDialog"
+      >
+        {{ $tc('common.View') }}
+        <span>({{ $tc('setting.LockedIP', ipCounts ) }})</span>
+      </el-button>
+    </div>
+    <Dialog
+      :visible.sync="visible"
+      :title="title"
+      width="40%"
+      :show-cancel="false"
+      :show-confirm="false"
+      :destroy-on-close="true"
+      v-bind="$attrs"
+      v-on="$listeners"
+    >
+      <BlockedIPList />
+    </Dialog>
+  </div>
+</template>
+
+<script>
+import { Dialog } from '@/components'
+import BlockedIPList from '@/components/Apps/BlockedIPs/BlockedIPList'
+
+export default {
+  componentName: 'BlockedIPs',
+  components: {
+    BlockedIPList,
+    Dialog
+  },
+  props: {
+    value: {
+      type: Object,
+      default: () => ({})
+    },
+    title: {
+      type: String,
+      default: function() {
+        return this.$t('setting.BlockedIPS')
+      }
+    },
+    url: {
+      type: String,
+      default: `/api/v1/assets/platform-automation-methods/`
+    }
+  },
+  data() {
+    return {
+      remoteMeta: {},
+      visible: false,
+      form: this.value,
+      ipCounts: 0,
+      config: {
+        url: this.url,
+        hasSaveContinue: false,
+        hasButtons: true,
+        fields: [],
+        fieldsMeta: {}
+      }
+    }
+  },
+  created() {
+    this.getLockedIp()
+  },
+  methods: {
+    getLockedIp() {
+      this.$axios.get('/api/v1/settings/security/block-ip/').then(res => {
+        this.ipCounts = res.count
+      })
+    },
+    onOpenDialog() {
+      this.visible = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

src/components/Apps/ChangeSecret/RecordViewSecret.vue

@@ -0,0 +1,136 @@
+<template>
+  <div>
+    <Dialog
+      :destroy-on-close="true"
+      :show-cancel="false"
+      :title="title"
+      :visible.sync="showSecret"
+      :width="'50'"
+      v-bind="$attrs"
+      @confirm="accountConfirmHandle"
+      v-on="$listeners"
+    >
+      <el-form :model="secretInfo" class="password-form" label-position="right" label-width="100px">
+        <el-form-item :label="$tc('accounts.AccountChangeSecret.OldSecret')">
+          <ShowKeyCopyFormatter
+            :cell-value="secretInfo.old_secret"
+            :col="{ formatterArgs: {
+              name: 'old_secret'
+            }}"
+          />
+        </el-form-item>
+        <el-form-item :label="$tc('accounts.AccountChangeSecret.NewSecret')">
+          <ShowKeyCopyFormatter
+            :cell-value="secretInfo.new_secret"
+            :col="{ formatterArgs: {
+              name: 'new_secret'
+            }}"
+          />
+        </el-form-item>
+      </el-form>
+    </Dialog>
+  </div>
+</template>
+
+<script>
+import Dialog from '@/components/Dialog/index.vue'
+import { ShowKeyCopyFormatter } from '@/components/Table/TableFormatters'
+
+export default {
+  name: 'RecordViewSecret',
+  components: {
+    Dialog,
+    ShowKeyCopyFormatter
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    url: {
+      type: String,
+      default: ''
+    },
+    title: {
+      type: String,
+      default: function() {
+        return this.$tc('common.ViewSecret')
+      }
+    }
+  },
+  data() {
+    return {
+      secretInfo: {},
+      showSecret: false,
+      mfaDialogVisible: true
+    }
+  },
+  computed: {
+  },
+  mounted() {
+    this.showSecretDialog()
+  },
+  methods: {
+    accountConfirmHandle() {
+      this.showSecret = false
+      this.mfaDialogVisible = false
+    },
+    showSecretDialog() {
+      return this.$axios.get(this.url, { disableFlashErrorMsg: true }).then((res) => {
+        this.secretInfo = res
+        this.showSecret = true
+      })
+    },
+    exit() {
+      this.$emit('update:visible', false)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .item-textarea >>> .el-textarea__inner {
+    height: 110px;
+  }
+
+  .el-form-item {
+    border-bottom: 1px solid #EBEEF5;
+    padding: 5px 0;
+    margin-bottom: 0;
+
+    &:last-child {
+      border-bottom: none;
+    }
+
+    >>> .el-form-item__label {
+      padding-right: 20px;
+      line-height: 30px;
+    }
+
+    >>> .el-form-item__content {
+      line-height: 30px;
+
+      pre {
+        margin: 0;
+      }
+    }
+  }
+
+  ul {
+    margin: 0;
+  }
+
+  li {
+    display: block;
+    font-size: 13px;
+    margin-bottom: 8px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+
+    .title {
+      color: #303133;
+      font-weight: 500;
+    }
+  }
+</style>

src/components/Apps/ChatAi/components/ChitChat/ChatInput.vue

@@ -0,0 +1,163 @@
+<template>
+  <div class="container">
+    <div class="chat-action">
+      <Select2
+        v-model="select.value"
+        :disabled="isLoading || isSelectDisabled"
+        v-bind="select"
+        @change="onSelectChange"
+      />
+    </div>
+    <div class="chat-input">
+      <el-input
+        v-model="inputValue"
+        :disabled="isLoading"
+        :placeholder="$tc('common.InputMessage')"
+        type="textarea"
+        @compositionend="isIM = false"
+        @compositionstart="isIM = true"
+        @keypress.native="onKeyEnter"
+      />
+      <div class="input-action">
+        <span class="right">
+          <i :class="{'active': inputValue }" class="fa fa-send" @click="onSendHandle" />
+        </span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import Select2 from '../../../../Form/FormFields/Select2.vue'
+import { useChat } from '../../useChat.js'
+
+const { setLoading } = useChat()
+
+export default {
+  components: { Select2 },
+  props: {
+  },
+  data() {
+    return {
+      isIM: false,
+      inputValue: '',
+      select: {
+        url: '/api/v1/settings/chatai-prompts/',
+        value: '',
+        multiple: false,
+        placeholder: this.$t('common.Prompt'),
+        ajax: {
+          transformOption: (item) => {
+            return { label: item.name, value: item.content }
+          }
+        }
+      }
+    }
+  },
+  computed: {
+    ...mapState({
+      isLoading: state => state.chat.loading
+    }),
+    isSelectDisabled() {
+      return !!this.select.value
+    }
+  },
+  methods: {
+    onKeyEnter(event) {
+      if (event.key === 'Enter') {
+        if ((!this.isIM && !event.shiftKey) || (this.isIM && event.ctrlKey)) {
+          event.preventDefault()
+          this.onSendHandle()
+        }
+      }
+    },
+    onSendHandle() {
+      if (!this.inputValue) return
+
+      setLoading(true)
+      this.$emit('send', this.inputValue)
+      this.inputValue = ''
+    },
+    onSelectChange(value) {
+      this.$emit('select-prompt', value)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+  display: flex;
+  height: 100%;
+  flex-direction: column;
+  .chat-action {
+    width: 100%;
+    margin: 6px 0;
+    &>>> .el-select {
+      width: 50%;
+      .el-input__inner {
+        height: 28px;
+        line-height: 28px;
+        border-radius: 14px;
+        border-color: transparent;
+        background-color: #f7f7f8;
+        font-size: 13px;
+        color: rgba(0, 0, 0, 0.45);
+        &:hover {
+          background-color: #ededed;
+        }
+      }
+      .el-input__icon {
+        line-height: 0px;
+      }
+    }
+  }
+  .chat-input {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    border: 1px solid #DCDFE6;
+    border-radius: 12px;
+    &:has(.el-textarea__inner:focus) {
+      border: 1px solid var(--color-primary);
+    }
+    &>>> .el-textarea {
+      height: 100%;
+      .el-textarea__inner {
+        height: 100%;
+        padding: 8px 10px;
+        border: none;
+        border-top-left-radius: 12px;
+        border-top-right-radius: 12px;
+        resize: none;
+        &::-webkit-scrollbar {
+          width: 12px;
+        }
+      }
+    }
+    .el-textarea.is-disabled + .input-action {
+      background-color: #F5F7FA;
+      cursor: no-drop;
+      i {
+        cursor: no-drop;
+      }
+    }
+    .input-action {
+      overflow: hidden;
+      padding: 0 16px 15px;
+      border-bottom-left-radius: 12px;
+      border-bottom-right-radius: 12px;
+      .right {
+        float: right;
+        .active {
+          color: var(--color-primary);
+        }
+        i {
+          cursor: pointer;
+        }
+      }
+    }
+  }
+}
+</style>

src/components/Apps/ChatAi/components/ChitChat/ChatMessage.vue

@@ -0,0 +1,186 @@
+<template>
+  <div :class="{'user-role': isUserRole}" class="chat-item">
+    <div class="avatar">
+      <el-avatar :src="isUserRole ? userUrl : chatUrl" class="header-avatar" />
+    </div>
+    <div class="content">
+      <div class="operational">
+        <span class="date">
+          {{ $moment(item.message.create_time).format('YYYY-MM-DD HH:mm:ss') }}
+        </span>
+      </div>
+      <div class="message">
+        <div class="message-content">
+          <span v-if="isSystemError" class="error">
+            {{ item.message.content }}
+          </span>
+          <span v-else class="chat-text">
+            <MessageText :message="item.message" />
+          </span>
+        </div>
+        <div class="action">
+          <el-tooltip
+            v-if="isSystemError && isLoading"
+            :content="$tc('common.Reconnect')"
+            effect="dark"
+            placement="top"
+          >
+            <svg-icon icon-class="refresh" @click="onRefresh" />
+          </el-tooltip>
+          <el-dropdown v-else size="small" @command="handleCommand">
+            <span class="el-dropdown-link">
+              <i class="fa fa-ellipsis-v" />
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item v-for="i in dropdownOptions" :key="i.action" :command="i.action">
+                {{ i.label }}
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import MessageText from './MessageText.vue'
+import { mapState } from 'vuex'
+import { copy } from '@/utils/common'
+import { useChat } from '../../useChat.js'
+import { reconnect } from '@/utils/socket'
+
+const { setLoading, removeLoadingMessageInChat } = useChat()
+
+export default {
+  components: {
+    MessageText
+  },
+  props: {
+    item: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      chatUrl: require('@/assets/img/chat.png'),
+      userUrl: '/api/v1/settings/logo/',
+      dropdownOptions: [
+        {
+          action: 'copy',
+          label: this.$t('common.Copy')
+        }
+      ]
+    }
+  },
+  computed: {
+    ...mapState({
+      isLoading: state => state.chat.loading
+    }),
+    isUserRole() {
+      return this.item.message?.role === 'user'
+    },
+    isSystemError() {
+      return this.item.type === 'error' && this.item.message?.role === 'assistant'
+    }
+  },
+  methods: {
+    onRefresh() {
+      reconnect()
+      removeLoadingMessageInChat()
+      setLoading(false)
+    },
+    handleCommand(value) {
+      if (value === 'copy') {
+        copy(this.item.message.content)
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.chat-item {
+  display: flex;
+  padding: 16px 14px 0;
+  &:last-child {
+    padding-bottom: 16px;
+  }
+  .avatar {
+    width: 22px;
+    height: 22px;
+    margin-top: 2px;
+    .header-avatar {
+      width: 100%;
+      height: 100%;
+      &>>> img {
+        background-color: #e5e5e7;
+      }
+    }
+  }
+  .content {
+    margin-left: 6px;
+    overflow: hidden;
+    .operational {
+      display: flex;
+      justify-content: space-between;
+      overflow: hidden;
+      .copy {
+        float: right;
+        cursor: pointer;
+      }
+    }
+    .message {
+      display: -webkit-box;
+      .message-content {
+        flex: 1;
+        padding: 6px 10px;
+        border-radius: 2px 12px 12px;
+        background-color: #f0f1f5;
+      }
+      .action {
+        .svg-icon {
+          transform: translateY(50%);
+          margin-left: 3px;
+          cursor: pointer;
+        }
+        .el-dropdown {
+          height: 32px;
+          line-height: 37px;
+          font-size: 13px;
+          .el-dropdown-link {
+            i {
+              padding: 4px 5px;
+              font-size: 15px;
+              color: #8d9091;
+              &:hover {
+                color: #7b8085
+              }
+            }
+          }
+        }
+      }
+      .error {
+        color: red;
+      }
+    }
+  }
+}
+.user-role {
+  flex-direction: row-reverse;
+  .content {
+    margin-right: 10px;
+    .operational {
+      flex-direction: row-reverse;
+    }
+    .message {
+      flex-direction: row-reverse;
+      .message-content {
+        background-color: var(--menu-hover);
+        border-radius: 12px 2px 12px 12px;
+      }
+    }
+  }
+}
+</style>

src/components/Apps/ChatAi/components/ChitChat/MessageText.vue

@@ -0,0 +1,178 @@
+<template>
+  <div>
+    <div ref="textRef" class="leading-relaxed break-words">
+      <span v-if="message.content === 'loading'" class="loading-box">
+        <span />
+        <span />
+        <span />
+      </span>
+      <div v-else class="inline-block markdown-body" v-html="text" />
+    </div>
+  </div>
+</template>
+
+<script>
+import MarkdownIt from 'markdown-it'
+import mdKatex from '@traptitech/markdown-it-katex'
+import mila from 'markdown-it-link-attributes'
+import hljs from 'highlight.js'
+import 'highlight.js/styles/atom-one-dark.css'
+import { copy } from '@/utils/common'
+
+/* eslint-disable vue/no-v-html */
+export default {
+  props: {
+    message: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      markdown: null
+    }
+  },
+  computed: {
+    text() {
+      const value = this.message?.content || ''
+      if (value && this.markdown) {
+        return this.markdown?.render(value)
+      }
+      return this.$xss.process(value)
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  updated() {
+    this.addCopyEvents()
+  },
+  destroyed() {
+    this.removeCopyEvents()
+  },
+  methods: {
+    init() {
+      const vm = this
+      this.markdown = new MarkdownIt({
+        html: false,
+        linkify: true,
+        highlight(code, language) {
+          const validLang = !!(language && hljs.getLanguage(language))
+          if (validLang) {
+            const lang = language || ''
+            return vm.highlightBlock(hljs.highlight(lang, code, true).value, lang)
+          }
+          return vm.highlightBlock(hljs.highlightAuto(code).value, '')
+        }
+      })
+      this.markdown.use(mila, { attrs: { target: '_blank', rel: 'noopener', class: 'link-style' }})
+      this.markdown.use(mdKatex, { blockClass: 'katexmath-block rounded-md', errorColor: ' #cc0000' })
+    },
+    highlightBlock(str, lang) {
+      return `<pre class="code-block-wrapper"><div class="code-block-header"><span class="code-block-header__lang">${lang}</span><span class="code-block-header__copy">${'Copy'}</span></div><code class="hljs code-block-body ${lang}">${str}</code></pre>`
+    },
+    addCopyEvents() {
+      const copyBtn = document.querySelectorAll('.code-block-header__copy')
+      copyBtn.forEach((btn) => {
+        btn.addEventListener('click', () => {
+          const code = btn.parentElement?.nextElementSibling?.textContent
+          if (code) {
+            copy(code)
+          }
+        })
+      })
+    },
+    removeCopyEvents() {
+      if (this.$refs.textRef) {
+        const copyBtn = this.$refs.textRef.querySelectorAll('.code-block-header__copy')
+        copyBtn.forEach((btn) => {
+          btn.removeEventListener('click', () => {})
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.markdown-body {
+  font-size: 13px;
+  &>>> p {
+    margin-bottom: 0 !important;
+  }
+  background: inherit;
+  &>>> pre {
+    padding: 0 0 6px 0;
+    .hljs.code-block-body {
+      border-radius: 4px;
+    }
+  }
+  &>>> .code-block-wrapper {
+    background: #1F2329;
+    padding: 2px 6px;
+    margin: 5px 0;
+
+    .code-block-body {
+      padding: 5px 10px 0;
+    };
+    .code-block-header {
+      margin-bottom: 4px;
+      overflow: hidden;
+      background: #353946;
+      color: #c2d1e1;
+
+      .code-block-header__copy {
+        float: right;
+        cursor: pointer;
+        &:hover {
+          color: #6e747b;
+        }
+      }
+    }
+    .hljs.code-block-body.javascript {
+      .hljs-comment {
+        display: block;
+      }
+    }
+  }
+}
+>>> .link-style {
+  color: #487bf4;
+  &:hover {
+    color: #275ee3;
+  }
+}
+.loading-box{
+  margin-left: 6px;
+}
+.loading-box span{
+  display: inline-block;
+  width: 5px;
+  height: 5px;
+  margin-right: 5px;
+  border-radius: 50%;
+  vertical-align: middle;
+  background: #676A6c;
+  animation: load 1.2s ease infinite;
+}
+.loading-box span:last-child{
+  margin-right: 0;
+}
+@keyframes load{
+  0%{
+    opacity: 1;
+  }
+  100%{
+    opacity: 0;
+  }
+}
+.loading-box span:nth-child(1){
+  animation-delay: 0.23s;
+}
+.loading-box span:nth-child(2){
+  animation-delay: 0.36s;
+}
+.loading-box span:nth-child(3){
+  animation-delay: 0.49s;
+}
+</style>

src/components/Apps/ChatAi/components/ChitChat/index.vue

@@ -0,0 +1,271 @@
+<template>
+  <div class="chat-content">
+    <div id="scrollRef" class="chat-list">
+      <div v-if="showIntroduction" class="introduction">
+        <div v-for="(item, index) in introduction" :key="index" class="introduction-item" @click="sendIntroduction(item)">
+          <div class="head">
+            <i v-if="item.icon" :class="item.icon" />
+            <span class="title">{{ item.title }}</span>
+          </div>
+          <div class="content">
+            {{ item.content }}
+          </div>
+        </div>
+      </div>
+      <ChatMessage v-for="(item, index) in activeChat.chats" :key="index" :item="item" />
+    </div>
+    <div class="input-box">
+      <el-button
+        v-if="isLoading && socket && socket.readyState === 1"
+        class="stop"
+        icon="fa fa-stop-circle-o"
+        round
+        size="small"
+        @click="onStopHandle"
+      >{{ $tc('common.Stop') }}</el-button>
+      <ChatInput ref="chatInput" @send="onSendHandle" @select-prompt="onSelectPromptHandle" />
+    </div>
+  </div>
+</template>
+
+<script>
+import ChatInput from './ChatInput.vue'
+import ChatMessage from './ChatMessage.vue'
+import { mapState } from 'vuex'
+import { closeWebSocket, createWebSocket, onSend, ws } from '@/utils/socket'
+import { getInputFocus, useChat } from '../../useChat.js'
+
+const {
+  setLoading,
+  clearChats,
+  addChatMessageById,
+  addMessageToActiveChat,
+  newChatAndAddMessageById,
+  removeLoadingMessageInChat,
+  updateChaMessageContentById,
+  addTemporaryLoadingToChat
+} = useChat()
+
+export default {
+  components: {
+    ChatInput,
+    ChatMessage
+  },
+  props: {
+  },
+  data() {
+    return {
+      socket: {},
+      prompt: '',
+      currentConversationId: '',
+      showIntroduction: false,
+      introduction: [
+        {
+          title: this.$t('common.introduction.ConceptTitle'),
+          content: this.$t('common.introduction.ConceptContent')
+        },
+        {
+          title: this.$t('common.introduction.IdeaTitle'),
+          content: this.$t('common.introduction.IdeaContent')
+        }
+      ]
+    }
+  },
+  computed: {
+    ...mapState({
+      isLoading: state => state.chat.loading,
+      activeChat: state => state.chat.activeChat
+    })
+  },
+  destroyed() {
+    closeWebSocket()
+  },
+  methods: {
+    init() {
+      this.initWebSocket()
+      this.initChatMessage()
+    },
+    initWebSocket() {
+      const { NODE_ENV, VUE_APP_KAEL_HOST } = process.env || {}
+      const api = '/kael/chat/system/'
+      const protocol = window.location.protocol === 'https:' ? 'wss' : 'ws'
+      const path = `${protocol}://${window.location.host}${api}`
+      const index = VUE_APP_KAEL_HOST?.indexOf('://')
+      const localPath = protocol + VUE_APP_KAEL_HOST?.substring(index, VUE_APP_KAEL_HOST?.length) + api
+      const url = NODE_ENV === 'development' ? localPath : path
+      createWebSocket(url, this.onWebSocketMessage)
+    },
+    initChatMessage() {
+      this.prompt = ''
+      this.showIntroduction = true
+      this.currentConversationId = ''
+      this.$refs.chatInput.select.value = ''
+      const chat = {
+        message: {
+          content: this.$t('common.ChatHello'),
+          role: 'assistant',
+          create_time: new Date()
+        }
+      }
+      newChatAndAddMessageById(chat)
+      setLoading(false)
+    },
+    onWebSocketMessage(data) {
+      if (data.type === 'message') {
+        this.onChatMessage(data)
+      }
+      if (data.type === 'error') {
+        this.onSystemMessage(data)
+      }
+    },
+    onChatMessage(data) {
+      if (data.conversation_id) {
+        setLoading(true)
+        removeLoadingMessageInChat()
+        this.currentConversationId = data.conversation_id
+        updateChaMessageContentById(data.message.id, data)
+      }
+      if (data.message?.type === 'finish') {
+        setLoading(false)
+        getInputFocus()
+      }
+    },
+    onSystemMessage(data) {
+      data.message = {
+        content: data.system_message,
+        role: 'assistant',
+        create_time: new Date()
+      }
+      removeLoadingMessageInChat()
+      addMessageToActiveChat(data)
+      this.socketReadyStateSuccess = false
+      setLoading(true)
+    },
+    onSendHandle(value) {
+      this.showIntroduction = false
+      this.socket = ws || {}
+      if (ws?.readyState === 1) {
+        this.socketReadyStateSuccess = true
+        const chat = {
+          message: {
+            content: value,
+            role: 'user',
+            create_time: new Date()
+          }
+        }
+        const message = {
+          content: value,
+          prompt: this.prompt,
+          conversation_id: this.currentConversationId || ''
+        }
+        addChatMessageById(chat)
+        onSend(message)
+        addTemporaryLoadingToChat()
+      } else {
+        const chat = {
+          message: {
+            content: this.$t('common.ConnectionDropped'),
+            role: 'assistant',
+            create_time: new Date()
+          },
+          type: 'error'
+        }
+        addChatMessageById(chat)
+        this.socketReadyStateSuccess = false
+        setLoading(true)
+      }
+    },
+    onSelectPromptHandle(value) {
+      this.prompt = value
+      this.currentConversationId = ''
+      this.showIntroduction = false
+      this.onSendHandle(value)
+    },
+    onNewChat() {
+      clearChats()
+      this.initChatMessage()
+    },
+    onStopHandle() {
+      this.$axios.post(
+        '/kael/interrupt_current_ask/',
+        { id: this.currentConversationId || '' }
+      ).finally(() => {
+        removeLoadingMessageInChat()
+        setLoading(false)
+      })
+    },
+    sendIntroduction(item) {
+      this.showIntroduction = false
+      this.onSendHandle(item.content)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.chat-content {
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  height: 100%;
+
+  .introduction {
+    padding: 16px 14px 0;
+
+    .introduction-item {
+      padding: 12px 14px;
+      border-radius: 8px;
+      margin-top: 16px;
+      background-color: var(--menu-hover);
+      cursor: pointer;
+
+      &:hover {
+        box-shadow: 0 0 2px 2px #00000014;
+      }
+
+      &:first-child {
+        margin-top: 0;
+      }
+      .head {
+        margin-bottom: 2px;
+        .title {
+          font-weight: 500;
+          color: #373739;
+        }
+      }
+      .content {
+        display: inline-block;
+        color: #a7a7ab;
+        word-wrap: break-word;
+      }
+    }
+  }
+  .chat-list {
+    flex: 1;
+    position: relative;
+    padding: 0 15px 25px;
+    overflow-y: auto;
+    user-select: text;
+    &::-webkit-scrollbar {
+      width: 12px;
+    }
+  }
+  .input-box {
+    position: relative;
+    height: 160px;
+    padding: 0 15px;
+    margin-bottom: 15px;
+    border-top: 1px solid #ececec;
+  }
+  .stop {
+    position: absolute;
+    top: -37px;
+    left: 50%;
+    z-index: 11;
+    transform: translateX(-50%);
+    >>> i {
+      margin-right: 4px;
+    }
+  }
+}
+</style>

src/components/Apps/ChatAi/components/Sidebar/index.vue

@@ -0,0 +1,81 @@
+<template>
+  <div class="container">
+    <div class="close-sidebar">
+      <i v-if="hasClose" class="el-icon-close" @click="onClose" />
+    </div>
+    <el-tabs v-model="active" :tab-position="'right'" @tab-click="handleClick">
+      <el-tab-pane v-for="(item) in submenu" :key="item.name" :name="item.name">
+        <span slot="label">
+          <el-tooltip effect="dark" placement="left" :content="item.label">
+            <svg-icon :icon-class="item.icon" />
+          </el-tooltip>
+        </span>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    active: {
+      type: String,
+      default: 'chat'
+    },
+    hasClose: {
+      type: Boolean,
+      default: true
+    },
+    submenu: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+    }
+  },
+  methods: {
+    handleClick(tab, event) {
+      this.$emit('tab-click', tab)
+    },
+    onClose() {
+      this.$parent.onClose()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+  width: 100%;
+  height: 100%;
+  background-color: #f0f1f5;
+  .close-sidebar {
+    height: 48px;
+    padding: 12px 0;
+    text-align: center;
+    font-size: 14px;
+    cursor: pointer;
+    i {
+      font-size: 16px;
+      font-weight: 600;
+      padding: 4px;
+      border-radius: 2px;
+      &:hover {
+        color: var(--color-primary);
+        background: var(--menu-hover);
+      }
+    }
+  }
+}
+>>> .el-tabs {
+  .el-tabs__item {
+    padding: 0 13px;
+    font-size: 15px;
+    :hover {
+      color: #7b8085;
+    }
+  }
+}
+</style>

src/components/Apps/ChatAi/index.vue

@@ -0,0 +1,145 @@
+<template>
+  <div class="chat">
+    <div class="container">
+      <div class="header">
+        <div class="left">
+          <img :src="robotUrl" alt="">
+          <span class="title">{{ title }}</span>
+        </div>
+        <span class="new" @click="onNewChat">
+          <i class="el-icon-plus" />
+          <span>{{ $tc('common.NewChat') }}</span>
+        </span>
+      </div>
+      <div class="content">
+        <keep-alive>
+          <component :is="active" ref="component" />
+        </keep-alive>
+      </div>
+    </div>
+    <div class="sidebar">
+      <Sidebar v-bind="$attrs" :active.sync="active" :submenu="submenu" />
+    </div>
+  </div>
+</template>
+
+<script>
+import Sidebar from './components/Sidebar/index.vue'
+import Chat from './components/ChitChat/index.vue'
+import { getInputFocus } from './useChat.js'
+import { ws } from '@/utils/socket'
+
+export default {
+  components: {
+    Chat,
+    Sidebar
+  },
+  props: {
+    title: {
+      type: String,
+      default: function() {
+        return this.$t('setting.ChatAI')
+      }
+    },
+    drawerPanelVisible: {
+      type: Boolean,
+      default: () => false
+    }
+  },
+  data() {
+    return {
+      active: 'chat',
+      robotUrl: require('../../../assets/img/robot-assistant.png'),
+      submenu: [
+        {
+          name: 'chat',
+          label: this.$t('common.Chat'),
+          icon: 'chat'
+        }
+      ]
+    }
+  },
+  watch: {
+    drawerPanelVisible(value) {
+      if (value && !ws) {
+        this.initWebSocket()
+      }
+    }
+  },
+  methods: {
+    initWebSocket() {
+      this.$refs.component?.init()
+    },
+    onClose() {
+      this.$parent.show = false
+    },
+    onNewChat() {
+      this.active = 'chat'
+      this.$nextTick(() => {
+        this.$refs.component?.onNewChat()
+        getInputFocus()
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.chat {
+  display: flex;
+  width: 100%;
+  height: 100%;
+  .container {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    .header {
+      display: flex;
+      justify-content: space-between;
+      height: 48px;
+      line-height: 48px;
+      padding: 0 16px;
+      overflow: hidden;
+      border-bottom: 1px solid #ececec;
+      .left {
+        img {
+          width: 22px;
+          height: 22px;
+          vertical-align: sub;
+        }
+        .title {
+          display: inline-block;
+          font-size: 18px;
+          color: black;
+        }
+      }
+      .new {
+        display: inline-block;
+        height: 28px;
+        line-height: 28px;
+        border-radius: 16px;
+        padding: 0 10px;
+        transform: translateY(32%);
+        color: var(--color-primary);
+        background-color: #f7f7f8;
+        cursor: pointer;
+        font-size: 13px;
+        &:hover {
+          background-color: #ededed;
+        }
+      }
+    }
+    .content {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      overflow: hidden;
+    }
+  }
+  .sidebar {
+    height: 100%;
+    width: 42px;
+  }
+}
+</style>

src/components/Apps/ChatAi/useChat.js

@@ -0,0 +1,80 @@
+import store from '@/store'
+import { pageScroll } from '@/utils/common'
+
+export const getInputFocus = () => {
+  const dom = document.querySelector('.chat-input .el-textarea__inner')
+  setTimeout(() => dom?.focus(), 200)
+}
+
+export function useChat() {
+  const chatStore = {}
+
+  const setLoading = (loading) => {
+    store.commit('chat/setLoading', loading)
+  }
+
+  const onNewChat = (name) => {
+    const data = {
+      name: name || `new chat`,
+      id: 1,
+      conversation_id: '',
+      chats: []
+    }
+    store.commit('chat/addChatToStore', data)
+  }
+
+  const clearChats = () => {
+    store.commit('chat/clearChats')
+  }
+
+  const addMessageToActiveChat = (chat) => {
+    store.commit('chat/addMessageToActiveChat', chat)
+  }
+
+  const removeLoadingMessageInChat = () => {
+    store.commit('chat/removeLoadingMessageInChat')
+  }
+
+  const addChatMessageById = (chat) => {
+    store.commit('chat/addMessageToActiveChat', chat)
+    if (chat?.conversation_id) {
+      store.commit('chat/setActiveChatConversationId', chat.conversation_id)
+    }
+    pageScroll('scrollRef')
+  }
+
+  const addTemporaryLoadingToChat = () => {
+    const temporaryChat = {
+      message: {
+        content: 'loading',
+        role: 'assistant',
+        create_time: new Date()
+      }
+    }
+    addChatMessageById(temporaryChat)
+  }
+
+  const newChatAndAddMessageById = (chat) => {
+    onNewChat(chat.message.content)
+    addChatMessageById(chat)
+  }
+
+  const updateChaMessageContentById = (id, data) => {
+    store.commit('chat/updateChaMessageContentById', { id, data })
+    pageScroll('scrollRef')
+  }
+
+  return {
+    chatStore,
+    setLoading,
+    onNewChat,
+    clearChats,
+    getInputFocus,
+    addMessageToActiveChat,
+    newChatAndAddMessageById,
+    removeLoadingMessageInChat,
+    addChatMessageById,
+    addTemporaryLoadingToChat,
+    updateChaMessageContentById
+  }
+}

src/components/Apps/DrawerPanel/index.vue

@@ -0,0 +1,209 @@
+<template>
+  <div ref="drawer" :class="{show: show}" class="drawer">
+    <div :style="{'background-color': modal ? 'rgba(0, 0, 0, .3)' : 'transparent'}" class="modal" />
+    <div :style="{'width': width}" class="drawer-panel">
+      <div v-show="!show" ref="dragBox" class="handle-button">
+        <i v-if="icon.startsWith('fa') || icon.startsWith('el')" :class="show ? 'el-icon-close': icon" />
+        <img v-else :src="icon" alt="">
+      </div>
+      <div class="drawer-panel-item">
+        <slot :drawer-panel-visible="show" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'DrawerPanel',
+  props: {
+    icon: {
+      type: String,
+      default: 'el-icon-setting'
+    },
+    width: {
+      type: String,
+      default: '440px'
+    },
+    modal: {
+      type: Boolean,
+      default: true
+    },
+    clickNotClose: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      show: false
+    }
+  },
+  watch: {
+    show(value) {
+      if (value && !this.clickNotClose) {
+        this.addEventClick()
+      }
+      this.$emit('toggle', this.show)
+    }
+  },
+  mounted() {
+    this.init()
+    this.insertToBody()
+  },
+  beforeDestroy() {
+    const element = this.$refs.drawer
+    element.remove()
+    window.removeEventListener('click', this.closeSidebar)
+  },
+  methods: {
+    init() {
+      this.$nextTick(() => {
+        const dragBox = this.$refs.dragBox
+        const clientOffset = {}
+        dragBox.addEventListener('mousedown', (event) => {
+          const offsetX = dragBox.getBoundingClientRect().left
+          const offsetY = dragBox.getBoundingClientRect().top
+          const innerX = event.clientX - offsetX
+          const innerY = event.clientY - offsetY
+
+          clientOffset.clientX = event.clientX
+          clientOffset.clientY = event.clientY
+          document.onmousemove = function(event) {
+            dragBox.style.left = event.clientX - innerX + 'px'
+            dragBox.style.top = event.clientY - innerY + 'px'
+            const dragDivTop = window.innerHeight - dragBox.getBoundingClientRect().height
+            const dragDivLeft = window.innerWidth - dragBox.getBoundingClientRect().width
+            dragBox.style.left = dragDivLeft + 'px'
+            dragBox.style.left = '-48px'
+            if (dragBox.getBoundingClientRect().top <= 0) {
+              dragBox.style.top = '0px'
+            }
+            if (dragBox.getBoundingClientRect().top >= dragDivTop) {
+              dragBox.style.top = dragDivTop + 'px'
+            }
+            event.preventDefault()
+            event.stopPropagation()
+          }
+          document.onmouseup = function() {
+            document.onmousemove = null
+            document.onmouseup = null
+          }
+        }, false)
+        dragBox.addEventListener('mouseup', (event) => {
+          const clientX = event.clientX
+          const clientY = event.clientY
+          if (this.isDifferenceWithinThreshold(clientX, clientOffset.clientX) && this.isDifferenceWithinThreshold(clientY, clientOffset.clientY)) {
+            this.show = !this.show
+          }
+        })
+      })
+    },
+    isDifferenceWithinThreshold(num1, num2, threshold = 5) {
+      const difference = Math.abs(num1 - num2)
+      return difference <= threshold
+    },
+    addEventClick() {
+      window.addEventListener('click', this.closeSidebar)
+    },
+    closeSidebar(evt) {
+      const parent = evt.target.closest('.drawer-panel')
+      if (!parent && evt.target.className === 'modal') {
+        this.show = false
+      }
+    },
+    insertToBody() {
+      const element = this.$refs.drawer
+      const body = document.querySelector('body')
+      body.insertBefore(element, body.firstChild)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.modal {
+  position: fixed;
+  top: 0;
+  left: 0;
+  opacity: 0;
+  transition: opacity .3s cubic-bezier(.7, .3, .1, 1);
+  background: rgba(0, 0, 0, .3);
+  z-index: -1;
+}
+
+.drawer-panel {
+  position: fixed;
+  top: 0;
+  right: 0;
+  width: 100%;
+  min-width: 260px;
+  height: 100vh;
+  user-select: none;
+  transition: transform .25s cubic-bezier(.7, .3, .1, 1);
+  box-shadow: 0 0 8px 4px #00000014;
+  transform: translate(100%);
+  background: #FFFFFF;
+  z-index: 1200;
+}
+
+.drawer-panel-item {
+  height: 100%;
+}
+
+.drawer-panel-item::-webkit-scrollbar-track {
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.show {
+  transition: all .3s cubic-bezier(.7, .3, .1, 1);
+}
+
+.show .modal {
+  z-index: 1003;
+  opacity: 1;
+  width: 100%;
+  height: 100%;
+}
+
+.show .drawer-panel {
+  transform: translate(0);
+}
+
+.handle-button {
+  position: absolute;
+  bottom: 20%;
+  left: -48px;
+  width: 48px;
+  height: 45px;
+  line-height: 45px;
+  box-sizing: border-box;
+  text-align: center;
+  font-size: 24px;
+  border-radius: 20px 0 0 20px;
+  z-index: 0;
+  pointer-events: auto;
+  color: #fff;
+  background-color: #FFFFFF;
+  box-shadow: 0 0 8px 4px #00000014;
+  cursor: pointer;
+
+  &:hover {
+    left: -50px !important;
+    width: 50px !important;
+    transform: scale(1.06);
+  }
+  i {
+    font-size: 20px;
+    line-height: 45px;
+  }
+  img {
+    width: 22px;
+    height: 22px;
+    transform: translateY(10%);
+    margin-left: 3px;
+  }
+}
+</style>

src/components/Apps/GatewayDialog/index.vue

@@ -0,0 +1,92 @@
+<template>
+  <Dialog
+    v-if="iVisible"
+    :destroy-on-close="true"
+    :show-cancel="false"
+    :show-confirm="false"
+    :title="$tc('assets.TestGatewayTestConnection')"
+    :visible.sync="iVisible"
+    top="35vh"
+    width="40%"
+  >
+    <el-row :gutter="20">
+      <el-col :md="4" :sm="24">
+        <div style="line-height: 34px">{{ $t('assets.SSHPort') }}</div>
+      </el-col>
+      <el-col :md="14" :sm="24">
+        <el-input v-model="port" />
+        <span class="help-tips help-block">{{ $t('assets.TestGatewayHelpMessage') }}</span>
+      </el-col>
+      <el-col :md="4" :sm="24">
+        <el-button
+          :loading="loading"
+          size="mini"
+          style="line-height:20px "
+          type="primary"
+          @click="dialogConfirm"
+        >
+          {{ this.$t('common.Confirm') }}
+        </el-button>
+      </el-col>
+    </el-row>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from '@/components/Dialog/index.vue'
+import { openTaskPage } from '@/utils/jms'
+
+export default {
+  name: 'GatewayDialog',
+  components: {
+    Dialog
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    port: {
+      type: Number,
+      default: 0
+    },
+    cell: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {}
+  },
+  computed: {
+    iVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:visible', val)
+      }
+    }
+  },
+  methods: {
+    dialogConfirm() {
+      if (isNaN(this.port)) {
+        return this.$message.error(this.$tc('common.TestPortErrorMsg'))
+      }
+      this.$axios.post(
+        `/api/v1/assets/gateways/${this.cell}/test-connective/`,
+        { port: this.port }
+      )
+        .then((res) => {
+          openTaskPage(res['task'])
+        }).finally(() => {
+          this.iVisible = false
+        })
+    }
+  }
+}
+</script>

src/components/Apps/GrantedAssets/index.vue

@@ -1,10 +1,12 @@
 <template>
-  <TreeTable :table-config="tableConfig" :header-actions="headerActions" :tree-setting="treeSetting" />
+  <TreeTable :header-actions="headerActions" :table-config="tableConfig" :tree-setting="treeSetting" />
 </template>
 
 <script type="text/jsx">
-import { DetailFormatter, SystemUserFormatter } from '@/components/TableFormatters'
-import TreeTable from '../TreeTable'
+import TreeTable from '../../Table/TreeTable/index.vue'
+import { DetailFormatter } from '@/components/Table/TableFormatters'
+import { AccountInfoFormatter } from '@/components/Table/TableFormatters'
+import { connectivityMeta } from '@/components/Apps/AccountListTable/const'
 
 export default {
   name: 'GrantedAssets',
@@ -35,7 +37,7 @@ export default {
     getShowUrl: {
       type: Function,
       default({ row, col }) {
-        return this.tableUrl.replace('/assets/', `/assets/${row.id}/system-users/?cache_policy=1`)
+        return this.tableUrl.replace('/assets/', `/assets/${row.id}/accounts/`)
       }
     }
   },
@@ -57,34 +59,29 @@ export default {
       tableConfig: {
         url: this.tableUrl,
         hasTree: true,
-        columns: [
-          {
-            prop: 'hostname',
-            label: this.$t('assets.Hostname'),
+        columnsExtra: ['view_account'],
+        columnsExclude: ['spec_info'],
+        columnsShow: {
+          min: ['name', 'address', 'accounts'],
+          default: ['name', 'address', 'platform', 'view_account', 'connectivity']
+        },
+        columnsMeta: {
+          name: {
             formatter: DetailFormatter,
-            sortable: true,
             formatterArgs: {
               route: 'AssetDetail'
-            },
-            showOverflowTooltip: true
+            }
           },
-          {
-            prop: 'ip',
-            label: this.$t('assets.IP'),
-            width: '140px',
-            sortable: 'custom'
+          actions: {
+            has: false
           },
-          {
-            prop: 'systemUsers',
-            label: this.$t('assets.SystemUsers'),
-            align: 'center',
-            formatter: SystemUserFormatter,
-            formatterArgs: {
-              getUrl: this.getShowUrl.bind(this)
-            },
-            showOverflowTooltip: true
-          }
-        ]
+          view_account: {
+            label: this.$t('assets.Account'),
+            formatter: AccountInfoFormatter,
+            width: '100px'
+          },
+          connectivity: connectivityMeta
+        }
       },
       headerActions: {
         hasLeftActions: false,

src/components/Apps/ManyJsonTabs/AssetJsonTab.vue

@@ -0,0 +1,71 @@
+<template>
+  <el-row :gutter="24">
+    <el-col :md="20" :sm="22">
+      <ListTable v-bind="config" />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import ListTable from '@/components/Table/ListTable/index.vue'
+import { toM2MJsonParams } from '@/utils/jms'
+
+export default {
+  name: 'AssetJsonTab',
+  components: {
+    ListTable
+  },
+  props: {
+    object: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    const [key, value] = toM2MJsonParams(this.object.assets)
+    return {
+      config: {
+        headerActions: {
+          hasLeftActions: false,
+          hasImport: false,
+          hasExport: false
+        },
+        tableConfig: {
+          url: `/api/v1/assets/assets/?${key}=${value}`,
+          columns: ['name', 'address', 'platform',
+            'type', 'is_active'
+          ],
+          columnsMeta: {
+            name: {
+              label: this.$t('assets.Asset'),
+              formatter: (row) => {
+                const to = {
+                  name: 'AssetDetail',
+                  params: { id: row.id }
+                }
+                if (this.$hasPerm('assets.view_asset')) {
+                  return <router-link to={to} class='text-link'>{row.name}</router-link>
+                } else {
+                  return <span>{row.name}</span>
+                }
+              }
+            },
+            actions: {
+              has: false
+            }
+          }
+        }
+      }
+    }
+  },
+  computed: {
+    iUrl() {
+      return `/api/v1/users/users/`
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/Apps/ManyJsonTabs/UserJsonTab.vue

@@ -0,0 +1,91 @@
+<template>
+  <el-row :gutter="24">
+    <el-col :md="20" :sm="22">
+      <ListTable v-bind="config" />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import ListTable from '@/components/Table/ListTable/index.vue'
+import { toM2MJsonParams } from '@/utils/jms'
+
+export default {
+  name: 'User',
+  components: {
+    ListTable
+  },
+  props: {
+    object: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    const [key, value] = toM2MJsonParams(this.object.users)
+    return {
+      config: {
+        headerActions: {
+          hasLeftActions: false,
+          hasImport: false,
+          hasExport: false
+        },
+        tableConfig: {
+          url: `/api/v1/users/users/?${key}=${value}`,
+          columns: [
+            'name', 'username', 'groups', 'system_roles',
+            'org_roles', 'source', 'is_valid'
+          ],
+          columnsMeta: {
+            name: {
+              label: this.$t('common.Name'),
+              formatter: (row) => {
+                const to = {
+                  name: 'UserDetail',
+                  params: { id: row.id }
+                }
+                if (this.$hasPerm('users.view_user')) {
+                  return <router-link to={to} class='text-link'>{row.name}</router-link>
+                } else {
+                  return <span>{row.name}</span>
+                }
+              }
+            },
+            system_roles: {
+              label: this.$t('users.SystemRoles'),
+              formatter: (row) => {
+                return row['system_roles'].map(item => item['display_name']).join(', ') || '-'
+              },
+              filters: [],
+              columnKey: 'system_roles'
+            },
+            org_roles: {
+              label: this.$t('users.OrgRoles'),
+              formatter: (row) => {
+                return row['org_roles'].map(item => item['display_name']).join(', ') || '-'
+              },
+              filters: [],
+              columnKey: 'org_roles',
+              has: () => {
+                return this.$store.getters.hasValidLicense && !this.currentOrgIsRoot
+              }
+            },
+            actions: {
+              has: false
+            }
+          }
+        }
+      }
+    }
+  },
+  computed: {
+    iUrl() {
+      return `/api/v1/users/users/`
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/Apps/ResourceActivity/index.vue

@@ -0,0 +1,92 @@
+<template>
+  <div>
+    <el-row :gutter="20">
+      <el-col :md="12" :sm="24">
+        <IBox :title="title" class="block" v-bind="$attrs">
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in activities"
+              :key="index"
+              :size="activity.size"
+              :timestamp="activity.timestamp"
+              :type="activity.type"
+              placement="bottom"
+            >
+              {{ activity.content }}
+              <el-link
+                v-if="activity['detail_url']"
+                type="primary"
+                @click.native="onClick(activity)"
+              >
+                {{ $tc('common.Detail') }}
+              </el-link>
+            </el-timeline-item>
+          </el-timeline>
+        </IBox>
+      </el-col>
+    </el-row>
+    <DiffDetail ref="DetailDialog" :title="$tc('route.OperateLog')" />
+  </div>
+</template>
+
+<script>
+import IBox from '@/components/IBox/index.vue'
+import DiffDetail from '@/components/Dialog/DiffDetail.vue'
+import { openTaskPage } from '@/utils/jms'
+
+export default {
+  name: 'ResourceActivity',
+  components: {
+    IBox,
+    DiffDetail
+  },
+  props: {
+    object: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      activityUrl: `/api/v1/audits/activities/?resource_id=${this.object.id}`,
+      title: `${this.$t('common.Activity')} - ${this.$t('common.Last30')}`,
+      activities: [
+        {
+          content: this.$t('common.Now'),
+          timestamp: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
+          type: 'primary'
+        }
+      ]
+    }
+  },
+  mounted() {
+    this.getActivities()
+  },
+  methods: {
+    getActivities() {
+      this.$axios.get(this.activityUrl).then(res => {
+        for (const i in res) {
+          this.activities.push(res[i])
+        }
+      })
+    },
+    onClick(activity) {
+      const type = activity['r_type']
+      const taskUrl = activity['detail_url']
+      if (type === 'O') {
+        this.$axios.get(taskUrl).then(
+          res => {
+            this.$refs.DetailDialog.show(res.diff)
+          }
+        )
+      } else {
+        openTaskPage('', 'celery', taskUrl)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/Apps/UserConfirmDialog/index.vue

@@ -0,0 +1,234 @@
+<template>
+  <Dialog
+    :close-on-click-modal="false"
+    :destroy-on-close="true"
+    :show-cancel="false"
+    :show-confirm="false"
+    :title="title"
+    :visible.sync="visible"
+    class="dialog-content"
+    v-bind="$attrs"
+    width="600px"
+    @confirm="visible = false"
+    v-on="$listeners"
+  >
+    <div v-if="confirmTypeRequired === 'relogin'">
+      <el-row :gutter="24" style="margin: 0 auto;">
+        <el-col :md="24" :sm="24">
+          <el-alert
+            :title="$tc('auth.ReLoginTitle')"
+            center
+            style="margin-bottom: 20px;"
+            type="error"
+          />
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin: 0 auto;">
+        <el-col :md="24" :sm="24">
+          <el-button class="confirm-btn" size="mini" type="primary" @click="logout">
+            {{ this.$t('auth.ReLogin') }}
+          </el-button>
+        </el-col>
+      </el-row>
+    </div>
+    <div v-else>
+      <el-row :gutter="24" style="margin: 0 auto;">
+        <el-col :md="24" :sm="24" :span="24" class="add">
+          <el-select
+            v-model="subTypeSelected"
+            style="width: 100%; margin-bottom: 20px;"
+            @change="handleSubTypeChange"
+          >
+            <el-option
+              v-for="item of subTypeChoices"
+              :key="item.name"
+              :disabled="item.disabled"
+              :label="item.display_name"
+              :value="item.name"
+            />
+          </el-select>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin: 0 auto;">
+        <el-col :md="24" :sm="24" style="display: flex; margin-bottom: 20px;">
+          <el-input
+            v-model="secretValue"
+            :placeholder="inputPlaceholder"
+            :show-password="showPassword"
+            @keyup.enter.native="handleConfirm"
+          />
+          <span v-if="subTypeSelected === 'sms'" style="margin: -1px 0 0 20px;">
+            <el-button
+              :disabled="smsBtnDisabled"
+              size="mini"
+              style="line-height:20px; float: right;"
+              type="primary"
+              @click="sendSMSCode"
+            >
+              {{ smsBtnText }}
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin: 10px auto;">
+        <el-col :md="24" :sm="24">
+          <el-button class="confirm-btn" size="mini" type="primary" @click="handleConfirm">
+            {{ this.$t('common.Confirm') }}
+          </el-button>
+        </el-col>
+      </el-row>
+    </div>
+  </Dialog>
+</template>
+<script>
+import Dialog from '@/components/Dialog/index.vue'
+import { encryptPassword } from '@/utils/crypto'
+
+export default {
+  name: 'UserConfirmDialog',
+  components: {
+    Dialog
+  },
+  props: {
+    url: {
+      type: String,
+      default: ''
+    },
+    handler: {
+      type: Function,
+      default: null
+    }
+  },
+  data() {
+    return {
+      title: this.$t('common.CurrentUserVerify'),
+      smsWidth: 0,
+      subTypeSelected: '',
+      inputPlaceholder: '',
+      smsBtnText: this.$t('common.SendVerificationCode'),
+      smsBtnDisabled: false,
+      confirmTypeRequired: '',
+      subTypeChoices: [],
+      secretValue: '',
+      visible: false,
+      callback: null,
+      cancel: null,
+      processing: false
+    }
+  },
+  computed: {
+    showPassword() {
+      return this.confirmTypeRequired === 'password'
+    }
+  },
+  mounted() {
+    this.$eventBus.$on('showConfirmDialog', this.performConfirm)
+  },
+  beforeDestroy() {
+    this.$eventBus.$off('showConfirmDialog', this.performConfirm)
+  },
+  methods: {
+    handleSubTypeChange(val) {
+      this.inputPlaceholder = this.subTypeChoices.filter(item => item.name === val)[0]?.placeholder
+      this.smsWidth = val === 'sms' ? 6 : 0
+    },
+    performConfirm: _.throttle(function({ response, callback, cancel }) {
+      if (this.processing || this.visible) {
+        return
+      }
+      this.processing = true
+      this.callback = callback
+      this.cancel = cancel
+      this.$log.debug('perform confirm action')
+      const confirmType = response.data?.code
+      const confirmUrl = '/api/v1/authentication/confirm/'
+      this.$axios.get(confirmUrl, { params: { confirm_type: confirmType }}).then((data) => {
+        this.confirmTypeRequired = data.confirm_type
+
+        if (this.confirmTypeRequired === 'relogin') {
+          this.$axios.post(confirmUrl, { 'confirm_type': 'relogin', 'secret_key': 'x' }).then(() => {
+            this.callback()
+            this.visible = false
+          }).catch(() => {
+            this.title = this.$t('auth.NeedReLogin')
+            this.visible = true
+          })
+          return
+        }
+        this.subTypeChoices = data.content
+        const defaultSubType = this.subTypeChoices.filter(item => !item.disabled)[0]
+        this.subTypeSelected = defaultSubType.name
+        this.inputPlaceholder = defaultSubType.placeholder
+        this.visible = true
+      }).catch((err) => {
+        const data = err.response?.data
+        const msg = data?.error || data?.detail || data?.msg || this.$t('common.GetConfirmTypeFailed')
+        this.$message.error(msg)
+        this.cancel(err)
+      }).finally(() => {
+        this.processing = false
+      })
+    }, 300),
+    logout() {
+      window.location.href = `${process.env.VUE_APP_LOGOUT_PATH}?next=${this.$route.fullPath}`
+    },
+    sendSMSCode() {
+      this.$axios.post(`/api/v1/authentication/mfa/select/`, { type: 'sms' }).then(res => {
+        this.$message.success(this.$tc('common.VerificationCodeSent'))
+        let time = 60
+        const interval = setInterval(() => {
+          const originText = this.smsBtnText
+          this.smsBtnText = this.$t('common.Pending') + `: ${time}`
+          this.smsBtnDisabled = true
+          time -= 1
+
+          if (time === 0) {
+            this.smsBtnText = originText
+            this.smsBtnDisabled = false
+            clearInterval(interval)
+          }
+        }, 1000)
+      })
+    },
+    handleConfirm() {
+      if (this.confirmTypeRequired === 'relogin') {
+        return this.logout()
+      }
+      if (this.subTypeSelected === 'otp' && this.secretValue.length !== 6) {
+        return this.$message.error(this.$tc('common.MFAErrorMsg'))
+      }
+      const data = {
+        confirm_type: this.confirmTypeRequired,
+        mfa_type: this.confirmTypeRequired === 'mfa' ? this.subTypeSelected : '',
+        secret_key: this.confirmTypeRequired === 'password' ? encryptPassword(this.secretValue) : this.secretValue
+      }
+      this.$axios.post(`/api/v1/authentication/confirm/`, data).then(res => {
+        this.callback()
+        this.secretValue = ''
+        this.visible = false
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .dialog-content >>> .el-dialog__footer {
+    padding: 0;
+  }
+
+  .dialog-content >>> .el-dialog {
+    padding: 8px;
+
+    .el-dialog__body {
+      padding-top: 30px;
+      padding-bottom: 30px;
+    }
+  }
+
+  .confirm-btn {
+    width: 100%;
+    line-height: 20px;
+  }
+
+</style>

src/components/AssetSelect/index.vue

@@ -1,206 +0,0 @@
-<template>
-  <div class="asset-select-dialog">
-    <Select2
-      ref="select2"
-      v-model="select2Config.value"
-      v-bind="select2Config"
-      @input="onInputChange"
-      @focus.stop="handleFocus"
-      v-on="$listeners"
-    />
-    <Dialog
-      v-if="dialogVisible"
-      :title="this.$t('assets.Assets')"
-      :visible.sync="dialogVisible"
-      custom-class="asset-select-dialog"
-      width="80vw"
-      top="1vh"
-      @confirm="handleConfirm"
-      @cancel="handleCancel"
-    >
-      <TreeTable
-        ref="ListPage"
-        :tree-setting="treeSetting"
-        :table-config="tableConfig"
-        :header-actions="headerActions"
-      />
-    </Dialog>
-  </div>
-</template>
-
-<script>
-import TreeTable from '@/components/TreeTable'
-import { DetailFormatter } from '@/components/TableFormatters'
-import Select2 from '@/components/FormFields/Select2'
-import Dialog from '@/components/Dialog'
-
-export default {
-  componentName: 'AssetSelect',
-  components: { TreeTable, Select2, Dialog },
-  props: {
-    value: {
-      type: Array,
-      default: () => []
-    },
-    canSelect: {
-      type: Function,
-      default(row, index) {
-        return true
-      }
-    },
-    disabled: {
-      type: [Boolean, Function],
-      default: false
-    }
-  },
-  data() {
-    const select2Config = {
-      value: this.value,
-      multiple: true,
-      clearable: true,
-      ajax: {
-        url: '/api/v1/assets/assets/?fields_size=mini',
-        transformOption: (item) => {
-          return { label: item.hostname + '(' + item.ip + ')', value: item.id }
-        }
-      }
-    }
-    const vm = this
-    return {
-      dialogVisible: false,
-      initialValue: _.cloneDeep(this.value),
-      rowSelected: [],
-      initSelection: null,
-      treeSetting: {
-        showMenu: false,
-        showRefresh: true,
-        showAssets: false,
-        url: '/api/v1/assets/assets/?fields_size=mini',
-        nodeUrl: '/api/v1/assets/nodes/',
-        // ?assets=0不显示资产. =1显示资产
-        treeUrl: '/api/v1/assets/nodes/children/tree/?assets=0'
-      },
-      select2Config: select2Config,
-      dialogSelect2Config: select2Config,
-      tableConfig: {
-        url: '/api/v1/assets/assets/?fields_size=mini',
-        hasTree: true,
-        canSelect: this.canSelect,
-        columns: [
-          {
-            prop: 'hostname',
-            label: this.$t('assets.Hostname'),
-            sortable: true,
-            showOverflowTooltip: true,
-            formatter: DetailFormatter,
-            formatterArgs: {
-              route: 'AssetDetail'
-            }
-          },
-          {
-            prop: 'ip',
-            label: this.$t('assets.ipDomain'),
-            sortable: 'custom'
-          },
-          {
-            prop: 'platform',
-            label: this.$t('assets.Platform'),
-            sortable: true
-          },
-          {
-            prop: 'protocols',
-            formatter: function(row) {
-              return <span> {row.protocols.toString()} </span>
-            },
-            label: this.$t('assets.Protocols')
-          }
-        ],
-        listeners: {
-          'toggle-row-selection': (isSelected, row) => {
-            if (isSelected) {
-              vm.addRowToSelect(row)
-            } else {
-              vm.removeRowFromSelect(row)
-            }
-          }
-        },
-        theRowDefaultIsSelected: (row) => {
-          return this.value.indexOf(row.id) > -1
-        }
-      },
-      headerActions: {
-        hasLeftActions: false,
-        hasRightActions: false
-      }
-    }
-  },
-  methods: {
-    handleFocus() {
-      this.$refs.select2.selectRef.blur()
-      this.dialogVisible = true
-    },
-    handleConfirm() {
-      this.dialogVisible = false
-    },
-    handleCancel() {
-      this.$refs.select2.iValue = this.initialValue
-      this.dialogVisible = false
-    },
-    onInputChange(val) {
-      this.$emit('change', val)
-    },
-    addToSelect(options, row) {
-      const selectOptionsHas = options.find(item => item.value === row.id)
-      // 如果select2的options中没有，那么可能无法显示正常的值
-      if (selectOptionsHas === undefined) {
-        const option = {
-          label: `${row.hostname}(${row.ip})`,
-          value: row.id
-        }
-        options.push(option)
-      }
-    },
-    addRowToSelect(row) {
-      const outSelectOptions = this.$refs.select2.options
-      this.addToSelect(outSelectOptions, row)
-
-      const selectValue = this.$refs.select2.iValue
-      const selectValueIndex = selectValue.indexOf(row.id)
-      if (selectValueIndex === -1) {
-        selectValue.push(row.id)
-      }
-      this.onInputChange(selectValue)
-    },
-    removeRowFromSelect(row) {
-      const selectValue = this.$refs.select2.iValue
-      const selectValueIndex = selectValue.indexOf(row.id)
-      if (selectValueIndex > -1) {
-        selectValue.splice(selectValueIndex, 1)
-      }
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-  .el-select{
-    width: 100%;
-  }
-  .page  ::v-deep  .page-heading{
-    display: none;
-  }
-  .el-dialog__wrapper  ::v-deep .el-dialog__body{
-    padding: 5px 10px;
-  }
-  .page  ::v-deep  .treebox {
-    height: inherit !important;
-  }
-  .asset-select-dialog >>> .transition-box:first-child {
-    background-color: #f3f3f3 ;
-  }
-
-  .el-dialog__wrapper  ::v-deep .el-dialog__body .wrapper-content {
-    padding: 10px;
-  }
-
-</style>

src/components/AutoDataForm/index.vue

@@ -1,117 +0,0 @@
-<template>
-  <DataForm ref="dataForm" v-loading="loading" :fields="totalFields" :form="iForm" v-bind="$attrs" v-on="$listeners">
-    <FormGroupHeader
-      v-for="(group, i) in groups"
-      :slot="'id:'+group.name"
-      :key="'group-'+group.name"
-      :group="group"
-      :index="i"
-      :line="i !== 0"
-    />
-  </DataForm>
-</template>
-
-<script>
-import DataForm from '../DataForm'
-import FormGroupHeader from '@/components/FormGroupHeader'
-import { FormFieldGenerator } from '@/components/AutoDataForm/utils'
-export default {
-  name: 'AutoDataForm',
-  components: {
-    DataForm,
-    FormGroupHeader
-  },
-  props: {
-    url: {
-      type: String,
-      required: true
-    },
-    method: {
-      type: String,
-      default: 'post'
-    },
-    fields: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    form: {
-      type: Object,
-      default: () => ({})
-    },
-    fieldsMeta: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  data() {
-    return {
-      remoteMeta: {},
-      totalFields: [],
-      loading: true,
-      groups: [],
-      iForm: this.form,
-      errors: {}
-    }
-  },
-  mounted() {
-    this.optionUrlMetaAndGenerateColumns()
-  },
-  methods: {
-    optionUrlMetaAndGenerateColumns() {
-      this.$store.dispatch('common/getUrlMeta', { url: this.url }).then(data => {
-        this.remoteMeta = data.actions[this.method.toUpperCase()] || {}
-        this.generateColumns()
-        this.cleanFormValue()
-      }).catch(err => {
-        this.$log.error(err)
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    generateColumns() {
-      const generator = new FormFieldGenerator()
-      this.totalFields = generator.generateFields(this.fields, this.fieldsMeta, this.remoteMeta)
-      this.groups = generator.groups
-      this.$log.debug('Total fields: ', this.totalFields)
-    },
-    _cleanFormValue(form, remoteMeta) {
-      for (const [k, v] of Object.entries(remoteMeta)) {
-        if (v.default === undefined) {
-          continue
-        }
-        const valueSet = form[k]
-        if (valueSet !== undefined) {
-          continue
-        }
-        if (v.type === 'nested object' && typeof valueSet === 'object') {
-          this._cleanFormValue(valueSet, v.children)
-        }
-        form[k] = v.default
-      }
-    },
-    cleanFormValue() {
-      this._cleanFormValue(this.iForm, this.remoteMeta)
-    },
-    setFieldError(name, error) {
-      const field = this.totalFields.find((v) => v.prop === name)
-      if (!field) {
-        return
-      }
-      if (field.attrs.error === error) {
-        error += '.'
-      }
-      if (field.type === 'nestedField') {
-        field.el.errors = error
-      } else {
-        field.attrs.error = error
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/components/Cards/DetailCard/ItemValue.vue

@@ -0,0 +1,105 @@
+<script type="text/jsx">
+import { toSafeLocalDateStr } from '@/utils/common'
+
+export default {
+  name: 'ItemValue',
+  props: {
+    value: {
+      type: [String, Number, Function, Array, Object, Boolean],
+      default: ''
+    },
+    item: {
+      type: Object,
+      default: () => ({})
+    },
+    formatter: {
+      type: Function,
+      default: null
+    }
+  },
+  data() {
+    return {}
+  },
+  computed: {
+    displayValue() {
+      if ([null, undefined, ''].includes(this.value)) {
+        return '-'
+      }
+      if (typeof this.value === 'boolean') {
+        return this.toChoicesDisplay(this.value)
+      } else if (typeof this.value === 'object') {
+        return this.value
+      } else if (this.value instanceof Array) {
+        return this.value.map(item => {
+          if (typeof item === 'object') {
+            return item.label || item.title
+          } else {
+            return item
+          }
+        }).join(', ')
+      } else if (this.isDatetime(this.value)) {
+        return toSafeLocalDateStr(this.value)
+      } else {
+        return this.value
+      }
+    }
+  },
+  methods: {
+    toChoicesDisplay(value) {
+      if (!value) {
+        return this.$t('common.No')
+      }
+      return this.$t('common.Yes')
+    },
+    isDatetime(value) {
+      if (typeof value !== 'string') {
+        return false
+      }
+      if (value.split(' ').length !== 3) {
+        return false
+      }
+      if (value.split(' ')[1].split(':').length !== 3) {
+        return false
+      }
+      if (isNaN(value) && !isNaN(Date.parse(value))) {
+        return true
+      }
+    }
+  },
+  render(h) {
+    let formatterData = ''
+    if (typeof this.formatter === 'function') {
+      const data = this.formatter(this.item, this.value)
+      if (data instanceof Promise) {
+        data.then(res => {
+          formatterData = res
+        })
+      } else {
+        formatterData = data
+      }
+      return (
+        <span>{formatterData}</span>
+      )
+    }
+    if (this.value instanceof Array) {
+      const newArr = this.value || []
+      return (
+        <span>
+          {
+            newArr.map((item, index) => <div key={index}>{item.key}：{item.value} </div>)
+          }
+        </span>
+      )
+    }
+    return (
+      <span>{this.displayValue}</span>
+    )
+  }
+}
+</script>
+
+<style scoped>
+a {
+  color: var(--color-success);
+}
+</style>

src/components/Cards/DetailCard/auto.vue

@@ -0,0 +1,185 @@
+<template>
+  <DetailCard v-if="!loading && hasObject && items.length > 0" :items="items" v-bind="$attrs" />
+</template>
+
+<script>
+import DetailCard from './index.vue'
+import { copy, toSafeLocalDateStr } from '@/utils/common'
+
+export default {
+  name: 'AutoDetailCard',
+  components: { DetailCard },
+  props: {
+    object: {
+      type: Object,
+      default: () => ({})
+    },
+    url: {
+      type: String,
+      required: true
+    },
+    fields: {
+      type: Array,
+      default: null
+    },
+    excludes: {
+      type: Array,
+      default: null
+    },
+    showUndefine: {
+      type: Boolean,
+      default: true
+    },
+    formatters: {
+      type: Object,
+      default: () => ({})
+    },
+    nested: {
+      type: String,
+      default: null
+    }
+  },
+  data() {
+    return {
+      items: [],
+      loading: true
+    }
+  },
+  computed: {
+    iObject() {
+      if (this.nested) {
+        return this.object[this.nested] || {}
+      } else {
+        return this.object
+      }
+    },
+    hasObject() {
+      return Object.keys(this.iObject).length > 0
+    }
+  },
+  async mounted() {
+    await this.optionAndGenFields()
+    this.loading = false
+  },
+  methods: {
+    defaultFormatter(fields) {
+      const formatter = {}
+      for (const name of fields) {
+        formatter[name] = function(item, val) {
+          if (val === '-') {
+            return <span>{'-'}</span>
+          }
+          return (<span style={{ cursor: 'pointer' }} onClick={() => copy(val)}>
+            {val}
+          </span>)
+        }
+      }
+      return formatter
+    },
+    async optionAndGenFields() {
+      const data = await this.$store.dispatch('common/getUrlMeta', { url: this.url })
+      let remoteMeta = data.actions['GET'] || {}
+      if (this.nested) {
+        remoteMeta = remoteMeta[this.nested]?.children || {}
+      }
+      let fields = this.fields
+      fields = fields || Object.keys(remoteMeta)
+      const defaultExcludes = ['org_id']
+      const excludes = (this.excludes || []).concat(defaultExcludes)
+      fields = fields.filter(item => !excludes.includes(item))
+      const defaultFormatter = this.defaultFormatter(fields)
+      for (const name of fields) {
+        if (typeof name === 'object') {
+          this.items.push(name)
+          continue
+        }
+        const fieldMeta = remoteMeta[name]
+        if (!fieldMeta) {
+          continue
+        }
+        if (fieldMeta['write_only']) {
+          continue
+        }
+
+        let value = this.iObject[name]
+        const label = fieldMeta.label
+
+        if (Array.isArray(value)) {
+          if (typeof value[0] === 'object') {
+            const firstValue = value[0]
+            if (firstValue.hasOwnProperty('name')) {
+              value.forEach(item => {
+                const fieldName = `${name}.${item.name}`
+                if (excludes.includes(fieldName)) {
+                  return
+                }
+                this.items.push({
+                  key: item.label,
+                  value: item.value
+                })
+              })
+            } else {
+              value.forEach((item, index) => {
+                const v = Object.entries(item).map(([key, value]) => `${key}:${value}`).join(', ')
+                const data = { value: v }
+                if (index === 0) {
+                  data['key'] = label
+                }
+                this.items.push(data)
+              })
+            }
+          } else if (typeof value[0] === 'string') {
+            value.forEach((item, index) => {
+              let data = {}
+              if (index === 0) {
+                data = {
+                  key: label,
+                  value: value[index]
+                }
+              } else {
+                data = {
+                  value: value[index]
+                }
+              }
+              this.items.push(data)
+            })
+          }
+          continue
+        }
+        if (value === null || value === '') {
+          value = '-'
+        } else if (fieldMeta.type === 'datetime') {
+          value = toSafeLocalDateStr(value)
+        } else if (fieldMeta.type === 'labeled_choice') {
+          value = value?.['label']
+        } else if (fieldMeta.type === 'related_field' || fieldMeta.type === 'nested object') {
+          value = value?.['name']
+        } else if (fieldMeta.type === 'm2m_related_field') {
+          value = value?.map(item => item['name']).join(', ')
+        } else if (fieldMeta.type === 'boolean') {
+          value = value ? this.$t('common.Yes') : this.$t('common.No')
+        }
+
+        if (value === undefined) {
+          if (this.showUndefine) {
+            value = '-'
+          } else {
+            continue
+          }
+        }
+
+        const item = {
+          key: label,
+          value: value,
+          formatter: this.formatters[name] || defaultFormatter[name]
+        }
+        this.items.push(item)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/Cards/DetailCard/index.vue

@@ -0,0 +1,89 @@
+<template>
+  <IBox :fa="fa" :title="title">
+    <el-form class="content" label-position="left" label-width="25%">
+      <el-form-item v-for="item in iItems" :key="item.key" :label="item.key">
+        <ItemValue :value="item.value" class="item-value" v-bind="item" />
+      </el-form-item>
+    </el-form>
+    <slot />
+  </IBox>
+</template>
+
+<script>
+import IBox from '../../IBox/index.vue'
+import ItemValue from './ItemValue.vue'
+
+export default {
+  name: 'DetailCard',
+  components: { IBox, ItemValue },
+  props: {
+    title: {
+      type: String,
+      default() {
+        return this.$t('common.BasicInfo')
+      }
+    },
+    fa: {
+      type: String,
+      default: 'fa-info-circle'
+    },
+    items: {
+      type: Array,
+      default: () => []
+    },
+    align: {
+      type: String,
+      default: 'left'
+    }
+  },
+  data() {
+    return {
+      iItems: this.items.filter(item => {
+        return !item.hasOwnProperty('has') || item.has === true
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .el-card__body {
+    padding: 20px 40px;
+  }
+
+  .el-form-item {
+    border-bottom: 1px dashed #EBEEF5;
+    padding: 1px 0;
+    margin-bottom: 0;
+
+    &:last-child {
+      border-bottom: none;
+    }
+
+    &:hover {
+    }
+
+    >>> .el-form-item__label {
+      padding-right: 8%;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;
+    }
+
+    >>> .el-form-item__content {
+      font-size: 13px;
+    }
+
+    >>> .el-tag--mini {
+      margin-right: 3px;
+    }
+  }
+
+  .item-value span {
+    word-break: break-word;
+  }
+  .content {
+    font-size: 13px;
+    line-height: 2.5;
+  }
+</style>

src/components/Cards/RelationCard/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <IBox :fa="icon" :type="type" :title="title" v-bind="$attrs">
-    <table style="width: 100%;table-layout:fixed;" class="CardTable">
+  <IBox :title="title" :type="type" v-bind="$attrs">
+    <table class="CardTable" style="width: 100%;table-layout:fixed;">
       <tr>
         <td colspan="2">
           <Select2 ref="select2" v-model="select2.value" :disabled="iDisabled" v-bind="select2" />
@@ -9,7 +9,7 @@
       <slot />
       <tr>
         <td colspan="2">
-          <el-button :type="type" size="small" :loading="submitLoading" :disabled="iDisabled" @click="addObjects">
+          <el-button :disabled="iDisabled" :loading="submitLoading" :type="type" size="small" @click="addObjects">
             {{ $t('common.Add') }}
           </el-button>
         </td>
@@ -17,12 +17,12 @@
       <template v-if="showHasObjects">
         <tr v-for="obj of iHasObjects" :key="obj.value" class="item">
           <td style="width: 100%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
-            <el-tooltip style="margin: 4px;" effect="dark" :content="obj.label" placement="left">
+            <el-tooltip :content="obj.label" effect="dark" placement="left" style="margin: 4px;">
               <b>{{ obj.label }}</b>
             </el-tooltip>
           </td>
           <td>
-            <el-button size="mini" :disabled="iDisabled" type="danger" style="float: right" @click="removeObject(obj)">
+            <el-button :disabled="iDisabled" size="mini" style="float: right" type="danger" @click="removeObject(obj)">
               <i class="fa fa-minus" />
             </el-button>
           </td>
@@ -30,7 +30,7 @@
       </template>
       <tr v-if="params.hasMore && showHasMore" class="item">
         <td colspan="2">
-          <el-button :type="type" :disabled="iDisabled" size="small" style="width: 100%" @click="loadMore">
+          <el-button :disabled="iDisabled" :type="type" size="small" style="width: 100%" @click="loadMore">
             <i class="fa fa-arrow-down" />
             {{ $t('common.More') }}
           </el-button>
@@ -41,10 +41,11 @@
 </template>
 
 <script>
-import Select2 from '../FormFields/Select2'
-import IBox from '../IBox'
+import Select2 from '@/components/Form/FormFields/Select2.vue'
+import IBox from '../../IBox/index.vue'
 import { createSourceIdCache } from '@/api/common'
 import { mapGetters } from 'vuex'
+
 export default {
   name: 'RelationCard',
   components: {
@@ -102,6 +103,10 @@ export default {
       type: Function,
       default: (obj, that) => {}
     },
+    allowCreate: {
+      type: Boolean,
+      default: false
+    },
     onDeleteSuccess: {
       type: Function,
       default(obj, that) {
@@ -117,6 +122,22 @@ export default {
         that.$message.success(that.$t('common.RemoveSuccessMsg'))
       }
     },
+    onDeleteFail: {
+      type: Function,
+      default(error, that) {
+        let msg = ''
+        const data = error.response.data
+        for (const item of Object.keys(data)) {
+          const value = data[item]
+          if (value instanceof Array) {
+            msg = value.join(',')
+          } else {
+            msg = value
+          }
+        }
+        that.$message.error(msg)
+      }
+    },
     performAdd: {
       type: Function,
       default: (objects, that) => {}
@@ -129,6 +150,10 @@ export default {
         that.$refs.select2.clearSelected()
         that.$message.success(that.$t('common.AddSuccessMsg'))
       }
+    },
+    getHasObjects: {
+      type: Function,
+      default: null // (objectIds) => {}
     }
   },
   data() {
@@ -146,7 +171,8 @@ export default {
         options: this.objects,
         value: this.value,
         disabled: this.disabled,
-        disabledValues: []
+        disabledValues: [],
+        allowCreate: this.allowCreate
       }
     }
   },
@@ -241,14 +267,22 @@ export default {
         return
       }
       this.select2.disabledValues = this.hasObjectsId
-      const resp = await createSourceIdCache(this.hasObjectsId)
-      this.params.spm = resp.spm
-      await this.loadHasObjects()
+      if (this.getHasObjects) {
+        this.getHasObjects(this.hasObjectsId).then((data) => {
+          this.iHasObjects = data
+        })
+      } else {
+        const resp = await createSourceIdCache(this.hasObjectsId)
+        this.params.spm = resp.spm
+        await this.loadHasObjects()
+      }
     },
     removeObject(obj) {
       this.performDelete(obj, this).then(
         () => this.onDeleteSuccess(obj, this)
-      )
+      ).catch(error => {
+        this.onDeleteFail(error, this)
+      })
     },
     addObjects() {
       const objects = this.$refs.select2.$refs.select.selected.map(item => ({ label: item.label, value: item.value }))

src/components/DataActions/index.vue

@@ -10,7 +10,7 @@
         placement="bottom-start"
         @command="handleDropdownCallback"
       >
-        <el-button :size="size" v-bind="cleanButtonAction(action)">
+        <el-button class="more-action" :size="size" v-bind="cleanButtonAction(action)">
           {{ action.title }}<i class="el-icon-arrow-down el-icon--right" />
         </el-button>
         <el-dropdown-menu slot="dropdown" style="overflow: auto;max-height: 60vh">
@@ -28,6 +28,10 @@
               :command="[option, action]"
               v-bind="option"
             >
+              <span v-if="option.fa">
+                <i v-if="option.fa.startsWith('fa-')" :class="'fa ' + option.fa" />
+                <svg-icon v-else :icon-class="option.fa" style="font-size: 14px; margin-right: 2px; margin-left: -2px;" />
+              </span>
               {{ option.title }}
             </el-dropdown-item>
           </template>
@@ -44,7 +48,11 @@
       >
         <el-tooltip :disabled="!action.tip" :content="action.tip" placement="top">
           <span>
-            <i v-if="action.fa" :class="'fa ' + action.fa" />{{ action.title }}
+            <span v-if="action.fa" style="vertical-align: initial;">
+              <i v-if="action.fa.startsWith('fa-')" :class="'fa ' + action.fa" />
+              <svg-icon v-else :icon-class="action.fa" style="font-size: 14px;" />
+            </span>
+            {{ action.title }}
           </span>
         </el-tooltip>
       </el-button>
@@ -153,7 +161,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .layout {
   display: flex;
   justify-content: center;
@@ -181,4 +189,22 @@ export default {
 .el-button-ungroup .action-item:first-child {
   margin-left: 0;
 }
+::v-deep .more-batch-processing {
+  &.el-dropdown-menu__item--divided {
+    margin-top: 0;
+    border-top: none;
+    color: #909399;
+    cursor: auto;
+    font-size: 12px;
+    line-height: 30px;
+    border-bottom: 1px solid #E4E7ED;
+    &:before {
+      height: 0;
+    }
+  }
+  &.el-dropdown-menu__item:not(.is-disabled):hover {
+    color: #909399;
+    background-color: #FFFFFF;
+  }
+}
 </style>

src/components/DataForm/rules/index.js

@@ -1,34 +0,0 @@
-import i18n from '@/i18n/i18n'
-
-export const Required = {
-  required: true, message: i18n.t('common.fieldRequiredError'), trigger: 'blur'
-}
-
-export const RequiredChange = {
-  required: true, message: i18n.t('common.fieldRequiredError'), trigger: 'change'
-}
-
-export const EmailCheck = {
-  type: 'email',
-  message: i18n.t('common.InputEmailAddress'),
-  trigger: ['blur', 'change']
-}
-
-export default {
-  Required,
-  RequiredChange,
-  EmailCheck
-}
-
-export const JsonRequired = {
-  required: true,
-  trigger: 'change',
-  validator: (rule, value, callback) => {
-    try {
-      JSON.parse(value)
-      callback()
-    } catch (e) {
-      callback(new Error(i18n.t('common.InvalidJson')))
-    }
-  }
-}

src/components/DataTable/compenents/el-data-table/index.less

@@ -1,16 +0,0 @@
-.el-data-table  ::v-deep  .el-pagination{
-    text-align: center !important;
-  }
-  .el-data-table  ::v-deep  .el-table td{
-    padding: 4px 0;
-  }
-  .el-data-table  ::v-deep  .el-table th{
-    padding: 4px 0;
-  }
-  .el-data-table ::v-deep  .el-form-item{
-    margin-bottom:10px !important ;
-    margin-top:10px;
-  }
-  .el-data-table ::v-deep  .el-pagination{
-    padding:15px  0 !important ;
-  }

src/components/DataZTree/components/ZTree/index.vue

@@ -1,221 +0,0 @@
-<template>
-  <div>
-    <ul v-show="loading" class="ztree">
-      {{ this.$t('common.tree.Loading') }}...
-    </ul>
-    <div v-show="!loading" class="treebox">
-      <ul :id="iZTreeID" class="ztree">
-        {{ this.$t('common.tree.Loading') }}...
-      </ul>
-      <div v-if="treeSetting.treeUrl===''">
-        {{ this.$t('common.tree.Empty') }}<a id="tree-refresh"><i class="fa fa-refresh" /></a>
-      </div>
-    </div>
-    <div :id="iRMenuID" class="rMenu">
-      <ul class="dropdown-menu menu-actions">
-        <slot name="rMenu" />
-      </ul>
-    </div>
-  </div>
-</template>
-
-<script>
-// 导入JQuery
-// eslint-disable-next-line no-unused-vars
-import $ from '@/utils/jquery-vendor.js'
-import '@ztree/ztree_v3/js/jquery.ztree.all.min.js'
-import '@/styles/ztree.css'
-import axiosRetry from 'axios-retry'
-
-const defaultObject = {
-  type: Object,
-  default: () => {}
-}
-export default {
-  name: 'ZTree',
-  components: {
-  },
-  props: {
-    setting: defaultObject
-  },
-  data() {
-    return {
-      iZTreeID: `zTree_${this._uid}`,
-      iRMenuID: `rMenu_${this._uid}`,
-      zTree: '',
-      rMenu: '',
-      init: false,
-      loading: false
-    }
-  },
-  computed: {
-    treeSetting() {
-      return this.setting
-    }
-  },
-  mounted() {
-    this.initTree()
-    // $('.treebox').css('height', window.innerHeight - 60)
-  },
-  beforeDestroy() {
-    $.fn.zTree.destroy(this.iZTreeID)
-  },
-  methods: {
-    initTree: function() {
-      const vm = this
-      let treeUrl
-      if (this.init) {
-        this.loading = true
-      }
-      if (this.init && this.treeSetting.treeUrl.indexOf('/perms/') !== -1 && this.treeSetting.treeUrl.indexOf('rebuild_tree') === -1) {
-        treeUrl = (this.treeSetting.treeUrl.indexOf('?') === -1) ? `${this.treeSetting.treeUrl}?rebuild_tree=1` : `${this.treeSetting.treeUrl}&rebuild_tree=1`
-      } else {
-        treeUrl = this.treeSetting.treeUrl
-      }
-      this.$axios.get(treeUrl, {
-        'axios-retry': {
-          retries: 20,
-          retryCondition: e => {
-            return axiosRetry.isNetworkOrIdempotentRequestError(e) || e.response.status === 409
-          },
-          shouldResetTimeout: true,
-          retryDelay: () => { return 5000 }
-        }
-      }).then(res => {
-        if (!res) {
-          res = []
-        }
-        if (res.length === 0) {
-          res.push({
-            name: this.$t('common.tree.Empty')
-          })
-        }
-        this.treeSetting.treeUrl = treeUrl
-        if (this.init) {
-          vm.zTree.destroy()
-        }
-        this.zTree = $.fn.zTree.init($(`#${this.iZTreeID}`), this.treeSetting, res)
-        // 手动上报事件, Tree加载完成
-        this.$emit('TreeInitFinish', this.zTree)
-        if (this.treeSetting.showRefresh) {
-          this.rootNodeAddDom(
-            this.zTree,
-            this.treeSetting.callback.refresh
-          )
-        }
-
-        if (this.treeSetting.showMenu) {
-          this.rMenu = $(`#${this.iRMenuID}`)
-        }
-        if (this.treeSetting.otherMenu) {
-          $('.menu-actions').append(this.otherMenu)
-        }
-      }).finally(_ => {
-        vm.loading = false
-        vm.init = true
-      })
-    },
-    rootNodeAddDom: function(ztree, callback) {
-      const vm = this
-      const refreshIcon = "<a id='tree-refresh'><i class='fa fa-refresh'></i></a>"
-      const rootNode = ztree.getNodes()[0]
-      let $rootNodeRef
-      if (rootNode) {
-        $rootNodeRef = $('#' + rootNode.tId + '_a')
-        $rootNodeRef.after(refreshIcon)
-      } else {
-        $rootNodeRef = $('#' + ztree.setting.treeId)
-        $rootNodeRef.html(refreshIcon)
-      }
-      const refreshIconRef = $('#tree-refresh')
-      refreshIconRef.bind('click', function() {
-        const result = callback()
-        if (result && result.then) {
-          result.finally(() => {
-            vm.initTree()
-          })
-        } else {
-          vm.initTree()
-        }
-      })
-    },
-    refresh: function() {
-      const refreshIconRef = $('#tree-refresh')
-      refreshIconRef.click()
-    },
-    getCheckedNodes: function() {
-      return this.zTree.getCheckedNodes(true)
-    }
-  }
-
-}
-</script>
-
-<style lang='less' scoped>
-  div.rMenu {
-    position: absolute;
-    visibility: hidden;
-    text-align: left;
-    top: 0;
-    left: 0;
-    z-index: 999;
-    float: left;
-    padding: 0 0;
-    margin: 2px 0 0;
-    list-style: none;
-    background-clip: padding-box;
-  }
-  .dataTables_wrapper .dataTables_processing {
-    opacity: .9;
-    border: none;
-  }
-  div.rMenu li{
-    margin: 6px 0;
-    cursor: pointer;
-    list-style: none outside none;
-  }
-  .dropdown-menu {
-    border: medium none;
-    min-width: 160px;
-    background-color: #fff;
-    border-radius: 3px;
-    box-shadow: 0 0 3px rgba(86, 96, 117, 0.7);
-    display: block;
-    float: left;
-    font-size: 12px;
-    left: 0;
-    list-style: none outside none;
-    padding: 0;
-    position: absolute;
-    text-shadow: none;
-    top: 100%;
-    z-index: 1000;
-  }
-  .ztree  ::v-deep  .fa-refresh {
-    font: normal normal normal 14px/1 FontAwesome !important;
-  }
-  .dropdown a:hover {
-    background-color: #f1f1f1
-  }
-  .dropdown-menu > li > a {
-    border-radius: 3px;
-    color: inherit;
-    line-height: 25px;
-    margin: 4px;
-    text-align: left;
-    font-weight: normal;
-    display: block;
-    padding: 3px 20px;
-    clear: both;
-    white-space: nowrap;
-  }
-  .dropdown-menu>li>a:hover, .dropdown-menu>li>a:focus {
-    color: #262626;
-    text-decoration: none;
-    background-color: #f5f5f5;
-  }
-  .treebox {
-    height: 80vh;
-    overflow: auto;
-  }
-</style>

src/components/DetailCard/ItemValue.vue

@@ -1,57 +0,0 @@
-<script type="text/jsx">
-export default {
-  name: 'ItemValue',
-  props: {
-    value: {
-      type: [String, Number, Function, Array, Object, Boolean],
-      default: ''
-    },
-    item: {
-      type: Object,
-      default: () => ({})
-    },
-    formatter: {
-      type: Function,
-      default: null
-    }
-  },
-  methods: {
-    toChoicesDisplay(value) {
-      if (!value) {
-        return this.$t('common.No')
-      }
-      return this.$t('common.Yes')
-    }
-  },
-  render(h) {
-    if (typeof this.formatter === 'function') {
-      return this.formatter(this.item, this.value)
-    }
-    if (typeof this.value === 'boolean') {
-      return (
-        <span class='item-value'>{this.toChoicesDisplay(this.value)}</span>
-      )
-    }
-    if (this.value instanceof Array) {
-      const newArr = this.value || []
-      return (
-        <span class='item-value'>
-          {
-            newArr.map((item, index) => <div key={index}>{item.key}：{item.value} </div>)
-          }
-        </span>
-      )
-    }
-    return (
-      <span class='item-value'>{this.value}</span>
-    )
-  }
-}
-</script>
-
-<style scoped>
-.item-value {
-  word-break: break-word;
-}
-
-</style>

src/components/DetailCard/index.vue

@@ -1,54 +0,0 @@
-<template>
-  <IBox :title="title" fa="fa-info-circle">
-    <div class="content">
-      <el-row v-if="this.$route.params.id" :gutter="10" class="item">
-        <el-col :span="6"><div :style="{ 'text-align': align }" class="item-label"><label>ID: </label></div></el-col>
-        <el-col :span="18"><div class="item-text">{{ this.$route.params.id }}</div></el-col>
-      </el-row>
-      <el-row v-for="item in items" :key="'card-' + item.key" :gutter="10" class="item">
-        <el-col :span="6">
-          <div :style="{ 'text-align': align }" class="item-label"><label>{{ item.key }}: </label></div>
-        </el-col>
-        <el-col :span="18">
-          <div class="item-text">
-            <ItemValue :value="item.value" v-bind="item" />
-          </div>
-        </el-col>
-      </el-row>
-      <slot />
-    </div>
-  </IBox>
-</template>
-
-<script>
-import IBox from '../IBox'
-import ItemValue from './ItemValue'
-
-export default {
-  name: 'DetailCard',
-  components: { IBox, ItemValue },
-  props: {
-    title: {
-      type: String,
-      default() {
-        return this.$t('common.BasicInfo')
-      }
-    },
-    items: {
-      type: Array,
-      default: () => []
-    },
-    align: {
-      type: String,
-      default: 'left'
-    }
-  }
-}
-</script>
-
-<style scoped>
-  .content {
-    font-size: 13px;
-    line-height: 2.5;
-  }
-</style>

src/components/Dialog/DiffDetail.vue

@@ -0,0 +1,105 @@
+<template>
+  <Dialog
+    v-if="detailVisible"
+    :show-cancel="false"
+    :show-confirm="false"
+    :title="title"
+    :visible.sync="detailVisible"
+  >
+    <div>
+      <div v-if="isEmpty()" style="text-align: center">
+        {{ this.$tc('common.NoContent') }}
+      </div>
+      <div v-else>
+        <el-table
+          :data="diff"
+          class="diffTable"
+        >
+          <el-table-column
+            :label="$tc('audits.ChangeField')"
+            :prop="fieldName"
+            show-overflow-tooltip
+            width="100"
+          />
+          <el-table-column
+            :label="$tc('audits.BeforeChange')"
+            :prop="leftKeyName"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            :label="$tc('audits.AfterChange')"
+            :prop="rightKeyName"
+            show-overflow-tooltip
+          />
+        </el-table>
+      </div>
+    </div>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from '@/components/Dialog/index'
+
+export default {
+  name: 'DiffDetail',
+  components: {
+    Dialog
+  },
+  props: {
+    title: {
+      type: String,
+      default: () => ''
+    },
+    fieldName: {
+      type: String,
+      default: () => 'field'
+    },
+    leftKeyName: {
+      type: String,
+      default: () => 'before'
+    },
+    rightKeyName: {
+      type: String,
+      default: () => 'after'
+    }
+  },
+  data() {
+    return {
+      diff: [],
+      detailVisible: false
+    }
+  },
+  methods: {
+    isEmpty() {
+      const content = this.diff
+      return !content || JSON.stringify(content) === '{}'
+    },
+    show(data) {
+      this.diff = data
+      this.detailVisible = true
+    }
+  }
+}
+
+</script>
+
+<style lang='scss' scoped>
+  .el-tag {
+    width: 100%;
+    white-space: normal;
+    height: auto;
+  }
+
+  .el-table::before {
+    background-color: inherit;
+  }
+
+  .diffTable {
+    width: 100%;
+    max-height: 80vh;
+
+    & >>> td {
+      padding: 5px 0 !important;
+    }
+  }
+</style>

src/components/Dialog/index.vue

@@ -1,19 +1,23 @@
 <template>
   <el-dialog
+    :append-to-body="true"
+    :modal-append-to-body="true"
     :title="title"
     :top="top"
     :width="iWidth"
     class="dialog"
     v-bind="$attrs"
-    :append-to-body="false"
-    :modal-append-to-body="false"
     v-on="$listeners"
   >
-    <slot />
+    <div v-loading="loadingStatus">
+      <slot />
+    </div>
     <div slot="footer" class="dialog-footer">
       <slot name="footer">
-        <el-button v-if="showCancel" size="small" @click="onCancel">{{ cancelTitle }}</el-button>
-        <el-button v-if="showConfirm" type="primary" size="small" :loading="loadingStatus" @click="onConfirm">{{ confirmTitle }}</el-button>
+        <el-button v-if="showCancel && showButtons" @click="onCancel">{{ cancelTitle }}</el-button>
+        <el-button v-if="showConfirm && showButtons" :disabled="loadingStatus" type="primary" @click="onConfirm">
+          {{ confirmTitle }}
+        </el-button>
       </slot>
     </div>
   </el-dialog>
@@ -27,16 +31,6 @@ export default {
       type: String,
       default: 'Title'
     },
-    showCancel: {
-      type: Boolean,
-      default: true
-    },
-    cancelTitle: {
-      type: String,
-      default() {
-        return this.$t('common.Cancel')
-      }
-    },
     top: {
       type: String,
       default: '3vh'
@@ -49,15 +43,33 @@ export default {
       type: Boolean,
       default: true
     },
-    loadingStatus: {
-      type: Boolean,
-      default: false
-    },
     confirmTitle: {
       type: String,
       default() {
         return this.$t('common.Confirm')
       }
+    },
+    showCancel: {
+      type: Boolean,
+      default: true
+    },
+    cancelTitle: {
+      type: String,
+      default() {
+        return this.$t('common.Cancel')
+      }
+    },
+    showButtons: {
+      type: Boolean,
+      default: true
+    },
+    loadingStatus: {
+      type: Boolean,
+      default: false
+    },
+    maxWidth: {
+      type: String,
+      default: '1200px'
     }
   },
   data() {
@@ -66,9 +78,11 @@ export default {
   },
   computed: {
     iWidth() {
-      return this.$store.getters.isMobile ? '80%' : this.width
+      return this.$store.getters.isMobile ? '1000px' : this.width
     }
   },
+  mounted() {
+  },
   methods: {
     onCancel() {
       this.$emit('cancel')
@@ -81,12 +95,43 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .dialog >>> .el-dialog__header {
-    /*padding-top: 10px;*/
-  }
+  .dialog >>> .el-dialog {
+    border-radius: 0.3em;
+    max-width: min(100vw, 1500px);
 
-  .dialog-footer {
-    padding-right: 20px;
+    .el-icon-circle-check {
+      display: none;
+    }
+
+    &__header {
+      box-sizing: border-box;
+      padding: 15px 22px;
+      border-bottom: 1px solid #dee2e6;
+      font-weight: 400;
+    }
+
+    &__body {
+      padding: 20px 30px;
+
+      &:has(.el-table) {
+        background: #f3f3f4;
+      }
+    }
+
+    &__footer {
+      border-top: 1px solid #dee2e6;
+      padding: 16px;
+      justify-content: flex-end;
+    }
+  }
+  @media (max-width: 900px) {
+    .dialog >>> .el-dialog {
+      max-width: calc(100% - 30px);
+    }
+  }
+  .dialog-footer >>> button.el-button {
+    font-size: 13px;
+    padding: 10px 20px;
   }
 
 </style>

src/components/Form/AutoDataForm/components/NestedField.vue

@@ -1,15 +1,19 @@
 <template>
   <DataForm
+    v-if="!loading"
+    :disabled="disabled"
     :fields="iFields"
     :form="value"
     style="margin-left: -26%;margin-right: -6%"
     v-bind="kwargs"
+    @change="updateValue($event)"
+    @input="updateValue($event)"
     v-on="$listeners"
   />
 </template>
 
 <script>
-import DataForm from '@/components/DataForm'
+import DataForm from '@/components/Form/DataForm/index.vue'
 
 export default {
   name: 'NestedField',
@@ -28,10 +32,16 @@ export default {
     errors: {
       type: [Object, String],
       default: ''
+    },
+    disabled: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
     return {
+      loading: false,
+      formJson: JSON.stringify(this.value),
       kwargs: {
         hasReset: false,
         hasSaveContinue: false,
@@ -60,7 +70,26 @@ export default {
       return fields
     }
   },
+  watch: {
+    value: {
+      handler(val) {
+        const valJson = JSON.stringify(val)
+        // 如果不想等，证明是 value 自己变化导致的， 需要重新渲染
+        if (valJson !== this.formJson) {
+          this.loading = true
+          setTimeout(() => {
+            this.loading = false
+          }, 10)
+        }
+      },
+      deep: true
+    }
+  },
   methods: {
+    updateValue(val) {
+      this.formJson = JSON.stringify(val)
+      this.$emit('input', val)
+    },
     objectToString(obj) {
       let data = ''
       // eslint-disable-next-line prefer-const

src/components/Form/AutoDataForm/index.vue

@@ -0,0 +1,171 @@
+<template>
+  <DataForm
+    v-if="!loading"
+    ref="dataForm"
+    :fields="totalFields"
+    :form="iForm"
+    v-bind="$attrs"
+    v-on="$listeners"
+  >
+    <span
+      v-for="(group, i) in groups"
+      :key="'group-'+group.name"
+      :slot="'id:'+group.name"
+    >
+      <FormGroupHeader
+        v-if="!groupHidden(group, i)"
+        :group="group"
+        :index="i"
+        :line="i !== 0 && !groupHidden(groups[i - 1], i - 1)"
+      />
+    </span>
+  </DataForm>
+</template>
+
+<script>
+import DataForm from '../DataForm/index.vue'
+import FormGroupHeader from '@/components/Form/FormGroupHeader/index.vue'
+import { FormFieldGenerator } from '@/components/Form/AutoDataForm/utils'
+
+export default {
+  name: 'AutoDataForm',
+  components: {
+    DataForm,
+    FormGroupHeader
+  },
+  props: {
+    url: {
+      type: String,
+      required: true
+    },
+    method: {
+      type: String,
+      default: 'post'
+    },
+    fields: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    form: {
+      type: Object,
+      default: () => ({})
+    },
+    fieldsMeta: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      remoteMeta: {},
+      totalFields: [],
+      loading: true,
+      groups: [],
+      errors: {}
+    }
+  },
+  computed: {
+    dataForm() {
+      return this.$refs.dataForm
+    },
+    iForm() {
+      const iForm = {}
+      Object.entries(this.form).forEach(([key, value]) => {
+        // 初始值是 choice 对象
+        if (value && typeof value === 'object' && value.label && value.value !== undefined) {
+          iForm[key] = value.value
+        } else if (Array.isArray(value) && value.length > 0 && typeof value[0] === 'object' &&
+          value[0].label && value[0].value !== undefined) {
+          iForm[key] = value.map(item => item.value)
+        } else {
+          iForm[key] = value
+        }
+      })
+      return iForm
+    }
+  },
+  mounted() {
+    this.optionUrlMetaAndGenerateColumns()
+  },
+  methods: {
+    async optionUrlMetaAndGenerateColumns() {
+      let data = { actions: {}}
+      if (this.url) {
+        data = await this.$store.dispatch('common/getUrlMeta', { url: this.url })
+      }
+      this.remoteMeta = data.actions[this.method.toUpperCase()] || {}
+      this.$emit('afterRemoteMeta', this.remoteMeta)
+      this.generateColumns()
+      this.$emit('afterGenerateColumns', this.totalFields)
+      this.cleanFormValue()
+      this.loading = false
+    },
+    generateColumns() {
+      const generator = new FormFieldGenerator(this.$emit)
+      this.totalFields = generator.generateFields(this.fields, this.fieldsMeta, this.remoteMeta)
+      this.groups = generator.groups
+      this.$log.debug('Total fields: ', this.totalFields)
+    },
+    _cleanFormValue(form, remoteMeta) {
+      if (!form) {
+        form = {}
+      }
+      for (const [k, v] of Object.entries(remoteMeta)) {
+        let valueSet = form[k]
+        if (v.type === 'nested object' && v.children) {
+          // 有一些字段属性时 nested object 类型，但是没有 children，没有children的不需要走递归逻辑，
+          // 比如：认证配置中的属性映射字段
+          if (typeof valueSet !== 'object') {
+            // 处理一些前端没有设置初始值的情况
+            valueSet = {}
+          }
+          form[k] = valueSet
+          this._cleanFormValue(valueSet, v.children)
+        }
+        if (valueSet !== undefined) {
+          continue
+        }
+        if (v.default === undefined) {
+          continue
+        }
+        form[k] = v.default
+      }
+    },
+    cleanFormValue() {
+      this._cleanFormValue(this.iForm, this.remoteMeta)
+    },
+    setFieldError(name, error) {
+      const field = this.totalFields.find((v) => v.prop === name)
+      if (!field) {
+        return
+      }
+      if (field.attrs.error === error) {
+        error += '.'
+      }
+      if (field.type === 'nestedField') {
+        field.el.errors = error
+      } else {
+        field.attrs.error = error
+      }
+    },
+    groupHidden(group, i) {
+      for (const field of group.fields) {
+        let hidden = field.hidden
+        if (typeof hidden === 'function') {
+          hidden = hidden(this.iForm)
+        }
+        if (!hidden) {
+          return false
+        }
+      }
+      return true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/Form/AutoDataForm/utils.js

@@ -1,25 +1,36 @@
 import Vue from 'vue'
-import Select2 from '@/components/FormFields/Select2'
-import NestedField from '@/components/AutoDataForm/components/NestedField'
-import rules from '@/components/DataForm/rules'
+import ObjectSelect2 from '@/components/Form/FormFields/NestedObjectSelect2.vue'
+import NestedField from '@/components/Form/AutoDataForm/components/NestedField.vue'
+import Switcher from '@/components/Form/FormFields/Switcher.vue'
+import rules from '@/components/Form/DataForm/rules'
+import BasicTree from '@/components/Form/FormFields/BasicTree.vue'
+import JsonEditor from '@/components/Form/FormFields/JsonEditor.vue'
 import { assignIfNot } from '@/utils/common'
+import TagInput from '@/components/Form/FormFields/TagInput.vue'
 
 export class FormFieldGenerator {
-  constructor() {
+  constructor(emit) {
+    this.$emite = emit
     this.groups = []
   }
+
   generateFieldByType(type, field, fieldMeta, fieldRemoteMeta) {
     switch (type) {
+      case 'labeled_choice':
       case 'choice':
-        type = 'radio-group'
-        if (!fieldRemoteMeta.read_only) {
-          field.options = fieldRemoteMeta.choices.map(v => {
-            return { label: v.display_name, value: v.value }
-          })
+        // Value 处理事在 AutoDataForm 中处理的
+        if (!fieldRemoteMeta['read_only']) {
+          field.options = fieldRemoteMeta.choices
         }
+        type = 'radio-group'
         break
       case 'multiple choice':
-        field.el.choices = fieldRemoteMeta['choices']
+        field.options = fieldRemoteMeta.choices
+        type = 'checkbox-group'
+        break
+      case 'tree':
+        field.el.tree = fieldRemoteMeta.tree
+        field.component = BasicTree
         break
       case 'datetime':
         type = 'date-picker'
@@ -27,12 +38,20 @@ export class FormFieldGenerator {
           type: 'datetime'
         }
         break
+      case 'json':
+        type = 'json-editor'
+        field.component = JsonEditor
+        break
       case 'field':
         type = ''
-        field.component = Select2
+        field.component = ObjectSelect2
         if (fieldRemoteMeta.required) {
           field.el.clearable = false
         }
+        field.el.label = field.label
+        // if (fieldRemoteMeta.child && fieldRemoteMeta.child.type === 'nested object') {
+        //   field.component = ObjectSelect2
+        // }
         break
       case 'string':
         type = 'input'
@@ -45,40 +64,56 @@ export class FormFieldGenerator {
         }
         break
       case 'boolean':
-        type = 'checkbox'
+        type = ''
+        field.component = Switcher
+        break
+      case 'list':
+        type = 'input'
+        field.component = TagInput
+        break
+      case 'object_related_field':
+        field.component = ObjectSelect2
+        break
+      case 'm2m_related_field':
+        field.component = ObjectSelect2
+        field.el.label = field.label
         break
       case 'nested object':
         type = 'nestedField'
         field.component = NestedField
         field.label = ''
         field.labelWidth = 0
+        field.el = { ...field.el, ...fieldMeta }
         field.el.fields = this.generateNestFields(field, fieldMeta, fieldRemoteMeta)
         field.el.errors = {}
-        Vue.$log.debug('All fields in generate: ', field.el.allFields)
+        field.hidden = () => {
+          const hidden = fieldMeta['hiddenFields'] || (() => field.el.fields.length === 0)
+          return hidden(fieldMeta, fieldRemoteMeta, field.el.fields)
+        }
         break
       default:
         type = 'input'
         break
     }
+    // 上面重写了 type
     if (type === 'radio-group') {
-      if (!fieldRemoteMeta.read_only) {
-        const options = fieldRemoteMeta.choices.map(v => {
-          return { label: v.display_name, value: v.value }
-        })
-        if (options.length > 4) {
-          type = 'select'
-          field.el.filterable = true
-        }
+      if (field.options.length > 4) {
+        type = 'select'
+        field.el.filterable = true
       }
     }
     field.type = type
     return field
   }
+
   generateNestFields(field, fieldMeta, fieldRemoteMeta) {
     const fields = []
-    const nestedFields = fieldMeta.fields || []
+    let nestedFields = fieldMeta.fields || []
     const nestedFieldsMeta = fieldMeta.fieldsMeta || {}
     const nestedFieldsRemoteMeta = fieldRemoteMeta.children || {}
+    if (nestedFields === '__all__') {
+      nestedFields = Object.keys(nestedFieldsRemoteMeta)
+    }
     for (const name of nestedFields) {
       const f = this.generateField(name, nestedFieldsMeta, nestedFieldsRemoteMeta)
       fields.push(f)
@@ -86,6 +121,7 @@ export class FormFieldGenerator {
     Vue.$log.debug('NestFields: ', fields)
     return fields
   }
+
   generateFieldByName(name, field) {
     switch (name) {
       case 'email':
@@ -100,6 +136,7 @@ export class FormFieldGenerator {
     }
     return field
   }
+
   generateFieldByOther(field, fieldMeta, fieldRemoteMeta) {
     const filedRules = field.rules || []
     if (fieldRemoteMeta.required) {
@@ -109,15 +146,20 @@ export class FormFieldGenerator {
         filedRules.push(rules.RequiredChange)
       }
     }
+    // 一些 field 有 choices 但不是 choiceField
+    if (fieldRemoteMeta.choices && field.type.indexOf('choice') === -1) {
+      field.el.choices = fieldRemoteMeta.choices
+    }
     field.rules = filedRules
     return field
   }
+
   generateField(name, fieldsMeta, remoteFieldsMeta) {
     let field = { id: name, prop: name, el: {}, attrs: {}, rules: [] }
     const remoteFieldMeta = remoteFieldsMeta[name] || {}
     const fieldMeta = fieldsMeta[name] || {}
     field.label = remoteFieldMeta.label
-    field.helpText = remoteFieldMeta.help_text
+    field.helpText = remoteFieldMeta['help_text']
     field = this.generateFieldByType(remoteFieldMeta.type, field, fieldMeta, remoteFieldMeta)
     field = this.generateFieldByName(name, field)
     field = this.generateFieldByOther(field, fieldMeta, remoteFieldMeta)
@@ -130,18 +172,25 @@ export class FormFieldGenerator {
     // Vue.$log.debug('Generate field: ', name, field)
     return field
   }
+
   generateFieldGroup(field, fieldsMeta, remoteFieldsMeta) {
     const [groupTitle, fields] = field
-    this.groups.push({
+    const _fields = this.generateFields(fields, fieldsMeta, remoteFieldsMeta)
+    const group = {
       id: groupTitle,
       title: groupTitle,
-      name: fields[0],
-      fields: fields
-    })
-    return this.generateFields(fields, fieldsMeta, remoteFieldsMeta)
+      fields: _fields,
+      name: _fields[0]?.id
+    }
+    this.groups.push(group)
+    return _fields
   }
+
   generateFields(_fields, fieldsMeta, remoteFieldsMeta) {
     let fields = []
+    if (_fields === '__all__') {
+      _fields = Object.keys(remoteFieldsMeta)
+    }
     for (let field of _fields) {
       if (field instanceof Array) {
         const items = this.generateFieldGroup(field, fieldsMeta, remoteFieldsMeta)

src/components/Form/CronTab/Crontab.vue

@@ -2,7 +2,7 @@
 <template>
   <div>
     <el-tabs type="border-card">
-      <el-tab-pane v-if="shouldHide('min')" :label="this.$t('common.CronTab.min')">
+      <el-tab-pane v-if="shouldHide('min')" :label="$tc('common.CronTab.min')" class="crontab-panel">
         <CrontabMin
           ref="cronmin"
           :check="checkNumber"
@@ -11,7 +11,7 @@
         />
       </el-tab-pane>
 
-      <el-tab-pane v-if="shouldHide('hour')" :label="this.$t('common.CronTab.hour')">
+      <el-tab-pane v-if="shouldHide('hour')" :label="$tc('common.CronTab.hour')">
         <CrontabHour
           ref="cronhour"
           :check="checkNumber"
@@ -20,7 +20,7 @@
         />
       </el-tab-pane>
 
-      <el-tab-pane v-if="shouldHide('day')" :label="this.$t('common.CronTab.day')">
+      <el-tab-pane v-if="shouldHide('day')" :label="$tc('common.CronTab.day')">
         <CrontabDay
           ref="cronday"
           :check="checkNumber"
@@ -29,7 +29,7 @@
         />
       </el-tab-pane>
 
-      <el-tab-pane v-if="shouldHide('month')" :label="this.$t('common.CronTab.month')">
+      <el-tab-pane v-if="shouldHide('month')" :label="$tc('common.CronTab.month')">
         <CrontabMonth
           ref="cronmonth"
           :check="checkNumber"
@@ -38,7 +38,7 @@
         />
       </el-tab-pane>
 
-      <el-tab-pane v-if="shouldHide('week')" :label="this.$t('common.CronTab.week')">
+      <el-tab-pane v-if="shouldHide('week')" :label="$tc('common.CronTab.week')">
         <CrontabWeek
           ref="cronweek"
           :check="checkNumber"
@@ -59,38 +59,38 @@
             <td>
               <el-input
                 v-model.trim="contabValueObj.min"
-                min="0"
                 max="5"
-                size="small"
+                min="0"
                 onkeyup="value=value.replace(/[^\0-9\-\*\,]/g,'')"
+                size="mini"
               />
             </td>
             <td>
               <el-input
                 v-model.trim="contabValueObj.hour"
-                size="small"
                 onkeyup="value=value.replace(/[^\0-9\-\*\,]/g,'')"
+                size="mini"
               />
             </td>
             <td>
               <el-input
                 v-model.trim="contabValueObj.day"
-                size="small"
                 onkeyup="value=value.replace(/[^\0-9\\-\*\,]/g,'')"
+                size="mini"
               />
             </td>
             <td>
               <el-input
                 v-model.trim="contabValueObj.month"
-                size="small"
                 onkeyup="value=value.replace(/[^\0-9\-\*\,]/g,'')"
+                size="mini"
               />
             </td>
             <td>
               <el-input
                 v-model.trim="contabValueObj.week"
-                size="small"
                 onkeyup="value=value.replace(/[^\0-9\-\*\,]/g,'')"
+                size="mini"
               />
             </td>
           </tbody>
@@ -100,7 +100,7 @@
           <div style="font-size: 13px;">{{ contabValueString }}</div>
         </div>
       </div>
-      <CrontabResult :ex="contabValueString" />
+      <CrontabResult :ex="contabValueString" @crontabDiffChange="crontabDiffChangeHandle" />
 
       <div class="pop_btn">
         <el-button
@@ -130,7 +130,7 @@ import CrontabWeek from './components/Crontab-Week.vue'
 import CrontabResult from './components/Crontab-Result.vue'
 
 export default {
-  name: 'Vcrontab',
+  name: 'VCrontab',
   components: {
     CrontabMin,
     CrontabHour,
@@ -167,7 +167,8 @@ export default {
         week: '*'
         // year: "",
       },
-      newContabValueString: ''
+      newContabValueString: '',
+      crontabDiff: 0
     }
   },
   computed: {
@@ -238,7 +239,7 @@ export default {
     updateContabValue(name, value, from) {
       this.contabValueObj[name] = value
       if (from && from !== name) {
-        console.log(`来自组件 ${from} 改变了 ${name} ${value}`)
+        // debug(`来自组件 ${from} 改变了 ${name} ${value}`)
         this.changeRadio(name, value)
       }
     },
@@ -364,6 +365,12 @@ export default {
     },
     // 填充表达式
     submitFill() {
+      const crontabDiffMin = this.crontabDiff / 1000 / 60
+      if (crontabDiffMin > 0 && crontabDiffMin < 10) {
+        const msg = this.$tc('common.crontabDiffError')
+        this.$message.error(msg)
+        return
+      }
       this.$emit('fill', this.contabValueString)
       this.hidePopup()
     },
@@ -381,15 +388,19 @@ export default {
       for (const j in this.contabValueObj) {
         this.changeRadio(j, this.contabValueObj[j])
       }
+    },
+    crontabDiffChangeHandle(diff) {
+      this.crontabDiff = diff
     }
   }
 }
 </script>
-<style scoped>
+<style lang='scss' scoped>
 .pop_btn {
-  text-align: center;
+  float: right;
   margin-top: 20px;
 }
+
 .popup-main {
   position: relative;
   margin: 10px auto 0;
@@ -398,12 +409,14 @@ export default {
   font-size: 12px;
   overflow: hidden;
 }
+
 .popup-title {
   overflow: hidden;
   line-height: 34px;
   padding-top: 6px;
   background: #f2f2f2;
 }
+
 .popup-result {
   position: relative;
   box-sizing: border-box;
@@ -413,6 +426,7 @@ export default {
   border: 1px solid #dcdfe6;
   box-shadow: 0 2px 4px 0 rgb(0 0 0 / 12%), 0 0 6px 0 rgb(0 0 0 / 4%);
 }
+
 .popup-result .title {
   position: absolute;
   top: -17px;
@@ -424,11 +438,13 @@ export default {
   line-height: 30px;
   background: #fff;
 }
+
 .popup-result table {
   text-align: center;
   width: 100%;
   margin: 0 auto;
 }
+
 .popup-result table span {
   display: block;
   width: 100%;
@@ -439,12 +455,20 @@ export default {
   overflow: hidden;
   border: 1px solid #e8e8e8;
 }
+
 .popup-result-scroll {
   font-size: 12px;
   line-height: 24px;
   height: 10em;
   overflow-y: auto;
 }
+
+.crontab-panel {
+  > > > .el-input-number {
+    margin: 0 5px
+  }
+}
+
 .el-form-item--mini.el-form-item,
 .el-form-item--small.el-form-item {
   margin-bottom: 10px;

src/components/Form/CronTab/components/Crontab-Day.vue

@@ -10,22 +10,28 @@
     <el-form-item>
       <el-radio v-model="radioValue" :label="3">
         {{ this.$t('common.CronTab.from') }}
-        <el-input-number v-model="cycle01" :min="0" :max="31" /> -
-        <el-input-number v-model="cycle02" :min="0" :max="31" /> {{ this.$t('common.CronTab.day') }}
+        <el-input-number v-model="cycle01" :max="31" :min="0" size="mini" /> -
+        <el-input-number v-model="cycle02" :max="31" :min="0" size="mini" /> {{ this.$t('common.CronTab.day') }}
       </el-radio>
     </el-form-item>
 
     <el-form-item>
       <el-radio v-model="radioValue" :label="4">
         {{ this.$t('common.CronTab.every') }}
-        <el-input-number v-model="average02" :min="1" :max="31" /> {{ this.$t('common.CronTab.day') }}{{ this.$t('common.CronTab.executeOnce') }}
+        <el-input-number v-model="average02" :max="31" :min="1" size="mini" /> {{ this.$t('common.CronTab.day') }}{{ this.$t('common.CronTab.executeOnce') }}
       </el-radio>
     </el-form-item>
 
     <el-form-item>
       <el-radio v-model="radioValue" :label="7">
         {{ this.$t('common.CronTab.appoint') }}
-        <el-select v-model="checkboxList" clearable :placeholder="this.$t('common.CronTab.manyChoose')" multiple style="width:100%">
+        <el-select
+          v-model="checkboxList"
+          :placeholder="$tc('common.CronTab.manyChoose')"
+          clearable
+          multiple
+          style="width:100%"
+        >
           <el-option v-for="item in 31" :key="item" :value="item">{{ item }}</el-option>
         </el-select>
       </el-radio>
@@ -45,7 +51,8 @@ export default {
     },
     check: {
       type: Function,
-      default: () => {}
+      default: () => {
+      }
     }
   },
   data() {
@@ -184,6 +191,6 @@ export default {
 
 <style scoped>
 	.el-form-item--small.el-form-item {
-		margin-bottom: 10px;
-	}
+    margin-bottom: 10px;
+  }
 </style>

src/components/Form/CronTab/components/Crontab-Hour.vue

@@ -10,22 +10,28 @@
     <el-form-item>
       <el-radio v-model="radioValue" :label="2">
         {{ this.$t('common.CronTab.from') }}
-        <el-input-number v-model="cycle01" :min="0" :max="60" /> -
-        <el-input-number v-model="cycle02" :min="0" :max="60" /> {{ this.$t('common.CronTab.hour') }}
+        <el-input-number v-model="cycle01" :max="60" :min="0" size="mini" /> -
+        <el-input-number v-model="cycle02" :max="60" :min="0" size="mini" /> {{ this.$t('common.CronTab.hour') }}
       </el-radio>
     </el-form-item>
 
     <el-form-item>
       <el-radio v-model="radioValue" :label="3">
         {{ this.$t('common.CronTab.every') }}
-        <el-input-number v-model="average02" :min="1" :max="60" /> {{ this.$t('common.CronTab.hour') }}{{ this.$t('common.CronTab.executeOnce') }}
+        <el-input-number v-model="average02" :max="60" :min="1" size="mini" /> {{ this.$t('common.CronTab.hour') }}{{ this.$t('common.CronTab.executeOnce') }}
       </el-radio>
     </el-form-item>
 
     <el-form-item>
       <el-radio v-model="radioValue" :label="4">
         {{ this.$t('common.CronTab.appoint') }}
-        <el-select v-model="checkboxList" clearable :placeholder="this.$t('common.CronTab.manyChoose')" multiple style="width:100%">
+        <el-select
+          v-model="checkboxList"
+          :placeholder="$tc('common.CronTab.manyChoose')"
+          clearable
+          multiple
+          style="width:100%"
+        >
           <el-option v-for="item in 24" :key="item" :value="item-1">{{ item-1 }}</el-option>
         </el-select>
       </el-radio>
@@ -45,7 +51,8 @@ export default {
     },
     check: {
       type: Function,
-      default: () => {}
+      default: () => {
+      }
     }
   },
   data() {
@@ -153,6 +160,6 @@ export default {
 
 <style scoped>
 	.el-form-item--small.el-form-item {
-		margin-bottom: 10px
-	}
+    margin-bottom: 10px
+  }
 </style>

src/components/Form/CronTab/components/Crontab-Min.vue

@@ -7,26 +7,26 @@
       </el-radio>
     </el-form-item>
 
-    <el-form-item>
-      <el-radio v-model="radioValue" :label="2">
-        {{ this.$t('common.CronTab.from') }}
-        <el-input-number v-model="cycle01" :min="0" :max="60" /> -
-        <el-input-number v-model="cycle02" :min="0" :max="60" /> {{ this.$t('common.CronTab.min') }}
-      </el-radio>
-    </el-form-item>
-
     <el-form-item>
       <el-radio v-model="radioValue" :label="3">
         {{ this.$t('common.CronTab.from') }}
-        <el-input-number v-model="average02" :min="1" :max="60" /> {{ this.$t('common.CronTab.min') }}{{ this.$t('common.CronTab.executeOnce') }}
+        <el-input-number v-model="average02" :max="60" :min="1" size="mini" />
+        {{ this.$t('common.CronTab.min') }}{{ this.$t('common.CronTab.executeOnce') }}
       </el-radio>
     </el-form-item>
 
     <el-form-item>
       <el-radio v-model="radioValue" :label="4">
         {{ this.$t('common.CronTab.appoint') }}
-        <el-select v-model="checkboxList" clearable :placeholder="this.$t('common.CronTab.manyChoose')" multiple style="width:100%" size="small">
-          <el-option v-for="item in 60" :key="item" :value="item-1">{{ item-1 }}</el-option>
+        <el-select
+          v-model="checkboxList"
+          :placeholder="$tc('common.CronTab.manyChoose')"
+          clearable
+          multiple
+          size="small"
+          style="width:100%"
+        >
+          <el-option v-for="item in 60" :key="item" :value="item-1">{{ item - 1 }}</el-option>
         </el-select>
       </el-radio>
     </el-form-item>
@@ -46,7 +46,8 @@ export default {
     },
     check: {
       type: Function,
-      default: () => {}
+      default: () => {
+      }
     }
   },
   data() {
@@ -150,7 +151,7 @@ export default {
 </script>
 
 <style scoped>
-	.el-form-item--small.el-form-item {
-		margin-bottom: 10px;
-	}
+.el-form-item--small.el-form-item {
+  margin-bottom: 10px;
+}
 </style>

src/components/Form/CronTab/components/Crontab-Month.vue

@@ -10,22 +10,28 @@
     <el-form-item>
       <el-radio v-model="radioValue" :label="2">
         {{ this.$t('common.CronTab.from') }}
-        <el-input-number v-model="cycle01" :min="1" :max="12" /> -
-        <el-input-number v-model="cycle02" :min="1" :max="12" /> {{ this.$t('common.CronTab.month') }}
+        <el-input-number v-model="cycle01" :max="12" :min="1" size="mini" /> -
+        <el-input-number v-model="cycle02" :max="12" :min="1" size="mini" /> {{ this.$t('common.CronTab.month') }}
       </el-radio>
     </el-form-item>
 
     <el-form-item>
       <el-radio v-model="radioValue" :label="3">
         {{ this.$t('common.CronTab.every') }}
-        <el-input-number v-model="average02" :min="1" :max="12" /> {{ this.$t('common.CronTab.month') }}{{ this.$t('common.CronTab.executeOnce') }}
+        <el-input-number v-model="average02" :max="12" :min="1" size="mini" /> {{ this.$t('common.CronTab.month') }}{{ this.$t('common.CronTab.executeOnce') }}
       </el-radio>
     </el-form-item>
 
     <el-form-item>
       <el-radio v-model="radioValue" :label="4">
         {{ this.$t('common.CronTab.appoint') }}
-        <el-select v-model="checkboxList" clearable :placeholder="this.$t('common.CronTab.manyChoose')" multiple style="width:100%">
+        <el-select
+          v-model="checkboxList"
+          :placeholder="$tc('common.CronTab.manyChoose')"
+          clearable
+          multiple
+          style="width:100%"
+        >
           <el-option v-for="item in 12" :key="item" :value="item">{{ item }}</el-option>
         </el-select>
       </el-radio>
@@ -45,7 +51,8 @@ export default {
     },
     check: {
       type: Function,
-      default: () => {}
+      default: () => {
+      }
     }
   },
   data() {
@@ -158,6 +165,6 @@ export default {
 
 <style scoped>
 	.el-form-item--small.el-form-item {
-		margin-bottom: 10px;
-	}
+    margin-bottom: 10px;
+  }
 </style>

src/components/Form/CronTab/components/Crontab-Result.vue

@@ -13,7 +13,8 @@
 
 <script>
 import parser from 'cron-parser'
-import moment from 'moment'
+import { toSafeLocalDateStr } from '@/utils/common'
+
 export default {
   name: 'CrontabResult',
   props: {
@@ -46,14 +47,18 @@ export default {
       const rule = 0 + ' ' + this.$options.propsData.ex
       try {
         this.resultList = []
-        var interval = parser.parseExpression(rule)
+        const interval = parser.parseExpression(rule)
         for (let index = 0; index < 5; index++) {
           const cur = interval.next().toString()
-          this.resultList.push(moment(cur).format('YYYY-MM-DD HH:mm:ss'))
+          this.resultList.push(toSafeLocalDateStr(cur))
         }
+        const first = new Date(this.resultList[0])
+        const second = new Date(this.resultList[1])
+        const diff = Math.abs(second - first)
+        this.$emit('crontabDiffChange', diff)
       } catch (error) {
         this.isShow = false
-        console.log(error, 'error')
+        // debug(error, 'error')
       }
     }
   }

src/components/Form/CronTab/components/Crontab-Week.vue

@@ -10,16 +10,24 @@
     <el-form-item>
       <el-radio v-model="radioValue" :label="3">
         {{ this.$t('common.CronTab.cycleFromWeek') }}
-        <el-input-number v-model="cycle01" :min="1" :max="7" /> -
-        <el-input-number v-model="cycle02" :min="1" :max="7" />
+        <el-input-number v-model="cycle01" :max="7" :min="1" size="mini" /> -
+        <el-input-number v-model="cycle02" :max="7" :min="1" size="mini" />
       </el-radio>
     </el-form-item>
 
     <el-form-item>
       <el-radio v-model="radioValue" :label="6">
         {{ this.$t('common.CronTab.appoint') }}
-        <el-select v-model="checkboxList" clearable :placeholder="this.$t('common.CronTab.manyChoose')" multiple style="width:100%">
-          <el-option v-for="(item,index) of weekList" :key="index" :value="index+1">{{ item }}</el-option>
+        <el-select
+          v-model="checkboxList"
+          :placeholder="$tc('common.CronTab.manyChoose')"
+          clearable
+          multiple
+          style="width:100%"
+        >
+          <el-option v-for="(item,index) of weekList" :key="index" :value="index === 6 ? 0 : (index + 1)">
+            {{ item }}
+          </el-option>
         </el-select>
       </el-radio>
     </el-form-item>
@@ -39,7 +47,8 @@ export default {
     },
     check: {
       type: Function,
-      default: () => {}
+      default: () => {
+      }
     }
   },
   data() {
@@ -173,6 +182,6 @@ export default {
 
 <style scoped>
 	.el-form-item--small.el-form-item {
-		margin-bottom: 10px;
-	}
+    margin-bottom: 10px;
+  }
 </style>

src/components/Form/CronTab/index.vue

@@ -1,13 +1,19 @@
 <template>
   <div>
     <div class="box">
-      <el-input v-model="input" clearable @focus="showDialog" @clear="onClear" />
+      <el-input v-model="input" clearable @clear="onClear" @focus="showDialog" />
     </div>
-    <el-dialog :title="this.$t('common.CronTab.newCron')" :visible.sync="showCron" top="8vh" width="580px" append-to-body>
+    <el-dialog
+      :title="$tc('common.CronTab.newCron')"
+      :visible.sync="showCron"
+      append-to-body
+      top="8vh"
+      width="650px"
+    >
       <Crontab
         :expression="expression"
-        @hide="showCron = false"
         @fill="crontabFill"
+        @hide="showCron = false"
       />
     </el-dialog>
   </div>
@@ -15,6 +21,7 @@
 
 <script>
 import Crontab from './Crontab.vue'
+
 export default {
   components: { Crontab },
   props: {
@@ -51,5 +58,5 @@ export default {
 <style scoped>
   .el-dialog__body {
     padding: 12px 16px;
-}
+  }
 </style>