From 84f8fcc904f4de6e3c5176662059b5aa219f5099 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Fri, 29 Mar 2024 16:41:18 +0800
Subject: [PATCH 1/3] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E9=98=88?=
 =?UTF-8?q?=E5=80=BC=E9=99=90=E5=88=B6=E6=9E=9A=E4=B8=BE=E5=80=BC=E6=B0=94?=
 =?UTF-8?q?=E6=B3=A1=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/components/senior/Threshold.vue         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/frontend/src/views/chart/components/senior/Threshold.vue b/core/frontend/src/views/chart/components/senior/Threshold.vue
index b0f1ba128c..9b5d85a2b4 100644
--- a/core/frontend/src/views/chart/components/senior/Threshold.vue
+++ b/core/frontend/src/views/chart/components/senior/Threshold.vue
@@ -384,9 +384,13 @@
                   <span style="display: inline"> {{ item.enumValues.join(',') }}</span>
                   <el-tooltip
                     v-if="item.enumValues && item.enumValues.length"
-                    :content="item.enumValues.join(',')"
                   >
                     <i class="el-icon-info"></i>
+                    <template v-slot:content>
+                      <div style="max-width: 200px">
+                        {{ item.enumValues.join(',') }}
+                      </div>
+                    </template>
                   </el-tooltip>
                 </div>
               </el-col>

From 2e2f5af014181db7bde5f3a05e6c6d57843c7708 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Fri, 29 Mar 2024 16:41:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E9=98=88?=
 =?UTF-8?q?=E5=80=BC=E6=9E=9A=E4=B8=BE=E5=80=BC=E5=8E=BB=E9=99=A4=E7=A9=BA?=
 =?UTF-8?q?=E5=80=BC=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/chart/components/senior/dialog/TableThresholdEdit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 806ea8fbc8..fcd6395c90 100644
--- a/core/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
+++ b/core/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
@@ -719,7 +719,7 @@ export default {
       const fieldType = this.getFieldType(fieldId)
       if (fieldType) {
         post('/chart/view/getFieldData/' + this.chart.id + '/' + this.panelInfo.id + '/' + fieldId + '/' + fieldType, {}).then(response => {
-          this.$set(this.fieldEnumValues, fieldId, response.data)
+          this.$set(this.fieldEnumValues, fieldId, response.data?.filter(i => i && i.trim()))
         })
       }
     },

From e25e9a9a7fdf89a91076bae8676ce2ef29a89476 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Fri, 29 Mar 2024 16:58:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E9=80=8F?=
 =?UTF-8?q?=E8=A7=86=E8=A1=A8=E9=98=88=E5=80=BC=E4=B8=8D=E5=8C=85=E5=90=AB?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/views/chart/chart/table/table-info.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/frontend/src/views/chart/chart/table/table-info.js b/core/frontend/src/views/chart/chart/table/table-info.js
index 7e94bed258..687beb009a 100644
--- a/core/frontend/src/views/chart/chart/table/table-info.js
+++ b/core/frontend/src/views/chart/chart/table/table-info.js
@@ -747,9 +747,14 @@ function getConditions(chart) {
       res.text.push({
         field: field.field.dataeaseName,
         mapping(value, rowData) {
+          // 总计小计
           if (rowData?.isTotals) {
             return null
           }
+          // 表头
+          if (rowData?.id && rowData?.field === rowData.id) {
+            return null
+          }
           return {
             fill: mappingColor(value, defaultTextColor, field, 'color', filedValueMap, rowData)
           }
@@ -761,6 +766,9 @@ function getConditions(chart) {
           if (rowData?.isTotals) {
             return null
           }
+          if (rowData?.id && rowData?.field === rowData.id) {
+            return null
+          }
           const fill = mappingColor(value, defaultBgColor, field, 'backgroundColor', filedValueMap, rowData)
           if (fill) {
             return { fill }