perf: Account remove

- jumpserver/pull/15373

package.json

@@ -72,7 +72,6 @@
     "vue-i18n": "^8.15.5",
     "vue-json-editor": "^1.4.3",
     "vue-markdown": "^2.2.4",
-    "vue-moment": "^4.1.0",
     "vue-password-strength-meter": "^1.7.2",
     "vue-router": "3.0.6",
     "vue-select": "^3.9.5",

src/components/Apps/AssetRelationCard/index.vue

@@ -3,7 +3,7 @@
     <table style="width: 100%">
       <tr>
         <td colspan="2">
-          <AssetSelect ref="assetSelect" :can-select="canSelect" :disabled="disabled" />
+          <AssetSelect ref="assetSelect" :can-select="canSelect" :disabled="disabled" :tree-setting="treeSetting" />
         </td>
       </tr>
       <tr>
@@ -59,6 +59,10 @@ export default {
       default(row, index) {
         return true
       }
+    },
+    treeSetting: {
+      type: Object,
+      default: () => {}
     }
   },
   data() {

src/components/Apps/AssetTreeTable/index.vue

@@ -108,6 +108,11 @@ export default {
               url: this.typeUrl,
               nodeUrl: this.treeSetting?.nodeUrl || this.nodeUrl,
               treeUrl: `${this.typeUrl}?assets=${showAssets ? '1' : '0'}&count_resource=${this.treeSetting.countResource || 'asset'}`,
+              edit: {
+                drag: {
+                  isMove: false
+                }
+              },
               callback: {
                 onSelected: (event, treeNode) => this.getAssetsUrl(treeNode)
               }

src/components/Apps/GrantedAssets/index.vue

@@ -51,6 +51,11 @@ export default {
         url: this.tableUrl,
         // ?assets=0不显示资产. =1显示资产
         treeUrl: this.treeUrl,
+        edit: {
+          drag: {
+            isMove: false
+          }
+        },
         callback: {
           onSelected: (event, node) => vm.onSelected(node, vm),
           refresh: vm.refreshObjectAssetPermission

src/components/Cards/DetailCard/ItemValue.vue

@@ -78,7 +78,7 @@ export default {
         formatterData = data
       }
       return (
-        <span>{formatterData}</span>
+        <span style={{ whiteSpace: 'pre-wrap', wordBreak: 'break-word', lineHeight: '1.2' }}>{formatterData}</span>
       )
     }
     if (this.value instanceof Array) {

src/components/Table/DataTable/compenents/el-data-table/utils/select-strategy.js

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

src/components/Table/ListTable/TableAction/RightSide.vue

@@ -122,8 +122,13 @@ export default {
       })
     },
     iExportOptions() {
-      const options = assignIfNot(this.exportOptions, { url: this.tableUrl })
+      // const options = assignIfNot(this.exportOptions, { url: this.tableUrl })
-      return options
+      // return options
+
+      return {
+        url: this.tableUrl,
+        ...this.exportOptions
+      }
     }
   },
   methods: {

src/components/Table/TableFormatters/ShowKeyCopyFormatter.vue

@@ -9,7 +9,7 @@
       class="text edit-input"
       @blur="onEditBlur"
     />
-    <span v-if="realValue" class="action">
+    <span class="action">
       <template v-for="(item, index) in iActions">
         <el-tooltip
           v-if="item.has"

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

@@ -157,7 +157,7 @@ export default {
         </a>`
       const treeActions = `${showSearch ? searchIcon : ''}${showRefresh ? refreshIcon : ''}`
       const icons = `
-        <span style="float: right; margin-right: 10px">
+        <span>
           ${treeActions}
         </span>`
       if (rootNode) {

src/components/Tree/DataZTree/index.vue

@@ -39,7 +39,7 @@ export default {
           showRenameBtn: false,
           drag: {
             isCopy: false,
-            isMove: true
+            isMove: !this.$store.getters.currentOrgIsRoot
           }
         },
         callback: {

src/components/Widgets/MarkDown/index.vue

@@ -54,24 +54,24 @@ export default {
       resizeObserver: null,
       span: 12,
       isShow: true,
-      iValue: this.value
+      iValue: this.sanitizeContent(this.value)
     }
   },
   computed: {
     sanitizedValue() {
-      // 转义特殊字符
+      const content = this.iValue.replace(/\\/g, '\\\\').replace(/\$/g, '\\$')
-      let content = this.iValue.replace(/\\/g, '\\\\').replace(/\$/g, '\\$')
 
-      // 使用 DOMPurify 进行 XSS 过滤
+      return this.sanitizeContent(content)
-      content = DOMPurify.sanitize(content)
+    }
-
+  },
-      return 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
@@ -91,8 +91,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/layout/components/NavHeader/AccountDropdown.vue

@@ -74,9 +74,11 @@ export default {
     },
     async logout() {
       const currentOrg = this.$store.getters.currentOrg
-      if (currentOrg.autoEnter) {
+
+      if (currentOrg.autoEnter || currentOrg.is_system) {
         await this.$store.dispatch('users/setCurrentOrg', this.$store.getters.preOrg)
       }
+
       window.location.href = `${process.env.VUE_APP_LOGOUT_PATH}?next=${this.$route.fullPath}`
     }
   }

src/main.js

@@ -24,6 +24,8 @@ import { message } from '@/utils/message'
 import xss from '@/utils/xss'
 import request from '@/utils/request'
 import ElTableTooltipPatch from '@/utils/elTableTooltipPatch.js'
+import moment from 'moment'
+moment.locale('zh-cn')
 
 /**
  * If you don't want to use mock-server
@@ -50,11 +52,7 @@ Vue.config.productionTip = false
 Vue.use(VueCookie)
 window.$cookie = VueCookie
 
-const moment = require('moment')
+Vue.prototype.$moment = moment
-require('moment/locale/zh-cn')
-Vue.use(require('vue-moment'), {
-  moment
-})
 
 Vue.use(VueLogger, loggerOptions)
 

src/store/modules/users.js

@@ -71,10 +71,12 @@ const mutations = {
     state.consoleOrgs = state.consoleOrgs.filter(i => i.id !== org.id)
   },
   SET_CURRENT_ORG(state, org) {
-    // 系统组织和全局组织不设置成 Pre org
+    // 系统组织不设置成 Pre org
-    if (!state.currentOrg?.autoEnter && !state.currentOrg?.is_root) {
+    const currentOrg = state.currentOrg
-      state.preOrg = state.currentOrg
+
-      setPreOrgLocal(state.username, state.currentOrg)
+    if (currentOrg && !currentOrg.autoEnter && !currentOrg.is_system) {
+      state.preOrg = currentOrg
+      setPreOrgLocal(state.username, currentOrg)
     }
     state.currentOrg = org
     saveCurrentOrgLocal(state.username, org)
@@ -144,6 +146,7 @@ const actions = {
     const systemOrg = {
       id: orgUtil.SYSTEM_ORG_ID,
       name: 'SystemSetting',
+      is_system: true,
       autoEnter: new Date().getTime()
     }
     commit('SET_CURRENT_ORG', systemOrg)

src/utils/auth.js

@@ -42,8 +42,14 @@ export function getCurrentOrgLocal(username) {
 
 export function saveCurrentOrgLocal(username, org) {
   const key = CURRENT_ORG_KEY + '_' + username
-  localStorage.setItem(key, JSON.stringify(org))
+
-  VueCookie.set('X-JMS-ORG', org.id)
+  if (org) {
+    localStorage.setItem(key, JSON.stringify(org))
+    VueCookie.set('X-JMS-ORG', org.id)
+  } else {
+    localStorage.removeItem(key)
+    VueCookie.delete('X-JMS-ORG')
+  }
 }
 
 export function setPreOrgLocal(username, org) {

src/utils/common.js

@@ -366,16 +366,32 @@ export function download(downloadUrl, filename) {
   const iframe = document.createElement('iframe')
   iframe.style.display = 'none'
   document.body.appendChild(iframe)
-  const a = document.createElement('a')
+  const timeout = 1000 * 60 * 30
-  a.href = downloadUrl
+
   if (filename) {
-    a.download = filename
+    fetch(downloadUrl)
+      .then(response => response.blob())
+      .then(blob => {
+        const url = URL.createObjectURL(blob)
+        const a = iframe.contentWindow.document.createElement('a')
+        a.href = url
+        a.download = filename
+        iframe.contentWindow.document.body.appendChild(a)
+        a.click()
+        setTimeout(() => {
+          URL.revokeObjectURL(url)
+          document.body.removeChild(iframe)
+        }, timeout) // If you can't download it in half an hour, don't download it.
+      })
+      .catch(() => {
+        document.body.removeChild(iframe)
+      })
+  } else {
+    iframe.src = downloadUrl
+    setTimeout(() => {
+      document.body.removeChild(iframe)
+    }, timeout) // If you can't download it in half an hour, don't download it.
   }
-  iframe.contentWindow.document.body.appendChild(a)
-  a.click()
-  setTimeout(() => {
-    document.body.removeChild(iframe)
-  }, 1000 * 60 * 30) // If you can't download it in half an hour, don't download it.
 }
 
 export function diffObject(object, base) {

src/utils/org.js

@@ -17,7 +17,7 @@ function getPropOrg() {
   if (defaultOrg) {
     return defaultOrg
   }
-  return orgs.filter(item => !item['is_root'] && item.id !== SYSTEM_ORG_ID)[0]
+  return orgs.filter(item => !item['is_root'] && !item['is_system'])[0]
 }
 
 async function change2PropOrg() {

src/utils/request.js

@@ -90,10 +90,20 @@ function ifBadRequest({ response, error }) {
   }
 }
 
+export function logout() {
+  window.location.href = `${process.env.VUE_APP_LOGOUT_PATH}?next=${location.pathname}`
+}
+
 export function flashErrorMsg({ response, error }) {
   if (!response.config.disableFlashErrorMsg) {
     const responseErrorMsg = getErrorResponseMsg(error)
     const msg = responseErrorMsg || error.message
+
+    if (response.status === 403 && msg === 'CSRF Failed: CSRF token missing.') {
+      setTimeout(() => {
+        logout()
+      }, 1000)
+    }
     message({
       message: msg,
       type: 'error',

src/utils/startup.js

@@ -8,7 +8,10 @@ import orgs from '@/api/orgs'
 import { getPropView, isViewHasOrgs } from '@/utils/jms'
 
 const whiteList = ['/login', process.env.VUE_APP_LOGIN_PATH] // no redirect whitelist
-const autoEnterOrgs = ['00000000-0000-0000-0000-000000000001', '00000000-0000-0000-0000-000000000000']
+const autoEnterOrgs = [
+  '00000000-0000-0000-0000-000000000001',
+  '00000000-0000-0000-0000-000000000000'
+]
 
 function reject(msg) {
   return new Promise((resolve, reject) => reject(msg))
@@ -23,6 +26,19 @@ async function checkLogin({ to, from, next }) {
     return await store.dispatch('users/getProfile')
   } catch (e) {
     Vue.$log.error(e)
+    // remove currentOrg: System org item
+    for (let i = 0; i < localStorage.length; i++) {
+      const key = localStorage.key(i)
+      if (!key.startsWith('jms_current_org_')) {
+        continue
+      }
+      let value = localStorage.getItem(key)
+      value = JSON.parse(value)
+      if (!value.is_system) {
+        continue
+      }
+      localStorage.removeItem(key)
+    }
     const status = e.response.status
     if (store.getters.currentOrg.autoEnter) {
       await store.dispatch('users/setCurrentOrg', store.getters.preOrg)
@@ -154,18 +170,24 @@ export async function startup({ to, from, next }) {
   if (store.getters.inited) {
     return true
   }
-  await store.dispatch('app/init')
 
-  // set page title
+  try {
-  // await getOpenPublicSetting({ to, from, next })
+    await store.dispatch('app/init')
-  await getPublicSetting({ to, from, next }, true)
+
-  await checkLogin({ to, from, next })
+    // set page title
-  await getPublicSetting({ to, from, next }, false)
+    // await getOpenPublicSetting({ to, from, next })
-  await changeCurrentViewIfNeed({ to, from, next })
+    await getPublicSetting({ to, from, next }, true)
-  await changeCurrentOrgIfNeed({ to, from, next })
+    await checkLogin({ to, from, next })
-  await generatePageRoutes({ to, from, next })
+    await getPublicSetting({ to, from, next }, false)
-  await checkUserFirstLogin({ to, from, next })
+    await changeCurrentViewIfNeed({ to, from, next })
-  await store.dispatch('assets/getAssetCategories')
+    await changeCurrentOrgIfNeed({ to, from, next })
+    await generatePageRoutes({ to, from, next })
+    await checkUserFirstLogin({ to, from, next })
+    await store.dispatch('assets/getAssetCategories')
+  } catch (e) {
+    Vue.$log.error('Startup error: ', e)
+  }
+
   return true
 }
 

src/views/accounts/Account/AccountList.vue

@@ -30,7 +30,12 @@ export default {
         showMenu: false,
         showAssets: true,
         url: '/api/v1/accounts/accounts/',
-        countResource: 'account'
+        countResource: 'account',
+        edit: {
+          drag: {
+            isMove: false
+          }
+        }
       }
     }
   }

src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue

@@ -122,9 +122,53 @@ export default {
           return {
             name: 'AccountChangeSecretCreate'
           }
-        }
+        },
+        extraMoreActions: [
+          {
+            name: 'BatchDisable',
+            title: this.$t('common.BatchDisable'),
+            icon: 'fa fa-ban',
+            can: ({ selectedRows }) => selectedRows.length > 0 && this.$hasPerm('accounts.change_changesecretautomation'),
+            callback: ({ selectedRows, reloadTable }) => this.bulkDisableCallback(selectedRows, reloadTable)
+          },
+          {
+            name: 'BatchActivate',
+            title: this.$t('common.BatchActivate'),
+            icon: 'fa fa-check-circle-o',
+            can: ({ selectedRows }) => selectedRows.length > 0 && this.$hasPerm('accounts.change_changesecretautomation'),
+            callback: ({ selectedRows, reloadTable }) => this.bulkActivateCallback(selectedRows, reloadTable)
+          }
+        ]
       }
     }
+  },
+  methods: {
+    bulkDisableCallback(selectedRows, reloadTable) {
+      const url = '/api/v1/accounts/change-secret-automations/'
+      const data = selectedRows.map(row => {
+        return { id: row.id, is_active: false }
+      })
+      if (data.length === 0) return
+      this.$axios.patch(url, data).then(() => {
+        reloadTable()
+        this.$message.success(this.$t('common.disableSuccessMsg'))
+      }).catch(error => {
+        this.$message.error(this.$t('common.updateError') + ' ' + error)
+      })
+    },
+    bulkActivateCallback(selectedRows, reloadTable) {
+      const url = '/api/v1/accounts/change-secret-automations/'
+      const data = selectedRows.map(row => {
+        return { id: row.id, is_active: true }
+      })
+      if (data.length === 0) return
+      this.$axios.patch(url, data).then(() => {
+        reloadTable()
+        this.$message.success(this.$t('common.activateSuccessMsg'))
+      }).catch(error => {
+        this.$message.error(this.$t('common.updateError') + ' ' + error)
+      })
+    }
   }
 }
 </script>

src/views/accounts/AccountPush/AccountPushList.vue

@@ -127,9 +127,58 @@ export default {
       headerActions: {
         hasRefresh: true,
         hasExport: false,
-        hasImport: false
+        hasImport: false,
+        createRoute: () => {
+          return {
+            name: 'AccountPushCreate'
+          }
+        },
+        extraMoreActions: [
+          {
+            name: 'BatchDisable',
+            title: this.$t('common.BatchDisable'),
+            icon: 'fa fa-ban',
+            can: ({ selectedRows }) => selectedRows.length > 0 && this.$hasPerm('accounts.change_pushaccountautomation'),
+            callback: ({ selectedRows, reloadTable }) => this.bulkDisableCallback(selectedRows, reloadTable)
+          },
+          {
+            name: 'BatchActivate',
+            title: this.$t('common.BatchActivate'),
+            icon: 'fa fa-check-circle-o',
+            can: ({ selectedRows }) => selectedRows.length > 0 && this.$hasPerm('accounts.change_pushaccountautomation'),
+            callback: ({ selectedRows, reloadTable }) => this.bulkActivateCallback(selectedRows, reloadTable)
+          }
+        ]
       }
     }
+  },
+  methods: {
+    bulkDisableCallback(selectedRows, reloadTable) {
+      const url = '/api/v1/accounts/push-account-automations/'
+      const data = selectedRows.map(row => {
+        return { id: row.id, is_active: false }
+      })
+      if (data.length === 0) return
+      this.$axios.patch(url, data).then(() => {
+        reloadTable()
+        this.$message.success(this.$t('common.disableSuccessMsg'))
+      }).catch(error => {
+        this.$message.error(this.$t('common.updateError') + ' ' + error)
+      })
+    },
+    bulkActivateCallback(selectedRows, reloadTable) {
+      const url = '/api/v1/accounts/push-account-automations/'
+      const data = selectedRows.map(row => {
+        return { id: row.id, is_active: true }
+      })
+      if (data.length === 0) return
+      this.$axios.patch(url, data).then(() => {
+        reloadTable()
+        this.$message.success(this.$t('common.activateSuccessMsg'))
+      }).catch(error => {
+        this.$message.error(this.$t('common.updateError') + ' ' + error)
+      })
+    }
   }
 }
 </script>

src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue

@@ -65,9 +65,11 @@ export default {
         columns: ['name', 'username', 'secret_type', 'privileged'],
         columnsMeta: {
           name: {
-            formatterArgs: {
+            formatter: (row) => <span>{row.name}</span>
-              route: 'AccountTemplateDetail'
+            // 暂禁用远程应用中账号模板的详情跳转
-            }
+            // formatterArgs: {
+            //   route: 'AccountTemplateDetail'
+            // }
           },
           privileged: {
             width: '100px'

src/views/assets/Cloud/const.js

@@ -102,7 +102,7 @@ export const ACCOUNT_PROVIDER_ATTRS_MAP = {
   [vmware]: {
     name: vmware,
     title: 'VMware',
-    attrs: ['host', 'port', 'username', 'password']
+    attrs: ['host', 'port', 'username', 'password', 'auto_sync_node']
   },
   [nutanix]: {
     name: nutanix,

src/views/assets/Platform/const.js

@@ -20,7 +20,8 @@ export const platformFieldsMeta = (vm) => {
         'change_secret_enabled', 'change_secret_method', 'change_secret_params',
         'push_account_enabled', 'push_account_method', 'push_account_params',
         'verify_account_enabled', 'verify_account_method', 'verify_account_params',
-        'gather_accounts_enabled', 'gather_accounts_method', 'gather_accounts_params'
+        'gather_accounts_enabled', 'gather_accounts_method', 'gather_accounts_params',
+        'remove_account_enabled', 'remove_account_method', 'remove_account_params'
       ],
       fieldsMeta: {
         ansible_config: {
@@ -28,12 +29,15 @@ export const platformFieldsMeta = (vm) => {
           hidden: (formValue) => !formValue['ansible_enabled']
         },
         gather_facts_enabled: {},
+        remove_account_enabled: {},
         ping_method: {},
         ping_params: {
           label: ''
         },
         gather_facts_method: {},
         push_account_method: {},
+        remove_account_method: {},
+        remove_account_params: {},
         push_account_params: {
           label: ''
         },

src/views/myassets/index.vue

@@ -36,6 +36,11 @@ export default {
               this.tableConfig.url = `/api/v1/perms/users/self/nodes/${currentNodeId}/assets/?cache_policy=1`
             }
           }.bind(this)
+        },
+        edit: {
+          drag: {
+            isMove: false
+          }
         }
       },
       tableConfig: {

src/views/ops/File/index.vue

@@ -205,6 +205,11 @@ export default {
         view: {
           dblClickExpand: false,
           showLine: true
+        },
+        edit: {
+          drag: {
+            isMove: false
+          }
         }
       },
       iShowTree: true,

src/views/ops/Job/QuickJob.vue

@@ -290,6 +290,11 @@ export default {
         view: {
           dblClickExpand: false,
           showLine: true
+        },
+        edit: {
+          drag: {
+            isMove: false
+          }
         }
       },
       iShowTree: true

src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue

@@ -11,7 +11,6 @@
 <script>
 import { GenericCreateUpdatePage } from '@/layout/components'
 import AssetSelect from '@/components/Apps/AssetSelect'
-import { getDayFuture } from '@/utils/common'
 import AccountFormatter from './components/AccountFormatter'
 import { AllAccount } from '../const'
 import ProtocolsSelect from '@/components/Form/FormFields/AllOrSpec.vue'
@@ -34,7 +33,6 @@ export default {
       initial: {
         is_active: true,
         date_start: new Date().toISOString(),
-        date_expired: getDayFuture(25550, new Date()).toISOString(),
         nodes: nodesInitial,
         assets: assetsInitial,
         accounts: [AllAccount]

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

@@ -107,6 +107,13 @@ export default {
           this.$log.debug('AssetSelect value', that.assets)
           this.$message.success(this.$tc('common.updateSuccessMsg'))
           this.$store.commit('common/reload')
+        },
+        treeSetting: {
+          edit: {
+            drag: {
+              isMove: false
+            }
+          }
         }
       },
       nodeRelationConfig: {

src/views/perms/AssetPermission/AssetPermissionList.vue

@@ -39,7 +39,12 @@ export default {
         notShowBuiltinTree: true,
         url: '/api/v1/perms/asset-permissions/',
         nodeUrl: '/api/v1/perms/asset-permissions/',
-        treeUrl: '/api/v1/assets/nodes/children/tree/?assets=1'
+        treeUrl: '/api/v1/assets/nodes/children/tree/?assets=1',
+        edit: {
+          drag: {
+            isMove: false
+          }
+        }
       },
       tableConfig: {
         url: '/api/v1/perms/asset-permissions/',

src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue

@@ -24,6 +24,7 @@
               v-model="requestForm.accounts"
               :nodes="requestForm.nodes"
               :assets="requestForm.assets"
+              :oid="requestForm.oid"
               :show-add-template="false"
               style="width: 50% !important"
             />
@@ -83,6 +84,7 @@ export default {
         assets: this.object.apply_assets?.map(i => i.id),
         accounts: this.object.apply_accounts,
         actions: this.object.apply_actions,
+        oid: this.object.org_id,
         apply_date_expired: this.object.apply_date_expired,
         apply_date_start: this.object.apply_date_start
       },

src/views/tickets/components/Session.vue

@@ -134,7 +134,7 @@ export default {
     },
     onMonitor() {
       const joinUrl = `/luna/monitor/${this.session.id}?ticket_id=${this.object.id}`
-      window.open(joinUrl, 'height=600, width=850, top=400, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')
+      window.open(joinUrl, '_blank', 'height=600, width=850, top=400, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')
     },
     onToggleLock() {
       const url = '/api/v1/terminal/tasks/toggle-lock-session-for-ticket/'

src/views/users/Role/RoleDetail/RoleInfo.vue

@@ -54,6 +54,11 @@ export default {
         showRefresh: true,
         showSearch: false,
         treeUrl: '',
+        edit: {
+          drag: {
+            isMove: false
+          }
+        },
         check: {
           enable: true
         },

src/views/users/User/UserCreateUpdate.vue

@@ -121,6 +121,9 @@ export default {
         system_roles: {
           component: Select2,
           label: this.$t('users.SystemRoles'),
+          rules: [
+            rules.Required
+          ],
           el: {
             multiple: true,
             ajax: {

yarn.lock

@@ -8987,7 +8987,7 @@ moment-parseformat@^4.0.0:
   resolved "https://registry.npmmirror.com/moment-parseformat/-/moment-parseformat-4.0.0.tgz#44cffc3b3be3b3d033475869fbfa9066abb66cb0"
   integrity sha512-0V4ICKnI1npglqrMSDK2y8WxOdN79DkMoIexzY3P+jr2wNfbB4J81BgjFfHsj18wBsV7FdKCWyCHcezzH0xlyg==
 
-moment@^2.19.2, moment@^2.29.4:
+moment@^2.29.4:
   version "2.29.4"
   resolved "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
   integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
@@ -13226,13 +13226,6 @@ vue-markdown@^2.2.4:
     markdown-it-task-lists "^2.0.1"
     markdown-it-toc-and-anchor "^4.1.2"
 
-vue-moment@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmmirror.com/vue-moment/-/vue-moment-4.1.0.tgz#092a8ff723a96c6f85a0a8e23ad30f0bf320f3b0"
-  integrity sha512-Gzisqpg82ItlrUyiD9d0Kfru+JorW2o4mQOH06lEDZNgxci0tv/fua1Hl0bo4DozDV2JK1r52Atn/8QVCu8qQw==
-  dependencies:
-    moment "^2.19.2"
-
 vue-password-strength-meter@^1.7.2:
   version "1.7.2"
   resolved "https://registry.npmmirror.com/vue-password-strength-meter/-/vue-password-strength-meter-1.7.2.tgz#ddaae2246fb8a53fd8cdc5b1084b1d16cc401505"