fix: Ticket comment not display

src/components/Apps/AccountListTable/AccountCreateUpdate.vue

@@ -107,6 +107,10 @@ export default {
           this.$emit('add', true)
         }
       }).catch(error => {
+        if (error?.response?.data?.code === 'no_valid_assets') {
+          this.$message.error(error?.response?.data?.detail)
+          return
+        }
         this.iVisible = true
         this.handleResult(null, error)
       })

src/components/Form/AutoDataForm/index.vue

@@ -223,9 +223,21 @@ export default {
       const mapped = {}
       Object.entries(errors || {}).forEach(([k, v]) => {
         let msg = v
+        console.log(k, v)
         // v是数组并且数组都是字符串，则拼接为字符串
         if (Array.isArray(v) && v.every(item => typeof item === 'string')) msg = v.join('; ')
-        else if (typeof v === 'object' && v !== null) msg = JSON.stringify(v)
+        // 处理 [{"port":["请确保该值小于或者等于 65535。"]},{},{}] 这种情况
+        else if (Array.isArray(v) && v.every(item => _.isPlainObject(item))) {
+          const subMsg = []
+          v.forEach((subItem) => {
+            Object.values(subItem).forEach((subMsgArr) => {
+              if (Array.isArray(subMsgArr)) {
+                subMsg.push(...subMsgArr)
+              }
+            })
+          })
+          msg = subMsg.join(' ')
+        } else if (typeof v === 'object' && v !== null) msg = JSON.stringify(v)
         mapped[k] = String(msg || '')
       })
       this.serverErrors = mapped

src/layout/components/NavHeader/Organization.vue

@@ -65,6 +65,17 @@ export default {
       'usingOrgs',
       'currentViewRoute'
     ]),
+    currentOrgDisplayName() {
+      const currentOrgId = this.currentOrg?.id
+      if (!currentOrgId) {
+        return this.$tc('Select')
+      }
+      const matchedOrg = this.usingOrgs.find(item => item.id === currentOrgId)
+      if (matchedOrg?.name) {
+        return matchedOrg.name
+      }
+      return this.currentOrg.name || this.$tc('Select')
+    },
     orgActionsGroup() {
       const orgActions = {
         label: this.$t('OrganizationList'),
@@ -110,11 +121,8 @@ export default {
     }
   },
   watch: {
-    currentOrg: {
-      handler() {
+    currentOrgDisplayName() {
       this.updateWidth()
-      },
-      deep: true
     }
   },
   mounted() {
@@ -133,8 +141,9 @@ export default {
         tempSpan.style.fontWeight = 'normal'
         tempSpan.style.letterSpacing = 'normal'
 
-        // 获取当前组织名称
-        const orgName = this.currentOrg.name || this.$tc('Select')
+        // 获取当前组织显示名称
+        const orgName = this.currentOrgDisplayName
+
         tempSpan.textContent = orgName
         document.body.appendChild(tempSpan)
 

src/layout/components/TabPage/index.vue

@@ -167,8 +167,7 @@ export default {
 }
 </script>
 
-<style lang='scss' scoped>
-
+<style lang="scss" scoped>
 .page.no-title {
   ::v-deep {
     .page-submenu .el-tabs__header {
@@ -199,6 +198,14 @@ export default {
         opacity: 1;
       }
     }
+
+    &.is-disabled {
+      cursor: not-allowed;
+
+      &:hover {
+        color: #c0c4cc;
+      }
+    }
   }
 
   .el-tabs__nav-next {

src/utils/common/index.js

@@ -149,6 +149,11 @@ export function getErrorResponseMsg(error) {
       .join('; ')
   } else if (typeof data === 'string') {
     return data
+  } else if (_.isPlainObject(data)) {
+    return Object.values(data)
+      .map(item => getErrorResponseMsg(item))
+      .filter(i => i)
+      .join('; ')
   } else {
     msg = error.toString()
   }

src/views/accounts/AccountPush/AccountPushCreateUpdate.vue

@@ -144,11 +144,6 @@ export default {
       deep: true
     }
   },
-  mounted() {
-    if (!this.$store.getters.hasValidLicense) {
-      delete this.fields[3]
-    }
-  },
   methods: {
     handleAfterGetRemoteMeta(meta) {
       const needSetOptionFields = [

src/views/accounts/RiskDetect/AccountRiskList.vue

@@ -43,7 +43,9 @@ export default {
         asset: ''
       },
       treeSetting: {
-        showMenu: true,
+        showMenu: (node) => {
+          return node?.meta?.type === 'asset'
+        },
         showRefresh: true,
         showSearch: true,
         showAssets: true,
@@ -55,7 +57,7 @@ export default {
         menu: [
           {
             id: 'check',
-            name: this.$t('Check'),
+            name: this.$t('RiskDetection'),
             icon: 'scan',
             callback: (node) => {
               vm.detectDialog.asset = node.id

src/views/accounts/RiskDetect/RiskHandlerFormatter/ReviewDrawer.vue

@@ -6,7 +6,6 @@
     class="risk-review-drawer"
     destroy-on-close
     direction="rtl"
-    style="z-index: 999"
   >
     <div class="drawer-container">
       <div class="drawer-body">

src/views/ops/Adhoc/QuickJob.vue

@@ -515,6 +515,8 @@ export default {
         this.setBtn()
         this.selectAssets = assets
         this.selectNodes = nodes
+      }).catch(() => {
+        this.lastRequestPayload = null
       })
     },
     viewConfirmRunAssets() {

src/views/ops/File/index.vue

@@ -408,7 +408,6 @@ export default {
       createJob(data).then(res => {
         this.progressLength = 0
         this.executionInfo.timeCost = 0
-        this.showProgress = true
         this.speedText = ''
         const form = new FormData()
         const start = Date.now()
@@ -436,13 +435,13 @@ export default {
             }
           }
         }).then(res => {
+          this.showProgress = true
           this.executionInfo.status = 'running'
           this.currentTaskId = res.task_id
           this.xtermConfig = { taskId: this.currentTaskId, type: 'shortcut_cmd' }
           this.setCostTimeInterval()
           this.writeExecutionOutput()
-        }).catch((error) => {
-          this.$message.error(this.$tc('Error'), error)
+        }).catch(() => {
           this.execute_stop()
         })
       })

src/views/ops/Job/JobUpdateCreate.vue

@@ -224,11 +224,12 @@ export default {
           title: this.$t('ExecuteAfterSaving'),
           callback: (value, form, btn) => {
             form.value.run_after_save = true
-            const parameters = form.value.variable.reduce((acc, item) => {
+            if (form.value?.variable) {
+              form.value['parameters'] = form.value.variable.reduce((acc, item) => {
                 acc[item.var_name] = item.default_value || ''
                 return acc
               }, {})
-            form.value['parameters'] = parameters
+            }
             this.submitForm(form, btn)
           }
         }

src/views/profile/PasswordAndSSHKey/index.vue

@@ -32,6 +32,22 @@ export default {
       }
     }
   },
+  computed: {
+    passwordMenuDisabled() {
+      return this.$store.state.users.profile.source.value !== 'local'
+    }
+  },
+  watch: {
+    passwordMenuDisabled: {
+      immediate: true,
+      handler(disabled) {
+        this.config.submenu = this.getSubmenu()
+        if (disabled && this.config.activeMenu === 'Password') {
+          this.config.activeMenu = 'SSHKeyList'
+        }
+      }
+    }
+  },
   methods: {
     getSubmenu() {
       return [

src/views/tickets/components/Comments.vue

@@ -147,7 +147,7 @@ export default {
       this.loading = true
       const url = `/api/v1/tickets/comments/?ticket_id=${this.object.id}`
       this.$axios.get(url).then(res => {
-        this.comments = res.results
+        this.comments = res
       }).catch(err => {
         this.$message.error(err)
       }).finally(() => {

vue.config.js

@@ -161,8 +161,7 @@ module.exports = {
         target: process.env.VUE_APP_CORE_HOST || 'http://127.0.0.1:8080',
         changeOrigin: true
       }
-    },
-    after: require('./mock/mock-server.js')
+    }
   },
   css: {},
   configureWebpack: {