@publishfx/publish-chart 2.1.14 → 2.1.17

package/dist/adapters/DataAdapter.js

@@ -115,6 +115,7 @@ class DataAdapter {
     static transformForBarLine(data, config) {
         const ds = new lib();
         const dv = ds.createView().source(data);
+        const allKeys = new Set(dv.rows.map((item)=>item[config.x || 'x']));
         const tdv = ds.createView().source(data);
         const combinedv = ds.createView().source(data);
         if (config.y && config.x) {
@@ -144,14 +145,6 @@ class DataAdapter {
                     return row.isCombine;
                 }
             });
-            console.log('tdv:', tdv.rows);
-            tdv.transform({
-                type: 'filter',
-                callback (row) {
-                    return !row[config.y] || '-' !== row[config.y];
-                }
-            });
-            console.log('tdv:', tdv.rows);
             if (config.isDescend) tdv.transform({
                 type: 'sort',
                 callback (a, b) {
@@ -159,20 +152,19 @@ class DataAdapter {
                 }
             });
             const xKey = config.x ?? 'x';
-            const sortData = tdv.rows.map((item)=>item[xKey]);
             combinedv.rows.sort((a, b)=>{
-                const aIndex = sortData.indexOf(a[xKey]);
-                const bIndex = sortData.indexOf(b[xKey]);
+                const aIndex = allKeys.has(a[xKey]) ? Array.from(allKeys).indexOf(a[xKey]) : -1;
+                const bIndex = allKeys.has(b[xKey]) ? Array.from(allKeys).indexOf(b[xKey]) : -1;
                 if (-1 === aIndex) return 1;
                 if (-1 === bIndex) return -1;
                 return aIndex - bIndex;
             });
         }
-        console.log('leftData:', tdv.rows, 'rightData:', combinedv.rows);
         return {
             transformedData: dv.rows,
             leftData: tdv.rows,
-            rightData: combinedv.rows
+            rightData: combinedv.rows,
+            xKey: Array.from(allKeys)
         };
     }
     static transformForGroupCompare(data, _config) {

package/dist/components/base/BarChart.js

@@ -154,7 +154,6 @@ const BarChart = ({ height = 300, data, x = "", y = "", indicatorMap, onChartCli
             },
             appendPadding: padding,
             onPointMouseover: (e)=>{
-                console.log("onPointMouseover", nodeSetting.showType, typeof nodeSetting.showType);
                 if (1 === nodeSetting.showType) try {
                     if (e?.data) {
                         setPointP({
@@ -168,7 +167,6 @@ const BarChart = ({ height = 300, data, x = "", y = "", indicatorMap, onChartCli
                         });
                     }
                 } catch (error) {
-                    console.warn("Failed to handle point mouseover:", error);
                     setPointP({
                         x: 0,
                         y: 0

package/dist/components/composite/BarLineCompareWeekend.js

@@ -448,9 +448,7 @@ const BarLineCompareWeekend = ({ height = 310, data, x = '', y = '', z = '', ind
                                 const mapValue = legendMapRef.current[key];
                                 return false !== mapValue;
                             });
-                        } catch (error) {
-                            console.warn('Failed to apply filter:', error);
-                        }
+                        } catch (error) {}
                     };
                     if (chart && chart.geometries) {
                         const mainChartGeometries = chart.geometries || [];

package/dist/components/composite/GroupCompare.js

@@ -26,8 +26,6 @@ const GroupCompare = ({ height = 300, data, x = "", y = "", indicatorMap, onChar
     const BAR_PADDING_RIGHT = mergedConfig.layout.barPaddingRight || 10;
     const HOR_BAR_PADDING_RIGHT = mergedConfig.layout.horBarPaddingRight || 50;
     const { isDescend = false, isLegend = true, isHorizontal = false, isDataTag = false, isHighlight = true } = config || {};
-    console.log('isLegend', isLegend);
-    console.log('config', config);
     const [chartInsWidth, setChartInsWidth] = useState(0);
     const [mainBarSize, setMainBarSize] = useState(void 0);
     const [backgroundHeight, setBackgroundHeight] = useState(1000);

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

@@ -16,7 +16,6 @@ const G2BarChart = ({ height = 300, data, x = "", y = "", indicatorMap, onChartC
     showType: 0,
     type: []
 }, auxiliaryLineData, highlightDate = [], indicators = [], timeRange })=>{
-    console.log("props data:", data, nodeSetting, "x:", x, "y:", y, "legend:", legend, "indicators:", indicators, timeRange);
     const { formatter, dataTransform, config: contextConfig } = useChartContext();
     const tooltipContainerRef = useG2TooltipContainer();
     const themeColors = contextConfig?.theme?.colors || [];
@@ -27,7 +26,6 @@ const G2BarChart = ({ height = 300, data, x = "", y = "", indicatorMap, onChartC
     const chartConfig = config || {};
     const { isDataTag = false, isDescend = false, isHorizontal = false, isLegend = true, isHighlight = true } = chartConfig;
     const transformedData = useMemo(()=>{
-        console.log("transformedData: bar ---", legend, data, indicators);
         if (!legend) {
             let result = transformIndicatorList(indicators, data);
             data = result[y] || [];
@@ -49,7 +47,6 @@ const G2BarChart = ({ height = 300, data, x = "", y = "", indicatorMap, onChartC
         dataTransform,
         contextConfig.nodeMap
     ]);
-    console.log("transformedData: bar final", transformedData);
     const nodeData = transformedData.filter((item)=>item.nodeInfos?.info?.length > 0 || item.nodeInfos?.infosCompare?.length > 0);
     const maxY = useMemo(()=>{
         const values = transformedData.filter((item)=>"-" !== item[safeY] && void 0 !== item[safeY] && null !== item[safeY]).map((item)=>Number(item[safeY]) || 0);
@@ -71,6 +68,7 @@ const G2BarChart = ({ height = 300, data, x = "", y = "", indicatorMap, onChartC
     const [legendItems, setLegendItems] = useState([]);
     const containerRef = useRef(null);
     const chartRef = useRef(null);
+    const currentTooltipTitleRef = useRef(null);
     const [viewWidth, setViewWidth] = useState(0);
     const [viewOffset, setViewOffset] = useState(0);
     useEffect(()=>{
@@ -131,6 +129,7 @@ const G2BarChart = ({ height = 300, data, x = "", y = "", indicatorMap, onChartC
             } : void 0,
             height: height - canvasMarginBottom,
             tooltipRender: (title, items)=>{
+                currentTooltipTitleRef.current = title;
                 const container = tooltipContainerRef.current;
                 if (!container) return null;
                 let safeItems = items.map((i)=>({
@@ -150,27 +149,24 @@ const G2BarChart = ({ height = 300, data, x = "", y = "", indicatorMap, onChartC
             },
             auxiliaryLineData: auxiliaryLineData ?? [],
             onNodeListChange: (nodes)=>{
-                console.log("g2bar node list:", nodes);
                 setXYList(nodes);
             },
             timeRange,
             onChartRender: (chartProps)=>{
-                console.log("chartProps:", chartProps);
                 setViewWidth(chartProps.layout.innerWidth);
                 setViewOffset(chartProps.layout.paddingLeft + chartProps.layout.marginLeft);
             }
         });
         chartRef.current = chart;
-        if (onChartClick) chart.on("element:click", (e)=>{
-            console.log('e:', e);
-            const datum = e.data?.data;
-            if (datum) onChartClick({
-                title: datum[x]
+        if (onChartClick) chart.on("plot:click", (_e)=>{
+            const tooltipTitle = currentTooltipTitleRef.current;
+            if (null != tooltipTitle) onChartClick({
+                title: tooltipTitle
             });
         });
         return ()=>{
             if (chartRef.current) {
-                chartRef.current.off("element:click");
+                chartRef.current.off("plot:click");
                 chartRef.current.destroy();
                 chartRef.current = null;
             }
@@ -195,7 +191,6 @@ const G2BarChart = ({ height = 300, data, x = "", y = "", indicatorMap, onChartC
         auxiliaryLineData,
         onChartClick
     ]);
-    console.log("xyList:", xyList);
     return /*#__PURE__*/ jsxs("div", {
         style: {
             width: "100%",

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

@@ -2,7 +2,6 @@ import { jsx, jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { Tooltip } from "@arco-design/web-react";
 const G2BarLegend = ({ items, activeIds, onChange, pageSize: pageSizeProp, maxLabelChars = 8, style })=>{
-    console.log("G2BarLegend items:", items, activeIds);
     const [page, setPage] = useState(1);
     const [autoPageSize, setAutoPageSize] = useState(pageSizeProp || items.length || 1);
     const containerRef = useRef(null);
@@ -128,9 +127,10 @@ const G2BarLegend = ({ items, activeIds, onChange, pageSize: pageSizeProp, maxLa
                             marker,
                             /*#__PURE__*/ jsx(Tooltip, {
                                 content: item.label,
-                                disabled: true,
+                                disabled: false,
                                 children: /*#__PURE__*/ jsx("span", {
                                     style: {
+                                        maxWidth: 300,
                                         overflow: "hidden",
                                         textOverflow: "ellipsis",
                                         whiteSpace: "nowrap"

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

@@ -54,9 +54,9 @@ const transformDataToGroupBarLineFormat = (data, x = "groupName", y = "", indica
     }).flat();
 };
 const lineColors = [
-    '#FA8C16',
-    '#7CB305',
-    '#5CDBD3'
+    "#FA8C16",
+    "#7CB305",
+    "#5CDBD3"
 ];
 const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap, onChartClick, legend = "", config, nodeSetting = {
     showType: 0,
@@ -68,7 +68,6 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
     const [isOldData, setIsOldData] = useState(false);
     const currentTooltipTitleRef = useRef(null);
     isGroupRef.current = isGroup;
-    console.log("G2CombineChart props:", data, x, y, z, indicators, legend, config, nodeSetting);
     const themeColors = contextConfig?.theme?.colors || [];
     const safeIndicatorMap = indicatorMap || contextConfig.indicatorMap || {};
     const safeLegend = legend || "groupType";
@@ -80,16 +79,13 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
     const [xyList, setXYList] = useState([]);
     const [activeIds, setActiveIds] = useState([]);
     const [legendItems, setLegendItems] = useState([]);
-    const { transformedData, leftData, rightData } = useMemo(()=>{
-        console.log("G2CombineChart left useMemo: legend:", legend, data, x, y, z, indicators);
+    const { transformedData, leftData, rightData, xKey } = useMemo(()=>{
         if (!legend) {
             let result = transformDataToGroupBarLineFormat(data, x, y, indicators);
             data = result;
             setIsOldData(true);
-            console.log('tdv data:', data);
         }
-        console.log("G2CombineChart renderG2CombineChart transformedData2:", data);
-        const { transformedData, leftData, rightData } = DataAdapter.transform(data, "barLine", {
+        const { transformedData, leftData, rightData, xKey } = DataAdapter.transform(data, "barLine", {
             type: "barLine",
             x,
             y: safeY,
@@ -101,7 +97,8 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
         return {
             transformedData: transformedData.map((item)=>dataTransform.processNodeInfo(item, contextConfig.nodeMap)),
             leftData: leftData.map((item)=>dataTransform.processNodeInfo(item, contextConfig.nodeMap)),
-            rightData: rightData.map((item)=>dataTransform.processNodeInfo(item, contextConfig.nodeMap))
+            rightData: rightData.map((item)=>dataTransform.processNodeInfo(item, contextConfig.nodeMap)),
+            xKey: xKey
         };
     }, [
         data,
@@ -112,7 +109,6 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
         contextConfig.nodeMap,
         isDescend
     ]);
-    console.log("G2CombineChart transformedData:", transformedData, leftData, rightData);
     const nodeData = transformedData.filter((item)=>item.nodeInfos?.info?.length > 0 || item.nodeInfos?.infosCompare?.length > 0);
     const { maxY } = useMemo(()=>{
         const key = isGroupRef.current ? "total" : safeY;
@@ -129,7 +125,7 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
         y
     ]);
     const formatLineAxis = useCallback((val)=>{
-        const indicatorId = indicators?.length > 2 ? '' : safeZ;
+        const indicatorId = indicators?.length > 2 ? "" : safeZ;
         return getAxisFormat(val, safeIndicatorMap, indicatorId);
     }, [
         safeIndicatorMap,
@@ -147,7 +143,7 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
         const lineGroupTypeArr = sortedGroupTypes.filter((v)=>"true" === v.split("_")[1]);
         const items = sortedGroupTypes.map((id, index)=>{
             const colorIndex = index;
-            const indicatorId = id.split("_")[0];
+            const indicatorId = isGroupRef.current ? id : id.split("_")[0];
             const isCombine = "true" === id.split("_")[1];
             const lineGroupTypeIndex = lineGroupTypeArr.indexOf(id);
             const color = isGroupRef.current ? isCombine ? lineColors[lineGroupTypeIndex] || lineColors[0] : themeColors[colorIndex] || themeColors[0] : 0 === colorIndex ? themeColors[colorIndex] : lineColors[colorIndex - 1];
@@ -176,10 +172,30 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
     const filterLeftData = useMemo(()=>{
         if (!activeIds.length) return leftData;
         const result = leftData.filter((d)=>d.groupType ? activeIds.includes(String(d.groupType.replace("_compare", "") + "_" + d.isCombine)) : true);
-        if (isGroupRef.current) result.forEach((item)=>{
-            item.total = result.filter((d)=>d.groupName === item.groupName).reduce((acc, d)=>acc + ('' === d.groupValue ? 0 : d.groupValue), 0);
-        });
-        return result;
+        if (!isGroupRef.current) return result;
+        {
+            const groupTypes = Array.from(new Set(result.map((d)=>d.groupType)));
+            let groupResult = [];
+            groupTypes.forEach((groupType)=>{
+                const groupData = leftData.filter((d)=>d.groupType === groupType);
+                xKey.forEach((key)=>{
+                    if (!result.filter((d)=>d.groupType === groupType).some((d)=>d.groupName === key)) groupData.push({
+                        groupName: key,
+                        isCombine: false,
+                        groupType: groupType,
+                        groupValue: "",
+                        total: 0,
+                        percent: ""
+                    });
+                });
+                groupData.sort((a, b)=>xKey.indexOf(a.groupName) - xKey.indexOf(b.groupName));
+                groupResult = groupResult.concat(groupData);
+            });
+            groupResult.forEach((item)=>{
+                item.total = result.filter((d)=>d.groupName === item.groupName).reduce((acc, d)=>acc + ("" === d.groupValue || "-" === d.groupValue ? 0 : d.groupValue), 0);
+            });
+            return groupResult;
+        }
     }, [
         leftData,
         activeIds
@@ -191,6 +207,18 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
         rightData,
         activeIds
     ]);
+    const maxLeft = useMemo(()=>filterLeftData.reduce((max, item)=>{
+            const key = isGroupRef.current ? "total" : safeY;
+            if (String(item[key]).includes("-") || void 0 === item[key] || null === item[key] || "" === item[key]) return max;
+            return Math.max(max, item[key]);
+        }, 0), [
+        filterLeftData,
+        isGroupRef,
+        safeY
+    ]);
+    const maxRight = useMemo(()=>filterRightData.reduce((max, item)=>Math.max(max, item.groupValue), 0), [
+        filterRightData
+    ]);
     const filteredData = useMemo(()=>[
             ...filterLeftData,
             ...filterRightData
@@ -210,7 +238,6 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
             chartRef.current.destroy();
             chartRef.current = null;
         }
-        console.log("canvasMarginBottom:", canvasMarginBottom);
         const chart = renderG2CombineChart(containerRef.current, {
             data: filteredData,
             nodeData,
@@ -218,6 +245,8 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
             y: safeY,
             z,
             maxY,
+            maxLeft,
+            maxRight,
             themeColors,
             indicatorMap: safeIndicatorMap,
             formatAxis,
@@ -278,12 +307,9 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
         chartRef.current = chart;
         if (onChartClick) chart.on("plot:click", (_e)=>{
             const tooltipTitle = currentTooltipTitleRef.current;
-            if (null != tooltipTitle) {
-                console.log('使用 tooltip title 触发下钻:', tooltipTitle);
-                onChartClick({
-                    title: tooltipTitle
-                });
-            }
+            if (null != tooltipTitle) onChartClick({
+                title: tooltipTitle
+            });
         });
         return ()=>{
             if (chartRef.current) {
@@ -315,7 +341,6 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
         rightData,
         isOldData
     ]);
-    console.log("G2BarLegend items: combie", legendItems, activeIds);
     return /*#__PURE__*/ jsxs("div", {
         style: {
             width: "100%",

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

@@ -262,10 +262,7 @@ const G2GaugeChart = (props)=>{
                 if (tooltip.formatter) try {
                     tooltipValue = tooltip.formatter(value);
                 } catch (error) {
-                    if ("development" === process.env.NODE_ENV) console.warn("[G2GaugeChart] tooltip.formatter 函数执行出错，使用降级值", {
-                        error,
-                        value
-                    });
+                    process.env.NODE_ENV;
                     tooltipValue = value.toLocaleString();
                 }
                 else tooltipValue = value.toLocaleString();

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

@@ -14,7 +14,6 @@ const G2GroupBarChart = ({ height = 300, data, x = "", y = "", indicatorMap, onC
     showType: 0,
     type: []
 }, auxiliaryLineData, highlightDate = [], indicators = [], timeRange })=>{
-    console.log("props data:", data, nodeSetting, "x:", x, "y:", y, "legend:", legend, "indicators:", indicators, timeRange, config);
     const { formatter, dataTransform, config: contextConfig } = useChartContext();
     const tooltipContainerRef = useG2TooltipContainer();
     const themeColors = contextConfig?.theme?.colors || [];
@@ -24,7 +23,6 @@ const G2GroupBarChart = ({ height = 300, data, x = "", y = "", indicatorMap, onC
     const chartConfig = config || {};
     const { isDataTag = false, isDescend = false, isHorizontal = false, isLegend = true, isHighlight = true } = chartConfig;
     const transformedData = useMemo(()=>{
-        console.log("transformedData: bar ---", legend, data, indicators);
         if (!legend) {
             let result = transformIndicatorList(indicators, data);
             data = result[y] || [];
@@ -46,7 +44,6 @@ const G2GroupBarChart = ({ height = 300, data, x = "", y = "", indicatorMap, onC
         dataTransform,
         contextConfig.nodeMap
     ]);
-    console.log("transformedData: bar final", transformedData);
     const maxY = useMemo(()=>{
         const values = transformedData.filter((item)=>"-" !== item['total'] && void 0 !== item['total'] && null !== item['total']).map((item)=>Number(item['total']) || 0);
         const dataMax = values.length > 0 ? Math.max(...values) : 0;
@@ -143,7 +140,6 @@ const G2GroupBarChart = ({ height = 300, data, x = "", y = "", indicatorMap, onC
             },
             auxiliaryLineData: auxiliaryLineData ?? [],
             onNodeListChange: (nodes)=>{
-                console.log("g2bar node list:", nodes, nodes[0], nodes[1]);
                 setXYList(nodes);
             },
             timeRange,

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

@@ -75,13 +75,9 @@ const G2IndicatorCardChart = ({ data, height, x = '', y = '', legend = '', indic
         });
         const view = chart.view();
         view.data(transformedData);
-        if (scale && scale.groupValue) {
-            console.log(transformedData, 'transformedData');
-            console.log(scale.groupValue, 'scale.groupValue');
-            view.scale({
-                y: scale.groupValue
-            });
-        }
+        if (scale && scale.groupValue) view.scale({
+            y: scale.groupValue
+        });
         if (lineStyle.area) view.area().encode('x', x || 'groupName').encode('y', 'groupValue').encode('shape', lineStyle.shape || 'smooth').style({
             fill: lineColor,
             fillOpacity: 0.2

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

@@ -17,7 +17,6 @@ const G2LineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap,
     showType: 0,
     type: []
 }, auxiliaryLineData, highlightDate, indicators = [] })=>{
-    console.log("props data: G2LineChart", data, nodeSetting, config, "x, y, z", x, y, z, "highlightDate:", highlightDate, "indicators:", indicators);
     const { formatter, dataTransform, config: contextConfig } = useChartContext();
     const tooltipContainerRef = useG2TooltipContainer();
     const themeColors = contextConfig?.theme?.colors || [];
@@ -54,7 +53,6 @@ const G2LineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap,
         contextConfig.nodeMap
     ]);
     const nodeData = transformedData.filter((item)=>item.nodeInfos?.info?.length > 0 || item.nodeInfos?.infosCompare?.length > 0);
-    console.log("nodeData:", nodeData);
     const { minY, maxY } = useMemo(()=>{
         const dataValues = transformedData.filter((item)=>"-" !== item[safeY] && void 0 !== item[safeY] && null !== item[safeY]).map((item)=>Number(item[safeY]));
         const compareValues = transformedData.filter((item)=>"-" !== item["subGroupValue"] && null != item["subGroupValue"]).map((item)=>Number(item["subGroupValue"]));
@@ -130,7 +128,6 @@ const G2LineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap,
             chartRef.current.destroy();
             chartRef.current = null;
         }
-        console.log("G2LineChart", x, y, minY, maxY);
         const chart = renderG2LineChart(containerRef.current, {
             data: filteredData,
             nodeData,
@@ -161,7 +158,6 @@ const G2LineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap,
                         ...i,
                         color: i.color ?? themeColors[0] ?? "#5B8FF9"
                     }));
-                console.log("safeItems:", safeItems);
                 react_dom.render(/*#__PURE__*/ jsx(G2CompareTooltip, {
                     title: title,
                     items: safeItems,
@@ -175,7 +171,6 @@ const G2LineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap,
             legendSize: 12,
             useStrictTicks: true,
             onNodeListChange: (nodes)=>{
-                console.log("setXYList:", nodes);
                 setXYList(nodes);
             },
             onChartRender: (chartProps)=>{
@@ -190,16 +185,11 @@ const G2LineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap,
         if (onChartClick) {
             chart.on("plot:click", (_e)=>{
                 const tooltipTitle = currentTooltipTitleRef.current;
-                if (null != tooltipTitle) {
-                    console.log("使用 tooltip title 触发下钻:", tooltipTitle);
-                    onChartClick({
-                        title: tooltipTitle
-                    });
-                }
-            });
-            chart.on("plot:pointerenter:", (event)=>{
-                console.log("plot:pointerenter:", event);
+                if (null != tooltipTitle) onChartClick({
+                    title: tooltipTitle
+                });
             });
+            chart.on("plot:pointerenter:", (event)=>{});
         }
         return ()=>{
             if (chartRef.current) {
@@ -227,7 +217,6 @@ const G2LineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap,
         auxiliaryLineData,
         themeColors
     ]);
-    console.log("legendItems:", legendItems);
     return /*#__PURE__*/ jsxs("div", {
         style: {
             width: "100%",

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

@@ -61,7 +61,6 @@ function applyAxisX(mark, options = {}) {
     const needSampling = dataCount > 0 && containerWidth > 0;
     const interval = needSampling ? calcAxisInterval(dataCount, containerWidth, maxLabelChars, fontSize) : 1;
     const axisFilter = needSampling && interval > 1 ? (type)=>createAxisFilter(type, interval, dataCount) : null;
-    console.log('axisFilter:', interval);
     mark.axis('x', {
         title,
         grid,
@@ -82,6 +81,12 @@ function applyAxisX(mark, options = {}) {
         },
         labelAlign: 'horizontal',
         labelDx: (_datum, _index, _data)=>0,
+        labelRender: isHorizontal ? void 0 : (datum)=>{
+            let left = '0%';
+            if (datum.value > 0.9) left = '-13%';
+            else if (datum.value < 0.1) left = '10%';
+            return `<div style="transform: translateX(${left});">${datum.label}</div>`;
+        },
         labelOpacity: 0.6,
         ...axisFilter && {
             tickFilter: axisFilter('tick'),
@@ -148,10 +153,9 @@ function applyLegendColor(view, options = {}) {
 }
 function applyAuxiliaryLineY(view, lines, options = {}) {
     if (!lines?.length) return;
-    console.log('applyAuxiliaryLineY:', lines);
     const { stroke = '#F4664A', strokeOpacity = 1, labelMaxLength = 5 } = options;
     lines.forEach((auxLine)=>{
-        view.lineY().encode('y', auxLine.value).style('stroke', stroke).style('strokeOpacity', strokeOpacity).style('lineWidth', 1).style('shadowColor', 'transparent').scale('y', {
+        view.lineY().encode('y', auxLine.value).style('stroke', stroke).style('strokeOpacity', strokeOpacity).style('lineWidth', 1).style('shadowColor', 'transparent').animate(false).scale('y', {
             key: auxLine?.axis === 'right' ? 'line' : 'main'
         }).axis('x', false).label({
             dx: 0,
@@ -176,7 +180,7 @@ function applyHighlightDate(view, x, data, highlightDate, isHighlight) {
             [x]: item,
             ['highlight']: highlightDate.includes(item) ? 100 : 0
         }));
-    const highlightInterval = view.interval().data(highlightData).encode('x', x).encode('y', 'highlight').scale('y', {
+    const highlightInterval = view.interval().data(highlightData).encode('x', x).encode('y', 'highlight').animate(false).scale('y', {
         type: 'linear',
         domainMin: 0,
         domainMax: 100,
@@ -187,7 +191,7 @@ function applyHighlightDate(view, x, data, highlightDate, isHighlight) {
         fill: '#cccccc',
         fillOpacity: isHighlight ? 0.3 : 0
     });
-    view.line().data(highlightData).encode('x', x).encode('y', 'highlight').scale('y', {
+    view.line().data(highlightData).encode('x', x).encode('y', 'highlight').animate(false).scale('y', {
         type: 'linear',
         domainMin: 0,
         domainMax: 100,
@@ -272,7 +276,6 @@ function fillMissingIndicator(baseItems, safeTitle, isCompare, isGroup = false)
             id,
             0
         ]));
-    console.log('baseItems:', baseItems);
     if (isCompare && !isGroup) {
         baseItems.forEach((item)=>{
             if (item.indicatorId) indicatorIdSet.set(item.indicatorId, (indicatorIdSet.get(item.indicatorId) ?? 0) + 1);
@@ -311,7 +314,6 @@ function fillMissingIndicator(baseItems, safeTitle, isCompare, isGroup = false)
         };
         return item;
     }).sort(intervalSort);
-    console.log('safeItems:', safeItems);
     return safeItems;
 }
 export { adjustDomainMax, applyAuxiliaryLineY, applyAxisX, applyAxisY, applyHighlightDate, applyLegendColor, applyNodeData, applyScaleYLinear, createChart, fillMissingIndicator, getColorByGroupType, getMainView, intervalSort, sortByIndicators };

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

@@ -20,7 +20,6 @@ function renderG2BarChart(container, options) {
         paddingBottom: 0,
         insetBottom: 0
     });
-    console.log('isLegend:', legend, isLegend);
     const view = getMainView(chart);
     view.attr('marginLeft', 0).attr('marginRight', 0).attr('marginBottom', isLegend ? 0 : 16);
     if (isHorizontal) view.coordinate({
@@ -37,11 +36,10 @@ function renderG2BarChart(container, options) {
         key: 'main'
     });
     if (!CLOSE_HIGHLIGHT_DEBUG) applyHighlightDate(view, x, data, highlightDate, isHighlight);
-    console.log('g2bar data:', data, y);
     const interval = view.interval().encode('x', x).encode('y', y).encode('color', 'groupType').transform({
         type: 'dodgeX',
         padding: isHorizontal ? 0.2 : 0
-    });
+    }).animate(false);
     interval.style({
         columnWidthRatio: 0.6,
         insetLeft: (_d, index, _data, _column)=>{
@@ -145,7 +143,6 @@ function renderG2BarChart(container, options) {
         bounding: tooltipBounding
     });
     applyAuxiliaryLineY(view, auxiliaryLineData);
-    console.log('nodeList data:', data);
     if (!CLOSE_NODE_DEBUG) {
         const nodeList = applyNodeData(view, nodeData, x, y);
         onNodeListChange?.(nodeList);
@@ -170,7 +167,6 @@ function renderG2BarChart(container, options) {
     let hasEmittedNodeList = false;
     chart.on('afterrender', (_e)=>{
         if (hasEmittedNodeList) return;
-        console.log('chart.coordinateBBox:', chart.getContext(), view.getCoordinate());
         const views = chart.getContext()?.views;
         const viewCoordinate = views?.[0]?.layout;
         if (onChartRender && viewCoordinate) onChartRender({

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

@@ -18,6 +18,10 @@ export interface RenderG2CombineChartOptions {
     z: string;
     /** 柱状图 Y 轴最大值 */
     maxY: number;
+    /** 柱状图 Y 轴最大值 */
+    maxLeft: number;
+    /** 折线图 Y 轴最大值 */
+    maxRight: number;
     /** 高亮日期，用于 x 轴 gridFilter */
     highlightDate?: string[];
     /** 主题色数组 */

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

@@ -5,7 +5,7 @@ const Y_AXIS_FIELD = 'groupValue';
 const BAR_Y_FIELD = 'barValue';
 const LINE_Y_FIELD = 'lineValue';
 function renderG2CombineChart(container, options) {
-    const { data, nodeData, x, y, z: _z, maxY, themeColors, indicatorMap: _indicatorMap, formatAxis, formatLineAxis, isDataTag = true, isCombineDataTag = true, isLegend: _isLegend = false, isCompare = false, formatLabel, highlightDate = [], height = 300, isHighlight = true, isClickable = false, indicators = [], tooltipRender, auxiliaryLineData = [], onNodeListChange, lineColors, onChartRender, isGroup, legendItems = [], indicatorId, isTooltipContent = false } = options;
+    const { data, nodeData, x, z: _z, maxLeft, maxRight, themeColors, indicatorMap: _indicatorMap, formatAxis, formatLineAxis, isDataTag = true, isCombineDataTag = true, isLegend: _isLegend = false, isCompare = false, formatLabel, highlightDate = [], height = 300, isHighlight = true, isClickable = false, indicators = [], tooltipRender, auxiliaryLineData = [], onNodeListChange, lineColors, onChartRender, isGroup, legendItems = [], indicatorId, isTooltipContent = false } = options;
     const chart = createChart({
         container,
         height,
@@ -14,11 +14,11 @@ function renderG2CombineChart(container, options) {
     chart.options({
         marginBottom: 0,
         paddingBottom: 0,
-        insetBottom: 0
+        insetBottom: 0,
+        animate: null
     });
     const view = getMainView(chart);
-    view.attr('insetLeft', 0).attr('insetRight', 0).attr('marginLeft', 0).attr('marginRight', 0).attr('marginBottom', 0);
-    console.log('renderG2CombineChart data:', data, 'maxY:', maxY, x, y, 'indicators:', indicators);
+    view.attr('insetLeft', 0).attr('insetRight', 0).attr('marginLeft', 0).attr('marginRight', 0).attr('marginBottom', 0).attr('animate', false).animate(false);
     view.data(data);
     const xValueCount = new Set(data.map((d)=>d[x])).size;
     applyAxisX(view, {
@@ -28,27 +28,17 @@ function renderG2CombineChart(container, options) {
         containerWidth: container.clientWidth
     });
     const barColor = themeColors[0] ?? "#5B8FF9";
-    console.log('tooltip: themeColors:', themeColors[0], barColor, isGroup);
-    console.log('renderG2CombineChart highlightDate:', highlightDate, isHighlight);
     applyHighlightDate(view, x, data, highlightDate, isHighlight);
     const intervalData = data.filter((item)=>!item.isCombine).map((item)=>({
             ...item,
             [BAR_Y_FIELD]: item[Y_AXIS_FIELD]
         }));
-    console.log('renderG2CombineChart interval data:', intervalData);
-    const intervalMaxY = intervalData.reduce((max, item)=>{
-        const key = isGroup ? "total" : BAR_Y_FIELD;
-        console.log('tdv item:', key, item[key], intervalData);
-        if ('-' === item[key] || void 0 === item[key] || null === item[key] || '' === item[key]) return max;
-        return Math.max(max, item[key]);
-    }, 0);
-    console.log('tdv:', intervalMaxY);
     const auxLeftValues = auxiliaryLineData?.length ? auxiliaryLineData.filter((item)=>'left' === item.axis).map((item)=>item.value) : [];
     const maxAuxLeft = auxLeftValues.length ? Math.max(...auxLeftValues) : 0;
     const auxRightValues = auxiliaryLineData?.length ? auxiliaryLineData.filter((item)=>'right' === item.axis).map((item)=>item.value) : [];
     const maxAuxRight = auxRightValues.length ? Math.max(...auxRightValues) : 0;
-    const finalIntervalMax = Math.max(intervalMaxY, maxAuxLeft);
-    const interval = view.interval().data(intervalData).encode("x", x).encode("y", BAR_Y_FIELD).encode("color", "groupType").transform(isGroup ? {
+    const finalIntervalMax = Math.max(maxLeft, maxAuxLeft);
+    const interval = view.interval().data(intervalData).encode("x", x).encode("y", BAR_Y_FIELD).encode("color", "groupType").animate(false).transform(isGroup ? {
         type: 'stackY',
         reverse: true
     } : {
@@ -109,13 +99,11 @@ function renderG2CombineChart(container, options) {
         labelFormatter: formatAxis,
         labelOpacity: 0.6
     });
-    console.log('tooltip:', barColor, isCompare);
     interval.tooltip({
         items: isGroup ? [
             (datum)=>{
                 const groupType = String(datum.groupType ?? '');
                 const index = legendItems.findIndex((item)=>item.id === `${groupType}_${datum.isCombine}`);
-                console.log(datum);
                 return {
                     value: datum[Y_AXIS_FIELD],
                     name: datum['groupType'],
@@ -162,24 +150,12 @@ function renderG2CombineChart(container, options) {
             ...item,
             [LINE_Y_FIELD]: item[Y_AXIS_FIELD]
         }));
-    console.log('renderG2CombineChart: line data:', data);
     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]
         }));
-    console.log('compareLineData:', compareLineData);
-    const lineMaxY = lineData.reduce((max, item)=>{
-        if ('-' === item[LINE_Y_FIELD] || void 0 === item[LINE_Y_FIELD] || null === item[LINE_Y_FIELD] || '' === item[LINE_Y_FIELD]) return max;
-        return Math.max(max, item[LINE_Y_FIELD]);
-    }, 0);
-    const compareLineMaxY = compareLineData.reduce((max, item)=>{
-        if ('-' === item[LINE_Y_FIELD] || void 0 === item[LINE_Y_FIELD] || null === item[LINE_Y_FIELD] || '' === item[LINE_Y_FIELD]) return max;
-        return Math.max(max, item[LINE_Y_FIELD]);
-    }, 0);
-    const lineFinalMaxY = Math.max(lineMaxY, compareLineMaxY) || 1;
-    const finalLineMax = Math.max(lineFinalMaxY, maxAuxRight);
-    console.log('lineData:', lineData);
-    const line = view.line().data(lineData).encode("x", x).encode("y", LINE_Y_FIELD).encode('color', 'groupType').style({
+    const finalLineMax = Math.max(maxRight, maxAuxRight);
+    const line = view.line().data(lineData).encode("x", x).encode("y", LINE_Y_FIELD).encode('color', 'groupType').animate(false).style({
         lineWidth: 2,
         stroke: (datum)=>{
             const currentDatum = datum[0];
@@ -217,7 +193,7 @@ function renderG2CombineChart(container, options) {
         position: 'right',
         title: false,
         grid: true,
-        gridStrokeOpacity: 0 === intervalMaxY ? 0.2 : 0,
+        gridStrokeOpacity: 0 === maxAuxLeft ? 0.2 : 0,
         gridLineWidth: 1,
         gridLineDash: [
             0,
@@ -227,8 +203,7 @@ function renderG2CombineChart(container, options) {
         labelFormatter: formatLineAxis,
         labelOpacity: 0.6
     });
-    console.log('renderG2CombineChart: compare line data:', compareLineData);
-    const compareLine = view.line().data(compareLineData).encode('x', x).encode('y', LINE_Y_FIELD).encode('color', 'groupType').style({
+    const compareLine = view.line().data(compareLineData).encode('x', x).encode('y', LINE_Y_FIELD).encode('color', 'groupType').animate(false).style({
         lineDash: [
             4,
             4
@@ -288,7 +263,6 @@ function renderG2CombineChart(container, options) {
         } : {},
         render: (event, payload)=>{
             const { title, items } = payload;
-            console.log('tooltipRender:', title, items, isCompare);
             let safeTitle = title.replace(/,.*$/, '');
             const baseItems = items.filter((item)=>item.hasOwnProperty('isCombine') && !item.isCombine);
             const safeItems = fillMissingIndicator(baseItems, safeTitle, isCompare, isGroup);

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

@@ -13,7 +13,6 @@ function renderG2GroupBarChart(container, options) {
         paddingBottom: 0,
         insetBottom: 0
     });
-    console.log('isLegend:', legend, isLegend);
     const view = getMainView(chart);
     view.attr('marginBottom', isLegend ? 0 : 16);
     if (isHorizontal) view.coordinate({
@@ -23,7 +22,6 @@ function renderG2GroupBarChart(container, options) {
             }
         ]
     });
-    console.log(legendItems, 'legendItems');
     view.data(data);
     applyScaleYLinear(view, {
         field: 'y',
@@ -124,7 +122,6 @@ function renderG2GroupBarChart(container, options) {
     }
     applyAuxiliaryLineY(view, auxiliaryLineData);
     const nodeList = [];
-    console.log('nodeList data:', data);
     data.forEach((item)=>{
         view.shape().data([
             {

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

@@ -2,7 +2,6 @@ import { applyAuxiliaryLineY, applyAxisX, applyAxisY, applyHighlightDate, applyN
 const Y_AXIS_FIELD = 'groupValue';
 function renderG2LineChart(container, options) {
     const { data, nodeData, x, y, minY, maxY, timeRange: _timeRange, themeColors, indicators = [], indicatorMap: _indicatorMap = {}, formatAxis, highlightDate = [], auxiliaryLineData = [], isDataTag = false, isLegend = true, isHighlight = true, formatLabel, height = 300, legendLength: _legendLength, legendSize: _legendSize, tooltipRender, onNodeListChange, onChartRender } = options;
-    console.log('g2line data:', data, x, y);
     const colorOpts = {
         themeColors,
         primaryKey: y,
@@ -28,12 +27,11 @@ function renderG2LineChart(container, options) {
         key: 'main'
     });
     applyHighlightDate(view, x, data, highlightDate, isHighlight);
-    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({
+    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').animate(false).style({
         lineWidth: 2,
         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').encode('series', 'groupType').style({
+    const compareLine = view.line().data(data.filter((item)=>item.groupType.includes('_compare'))).encode('x', x).encode('y', Y_AXIS_FIELD).encode('color', 'groupType').encode('series', 'groupType').animate(false).style({
         lineDash: [
             4,
             4
@@ -62,7 +60,6 @@ function renderG2LineChart(container, options) {
         ]
     });
     const hasCompareData = data.some((item)=>item.groupType.includes('_compare'));
-    console.log('hasCompareData:', hasCompareData, data);
     if (hasCompareData) compareLine.tooltip({
         items: [
             (datum)=>({
@@ -95,16 +92,13 @@ function renderG2LineChart(container, options) {
         bounding: tooltipBounding,
         render: (_event, payload)=>{
             const { title, items } = payload;
-            console.log('tooltipRender:', title, items, indicators);
             if (indicators.length) {
                 const groupedItems = indicators.map((indicator)=>items.filter((i)=>i.indicatorId === String(indicator)));
-                console.log(groupedItems.flat(), 'tooltip groupedItems');
                 const sortedItems = groupedItems.map((group)=>[
                         group.filter((i)=>i.name === i.indicatorId),
                         group.filter((i)=>i.compareTime),
                         group.filter((i)=>i.name.includes('_change'))
                     ].filter(Boolean).flat()).flat();
-                console.log(sortedItems, 'tooltip sortedItems');
                 const formatItems = sortedItems.map((item)=>({
                         ...item,
                         color: getColorByGroupType(item?.indicatorId, colorOpts)

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

@@ -7,47 +7,20 @@ function isValidColor(color) {
     return "" !== s.color;
 }
 function validateAndNormalizeProps(props) {
-    const isDev = "development" === process.env.NODE_ENV;
+    process.env.NODE_ENV;
     let { min = 0, max } = props;
-    if ("number" != typeof max || !isFinite(max)) {
-        if (isDev) console.warn("[G2GaugeChart] max 必须是有效的数字，使用默认值 100", {
-            max
-        });
-        max = 100;
-    }
-    if ("number" != typeof min || !isFinite(min)) {
-        if (isDev) console.warn("[G2GaugeChart] min 必须是有效的数字，使用默认值 0", {
-            min
-        });
-        min = 0;
-    }
+    if ("number" != typeof max || !isFinite(max)) max = 100;
+    if ("number" != typeof min || !isFinite(min)) min = 0;
     if (min >= max) {
-        if (isDev) console.warn(`[G2GaugeChart] min (${min}) 必须小于 max (${max})，自动调整为 max - 1`, {
-            min,
-            max
-        });
         min = max - 1;
         if (min < 0) {
             min = 0;
             max = 100;
-            if (isDev) console.warn("[G2GaugeChart] min 和 max 都无效，使用默认值 min=0, max=100");
         }
     }
     let { value } = props;
-    if ("number" != typeof value || !isFinite(value)) {
-        if (isDev) console.warn(`[G2GaugeChart] value 必须是有效的数字，使用默认值 (min + max) / 2`, {
-            value
-        });
-        value = (min + max) / 2;
-    }
-    const originalValue = value;
+    if ("number" != typeof value || !isFinite(value)) value = (min + max) / 2;
     value = Math.min(Math.max(value, min), max);
-    if (originalValue !== value && isDev) console.warn(`[G2GaugeChart] value (${originalValue}) 超出范围 [${min}, ${max}]，已限制为 ${value}`, {
-        originalValue,
-        min,
-        max,
-        clampedValue: value
-    });
     let thresholds = [];
     const defaultColors = [
         '#9596d9',
@@ -68,33 +41,18 @@ function validateAndNormalizeProps(props) {
     let colors = [];
     if (props.thresholds && Array.isArray(props.thresholds) && props.thresholds.length > 0 && "object" == typeof props.thresholds[0]) colors = props.thresholds.map((t)=>t.color).filter((c)=>!!c && isValidColor(c));
     if (0 === colors.length && props.thresholdColors) colors = props.thresholdColors.filter((c)=>isValidColor(c));
-    if (0 === colors.length) {
-        colors = [
-            ...defaultColors
-        ];
-        if (isDev) console.warn("[G2GaugeChart] 未提供有效的颜色，使用默认颜色", {
-            colors
-        });
-    }
+    if (0 === colors.length) colors = [
+        ...defaultColors
+    ];
     while(colors.length < thresholds.length){
         const lastColor = colors[colors.length - 1];
         colors.push(lastColor || defaultColors[0]);
     }
     let height = props.height ?? 300;
-    if ("number" != typeof height || !isFinite(height) || height <= 0) {
-        if (isDev) console.warn(`[G2GaugeChart] height 必须是大于 0 的数字，使用默认值 300`, {
-            height: props.height
-        });
-        height = 300;
-    }
+    if ("number" != typeof height || !isFinite(height) || height <= 0) height = 300;
     height = Math.min(Math.max(height, 100), 2000);
     let pointerColor = props.pointerColor ?? "#c5c5c5";
-    if (!isValidColor(pointerColor)) {
-        if (isDev) console.warn(`[G2GaugeChart] pointerColor 无效，使用默认值 #c5c5c5`, {
-            pointerColor: props.pointerColor
-        });
-        pointerColor = "#c5c5c5";
-    }
+    if (!isValidColor(pointerColor)) pointerColor = "#c5c5c5";
     const formatter = props.formatter;
     const tickFormatter = props.tickFormatter;
     return {
@@ -116,11 +74,7 @@ function safeFormat(formatter, value, percent, fallback) {
     try {
         return formatter(value, percent);
     } catch (error) {
-        if ("development" === process.env.NODE_ENV) console.warn("[G2GaugeChart] formatter 函数执行出错，使用降级值", {
-            error,
-            value,
-            percent
-        });
+        process.env.NODE_ENV;
         return fallback;
     }
 }
@@ -129,10 +83,7 @@ function safeTickFormat(tickFormatter, value, fallback) {
     try {
         return tickFormatter(value);
     } catch (error) {
-        if ("development" === process.env.NODE_ENV) console.warn("[G2GaugeChart] tickFormatter 函数执行出错，使用降级值", {
-            error,
-            value
-        });
+        process.env.NODE_ENV;
         return fallback;
     }
 }

package/dist/components/g2/shared/G2CompareTooltip.d.ts

@@ -1,3 +1,4 @@
+import type { AuxiliaryLineData } from "../../../core/ChartTypes";
 type Item = {
     color?: string;
     name?: string;
@@ -7,6 +8,7 @@ type Item = {
     indicatorId?: string;
     percent?: string | number;
     hidden?: boolean;
+    isCombine?: boolean;
 };
 interface Props {
     isGroupBar?: boolean;
@@ -15,10 +17,7 @@ interface Props {
     safeIndicatorMap: any;
     formatter: any;
     safeLegend: string;
-    auxiliaryLineData: undefined | {
-        name: string;
-        value: string | number;
-    }[];
+    auxiliaryLineData?: AuxiliaryLineData[];
 }
 declare const _default: import("react").NamedExoticComponent<Props>;
 export default _default;

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

@@ -3,8 +3,8 @@ import { memo } from "react";
 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);
+    let auxiIndicatorId = '';
+    let combineIndicatorId = '';
     const uniqueColors = [];
     return /*#__PURE__*/ jsxs("div", {
         style: {
@@ -14,7 +14,8 @@ const G2CompareTooltip = ({ isGroupBar = false, title, items, safeIndicatorMap,
             /*#__PURE__*/ jsx("div", {
                 children: title
             }),
-            items?.map(({ color, value, isChange, compareTime, indicatorId, name, percent, hidden }, index)=>{
+            items?.map(({ color, value, isChange, compareTime, indicatorId, name, percent, hidden, isCombine }, index)=>{
+                if (isCombine) combineIndicatorId = indicatorId ?? "";
                 let isFirst = false;
                 if (0 === index) auxiIndicatorId = indicatorId ?? "";
                 if (color && !uniqueColors.includes(color)) {
@@ -61,9 +62,7 @@ const G2CompareTooltip = ({ isGroupBar = false, title, items, safeIndicatorMap,
                     ]
                 }, index);
             }),
-            auxiliaryLineData?.map(({ name, value }, index)=>{
-                console.log("auxiliaryLineData:", name, value, safeLegend);
-                return /*#__PURE__*/ jsxs("div", {
+            auxiliaryLineData?.map(({ name, value, axis }, index)=>/*#__PURE__*/ jsxs("div", {
                     style: {
                         display: "flex",
                         justifyContent: "space-between",
@@ -82,11 +81,10 @@ const G2CompareTooltip = ({ isGroupBar = false, title, items, safeIndicatorMap,
                             ]
                         }),
                         /*#__PURE__*/ jsx("div", {
-                            children: formatter.formatIndicator(value, safeIndicatorMap[auxiIndicatorId ?? ""] ?? {})
+                            children: 'right' === axis ? formatter.formatIndicator(value, safeIndicatorMap[combineIndicatorId ?? ''] ?? {}) : formatter.formatIndicator(value, safeIndicatorMap[auxiIndicatorId ?? ''] ?? {})
                         })
                     ]
-                }, index);
-            })
+                }, index))
         ]
     });
 };

package/dist/components/shared/NodeDetail.js

@@ -3,9 +3,7 @@ import "react";
 import { Popover } from "@arco-design/web-react";
 import { nodeMap } from "../../core/ChartConfig.js";
 import { NodePopoverContent } from "./NodePopoverContent.js";
-const NodeDetail = ({ chartWidth, chartOffset, dvRows, ratio = 1 })=>{
-    console.log(dvRows, 'dvRows');
-    return /*#__PURE__*/ jsx("div", {
+const NodeDetail = ({ chartWidth, chartOffset, dvRows, ratio = 1 })=>/*#__PURE__*/ jsx("div", {
         style: {
             display: 'flex',
             justifyContent: 'space-around',
@@ -106,5 +104,4 @@ const NodeDetail = ({ chartWidth, chartOffset, dvRows, ratio = 1 })=>{
             });
         })
     });
-};
 export { NodeDetail };

package/dist/utils/chartHelpers.js

@@ -16,9 +16,7 @@ const calculateBarWidth = (chart, data, xField, widthRatio = 0.5)=>{
             const estimatedBarWidth = xValueWidth * widthRatio;
             return estimatedBarWidth;
         }
-    } catch (error) {
-        console.error('计算主图柱状图宽度失败', error);
-    }
+    } catch (error) {}
 };
 const getAxisHorPaddingByText = (value, indicatorMap, y)=>7 * getAxisFormat(value, indicatorMap, y).length + 26;
 const getAxisFormat = (val, indicatorMap, y)=>{

package/package.json

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