Merge pull request #8802 from dataease/pr@dev@fix_table_threshold

Pr@dev@fix table threshold

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 }

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>

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()))
         })
       }
     },