Merge branch 'dev-3.6' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7

nezha-fronted/src/assets/css/common.scss

@@ -685,3 +685,7 @@ textarea {
   overflow: hidden;
   overflow-y: auto;
 }
+
+.message-zindex{
+  z-index: 5000 !important;
+}

nezha-fronted/src/assets/css/components/page/config/agent.scss

@@ -42,9 +42,3 @@
   color: $--color-text-primary;
   text-align: center;
 }
-
-.agent{
-  .message-zindex{
-    z-index: 1000;
-  }
-}

nezha-fronted/src/components/cli/fileDirectory.vue

@@ -585,6 +585,7 @@ export default {
       return '-'
     },
     resetState (type) {
+      console.log(type)
       if (type == 'sizeOrderType') {
         this.dateOrderType = 0
         this.nameOrderType = 0
@@ -603,7 +604,7 @@ export default {
       if (!orderType) {
         orderType = this[key] === 'asc' ? 'desc' : 'asc'
       }
-      this.resetState(orderType)
+      this.resetState(key)
       if (this[key] == orderType) {
         this[key] = 0
         this.fileList = this.oldFileList

nezha-fronted/src/components/common/message/src/main.vue

@@ -2,11 +2,11 @@
   <transition name="el-message-fade" @after-leave="handleAfterLeave">
     <div
       :class="[
-        'el-message',
+        'el-message message-zindex',
         type && !iconClass ? `el-message--${ type }` : '',
         center ? 'is-center' : '',
         showClose ? 'is-closable' : '',
-        customClass
+        customClass,
       ]"
       :style="positionStyle"
       v-show="visible"

nezha-fronted/src/components/common/searchInput.vue

@@ -551,6 +551,10 @@ export default {
           val.val = selectItem.name
           val.valnum = selectItem.id
           val.valString = ''
+        } else if (val.type == 'terminalStatus' && selectItem.searchType == 'terminalStatus') {
+          val.val = selectItem.label
+          val.valnum = selectItem.id
+          val.valString = ''
         } else if (val.type == 'assetType' && selectItem.searchType == 'assetType') {
           val.val = selectItem.name
           val.valnum = selectItem.id
@@ -957,6 +961,8 @@ export default {
               objectInfo.type = val.valnum
             } else if (val.label === 'assetState') {
               objectInfo.stateIds = val.valnum
+            }else if (val.label === 'terminalStatus') {
+              objectInfo.state = val.valnum
             } else if (val.label === 'assetType') {
               objectInfo.typeIds = val.valnum
             } else if (val.label === 'credentialType') {
@@ -1010,6 +1016,8 @@ export default {
             objectInfo.projectIds = val.valnum
           } else if (val.label === 'assetState') {
             objectInfo.stateIds = val.valnum
+          } else if (val.label === 'terminalStatus') {
+            objectInfo.state = val.valnum
           } else if (val.label === 'assetType') {
             objectInfo.typeIds = val.valnum
           } else if (val.type === 'brand') {

nezha-fronted/src/components/page/config/agent.vue

@@ -232,7 +232,7 @@ export default {
     },
     copyUrl (txt) {
       this.$copyText(txt).then(() => {
-        this.$message.success({ message: this.$t('overall.copySuccess'), customClass: 'message-zindex' })
+        this.$message.success({ message: this.$t('overall.copySuccess') })
       })
     },
     // copyUrl (id) {

nezha-fronted/src/components/page/config/terminalLog.vue

@@ -156,10 +156,10 @@ export default {
             readonly: true,
             disabled: false
           }, {
-            id: 17,
+            id: 'state',
             name: this.$t('overall.state'),
-            type: 'terminalStatus',
-            label: 'state',
+            type: 'select',
+            label: 'terminalStatus',
             readonly: true,
             disabled: false
           }