merge: with dev

2025-08-01 23:18:17 +00:00 · 2024-02-05 10:06:15 +08:00 · 2024-02-05 10:06:15 +08:00 · c0d4ec7dba
commit c0d4ec7dba
parent b91287a974 ba109da324
67 changed files with 852 additions and 328 deletions
--- a/package.json
+++ b/package.json
@ -33,7 +33,7 @@
    "crypto-js": "^4.1.1",
    "css-color-function": "^1.3.3",
    "deepmerge": "^4.2.2",
-    "echarts": "^4.7.0",
+    "echarts": "4.7.0",
    "element-ui": "2.13.2",
    "eslint-plugin-html": "^6.0.0",
    "highlight.js": "^11.9.0",
--- a/public/index.html
+++ b/public/index.html
@ -27,6 +27,9 @@
        if(pathname.indexOf('/ui') === -1) {
          window.location.href = window.location.origin + '/ui/#' + pathname
        }
+        if (pathname.startsWith('/ui/#/chat')) {
+          window.location.href = window.location.origin + pathname
+        }
      }
    </script>
    <div id="app"></div>
--- a/src/components/Apps/AccountCreateUpdateForm/const.js
+++ b/src/components/Apps/AccountCreateUpdateForm/const.js
@ -0,0 +1,191 @@
+import { UpdateToken, UploadSecret } from '@/components/Form/FormFields'
+import Select2 from '@/components/Form/FormFields/Select2.vue'
+import AssetSelect from '@/components/Apps/AssetSelect/index.vue'
+import { Required, RequiredChange } from '@/components/Form/DataForm/rules'
+import AutomationParamsForm from '@/views/assets/Platform/AutomationParamsSetting.vue'
+
+export const accountFieldsMeta = (vm) => {
+  const defaultPrivilegedAccounts = ['root', 'administrator']
+  return {
+    assets: {
+      rules: [Required],
+      component: AssetSelect,
+      label: vm.$t('assets.Asset'),
+      el: {
+        multiple: false
+      },
+      hidden: () => {
+        return vm.platform || vm.asset
+      }
+    },
+    template: {
+      component: Select2,
+      rules: [Required],
+      el: {
+        multiple: false,
+        ajax: {
+          url: '/api/v1/accounts/account-templates/',
+          transformOption: (item) => {
+            return { label: item.name, value: item.id }
+          }
+        }
+      },
+      hidden: () => {
+        return vm.platform || vm.asset || !vm.addTemplate
+      }
+    },
+    on_invalid: {
+      rules: [Required],
+      label: vm.$t('accounts.AccountPolicy'),
+      helpText: vm.$t('accounts.BulkCreateStrategy'),
+      hidden: () => {
+        return vm.platform || vm.asset
+      }
+    },
+    name: {
+      label: vm.$t('common.Name'),
+      rules: [RequiredChange],
+      on: {
+        input: ([value], updateForm) => {
+          if (!vm.usernameChanged) {
+            if (!vm.account?.name) {
+              updateForm({ username: value })
+            }
+            const maybePrivileged = defaultPrivilegedAccounts.includes(value)
+            if (maybePrivileged) {
+              updateForm({ privileged: true })
+            }
+          }
+        }
+      },
+      hidden: () => {
+        return vm.addTemplate
+      }
+    },
+    username: {
+      el: {
+        disabled: !!vm.account?.name
+      },
+      on: {
+        input: ([value], updateForm) => {
+          vm.usernameChanged = true
+        },
+        change: ([value], updateForm) => {
+          const maybePrivileged = defaultPrivilegedAccounts.includes(value)
+          if (maybePrivileged) {
+            updateForm({ privileged: true })
+          }
+        }
+      },
+      hidden: () => {
+        return vm.addTemplate
+      }
+    },
+    privileged: {
+      label: vm.$t('assets.Privileged'),
+      hidden: () => {
+        return vm.addTemplate
+      }
+    },
+    su_from: {
+      component: Select2,
+      hidden: (formValue) => {
+        return !vm.asset?.id || !vm.iPlatform.su_enabled
+      },
+      el: {
+        multiple: false,
+        clearable: true,
+        ajax: {
+          url: `/api/v1/accounts/accounts/su-from-accounts/?account=${vm.account?.id || ''}&asset=${vm.asset?.id || ''}`,
+          transformOption: (item) => {
+            return { label: `${item.name}(${item.username})`, value: item.id }
+          }
+        }
+      }
+    },
+    su_from_username: {
+      label: vm.$t('assets.UserSwitchFrom'),
+      hidden: (formValue) => {
+        return vm.platform || vm.asset || vm.addTemplate
+      }
+    },
+    password: {
+      label: vm.$t('assets.Password'),
+      component: UpdateToken,
+      hidden: (formValue) => {
+        console.log('formValue: ', formValue)
+        return formValue.secret_type !== 'password' || vm.addTemplate
+      }
+    },
+    ssh_key: {
+      label: vm.$t('assets.PrivateKey'),
+      component: UploadSecret,
+      hidden: (formValue) => formValue.secret_type !== 'ssh_key' || vm.addTemplate
+    },
+    passphrase: {
+      label: vm.$t('assets.Passphrase'),
+      component: UpdateToken,
+      hidden: (formValue) => formValue.secret_type !== 'ssh_key' || vm.addTemplate
+    },
+    token: {
+      label: vm.$t('assets.Token'),
+      component: UploadSecret,
+      hidden: (formValue) => formValue.secret_type !== 'token' || vm.addTemplate
+    },
+    access_key: {
+      id: 'access_key',
+      label: vm.$t('assets.AccessKey'),
+      component: UploadSecret,
+      hidden: (formValue) => formValue.secret_type !== 'access_key' || vm.addTemplate
+    },
+    api_key: {
+      id: 'api_key',
+      label: vm.$t('assets.ApiKey'),
+      component: UploadSecret,
+      hidden: (formValue) => formValue.secret_type !== 'api_key' || vm.addTemplate
+    },
+    secret_type: {
+      type: 'radio-group',
+      options: [],
+      hidden: () => {
+        return vm.addTemplate
+      }
+    },
+    push_now: {
+      helpText: vm.$t('accounts.AccountPush.WindowsPushHelpText'),
+      hidden: (formValue) => {
+        const automation = vm.iPlatform.automation || {}
+        return !automation.push_account_enabled ||
+          !automation.ansible_enabled ||
+          !vm.$hasPerm('accounts.push_account') ||
+          (formValue.secret_type === 'ssh_key' && vm.iPlatform.type.value === 'windows') ||
+          vm.addTemplate
+      }
+    },
+    params: {
+      label: vm.$t('assets.PushParams'),
+      component: AutomationParamsForm,
+      el: {
+        method: vm.asset?.auto_config?.push_account_method
+      },
+      hidden: (formValue) => {
+        const automation = vm.iPlatform.automation || {}
+        return !formValue.push_now ||
+          !automation.push_account_enabled ||
+          !automation.ansible_enabled ||
+          (formValue.secret_type === 'ssh_key' && vm.iPlatform.type.value === 'windows') ||
+          !vm.$hasPerm('accounts.push_account') ||
+          vm.addTemplate
+      }
+    },
+    is_active: {
+      label: vm.$t('common.IsActive')
+    },
+    comment: {
+      label: vm.$t('common.Comment'),
+      hidden: () => {
+        return vm.addTemplate
+      }
+    }
+  }
+}
--- a/src/components/Apps/AccountCreateUpdateForm/index.vue
+++ b/src/components/Apps/AccountCreateUpdateForm/index.vue
@ -9,12 +9,8 @@

 <script>
 import AutoDataForm from '@/components/Form/AutoDataForm/index.vue'
-import { UpdateToken, UploadSecret } from '@/components/Form/FormFields'
-import Select2 from '@/components/Form/FormFields/Select2.vue'
-import AssetSelect from '@/components/Apps/AssetSelect/index.vue'
 import { encryptPassword } from '@/utils/crypto'
-import { Required, RequiredChange } from '@/components/Form/DataForm/rules'
-import AutomationParamsForm from '@/views/assets/Platform/AutomationParamsSetting.vue'
+import { accountFieldsMeta } from '@/components/Apps/AccountCreateUpdateForm/const'

 export default {
  name: 'AccountCreateForm',
@ -48,7 +44,6 @@ export default {
    return {
      loading: true,
      usernameChanged: false,
-      defaultPrivilegedAccounts: ['root', 'administrator'],
      iPlatform: {
        automation: {},
        su_enabled: false,
@ -72,179 +67,7 @@ export default {
        ]],
        [this.$t('Other'), ['push_now', 'params', 'on_invalid', 'is_active', 'comment']]
      ],
-      fieldsMeta: {
-        assets: {
-          rules: [Required],
-          component: AssetSelect,
-          label: this.$t('Asset'),
-          el: {
-            multiple: false
-          },
-          hidden: () => {
-            return this.platform || this.asset
-          }
-        },
-        template: {
-          component: Select2,
-          rules: [Required],
-          el: {
-            multiple: false,
-            ajax: {
-              url: '/api/v1/accounts/account-templates/',
-              transformOption: (item) => {
-                return { label: item.name, value: item.id }
-              }
-            }
-          },
-          hidden: () => {
-            return this.platform || this.asset || !this.addTemplate
-          }
-        },
-        on_invalid: {
-          rules: [Required],
-          label: this.$t('AccountPolicy'),
-          helpText: this.$t('BulkCreateStrategy'),
-          hidden: () => {
-            return this.platform || this.asset
-          }
-        },
-        name: {
-          rules: [RequiredChange],
-          on: {
-            input: ([value], updateForm) => {
-              if (!this.usernameChanged) {
-                if (!this.account?.name) {
-                  updateForm({ username: value })
-                }
-                const maybePrivileged = this.defaultPrivilegedAccounts.includes(value)
-                if (maybePrivileged) {
-                  updateForm({ privileged: true })
-                }
-              }
-            }
-          },
-          hidden: () => {
-            return this.addTemplate
-          }
-        },
-        username: {
-          el: {
-            disabled: !!this.account?.name
-          },
-          on: {
-            input: ([value], updateForm) => {
-              this.usernameChanged = true
-            },
-            change: ([value], updateForm) => {
-              const maybePrivileged = this.defaultPrivilegedAccounts.includes(value)
-              if (maybePrivileged) {
-                updateForm({ privileged: true })
-              }
-            }
-          },
-          hidden: () => {
-            return this.addTemplate
-          }
-        },
-        privileged: {
-          hidden: () => {
-            return this.addTemplate
-          }
-        },
-        su_from: {
-          component: Select2,
-          hidden: (formValue) => {
-            return !this.asset?.id || !this.iPlatform.su_enabled
-          },
-          el: {
-            multiple: false,
-            clearable: true,
-            ajax: {
-              url: `/api/v1/accounts/accounts/su-from-accounts/?account=${this.account?.id || ''}&asset=${this.asset?.id || ''}`,
-              transformOption: (item) => {
-                return { label: `${item.name}(${item.username})`, value: item.id }
-              }
-            }
-          }
-        },
-        su_from_username: {
-          label: this.$t('SwitchFrom'),
-          hidden: (formValue) => {
-            return this.platform || this.asset || this.addTemplate
-          }
-        },
-        password: {
-          label: this.$t('Password'),
-          component: UpdateToken,
-          hidden: (formValue) => formValue.secret_type !== 'password' || this.addTemplate
-        },
-        ssh_key: {
-          label: this.$t('PrivateKey'),
-          component: UploadSecret,
-          hidden: (formValue) => formValue.secret_type !== 'ssh_key' || this.addTemplate
-        },
-        passphrase: {
-          label: this.$t('Passphrase'),
-          component: UpdateToken,
-          hidden: (formValue) => formValue.secret_type !== 'ssh_key' || this.addTemplate
-        },
-        token: {
-          label: this.$t('Token'),
-          component: UploadSecret,
-          hidden: (formValue) => formValue.secret_type !== 'token' || this.addTemplate
-        },
-        access_key: {
-          id: 'access_key',
-          label: this.$t('AccessKey'),
-          component: UploadSecret,
-          hidden: (formValue) => formValue.secret_type !== 'access_key' || this.addTemplate
-        },
-        api_key: {
-          id: 'api_key',
-          label: this.$t('ApiKey'),
-          component: UploadSecret,
-          hidden: (formValue) => formValue.secret_type !== 'api_key' || this.addTemplate
-        },
-        secret_type: {
-          type: 'radio-group',
-          options: [],
-          hidden: () => {
-            return this.addTemplate
-          }
-        },
-        push_now: {
-          helpText: this.$t('WindowsPushHelpText'),
-          hidden: (formValue) => {
-            const automation = this.iPlatform.automation || {}
-            return !automation.push_account_enabled ||
-              !automation.ansible_enabled ||
-              !this.$hasPerm('accounts.push_account') ||
-              (formValue.secret_type === 'ssh_key' && this.iPlatform.type.value === 'windows') ||
-              this.addTemplate
-          }
-        },
-        params: {
-          label: this.$t('PushParams'),
-          component: AutomationParamsForm,
-          el: {
-            method: this.asset?.auto_config?.push_account_method
-          },
-          hidden: (formValue) => {
-            const automation = this.iPlatform.automation || {}
-            return !formValue.push_now ||
-              !automation.push_account_enabled ||
-              !automation.ansible_enabled ||
-              (formValue.secret_type === 'ssh_key' && this.iPlatform.type.value === 'windows') ||
-              !this.$hasPerm('accounts.push_account') ||
-              this.addTemplate
-          }
-        },
-        comment: {
-          hidden: () => {
-            return this.addTemplate
-          }
-        }
-      },
+      fieldsMeta: accountFieldsMeta(this),
      hasSaveContinue: false
    }
  },
--- a/src/components/Apps/AccountListTable/AccountBulkUpdateDialog.vue
+++ b/src/components/Apps/AccountListTable/AccountBulkUpdateDialog.vue
@ -0,0 +1,87 @@
+<template>
+  <GenericUpdateFormDialog
+    v-if="visible"
+    :form-setting="formSetting"
+    :selected-rows="selectedRows"
+    :visible="visible"
+    v-on="$listeners"
+  />
+</template>
+
+<script>
+import { GenericUpdateFormDialog } from '@/layout/components'
+import { accountFieldsMeta } from '@/components/Apps/AccountCreateUpdateForm/const'
+import { encryptPassword } from '@/utils/crypto'
+
+export default {
+  name: 'AccountBulkUpdateDialog',
+  components: {
+    GenericUpdateFormDialog
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    selectedRows: {
+      type: Array,
+      default: () => ([])
+    }
+  },
+  data() {
+    return {
+      formSetting: {
+        url: '/api/v1/accounts/accounts/',
+        hasSaveContinue: false,
+        fields: [],
+        fieldsMeta: accountFieldsMeta(this),
+        cleanOtherFormValue: (formValue) => {
+          for (const value of formValue) {
+            Object.keys(value).forEach((item, index, arr) => {
+              if (['ssh_key', 'token', 'access_key', 'api_key', 'password'].includes(item)) {
+                value['secret'] = encryptPassword(value[item])
+                delete value[item]
+              }
+            })
+          }
+          return formValue
+        }
+      }
+    }
+  },
+  created() {
+    this.filterFieldsMeta()
+  },
+  methods: {
+    filterFieldsMeta() {
+      let fields = ['privileged']
+      const fieldsMeta = {}
+      const secretFields = ['password', 'ssh_key', 'passphrase', 'token', 'access_key', 'api_key']
+      const secret_type = this.selectedRows[0].secret_type?.value || 'password'
+      for (const field of secretFields) {
+        if (secret_type === 'ssh_key' && field === 'passphrase') {
+          fields.push('passphrase')
+          this.formSetting.fieldsMeta['passphrase'].hidden = () => false
+          continue
+        }
+        if (secret_type === field) {
+          fields.push(field)
+          this.formSetting.fieldsMeta[field].hidden = () => false
+          continue
+        }
+        delete this.formSetting.fieldsMeta[field]
+      }
+      fields = fields.concat(['is_active', 'comment'])
+      for (const field of fields) {
+        fieldsMeta[field] = this.formSetting.fieldsMeta[field]
+      }
+      this.formSetting.fields = fields
+      this.formSetting.fieldsMeta = fieldsMeta
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
--- a/src/components/Apps/AccountListTable/AccountList.vue
+++ b/src/components/Apps/AccountListTable/AccountList.vue
@ -37,6 +37,12 @@
      :result="createAccountResults"
      :visible.sync="showResultDialog"
    />
+    <AccountBulkUpdateDialog
+      v-if="updateSelectedDialogSetting.visible"
+      :visible.sync="updateSelectedDialogSetting.visible"
+      v-bind="updateSelectedDialogSetting"
+      @update="handleAccountBulkUpdate"
+    />
  </div>
 </template>

@ -49,10 +55,12 @@ import AccountCreateUpdate from './AccountCreateUpdate.vue'
 import { connectivityMeta } from './const'
 import { openTaskPage } from '@/utils/jms'
 import ResultDialog from './BulkCreateResultDialog.vue'
+import AccountBulkUpdateDialog from '@/components/Apps/AccountListTable/AccountBulkUpdateDialog.vue'

 export default {
  name: 'AccountListTable',
  components: {
+    AccountBulkUpdateDialog,
    ResultDialog,
    ListTable,
    UpdateSecretInfo,
@ -116,6 +124,10 @@ export default {
    headerExtraActions: {
      type: Array,
      default: () => []
+    },
+    extraQuery: {
+      type: Object,
+      default: () => ({})
    }
  },
  data() {
@ -137,9 +149,7 @@ export default {
          app: 'assets',
          resource: 'account'
        },
-        extraQuery: {
-          order: '-date_updated'
-        },
+        extraQuery: this.extraQuery,
        columnsExclude: ['spec_info'],
        columnsShow: {
          min: ['name', 'username', 'actions'],
@ -336,6 +346,25 @@ export default {
          ...this.headerExtraActions
        ],
        extraMoreActions: [
+          {
+            name: 'BulkVerify',
+            title: this.$t('accounts.BulkVerify'),
+            type: 'primary',
+            fa: 'fa-handshake-o',
+            can: ({ selectedRows }) => {
+              return selectedRows.length > 0
+            },
+            callback: function({ selectedRows }) {
+              const ids = selectedRows.map(v => { return v.id })
+              this.$axios.post(
+                '/api/v1/accounts/accounts/tasks/',
+                { action: 'verify', accounts: ids }).then(res => {
+                openTaskPage(res['task'])
+              }).catch(err => {
+                this.$message.error(this.$tc('common.bulkVerifyErrorMsg' + ' ' + err))
+              })
+            }.bind(this)
+          },
          {
            name: 'ClearSecrets',
            title: this.$t('ClearSecret'),
@ -354,6 +383,21 @@ export default {
                this.$message.error(this.$tc('BulkClearErrorMsg' + ' ' + err))
              })
            }.bind(this)
+          },
+          {
+            name: 'actionUpdateSelected',
+            title: this.$t('accounts.AccountBatchUpdate'),
+            fa: 'batch-update',
+            can: ({ selectedRows }) => {
+              return selectedRows.length > 0 &&
+                !this.$store.getters.currentOrgIsRoot &&
+                vm.$hasPerm('accounts.change_account') &&
+                selectedRows.every(i => i.secret_type.value === selectedRows[0].secret_type.value)
+            },
+            callback: ({ selectedRows }) => {
+              vm.updateSelectedDialogSetting.selectedRows = selectedRows
+              vm.updateSelectedDialogSetting.visible = true
+            }
          }
        ],
        canBulkDelete: vm.$hasPerm('accounts.delete_account'),
@ -362,6 +406,10 @@ export default {
          exclude: ['asset']
        },
        hasSearch: true
+      },
+      updateSelectedDialogSetting: {
+        visible: false,
+        selectedRows: []
      }
    }
  },
@ -429,6 +477,10 @@ export default {
      setTimeout(() => {
        this.showResultDialog = true
      }, 100)
+    },
+    handleAccountBulkUpdate() {
+      this.updateSelectedDialogSetting.visible = false
+      this.$refs.ListTable.reloadTable()
    }
  }
 }
--- a/src/components/Apps/AssetSelect/dialog.vue
+++ b/src/components/Apps/AssetSelect/dialog.vue
@ -1,5 +1,6 @@
 <template>
  <Dialog
+    :close-on-click-modal="false"
    :title="$tc('Assets')"
    custom-class="asset-select-dialog"
    top="2vh"
@ -109,6 +110,7 @@ export default {
      headerActions: {
        hasLeftActions: false,
        hasRightActions: false,
+        hasLabelSearch: true,
        searchConfig: {
          getUrlQuery: false
        }
--- a/src/components/Apps/AssetTreeTable/index.vue
+++ b/src/components/Apps/AssetTreeTable/index.vue
@ -60,6 +60,7 @@ export default {
    const showAssets = this.treeSetting?.showAssets || this.showAssets
    const treeUrlQuery = this.setTreeUrlQuery()
    const assetTreeUrl = `${this.treeUrl}?assets=${showAssets ? '1' : '0'}&${treeUrlQuery}`
+    const vm = this

    return {
      treeTabConfig: {
@ -81,7 +82,13 @@ export default {
              nodeUrl: this.nodeUrl,
              treeUrl: assetTreeUrl,
              callback: {
-                onSelected: (event, treeNode) => this.getAssetsUrl(treeNode)
+                onSelected: (event, treeNode) => this.getAssetsUrl(treeNode),
+                beforeRefresh: () => {
+                  const query = { ...this.$route.query, node_id: '', asset_id: '' }
+                  setTimeout(() => {
+                    vm.$router.replace({ query: query })
+                  }, 100)
+                }
              },
              ...this.treeSetting
            }
--- a/src/components/Apps/ChatAi/components/Sidebar/index.vue
+++ b/src/components/Apps/ChatAi/components/Sidebar/index.vue
@ -1,7 +1,7 @@
 <template>
  <div class="container">
    <div class="close-sidebar">
-      <i class="el-icon-close" @click="onClose" />
+      <i v-if="hasClose" class="el-icon-close" @click="onClose" />
    </div>
    <el-tabs v-model="active" :tab-position="'right'" @tab-click="handleClick">
      <el-tab-pane v-for="(item) in submenu" :key="item.name" :name="item.name">
@ -22,6 +22,10 @@ export default {
      type: String,
      default: 'chat'
    },
+    hasClose: {
+      type: Boolean,
+      default: true
+    },
    submenu: {
      type: Array,
      default: () => []
@ -48,9 +52,10 @@ export default {
  height: 100%;
  background-color: #f0f1f5;
  .close-sidebar {
+    height: 48px;
+    padding: 12px 0;
    text-align: center;
    font-size: 14px;
-    padding: 12px 0;
    cursor: pointer;
    i {
      font-size: 16px;
--- a/src/components/Apps/ChatAi/index.vue
+++ b/src/components/Apps/ChatAi/index.vue
@ -18,7 +18,7 @@
      </div>
    </div>
    <div class="sidebar">
-      <Sidebar :active.sync="active" :submenu="submenu" />
+      <Sidebar v-bind="$attrs" :active.sync="active" :submenu="submenu" />
    </div>
  </div>
 </template>
@ -62,11 +62,14 @@ export default {
  watch: {
    drawerPanelVisible(value) {
      if (value && !ws) {
-        this.$refs.component?.init()
+        this.initWebSocket()
      }
    }
  },
  methods: {
+    initWebSocket() {
+      this.$refs.component?.init()
+    },
    onClose() {
      this.$parent.show = false
    },
--- a/src/components/Apps/GrantedAssets/index.vue
+++ b/src/components/Apps/GrantedAssets/index.vue
@ -5,6 +5,7 @@
 <script type="text/jsx">
 import TreeTable from '../../Table/TreeTable/index.vue'
 import { DetailFormatter } from '@/components/Table/TableFormatters'
+import { connectivityMeta } from '@/components/Apps/AccountListTable/const'

 export default {
  name: 'GrantedAssets',
@ -58,9 +59,9 @@ export default {
        url: this.tableUrl,
        hasTree: true,
        columnsExclude: ['spec_info'],
-        columnShow: {
+        columnsShow: {
          min: ['name', 'address', 'accounts'],
-          default: ['name', 'address', 'accounts', 'actions']
+          default: ['name', 'address', 'platform', 'connectivity']
        },
        columnsMeta: {
          name: {
@ -71,7 +72,8 @@ export default {
          },
          actions: {
            has: false
-          }
+          },
+          connectivity: connectivityMeta
        }
      },
      headerActions: {
--- a/src/components/Form/AutoDataForm/utils.js
+++ b/src/components/Form/AutoDataForm/utils.js
@ -7,7 +7,6 @@ import BasicTree from '@/components/Form/FormFields/BasicTree.vue'
 import JsonEditor from '@/components/Form/FormFields/JsonEditor.vue'
 import { assignIfNot, capitalizeFirst } from '@/utils/common'
 import TagInput from '@/components/Form/FormFields/TagInput.vue'
-import Select2 from '@/components/Form/FormFields/Select2.vue'
 import TransferSelect from '@/components/Form/FormFields/TransferSelect.vue'

 export class FormFieldGenerator {
@ -46,7 +45,7 @@ export class FormFieldGenerator {
        break
      case 'field':
        type = ''
-        field.component = Select2
+        field.component = ObjectSelect2
        if (fieldRemoteMeta.required) {
          field.el.clearable = false
        }
@ -77,7 +76,7 @@ export class FormFieldGenerator {
        field.component = ObjectSelect2
        break
      case 'm2m_related_field':
-        field.component = Select2
+        field.component = ObjectSelect2
        field.el.label = field.label
        break
      case 'nested object':
--- a/src/components/Form/CronTab/Crontab.vue
+++ b/src/components/Form/CronTab/Crontab.vue
@ -100,7 +100,7 @@
          <div style="font-size: 13px;">{{ contabValueString }}</div>
        </div>
      </div>
-      <CrontabResult :ex="contabValueString" />
+      <CrontabResult :ex="contabValueString" @crontabDiffChange="crontabDiffChangeHandle" />

      <div class="pop_btn">
        <el-button
@ -167,7 +167,8 @@ export default {
        week: '*'
        // year: "",
      },
-      newContabValueString: ''
+      newContabValueString: '',
+      crontabDiff: 0
    }
  },
  computed: {
@ -364,6 +365,12 @@ export default {
    },
    // 填充表达式
    submitFill() {
+      const crontabDiffMin = this.crontabDiff / 1000 / 60
+      if (crontabDiffMin > 0 && crontabDiffMin < 10) {
+        const msg = this.$tc('common.crontabDiffError')
+        this.$message.error(msg)
+        return
+      }
      this.$emit('fill', this.contabValueString)
      this.hidePopup()
    },
@ -381,6 +388,9 @@ export default {
      for (const j in this.contabValueObj) {
        this.changeRadio(j, this.contabValueObj[j])
      }
+    },
+    crontabDiffChangeHandle(diff) {
+      this.crontabDiff = diff
    }
  }
 }
@ -454,7 +464,7 @@ export default {
 }

 .crontab-panel {
-  >>> .el-input-number {
+  > > > .el-input-number {
    margin: 0 5px
  }
 }
--- a/src/components/Form/CronTab/components/Crontab-Result.vue
+++ b/src/components/Form/CronTab/components/Crontab-Result.vue
@ -52,6 +52,10 @@ export default {
          const cur = interval.next().toString()
          this.resultList.push(toSafeLocalDateStr(cur))
        }
+        const first = new Date(this.resultList[0])
+        const second = new Date(this.resultList[1])
+        const diff = Math.abs(second - first)
+        this.$emit('crontabDiffChange', diff)
      } catch (error) {
        this.isShow = false
        // debug(error, 'error')
--- 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
@ -7,13 +7,11 @@
    v-bind="data.attrs"
  >
    <template v-if="data.helpTips" #label>
+      {{ data.label }}
      <el-tooltip placement="top" effect="light" popper-class="help-tips">
        <div slot="content" v-html="data.helpTips" />
-        <el-button style="padding: 0">
-          <i class="fa fa-question-circle" />
-        </el-button>
+        <i class="fa fa-question-circle-o" />
      </el-tooltip>
-      {{ data.label }}
    </template>
    <template v-if="readonly && hasReadonlyContent">
      <div
@ -70,7 +68,8 @@
          :key="opt.label"
          v-bind="opt"
          :label="'value' in opt ? opt.value : opt.label"
-        >{{ opt.label }}</el-radio>
+        >{{ opt.label }}
+        </el-radio>
      </template>
    </custom-component>
    <div v-if="data.helpText" class="help-block" v-html="data.helpText" />
--- a/src/components/Form/FormFields/CodeEditor.vue
+++ b/src/components/Form/FormFields/CodeEditor.vue
@ -2,7 +2,7 @@
  <div class="code-editor" style="font-size: 12px">
    <div class="toolbar">
      <div
-        v-for="(item,index) in toolbar.left"
+        v-for="(item,index) in iActions"
        :key="index"
        style="display: inline-block; margin: 0 2px"
      >
@ -93,6 +93,16 @@
        </el-tooltip>
      </div>

+      <div v-if="toolbar.hasOwnProperty('fold')" class="fold">
+        <el-tooltip :content="$tc('common.MoreActions')" placement="top">
+          <i
+            class="fa"
+            :class="[isFold ? 'fa-angle-double-right': 'fa-angle-double-down']"
+            @click="onChangeFold"
+          />
+        </el-tooltip>
+      </div>
+
      <div class="right-side" style="float: right">
        <div
          v-for="(item,index) in toolbar.right"
@ -154,9 +164,19 @@ export default {
    }
  },
  data() {
-    return {}
+    return {
+      isFold: true
+    }
  },
  computed: {
+    iActions() {
+      let actions = this.toolbar.left || {}
+      const fold = this.toolbar.fold || {}
+      if (!this.isFold) {
+        actions = { ...actions, ...fold }
+      }
+      return actions
+    },
    iValue: {
      get() {
        return this.value
@ -179,6 +199,9 @@ export default {
    }
  },
  methods: {
+    onChangeFold() {
+      this.isFold = !this.isFold
+    },
    getLabel(value, items) {
      for (const item of items) {
        if (item.value === value) {
@ -205,6 +228,16 @@ export default {
  margin-bottom: 5px;
 }

+.fold {
+  display: inline-block;
+  padding-left: 4px;
+  i {
+    font-weight: bold;
+    font-size: 15px;
+    cursor: pointer;
+  }
+}
+
 > > > .CodeMirror pre.CodeMirror-line,
 > > > .CodeMirror-linenumber.CodeMirror-gutter-elt {
  line-height: 18px !important;
--- a/src/components/Form/FormFields/PhoneInput.vue
+++ b/src/components/Form/FormFields/PhoneInput.vue
@ -24,6 +24,7 @@
 </template>

 <script>
+import { mapGetters } from 'vuex'

 export default {
  name: 'PhoneInput',
@ -35,21 +36,7 @@ export default {
  },
  data() {
    return {
-      rawValue: {},
-      countries: [
-        { name: 'China(中国)', value: '+86' },
-        { name: 'HongKong(中国香港)', value: '+852' },
-        { name: 'Macao(中国澳门)', value: '+853' },
-        { name: 'Taiwan(中国台湾)', value: '+886' },
-        { name: 'America(America)', value: '+1' },
-        { name: 'Russia(Россия)', value: '+7' },
-        { name: 'France(français)', value: '+33' },
-        { name: 'Britain(Britain)', value: '+44' },
-        { name: 'Germany(Deutschland)', value: '+49' },
-        { name: 'Japan(日本)', value: '+81' },
-        { name: 'Korea(한국)', value: '+82' },
-        { name: 'India(भारत)', value: '+91' }
-      ]
+      rawValue: {}
    }
  },
  computed: {
@ -58,7 +45,13 @@ export default {
        return ''
      }
      return `${this.rawValue.code}${this.rawValue.phone}`
-    }
+    },
+    countries: {
+      get() {
+        return this.publicSettings.COUNTRY_CALLING_CODES
+      }
+    },
+    ...mapGetters(['publicSettings'])
  },
  mounted() {
    this.rawValue = this.value || { code: '+86', phone: '' }
--- a/src/components/Form/FormFields/TransferSelect.vue
+++ b/src/components/Form/FormFields/TransferSelect.vue
@ -13,6 +13,7 @@
      v-if="showTransfer"
      :title="label"
      :visible.sync="showTransfer"
+      :close-on-click-modal="false"
      width="730px"
      @cancel="handleTransCancel"
      @confirm="handleTransConfirm"
@ -125,13 +126,17 @@ export default {
        return _.uniq(value)
      },
      set(val) {
-        this.$emit('input', val)
+        this.emit(val)
      }
    }
  },
  methods: {
+    emit(val) {
+      const value = _.uniq(val)
+      this.$emit('input', value)
+    },
    onInputChange(val) {
-      this.$emit('input', val)
+      this.emit(val)
    },
    handleFocus() {
      this.$refs.select2.selectRef.blur()
@ -154,7 +159,7 @@ export default {
        return { value: item.id, label: item.label }
      })
      this.select2.options = options
-      this.$emit('input', options.map(item => item.value))
+      this.emit(options.map(item => item.value))
      this.showTransfer = false
    }
  }
--- a/src/components/Form/FormFields/WeekCronSelect.vue
+++ b/src/components/Form/FormFields/WeekCronSelect.vue
@ -204,7 +204,12 @@ export default {
    },
    formatWeektime(col) {
      const timeStamp = 1542384000000 // '2018-11-17 00:00:00'
-      const beginStamp = timeStamp + col * 1800000 // col * 30 * 60 * 1000
+      const timezone = 8
+      const offsetGMT = new Date().getTimezoneOffset() // 本地时间和格林威治的时间差，单位为分钟
+      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

      const begin = this.formatDate(new Date(beginStamp), 'hh:mm')
--- a/src/components/Table/AutoDataSearch/index.vue
+++ b/src/components/Table/AutoDataSearch/index.vue
@ -68,6 +68,9 @@ export default {
  },
  methods: {
    handleTagSearch(tags) {
+      if (_.isEqual(tags, this.tags)) {
+        return
+      }
      this.tags = tags
      if (tags.length === 0) {
        this.manualSearch = false
--- a/src/components/Table/ListTable/TableAction/index.vue
+++ b/src/components/Table/ListTable/TableAction/index.vue
@ -209,6 +209,12 @@ export default {
  .left-side {
    float: left;
    display: block;
+    &>>> .action-item.el-dropdown {
+      height: 33px;
+      &> .el-button {
+        height: 100%;
+      }
+    }
  }

  .right-side {
--- a/src/components/Table/TableFormatters/AmountFormatter.vue
+++ b/src/components/Table/TableFormatters/AmountFormatter.vue
@ -3,17 +3,19 @@
    <template>
      <el-popover
        :disabled="!showItems"
+        :open-delay="500"
        :title="title"
        placement="top-start"
        trigger="hover"
        width="400"
+        @show="getAsyncItems"
      >
        <div class="detail-content">
          <div v-for="item of items" :key="getKey(item)" class="detail-item">
            <span class="detail-item-name">{{ item }}</span>
          </div>
        </div>
-        <span slot="reference">{{ items && items.length }}</span>
+        <span slot="reference">{{ amount }}</span>
      </el-popover>
    </template>
  </DetailFormatter>
@ -37,41 +39,73 @@ export default {
          showItems: true,
          getItem(item) {
            return item.name
-          }
+          },
+          async: false,
+          ajax: {},
+          title: ''
        }
      }
    }
  },
  data() {
+    const formatterArgs = Object.assign(this.formatterArgsDefault, this.col.formatterArgs || {})
    return {
-      formatterArgs: Object.assign(this.formatterArgsDefault, this.col.formatterArgs || {})
+      formatterArgs: formatterArgs,
+      data: formatterArgs.async ? [] : (this.cellValue || []),
+      amount: '',
+      asyncGetDone: false
    }
  },
  computed: {
    title() {
-      return this.formatterArgs.title || ''
+      return this.formatterArgs.title || this.col.label.replace('amount', '').replace('数量', '')
    },
    items() {
+      if (this.formatterArgs.async && !this.asyncGetDone) {
+        return [this.$t('common.tree.Loading') + '...']
+      }
      const getItem = this.formatterArgs.getItem || (item => item.name)
-      let data = this.cellValue?.map(item => getItem(item)) || []
+      let data = this.data.map(item => getItem(item)) || []
      data = data.filter(Boolean)
      return data
    },
    showItems() {
-      return this.formatterArgs.showItems !== false && this.cellValue?.length > 0
+      return this.amount !== 0 && this.amount !== ''
    }
  },
+  async mounted() {
+    this.amount = this.formatterArgs.async ? this.cellValue : (this.cellValue || []).length
+  },
  methods: {
    getKey(item) {
-      const id = Math.random().toString(36).substring(2)
+      const id = Math.random().toString(36).substring(16)
      return id + item
+    },
+    getDefaultUrl() {
+      const url = new URL(this.url, location.origin)
+      url.pathname += this.row.id + '/'
+      return url.pathname
+    },
+    async getAsyncItems() {
+      if (!this.formatterArgs.async) {
+        return
+      }
+      if (this.asyncGetDone) {
+        return
+      }
+      const url = this.formatterArgs.ajax.url || this.getDefaultUrl()
+      const params = this.formatterArgs.ajax.params || {}
+      const transform = this.formatterArgs.ajax.transform || (resp => resp[this.col.prop.replace('_amount', '')])
+      const response = await this.$axios.get(url, { params: params })
+      this.data = transform(response)
+      this.asyncGetDone = true
    }
  }
 }
 </script>
 <style lang="scss" scoped>
 .detail-content {
-  padding: 20px 10px;
+  padding: 5px 10px;
  max-height: 60vh;
  overflow-y: auto;
 }
@ -86,6 +120,6 @@ export default {
 }

 .detail-item:first-child {
-  border-top: 1px solid #EBEEF5;
+  //border-top: 1px solid #EBEEF5;
 }
 </style>
--- a/src/components/Tree/DataZTree/components/ZTree/index.vue
+++ b/src/components/Tree/DataZTree/components/ZTree/index.vue
@ -167,6 +167,9 @@ export default {
    },
    async refresh() {
      this.treeSearchValue = ''
+      if (this.treeSetting?.callback?.beforeRefresh) {
+        this.treeSetting.callback.beforeRefresh()
+      }
      if (this.treeSetting?.callback?.refresh) {
        await this.treeSetting.callback.refresh()
      }
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@ -1 +1 @@
-{}
+{}
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@ -1 +1 @@
-{}
+{}
--- a/src/icons/svg/batch-update.svg
+++ b/src/icons/svg/batch-update.svg
@ -1 +1 @@
-<svg t="1687315588323" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3119" width="11" height="11"><path d="M302.545455 116.363636h409.6a27.927273 27.927273 0 0 0 0-55.854545h-409.6a27.927273 27.927273 0 1 0 0 55.854545z m-93.09091 102.4h595.781819a27.927273 27.927273 0 0 0 0-55.854545h-595.781819a27.927273 27.927273 0 1 0 0 55.854545z m670.254546 55.854546h-735.418182c-51.414109 0-93.090909 41.686109-93.090909 93.090909v512c0 51.414109 41.6768 93.090909 93.090909 93.090909h735.418182c51.414109 0 93.090909-41.6768 93.090909-93.090909v-512c0-51.4048-41.6768-93.090909-93.090909-93.090909z m37.236364 594.3296a46.545455 46.545455 0 0 1-46.545455 46.545454h-716.8a46.545455 46.545455 0 0 1-46.545455-46.545454V386.327273a46.545455 46.545455 0 0 1 46.545455-46.545455h716.8a46.545455 46.545455 0 0 1 46.545455 46.545455v482.620509zM602.177164 522.621673l-68.9152-64.474764a4.747636 4.747636 0 0 0-1.405673-1.349818 9.234618 9.234618 0 0 0-1.396364-1.163636 11.776 11.776 0 0 0-3.006836-1.7408c-0.996073-0.577164-1.796655-0.772655-2.802036-1.163637-0.605091-0.195491-1.200873-0.390982-2.010764-0.577163-0.390982 0-0.586473-0.195491-0.996073-0.195491-2.196945-0.577164-4.012218-0.577164-5.008291-0.577164h-0.400291c-0.996073 0-3.006836 0-5.408581 0.577164-0.400291 0-0.595782 0.195491-0.996073 0.195491-0.400291 0.195491-1.005382 0.195491-1.405673 0.390981a15.555491 15.555491 0 0 0-3.006836 1.163637c-0.195491 0-0.195491 0.195491-0.400291 0.195491 0 0.195491-0.195491 0.195491-0.195491 0.195491-1.200873 0.577164-2.606545 1.349818-3.611927 2.122472l-0.195491 0.195491a7.000436 7.000436 0 0 0-2.401746 1.7408l-67.314036 64.660946c-4.803491 4.449745-7.614836 10.426182-7.614836 16.7936-0.195491 6.376727 2.606545 12.744145 7.214545 17.370763s10.826473 7.335564 17.435927 7.335564 13.218909-2.513455 18.031709-7.149382l24.641164-23.738182v266.267928c0 13.312 11.226764 24.129164 25.041455 24.129163s25.041455-10.817164 25.041454-24.129163V532.452073l26.046836 24.520145c4.608 4.626618 10.817164 6.953891 17.640728 6.953891 6.795636 0 13.014109-2.513455 17.836218-7.149382l0.186182-0.195491c9.616291-9.644218 9.4208-24.510836-0.400291-33.773381l-0.223418-0.186182z" fill="#2c2c2c" p-id="3120"></path></svg>
+<svg t="1704873961556" viewBox="0 0 1124 1224" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8913" width="14" height="14"><path stroke-width="150" d="M302.545455 116.363636h409.6a27.927273 27.927273 0 0 0 0-55.854545h-409.6a27.927273 27.927273 0 1 0 0 55.854545z m-93.09091 102.4h595.781819a27.927273 27.927273 0 0 0 0-55.854545h-595.781819a27.927273 27.927273 0 1 0 0 55.854545z m670.254546 55.854546h-735.418182c-51.414109 0-93.090909 41.686109-93.090909 93.090909v512c0 51.414109 41.6768 93.090909 93.090909 93.090909h735.418182c51.414109 0 93.090909-41.6768 93.090909-93.090909v-512c0-51.4048-41.6768-93.090909-93.090909-93.090909z m37.236364 594.3296a46.545455 46.545455 0 0 1-46.545455 46.545454h-716.8a46.545455 46.545455 0 0 1-46.545455-46.545454V386.327273a46.545455 46.545455 0 0 1 46.545455-46.545455h716.8a46.545455 46.545455 0 0 1 46.545455 46.545455v482.620509zM602.177164 522.621673l-68.9152-64.474764a4.747636 4.747636 0 0 0-1.405673-1.349818 9.234618 9.234618 0 0 0-1.396364-1.163636 11.776 11.776 0 0 0-3.006836-1.7408c-0.996073-0.577164-1.796655-0.772655-2.802036-1.163637-0.605091-0.195491-1.200873-0.390982-2.010764-0.577163-0.390982 0-0.586473-0.195491-0.996073-0.195491-2.196945-0.577164-4.012218-0.577164-5.008291-0.577164h-0.400291c-0.996073 0-3.006836 0-5.408581 0.577164-0.400291 0-0.595782 0.195491-0.996073 0.195491-0.400291 0.195491-1.005382 0.195491-1.405673 0.390981a15.555491 15.555491 0 0 0-3.006836 1.163637c-0.195491 0-0.195491 0.195491-0.400291 0.195491 0 0.195491-0.195491 0.195491-0.195491 0.195491-1.200873 0.577164-2.606545 1.349818-3.611927 2.122472l-0.195491 0.195491a7.000436 7.000436 0 0 0-2.401746 1.7408l-67.314036 64.660946c-4.803491 4.449745-7.614836 10.426182-7.614836 16.7936-0.195491 6.376727 2.606545 12.744145 7.214545 17.370763s10.826473 7.335564 17.435927 7.335564 13.218909-2.513455 18.031709-7.149382l24.641164-23.738182v266.267928c0 13.312 11.226764 24.129164 25.041455 24.129163s25.041455-10.817164 25.041454-24.129163V532.452073l26.046836 24.520145c4.608 4.626618 10.817164 6.953891 17.640728 6.953891 6.795636 0 13.014109-2.513455 17.836218-7.149382l0.186182-0.195491c9.616291-9.644218 9.4208-24.510836-0.400291-33.773381l-0.223418-0.186182z" fill="#2c2c2c" p-id="8914"></path></svg>
--- a/src/icons/svg/help.svg
+++ b/src/icons/svg/help.svg
@ -0,0 +1 @@
+<svg t="1705571985818" class="icon" viewBox="0 0 1028 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="19018" width="13" height="13"><path d="M983.678752 314.585575c-25.849513-60.781287-62.777388-115.474464-109.785575-162.482651s-101.701365-83.936062-162.482651-109.785575C648.433528 15.569591 581.663938 1.996101 512.998051 1.996101c-68.665887 0-135.435478 13.573489-198.412476 40.321248-60.781287 25.849513-115.474464 62.777388-162.482651 109.785575s-83.936062 101.701365-109.785575 162.482651C15.569591 377.562573 1.996101 444.332164 1.996101 512.998051c0 68.665887 13.573489 135.435478 40.321248 198.412475 25.849513 60.781287 62.777388 115.474464 109.785575 162.482651s101.701365 83.936062 162.482651 109.785575c62.976998 26.747758 129.746589 40.321248 198.412476 40.321248 68.665887 0 135.435478-13.573489 198.412475-40.321248 60.781287-25.849513 115.474464-62.777388 162.482651-109.785575s83.936062-101.701365 109.785575-162.482651c26.747758-62.976998 40.321248-129.746589 40.321248-198.412475 0-68.665887-13.573489-135.435478-40.321248-198.412476zM673.684211 894.752437c-51.00039 21.6577-105.094737 32.636257-160.68616 32.636257s-109.68577-10.978558-160.68616-32.636257c-49.403509-21.058869-93.816764-51.100195-131.9423-89.125926-38.125536-38.125536-68.067057-82.438986-89.125926-131.9423-21.6577-51.00039-32.636257-105.094737-32.636258-160.68616s10.978558-109.68577 32.636258-160.68616c21.058869-49.403509 51.100195-93.816764 89.125926-131.9423 38.125536-38.125536 82.438986-68.067057 131.9423-89.125926 51.00039-21.6577 105.094737-32.636257 160.68616-32.636258s109.68577 10.978558 160.68616 32.636258c49.403509 21.058869 93.816764 51.100195 131.9423 89.125926 38.125536 38.125536 68.067057 82.438986 89.125926 131.9423 21.6577 51.00039 32.636257 105.094737 32.636257 160.68616s-10.978558 109.68577-32.636257 160.68616c-21.058869 49.403509-51.100195 93.816764-89.125926 131.9423-38.125536 38.025731-82.538791 68.067057-131.9423 89.125926z" p-id="19019" fill="#080606"></path><path d="M476.868616 808.820273h74.554386c8.283821 0 14.97076-6.68694 14.97076-14.97076v-68.366472c0-8.283821-6.68694-14.97076-14.97076-14.97076h-74.554386c-8.283821 0-14.97076 6.68694-14.97076 14.97076v68.366472c0 8.283821 6.68694 14.97076 14.97076 14.97076zM687.557115 373.270955c-3.293567-51.299805-19.262378-90.922417-47.307602-117.869785-28.045224-26.947368-68.266667-41.119688-119.566472-42.217544h-0.998051c-58.585575 2.195712-104.096686 19.461988-135.235867 51.100195-31.039376 31.638207-47.906433 77.847953-50.102144 137.331774-0.299415 8.483431 6.487329 15.469786 14.97076 15.469785h65.272514c8.084211 0 14.77115-6.487329 14.970761-14.57154 1.896296-72.558285 30.440546-107.490058 90.024171-109.68577h1.297466c48.904483 2.095906 73.65614 26.947368 77.548538 77.947758 0 0.499025 0.099805 1.097856 0 1.596882-0.59883 26.548148-19.961014 59.0846-57.687329 96.810916-51.100195 48.904483-75.951657 93.118129-75.951657 135.036257v55.990643c0 8.283821 6.68694 14.97076 14.97076 14.970761h68.366472c8.283821 0 14.97076-6.68694 14.97076-14.970761v-65.272514c0-11.377778 7.8846-32.736062 45.211696-70.162963 52.497466-50.301754 79.145419-101.002729 79.145419-150.605848l0.099805-0.898246z" p-id="19020" fill="#080606"></path></svg>
--- a/src/icons/svg/load-file.svg
+++ b/src/icons/svg/load-file.svg
@ -0,0 +1 @@
+<svg t="1705572472151" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="27270" width="13" height="13"><path d="M896.64 63.872v132.224c0 137.216-88.64 260.48-197.76 327.296 109.12 66.752 197.76 189.056 197.76 326.336V960h28.8a32 32 0 0 1 0 64H99.136a32 32 0 1 1 0-64h28.416v-110.272c0-137.28 92.8-259.584 201.856-326.4C220.16 456.576 127.488 333.376 127.488 196.16V63.872h-31.616A31.872 31.872 0 0 1 63.936 32 32 32 0 0 1 96 0h832.128a32 32 0 0 1 0 63.872h-31.36z m-703.04 0v132.224c0 135.424 117.824 253.312 243.84 286.336a39.68 39.68 0 0 1 15.936 8.384 43.712 43.712 0 0 1-1.344 66.176 42.24 42.24 0 0 1-16.064 7.68c-125.248 33.6-242.368 150.08-242.368 285.056V960h638.272v-110.272c0-135.488-119.808-252.352-245.76-285.44a43.712 43.712 0 0 1-22.784-15.872 42.56 42.56 0 0 1-7.424-18.24c-2.368-23.04 10.24-42.56 30.08-47.68 126.08-33.088 245.888-150.976 245.888-286.4V63.872H193.6zM511.872 458.24a107.264 107.264 0 0 0-14.848-16l-2.88-2.496-2.304-2.048-2.56-1.728a104.448 104.448 0 0 0-35.2-16.768c-65.28-17.088-113.664-67.392-135.744-135.936h387.264C683.52 351.744 634.88 402.048 569.408 419.2c-23.552 6.144-43.52 20.288-57.6 38.976z m-17.472 146.24l2.944-2.368c2.112-1.92 3.776-3.456 5.376-5.12l2.112-2.24 2.944-3.456 2.944-3.712s1.024-1.472 1.024-1.6l6.016 9.152 2.56 1.408 0.832 0.768a82.752 82.752 0 0 0 29.248 19.392l3.136 1.088c1.408 0.512 2.816 0.96 4.288 1.344 72.96 20.48 117.568 80.96 117.568 177.024v18.56H348.608v-18.56c0-95.36 43.776-155.52 115.648-176.64 8.704-2.176 16.96-5.888 24.576-11.008l1.664-0.896 3.84-3.136z" fill="#000000" p-id="27271"></path></svg>
--- a/src/icons/svg/save-line.svg
+++ b/src/icons/svg/save-line.svg
@ -0,0 +1 @@
+<svg t="1705571586044" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="17569" width="13" height="13"><path d="M925.248 356.928l-258.176-258.176a64 64 0 0 0-45.248-18.752H144a64 64 0 0 0-64 64v736a64 64 0 0 0 64 64h736a64 64 0 0 0 64-64V402.176a64 64 0 0 0-18.752-45.248zM288 144h192V256H288V144z m448 736H288V736h448v144z m144 0H800V704a32 32 0 0 0-32-32H256a32 32 0 0 0-32 32v176H144v-736H224V288a32 32 0 0 0 32 32h256a32 32 0 0 0 32-32V144h77.824l258.176 258.176V880z" p-id="17570"></path></svg>
--- a/src/layout/components/GenericUpdateFormDialog/index.vue
+++ b/src/layout/components/GenericUpdateFormDialog/index.vue
@ -89,7 +89,7 @@ export default {
  },
  mounted() {
    const defaultFormSetting = this.getDefaultFormSetting()
-    this.iFormSetting = Object.assign({}, this.formSetting, defaultFormSetting)
+    this.iFormSetting = Object.assign({}, defaultFormSetting, this.formSetting)
  },
  methods: {
    handleCheckedFieldsChange(values) {
@ -107,6 +107,7 @@ export default {
      return {
        needGetObjectDetail: false,
        submitMethod: () => 'patch',
+        cleanOtherFormValue: (formValue) => formValue,
        cleanFormValue: (value) => {
          const filterValue = {}
          Object.keys(value)
@ -114,12 +115,15 @@ export default {
            .forEach((key) => {
              filterValue[key] = value[key]
            })
-          const formValue = []
+          let formValue = []
          let object = {}
          for (const row of vm.selectedRows) {
            object = Object.assign({}, filterValue, { id: row.id })
            formValue.push(object)
          }
+          if (typeof this.iFormSetting.cleanOtherFormValue === 'function') {
+            formValue = this.iFormSetting.cleanOtherFormValue(formValue)
+          }
          return formValue
        },
        onSubmit: function(validValues) {
--- a/src/layout/components/Page/PageHeading.vue
+++ b/src/layout/components/Page/PageHeading.vue
@ -66,6 +66,9 @@ export default {
    font-weight: 500;
    line-height: 32px;
    color: #1F2329;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
  }

  .page-heading-right {
--- a/src/router/common.js
+++ b/src/router/common.js
@ -31,7 +31,17 @@ export default [
    name: 'TaskLog',
    hidden: true,
    meta: {
-      title: i18n.t('CeleryTaskLog'),
+      title: i18n.t('route.CeleryTaskLog'),
+      permissions: []
+    }
+  },
+  {
+    path: '/chat/chat-ai/',
+    component: () => import('@/views/chat/ChatAi'),
+    name: 'ChatAi',
+    hidden: true,
+    meta: {
+      title: i18n.t('ChatAI'),
      permissions: []
    }
  },
--- a/src/utils/startup.js
+++ b/src/utils/startup.js
@ -2,12 +2,10 @@
 import store from '@/store'
 import router, { resetRouter } from '@/router'
 import Vue from 'vue'
-import VueCookie from 'vue-cookie'
 import { message } from '@/utils/message'
 import orgUtil from '@/utils/org'
 import orgs from '@/api/orgs'
 import { getPropView, isViewHasOrgs } from '@/utils/jms'
-import request from '@/utils/request'

 const whiteList = ['/login', process.env.VUE_APP_LOGIN_PATH] // no redirect whitelist

@ -15,44 +13,11 @@ function reject(msg) {
  return new Promise((resolve, reject) => reject(msg))
 }

-function isRenewalExpired(renewalTime) {
-  const currentTimeStamp = Math.floor(new Date().getTime() / 1000)
-  const sessionExpireTimestamp = VueCookie.get('jms_session_expire_timestamp')
-
-  if (!sessionExpireTimestamp) {
-    return false
-  }
-  const timeDifferenceInSeconds = currentTimeStamp - parseInt(sessionExpireTimestamp, 10)
-  return timeDifferenceInSeconds > renewalTime
-}
-
 async function checkLogin({ to, from, next }) {
  if (whiteList.indexOf(to.path) !== -1) {
    next()
  }
-  // Determine whether the user has logged in
-  const sessionExpire = VueCookie.get('jms_session_expire')
-  if (!sessionExpire) {
-    request.get(process.env['VUE_APP_LOGOUT_PATH']).finally(() => {
-      window.location = process.env.VUE_APP_LOGIN_PATH
-    })
-    return reject('No session mark found in cookie')
-  } else if (sessionExpire === 'close') {
-    let startTime = new Date().getTime()
-    const intervalId = setInterval(() => {
-      const endTime = new Date().getTime()
-      const delta = (endTime - startTime)
-      startTime = endTime
-      Vue.$log.debug('Set session expire: ', delta)
-      if (!isRenewalExpired(120)) {
-        VueCookie.set('jms_session_expire', 'close', { expires: '2m' })
-      } else {
-        clearInterval(intervalId)
-      }
-    }, 10 * 1000)
-  } else if (sessionExpire === 'age') {
-    Vue.$log.debug('Session expire on age')
-  }
+
  try {
    return await store.dispatch('users/getProfile')
  } catch (e) {
--- a/src/views/accounts/Account/AccountDetail/Detail.vue
+++ b/src/views/accounts/Account/AccountDetail/Detail.vue
@ -104,7 +104,7 @@ export default {
              this.$axios.post(
                `/api/v1/accounts/accounts/tasks/`,
                {
-                  action: 'test',
+                  action: 'verify',
                  accounts: [this.object.id]
                }
              ).then(res => {
--- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue
+++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue
@ -53,7 +53,7 @@ export default {
            formatterArgs: {
              showFalse: false
            },
-            width: '80px'
+            width: '152px'
          },
          periodic_display: {
            width: '150px'
--- a/src/views/accounts/AccountGather/AccountGatherTaskList.vue
+++ b/src/views/accounts/AccountGather/AccountGatherTaskList.vue
@ -52,8 +52,7 @@ export default {
            formatterArgs: {
              showFalse: false
            },
-            filterable: false,
-            width: '120px'
+            width: '152px'
          },
          periodic_display: {
          },
--- a/src/views/accounts/AccountPush/AccountPushList.vue
+++ b/src/views/accounts/AccountPush/AccountPushList.vue
@ -63,6 +63,9 @@ export default {
            label: vm.$t('NodeAmount'),
            width: '80px'
          },
+          is_periodic: {
+            width: '152px'
+          },
          periodic_display: {
            width: '150px'
          },
--- a/src/views/accounts/AccountTemplate/AccountTemplateList.vue
+++ b/src/views/accounts/AccountTemplate/AccountTemplateList.vue
@ -83,9 +83,13 @@ export default {
      },
      headerActions: {
        hasRefresh: true,
-        hasExport: false,
-        hasImport: false,
+        hasExport: this.$hasPerm('accounts.view_accounttemplatesecret'),
        hasMoreActions: false,
+        exportOptions: {
+          url: '/api/v1/accounts/account-template-secrets/',
+          mfaVerifyRequired: true,
+          tips: this.$t('accounts.AccountExportTips')
+        },
        createRoute: () => {
          return {
            name: 'AccountTemplateCreate'
--- a/src/views/accounts/AccountTemplate/const.js
+++ b/src/views/accounts/AccountTemplate/const.js
@ -1,5 +1,5 @@
 import { getUuidUpdateFromUrl } from '@/utils/common'
-import { PasswordRule, UpdateToken } from '@/components/Form/FormFields'
+import { PasswordRule, UpdateToken, UploadSecret } from '@/components/Form/FormFields'
 import Select2 from '@/components/Form/FormFields/Select2'
 import AutomationParams from '@/components/Apps/AutomationParams'
 import i18n from '@/i18n/i18n'
@ -68,6 +68,7 @@ export const templateFieldsMeta = (vm) => {
        type: 'textarea',
        rows: 4
      },
+      component: UploadSecret,
      hidden: (formValue) => formValue.secret_type !== 'ssh_key' || formValue.secret_strategy === 'random'
    },
    passphrase: {
--- a/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
@ -59,7 +59,7 @@ export default {
          [this.$t('Basic'), ['name', 'address', 'platform', 'nodes']],
          [this.$t('Protocol'), ['protocols']],
          [this.$t('Account'), ['accounts']],
-          [this.$t('Other'), ['domain', 'is_active', 'comment']]
+          [this.$t('Other'), ['domain', 'labels', 'is_active', 'comment']]
        ],
        fieldsMeta: assetFieldsMeta(this),
        performSubmit(validValues) {
--- a/src/views/assets/Asset/AssetDetail/Account.vue
+++ b/src/views/assets/Asset/AssetDetail/Account.vue
@ -1,7 +1,7 @@
 <template>
  <div>
    <el-row :gutter="24">
-      <el-col :md="24" :sm="24">
+      <el-col :md="14" :sm="24">
        <AccountListTable
          ref="ListTable"
          :asset="object"
@ -20,17 +20,23 @@
          @onConfirm="onConfirm"
        />
      </el-col>
+      <el-col :md="10" :sm="24">
+        <QuickActions :actions="quickActions" :title="title" type="primary" />
+      </el-col>
    </el-row>
  </div>
 </template>

 <script>
 import { AccountListTable } from '@/components'
+import QuickActions from '@/components/QuickActions'
 import AccountTemplateDialog from '@/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog'
+import { openTaskPage } from '@/utils/jms'

 export default {
  name: 'Detail',
  components: {
+    QuickActions,
    AccountListTable,
    AccountTemplateDialog
  },
@ -46,6 +52,7 @@ export default {
  },
  data() {
    return {
+      title: this.$t('accounts.QuickTest'),
      templateDialogVisible: false,
      headerExtraActions: [
        {
@ -56,6 +63,25 @@ export default {
            this.templateDialogVisible = true
          }
        }
+      ],
+      quickActions: [
+        {
+          title: this.$t('accounts.BulkVerify'),
+          attrs: {
+            type: 'primary',
+            label: this.$tc('accounts.Test')
+          },
+          callbacks: Object.freeze({
+            click: () => {
+              this.$axios.post(
+                `/api/v1/accounts/accounts/tasks/`,
+                { action: 'verify', assets: [this.object.id] }
+              ).then(res => {
+                openTaskPage(res['task'])
+              })
+            }
+          })
+        }
      ]
    }
  },
--- a/src/views/assets/Asset/AssetList/components/BaseList.vue
+++ b/src/views/assets/Asset/AssetList/components/BaseList.vue
@ -97,8 +97,13 @@ export default {
        route.query.type = row.type.value
        route.query.category = row.type.category
      }
-      const { href } = vm.$router.resolve(route)
-      window.open(href, '_blank')
+      const createInNewPage = this.$route.query.node_id && routeAction === 'Create'
+      if (createInNewPage) {
+        const { href } = vm.$router.resolve(route)
+        window.open(href, '_blank')
+      } else {
+        this.$router.push(route)
+      }
    }
    const extraQuery = this.$route.params?.extraQuery || {}
    return {
--- a/src/views/assets/Asset/AssetList/components/PlatformDialog.vue
+++ b/src/views/assets/Asset/AssetList/components/PlatformDialog.vue
@ -160,8 +160,12 @@ export default {
      }

      const router = { name: route, query }
-      const { href } = this.$router.resolve(router)
-      window.open(href, '_blank')
+      if (this.$route.query.node_id) {
+        const { href } = this.$router.resolve(router)
+        window.open(href, '_blank')
+      } else {
+        this.$router.push(router)
+      }
    }
  }
 }
--- a/src/views/assets/Domain/DomainDetail/AssetList.vue
+++ b/src/views/assets/Domain/DomainDetail/AssetList.vue
@ -0,0 +1,39 @@
+<template>
+  <BaseList v-bind="tableConfig" />
+</template>
+
+<script>
+import BaseList from '../../Asset/AssetList/components/BaseList'
+
+export default {
+  components: {
+    BaseList
+  },
+  props: {
+    object: {
+      type: Object,
+      default: () => {
+      }
+    }
+  },
+  data() {
+    return {
+      tableConfig: {
+        category: 'all',
+        url: `/api/v1/assets/assets/?domain=${this.$route.params.id}`,
+        headerActions: {
+          hasCreate: false,
+          hasRefresh: true,
+          hasExport: false,
+          hasImport: false,
+          hasMoreActions: true
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
--- a/src/views/assets/Domain/DomainDetail/index.vue
+++ b/src/views/assets/Domain/DomainDetail/index.vue
@ -10,13 +10,15 @@
 import { GenericDetailPage, TabPage } from '@/layout/components'
 import Detail from './Detail.vue'
 import GatewayList from './GatewayList.vue'
+import AssetList from './AssetList.vue'

 export default {
  components: {
    GenericDetailPage,
    TabPage,
    Detail,
-    GatewayList
+    GatewayList,
+    AssetList
  },
  data() {
    return {
@ -32,6 +34,11 @@ export default {
            title: this.$t('GatewayList'),
            name: 'GatewayList',
            hidden: () => !this.$hasPerm('assets.view_gateway')
+          },
+          {
+            title: this.$t('assets.AssetList'),
+            name: 'AssetList',
+            hidden: () => !this.$hasPerm('assets.view_asset')
          }
        ],
        hasRightSide: true
--- a/src/views/assets/Domain/DomainList.vue
+++ b/src/views/assets/Domain/DomainList.vue
@ -4,7 +4,7 @@

 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter } from '@/components/Table/TableFormatters'
+import AmountFormatter from '@/components/Table/TableFormatters/AmountFormatter.vue'

 export default {
  components: {
@ -15,7 +15,7 @@ export default {
      tableConfig: {
        url: '/api/v1/assets/domains/',
        columnsExclude: ['gateway'],
-        columnsExtra: ['gateway_count'],
+        columnsExtra: ['gateways'],
        columns: ['name', 'assets_amount', 'gateways', 'comment', 'actions'],
        columnsShow: {
          min: ['name', 'actions'],
@ -24,17 +24,22 @@ export default {
        columnsMeta: {
          assets_amount: {
            width: '160px',
-            formatter: DetailFormatter
+            formatter: AmountFormatter,
+            formatterArgs: {
+              async: true,
+              permissions: 'assets.view_asset',
+              routeQuery: {
+                activeTab: 'AssetList'
+              }
+            }
          },
          gateways: {
-            formatter: DetailFormatter,
+            label: this.$t('assets.Gateway'),
+            formatter: AmountFormatter,
            formatterArgs: {
              permissions: 'assets.view_gateway',
              routeQuery: {
                activeTab: 'GatewayList'
-              },
-              getTitle: function({ row }) {
-                return row.gateways.length
              }
            }
          }
--- a/src/views/assets/const.js
+++ b/src/views/assets/const.js
@ -121,6 +121,7 @@ export const assetFieldsMeta = (vm) => {
      name: 'labels',
      label: vm.$t('Label'),
      type: 'm2m',
+      component: Select2,
      el: {
        multiple: true,
        url: '/api/v1/labels/labels/',
--- a/src/views/audits/OperateLog/OperateLogList.vue
+++ b/src/views/audits/OperateLog/OperateLogList.vue
@ -34,7 +34,8 @@ export default {
          min: ['user', 'resource'],
          default: [
            'user', 'action_display', 'resource_type_display',
-            'resource', 'remote_addr', 'datetime', 'actions'
+            'resource', 'remote_addr', 'datetime', 'action',
+            'resource_type', 'actions'
          ]
        },
        columnsMeta: {
--- a/src/views/chat/ChatAi/index.vue
+++ b/src/views/chat/ChatAi/index.vue
@ -0,0 +1,29 @@
+<template>
+  <div class="chat-container">
+    <ChatAi ref="chat" :drawer-panel-visible="true" :has-close="false" />
+  </div>
+</template>
+
+<script>
+import ChatAi from '@/components/Apps/ChatAi'
+export default {
+  components: {
+    ChatAi
+  },
+  data() {
+    return {
+    }
+  },
+  mounted() {
+    this.$refs.chat.initWebSocket()
+  },
+  methods: {
+  }
+}
+</script>
+
+<style scoped>
+.chat-container {
+  height: 100vh;
+}
+</style>
--- a/src/views/dashboard/Audit/TrendSummary.vue
+++ b/src/views/dashboard/Audit/TrendSummary.vue
@ -20,8 +20,8 @@ export default {
  data() {
    return {
      config: {
-        title: this.$t('UserLoginTrend'),
-        tip: this.$t('UserLoginTrend')
+        title: this.$t('SessionConnectTrend'),
+        tip: this.$t('SessionConnectTrend')
      },
      columnChartConfig: {
        datesMetrics: [],
@ -43,7 +43,7 @@ export default {
      const data = await this.$axios.get(`/api/v1/index/?dates_metrics=1&days=${this.days}`)
      const loginTotal = data?.dates_metrics_total_count_login
      this.columnChartConfig.datesMetrics = data.dates_metrics_date
-      if (loginTotal.length > 1) {
+      if (loginTotal.length > 0) {
        this.columnChartConfig.primaryData = loginTotal
      }
    }
--- a/src/views/dashboard/Audit/index.vue
+++ b/src/views/dashboard/Audit/index.vue
@ -65,7 +65,7 @@ export default {
    border-radius: 4px!important;
    padding: 4px 0!important;
    .el-radio-button__inner {
-      color: var(--color-primary)!important;
+      color: black!important;
      background-color: #FFF!important;
      border-radius: 4px!important;
    }
--- a/src/views/dashboard/Console/RankSummary.vue
+++ b/src/views/dashboard/Console/RankSummary.vue
@ -33,7 +33,7 @@ export default {
          {
            prop: 'total',
            label: this.$t('LoginCount'),
-            width: '80px'
+            width: '120px'
          }
        ]
      },
@ -50,7 +50,7 @@ export default {
          {
            prop: 'total',
            label: this.$t('NumberOfVisits'),
-            width: '80px'
+            width: '140px'
          }
        ]
      }
--- a/src/views/dashboard/Console/UserAssetActivity.vue
+++ b/src/views/dashboard/Console/UserAssetActivity.vue
@ -28,7 +28,7 @@ export default {
      lineChartConfig: {
        datesMetrics: [],
        primaryData: [0],
-        primaryName: this.$t('LoginUsers'),
+        primaryName: this.$t('ActiveUsers'),
        secondaryData: [0],
        secondaryName: this.$t('LoginAssets')
      }
--- a/src/views/dashboard/components/RealTimeSummary.vue
+++ b/src/views/dashboard/components/RealTimeSummary.vue
@ -44,7 +44,7 @@ export default {
          }
        },
        {
-          title: this.$t('CurrentConnections'),
+          title: this.$t('CurrentConnectionUsers'),
          body: {
            route: { name: `SessionList`, params: { activeMenu: 'OnlineList' }},
            count: this.counter.total_count_online_users,
--- a/src/views/dashboard/components/RingChart.vue
+++ b/src/views/dashboard/components/RingChart.vue
@ -51,7 +51,7 @@ export default {
              fontSize: 24,
              color: '#646A73'
            },
-            subtext: this.$t('Proportion') + percentage + '%',
+            subtext: this.$t('Proportion') + ' ' + percentage + '%',
            subtextStyle: {
              fontSize: 12,
              color: '#646A73'
--- a/src/views/dashboard/components/SwitchDate.vue
+++ b/src/views/dashboard/components/SwitchDate.vue
@ -74,7 +74,7 @@ export default {
      box-shadow: 2px 1px 2px rgba(0 0 0 / 8%);

      .el-radio-button__inner {
-        color: var(--color-primary);
+        color: black;
        background-color: #FFF;
        border-radius: 4px;
        box-shadow: 0 2px 2px rgb(90 97 105 / 31%)!important;
--- a/src/views/labels/LabelResourcesDialog.vue
+++ b/src/views/labels/LabelResourcesDialog.vue
@ -43,6 +43,9 @@ export default {
        hasImport: false,
        onCreate: () => {
          this.$emit('addResource')
+        },
+        searchConfig: {
+          getUrlQuery: false
        }
      }
    }
--- a/src/views/ops/Job/QuickJob.vue
+++ b/src/views/ops/Job/QuickJob.vue
@ -34,7 +34,7 @@
              <span>{{ executionInfo.timeCost.toFixed(2) }}</span>
            </span>
          </span>
-          <div style="padding-left: 30px; background-color: rgb(247 247 247)">
+          <div class="xterm-container">
            <Term
              ref="xterm"
              :show-tool-bar="true"
@ -193,7 +193,9 @@ export default {
              this.cmOptions.mode = option === 'win_shell' ? 'powershell' : option
              this.module = option
            }
-          },
+          }
+        },
+        fold: {
          timeout: {
            type: 'select',
            name: this.$t('Timeout'),
@ -224,7 +226,7 @@ export default {
          openCommand: {
            type: 'button',
            align: 'right',
-            icon: 'fa-folder-open',
+            icon: 'load-file',
            tip: this.$t('OpenCommand'),
            callback: (val, setting) => {
              this.showOpenAdhocDialog = true
@ -233,7 +235,7 @@ export default {
          saveCommand: {
            type: 'button',
            align: 'right',
-            icon: 'save',
+            icon: 'save-line',
            tip: this.$t('SaveCommand'),
            callback: (val, setting) => {
              if (!this.command) {
@ -246,7 +248,7 @@ export default {
          help: {
            type: 'button',
            align: 'right',
-            icon: 'fa fa-question-circle',
+            icon: 'help',
            tip: this.$t('Help'),
            callback: (val, setting) => {
              this.showHelpDialog = true
@ -440,6 +442,19 @@ export default {
 </script>

 <style lang="scss" scoped>
+.xterm-container {
+  padding-left: 30px;
+  background-color: rgb(247, 247, 247);
+  height: calc(100vh - 549px);
+  overflow: hidden;
+  & > div {
+    height: 100%;
+    &>>> .xterm {
+      height: calc(100% - 8px);
+      overflow-y: auto;
+    }
+  }
+}
 .mini-button {
  width: 12px;
  float: right;
--- a/src/views/perms/AssetPermission/AssetPermissionList.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionList.vue
@ -21,7 +21,6 @@ import PermBulkUpdateDialog from './components/PermBulkUpdateDialog'
 import AmountFormatter from '@/components/Table/TableFormatters/AmountFormatter'
 import { mapGetters } from 'vuex'
 import { AccountLabelMapper, AssetPermissionListPageSearchConfigOptions } from '../const'
-import { DetailFormatter } from '@/components/Table/TableFormatters'

 export default {
  components: {
@ -87,32 +86,38 @@ export default {
            }
          },
          users_amount: {
-            formatter: DetailFormatter,
+            formatter: AmountFormatter,
            formatterArgs: {
+              async: true,
              routeQuery: {
                activeTab: 'AssetPermissionUser'
              }
            }
          },
          user_groups_amount: {
-            formatter: DetailFormatter,
+            formatter: AmountFormatter,
            formatterArgs: {
+              async: true,
              routeQuery: {
                activeTab: 'AssetPermissionUser'
              }
            }
          },
          assets_amount: {
-            formatter: DetailFormatter,
+            formatter: AmountFormatter,
            formatterArgs: {
+              async: true,
              routeQuery: {
                activeTab: 'AssetPermissionAsset'
              }
            }
          },
          nodes_amount: {
-            formatter: DetailFormatter,
+            label: this.$t('perms.Node'),
+            width: '60px',
+            formatter: AmountFormatter,
            formatterArgs: {
+              async: true,
              routeQuery: {
                activeTab: 'AssetPermissionAsset'
              }
@ -146,11 +151,17 @@ export default {
      headerActions: {
        hasLabelSearch: true,
        hasBulkDelete: true,
-        createRoute() {
-          return {
+        onCreate: () => {
+          const route = {
            name: 'AssetPermissionCreate',
            query: this.$route.query
          }
+          if (vm.$route.query.node_id) {
+            const { href } = this.$router.resolve(route)
+            window.open(href, '_blank')
+          } else {
+            this.$router.push(route)
+          }
        },
        handleImportClick: ({ selectedRows }) => {
          this.$eventBus.$emit('showImportDialog', {
@ -158,7 +169,6 @@ export default {
            url: '/api/v1/perms/asset-permissions/'
          })
        },
-        createInNewPage: true,
        searchConfig: {
          url: '',
          options: AssetPermissionListPageSearchConfigOptions
--- a/src/views/perms/AssetPermission/components/AccountFormatter.vue
+++ b/src/views/perms/AssetPermission/components/AccountFormatter.vue
@ -1,5 +1,5 @@
 <template>
-  <el-form>
+  <el-form @submit.native.prevent>
    <el-form-item>
      <el-checkbox-group v-model="choicesSelected">
        <el-checkbox
--- a/src/views/profile/ProfileUpdate/index.vue
+++ b/src/views/profile/ProfileUpdate/index.vue
@ -29,6 +29,7 @@ export default {
        activeMenu: 'ProfileUpdate',
        submenu: this.getSubmenu(),
        hasRightSide: false,
+        hasActivity: false,
        actions: {
          detailApiUrl: '/api/v1/users/profile/'
        }
--- a/src/views/sessions/SessionDetail/SessionFTPLogs.vue
+++ b/src/views/sessions/SessionDetail/SessionFTPLogs.vue
@ -0,0 +1,82 @@
+<template>
+  <el-row :gutter="20">
+    <el-col :md="16" :sm="24">
+      <ListTable :header-actions="headerActions" :table-config="tableConfig" />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import ListTable from '@/components/Table/ListTable'
+import { download } from '@/utils/common'
+
+export default {
+  name: 'SessionFTPLogs',
+  components: {
+    ListTable
+  },
+  data() {
+    return {
+      tableConfig: {
+        hasSelection: false,
+        url: `/api/v1/audits/ftp-logs/?session_id=${this.$route.params.id}`,
+        columnsShow: {
+          default: [
+            'id', 'user', 'remote_addr', 'asset', 'account', 'operate',
+            'filename', 'date_start', 'is_success', 'actions'
+          ]
+        },
+        columnsMeta: {
+          remote_addr: {
+            width: '140px'
+          },
+          operate: {
+            width: '100px'
+          },
+          is_success: {
+            width: '80px'
+          },
+          actions: {
+            width: '82px',
+            formatterArgs: {
+              hasUpdate: false,
+              hasDelete: false,
+              hasClone: false,
+              extraActions: [
+                {
+                  name: 'download',
+                  title: this.$t('sessions.download'),
+                  type: 'primary',
+                  can: ({ row }) => { return row.has_file },
+                  tip: ({ row }) => {
+                    return row.has_file ? this.$t('sessions.download') : this.$t('sessions.DownloadFTPFileTip')
+                  },
+                  callback: function({ row }) {
+                    // 跳转下载页面
+                    download(`/api/v1/audits/ftp-logs/${row.id}/file/download/`)
+                  }
+                }
+              ]
+            }
+          }
+        }
+      },
+      headerActions: {
+        hasExport: false,
+        hasImport: false,
+        hasRefresh: false,
+        hasCreate: false,
+        hasBulkDelete: false,
+        hasBulkUpdate: false,
+        hasLeftActions: false,
+        hasSearch: false,
+        hasRightActions: false
+      }
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+</style>
--- a/src/views/sessions/SessionDetail/index.vue
+++ b/src/views/sessions/SessionDetail/index.vue
@ -15,6 +15,7 @@ import { GenericDetailPage } from '@/layout/components'
 import SessionCommands from './SessionCommands'
 import SessionDetailInfo from './SessionDetailInfo'
 import SessionJoinRecords from './SessionJoinRecords'
+import SessionFTPLogs from './SessionFTPLogs'

 export default {
  name: 'SessionDetail',
@ -22,7 +23,8 @@ export default {
    GenericDetailPage,
    SessionCommands,
    SessionDetailInfo,
-    SessionJoinRecords
+    SessionJoinRecords,
+    SessionFTPLogs
  },
  data() {
    return {
@ -40,6 +42,11 @@ export default {
            name: 'SessionCommands',
            hidden: () => !this.$hasPerm('terminal.view_command')
          },
+          {
+            title: this.$t('FileTransfer'),
+            name: 'SessionFTPLogs',
+            hidden: () => !this.$hasPerm('terminal.view_ftplog')
+          },
          {
            title: this.$t('Activity'),
            name: 'SessionJoinRecords',
--- a/src/views/settings/Auth/Ldap/SyncSettingDialog.vue
+++ b/src/views/settings/Auth/Ldap/SyncSettingDialog.vue
@ -34,7 +34,7 @@ export default {
      settings: {
        visible: false,
        url: '/api/v1/settings/setting/?category=ldap',
-        fields: ['AUTH_LDAP_SYNC_ORG_IDS', 'AUTH_LDAP_SYNC_IS_PERIODIC', 'AUTH_LDAP_SYNC_CRONTAB', 'AUTH_LDAP_SYNC_INTERVAL'],
+        fields: ['AUTH_LDAP_SYNC_ORG_IDS', 'AUTH_LDAP_SYNC_IS_PERIODIC', 'AUTH_LDAP_SYNC_CRONTAB', 'AUTH_LDAP_SYNC_INTERVAL', 'AUTH_LDAP_SYNC_RECEIVERS'],
        fieldsMeta: {
          AUTH_LDAP_SYNC_ORG_IDS: {
            component: Select2,
@ -63,6 +63,20 @@ export default {
          AUTH_LDAP_SYNC_INTERVAL: {
            rules: [Required],
            helpText: this.$t('IntervalOfCreateUpdatePage')
+          },
+          AUTH_LDAP_SYNC_RECEIVERS: {
+            component: Select2,
+            label: this.$t('AccountChangeSecret.Addressee'),
+            el: {
+              value: [],
+              multiple: true,
+              ajax: {
+                url: '/api/v1/users/users/?fields_size=mini&oid=ROOT',
+                transformOption: (item) => {
+                  return { label: item.name + '(' + item.username + ')', value: item.id }
+                }
+              }
+            }
          }
        },
        submitMethod: () => 'patch'
--- a/src/views/tickets/RequestAssetPerm/CreateUpdate.vue
+++ b/src/views/tickets/RequestAssetPerm/CreateUpdate.vue
@ -112,8 +112,8 @@ export default {
          },
          hidden: (form) => {
            const fieldsMeta = this.fieldsMeta
-            fieldsMeta.apply_assets.el.ajax.url = `/api/v1/assets/assets/suggestions/?oid=${form['org_id']}`
-            fieldsMeta.apply_nodes.el.ajax.url = `/api/v1/assets/nodes/suggestions/?oid=${form['org_id']}`
+            fieldsMeta.apply_assets.el.ajax.url = `/api/v1/tickets/apply-assets/suggestions/?oid=${form['org_id']}`
+            fieldsMeta.apply_nodes.el.ajax.url = `/api/v1/tickets/apply-nodes/suggestions/?oid=${form['org_id']}`
            fieldsMeta.apply_accounts.el.oid = form['org_id']
          },
          on: {
--- a/src/views/users/Group/UserGroupList.vue
+++ b/src/views/users/Group/UserGroupList.vue
@ -4,7 +4,7 @@

 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter } from '@/components/Table/TableFormatters'
+import AmountFormatter from '@/components/Table/TableFormatters/AmountFormatter.vue'

 export default {
  components: {
@ -22,8 +22,9 @@ export default {
        columnsMeta: {
          users_amount: {
            width: '120px',
-            formatter: DetailFormatter,
+            formatter: AmountFormatter,
            formatterArgs: {
+              async: true,
              getRoute({ row }) {
                return {
                  name: 'UserGroupDetail',
--- a/src/views/users/User/UserCreateUpdate.vue
+++ b/src/views/users/User/UserCreateUpdate.vue
@ -113,6 +113,7 @@ export default {
        },
        org_roles: {
          component: Select2,
+          label: this.$t('users.OrgRoles'),
          rules: this.$store.getters.currentOrgIsRoot ? [] : [rules.RequiredChange],
          el: {
            multiple: true,
@ -144,6 +145,10 @@ export default {
        },
        phone: {
          component: PhoneInput
+        },
+        is_active: {
+          label: this.$t('users.IsActive'),
+          el: {}
        }
      },
      submitMethod() {
@ -180,7 +185,7 @@ export default {
    }
  },
  computed: {
-    ...mapGetters(['currentOrgIsRoot'])
+    ...mapGetters(['currentOrgIsRoot', 'currentUser'])
  },
  async mounted() {
    if (this.currentOrgIsRoot) {
@ -192,6 +197,14 @@ export default {
  methods: {
    afterGetUser(user) {
      this.user = user
+      if (this.user.id === this.currentUser.id) {
+        const fieldsToUpdate = ['system_roles', 'org_roles', 'is_active']
+        fieldsToUpdate.forEach(field => {
+          const msg = this.$t('users.disallowSelfUpdateFields', { attr: this.fieldsMeta[field]['label'] })
+          this.fieldsMeta[field].el.disabled = true
+          this.fieldsMeta[field].helpTips = msg
+        })
+      }
      this.fieldsMeta.password.el.userIsOrgAdmin = user['is_org_admin']
      if (this.$route.query.clone_from) {
        this.user.groups = []
				`@ -0,0 +1 @@`
				<svg t="1705571985818" class="icon" viewBox="0 0 1028 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="19018" width="13" height="13"><path d="M983.678752 314.585575c-25.849513-60.781287-62.777388-115.474464-109.785575-162.482651s-101.701365-83.936062-162.482651-109.785575C648.433528 15.569591 581.663938 1.996101 512.998051 1.996101c-68.665887 0-135.435478 13.573489-198.412476 40.321248-60.781287 25.849513-115.474464 62.777388-162.482651 109.785575s-83.936062 101.701365-109.785575 162.482651C15.569591 377.562573 1.996101 444.332164 1.996101 512.998051c0 68.665887 13.573489 135.435478 40.321248 198.412475 25.849513 60.781287 62.777388 115.474464 109.785575 162.482651s101.701365 83.936062 162.482651 109.785575c62.976998 26.747758 129.746589 40.321248 198.412476 40.321248 68.665887 0 135.435478-13.573489 198.412475-40.321248 60.781287-25.849513 115.474464-62.777388 162.482651-109.785575s83.936062-101.701365 109.785575-162.482651c26.747758-62.976998 40.321248-129.746589 40.321248-198.412475 0-68.665887-13.573489-135.435478-40.321248-198.412476zM673.684211 894.752437c-51.00039 21.6577-105.094737 32.636257-160.68616 32.636257s-109.68577-10.978558-160.68616-32.636257c-49.403509-21.058869-93.816764-51.100195-131.9423-89.125926-38.125536-38.125536-68.067057-82.438986-89.125926-131.9423-21.6577-51.00039-32.636257-105.094737-32.636258-160.68616s10.978558-109.68577 32.636258-160.68616c21.058869-49.403509 51.100195-93.816764 89.125926-131.9423 38.125536-38.125536 82.438986-68.067057 131.9423-89.125926 51.00039-21.6577 105.094737-32.636257 160.68616-32.636258s109.68577 10.978558 160.68616 32.636258c49.403509 21.058869 93.816764 51.100195 131.9423 89.125926 38.125536 38.125536 68.067057 82.438986 89.125926 131.9423 21.6577 51.00039 32.636257 105.094737 32.636257 160.68616s-10.978558 109.68577-32.636257 160.68616c-21.058869 49.403509-51.100195 93.816764-89.125926 131.9423-38.125536 38.025731-82.538791 68.067057-131.9423 89.125926z" p-id="19019" fill="#080606"></path><path d="M476.868616 808.820273h74.554386c8.283821 0 14.97076-6.68694 14.97076-14.97076v-68.366472c0-8.283821-6.68694-14.97076-14.97076-14.97076h-74.554386c-8.283821 0-14.97076 6.68694-14.97076 14.97076v68.366472c0 8.283821 6.68694 14.97076 14.97076 14.97076zM687.557115 373.270955c-3.293567-51.299805-19.262378-90.922417-47.307602-117.869785-28.045224-26.947368-68.266667-41.119688-119.566472-42.217544h-0.998051c-58.585575 2.195712-104.096686 19.461988-135.235867 51.100195-31.039376 31.638207-47.906433 77.847953-50.102144 137.331774-0.299415 8.483431 6.487329 15.469786 14.97076 15.469785h65.272514c8.084211 0 14.77115-6.487329 14.970761-14.57154 1.896296-72.558285 30.440546-107.490058 90.024171-109.68577h1.297466c48.904483 2.095906 73.65614 26.947368 77.548538 77.947758 0 0.499025 0.099805 1.097856 0 1.596882-0.59883 26.548148-19.961014 59.0846-57.687329 96.810916-51.100195 48.904483-75.951657 93.118129-75.951657 135.036257v55.990643c0 8.283821 6.68694 14.97076 14.97076 14.970761h68.366472c8.283821 0 14.97076-6.68694 14.97076-14.970761v-65.272514c0-11.377778 7.8846-32.736062 45.211696-70.162963 52.497466-50.301754 79.145419-101.002729 79.145419-150.605848l0.099805-0.898246z" p-id="19020" fill="#080606"></path></svg>
				`@ -0,0 +1 @@`
				<svg t="1705572472151" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="27270" width="13" height="13"><path d="M896.64 63.872v132.224c0 137.216-88.64 260.48-197.76 327.296 109.12 66.752 197.76 189.056 197.76 326.336V960h28.8a32 32 0 0 1 0 64H99.136a32 32 0 1 1 0-64h28.416v-110.272c0-137.28 92.8-259.584 201.856-326.4C220.16 456.576 127.488 333.376 127.488 196.16V63.872h-31.616A31.872 31.872 0 0 1 63.936 32 32 32 0 0 1 96 0h832.128a32 32 0 0 1 0 63.872h-31.36z m-703.04 0v132.224c0 135.424 117.824 253.312 243.84 286.336a39.68 39.68 0 0 1 15.936 8.384 43.712 43.712 0 0 1-1.344 66.176 42.24 42.24 0 0 1-16.064 7.68c-125.248 33.6-242.368 150.08-242.368 285.056V960h638.272v-110.272c0-135.488-119.808-252.352-245.76-285.44a43.712 43.712 0 0 1-22.784-15.872 42.56 42.56 0 0 1-7.424-18.24c-2.368-23.04 10.24-42.56 30.08-47.68 126.08-33.088 245.888-150.976 245.888-286.4V63.872H193.6zM511.872 458.24a107.264 107.264 0 0 0-14.848-16l-2.88-2.496-2.304-2.048-2.56-1.728a104.448 104.448 0 0 0-35.2-16.768c-65.28-17.088-113.664-67.392-135.744-135.936h387.264C683.52 351.744 634.88 402.048 569.408 419.2c-23.552 6.144-43.52 20.288-57.6 38.976z m-17.472 146.24l2.944-2.368c2.112-1.92 3.776-3.456 5.376-5.12l2.112-2.24 2.944-3.456 2.944-3.712s1.024-1.472 1.024-1.6l6.016 9.152 2.56 1.408 0.832 0.768a82.752 82.752 0 0 0 29.248 19.392l3.136 1.088c1.408 0.512 2.816 0.96 4.288 1.344 72.96 20.48 117.568 80.96 117.568 177.024v18.56H348.608v-18.56c0-95.36 43.776-155.52 115.648-176.64 8.704-2.176 16.96-5.888 24.576-11.008l1.664-0.896 3.84-3.136z" fill="#000000" p-id="27271"></path></svg>
				`@ -0,0 +1 @@`
				<svg t="1705571586044" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="17569" width="13" height="13"><path d="M925.248 356.928l-258.176-258.176a64 64 0 0 0-45.248-18.752H144a64 64 0 0 0-64 64v736a64 64 0 0 0 64 64h736a64 64 0 0 0 64-64V402.176a64 64 0 0 0-18.752-45.248zM288 144h192V256H288V144z m448 736H288V736h448v144z m144 0H800V704a32 32 0 0 0-32-32H256a32 32 0 0 0-32 32v176H144v-736H224V288a32 32 0 0 0 32 32h256a32 32 0 0 0 32-32V144h77.824l258.176 258.176V880z" p-id="17570"></path></svg>