@publishfx/publish-chart 2.1.13 → 2.1.15

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+**2.1.14** fix(chart): 修复组合图折线指标传空判断
+- 2026-03-05T02:35:21+08:00 [fix(chart): 修复组合图折线指标传空判断](http://lf.git.oa.mt/publish_platform/web/publish/commit/abad3dc8688a3a06d57e2ef1c3884593f5bba88e)
+- 2026-03-05T02:30:07+08:00 [fix(chart): 副轴和非副轴分别定义偏移](http://lf.git.oa.mt/publish_platform/web/publish/commit/6390674b94bcffb02e2145ecc51927a20d89d4a0)
+- 2026-03-05T02:28:42+08:00 [fix(chart): 为了规避辅助线文本避让的问题仍然使用render渲染辅助线](http://lf.git.oa.mt/publish_platform/web/publish/commit/a005f7455772ee64b3e1b951de6eec7fc1529bc5)
+- 2026-03-05T02:19:27+08:00 [fix(chart): 分组时不进行补充处理](http://lf.git.oa.mt/publish_platform/web/publish/commit/0dcc076cf441b16cb6a7a02aee5f6736c1574bc0)
+- 2026-03-05T02:15:09+08:00 [fix(chart): 处理缺失数据导致的tooltip文本缺失问题](http://lf.git.oa.mt/publish_platform/web/publish/commit/ab1c7394ed7b80b5ed17237f59d6c222ad6f253b)
+- 2026-03-05T01:16:46+08:00 [fix(chart): 着重函数axis调整减少顶部空白](http://lf.git.oa.mt/publish_platform/web/publish/commit/6100c4c96a98aa690a61783a64ae4cc3e1c3309f)
+- 2026-03-05T01:03:57+08:00 [feat(chart): 处理图表tooltip和节点tooltip的冲突问题](http://lf.git.oa.mt/publish_platform/web/publish/commit/b502392f558e0d8fdec18c551f52c6f3dc6f9eb2)
+- 2026-03-04T22:36:24+08:00 [fix(chart): 组合图数据处理](http://lf.git.oa.mt/publish_platform/web/publish/commit/6622bc898bdd8feed1655b1573545299164af09c)
+- 2026-03-04T22:18:28+08:00 [fix(chart): 组合图tooltip滚动显示问题](http://lf.git.oa.mt/publish_platform/web/publish/commit/6180fdf4417da43bef0800b450f4d739ca1ab6ee)
+- 2026-03-04T21:28:25+08:00 [fix(chart): 可视化看板、编辑看板tooltip位置问题](http://lf.git.oa.mt/publish_platform/web/publish/commit/c58e1851d1286fcf4290ede2435603e378a747ba)
+- 2026-03-04T21:17:52+08:00 [fix(chart): 组合图total计算更新](http://lf.git.oa.mt/publish_platform/web/publish/commit/937597110cc96672a2f7fda5899cd6df660bd251)
+
 **2.1.11** fix(chart): 组合图去掉主轴过滤逻辑，以支持tooltip展示
 - 2026-03-04T20:56:34+08:00 [fix(chart): 组合图去掉主轴过滤逻辑，以支持tooltip展示](http://lf.git.oa.mt/publish_platform/web/publish/commit/215222fb1ae535a52aea475d3a8447cdc61dfa19)
 - 2026-03-04T20:30:34+08:00 [fix(chart): 组合图数据处理逻辑优化](http://lf.git.oa.mt/publish_platform/web/publish/commit/bab29eb2897d1b7b60877c234d8cc14b4d79b9a9)

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);

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 > 1 ? '' : safeZ;
+        const indicatorId = indicators?.length > 2 ? "" : safeZ;
         return getAxisFormat(val, safeIndicatorMap, indicatorId);
     }, [
         safeIndicatorMap,
@@ -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 ? 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"]));
@@ -77,7 +75,7 @@ const G2LineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap,
         auxiliaryLineData
     ]);
     const formatAxis = useCallback((val)=>{
-        const indicatorId = indicators?.length > 1 ? '' : safeLegend;
+        const indicatorId = indicators?.length > 1 ? "" : safeLegend;
         return getAxisFormat(val, safeIndicatorMap, indicatorId);
     }, [
         safeIndicatorMap,
@@ -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,
@@ -186,15 +182,15 @@ const G2LineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap,
             }
         });
         chartRef.current = chart;
-        if (onChartClick) chart.on("plot:click", (_e)=>{
-            const tooltipTitle = currentTooltipTitleRef.current;
-            if (null != tooltipTitle) {
-                console.log('使用 tooltip title 触发下钻:', tooltipTitle);
-                onChartClick({
+        if (onChartClick) {
+            chart.on("plot:click", (_e)=>{
+                const tooltipTitle = currentTooltipTitleRef.current;
+                if (null != tooltipTitle) onChartClick({
                     title: tooltipTitle
                 });
-            }
-        });
+            });
+            chart.on("plot:pointerenter:", (event)=>{});
+        }
         return ()=>{
             if (chartRef.current) {
                 chartRef.current.off("plot:click");
@@ -221,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%",
@@ -255,7 +250,7 @@ const G2LineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap,
                 children: xyList?.map((item, index)=>/*#__PURE__*/ jsx(NodePopover, {
                         style: {
                             position: "absolute",
-                            top: item.pointP?.y + 10,
+                            top: item.pointP?.y + 12,
                             left: item.pointP?.x,
                             width: 12,
                             height: 12,

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

@@ -307,3 +307,5 @@ export declare function applyNodeData(view: any, nodeData: any[], x: string, y:
 }[];
 export declare function adjustDomainMax(domainMin: number, domainMax: number): number;
 export declare const sortByIndicators: (arr: string[], indicators: string[]) => string[];
+export declare function intervalSort(a: any, b: any): number;
+export declare function fillMissingIndicator(baseItems: any[], safeTitle: string, isCompare: boolean, isGroup?: boolean): any[];