Merge branch 'dev-3.8' of git.mesalab.cn:nezha/nezha-fronted into dev-3.10rel-24.01.12

5 files changed, 15 insertions, 9 deletions

diff --git a/nezha-fronted/src/components/chart/chart/chart-table.vue b/nezha-fronted/src/components/chart/chart/chart-table.vue
index 3e12a6177..cef14d34c 100644
--- a/nezha-fronted/src/components/chart/chart/chart-table.vue
+++ b/nezha-fronted/src/components/chart/chart/chart-table.vue
@@ -237,6 +237,7 @@ export default {
       this.seriesItem = this.filterShowData(this.storedTableData, this.pageObj, 'series')
     },
     filterShowData (source, pageObj, from) {
+      console.log(123123123)
       let orderBy = null
       let sourceData = null
       if (from === 'series') {
@@ -251,10 +252,12 @@ export default {
         source = Object.assign([], sourceData)
       } else { // 排序之后的顺序
         if (orderBy.order === 'ascending') {
-          source = source.sort(this.$tableSet.asce(orderBy.prop))
+          console.log(source)
+          source = source.sort(this.$tableSet.asce(orderBy.prop, true))
         }
         if (orderBy.order === 'descending') {
-          source = source.sort(this.$tableSet.desc(orderBy.prop))
+          console.log(source)
+          source = source.sort(this.$tableSet.desc(orderBy.prop, true))
         }
       }
       return source.slice((pageObj.pageNo - 1) * pageObj.pageSize, pageObj.pageNo * pageObj.pageSize)
@@ -604,6 +607,7 @@ export default {
     },
     // 数据排序
     tableDataSort (item) {
+      console.log(item)
       this.orderBy = { order: item.order, prop: item.prop }
       this.seriesItem = this.filterShowData(this.storedTableData, this.pageObj, 'series')
     },
diff --git a/nezha-fronted/src/components/chart/chart/chartTable.vue b/nezha-fronted/src/components/chart/chart/chartTable.vue
index 3bccde8a2..510903803 100644
--- a/nezha-fronted/src/components/chart/chart/chartTable.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTable.vue
@@ -447,8 +447,8 @@ export default {
     // 本地正序
     asce (prop) {
       return function (obj1, obj2) {
-        let val1 = obj1.display[prop + 'display'].display.replace(/\s*/g, '')
-        let val2 = obj2.display[prop + 'display'].display.replace(/\s*/g, '')
+        let val1 = obj1.display[prop + 'display'].oldValue.replace(/\s*/g, '')
+        let val2 = obj2.display[prop + 'display'].oldValue.replace(/\s*/g, '')
         if (!isNaN(val1) && !isNaN(val2)) {
           val1 = Number(val1)
           val2 = Number(val2)
@@ -465,8 +465,8 @@ export default {
     // 本地倒序
     desc (prop) {
       return function (obj1, obj2) {
-        let val1 = obj1.display[prop + 'display'].display.replace(/\s*/g, '')
-        let val2 = obj2.display[prop + 'display'].display.replace(/\s*/g, '')
+        let val1 = obj1.display[prop + 'display'].oldValue.replace(/\s*/g, '')
+        let val2 = obj2.display[prop + 'display'].oldValue.replace(/\s*/g, '')
         if (!isNaN(val1) && !isNaN(val2)) {
           val1 = Number(val1)
           val2 = Number(val2)
diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js
index 2ebb604b6..1097db98e 100644
--- a/nezha-fronted/src/components/common/js/tools.js
+++ b/nezha-fronted/src/components/common/js/tools.js
@@ -848,11 +848,11 @@ export const tableSet = {
     }
   },
   // 本地正序
-  asce (prop) {
+  asce (prop, useOldValue) {
     return function (obj1, obj2) {
       let val1 = obj1[prop]
       let val2 = obj2[prop]
-      if (prop === 'value') {
+      if (prop === 'value' || useOldValue) {
         val1 = obj1.oldValue
         val2 = obj2.oldValue
       }
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
index 5e131d5d1..cad44329d 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
@@ -942,6 +942,7 @@
               :placeholder="$t('overall.auto')"
               popper-class="right-box-select-top prevent-clickoutside"
               size="small"
+              clearable
               @change="change"
               >
               <el-option
@@ -965,6 +966,7 @@
               :placeholder="$t('overall.auto')"
               popper-class="right-box-select-top prevent-clickoutside"
               size="small"
+              clearable
               @change="change"
               >
               <el-option :label="$t('dashboard.dashboard.chartForm.asc')" value="asc"></el-option>
diff --git a/nezha-fronted/static/config.json b/nezha-fronted/static/config.json
index 3d45d84b8..958fdd1be 100644
--- a/nezha-fronted/static/config.json
+++ b/nezha-fronted/static/config.json
@@ -1 +1 @@
-{"baseUrl":"http://192.168.44.22/", "version": "23.06"}
+{"baseUrl":"http://192.168.44.100/", "version": "23.06"}