@publishfx/publish-chart 2.1.8 → 2.1.9

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+**2.1.9** feat(chart): 组合图折线色彩设置
+- 2026-03-04T16:45:43+08:00 [feat(chart): 组合图折线色彩设置](http://lf.git.oa.mt/publish_platform/web/publish/commit/2d456a5bd13fbed534b125a71955e8d18f62bbfc)
+- 2026-03-04T16:42:51+08:00 [feat(chart): 组合图副轴最大值逻辑复原](http://lf.git.oa.mt/publish_platform/web/publish/commit/6a1e758f64f6e7ef202c8089afecdd49580cf133)
+- 2026-03-04T16:28:16+08:00 [fix(chart): 解决缺数据场景下的tooltip问题](http://lf.git.oa.mt/publish_platform/web/publish/commit/163c2e4e4ca33c92179a505b18f8f4e03d4d5229)
+- 2026-03-04T16:18:04+08:00 [feat(chart): 固定组合图副轴最大值](http://lf.git.oa.mt/publish_platform/web/publish/commit/1dde15ae135b27676db7d57940dee63fb0c7d4cb)
+- 2026-03-04T16:06:17+08:00 [fix(chart): 修复空数据导致的tooltip异常问题](http://lf.git.oa.mt/publish_platform/web/publish/commit/59ddceb66f4bf9dc893cf68eb2be15464a53303c)
+- 2026-03-04T15:42:22+08:00 [feat(chart): 数据标签加粗](http://lf.git.oa.mt/publish_platform/web/publish/commit/3ab4756a4fdea0979e56de01e5e9581bed568625)
+- 2026-03-04T15:12:27+08:00 [feat(chart): 组合图颜色](http://lf.git.oa.mt/publish_platform/web/publish/commit/d448d5203de936018e95d8bcc301aaa877a64666)
+
 **2.1.8** feat(chart): 柱状、折线、组合图的节点单独传递
 - 2026-03-04T11:59:34+08:00 [feat(chart): 柱状、折线、组合图的节点单独传递](http://lf.git.oa.mt/publish_platform/web/publish/commit/5ef7b6c79b51438f7ae49edce74e060e5ffbd595)
 - 2026-03-04T11:45:15+08:00 [fix(chart): 将node信息单独传递](http://lf.git.oa.mt/publish_platform/web/publish/commit/20b4209876bd464ff63674480eb3a308e7007a02)

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

@@ -54,9 +54,9 @@ const transformDataToGroupBarLineFormat = (data, x = "groupName", y = "", indica
     }).flat();
 };
 const lineColors = [
-    "#FE765E",
-    "#945FB9",
-    "#FF99C3"
+    '#FA8C16',
+    '#7CB305',
+    '#5CDBD3'
 ];
 const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap, onChartClick, legend = "", config, nodeSetting = {
     showType: 0,

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

@@ -214,7 +214,7 @@ function applyHighlightDate(view, x, data, highlightDate, isHighlight) {
 }
 function applyNodeData(view, nodeData, x, y) {
     const nodeList = [];
-    nodeData.forEach((item)=>{
+    nodeData?.forEach((item)=>{
         view.shape().data([
             {
                 [x]: item[x],

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

@@ -151,6 +151,9 @@ function renderG2BarChart(container, options) {
         onNodeListChange?.(nodeList);
     }
     if (isDataTag && formatLabel) interval.label({
+        style: {
+            fontWeight: 600
+        },
         text: (d)=>formatLabel(d),
         position: isHorizontal ? 'right' : 'top',
         offset: 0,

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

@@ -128,7 +128,8 @@ function renderG2CombineChart(container, options) {
                     indicatorId: datum['groupType'],
                     channel: Y_AXIS_FIELD,
                     color: barColor || 'transparent',
-                    isCombine: false
+                    isCombine: false,
+                    x: datum[x]
                 },
             isCompare ? (datum)=>datum.groupType.includes('_compare') ? {
                     value: datum[BAR_Y_FIELD],
@@ -149,12 +150,12 @@ function renderG2CombineChart(container, options) {
                 } : false : false
         ].filter(Boolean)
     });
-    const lineData = data.filter((item)=>item.isCombine && !item.groupType.includes('_compare')).map((item)=>({
+    const lineData = data.filter((item)=>item.isCombine && !item.groupType.includes('_compare')).filter((item)=>'' !== item[Y_AXIS_FIELD]).map((item)=>({
             ...item,
             [LINE_Y_FIELD]: item[Y_AXIS_FIELD]
         }));
     console.log('renderG2CombineChart: line data:', lineData);
-    const compareLineData = data.filter((item)=>item.isCombine && item.groupType.includes('_compare')).map((item)=>({
+    const compareLineData = data.filter((item)=>item.isCombine && item.groupType.includes('_compare')).filter((item)=>'' !== item[Y_AXIS_FIELD]).map((item)=>({
             ...item,
             [LINE_Y_FIELD]: item[Y_AXIS_FIELD]
         }));
@@ -163,36 +164,28 @@ function renderG2CombineChart(container, options) {
     const compareLineMaxY = compareLineData.reduce((max, item)=>Math.max(max, item[LINE_Y_FIELD]), 0);
     const lineFinalMaxY = Math.max(lineMaxY, compareLineMaxY) || 1;
     const finalLineMax = Math.max(lineFinalMaxY, maxAux);
+    console.log('lineData:', lineData);
     const line = view.line().data(lineData).encode("x", x).encode("y", LINE_Y_FIELD).encode('color', 'groupType').style({
         lineWidth: 2,
         stroke: (datum)=>{
-            const groupTypeSet = new Set(lineData.map((item)=>item.groupType));
-            const groupTypeArr = [
-                ...groupTypeSet
-            ];
-            const groupType = String(datum[0]?.groupType ?? '');
-            const index = groupTypeArr.findIndex((item)=>item === groupType);
-            const color = lineColors[index] || lineColors[0];
-            return color;
+            const currentDatum = datum[0];
+            const item = legendItems.find((item)=>item.id === `${currentDatum?.groupType}_${currentDatum?.isCombine}`);
+            return item?.color || lineColors[0];
         }
     });
     line.tooltip({
         items: [
             (datum)=>{
-                const groupTypeSet = new Set(lineData.map((item)=>item.groupType));
-                const groupTypeArr = [
-                    ...groupTypeSet
-                ];
-                const groupType = String(datum?.groupType ?? '');
-                const index = groupTypeArr.findIndex((item)=>item === groupType);
+                const item = legendItems.find((item)=>item.id === `${datum?.groupType}_${datum?.isCombine}`);
                 return {
                     value: datum[LINE_Y_FIELD],
                     name: getIndicatorCompareName(_indicatorMap, datum['groupType']),
                     indicatorId: datum['groupType'],
                     channel: Y_AXIS_FIELD,
-                    color: lineColors[index] || lineColors[0],
+                    color: item?.color || lineColors[0],
                     isCombine: true,
-                    tipType: 'line'
+                    tipType: 'line',
+                    x: datum[x]
                 };
             }
         ]
@@ -257,7 +250,8 @@ function renderG2CombineChart(container, options) {
                     channel: Y_AXIS_FIELD,
                     color: lineColors[indicators.slice(1).indexOf(String(datum['groupType'])) ?? 0] || 'transparent',
                     isCombine: true,
-                    tipType: 'compareline'
+                    tipType: 'compareline',
+                    x: datum[x]
                 } : false,
             (datum)=>datum.groupType.includes('_compare') ? {
                     name: datum['groupType'].replace('_compare', '_change'),
@@ -266,7 +260,8 @@ function renderG2CombineChart(container, options) {
                     value: datum?.change,
                     isChange: true,
                     isCombine: true,
-                    tipType: 'compareline'
+                    tipType: 'compareline',
+                    x: datum[x]
                 } : false
         ].filter(Boolean)
     });
@@ -276,14 +271,30 @@ function renderG2CombineChart(container, options) {
         marker: false,
         render: (event, payload)=>{
             const { title, items } = payload;
+            console.log('tooltipRender:', title, items);
+            let safeTitle = title.replace(/,.*$/, '');
             const baseItems = items.filter((item)=>!item.isCombine);
+            const safeItems = baseItems.map((item)=>{
+                if (item.x !== safeTitle) return {
+                    ...item,
+                    value: '-'
+                };
+                return item;
+            });
             const combineItems = items.filter((item)=>item.isCombine);
+            const safeCombineItems = combineItems.map((item)=>{
+                if (item.x !== safeTitle) return {
+                    ...item,
+                    value: '-'
+                };
+                return item;
+            });
             const indicatorOrder = new Map(indicators.map((id, i)=>[
                     id,
                     i
                 ]));
             const sortedCombineItems = [
-                ...combineItems
+                ...safeCombineItems
             ].sort((a, b)=>{
                 const orderA = indicatorOrder.get(a.indicatorId) ?? 1 / 0;
                 const orderB = indicatorOrder.get(b.indicatorId) ?? 1 / 0;
@@ -295,8 +306,8 @@ function renderG2CombineChart(container, options) {
                 };
                 return typeRank(a) - typeRank(b);
             });
-            const content = tooltipRender(title, [
-                ...baseItems,
+            const content = tooltipRender(safeTitle, [
+                ...safeItems,
                 ...sortedCombineItems
             ]) ?? null;
             if (content) {
@@ -375,6 +386,9 @@ function renderG2CombineChart(container, options) {
                 dy: -16,
                 dx: -10,
                 offset: 0,
+                style: {
+                    fontWeight: 600
+                },
                 text: (d)=>{
                     if (!isGroup) return formatLabel(d);
                     if (lastItemsInEachStack.has(d)) return formatLabel(d);
@@ -386,6 +400,9 @@ function renderG2CombineChart(container, options) {
             dy: -10,
             dx: 10,
             offset: 0,
+            style: {
+                fontWeight: 600
+            },
             text: (d)=>formatLabel(d)
         });
         view.labelTransform([

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

@@ -139,12 +139,18 @@ function renderG2LineChart(container, options) {
             dy: -10,
             dx: -10,
             offset: 0,
+            style: {
+                fontWeight: 600
+            },
             text: (d)=>formatLabel(d)
         });
         compareLine.label({
             dy: -10,
             dx: -10,
             offset: 0,
+            style: {
+                fontWeight: 600
+            },
             text: (d)=>formatLabel(d)
         });
         view.labelTransform([

package/dist/components/g2/shared/G2CompareTooltip.js

@@ -4,6 +4,7 @@ import { CompareChange } from "@publishfx/publish-components";
 import { getIndicatorCompareName } from "../../../utils/indicatorHelpers.js";
 const G2CompareTooltip = ({ isGroupBar = false, title, items, safeIndicatorMap, formatter, safeLegend, auxiliaryLineData })=>{
     let auxiIndicatorId = "";
+    console.log('G2CompareTooltip:', items);
     const uniqueColors = [];
     return /*#__PURE__*/ jsxs("div", {
         style: {

package/package.json

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