Merge pull request #5314 from jumpserver/dev

v4.10.15

src/components/Apps/AssetTreeTable/index.vue

@@ -20,7 +20,7 @@
 
 <script>
 import TreeTable from '../../Table/TreeTable/index.vue'
-import { setRouterQuery, setUrlParam } from '@/utils/common/index'
+import { getShowCurrentAssetValue, setRouterQuery, setUrlParam } from '@/utils/common/index'
 import $ from '@/utils/jquery-vendor'
 
 export default {
@@ -160,7 +160,7 @@ export default {
       return str
     },
     decorateRMenu() {
-      const show_current_asset = this.$cookie.get('show_current_asset') || '0'
+      const show_current_asset = getShowCurrentAssetValue(this.$cookie)
       if (show_current_asset === '1') {
         $('#m_show_asset_all_children_node').css('color', '#606266')
         $('#m_show_asset_only_current_node').css('color', 'green')
@@ -172,6 +172,7 @@ export default {
 
     getAssetsUrl(treeNode) {
       let url = this.treeSetting?.url || this.url
+      const showCurrentAsset = getShowCurrentAssetValue(this.$cookie)
 
       const setParam = (param, value, delay) => {
         setTimeout(() => {
@@ -183,10 +184,12 @@ export default {
         const nodeId = treeNode.meta.data.id
         setParam('node_id', nodeId)
         setParam('asset_id', '')
+        setParam('show_current_asset', showCurrentAsset)
       } else if (treeNode.meta.type === 'asset') {
         const assetId = treeNode.meta.data?.id || treeNode.id
         setParam('node_id', '')
         setParam('asset_id', assetId)
+        setParam('show_current_asset', showCurrentAsset)
       } else if (treeNode.meta.type === 'category') {
         setParam('category', treeNode.meta.category)
       } else if (treeNode.meta.type === 'type') {

src/components/Table/InfoCardTable/Panel.vue

@@ -185,6 +185,7 @@ div.info-panel {
           white-space: nowrap;
           width: 100%;
           margin: unset;
+          text-align: start;
         }
 
         .comment {
@@ -197,6 +198,7 @@ div.info-panel {
       ::v-deep {
         .el-avatar {
           background: #fff;
+          flex-shrink: 0;
         }
       }
     }

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

@@ -111,7 +111,7 @@ export default {
         {
           name: 'actionFilter',
           icon: 'filter',
-          tip: this.$t('Filter'),
+          tip: this.$t('QuickFilter'),
           has: this.hasQuickFilter,
           callback: this.handleFilterClick.bind(this)
         },

src/components/Table/TagSearch/index.vue

@@ -243,10 +243,12 @@ export default {
         delete routeFilter.search
       }
       const asFilterTags = _.cloneDeep(this.filterTags)
-      this.filterTags = {
+      setTimeout(() => {
-        ...asFilterTags,
+        this.filterTags = {
-        ...routeFilter
+          ...asFilterTags,
-      }
+          ...routeFilter
+        }
+      }, 100)
     },
     getValueLabel(key, value) {
       for (const field of this.options) {

src/components/Tree/AutoDataZTree/index.vue

@@ -26,6 +26,7 @@
 import DataZTree from '../DataZTree/index.vue'
 import Icon from '@/components/Widgets/Icon'
 import $ from '@/utils/jquery-vendor'
+import { getShowCurrentAssetValue } from '@/utils/common/index'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -199,7 +200,7 @@ export default {
     },
     // Request URL: http://localhost/api/v1/assets/assets/?node_id=ID&show_current_asset=null&draw=2&limit=15&offset=0&_=1587022917769
     onSelected: function(event, treeNode) {
-      const show_current_asset = this.$cookie.get('show_current_asset') || '0'
+      const show_current_asset = getShowCurrentAssetValue(this.$cookie)
       if (!this.setting.url) {
         return
       }

src/utils/common/index.js

@@ -150,10 +150,11 @@ export function getErrorResponseMsg(error) {
   } else if (typeof data === 'string') {
     return data
   } else if (_.isPlainObject(data)) {
-    return Object.values(data)
+    const msg = Object.values(data)
       .map(item => getErrorResponseMsg(item))
       .filter(i => i)
-      .join('; ')
+    // 错误信息不要重复提示
+    return [...new Set(msg)].join('; ')
   } else {
     msg = error.toString()
   }
@@ -423,6 +424,28 @@ export function getDrawerWidth() {
   return '90%'
 }
 
+export function getShowCurrentAssetValue(cookie, defaultValue = '0') {
+  const stored = typeof window !== 'undefined'
+    ? window.localStorage.getItem('show_current_asset')
+    : null
+  if (stored === '0' || stored === '1') {
+    return stored
+  }
+  if (cookie && typeof cookie.get === 'function') {
+    return cookie.get('show_current_asset') || defaultValue
+  }
+  return defaultValue
+}
+
+export function setShowCurrentAssetValue(cookie, value) {
+  if (typeof window !== 'undefined') {
+    window.localStorage.setItem('show_current_asset', String(value))
+  }
+  if (cookie && typeof cookie.set === 'function') {
+    cookie.set('show_current_asset', value, 1)
+  }
+}
+
 export class ObjectLocalStorage {
   constructor(key, attr) {
     this.key = key

src/utils/secure.js

@@ -92,7 +92,7 @@ export function encryptPassword(password) {
   rsaPublicKeyText = rsaPublicKeyText.replaceAll('"', '')
   const rsaPublicKey = atob(rsaPublicKeyText)
   const keyCipher = rsaEncrypt(aesKey, rsaPublicKey)
-  const passwordCipher = aesEncrypt(password, aesKey)
+  const passwordCipher = aesEncrypt(String(password), aesKey)
   return `${keyCipher}:${passwordCipher}`
 }
 

src/views/accounts/AccountChangeSecret/ExecutionDetail/AccountChangeSecretExecutionInfo.vue

@@ -38,11 +38,6 @@ export default {
           value: this.object.snapshot.node_amount
         },
         'trigger_display', 'date_start', 'date_finished',
-        {
-          key: this.$t('MailRecipient'),
-          value: this.object.recipients ? this.object.recipients.map(
-            i => `${i[0]}` + `${i[1] ? ': ' + this.$t('ContainAttachment') : ''}`).join(', ') : ''
-        },
         {
           key: this.$t('Comment'),
           value: this.object.snapshot.common

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

@@ -5,7 +5,12 @@
     </el-alert>
     <TwoCol>
       <template>
-        <GenericListTable ref="listTable" :header-actions="headerActions" :table-config="tableConfig" />
+        <GenericListTable
+          ref="listTable"
+          :detail-drawer="detailDrawer"
+          :header-actions="headerActions"
+          :table-config="tableConfig"
+        />
       </template>
       <template #right>
         <QuickActions :actions="quickActions" type="primary" />
@@ -21,12 +26,13 @@
 </template>
 
 <script>
-import GenericListTable from '@/layout/components/GenericListTable'
 import { QuickActions } from '@/components'
-import { ActionsFormatter, DetailFormatter } from '@/components/Table/TableFormatters'
-import ViewSecret from '@/components/Apps/AccountListTable/ViewSecret'
 import { openTaskPage } from '@/utils/jms/index'
+import { GenericListTable } from '@/layout/components'
+import { ActionsFormatter, DetailFormatter } from '@/components/Table/TableFormatters'
+
 import TwoCol from '@/layout/components/Page/TwoColPage.vue'
+import ViewSecret from '@/components/Apps/AccountListTable/ViewSecret'
 
 export default {
   name: 'AccountTemplateChangeSecret',
@@ -46,6 +52,7 @@ export default {
   data() {
     const vm = this
     return {
+      detailDrawer: () => import('@/views/accounts/AccountDiscover/TaskDetail/index.vue'),
       visible: false,
       secretUrl: '',
       showViewSecretDialog: false,
@@ -58,20 +65,20 @@ export default {
           },
           callbacks: Object.freeze({
             click: () => {
-              this.$axios.patch(
+              this.$axios
-                `/api/v1/accounts/account-templates/${this.object.id}/sync-related-accounts/`
+                .patch(
-              ).then(res => {
+                  `/api/v1/accounts/account-templates/${this.object.id}/sync-related-accounts/`
-                openTaskPage(res['task'])
+                )
-              })
+                .then(res => {
+                  openTaskPage(res['task'])
+                })
             }
           })
         }
       ],
       tableConfig: {
         url: `/api/v1/accounts/accounts/?source_id=${this.object.id}`,
-        columns: [
+        columns: ['name', 'asset', 'secret_type', 'is_active', 'date_created'],
-          'name', 'asset', 'secret_type', 'is_active', 'date_created'
-        ],
         columnsMeta: {
           name: {
             formatter: DetailFormatter,
@@ -79,8 +86,9 @@ export default {
               drawer: true,
               can: vm.$hasPerm('accounts.view_account'),
               getRoute: ({ row }) => {
+                this.detailDrawer = () => import('@/views/accounts/Account/AccountDetail/index.vue')
                 return {
-                  name: 'AssetAccountDetail',
+                  name: 'AccountDetail',
                   params: { id: row.id }
                 }
               }
@@ -94,6 +102,7 @@ export default {
               can: vm.$hasPerm('assets.view_asset'),
               getTitle: ({ row }) => row.asset.name,
               getRoute: ({ row }) => {
+                this.detailDrawer = () => import('@/views/assets/Asset/AssetDetail')
                 return {
                   name: 'AssetDetail',
                   params: { id: row.asset.id }

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

@@ -28,7 +28,12 @@ import { mapGetters } from 'vuex'
 import TreeMenu from './components/TreeMenu'
 import BaseList from './components/BaseList'
 import $ from '@/utils/jquery-vendor'
-import { setRouterQuery, setUrlParam } from '@/utils/common/index'
+import {
+  getShowCurrentAssetValue,
+  setShowCurrentAssetValue,
+  setRouterQuery,
+  setUrlParam
+} from '@/utils/common/index'
 
 export default {
   components: {
@@ -73,7 +78,7 @@ export default {
   },
   methods: {
     decorateRMenu() {
-      const show_current_asset = this.$cookie.get('show_current_asset') || '0'
+      const show_current_asset = getShowCurrentAssetValue(this.$cookie)
       if (show_current_asset === '1') {
         $('#m_show_asset_all_children_node').css('color', '#606266')
         $('#m_show_asset_only_current_node').css('color', 'green')
@@ -83,7 +88,7 @@ export default {
       }
     },
     showAll({ node, showCurrentAsset }) {
-      this.$cookie.set('show_current_asset', showCurrentAsset, 1)
+      setShowCurrentAssetValue(this.$cookie, showCurrentAsset)
       this.decorateRMenu()
       const url = `${this.treeSetting.url}?node_id=${node.meta.data.id}&show_current_asset=${showCurrentAsset}`
       this.$refs.AssetTreeTable.$refs.TreeList.handleUrlChange(url)

src/views/tickets/BaseTicketList.vue

@@ -73,7 +73,7 @@ export default {
           ]
         },
         {
-          label: this.$t('Action'),
+          label: this.$t('State'),
           options: [
             {
               label: this.$t('All'),
@@ -112,7 +112,7 @@ export default {
       ticketTableConfig: {
         url: this.url,
         extraQuery: this.extraQuery,
-        columnsExclude: ['process_map', 'rel_snapshot'],
+        columnsExclude: ['process_map', 'rel_snapshot', 'status'],
         columnsShow: {
           min: ['title', 'serial_num', 'type', 'state', 'date_created'],
           default: ['title', 'serial_num', 'type', 'state', 'date_created']
@@ -161,25 +161,8 @@ export default {
               return row.type.label
             }
           },
-          status: {
-            align: 'center',
-            sortable: 'custom',
-            formatter: TagChoicesFormatter,
-            formatterArgs: {
-              getTagLabel({ row }) {
-                return row.status.label
-              },
-              getTagType({ row }) {
-                if (row.status.value === 'open') {
-                  return 'primary'
-                } else {
-                  return 'danger'
-                }
-              }
-            }
-          },
           state: {
-            label: this.$t('Action'),
+            label: this.$t('State'),
             align: 'center',
             sortable: 'custom',
             formatter: TagChoicesFormatter,

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

@@ -217,12 +217,14 @@ export default {
       const accounts = this.requestForm.accounts
       if (this.object.approval_step.value === this.object.process_map.length) {
         if (assets.length === 0 && nodes.length === 0) {
-          return this.$message.error(this.$tc('SelectAtLeastOneAssetOrNodeErrMsg'))
+          this.$message.error(this.$tc('SelectAtLeastOneAssetOrNodeErrMsg'))
+          return false
         } else if (accounts.length === 0) {
-          return this.$message.error(this.$tc('RequiredSystemUserErrMsg'))
+          this.$message.error(this.$tc('RequiredSystemUserErrMsg'))
+          return false
         }
       }
-      this.$axios.patch(`/api/v1/tickets/apply-asset-tickets/${this.object.id}/approve/`, {
+      return this.$axios.patch(`/api/v1/tickets/apply-asset-tickets/${this.object.id}/approve/`, {
         apply_nodes: nodes || [],
         apply_assets: assets || [],
         apply_accounts: accounts || [],
@@ -239,11 +241,11 @@ export default {
     },
     handleClose() {
       const url = `/api/v1/tickets/apply-asset-tickets/${this.object.id}/close/`
-      this.$axios.put(url).then(res => this.reloadPage()).catch(err => this.$message.error(err))
+      return this.$axios.put(url).then(res => this.reloadPage()).catch(err => this.$message.error(err))
     },
     handleReject() {
       const url = `/api/v1/tickets/apply-asset-tickets/${this.object.id}/reject/`
-      this.$axios.put(url).then(res => this.reloadPage()).catch(err => this.$message.error(err))
+      return this.$axios.put(url).then(res => this.reloadPage()).catch(err => this.$message.error(err))
     }
   }
 }

src/views/tickets/components/Comments.vue

@@ -231,7 +231,16 @@ export default {
       }
 
       if (handler) {
-        handler()
+        const result = handler()
+        if (result === false) {
+          this.isDisabled = false
+          return
+        }
+        if (result && typeof result.finally === 'function') {
+          result.finally(() => {
+            this.isDisabled = false
+          })
+        }
       } else {
         this.$message.error('No handler for action')
       }

src/views/users/User/UserCreateUpdate.vue

@@ -264,7 +264,7 @@ export default {
       let mfa_level = null
       // SECURITY_MFA_AUTH 0 不开启 1 全局开启 2 管理员开启
       const securityMFAAuth = store.getters.publicSettings['SECURITY_MFA_AUTH']
-      const adminUserIsNeed = (user?.is_superuser || user?.is_org_admin) && this.$route.meta.action === 'update' &&
+      const adminUserIsNeed = (user?.is_superuser || user?.is_org_admin) && this.$route.params.action === 'update' &&
         securityMFAAuth === MFASystemSetting.onlyAdminUsers
       if (securityMFAAuth === MFASystemSetting.allUsers) {
         options = [{ 'value': MFALevel.allUsers, 'label': this.$t('MFAAllUsers') }]

src/views/users/User/UserDetail/UserInfo.vue

@@ -20,6 +20,8 @@ import { QuickActions } from '@/components'
 import RelationCard from '@/components/Cards/RelationCard'
 import AutoDetailCard from '@/components/Cards/DetailCard/auto'
 import TwoCol from '@/layout/components/Page/TwoColPage.vue'
+import store from '@/store'
+import { MFASystemSetting } from '@/views/users/const'
 
 export default {
   name: 'UserInfo',
@@ -226,7 +228,22 @@ export default {
             return <div>{doms}</div>
           }
         },
-        'wecom_id', 'dingtalk_id', 'feishu_id', 'mfa_level',
+        'wecom_id', 'dingtalk_id', 'feishu_id',
+        {
+          key: this.$t('MFA'),
+          formatter: (item, val) => {
+            const user = vm.object
+            const securityMFAAuth = store.getters.publicSettings['SECURITY_MFA_AUTH']
+            const adminUserIsNeed = (user?.is_superuser || user?.is_org_admin) && securityMFAAuth === MFASystemSetting.onlyAdminUsers
+            if (securityMFAAuth === MFASystemSetting.allUsers) {
+              return this.$t('MFAAllUsers')
+            }
+            if (securityMFAAuth === MFASystemSetting.onlyAdminUsers && adminUserIsNeed) {
+              return this.$t('MFAOnlyAdminUsers')
+            }
+            return user?.mfa_level.label
+          }
+        },
         'source', 'labels',
         'created_by', 'date_joined', 'date_expired',
         'date_password_last_updated', 'last_login', 'comment'