@publishfx/publish-chart 2.1.33 → 2.1.35

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+**2.1.35** fix(chart): 组合图需要highlightDate依赖侦听
+- 2026-03-19T19:24:40+08:00 [fix(chart): 组合图需要highlightDate依赖侦听](http://lf.git.oa.mt/publish_platform/web/publish/commit/5bd7170d6dd7707c06a7a14f944a8317642ccf2f)
+
+**2.1.34** fix(chart): 修复组合图有缺失项时导致的排序不符合预期的问题
+- 2026-03-13T18:27:29+08:00 [fix(chart): 修复组合图有缺失项时导致的排序不符合预期的问题](http://lf.git.oa.mt/publish_platform/web/publish/commit/22494114c4fe99d7a63b434a6b48f1d4ad0fd58e)
+
 **2.1.33** fix(chart): 修复几个问题
 - 2026-03-13T15:39:21+08:00 [fix(chart): 修复几个问题](http://lf.git.oa.mt/publish_platform/web/publish/commit/8007ec69939e98bacdb694b917c73fff6f8254d2)
 - 2026-03-11T16:17:35+08:00 [fix(chart): 离线分析compareTimeValue为空时补充字符。](http://lf.git.oa.mt/publish_platform/web/publish/commit/9f042730b66e8378c90400981cd86376e8b3018d)

package/dist/components/g2/base/G2CombineChart.js

@@ -172,7 +172,7 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
         const result = leftData.filter((d)=>d.groupType ? activeIds.includes(String(d.groupType.replace("_compare", "") + "_" + d.isCombine)) : true);
         if (!isGroupRef.current) return result;
         {
-            const groupTypes = Array.from(new Set(result.map((d)=>d.groupType)));
+            const groupTypes = Array.from(new Set(result.map((d)=>String(d.groupType))));
             const groupNameTotalMap = result.reduce((acc, item)=>{
                 const groupName = String(item.groupName);
                 const value = "" === item.groupValue || "-" === item.groupValue ? 0 : Number(item.groupValue) || 0;
@@ -184,23 +184,38 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
                 const key = String(item.groupName);
                 if (!leftDataOrder.has(key)) leftDataOrder.set(key, leftDataOrder.size);
             });
+            const orderedGroupNames = Array.from(new Set(result.map((item)=>String(item.groupName)))).sort((a, b)=>{
+                if (isDescend) {
+                    const aTotal = groupNameTotalMap[a] ?? 0;
+                    const bTotal = groupNameTotalMap[b] ?? 0;
+                    if (aTotal !== bTotal) return bTotal - aTotal;
+                }
+                const aIndex = leftDataOrder.get(a);
+                const bIndex = leftDataOrder.get(b);
+                if (void 0 === aIndex && void 0 === bIndex) return xKey.indexOf(a) - xKey.indexOf(b);
+                if (void 0 === aIndex) return 1;
+                if (void 0 === bIndex) return -1;
+                return aIndex - bIndex;
+            });
             let groupResult = [];
             groupTypes.forEach((groupType)=>{
-                const groupData = leftData.filter((d)=>d.groupType === groupType).map((d)=>({
+                const groupDataMap = new Map();
+                leftData.filter((d)=>d.groupType === groupType).forEach((d)=>{
+                    groupDataMap.set(String(d.groupName), {
                         ...d
-                    }));
-                groupData.sort((a, b)=>{
-                    if (isDescend) {
-                        const aTotal = groupNameTotalMap[String(a.groupName)] ?? 0;
-                        const bTotal = groupNameTotalMap[String(b.groupName)] ?? 0;
-                        if (aTotal !== bTotal) return bTotal - aTotal;
-                    }
-                    const aIndex = leftDataOrder.get(String(a.groupName));
-                    const bIndex = leftDataOrder.get(String(b.groupName));
-                    if (void 0 === aIndex && void 0 === bIndex) return xKey.indexOf(a.groupName) - xKey.indexOf(b.groupName);
-                    if (void 0 === aIndex) return 1;
-                    if (void 0 === bIndex) return -1;
-                    return aIndex - bIndex;
+                    });
+                });
+                const groupData = orderedGroupNames.map((groupName)=>{
+                    const existed = groupDataMap.get(groupName);
+                    if (existed) return existed;
+                    return {
+                        groupName,
+                        isCombine: false,
+                        groupType,
+                        groupValue: null,
+                        total: 0,
+                        percent: ""
+                    };
                 });
                 groupResult = groupResult.concat(groupData);
             });
@@ -372,6 +387,7 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
         onChartClick,
         isLegend,
         isHighlight,
+        highlightDate,
         legendItems,
         auxiliaryLineData,
         leftData,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@publishfx/publish-chart",
-  "version": "2.1.33",
+  "version": "2.1.35",
   "description": "A React chart component library for the Publish platform, including BarChart, LineChart, BarLineChart and other visualization components",
   "type": "module",
   "keywords": [