From 6ea76b54d9b53e857560bdfe646e765ae217b462 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Tue, 26 Mar 2024 11:27:40 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=B7=E5=BC=8F=E5=88=9D=E5=A7=8B=E5=8C=96=E6=9E=9A?=
 =?UTF-8?q?=E4=B8=BE=E5=80=BC=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/views/chart/chart/util.js   |  7 ++
 .../senior/dialog/TableThresholdEdit.vue      | 65 +++++++------------
 2 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/core/frontend/src/views/chart/chart/util.js b/core/frontend/src/views/chart/chart/util.js
index 08bd5d2af8..7137f276cc 100644
--- a/core/frontend/src/views/chart/chart/util.js
+++ b/core/frontend/src/views/chart/chart/util.js
@@ -3923,3 +3923,10 @@ export function handleTableEmptyStrategy(tableData, chart) {
   }
   return newData
 }
+
+export function parseJson(target) {
+  if (Object.prototype.toString.call(target) === '[object String]') {
+    return JSON.parse(target)
+  }
+  return JSON.parse(JSON.stringify(target))
+}
diff --git a/core/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue b/core/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
index 374e572458..70ee0922d0 100644
--- a/core/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
+++ b/core/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
@@ -393,6 +393,7 @@
 <script>
 import { COLOR_PANEL } from '@/views/chart/chart/chart'
 import { post } from '@/api/dataset/dataset'
+import { parseJson } from '@/views/chart/chart/util'
 
 export default {
   name: 'TableThresholdEdit',
@@ -570,14 +571,21 @@ export default {
     init() {
       this.thresholdArr = JSON.parse(JSON.stringify(this.threshold))
       this.initFields()
-      this.thresholdArr && this.thresholdArr.forEach(ele => {
+      const enumFields = new Set([])
+      this.thresholdArr?.forEach(ele => {
         this.initOptions(ele)
         if (ele.conditions) {
           for (const item of ele.conditions) {
             this.initConditionField(item)
+            if (item.field === '2') {
+              enumFields.add(ele.fieldId)
+            }
           }
         }
       })
+      enumFields.forEach(fieldId => {
+        this.getFieldEnumValues(fieldId)
+      })
     },
     initConditionField(item) {
       // 兼容旧数据
@@ -615,42 +623,17 @@ export default {
       }
     },
     initFields() {
-      // 暂时支持指标
       if (this.chart.type === 'table-info') {
-        if (Object.prototype.toString.call(this.chart.xaxis) === '[object Array]') {
-          this.fields = JSON.parse(JSON.stringify(this.chart.xaxis))
-        } else {
-          this.fields = JSON.parse(this.chart.xaxis)
-        }
+        this.fields.splice(0, this.fields.length, ...parseJson(this.chart.xaxis))
       } else if (this.chart.type === 'table-pivot') {
-        const totalFields = []
-        if (Object.prototype.toString.call(this.chart.yaxis) === '[object Array]') {
-          totalFields.splice(totalFields.length, 0, ...JSON.parse(JSON.stringify(this.chart.yaxis)))
-        } else {
-          totalFields.splice(totalFields.length, 0, ...JSON.parse(this.chart.yaxis))
-        }
-        if (Object.prototype.toString.call(this.chart.xaxis) === '[object Array]') {
-          totalFields.splice(totalFields.length, 0, ...JSON.parse(JSON.stringify(this.chart.xaxis)))
-        } else {
-          totalFields.splice(totalFields.length, 0, ...JSON.parse(this.chart.xaxis))
-        }
-        if (Object.prototype.toString.call(this.chart.xaxisExt) === '[object Array]') {
-          totalFields.splice(totalFields.length, 0, ...JSON.parse(JSON.stringify(this.chart.xaxisExt)))
-        } else {
-          totalFields.splice(totalFields.length, 0, ...JSON.parse(this.chart.xaxisExt))
-        }
-        this.fields.splice(0, this.fields.length, ...totalFields)
+        const yAxis = parseJson(this.chart.yaxis)
+        const xAxis = parseJson(this.chart.xaxis)
+        const xAxisExt = parseJson(this.chart.xaxisExt)
+        this.fields.splice(0, this.fields.length,  ...yAxis, ...xAxis, ...xAxisExt)
       } else {
-        if (Object.prototype.toString.call(this.chart.xaxis) === '[object Array]') {
-          this.fields = this.fields.concat(JSON.parse(JSON.stringify(this.chart.xaxis)))
-        } else {
-          this.fields = this.fields.concat(JSON.parse(this.chart.xaxis))
-        }
-        if (Object.prototype.toString.call(this.chart.yaxis) === '[object Array]') {
-          this.fields = this.fields.concat(JSON.parse(JSON.stringify(this.chart.yaxis)))
-        } else {
-          this.fields = this.fields.concat(JSON.parse(this.chart.yaxis))
-        }
+        const yAxis = parseJson(this.chart.yaxis)
+        const xAxis = parseJson(this.chart.xaxis)
+        this.fields.splice(0, this.fields.length, ...yAxis, ...xAxis)
       }
 
       // 区分文本、数值、日期字段
@@ -720,21 +703,21 @@ export default {
           if (curField.field.deType === 1 && !['eq', 'not_eq'].includes(item.term)) {
             item.field = '0'
           }
-          this.getFieldEnumValues(curField.field)
+          this.getFieldEnumValues(curField.fieldId)
           break
         default:
           break
       }
       this.changeThreshold()
     },
-    getFieldEnumValues(field) {
-      if (this.fieldEnumValues[field.id]) {
+    getFieldEnumValues(fieldId) {
+      if (this.fieldEnumValues[fieldId]) {
         return
       }
-      const fieldType = this.getFieldType(field.id)
+      const fieldType = this.getFieldType(fieldId)
       if (fieldType) {
-        post('/chart/view/getFieldData/' + this.chart.id + '/' + this.panelInfo.id + '/' + field.id + '/' + fieldType, {}).then(response => {
-          this.$set(this.fieldEnumValues, field.id, response.data)
+        post('/chart/view/getFieldData/' + this.chart.id + '/' + this.panelInfo.id + '/' + fieldId + '/' + fieldType, {}).then(response => {
+          this.$set(this.fieldEnumValues, fieldId, response.data)
         })
       }
     },
@@ -781,7 +764,7 @@ export default {
           }
           if (ele.field === '2') {
             ele.enumValues?.splice(0)
-            this.getFieldEnumValues(item.field)
+            this.getFieldEnumValues(item.fieldId)
           }
         }
       })