perf: asset permission accounts select

perf: revert click focus
perf: asset permission set
2025-05-05 14:46:37 +00:00 · 2025-04-30 14:57:39 +08:00 · 2025-04-30 14:57:39 +08:00 · 2025-04-30 14:57:39 +08:00 · 2025-04-30 14:57:39 +08:00 · 2025-04-29 16:36:03 +08:00
563 changed files with 18710 additions and 7156 deletions
--- a/.github/workflows/.github/workflows/llm-code-review.yml
+++ b/.github/workflows/.github/workflows/llm-code-review.yml
@ -0,0 +1,28 @@
+name: LLM Code Review
+
+permissions:
+  contents: read
+  pull-requests: write
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+jobs:
+  llm-code-review:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: fit2cloud/LLM-CodeReview-Action@main
+        env:
+          GITHUB_TOKEN: ${{ secrets.FIT2CLOUDRD_LLM_CODE_REVIEW_TOKEN }}
+          OPENAI_API_KEY: ${{ secrets.ALIYUN_LLM_API_KEY }}
+          LANGUAGE: English
+          OPENAI_API_ENDPOINT: https://dashscope.aliyuncs.com/compatible-mode/v1
+          MODEL: qwen2-1.5b-instruct
+          PROMPT: "Please check the following code differences for any irregularities, potential issues, or optimization suggestions, and provide your answers in English."
+          top_p: 1
+          temperature: 1
+          # max_tokens: 10000
+          MAX_PATCH_LENGTH: 10000 
+          IGNORE_PATTERNS: "/node_modules,*.md,/dist,/.github"
+          FILE_PATTERNS: "*.java,*.go,*.py,*.vue,*.ts,*.js,*.css,*.scss,*.html"
--- a/.gitignore
+++ b/.gitignore
@ -17,3 +17,5 @@ tests/**/coverage/
 *.sln
 .env.development
 .python-version
+
+helper.json
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-FROM jumpserver/lina-base:20240723_084702 AS stage-build
+FROM jumpserver/lina-base:20250408_074136 AS stage-build

 ARG VERSION
 ENV VERSION=$VERSION
--- a/jsconfig.json
+++ b/jsconfig.json
@ -5,5 +5,6 @@
        "@/*": ["src/*"]
    }
  },
+  "include": ["src"],
  "exclude": ["node_modules", "dist"]
 }
--- a/package.json
+++ b/package.json
@ -2,7 +2,7 @@
  "name": "lina",
  "version": "v4.0.0",
  "description": "JumpServer Web UI",
-  "author": "JumpServer Team <support@fit2cloud.com>",
+  "author": "JumpServer Team <support@lxware.hk>",
  "license": "GPL-3.0-or-later",
  "scripts": {
    "dev": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
@ -81,6 +81,7 @@
    "vue-select": "^3.9.5",
    "vuejs-logger": "^1.5.4",
    "vuex": "3.1.0",
+    "watermark-js-plus": "^1.5.8",
    "xss": "^1.0.14",
    "xterm": "^4.5.0",
    "xterm-addon-fit": "^0.3.0",
@ -142,5 +143,6 @@
    "src/**/*.{js,vue}": [
      "eslint --fix"
    ]
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }
--- a/public/index.html
+++ b/public/index.html
@ -1,38 +1,90 @@
 <!DOCTYPE html>
 <html>
-  <head>
+<head>
    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta http-equiv="Expires" content="0">
-    <meta http-equiv="Pragma" content="no-cache">
-    <meta http-equiv="Cache-control" content="no-cache">
-    <meta http-equiv="Cache" content="no-cache">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta content="0" http-equiv="Expires">
+    <meta content="no-cache" http-equiv="Pragma">
+    <meta content="no-cache" http-equiv="Cache-control">
+    <meta content="no-cache" http-equiv="Cache">
+    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
    <title><%= webpackConfig.name %></title>
-    <link rel="stylesheet" href="<%= BASE_URL %>theme/element-ui.css">
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but <%= webpackConfig.name %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <script>
-      window.onload = function() {
+    <link href="<%= BASE_URL %>theme/element-ui.css" rel="stylesheet">
+    <style>
+        #loading {
+            position: fixed;
+            top: 0;
+            left: 0;
+            width: 100vw;
+            height: 100vh;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            background-color: rgba(255, 255, 255, 0.98);
+            z-index: 9999;
+        }
+
+        #loading .spinner {
+            width: 40px;
+            height: 40px;
+            border: 3px solid transparent;
+            border-top-color: var(--color-primary);
+            border-radius: 50%;
+            animation: spin 1s linear infinite;
+        }
+
+        #loading .spinner::after {
+            content: '';
+            position: absolute;
+            top: -3px;
+            left: -3px;
+            width: 40px;
+            height: 40px;
+            border: 3px solid transparent;
+            border-top-color: rgba(64, 158, 255, 0.2);
+            border-radius: 50%;
+            animation: spin 2s linear infinite;
+        }
+
+        @keyframes spin {
+            0% {
+                transform: rotate(0deg);
+            }
+            100% {
+                transform: rotate(360deg);
+            }
+        }
+    </style>
+</head>
+<body>
+<noscript>
+    <strong>
+        We're sorry but <%= webpackConfig.name %> doesn't work properly without JavaScript enabled.
+        Please enable it to continue.
+    </strong>
+</noscript>
+<script>
+    window.onload = function () {
        if (location.pathname === '/') {
-           location.pathname = '/ui/'
+            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.indexOf('/ui') === -1) {
+            window.location.href = window.location.origin + '/ui/#' + pathname
        }
        if (pathname.startsWith('/ui/#/chat')) {
-          window.location.href = window.location.origin + pathname
+            window.location.href = window.location.origin + pathname
        }
-      }
-    </script>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
+    }
+</script>
+<div id="app">
+</div>
+<div id="loading">
+    <div class="spinner"></div>
+</div>
+<!-- built files will be auto injected -->
+</body>
 </html>
--- a/src/App.vue
+++ b/src/App.vue
@ -5,14 +5,59 @@
 </template>

 <script>
-import { mapState } from 'vuex'
+import { mapState, mapGetters } from 'vuex'
+import { Watermark } from 'watermark-js-plus'

 export default {
  name: 'App',
+  data() {
+    return {
+      watermark: null
+    }
+  },
  computed: {
    ...mapState({
      isRouterAlive: state => state.common.isRouterAlive
+    }),
+    ...mapGetters({
+      currentUser: 'currentUser',
+      publicSettings: 'publicSettings'
    })
+  },
+  watch: {
+    currentUser: {
+      handler(newVal) {
+        this.createWatermark()
+      }
+    },
+    'publicSettings.SECURITY_WATERMARK_ENABLED': {
+      handler(newVal) {
+        if (!newVal) {
+          return setTimeout(() => {
+            this.watermark?.destroy()
+            this.watermark = null
+          })
+        }
+
+        this.createWatermark()
+      }
+    }
+  },
+  methods: {
+    createWatermark() {
+      if (this.currentUser?.username && this.publicSettings?.SECURITY_WATERMARK_ENABLED) {
+        this.watermark = new Watermark({
+          content: `${this.currentUser.username}(${this.currentUser.name})`,
+          width: 200,
+          height: 200,
+          rotate: 45,
+          fontWeight: 'normal',
+          fontColor: 'rgba(128, 128, 128, 0.2)'
+        })
+
+        this.watermark.create()
+      }
+    }
  }
 }
 </script>
--- a/src/api/asset.js
+++ b/src/api/asset.js
@ -16,9 +16,9 @@ export function getSystemUserList(data) {
  })
 }

-export function getDomainList(data) {
+export function getZoneList(data) {
  return request({
-    url: '/api/v1/assets/domains/',
+    url: '/api/v1/assets/zones/',
    method: 'get',
    params: data
  })
--- a/src/api/users.js
+++ b/src/api/users.js
@ -8,11 +8,20 @@ export function login(data) {
  })
 }

-export function getProfile(token) {
-  return request({
+export async function getProfile(token) {
+  let profile = await request({
    url: '/api/v1/users/profile/',
    method: 'get'
  })
+  const perms = await request({
+    url: '/api/v1/users/profile/permissions/',
+    method: 'get'
+  })
+  profile = {
+    ...profile,
+    ...perms
+  }
+  return profile
 }

 export function getUserList(data) {
@ -22,6 +31,7 @@ export function getUserList(data) {
    params: data
  })
 }
+
 export function getUserGroupList(params) {
  return request({
    url: '/api/v1/users/groups/',
@ -29,6 +39,7 @@ export function getUserGroupList(params) {
    params: params
  })
 }
+
 export function getUserGroupDetail(id) {
  return request({
    url: `/api/v1/users/groups/${id}/`,
@ -50,6 +61,7 @@ export function editUserGroup(data) {
    data: data
  })
 }
+
 export function updateUserGroup(id, data) {
  return request({
    url: '/api/v1/users/groups/' + id + '/',
--- a/src/assets/img/deepSeek.png
+++ b/src/assets/img/deepSeek.png
--- a/src/assets/img/icons/general.png
+++ b/src/assets/img/icons/general.png
--- a/src/assets/img/icons/other.png
+++ b/src/assets/img/icons/other.png
--- a/src/assets/img/icons/windows_ad.png
+++ b/src/assets/img/icons/windows_ad.png
--- a/src/components/Apps/AccountCreateUpdateForm/const.js
+++ b/src/components/Apps/AccountCreateUpdateForm/const.js
@ -5,10 +5,18 @@ import AutomationParamsForm from '@/views/assets/Platform/AutomationParamsSettin

 export const accountFieldsMeta = (vm) => {
  const defaultPrivilegedAccounts = ['root', 'administrator']
+
+  function onPrivilegedUser(value, updateForm) {
+    const maybePrivileged = defaultPrivilegedAccounts.includes(value)
+    if (maybePrivileged) {
+      updateForm({ privileged: true, secret_reset: false, push_now: false })
+    }
+  }
+
  return {
    assets: {
      component: Select2,
-      label: vm.$t('Assets'),
+      label: vm.$t('Asset'),
      rules: [Required],
      el: {
        multiple: true,
@ -27,6 +35,9 @@ export const accountFieldsMeta = (vm) => {
      component: Select2,
      rules: [Required],
      el: {
+        get disabled() {
+          return vm.isDisabled
+        },
        multiple: false,
        ajax: {
          url: '/api/v1/accounts/account-templates/',
@ -43,6 +54,11 @@ export const accountFieldsMeta = (vm) => {
      rules: [Required],
      label: vm.$t('AccountPolicy'),
      helpTip: vm.$t('AccountPolicyHelpText'),
+      el: {
+        get disabled() {
+          return vm.isDisabled
+        }
+      },
      hidden: () => {
        return vm.platform || vm.asset
      }
@ -50,17 +66,19 @@ export const accountFieldsMeta = (vm) => {
    name: {
      label: vm.$t('Name'),
      rules: [RequiredChange],
+      el: {
+        get disabled() {
+          return vm.isDisabled
+        }
+      },
      on: {
        input: ([value], updateForm) => {
          if (!vm.usernameChanged) {
            if (!vm.account?.name) {
              updateForm({ username: value })
            }
-            const maybePrivileged = defaultPrivilegedAccounts.includes(value)
-            if (maybePrivileged) {
-              updateForm({ privileged: true })
-            }
          }
+          onPrivilegedUser(value, updateForm)
        }
      },
      hidden: () => {
@ -69,17 +87,16 @@ export const accountFieldsMeta = (vm) => {
    },
    username: {
      el: {
-        disabled: !!vm.account?.name
+        get disabled() {
+          return !!vm.account?.name || vm.isDisabled
+        }
      },
      on: {
        input: ([value], updateForm) => {
          vm.usernameChanged = true
        },
        change: ([value], updateForm) => {
-          const maybePrivileged = defaultPrivilegedAccounts.includes(value)
-          if (maybePrivileged) {
-            updateForm({ privileged: true })
-          }
+          onPrivilegedUser(value, updateForm)
        }
      },
      hidden: () => {
@ -88,6 +105,11 @@ export const accountFieldsMeta = (vm) => {
    },
    privileged: {
      label: vm.$t('Privileged'),
+      el: {
+        get disabled() {
+          return vm.isDisabled
+        }
+      },
      hidden: () => {
        return vm.addTemplate
      }
@ -110,6 +132,11 @@ export const accountFieldsMeta = (vm) => {
    },
    su_from_username: {
      label: vm.$t('UserSwitchFrom'),
+      el: {
+        get disabled() {
+          return vm.isDisabled
+        }
+      },
      hidden: (formValue) => {
        return vm.platform || vm.asset || vm.addTemplate
      }
@ -117,6 +144,11 @@ export const accountFieldsMeta = (vm) => {
    password: {
      label: vm.$t('Password'),
      component: UpdateToken,
+      el: {
+        get disabled() {
+          return vm.isDisabled
+        }
+      },
      hidden: (formValue) => {
        return formValue.secret_type !== 'password' || vm.addTemplate
      }
@ -124,33 +156,63 @@ export const accountFieldsMeta = (vm) => {
    ssh_key: {
      label: vm.$t('PrivateKey'),
      component: UploadSecret,
+      el: {
+        get disabled() {
+          return vm.isDisabled
+        }
+      },
      hidden: (formValue) => formValue.secret_type !== 'ssh_key' || vm.addTemplate
    },
    passphrase: {
      label: vm.$t('Passphrase'),
      component: UpdateToken,
+      el: {
+        get disabled() {
+          return vm.isDisabled
+        }
+      },
      hidden: (formValue) => formValue.secret_type !== 'ssh_key' || vm.addTemplate
    },
    token: {
      label: vm.$t('Token'),
      component: UploadSecret,
+      el: {
+        get disabled() {
+          return vm.isDisabled
+        }
+      },
      hidden: (formValue) => formValue.secret_type !== 'token' || vm.addTemplate
    },
    access_key: {
      id: 'access_key',
      label: vm.$t('AccessKey'),
      component: UploadSecret,
+      el: {
+        get disabled() {
+          return vm.isDisabled
+        }
+      },
      hidden: (formValue) => formValue.secret_type !== 'access_key' || vm.addTemplate
    },
    api_key: {
      id: 'api_key',
      label: vm.$t('ApiKey'),
      component: UploadSecret,
+      el: {
+        get disabled() {
+          return vm.isDisabled
+        }
+      },
      hidden: (formValue) => formValue.secret_type !== 'api_key' || vm.addTemplate
    },
    secret_type: {
      type: 'radio-group',
      options: [],
+      el: {
+        get disabled() {
+          return vm.isDisabled
+        }
+      },
      hidden: () => {
        return vm.addTemplate
      }
@ -163,7 +225,8 @@ export const accountFieldsMeta = (vm) => {
          !automation.ansible_enabled ||
          !vm.$hasPerm('accounts.push_account') ||
          (formValue.secret_type === 'ssh_key' && vm.iPlatform.type.value === 'windows') ||
-          vm.addTemplate
+          vm.addTemplate ||
+          !formValue.secret_reset
      }
    },
    params: {
@ -172,6 +235,9 @@ export const accountFieldsMeta = (vm) => {
      el: {},
      hidden: (formValue) => {
        const automation = vm.iPlatform.automation || {}
+        if (!vm.iPlatform.automation) {
+          return true
+        }
        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 ||
@ -184,12 +250,27 @@ export const accountFieldsMeta = (vm) => {
      }
    },
    is_active: {
-      label: vm.$t('IsActive')
+      label: vm.$t('IsActive'),
+      el: {
+        get disabled() {
+          return vm.isDisabled
+        }
+      }
    },
    comment: {
      label: vm.$t('Comment'),
-      hidden: () => {
-        return vm.addTemplate
+      el: {
+        get disabled() {
+          return vm.isDisabled
+        }
+      }
+    },
+    secret_reset: {
+      label: vm.$t('SecretReset'),
+      el: {
+        get disabled() {
+          return vm.isDisabled
+        }
      }
    }
  }
--- a/src/components/Apps/AccountCreateUpdateForm/index.vue
+++ b/src/components/Apps/AccountCreateUpdateForm/index.vue
@ -45,6 +45,7 @@ export default {
  data() {
    return {
      loading: true,
+      isDisabled: false,
      usernameChanged: false,
      submitBtnText: this.$t('Confirm'),
      iPlatform: {
@ -61,11 +62,12 @@ export default {
      form: Object.assign({ 'on_invalid': 'error' }, this.account || {}),
      encryptedFields: ['secret'],
      fields: [
-        [this.$t('AccountTemplate'), ['template']],
-        [this.$t('Basic'), ['assets', 'name', 'username', 'privileged', 'su_from', 'su_from_username']],
+        [this.$t('Basic'), ['name', 'username', 'privileged', 'su_from', 'su_from_username', 'template']],
+        [this.$t('Asset'), ['assets']],
        [this.$t('Secret'), [
          'secret_type', 'password', 'ssh_key', 'token',
-          'access_key', 'passphrase', 'api_key'
+          'access_key', 'passphrase', 'api_key',
+          'secret_reset'
        ]],
        [this.$t('Other'), ['push_now', 'params', 'on_invalid', 'is_active', 'comment']]
      ],
@ -73,6 +75,16 @@ export default {
      hasSaveContinue: false
    }
  },
+  watch: {
+    '$route.query': {
+      handler(nv, ov) {
+        if (nv && (nv.flag === 'move' || nv.flag === 'copy')) {
+          this.isDisabled = true
+        }
+      },
+      immediate: true
+    }
+  },
  async mounted() {
    try {
      await this.getPlatform()
@ -145,7 +157,11 @@ export default {
        delete form['secret']
      }
      if (this.account?.name) {
-        this.$emit('edit', form)
+        if (this.account.payload && this.account.payload === 'pam_account_clone') {
+          this.$emit('add', form)
+        } else {
+          this.$emit('edit', form)
+        }
      } else {
        this.$emit('add', form)
      }
@ -157,16 +173,16 @@ export default {
 <style lang='scss' scoped>
 .account-add {
  ::v-deep .el-form-item {
-    margin-bottom: 5px;
+    //margin-bottom: 5px;

    .help-block {
-      margin-bottom: 5px;
+      //margin-bottom: 5px;
    }
  }

  ::v-deep .form-group-header {
    .hr-line-dashed {
-      margin: 5px 0;
+      //margin: 5px 0;
    }

    h3 {
--- a/src/components/Apps/AccountListTable/AccountCreateUpdate.vue
+++ b/src/components/Apps/AccountListTable/AccountCreateUpdate.vue
@ -1,36 +1,38 @@
-<template>
-  <Dialog
-    v-if="iVisible"
-    :close-on-click-modal="false"
-    :destroy-on-close="true"
-    :show-cancel="false"
-    :show-confirm="false"
+<template v-if="iVisible">
+  <Drawer
    :title="title"
-    :visible.sync="iVisible"
-    v-bind="$attrs"
-    width="900px"
-    v-on="$listeners"
+    :visible="iVisible"
+    class="drawer"
+    @close-drawer="handleCloseDrawer"
  >
-    <AccountCreateUpdateForm
-      v-if="!loading"
-      ref="form"
-      :account="account"
-      :add-template="addTemplate"
-      :asset="asset"
-      @add="addAccount"
-      @edit="editAccount"
-    />
-  </Dialog>
+    <Page :title="'null'">
+      <IBox class="content">
+        <AccountCreateUpdateForm
+          v-if="!loading"
+          ref="form"
+          :account="account"
+          :add-template="addTemplate"
+          :asset="asset"
+          @add="addAccount"
+          @edit="editAccount"
+        />
+      </IBox>
+    </Page>
+  </Drawer>
 </template>

 <script>
-import Dialog from '@/components/Dialog/index.vue'
+import Drawer from '@/components/Drawer/index.vue'
 import AccountCreateUpdateForm from '@/components/Apps/AccountCreateUpdateForm/index.vue'
+import IBox from '@/components/Common/IBox/index.vue'
+import Page from '@/layout/components/Page/index.vue'

 export default {
  name: 'CreateAccountDialog',
  components: {
-    Dialog,
+    IBox,
+    Drawer,
+    Page,
    AccountCreateUpdateForm
  },
  props: {
@ -111,11 +113,22 @@ export default {
    },
    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('UpdateSuccessMsg'))
-      }).catch(error => this.setFieldError(error))
+      const flag = this.$route.query.flag
+
+      switch (flag) {
+        case 'copy':
+          this.handleAccountOperation(this.account.id, 'copy-to-assets', data)
+          break
+        case 'move':
+          this.handleAccountOperation(this.account.id, 'move-to-assets', data)
+          break
+        default:
+          this.$axios.patch(`/api/v1/accounts/accounts/${this.account.id}/`, data).then(() => {
+            this.iVisible = false
+            this.$emit('add', true)
+            this.$message.success(this.$tc('UpdateSuccessMsg'))
+          }).catch(error => this.setFieldError(error))
+      }
    },
    handleResult(resp, error) {
      let bulkCreate = !this.asset
@ -168,7 +181,29 @@ export default {
          refsAutoDataForm.setFieldError(current, err)
        }
      }
+    },
+    handleCloseDrawer() {
+      this.iVisible = false
+      // Reflect.deleteProperty(this.$route.query, 'flag')
+    },
+    handleAccountOperation(id, path, data) {
+      this.$axios.post(`/api/v1/accounts/accounts/${id}/${path}/`, data).then((res) => {
+        this.iVisible = false
+        this.$emit('add', true)
+        this.handleResult(res, null)
+      }).catch(error => this.handleResult(null, error))
    }
  }
 }
 </script>
+
+<style lang="scss" scoped>
+.drawer {
+  ::v-deep .el-drawer__body {
+
+    .el-form {
+      margin-right: 30px;
+    }
+  }
+}
+</style>
--- a/src/components/Apps/AccountListTable/AccountList.vue
+++ b/src/components/Apps/AccountListTable/AccountList.vue
@ -1,6 +1,12 @@
 <template>
  <div>
-    <ListTable ref="ListTable" :header-actions="headerActions" :table-config="tableConfig" />
+    <DrawerListTable
+      ref="ListTable"
+      :detail-drawer="detailDrawer"
+      :header-actions="headerActions"
+      :quick-filters="quickFilters"
+      :table-config="tableConfig"
+    />
    <ViewSecret
      v-if="showViewSecretDialog"
      :account="account"
@ -16,22 +22,13 @@
    <AccountCreateUpdate
      v-if="showAddDialog"
      :account="account"
+      :add-template="addTemplate"
      :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="accountCreateByTemplateTitle"
-      :visible.sync="showAddTemplateDialog"
-      @add="addAccountSuccess"
-      @bulk-create-done="showBulkCreateResult($event)"
-    />
    <ResultDialog
      v-if="showResultDialog"
      :result="createAccountResults"
@ -44,29 +41,42 @@
      v-bind="updateSelectedDialogSetting"
      @update="handleAccountBulkUpdate"
    />
+    <PasswordHistoryDialog
+      v-if="showPasswordHistoryDialog"
+      :account="currentAccountColumn"
+      :visible.sync="showPasswordHistoryDialog"
+    />
  </div>
 </template>

 <script>
-import ListTable from '@/components/Table/ListTable/index.vue'
-import { ActionsFormatter } from '@/components/Table/TableFormatters'
+import { mapGetters } from 'vuex'
+import { accountOtherActions, accountQuickFilters, connectivityMeta, isDirectoryServiceAccount } from './const'
+import { openTaskPage } from '@/utils/jms'
+import {
+  AccountConnectFormatter,
+  ActionsFormatter,
+  PlatformFormatter,
+  SecretViewerFormatter
+} 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 AccountCreateUpdate from './AccountCreateUpdate.vue'
+import PasswordHistoryDialog from './PasswordHistoryDialog.vue'
+import DrawerListTable from '@/components/Table/DrawerListTable/index.vue'
 import AccountBulkUpdateDialog from '@/components/Apps/AccountListTable/AccountBulkUpdateDialog.vue'

 export default {
  name: 'AccountListTable',
  components: {
-    AccountBulkUpdateDialog,
-    ResultDialog,
-    ListTable,
-    UpdateSecretInfo,
    ViewSecret,
-    AccountCreateUpdate
+    ResultDialog,
+    DrawerListTable,
+    UpdateSecretInfo,
+    AccountCreateUpdate,
+    PasswordHistoryDialog,
+    AccountBulkUpdateDialog
  },
  props: {
    url: {
@ -89,7 +99,7 @@ export default {
    },
    hasClone: {
      type: Boolean,
-      default: false
+      default: true
    },
    asset: {
      type: Object,
@ -119,7 +129,7 @@ export default {
    columnsDefault: {
      type: Array,
      default: () => ([
-        'name', 'username', 'asset', 'date_updated'
+        'name', 'username', 'secret', 'asset', 'platform', 'connect'
      ])
    },
    headerExtraActions: {
@ -129,22 +139,34 @@ export default {
    extraQuery: {
      type: Object,
      default: () => ({})
+    },
+    showQuickFilters: {
+      type: Boolean,
+      default: true
+    },
+    showActions: {
+      type: Boolean,
+      default: true
    }
  },
  data() {
    const vm = this
    return {
+      addTemplate: false,
+      isUpdateAccount: false,
+      currentAccountColumn: {},
+      showPasswordHistoryDialog: false,
      showViewSecretDialog: false,
      showUpdateSecretDialog: false,
      showResultDialog: false,
      showAddDialog: false,
      showAddTemplateDialog: false,
+      detailDrawer: () => import('@/views/accounts/Account/AccountDetail/index.vue'),
      createAccountResults: [],
-      accountCreateUpdateTitle: this.$t('AddAccount'),
-      accountCreateByTemplateTitle: this.$t('AddAccountByTemplate'),
      iAsset: this.asset,
      account: {},
      secretUrl: '',
+      quickFilters: this.showQuickFilters ? accountQuickFilters(this) : [],
      tableConfig: {
        url: this.url,
        permissions: {
@ -153,40 +175,86 @@ export default {
        },
        extraQuery: this.extraQuery,
        columnsExclude: ['spec_info'],
+        columnsAdd: ['secret', 'platform', 'connect'],
        columnsShow: {
          min: ['name', 'username', 'actions'],
          default: this.columnsDefault
        },
        columnsMeta: {
          name: {
-            width: '120px',
-            formatter: function(row) {
-              const to = {
-                name: 'AssetAccountDetail',
+            minWidth: '60px',
+            formatterArgs: {
+              can: () => vm.$hasPerm('accounts.view_account'),
+              getRoute: ({ row }) => ({
+                name: 'AccountDetail',
                params: { id: row.id }
+              }),
+              getTitle: ({ row }) => {
+                let title = row.name
+                if (row.ds && this.asset && this.asset.id !== row.asset.id) {
+                  const dsID = row.ds.id.split('-')[0]
+                  title = `${row.name}@${dsID}`
+                }
+                return title
+              },
+              getDrawerTitle({ row }) {
+                return `${row.username}@${row.asset.name}`
              }
-              if (vm.$hasPerm('accounts.view_account')) {
-                return <router-link to={to}>{row.name}</router-link>
+            }
+          },
+          secret: {
+            formatter: SecretViewerFormatter,
+            width: '130px',
+            formatterArgs: {
+              secretFrom: 'api',
+              hasDownload: false,
+              actionLeft: true
+            }
+          },
+          connect: {
+            label: this.$t('Connect'),
+            width: '80px',
+            formatter: AccountConnectFormatter,
+            formatterArgs: {
+              asset: this.asset,
+              can: ({ row }) => {
+                return this.currentUserIsSuperAdmin
+              }
+            }
+          },
+          ds: {
+            width: '100px',
+            formatter: (row) => {
+              if (row.ds && row.ds['domain_name']) {
+                return row.ds['domain_name']
              } else {
-                return <span>{row.name}</span>
+                return ''
              }
            }
          },
+          platform: {
+            label: this.$t('Platform'),
+            width: '150px',
+            formatter: PlatformFormatter,
+            formatterArgs: {
+              platformAttr: 'asset.platform'
+            }
+          },
          asset: {
+            minWidth: '100px',
            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>
-              }
+              return row.asset.name
            }
          },
          username: {
-            width: '120px'
+            minWidth: '60px',
+            formatter: function(row) {
+              if (row.ds && row.ds['domain_name']) {
+                return `${row.username}@${row.ds['domain_name']}`
+              } else {
+                return row.username
+              }
+            }
          },
          secret_type: {
            formatter: function(row) {
@ -214,77 +282,19 @@ export default {
          connectivity: connectivityMeta,
          actions: {
            formatter: ActionsFormatter,
+            has: this.showActions,
            formatterArgs: {
+              performDelete: ({ row }) => {
+                const id = row.id
+                const url = `/api/v1/accounts/accounts/${id}/`
+                return this.$axios.delete(url)
+              },
              hasUpdate: false, // can set function(row, value)
-              hasDelete: false, // can set function(row, value)
-              hasClone: this.hasClone,
+              hasDelete: true, // can set function(row, value)
+              hasClone: false,
+              canDelete: ({ row }) => vm.$hasPerm('accounts.delete_account') && !isDirectoryServiceAccount(row, this),
              moreActionsTitle: this.$t('More'),
-              extraActions: [
-                {
-                  name: 'View',
-                  title: this.$t('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: 'Update',
-                  title: this.$t('Edit'),
-                  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('UpdateAccount')
-                    setTimeout(() => {
-                      vm.showAddDialog = true
-                    })
-                  }
-                },
-                {
-                  name: 'Test',
-                  title: this.$t('Test'),
-                  can: ({ row }) =>
-                    !this.$store.getters.currentOrgIsRoot &&
-                    this.$hasPerm('accounts.verify_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: 'ClearSecret',
-                  title: this.$t('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('ClearSuccessMsg'))
-                    })
-                  }
-                }
-              ]
+              extraActions: accountOtherActions(this)
            }
          },
          ...this.columnsMeta
@ -313,15 +323,15 @@ export default {
            type: 'primary',
            icon: 'plus',
            can: () => {
-              return vm.$hasPerm('accounts.add_account') && !this.$store.getters.currentOrgIsRoot
+              return vm.$hasPerm('accounts.add_account') && !vm.$store.getters.currentOrgIsRoot
            },
-            callback: async() => {
-              await this.getAssetDetail()
+            callback: () => {
              setTimeout(() => {
                vm.iAsset = this.asset
                vm.account = {}
-                vm.showAddDialog = true
-              })
+                this.addTemplate = false
+                this.showAddDialog = true
+              }, 200)
            }
          },
          {
@ -329,14 +339,15 @@ export default {
            title: this.$t('TemplateAdd'),
            has: !(this.platform || this.asset),
            can: () => {
-              return vm.$hasPerm('accounts.add_account') && !this.$store.getters.currentOrgIsRoot
+              return vm.$hasPerm('accounts.add_account') && !vm.$store.getters.currentOrgIsRoot
            },
            callback: async() => {
              await this.getAssetDetail()
              setTimeout(() => {
                vm.iAsset = this.asset
                vm.account = {}
-                vm.showAddTemplateDialog = true
+                vm.showAddDialog = true
+                vm.addTemplate = true
              })
            }
          },
@ -347,11 +358,11 @@ export default {
            name: 'TestSelected',
            title: this.$t('TestSelected'),
            type: 'primary',
-            icon: 'fa-link',
+            icon: 'verify',
            can: ({ selectedRows }) => {
              return selectedRows.length > 0 &&
-                  ['clickhouse', 'redis', 'website', 'chatgpt'].indexOf(selectedRows[0].asset.type.value) === -1 &&
-                  !this.$store.getters.currentOrgIsRoot
+                ['clickhouse', 'redis', 'website', 'chatgpt'].indexOf(selectedRows[0].asset.type.value) === -1 &&
+                !this.$store.getters.currentOrgIsRoot
            },
            callback: function({ selectedRows }) {
              const ids = selectedRows.map(v => {
@ -416,6 +427,18 @@ export default {
      }
    }
  },
+  computed: {
+    ...mapGetters(['currentUserIsSuperAdmin']),
+    accountCreateUpdateTitle() {
+      if (this.addTemplate) {
+        return this.$t('AddAccountByTemplate')
+      } else if (this.isUpdateAccount) {
+        return this.$t('UpdateAccount')
+      } else {
+        return this.$t('AddAccount')
+      }
+    }
+  },
  watch: {
    url(iNew) {
      this.$set(this.tableConfig, 'url', iNew)
@ -423,52 +446,35 @@ export default {
    }
  },
  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('Delete'),
-          can: this.$hasPerm('accounts.delete_account'),
-          type: 'primary',
-          callback: ({ row }) => {
-            const msg = this.$t('AccountDeleteConfirmMsg')
-            this.$confirm(msg, this.$tc('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('DeleteSuccessMsg'))
-                })
-              }
-            })
-          }
-        }
-      )
-    }
+    this.setActions()
  },
  activated() {
    // 由于组件嵌套较深，有可能导致 Error in activated hook: "TypeError: Cannot read properties of undefined (reading 'getList')" 的问题
-    setTimeout(() => {
-      this.refresh()
-    }, 300)
+    if (this.tabDeactivated) {
+      setTimeout(() => this.refresh(), 300)
+    }
+  },
+  deactivated() {
+    this.tabDeactivated = true
  },
  methods: {
+    setActions() {
+      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)
+        }
+      }
+    },
    onUpdateAuthDone(account) {
      Object.assign(this.account, account)
    },
    addAccountSuccess() {
+      // Reflect.deleteProperty(this.$route.query, 'flag')
+      this.isUpdateAccount = false
      this.$refs.ListTable.reloadTable()
    },
    async getAssetDetail() {
@ -507,7 +513,7 @@ export default {
 }
 </script>

-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .cell a {
  color: var(--color-info);
 }
--- a/src/components/Apps/AccountListTable/PasswordHistoryDialog.vue
+++ b/src/components/Apps/AccountListTable/PasswordHistoryDialog.vue
@ -4,7 +4,7 @@

 <script>
 import { GenericListTableDialog } from '@/layout/components'
-import { ShowKeyCopyFormatter } from '@/components/Table/TableFormatters'
+import { SecretViewerFormatter } from '@/components/Table/TableFormatters'

 export default {
  components: {
@ -33,7 +33,7 @@ export default {
          columnsMeta: {
            secret: {
              label: this.$t('Password'),
-              formatter: ShowKeyCopyFormatter,
+              formatter: SecretViewerFormatter,
              formatterArgs: {
                hasDownload: false,
                name: this.account.name
--- a/src/components/Apps/AccountListTable/UpdateSecretInfo.vue
+++ b/src/components/Apps/AccountListTable/UpdateSecretInfo.vue
@ -1,44 +1,36 @@
 <template>
  <Dialog
    :destroy-on-close="true"
+    :show-buttons="false"
    :title="$tc('UpdateAssetUserToken')"
-    :visible.sync="visible"
-    width="50"
-    @cancel="handleCancel()"
-    @confirm="handleConfirm()"
+    :visible.sync="iVisible"
+    width="800px"
    v-on="$listeners"
  >
-    <el-form label-position="right" label-width="90px">
-      <el-form-item :label="$tc('Name')">
-        <el-input v-model="account['asset_name']" readonly />
-      </el-form-item>
-      <el-form-item :label="$tc('Username')">
-        <el-input v-model="account['username']" readonly />
-      </el-form-item>
-      <el-form-item :label="$tc('Password')">
-        <UpdateToken v-model="authInfo.password" />
-      </el-form-item>
-      <el-form-item :label="$tc('SSHSecretKey')">
-        <UploadKey @input="getFile" />
-      </el-form-item>
-      <el-form-item :label="$tc('Passphrase')">
-        <UpdateToken v-model="authInfo.passphrase" />
-      </el-form-item>
-    </el-form>
+    <AutoDataForm
+      :fields="fields"
+      :fields-meta="fieldsMeta"
+      :form="init"
+      :has-reset="false"
+      :has-save-continue="false"
+      :url="''"
+      method="patch"
+      @submit="handleConfirm"
+    />
  </Dialog>
 </template>

 <script>
 import Dialog from '@/components/Dialog/index.vue'
-import { UpdateToken, UploadKey } from '@/components/Form/FormFields'
+import { accountFieldsMeta } from '@/components/Apps/AccountCreateUpdateForm/const'
 import { encryptPassword } from '@/utils/crypto'
+import AutoDataForm from '@/components/Form/AutoDataForm/index.vue'

 export default {
  name: 'UpdateSecretInfo',
  components: {
-    Dialog,
-    UploadKey,
-    UpdateToken
+    AutoDataForm,
+    Dialog
  },
  props: {
    account: {
@ -51,49 +43,59 @@ export default {
    }
  },
  data() {
+    const accountMeta = accountFieldsMeta(this)
    return {
-      secretInfo: {
-        password: '',
-        private_key: '',
-        passphrase: ''
+      fields: [
+        'name', 'secret_type', 'password', 'ssh_key', 'token',
+        'access_key', 'passphrase', 'api_key'
+      ],
+      fieldsMeta: {
+        ...accountMeta,
+        name: {
+          ...accountMeta.name,
+          readonly: true
+        },
+        secret_type: {
+          hidden: () => true
+        }
+      },
+      init: {
+        ...this.account
+      }
+    }
+  },
+  computed: {
+    iVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:visible', val)
      }
    }
  },
  methods: {
-    handleConfirm() {
-      const data = {}
-      if (this.secretInfo.password !== '') {
-        data.password = encryptPassword(this.secretInfo.password)
-      }
-      if (this.secretInfo.private_key !== '') {
-        data.private_key = encryptPassword(this.secretInfo.private_key)
-        if (this.secretInfo.passphrase) data.passphrase = this.secretInfo.passphrase
+    handleConfirm(form) {
+      const secretType = this.account.secret_type.value
+      const data = {
+        secret: encryptPassword(form[secretType])
      }
      this.$axios.patch(
        `/api/v1/accounts/accounts/${this.account.id}/`,
        data,
        { disableFlashErrorMsg: true }
      ).then(res => {
-        this.authInfo = { password: '', private_key: '' }
        this.$message.success(this.$tc('UpdateSuccessMsg'))
-        this.$emit('updateAuthDone', res)
-        this.$emit('update:visible', false)
+        this.iVisible = false
      }).catch(err => {
        const errMsg = Object.values(err.response.data).join(', ')
        this.$message.error(this.$tc('UpdateErrorMsg') + ' ' + errMsg)
-        this.$emit('update:visible', true)
+        this.iVisible = false
      })
    },
    handleCancel() {
      this.$emit('update:visible', false)
-    },
-    getFile(file) {
-      this.secretInfo.private_key = file
    }
  }
 }
 </script>
-
-<style scoped>
-
-</style>
--- a/src/components/Apps/AccountListTable/ViewSecret.vue
+++ b/src/components/Apps/AccountListTable/ViewSecret.vue
@ -18,7 +18,7 @@
          <span>{{ account['username'] }}</span>
        </el-form-item>
        <el-form-item :label="secretTypeLabel">
-          <ShowKeyCopyFormatter
+          <SecretViewerFormatter
            :cell-value="secretInfo.secret"
            :col="{ formatterArgs: {
              name: account['name'],
@ -60,7 +60,7 @@
 <script>
 import Dialog from '@/components/Dialog/index.vue'
 import PasswordHistoryDialog from './PasswordHistoryDialog.vue'
-import { ShowKeyCopyFormatter } from '@/components/Table/TableFormatters'
+import { SecretViewerFormatter } from '@/components/Table/TableFormatters'
 import { encryptPassword } from '@/utils/crypto'

 export default {
@ -68,7 +68,7 @@ export default {
  components: {
    Dialog,
    PasswordHistoryDialog,
-    ShowKeyCopyFormatter
+    SecretViewerFormatter
  },
  props: {
    account: {
--- a/src/components/Apps/AccountListTable/const.js
+++ b/src/components/Apps/AccountListTable/const.js
@ -1,4 +1,5 @@
 import { ChoicesFormatter } from '@/components/Table/TableFormatters'
+import { openTaskPage } from '@/utils/jms'

 export const connectivityMeta = {
  formatter: ChoicesFormatter,
@ -6,11 +7,23 @@ export const connectivityMeta = {
    faChoices: {
      '-': '',
      ok: 'fa-check-circle',
-      err: 'fa-times-circle'
+      err: 'fa-times-circle',
+      auth_err: 'fa-times-circle',
+      sudo_err: 'fa-times-circle',
+      password_err: 'fa-times-circle',
+      openssh_key_err: 'fa-times-circle',
+      ntlm_err: 'fa-times-circle',
+      create_dir_err: 'fa-times-circle'
    },
    classChoices: {
      ok: 'text-primary',
-      err: 'text-danger'
+      err: 'text-danger',
+      auth_err: 'text-danger',
+      sudo_err: 'text-danger',
+      password_err: 'text-danger',
+      openssh_key_err: 'text-danger',
+      ntlm_err: 'text-danger',
+      create_dir_err: 'text-danger'
    },
    getText({ cellValue }) {
      if (cellValue?.value === '-' || cellValue?.value === 'unknown') {
@ -22,3 +35,309 @@ export const connectivityMeta = {
  },
  width: '130px'
 }
+
+export function isDirectoryServiceAccount(account, vm) {
+  return vm.asset && vm.asset.id !== account.asset.id
+}
+
+export const accountOtherActions = (vm) => {
+  return [
+    {
+      name: 'View',
+      title: vm.$t('View'),
+      can: vm.$hasPerm('accounts.view_accountsecret'),
+      type: 'primary',
+      order: 1,
+      callback: ({ row }) => {
+        // debugger
+        vm.secretUrl = `/api/v1/accounts/account-secrets/${row.id}/`
+        vm.account = row
+        vm.showViewSecretDialog = false
+        setTimeout(() => {
+          vm.showViewSecretDialog = true
+        })
+      }
+    },
+    {
+      name: 'Update',
+      title: vm.$t('Edit'),
+      can: ({ row }) => {
+        return vm.$hasPerm('accounts.change_account') &&
+          !vm.$store.getters.currentOrgIsRoot &&
+          !isDirectoryServiceAccount(row, vm)
+      },
+      callback: ({ row }) => {
+        vm.isUpdateAccount = true
+        const data = {
+          ...vm.asset,
+          ...row.asset
+        }
+        vm.iAsset = data
+        vm.account = row
+        vm.addTemplate = false
+        vm.showAddDialog = false
+        setTimeout(() => {
+          vm.showAddDialog = true
+        })
+      }
+    },
+    {
+      name: 'UpdateSecret',
+      title: vm.$t('EditSecret'),
+      can: ({ row }) => {
+        return vm.$hasPerm('accounts.change_account') &&
+          !vm.$store.getters.currentOrgIsRoot &&
+          !isDirectoryServiceAccount(row, vm)
+      },
+      callback: ({ row }) => {
+        const data = {
+          ...vm.asset,
+          ...row.asset
+        }
+        vm.account = row
+        vm.iAsset = data
+        vm.showUpdateSecretDialog = false
+        vm.accountCreateUpdateTitle = vm.$t('UpdateAccount')
+        setTimeout(() => {
+          vm.showUpdateSecretDialog = true
+        })
+      }
+    },
+    {
+      name: 'Clone',
+      title: vm.$t('Duplicate'),
+      has: () => {
+        return !vm.asset
+      },
+      can: ({ row }) => {
+        return vm.$hasPerm('accounts.add_account') &&
+          !vm.$store.getters.currentOrgIsRoot &&
+          !isDirectoryServiceAccount(row, vm)
+      },
+      callback: ({ row }) => {
+        vm.account = {
+          name: `${row.name} - ${vm.$t('Duplicate').toLowerCase()}`,
+          username: `${row.username} - ${vm.$t('Duplicate').toLowerCase()}`,
+          payload: 'pam_account_clone'
+        }
+        vm.iAsset = vm.asset
+
+        vm.showAddDialog = false
+        setTimeout(() => {
+          vm.showAddDialog = true
+        })
+      }
+    },
+    {
+      name: 'Test',
+      title: vm.$t('VerifySecret'),
+      divided: true,
+      can: ({ row }) =>
+        !vm.$store.getters.currentOrgIsRoot &&
+        vm.$hasPerm('accounts.verify_account') &&
+        row.asset['auto_config'].ansible_enabled &&
+        row.asset['auto_config'].ping_enabled,
+      callback: ({ row }) => {
+        vm.$axios.post(
+          `/api/v1/accounts/accounts/tasks/`,
+          { action: 'verify', accounts: [row.id] }
+        ).then(res => {
+          openTaskPage(res['task'])
+        })
+      }
+    },
+    {
+      name: 'ClearSecret',
+      title: vm.$t('ClearSecret'),
+      can: ({ row }) => {
+        return vm.$hasPerm('accounts.change_account') &&
+          !isDirectoryServiceAccount(row, vm)
+      },
+      type: 'primary',
+      callback: ({ row }) => {
+        vm.$axios.patch(
+          `/api/v1/accounts/accounts/clear-secret/`,
+          { account_ids: [row.id] }
+        ).then(() => {
+          vm.$message.success(vm.$tc('ClearSuccessMsg'))
+        })
+      }
+    },
+    {
+      name: 'SecretHistory',
+      title: vm.$t('HistoryPassword'),
+      can: () => vm.$hasPerm('accounts.view_accountsecret'),
+      type: 'primary',
+      callback: ({ row }) => {
+        vm.account = row
+        vm.currentAccountColumn = row
+        vm.showViewSecretDialog = false
+        vm.secretUrl = `/api/v1/accounts/account-secrets/${row.id}/`
+        setTimeout(() => {
+          vm.showViewSecretDialog = true
+        })
+      }
+    },
+    {
+      name: 'CopyToOther',
+      title: vm.$t('CopyToAsset'),
+      type: 'primary',
+      divided: true,
+      can: ({ row }) => {
+        return vm.$hasPerm('accounts.add_account') &&
+          !vm.$store.getters.currentOrgIsRoot &&
+          !isDirectoryServiceAccount(row, vm)
+      },
+      has: () => {
+        return !vm.asset
+      },
+      callback: ({ row }) => {
+        vm.accountCreateUpdateTitle = vm.$t('CopyToOther')
+        vm.$route.query.flag = 'copy'
+        vm.iAsset = vm.asset
+        vm.account = row
+        vm.showAddDialog = true
+      }
+    },
+    {
+      name: 'MoveToOther',
+      title: vm.$t('MoveToAsset'),
+      type: 'primary',
+      can: ({ row }) => {
+        return vm.$hasPerm('accounts.add_account') &&
+          !vm.$store.getters.currentOrgIsRoot &&
+          !isDirectoryServiceAccount(row, vm)
+      },
+      has: () => {
+        return !vm.asset
+      },
+      callback: ({ row }) => {
+        vm.accountCreateUpdateTitle = vm.$t('MoveToOther')
+        vm.$route.query.flag = 'move'
+        vm.iAsset = vm.asset
+        vm.account = row
+        vm.showAddDialog = true
+      }
+    }
+  ]
+}
+
+export const accountQuickFilters = (vm) => [
+  {
+    label: vm.$t('Recent (7 days)'),
+    options: [
+      {
+        label: vm.$t('RecentlyDiscovered'),
+        filter: {
+          latest_discovery: '1'
+        }
+      },
+      {
+        label: vm.$t('RecentlyLoggedIn'),
+        filter: {
+          latest_accessed: '1'
+        }
+      },
+      {
+        label: vm.$t('RecentlyModified'),
+        filter: {
+          latest_updated: '1'
+        }
+      },
+      {
+        label: vm.$t('RecentlyChangedPassword'),
+        filter: {
+          latest_secret_changed: '1'
+        }
+      },
+      {
+        label: vm.$t('RecentPasswordChangeFailed'),
+        filter: {
+          latest_secret_change_failed: '1'
+        }
+      }
+    ]
+  },
+  {
+    label: vm.$t('RiskyAccount'),
+    options: [
+      {
+        label: vm.$t('NoLoginLongTime'),
+        filter: {
+          long_time_no_login: 'true'
+        }
+      },
+      {
+        label: vm.$t('AddAccount'),
+        filter: {
+          risk: 'new_found'
+        }
+      },
+      {
+        label: vm.$t('WeakPassword'),
+        filter: {
+          risk: 'weak_password'
+        }
+      },
+      {
+        label: vm.$t('EmptyPassword'),
+        filter: {
+          has_secret: 'false'
+        }
+      },
+      {
+        label: vm.$t('LongTimePassword'),
+        filter: {
+          long_time_no_change_secret: 'true'
+        }
+      }
+    ]
+  },
+  {
+    label: vm.$t('AccountType'),
+    options: [
+      {
+        label: vm.$t('All'),
+        filter: {
+          category: ''
+        }
+      },
+      {
+        label: vm.$t('Host'),
+        filter: {
+          category: 'host'
+        }
+      },
+      {
+        label: vm.$t('Database'),
+        filter: {
+          category: 'database'
+        }
+      },
+      {
+        label: vm.$t('Cloud'),
+        filter: {
+          category: 'cloud'
+        }
+      },
+      {
+        label: vm.$t('Device'),
+        filter: {
+          category: 'device'
+        }
+      },
+      {
+        label: 'Web',
+        filter: {
+          category: 'web'
+        }
+      },
+      {
+        label: vm.$t('Other'),
+        filter: {
+          category: 'custom'
+        }
+      }
+    ]
+  }
+]
--- a/src/components/Apps/AssetRelationCard/index.vue
+++ b/src/components/Apps/AssetRelationCard/index.vue
@ -16,7 +16,7 @@
 </template>

 <script>
-import IBox from '@/components/IBox/index.vue'
+import IBox from '@/components/Common/IBox/index.vue'
 import AssetSelect from '@/components/Apps/AssetSelect/index.vue'

 export default {
@ -48,11 +48,13 @@ export default {
    },
    performAdd: {
      type: Function,
-      default: (objects, that) => {}
+      default: (objects, that) => {
+      }
    },
    onAddSuccess: {
      type: Function,
-      default: (objects, that) => {}
+      default: (objects, that) => {
+      }
    },
    canSelect: {
      type: Function,
@ -62,8 +64,7 @@ export default {
    }
  },
  data() {
-    return {
-    }
+    return {}
  },
  methods: {
    addObjects() {
@ -77,18 +78,18 @@ export default {
 </script>

 <style scoped>
-  b, strong {
-    font-weight: 700;
-    font-size: 13px;
-  }
+b, strong {
+  font-weight: 700;
+  font-size: 13px;
+}

-  tr td {
-    line-height: 1.42857;
-    padding: 8px;
-    vertical-align: top;
-  }
+tr td {
+  line-height: 1.42857;
+  padding: 8px;
+  vertical-align: top;
+}

-  tr.item td {
-    border-top: 1px solid #e7eaec;
-  }
+tr.item td {
+  border-top: 1px solid #e7eaec;
+}
 </style>
--- a/src/components/Apps/AssetSelect/dialog.vue
+++ b/src/components/Apps/AssetSelect/dialog.vue
@ -2,7 +2,6 @@
  <Dialog
    :close-on-click-modal="false"
    :title="$tc('Assets')"
-    :disabled-status="!isLoaded"
    custom-class="asset-select-dialog"
    top="2vh"
    v-bind="$attrs"
@ -23,8 +22,8 @@
      :url="baseUrl"
      class="tree-table"
      v-bind="$attrs"
-      v-on="$listeners"
      @loaded="handleTableLoaded"
+      v-on="$listeners"
    />
  </Dialog>
 </template>
@ -83,7 +82,7 @@ export default {
          },
          {
            prop: 'address',
-            label: this.$t('IpDomain'),
+            label: this.$t('Address'),
            sortable: 'custom'
          },
          {
--- a/src/components/Apps/AssetSelect/index.vue
+++ b/src/components/Apps/AssetSelect/index.vue
@ -56,6 +56,10 @@ export default {
    treeSetting: {
      type: Object,
      default: () => ({})
+    },
+    disabled: {
+      type: [Boolean, Function],
+      default: false
    }
  },
  data() {
@ -71,6 +75,7 @@ export default {
      dialogVisible: false,
      initialValue: _.cloneDeep(iValue),
      select2Config: {
+        disabled: this.disabled,
        value: iValue,
        multiple: true,
        clearable: true,
--- a/src/components/Apps/AssetTreeTable/index.vue
+++ b/src/components/Apps/AssetTreeTable/index.vue
@ -142,6 +142,9 @@ export default {
    treeSetting.showDelete = this.$hasPerm('assets.delete_node')
  },
  methods: {
+    reloadTable() {
+      this.$refs.TreeList.reloadTable()
+    },
    setTreeUrlQuery() {
      let str = ''
      for (const key in this.treeUrlQuery) {
--- a/src/components/Apps/BlockedIPs/BlockedIPList.vue
+++ b/src/components/Apps/BlockedIPs/BlockedIPList.vue
@ -3,7 +3,7 @@
 </template>

 <script>
-import ListTable from '@/components/Table/ListTable/index.vue'
+import { DrawerListTable as ListTable } from '@/components'

 export default {
  name: 'BlockedIPList',
--- a/src/components/Apps/ChangeSecret/RecordViewSecret.vue
+++ b/src/components/Apps/ChangeSecret/RecordViewSecret.vue
@ -12,7 +12,7 @@
    >
      <el-form :model="secretInfo" class="password-form" label-position="right" label-width="100px">
        <el-form-item :label="$tc('OldSecret')">
-          <ShowKeyCopyFormatter
+          <SecretViewerFormatter
            :cell-value="secretInfo.old_secret"
            :col="{ formatterArgs: {
              name: 'old_secret'
@ -20,7 +20,7 @@
          />
        </el-form-item>
        <el-form-item :label="$tc('NewSecret')">
-          <ShowKeyCopyFormatter
+          <SecretViewerFormatter
            :cell-value="secretInfo.new_secret"
            :col="{ formatterArgs: {
              name: 'new_secret'
@ -34,13 +34,13 @@

 <script>
 import Dialog from '@/components/Dialog/index.vue'
-import { ShowKeyCopyFormatter } from '@/components/Table/TableFormatters'
+import { SecretViewerFormatter } from '@/components/Table/TableFormatters'

 export default {
  name: 'RecordViewSecret',
  components: {
    Dialog,
-    ShowKeyCopyFormatter
+    SecretViewerFormatter
  },
  props: {
    visible: {
--- a/src/components/Apps/ChatAi/components/ChitChat/ChatInput.vue
+++ b/src/components/Apps/ChatAi/components/ChitChat/ChatInput.vue
@ -46,7 +46,7 @@ export default {
        url: '/api/v1/settings/chatai-prompts/',
        value: '',
        multiple: false,
-        placeholder: this.$t('Prompt'),
+        placeholder: this.$t('Role'),
        ajax: {
          transformOption: (item) => {
            return { label: item.name, value: item.content }
--- a/src/components/Apps/ChatAi/components/ChitChat/ChatMessage.vue
+++ b/src/components/Apps/ChatAi/components/ChitChat/ChatMessage.vue
@ -1,42 +1,74 @@
 <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 :class="{ 'user-role': isUserRole }" class="chat-item">
+    <div class="chart-item-container">
+      <div class="avatar">
+        <el-avatar
+          :src="isUserRole ? userUrl : chatUrl"
+          class="header-avatar"
+        />
      </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 class="content">
+        <div class="operational">
+          <div v-if="!item.message.is_reasoning" class="date">
+            {{
+              $moment(item.message.create_time).format("YYYY-MM-DD HH:mm:ss")
+            }}
+          </div>
+
+          <div v-else class="thinking-time">{{ $i18n.t('DeeplyThoughtAbout') }}</div>
        </div>
-        <div class="action">
-          <el-tooltip
-            v-if="isSystemError && isLoading"
-            :content="$tc('Reconnect')"
-            :open-delay="500"
-            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 :class="item.reasoning ? 'reasoning' : 'message'">
+          <div class="message-content">
+            <div v-if="!item.reasoning">
+              <span v-if="isSystemError" class="error">
+                {{ item.message.content }}
+              </span>
+              <span v-else class="chat-text">
+                <MessageText :message="item.message" />
+              </span>
+            </div>
+
+            <div v-else class="thinking-wrapper">
+              <div class="thinking-content">
+                <!-- eslint-disable-next-line -->
+                <div class="divider"></div>
+                <p>
+                  <MessageText :message="item.reasoning" />
+                </p>
+              </div>
+
+              <div class="thinking-result">
+                <span v-if="isServerError" class="error">
+                  {{ isServerError }}
+                </span>
+                <MessageText :message="item.result" />
+              </div>
+            </div>
+          </div>
+          <div class="action">
+            <el-tooltip
+              v-if="isSystemError && isLoading"
+              :content="$tc('Reconnect')"
+              :open-delay="500"
+              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>
@ -45,7 +77,7 @@

 <script>
 import MessageText from './MessageText.vue'
-import { mapState } from 'vuex'
+import { mapGetters, mapState } from 'vuex'
 import { copy } from '@/utils/common'
 import { useChat } from '../../useChat.js'
 import { reconnect } from '@/utils/socket'
@ -65,7 +97,6 @@ export default {
  },
  data() {
    return {
-      chatUrl: require('@/assets/img/chat.png'),
      userUrl: '/api/v1/settings/logo/',
      dropdownOptions: [
        {
@ -79,11 +110,26 @@ export default {
    ...mapState({
      isLoading: state => state.chat.loading
    }),
+    ...mapGetters([
+      'publicSettings'
+    ]),
    isUserRole() {
      return this.item.message?.role === 'user'
    },
    isSystemError() {
-      return this.item.type === 'error' && this.item.message?.role === 'assistant'
+      return (
+        this.item.type === 'error' && this.item?.role === 'assistant'
+      )
+    },
+    isServerError() {
+      return (this.item.type === 'finish' && this.item.result.content === '')
+        ? this.$i18n.t('ServerBusyRetry')
+        : ''
+    },
+    chatUrl() {
+      return this.publicSettings.CHAT_AI_TYPE === 'gpt'
+        ? require('@/assets/img/chat.png')
+        : require('@/assets/img/deepSeek.png')
    }
  },
  methods: {
@ -94,7 +140,7 @@ export default {
    },
    handleCommand(value) {
      if (value === 'copy') {
-        copy(this.item.message.content)
+        copy(this.item.result.content)
      }
    }
  }
@ -104,101 +150,160 @@ export default {
 <style lang="scss" scoped>
 .chat-item {
  display: flex;
-  padding: 16px 14px 0;
+  padding: 0.5rem;

-  &:last-child {
-    padding-bottom: 16px;
-  }
+  .chart-item-container {
+    display: flex;
+    gap: 0.5rem;

-  .avatar {
-    width: 22px;
-    height: 22px;
-    margin-top: 2px;
+    .avatar {
+      width: 24px;
+      height: 24px;
+      margin-top: 2px;

-    .header-avatar {
-      width: 100%;
-      height: 100%;
+      .header-avatar {
+        width: 100%;
+        height: 100%;
+        border-radius: 50%;

-      &::v-deep img {
-        background-color: #e5e5e7;
+        &::v-deep img {
+          background-color: #fff;
+        }
      }
    }
-  }

-  .content {
-    margin-left: 6px;
-    overflow: hidden;
-
-    .operational {
+    .content {
      display: flex;
-      justify-content: space-between;
+      flex-direction: column;
+      // gap: 0.5rem;
      overflow: hidden;

-      .copy {
-        float: right;
-        cursor: pointer;
-      }
-    }
+      .operational {
+        display: flex;
+        justify-content: space-between;
+        overflow: hidden;

-    .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;
+        .date {
+          padding-top: 5px;
        }

-        .el-dropdown {
-          height: 32px;
-          line-height: 37px;
-          font-size: 13px;
+        .thinking-time {
+          width: 6rem;
+          display: flex;
+          justify-content: center;
+          padding: 5px 10px;
+          border-radius: 0.5rem;
+          background-color: #f5f5f5;
+        }

-          .el-dropdown-link {
-            i {
-              padding: 4px 5px;
-              font-size: 15px;
-              color: #8d9091;
+        .copy {
+          float: right;
+          cursor: pointer;
+        }
+      }

-              &:hover {
-                color: #7b8085
+      .reasoning {
+        display: flex;
+        gap: 0.5rem;
+        align-items: flex-end;
+
+        .message-content .thinking-wrapper {
+          display: flex;
+          flex-direction: column;
+          gap: 0.5rem;
+
+          .thinking-content {
+            position: relative;
+            color: #8b8b8b;
+
+            .divider {
+              position: absolute;
+              top: 0;
+              left: 0;
+              height: 100%;
+              border-left: 2px solid #e5e5e5;
+            }
+
+            p {
+              margin: unset;
+              padding-left: 0.5rem;
+
+              ::v-deep p {
+                color: #8b8b8b;
              }
            }
          }
        }
      }

-      .error {
-        color: red;
+      .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;
+  &:last-child {
+    padding-bottom: 16px;
+  }

-  .content {
-    margin-right: 10px;
+  &.user-role {
+    flex-direction: row-reverse;

-    .operational {
+    .chart-item-container {
      flex-direction: row-reverse;
    }

-    .message {
-      flex-direction: row-reverse;
+    .content {
+      margin-right: 10px;

-      .message-content {
-        background-color: var(--menu-hover);
-        border-radius: 12px 2px 12px 12px;
+      .operational {
+        flex-direction: row-reverse;
+      }
+
+      .message {
+        flex-direction: row-reverse;
+
+        .message-content {
+          background-color: var(--menu-hover);
+          border-radius: 12px 2px 12px 12px;
+        }
      }
    }
  }
--- a/src/components/Apps/ChatAi/components/ChitChat/index.vue
+++ b/src/components/Apps/ChatAi/components/ChitChat/index.vue
@ -123,7 +123,17 @@ export default {
        setLoading(true)
        removeLoadingMessageInChat()
        this.conversationId = data.id
-        updateChaMessageContentById(data.message.id, data)
+
+        const newFragment = {
+          message: { id: data.message.id, is_reasoning: data.message.is_reasoning },
+          reasoning: { content: data.message.is_reasoning ? data.message.content : '' },
+          result: { content: data.message.is_reasoning ? '' : data.message.content },
+          role: data.message.role,
+          type: data.message.type,
+          create_time: data.message.create_time
+        }
+
+        updateChaMessageContentById(data.message.id, newFragment)
      }
      if (data.message?.type === 'finish') {
        setLoading(false)
--- a/src/components/Apps/GatewayTestDialog/index.vue
+++ b/src/components/Apps/GatewayTestDialog/index.vue
--- a/src/components/Apps/GrantedAssets/index.vue
+++ b/src/components/Apps/GrantedAssets/index.vue
@ -7,7 +7,7 @@
  />
 </template>

-<script type="text/jsx">
+<script>
 import AssetTreeTable from '@/components/Apps/AssetTreeTable'
 import { AccountInfoFormatter, DetailFormatter } from '@/components/Table/TableFormatters'
 import { connectivityMeta } from '@/components/Apps/AccountListTable/const'
@ -87,7 +87,7 @@ export default {
        columnsExclude: ['spec_info'],
        columnsShow: {
          min: ['name', 'address', 'accounts'],
-          default: ['name', 'address', 'platform', 'connectivity', 'view_account', 'actions']
+          default: ['name', 'address', 'platform', 'view_account', 'actions']
        },
        columnsMeta: {
          name: {
--- a/src/components/Apps/ManyJsonTabs/AssetJsonTab.vue
+++ b/src/components/Apps/ManyJsonTabs/AssetJsonTab.vue
@ -1,24 +1,26 @@
 <template>
-  <el-row :gutter="24">
-    <el-col :md="20" :sm="22">
-      <ListTable v-bind="config" />
-    </el-col>
-  </el-row>
+  <TwoCol>
+    <ListTable v-bind="config" />
+  </TwoCol>
 </template>

 <script>
-import ListTable from '@/components/Table/ListTable/index.vue'
+import { DrawerListTable as ListTable } from '@/components'
 import { toM2MJsonParams } from '@/utils/jms'
+import { DetailFormatter } from '@/components/Table/TableFormatters'
+import TwoCol from '@/layout/components/Page/TwoColPage.vue'

 export default {
  name: 'AssetJsonTab',
  components: {
+    TwoCol,
    ListTable
  },
  props: {
    object: {
      type: Object,
-      default: () => {}
+      default: () => {
+      }
    }
  },
  data() {
@ -32,21 +34,18 @@ export default {
        },
        tableConfig: {
          url: `/api/v1/assets/assets/?${key}=${value}`,
-          columns: ['name', 'address', 'platform',
-            'type', 'is_active'
-          ],
+          columns: ['name', 'address', 'platform', 'type', 'is_active'],
+          columnsShow: {
+            min: ['name', 'address'],
+            default: ['name', 'address', 'platform']
+          },
          columnsMeta: {
            name: {
              label: this.$t('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>
+              formatter: DetailFormatter,
+              formatterArgs: {
+                getRoute: ({ row }) => {
+                  return { name: 'AssetDetail', params: { id: row.id }}
                }
              }
            },
@ -65,7 +64,3 @@ export default {
  }
 }
 </script>
-
-<style scoped>
-
-</style>
--- a/src/components/Apps/ManyJsonTabs/UserJsonTab.vue
+++ b/src/components/Apps/ManyJsonTabs/UserJsonTab.vue
@ -1,18 +1,19 @@
 <template>
-  <el-row :gutter="24">
-    <el-col :md="20" :sm="22">
-      <ListTable v-bind="config" />
-    </el-col>
-  </el-row>
+  <TwoCol>
+    <ListTable v-bind="config" />
+  </TwoCol>
 </template>

 <script>
-import ListTable from '@/components/Table/ListTable/index.vue'
+import { DrawerListTable as ListTable } from '@/components'
 import { toM2MJsonParams } from '@/utils/jms'
+import TwoCol from '@/layout/components/Page/TwoColPage.vue'
+import { DetailFormatter } from '@/components/Table/TableFormatters'

 export default {
  name: 'User',
  components: {
+    TwoCol,
    ListTable
  },
  props: {
@ -34,22 +35,23 @@ export default {
        tableConfig: {
          url: `/api/v1/users/users/?${key}=${value}`,
          columns: [
-            'name', 'username', 'groups', 'system_roles',
+            'name', 'username', 'email', 'groups', 'system_roles',
            'org_roles', 'source', 'is_valid'
          ],
+          columnsShow: {
+            min: ['name', 'username'],
+            default: ['name', 'username', 'email']
+          },
          columnsMeta: {
            name: {
              label: this.$t('Name'),
-              width: 85,
-              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>
+              formatter: DetailFormatter,
+              formatterArgs: {
+                getRoute: ({ row }) => {
+                  return {
+                    name: 'UserDetail',
+                    params: { id: row.id }
+                  }
                }
              }
            },
@ -87,7 +89,3 @@ export default {
  }
 }
 </script>
-
-<style scoped>
-
-</style>
--- a/src/components/Apps/ResourceActivity/index.vue
+++ b/src/components/Apps/ResourceActivity/index.vue
@ -1,43 +1,43 @@
 <template>
  <div>
-    <el-row :gutter="20">
-      <el-col :md="16" :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"
+    <TwoCol>
+      <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)"
            >
-              {{ activity.content }}
-              <el-link
-                v-if="activity['detail_url']"
-                type="primary"
-                @click.native="onClick(activity)"
-              >
-                {{ $tc('Detail') }}
-              </el-link>
-            </el-timeline-item>
-          </el-timeline>
-        </IBox>
-      </el-col>
-    </el-row>
+              {{ $tc('Detail') }}
+            </el-link>
+          </el-timeline-item>
+        </el-timeline>
+      </IBox>
+    </TwoCol>
    <DiffDetail ref="DetailDialog" :title="$tc('OperateLog')" />
  </div>
 </template>

 <script>
-import IBox from '@/components/IBox/index.vue'
+import IBox from '@/components/Common/IBox/index.vue'
 import DiffDetail from '@/components/Dialog/DiffDetail.vue'
 import { openTaskPage } from '@/utils/jms'
 import { toSafeLocalDateStr } from '@/utils/time'
+import TwoCol from '@/layout/components/Page/TwoColPage.vue'

 export default {
  name: 'ResourceActivity',
  components: {
+    TwoCol,
    IBox,
    DiffDetail
  },
--- a/src/components/Apps/UserConfirmDialog/index.vue
+++ b/src/components/Apps/UserConfirmDialog/index.vue
@ -67,13 +67,13 @@
            style="width: 100%; height: 800px;border: none;"
          />

-          <span v-if="subTypeSelected === 'sms'" style="margin: -1px 0 0 20px;">
+          <span v-if="subTypeSelected === 'sms' || subTypeSelected === 'email'" style="margin: -1px 0 0 20px;">
            <el-button
              :disabled="smsBtnDisabled"
              size="mini"
              style="line-height: 14px; float: right;"
              type="primary"
-              @click="sendSMSCode"
+              @click="sendCode"
            >
              {{ smsBtnText }}
            </el-button>
@ -98,7 +98,7 @@
            type="primary"
            @click="handleFaceCapture"
          >
-            开始人脸识别
+            {{ this.$tc('VerifyFace') }}
          </el-button>
        </el-col>
      </el-row>
@ -204,8 +204,8 @@ export default {
    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 => {
+    sendCode() {
+      this.$axios.post(`/api/v1/authentication/mfa/select/`, { type: this.subTypeSelected }).then(res => {
        this.$message.success(this.$tc('VerificationCodeSent'))
        let time = 60
        this.smsBtnDisabled = true
@ -225,7 +225,7 @@ export default {
      })
    },
    startFaceCapture() {
-      const url = '/api/v1/authentication/mfa/face/context/'
+      const url = '/api/v1/authentication/face/context/'
      this.$axios.post(url).then(data => {
        const token = data['token']
        this.faceCaptureUrl = '/facelive/capture?token=' + token
--- a/src/components/Apps/VariableCreateUpdateForm/index.vue
+++ b/src/components/Apps/VariableCreateUpdateForm/index.vue
@ -23,9 +23,17 @@ export default {
    }
  },
  data() {
+    const defaultValidator = (rule, value, callback) => {
+      if (this.defaultValueRequired && !value) {
+        callback(new Error(this.$t('FieldRequiredError')))
+      } else {
+        callback()
+      }
+    }
    return {
+      defaultValueRequired: false,
      submitBtnText: this.$t('Confirm'),
-      url: '/api/v1/ops/variable/',
+      url: '/api/v1/ops/variables/',
      form: Object.assign({ 'on_invalid': 'error' }, this.variable || {}),
      fields: [
        ['', ['name', 'var_name', 'type', 'text_default_value', 'select_default_value', 'extra_args', 'tips', 'required']]
@ -36,15 +44,19 @@ export default {
          hidden: (formValue) => {
            return formValue.type !== 'text'
          },
+          rules: [{ validator: defaultValidator }],
+          helpTip: this.$t('DefaultValueTip'),
          el: {
            type: 'input'
          }
        },
        select_default_value: {
          label: this.$t('DefaultValue'),
+          helpTip: this.$t('DefaultValueTip'),
          hidden: (formValue) => {
            return formValue.type !== 'select'
          },
+          rules: [{ validator: defaultValidator }],
          el: { type: 'input' }
        },
        extra_args: {
@ -70,12 +82,22 @@ export default {
              }
            }
          ]
+        },
+        required: {
+          on: {
+            change: ([event], updateForm) => {
+              this.defaultValueRequired = event
+            }
+          }
        }
      },
      hasSaveContinue: false,
      method: 'get'
    }
  },
+  mounted() {
+    this.defaultValueRequired = this.variable?.required || false
+  },
  methods: {
    confirm(form) {
      if (this.variable?.name) {
--- a/src/components/Apps/VariableSetForm/index.vue
+++ b/src/components/Apps/VariableSetForm/index.vue
@ -31,7 +31,7 @@ export default {
    return {
      submitBtnText: this.$t('Confirm'),
      // 防止缓存form remoteMeta
-      url: `/api/v1/ops/variable/form_data/?t=${new Date().getTime()}&` + this.queryParam,
+      url: `/api/v1/ops/variables/form-data/?t=${new Date().getTime()}&` + this.queryParam,
      form: {},
      hasSaveContinue: false,
      method: 'get',
--- a/src/components/Cards/DetailCard/ItemValue.vue
+++ b/src/components/Cards/DetailCard/ItemValue.vue
@ -78,7 +78,7 @@ export default {
        formatterData = data
      }
      return (
-        <span style={{ whiteSpace: 'pre-wrap', lineHeight: '1.2' }}>{formatterData}</span>
+        <span style={{ whiteSpace: 'pre-wrap', wordBreak: 'break-word', lineHeight: '1.2' }}>{formatterData}</span>
      )
    }
    if (this.value instanceof Array) {
--- a/src/components/Cards/DetailCard/auto.vue
+++ b/src/components/Cards/DetailCard/auto.vue
@ -1,7 +1,12 @@
 <template>
  <IBox v-if="loading" style="width: 100%; height: 200px" />
  <div v-else>
-    <DetailCard v-if="hasObject && items.length > 0" :items="validItems" :loading="loading" v-bind="$attrs" />
+    <DetailCard
+      v-if="hasObject && items.length > 0"
+      :items="validItems"
+      :loading="loading"
+      v-bind="$attrs"
+    />
  </div>
 </template>

@ -9,7 +14,7 @@
 import DetailCard from './index.vue'
 import { copy } from '@/utils/common'
 import { toSafeLocalDateStr } from '@/utils/time'
-import IBox from '@/components/IBox/index.vue'
+import IBox from '@/components/Common/IBox/index.vue'
 import LabelsDetailFormatter from '../Formatters/LabelsDetailFormatter.vue'

 export default {
@ -32,7 +37,7 @@ export default {
      type: Array,
      default: null
    },
-    showUndefine: {
+    showUndefined: {
      type: Boolean,
      default: true
    },
@ -168,7 +173,7 @@ export default {
      const data = await this.$store.dispatch('common/getUrlMeta', { url: this.url })
      let remoteMeta = data.actions['GET'] || {}
      if (this.nested) {
-        remoteMeta = remoteMeta[this.nested]?.children || {}
+        remoteMeta = remoteMeta[this.nested]?.children || remoteMeta || {}
      }
      let fields = this.fields
      fields = fields || Object.keys(remoteMeta)
@ -220,7 +225,7 @@ export default {
        value = this.parseValue(value, fieldMeta.type)

        if (value === undefined) {
-          if (this.showUndefine) {
+          if (this.showUndefined) {
            value = '-'
          } else {
            continue
--- a/src/components/Cards/DetailCard/index.vue
+++ b/src/components/Cards/DetailCard/index.vue
@ -1,24 +1,25 @@
 <template>
  <IBox :fa="fa" :title="title">
-    <el-form :label-width="labelWidth" class="content" label-position="left">
-      <span v-for="item in items" :key="item.key">
-        <el-form-item v-if="item.has !== false" :class="item.class" :label="item.key">
-          <span slot="label"> {{ formateLabel(item.key) }}</span>
-          <span
-            :is="item.component"
-            v-if="item.component"
-            v-bind="{...item}"
-          />
-          <ItemValue v-else :value="item.value" class="item-value" v-bind="item" />
-        </el-form-item>
-      </span>
+    <el-form :label-width="labelWidth" class="content detail-card" label-position="left">
+      <template v-for="item in items">
+        <div v-if="item.has !== false" :key="item.key" :class="item.class " :label="item.key" class="el-form-item">
+          <span slot="label" class="el-form-item__label"> {{ formateLabel(item.key) }}</span>
+          <span class="item-value el-form-item__content">
+            <template
+              :is="item.component"
+              v-if="item.component"
+              v-bind="{...item}"
+            />
+            <ItemValue v-else :value="item.value" v-bind="item" />
+          </span>
+        </div>
+      </template>
    </el-form>
-    <slot />
  </IBox>
 </template>

 <script>
-import IBox from '../../IBox/index.vue'
+import IBox from '@/components/Common/IBox/index.vue'
 import ItemValue from './ItemValue.vue'

 export default {
@ -45,7 +46,7 @@ export default {
    },
    labelWidth: {
      type: String,
-      default: '25%'
+      default: '120px'
    }
  },
  data() {
@ -71,55 +72,76 @@ export default {
  padding: 20px 40px;
 }

-.el-form-item {
-  border-bottom: 1px dashed #EBEEF5;
-  padding: 1px 0;
-  margin-bottom: 0;
-
-  &:last-child {
-    border-bottom: none;
-  }
-
-  &.array-item {
-    border-bottom: none;
-
-    ::v-deep .el-form-item__content {
-      border-bottom: 1px dashed #EBEEF5
-    }
-
-    ::v-deep .el-form-item__label:last-child {
-      border: 1px dashed #EBEEF5;
-    }
-  }
-
-  ::v-deep .el-form-item__label {
-    padding-right: 8%;
-    overflow: hidden;
-    color: var(--color-icon-primary);
-
-    span {
-      display: inline-block;
-      line-height: 1.5;
-    }
-  }
-
-  ::v-deep .el-form-item__content {
-    color: var(--color-text-primary);
-    font-size: 13px;
-    line-height: 40px;
-  }
-
-  ::v-deep .el-tag--mini {
-    margin-right: 3px;
-  }
-}
-
-.item-value span {
-  word-break: break-word;
-}
-
 .content {
  font-size: 13px;
-  line-height: 2.5;
+  line-height: 2;
+
+  ::v-deep .el-form-item {
+    border-bottom: 1px dashed #F4F4F4;
+    padding: 1px 0;
+    margin-bottom: 0;
+    display: flex;
+    align-items: center;
+    //text-align: end;
+    line-height: 32px;
+    min-height: 32px;
+
+    &:last-child {
+      //border-bottom: none;
+    }
+
+    &.array-item {
+      border-bottom: none;
+
+      ::v-deep .el-form-item__content {
+        border-bottom: 1px dashed #EBEEF5
+      }
+
+      ::v-deep .el-form-item__label:last-child {
+        border: 1px dashed #EBEEF5;
+      }
+    }
+
+    .el-form-item__label {
+      //padding-right: 8%;
+      overflow: hidden;
+      color: var(--color-icon-primary);
+      font-size: 12px;
+      line-height: 1.5;
+      font-weight: 400;
+      width: 33%;
+      min-width: 120px;
+      padding: 5px 0;
+
+      span {
+        display: inline-block;
+        //line-height: 1.1;
+      }
+    }
+
+    .el-form-item__content {
+      color: var(--color-text-primary);
+      font-size: 13px;
+      line-height: 1.5;
+      width: calc(100% - 120px);
+      padding: 5px 0;
+    }
+
+    ::v-deep .el-tag--mini {
+      margin-right: 3px;
+    }
+  }
+
+  .item-value {
+    ::v-deep span {
+      //display: -webkit-box;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      word-break: break-word;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+      vertical-align: middle;
+    }
+  }
 }
 </style>
--- a/src/components/Cards/RelationCard/index.vue
+++ b/src/components/Cards/RelationCard/index.vue
@ -49,7 +49,7 @@
 <script>
 import { createSourceIdCache } from '@/api/common'
 import { Select2 } from '@/components/Form/FormFields'
-import IBox from '@/components/IBox/index.vue'
+import IBox from '@/components/Common/IBox/index.vue'
 import { mapGetters } from 'vuex'

 export default {
@ -340,13 +340,13 @@ b, strong {
 }

 tr td {
-  line-height: 1.42857;
-  padding: 8px;
+  line-height: 1.4;
+  padding: 8px 0;
  vertical-align: top;
 }

 tr.item td {
-  border-top: 1px solid #e7eaec;
+  border-top: 1px dashed #EBEEF5;
 }

 .box-margin {
--- a/src/components/Cards/SummaryCard/index.vue
+++ b/src/components/Cards/SummaryCard/index.vue
@ -1,18 +1,23 @@
 <template>
-  <el-card shadow="never">
-    <div slot="header" class="summary-header">
-      <span class="header-title">{{ title }}</span>
+  <div>
+    <div class="summary-header">
+      <el-tooltip :content="title" :open-delay="500" placement="top">
+        <span class="title">{{ title }}</span>
+      </el-tooltip>
    </div>
    <slot>
-      <h1 class="no-margins">
-        <span v-if="body.disabled" class="disabled-link">{{ body.count }}</span>
-        <router-link v-else :to="body.route">
-          <span>{{ body.count }}</span>
-        </router-link>
-      </h1>
-      <small>{{ body.comment }}</small>
+      <h3 class="no-margins ">
+        <span
+          :class="{ 'can-direct': canDirect }"
+          class="num"
+          @click="handleClick"
+        >
+          <span v-if="count === null"> - </span>
+          <span v-else>{{ count }}</span>
+        </span>
+      </h3>
    </slot>
-  </el-card>
+  </div>
 </template>

 <script>
@ -23,56 +28,78 @@ export default {
      type: String,
      default: ''
    },
-    rightSideLabel: {
-      type: Object,
-      default: () => ({})
+    count: {
+      type: [Number, String, Promise],
+      default: null
    },
-    body: {
-      type: Object,
-      default: () => ({})
+    route: {
+      type: [String, Object],
+      default: ''
+    },
+    canDirect: {
+      type: Boolean,
+      default: false
+    },
+    callback: {
+      type: Function,
+      default: () => {
+      }
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {}
+  },
+  methods: {
+    handleClick() {
+      if (this.disabled) {
+        return
+      }
+      if (this.route) {
+        this.$router.push(this.route)
+        return
+      }
+      this.callback.bind(this)()
+      this.$emit('click')
    }
  }
 }
 </script>

 <style lang="scss" scoped>
-  .pull-right {
-    float: right !important;
-  }
+.summary-header {
+  //color: var(--color-icon-primary);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: pointer;

-  .header-title {
-    font-size: 14px;
-    margin: 0 0 7px;
+  .title {
+    font-style: normal;
    font-weight: 600;
+    font-size: 12px;
+    text-transform: uppercase;
+    line-height: 1.2;
  }
+}

-  .right-side ::v-deep .el-tag {
-    font-weight: 600;
-    padding: 3px 8px;
-    text-shadow: none;
-    line-height: 1;
-  }
+.no-margins {
+  margin: 0 !important;

-  h1 {
-    font-size: 30px;
-    font-weight: 100;
-  }
+  .num {
+    font-style: normal;
+    font-weight: 500;
+    font-size: 24px;
+    line-height: 40px;
+    color: var(--color-text-primary);
+    cursor: pointer;

-  .el-card__body {
-    background-color: #ffffff;
-    color: inherit;
-    padding: 15px 20px 20px 20px !important;
-    border-color: #e7eaec;
-    border-image: none;
-    border-style: solid solid none;
-    border-width: 1px 0;
-  }
-
-  .no-margins {
-    margin: 0 !important;
-  }
-
-  .disabled-link {
-    color: #428bca;
+    &.can-direct:hover {
+      color: var(--color-primary);
+    }
  }
+}
 </style>
--- a/src/components/Common/ActionsGroup/index.vue
+++ b/src/components/Common/ActionsGroup/index.vue
@ -3,7 +3,7 @@
 </template>

 <script>
-import DataActions from '@/components/DataActions'
+import DataActions from '@/components/Common/DataActions/index.vue'

 export default {
  name: 'ActionsGroup',
--- a/src/components/Common/DataActions/index.vue
+++ b/src/components/Common/DataActions/index.vue
@ -5,15 +5,28 @@
        v-if="action.dropdown"
        v-show="action.dropdown.length > 0"
        :key="action.name"
+        :class="[action.name, {grouped: action.grouped }]"
+        :size="action.size"
+        :split-button="!!action.split"
+        :type="action.type"
        class="action-item"
        placement="bottom-start"
        trigger="click"
+        @click="handleClick(action)"
        @command="handleDropdownCallback"
      >
-        <el-button :size="size" class="more-action" v-bind="cleanButtonAction(action)">
-          <span v-if="action.icon && !action.icon.startsWith('el-')" class="pre-icon">
-            <i v-if="action.icon.startsWith('fa')" :class="'fa fa-fw ' + action.icon" />
-            <svg-icon v-else :icon-class="action.icon" />
+        <span v-if="action.split">
+          {{ action.title }}
+        </span>
+        <el-button
+          v-else
+          :class="action.name"
+          :size="size"
+          class="more-action"
+          v-bind="{...cleanButtonAction(action), icon: ''}"
+        >
+          <span class="pre-icon">
+            <Icon v-if="action.icon" :icon="action.icon" />
          </span>
          <span v-if="action.title">
            {{ action.title }}<i class="el-icon-arrow-down el-icon--right" />
@ -29,7 +42,13 @@
            >
              {{ option.group }}
            </div>
-            <el-tooltip :key="option.name" :content="option.tip" :disabled="!option.tip" :open-delay="500" placement="top">
+            <el-tooltip
+              :key="option.name"
+              :content="option.tip"
+              :disabled="!option.tip"
+              :open-delay="500"
+              placement="top"
+            >
              <el-dropdown-item
                :key="option.name"
                :command="[option, action]"
@ -37,9 +56,8 @@
                class="dropdown-item"
                v-bind="{...option, icon: ''}"
              >
-                <span v-if="option.icon" class="pre-icon">
-                  <i v-if="option.icon.startsWith('fa')" :class="'fa fa-fw ' + option.icon" />
-                  <svg-icon v-else :icon-class="option.icon" />
+                <span v-if="actionsHasIcon(action.dropdown)" class="pre-icon">
+                  <Icon v-if="option.icon" :icon="option.icon" />
                </span>
                {{ option.title }}
              </el-dropdown-item>
@ -51,16 +69,16 @@
      <el-button
        v-else
        :key="action.name"
+        :class="[action.name, {grouped: action.grouped }]"
        :size="size"
        class="action-item"
-        v-bind="{...cleanButtonAction(action), icon: action.icon && action.icon.startsWith('el-') ? action.icon : ''}"
+        v-bind="{...cleanButtonAction(action), icon: ''}"
        @click="handleClick(action)"
      >
-        <el-tooltip :content="action.tip" :disabled="!action.tip" :open-delay="500" placement="top">
+        <el-tooltip :content="action.tip" :disabled="!action.tip" placement="top">
          <span>
-            <span v-if="action.icon && !action.icon.startsWith('el-')" style="vertical-align: initial">
-              <i v-if="action.icon.startsWith('fa')" :class="'fa ' + action.icon" />
-              <svg-icon v-else :icon-class="action.icon" />
+            <span v-if="action.icon" style="vertical-align: initial">
+              <Icon :icon="action.icon" />
            </span>
            {{ action.title }}
          </span>
@ -72,9 +90,13 @@

 <script>
 import { toSentenceCase } from '@/utils/common'
+import Icon from '@/components/Widgets/Icon/index.vue'

 export default {
  name: 'DataActions',
+  components: {
+    Icon
+  },
  props: {
    grouped: {
      type: Boolean,
@ -99,6 +121,9 @@ export default {
    }
  },
  methods: {
+    actionsHasIcon(actions) {
+      return actions.some(action => action.icon)
+    },
    hasIcon(action, type = '') {
      const icon = action.icon
      if (!icon) {
@ -156,6 +181,7 @@ export default {
      delete action['callback']
      delete action['name']
      delete action['can']
+      delete action['split']
      return action
    },
    cleanActions(actions) {
@ -185,6 +211,10 @@ export default {
        }
        delete action['can']

+        if (!action.size) {
+          action.size = 'small'
+        }
+
        if (action.dropdown) {
          action.dropdown = this.cleanActions(action.dropdown)
        }
@ -209,6 +239,10 @@ $color-drop-menu-border: #e4e7ed;
  .action-item {
    margin-left: 5px;

+    &.grouped {
+      margin-left: 0;
+    }
+
    &:first-child {
      margin-left: 0;
    }
@ -249,10 +283,15 @@ $color-drop-menu-border: #e4e7ed;
  align-items: flex-end;

  .el-button {
-    display: flex;
-    align-items: center;
-    padding: 2px 6px;
-    color: $btn-text-color;
+    padding: 2px 5px;
+
+    &:not(.is-plain) {
+      color: $btn-text-color;
+    }
+
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;

    * {
      vertical-align: baseline !important;
@ -280,7 +319,6 @@ $color-drop-menu-border: #e4e7ed;
 // 下拉 options
 .el-dropdown-menu {
  ::v-deep .more-batch-processing {
-    text-align: center;

    &:hover {
      background-color: transparent !important;
@ -303,6 +341,7 @@ $color-drop-menu-border: #e4e7ed;

  .dropdown-item {
    color: var(--color-text-primary);
+    line-height: 34px;

    .pre-icon {
      width: 17px;
@ -324,6 +363,8 @@ $color-drop-menu-border: #e4e7ed;
  }

  .el-dropdown-menu__item {
+    padding: 0 20px;
+
    &.is-disabled {
      color: var(--color-disabled);
      cursor: not-allowed;
--- a/src/components/Common/IBox/HeadingIBox.vue
+++ b/src/components/Common/IBox/HeadingIBox.vue
@ -2,7 +2,8 @@
  <IBox v-bind="$attrs">
    <div v-if="contentHeading" class="ibox-heading">
      <slot name="content-heading">
-        <h3 v-if="contentHeading.title"><i v-if="contentHeading.fa" :class="'fa ' + contentHeading.fa" /> {{ contentHeading.title }}</h3>
+        <h3 v-if="contentHeading.title"><i v-if="contentHeading.fa" :class="'fa ' + contentHeading.fa" /> {{
+          contentHeading.title }}</h3>
        <small v-if="contentHeading.content"><i class="fa fa-tim" /> {{ contentHeading.content }}</small>
      </slot>
    </div>
@ -11,7 +12,8 @@
 </template>

 <script>
-import IBox from './index'
+import IBox from './index.vue'
+
 export default {
  name: 'HeadingIBox',
  components: { IBox },
@ -25,20 +27,22 @@ export default {
 </script>

 <style scoped>
-  .ibox-heading {
-    background-color: #f3f6fb;
-    border-bottom: none;
-    margin: -15px -20px 20px -20px;
-    padding: 20px
-  }
-  .ibox-heading h3 {
-    font-weight: 200;
-    font-size: 24px;
-    margin-top: 5px;
-    margin-bottom: 10px;
-    line-height: 1.1;
-  }
-  .ibox .el-card__body {
-   background-color: #f3f6fb;
-  }
+.ibox-heading {
+  background-color: #f3f6fb;
+  border-bottom: none;
+  margin: -15px -20px 20px -20px;
+  padding: 20px
+}
+
+.ibox-heading h3 {
+  font-weight: 200;
+  font-size: 24px;
+  margin-top: 5px;
+  margin-bottom: 10px;
+  line-height: 1.1;
+}
+
+.ibox .el-card__body {
+  background-color: #f3f6fb;
+}
 </style>
--- a/src/components/Common/IBox/index.vue
+++ b/src/components/Common/IBox/index.vue
@ -1,5 +1,5 @@
 <template>
-  <el-card :class="'ibox ' + type" shadow="never" v-bind="$attrs">
+  <el-card :class="'ibox ' + type" :shadow="shadow" v-bind="$attrs">
    <template #header>
      <slot name="header">
        <div v-if="title" slot="header" class="clearfix ibox-title">
@ -26,6 +26,10 @@ export default {
    type: {
      type: String,
      default: 'default'
+    },
+    shadow: {
+      type: String,
+      default: 'never'
    }
  },
  computed: {
--- a/src/components/Common/QuickActions/action.vue
+++ b/src/components/Common/QuickActions/action.vue
@ -25,9 +25,9 @@
 </template>

 <script>
-import Switcher from '@/components/Form/FormFields/Switcher'
-import Select2 from '@/components/Form/FormFields/Select2'
-import UpdateSelect from '@/components/Form/FormFields/UpdateSelect'
+import Switcher from '@/components/Form/FormFields/Switcher.vue'
+import Select2 from '@/components/Form/FormFields/Select2.vue'
+import UpdateSelect from '@/components/Form/FormFields/UpdateSelect.vue'
 import { toSentenceCase } from '@/utils/common'

 class Action {
--- a/src/components/Common/QuickActions/index.vue
+++ b/src/components/Common/QuickActions/index.vue
@ -9,8 +9,8 @@
 </template>

 <script>
-import IBox from '@/components/IBox'
-import ActionItem from './action'
+import IBox from '@/components/Common/IBox/index.vue'
+import ActionItem from './action.vue'

 // 查看 views/users/users/UserDetail/UserInfo.vue 使用样例
 export default {
@ -39,32 +39,32 @@ export default {
 </script>

 <style scoped>
-  .quick-actions ::v-deep table {
-    width: 100%;
-  }
+.quick-actions ::v-deep table {
+  width: 100%;
+}

-  .quick-actions ::v-deep tr > td {
-    line-height: 1.43;
-    padding: 8px;
-    vertical-align: top;
-    font-size: 13px;
-    width: 50%;
-  }
+.quick-actions ::v-deep tr > td {
+  line-height: 1.43;
+  padding: 8px 0;
+  vertical-align: top;
+  font-size: 13px;
+  width: 50%;
+}

-  .quick-actions ::v-deep tr > td > span:last-child {
-    float: right;
-  }
+.quick-actions ::v-deep tr > td > span:last-child {
+  float: right;
+}

-  .quick-actions ::v-deep button {
-    padding: 4px 5px;
-    font-size: 13px;
-    width: 65px;
+.quick-actions ::v-deep button {
+  padding: 4px 5px;
+  font-size: 13px;
+  min-width: 65px;

-    span {
-      overflow: hidden;
-      white-space: nowrap; /* 控制文本不换行 */
-      text-overflow: ellipsis;
-      display: block;
-    }
+  span {
+    overflow: hidden;
+    white-space: nowrap; /* 控制文本不换行 */
+    text-overflow: ellipsis;
+    display: block;
  }
+}
 </style>
--- a/src/views/dashboard/components/ColumnChart.vue
+++ b/src/views/dashboard/components/ColumnChart.vue
--- a/src/views/dashboard/components/DataCard.vue
+++ b/src/views/dashboard/components/DataCard.vue
--- a/src/views/dashboard/components/LineChart.vue
+++ b/src/views/dashboard/components/LineChart.vue
--- a/src/views/dashboard/components/ProgressChart.vue
+++ b/src/views/dashboard/components/ProgressChart.vue
--- a/src/views/dashboard/components/RankTable.vue
+++ b/src/views/dashboard/components/RankTable.vue
@ -9,18 +9,29 @@
      class="table"
      style="width: 100%"
    >
-      <el-table-column :label="$tc('Ranking')" width="80px">
-        <template v-slot="scope">
-          <span>{{ scope.$index + 1 }}</span>
+      <el-table-column :label="$tc('Ranking')">
+        <template #header>
+          <el-tooltip :content="$t('Ranking')" placement="top" :open-delay="500">
+            <span style="cursor: pointer;">{{ $t('Ranking') }}</span>
+          </el-tooltip>
+        </template>
+        <template #default="scope">
+          {{ scope.$index + 1 }}
        </template>
      </el-table-column>
+
      <el-table-column
        v-for="i in config.columns"
        :key="i.prop"
-        :label="i.label"
        :prop="i.prop"
-        :width="i.width"
-      />
+        :width="getColumnWidth(i)"
+      >
+        <template #header>
+          <el-tooltip :content="i.label" placement="top" :open-delay="500">
+            <span style="cursor: pointer;">{{ i.label }}</span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
    </el-table>
  </div>
 </template>
@ -56,6 +67,19 @@ export default {
    this.getList()
  },
  methods: {
+    getColumnWidth(column) {
+      if (column.prop === 'total') {
+        const locale = this.$i18n.locale
+        switch (locale) {
+          case 'en':
+            return '120px'
+          case 'pt-br':
+            return '220px'
+          default:
+            return '100px'
+        }
+      }
+    },
    getList() {
      this.$axios.get(this.tableUrl).then(res => {
        this.tableData = this.config.data ? res?.[this.config.data] : res
--- a/src/views/dashboard/components/RealTimeSummary.vue
+++ b/src/views/dashboard/components/RealTimeSummary.vue
@ -6,7 +6,7 @@
    <div class="content">
      <el-row justify="space-between" type="flex">
        <el-col v-for="item of summaryItems" :key="item.title" :md="8" :sm="12" :xs="12">
-          <SummaryCard :body="item.body" :title="item.title" />
+          <SummaryCard :title="item.title" v-bind="item.body" />
        </el-col>
      </el-row>
    </div>
@ -15,7 +15,7 @@

 <script>
 import Title from './Title.vue'
-import SummaryCard from './SummaryCard'
+import SummaryCard from '@/components/Cards/SummaryCard'

 export default {
  components: { Title, SummaryCard },
@ -85,15 +85,18 @@ export default {
 .box {
  padding: 20px;
  background: #FFFFFF;
+
  .content {
    .el-col {
      padding-left: 16px;
      border-left: 1px solid #EFF0F1;
+
      &:first-child {
        padding-left: 0;
        border-left: none;
      }
    }
+
    .sub {
      font-style: normal;
      font-weight: 400;
@ -101,6 +104,7 @@ export default {
      line-height: 20px;
      color: #646A73;
    }
+
    .num {
      font-style: normal;
      font-weight: 500;
--- a/src/views/dashboard/components/RingChart.vue
+++ b/src/views/dashboard/components/RingChart.vue
@ -23,24 +23,42 @@ export default {
  },
  computed: {
    options() {
-      const { total = 0, active = 0, title, color } = this.config
+      const { total = 0, active = 0, title, color, colors } = this.config
      const activeDecimal = new Decimal(active)
      const totalDecimal = new Decimal(total)

      let percentage = activeDecimal.dividedBy(totalDecimal).times(100)
      percentage = isNaN(percentage) ? 0 : percentage
      percentage = percentage.toFixed(2)
+
+      const formatTitle = (text) => {
+        if (!text) return ''
+        const maxLength = 23
+        const lines = []
+        for (let i = 0; i < text.length; i += maxLength) {
+          lines.push(text.slice(i, i + maxLength))
+        }
+        return lines.join('\n')
+      }
+
      return {
        title: [
          {
-            text: this.config.chartTitle,
+            text: formatTitle(this.config.chartTitle),
            textStyle: {
              color: '#646A73',
-              fontSize: 12
+              fontSize: 12,
+              lineHeight: 16,
+              rich: {
+                width: 100,
+                overflow: 'break'
+              }
            },
            textAlign: 'center',
            left: '48%',
-            top: '32%'
+            top: '32%',
+            width: 100,
+            overflow: 'break'
          },
          {
            left: '48%',
@ -61,7 +79,7 @@ export default {
        legend: {
          show: false
        },
-        color: [color, 'rgba(43, 147, 124, 0.05)'],
+        color: colors || [color, 'rgba(43, 147, 124, 0.05)'],
        tooltip: {
          trigger: 'item',
          formatter: '{a} <br/>{b}: {d}%'
--- a/src/views/dashboard/components/SummaryCountCard.vue
+++ b/src/views/dashboard/components/SummaryCountCard.vue
@ -4,18 +4,20 @@
      <Title :config="config" />
    </div>
    <div class="content">
-      <el-row type="flex" justify="space-between">
-        <el-col v-for="item of items" :key="item.title" :md="8" :sm="12" :xs="12">
-          <SummaryCard :title="item.title" :body="item.body" />
-        </el-col>
-      </el-row>
+      <SummaryCard
+        v-for="item of items"
+        :key="item.title"
+        :title="item.title"
+        class="summary-card"
+        v-bind="item.body"
+      />
    </div>
  </div>
 </template>

 <script>
-import Title from '../components/Title.vue'
-import SummaryCard from '../components/SummaryCard'
+import Title from './Title.vue'
+import SummaryCard from '@/components/Cards/SummaryCard'

 export default {
  components: { Title, SummaryCard },
@ -35,8 +37,7 @@ export default {
    }
  },
  data() {
-    return {
-    }
+    return {}
  }
 }
 </script>
@ -45,28 +46,21 @@ export default {
 .box {
  padding: 20px;
  background: #FFFFFF;
+
  .content {
-    .el-col {
+    display: flex;
+    justify-content: space-between;
+    padding: 0 10px;
+
+    .summary-card {
      padding-left: 16px;
      border-left: 1px solid #EFF0F1;
+
      &:first-child {
        padding-left: 0;
        border-left: none;
      }
    }
-    .sub {
-      font-style: normal;
-      font-weight: 400;
-      font-size: 12px;
-      line-height: 20px;
-      color: #646A73;
-    }
-    .num {
-      font-style: normal;
-      font-weight: 500;
-      font-size: 24px;
-      cursor: pointer;
-    }
  }
 }
 </style>
--- a/src/views/dashboard/components/SwitchDate.vue
+++ b/src/views/dashboard/components/SwitchDate.vue
--- a/src/views/dashboard/components/Title.vue
+++ b/src/views/dashboard/components/Title.vue
--- a/src/components/Dialog/DiffDetail.vue
+++ b/src/components/Dialog/DiffDetail.vue
@ -1,6 +1,7 @@
 <template>
  <Dialog
    v-if="detailVisible"
+    :modal="false"
    :show-cancel="false"
    :show-confirm="false"
    :title="title"
--- a/src/components/Dialog/ProcessingDialog.vue
+++ b/src/components/Dialog/ProcessingDialog.vue
@ -0,0 +1,71 @@
+<template>
+  <Dialog
+    :show-cancel="false"
+    :visible="iVisible"
+    class="processing-dialog"
+    height="300"
+    :title="$tc('Processing')"
+    width="300"
+    @confirm="iVisible=false"
+  >
+    <div id="load">
+      <div class="spinner" />
+    </div>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from './index.vue'
+
+export default {
+  name: 'ProcessingDialog',
+  components: { Dialog },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {}
+  },
+  computed: {
+    iVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:visible', val)
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.processing-dialog {
+  ::v-deep .el-dialog__body {
+    overflow: hidden;
+  }
+}
+
+.spinner {
+  width: 100px;
+  height: 100px;
+  border: 5px solid rgba(0, 0, 0, 0.1);
+  border-radius: 50%;
+  border-top-color: var(--color-primary);
+  animation: spin 1s infinite linear;
+}
+
+#load {
+  display: flex;
+  justify-content: center;
+}
+
+@keyframes spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+</style>
--- a/src/components/Dialog/RemoteProcessingDialog.vue
+++ b/src/components/Dialog/RemoteProcessingDialog.vue
@ -0,0 +1,69 @@
+<template>
+  <Dialog
+    :visible="iVisible"
+    height="300"
+    title="Processing"
+    width="300"
+    class="processing-dialog"
+  >
+    <div id="load">
+      <div class="spinner" />
+    </div>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from './index.vue'
+
+export default {
+  name: 'RemoteProcessingDialog',
+  components: { Dialog },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {}
+  },
+  computed: {
+    iVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:visible', val)
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.processing-dialog {
+  ::v-deep .el-dialog__body {
+    overflow: hidden;
+  }
+}
+
+.spinner {
+    width: 100px;
+    height: 100px;
+    border: 5px solid rgba(0, 0, 0, 0.1);
+    border-radius: 50%;
+    border-top-color: var(--color-primary);
+    animation: spin 1s infinite linear;
+}
+
+#load {
+  display: flex;
+  justify-content: center;
+}
+
+@keyframes spin {
+    to {
+        transform: rotate(360deg);
+    }
+}
+</style>
--- a/src/components/Dialog/ReportDialog.vue
+++ b/src/components/Dialog/ReportDialog.vue
@ -0,0 +1,75 @@
+<template>
+  <div>
+    <Dialog
+      v-if="iVisible"
+      :destroy-on-close="true"
+      :show-cancel="false"
+      :show-confirm="false"
+      :title="$tc('Report')"
+      :visible.sync="iVisible"
+      top="35vh"
+      width="80%"
+      @close="loading=true"
+    >
+      <span v-if="loading" v-loading="loading" class="loading" />
+      <iframe title="dialog" :src="url" style="border: none;" @load="onIframeLoad" />
+    </Dialog>
+  </div>
+</template>
+
+<script>
+import Dialog from '@/components/Dialog/index.vue'
+
+export default {
+  name: 'ReportDialog',
+  components: {
+    Dialog
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    url: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      loading: true
+    }
+  },
+  computed: {
+    iVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:visible', val)
+      }
+    }
+  },
+  mounted() {
+  },
+  beforeMount() {
+  },
+  methods: {
+    onIframeLoad() {
+      this.loading = false
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+iframe {
+  width: 100%;
+  height: 500px;
+}
+
+.loading {
+  margin-top: 20px;
+  display: block;
+}
+</style>
--- a/src/components/Dialog/Secret.vue
+++ b/src/components/Dialog/Secret.vue
@ -0,0 +1,96 @@
+<template>
+  <Dialog
+    :show-cancel="false"
+    :title="title"
+    :visible.sync="visible"
+    :close-on-click-modal="false"
+    width="700px"
+    @close="onClose"
+    @confirm="visible = false"
+  >
+    <el-alert type="warning" :closable="false">
+      {{ warningText }}
+      <div class="secret">
+        <div class="row">
+          <span class="col">ID:</span>
+          <span class="value">{{ keyInfo.id }}</span>
+          <i class="el-icon-copy-document copy-icon" @click="handleCopy(keyInfo.id)" />
+        </div>
+        <div class="row">
+          <span class="col">Secret:</span>
+          <span class="value">{{ keyInfo.secret }}</span>
+          <i class="el-icon-copy-document copy-icon" @click="handleCopy(keyInfo.secret)" />
+        </div>
+      </div>
+    </el-alert>
+  </Dialog>
+</template>
+
+<script>
+import i18n from '@/i18n/i18n'
+import { copy } from '@/utils/common'
+import Dialog from '@/components/Dialog/index'
+
+export default {
+  name: 'Secret',
+  components: {
+    Dialog
+  },
+  props: {
+    title: {
+      type: String,
+      default: () => i18n.t('CreateAccessKey')
+    },
+    warningText: {
+      type: String,
+      default: () => i18n.t('ApiKeyWarning')
+    }
+  },
+  data() {
+    return {
+      keyInfo: { id: '', secret: '' },
+      visible: false
+    }
+  },
+  methods: {
+    show(data) {
+      this.keyInfo = data
+      this.visible = true
+    },
+    onClose() {
+      this.$emit('close')
+    },
+    handleCopy(value) {
+      copy(value)
+    }
+  }
+}
+
+</script>
+
+<style lang='scss' scoped>
+ .secret {
+  color: #2b2f3a;
+  margin-top: 20px;
+}
+
+.row {
+  margin-bottom: 10px;
+}
+
+.col {
+  width: 100px;
+  text-align: left;
+  display: inline-block;
+}
+
+.copy-icon {
+  margin-left: 5px;
+  cursor: pointer;
+  transition: color 0.2s;
+}
+
+.value {
+  font-weight: 600;
+}
+</style>
--- a/src/components/Dialog/index.vue
+++ b/src/components/Dialog/index.vue
@ -2,6 +2,7 @@
  <transition name="dialog-fade">
    <el-dialog
      :append-to-body="true"
+      :class="{ shadow: shadow }"
      :modal-append-to-body="true"
      :title="title"
      :top="top"
@ -46,7 +47,7 @@ export default {
    },
    width: {
      type: String,
-      default: '60%'
+      default: '800px'
    },
    showConfirm: {
      type: Boolean,
@ -79,11 +80,14 @@ export default {
    maxWidth: {
      type: String,
      default: '1200px'
+    },
+    shadow: {
+      type: Boolean,
+      default: true
    }
  },
  data() {
-    return {
-    }
+    return {}
  },
  computed: {
    iWidth() {
@ -102,59 +106,69 @@ export default {
 </script>

 <style lang="scss" scoped>
-  .dialog ::v-deep .el-dialog {
-    border-radius: 0.3em;
-    max-width: min(100vw, 1500px);
+.dialog.shadow ::v-deep .el-dialog {
+  box-shadow: 1px 2px 12px 0 rgba(0, 0, 0, 0.6);
+}

+.dialog ::v-deep .el-dialog {
+  border-radius: 0.3em;
+  max-width: min(100vw, 1500px);
+
+  .form-group-header {
+    margin-left: 20px;
+  }
+
+  .el-form--label-top {
    .form-group-header {
-      margin-left: 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;
-      font-size: 13px;
-
-      &:has(.el-table) {
-        background: #f3f3f4;
-      }
-    }
-
-    &__footer {
-      border-top: 1px solid #dee2e6;
-      padding: 16px 25px;
-      justify-content: flex-end;
+      margin-left: 0;
    }
  }

-  @media (max-width: 900px) {
-    .dialog ::v-deep .el-dialog {
-      max-width: calc(100% - 30px);
-    }
+  .el-icon-circle-check {
+    display: none;
  }

-  .dialog-footer ::v-deep button.el-button {
+  &__header {
+    box-sizing: border-box;
+    padding: 15px 22px;
+    border-bottom: 1px solid #dee2e6;
+    font-weight: 400;
+  }
+
+  &__body {
+    padding: 20px 30px;
    font-size: 13px;
-    padding: 8px 12px;
+
+    &:has(.el-table) {
+      background: #f3f3f4;
+    }
  }

-  .dialog-fade-enter-active, .dialog-fade-leave-active {
-    transition: opacity 1s ease;
+  &__footer {
+    border-top: 1px solid #dee2e6;
+    padding: 16px 25px;
+    justify-content: flex-end;
  }
+}

-  .dialog-fade-enter, .dialog-fade-leave-to /* .dialog-fade-leave-active 在 <2.1.8 中以及被重复声明 */
-  {
-    opacity: 0;
+@media (max-width: 900px) {
+  .dialog ::v-deep .el-dialog {
+    max-width: calc(100% - 30px);
  }
+}
+
+.dialog-footer ::v-deep button.el-button {
+  font-size: 13px;
+  padding: 8px 12px;
+}
+
+.dialog-fade-enter-active, .dialog-fade-leave-active {
+  transition: opacity 1s ease;
+}
+
+.dialog-fade-enter, .dialog-fade-leave-to /* .dialog-fade-leave-active 在 <2.1.8 中以及被重复声明 */
+{
+  opacity: 0;
+}

 </style>
--- a/src/components/Drawer/index.vue
+++ b/src/components/Drawer/index.vue
@ -0,0 +1,305 @@
+<template>
+  <el-drawer
+    ref="drawer"
+    v-el-drawer-drag-width
+    :append-to-body="true"
+    :before-close="handleClose"
+    :class="['drawer', { 'drawer__no-footer': !hasFooter }]"
+    :modal="modal"
+    :size="size"
+    :title="title"
+    :visible.sync="iVisible"
+    custom-class="drawer"
+    destroy-on-close
+    direction="rtl"
+    v-on="$listeners"
+  >
+    <div class="drawer__content">
+      <slot name="default">
+        <component
+          :is="component"
+          v-if="component"
+          ref="dynamicComponent"
+          v-bind="componentProps"
+          v-on="componentListeners"
+        />
+      </slot>
+    </div>
+    <div v-if="hasFooter" ref="drawerFooter" class="drawer__footer" />
+  </el-drawer>
+</template>
+
+<script>
+import { getDrawerWidth } from '@/utils/common'
+
+export default {
+  props: {
+    title: {
+      type: String,
+      default: ''
+    },
+    size: {
+      type: String,
+      default: () => {
+        return getDrawerWidth()
+      }
+    },
+    component: {
+      type: [String, Function, Object],
+      default: ''
+    },
+    componentProps: {
+      type: Object,
+      default: () => ({})
+    },
+    componentListeners: {
+      type: Object,
+      default: () => ({})
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    modal: {
+      type: Boolean,
+      default: true
+    },
+    hasFooter: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      formLabelWidth: '80px'
+    }
+  },
+  computed: {
+    iVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:visible', val)
+      }
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    handleClose(done) {
+      this.$emit('close-drawer')
+      done()
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.drawer__no-footer {
+  ::v-deep {
+    .drawer {
+      .page {
+        height: calc(100vh - 55px);
+      }
+    }
+  }
+}
+
+@media (max-width: 992px) {
+  .drawer ::v-deep {
+    .el-form-item {
+      display: flex;
+      flex-direction: column;
+      gap: 0.3rem;
+    }
+  }
+}
+
+.drawer {
+  ::v-deep {
+    min-width: 565px;
+
+    .el-card__body {
+      padding-top: 10px;
+      padding-bottom: 20px;
+    }
+
+    .page-submenu {
+      .el-tabs__header {
+        padding: 0 15px;
+      }
+
+      .el-tabs__item.is-top {
+        padding: 0 10px;
+      }
+    }
+
+    .form-buttons {
+      margin-left: 13px;
+    }
+
+    .el-form {
+      margin-right: 1px;
+      padding-right: 15px;
+      height: 100%;
+
+      &.detail-card {
+        padding-right: 0;
+        margin-top: unset;
+      }
+
+      // Detail 中
+      &.content {
+        margin-right: 0;
+      }
+
+      .form-buttons {
+        //position: absolute;
+        // bottom: 13px;
+        // margin-left: 20%;
+        // margin-top: 0;
+      }
+
+      // Form 中的子 form
+      .el-form {
+        margin-left: 0;
+        margin-top: 0;
+        margin-bottom: 0;
+      }
+
+      .el-form-item {
+        .el-form-item__label {
+          padding-right: 20px;
+        }
+
+        .el-radio {
+          line-height: 25px;
+          margin-right: 13px;
+
+          .el-radio__label {
+            padding-left: 5px;
+          }
+        }
+      }
+
+      &.el-form--label-top {
+        .el-radio-group {
+          .el-radio {
+            display: block;
+            padding-bottom: 3px;
+          }
+        }
+
+        .el-form-item {
+          padding-left: 12px;
+
+          .el-form-item__label {
+            padding: 0 20px 0 0;
+            line-height: 30px;
+          }
+
+          .sub-form {
+            margin-left: -1px;
+
+            .form-fields {
+              max-height: unset;
+            }
+          }
+        }
+
+        &.form-fields {
+          //overflow: auto;
+          //max-height: calc(100vh - 180px);
+        }
+
+        .el-checkbox-group {
+          .el-checkbox {
+            display: block;
+            padding-bottom: 3px;
+          }
+        }
+
+        .el-form-item__content:has(.el-checkbox):not(:has(.el-checkbox-group)) {
+          display: inline-block; /* 更改为 inline-block */
+          //width: unset; /* 这个设置上去后，平台详情中， Automations 会有问题 */
+          vertical-align: bottom;
+        }
+
+        .el-form-item__content {
+          form {
+            .el-form-item {
+              padding-left: 0;
+            }
+          }
+        }
+      }
+
+      .form-group-header {
+        margin-left: 20px;
+      }
+    }
+
+    .el-drawer__header {
+      border-bottom: 1px solid #EBEEF5;
+      margin-bottom: 0;
+      padding: 15px 20px;
+      font-size: 16px;
+      font-weight: 500;
+      color: var(--color-text-primary);
+    }
+
+    .sql.container {
+      display: none;
+    }
+
+    .page {
+      overflow-y: auto;
+
+      height: calc(100vh - 110px);
+
+      &.tab-page {
+        .page-content {
+          padding-right: 0;
+          padding-left: 0;
+        }
+      }
+
+      .page-content {
+        height: unset;
+        padding-right: 10px;
+        padding-left: 20px;
+
+        & > div {
+          margin-bottom: 1px;
+        }
+      }
+
+      .ibox {
+        margin-bottom: 10px;
+        border: none;
+      }
+    }
+
+    .drawer__content, .tab-page-content {
+      height: 100%;
+      background: #f3f3f3;
+    }
+
+    .drawer__footer {
+      border-top: solid 1px #f3f3f3;
+    }
+
+    //.el-drawer__header {
+    //  margin-bottom: 20px;
+    //
+    //  span {
+    //    font-size: 16px;
+    //    font-weight: 800;
+    //    color: var(--color-text-primary);
+    //  }
+    //}
+  }
+}
+</style>
--- a/src/components/Form/AutoDataForm/index.vue
+++ b/src/components/Form/AutoDataForm/index.vue
@ -1,25 +1,27 @@
 <template>
-  <DataForm
-    v-if="!loading"
-    ref="dataForm"
-    :fields="totalFields"
-    :form="iForm"
-    v-bind="$attrs"
-    v-on="$listeners"
-  >
-    <div
-      v-for="(group, i) in groups"
-      :key="'group-'+group.name"
-      :slot="'id:'+group.name"
+  <div>
+    <DataForm
+      v-if="!loading"
+      ref="dataForm"
+      :fields="totalFields"
+      :form="iForm"
+      v-bind="$attrs"
+      v-on="$listeners"
    >
-      <FormGroupHeader
-        v-if="!groupHidden(group, i)"
-        :group="group"
-        :index="i"
-        :line="i !== 0 && !groupHidden(groups[i - 1], i - 1)"
-      />
-    </div>
-  </DataForm>
+      <template
+        v-for="(group, i) in groups"
+        :slot="'id:'+group.name"
+      >
+        <FormGroupHeader
+          v-if="!groupHidden(group, i)"
+          :key="'group-' + group.name"
+          :group="group"
+          :index="i"
+          :line="i !== 0 && !groupHidden(groups[i - 1], i - 1)"
+        />
+      </template>
+    </DataForm>
+  </div>
 </template>

 <script>
@ -87,6 +89,7 @@ export default {
    }
  },
  mounted() {
+    // this.$log.debug('>>> Method: ', this.method)
    this.optionUrlMetaAndGenerateColumns()
  },
  methods: {
@ -163,5 +166,6 @@ export default {
      return true
    }
  }
+
 }
 </script>
--- a/src/components/Form/AutoDataForm/utils.js
+++ b/src/components/Form/AutoDataForm/utils.js
@ -1,7 +1,6 @@
 import Vue from 'vue'
 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'
@ -64,8 +63,9 @@ export class FormFieldGenerator {
        }
        break
      case 'boolean':
-        type = ''
-        field.component = Switcher
+        type = 'checkbox'
+        // field.component = Switcher
+        // field.type = 'checkbox'
        break
      case 'list':
        type = 'input'
@ -112,7 +112,7 @@ export class FormFieldGenerator {
    let nestedFields = fieldMeta.fields || []
    const nestedFieldsMeta = fieldMeta.fieldsMeta || {}
    const nestedFieldsRemoteMeta = fieldRemoteMeta.children || {}
-    if (nestedFields === '__all__') {
+    if (nestedFields.toString() === '__all__') {
      nestedFields = Object.keys(nestedFieldsRemoteMeta)
    }
    for (const name of nestedFields) {
--- a/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue
+++ b/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue
@ -8,18 +8,21 @@
    v-bind="data.attrs"
  >
    <template v-if="data.label" #label>
-      <span>{{ data.label }}</span>
-      <el-tooltip
-        v-if="data.helpTip"
-        :open-delay="500"
-        :tabindex="-1"
-        effect="dark"
-        placement="right"
-        popper-class="help-tips"
-      >
-        <div slot="content" v-sanitize="data.helpTip" class="help-tip-content" /> <!-- Noncompliant -->
-        <i class="fa fa-question-circle-o help-tip-icon" />
-      </el-tooltip>
+      <span :title="data.label">
+        <span v-if="data.required">* </span>
+        {{ data.label }}
+        <el-tooltip
+          v-if="data.helpTip"
+          :open-delay="500"
+          :tabindex="-1"
+          effect="dark"
+          placement="right"
+          popper-class="help-tips"
+        >
+          <div slot="content" v-sanitize="data.helpTip" class="help-tip-content" /> <!-- Noncompliant -->
+          <i class="fa fa-question-circle-o help-tip-icon" />
+        </el-tooltip>
+      </span>
    </template>
    <template v-if="readonly && hasReadonlyContent">
      <div
@ -71,6 +74,7 @@
          <el-tooltip v-if="opt.tip" :content="opt.tip" :open-delay="500" placement="top">
            <i class="el-icon-warning-outline" />
          </el-tooltip>
+          <span v-if="data.helpText">{{ data.helpText }}</span>
        </el-checkbox>
        <!-- WARNING: radio 用 label 属性来表示 value 的含义 -->
        <!-- FYI: radio 的 value 属性可以在没有 radio-group 时用来关联到同一个 v-model -->
@ -87,7 +91,7 @@
        </el-radio>
      </template>
    </custom-component>
-    <div v-if="data.helpText" class="help-block">
+    <div v-if="data.helpText" :class="data.type" class="help-block">
      <el-alert
        v-if="data.helpText.startsWith('!')"
        :closable="false"
@ -99,6 +103,9 @@
      </el-alert>
      <span v-else v-sanitize="data.helpText" />
    </div>
+    <div v-if="data.helpTextFormatter" class="help-block">
+      <RenderHelpTextSafe :render-content="data.helpTextFormatter" />
+    </div>
  </el-form-item>
 </template>
 <script>
@ -121,6 +128,18 @@ function validator(data) {

 export default {
  components: {
+    RenderHelpTextSafe: {
+      functional: true,
+      props: {
+        renderContent: {
+          type: Function,
+          required: true
+        }
+      },
+      render(h, { props }) {
+        return props.renderContent()
+      }
+    },
    /**
     * 🐂🍺只需要有组件选项对象，就可以立刻包装成函数式组件在 template 中使用
     * FYI: https://cn.vuejs.org/v2/guide/render-function.html#%E5%87%BD%E6%95%B0%E5%BC%8F%E7%BB%84%E4%BB%B6
@ -315,6 +334,10 @@ export default {
  ::v-deep .el-alert__icon {
    font-size: 16px
  }
+
+  &.checkbox {
+    //display: inline;
+  }
 }

 .help-tip-icon {
--- a/src/components/Form/DataForm/index.vue
+++ b/src/components/Form/DataForm/index.vue
@ -1,68 +1,71 @@
 <template>
-  <ElFormRender
-    :id="id"
-    ref="form"
-    :class="mobile ? 'mobile' : 'desktop'"
-    :content="fields"
-    :form="basicForm"
-    :label-position="labelPosition"
-    label-width="25%"
-    v-bind="$attrs"
-    v-on="$listeners"
-  >
-    <!-- slot 透传 -->
-    <slot
-      v-for="item in fields"
-      :slot="`id:${item.id}`"
-      :name="`id:${item.id}`"
-    />
-    <slot
-      v-for="item in fields"
-      :slot="`$id:${item.id}`"
-      :name="`$id:${item.id}`"
-    />
+  <div>
+    <ElFormRender
+      :id="id"
+      ref="form"
+      :class="[mobile ? 'mobile' : 'desktop']"
+      :content="fields"
+      :form="basicForm"
+      :label-position="iLabelPosition"
+      class="form-fields"
+      label-width="25%"
+      v-bind="$attrs"
+      v-on="$listeners"
+    >
+      <!-- slot 透传 -->
+      <slot
+        v-for="item in fields"
+        :slot="`id:${item.id}`"
+        :name="`id:${item.id}`"
+      />
+      <slot
+        v-for="item in fields"
+        :slot="`$id:${item.id}`"
+        :name="`$id:${item.id}`"
+      />

-    <el-form-item v-if="hasButtons" class="form-buttons">
-      <el-button
-        v-if="defaultButton"
-        :disabled="!canSubmit"
-        :loading="isSubmitting"
-        :size="submitBtnSize"
-        type="primary"
-        @click="submitForm('form')"
-      >
-        {{ iSubmitBtnText }}
-      </el-button>
+      <div v-if="hasButtons" class="form-buttons">
+        <el-button
+          v-if="defaultButton"
+          :disabled="!canSubmit"
+          :loading="isSubmitting"
+          :size="submitBtnSize"
+          type="primary"
+          @click="submitForm('form')"
+        >
+          {{ iSubmitBtnText }}
+        </el-button>

-      <el-button
-        v-if="defaultButton && hasSaveContinue"
-        size="small"
-        @click="submitForm('form', true)"
-      >
-        {{ $t("SaveAndAddAnother") }}
-      </el-button>
+        <el-button
+          v-if="defaultButton && hasSaveContinue"
+          size="small"
+          @click="submitForm('form', true)"
+        >
+          {{ $t("SaveAndAddAnother") }}
+        </el-button>

-      <el-button
-        v-if="defaultButton && hasReset"
-        size="small"
-        @click="resetForm('form')"
-      >
-        {{ $t("Reset") }}
-      </el-button>
+        <el-button
+          v-if="defaultButton && hasReset"
+          size="small"
+          @click="resetForm('form')"
+        >
+          {{ $t("Reset") }}
+        </el-button>

-      <el-button
-        v-for="button in moreButtons"
-        v-show="!button.hidden"
-        :key="button.title"
-        :loading="button.loading"
-        size="small"
-        v-bind="button"
-        @click="handleClick(button)"
-      >
-        {{ button.title }}
-      </el-button>
-    </el-form-item>
-  </ElFormRender>
+        <el-button
+          v-for="button in moreButtons"
+          v-show="!button.hidden"
+          :key="button.title"
+          :loading="button.loading"
+          size="small"
+          v-bind="button"
+          @click="handleClick(button)"
+        >
+          {{ button.title }}
+        </el-button>
+      </div>
+    </ElFormRender>
+  </div>
 </template>

 <script>
@ -121,6 +124,10 @@ export default {
    isSubmitting: {
      type: Boolean,
      default: false
+    },
+    labelPosition: {
+      type: String,
+      default: ''
    }
  },
  data() {
@ -137,7 +144,17 @@ export default {
    mobile() {
      return this.$store.state.app.device === 'mobile'
    },
-    labelPosition() {
+    drawer() {
+      return this.$store.state.common.inDrawer
+    },
+    iLabelPosition() {
+      if (this.labelPosition) {
+        return this.labelPosition
+      }
+      // if (this.drawer) {
+      //   return 'left'
+      // }
+      // return this.drawer || this.mobile ? 'top' : 'right'
      return this.mobile ? 'top' : 'right'
    }
  },
@ -211,21 +228,38 @@ export default {
    color: var(--color-text-primary);
  }

+  &.label-top {
+    ::v-deep .el-form-item {
+      .el-form-item__content {
+        width: 100%;
+      }
+    }
+  }
+
  ::v-deep .el-form-item {
    margin-bottom: 10px;

-    .item-params {
-      margin-top: 0;
-    }
-
    .el-form-item__label {
      padding: 0 30px 0 0;
      line-height: 30px;
      color: var(--color-text-primary);

+      span {
+        display: unset;
+      }
+
      i {
        color: var(--color-icon-primary);
      }
+
+      span {
+        max-width: calc(100% - 25px);
+        //white-space: nowrap; /* 禁止换行 */
+        //text-overflow: ellipsis;
+        overflow: hidden;
+        display: inline-block;
+        line-height: 16px;
+      }
    }

    .el-form-item__content {
@ -301,8 +335,9 @@ export default {
    }
  }

-  ::v-deep .el-form-item.form-buttons {
-    margin-top: 20px;
+  ::v-deep .form-buttons {
+    margin-top: 30px;
+    margin-left: 25%;
  }
 }

--- a/src/components/Form/FormFields/AttrInput.vue
+++ b/src/components/Form/FormFields/AttrInput.vue
@ -27,7 +27,9 @@ export default {
    },
    beforeSubmit: {
      type: Function,
-      default: (val) => { return true }
+      default: (val) => {
+        return true
+      }
    }
  },
  data() {
@ -50,14 +52,16 @@ export default {
 ::v-deep .el-select {
  width: 100%;
 }
+
 ::v-deep .el-form-item__content {
  width: 100% !important;
 }
+
 ::v-deep .form-buttons {
  margin: 0 !important;
 }
+
 .attr-input {
-  margin-top: -10px;
 }
 </style>

--- a/src/components/Form/FormFields/BasicTree.vue
+++ b/src/components/Form/FormFields/BasicTree.vue
@ -47,6 +47,9 @@ export default {
  },
  computed: {
    iValue() {
+      if (!this.value) {
+        return []
+      }
      return this.value.map(item => {
        if (item.value) {
          return item.value
@ -115,6 +118,73 @@ export default {
    color: #999;
  }

+  .el-tree > .el-tree-node:after {
+    border-top: none;
+  }
+
+  //节点有间隙，隐藏掉展开按钮就好了,如果觉得空隙没事可以删掉
+  .el-tree-node__expand-icon.is-leaf {
+    display: none;
+  }
+
+  .el-tree > .el-tree-node:before {
+    border-left: none;
+    display: none;
+  }
+
+  .el-tree > .el-tree-node:after {
+    border-top: none;
+    display: none;
+  }
+
+  .el-tree-node__children {
+    padding-left: 13px;
+
+    .el-tree-node {
+      position: relative;
+      padding-left: 13px;
+
+      &:before {
+        content: "";
+        left: -4px;
+        position: absolute;
+        right: auto;
+        border-width: 1px;
+      }
+
+      &:first-child::before {
+        display: none;
+      }
+
+      &:last-child:before {
+        height: 38px;
+      }
+
+      &:before {
+        border-left: 1px dashed #dcdcdc;
+        bottom: 0;
+        height: 100%;
+        top: -26px;
+        width: 1px;
+      }
+
+      &:after {
+        content: "";
+        left: -4px;
+        position: absolute;
+        right: auto;
+        border-width: 1px;
+      }
+
+      &:after {
+        border-top: 1px dashed #dcdcdc;
+        height: 20px;
+        top: 12px;
+        width: 24px;
+      }
+    }
+  }
+
  .el-tree-node__content:hover {
    background-color: transparent;
  }
@ -129,7 +199,7 @@ export default {
    }

    .el-tree-node__children {
-      margin-left: -25px;
+      //margin-left: -25px;
    }
  }
 }
--- a/src/components/Form/FormFields/CronTab/Crontab.vue
+++ b/src/components/Form/FormFields/CronTab/Crontab.vue
@ -361,9 +361,10 @@ export default {
    },
    // 填充表达式
    submitFill() {
+      const minMinutes = 60
      const crontabDiffMin = this.crontabDiff / 1000 / 60
-      if (crontabDiffMin > 0 && crontabDiffMin < 10) {
-        const msg = this.$tc('CrontabDiffError')
+      if (crontabDiffMin > 0 && crontabDiffMin < minMinutes) {
+        const msg = this.$t('CrontabDiffError', { minutes: minMinutes })
        this.$message.error(msg)
        return
      }
--- a/src/components/Form/FormFields/CronTab/components/Crontab-Day.vue
+++ b/src/components/Form/FormFields/CronTab/components/Crontab-Day.vue
--- a/src/components/Form/FormFields/CronTab/components/Crontab-Hour.vue
+++ b/src/components/Form/FormFields/CronTab/components/Crontab-Hour.vue
@ -10,15 +10,18 @@
    <el-form-item>
      <el-radio v-model="radioValue" :label="2">
        {{ this.$t('From') }}
-        <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('Hour') }}
+        <el-input-number v-model="cycle01" :max="23" :min="0" size="mini" />
+        -
+        <el-input-number v-model="cycle02" :max="23" :min="0" size="mini" />
+        {{ this.$t('Hour') }}
      </el-radio>
    </el-form-item>

    <el-form-item>
      <el-radio v-model="radioValue" :label="3">
        {{ this.$t('Every') }}
-        <el-input-number v-model="average02" :max="60" :min="1" size="mini" /> {{ this.$t('Hour') }} {{ this.$t('ExecuteOnce') }}
+        <el-input-number v-model="average02" :max="23" :min="1" size="mini" />
+        {{ this.$t('Hour') }} {{ this.$t('ExecuteOnce') }}
      </el-radio>
    </el-form-item>

@ -32,7 +35,7 @@
          multiple
          style="width:100%"
        >
-          <el-option v-for="item in 24" :key="item" :value="item-1">{{ item-1 }}</el-option>
+          <el-option v-for="item in 24" :key="item" :value="item-1">{{ item - 1 }}</el-option>
        </el-select>
      </el-radio>
    </el-form-item>
--- a/src/components/Form/FormFields/CronTab/components/Crontab-Min.vue
+++ b/src/components/Form/FormFields/CronTab/components/Crontab-Min.vue
@ -9,7 +9,7 @@
    <el-form-item>
      <el-radio v-model="radioValue" :label="3">
        {{ this.$t('From') }}
-        <el-input-number v-model="average02" :max="60" :min="1" size="mini" />
+        <el-input-number v-model="average02" :max="59" :min="1" size="mini" />
        {{ this.$t('Min') }} {{ this.$t('ExecuteOnce') }}
      </el-radio>
    </el-form-item>
--- a/src/components/Form/FormFields/CronTab/components/Crontab-Month.vue
+++ b/src/components/Form/FormFields/CronTab/components/Crontab-Month.vue
--- a/src/components/Form/FormFields/CronTab/components/Crontab-Result.vue
+++ b/src/components/Form/FormFields/CronTab/components/Crontab-Result.vue
--- a/src/components/Form/FormFields/CronTab/components/Crontab-Week.vue
+++ b/src/components/Form/FormFields/CronTab/components/Crontab-Week.vue
--- a/src/components/Form/FormFields/CronTab/index.vue
+++ b/src/components/Form/FormFields/CronTab/index.vue
@ -39,6 +39,13 @@ export default {
      showCron: false
    }
  },
+  watch: {
+    value: {
+      handler(val) {
+        this.crontabFill(val)
+      }
+    }
+  },
  methods: {
    crontabFill(value) {
      // 确定后回传的值
--- a/src/components/Form/FormFields/DatetimeRangePicker.vue
+++ b/src/components/Form/FormFields/DatetimeRangePicker.vue
@ -5,11 +5,11 @@
    :default-time="['00:00:01', '23:59:59']"
    :end-placeholder="$tc('DateEnd')"
    :picker-options="pickerOptions"
-    :range-separator="$tc('To')"
    :start-placeholder="$tc('DateStart')"
+    :type="type"
    class="datepicker"
+    range-separator="-"
    size="small"
-    type="datetimerange"
    v-bind="$attrs"
    @change="handleDateChange"
    v-on="$listeners"
@ -28,6 +28,15 @@ export default {
    dateEnd: {
      type: [Number, String, Date],
      default: null
+    },
+    type: {
+      type: String,
+      default: 'daterange'
+      // default: 'datetimerange'
+    },
+    toMinMax: {
+      type: Boolean,
+      default: true
    }
  },
  data() {
@ -35,6 +44,10 @@ export default {
    const endValue = this.dateEnd || this.$route.query['date_end']
    const dateStart = new Date(startValue)
    const dateTo = new Date(endValue)
+    if (this.toMinMax) {
+      dateStart.setHours(0, 0, 0, 0)
+      dateTo.setHours(23, 59, 59, 999)
+    }
    return {
      value: [dateStart, dateTo],
      pickerOptions: {
@ -74,9 +87,13 @@ export default {
      }
    },
    onShortcutClick(picker, day) {
-      const end = new Date()
-      const start = new Date()
+      let start = new Date()
+      let end = new Date()
      start.setTime(start.getTime() - 3600 * 1000 * 24 * day)
+      if (this.toMinMax) {
+        start = new Date(start.setHours(0, 0, 0, 0))
+        end = new Date(end.setHours(23, 59, 59, 999))
+      }
      picker.$emit('pick', [start, end])
    }
  }
@ -84,9 +101,18 @@ export default {
 </script>

 <style lang='scss' scoped>
+html:lang(pt-br) {
+  .datepicker ::v-deep .el-range-separator {
+    padding: 0 10px;
+  }
+}
+
 .datepicker {
+  &.el-date-editor--daterange.el-input__inner {
+    width: 243px;
+  }
+
  margin-left: 10px;
-  width: 233px;
  border: 1px solid #dcdee2;
  border-radius: 2px;
  height: 28px;
--- a/src/components/Form/FormFields/PasswordInput.vue
+++ b/src/components/Form/FormFields/PasswordInput.vue
@ -5,7 +5,9 @@
    v-bind="iAttrs"
    @input="handleInput"
    v-on="$listeners"
-  />
+  >
+    hello
+  </Password>
 </template>

 <script>
--- a/src/components/Form/FormFields/PasswordRule.vue
+++ b/src/components/Form/FormFields/PasswordRule.vue
@ -55,22 +55,22 @@ export default {
          {
            id: 'uppercase',
            label: this.$t('Uppercase'),
-            type: 'switch'
+            type: 'checkbox'
          },
          {
            id: 'lowercase',
            label: this.$t('Lowercase'),
-            type: 'switch'
+            type: 'checkbox'
          },
          {
            id: 'digit',
            label: this.$t('Digit'),
-            type: 'switch'
+            type: 'checkbox'
          },
          {
            id: 'symbol',
            label: this.$t('SpecialSymbol'),
-            type: 'switch'
+            type: 'checkbox'
          },
          {
            id: 'exclude_symbols',
--- a/src/components/Form/FormFields/PhoneInput.vue
+++ b/src/components/Form/FormFields/PhoneInput.vue
@ -5,7 +5,6 @@
        slot="prepend"
        :placeholder="$tc('Select')"
        :value="rawValue.code"
-        style="width: 105px;"
        @change="onChange"
      >
        <el-option
@ -69,7 +68,11 @@ export default {
 }
 </script>

-<style scoped>
+<style lang="scss" scoped>
+.el-select {
+  width: 85px;
+}
+
 .country-name {
  display: inline-block;
  width: 150px;
--- a/src/components/Form/FormFields/ProtocolSelector/ProtocolSettingDialog.vue
+++ b/src/components/Form/FormFields/ProtocolSelector/ProtocolSettingDialog.vue
@ -3,6 +3,7 @@
    v-if="$attrs.visible"
    :close-on-click-modal="false"
    :destroy-on-close="true"
+    :modal="false"
    :show-cancel="false"
    :show-confirm="false"
    :title="$tc('PlatformProtocolConfig') + '：' + protocol.name"
@ -52,6 +53,7 @@ export default {
    const vm = this
    const platform = this.$route.query.platform
    return {
+      platform: '',
      loading: true,
      form: this.protocol,
      platformDetail: platform ? '#/console/assets/platforms/' + platform : '',
@ -96,11 +98,29 @@ export default {
      }
    }
  },
+  async mounted() {
+    try {
+      const drawActionMeta = await this.$store.dispatch('common/getDrawerActionMeta')
+      const platform = drawActionMeta.row.platform.id
+      const name = drawActionMeta.row.platform.name
+
+      if (platform) {
+        this.platformDetail = `/ui/#/settings/platforms?id=${platform}&name=${name}`
+      } else {
+        this.platformDetail = ''
+      }
+    } catch (e) {
+      throw new Error(e)
+    }
+  },
  methods: {
    onSubmit(form) {
      this.protocol = Object.assign(this.protocol, form)
      this.$emit('update:visible', false)
      this.$emit('confirm', this.protocol)
+    },
+    openInNewTab() {
+      window.open(this.platformDetail, '_blank')
    }
  }
 }
--- a/src/components/Form/FormFields/TagInput.vue
+++ b/src/components/Form/FormFields/TagInput.vue
@ -78,16 +78,18 @@ export default {
  },
  data() {
    return {
-      filterTags: this.value,
      focus: false,
      filterValue: '',
-      isCheckShowPassword: this.replaceShowPassword,
-      component: this.autocomplete ? 'el-autocomplete' : 'el-input'
+      filterTags: this.value,
+      isCheckShowPassword: this.replaceShowPassword
    }
  },
  computed: {
    iPlaceholder() {
      return `${this.placeholder} (${this.$t('EnterToContinue')})`
+    },
+    component() {
+      return this.autocomplete !== null ? 'el-autocomplete' : 'el-input'
    }
  },
  watch: {
@ -98,7 +100,7 @@ export default {
  methods: {
    handleTagClose(tag) {
      this.filterTags.splice(this.filterTags.indexOf(tag), 1)
-      this.$emit('change', this.filterTags)
+      this.handleConfirm()
    },
    handleSelect(item) {
      this.filterValue = item.value
@ -113,8 +115,9 @@ export default {
      if (!this.filterTags.includes(this.filterValue)) {
        this.filterTags.push(this.filterValue)
        this.filterValue = ''
-        this.$emit('change', this.filterTags)
      }
+      this.$emit('change', this.filterTags)
+      this.$emit('input', this.filterTags)
      this.$refs.SearchInput.focus()
    },
    handleTagClick(v, k) {
@ -151,7 +154,7 @@ export default {
  display: flex;
  flex-wrap: wrap;
  align-items: center;
-  padding: 1px 2px 1px;
+  //padding: 0 6px;
  border: 1px solid #dcdee2;
  border-radius: 1px;
  background-color: #fff;
@ -162,8 +165,9 @@ export default {
  }

  & ::v-deep .el-tag {
-    margin-top: 1px;
+    margin-bottom: 1px;
    font-family: sans-serif !important;
+    margin-left: 5px;
  }

  & ::v-deep .el-autocomplete {
@ -177,7 +181,8 @@ export default {
  & ::v-deep .el-input__inner {
    max-width: 100%;
    border: none;
-    padding-left: 10px;
+    padding-left: 12px;
+    height: 28px;
  }
 }

@ -187,7 +192,7 @@ export default {
 }

 .filter-field ::v-deep .el-input__inner {
-  height: 28px;
+  height: 27px !important;
 }

 .show-password {
--- a/src/components/Form/FormFields/UpdateToken.vue
+++ b/src/components/Form/FormFields/UpdateToken.vue
@ -1,21 +1,27 @@
 <template>
-  <div>
+  <div class="update-token">
    <el-button v-show="!isShow" icon="el-icon-edit" type="text" @click="isShow=true">
      {{ text }}
    </el-button>
    <el-input
      v-show="isShow"
      v-model.trim="curValue"
+      :disabled="disabled"
      :placeholder="placeholder"
      :type="type"
-      autocomplete="new-password"
+      class="password-input"
      show-password
      @change="onChange"
    />
+    <el-button :disabled="disabled" size="small" type="text" @click="randomPassword">
+      <i class="fa fa-refresh" />
+    </el-button>
  </div>
 </template>

 <script>
+import { randomString } from '@/utils/string'
+
 export default {
  props: {
    value: {
@ -39,6 +45,10 @@ export default {
    placeholder: {
      type: String,
      default: () => ''
+    },
+    disabled: {
+      type: Boolean,
+      default: false
    }
  },
  data() {
@ -55,7 +65,24 @@ export default {
  methods: {
    onChange(e) {
      this.$emit('input', this.curValue)
+    },
+    randomPassword() {
+      this.curValue = randomString(24, true)
+      this.$emit('input', this.curValue)
    }
  }
 }
 </script>
+<style lang='scss' scoped>
+.password-input {
+  width: calc(100% - 50px);
+}
+
+.update-token {
+  i {
+    color: var(--color-text-secondary);
+    font-size: 14px;
+  }
+}
+
+</style>
--- a/src/components/Form/FormFields/UploadField.vue
+++ b/src/components/Form/FormFields/UploadField.vue
@ -8,8 +8,11 @@
    <div v-if="tip !== ''" class="help-block">{{ tip }}</div>
    <input v-model="value" hidden type="text" v-on="$listeners">
    <div>
-      <img :class="showBG ? 'show-bg' : ''" :src="preview" v-bind="$attrs">
+      <img v-if="preview" :class="showBG ? 'show-bg' : ''" :src="preview" v-bind="$attrs" alt="">
    </div>
+    <el-button v-if="fileName" size="mini" type="danger" @click.native.stop="resetUpload">
+      {{ this.$t('Cancel') }}
+    </el-button>
  </div>
 </template>

@ -55,21 +58,29 @@ export default {
    },
    Onchange(e) {
      const upLoadFile = e.target.files[0]
+
      if (upLoadFile === undefined) {
-        this.$emit('input', this.initial)
        return
      }
+
      this.fileName = upLoadFile?.name || ''
      this.$emit('fileChange', upLoadFile)
      this.$emit('input', this.getObjectURL(upLoadFile))
    },
+    resetUpload() {
+      this.fileName = ''
+      this.preview = ''
+      this.$refs.upLoadFile.value = ''
+      this.$emit('input', '')
+      this.$emit('fileChange', null)
+    },
    getObjectURL(file) {
      let url = null
-      if (window.createObjectURL !== undefined) { // basic
+      if (window.createObjectURL !== undefined) {
        url = window.createObjectURL(file)
-      } else if (window.URL !== undefined) { // mozilla(firefox)
+      } else if (window.URL !== undefined) {
        url = window.URL.createObjectURL(file)
-      } else if (window.webkitURL !== undefined) { // webkit or chrome
+      } else if (window.webkitURL !== undefined) {
        url = window.webkitURL.createObjectURL(file)
      }
      return url
--- a/src/components/Form/FormFields/WeekCronSelect.vue
+++ b/src/components/Form/FormFields/WeekCronSelect.vue
@ -1,7 +1,7 @@
 <template>
  <div class="c-weektime">
    <div class="c-schedue" />
-    <div :class="{'c-schedue': true, 'c-schedue-notransi': mode}" :style="styleValue" />
+    <div :class="{'c-schedue': true, 'c-schedue-notransi': mode}" />
    <table :class="{'c-min-table': colspan < 2}" class="c-weektime-table">
      <thead class="c-weektime-head">
        <tr>
@ -14,7 +14,7 @@
        </tr>
      </thead>
      <tbody class="c-weektime-body" @mouseleave="containerLeave()">
-        <tr v-for="t in weektimeData" :key="t.row">
+        <tr v-for="t in weekTimeData" :key="t.row">
          <td>{{ t.value }}</td>
          <td
            v-for="n in t.child"
@ -45,6 +45,7 @@
 const createArr = len => {
  return Array.from(Array(len)).map((ret, id) => id)
 }
+
 function splicing(list) {
  let same
  let i = -1
@ -67,6 +68,7 @@ function splicing(list) {
  arr.shift()
  return arr.join('')
 }
+
 export default {
  name: 'WeekCronSelect',
  props: {
@ -77,7 +79,7 @@ export default {
    colspan: {
      type: Number,
      default() {
-        return 2
+        return 1
      }
    }
  },
@ -100,7 +102,7 @@ export default {
        this.$t('Saturday'),
        this.$t('Sunday')
      ],
-      weektimeData: [],
+      weekTimeData: [],
      timeRange: [] // 格式化之后数据
    }
  },
@ -142,10 +144,10 @@ export default {
        return {
          value: ret,
          row: index,
-          child: children(ret, index, 48)
+          child: children(ret, index, 24 * this.colspan)
        }
      })
-      this.weektimeData = isData
+      this.weekTimeData = isData
    },
    // 反解析传递过来的默认值
    nextValue() {
@ -169,8 +171,11 @@ export default {
      const startVal = this.countIndex(start)
      const endVal = this.countIndex(end)
      for (let i = startVal; i < (endVal === 0 ? 48 : endVal); i++) {
-        const curWeek = this.weektimeData[idNum]
-        curWeek.child[i].check = true
+        const curWeek = this.weekTimeData[idNum]
+        const curChild = curWeek.child[i]
+        if (curChild) {
+          curChild.check = true
+        }
      }
    },
    // 计算索引
@ -209,8 +214,9 @@ export default {
      const nowDate = new Date(timeStamp).getTime()
      const targetStamp = new Date(nowDate + offsetGMT * 60 * 1000 + timezone * 60 * 60 * 1000).getTime()

-      const beginStamp = targetStamp + col * 1800000 // col * 30 * 60 * 1000
-      const endStamp = beginStamp + 1800000
+      // (2 / this.colspan) 原来是一个单元格 30分钟，现在是一个单元格 30 * 2 / this.colspan 分钟
+      const beginStamp = targetStamp + col * 1800000 * (2 / this.colspan) // col * 30 * 60 * 1000
+      const endStamp = beginStamp + 1800000 * (2 / this.colspan)

      const begin = this.formatDate(new Date(beginStamp), 'hh:mm')
      const end = this.formatDate(new Date(endStamp), 'hh:mm')
@ -218,7 +224,7 @@ export default {
    },
    // 清空时间段
    clearWeektime() {
-      this.weektimeData.forEach(item => {
+      this.weekTimeData.forEach(item => {
        item.child.forEach(t => {
          this.$set(t, 'check', false)
        })
@ -228,7 +234,7 @@ export default {
    },
    // 全选
    selectAll() {
-      this.weektimeData.forEach(item => {
+      this.weekTimeData.forEach(item => {
        item.child.forEach(t => {
          this.$set(t, 'check', true)
        })
@ -241,7 +247,7 @@ export default {
      this.mode = 0
    },
    setTimeRange() {
-      this.timeRange = this.weektimeData.map(item => {
+      this.timeRange = this.weekTimeData.map(item => {
        return {
          id: item.row === 6 ? 0 : item.row + 1,
          value: splicing(item.child)
@ -308,7 +314,7 @@ export default {
    selectWeek(row, col, check) {
      const [minRow, maxRow] = row
      const [minCol, maxCol] = col
-      this.weektimeData.forEach(item => {
+      this.weekTimeData.forEach(item => {
        item.child.forEach(t => {
          if (t.row >= minRow && t.row <= maxRow && t.col >= minCol && t.col <= maxCol) {
            this.$set(t, 'check', check)
@ -321,11 +327,12 @@ export default {
 </script>
 <style lang="scss" scoped>
 .c-weektime {
-  min-width: 640px;
+  //min-width: 440px;
  position: relative;
  display: inline-block;
  padding-right: 20px;
 }
+
 .c-schedue {
  background: #598fe6;
  position: absolute;
@ -334,55 +341,70 @@ export default {
  opacity: .6;
  pointer-events: none;
 }
+
 .c-schedue-notransi {
  transition: width .12s ease, height .12s ease, top .12s ease, left .12s ease;
 }
+
 .c-weektime-table {
  border-collapse: collapse;
+
  th {
    vertical-align: inherit;
    font-weight: bold;
  }
+
  tr {
    height: 30px;
  }
+
  tr, td, th {
    user-select: none;
    border: 1px solid #dee4f5;
    text-align: center;
-    min-width: 12px;
+    min-width: 10px;
    line-height: 1.6em;
    transition: background .16s ease;
  }
+
  .c-weektime-head {
    font-size: 12px;
+
    .week-td {
      width: 72px;
    }
  }
+
  .c-weektime-body {
    font-size: 12px;
+
    td {
      &.weektime-atom-item {
        user-select: unset;
        background-color: #f5f5f5;
+        width: 18px;
      }
+
      &.ui-selected {
        background-color: #598fe6;
      }
    }
  }
+
  .c-weektime-preview {
    line-height: 2.4em;
    padding: 0 10px;
-    font-size: 13px;
+    font-size: 11px;
+
    .c-weektime-con {
      line-height: 42px;
      user-select: none;
    }
+
    .c-weektime-time {
      text-align: left;
      line-height: 2.4em;
+
      p {
        max-width: 625px;
        line-height: 1.4em;
@ -392,11 +414,13 @@ export default {
    }
  }
 }
+
 .c-min-table {
  tr, td, th {
-    min-width: 24px;
+    min-width: 17px;
  }
 }
+
 .g-clearfix {
  &:after, &:before {
    clear: both;
@ -404,16 +428,20 @@ export default {
    display: table;
  }
 }
+
 .g-pull-left {
  float: left;
 }
+
 .g-pull-right {
  float: right;
-  color: #409eff!important;
+  color: #409eff !important;
 }
+
 .g-pull-margin {
  margin-right: 12px;
 }
+
 .g-tip-text {
  color: #999;
 }
--- a/src/components/Form/FormGroupHeader/index.vue
+++ b/src/components/Form/FormGroupHeader/index.vue
@ -1,7 +1,15 @@
 <template>
-  <div class="form-group-header">
+  <div ref="formGroup" class="form-group-header">
    <div v-if="line" class="hr-line-dashed" />
-    <h3>{{ group['title'] }} </h3>
+    <div v-if="group['title']">
+      <h3 @click="toggle">{{ group['title'] }} </h3>
+      <span class="compass" @click="toggle">
+        <i :class="iconClass" />
+      </span>
+    </div>
+    <div v-if="!isVisible" class="ellipsis" @click="toggle">
+      <i class="fa fa-angle-double-down" />
+    </div>
  </div>
 </template>

@ -20,16 +28,62 @@ export default {
      type: Object,
      default: () => ({})
    }
+  },
+  data() {
+    return {
+      isVisible: true
+    }
+  },
+  computed: {
+    iconClass() {
+      return this.isVisible ? 'el-icon-arrow-down' : 'el-icon-arrow-up'
+    }
+  },
+  methods: {
+    toggle() {
+      this.isVisible = !this.isVisible
+      this.toggleSiblingVisibility()
+    },
+    toggleSiblingVisibility() {
+      // 当前 form-group-header 的 DOM 元素
+      const formGroupHeader = this.$refs.formGroup
+      if (!formGroupHeader) return
+
+      // 找到当前 form-group-header 的下一个兄弟节点
+      let sibling = formGroupHeader.nextElementSibling
+
+      // 循环隐藏或显示直到找到下一个 form-group-header
+      while (sibling && sibling.classList.contains('el-form-item')) {
+        sibling.style.display = this.isVisible ? '' : 'none'
+        sibling = sibling.nextElementSibling
+      }
+    }
  }
 }
 </script>

 <style lang="less" scoped>
 .hr-line-dashed {
-    border-top: 1px dashed #e7eaec;
-    color: #ffffff;
-    background-color: #ffffff;
-    height: 1px;
-    margin: 20px 0;
+  border-top: 1px dashed #e7eaec;
+  color: #ffffff;
+  background-color: #ffffff;
+  height: 1px;
+  margin: 20px 0;
+}
+
+h3 {
+  display: inline-block;
+  cursor: pointer;
+}
+
+.compass {
+  display: inline-block;
+  float: right;
+  cursor: pointer;
+}
+
+.ellipsis {
+  text-align: center;
+  cursor: pointer;
 }
 </style>
--- a/src/components/Table/AutoDataTable/components/ColumnSettingPopover.vue
+++ b/src/components/Table/AutoDataTable/components/ColumnSettingPopover.vue
@ -36,6 +36,7 @@
          <el-checkbox
            :disabled="item.prop==='actions' || minColumns.indexOf(item.prop)!==-1"
            :label="item.prop"
+            :title="item.label"
          >
            {{ item.label }}
          </el-checkbox>
--- a/src/components/Table/AutoDataTable/index.vue
+++ b/src/components/Table/AutoDataTable/index.vue
@ -23,11 +23,17 @@
 <script type="text/jsx">
 import DataTable from '@/components/Table/DataTable/index.vue'
 import {
-  ActionsFormatter, ArrayFormatter, ChoicesFormatter, DateFormatter, DetailFormatter, DisplayFormatter,
+  ActionsFormatter,
+  ArrayFormatter,
+  ChoicesFormatter,
+  CopyableFormatter,
+  DateFormatter,
+  DetailFormatter,
+  DisplayFormatter,
  ObjectRelatedFormatter
 } from '@/components/Table/TableFormatters'
 import i18n from '@/i18n/i18n'
-import { newURL, replaceAllUUID, toSentenceCase } from '@/utils/common'
+import { newURL, ObjectLocalStorage, replaceAllUUID, toSentenceCase } from '@/utils/common'
 import ColumnSettingPopover from './components/ColumnSettingPopover.vue'
 import LabelsFormatter from '@/components/Table/TableFormatters/LabelsFormatter.vue'

@ -62,10 +68,21 @@ export default {
        currentCols: [],
        defaultCols: []
      },
-      isDeactivated: false
+      isDeactivated: false,
+      objTableColumns: new ObjectLocalStorage('tableColumns')
+    }
+  },
+  computed: {
+    dynamicActionWidth() {
+      if (this.$i18n.locale === 'en') {
+        return '120px'
+      }
+      if (this.$i18n.locale === 'pt-br') {
+        return '160px'
+      }
+      return '100px'
    }
  },
-  computed: {},
  watch: {
    config: {
      handler: _.debounce(function(iNew, iOld) {
@ -120,6 +137,15 @@ export default {
    },
    generateColumnByName(name, col) {
      switch (name) {
+        case 'id':
+          if (!col.width) {
+            col.width = '299px'
+          }
+          if (!col.formatter) {
+            col.formatter = CopyableFormatter
+            col.iconPosition = 'left'
+          }
+          break
        case 'name':
          col.formatter = DetailFormatter
          col.sortable = 'custom'
@ -131,7 +157,7 @@ export default {
            prop: 'actions',
            label: i18n.t('Actions'),
            align: 'center',
-            width: '100px',
+            width: this.dynamicActionWidth,
            formatter: ActionsFormatter,
            fixed: 'right',
            formatterArgs: {}
@ -187,7 +213,7 @@ export default {
          break
        case 'datetime':
          col.formatter = DateFormatter
-          col.width = '175px'
+          col.width = '155px'
          break
        case 'object_related_field':
          col.formatter = ObjectRelatedFormatter
@ -348,6 +374,8 @@ export default {

      let configColumns = config.columns || allColumnNames
      const columnsExclude = config.columnsExclude || []
+      const columnsAdd = config.columnsAdd || []
+      configColumns = configColumns.concat(columnsAdd)
      configColumns = configColumns.filter(item => !columnsExclude.includes(item))

      // 解决后端 API 返回字段中包含 actions 的问题;
@ -417,13 +445,9 @@ export default {
      const minColumnsNames = _.get(this.iConfig, 'columnsShow.min', ['actions', 'id'])
        .filter(n => totalColumnsNames.includes(n))

-      // 应该显示的列
-      const _tableConfig = localStorage.getItem('tableConfig')
-        ? JSON.parse(localStorage.getItem('tableConfig'))
-        : {}
      let tableName = this.config.name || this.$route.name + '_' + newURL(this.config.url).pathname
      tableName = replaceAllUUID(tableName)
-      const configShowColumnsNames = _.get(_tableConfig[tableName], 'showColumns', null)
+      const configShowColumnsNames = this.objTableColumns.get(tableName)
      let showColumnsNames = configShowColumnsNames || defaultColumnsNames
      if (showColumnsNames.length === 0) {
        showColumnsNames = totalColumnsNames
@ -470,17 +494,12 @@ export default {
      }
      this.popoverColumns.currentCols = columns

-      const _tableConfig = localStorage.getItem('tableConfig')
-        ? JSON.parse(localStorage.getItem('tableConfig'))
-        : {}
      let tableName = this.config.name || this.$route.name + '_' + newURL(url).pathname
      // 替换url中的uuid，避免同一个类型接口生成多个key，localStorage中的数据无法共用.
      tableName = replaceAllUUID(tableName)

-      _tableConfig[tableName] = {
-        'showColumns': columns
-      }
-      localStorage.setItem('tableConfig', JSON.stringify(_tableConfig))
+      this.objTableColumns.set(tableName, columns)
+
      this.filterShowColumns()
    },
    filterChange(filters) {
--- a/src/components/Table/CardTable/Panel.vue
+++ b/src/components/Table/CardTable/Panel.vue
@ -0,0 +1,153 @@
+<template>
+  <div @click="handleClick">
+    <span v-if="d.edition === 'enterprise'" class="enterprise">
+      {{ $t('Enterprise') }}
+    </span>
+    <el-row class="panel">
+      <el-col v-if="d.icon" :span="8" class="image">
+        <img
+          v-if="d.icon.startsWith('/') || d.icon.startsWith('data:')"
+          :alt="d.display_name"
+          :src="d.icon"
+        >
+        <Icon v-else :icon="d.icon" />
+      </el-col>
+      <el-col :span="16" class="text-zone">
+        <div class="one-line">
+          <b>{{ d.display_name }}</b>
+          <el-tag v-if="d.version" size="mini" style="margin-left: 5px">
+            {{ d.version }}
+          </el-tag>
+        </div>
+        <div :title="d.comment " class="comment">
+          {{ d.comment }}
+        </div>
+        <div class="tag-zone">
+          <el-tag v-for="tag of d.tags" :key="tag" size="mini">
+            {{ capitalize(tag) }}
+          </el-tag>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import Icon from '@/components/Widgets/Icon/index.vue'
+
+export default {
+  name: 'Panel',
+  components: { Icon },
+  props: {
+    d: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {}
+  },
+  methods: {
+    capitalize(str) {
+      return str.charAt(0).toUpperCase() + str.slice(1)
+    },
+    handleClick() {
+      this.$emit('onClick', this.d)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.panel {
+  display: flex;
+  flex-wrap: nowrap;
+  margin-top: 0;
+  height: 100%;
+
+  .image {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    img {
+      width: 60px;
+      height: 60px;
+      object-fit: contain;
+    }
+
+    svg {
+      width: 40px;
+      height: 40px;
+    }
+  }
+
+  .text-zone {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+
+    .one-line {
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      padding-top: 10px;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      cursor: pointer;
+
+      b {
+        padding-right: 5px;
+      }
+
+      span {
+        margin-left: 0 !important;
+      }
+    }
+
+    .comment {
+      display: -webkit-box;
+      height: 120px;
+      font-size: 12px;
+      padding: 10px 0;
+      cursor: pointer;
+      overflow: hidden;
+      -webkit-line-clamp: 4;
+      -webkit-box-flex: 1;
+      -webkit-box-orient: vertical;
+      text-align: left;
+    }
+
+    .tag-zone {
+      display: flex;
+      height: 30%;
+      align-items: center;
+      cursor: pointer;
+    }
+  }
+}
+
+.enterprise {
+  position: absolute;
+  right: -1px;
+  top: -1px;
+  background-color: var(--color-primary);
+  color: #fff;
+  padding: 3px 8px 4px 9px;
+  font-size: 13px;
+  border-radius: 3px 3px 3px 8px;
+}
+
+.tag-zone {
+  margin-top: 10px;
+
+  .el-tag {
+    margin-right: 3px;
+  }
+}
+
+.text-zone {
+  text-align: left;
+  height: 100%;
+}
+</style>
--- a/src/components/Table/CardTable/index.vue
+++ b/src/components/Table/CardTable/index.vue
@ -6,54 +6,25 @@
      :table-url="tableUrl"
      v-bind="headerActions"
    />
-    <el-row :gutter="10" class="the-row">
-      <IBox v-if="totalData.length === 0">
+    <el-row v-loading="loading" class="the-row">
+      <IBox v-if="totalData.length === 0" class="empty-box">
        <el-empty :description="$t('NoData')" :image-size="200" class="no-data" style="padding: 20px" />
      </IBox>
-      <el-col v-for="(d, index) in totalData" :key="index" :lg="8" :md="12" :sm="24" style="min-width: 335px;">
+      <div class="card-container">
        <el-card
-          :body-style="{ 'text-align': 'center', 'padding': '15px' }"
+          v-for="(d, index) in totalData"
+          :key="index"
          :class="{'is-disabled': isDisabled(d)}"
-          class="my-card"
+          class="the-card"
          shadow="hover"
-          @click.native="onView(d)"
        >
          <keep-alive>
-            <component :is="subComponent" v-if="subComponent" :object="d" @refresh="getList" />
-            <slot v-else :index="index" :item="d">
-              <span v-if="d.edition === 'enterprise'" class="enterprise">
-                {{ $t('Enterprise') }}
-              </span>
-              <el-row>
-                <el-col v-if="d.icon" :span="8" class="image">
-                  <img
-                    v-if="d.icon.startsWith('/') || d.icon.startsWith('data:')"
-                    :alt="d.display_name"
-                    :src="d.icon"
-                  >
-                  <Icon v-else :icon="d.icon" />
-                </el-col>
-                <el-col :span="16" class="text-zone">
-                  <div class="one-line">
-                    <b>{{ d.display_name }}</b>
-                    <el-tag v-if="d.version" size="mini" style="margin-left: 5px">
-                      {{ d.version }}
-                    </el-tag>
-                  </div>
-                  <div :title="d.comment " class="comment">
-                    {{ d.comment }}
-                  </div>
-                  <div class="tag-zone">
-                    <el-tag v-for="tag of d.tags" :key="tag" size="mini">
-                      {{ capitalize(tag) }}
-                    </el-tag>
-                  </div>
-                </el-col>
-              </el-row>
+            <slot :index="index" :item="d" :onView="onView">
+              <Panel :d="d" @click.native="onView(d)" />
            </slot>
          </keep-alive>
        </el-card>
-      </el-col>
+      </div>
    </el-row>
    <Pagination
      v-show="pagination && total > paginationSize"
@ -67,11 +38,11 @@
 </template>

 <script>
-import TableAction from '@/components/Table/ListTable/TableAction'
-import { Pagination } from '@/components'
-import Icon from '@/components/Widgets/Icon/index.vue'
 import { mapGetters } from 'vuex'
-import IBox from '@/components/IBox/index.vue'
+import { Pagination } from '@/components'
+import TableAction from '@/components/Table/ListTable/TableAction'
+import IBox from '@/components/Common/IBox/index.vue'
+import Panel from './Panel'

 const defaultFirstPage = 1

@ -79,12 +50,16 @@ export default {
  name: 'CardTable',
  components: {
    IBox,
+    Panel,
    TableAction,
-    Pagination,
-    Icon
+    Pagination
  },
  props: {
    // 定义 table 的配置
+    columns: {
+      type: Number,
+      default: 3
+    },
    tableConfig: {
      type: Object,
      default: () => ({})
@ -100,6 +75,10 @@ export default {
    subComponent: {
      type: Object,
      default: () => null
+    },
+    subComponentProps: {
+      type: Object,
+      default: () => ({})
    }
  },
  data() {
@ -111,6 +90,7 @@ export default {
      paginationSize: 6,
      paginationLayout: 'total, sizes, prev, pager, next',
      paginationSizes: [6, 18, 27],
+      loading: true,
      axiosConfig: {
        raw: 1,
        params: {
@ -126,16 +106,17 @@ export default {
      return this.tableConfig.url || ''
    }
  },
-  mounted() {
-    this.getList()
+  async mounted() {
+    try {
+      await this.getList()
+    } finally {
+      this.loading = false
+    }
  },
  methods: {
    isDisabled(item) {
      return item.edition?.value === 'enterprise' && !this.hasValidLicense
    },
-    capitalize(str) {
-      return str.charAt(0).toUpperCase() + str.slice(1)
-    },
    getIcon(status) {
      let iconClass = 'fa-check-circle'
      if (status === false) {
@ -146,7 +127,7 @@ export default {
    getPageQuery(currentPage, pageSize) {
      return this.$refs.pagination.getPageQuery(currentPage, pageSize)
    },
-    getList() {
+    async getList() {
      if (this.tableConfig.totalData) {
        this.totalData = this.tableConfig.totalData
        this.total = this.totalData.length
@ -156,20 +137,15 @@ export default {
        return
      }
      const pageQuery = this.getPageQuery(this.page, this.paginationSize)
-      const query = Object.assign(this.extraQuery, pageQuery)
+      const query = Object.assign(this.extraQuery, pageQuery, this.tableConfig.extraQuery)
      const queryString = Object.keys(query).map(key => key + '=' + query[key]).join('&')
-      const url = `${this.tableUrl}?${queryString}`
+      const connector = this.tableUrl.indexOf('?') === -1 ? '?' : '&'
+      const url = `${this.tableUrl}${connector}${queryString}`

-      this.$axios
-        .get(url, this.axiosConfig)
-        .then(({ data: resp }) => {
-          this.total = resp?.count || 0
-          this.totalData = resp?.results || []
-        })
-        .catch(err => {
-          this.$log.error('Error occur: ', err)
-          this.total = 0
-        })
+      const resp = await this.$axios.get(url, this.axiosConfig)
+      const data = resp.data
+      this.total = data?.count || 0
+      this.totalData = data?.results || []
    },
    reloadTable() {
      this.getList()
@ -200,9 +176,7 @@ export default {
      this.$router.push(detailRoute)
    },
    defaultPerformDelete(obj) {
-      this.$axios.delete(
-        `${this.tableConfig.url}${obj.id}/`
-      )
+      this.$axios.delete(`${this.tableConfig.url}${obj.id}/`)
    },
    onView(obj) {
      if (this.isDisabled(obj)) {
@ -233,88 +207,42 @@ export default {
 </script>

 <style lang="scss" scoped>
+.the-row .empty-box {
+  display: block;
+
+  ::v-deep {
+    .el-empty {
+      margin: 0 auto;
+    }
+  }
+}
+
 .the-row {
  margin-top: 15px;
  max-width: 1600px;
  text-align: center;

+  .card-container {
+    display: flex;
+    justify-content: left;
+    flex-wrap: wrap;
+  }
+
  .el-col, div {
-    .my-card {
+    gap: 20px;
+
+    .the-card {
      min-width: 330px;
-      width: 100%;
      position: relative;
      margin-bottom: 20px;
+      //height: 230px;
+      width: 380px;
+      padding: 15px;

      ::v-deep .el-card__body {
        height: 100%;
-
-        .el-row {
-          display: flex;
-          flex-wrap: nowrap;
-          margin-top: 0;
-          height: 100%;
-
-          .image {
-            display: flex;
-            justify-content: center;
-            align-items: center;
-
-            img {
-              width: 60px;
-              height: 60px;
-              object-fit: contain;
-            }
-
-            svg {
-              width: 40px;
-              height: 40px;
-            }
-          }
-
-          .text-zone {
-            display: flex;
-            flex-direction: column;
-            align-items: flex-start;
-
-            .one-line {
-              display: flex;
-              flex-wrap: wrap;
-              align-items: center;
-              padding-top: 10px;
-              text-overflow: ellipsis;
-              white-space: nowrap;
-              cursor: pointer;
-
-              b {
-                padding-right: 5px;
-              }
-
-              span {
-                margin-left: 0 !important;
-              }
-            }
-
-            .comment {
-              display: -webkit-box;
-              height: 120px;
-              font-size: 12px;
-              padding: 10px 0;
-              cursor: pointer;
-              overflow: hidden;
-              -webkit-line-clamp: 4;
-              -webkit-box-flex: 1;
-              -webkit-box-orient: vertical;
-              text-align: left;
-            }
-
-            .tag-zone {
-              display: flex;
-              height: 30%;
-              align-items: center;
-              cursor: pointer;
-            }
-          }
-        }
+        width: 100%;
+        padding: 0;
      }

      &.is-disabled {
@ -342,35 +270,15 @@ export default {
  }
 }

-.enterprise {
-  position: absolute;
-  right: -1px;
-  top: -1px;
-  background-color: var(--color-primary);
-  color: #fff;
-  padding: 3px 8px 4px 9px;
-  font-size: 13px;
-  border-radius: 3px 3px 3px 8px;
-}
-
-.tag-zone {
-  margin-top: 10px;
-
-  .el-tag {
-    margin-right: 3px;
-  }
-}
-
-.text-zone {
-  text-align: left;
-  height: 100%;
-}
-
 .pagination {
  padding-top: 10px;
  border-top: 1px solid #e7eaec;
 }

+.el-col {
+  //min-width: 330px; 设置完后，remote app 列表会有问题
+}
+
 .no-data {
  display: flex;
  flex-direction: column;
--- a/src/components/Table/DataTable/compenents/el-data-table/el-data-table.vue
+++ b/src/components/Table/DataTable/compenents/el-data-table/el-data-table.vue
@ -7,14 +7,14 @@
    <template v-else>
      <el-table
        ref="table"
-        v-loading="loading"
+        v-loading="tableLoading"
        :data="data"
        :row-class-name="rowClassName"
        v-bind="tableAttrs"
        @select="selectStrategy.onSelect"
        v-on="$listeners"
        @selection-change="selectStrategy.onSelectionChange"
-        @select-all="selectStrategy.onSelectAll($event, canSelect)"
+        @select-all="handleSelectAll($event, canSelect)"
        @sort-change="onSortChange"
      >
        <!--TODO 不用jsx写, 感觉template逻辑有点不清晰了-->
@ -105,14 +105,17 @@
            <template #header>
              <span :title="col.label">{{ col.label }}</span>
            </template>
-            <template v-if="col.formatter && typeof col.formatter !== 'function'" v-slot:default="{row, column, index}">
+            <template
+              v-if="col.formatter && typeof col.formatter !== 'function'"
+              v-slot:default="{row, column, $index}"
+            >
              <div
                :is="col.formatter"
                :key="row.id"
                :cell-value="row[col.prop]"
                :col="col"
                :column="column"
-                :index="index"
+                :index="$index"
                :reload="getList"
                :row="row"
                :table-data="data"
@ -749,7 +752,7 @@ export default {
      page: defaultFirstPage,
      // https://github.com/ElemeFE/element/issues/1153
      total: null,
-      loading: false,
+      tableLoading: false,
      // 多选项的数组
      selected: [],

@ -940,11 +943,11 @@ export default {
    },
    getListFromStaticData({ loading = true } = {}) {
      if (loading) {
-        this.loading = true
+        this.tableLoading = true
      }
      if (!this.hasPagination) {
        this.data = this.totalData
-        this.loading = false
+        this.tableLoading = false
        if (this.isTree) {
          this.data = this.tree2Array(this.data, this.expandAll)
        }
@ -957,7 +960,7 @@ export default {
      const end = (page + pageOffset) * this.size
      this.$log.debug(`page: ${page}, size: ${this.size}, start: ${start}, end: ${end}`)
      this.data = this.totalData.slice(start, end)
-      this.loading = false
+      this.tableLoading = false
      this.data = this.tree2Array(this.data, this.expandAll)
      return this.data
    },
@ -983,7 +986,7 @@ export default {
        queryUtil.stringify(query, '=', '&')

      // 请求开始
-      this.loading = loading
+      this.tableLoading = loading

      // 存储query记录, 便于后面恢复
      if (this.saveQuery) {
@ -1023,7 +1026,7 @@ export default {
            this.total === 0 &&
            (_isEmpty(formValue) || _values(formValue).every(isFalsey))

-          this.loading = false
+          this.tableLoading = false
          /**
           * 请求返回, 数据更新后触发
           * @property {object} data - table的数据
@ -1033,7 +1036,7 @@ export default {

          // 开启persistSelection时，需要同步selected状态到el-table中
          this.$nextTick(() => {
-            this.selectStrategy.updateElTableSelection()
+            this.selectStrategy?.updateElTableSelection()
          })
        })
        .catch(err => {
@ -1043,7 +1046,7 @@ export default {
           */
          this.$emit('error', err)
          this.total = 0
-          this.loading = false
+          this.tableLoading = false
        })
    },
    search(attrs, reset) {
@ -1106,6 +1109,14 @@ export default {
      this.page = val
      this.getList()
    },
+    handleSelectAll(selection, selectable = () => true) {
+      this.tableLoading = true
+      try {
+        this.selectStrategy.onSelectAll(selection, selectable)
+      } finally {
+        this.tableLoading = false
+      }
+    },
    /**
     * 切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否
     *
@ -1122,7 +1133,7 @@ export default {
     * @public
     */
    clearSelection() {
-      return this.selectStrategy.clearSelection()
+      return this.selectStrategy?.clearSelection()
    },
    // 弹窗相关
    // 除非树形结构在操作列点击新增, 否则 row 是 MouseEvent
--- a/src/components/Table/DataTable/compenents/el-data-table/utils/select-strategy.js
+++ b/src/components/Table/DataTable/compenents/el-data-table/utils/select-strategy.js
@ -13,15 +13,28 @@ class StrategyAbstract {
    this.onSelect = this.onSelect.bind(this)
    this.onSelectAll = this.onSelectAll.bind(this)
  }
+
  get elTable() {
    return this.elDataTable.$refs.table
  }
-  onSelectionChange() {}
-  onSelect() {}
-  onSelectAll() {}
-  toggleRowSelection() {}
-  clearSelection() {}
-  updateElTableSelection() {}
+
+  onSelectionChange() {
+  }
+
+  onSelect() {
+  }
+
+  onSelectAll() {
+  }
+
+  toggleRowSelection() {
+  }
+
+  clearSelection() {
+  }
+
+  updateElTableSelection() {
+  }
 }

 /**
@ -34,14 +47,16 @@ class StrategyNormal extends StrategyAbstract {
  onSelectionChange(val) {
    this.elDataTable.selected = val
  }
+
  /**
   * toggleRowSelection和clearSelection的表现与el-table一致
   */
  toggleRowSelection(...args) {
    return this.elTable.toggleRowSelection(...args)
  }
+
  clearSelection() {
-    return this.elTable.clearSelection()
+    return this.elTable?.clearSelection()
  }
 }

@ -65,17 +80,55 @@ class StrategyPersistSelection extends StrategyAbstract {
    const isChosen = selection.indexOf(row) > -1
    this.toggleRowSelection(row, isChosen)
  }
+
  /**
   * 用户切换当前页的多选
   */
  onSelectAll(selection, selectable = () => true) {
-    const isSelected = !!selection.length
-    this.elDataTable.data.forEach(r => {
-      if (selectable(r)) {
-        this.toggleRowSelection(r, isSelected)
-      }
-    })
+    const { id, selected, data } = this.elDataTable
+    const selectableRows = data.filter(selectable)
+    // const isSelected = !!selection.length
+
+    // 创建已选择项的 id 集合，用于快速查找
+    const selectedIds = new Set(selected.map(r => r[id]))
+    const currentPageIds = new Set(selectableRows.map(row => row[id]))
+
+    // 前页面的选中状态
+    const currentPageSelectedCount = selectableRows.filter(row =>
+      selectedIds.has(row[id])
+    ).length
+
+    // 判断是全选还是取消全选
+    const shouldSelectAll = currentPageSelectedCount < selectableRows.length
+
+    this.elTable?.clearSelection()
+
+    if (shouldSelectAll) {
+      selectableRows.forEach(row => {
+        if (!selectedIds.has(row[id])) selected.push(row)
+
+        this.elTable.toggleRowSelection(row, true)
+
+        // ! 这里需要触发事件，否则在 el-table 中无法触发 selection-change 事件
+        this.elDataTable.$emit('toggle-row-selection', true, row)
+      })
+    } else {
+      const newSelected = []
+
+      selected.forEach(row => {
+        if (!currentPageIds.has(row[id])) {
+          newSelected.push(row)
+        } else {
+          this.elDataTable.$emit('toggle-row-selection', false, row)
+        }
+      })
+
+      this.elDataTable.selected = newSelected
+    }
+
+    this.elDataTable.$emit('selection-change', this.elDataTable.selected)
  }
+
  /**
   * toggleRowSelection和clearSelection管理elDataTable的selected数组
   * 记得最后要将状态同步到el-table中
@ -83,34 +136,42 @@ class StrategyPersistSelection extends StrategyAbstract {
  toggleRowSelection(row, isSelected) {
    const { id, selected } = this.elDataTable
    const foundIndex = selected.findIndex(r => r[id] === row[id])
+
    if (typeof isSelected === 'undefined') {
      isSelected = foundIndex <= -1
    }
+
    if (isSelected && foundIndex === -1) {
      selected.push(row)
    } else if (!isSelected && foundIndex > -1) {
      selected.splice(foundIndex, 1)
    }
+
    this.elDataTable.$emit('toggle-row-selection', isSelected, row)
    this.updateElTableSelection()
  }
+
  clearSelection() {
    this.elDataTable.selected = []
    this.updateElTableSelection()
  }
+
  /**
   * 将selected状态同步到el-table中
   */
  updateElTableSelection() {
    const { data, id, selected } = this.elDataTable
-    // 历史勾选的行已经不在当前页了，所以要将当前页的行数据和selected合并
-    const mergeData = _.uniqWith([...data, ...selected], _.isEqual)
-    mergeData.forEach(r => {
-      const isSelected = !!selected.find(r2 => r[id] === r2[id])
-      if (!this.elTable) {
-        return
+    const selectedIds = new Set(selected.map(r => r[id]))
+
+    this.elTable?.clearSelection()
+
+    data.forEach(row => {
+      const shouldBeSelected = selectedIds.has(row[id])
+      if (!this.elTable) return
+
+      if (shouldBeSelected) {
+        this.elTable.toggleRowSelection(row, true)
      }
-      this.elTable.toggleRowSelection(r, isSelected)
    })
  }
 }
--- a/src/components/Table/DataTable/index.vue
+++ b/src/components/Table/DataTable/index.vue
@ -10,6 +10,7 @@
 </template>

 <script>
+import { newURL, ObjectLocalStorage } from '@/utils/common'
 import { default as ElDatableTable } from './compenents/el-data-table'
 import { mapGetters } from 'vuex'

@ -27,7 +28,11 @@ export default {
  },
  data() {
    const userTableActions = this.config.tableActions || {}
+    const objTableSize = new ObjectLocalStorage('tableSize')
+    const pathName = newURL(this.config.url).pathname
    return {
+      objTableSize: objTableSize,
+      pathName: pathName,
      defaultConfig: {
        axiosConfig: {
          raw: 1,
@ -70,7 +75,7 @@ export default {
        },
        pageCount: 5,
        paginationLayout: 'total, sizes, prev, pager, next',
-        paginationSize: JSON.parse(localStorage.getItem('paginationSize')) || 15,
+        paginationSize: objTableSize.get(pathName) || 15,
        paginationSizes: [15, 30, 50, 100],
        paginationBackground: true,
        transformQuery: query => {
@ -107,7 +112,7 @@ export default {
      return this.$refs.table
    },
    tableConfig() {
-      const tableDefaultConfig = this.defaultConfig
+      const tableDefaultConfig = this.defaultConfig || {}
      let tableAttrs = tableDefaultConfig.tableAttrs
      if (this.config.tableAttrs) {
        tableAttrs = Object.assign(tableAttrs, this.config.tableAttrs)
@ -124,7 +129,7 @@ export default {
  watch: {},
  methods: {
    getList() {
-      this.$refs.table.clearSelection()
+      this.$refs.table?.clearSelection()
      return this.$refs.table.getList()
    },
    getData() {
@ -157,13 +162,7 @@ export default {
      this.$emit('loaded')
    },
    handleSizeChange(val) {
-      localStorage.setItem('paginationSize', val)
-      this.$store.commit('table/SET_TABLE_CONFIG',
-        {
-          key: 'paginationSize',
-          value: val
-        }
-      )
+      this.objTableSize.set(this.pathName, val)
    }
  }
 }
--- a/src/components/Table/DrawerListTable/PageDrawer.vue
+++ b/src/components/Table/DrawerListTable/PageDrawer.vue
@ -0,0 +1,75 @@
+<template>
+  <Drawer
+    :component="component"
+    :component-listeners="listener"
+    :title="title"
+    :visible.sync="iVisible"
+    append-to-body
+    class="form-drawer"
+    v-bind="props"
+    v-on="$listeners"
+  />
+</template>
+
+<script>
+import Drawer from '@/components/Drawer/index.vue'
+
+export default {
+  components: { Drawer },
+  props: {
+    visible: {
+      type: Boolean,
+      required: true
+    },
+    title: {
+      type: String,
+      default: ''
+    },
+    component: {
+      type: [String, Function],
+      required: true
+    },
+    props: {
+      type: Object,
+      default: () => ({})
+    },
+    action: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      listener: {
+        ...this.$listeners
+      }
+    }
+  },
+  computed: {
+    iVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$log.debug('>>> PageDrawer set to: ', val, this)
+        this.$emit('update:visible', val)
+      }
+    }
+  },
+  mounted() {
+    this.$log.debug('>>> PageDrawer component: ', this.component)
+  },
+  methods: {
+    closeDrawer() {
+      this.iVisible = false
+      // 关闭 Drawer 后，清空所有 params 参数
+      // Reflect.ownKeys(this.$route.params).forEach(key => {
+      //   Reflect.deleteProperty(this.$route.params, key)
+      // })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
--- a/src/components/Table/DrawerListTable/index.vue
+++ b/src/components/Table/DrawerListTable/index.vue
@ -0,0 +1,393 @@
+<template>
+  <div>
+    <ListTable
+      ref="ListTable"
+      :header-actions="iHeaderActions"
+      :table-config="iTableConfig"
+      v-bind="$attrs"
+    />
+    <Drawer
+      v-if="drawerComponent"
+      :action="action"
+      :class="[action]"
+      :component="drawerComponent"
+      :props="drawerProps"
+      :title="drawerTitle"
+      :visible.sync="drawerVisible"
+      class="page-drawer"
+    />
+  </div>
+</template>
+
+<script>
+import ListTable from '../ListTable'
+import Drawer from '@/components/Drawer/index.vue'
+import { setUrlParam, toLowerCaseExcludeAbbr, toSentenceCase } from '@/utils/common'
+import { mapGetters } from 'vuex'
+
+const drawerType = [String, Function]
+
+export default {
+  name: 'GenericListPage',
+  components: {
+    ListTable, Drawer
+  },
+  props: {
+    detailDrawer: {
+      type: drawerType,
+      default: ''
+    },
+    createDrawer: {
+      type: drawerType,
+      default: ''
+    },
+    updateDrawer: {
+      type: drawerType,
+      default: ''
+    },
+    tableConfig: {
+      type: Object,
+      required: true
+    },
+    headerActions: {
+      type: Object,
+      required: true
+    },
+    drawerProps: {
+      type: Object,
+      default: () => ({})
+    },
+    reloadOrderQuery: {
+      type: String,
+      default: '-date_updated'
+    },
+    resource: {
+      type: String,
+      default: ''
+    },
+    getDrawerTitle: {
+      type: Function,
+      default: null
+    }
+  },
+  data() {
+    return {
+      drawerTitle: '',
+      action: '',
+      drawerVisible: false,
+      drawerComponent: ''
+    }
+  },
+  computed: {
+    ...mapGetters(['inDrawer']),
+    iHeaderActions() {
+      const actions = this.headerActions
+      if (!actions.onCreate) {
+        actions.onCreate = this.onCreate
+      }
+      return actions
+    },
+    iTableConfig() {
+      const config = _.cloneDeep(this.tableConfig)
+      const actionMap = {
+        'columnsMeta.actions.formatterArgs.onUpdate': this.onUpdate,
+        'columnsMeta.actions.formatterArgs.onClone': this.onClone,
+        'columnsMeta.name.formatterArgs.onClick': this.onDetail
+      }
+      for (const [key, value] of Object.entries(actionMap)) {
+        if (_.get(config, key)) {
+          continue
+        }
+        _.set(config, key, value)
+      }
+      const columnsMeta = config.columnsMeta
+      for (const value of Object.values(columnsMeta)) {
+        const formatter = value?.formatter
+        const formatterArgs = value?.formatterArgs
+        // console.log('>>> name: ', key)
+        // console.log('>>> formatter: ', formatter)
+        const detailFormaters = ['AmountFormatter', 'DetailFormatter']
+        if (formatter && detailFormaters.includes(formatter.name) && formatterArgs.drawer !== false) {
+          formatterArgs.onClick = this.onDetail
+        }
+      }
+      return config
+    }
+  },
+  watch: {
+    inDrawer(val) {
+      if (!this.drawerVisible) {
+        return
+      }
+      if (!val) {
+        this.drawerVisible = false
+        this.reloadTable()
+      }
+    },
+    drawerVisible: {
+      handler(val, oldVal) {
+        this.$log.debug('>>> drawerVisible changed: ', oldVal, '->', val)
+        if (!val && oldVal) {
+          this.$nextTick(() => {
+            this.afterCloseDrawer()
+          })
+        }
+      }
+    }
+  },
+  mounted() {
+    this.routeFreeze = {
+      params: _.cloneDeep(this.$route.params),
+      query: _.cloneDeep(this.$route.query)
+    }
+    this.$log.debug('>>> DrawerListTable mounted: ', this.routeFreeze)
+  },
+  destroyed() {
+    this.$log.debug('>>> DrawerListTable destroyed')
+  },
+  activated() {
+    this.$log.debug('>>> DrawerListTable activated')
+  },
+  deactivated() {
+    this.$log.debug('>>> DrawerListTable deactivated')
+  },
+  methods: {
+    afterCloseDrawer() {
+      // 清空路由参数, 恢复路由参数
+      for (const key of ['params', 'query']) {
+        const curValue = this.$route[key] || {}
+        for (const k in curValue) {
+          this.$route[key][k] = ''
+        }
+        const value = this.routeFreeze[key] || {}
+        for (const k in value) {
+          this.$route[key][k] = value[k]
+        }
+      }
+      this.drawerComponent = ''
+    },
+    getDetailDrawerTitle({ col, row, cellValue, payload = {}}) {
+      this.$log.debug('>>> getDetailDrawerTitle: ', col, row, cellValue, payload)
+      const { detailRoute = {}, formatterArgs = {}} = payload
+      const getTitle = formatterArgs.getDrawerTitle
+      this.$log.debug('>>> getTitle: ', getTitle)
+      if (getTitle && typeof getTitle === 'function') {
+        return getTitle({ col, row, cellValue })
+      }
+      if (formatterArgs.title) {
+        return formatterArgs.title
+      }
+      const resolvedRoute = this.resolveRoute(detailRoute)
+      let title = cellValue || row.name
+      if (formatterArgs.getTitle) {
+        title = formatterArgs.getTitle({ col, row, cellValue })
+      }
+      let resource = resolvedRoute?.meta?.title || resolvedRoute?.name || ''
+      resource = resource.replace('Detail', '').replace('详情', '')
+
+      if (resource) {
+        title = `${resource}: ${title}`
+      }
+      return title
+    },
+    getActionDrawerTitle({ action, row, col, cellValue, payload }) {
+      if (action === 'detail') {
+        return this.getDetailDrawerTitle({ col, row, cellValue, payload })
+      }
+
+      let title = this.title
+      if (!title && this.resource) {
+        title = this.resource
+      }
+      if (!title) {
+        title = this.$route.meta?.title
+        title = title.replace('List', '').replace('列表', '')
+        title = _.trimEnd(title, 's')
+      }
+      if (!title) {
+        title = this.$t('NoTitle')
+      }
+      let actionLabel = ''
+      if (action === 'clone' || action === 'create') {
+        actionLabel = this.$t('Create')
+      } else if (action === 'update') {
+        actionLabel = this.$t('Update')
+      } else if (action === 'detail') {
+        actionLabel = this.$t('Detail')
+      }
+      title = actionLabel + this.$t('WordSep') + toLowerCaseExcludeAbbr(title)
+      return title
+    },
+    getDefaultDrawer(action) {
+      const route = this.$route.name
+      const actionRouteName = route.replace('List', toSentenceCase(action))
+      return this.getRouteNameComponent(actionRouteName, action)
+    },
+    getRouteNameComponent(name, action) {
+      const route = { name: name }
+      if (action === 'detail' || action === 'update') {
+        route.params = { id: '1' }
+      }
+      const routes = this.$router.resolve(route)
+      if (!routes) {
+        return
+      }
+      const matched = routes.resolved.matched.filter(item => item.name === name && item.components)
+      if (matched.length === 0) {
+        return
+      }
+
+      if (matched[0] && matched[0].components?.default) {
+        const component = matched[0].components.default
+        return component
+      }
+    },
+    resolveRoute(route) {
+      const routes = this.$router.resolve(route)
+      if (!routes) {
+        return
+      }
+      const matched = routes.resolved.matched.filter(item => item.name === route.name && item.components)
+      if (matched.length === 0) {
+        return
+      }
+      if (matched[0] && matched[0].components?.default) {
+        return matched[0]
+      }
+    },
+    getDetailComponent({ detailRoute }) {
+      if (!detailRoute) {
+        return this.detailDrawer
+      }
+      this.$log.debug('>>> getDetailComponent: ', detailRoute)
+      const route = this.resolveRoute(detailRoute)
+      let component = null
+      if (route) {
+        component = route.components.default
+      }
+      if (!component) {
+        component = this.detailDrawer
+      }
+      return component
+    },
+    getDrawerComponent(action, payload) {
+      this.$log.debug('>>> getDrawerComponent: ', action, payload)
+      switch (action) {
+        case 'create':
+          return this.createDrawer
+        case 'update':
+          return this.updateDrawer || this.createDrawer
+        case 'detail':
+          return this.getDetailComponent(payload)
+        case 'clone':
+          return this.createDrawer || this.getDefaultDrawer('create')
+        default:
+          return this.createDrawer
+      }
+    },
+
+    async showDrawer(action, { row = {}, col = {}, query = {}, cellValue = '', payload = {}} = {}) {
+      try {
+        // 1. 先重置状态
+        this.drawerVisible = false
+        this.action = action
+
+        for (const key in query) {
+          this.$route.query[key] = query[key]
+        }
+
+        // 2. 等待下一个 tick，确保状态已重置
+        await this.$nextTick()
+
+        // 3. 设置组件
+        this.drawerComponent = this.getDrawerComponent(action, payload)
+        this.$log.debug('>>> drawerComponent: ', this.drawerComponent)
+        this.drawerTitle = this.getActionDrawerTitle({ action, row, col, cellValue, payload })
+
+        // 4. 如果没有组件，尝试获取默认组件
+        if (!this.drawerComponent) {
+          this.drawerComponent = this.getDefaultDrawer(action)
+        }
+
+        // 5. 如果还是没有组件，报错
+        if (!this.drawerComponent) {
+          throw new Error(`No drawer component found for action: ${action}`)
+        }
+
+        // 6. 获取标题
+        if (this.getDrawerTitle) {
+          const actionMeta = await this.$store.getters['common/drawerActionMeta']
+          this.title = this.getDrawerTitle({ action, ...actionMeta })
+        }
+
+        // 7. 等待下一个 tick，确保组件已设置
+        await this.$nextTick()
+
+        // 8. 显示抽屉
+        this.drawerVisible = true
+
+        this.$log.debug('Drawer initialized:', {
+          title: this.title,
+          visible: this.drawerVisible,
+          component: this.drawerComponent,
+          action: this.action,
+          'this': this,
+          'vm': this.vm
+        })
+      } catch (error) {
+        console.error('Failed to show drawer:', error)
+        this.drawerVisible = false
+        this.drawerComponent = ''
+      }
+    },
+    reloadTable() {
+      if (this.reloadOrderQuery) {
+        this.iTableConfig.url = setUrlParam(this.iTableConfig.url, 'order', this.reloadOrderQuery)
+      }
+      this.$refs.ListTable.reloadTable()
+    },
+    async onDetail({ row, col, cellValue, detailRoute, formatterArgs }) {
+      this.$log.debug('>>> onDetail: ', detailRoute, formatterArgs)
+      this.$route.params.id = row.id
+      // 因为使用 detail formatter 时，id 可能并非 row 的，比如 execution 的 task id
+      const query = detailRoute?.query || {}
+      const params = detailRoute?.params || {}
+      for (const key in query) {
+        this.$route.query[key] = query[key]
+      }
+      for (const key in params) {
+        this.$route.params[key] = params[key]
+      }
+      // 有可能来自 params 或者 row
+      const id = params.id || row.id
+      await this.$store.dispatch('common/setDrawerActionMeta', {
+        action: 'detail', row: row, col: col, id: id
+      })
+      await this.showDrawer('detail', { row, col, cellValue, payload: { detailRoute, formatterArgs }})
+    },
+    async onCreate(meta) {
+      if (!meta) {
+        meta = {}
+      }
+      this.$route.params.id = ''
+      await this.$store.dispatch('common/setDrawerActionMeta', { action: 'create', ...meta })
+      await this.showDrawer('create', meta)
+    },
+    async onClone({ row, col, query = {}}) {
+      this.$route.params.id = ''
+      await this.$store.dispatch('common/setDrawerActionMeta', {
+        action: 'clone', row: row, col: col, id: row.id
+      })
+      await this.showDrawer('clone', { query })
+    },
+    async onUpdate({ row, col, query = {}}) {
+      this.$route.params.id = row.id
+      this.$route.params.action = 'update'
+      await this.$store.dispatch('common/setDrawerActionMeta', {
+        action: 'update', row: row, col: col, id: row.id
+      })
+      await this.showDrawer('update', { query })
+    }
+  }
+}
+</script>
--- a/src/components/Table/InfoCardTable/Info.vue
+++ b/src/components/Table/InfoCardTable/Info.vue
@ -0,0 +1,64 @@
+<template>
+  <div class="item-info">
+    <el-row>
+      <el-col v-for="(item, i) of infos" :key="i" :span="12" class="panel-item">
+        <small class="item-label">{{ item.title }}</small>
+        <h4 class="item-value">{{ item.content }}</h4>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'InfoPanel',
+  components: {},
+  props: {
+    infos: {
+      type: Array,
+      default: () => ([])
+    }
+  },
+  data() {
+    return {}
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+@mixin textOverflow {
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
+.panel-item {
+  text-align: start;
+}
+
+.panel-label {
+
+}
+
+//
+//.panel-item {
+//  flex-wrap: nowrap;
+//  text-align: left;
+//  padding: 3px 0;
+//  line-height: 20px;
+//
+//  .item-label {
+//    text-align: left;
+//    display: flex;
+//    flex: 1;
+//    min-width: 110px;
+//  }
+//
+//  .text-info {
+//    flex: 2;
+//    @include textOverflow;
+//  }
+//}
+//
+
+</style>
--- a/Show More
+++ b/Show More