From 5b38511f7b4d8ad56a7c8b0ec8de4840b5585cf9 Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Wed, 4 Mar 2026 19:59:55 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=80=8F=E8=A7=86=E8=A1=A8=E6=9D=A1=E4=BB=B6=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5=E5=8A=A8=E6=80=81=E5=80=BC?=
 =?UTF-8?q?=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/charts/impl/DefaultChartHandler.java | 18 +++++++++++-------
 .../charts/impl/table/TablePivotHandler.java   | 12 +++++++++++-
 .../components/table/TableHeaderSelector.vue   |  2 +-
 .../components/js/panel/common/common_table.ts | 18 +++++++++---------
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java
index abfaf1499f..bd89919c5e 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java
@@ -245,21 +245,25 @@ public class DefaultChartHandler extends AbstractChartPlugin {
         return list;
     }
 
-    protected List<ChartViewFieldDTO> getAssistFields(List<ChartSeniorAssistDTO> list, List<ChartViewFieldDTO> yAxis) {
+    protected List<ChartViewFieldDTO> getAssistFields(List<ChartSeniorAssistDTO> list, List<ChartViewFieldDTO> axis) {
+        return getAssistFields(list, axis, SQLConstants.FIELD_ALIAS_Y_PREFIX);
+    }
+
+    protected List<ChartViewFieldDTO> getAssistFields(List<ChartSeniorAssistDTO> list, List<ChartViewFieldDTO> axis, String prefix) {
         List<ChartViewFieldDTO> res = new ArrayList<>();
         for (ChartSeniorAssistDTO dto : list) {
             DatasetTableFieldDTO curField = dto.getCurField();
-            ChartViewFieldDTO yField = null;
+            ChartViewFieldDTO targetField = null;
             String alias = "";
-            for (int i = 0; i < yAxis.size(); i++) {
-                ChartViewFieldDTO field = yAxis.get(i);
+            for (int i = 0; i < axis.size(); i++) {
+                ChartViewFieldDTO field = axis.get(i);
                 if (Objects.equals(field.getId(), curField.getId())) {
-                    yField = field;
-                    alias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i);
+                    targetField = field;
+                    alias = String.format(prefix, i);
                     break;
                 }
             }
-            if (ObjectUtils.isEmpty(yField)) {
+            if (ObjectUtils.isEmpty(targetField)) {
                 continue;
             }
 
diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TablePivotHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TablePivotHandler.java
index 88b5e9cd9e..05006ebf63 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TablePivotHandler.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TablePivotHandler.java
@@ -3,6 +3,7 @@ package io.dataease.chart.charts.impl.table;
 import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
 import io.dataease.chart.charts.impl.GroupChartHandler;
 import io.dataease.constant.DeTypeConstants;
+import io.dataease.constant.SQLConstants;
 import io.dataease.engine.constant.ExtFieldConstant;
 import io.dataease.engine.sql.SQLProvider;
 import io.dataease.engine.trans.Dimension2SQLObj;
@@ -44,7 +45,16 @@ public class TablePivotHandler extends GroupChartHandler {
             var originSql = result.getQuerySql();
             var dynamicAssistFields = getDynamicThresholdFields(view);
             var yAxis = formatResult.getAxisMap().get(ChartAxis.yAxis);
-            var assistFields = getAssistFields(dynamicAssistFields, yAxis);
+            var xAxis = formatResult.getAxisMap().get(ChartAxis.xAxis);
+            var dimAxis = new ArrayList<>(xAxis);
+            var xAxisExt = formatResult.getAxisMap().get(ChartAxis.xAxisExt);
+            if (xAxisExt != null) {
+                dimAxis.addAll(xAxisExt);
+            }
+            var yAssistFields = getAssistFields(dynamicAssistFields, yAxis);
+            var assistFields = new ArrayList<>(yAssistFields);
+            var xAssistFields = getAssistFields(dynamicAssistFields, dimAxis, SQLConstants.FIELD_ALIAS_X_PREFIX);
+            assistFields.addAll(xAssistFields);
             if (CollectionUtils.isNotEmpty(assistFields)) {
                 var req = new DatasourceRequest();
                 req.setIsCross(crossDs);
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue
index f4c98171d1..85198b9f2e 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue
@@ -425,7 +425,7 @@ onMounted(() => {
           />
         </el-select>
       </el-col>
-      <el-col :span="12" style="display: flex; align-items: center">
+      <el-col :offset="1" :span="11" style="display: flex; align-items: center">
         <el-radio-group
           class="icon-radio-group"
           v-model="alignConfig.align"
diff --git a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
index 9085bee5a2..0865b1f98b 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
@@ -726,7 +726,7 @@ export function getConditions(chart: Chart) {
     for (let i = 0; i < conditions.length; i++) {
       const fieldItem = conditions[i]
       if (!fieldItem.conditions) continue;
-      
+
       for (let j = 0; j < fieldItem.conditions.length; j++) {
         const rule = fieldItem.conditions[j]
         let targets = []
@@ -775,7 +775,7 @@ export function getConditions(chart: Chart) {
           if (rowData?.id && rowData?.field === rowData.id) {
             return null
           }
-          
+
           return {
             fill: mappingColor(value, defaultValueColor, rules, 'color', filedValueMap, rowData)
           }
@@ -811,7 +811,7 @@ export function getConditions(chart: Chart) {
 
 export function mappingColor(value, defaultColor, rules, type, filedValueMap?, rowData?) {
   let color = null
-  
+
   // If called from old code (rules is a single field object), adapt it
   if (rules && !Array.isArray(rules) && rules.conditions) {
       const field = rules;
@@ -823,12 +823,12 @@ export function mappingColor(value, defaultColor, rules, type, filedValueMap?, r
     let flag = false
     const t = rule
     let tv, max, min
-    
+
     let checkValue = value;
-    if (sourceField.dataeaseName && rowData) {
-        checkValue = rowData[sourceField.dataeaseName];
+    if (sourceField.dataeaseName && rowData?.[sourceField.dataeaseName]) {
+      checkValue = rowData[sourceField.dataeaseName]
     }
-    
+
     if (t.type === 'dynamic') {
       if (t.term === 'between') {
         max = parseFloat(getValue(t.dynamicMaxField, filedValueMap, rowData))
@@ -844,7 +844,7 @@ export function mappingColor(value, defaultColor, rules, type, filedValueMap?, r
         tv = t.value
       }
     }
-    
+
     const val = checkValue;
 
     if (sourceField.deType === 2 || sourceField.deType === 3 || sourceField.deType === 4) {
@@ -1012,7 +1012,7 @@ export function mappingColor(value, defaultColor, rules, type, filedValueMap?, r
       }
     }
   }
-  
+
   if (!color) {
       color = defaultColor;
   }