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

nezha-fronted/package-lock.json

@@ -13324,7 +13324,7 @@
     },
     "node-sass": {
       "version": "4.14.1",
-      "resolved": "https://registry.npmmirror.com/node-sass/-/node-sass-4.14.1.tgz",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
       "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
       "dev": true,
       "requires": {
@@ -19666,7 +19666,7 @@
     },
     "webpack-bundle-analyzer": {
       "version": "2.13.1",
-      "resolved": "https://registry.npmmirror.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz",
       "integrity": "sha512-rwxyfecTAxoarCC9VlHlIpfQCmmJ/qWD5bpbjkof+7HrNhTNZIwZITxN6CdlYL2axGmwNUQ+tFgcSOiNXMf/sQ==",
       "dev": true,
       "requires": {

nezha-fronted/src/components/common/table/tool/pingTable.vue

@@ -25,6 +25,8 @@
       :width="`${item.width}`"
       class="data-column"
       :sortable="item.sortable"
+      :sort-orders="['ascending', 'descending']"
+      :sort-method="item.sortMethod"
     >
       <template slot="header">
         <span class="data-column__span">{{item.label}}</span>
@@ -56,6 +58,7 @@
 
 <script>
 import table from '@/components/common/mixin/table'
+import lodash from 'lodash'
 export default {
   name: 'pingTable',
   mixins: [table],
@@ -69,7 +72,8 @@ export default {
           label: this.$t('overall.dc'),
           prop: 'dc',
           sortable: true,
-          minWidth: 200
+          minWidth: 200,
+          sortMethod: this.sortMethod('dc.name')
         }, {
           label: this.$t('ping.sourceIp'),
           prop: 'source',
@@ -111,6 +115,20 @@ export default {
     }
   },
   methods: {
+    // 防止prop为对象时 排序不正确
+    sortMethod (prop) {
+      return function (a, b) {
+        const val1 = lodash.get(a, prop, '')
+        const val2 = lodash.get(b, prop, '')
+        if (val1 < val2) {
+          return -1
+        } else if (val1 > val2) {
+          return 1
+        } else {
+          return 0
+        }
+      }
+    }
   }
 }
 </script>

nezha-fronted/src/components/common/table/tool/traceTable.vue

@@ -25,6 +25,8 @@
       :width="`${item.width}`"
       class="data-column"
       :sortable="item.sortable"
+      :sort-orders="['ascending', 'descending']"
+      :sort-method="item.sortMethod"
     >
       <template slot="header">
         <span class="data-column__span">{{item.label}}</span>
@@ -55,6 +57,7 @@
 
 <script>
 import table from '@/components/common/mixin/table'
+import lodash from 'lodash'
 export default {
   name: 'traceTable',
   mixins: [table],
@@ -67,7 +70,8 @@ export default {
         {
           label: this.$t('overall.dc'),
           prop: 'dc',
-          sortable: true
+          sortable: true,
+          sortMethod: this.sortMethod('dc.name')
         }, {
           label: this.$t('ping.sourceIp'),
           prop: 'source',
@@ -89,6 +93,20 @@ export default {
     }
   },
   methods: {
+    // 防止prop为对象时 排序不正确
+    sortMethod (prop) {
+      return function (a, b) {
+        const val1 = lodash.get(a, prop, '')
+        const val2 = lodash.get(b, prop, '')
+        if (val1 < val2) {
+          return -1
+        } else if (val1 > val2) {
+          return 1
+        } else {
+          return 0
+        }
+      }
+    }
   }
 }
 </script>