perf: connectivity meta icon

* Fixed: Fix the issue of losing the automation status when cloning the platform list.

* Fixed: Remove console

---------

Co-authored-by: zhaojisen <1301338853@qq.com>

Dockerfile

@@ -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

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",
@@ -94,7 +95,6 @@
     "@vue/cli-plugin-unit-jest": "3.6.3",
     "@vue/cli-service": "3.6.0",
     "@vue/test-utils": "1.0.0-beta.29",
-    "@vue/runtime-dom": "3.5.13",
     "autoprefixer": "^9.5.1",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "10.0.1",
@@ -121,7 +121,7 @@
     "serve-static": "^1.16.0",
     "strip-ansi": "^7.1.0",
     "svg-sprite-loader": "4.1.3",
-    "svgo": "1.2.4",
+    "svgo": "1.2.2",
     "vue-i18n-extract": "^1.1.1",
     "vue-template-compiler": "2.6.10"
   },
@@ -143,5 +143,6 @@
     "src/**/*.{js,vue}": [
       "eslint --fix"
     ]
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

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>

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
   })

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 + '/',

src/components/Apps/AccountCreateUpdateForm/const.js

@@ -6,10 +6,17 @@ 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,
@@ -70,11 +77,8 @@ export const accountFieldsMeta = (vm) => {
             if (!vm.account?.name) {
               updateForm({ username: value })
             }
-            const maybePrivileged = defaultPrivilegedAccounts.includes(value)
-            if (maybePrivileged) {
-              updateForm({ privileged: true })
-            }
           }
+          onPrivilegedUser(value, updateForm)
         }
       },
       hidden: () => {
@@ -92,10 +96,7 @@ export const accountFieldsMeta = (vm) => {
           vm.usernameChanged = true
         },
         change: ([value], updateForm) => {
-          const maybePrivileged = defaultPrivilegedAccounts.includes(value)
-          if (maybePrivileged) {
-            updateForm({ privileged: true })
-          }
+          onPrivilegedUser(value, updateForm)
         }
       },
       hidden: () => {

src/components/Apps/AccountCreateUpdateForm/index.vue

@@ -63,7 +63,7 @@ export default {
       encryptedFields: ['secret'],
       fields: [
         [this.$t('Basic'), ['name', 'username', 'privileged', 'su_from', 'su_from_username', 'template']],
-        [this.$t('Assets'), ['assets']],
+        [this.$t('Asset'), ['assets']],
         [this.$t('Secret'), [
           'secret_type', 'password', 'ssh_key', 'token',
           'access_key', 'passphrase', 'api_key',

src/components/Apps/AccountListTable/AccountList.vue

@@ -51,7 +51,7 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import { accountOtherActions, accountQuickFilters, connectivityMeta } from './const'
+import { accountOtherActions, accountQuickFilters, connectivityMeta, isDirectoryServiceAccount } from './const'
 import { openTaskPage } from '@/utils/jms'
 import {
   AccountConnectFormatter,
@@ -182,13 +182,21 @@ export default {
         },
         columnsMeta: {
           name: {
-            width: '120px',
+            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}`
               }
@@ -208,15 +216,19 @@ export default {
             width: '80px',
             formatter: AccountConnectFormatter,
             formatterArgs: {
-              buttonIcon: 'fa fa-desktop',
-              url: '/api/v1/assets/assets/{id}',
-              can: () => this.currentUserIsSuperAdmin,
-              connectUrlTemplate: (row) => `/luna/pam_connect/${row.id}/${row.username}/${row.asset.id}/${row.asset.name}/`,
-              setMapItem: (id, protocol) => {
-                this.$store.commit('table/SET_PROTOCOL_MAP_ITEM', {
-                  key: id,
-                  value: protocol
-                })
+              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 ''
               }
             }
           },
@@ -229,12 +241,20 @@ export default {
             }
           },
           asset: {
+            minWidth: '100px',
             formatter: function(row) {
               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) {
@@ -264,10 +284,15 @@ export default {
             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: true, // can set function(row, value)
               hasClone: false,
-              canDelete: () => vm.$hasPerm('accounts.delete_account'),
+              canDelete: ({ row }) => vm.$hasPerm('accounts.delete_account') && !isDirectoryServiceAccount(row, this),
               moreActionsTitle: this.$t('More'),
               extraActions: accountOtherActions(this)
             }

src/components/Apps/AccountListTable/const.js

@@ -7,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') {
@@ -24,162 +36,191 @@ export const connectivityMeta = {
   width: '130px'
 }
 
-export const accountOtherActions = (vm) => [
-  {
-    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: vm.$hasPerm('accounts.change_account') && !vm.$store.getters.currentOrgIsRoot,
-    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: vm.$hasPerm('accounts.change_account') && !vm.$store.getters.currentOrgIsRoot,
-    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: vm.$hasPerm('accounts.add_account') && !vm.$store.getters.currentOrgIsRoot,
-    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
+export function isDirectoryServiceAccount(account, vm) {
+  return vm.asset && vm.asset.id !== account.asset.id
+}
 
-      vm.showAddDialog = false
-      setTimeout(() => {
+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: '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: vm.$hasPerm('accounts.change_account'),
-    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: () => vm.$hasPerm('accounts.add_account') && !vm.$store.getters.currentOrgIsRoot,
-    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
+      }
     }
-  },
-  {
-    name: 'MoveToOther',
-    title: vm.$t('MoveToAsset'),
-    type: 'primary',
-    can: () => vm.$hasPerm('accounts.add_account') && !vm.$store.getters.currentOrgIsRoot,
-    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) => [
   {

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>
@@ -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

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
       }

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>

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>

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) {
       // 确定后回传的值

src/components/Form/FormFields/ProtocolSelector/ProtocolSettingDialog.vue

@@ -53,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 : '',
@@ -97,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')
     }
   }
 }

src/components/Table/CardTable/index.vue

@@ -137,9 +137,10 @@ 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}`
 
       const resp = await this.$axios.get(url, this.axiosConfig)
       const data = resp.data
@@ -212,9 +213,6 @@ export default {
   ::v-deep {
     .el-empty {
       margin: 0 auto;
-
-      .el-empty__image {
-      }
     }
   }
 }
@@ -226,6 +224,8 @@ export default {
 
   .card-container {
     display: flex;
+    justify-content: left;
+    flex-wrap: wrap;
   }
 
   .el-col, div {

src/components/Table/InfoCardTable/Info.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="item-info">
     <el-row>
-      <el-col v-for="item of infos" :key="item.content" :span="12" class="panel-item">
+      <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>

src/components/Table/TableFormatters/AccountConnectFormatter.vue

@@ -1,24 +1,33 @@
 <template>
   <div>
     <el-dropdown
-      v-if="hasPerm"
+      :disabled="!hasPerm"
+      :show-timeout="500"
+      class="action-connect"
       size="small"
       trigger="hover"
-      :show-timeout="500"
-      @command="handleCommand"
+      type="primary"
+      @command="handleProtocolConnect"
       @visible-change="visibleChange"
     >
       <el-button
         plain
         size="mini"
         type="primary"
-        @click="handlePamConnect"
+        :disabled="!hasPerm"
+        @click="handleBtnConnect"
       >
-        <i :class="IButtonIcon" />
+        <i :class="iButtonIcon" :style="{ color: hasPerm ? '' : '#fff' }" />
       </el-button>
-      <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item command="Title" disabled>
-          {{ ITitleText }}
+
+      <el-dropdown-menu v-if="!isClick" slot="dropdown">
+        <el-dropdown-item command="title" disabled>
+          <div v-if="getProtocolsLoading">
+            {{ $t('Loading') }}
+          </div>
+          <div v-else>
+            {{ dropdownTitle }}
+          </div>
         </el-dropdown-item>
         <el-dropdown-item divided />
         <el-dropdown-item
@@ -30,16 +39,6 @@
         </el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
-
-    <el-button
-      v-else
-      plain
-      size="mini"
-      type="primary"
-      :disabled="!hasPerm"
-    >
-      <i :class="IButtonIcon" style="color: #fff" />
-    </el-button>
   </div>
 </template>
 
@@ -50,85 +49,73 @@ export default {
   name: 'AccountConnectFormatter',
   extends: BaseFormatter,
   props: {
-    buttonIcon: {
-      type: String,
-      default: 'fa fa-desktop'
-    },
-    titleText: {
-      type: String,
-      default: ''
-    },
-    url: {
-      type: String,
-      default: ''
+    formatterArgsDefault: {
+      type: Object,
+      default() {
+        return {
+          can: () => true,
+          getConnectUrl: (row, protocol, asset) => {
+            const assetId = asset ? asset.id : row.asset.id
+            return `/luna/admin-connect/?
+              asset=${assetId}
+              &account=${row.id}
+              &protocol=${protocol}
+            `.replace(/\s+/g, '')
+          },
+          asset: null,
+          assetUrl: '/api/v1/assets/assets/{id}/',
+          buttonIcon: 'fa fa-desktop'
+        }
+      }
     }
   },
   data() {
     return {
-      hasPerm: false,
-      protocols: []
+      formatterArgs: Object.assign(this.formatterArgsDefault, this.col.formatterArgs),
+      protocols: [],
+      isClick: false,
+      getProtocolsLoading: false,
+      dropdownTitle: this.$t('Protocols')
     }
   },
   computed: {
-    IButtonIcon() {
-      return this.buttonIcon
+    iButtonIcon() {
+      return this.formatterArgs.buttonIcon
     },
-    ITitleText() {
-      return this.titleText || this.$t('SelectProtocol')
+    hasPerm() {
+      return this.formatterArgs.can({ row: this.row, cellValue: this.cellValue })
     }
   },
-  mounted() {
-    this.hasPerm = this.formatterArgs.can()
-  },
   methods: {
-    handleCommand(protocol) {
-      if (protocol === 'Title') return
-
-      this.formatterArgs.setMapItem(this.row.id, protocol)
-      this.handleWindowOpen(this.row, protocol)
+    handleProtocolConnect(protocol) {
+      const url = this.formatterArgs.getConnectUrl(this.row, protocol, this.formatterArgs.asset)
+      window.open(url, '_blank')
     },
     visibleChange(visible) {
       if (visible) {
         this.getProtocols(this.row.asset.id)
       }
     },
-    handleWindowOpen(row, protocol) {
-      const url = this.formatterArgs.connectUrlTemplate(row) + `${protocol}`
-
-      this.$nextTick(() => {
-        window.open(url, '_blank')
-      })
-    },
-    async handlePamConnect() {
-      const protocolMap = this.$store.getters.protocolMap
-
-      if (protocolMap.has(this.row.id)) {
-        // 直连
-        const protocol = protocolMap.get(this.row.id)
-        this.handleWindowOpen(this.row, protocol)
-      } else {
-        try {
-          const url = this.formatterArgs.url.replace('{id}', this.row.asset.id)
-          const res = await this.$axios.get(url)
-
-          if (res && res.protocols.length > 0) {
-            const protocol = res.protocols.filter(protocol => protocol.name !== 'sftp')[0]
-
-            this.formatterArgs.setMapItem(this.row.id, protocol.name)
-            this.handleWindowOpen(this.row, protocol.name)
-          }
-        } catch (e) {
-          throw new Error(`Error getting protocols: ${e}`)
-        }
+    async handleBtnConnect() {
+      this.isClick = true
+      if (this.protocols === 0) {
+        await this.getProtocols(this.row.asset.id)
       }
+
+      if (this.protocols.length > 0) {
+        this.handleProtocolConnect(this.protocols[0].name)
+      }
+      setTimeout(() => {
+        this.isClick = false
+      }, 1000)
     },
     async getProtocols(assetId) {
+      if (this.protocols.length > 0) return
       try {
-        const url = this.formatterArgs.url.replace('{id}', assetId)
+        const url = this.formatterArgs.assetUrl.replace('{id}', assetId)
         const res = await this.$axios.get(url)
 
-        // 暂将 SFTP 过滤
-        if (res) this.protocols = res.protocols.filter(protocol => protocol.name !== 'sftp')
+        this.protocols = res.protocols.filter(protocol => (protocol.name !== 'winrm')) || []
       } catch (e) {
         throw new Error(`Error getting protocols: ${e}`)
       }
@@ -137,7 +124,7 @@ export default {
 }
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .el-dropdown-menu__item.is-disabled {
   font-weight: 500;
   color: var(--el-text-color-secondary);

src/components/Table/TableFormatters/AccountInfoFormatter.vue

@@ -10,7 +10,7 @@
         <span>{{ $t('No accounts') }}</span>
       </div>
       <div v-for="account of accountData" :key="account.id" class="detail-item">
-        <span>{{ account.name }}({{ account.username }})</span>
+        <span>{{ getDisplay(account) }}</span>
       </div>
     </div>
     <el-button slot="reference" class="link-btn" plain size="mini" type="primary">
@@ -39,10 +39,20 @@ export default {
     }
   },
   methods: {
+    getDisplay(account) {
+      const { username, name } = account
+      if (username.startsWith('@')) {
+        return name
+      } else if (name === username) {
+        return username
+      } else {
+        return `${name}(${username})`
+      }
+    },
     async getAsyncItems() {
       this.loading = true
       const userId = this.$route.params.id || 'self'
-      const url = `/api/v1/perms/users/${userId}/assets/${this.row.id}`
+      const url = `/api/v1/perms/users/${userId}/assets/${this.row.id}/`
       this.$axios.get(url).then(res => {
         this.accountData = res?.permed_accounts || []
       }).finally(() => {

src/components/Table/TableFormatters/DiscoverConfirmFormatter.vue

@@ -6,7 +6,7 @@
           <i class="fa fa-check" />
         </el-button>
         <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item v-for="item of iActions" :key="item.name" :command="item.name">
+          <el-dropdown-item v-for="item of iActions" :key="item.name" :command="item.name" :disabled="item.disabled">
             {{ item.label }}
           </el-dropdown-item>
         </el-dropdown-menu>
@@ -123,17 +123,20 @@ export default {
         {
           name: 'delete_remote',
           label: this.$t('DeleteRemoteAccount'),
-          has: this.row.remote_present
+          has: this.row.remote_present,
+          disabled: this.$store.getters.currentOrgIsRoot
         },
         {
           name: 'add_account',
           label: this.$t('AddAccount'),
-          has: !this.row.present
+          has: !this.row.present,
+          disabled: this.$store.getters.currentOrgIsRoot
         },
         {
           name: 'change_password_add',
           label: this.$t('AddAccountAfterChangingPassword'),
-          has: !this.row.present
+          has: !this.row.present,
+          disabled: this.$store.getters.currentOrgIsRoot
         }
       ]
       return actions.filter(action => {

src/components/Table/TableFormatters/HostInfoFormatter.vue

@@ -50,23 +50,75 @@ export default {
       return cellValue
     },
     viewText() {
-      const cpuCount = this.items['cpu_count']
-      const cpuCores = this.items['cpu_cores']
-      const cpuVcpus = this.items['cpu_vcpus']
-      const memory = this.items['memory']
-      const diskTotal = this.items['disk_total']
+      const cpuCount = Number(this.items['cpu_count'] || 0)
+      const cpuCores = Number(this.items['cpu_cores'] || 0)
+      const cpuVcpus = Number(this.items['cpu_vcpus'] || 0)
+      const memory = Number(this.items['memory'] || 0)
+      const diskTotal = Number(this.items['disk_total'] || 0)
+      const rawCpuModel = this.items['cpu_model']
+      const rawGpuModel = this.items['gpu_model']
+
+      let summary = ''
+
       if (cpuCount) {
-        let text = `${cpuVcpus || cpuCores * cpuCount} Core`
+        const coreCount = cpuVcpus || (cpuCores * cpuCount)
+        summary = `${coreCount} Core`
+
         if (memory) {
-          text += ` ${memory}G`
+          summary += ` ${Math.round(memory)}G`
         }
+
         if (diskTotal) {
-          text += ` ${diskTotal}G`
+          summary += ` ${Math.round(diskTotal)}G`
         }
-        return text
+
+        const cpuModel = this.formatCpuModel(rawCpuModel)
+        if (cpuModel) {
+          summary += ` (${cpuModel})`
+        }
+
+        if (rawGpuModel) {
+          const gpu = this.formatGpuModel(rawGpuModel)
+          summary += ` ${gpu}`
+        }
+
+        return summary
       }
+
       return this.items?.distribution || '-'
     }
+  },
+  methods: {
+    formatCpuModel(raw) {
+      if (!raw) return ''
+
+      const match = raw.match(/^([^\s]+)\s*(x\d+)?$/)
+      let base = match?.[1] || raw
+      const suffix = match?.[2] || ''
+
+      base = base
+        .replace(/GenuineIntel/i, '')
+        .replace(/\b\d+(st|nd|rd|th)? Gen\b/i, '')
+        .replace(/\(R\)/g, '')
+        .replace(/\(TM\)/g, '')
+        .replace(/\s+/g, ' ')
+        .trim()
+
+      return `${base}${suffix}`
+    },
+    formatGpuModel(raw) {
+      if (!raw) return ''
+
+      const match = raw.match(/(.+?),\s*(\d+),\s*([\d.]+)(?:\s*x(\d+))?/)
+      if (match) {
+        const [, model, vramMb, driverVersion, countStr] = match
+        const count = countStr ? parseInt(countStr) : 1
+        const vramGb = Math.round(parseInt(vramMb) / 1024)
+        const label = `${model} (${vramGb}GB, Driver ${driverVersion})`
+        return count > 1 ? `${label} x${count}` : label
+      }
+      return raw // fallback
+    }
   }
 }
 </script>

src/components/Table/TableFormatters/PlatformFormatter.vue

@@ -45,7 +45,7 @@ export default {
 }
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .platform-td {
   display: flex;
   flex-wrap: nowrap;
@@ -55,6 +55,7 @@ export default {
   .icon-zone {
     width: 1.5em;
     height: 1.5em;
+    flex-shrink: 0;
 
     .asset-icon {
       height: 100%;
@@ -66,6 +67,10 @@ export default {
 
   .platform-name {
     flex: 1;
+    min-width: 0;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis
   }
 }
 

src/components/Table/TagSearch/index.vue

@@ -320,15 +320,15 @@ export default {
       // this.$emit('tagSearch', this.filterMaps)
 
       // 修改查询参数时改变url中保存的参数
-      if (this.getUrlQuery) {
-        let newQuery = _.cloneDeep(this.$route.query)
-        if (this.filterKey.startsWith('search')) {
-          newQuery = { ...newQuery, search: encodeURI(this.filterMaps.search) }
-        } else {
-          newQuery = { ...newQuery, [this.filterKey]: encodeURI(this.filterValue) }
-        }
-        this.$router.replace({ query: newQuery })
-      }
+      // if (this.getUrlQuery) {
+      // let newQuery = _.cloneDeep(this.$route.query)
+      // if (this.filterKey.startsWith('search')) {
+      // newQuery = { ...newQuery, search: encodeURI(this.filterMaps.search) }
+      // } else {
+      // newQuery = { ...newQuery, [this.filterKey]: encodeURI(this.filterValue) }
+      // }
+      // this.$router.replace({ query: newQuery })
+      // }
 
       this.filterKey = ''
       this.filterValue = ''

src/components/Widgets/MarkDown/index.vue

@@ -53,24 +53,24 @@ export default {
       resizeObserver: null,
       span: 12,
       isShow: true,
-      iValue: this.value
+      iValue: this.sanitizeContent(this.value)
     }
   },
   computed: {
     sanitizedValue() {
-      // 转义特殊字符
-      let content = this.iValue.replace(/\\/g, '\\\\').replace(/\$/g, '\\$')
+      const content = this.iValue.replace(/\\/g, '\\\\').replace(/\$/g, '\\$')
 
-      // 使用 DOMPurify 进行 XSS 过滤
-      content = DOMPurify.sanitize(content)
-
-      return content
+      return this.sanitizeContent(content)
+    }
+  },
+  watch: {
+    value(newVal) {
+      this.iValue = this.sanitizeContent(newVal)
     }
   },
   mounted() {
     this.$nextTick(() => {
       this.resizeObserver = new ResizeObserver(entries => {
-        // 监听高度变化
         const height = entries[0].target.offsetHeight
         if (height) {
           this.height = height
@@ -90,8 +90,19 @@ export default {
     this.resizeObserver = null
   },
   methods: {
+    sanitizeContent(content) {
+      if (!content) return ''
+
+      return DOMPurify.sanitize(content, {
+        ALLOWED_TAGS: ['p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'ul', 'ol', 'li', 'strong', 'em', 'code', 'pre', 'blockquote', 'a'],
+        FORBID_TAGS: ['script', 'style', 'iframe', 'frame', 'object', 'embed'],
+        FORBID_ATTR: ['onerror', 'onload', 'onclick', 'onmouseover']
+      })
+    },
     onChange() {
-      this.$emit('change', this.iValue)
+      const sanitizedValue = this.sanitizeContent(this.iValue)
+      this.iValue = sanitizedValue
+      this.$emit('change', sanitizedValue)
     },
     onView() {
       this.isShow = !this.isShow

src/components/const.js

@@ -38,10 +38,20 @@ export const crontab = {
     return formValue.is_periodic === false
   },
   helpText: i18n.t('CrontabHelpText'),
-  helpTip: i18n.t('CrontabHelpTip')
+  helpTip: i18n.t('CrontabHelpTip'),
+  on: {
+    change: (val, updateForm) => {
+      updateForm({
+        interval: null
+      })
+    }
+  }
 }
 
 const validatorInterval = (rule, value, callback) => {
+  if (value === '') {
+    return callback()
+  }
   if (parseInt(value) < 1) {
     return callback(new Error(i18n.t('EnsureThisValueIsGreaterThanOrEqualTo1')))
   }
@@ -59,7 +69,14 @@ export const interval = {
   },
   rules: [
     { validator: validatorInterval }
-  ]
+  ],
+  on: {
+    input: (val, updateForm) => {
+      updateForm({
+        crontab: ''
+      })
+    }
+  }
 }
 
 export const is_periodic = {

src/i18n/langs/index.js

@@ -2,6 +2,10 @@ import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
 import zhTWLocale from 'element-ui/lib/locale/lang/zh-TW'
 import enLocale from 'element-ui/lib/locale/lang/en'
 import jaLocale from 'element-ui/lib/locale/lang/ja'
+import ptBrLocale from 'element-ui/lib/locale/lang/pt-br'
+import esLocale from 'element-ui/lib/locale/lang/es'
+import ruLocale from 'element-ui/lib/locale/lang/ru-RU'
+import koLocale from 'element-ui/lib/locale/lang/ko'
 import zh from './zh.json'
 import zhHant from './zh_hant.json'
 import en from './en.json'
@@ -23,6 +27,18 @@ const messages = {
   ja: {
     ...jaLocale,
     ...ja
+  },
+  pt_br: {
+    ...ptBrLocale
+  },
+  es: {
+    ...esLocale
+  },
+  ru: {
+    ...ruLocale
+  },
+  ko: {
+    ...koLocale
   }
 }
 

src/layout/components/GenericCreateUpdateForm/index.vue

@@ -244,6 +244,7 @@ export default {
             this.$refs.form.setFieldError(key, err)
           }
         }
+        this.$emit('performError', data)
       }
     },
     hasSaveContinue: {

src/layout/components/NavHeader/Help.vue

@@ -51,7 +51,7 @@ export default {
           window.open(this.URLSite.HELP_SUPPORT_URL, '_blank')
           break
         case 'enterprise':
-          window.open('https://jumpserver.org/enterprise.html', '_blank')
+          window.open('https://www.jumpserver.com/#section-edition', '_blank')
           break
         case 'about':
           this.visible = true

src/layout/components/Page/index.vue

@@ -38,14 +38,14 @@
             <div class="disabled-text">
               {{ $t('UpgradeEnterpriseEditionHelpText') }}
             </div>
-            <el-button class="upgrade-btn" type="primary">
+            <el-button class="upgrade-btn" type="primary" @click="handleUpgrade">
               {{ $t('UpgradeEnterpriseEdition') }}
             </el-button>
           </div>
         </IBox>
       </div>
-      <el-alert v-if="helpMessage" type="success">
-        <span v-sanitize="helpMessage" class="announcement-main" />
+      <el-alert v-if="iHelpMessage" type="success">
+        <span v-sanitize="iHelpMessage" class="announcement-main" />
       </el-alert>
       <slot />
     </PageContent>
@@ -119,6 +119,9 @@ export default {
         return true
       }
       return window.history.length <= 2
+    },
+    iHelpMessage() {
+      return this.helpMessage || this.helpTip
     }
   },
   methods: {
@@ -136,7 +139,7 @@ export default {
       clearTimeout(this.longPressTimer)
     },
     handleUpgrade() {
-      const url = 'http://www.jumpserver.org/support/'
+      const url = 'https://www.lxware.hk/pages/about'
       window.open(url, '_blank')
     }
   }
@@ -153,8 +156,8 @@ export default {
   overflow-x: hidden;
 
   .el-alert {
-    margin-top: -5px;
-    margin-bottom: 5px;
+    margin: -5px 0 5px 0!important;
+    width: calc(100% - 10px);
   }
 
   .page-content {

src/router/console/acls.js

@@ -25,7 +25,8 @@ export default [
           title: i18n.t('UserLoginACLs'),
           app: 'acls',
           resource: 'loginacl',
-          disableOrgsChange: true
+          disableOrgsChange: true,
+          licenseRequired: true
         },
         children: [
           {

src/router/console/assets.js

@@ -228,35 +228,35 @@ export default [
     component: empty,
     redirect: '',
     meta: {
-      resource: 'domain',
+      resource: 'zone',
       icon: 'zone',
-      permissions: ['assets.view_domain']
+      permissions: ['assets.view_zone']
     },
     children: [
       {
         path: '',
         name: 'ZoneList',
-        component: () => import('@/views/assets/Domain/DomainList.vue'),
+        component: () => import('@/views/assets/Zone/ZoneList.vue'),
         meta: { title: i18n.t('ZoneList') }
       },
       {
         path: 'create',
         name: 'ZoneCreate',
-        component: () => import('@/views/assets/Domain/DomainCreateUpdate.vue'),
+        component: () => import('@/views/assets/Zone/ZoneCreateUpdate.vue'),
         hidden: true,
         meta: { title: i18n.t('ZoneCreate') }
       },
       {
         path: ':id/update',
         name: 'ZoneUpdate',
-        component: () => import('@/views/assets/Domain/DomainCreateUpdate.vue'),
+        component: () => import('@/views/assets/Zone/ZoneCreateUpdate.vue'),
         hidden: true,
         meta: { title: i18n.t('ZoneUpdate') }
       },
       {
         path: ':id',
         name: 'ZoneDetail',
-        component: () => import('@/views/assets/Domain/DomainDetail'),
+        component: () => import('@/views/assets/Zone/ZoneDetail'),
         hidden: true,
         meta: { title: i18n.t('Zone') }
       }
@@ -274,7 +274,7 @@ export default [
       {
         path: 'create',
         name: 'GatewayCreate',
-        component: () => import('@/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue'),
+        component: () => import('@/views/assets/Zone/ZoneDetail/GatewayCreateUpdate.vue'),
         meta: {
           title: i18n.t('GatewayCreate'),
           permissions: ['assets.view_gateway']
@@ -283,7 +283,7 @@ export default [
       {
         path: ':id/update',
         name: 'GatewayUpdate',
-        component: () => import('@/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue'),
+        component: () => import('@/views/assets/Zone/ZoneDetail/GatewayCreateUpdate.vue'),
         meta: {
           title: i18n.t('GatewayUpdate'),
           permissions: ['assets.change_gateway']

src/store/modules/assets.js

@@ -89,6 +89,9 @@ const actions = {
         })
     })
   },
+  cleanPlatforms({ commit, dispatch, state }) {
+    state.platforms = []
+  },
   addToRecentPlatforms({ commit, display, state }, platform) {
     const recentPlatformIds = state.recentPlatformIds.filter(i => i !== platform.id)
     recentPlatformIds.unshift(platform.id)

src/store/modules/settings.js

@@ -29,6 +29,9 @@ const mutations = {
       state.hasValidLicense = settings['XPACK_LICENSE_IS_VALID']
     }
   },
+  SET_SECURITY_WATERMARK_ENABLED: (state, value) => {
+    state.publicSettings['SECURITY_WATERMARK_ENABLED'] = value
+  },
   setTheme(state, data) {
     state.themeColors = data
     localStorage.setItem('themeColors', JSON.stringify(data))

src/utils/startup.js

@@ -138,13 +138,20 @@ export async function generatePageRoutes({ to, from, next }) {
 }
 
 export async function checkUserFirstLogin({ to, from, next }) {
+  // 防止递归调用
+  if (to.path === '/profile/improvement') return true
   if (store.state.users.profile.is_first_login) {
-    next('/profile/improvement')
-  }
-  const nextRoute = localStorage.getItem('next')
-  if (nextRoute) {
-    localStorage.setItem('next', '')
-    next(nextRoute.replace('#', ''))
+    next({
+      name: 'Improvement',
+      replace: true,
+      query: { _t: Date.now() } // 添加时间戳，防止 from 一样 next 不触发 guard.js router.beforeEach逻辑
+    })
+  } else {
+    const nextRoute = localStorage.getItem('next')
+    if (nextRoute) {
+      localStorage.setItem('next', '')
+      next(nextRoute.replace('#', ''))
+    }
   }
 }
 
@@ -160,13 +167,18 @@ export async function changeCurrentViewIfNeed({ to, from, next }) {
   Vue.$log.debug('Change has current view, has perm: ', viewName, '=>', has)
   if (has) {
     await store.dispatch('users/changeToView', viewName)
-    return
+    return { status: 'continue' }
   }
   viewName = getPropView()
   // Next 之前要重置 init 状态，否则这些路由守卫就不走了
   await store.dispatch('app/reset')
   next(`/${viewName}/`)
-  return new Promise((resolve, reject) => reject(''))
+
+  // new Promise((resolve, reject) => reject('')) 这种方式通过输出发现在页面除此渲染的时候执行两次，
+  // 返回一个 Promise 我理解是为了中断第一次导航，确保只有第二次导航到到有权限的视图。由于第一个 has 为 false
+  // 导致被 startup catch 捕获，而 error 的 trace 之所以锁定为到 runtime 等中也是因为由于 Babel 和 Polyfill 的缘故
+
+  return { status: 'redirected', to: viewName }
 }
 
 function onI18nLoaded() {
@@ -188,6 +200,8 @@ function onI18nLoaded() {
 export async function startup({ to, from, next }) {
   // if (store.getters.inited) { return true }
   if (store.getters.inited) {
+    // 页面初始化后也需要检测
+    await checkUserFirstLogin({ to, from, next })
     return true
   }
 
@@ -200,7 +214,8 @@ export async function startup({ to, from, next }) {
     await checkLogin({ to, from, next })
     await onI18nLoaded()
     await getPublicSetting({ to, from, next }, false)
-    await changeCurrentViewIfNeed({ to, from, next })
+    const viewResult = await changeCurrentViewIfNeed({ to, from, next })
+    if (viewResult && viewResult.status === 'redirected') return true
     await changeCurrentOrgIfNeed({ to, from, next })
     await generatePageRoutes({ to, from, next })
     await checkUserFirstLogin({ to, from, next })

src/views/accounts/AccountBackup/AccountBackupList.vue

@@ -56,18 +56,9 @@ export default {
             }
           },
           executed_amount: {
-            formatter: DetailFormatter,
-            formatterArgs: {
-              can: vm.$hasPerm('accounts.view_backupaccountexecution'),
-              getRoute({ row }) {
-                return {
-                  name: 'AccountBackupList',
-                  query: {
-                    tab: 'AccountBackupExecutionList',
-                    automation_id: row.id
-                  }
-                }
-              }
+            formatter: (row) => {
+              const can = vm.$hasPerm('accounts.view_backupaccountexecution')
+              return <el-link onClick={ () => this.handleExecAmount(row) } disabled={ !can }>{ row.executed_amount }</el-link>
             }
           },
           actions: {
@@ -104,6 +95,17 @@ export default {
         hasImport: false
       }
     }
+  },
+  methods: {
+    handleExecAmount(row) {
+      this.$router.push({
+        name: 'AccountBackupList',
+        query: {
+          tab: 'AccountBackupExecutionList',
+          automation_id: row.id
+        }
+      })
+    }
   }
 }
 </script>

src/views/accounts/AccountBackup/index.vue

@@ -40,6 +40,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-</style>

src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue

@@ -61,19 +61,9 @@ export default {
             width: '180px'
           },
           executed_amount: {
-            formatter: DetailFormatter,
-            formatterArgs: {
-              route: 'AccountDiscoverList',
-              can: vm.$hasPerm('accounts.view_changesecretexecution'),
-              getRoute({ row }) {
-                return {
-                  name: 'AccountChangeSecretDetail',
-                  query: {
-                    tab: 'AccountChangeSecretExecutionList',
-                    automation_id: row.id
-                  }
-                }
-              }
+            formatter: (row) => {
+              const can = vm.$hasPerm('accounts.view_changesecretexecution')
+              return <el-link onClick={ () => this.handleExecAmount(row) } disabled={ !can }>{ row.executed_amount }</el-link>
             }
           },
           actions: {
@@ -114,6 +104,17 @@ export default {
         createRoute: 'AccountChangeSecretCreate'
       }
     }
+  },
+  methods: {
+    handleExecAmount(row) {
+      this.$router.push({
+        name: 'AccountChangeSecretList',
+        query: {
+          tab: 'AccountChangeSecretExecutionList',
+          automation_id: row.id
+        }
+      })
+    }
   }
 }
 </script>

src/views/accounts/AccountDiscover/AccountDiscoverTaskList.vue

@@ -69,19 +69,9 @@ export default {
           },
           periodic_display: {},
           executed_amount: {
-            formatter: DetailFormatter,
-            formatterArgs: {
-              route: 'AccountDiscoverList',
-              can: vm.$hasPerm('accounts.view_gatheraccountsexecution'),
-              getRoute({ row }) {
-                return {
-                  name: 'AccountDiscoverList',
-                  query: {
-                    tab: 'AccountDiscoverTaskExecutionList',
-                    automation_id: row.id
-                  }
-                }
-              }
+            formatter: (row) => {
+              const can = vm.$hasPerm('accounts.view_gatheraccountsexecution')
+              return <el-link onClick={ () => this.handleExecAmount(row) } disabled={ !can }>{ row.executed_amount }</el-link>
             }
           },
           actions: {
@@ -124,6 +114,17 @@ export default {
         }
       }
     }
+  },
+  methods: {
+    handleExecAmount(row) {
+      this.$router.push({
+        name: 'AccountDiscoverList',
+        query: {
+          tab: 'AccountDiscoverTaskExecutionList',
+          automation_id: row.id
+        }
+      })
+    }
   }
 }
 </script>

src/views/accounts/AccountPush/AccountPushList.vue

@@ -64,18 +64,9 @@ export default {
             showOverflowTooltip: true
           },
           executed_amount: {
-            formatter: DetailFormatter,
-            formatterArgs: {
-              can: vm.$hasPerm('accounts.view_pushaccountexecution'),
-              getRoute({ row }) {
-                return {
-                  name: 'AccountPushList',
-                  query: {
-                    tab: 'AccountPushExecutionList',
-                    automation_id: row.id
-                  }
-                }
-              }
+            formatter: (row) => {
+              const can = vm.$hasPerm('accounts.view_pushaccountexecution')
+              return <el-link onClick={ () => this.handleExecAmount(row) } disabled={ !can }>{ row.executed_amount }</el-link>
             }
           },
           actions: {
@@ -116,6 +107,17 @@ export default {
         createRoute: 'AccountPushCreate'
       }
     }
+  },
+  methods: {
+    handleExecAmount(row) {
+      this.$router.push({
+        name: 'AccountPushList',
+        query: {
+          tab: 'AccountPushExecutionList',
+          automation_id: row.id
+        }
+      })
+    }
   }
 }
 </script>

src/views/accounts/AccountTemplate/Detail/Account.vue

@@ -140,7 +140,14 @@ export default {
         hasImport: false,
         hasCreate: false,
         searchConfig: {
-          getUrlQuery: false
+          getUrlQuery: true,
+          exclude: ['asset'],
+          options: [
+            {
+              label: this.$t('AssetName'),
+              value: 'asset_name'
+            }
+          ]
         },
         hasMoreActions: false
       }

src/views/accounts/Automation/BaseExecutionList.vue

@@ -87,8 +87,8 @@ export default {
             formatter: DetailFormatter,
             minWidth: '180px',
             formatterArgs: {
-              getTitle: ({ row }) => row.snapshot.name,
-              getDrawerTitle: ({ row }) => row.snapshot.name,
+              getTitle: ({ row }) => row.automation?.name || row.snapshot.name,
+              getDrawerTitle: ({ row }) => row.automation?.name || row.snapshot.name,
               getRoute: ({ row }) => ({
                 name: this.automationRoute,
                 params: { id: row.automation.id }

src/views/accounts/Integration/ApplicationCreateUpdate.vue

@@ -61,14 +61,7 @@ export default {
             fileChange: ([value], updateForm) => {
               this.logo_file = value
             }
-          },
-          rules: [
-            {
-              required: true,
-              message: this.$t('FieldRequiredError'),
-              trigger: 'blur'
-            }
-          ]
+          }
         }
       },
       hasSaveContinue: false,
@@ -100,7 +93,6 @@ export default {
       }
     }
   },
-  methods: {
-  }
+  methods: {}
 }
 </script>

src/views/accounts/Integration/ApplicationList.vue

@@ -55,7 +55,7 @@ export default {
             formatter: DetailFormatter
           },
           secret: {
-            label: this.$t('Secret'),
+            label: 'Secret',
             formatter: CopyableFormatter,
             formatterArgs: {
               shadow: true,

src/views/accounts/PAM/AssetList.vue

@@ -20,7 +20,7 @@ export default {
         category: 'all'
       },
       tableConfig: {
-        columnsExclude: ['date_verified']
+        columnsExclude: ['date_verified', 'spec_info']
       },
       headerActions: {
         handleImportClick: ({ selectedRows }) => {

src/views/accounts/const.js

@@ -1,5 +1,6 @@
 import { toSafeLocalDateStr } from '@/utils/time'
 import { ActionsFormatter, DetailFormatter, DiscoverConfirmFormatter } from '@/components/Table/TableFormatters'
+
 export const statusMap = {
   pending: '0',
   confirmed: '1',
@@ -135,7 +136,7 @@ export const gatherAccountHeaderActions = (vm) => {
         type: 'primary',
         icon: 'fa fa-check',
         can: ({ selectedRows }) => {
-          return selectedRows.length > 0 && vm.$hasPerm('accounts.add_account')
+          return selectedRows.length > 0 && vm.$hasPerm('accounts.add_account') && !vm.$store.getters.currentOrgIsRoot
         },
         callback: function({ selectedRows }) {
           const ids = selectedRows.map(v => {
@@ -157,7 +158,7 @@ export const gatherAccountHeaderActions = (vm) => {
         type: 'primary',
         icon: 'fa fa-exchange',
         can: ({ selectedRows }) => {
-          return selectedRows.length > 0 && vm.$hasPerm('accounts.remove_account')
+          return selectedRows.length > 0 && vm.$hasPerm('accounts.remove_account') && !vm.$store.getters.currentOrgIsRoot
         },
         callback: function({ selectedRows }) {
           vm.gatherAccounts = selectedRows

src/views/acls/UserLoginACL/UserLoginACLCreateUpdate.vue

@@ -81,6 +81,13 @@ export default {
         return url
       },
       cleanFormValue(value) {
+        if (
+          Array.isArray(value.rules.time_period) &&
+          value.rules.time_period.every(item => item.value === '')
+        ) {
+          value.rules.time_period = []
+        }
+
         if (!Array.isArray(value.rules.ip_group)) {
           value.rules.ip_group = value.rules.ip_group ? value.rules.ip_group.split(',') : []
         }

src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue

@@ -47,7 +47,9 @@ export default {
     return {
       loading: true,
       platform: {},
-      changePlatformID: '',
+      initing: false,
+      // 在 meta 中，可能改变 platform id
+      platformID: this.$route.query.platform || '',
       meta: {},
       iConfig: {},
       defaultConfig: {
@@ -62,12 +64,12 @@ export default {
           [this.$t('Basic'), ['name', 'address', 'platform', 'nodes']],
           [this.$t('Protocol'), ['protocols']],
           [this.$t('Account'), ['accounts']],
-          [this.$t('Other'), ['domain', 'labels', 'is_active', 'comment']]
+          [this.$t('Other'), ['directory_services', 'zone', 'labels', 'is_active', 'comment']]
         ],
         fieldsMeta: {},
         performSubmit(validValues) {
           let url = this.url
-          const { id = '' } = this.$route.query
+          const { id = '' } = this.$route.params
           const values = _.cloneDeep(validValues)
           const submitMethod = id ? 'put' : 'post'
 
@@ -95,21 +97,28 @@ export default {
   },
   methods: {
     async init() {
+      // 更改平台时，就不重新 loading 了
+      this.$log.debug('Initing asset base upcate create', this.initing)
+      if (this.initing) {
+        return
+      }
+      this.initing = true
       try {
         await this.genConfig()
         await this.setInitial()
         await this.setPlatformConstrains()
       } finally {
+        this.initing = false
         this.loading = false
       }
     },
     async genConfig() {
       const { addFields, addFieldsMeta, defaultConfig } = this
-      defaultConfig.fieldsMeta = assetFieldsMeta(this, this.$route.query.type)
+      defaultConfig.fieldsMeta = assetFieldsMeta(this)
       let url = this.url
-      const { id = '', platform } = this.$route.query
-      if (platform && !id) {
-        url = setUrlParam(url, 'platform', platform)
+      const id = this.$route.params.id
+      if (!id) {
+        url = setUrlParam(url, 'platform', this.platformID)
       }
       // 过滤类型为：null, undefined 的元素
       defaultConfig.fields = defaultConfig.fields.filter(Boolean)
@@ -134,9 +143,9 @@ export default {
     },
     async setInitial() {
       const { defaultConfig } = this
-      const { node, platform } = this.$route.query
+      const { node } = this.$route.query
       const nodesInitial = node ? [node] : []
-      const platformId = this.changePlatformID || this.$route.query.platform || (platform || 'Linux')
+      const platformId = this.platformID || 'Linux'
       const url = `/api/v1/assets/platforms/${platformId}/`
       this.platform = await this.$axios.get(url)
       const initial = {
@@ -165,13 +174,6 @@ export default {
       const protocolChoices = this.iConfig.fieldsMeta.protocols.el.choices
       protocolChoices.splice(0, protocolChoices.length, ...protocols)
       this.iConfig.fieldsMeta.accounts.el.platform = platform
-      const hiddenCheckFields = ['protocols', 'domain']
-
-      for (const field of hiddenCheckFields) {
-        if (platform[field + '_enabled'] === false) {
-          this.iConfig.fieldsMeta[field].hidden = () => true
-        }
-      }
     }
   }
 }

src/views/assets/Asset/AssetCreateUpdate/DSCreateUpdate.vue

@@ -0,0 +1,23 @@
+<template>
+  <BaseAssetCreateUpdate v-bind="$data" />
+</template>
+
+<script>
+import BaseAssetCreateUpdate from './BaseAssetCreateUpdate'
+
+export default {
+  name: 'DSCreateUpdate',
+  components: { BaseAssetCreateUpdate },
+  data() {
+    return {
+      url: '/api/v1/assets/directories/',
+      addFields: [
+        [this.$t('IdentityDomain'), ['domain_name'], 1]
+      ]
+    }
+  }
+}
+</script>
+
+<style>
+</style>

src/views/assets/Asset/AssetDetail/Account.vue

@@ -59,7 +59,7 @@ export default {
     return {
       title: this.$t('Test'),
       templateDialogVisible: false,
-      columnsDefault: ['name', 'username', 'asset', 'connect'],
+      columnsDefault: ['name', 'username', 'connect'],
       headerExtraActions: [
         {
           name: this.$t('AccountTemplate'),

src/views/assets/Asset/AssetDetail/Detail.vue

@@ -184,7 +184,7 @@ export default {
         object: this.object,
         fields: [
           'id', 'name', 'category', 'type',
-          'address', 'platform', 'protocols', 'domain',
+          'address', 'platform', 'protocols', 'zone',
           'is_active', 'date_created', 'date_updated',
           'created_by', 'comment'
         ],

src/views/assets/Asset/AssetList/DSList.vue

@@ -0,0 +1,22 @@
+<template>
+  <BaseList v-bind="config" />
+</template>
+
+<script>
+import BaseList from './components/BaseList'
+
+export default {
+  components: {
+    BaseList
+  },
+  data() {
+    return {
+      config: {
+        url: '/api/v1/assets/directories/',
+        category: 'ds',
+        helpMessage: this.$t('DirectoryServiceHelpMessage')
+      }
+    }
+  }
+}
+</script>

src/views/assets/Asset/AssetList/DatabaseList.vue

@@ -13,7 +13,20 @@ export default {
     return {
       config: {
         category: 'database',
-        url: '/api/v1/assets/databases/'
+        url: '/api/v1/assets/databases/',
+        headerActions: {
+          extraActions: [
+            {
+              name: this.$t('CloudSync'),
+              title: this.$t('CloudSync'),
+              icon: 'cloud-provider',
+              has: () => this.$hasPerm('xpack.view_account') && this.$hasLicense(),
+              callback: () => this.$router.push(
+                { name: 'CloudAccountList', query: { category: 'database' }}
+              )
+            }
+          ]
+        }
       }
     }
   }

src/views/assets/Asset/AssetList/HostList.vue

@@ -37,7 +37,9 @@ export default {
               title: this.$t('CloudSync'),
               icon: 'cloud-provider',
               has: () => vm.$hasPerm('xpack.view_account') && vm.$hasLicense(),
-              callback: () => this.$router.push({ name: 'CloudAccountList' })
+              callback: () => this.$router.push(
+                { name: 'CloudAccountList', query: { category: 'host' }}
+              )
             }
           ]
         },

src/views/assets/Asset/AssetList/components/AssetBulkUpdateDialog.vue

@@ -41,7 +41,7 @@ export default {
       formSetting: {
         url: '/api/v1/assets/assets/',
         hasSaveContinue: false,
-        fields: ['platform', 'nodes', 'domain', 'labels', 'is_active', 'comment'],
+        fields: ['platform', 'nodes', 'zone', 'labels', 'is_active', 'comment'],
         fieldsMeta: {
           platform: {
             el: {
@@ -63,8 +63,8 @@ export default {
             ...meta.nodes,
             label: this.$t('Node')
           },
-          domain: {
-            ...meta.domain,
+          zone: {
+            ...meta.zone,
             label: this.$tc('Zone'),
             disabled: exclude.includes(this.category)
           },

src/views/assets/Asset/AssetList/components/BaseList.vue

@@ -143,7 +143,8 @@ export default {
         'custom': () => import('@/views/assets/Asset/AssetCreateUpdate/CustomCreateUpdate.vue'),
         'cloud': () => import('@/views/assets/Asset/AssetCreateUpdate/CloudCreateUpdate.vue'),
         'device': () => import('@/views/assets/Asset/AssetCreateUpdate/DeviceCreateUpdate.vue'),
-        'database': () => import('@/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue')
+        'database': () => import('@/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue'),
+        'ds': () => import('@/views/assets/Asset/AssetCreateUpdate/DSCreateUpdate.vue')
       },
       createProps: {},
       showPlatform: false,
@@ -216,16 +217,19 @@ export default {
   methods: {
     async updateOrCloneAsset(row, action) {
       this.createDrawer = this.drawer[row.category.value]
-      const meta = {
-        action: action,
-        id: row.id,
+
+      const query = {
         platform: row.platform.id,
         type: row.type.value,
         category: row.category.value,
-        row: row,
-        payload: row.payload
+        action: action
       }
-      this.$refs.ListTable.onUpdate({ row, query: meta })
+
+      if (action === 'clone') {
+        return this.$refs.ListTable.onClone({ row, query })
+      }
+
+      this.$refs.ListTable.onUpdate({ row, query })
     },
     createAsset(platform) {
       this.showPlatform = false

src/views/assets/Asset/AssetList/components/PlatformDialog.vue

@@ -5,7 +5,7 @@
     :show-confirm="false"
     :title="$tc('SelectPlatform')"
     :visible.sync="iVisible"
-    size="600px"
+    size="700px"
     top="1vh"
   >
     <template #title>
@@ -61,6 +61,7 @@ import { loadPlatformIcon } from '@/utils/jms'
 
 export default {
   name: 'PlatformDrawer',
+  components: {},
   props: {
     visible: {
       type: Boolean,
@@ -76,7 +77,7 @@ export default {
       platforms: [],
       recentPlatformIds: [],
       loading: true,
-      activeType: 'host',
+      activeType: [],
       recentUsedLabel: this.$t('RecentlyUsed'),
       typeIconMapper: {
         linux: 'fa-linux',
@@ -130,9 +131,7 @@ export default {
   async created() {
     this.platforms = await this.$store.dispatch('assets/getPlatforms')
     this.allRecentPlatforms = await this.$store.dispatch('assets/getRecentPlatforms')
-    if (this.allRecentPlatforms.length > 0) {
-      this.activeType = this.recentUsedLabel
-    }
+    this.activeType = Object.keys(this.iPlatforms)[0]
     this.loading = false
   },
   methods: {

src/views/assets/Asset/AssetList/components/const.js

@@ -194,7 +194,7 @@ export function getDefaultConfig(vm) {
         formatter: ActionsFormatter,
         formatterArgs: {
           onUpdate: ({ row }) => onAction(row, 'Update'),
-          onClone: ({ row }) => onAction({ ...row, payload: 'pam_asset_clone' }, 'Clone'),
+          onClone: ({ row }) => onAction(row, 'Clone'),
           performDelete: ({ row }) => {
             const id = row.id
             const url = `/api/v1/assets/assets/${id}/`

src/views/assets/Asset/AssetList/index.vue

@@ -56,6 +56,12 @@ export default {
             hidden: true,
             component: () => import('@/views/assets/Asset/AssetList/WebList.vue')
           },
+          {
+            icon: 'fa-id-card-o',
+            name: 'ds',
+            hidden: true,
+            component: () => import('@/views/assets/Asset/AssetList/DSList.vue')
+          },
           {
             icon: 'fa-comment',
             name: 'gpt',

src/views/assets/Asset/AssetMoreInformationEdit.vue

@@ -22,7 +22,7 @@ export default {
           fields: [
             'vendor', 'model', 'sn', 'cpu_model', 'cpu_count',
             'cpu_cores', 'cpu_vcpus', 'memory', 'disk_total',
-            'distribution', 'distribution_version', 'arch'
+            'distribution', 'distribution_version', 'arch', 'gpu_model'
           ]
         }
       },

src/views/assets/Cloud/Account/AccountDetail/AccountDetail.vue

@@ -224,3 +224,12 @@ export default {
 }
 </script>
 
+<style scoped lang="scss">
+::v-deep .el-card__body {
+  padding: 10px 20px 20px 20px;
+
+  .el-form {
+    margin-top: unset;
+  }
+}
+</style>

src/views/assets/Cloud/Account/AccountDetail/TaskSyncAssetList.vue

@@ -41,7 +41,7 @@ export default {
         ]
       },
       tableConfig: {
-        url: `/api/v1/xpack/cloud/sync-instance-tasks/${this.object.task?.id}/instances/`,
+        url: '',
         hasSelection: false,
         columns: [
           'instance_id',
@@ -49,6 +49,10 @@ export default {
             prop: 'asset_ip',
             label: this.$t('IP')
           },
+          {
+            prop: 'asset_display',
+            label: this.$t('Asset')
+          },
           'region',
           {
             prop: 'status',
@@ -76,9 +80,21 @@ export default {
       }
     }
   },
+  computed: {
+    dynamicUrl() {
+      const category = this.$route.query.category
+      const baseUrl = `/api/v1/xpack/cloud/sync-instance-tasks/instances/?category=${category}`
+      return this.object ? `${baseUrl}&task_id=${this.object.task.id}` : baseUrl
+    }
+  },
+  mounted() {
+    this.tableConfig.url = this.dynamicUrl
+  },
   methods: {
     DeleteReleasedAssets() {
-      this.$axios.delete(`/api/v1/xpack/cloud/sync-instance-tasks/${this.object.task?.id}/released-assets/`).then(
+      const baseUrl = '/api/v1/xpack/cloud/sync-instance-tasks/released-assets/'
+      const url = this.object ? `${baseUrl}?task_id=${this.object.task.id}` : baseUrl
+      this.$axios.delete(url).then(
         res => {
           this.$message.success(this.$tc('DeleteSuccessMsg'))
           this.$refs.GenericListTable.$refs.ListTable.reloadTable()

src/views/assets/Cloud/Account/AccountList.vue

@@ -21,7 +21,7 @@
 </template>
 
 <script type="text/jsx">
-import { lan, privateCloudProviders, publicCloudProviders } from '../const'
+import { lan, privateCloudProviders, publicHostProviders, publicDBProviders } from '../const'
 import CreateDialog from './components/CreateDialog.vue'
 import UpdateDialog from './components/UpdateDialog.vue'
 import SyncDialog from './components/SyncDialog.vue'
@@ -43,11 +43,12 @@ export default {
       object: null,
       table: {
         tableConfig: {
-          url: '/api/v1/xpack/cloud/accounts/',
+          url: '',
           permissions: {
             app: 'xpack',
             resource: 'account'
-          }
+          },
+          extraQuery: {}
         },
         subComponentProps: {
           handleUpdate: (obj) => {
@@ -102,7 +103,8 @@ export default {
                 title: this.$t('PublicCloud'),
                 icon: 'public-cloud',
                 callback: () => {
-                  this.providerConfig.providers = publicCloudProviders.map(
+                  const providers = this.iCategory === 'host' ? publicHostProviders : publicDBProviders
+                  this.providerConfig.providers = providers.map(
                     (item) => ACCOUNT_PROVIDER_ATTRS_MAP[item]
                   )
                   this.visible = true
@@ -110,8 +112,9 @@ export default {
               },
               {
                 name: 'privateCloud',
-                icon: 'private-cloud',
                 title: this.$t('PrivateCloud'),
+                icon: 'private-cloud',
+                has: () => this.iCategory === 'host',
                 callback: () => {
                   this.providerConfig.providers = privateCloudProviders.map(
                     (item) => ACCOUNT_PROVIDER_ATTRS_MAP[item]
@@ -123,6 +126,7 @@ export default {
                 name: 'LAN',
                 title: this.$t('LAN'),
                 icon: 'computer',
+                has: () => this.iCategory === 'host',
                 callback: () => {
                   const providers = [lan]
                   this.providerConfig.providers = providers.map(
@@ -143,6 +147,11 @@ export default {
       onlineSyncVisible: false
     }
   },
+  computed: {
+    iCategory() {
+      return this.$route.query.category || 'host'
+    }
+  },
   watch: {
     visible: {
       handler(val) {
@@ -166,6 +175,10 @@ export default {
       }
     }
   },
+  mounted() {
+    this.table.tableConfig.url = '/api/v1/xpack/cloud/accounts/'
+    this.table.tableConfig.extraQuery = { category: this.iCategory }
+  },
   methods: {
     valid(status) {
       if (status !== 200) {

src/views/assets/Cloud/Account/components/AuthPanel.vue

@@ -3,6 +3,7 @@
     ref="form"
     class="form"
     v-bind="settings"
+    @performError="handlePerformError"
     @performFinished="handlePerformFinished"
     @submitSuccess="handleSubmitSuccess"
   />
@@ -54,6 +55,7 @@ export default {
     }
 
     return {
+      priSubmitForm: null,
       submitType: 'auto',
       settings: {
         url: `/api/v1/xpack/cloud/accounts/`,
@@ -106,6 +108,9 @@ export default {
               },
               project: {
                 label: this.$t('Project')
+              },
+              hostname_prefix: {
+                required: false
               }
             }
           },
@@ -164,6 +169,7 @@ export default {
           const newValues = JSON.parse(JSON.stringify(values))
           newValues['attrs'] = encryptAttrsField(newValues.attrs)
           newValues['provider'] = vm.provider
+          newValues['category'] = this.$route.query.category || 'host'
           return newValues
         },
         addContinue: true
@@ -172,32 +178,53 @@ export default {
   },
   methods: {
     submitForm(form, btn, submitType) {
+      this.priSubmitForm = form
       form.validate((valid) => {
         if (valid) {
           btn.loading = true
+          this.$refs.form.$refs.form.dataForm.submitForm('form', false)
+          this.submitType = submitType
         }
       })
-
-      this.$refs.form.$refs.form.dataForm.submitForm('form', false)
-
-      if (this.origin === 'update') {
-        setTimeout(() => {
-          this.$emit('submitSuccess')
-          this.$emit('update:visible', false)
-        }, 500)
-      }
-      this.submitType = submitType
     },
     handleSubmitSuccess(res) {
       if (this.submitType === 'manual') {
         this.$emit('update:object', res)
         this.$emit('update:active', 2)
+      } else if (this.submitType === 'update') {
+        setTimeout(() => {
+          this.$emit('submitSuccess')
+          this.$emit('update:visible', false)
+        }, 500)
       }
     },
     handlePerformFinished() {
       for (const btn of this.settings.moreButtons) {
         btn.loading = false
       }
+    },
+    handlePerformError(errorData) {
+      if (errorData.hasOwnProperty('attrs')) {
+        for (const f in errorData['attrs']) {
+          this.setAttrsFieldError(f, errorData['attrs'][f])
+        }
+      }
+    },
+    setAttrsFieldError(name, errors) {
+      for (const item of this.priSubmitForm.content) {
+        if (item.id === 'attrs') {
+          errors = Array.isArray(errors) ? errors.join(',') : errors
+          const totalFields = item.el.fields
+          const field = totalFields.find((v) => v.prop === name)
+          if (!field) {
+            return
+          }
+          if (typeof errors === 'string') {
+            field.el.errors = errors
+            field.attrs.error = errors
+          }
+        }
+      }
     }
   }
 }

src/views/assets/Cloud/Strategy/StrategyDetail/StrategyDetail.vue

@@ -33,7 +33,11 @@ export default {
               <ul>
                 {
                   newArr.map((r, index) => {
-                    return <li key={index}>{`${r.attr.label} ${r.match.label} ${r.value}`} </li>
+                    return <li>
+                      <el-tag size='mini' key={index}>
+                        {r.attr.label}<strong> {`${r.match.label}`} </strong>{r.value}
+                      </el-tag>
+                    </li>
                   })
                 }
               </ul>
@@ -48,7 +52,11 @@ export default {
               <ul>
                 {
                   newArr.map((a, index) => {
-                    return <li key={index}>{`${a.attr.label}: ${a.value.label}`} </li>
+                    return <li>
+                      <el-tag size='mini' key={index}>
+                        <strong>{a.attr.label}: </strong>{`${a.value.label}`}
+                      </el-tag>
+                    </li>
                   })
                 }
               </ul>
@@ -58,42 +66,21 @@ export default {
         'comment', 'org_name'
       ]
     }
-  },
-  computed: {
-    cardTitle() {
-      return this.object.name
-    }
   }
 }
 </script>
 
 <style scoped>
 ul {
-  counter-reset: my-counter;
-  list-style-type: none;
+  display: flex;
+  flex-direction: column;
   margin: 0;
   padding: 0;
 }
 
 li {
-  counter-increment: my-counter;
-  position: relative;
-  padding-left: 20px;
-}
-
-li:before {
-  content: counter(my-counter);
-  display: block;
-  position: absolute;
-  left: 0;
-  top: 32%;
-  width: 14px;
-  height: 14px;
-  line-height: 12px;
-  text-align: center;
-  border: 1px solid;
-  border-radius: 50%;
-  background-color: #fff;
+  list-style: none;
+  margin: 3px 0;
 }
 </style>
 

src/views/assets/Cloud/Strategy/StrategyList.vue

@@ -21,7 +21,7 @@ export default {
       createDrawer: () => import('@/views/assets/Cloud/Strategy/StrategyCreateUpdate.vue'),
       detailDrawer: () => import('@/views/assets/Cloud/Strategy/StrategyDetail/index.vue'),
       tableConfig: {
-        url: '/api/v1/xpack/cloud/strategies/',
+        url: '',
         permissions: {
           app: 'xpack',
           resource: 'strategy'
@@ -52,10 +52,11 @@ export default {
               updateRoute: 'CloudStrategyUpdate',
               hasClone: false,
               canDelete: ({ row }) => {
-                return row.name !== 'default'
+                return this.$hasPerm('xpack.delete_strategy') && row.name !== 'default'
               },
               canUpdate: ({ row }) => {
-                return row.name !== 'default'
+                return this.$hasPerm('xpack.change_strategy') && row.name !== 'default' &&
+                  !this.$store.getters.currentOrgIsRoot
               }
             }
           }
@@ -69,8 +70,15 @@ export default {
       }
     }
   },
+  computed: {
+    iCategory() {
+      return this.$route.query.category || 'host'
+    }
+  },
+  mounted() {
+    this.tableConfig.url = `/api/v1/xpack/cloud/strategies/?category=${this.iCategory}`
+  },
   methods: {}
-
 }
 </script>
 

src/views/assets/Cloud/Strategy/components/ActionInput.vue

@@ -73,8 +73,8 @@ export default {
                   case 'node':
                     url = '/api/v1/assets/nodes/'
                     break
-                  case 'domain':
-                    url = '/api/v1/assets/domains/'
+                  case 'zone':
+                    url = '/api/v1/assets/zones/'
                     break
                   case 'account_template':
                     url = '/api/v1/accounts/account-templates/'
@@ -209,7 +209,7 @@ export default {
     beforeSubmit(data) {
       let status = true
       const labelMap = {
-        platform: this.$tc('Platform'), domain: this.$tc('Zone'),
+        platform: this.$tc('Platform'), zone: this.$tc('Zone'),
         name_strategy: this.$tc('Strategy')
       }
       this.tableConfig.totalData.map(item => {

src/views/assets/Cloud/Strategy/components/const.js

@@ -4,7 +4,7 @@ import { attrMatchOptions } from '@/components/const'
 export const resourceTypeOptions = [
   { label: i18n.t('Platform'), value: 'platform' },
   { label: i18n.t('Node'), value: 'node' },
-  { label: i18n.t('Zone'), value: 'domain' },
+  { label: i18n.t('Zone'), value: 'zone' },
   { label: i18n.t('AccountTemplate'), value: 'account_template' },
   { label: i18n.t('Tags'), value: 'label' },
   { label: i18n.t('Strategy'), value: 'name_strategy' }
@@ -20,7 +20,9 @@ export const tableFormatter = (colName, getResourceLabel) => {
   return (row, col, cellValue) => {
     const globalResource = {}
     const value = cellValue
-    if (value?.label) { return value.label }
+    if (value?.label) {
+      return value.label
+    }
     switch (colName) {
       case 'attr':
         return instanceAttrOptions.find(attr => attr.value === value)?.label || value
@@ -36,7 +38,9 @@ export const tableFormatter = (colName, getResourceLabel) => {
         }
         return globalResource[value] || value
       case 'protocols':
-        return Array.isArray(value) ? value.map(p => { return `${p.name}/${p.port}` }).join(', ') : ''
+        return Array.isArray(value) ? value.map(p => {
+          return `${p.name}/${p.port}`
+        }).join(', ') : ''
       case 'count':
         return value?.length || 0
       default:

src/views/assets/Cloud/const.js

@@ -29,13 +29,15 @@ export const scp = 'scp'
 export const apsara_stack = 'apsara_stack'
 export const lan = 'lan'
 
-export const publicCloudProviders = [
+export const publicHostProviders = [
   aliyun, qcloud, qcloud_lighthouse, huaweicloud,
   baiducloud, jdcloud, kingsoftcloud, aws_china,
   aws_international, azure, azure_international,
   gcp, ucloud, volcengine
 ]
 
+export const publicDBProviders = [aliyun]
+
 export const privateCloudProviders = [
   vmware, qingcloud_private, huaweicloud_private, ctyun_private,
   openstack, zstack, nutanix, fc, scp, apsara_stack

src/views/assets/Cloud/index.vue

@@ -13,6 +13,7 @@ export default {
   data() {
     return {
       config: {
+        title: '',
         activeMenu: 'CloudAccountList',
         submenu: [
           {
@@ -26,6 +27,12 @@ export default {
             name: 'StrategyList',
             hidden: () => !this.$hasPerm('xpack.view_strategy'),
             component: () => import('@/views/assets/Cloud/Strategy/StrategyList.vue')
+          },
+          {
+            title: this.$t('SyncInstanceTaskHistoryAssetList'),
+            name: 'TaskSyncAssetList',
+            hidden: () => !this.$hasLicense() || !this.$hasPerm('xpack.view_syncinstancedetail'),
+            component: () => import('@/views/assets/Cloud/Account/AccountDetail/TaskSyncAssetList.vue')
           }
         ],
         actions: {
@@ -33,6 +40,11 @@ export default {
         }
       }
     }
+  },
+  mounted() {
+    const category = this.$route.query.category || 'host'
+    const display = category === 'host' ? this.$t('Host') : this.$t('Database')
+    this.config.title = `${display} - ${this.$t('CloudSync')}`
   }
 }
 </script>

src/views/assets/Platform/PlatformCreateUpdate.vue

@@ -11,6 +11,7 @@
       :has-reset="false"
       :initial="initial"
       :url="url"
+      @submitSuccess="onSubmitSuccess"
     />
   </div>
 </template>
@@ -49,7 +50,8 @@ export default {
         ]],
         [this.$t('Config'), [
           'protocols', 'su_enabled', 'su_method',
-          'domain_enabled', 'charset'
+          'gateway_enabled', 'ds_enabled',
+          'charset'
         ]],
         [this.$t('Automations'), ['automation']],
         [this.$t('Other'), ['comment']]
@@ -58,23 +60,20 @@ export default {
       url: `/api/v1/assets/platforms/`,
       cleanFormValue: (values) => {
         const protocols = values['protocols'] || []
-        const query = this.$route.query || {}
         const automation = values['automation'] || {}
         const category_type = values['category_type']
         const ansibleConfig = automation?.['ansible_config'] || {}
         automation.ansible_config = ansibleConfig instanceof Object ? ansibleConfig : JSON.parse(ansibleConfig)
 
-        if (query.hasOwnProperty('_clone_from')) {
-          if (automation.hasOwnProperty('id')) {
-            delete automation['id']
-          }
-          values['protocols'] = protocols.map(i => {
-            if (i.hasOwnProperty('id')) {
-              delete i['id']
-            }
-            return i
-          })
+        if (automation.hasOwnProperty('id')) {
+          delete automation['id']
         }
+        values['protocols'] = protocols.map(i => {
+          if (i.hasOwnProperty('id')) {
+            delete i['id']
+          }
+          return i
+        })
         values['category'] = category_type[0]
         values['type'] = category_type[1]
         return values
@@ -105,6 +104,9 @@ export default {
     }
   },
   methods: {
+    onSubmitSuccess() {
+      this.$store.dispatch('assets/cleanPlatforms')
+    },
     updateSuMethodOptions() {
       const options = this.suMethods.filter(i => {
         return this.suMethodLimits.includes(i.value)
@@ -141,7 +143,6 @@ export default {
       const constraints = await this.$axios.get(url)
       this.defaultOptions = constraints
 
-      const fieldsCheck = ['domain_enabled', 'su_enabled']
       let protocols = constraints?.protocols || []
       protocols = protocols?.map(i => {
         if (i.name === 'http') {
@@ -151,15 +152,20 @@ export default {
       })
       this.fieldsMeta.protocols.el.choices = protocols
 
+      const fieldsCheck = ['gateway_enabled', 'su_enabled']
       for (const field of fieldsCheck) {
         const disabled = constraints[field] === false
         this.initial[field] = !disabled
         _.set(this.fieldsMeta, `${field}.el.disabled`, disabled)
       }
 
-      if (constraints['charset_enabled'] === false) {
-        this.fieldsMeta.charset.hidden = () => true
+      const fieldsHidden = ['charset', 'ds_enabled']
+      for (const field of fieldsHidden) {
+        if (constraints[field] === false) {
+          this.fieldsMeta[field].hidden = () => true
+        }
       }
+
       await setAutomations(this)
       await this.updateSuMethods(constraints)
     }

src/views/assets/Platform/PlatformDetail/Detail.vue

@@ -59,7 +59,7 @@ export default {
   data() {
     return {
       visible: false,
-      fields: ['domain_enabled'],
+      fields: ['gateway_enabled'],
       quickActions: [],
       url: `/api/v1/assets/platforms/${this.object.id}/`,
       detailFields: [
@@ -101,16 +101,16 @@ export default {
       const { object } = this
       const quickActions = [
         {
-          title: this.$t('EnableDomain'),
+          title: this.$t('EnableGateway'),
           type: 'switch',
           attrs: {
             label: this.$t('Update'),
-            model: object['domain_enabled'],
-            disabled: !this.canEdit || this.constraints['domain_enabled'] === false
+            model: object['gateway_enabled'],
+            disabled: !this.canEdit || this.constraints['gateway_enabled'] === false
           },
           callbacks: Object.freeze({
             change: (val) => {
-              const data = { domain_enabled: val }
+              const data = { gateway_enabled: val }
               this.$axios.patch(
                 `/api/v1/assets/platforms/${object.id}/`, data).then(res => {
                 this.$message.success(this.$tc('UpdateSuccessMsg'))

src/views/assets/Platform/PlatformList.vue

@@ -73,7 +73,7 @@ export default {
           category: {
             formatter: ChoicesFormatter
           },
-          domain_enabled: {
+          gateway_enabled: {
             formatterArgs: {
               showFalse: false
             }
@@ -115,7 +115,11 @@ export default {
               canUpdate: ({ row }) => !row.internal && vm.$hasPerm('assets.change_platform'),
               canDelete: ({ row }) => !row.internal && vm.$hasPerm('assets.delete_platform'),
               onUpdate({ row, col }) {
-                vm.$refs.genericListTable.onUpdate({ row, col, query: { type: row.type.value, category: row.category.value }})
+                vm.$refs.genericListTable.onUpdate({
+                  row,
+                  col,
+                  query: { type: row.type.value, category: row.category.value }
+                })
               }
             }
           }
@@ -149,14 +153,7 @@ export default {
       return `/api/v1/assets/platforms/?category=${this.tab.activeMenu}`
     }
   },
-  deactivated() {
-    window.localStorage.setItem('lastTab', this.tab.activeMenu)
-  },
   activated() {
-    setTimeout(() => {
-      this.tab.activeMenu = window.localStorage.getItem('lastTab') || 'host'
-      this.$refs.genericListTable?.reloadTable()
-    }, 300)
   },
   async mounted() {
     try {
@@ -164,6 +161,15 @@ export default {
     } finally {
       this.loading = false
     }
+
+    const name = this.$route.query?.name
+    const platform = this.$route.query?.id
+
+    if (platform) {
+      this.$nextTick(() => {
+        this.$refs.genericListTable.onDetail({ row: { id: platform, name }})
+      })
+    }
   },
   updated() {
     this.changeMoreCreates()
@@ -173,9 +179,15 @@ export default {
       this.tableConfig.url = this.url
       this.headerActions.importOptions.url = this.url
       this.headerActions.exportOptions.url = this.url
-      this.headerActions.moreCreates.dropdown = this.$store.state.assets.assetCategoriesDropdown.filter(item => {
+      const types = this.$store.state.assets.assetCategoriesDropdown.filter(item => {
         return item.category === this.tab.activeMenu
+      }).map(item => {
+        if (item.group && !item.group.includes(this.$t('Type'))) {
+          item.group += this.$t('WordSep') + this.$t('Type')
+        }
+        return item
       })
+      this.headerActions.moreCreates.dropdown = types
     },
     async setCategoriesTab() {
       const categoryIcon = {
@@ -185,6 +197,7 @@ export default {
         cloud: 'fa-cloud',
         web: 'fa-globe',
         gpt: 'fa-comment',
+        ds: 'fa-id-card-o',
         custom: 'fa-cube'
       }
       const state = await this.$store.dispatch('assets/getAssetCategories')

src/views/assets/Platform/const.js

@@ -76,11 +76,17 @@ export const platformFieldsMeta = (vm) => {
       }
     },
     charset: {},
-    domain_enabled: {
+    gateway_enabled: {
       el: {
         disabled: false
       }
     },
+    ds_enabled: {
+      el: {
+        disabled: false
+      }
+    },
+
     protocols: {
       label: i18n.t('SupportedProtocol'),
       ...assetMeta.protocols,

src/views/assets/Platform/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "target": "es5",
-    "sourceMap": true
-  },
-  "exclude": [
-    "node_modules"
-  ]
-}

src/views/assets/Zone/ZoneCreateUpdate.vue

@@ -25,9 +25,9 @@ export default {
           component: AssetSelect,
           el: {
             value: [],
-            baseUrl: '/api/v1/assets/assets/?domain_enabled=true',
+            baseUrl: '/api/v1/assets/assets/?gateway_enabled=true',
             treeUrlQuery: {
-              domain_enabled: true
+              gateway_enabled: true
             },
             canSelect: (row) => {
               return !row.platform?.name.startsWith('Gateway')
@@ -42,7 +42,7 @@ export default {
           }
         }
       },
-      url: '/api/v1/assets/domains/'
+      url: '/api/v1/assets/zones/'
     }
   }
 }

src/views/assets/Zone/ZoneDetail/AssetList.vue

@@ -14,7 +14,7 @@
 
 <script>
 import BaseList from '@/views/assets/Asset/AssetList/components/BaseList'
-import AddAssetDialog from '@/views/assets/Domain/components/AddAssetDialog.vue'
+import AddAssetDialog from '@/views/assets/Zone/components/AddAssetDialog.vue'
 import TwoCol from '@/layout/components/Page/TwoColPage.vue'
 
 export default {
@@ -34,7 +34,7 @@ export default {
     return {
       config: {
         category: 'all',
-        url: `/api/v1/assets/assets/?domain=${this.object.id}&is_gateway=0`,
+        url: `/api/v1/assets/assets/?zone=${this.object.id}&is_gateway=0`,
         tableConfig: {
           columns: ['name', 'address', 'platform', 'actions'],
           columnsMeta: {
@@ -114,14 +114,14 @@ export default {
         patch_data = rows.selectedRows.map(row => {
           return {
             id: row.id,
-            domain: null
+            zone: null
           }
         })
         msg = patch_data.length + ' ' + this.$t('Rows')
       } else {
         patch_data = [{
           id: rows.row.id,
-          domain: null
+          zone: null
         }]
         msg = rows.row.name
       }

src/views/assets/Zone/ZoneDetail/Detail.vue

@@ -23,7 +23,7 @@ export default {
   },
   data() {
     return {
-      url: `/api/v1/assets/domains/${this.object.id}/`,
+      url: `/api/v1/assets/zones/${this.object.id}/`,
       detailFields: [
         'name', 'assets_amount',
         {

src/views/assets/Zone/ZoneDetail/GatewayCreateUpdate.vue

@@ -17,11 +17,11 @@ export default {
         const url = `/api/v1/assets/platforms/?name__startswith=Gateway`
         const platform = await this.$axios.get(url)
         initial.platform = parseInt(platform[0].id)
-        initial.domain = this.$route.query.domain
+        initial.zone = this.$route.query.zone
         return initial
       },
       addFieldsMeta: {
-        domain: {
+        zone: {
           disabled: true
         },
         platform: {
@@ -40,7 +40,7 @@ export default {
       createSuccessNextRoute: {
         name: 'ZoneDetail',
         params: {
-          id: this.$route.query.domain
+          id: this.$route.query.zone
         },
         query: {
           tab: 'GatewayList'
@@ -49,7 +49,7 @@ export default {
       updateSuccessNextRoute: {
         name: 'ZoneDetail',
         params: {
-          id: this.$route.query.domain
+          id: this.$route.query.zone
         },
         query: {
           tab: 'GatewayList'

src/views/assets/Zone/ZoneDetail/GatewayList.vue

@@ -27,7 +27,7 @@ import { GenericListTable } from '@/layout/components'
 import GatewayTestDialog from '@/components/Apps/GatewayTestDialog'
 import { connectivityMeta } from '@/components/Apps/AccountListTable/const'
 import { ArrayFormatter, ChoicesFormatter, DetailFormatter, TagsFormatter } from '@/components/Table/TableFormatters'
-import AddGatewayDialog from '@/views/assets/Domain/components/AddGatewayDialog'
+import AddGatewayDialog from '@/views/assets/Zone/components/AddGatewayDialog'
 import TwoCol from '@/layout/components/Page/TwoColPage.vue'
 
 export default {
@@ -48,7 +48,7 @@ export default {
     const vm = this
 
     return {
-      createDrawer: () => import('@/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue'),
+      createDrawer: () => import('@/views/assets/Zone/ZoneDetail/GatewayCreateUpdate.vue'),
       detailDrawer: () => import('@/views/assets/Asset/AssetDetail'),
       transObject: {},
       testConfig: {
@@ -57,7 +57,7 @@ export default {
         cell: ''
       },
       tableConfig: {
-        url: `/api/v1/assets/gateways/?domain=${this.object.id}`,
+        url: `/api/v1/assets/gateways/?zone=${this.object.id}`,
         columnsExclude: [
           'info', 'spec_info', 'auto_config'
         ],
@@ -113,7 +113,7 @@ export default {
             formatterArgs: {
               updateRoute: {
                 name: 'GatewayUpdate',
-                query: { domain: this.object.id, platform_type: 'linux', 'category': 'host' }
+                query: { zone: this.object.id, platform_type: 'linux', 'category': 'host' }
               },
               onClone: ({ row }) => {
                 this.$refs.ListTable.onClone({ row: { ...row, payload: 'pam_asset_clone' }})
@@ -203,7 +203,7 @@ export default {
           }
         ],
         onCreate: () => {
-          vm.$refs.ListTable.onCreate({ query: { domain: vm.object.id, platform_type: 'linux', category: 'host' }})
+          vm.$refs.ListTable.onCreate({ query: { zone: vm.object.id, platform_type: 'linux', category: 'host' }})
         }
       },
       addGatewaySetting: {
@@ -222,14 +222,14 @@ export default {
         patch_data = rows.selectedRows.map(row => {
           return {
             id: row.id,
-            domain: null
+            zone: null
           }
         })
         msg = patch_data.length + ' ' + this.$t('Rows')
       } else {
         patch_data = [{
           id: rows.row.id,
-          domain: null
+          zone: null
         }]
         msg = rows.row.name
       }

src/views/assets/Zone/ZoneDetail/index.vue

@@ -25,7 +25,7 @@ export default {
       TaskDetail: {},
       config: {
         activeMenu: 'Detail',
-        url: '/api/v1/assets/domains/',
+        url: '/api/v1/assets/zones/',
         submenu: [
           {
             title: this.$t('Basic'),

src/views/assets/Zone/ZoneList.vue

@@ -18,10 +18,10 @@ export default {
   },
   data() {
     return {
-      createDrawer: () => import('./DomainCreateUpdate.vue'),
-      detailDrawer: () => import('./DomainDetail/index.vue'),
+      createDrawer: () => import('./ZoneCreateUpdate.vue'),
+      detailDrawer: () => import('@/views/assets/Zone/ZoneDetail/index.vue'),
       tableConfig: {
-        url: '/api/v1/assets/domains/',
+        url: '/api/v1/assets/zones/',
         columnsExclude: ['gateway'],
         columnsExtra: ['gateways'],
         columns: ['name', 'assets_amount', 'gateways', 'labels', 'comment', 'actions'],

src/views/assets/Zone/components/AddAssetDialog.vue

@@ -5,7 +5,7 @@
     :modal="false"
     :show-cancel="false"
     :show-confirm="false"
-    :title="$tc('AddAssetInDomain')"
+    :title="$tc('AddAssetInZone')"
     :visible.sync="setting.addAssetDialogVisible"
     after
     custom-class="asset-select-dialog"
@@ -62,9 +62,9 @@ export default {
             type: 'select2',
             el: {
               value: [],
-              url: '/api/v1/assets/assets/?domain_enabled=true',
+              url: '/api/v1/assets/assets/?gateway_enabled=true',
               treeUrlQuery: {
-                domain_enabled: true
+                gateway_enabled: true
               },
               canSelect: (row) => {
                 return !row.platform?.name.startsWith('Gateway') && this.object.assets.map(item => item.id).indexOf(row.id) === -1
@@ -75,7 +75,7 @@ export default {
         cleanFormValue(values) {
           const data = []
           values.assets.forEach(item => {
-            const d = { id: item, domain: vm.object.id }
+            const d = { id: item, zone: vm.object.id }
             data.push(d)
           })
           return data

src/views/assets/Zone/components/AddGatewayDialog.vue

@@ -4,7 +4,7 @@
     :destroy-on-close="true"
     :show-cancel="false"
     :show-confirm="false"
-    :title="$tc('AddGatewayInDomain')"
+    :title="$tc('AddGatewayInZone')"
     :visible.sync="setting.addGatewayDialogVisible"
     after
     custom-class="asset-select-dialog"
@@ -65,7 +65,7 @@ export default {
               multiple: true,
               clearable: true,
               ajax: {
-                url: '/api/v1/assets/assets/?domain_enabled=true&is_gateway=1'
+                url: '/api/v1/assets/assets/?gateway_enabled=true&is_gateway=1'
               },
               disabledValues: this.object.gateways.map(item => item.id)
             }
@@ -74,7 +74,7 @@ export default {
         cleanFormValue(values) {
           const data = []
           values.gateways.forEach(item => {
-            const d = { id: item.pk, domain: vm.object.id }
+            const d = { id: item.pk, zone: vm.object.id }
             data.push(d)
           })
           return data

src/views/assets/const.js

@@ -26,12 +26,12 @@ export const filterSelectValues = (values) => {
   return selects
 }
 
-function updatePlatformProtocols(vm, platformType, updateForm, isPlatformChanged = false) {
+function updatePlatformProtocols(vm, platformType, updateForm, platformChanged = false) {
   setTimeout(() => vm.init().then(() => {
-    const isCreate = vm?.$route?.meta.action === 'create' && vm?.$route?.query.clone_from === undefined
-    const need_modify = isCreate || isPlatformChanged
+    const isCreate = vm.$route.query.action === 'create' && vm?.$route?.query.clone_from === undefined
+    const needModify = isCreate || platformChanged
     const platformProtocols = vm.platform.protocols
-    if (!need_modify) return
+    if (!needModify) return
     if (platformType === 'website') {
       const setting = Array.isArray(platformProtocols) ? platformProtocols[0].setting : platformProtocols.setting
       updateForm({
@@ -48,7 +48,9 @@ function updatePlatformProtocols(vm, platformType, updateForm, isPlatformChanged
   }), 100)
 }
 
-export const assetFieldsMeta = (vm, platformType) => {
+export const assetFieldsMeta = (vm, category, type) => {
+  const platformCategory = category || vm.$route.query.category
+  const platformType = type || vm.$route.query.type
   const platformProtocols = []
   const secretTypes = []
   const asset = { address: 'https://jumpserver:330' }
@@ -92,38 +94,32 @@ export const assetFieldsMeta = (vm, platformType) => {
       el: {
         multiple: false,
         ajax: {
-          url: `/api/v1/assets/platforms/?type=${platformType}`,
+          url: `/api/v1/assets/platforms/?category=${platformCategory}&type=${platformType}`,
           transformOption: (item) => {
             return { label: item.name, value: item.id }
           }
         }
       },
       on: {
-        change: ([event], updateForm) => {
+        change: _.debounce(([event], updateForm) => {
           const pk = event.pk
-          const url = window.location.href
-          vm.changePlatformID = pk
-          if (url.includes('clone')) {
-            updatePlatformProtocols(vm, platformType, updateForm, true)
-          } else {
-            vm.$nextTick(() => {
-              updatePlatformProtocols(vm, platformType, updateForm, true)
-            })
-          }
-        },
-        input: ([event], updateForm) => {
+          vm.platformID = pk
+          updatePlatformProtocols(vm, platformType, updateForm, true)
+        }, 200),
+        input: _.debounce(([event], updateForm) => {
+          // 初始化的时候，mounted 中没有这个逻辑
           updatePlatformProtocols(vm, platformType, updateForm)
-        }
+        }, 200)
       }
     },
-    domain: {
+    zone: {
       component: Select2,
       disabled: false,
       el: {
         multiple: false,
         clearable: true,
         ajax: {
-          url: '/api/v1/assets/domains/'
+          url: '/api/v1/assets/zones/'
         }
       }
     },
@@ -134,6 +130,15 @@ export const assetFieldsMeta = (vm, platformType) => {
         default: []
       }
     },
+    directory_services: {
+      el: {
+        url: '/api/v1/assets/directories/',
+        disabled: false
+      },
+      hidden: () => {
+        return vm.platform.ds_enabled === false
+      }
+    },
     nodes: {
       rules: [rules.RequiredChange],
       el: {

src/views/audits/JobPeriodTaskList.vue

@@ -18,13 +18,13 @@ export default {
       tableConfig: {
         url: '/api/v1/audits/jobs/',
         columnsShow: {
-          min: ['name', 'material'],
+          min: ['name', 'args'],
           default: [
-            'name', 'material', 'type', 'crontab', 'interval', 'created_by', 'is_periodic_display', 'is_periodic'
+            'name', 'args', 'type', 'crontab', 'interval', 'created_by', 'is_periodic_display', 'is_periodic'
           ]
         },
         columns: [
-          'name', 'args', 'material', 'type', 'crontab', 'interval', 'date_last_run', 'summary',
+          'name', 'args', 'type', 'crontab', 'interval', 'date_last_run', 'summary',
           'created_by', 'is_periodic_display', 'is_periodic'
         ],
         columnsMeta: {
@@ -34,10 +34,6 @@ export default {
           name: {
             formatter: (row) => row.name
           },
-          material: {
-            width: '200px',
-            label: this.$t('Command')
-          },
           summary: {
             width: '130px',
             label: `${this.$t('Success')}/${this.$t('Total')}`,

src/views/ops/Adhoc/QuickJob.vue

@@ -14,6 +14,12 @@
       :visible.sync="showSetVariableDialog"
       @submit="onSubmitVariable"
     />
+    <ConfirmRunAssetsDialog
+      :visible.sync="showConfirmRunAssetsDialog"
+      :is-running="isRunning"
+      :assets="classifiedAssets"
+      @submit="onConfirmRunAsset"
+    />
     <AssetTreeTable ref="TreeTable" :tree-setting="treeSetting">
       <template slot="table">
         <div class="transition-box" style="width: calc(100% - 17px);">
@@ -29,8 +35,10 @@
             <QuickJobTerm
               ref="xterm"
               :show-tool-bar="true"
+              :select-assets="selectAssets"
               :xterm-config="xtermConfig"
               :execution-info="executionInfo"
+              @view-assets="viewConfirmRunAssets"
             />
           </div>
           <div style="display: flex;margin-top:10px;justify-content: space-between" />
@@ -42,6 +50,7 @@
 
 <script>
 import $ from '@/utils/jquery-vendor.js'
+import _isequal from 'lodash.isequal'
 import AssetTreeTable from '@/components/Apps/AssetTreeTable'
 import QuickJobTerm from '@/views/ops/Adhoc/components/QuickJobTerm.vue'
 import CodeEditor from '@/components/Form/FormFields/CodeEditor'
@@ -49,6 +58,7 @@ import Page from '@/layout/components/Page'
 import AdhocOpenDialog from './AdhocOpenDialog.vue'
 import AdhocSaveDialog from './AdhocSaveDialog.vue'
 import VariableHelpDialog from './VariableHelpDialog.vue'
+import ConfirmRunAssetsDialog from './components/ConfirmRunAssetsDialog.vue'
 import SetVariableDialog from '@/views/ops/Template/components/SetVariableDialog.vue'
 import { createJob, getJob, getTaskDetail, stopJob } from '@/api/ops'
 
@@ -62,7 +72,8 @@ export default {
     AssetTreeTable,
     Page,
     QuickJobTerm,
-    CodeEditor
+    CodeEditor,
+    ConfirmRunAssetsDialog
   },
   data() {
     return {
@@ -79,6 +90,7 @@ export default {
       showOpenAdhocDialog: false,
       showOpenAdhocSaveDialog: false,
       showSetVariableDialog: false,
+      showConfirmRunAssetsDialog: false,
       DataZTree: 0,
       runas: '',
       runasPolicy: 'skip',
@@ -135,7 +147,7 @@ export default {
               query: (query, cb) => {
                 const { hosts, nodes } = this.getSelectedNodesAndHosts()
 
-                if (hosts.length === 0) {
+                if (hosts.length === 0 && nodes.length === 0) {
                   this.$message.warning(`${this.$t('RequiredAssetOrNode')}`)
                   return cb([])
                 }
@@ -312,7 +324,15 @@ export default {
       },
       iShowTree: true,
       variableFormData: [],
-      variableQueryParam: ''
+      variableQueryParam: '',
+      classifiedAssets: {
+        error: [],
+        runnable: [],
+        skipped: []
+      },
+      selectAssets: [],
+      selectNodes: [],
+      lastRequestPayload: null
     }
   },
   computed: {
@@ -321,6 +341,9 @@ export default {
     },
     ztree() {
       return this.$refs.TreeTable.$refs.TreeList.$refs.AutoDataZTree.$refs.AutoDataZTree.$refs.dataztree.$refs.ztree
+    },
+    isRunning() {
+      return this.executionInfo.status.value === 'running'
     }
   },
   watch: {
@@ -442,6 +465,12 @@ export default {
       })
       return { hosts, nodes }
     },
+    shouldReRequest(payload) {
+      if (!this.lastRequestPayload) return true
+      const current = _.omit(payload, ['args'])
+      const last = _.omit(this.lastRequestPayload, ['args'])
+      return !_isequal(current, last)
+    },
     execute() {
       // const size = 'rows=' + this.xterm.rows + '&cols=' + this.xterm.cols
       const { hosts, nodes } = this.getSelectedNodesAndHosts()
@@ -458,12 +487,38 @@ export default {
         this.$message.error(this.$tc('RequiredRunas'))
         return
       }
-      const data = {
+      const payload = {
         assets: hosts,
         nodes: nodes,
         module: this.module,
         args: this.command,
         runas: this.runas,
+        runas_policy: this.runasPolicy
+      }
+      if (!this.shouldReRequest(payload)) {
+        this.onConfirmRunAsset(this.selectAssets, this.selectNodes)
+        return
+      }
+
+      this.lastRequestPayload = { ...payload }
+      this.$axios.post('/api/v1/ops/classified-hosts/', {
+        ...payload
+      }).then(data => {
+        this.classifiedAssets = data
+        if (this.classifiedAssets.error.length === 0) {
+          this.onConfirmRunAsset(hosts, nodes)
+        } else {
+          this.showConfirmRunAssetsDialog = true
+        }
+      })
+    },
+    onConfirmRunAsset(assets, nodes) {
+      const data = {
+        assets: assets,
+        nodes: nodes,
+        module: this.module,
+        args: this.command,
+        runas: this.runas,
         runas_policy: this.runasPolicy,
         instant: true,
         is_periodic: false,
@@ -483,8 +538,13 @@ export default {
         this.setCostTimeInterval()
         this.writeExecutionOutput()
         this.setBtn()
+        this.selectAssets = assets
+        this.selectNodes = nodes
       })
     },
+    viewConfirmRunAssets() {
+      this.showConfirmRunAssetsDialog = true
+    },
     stop() {
       stopJob({ task_id: this.currentTaskId }).then(() => {
         this.xterm.write('\x1b[31m' +
@@ -498,12 +558,12 @@ export default {
       })
     },
     setBtn() {
-      if (this.executionInfo.status.value !== 'running') {
+      if (!this.isRunning) {
         clearInterval(this.executionInfo.cancel)
         this.toolbar.left.run.icon = 'fa fa-play'
       }
-      this.toolbar.left.run.isVisible = this.executionInfo.status.value === 'running'
-      this.toolbar.left.stop.isVisible = this.executionInfo.status.value !== 'running'
+      this.toolbar.left.run.isVisible = this.isRunning
+      this.toolbar.left.stop.isVisible = !this.isRunning
     },
     onSubmitVariable(parameters) {
       this.parameters = parameters

src/views/ops/Adhoc/components/ConfirmRunAssetsDialog.vue

@@ -0,0 +1,211 @@
+<template>
+  <Dialog
+    :title="$t('ConfirmRunningAssets')"
+    :visible.sync="iVisible"
+    :show-buttons="!isRunning"
+    :show-confirm="true"
+    :show-cancel="true"
+    width="1200px"
+    @confirm="onConfirm"
+    @cancel="onCancel"
+  >
+    <div class="confirm-run-assets-dialog">
+      <div class="runnable-assets">
+        <div class="asset-group">
+          <div class="group-title">
+            {{ $t('RunnableAssets') }}
+          </div>
+          <el-checkbox
+            v-model="checkAll"
+            :indeterminate="isIndeterminate"
+            style="padding-bottom: 5px"
+            @change="handleCheckAllChange"
+          >
+            {{ $t('All') }}
+          </el-checkbox>
+          <el-checkbox-group v-model="selectedAssets" class="group-assets" @change="handleCheckedAssetChange">
+            <el-checkbox
+              v-for="asset in runnableAssets"
+              :key="asset.id"
+              :label="asset.id"
+              class="asset-item"
+            >
+              <div class="asset-item">
+                <span>{{ asset.name }}({{ asset.ip }})</span>
+              </div>
+            </el-checkbox>
+          </el-checkbox-group>
+        </div>
+      </div>
+      <div class="error-assets">
+        <div class="group-title">{{ $t('NonRunnableAssets') }}</div>
+        <div class="group-assets">
+          <div v-for="asset in failedAssets" :key="asset.id" class="asset-item">
+            <span><i class="fa fa-times-circle icon" />{{ asset.name }}</span>
+            <span class="asset-status">{{ asset.error }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div>
+      <div class="selected-count">{{ selectedAssets.length }}{{ $t('AssetsSelected') }}</div>
+    </div>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from '@/components/Dialog'
+
+export default {
+  name: 'ConfirmRunAssetsDialog',
+  components: {
+    Dialog
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    assets: {
+      type: Object,
+      default: () => {
+      }
+    },
+    isRunning: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      checkAll: true,
+      selectedAssets: [],
+      isIndeterminate: true
+    }
+  },
+  computed: {
+    iVisible: {
+      set(val) {
+        this.$emit('update:visible', val)
+      },
+      get() {
+        return this.visible
+      }
+    },
+    runnableAssets() {
+      return this.assets.runnable
+    },
+    failedAssets() {
+      return this.assets.error
+    }
+  },
+  watch: {
+    visible(val) {
+      if (val === true && this.selectedAssets.length === 0) {
+        // 首次打开时，默认选中所有可运行的资产
+        this.selectedAssets = this.runnableAssets.map((item) => item.id)
+      }
+    },
+    runnableAssets(val) {
+      // 去掉 selectedAssets 中不存在的 id
+      this.selectedAssets = this.selectedAssets.filter((item) => {
+        return val.some((asset) => asset.id === item)
+      })
+    }
+  },
+  methods: {
+    onCancel() {
+      this.$emit('update:visible', false)
+    },
+    onConfirm() {
+      this.$emit('submit', this.selectedAssets, [])
+      this.$emit('update:visible', false)
+    },
+    handleCheckAllChange(value) {
+      this.selectedAssets = value ? this.runnableAssets.map((item) => item.id) : []
+      this.isIndeterminate = false
+    },
+    handleCheckedAssetChange(value) {
+      const checkedCount = value.length
+      this.checkAll = checkedCount === this.runnableAssets.length
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.runnableAssets.length
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.confirm-run-assets-dialog {
+  .runnable-assets {
+    padding-right: 10px
+  }
+
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  grid-column-gap: 10px;
+
+  .group-title {
+    font-weight: bold;
+    margin-bottom: 8px;
+    font-size: 15px;
+    background: #fbfbfd;
+    padding: 10px;
+  }
+
+  .group-assets {
+    ::v-deep .el-checkbox__label {
+      display: inline-block;
+      padding-left: 10px;
+      line-height: 19px;
+      font-size: 13px;
+      width: 100%;
+    }
+
+    max-height: 300px;
+    overflow-y: auto;
+    scrollbar-width: none;
+    display: grid;
+    grid-template-columns: 1fr;
+    grid-row-gap: 5px;
+    justify-items: start;
+
+    .asset-item {
+      display: flex;
+      grid-template-columns: 1fr 1fr;
+      justify-content: space-between;
+      width: 100%;
+      border-bottom: 1px solid #eee;
+
+      .icon {
+        color: #ed5565;
+        padding-right: 3px
+      }
+
+      .asset-ip {
+        padding-right: 10px;
+      }
+
+      .asset-status {
+        padding-right: 10px;
+        color: #ed5565
+      }
+    }
+
+  }
+
+  .group-assets::-webkit-scrollbar {
+    display: none;
+  }
+
+  .footer {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 16px;
+  }
+
+  .selected-count {
+    color: #1ab394;
+  }
+}
+</style>

src/views/ops/Adhoc/components/QuickJobTerm.vue

@@ -6,6 +6,16 @@
         v-if="executionInfo.status"
         class="header-status"
       >
+        <span class="status-item">
+          <el-link
+            @click="viewConfirmRunAssets"
+          >
+            <span>{{ selectAssets.length }}</span>
+          </el-link>
+          <span style="display: inline-block;" @click="viewConfirmRunAssets">
+            {{ $t('AssetsSelected') }}
+          </span>
+        </span>
         <span class="status-item">
           <span>{{ $tc('Status') }}: </span>
           <span
@@ -67,6 +77,10 @@ export default {
       type: Object,
       // eslint-disable-next-line vue/require-valid-default-prop
       default: {}
+    },
+    selectAssets: {
+      type: Array,
+      default: () => []
     }
   },
   data() {
@@ -153,6 +167,9 @@ export default {
         this.showScrollButton = true
         this.xterm.scrollToBottom()
       })
+    },
+    viewConfirmRunAssets() {
+      this.$emit('view-assets')
     }
   }
 }

src/views/ops/Job/components/BaseJob.vue

@@ -53,7 +53,7 @@ export default {
           ]
         },
         columns: [
-          'name', 'type', 'summary', 'average_time_cost', 'asset_amount',
+          'name', 'type', 'summary', 'average_time_cost', 'asset_amount', 'is_periodic', 'periodic_display',
           'date_last_run', 'comment', 'date_updated', 'date_created', 'actions'
         ],
         columnsMeta: {

src/views/ops/Template/Adhoc.vue

@@ -17,6 +17,7 @@ export default {
   },
   data() {
     const currentUserID = this.$store.state.users.profile.id
+    const isSuperuser = this.$store.state.users.profile.is_superuser
     return {
       createDrawer: () => import('@/views/ops/Template/Adhoc/AdhocUpdateCreate.vue'),
       detailDrawer: () => import('@/views/ops/Template/Adhoc/AdhocDetail/index.vue'),
@@ -43,7 +44,7 @@ export default {
               updateRoute: 'AdhocUpdate',
               hasDelete: true,
               canDelete: ({ row }) => {
-                return this.$hasPerm('ops.delete_adhoc') && row.creator === currentUserID
+                return this.$hasPerm('ops.delete_adhoc') && row.creator === currentUserID || isSuperuser
               },
               hasClone: true,
               cloneRoute: 'AdhocCreate'

src/views/ops/Template/Adhoc/AdhocDetail/AdhocDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <TwoCol>
-    <AutoDetailCard :fields="detailFields" :object="object" :url="url" />
+    <AutoDetailCard :excludes="excludes" :object="object" :url="url" />
     <template #right>
       <IBox :title="$tc('Variable')">
         <Variable

src/views/ops/Template/Playbook.vue

@@ -27,6 +27,7 @@ export default {
   },
   data() {
     const currentUserID = this.$store.state.users.profile.id
+    const isSuperuser = this.$store.state.users.profile.is_superuser
     return {
       createDrawer: () => import('@/views/ops/Template/Playbook/PlaybookCreateUpdate.vue'),
       detailDrawer: () => import('@/views/ops/Template/Playbook/PlaybookDetail/index.vue'),
@@ -55,7 +56,7 @@ export default {
               updateRoute: 'PlaybookUpdate',
               hasDelete: true,
               canDelete: ({ row }) => {
-                return this.$hasPerm('ops.delete_playbook') && row.creator === currentUserID
+                return this.$hasPerm('ops.delete_playbook') && row.creator === currentUserID || isSuperuser
               },
               hasClone: true,
               cloneRoute: 'PlaybookCreate'

src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAccount.vue

@@ -3,7 +3,6 @@
     <template>
       <AccountListTable
         ref="ListTable"
-        :asset="object"
         :columns-default="columns"
         :has-clone="false"
         :has-column-actions="false"

src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionUser.vue

@@ -70,12 +70,11 @@ export default {
         }
       },
       headerActions: {
+        hasLeft: false,
         hasSearch: true,
         hasRefresh: true,
         hasExport: false,
-        hasImport: false,
-        hasCreate: false,
-        hasMoreActions: false
+        hasImport: false
       },
       userRelationConfig: {
         icon: 'fa-user',
@@ -103,7 +102,8 @@ export default {
         onAddSuccess: (objects, that) => {
           this.$log.debug('Select value', that.select2.value)
           that.iHasObjects = [...that.iHasObjects, ...objects]
-          this.$store.commit('common/reload')
+          that.$refs.select2.clearSelected()
+          this.$refs.ListTable.reloadTable()
         }
       },
       groupRelationConfig: {

src/views/profile/Improvement.vue

@@ -39,7 +39,10 @@ export default {
           disabled: true
         },
         phone: {
-          component: PhoneInput
+          component: PhoneInput,
+          hidden: () => {
+            return store.getters.publicSettings['PRIVACY_MODE']
+          }
         },
         mfa_level: {
           disabled: (formValue) => {

src/views/profile/index.vue

@@ -24,7 +24,7 @@
           style="margin-top: 15px"
           type="warning"
         />
-        <IBox :title="$tc('InformationModification')" fa="fa-edit">
+        <IBox v-if="!store.getters.publicSettings['PRIVACY_MODE']" :title="$tc('InformationModification')" fa="fa-edit">
           <table>
             <tr>
               <td> {{ $t('Phone') }}</td>
@@ -86,7 +86,8 @@ export default {
         {
           title: this.$t('FacialFeatures'),
           has: this.$store.getters.publicSettings.FACE_RECOGNITION_ENABLED &&
-            this.$store.getters.publicSettings.XPACK_LICENSE_EDITION_ULTIMATE,
+            this.$store.getters.publicSettings.XPACK_LICENSE_EDITION_ULTIMATE &&
+            !store.getters.publicSettings['PRIVACY_MODE'],
           attrs: {
             type: 'primary',
             label: this.$store.state.users.profile.is_face_code_set ? this.$t('Unbind') : this.$t('Bind')
@@ -111,7 +112,8 @@ export default {
             showTip: this.isDisabled('wecom'),
             tip: this.$t('UnbindHelpText')
           },
-          has: this.$store.getters.publicSettings.AUTH_WECOM,
+          has: this.$store.getters.publicSettings.AUTH_WECOM &&
+            !store.getters.publicSettings['PRIVACY_MODE'],
           callbacks: {
             click: function() {
               this.currentEdit = 'wecom'
@@ -128,7 +130,8 @@ export default {
             showTip: this.isDisabled('dingtalk'),
             tip: this.$t('UnbindHelpText')
           },
-          has: this.$store.getters.publicSettings.AUTH_DINGTALK,
+          has: this.$store.getters.publicSettings.AUTH_DINGTALK &&
+            !store.getters.publicSettings['PRIVACY_MODE'],
           callbacks: {
             click: function() {
               this.currentEdit = 'dingtalk'
@@ -145,7 +148,8 @@ export default {
             showTip: this.isDisabled('feishu'),
             tip: this.$t('UnbindHelpText')
           },
-          has: this.$store.getters.publicSettings.AUTH_FEISHU,
+          has: this.$store.getters.publicSettings.AUTH_FEISHU &&
+            !store.getters.publicSettings['PRIVACY_MODE'],
           callbacks: {
             click: function() {
               this.currentEdit = 'feishu'
@@ -162,7 +166,8 @@ export default {
             showTip: this.isDisabled('lark'),
             tip: this.$t('UnbindHelpText')
           },
-          has: this.$store.getters.publicSettings.AUTH_LARK,
+          has: this.$store.getters.publicSettings.AUTH_LARK &&
+            !store.getters.publicSettings['PRIVACY_MODE'],
           callbacks: {
             click: function() {
               this.currentEdit = 'lark'
@@ -179,7 +184,8 @@ export default {
             showTip: this.isDisabled('slack'),
             tip: this.$t('UnbindHelpText')
           },
-          has: this.$store.getters.publicSettings.AUTH_SLACK,
+          has: this.$store.getters.publicSettings.AUTH_SLACK &&
+            !store.getters.publicSettings['PRIVACY_MODE'],
           callbacks: {
             click: function() {
               this.currentEdit = 'slack'
@@ -314,6 +320,9 @@ export default {
     }
   },
   computed: {
+    store() {
+      return store
+    },
     detailCardItems() {
       return [
         {
@@ -337,7 +346,8 @@ export default {
             } else {
               return '-'
             }
-          }
+          },
+          has: !store.getters.publicSettings['PRIVACY_MODE']
         },
         {
           value: this.object.groups?.map(item => item.name).join(' ｜ '),

src/views/settings/Applet/Applet/AppletList.vue

@@ -57,6 +57,9 @@ export default {
       }
     }
   },
+  mounted() {
+    this.$store.dispatch('users/enterSettingOrg')
+  },
   methods: {
     handleUpload(res) {
       this.$refs.CardTable.reloadTable()