Merge pull request #978 from jumpserver/dev

v2.13.0 rc4
2025-09-20 02:31:43 +00:00 · 2021-08-18 19:46:06 +08:00
parent 16757b7df0 32817390c2
commit 4f2f4a7a9d
13 changed files with 94 additions and 39 deletions
--- a/src/components/AutoDataZTree/index.vue
+++ b/src/components/AutoDataZTree/index.vue
@@ -89,7 +89,7 @@ export default {
        return
      }
      if (currentNode) {
-        currentNode.name = currentNode.meta.node.value
+        currentNode.name = currentNode.meta.data.value
      }
      this.zTree.editName(currentNode)
    },
@@ -108,12 +108,12 @@ export default {
      const query = Object.assign({}, this.$route.query)
      if (treeNode.meta.type === 'node') {
        this.currentNode = treeNode
-        this.currentNodeId = treeNode.meta.node.id
+        this.currentNodeId = treeNode.meta.data.id
        query['node'] = this.currentNodeId
-        url = `${this.setting.url}${combinator}node_id=${treeNode.meta.node.id}&show_current_asset=${show_current_asset}`
+        url = `${this.setting.url}${combinator}node_id=${treeNode.meta.data.id}&show_current_asset=${show_current_asset}`
      } else if (treeNode.meta.type === 'asset') {
-        query['asset'] = treeNode.meta.asset.id
-        url = `${this.setting.url}${combinator}asset_id=${treeNode.meta.asset.id}&show_current_asset=${show_current_asset}`
+        query['asset'] = treeNode.meta.data.id
+        url = `${this.setting.url}${combinator}asset_id=${treeNode.meta.data.id}&show_current_asset=${show_current_asset}`
      }
      this.$router.push({ query })
      this.$emit('urlChange', url)
@@ -125,7 +125,7 @@ export default {
        return
      }
      this.$axios.delete(
-        `${this.treeSetting.nodeUrl}${currentNode.meta.node.id}/`
+        `${this.treeSetting.nodeUrl}${currentNode.meta.data.id}/`
      ).then(() => {
        this.$message.success(this.$t('common.deleteSuccessMsg'))
        this.zTree.removeNode(currentNode)
@@ -143,7 +143,7 @@ export default {
        url,
        { 'value': treeNode.name }
      ).then(res => {
-        let assetsAmount = treeNode.meta.node.assetsAmount
+        let assetsAmount = treeNode.meta.data.assetsAmount
        if (!assetsAmount) {
          assetsAmount = 0
        }
@@ -208,9 +208,9 @@ export default {
    onDrop: function(event, treeId, treeNodes, targetNode, moveType) {
      const treeNodesIds = []
      $.each(treeNodes, function(index, value) {
-        treeNodesIds.push(value.meta.node.id)
+        treeNodesIds.push(value.meta.data.id)
      })
-      const theUrl = `${this.treeSetting.nodeUrl}${targetNode.meta.node.id}/children/add/`
+      const theUrl = `${this.treeSetting.nodeUrl}${targetNode.meta.data.id}/children/add/`
      this.$axios.put(
        theUrl, {
          nodes: treeNodesIds
@@ -229,7 +229,7 @@ export default {
      }
      this.zTree.expandNode(parentNode, true, false, true, false)
      // http://localhost/api/v1/assets/nodes/85aa4ee2-0bd9-41db-9079-aa3646448d0c/children/
-      const url = `${this.treeSetting.nodeUrl}${parentNode.meta.node.id}/children/`
+      const url = `${this.treeSetting.nodeUrl}${parentNode.meta.data.id}/children/`
      this.$axios.post(url, {}).then(data => {
        const newNode = {
          id: data['key'],
@@ -243,7 +243,7 @@ export default {
        this.zTree.addNodes(parentNode, 0, newNode)
        // vm.$refs.dataztree.refresh()
        const node = this.zTree.getNodeByParam('id', newNode.id, parentNode)
-        this.currentNodeId = node.meta.node.id || newNode.id
+        this.currentNodeId = node.meta.data.id || newNode.id
        this.zTree.editName(node)
        this.$message.success(this.$t('common.createSuccessMsg'))
      }).catch(error => {
--- a/src/components/FormFields/Select2.vue
+++ b/src/components/FormFields/Select2.vue
@@ -2,6 +2,7 @@
  <el-select
    ref="select"
    v-model="iValue"
+    v-loading="!initialized"
    v-loadmore="loadMore"
    :options="iOptions"
    :remote="remote"
@@ -97,7 +98,7 @@ export default {
    return {
      loading: false,
      initialized: false,
-      iValue: this.value ? this.value : [],
+      iValue: this.multiple ? [] : '',
      defaultParams: _.cloneDeep(defaultParams),
      params: _.cloneDeep(defaultParams),
      iOptions: this.options || [],
@@ -161,11 +162,14 @@ export default {
      this.iValue = iNew
    }
  },
-  mounted() {
+  async mounted() {
    // this.$log.debug('Select2 url is: ', this.iAjax.url)
    if (!this.initialized) {
-      this.initialSelect()
+      await this.initialSelect()
+      setTimeout(() => {
        this.initialized = true
+        this.iValue = this.value
+      })
    }
    this.$nextTick(() => {
      // 因为elform存在问题，这个来清楚验证
@@ -243,9 +247,13 @@ export default {
      // this.$log.debug('Select ajax config', this.iAjax)
      if (this.iAjax.url) {
        if (this.value && this.value.length !== 0) {
-          this.$log.debug('Start init select2 value')
-          const data = await createSourceIdCache(this.value)
-          this.params.spm = data.spm
+          this.$log.debug('Start init select2 value, ', this.value)
+          let value = this.value
+          if (!Array.isArray(value)) {
+            value = [value]
+          }
+          const data = await createSourceIdCache(value)
+          this.params.spm = data['spm']
          await this.getInitialOptions()
        }
        await this.getOptions()
--- a/src/components/GrantedAssets/index.vue
+++ b/src/components/GrantedAssets/index.vue
@@ -27,7 +27,7 @@ export default {
          vm.tableConfig.initialUrl = vm.tableConfig.url
        }
        const initialUrl = vm.tableConfig.initialUrl
-        const nodeId = node.meta.node.id
+        const nodeId = node.meta.data.id
        const url = initialUrl.replace('/assets/', `/nodes/${nodeId}/assets/`)
        vm.tableConfig.url = url
      }
--- a/src/userviews/assets/index.vue
+++ b/src/userviews/assets/index.vue
@@ -24,7 +24,7 @@ export default {
          refresh: () => {},
          onSelected: function(event, treeNode) {
            if (treeNode.meta.type === 'node') {
-              const currentNodeId = treeNode.meta.node.id
+              const currentNodeId = treeNode.meta.data.id
              this.tableConfig.url = `/api/v1/perms/users/nodes/${currentNodeId}/assets/?cache_policy=1`
            }
          }.bind(this)
--- a/src/views/accounts/AssetAccount/AssetAccountList.vue
+++ b/src/views/accounts/AssetAccount/AssetAccountList.vue
@@ -33,11 +33,11 @@ export default {
          onSelected: function(event, treeNode) {
            let url = '/api/v1/assets/accounts/'
            if (treeNode.meta.type === 'node') {
-              const nodeId = treeNode.meta.node.id
+              const nodeId = treeNode.meta.data.id
              url = setUrlParam(url, 'asset', '')
              url = setUrlParam(url, 'node', nodeId)
            } else if (treeNode.meta.type === 'asset') {
-              const assetId = treeNode.meta.asset.id
+              const assetId = treeNode.meta.data.id
              url = setUrlParam(url, 'node', '')
              url = setUrlParam(url, 'asset', assetId)
            }
--- a/src/views/acl/UserAcl/UserAclCreateUpdate.vue
+++ b/src/views/acl/UserAcl/UserAclCreateUpdate.vue
@@ -37,7 +37,18 @@ export default {
          }
        }
      },
-      url: `/api/v1/acls/login-acls/`,
+      getUrl() {
+        const query = this.$route.query
+        const params = this.$route.params
+        let url = `/api/v1/acls/login-acls/`
+        if (params.id) {
+          url = `${url}${params.id}/`
+        }
+        if (query.user) {
+          url = `${url}?user=${query.user}`
+        }
+        return url
+      },
      updateSuccessNextRoute: { name: 'UserDetail', params: {
        id: this.$route.query.user
      }},
@@ -69,7 +80,6 @@ export default {
        if (!Array.isArray(value.ip_group)) {
          value.ip_group = value.ip_group ? value.ip_group.split(',') : []
        }
-        console.log('>>>>>>>>: ', value)
        return value
      }
    }
--- a/src/views/assets/Asset/AssetList.vue
+++ b/src/views/assets/Asset/AssetList.vue
@@ -420,7 +420,7 @@ export default {
        return
      }
      this.$axios.post(
-        `/api/v1/assets/nodes/${currentNode.meta.node.id}/tasks/`,
+        `/api/v1/assets/nodes/${currentNode.meta.data.id}/tasks/`,
        { 'action': 'refresh' }
      ).then((res) => {
        openTaskPage(res['task'])
@@ -435,7 +435,7 @@ export default {
        return
      }
      this.$axios.post(
-        `/api/v1/assets/nodes/${currentNode.meta.node.id}/tasks/`,
+        `/api/v1/assets/nodes/${currentNode.meta.data.id}/tasks/`,
        { 'action': 'test' }
      ).then((res) => {
        openTaskPage(res['task'])
@@ -451,7 +451,7 @@ export default {
      }
      this.$cookie.set('show_current_asset', '1', 1)
      this.decorateRMenu()
-      const url = `${this.treeSetting.url}?node_id=${currentNode.meta.node.id}&show_current_asset=1`
+      const url = `${this.treeSetting.url}?node_id=${currentNode.meta.data.id}&show_current_asset=1`
      this.$refs.TreeList.$refs.TreeTable.handleUrlChange(url)
    },
    rMenuShowAssetAllChildrenNode: function() {
@@ -462,7 +462,7 @@ export default {
      }
      this.$cookie.set('show_current_asset', '0', 1)
      this.decorateRMenu()
-      const url = `${this.treeSetting.url}?node_id=${currentNode.meta.node.id}&show_current_asset=0`
+      const url = `${this.treeSetting.url}?node_id=${currentNode.meta.data.id}&show_current_asset=0`
      this.$refs.TreeList.$refs.TreeTable.handleUrlChange(url)
    },
    rMenuShowNodeInfo: function() {
@@ -472,7 +472,7 @@ export default {
        return
      }
      this.$axios.get(
-        `/api/v1/assets/nodes/${currentNode.meta.node.id}/`
+        `/api/v1/assets/nodes/${currentNode.meta.data.id}/`
      ).then(res => {
        this.nodeInfoDialogSetting.dialogVisible = true
        this.nodeInfoDialogSetting.items = [
@@ -512,9 +512,9 @@ export default {
      if (!currentNode || assetsSelected.length === 0) {
        return
      }
-      let url = `/api/v1/assets/nodes/${currentNode.meta.node.id}/assets/add/`
+      let url = `/api/v1/assets/nodes/${currentNode.meta.data.id}/assets/add/`
      if (this.assetTreeTableDialogSetting.action === 'move') {
-        url = `/api/v1/assets/nodes/${currentNode.meta.node.id}/assets/replace/`
+        url = `/api/v1/assets/nodes/${currentNode.meta.data.id}/assets/replace/`
      }
      this.$axios.put(
        url, { assets: assetsSelected }
--- a/src/views/ops/CommandExecution.vue
+++ b/src/views/ops/CommandExecution.vue
@@ -142,7 +142,7 @@ export default {
    },
    onClick(event, treeId, treeNode, clickFlag) {
      // if (treeNode.meta.type === 'asset') {
-      //   const protocolsStr = treeNode.meta.asset.protocols + ''
+      //   const protocolsStr = treeNode.meta.data.protocols + ''
      //   if (protocolsStr.indexOf('ssh/') === -1) {
      //     // Don't Support SSH
      //   }
@@ -162,7 +162,7 @@ export default {
      const assetsNode = []
      nodes.forEach(function(node) {
        if (node.meta.type === 'asset' && !node.isHidden) {
-          const protocolsStr = node.meta.asset.protocols + ''
+          const protocolsStr = node.meta.data.protocols + ''
          if (assetsNodeId.indexOf(node.id) === -1 && protocolsStr.indexOf('ssh') > -1) {
            assetsNodeId.push(node.id)
            assetsNode.push(node)
--- a/src/views/settings/Security.vue
+++ b/src/views/settings/Security.vue
@@ -27,7 +27,7 @@ export default {
          this.$t('common.Basic'),
          [
            'SECURITY_COMMAND_EXECUTION', 'SECURITY_SERVICE_ACCOUNT_REGISTRATION',
-            'SECURITY_MAX_IDLE_TIME'
+            'SECURITY_MAX_IDLE_TIME', 'SECURITY_WATERMARK_ENABLED'
          ]
        ],
        [
--- a/src/views/settings/SystemMessageSubscription/SelectDialog.vue
+++ b/src/views/settings/SystemMessageSubscription/SelectDialog.vue
@@ -15,6 +15,7 @@
 <script>
 import Dialog from '@/components/Dialog'
 import { krryPaging } from 'krry-transfer'
+import { getUserList } from '@/api/users'
 export default {
  name: 'ListSelect',
  components: {
@@ -39,8 +40,27 @@ export default {
        getPageData: async function(pageIndex, pageSize) {
          const limit = pageSize
          const offset = (pageIndex - 1) * pageSize
-          const url = `/api/v1/users/users/?limit=${limit}&offset=${offset}&oid=ROOT`
-          const data = await this.$axios.get(url)
+          const params = {
+            'limit': limit,
+            'offset': offset,
+            'oid': 'ROOT'
+          }
+          const data = await getUserList(params)
+          const results = data['results'].map(item => {
+            return { id: item.id, label: `${item.name}(${item.username})` }
+          })
+          return results
+        },
+        getSearchData: async function(keyword, pageIndex, pageSize) {
+          const limit = pageSize
+          const offset = (pageIndex - 1) * pageSize
+          const params = {
+            'limit': limit,
+            'offset': offset,
+            'oid': 'ROOT',
+            'search': keyword
+          }
+          const data = await getUserList(params)
          const results = data['results'].map(item => {
            return { id: item.id, label: `${item.name}(${item.username})` }
          })
--- a/src/views/settings/SystemMessageSubscription/Subscription.vue
+++ b/src/views/settings/SystemMessageSubscription/Subscription.vue
@@ -33,7 +33,7 @@
    <SelectDialog
      v-if="dialogVisible"
      :visible.sync="dialogVisible"
-      title="修改消息接受人"
+      :title="$t('notifications.ChangeReceiver')"
      :selected-users="dialogSelectedUsers"
      @submit="onDialogSelectSubmit"
      @cancel="dialogVisible=false"
--- a/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue
+++ b/src/views/xpack/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue
@@ -134,6 +134,23 @@ export default {
          value.ip_network_segment_group = value.ip_network_segment_group ? value.ip_network_segment_group.split(',') : []
        }
        return value
+      },
+      onPerformError(error, method, vm) {
+        this.$emit('submitError', error)
+        const response = error.response
+        const data = response.data
+        if (response.status === 400) {
+          for (const key of Object.keys(data)) {
+            let value = data[key]
+            if (key === 'protocols') {
+              value = Object.values(data[key])
+            }
+            if (value instanceof Array) {
+              value = value.join(';')
+            }
+            this.$refs.form.setFieldError(key, value)
+          }
+        }
      }
    }
  },
--- a/src/views/xpack/Vault/VaultList.vue
+++ b/src/views/xpack/Vault/VaultList.vue
@@ -62,11 +62,11 @@ export default {
          onSelected: function(event, treeNode) {
            let url = vm.assetUserConfig.url
            if (treeNode.meta.type === 'node') {
-              const nodeId = treeNode.meta.node.id
+              const nodeId = treeNode.meta.data.id
              url = setUrlParam(url, 'asset_id', '')
              url = setUrlParam(url, 'node_id', nodeId)
            } else if (treeNode.meta.type === 'asset') {
-              const assetId = treeNode.meta.asset.id
+              const assetId = treeNode.meta.data.id
              url = setUrlParam(url, 'node_id', '')
              url = setUrlParam(url, 'asset_id', assetId)
            }