From a9c59468f956380056a07c1517330696849a424d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 14 Jun 2023 17:15:05 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2876=20fix=EF=BC=9Atable=E5=9B=BE=E8=A1=A8v?=
 =?UTF-8?q?alue=E5=88=97=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD=E4=B8=8D?=
 =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A2=84=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/chart/chartTable.vue    | 16 ++++++++++++----
 .../common/rightBox/chart/chartRightBox.vue      |  4 ++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartTable.vue b/nezha-fronted/src/components/chart/chart/chartTable.vue
index 7b4e40059..8e36f2b4f 100644
--- a/nezha-fronted/src/components/chart/chart/chartTable.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTable.vue
@@ -330,8 +330,12 @@ export default {
     // 本地正序
     asce (prop) {
       return function (obj1, obj2) {
-        const val1 = obj1.display[prop + 'display'].display.replace(/\s*/g, '')
-        const val2 = obj2.display[prop + 'display'].display.replace(/\s*/g, '')
+        let val1 = obj1.display[prop + 'display'].display.replace(/\s*/g, '')
+        let val2 = obj2.display[prop + 'display'].display.replace(/\s*/g, '')
+        if (!isNaN(val1) && !isNaN(val2)) {
+          val1 = Number(val1)
+          val2 = Number(val2)
+        }
         if (val1 < val2) {
           return -1
         } else if (val1 > val2) {
@@ -344,8 +348,12 @@ export default {
     // 本地倒序
     desc (prop) {
       return function (obj1, obj2) {
-        const val1 = obj1.display[prop + 'display'].display.replace(/\s*/g, '')
-        const val2 = obj2.display[prop + 'display'].display.replace(/\s*/g, '')
+        let val1 = obj1.display[prop + 'display'].display.replace(/\s*/g, '')
+        let val2 = obj2.display[prop + 'display'].display.replace(/\s*/g, '')
+        if (!isNaN(val1) && !isNaN(val2)) {
+          val1 = Number(val1)
+          val2 = Number(val2)
+        }
         if (val1 < val2) {
           return -1
         } else if (val1 > val2) {
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index 8337af8f6..1841741a8 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -572,9 +572,9 @@ export default {
           if (!obj.param.visibility) {
             obj.param.visibility = {
               varName: '',
-              operator: '',
+              operator: 'equal',
               varValue: '',
-              result: ''
+              result: 'show'
             }
           }
           if (obj.type === 'group' && !obj.param.repeat) {