@publishfx/publish-chart 2.1.1 → 2.1.3

package/CHANGELOG.md

@@ -1,4 +1,13 @@
-**2.1.1** feat(chart): 柱状图支持crossharisY
+**2.1.3** fix(chart): 组合图分组时inset置为0
+- 2026-02-28T23:48:20+08:00 [fix(chart): 组合图分组时inset置为0](http://lf.git.oa.mt/publish_platform/web/publish/commit/047e02d3cfbce21101277f48e904864163b2a02c)
+- 2026-02-28T22:42:20+08:00 [feat(chart): 组合图tooltip数据调整](http://lf.git.oa.mt/publish_platform/web/publish/commit/f79461050699b0755c8837e26b035083ec980cf1)
+- 2026-02-28T20:42:35+08:00 [feat(chart): 组合图默认值](http://lf.git.oa.mt/publish_platform/web/publish/commit/97613e165dc16ff1d415e01facafa11db4125a24)
+- 2026-02-28T20:42:08+08:00 [feat(chart): 组合图tooltips](http://lf.git.oa.mt/publish_platform/web/publish/commit/910af4376c2149ed44816d3eae4a3188f2601f54)
+- 2026-02-28T20:31:15+08:00 [feat(chart): 组合图增加着重日功能](http://lf.git.oa.mt/publish_platform/web/publish/commit/f88ce5905022454d3ac611cd16de73f6ae8c8d12)
+- 2026-02-28T20:08:16+08:00 [feat(chart): 设置着重interval的ratio为0.6](http://lf.git.oa.mt/publish_platform/web/publish/commit/057cb33eabe87d077b46b6271eea63a5e2879640)
+- 2026-02-28T20:02:39+08:00 [fix(chart): 修复组合图的ts错误](http://lf.git.oa.mt/publish_platform/web/publish/commit/a01f19528e46ee13d39f6de85c8ffc5fa9405ec5)
+- 2026-02-28T19:10:04+08:00 [feat(chart): 组合图支持分组](http://lf.git.oa.mt/publish_platform/web/publish/commit/525c1bbe47027ca3c4550adfea1c36e43c4dad34)
+- 2026-02-28T18:45:52+08:00 [feat(chart): 着重日逻辑优化](http://lf.git.oa.mt/publish_platform/web/publish/commit/3d57801fccaf67f69d3c08d19cc750fa36a2fa42)
 - 2026-02-28T18:37:26+08:00 [feat(chart): 柱状图支持crossharisY](http://lf.git.oa.mt/publish_platform/web/publish/commit/b77a0932f1710144915d209c0186640bafdff492)
 
 **2.1.1** feat(chart): 柱状图支持crossharisY

package/dist/adapters/DataAdapter.d.ts

@@ -1,5 +1,5 @@
 export interface TransformConfig {
-    type: 'bar' | 'groupBar' | 'line' | 'barLine' | 'groupCompare';
+    type: 'bar' | 'groupBar' | 'line' | 'barLine' | 'groupBarLine' | 'groupCompare';
     x?: string;
     y?: string;
     z?: string;
@@ -30,6 +30,10 @@ export declare class DataAdapter {
      * 柱状折线组合图数据转换
      */
     private static transformForBarLine;
+    /**
+   * 分组柱状折线组合图数据转换
+   */
+    private static transformForGroupBarLine;
     /**
      * 分组对比图数据转换
      */

package/dist/adapters/DataAdapter.js

@@ -11,6 +11,8 @@ class DataAdapter {
                 return this.transformForLine(data, config);
             case 'barLine':
                 return this.transformForBarLine(data, config);
+            case 'groupBarLine':
+                return this.transformForGroupBarLine(data, config);
             case 'groupCompare':
                 return this.transformForGroupCompare(data, config);
             default:
@@ -33,7 +35,7 @@ class DataAdapter {
                 callback: (a, b)=>{
                     if ('-' === a[config.y]) return config.isHorizontal ? -1 : 1;
                     if ('-' === b[config.y]) return config.isHorizontal ? 1 : -1;
-                    return config.isHorizontal ? a[config.y] - b[config.y] : b[config.y] - a[config.y];
+                    return b[config.y] - a[config.y];
                 }
             });
         }
@@ -129,6 +131,71 @@ class DataAdapter {
         });
         return dv.rows;
     }
+    static transformForGroupBarLine(data, config) {
+        const ds = new lib();
+        const dv = ds.createView().source(data);
+        const tdv = ds.createView().source(data);
+        if (config.y && config.x) {
+            dv.transform({
+                type: 'map',
+                callback: (row)=>{
+                    row[config.y] = '' !== row[config.y] ? +row[config.y] : '-';
+                    return row;
+                }
+            });
+            tdv.transform({
+                type: 'map',
+                callback: (row)=>{
+                    row[config.y] = '' !== row[config.y] ? +row[config.y] : '-';
+                    return row;
+                }
+            });
+            tdv.transform({
+                type: 'filter',
+                callback (row) {
+                    return !row.isCombine;
+                }
+            });
+            tdv.transform({
+                type: 'filter',
+                callback (row) {
+                    return !row[config.y] || '-' !== row[config.y];
+                }
+            });
+            tdv.transform({
+                type: 'aggregate',
+                fields: [
+                    config.y
+                ],
+                groupBy: [
+                    config.x
+                ],
+                operations: [
+                    'sum'
+                ],
+                as: [
+                    'total'
+                ]
+            });
+            tdv.transform({
+                type: 'sort',
+                callback (a, b) {
+                    return b.total - a.total;
+                }
+            });
+            const xKey = config.x ?? 'x';
+            const sortData = tdv.rows.map((item)=>item[xKey]);
+            if (config.isDescend) dv.transform({
+                type: 'sort',
+                callback (a, b) {
+                    if (-1 === sortData.indexOf(a[xKey])) return 1;
+                    if (-1 === sortData.indexOf(b[xKey])) return -1;
+                    return sortData.indexOf(a[xKey]) - sortData.indexOf(b[xKey]);
+                }
+            });
+        }
+        return dv.rows;
+    }
     static transformForGroupCompare(data, _config) {
         return data;
     }

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

@@ -60,18 +60,26 @@ const lineColors = [
 const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap, onChartClick, legend = "", config, nodeSetting = {
     showType: 0,
     type: []
-}, indicators = [], auxiliaryLineData, highlightDate, timeRange })=>{
+}, indicators = [], auxiliaryLineData, highlightDate, timeRange, isGroup })=>{
     const { formatter, dataTransform, config: contextConfig } = useChartContext();
     const tooltipContainerRef = useG2TooltipContainer();
-    console.log("G2CombineChart props:", data, x, y, z, indicatorMap, indicators, legend, config, nodeSetting);
+    console.log("G2CombineChart props:", data, x, y, z, indicators, legend, config, nodeSetting);
     const themeColors = contextConfig?.theme?.colors || [];
     const safeIndicatorMap = indicatorMap || contextConfig.indicatorMap || {};
-    const safeLegend = "groupType" !== legend ? legend || y : y;
+    const safeLegend = useMemo(()=>{
+        if (isGroup) return legend || 'groupType';
+        if ("groupType" === legend) return y;
+        return legend || y;
+    }, [
+        isGroup,
+        legend,
+        y
+    ]);
     const safeZ = z;
     const safeY = "groupValue";
     const isCompare = timeRange?.compareStartTime !== "";
     const chartConfig = config || {};
-    const { isDataTag = false, isLegend = true } = chartConfig;
+    const { isDataTag = false, isLegend = true, isDescend = false } = chartConfig;
     const [xyList, setXYList] = useState([]);
     const [activeIds, setActiveIds] = useState([]);
     const [legendItems, setLegendItems] = useState([]);
@@ -81,7 +89,12 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
             data = result;
         }
         console.log("G2CombineChart transformedData2:", data);
-        const result = DataAdapter.transform(data, "barLine", {
+        const result = isGroup ? DataAdapter.transform(data, "groupBarLine", {
+            type: "barLine",
+            x,
+            y: safeY,
+            isDescend
+        }) : DataAdapter.transform(data, "barLine", {
             type: "barLine",
             x,
             y: safeY,
@@ -89,6 +102,7 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
         });
         return result.map((item)=>dataTransform.processNodeInfo(item, contextConfig.nodeMap));
     }, [
+        isGroup,
         data,
         x,
         safeY,
@@ -98,11 +112,13 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
     ]);
     console.log("G2CombineChart transformedData:", transformedData);
     const { maxY } = useMemo(()=>{
-        const yValues = transformedData.filter((item)=>"-" !== item[safeY] && void 0 !== item[safeY] && null !== item[safeY]).map((item)=>Number(item[safeY]) || 0);
+        const key = isGroup ? "total" : safeY;
+        const yValues = transformedData.filter((item)=>"-" !== item[key] && void 0 !== item[key] && null !== item[key]).map((item)=>Number(item[key]) || 0);
         return {
             maxY: yValues.length > 0 ? Math.max(...yValues) : 0
         };
     }, [
+        isGroup,
         transformedData,
         safeY
     ]);
@@ -121,21 +137,25 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
             return;
         }
         const groupTypes = Array.from(new Set(transformedData.map((d)=>d.groupType.replace("_compare", "") + "_" + d.isCombine).filter((v)=>null != v)));
+        const lineGroupTypeArr = groupTypes.filter((v)=>"true" === v.split("_")[1]);
         const items = groupTypes.map((id, index)=>{
             const colorIndex = index;
             const indicatorId = id.split("_")[0];
-            const color = 0 === colorIndex ? themeColors[colorIndex] : lineColors[colorIndex - 1];
+            const isCombine = "true" === id.split("_")[1];
+            const lineGroupTypeIndex = lineGroupTypeArr.indexOf(id);
+            const color = isGroup ? isCombine ? lineColors[lineGroupTypeIndex] || lineColors[0] : themeColors[colorIndex] || themeColors[0] : 0 === colorIndex ? themeColors[colorIndex] : lineColors[colorIndex - 1];
             return {
                 id,
-                label: getIndicatorCompareName(safeIndicatorMap, String(indicatorId)) + (String(indicatorId).includes("_compare") ? `（对比时间：${timeRange?.compareStartTime}~${timeRange?.compareEndTime}）` : ""),
+                label: isGroup ? isCombine ? getIndicatorCompareName(safeIndicatorMap, String(indicatorId)) : indicatorId : getIndicatorCompareName(safeIndicatorMap, String(indicatorId)) + (String(indicatorId).includes("_compare") ? `（对比时间：${timeRange?.compareStartTime}~${timeRange?.compareEndTime}）` : ""),
                 color,
                 isCompare: String(indicatorId).includes("_compare"),
-                symbol: 0 === colorIndex ? "square" : "line"
+                symbol: isGroup ? isCombine ? 'line' : 'square' : 0 === colorIndex ? "square" : "line"
             };
         });
         setLegendItems(items);
         if (!activeIds.length) setActiveIds(items.map((i)=>i.id));
     }, [
+        isGroup,
         transformedData,
         safeIndicatorMap,
         themeColors,
@@ -177,7 +197,7 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
             height: height - canvasMarginBottom,
             formatLabel: isDataTag ? (d)=>{
                 const indicatorId = d.groupType.split("_")[0];
-                return "-" === formatter.formatIndicator(d.groupValue, safeIndicatorMap[indicatorId]) ? "" : formatter.formatIndicator(d.groupValue, safeIndicatorMap[indicatorId]);
+                return isGroup ? d.isCombine ? "-" === formatter.formatIndicator(d.groupValue, safeIndicatorMap[z]) ? "" : formatter.formatIndicator(d.groupValue, safeIndicatorMap[z]) : "-" === formatter.formatIndicator(d['total'], safeIndicatorMap[y]) ? "" : formatter.formatIndicator(d['total'], safeIndicatorMap[y]) : "-" === formatter.formatIndicator(d.groupValue, safeIndicatorMap[indicatorId]) ? "" : formatter.formatIndicator(d.groupValue, safeIndicatorMap[indicatorId]);
             } : void 0,
             indicators,
             tooltipRender: (title, items)=>{
@@ -187,8 +207,9 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
                         ...i,
                         color: i.color ?? themeColors[0] ?? "#5B8FF9"
                     }));
-                console.log("safeItems:", safeItems);
+                safeItems = safeItems.filter((i)=>i.indicatorId);
                 react_dom.render(/*#__PURE__*/ jsx(G2CompareTooltip, {
+                    isGroupBar: isGroup,
                     title: title,
                     items: safeItems,
                     safeIndicatorMap: safeIndicatorMap,
@@ -210,7 +231,10 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
                     setViewOffset((layout.paddingLeft ?? 0) + (layout.marginLeft ?? 0));
                 }
             },
-            lineColors
+            lineColors,
+            isGroup,
+            legendItems,
+            indicatorId: y
         });
         chartRef.current = chart;
         if (onChartClick) chart.on("element:click", (e)=>{
@@ -237,7 +261,9 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
         safeIndicatorMap,
         formatter,
         formatAxis,
-        onChartClick
+        onChartClick,
+        isGroup,
+        legendItems
     ]);
     if (!z) return /*#__PURE__*/ jsx("div", {
         style: {

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

@@ -153,11 +153,14 @@ function applyHighlightDate(view, x, data, highlightDate, isHighlight) {
         domainMax: 100,
         independent: true
     }).tooltip(false).axis('y', {
+        position: 'right',
         title: false,
         grid: false,
-        label: false
+        label: false,
+        tick: false
     });
     highlightInterval.style({
+        columnWidthRatio: 0.6,
         fill: '#cccccc',
         fillOpacity: isHighlight ? 0.3 : 0
     });
@@ -169,7 +172,8 @@ function applyHighlightDate(view, x, data, highlightDate, isHighlight) {
     }).tooltip(true).axis('y', {
         title: false,
         grid: false,
-        label: false
+        label: false,
+        tick: false
     }).style({
         stroke: 'transparent',
         strokeOpacity: 0

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

@@ -45,10 +45,12 @@ function renderG2BarChart(container, options) {
     interval.style({
         columnWidthRatio: 0.6,
         insetLeft: (_d, index, _data, _column)=>{
+            if (isHorizontal) return 0;
             if (isCompare) return index % 2 === 0 ? 4 : 0;
             return 4;
         },
         insetRight: (_d, index, _data, _column)=>{
+            if (isHorizontal) return 0;
             if (isCompare) return index % 2 === 1 ? 4 : 0;
             return 4;
         },

package/dist/components/g2/base/g2combine.d.ts

@@ -64,6 +64,15 @@ export interface RenderG2CombineChartOptions {
     onChartRender?: (chartProps: {
         layout: any;
     }) => void;
+    /** 是否为分组柱状（影响 legend / tooltip 文案） */
+    isGroup?: boolean;
+    /** 图例项列表（用于 tooltip 取色与文案） */
+    legendItems?: Array<{
+        id: string;
+        [key: string]: any;
+    }>;
+    /** 当前指标 id（用于 tooltip 展示） */
+    indicatorId?: string;
 }
 /**
  * 在容器上渲染 G2 柱状 + 折线组合图，返回 Chart 实例便于 destroy/更新

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

@@ -1,10 +1,11 @@
 import { lines } from "@antv/g-pattern";
-import { applyAxisX, createChart, getMainView } from "./g2Helpers.js";
+import { applyAxisX, applyHighlightDate, createChart, getMainView } from "./g2Helpers.js";
+import { getIndicatorCompareName } from "../../../utils/indicatorHelpers.js";
 const Y_AXIS_FIELD = 'groupValue';
 const BAR_Y_FIELD = 'barValue';
 const LINE_Y_FIELD = 'lineValue';
 function renderG2CombineChart(container, options) {
-    const { data, x, y, z: _z, maxY, themeColors, indicatorMap: _indicatorMap, formatAxis, formatLineAxis, isDataTag = false, isLegend: _isLegend = false, isCompare = false, formatLabel, highlightDate = [], height = 300, isHighlight = true, indicators = [], tooltipRender, onNodeListChange, lineColors, onChartRender } = options;
+    const { data, x, y, z: _z, maxY, themeColors, indicatorMap: _indicatorMap, formatAxis, formatLineAxis, isDataTag = false, isLegend: _isLegend = false, isCompare = false, formatLabel, highlightDate = [], height = 300, isHighlight = true, indicators = [], tooltipRender, onNodeListChange, lineColors, onChartRender, isGroup, legendItems = [], indicatorId } = options;
     const chart = createChart({
         container,
         height,
@@ -21,28 +22,42 @@ function renderG2CombineChart(container, options) {
     view.data(data);
     applyAxisX(view, {
         title: false,
-        grid: true,
-        gridStroke: '#333',
-        gridLineWidth: 50,
-        gridLineDash: [
-            1000
-        ],
-        gridFilter: highlightDate.length > 0 && isHighlight ? (val)=>highlightDate.includes(val?.label) : ()=>false
+        grid: false
     });
     const barColor = themeColors[0] ?? "#5B8FF9";
-    console.log('tooltip: themeColors:', themeColors[0], barColor);
+    console.log('tooltip: themeColors:', themeColors[0], barColor, isGroup);
     console.log('renderG2CombineChart interval data:', data.filter((item)=>!item.isCombine));
+    applyHighlightDate(view, x, data, highlightDate, isHighlight);
     const intervalData = data.filter((item)=>!item.isCombine).map((item)=>({
             ...item,
             [BAR_Y_FIELD]: item[Y_AXIS_FIELD]
         }));
-    const intervalMaxY = intervalData.reduce((max, item)=>Math.max(max, item[BAR_Y_FIELD]), 0);
-    const interval = view.interval().data(intervalData).encode("x", x).encode("y", BAR_Y_FIELD).encode("color", "groupType").transform({
-        type: 'dodgeX'
+    const intervalMaxY = intervalData.reduce((max, item)=>{
+        const key = isGroup ? "total" : BAR_Y_FIELD;
+        return Math.max(max, item[key]);
+    }, 0);
+    const interval = view.interval().data(intervalData).encode("x", x).encode("y", BAR_Y_FIELD).encode("color", "groupType").transform(isGroup ? {
+        type: 'stackY',
+        reverse: true
+    } : {
+        type: 'dodgeX',
+        padding: 0
     }).style({
-        columnWidthRatio: 0.5,
+        columnWidthRatio: 0.6,
+        insetLeft: (_d, index, _data, _column)=>{
+            if (isGroup) return 0;
+            if (isCompare) return index % 2 === 0 ? 4 : 0;
+            return 4;
+        },
+        insetRight: (_d, index, _data, _column)=>{
+            if (isGroup) return 0;
+            if (isCompare) return index % 2 === 1 ? 4 : 0;
+            return 4;
+        },
         fill: (datum)=>{
             const groupType = String(datum.groupType ?? '');
+            const index = legendItems.findIndex((item)=>item.id === `${groupType}_${datum.isCombine}`);
+            if (isGroup) return themeColors[index % themeColors.length] ?? themeColors[0] ?? "#5B8FF9";
             if (groupType.includes('_compare')) return {
                 image: lines({
                     backgroundColor: '#fff',
@@ -84,13 +99,28 @@ function renderG2CombineChart(container, options) {
     });
     console.log('tooltip:', barColor, isCompare);
     interval.tooltip({
-        items: [
+        items: isGroup ? [
+            (datum)=>{
+                const groupType = String(datum.groupType ?? '');
+                const index = legendItems.findIndex((item)=>item.id === `${groupType}_${datum.isCombine}`);
+                return {
+                    value: datum[Y_AXIS_FIELD],
+                    name: datum['groupType'],
+                    indicatorId,
+                    channel: Y_AXIS_FIELD,
+                    color: themeColors[index % themeColors.length] ?? themeColors[0] ?? "#5B8FF9",
+                    percent: `${(100 * Number(datum.percent)).toFixed(2)}%`,
+                    isCombine: false
+                };
+            }
+        ].filter(Boolean) : [
             (datum)=>datum.groupType.includes('_compare') ? false : {
                     value: datum[BAR_Y_FIELD],
                     name: datum['groupType'],
                     indicatorId: datum['groupType'],
                     channel: Y_AXIS_FIELD,
-                    color: barColor || 'transparent'
+                    color: barColor || 'transparent',
+                    isCombine: false
                 },
             isCompare ? (datum)=>datum.groupType.includes('_compare') ? {
                     value: datum[BAR_Y_FIELD],
@@ -98,14 +128,16 @@ function renderG2CombineChart(container, options) {
                     name: datum['groupType'],
                     indicatorId: datum['groupType'].replace('_compare', ''),
                     channel: Y_AXIS_FIELD,
-                    color: barColor || 'transparent'
+                    color: barColor || 'transparent',
+                    isCombine: false
                 } : false : false,
             isCompare ? (datum)=>datum.groupType.includes('_compare') ? {
                     name: datum['groupType'].replace('_compare', '_change'),
                     indicatorId: datum['groupType'].replace('_compare', ''),
                     value: datum?.change,
                     isChange: true,
-                    color: 'transparent'
+                    color: 'transparent',
+                    isCombine: false
                 } : false : false
         ].filter(Boolean)
     });
@@ -118,6 +150,7 @@ function renderG2CombineChart(container, options) {
             ...item,
             [LINE_Y_FIELD]: item[Y_AXIS_FIELD]
         }));
+    console.log('compareLineData:', compareLineData);
     const lineMaxY = lineData.reduce((max, item)=>Math.max(max, item[LINE_Y_FIELD]), 0);
     const compareLineMaxY = compareLineData.reduce((max, item)=>Math.max(max, item[LINE_Y_FIELD]), 0);
     const lineFinalMaxY = Math.max(lineMaxY, compareLineMaxY);
@@ -125,20 +158,35 @@ function renderG2CombineChart(container, options) {
     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 color = lineColors[indicators.slice(1).indexOf(String(groupType)) ?? 0];
+            const index = groupTypeArr.findIndex((item)=>item === groupType);
+            const color = isGroup ? lineColors[index] || lineColors[0] : lineColors[indicators.slice(1).indexOf(String(groupType)) ?? 0];
             return color;
         }
     });
     line.tooltip({
         items: [
-            (datum)=>({
+            (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);
+                return {
                     value: datum[LINE_Y_FIELD],
-                    name: datum['groupType'],
+                    name: isGroup ? getIndicatorCompareName(_indicatorMap, datum['groupType']) : datum['groupType'],
                     indicatorId: datum['groupType'],
                     channel: Y_AXIS_FIELD,
-                    color: lineColors[indicators.slice(1).indexOf(String(datum['groupType'])) ?? 0] || 'transparent'
-                })
+                    color: isGroup ? lineColors[index] || lineColors[0] : lineColors[indicators.slice(1).indexOf(String(datum['groupType'])) ?? 0] || 'transparent',
+                    isCombine: true,
+                    tipType: 'line'
+                };
+            }
         ]
     });
     line.scale('y', {
@@ -188,32 +236,45 @@ function renderG2CombineChart(container, options) {
     console.log('hasCompareData:', hasCompareData, data);
     if (hasCompareData) compareLine.tooltip({
         items: [
-            (datum)=>({
+            (datum)=>datum.groupType.includes('_compare') ? {
                     value: datum[LINE_Y_FIELD],
                     compareTime: datum?.compareTime,
                     name: datum['groupType'],
                     indicatorId: datum['groupType'].replace('_compare', ''),
                     channel: Y_AXIS_FIELD,
-                    color: lineColors[indicators.slice(1).indexOf(String(datum['groupType'])) ?? 0] || 'transparent'
-                }),
-            (datum)=>({
+                    color: lineColors[indicators.slice(1).indexOf(String(datum['groupType'])) ?? 0] || 'transparent',
+                    isCombine: true,
+                    tipType: 'compareline'
+                } : false,
+            (datum)=>datum.groupType.includes('_compare') ? {
                     name: datum['groupType'].replace('_compare', '_change'),
                     indicatorId: datum['groupType'].replace('_compare', ''),
+                    color: 'blue',
                     value: datum?.change,
                     isChange: true,
-                    color: 'transparent'
-                })
-        ]
+                    isCombine: true,
+                    tipType: 'compareline'
+                } : false
+        ].filter(Boolean)
     });
-    if (tooltipRender) line.interaction('tooltip', {
+    if (tooltipRender) view.interaction('tooltip', {
         shared: true,
         crosshairsY: true,
         marker: false,
         render: (_event, payload)=>{
             const { title, items } = payload;
+            const baseItems = items.filter((item)=>!item.isCombine);
+            const combineItems = items.filter((item)=>item.isCombine);
             console.log('tooltipRender:', title, items, indicators);
+            if (isGroup) return tooltipRender(title, [
+                ...baseItems,
+                ...combineItems
+            ]) ?? null;
             if (indicators.length) {
-                const groupedItems = indicators.map((indicator)=>items.filter((i)=>i.indicatorId === String(indicator)));
+                const groupedItems = indicators.map((indicator, index)=>{
+                    if (0 === index) return items.filter((i)=>!i.isCombine).filter((i)=>i.indicatorId === String(indicator));
+                    return items.filter((i)=>i.isCombine).filter((i)=>i.indicatorId === String(indicator));
+                });
                 console.log(groupedItems.flat(), 'tooltip groupedItems');
                 const sortedItems = groupedItems.map((group)=>[
                         group.filter((i)=>i.name === i.indicatorId),
@@ -223,8 +284,9 @@ function renderG2CombineChart(container, options) {
                 console.log(sortedItems, 'tooltip sortedItems');
                 const formatItems = sortedItems.map((item)=>({
                         ...item,
-                        color: lineColors[indicators.slice(1).indexOf(String(item?.indicatorId)) ?? 0] || barColor || 'transparent'
+                        color: item.isCombine ? lineColors[indicators.slice(1).indexOf(String(item?.indicatorId)) ?? 0] || barColor || 'transparent' : barColor || 'transparent'
                     }));
+                console.log(formatItems, 'tooltip formatItems');
                 return tooltipRender(title, formatItems ?? []) ?? null;
             }
         }
@@ -293,11 +355,27 @@ function renderG2CombineChart(container, options) {
         });
     });
     if (isDataTag && formatLabel) {
+        const groupedByX = intervalData.reduce((acc, item)=>{
+            const key = item[x];
+            if (!acc[key]) acc[key] = [];
+            acc[key].push(item);
+            return acc;
+        }, {});
+        const lastItemsInEachStack = new Set();
+        Object.values(groupedByX).forEach((group)=>{
+            group.sort((a, b)=>a[y] - b[y]);
+            const lastItem = group[group.length - 1];
+            lastItemsInEachStack.add(lastItem);
+        });
         interval.label({
-            dy: -10,
+            dy: isGroup ? -16 : -10,
             dx: -10,
             offset: 0,
-            text: (d)=>formatLabel(d)
+            text: (d)=>{
+                if (!isGroup) return formatLabel(d);
+                if (lastItemsInEachStack.has(d)) return formatLabel(d);
+                return '';
+            }
         });
         line.label({
             dy: -10,

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

@@ -53,7 +53,8 @@ function renderG2GroupBarChart(container, options) {
                 transform: 'rotate(-30deg)'
             };
             return themeColors[index % themeColors.length] ?? themeColors[0] ?? "#5B8FF9";
-        }
+        },
+        stroke: 'transparent'
     });
     applyAxisX(view, {
         title: false,

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

@@ -30,10 +30,10 @@ function renderG2LineChart(container, options) {
         clamp: true
     });
     applyHighlightDate(view, x, data, highlightDate, isHighlight);
-    console.log('g2linets:', x, Y_AXIS_FIELD, data);
-    const line = view.line().data(data.filter((item)=>!item.groupType.includes('_compare'))).encode('x', x).encode('y', Y_AXIS_FIELD).encode('color', 'groupType').style({
+    console.log('g2linets:', x, Y_AXIS_FIELD, data, indicators);
+    const line = view.line().data(data.filter((item)=>!item.groupType.includes('_compare'))).encode('x', x).encode('y', Y_AXIS_FIELD).encode('color', 'groupType').encode('series', 'groupType').style({
         lineWidth: 2,
-        stroke: (_datum, index)=>themeColors[index] ?? themeColors[0]
+        stroke: (datum)=>getColorByGroupType(datum[0]?.groupType ?? '', colorOpts)
     });
     const compareLine = view.line().data(data.filter((item)=>item.groupType.includes('_compare'))).encode('x', x).encode('y', Y_AXIS_FIELD).encode('color', 'groupType').style({
         lineDash: [
@@ -41,7 +41,7 @@ function renderG2LineChart(container, options) {
             4
         ],
         lineWidth: 2,
-        stroke: (_datum, index)=>themeColors[index] ?? themeColors[0]
+        stroke: (datum)=>getColorByGroupType(datum[0]?.groupType ?? '', colorOpts)
     });
     applyAxisX(view, {
         grid: false

package/dist/core/ChartTypes.d.ts

@@ -98,6 +98,8 @@ export interface BaseChartProps {
     auxiliaryLineData?: AuxiliaryLineData[];
     /** 高亮日期数组 */
     highlightDate?: string[];
+    /** 是否为分组柱状（组合图等场景） */
+    isGroup?: boolean;
 }
 /**
  * 业务组件 Props（可选，通过 Context 注入）

package/package.json

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