Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3

nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue

@@ -146,7 +146,7 @@ export default {
           minWidth: 110
         }, {
           label: 'Talon',
-          prop: 'clientState',
+          prop: 'talon',
           show: true,
           sortable: 'custom',
           minWidth: 150

nezha-fronted/src/components/common/table/asset/assetTable.vue

@@ -91,21 +91,21 @@
             <!--          <span v-else-if="scope.row.pid == -1">  <i class="nz-icon nz-icon-overview-project monitorColor color23BF9A"></i> 0 </span>-->
             <span v-else> - </span>
           </template>
-          <template v-else-if="item.prop === 'clientState'">
-            <div v-if="scope.row[item.prop]===1">
+          <template v-else-if="item.prop === 'talon'">
+            <div v-if="scope.row['clientState']===1">
               <div class="active-icon green-bg inline-block"></div>
               OK
             </div>
-            <div v-else-if="scope.row[item.prop]===0">
+            <div v-else-if="scope.row['clientState']===0">
               <div class="active-icon gray-bg inline-block"></div> {{ $t('config.user.disable') }}
             </div>
-            <div v-else-if="scope.row[item.prop]===2">
+            <div v-else-if="scope.row['clientState']===2">
               <div class="active-icon red-bg inline-block"></div> {{ $t('asset.connectionTimedOut') }}
             </div>
-            <div v-else-if="scope.row[item.prop]===3">
+            <div v-else-if="scope.row['clientState']===3">
               <div class="active-icon red-bg inline-block"></div> {{ $t('overall.AuthenticationFailed') }}
             </div>
-            <div v-else-if="scope.row[item.prop]===4">
+            <div v-else-if="scope.row['clientState']===4">
               <div class="active-icon red-bg inline-block"></div> {{ $t('config.terminallog.statusItem.unknownError') }}
             </div>
             <template v-else>-</template>
@@ -281,7 +281,8 @@ export default {
           minWidth: 110
         }, {
           label: 'Talon',
-          prop: 'clientState',
+          // prop: 'clientState',
+          prop: 'talon',
           show: true,
           sortable: 'custom',
           minWidth: 150
@@ -303,10 +304,10 @@ export default {
       if (str === 'dc') {
         orderBy = str
       }
-      if (str === 'clientState') {
-        str = 'talon_status'
-        orderBy = str
-      }
+      // if (str === 'clientState') {
+      //   str = 'talon_status'
+      //   orderBy = str
+      // }
       if (item.order === 'ascending') {
         orderBy = str
       }

nezha-fronted/src/components/common/table/settings/credentialsTable.vue

@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"

nezha-fronted/src/components/common/table/settings/globalizationTable.vue

@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"

nezha-fronted/src/components/common/table/settings/mibTable.vue

@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"

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

@@ -18,6 +18,7 @@
       <template v-slot:default="slotProps">
         <credentials-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"

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

@@ -19,6 +19,7 @@
       <template v-slot:default="slotProps">
         <globalization-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"
@@ -27,7 +28,6 @@
           :table-data="tableData"
           @del="del"
           @edit="edit"
-          @copy="copy"
           @orderBy="tableDataSort"
           @reload="getTableData"
           @selectionChange="selectionChange"
@@ -62,7 +62,7 @@ export default {
       url: 'sys/i18n',
       tableId: 'i18nTable', // 需要分页的table的id，用于记录每页数量
       blankObject: {
-        ids: '',
+        id: '',
         name: '',
         code: '',
         lang: 'en',
@@ -129,23 +129,6 @@ export default {
   mounted () {
     this.getUserData()
   }
-  // watch: {
-  //   $route: {
-  //     immediate: true,
-  //     handler () {
-  //       // 是否弹出侧滑
-  //       const add = this.$route.query.add
-  //       if (add) {
-  //         if (add === 'dc') {
-  //           this.add()
-  //         }
-  //         if (add === 'cabinet') {
-  //           this.addCabinet()
-  //         }
-  //       }
-  //     }
-  //   }
-  // }
 }
 </script>
 <style scoped>

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

@@ -18,6 +18,7 @@
       <template v-slot:default="slotProps">
         <mib-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"