fixed: Fixed an issue where multiple selections across pages could not be reversed

fixed: Fixed + and - not being special characters

.github/workflows/jms-generic-action-handler.yml

@@ -10,3 +10,4 @@ jobs:
       - uses: jumpserver/action-generic-handler@master
         env:
           GITHUB_TOKEN: ${{ secrets.PRIVATE_TOKEN }}
+          I18N_TOKEN: ${{ secrets.I18N_TOKEN }}

package.json

@@ -34,6 +34,7 @@
     "css-color-function": "^1.3.3",
     "decimal.js": "^10.4.3",
     "deepmerge": "^4.2.2",
+    "dompurify": "^3.1.6",
     "echarts": "4.7.0",
     "element-ui": "2.13.2",
     "eslint-plugin-html": "^6.0.0",

src/components/Apps/AccountCreateUpdateForm/index.vue

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

src/components/Apps/AccountListTable/AccountList.vue

@@ -353,7 +353,7 @@ export default {
             name: 'BulkVerify',
             title: this.$t('accounts.BulkVerify'),
             type: 'primary',
-            fa: 'fa-handshake-o',
+            fa: 'fa-link',
             can: ({ selectedRows }) => {
               return selectedRows.length > 0 &&
                   ['clickhouse', 'redis', 'website', 'chatgpt'].indexOf(selectedRows[0].asset.type.value) === -1 &&

src/components/Apps/AccountListTable/ViewSecret.vue

@@ -83,6 +83,10 @@ export default {
       type: String,
       default: ''
     },
+    type: {
+      type: String,
+      default: 'account'
+    },
     title: {
       type: String,
       default: function() {
@@ -136,7 +140,8 @@ export default {
         name: this.secretInfo.name,
         secret: encryptPassword(this.modifiedSecret)
       }
-      this.$axios.patch(`/api/v1/accounts/accounts/${this.account.id}/`, params).then(() => {
+      const url = this.type === 'account' ? `/api/v1/accounts/accounts` : `/api/v1/accounts/account-templates`
+      this.$axios.patch(`${url}/${this.account.id}/`, params).then(() => {
         this.$message.success(this.$tc('common.updateSuccessMsg'))
       })
     },

src/components/Apps/AssetSelect/dialog.vue

@@ -1,6 +1,7 @@
 <template>
   <Dialog
     :close-on-click-modal="false"
+    :loading-status="!isLoaded"
     :title="$tc('assets.Assets')"
     custom-class="asset-select-dialog"
     top="2vh"
@@ -21,6 +22,7 @@
       :tree-setting="treeSetting"
       class="tree-table"
       v-bind="$attrs"
+      @loaded="handleTableLoaded"
     />
   </Dialog>
 </template>
@@ -63,6 +65,7 @@ export default {
   data() {
     const vm = this
     return {
+      isLoaded: false,
       dialogVisible: false,
       rowSelected: _.cloneDeep(this.value) || [],
       rowsAdd: [],
@@ -143,6 +146,9 @@ export default {
       if (selectValueIndex > -1) {
         this.rowSelected.splice(selectValueIndex, 1)
       }
+    },
+    handleTableLoaded() {
+      this.isLoaded = true
     }
   }
 }

src/components/Apps/AssetSelect/index.vue

@@ -28,7 +28,6 @@
 <script>
 import Select2 from '@/components/Form/FormFields/Select2.vue'
 import AssetSelectDialog from './dialog.vue'
-import { b } from 'css-color-function/lib/adjusters'
 
 export default {
   componentName: 'AssetSelect',
@@ -81,7 +80,6 @@ export default {
     }
   },
   methods: {
-    b,
     handleFocus() {
       this.$refs.select2.selectRef.blur()
       this.dialogVisible = true

src/components/Apps/AssetTreeTable/index.vue

@@ -31,6 +31,10 @@ export default {
       type: String,
       default: '/api/v1/assets/assets/'
     },
+    typeUrl: {
+      type: String,
+      default: '/api/v1/assets/nodes/category/tree/'
+    },
     nodeUrl: {
       type: String,
       default: '/api/v1/assets/nodes/'
@@ -101,9 +105,9 @@ export default {
               showAssets: false,
               showSearch: false,
               customTreeHeaderName: this.$t('assets.BuiltinTree'),
-              url: '/api/v1/assets/nodes/category/tree/',
+              url: this.typeUrl,
               nodeUrl: this.treeSetting?.nodeUrl || this.nodeUrl,
-              treeUrl: `/api/v1/assets/nodes/category/tree/?assets=${showAssets ? '1' : '0'}&count_resource=${this.treeSetting.countResource || 'asset'}`,
+              treeUrl: `${this.typeUrl}?assets=${showAssets ? '1' : '0'}&count_resource=${this.treeSetting.countResource || 'asset'}`,
               callback: {
                 onSelected: (event, treeNode) => this.getAssetsUrl(treeNode)
               }

src/components/Apps/UserConfirmDialog/index.vue

@@ -82,6 +82,7 @@
 </template>
 <script>
 import Dialog from '@/components/Dialog/index.vue'
+import { encryptPassword } from '@/utils/crypto'
 
 export default {
   name: 'UserConfirmDialog',
@@ -199,7 +200,7 @@ export default {
       const data = {
         confirm_type: this.confirmTypeRequired,
         mfa_type: this.confirmTypeRequired === 'mfa' ? this.subTypeSelected : '',
-        secret_key: this.secretValue
+        secret_key: this.confirmTypeRequired === 'password' ? encryptPassword(this.secretValue) : this.secretValue
       }
       this.$axios.post(`/api/v1/authentication/confirm/`, data).then(res => {
         this.callback()

src/components/Cards/DetailCard/auto.vue

@@ -106,16 +106,28 @@ export default {
 
         if (Array.isArray(value)) {
           if (typeof value[0] === 'object') {
-            value.forEach(item => {
+            const firstValue = value[0]
-              const fieldName = `${name}.${item.name}`
+            if (firstValue.hasOwnProperty('name')) {
-              if (excludes.includes(fieldName)) {
+              value.forEach(item => {
-                return
+                const fieldName = `${name}.${item.name}`
-              }
+                if (excludes.includes(fieldName)) {
-              this.items.push({
+                  return
-                key: item.label,
+                }
-                value: item.value
+                this.items.push({
+                  key: item.label,
+                  value: item.value
+                })
               })
-            })
+            } else {
+              value.forEach((item, index) => {
+                const v = Object.entries(item).map(([key, value]) => `${key}:${value}`).join(', ')
+                const data = { value: v }
+                if (index === 0) {
+                  data['key'] = label
+                }
+                this.items.push(data)
+              })
+            }
           } else if (typeof value[0] === 'string') {
             value.forEach((item, index) => {
               let data = {}

src/components/Dialog/index.vue

@@ -9,11 +9,13 @@
     v-bind="$attrs"
     v-on="$listeners"
   >
-    <slot />
+    <div v-loading="loadingStatus">
+      <slot />
+    </div>
     <div slot="footer" class="dialog-footer">
       <slot name="footer">
         <el-button v-if="showCancel && showButtons" @click="onCancel">{{ cancelTitle }}</el-button>
-        <el-button v-if="showConfirm && showButtons" :loading="loadingStatus" type="primary" @click="onConfirm">
+        <el-button v-if="showConfirm && showButtons" :disabled="loadingStatus" type="primary" @click="onConfirm">
           {{ confirmTitle }}
         </el-button>
       </slot>
@@ -71,13 +73,16 @@ export default {
     }
   },
   data() {
-    return {}
+    return {
+    }
   },
   computed: {
     iWidth() {
       return this.$store.getters.isMobile ? '1000px' : this.width
     }
   },
+  mounted() {
+  },
   methods: {
     onCancel() {
       this.$emit('cancel')

src/components/Form/AutoDataForm/utils.js

@@ -7,7 +7,6 @@ import BasicTree from '@/components/Form/FormFields/BasicTree.vue'
 import JsonEditor from '@/components/Form/FormFields/JsonEditor.vue'
 import { assignIfNot } from '@/utils/common'
 import TagInput from '@/components/Form/FormFields/TagInput.vue'
-import TransferSelect from '@/components/Form/FormFields/TransferSelect.vue'
 
 export class FormFieldGenerator {
   constructor(emit) {
@@ -134,9 +133,6 @@ export class FormFieldGenerator {
       case 'comment':
         field.el.type = 'textarea'
         break
-      case 'users':
-        field.component = TransferSelect
-        field.el.label = field.label
     }
     return field
   }

src/components/Form/CronTab/components/Crontab-Min.vue

@@ -7,18 +7,11 @@
       </el-radio>
     </el-form-item>
 
-    <el-form-item>
-      <el-radio v-model="radioValue" :label="2">
-        {{ this.$t('common.CronTab.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('common.CronTab.min') }}
-      </el-radio>
-    </el-form-item>
-
     <el-form-item>
       <el-radio v-model="radioValue" :label="3">
         {{ this.$t('common.CronTab.from') }}
-        <el-input-number v-model="average02" :max="60" :min="1" size="mini" /> {{ this.$t('common.CronTab.min') }}{{ this.$t('common.CronTab.executeOnce') }}
+        <el-input-number v-model="average02" :max="60" :min="1" size="mini" />
+        {{ this.$t('common.CronTab.min') }}{{ this.$t('common.CronTab.executeOnce') }}
       </el-radio>
     </el-form-item>
 
@@ -33,7 +26,7 @@
           size="small"
           style="width:100%"
         >
-          <el-option v-for="item in 60" :key="item" :value="item-1">{{ item-1 }}</el-option>
+          <el-option v-for="item in 60" :key="item" :value="item-1">{{ item - 1 }}</el-option>
         </el-select>
       </el-radio>
     </el-form-item>
@@ -158,7 +151,7 @@ export default {
 </script>
 
 <style scoped>
-	.el-form-item--small.el-form-item {
+.el-form-item--small.el-form-item {
-    margin-bottom: 10px;
+  margin-bottom: 10px;
-  }
+}
 </style>

src/components/Form/FormFields/Select2.vue

@@ -225,9 +225,6 @@ export default {
       handler(newValue, oldValue) {
       },
       deep: true
-    },
-    iOptions(val) {
-      this.remote = val.length !== 0
     }
   },
   async mounted() {

src/components/Form/FormFields/TransferSelect.vue

@@ -11,6 +11,7 @@
     />
     <Dialog
       v-if="showTransfer"
+      :loading-status="!isLoaded"
       :close-on-click-modal="false"
       :title="label"
       :visible.sync="showTransfer"
@@ -18,6 +19,7 @@
       width="730px"
       @cancel="handleTransCancel"
       @confirm="handleTransConfirm"
+      v-on="$listeners"
     >
       <krryPaging v-if="selectInitialized" ref="pageTransfer" class="transfer" v-bind="pagingTransfer" />
     </Dialog>
@@ -77,13 +79,16 @@ export default {
       if (keyword) {
         params['search'] = keyword
       }
+      this.isLoaded = false
       const data = await this.$axios.get(url, { params })
+      this.isLoaded = true
       return data['results'].map(item => {
         const n = transformOption(item)
         return { id: n.value, label: n.label }
       })
     }
     return {
+      isLoaded: false,
       showTransfer: false,
       selectInitialized: false,
       select2: {
@@ -166,7 +171,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-
-</style>

src/components/Form/FormFields/UserPassword.vue

@@ -42,7 +42,7 @@ export default {
         patterns.push([/\d/, i18n.t('common.password.NUMBER_REQUIRED')])
       }
       if (passwordRule['SECURITY_PASSWORD_SPECIAL_CHAR']) {
-        const pattern = new RegExp("[`~!@#$^&*()=|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“'。，、？]")
+        const pattern = new RegExp("[`~!@#$^&*()=|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“'。，、？_+-]")
         patterns.push([pattern, i18n.t('common.password.SPECIAL_CHAR_REQUIRED')])
       }
       for (const [pattern, msg] of patterns) {

src/components/Libs/Krry/cascader/models/container.vue

@@ -53,27 +53,34 @@ export default {
   },
   props: {
     boxTitle: {
-      type: Array
+      type: Array,
+      default: () => []
     },
     boxOperation: {
-      type: Array
+      type: Array,
+      default: () => []
     },
     // 地域数据
     dataObj: {
-      type: Object
+      type: Object,
+      default: () => {}
     },
     // 已选数据
     selectedData: {
-      type: Array
+      type: Array,
+      default: () => []
     },
     onChangeSelected: {
-      type: Function
+      type: Function,
+      default: () => () => {}
     },
     filterable: {
-      type: Boolean
+      type: Boolean,
+      default: () => false
     },
     filterPlaceholder: {
-      type: String
+      type: String,
+      default: () => ''
     }
   },
   data() {

src/components/Libs/Krry/cascader/models/models/box.vue

@@ -46,7 +46,7 @@
     <div class="vip-footer">
       <el-button
         type="text"
-        :disabled="selectedDistrict.length > 0 ? false : true"
+        :disabled="selectedDistrict.length<=0"
         size="small"
         round
         @click="checkedSelected"
@@ -62,23 +62,29 @@ export default {
   components: {},
   props: {
     title: {
-      type: String
+      type: String,
+      default: () => ''
     },
     operation: {
-      type: String
+      type: String,
+      default: () => ''
     },
     operateId: {
-      type: Number
+      type: Number,
+      default: () => 0
     },
     // 区域数据
     districtList: {
-      type: Array
+      type: Array,
+      default: () => []
     },
     filterable: {
-      type: Boolean
+      type: Boolean,
+      default: () => false
     },
     filterPlaceholder: {
-      type: String
+      type: String,
+      default: () => ''
     }
   },
   data() {

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

@@ -34,12 +34,14 @@ 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()
   }
@@ -50,12 +52,12 @@ class StrategyNormal extends StrategyAbstract {
  */
 class StrategyPersistSelection extends StrategyAbstract {
   /**
-   * el-table的selection-change事件不适用于开启跨页保存的情况。
+   * el-table 的 selection-change 事件不适用于开启跨页保存的情况。
-   * 比如，当开启persistSelection时，发生以下两个场景：
+   * 比如，当开启 persistSelection时，发生以下两个场景：
    * 1. 用户点击翻页
    * 2. 用户点击行首的切换全选项按钮，清空当前页多选项数据
-   * 其中场景1应该保持selected不变；而场景2只应该从selected移除当前页所有行，保留其他页面的多选状态。
+   * 其中场景 1 应该保持 selected 不变；而场景 2 只应该从 selected 移除当前页所有行，保留其他页面的多选状态。
-   * 但el-table的selection-change事件在两个场景中无差别发生，所以这里不处理这个事件
+   * 但 el-table 的 selection-change 事件在两个场景中无差别发生，所以这里不处理这个事件
    */
 
   /**
@@ -63,13 +65,19 @@ class StrategyPersistSelection extends StrategyAbstract {
    */
   onSelect(selection, row) {
     const isChosen = selection.indexOf(row) > -1
+
     this.toggleRowSelection(row, isChosen)
   }
   /**
    * 用户切换当前页的多选
    */
   onSelectAll(selection, selectable = () => true) {
-    const isSelected = !!selection.length
+    // 获取当前所有已选择的项
+    const selectedRows = this.elDataTable.data.filter(r => selection.includes(r))
+
+    // 判断是否已全选
+    const isSelected = this.elDataTable.data.every(r => selectable(r) && selectedRows.includes(r))
+
     this.elDataTable.data.forEach(r => {
       if (selectable(r)) {
         this.toggleRowSelection(r, isSelected)
@@ -83,33 +91,42 @@ class StrategyPersistSelection extends StrategyAbstract {
   toggleRowSelection(row, isSelected) {
     const { id, selected } = this.elDataTable
     const foundIndex = selected.findIndex(r => r[id] === row[id])
+
     if (typeof isSelected === 'undefined') {
       isSelected = foundIndex <= -1
     }
+
     if (isSelected && foundIndex === -1) {
       selected.push(row)
     } else if (!isSelected && foundIndex > -1) {
       selected.splice(foundIndex, 1)
     }
+
     this.elDataTable.$emit('toggle-row-selection', isSelected, row)
     this.updateElTableSelection()
   }
+
   clearSelection() {
     this.elDataTable.selected = []
     this.updateElTableSelection()
   }
+
   /**
    * 将selected状态同步到el-table中
    */
   updateElTableSelection() {
     const { data, id, selected } = this.elDataTable
+
     // 历史勾选的行已经不在当前页了，所以要将当前页的行数据和selected合并
     const mergeData = _.uniqWith([...data, ...selected], _.isEqual)
+
     mergeData.forEach(r => {
       const isSelected = !!selected.find(r2 => r[id] === r2[id])
+
       if (!this.elTable) {
         return
       }
+
       this.elTable.toggleRowSelection(r, isSelected)
     })
   }

src/components/Table/DataTable/index.vue

@@ -153,6 +153,8 @@ export default {
           this.toggleRowSelection(row, true)
         }
       }
+
+      this.$emit('loaded')
     },
     handleSizeChange(val) {
       localStorage.setItem('paginationSize', val)

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

@@ -48,6 +48,7 @@
 import Dialog from '@/components/Dialog/index.vue'
 import { createSourceIdCache } from '@/api/common'
 import * as queryUtil from '@/components/Table/DataTable/compenents/el-data-table/utils/query'
+import { download } from '@/utils/common'
 
 export default {
   name: 'ExportDialog',
@@ -187,10 +188,7 @@ export default {
       })
     },
     downloadCsv(url) {
-      const a = document.createElement('a')
+      download(url)
-      a.href = url
-      a.click()
-      window.URL.revokeObjectURL(url)
     },
     async defaultPerformExport(selectRows, exportOption, q, exportTypeOption) {
       const url = (process.env.VUE_APP_ENV === 'production') ? (`${this.url}`) : (`${process.env.VUE_APP_BASE_API}${this.url}`)

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

@@ -68,7 +68,7 @@
 <script>
 import Dialog from '@/components/Dialog/index.vue'
 import ImportTable from '@/components/Table/ListTable/TableAction/ImportTable.vue'
-import { getErrorResponseMsg } from '@/utils/common'
+import { download, getErrorResponseMsg } from '@/utils/common'
 import { createSourceIdCache } from '@/api/common'
 
 export default {
@@ -221,10 +221,7 @@ export default {
       this.$message.success(msg)
     },
     downloadCsv(url) {
-      const a = document.createElement('a')
+      download(url)
-      a.href = url
-      a.click()
-      window.URL.revokeObjectURL(url)
     },
     async handleImportConfirm() {
       await this.$refs['importTable'].performUpload()

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-row>
+    <el-row type="flex" align="center">
       <el-col :md="8" :sm="24">
         <div class="tableFilter">
           <el-radio-group v-model="importStatusFilter" size="small">
@@ -11,7 +11,7 @@
           </el-radio-group>
         </div>
       </el-col>
-      <el-col :md="8" :sm="24" style="text-align: center">
+      <el-col :md="16" :sm="24" style="text-align: center; display: flex; align-items: center">
         <span class="summary-item summary-total"> {{ $t('common.Total') }}: {{ totalCount }}</span>
         <span class="summary-item summary-success"> {{ $t('common.Success') }}: {{ successCount }}</span>
         <span class="summary-item summary-failed"> {{ $t('common.Failed') }}: {{ failedCount }}</span>

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

@@ -122,6 +122,9 @@ export default {
       return this.hasLeftActions ? 'right' : 'left'
     }
   },
+  created() {
+    this.$emit('done')
+  },
   methods: {
     handleTagSearch(val) {
       this.searchTable(val)
@@ -144,119 +147,121 @@ export default {
 </script>
 
 <style lang='scss' scoped>
-  .table-header {
+.table-header {
-    /*display: flex;*/
+  /*display: flex;*/
-    /*flex-direction: row;*/
+  /*flex-direction: row;*/
-    /*justify-content: space-between;*/
+  /*justify-content: space-between;*/
-  }
+}
 
-  .right-side-item {
+.right-side-item {
-  }
+}
 
-  .right-side-actions >>> .el-button {
+.right-side-actions > > > .el-button {
-    border: none;
+  border: none;
-    padding: 5px;
+  padding: 5px;
-    font-size: 14px;
+  font-size: 14px;
-    width: 26px;
+  width: 26px;
-    height: 26px;
+  height: 26px;
-    color: #888;
+  color: #888;
-    background-color: transparent;
+  background-color: transparent;
-  }
+}
 
-  .right-side-actions >>> .fa {
+.right-side-actions > > > .fa {
-    height: 16px;
+  height: 16px;
-    width: 16px;
+  width: 16px;
-  }
+}
 
-  .right-side-actions >>> .el-button:hover {
+.right-side-actions > > > .el-button:hover {
-    background-color: rgb(0, 0, 0, 0.05);
+  background-color: rgb(0, 0, 0, 0.05);
-  }
+}
 
-  .action-search >>> .el-input__suffix i {
+.action-search > > > .el-input__suffix i {
-    font-weight: 500;
+  font-weight: 500;
-    color: #888;
+  color: #888;
-  }
+}
 
-  .action-search >>> .el-cascader {
+.action-search > > > .el-cascader {
-    line-height: 32px !important;
+  line-height: 32px !important;
-  }
+}
 
-  .right-side-actions {
+.right-side-actions {
-    display: flex;
+  display: flex;
-    padding-left: 10px;
+  padding-left: 10px;
-    align-items: center;
+  align-items: center;
-    justify-content: center;
+  justify-content: center;
-  }
+}
 
-  .table-action-right-side {
+.table-action-right-side {
-    display: flex;
+  display: flex;
-    justify-content: center;
+  justify-content: center;
-  }
+}
 
-  .export-item {
+.export-item {
-    display: block;
+  display: block;
-    padding: 5px 20px;
+  padding: 5px 20px;
-  }
+}
 
-  .datepicker {
+.datepicker {
-    margin-left: 10px;
+  margin-left: 10px;
-  }
+}
 
-  .table-header {
+.table-header {
-    line-height: 32px;
+  line-height: 32px;
-  }
+}
 
-  .left-side {
+.left-side {
-    float: left;
+  float: left;
-    display: block;
+  display: block;
-    &>>> .action-item.el-dropdown {
+
-      height: 33px;
+  & > > > .action-item.el-dropdown {
-      &> .el-button {
+    height: 33px;
-        height: 100%;
+
-      }
+    & > .el-button {
+      height: 100%;
     }
   }
+}
 
-  .right-side {
+.right-side {
-    float: right;
+  float: right;
-  }
+}
 
-  .search {
+.search {
-    display: flex;
+  display: flex;
-    flex-direction: row;
+  flex-direction: row;
-  }
+}
 
-  .mobile .search {
+.mobile .search {
-    display: inherit;
+  display: inherit;
-  }
+}
 
-  .mobile .search .datepicker {
+.mobile .search .datepicker {
-    margin-left: 0;
+  margin-left: 0;
-  }
+}
 
-  .search.left {
+.search.left {
-    float: left;
+  float: left;
-    padding: 0 !important;
+  padding: 0 !important;
-  }
+}
 
-  .search.right {
+.search.right {
-    float: right;
+  float: right;
-  }
+}
 
-  .mobile .search.right {
+.mobile .search.right {
-    float: none;
+  float: none;
-  }
+}
 
-  .mobile .search.right .action-search {
+.mobile .search.right .action-search {
-    width: 100%;
+  width: 100%;
-  }
+}
 
-  .mobile .right-side {
+.mobile .right-side {
-    padding-top: 5px;
+  padding-top: 5px;
-  }
+}
 
-  .filter-field.right-side-item.action-search {
+.filter-field.right-side-item.action-search {
-    height: 34px;
+  height: 34px;
-  }
+}
 
 </style>

src/components/Table/ListTable/index.vue

@@ -8,9 +8,11 @@
       :selected-rows="selectedRows"
       :table-url="tableUrl"
       v-bind="iHeaderActions"
+      @done="handleActionInitialDone"
     />
     <IBox class="table-content">
       <AutoDataTable
+        v-if="actionInit"
         ref="dataTable"
         :config="iTableConfig"
         :filter-table="filter"
@@ -73,7 +75,10 @@ export default {
     return {
       selectedRows: [],
       init: false,
-      extraQuery: extraQuery
+      isDeactivated: false,
+      extraQuery: extraQuery,
+      actionInit: this.headerActions.has === false,
+      initQuery: {}
     }
   },
   computed: {
@@ -166,14 +171,36 @@ export default {
     }
   },
   methods: {
+    handleActionInitialDone() {
+      setTimeout(() => {
+        this.actionInit = true
+      }, 100)
+    },
     handleSelectionChange(val) {
       this.selectedRows = val
     },
     reloadTable() {
       this.dataTable.getList()
     },
+    updateInitQuery(attrs) {
+      if (!this.actionInit) {
+        this.initQuery = attrs
+        for (const key in attrs) {
+          this.$set(this.extraQuery, key, attrs[key])
+        }
+        return true
+      }
+      const removeKeys = Object.keys(this.initQuery).filter(key => !attrs[key])
+      for (const key of removeKeys) {
+        this.$delete(this.extraQuery, key)
+      }
+    },
     search(attrs) {
       this.$log.debug('ListTable: search table', attrs)
+      const init = this.updateInitQuery(attrs)
+      if (init) {
+        return
+      }
       this.$emit('TagSearch', attrs)
       this.$refs.dataTable?.$refs.dataTable?.search(attrs, true)
     },

src/components/Table/TableFormatters/DateFormatter.vue

@@ -1,5 +1,5 @@
 <template>
-  <span>{{ value }}</span>
+  <span class="date">{{ dateValue }}</span>
 </template>
 
 <script>
@@ -10,24 +10,31 @@ export default {
   name: 'DateFormatter',
   extends: BaseFormatter,
   data() {
-    let value
+    // let value
-    if (this.cellValue) {
+    // if (this.cellValue) {
-      value = toSafeLocalDateStr(this.cellValue)
+    //   value = toSafeLocalDateStr(this.cellValue)
-    } else {
+    // } else {
-      value = '-'
+    //   value = '-'
-    }
+    // }
     // const locale = this.$i18n.locale
     // const value = dt.toLocaleString(locale, { hourCycle: 'h23' })
     // debug(this.$i18n.locale)
-    return {
+    // return {
-      value: value
+    //   value: value
-    }
+    // }
     // return {
     //   value: `${year}-${month}-${date} ${hour}:${minutes}:${seconds}`
     // }
+    return {}
+  },
+  computed: {
+    dateValue() {
+      if (this.cellValue) {
+        return toSafeLocalDateStr(this.cellValue)
+      } else {
+        return '-'
+      }
+    }
   }
 }
 </script>
-<style scoped>
-
-</style>

src/components/Table/TableFormatters/HostInfoFormatter.vue

@@ -64,7 +64,7 @@ export default {
         }
         return text
       }
-      return '-'
+      return this.items?.distribution || '-'
     }
   }
 }

src/components/Table/TableFormatters/LabelsFormatter.vue

@@ -27,7 +27,7 @@
     </a>
     <a
       v-if="formatterArgs.showEditBtn"
-      class="edit-btn"
+      :class="[{ 'disabled-link': this.$store.getters.currentOrgIsRoot },'edit-btn']"
       style="padding-left: 5px"
       @click="showDialog = true"
     >
@@ -269,4 +269,11 @@ export default {
 .tag-tip {
   margin-top: 10px;
 }
+
+.disabled-link {
+  pointer-events: none;
+  color: grey;
+  cursor: default;
+  text-decoration: none;
+}
 </style>

src/components/Tree/DataZTree/index.vue

@@ -39,7 +39,7 @@ export default {
           showRenameBtn: false,
           drag: {
             isCopy: false,
-            isMove: false
+            isMove: true
           }
         },
         callback: {

src/components/Widgets/MarkDown/index.vue

@@ -18,14 +18,15 @@
         />
       </el-col>
       <el-col v-show="isShow" :span="span">
-        <VueMarkdown class="result-html" :source="iValue" :show="true" :html="false" />
+        <VueMarkdown class="result-html" :source="sanitizedValue" :html="false" :show="true" />
       </el-col>
     </el-row>
-    <VueMarkdown v-else class="source" :source="iValue" :html="false" />
+    <VueMarkdown v-else class="source" :html="false" :source="sanitizedValue" />
   </div>
 </template>
 
 <script>
+import DOMPurify from 'dompurify'
 import VueMarkdown from 'vue-markdown'
 import 'github-markdown-css/github-markdown-light.css'
 
@@ -56,6 +57,17 @@ export default {
       iValue: this.value
     }
   },
+  computed: {
+    sanitizedValue() {
+      // 转义特殊字符
+      let content = this.iValue.replace(/\\/g, '\\\\').replace(/\$/g, '\\$')
+
+      // 使用 DOMPurify 进行 XSS 过滤
+      content = DOMPurify.sanitize(content)
+
+      return content
+    }
+  },
   mounted() {
     this.$nextTick(() => {
       this.resizeObserver = new ResizeObserver(entries => {

src/components/Widgets/Term/index.vue

@@ -48,6 +48,7 @@ export default {
         fontFamily: 'monaco, Consolas, "Lucida Console", monospace',
         lineHeight: 1.2,
         fontSize: 13,
+        scrollback: 9999999,
         rightClickSelectsWord: true,
         theme: {
           background: '#fff',
@@ -83,7 +84,7 @@ export default {
           callback: () => {
             this.xterm.selectAll()
             const text = this.xterm.getSelection()
-            const filename = `shortcut_cmd_${this.$route.query?.taskId}.log`
+            const filename = `${this.$route.query?.type}_${this.$route.query?.taskId}.log`
             downloadText(text, filename)
           }
         }

src/i18n/langs/en.json

@@ -721,6 +721,7 @@
     "BatchActivate": "Batch activate",
     "SyncSelected": "Sync selected",
     "bulkDeploy": "Bulk deploy",
+    "BulkVerify": "Bulk verify",
     "bulkDeleteErrorMsg": "Bulk delete failed: ",
     "bulkDeleteSuccessMsg": "Bulk delete success",
     "bulkRemoveErrorMsg": "Bulk remove failed: ",
@@ -1930,6 +1931,7 @@
     "CheckViewAcceptor": "View more acceptor",
     "Assignees": "Assignees",
     "Close": "Close",
+    "CancelTicket": "Cancel Ticket",
     "OpenStatus": "Open",
     "CloseStatus": "Close",
     "Comment": "Comment",
@@ -2135,7 +2137,8 @@
     "passwordWillExpiredSuffixMsg": " days.Please change your password as soon as possible.",
     "dateLastLogin": "Date last login",
     "AddAllMembersWarningMsg": "Are you sure you want to add all members?",
-    "disallowSelfUpdateFields": "Not allowed to modify the current fields oneself"
+    "disallowSelfUpdateFields": "Not allowed to modify the current fields oneself",
+    "GlobalDisableMfaMsg": "Global enforcement has been enabled"
   },
   "notifications": {
     "MessageType": "Message Type",
@@ -2271,6 +2274,8 @@
       "HostnameStrategy": "Used to produce the asset hostname. For example, 1. Instance name (instanceDemo)；2. Instance name and Partial IP (instanceDemo-250.1)",
       "IsAlwaysUpdate": "Keep assets up to date",
       "FullySynchronous": "Assets fully synchronized",
+      "ReleaseAssets": "Release assets",
+      "ReleaseAssetsHelpTips": "Whether to automatically delete assets synchronized through this task and released on the cloud at the end of the task",
       "AccountCreate": "Create account",
       "AccountList": "Account list",
       "AccountUpdate": "Update account",

src/i18n/langs/ja.json

@@ -717,6 +717,7 @@
     "SyncSuccessMsg": "同期に成功しました",
     "SyncSelected": "選択した同期",
     "bulkDeploy": "一括デプロイ",
+    "BulkVerify": "一括テスト",
     "bulkSyncErrorMsg": "一括同期に失敗しました:",
     "bulkDeleteErrorMsg": "一括削除に失敗しました:",
     "bulkDeleteSuccessMsg": "一括削除に成功しました",
@@ -1926,6 +1927,7 @@
     "Assignee": "処理者",
     "Assignees": "処理待ち",
     "Close": "閉じる",
+    "CancelTicket": "作業指示をキャンセルする",
     "OpenStatus": "オン",
     "CloseStatus": "閉じる",
     "Comment": "備考",
@@ -2124,7 +2126,8 @@
     "passwordWillExpiredPrefixMsg": "パスワードはまもなく",
     "passwordWillExpiredSuffixMsg": "期限が切れた後、できるだけ早くパスワードを変更してください。",
     "AddAllMembersWarningMsg": "すべてのメンバーを追加してもよろしいですか？",
-    "disallowSelfUpdateFields": "現在のフィールドを自分で変更することは許可されていません"
+    "disallowSelfUpdateFields": "現在のフィールドを自分で変更することは許可されていません",
+    "GlobalDisableMfaMsg": "グローバルでの強制が有効になっています"
   },
   "notifications": {
     "MessageType": "メッセージタイプ",
@@ -2267,6 +2270,8 @@
       "HostnameStrategy": "資産を生成するためにホスト名。例: 1. インスタンス名 (instanceDemo) 2.インスタンス名と一部IP (下位2桁) (instanceDemo-250.1)",
       "IsAlwaysUpdate": "資産は常に最新です",
       "FullySynchronous": "資産完全にシンクロします",
+      "ReleaseAssets": "資産の同期解放",
+      "ReleaseAssetsHelpTips": "タスクの終了時に、このタスクを介して同期され、クラウド上で解放された資産を自動的に削除するかどうか",
       "AccountCreate": "アカウントの作成",
       "AccountList": "アカウントリスト",
       "AccountUpdate": "アカウントの更新",
@@ -2425,4 +2430,4 @@
     "BindResource": "リソースを関連付ける",
     "SelectResource": "リソースを選択"
   }
-}
+}

src/i18n/langs/zh.json

@@ -771,6 +771,7 @@
     "BatchActivate": "批量激活",
     "SyncSelected": "同步所选",
     "bulkDeploy": "批量部署",
+    "BulkVerify": "批量测试",
     "bulkDeleteErrorMsg": "批量删除失败: ",
     "bulkDeleteSuccessMsg": "批量删除成功",
     "bulkRemoveErrorMsg": "批量移除失败: ",
@@ -1912,6 +1913,7 @@
     "Assignee": "处理人",
     "Assignees": "待处理人",
     "Close": "关闭",
+    "CancelTicket": "取消工单",
     "OpenStatus": "审批中",
     "CloseStatus": "已完成",
     "Comment": "备注",
@@ -2115,7 +2117,8 @@
     "passwordExpired": "密码过期了",
     "passwordWillExpiredPrefixMsg": "密码即将在 ",
     "passwordWillExpiredSuffixMsg": "天 后过期，请尽快修改您的密码。",
-    "disallowSelfUpdateFields": "不允许自己修改当前字段"
+    "disallowSelfUpdateFields": "不允许自己修改当前字段",
+    "GlobalDisableMfaMsg": "全局已强制开启"
   },
   "notifications": {
     "MessageType": "消息类型",
@@ -2186,6 +2189,8 @@
       "HostnameStrategy": "用于生成资产主机名。例如：1. 实例名称 (instanceDemo)；2. 实例名称和部分IP(后两位) (instanceDemo-250.1)",
       "IsAlwaysUpdate": "资产保持最新",
       "FullySynchronous": "资产完全同步",
+      "ReleaseAssets": "同步释放资产",
+      "ReleaseAssetsHelpTips": "是否在任务结束时，自动删除通过此任务同步下来且已经在云上释放的资产",
       "AccountCreate": "创建账户",
       "AccountList": "云账号",
       "AccountUpdate": "更新账户",

src/i18n/langs/zh_Hant.json

@@ -771,6 +771,7 @@
     "BatchActivate": "批次啟用",
     "SyncSelected": "同步所選",
     "bulkDeploy": "批次部署",
+    "BulkVerify": "批次測試",
     "bulkDeleteErrorMsg": "批次刪除失敗: ",
     "bulkDeleteSuccessMsg": "批次刪除成功",
     "bulkRemoveErrorMsg": "批次移除失敗: ",
@@ -1912,6 +1913,7 @@
     "Assignee": "處理人",
     "Assignees": "待處理人",
     "Close": "關閉",
+    "CancelTicket": "取消工單",
     "OpenStatus": "審批中",
     "CloseStatus": "已完成",
     "Comment": "備註",

src/layout/components/NavHeader/AccountDropdown.vue

@@ -61,7 +61,6 @@ export default {
           break
         case 'logout':
           this.logout()
-          window.location.href = `${process.env.VUE_APP_LOGOUT_PATH}?next=${this.$route.fullPath}`
           break
         case 'apiKey':
           this.$router.push('/profile/api-keys')
@@ -73,7 +72,12 @@ export default {
           this.$router.push('/profile/user/setting')
       }
     },
-    logout() {
+    async logout() {
+      const currentOrg = this.$store.getters.currentOrg
+      if (currentOrg.autoEnter) {
+        await this.$store.dispatch('users/setCurrentOrg', this.$store.getters.preOrg)
+      }
+      window.location.href = `${process.env.VUE_APP_LOGOUT_PATH}?next=${this.$route.fullPath}`
     }
   }
 }

src/store/modules/users.js

@@ -1,5 +1,7 @@
 import { getProfile as apiGetProfile, logout } from '@/api/users'
-import { getCurrentOrgLocal, getPreOrgLocal, getTokenFromCookie, saveCurrentOrgLocal, setPreOrgLocal } from '@/utils/auth'
+import {
+  getCurrentOrgLocal, getPreOrgLocal, getTokenFromCookie, saveCurrentOrgLocal, setPreOrgLocal
+} from '@/utils/auth'
 import orgUtil from '@/utils/org'
 import { resetRouter } from '@/router'
 import Vue from 'vue'
@@ -70,7 +72,7 @@ const mutations = {
   },
   SET_CURRENT_ORG(state, org) {
     // 系统组织和全局组织不设置成 Pre org
-    if (!state.currentOrg?.autoEnter) {
+    if (!state.currentOrg?.autoEnter && !state.currentOrg?.is_root) {
       state.preOrg = state.currentOrg
       setPreOrgLocal(state.username, state.currentOrg)
     }
@@ -142,7 +144,7 @@ const actions = {
     const systemOrg = {
       id: orgUtil.SYSTEM_ORG_ID,
       name: 'SystemSetting',
-      autoEnter: true
+      autoEnter: new Date().getTime()
     }
     commit('SET_CURRENT_ORG', systemOrg)
   },
@@ -157,7 +159,8 @@ const actions = {
     const globalOrg = {
       id: orgUtil.GLOBAL_ORG_ID,
       name: 'Global',
-      autoEnter: true
+      is_root: true,
+      autoEnter: new Date().getTime()
     }
     commit('SET_CURRENT_ORG', globalOrg)
   },

src/styles/ztree_icon.scss

@@ -92,6 +92,10 @@
     background: url('./icons/db2.png') no-repeat center left transparent;
   }
 
+  &.dameng_ico_docu {
+    background: url('./icons/dameng.png') no-repeat center left transparent;
+  }
+
   &.private_ico_docu {
     background: url('./icons/private.png') no-repeat center left transparent;
   }

src/utils/common.js

@@ -363,13 +363,19 @@ export function downloadText(content, filename) {
 }
 
 export function download(downloadUrl, filename) {
+  const iframe = document.createElement('iframe')
+  iframe.style.display = 'none'
+  document.body.appendChild(iframe)
   const a = document.createElement('a')
   a.href = downloadUrl
   if (filename) {
     a.download = filename
   }
+  iframe.contentWindow.document.body.appendChild(a)
   a.click()
-  window.URL.revokeObjectURL(downloadUrl)
+  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

@@ -8,6 +8,11 @@ export const GLOBAL_ORG_ID = '00000000-0000-0000-0000-000000000000'
 
 function getPropOrg() {
   const orgs = store.getters.usingOrgs
+  const preOrg = store.getters.preOrg || {}
+  const preFound = orgs.find((item) => item.id === preOrg.id)
+  if (preFound) {
+    return preFound
+  }
   const defaultOrg = orgs.find((item) => item.is_default)
   if (defaultOrg) {
     return defaultOrg
@@ -62,7 +67,7 @@ async function changeOrg(org, reload = true, vm = null) {
     }
   }
   location.hash = '#' + path
-  setTimeout(() => location.reload(), 400)
+  setTimeout(() => location.reload(), 500)
 }
 
 function hasCurrentOrgPermission() {

src/utils/startup.js

@@ -8,6 +8,7 @@ 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']
 
 function reject(msg) {
   return new Promise((resolve, reject) => reject(msg))
@@ -23,6 +24,9 @@ async function checkLogin({ to, from, next }) {
   } catch (e) {
     Vue.$log.error(e)
     const status = e.response.status
+    if (store.getters.currentOrg.autoEnter) {
+      await store.dispatch('users/setCurrentOrg', store.getters.preOrg)
+    }
     if (status === 401 || status === 403) {
       setTimeout(() => {
         window.location = process.env.VUE_APP_LOGIN_PATH
@@ -42,6 +46,10 @@ async function getPublicSetting({ to, from, next }, isOpen) {
 
 async function refreshCurrentOrg() {
   return orgs.getCurrentOrg().then(org => {
+    // Root 就不刷新本地的了, 会影响 autoEnter
+    if (autoEnterOrgs.indexOf(org.id) !== -1) {
+      return
+    }
     store.dispatch('users/setCurrentOrg', org)
   })
 }
@@ -60,9 +68,16 @@ async function changeCurrentOrgIfNeed({ to, from, next }) {
     Vue.$log.error('Current org is null or not a object: ', currentOrg)
     await orgUtil.change2PropOrg({ to, from, next })
   }
-  if (currentOrg.name === 'SystemSetting') {
+  const globalOrgPath = [
-    const preOrg = store.getters.preOrg
+    '/console/perms/login-acls/', '/console/users/roles/',
-    await orgUtil.changeOrg(preOrg)
+    '/console/perms/connect-method-acls/', '/settings/'
+  ]
+  if (autoEnterOrgs.indexOf(currentOrg.id) !== -1 && currentOrg.autoEnter) {
+    const delta = new Date().getTime() - currentOrg.autoEnter
+    const notNeedChange = globalOrgPath.find(path => to.path.indexOf(path) === 0)
+    if (!notNeedChange && delta > 3000) {
+      await orgUtil.change2PropOrg({ to, from, next })
+    }
     return
   }
   if (!orgUtil.hasCurrentOrgPermission()) {

src/views/accounts/AccountTemplate/AccountTemplateList.vue

@@ -6,6 +6,7 @@
       :account="account"
       :show-password-record="false"
       :url="secretUrl"
+      type="template"
       :visible.sync="showViewSecretDialog"
     />
   </div>
@@ -31,7 +32,7 @@ export default {
       tableConfig: {
         url: '/api/v1/accounts/account-templates/',
         columns: null,
-        columnsExclude: ['spec_info'],
+        columnsExclude: ['spec_info', 'password_rules', 'push_params'],
         columnsShow: {
           min: ['name', 'actions'],
           default: ['name', 'username', 'secret_type', 'has_secret', 'privileged', 'actions']

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

@@ -221,8 +221,7 @@ export default {
         url: `/api/v1/assets/assets/${this.object.id}/`,
         object: this.object,
         nested: 'spec_info',
-        showUndefine: true,
+        showUndefine: true
-        excludes: ['script']
       },
       customInfoConfig: {
         title: this.$t('common.CustomInfo'),

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

@@ -222,6 +222,30 @@ export default {
           getUrlQuery: false
         },
         extraMoreActions: [
+          {
+            name: 'BulkVerify',
+            title: this.$t('common.BulkVerify'),
+            type: 'primary',
+            icon: 'fa fa-link',
+            can: ({ selectedRows }) =>
+              this.$hasPerm('assets.test_assetconnectivity') &&
+              !this.$store.getters.currentOrgIsRoot &&
+              selectedRows.length > 0 &&
+              selectedRows[0].auto_config?.ansible_enabled &&
+              selectedRows[0].auto_config?.ping_enabled,
+            callback: function({ selectedRows }) {
+              const ids = selectedRows.map(v => {
+                return v.id
+              })
+              this.$axios.post(
+                '/api/v1/assets/assets/tasks/',
+                { action: 'test', assets: ids }).then(res => {
+                openTaskPage(res['task'])
+              }).catch(err => {
+                this.$message.error(this.$tc('common.bulkVerifyErrorMsg' + ' ' + err))
+              })
+            }.bind(this)
+          },
           {
             name: 'DeactiveSelected',
             title: this.$t('common.BatchDisable'),

src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue

@@ -26,7 +26,7 @@ export default {
         [this.$t('xpack.Cloud.CloudSource'), ['account', 'regions']],
         [this.$t('xpack.Cloud.SaveSetting'), [
           'hostname_strategy', 'ip_network_segment_group',
-          'sync_ip_type', 'is_always_update', 'fully_synchronous'
+          'sync_ip_type', 'is_always_update', 'fully_synchronous', 'release_assets'
         ]],
         [this.$t('xpack.Cloud.SyncStrategy'), ['strategy']],
         [this.$t('xpack.Timer'), ['is_periodic', 'crontab', 'interval']],
@@ -68,6 +68,11 @@ export default {
           label: this.$t('xpack.Cloud.FullySynchronous'),
           helpTips: this.$t('xpack.Cloud.FullySynchronousHelpTips')
         },
+        release_assets: {
+          type: 'switch',
+          label: this.$t('xpack.Cloud.ReleaseAssets'),
+          helpTips: this.$t('xpack.Cloud.ReleaseAssetsHelpTips')
+        },
         regions: {
           component: Select2,
           el: {

src/views/assets/Platform/AutomationParamsSetting.vue

@@ -10,13 +10,11 @@
       @click="onSetting"
     />
     <Dialog
-      v-if="isVisible"
       width="60%"
       :visible.sync="isVisible"
       :title="title"
       :show-cancel="false"
       :show-confirm="false"
-      :destroy-on-close="true"
       @close="onDialogClose"
     >
       <AutoDataForm
@@ -34,7 +32,7 @@
 <script>
 import Dialog from '../../../components/Dialog'
 import AutoDataForm from '../../../components/Form/AutoDataForm'
-import { DynamicInput } from '../../../components/Form/FormFields'
+import { DynamicInput, Switcher } from '../../../components/Form/FormFields'
 
 export default {
   components: {
@@ -147,6 +145,9 @@ export default {
             case 'list':
               component = DynamicInput
               break
+            case 'boolean':
+              component = Switcher
+              break
           }
 
           if (param) {

src/views/dashboard/Audit/RightSummary.vue

@@ -100,7 +100,7 @@ export default {
       this.data.total_count_job_logs = data?.total_count_job_logs
       this.data.total_count_job_logs_running = data?.total_count_job_logs_running
       this.data.total_count_job_logs_failed = data?.total_count_job_logs_failed
-      if (totalCountSession.length > 1) {
+      if (totalCountSession.length > 0) {
         this.chartConfig.secondaryData = totalCountSession
       }
     }

src/views/dashboard/Console/UserAssetActivity.vue

@@ -16,8 +16,7 @@ export default {
     Title,
     LineChart
   },
-  props: {
+  props: {},
-  },
   data() {
     return {
       loading: false,
@@ -48,10 +47,10 @@ export default {
       const activeUsers = data?.dates_metrics_total_count_active_users
       const activeAssets = data?.dates_metrics_total_count_active_assets
       this.lineChartConfig.datesMetrics = data.dates_metrics_date
-      if (activeUsers.length > 1) {
+      if (activeUsers.length > 0) {
         this.lineChartConfig.primaryData = activeUsers
       }
-      if (activeAssets.length > 1) {
+      if (activeAssets.length > 0) {
         this.lineChartConfig.secondaryData = activeAssets
       }
     }
@@ -64,6 +63,7 @@ export default {
   margin-top: 16px;
   padding: 20px;
   background: #fff;
+
   .head {
     display: flex;
     justify-content: space-between;

src/views/dashboard/components/ProgressChart.vue

@@ -128,7 +128,8 @@ export default {
               tip += current.label + '：' + current.total + '<br/>'
             }
             return tip
-          }
+          },
+          appendToBody: true
         },
         grid: {
           top: '60%',

src/views/dashboard/components/RealTimeSummary.vue

@@ -66,7 +66,16 @@ export default {
   },
   methods: {
     async getResourcesCount() {
-      return this.$axios.get('/api/v1/index/?total_count=1')
+      return this.$axios.get(
+        '/api/v1/index/',
+        {
+          params: {
+            total_count_online_sessions: 1,
+            total_count_online_users: 1,
+            total_count_today_failed_sessions: 1
+          }
+        }
+      )
     }
   }
 }

src/views/ops/File/index.vue

@@ -119,7 +119,7 @@
 import { TreeTable } from '@/components'
 import Term from '@/components/Widgets/Term'
 import Page from '@/layout/components/Page'
-import { createJob, getJob, getTaskDetail, JobUploadFile } from '@/api/ops'
+import { createJob, getTaskDetail, JobUploadFile } from '@/api/ops'
 import { formatFileSize } from '@/utils/common'
 import store from '@/store'
 
@@ -230,28 +230,9 @@ export default {
   },
   mounted() {
     this.enableWS()
-    this.initData()
   },
   methods: {
     formatFileSize,
-    async initData() {
-      this.recoverStatus()
-    },
-    recoverStatus() {
-      if (this.$route.query.taskId) {
-        this.currentTaskId = this.$route.query.taskId
-        getTaskDetail(this.currentTaskId).then(data => {
-          getJob(data.job_id).then(res => {
-            this.runAsInput.value = res.runas
-            this.runAsInput.callback(res.runas)
-            this.executionInfo.status = data['status']
-            this.executionInfo.timeCost = data['time_cost']
-            this.setCostTimeInterval()
-            this.writeExecutionOutput()
-          })
-        })
-      }
-    },
     enableWS() {
       const scheme = document.location.protocol === 'https:' ? 'wss' : 'ws'
       const port = document.location.port ? ':' + document.location.port : ''
@@ -281,7 +262,7 @@ export default {
       }
     },
     taskStatusStat(summary) {
-      const { ok, failures, dark, excludes, skipped } = summary
+      const { ok = [], failures = [], dark = [], excludes = [], skipped = [] } = summary
 
       const failedKeys = Object.keys(failures)
       const darkKeys = Object.keys(dark)
@@ -439,6 +420,7 @@ export default {
           this.executionInfo.timeCost = 0
           this.executionInfo.status = 'running'
           this.currentTaskId = res.task_id
+          this.$router.replace({ query: { taskId: this.currentTaskId, type: 'file_upload' }})
           this.setCostTimeInterval()
           this.writeExecutionOutput()
         }).catch(() => {

src/views/ops/Job/JobUpdateCreate.vue

@@ -98,6 +98,7 @@ export default {
           el: {
             baseUrl: '/api/v1/perms/users/self/assets/',
             baseNodeUrl: '/api/v1/perms/users/self/nodes/',
+            typeUrl: '/api/v1/perms/users/self/nodes/children-with-assets/category/tree',
             value: []
           }
         },

src/views/ops/Job/QuickJob.vue

@@ -446,7 +446,7 @@ export default {
         this.executionInfo.timeCost = 0
         this.executionInfo.status = 'running'
         this.currentTaskId = res.task_id
-        this.$router.replace({ query: { taskId: this.currentTaskId }})
+        this.$router.replace({ query: { taskId: this.currentTaskId, type: 'shortcut_cmd' }})
         this.setCostTimeInterval()
         this.writeExecutionOutput()
         this.setBtn()
@@ -455,7 +455,7 @@ export default {
     stop() {
       StopJob({ task_id: this.currentTaskId }).then(() => {
         this.xterm.write('\x1b[31m' +
-            this.$tc('ops.StopLogOutput').replace('currentTaskId', this.currentTaskId) + '\x1b[0m')
+          this.$tc('ops.StopLogOutput').replace('currentTaskId', this.currentTaskId) + '\x1b[0m')
         this.xterm.write(this.wrapperError(''))
         this.getTaskStatus()
       }).catch((e) => {

src/views/perms/AssetPermission/AssetPermissionList.vue

@@ -105,6 +105,7 @@ export default {
             formatter: AmountFormatter,
             formatterArgs: {
               async: true,
+              cellValueToRemove: ['@SPEC'],
               routeQuery: {
                 activeTab: 'AssetPermissionUser'
               }

src/views/profile/ProfileImprovement.vue

@@ -41,7 +41,7 @@ export default {
           component: PhoneInput
         },
         mfa_level: {
-          hidden: (formValue) => {
+          disabled: (formValue) => {
             return formValue.mfa_level === 2
           },
           helpText: this.$t('users.HelpText.MFAOfUserFirstLoginPersonalInformationImprovementPage')
@@ -90,8 +90,7 @@ export default {
       }
     }
   },
-  methods: {
+  methods: {}
-  }
 }
 </script>
 

src/views/profile/ProfileInfo.vue

@@ -143,7 +143,7 @@ export default {
           },
           callbacks: {
             click: function() {
-              window.location.href = `/core/auth/profile/mfa/`
+              window.open('/core/auth/profile/mfa/', '_blank')
             }
           }
         },

src/views/sessions/CommandList/BaseList.vue

@@ -22,6 +22,7 @@ import isFalsey from '@/components/Table/DataTable/compenents/el-data-table/util
 import deepmerge from 'deepmerge'
 import * as queryUtil from '@/components/Table/DataTable/compenents/el-data-table/utils/query'
 import { createSourceIdCache } from '@/api/common'
+import { download } from '@/utils/common'
 
 export default {
   name: 'CommandList',
@@ -144,10 +145,7 @@ export default {
               queryUtil.stringify(query, '=', '&')
             url = url + queryStr
             this.$log.debug('Export url: ', this.url, '=>', url)
-            const a = document.createElement('a')
+            download(url + queryStr)
-            a.href = url
-            a.click()
-            window.URL.revokeObjectURL(url + queryStr)
           }
         }
       },

src/views/settings/Msg/Email/index.vue

@@ -55,8 +55,7 @@ export default {
       fieldsMeta: {
         EMAIL_HOST_USER: {
           rules: [
-            rules.EmailCheck,
+            rules.EmailCheck
-            rules.Required
           ]
         },
         EMAIL_FROM: {

src/views/settings/Org/OrganizationCreateUpdate.vue

@@ -12,25 +12,24 @@ export default {
   data() {
     return {
       config: {
-        initial: {
+        initial: {},
-        },
         url: '/api/v1/orgs/orgs/',
         fields: [
           ['', ['name', 'comment']]
         ],
         hasSaveContinue: false,
-        fieldsMeta: {
+        fieldsMeta: {},
-        },
         onPerformSuccess(res, method) {
+          const order_params = { params: { order: '-date_created' }}
           switch (method) {
             case 'post':
               this.$store.dispatch('users/addAdminOrg', { id: res.id, name: res.name })
               this.$message.success(this.$tc('common.createSuccessMsg'))
-              return this.$router.push({ name: 'OrganizationList' })
+              return this.$router.push({ name: 'OrganizationList', ...order_params })
             case 'put':
               this.$store.dispatch('users/modifyOrg', { id: res.id, name: res.name })
               this.$message.success(this.$tc('common.updateSuccessMsg'))
-              return this.$router.push({ name: 'OrganizationList' })
+              return this.$router.push({ name: 'OrganizationList', ...order_params })
           }
         }
       }

src/views/settings/Storage/CommandStorageCreateUpdate.vue

@@ -19,7 +19,7 @@ export default {
   data() {
     const commandType = this.$route.query.type || 'es'
     return {
-      successUrl: { name: 'TerminalSetting', params: { activeMenu: 'CommandStorage' }},
+      successUrl: { name: 'Storage', params: { activeMenu: 'CommandStorage' }},
       initial: {
         type: commandType,
         doc_type: 'command',

src/views/tickets/BaseTicketList.vue

@@ -137,6 +137,14 @@ export default {
         canCreate: this.$hasPerm('tickets.view_ticket'),
         hasBulkDelete: false,
         searchConfig: {
+          default: {
+            state: {
+              key: 'state',
+              label: this.$t('tickets.action'),
+              value: 'pending',
+              valueLabel: this.$t('common.Open')
+            }
+          },
           exclude: ['id', 'title', 'type', 'applicant'],
           options: [
             {
@@ -180,7 +188,7 @@ export default {
             },
             {
               value: 'relevant_command',
-              label: this.$t('tickets.RelevantSystemUser')
+              label: this.$t('tickets.ApplyRunCommand')
             }
           ]
         },

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

@@ -44,7 +44,7 @@
             <BasicTree
               v-model="requestForm.actions"
               :tree="treeNodes"
-              style="width: 30% !important"
+              style="width: 100%"
             />
 
           </el-form-item>

src/views/tickets/TicketFlow/FlowRuleField.vue

@@ -48,7 +48,12 @@ export default {
         }
       ],
       select2Option: {
-        url: '/api/v1/users/users/?oid=root'
+        url: '/api/v1/users/users/?oid=root',
+        ajax: {
+          transformOption: (item) => {
+            return { label: item.name + '(' + item.username + ')', value: item.id }
+          }
+        }
       },
       fields: [
       ]

src/views/tickets/components/Comments.vue

@@ -27,7 +27,7 @@
       <el-form-item style="float: right">
         <template v-if="hasActionPerm">
           <el-button
-            :disabled="object.status.value === 'closed'"
+            :disabled="isDisabled || object.status.value === 'closed'"
             size="small"
             type="primary"
             @click="handleApprove"
@@ -35,7 +35,7 @@
             <i class="fa fa-check" /> {{ $t('tickets.Accept') }}
           </el-button>
           <el-button
-            :disabled="object.status.value === 'closed'"
+            :disabled="isDisabled || object.status.value === 'closed'"
             size="small"
             type="warning"
             @click="handleReject"
@@ -45,12 +45,12 @@
         </template>
         <el-button
           v-if="isSelfTicket"
-          :disabled="object.status.value === 'closed'"
+          :disabled="isDisabled || object.status.value === 'closed'"
           size="small"
           type="danger"
           @click="handleClose"
         >
-          <i class="fa fa-times" /> {{ $t('tickets.Close') }}
+          <i class="fa fa-times" /> {{ $t('tickets.CancelTicket') }}
         </el-button>
         <el-button
           :disabled="object.status.value === 'closed'"
@@ -94,6 +94,7 @@ export default {
   },
   data() {
     return {
+      isDisabled: false,
       comments: '',
       type_api: '',
       imageUrl: require('@/assets/img/avatar.png'),
@@ -156,17 +157,35 @@ export default {
       this.createComment(function() {
       })
       const url = `/api/v1/tickets/${this.type_api}/${this.object.id}/approve/`
-      this.$axios.put(url).then(res => this.reloadPage()).catch(err => this.$message.error(err))
+      this.$axios.put(url).then(res => {
+        this.reloadPage()
+      }).catch(err => {
+        this.$message.error(err)
+      }).finally(() => {
+        this.isDisabled = false
+      })
     },
     defaultReject() {
       this.createComment(function() {
       })
       const url = `/api/v1/tickets/${this.type_api}/${this.object.id}/reject/`
-      this.$axios.put(url).then(res => this.reloadPage()).catch(err => this.$message.error(err))
+      this.$axios.put(url).then(res => {
+        this.reloadPage()
+      }).catch(err => {
+        this.$message.error(err)
+      }).finally(() => {
+        this.isDisabled = false
+      })
     },
     defaultClose() {
       const url = `/api/v1/tickets/${this.type_api}/${this.object.id}/close/`
-      this.$axios.put(url).then(res => this.reloadPage()).catch(err => this.$message.error(err))
+      this.$axios.put(url).then(res => {
+        this.reloadPage()
+      }).catch(err => {
+        this.$message.error(err)
+      }).finally(() => {
+        this.isDisabled = false
+      })
     },
     createComment(successCallback) {
       const commentText = this.form.comments
@@ -187,17 +206,42 @@ export default {
         }
       })
     },
+    handleAction(actionType) {
+      if (this.isDisabled) {
+        return
+      }
+
+      this.isDisabled = true
+      let handler
+      switch (actionType) {
+        case 'approve':
+          handler = this.approve || this.defaultApprove
+          break
+        case 'reject':
+          handler = this.reject || this.defaultReject
+          break
+        case 'close':
+          handler = this.close || this.defaultClose
+          break
+        default:
+          handler = null
+          break
+      }
+
+      if (handler) {
+        handler()
+      } else {
+        this.$message.error('No handler for action')
+      }
+    },
     handleApprove() {
-      const handler = this.approve || this.defaultApprove
+      this.handleAction('approve')
-      handler()
     },
     handleReject() {
-      const handler = this.reject || this.defaultReject
+      this.handleAction('reject')
-      handler()
     },
     handleClose() {
-      const handler = this.close || this.defaultClose
+      this.handleAction('close')
-      handler()
     },
     handleComment() {
       this.createComment(

src/views/users/Group/UserGroupCreateUpdate.vue

@@ -4,7 +4,6 @@
 
 <script>
 import { GenericCreateUpdatePage } from '@/layout/components'
-import TransSelect from '@/components/Form/FormFields/TransferSelect.vue'
 
 export default {
   components: {
@@ -23,7 +22,6 @@ export default {
         ],
         fieldsMeta: {
           users: {
-            component: TransSelect,
             el: {
               url: '/api/v1/users/users/?fields_size=mini&order=name',
               ajax: {
@@ -38,8 +36,7 @@ export default {
       }
     }
   },
-  methods: {
+  methods: {}
-  }
 }
 </script>
 

src/views/users/User/UserCreateUpdate.vue

@@ -8,6 +8,7 @@ import { PhoneInput, UserPassword } from '@/components/Form/FormFields'
 import rules from '@/components/Form/DataForm/rules'
 import { mapGetters } from 'vuex'
 import { Select2 } from '@/components'
+import store from '@/store'
 
 export default {
   components: {
@@ -40,6 +41,9 @@ export default {
             return this.$route.params.id || formValue.source !== 'local'
           }
         },
+        mfa_level: {
+          disabled: false
+        },
         email: {
           rules: [
             rules.EmailCheck,
@@ -148,8 +152,8 @@ export default {
           },
           hidden: () => {
             return !this.$store.getters.hasValidLicense ||
-              !this.$hasPerm('rbac.add_orgrolebinding') ||
+                !this.$hasPerm('rbac.add_orgrolebinding') ||
-              this.$store.getters.currentOrgIsRoot
+                this.$store.getters.currentOrgIsRoot
           },
           helpText: this.$t('users.HelpText.OrgRoleHelpText')
         },
@@ -212,6 +216,7 @@ export default {
       this.fieldsMeta.groups.el.disabled = true
     }
     await this.setDefaultRoles()
+    this.disableMFAFieldIfNeed(null)
     this.loading = false
   },
   methods: {
@@ -229,11 +234,21 @@ export default {
       if (this.$route.query.clone_from) {
         this.user.groups = []
       }
+      this.disableMFAFieldIfNeed(user)
     },
     async setDefaultRoles() {
       const roles = await this.$axios.get('/api/v1/rbac/roles/')
       this.initial.system_roles = roles.filter(role => role.name === 'User').map(role => role.id)
       this.initial.org_roles = roles.filter(role => role.name === 'OrgUser').map(role => role.id)
+    },
+    disableMFAFieldIfNeed(user) {
+      // SECURITY_MFA_AUTH 0 不开启 1 全局开启 2 管理员开启
+      const adminUserIsNeed = (user?.is_superuser || user?.is_org_admin) && this.$route.meta.action === 'update' &&
+          store.getters.publicSettings['SECURITY_MFA_AUTH'] === 2
+      if (store.getters.publicSettings['SECURITY_MFA_AUTH'] === 1 || adminUserIsNeed) {
+        this.fieldsMeta['mfa_level'].disabled = true
+        this.fieldsMeta['mfa_level'].helpText = this.$t('users.GlobalDisableMfaMsg')
+      }
     }
   }
 }

yarn.lock

@@ -4463,6 +4463,11 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.2.2, domhandler@^4.3.1:
   dependencies:
     domelementtype "^2.2.0"
 
+dompurify@^3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.6.tgz#43c714a94c6a7b8801850f82e756685300a027e2"
+  integrity sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ==
+
 domready@1.0.8:
   version "1.0.8"
   resolved "https://registry.npmmirror.com/domready/-/domready-1.0.8.tgz#91f252e597b65af77e745ae24dd0185d5e26d58c"
@@ -12079,7 +12084,7 @@ string-length@^2.0.0:
     astral-regex "^1.0.0"
     strip-ansi "^4.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
   version "4.2.3"
   resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -12097,6 +12102,15 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmmirror.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
@@ -12196,7 +12210,7 @@ stringify-package@^1.0.1:
   resolved "https://registry.npmmirror.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"
   integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -12224,6 +12238,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1, strip-ansi@^7.1.0:
   version "7.1.0"
   resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -13616,8 +13637,7 @@ worker-farm@^1.7.0:
   dependencies:
     errno "~0.1.7"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
-  name wrap-ansi-cjs
   version "7.0.0"
   resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -13652,6 +13672,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"