@publishfx/publish-chart 2.1.6 → 2.1.7

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+**2.1.7** fix(chart): 修复折线图有空数据的异常场景
+- 2026-03-03T17:50:03+08:00 [fix(chart): 修复折线图有空数据的异常场景](http://lf.git.oa.mt/publish_platform/web/publish/commit/3465ede843d4fb156932871cdf042315dbb17096)
+- 2026-03-03T17:38:27+08:00 [fix(chart): 组合图柱数据缺失问题优化](http://lf.git.oa.mt/publish_platform/web/publish/commit/fa55e35a7569b9e7000d2c4dc5d09eee3b60bfff)
+- 2026-03-03T17:35:16+08:00 [fix: tserror](http://lf.git.oa.mt/publish_platform/web/publish/commit/995efdbe45391ecdb06ef6838c65d9bc87c33efa)
+- 2026-03-03T17:28:25+08:00 [feat: 去掉element:click](http://lf.git.oa.mt/publish_platform/web/publish/commit/5bb84001d505392306f4dfd8300e7d21f47fe95b)
+- 2026-03-03T17:26:42+08:00 [fix: 折线图点击无法下钻](http://lf.git.oa.mt/publish_platform/web/publish/commit/5395a60b96d9db398d5a4c5c8610481cbba8362a)
+- 2026-03-03T16:36:31+08:00 [fix: label缩略时要设置minLength](http://lf.git.oa.mt/publish_platform/web/publish/commit/b11ff5ff52376442f3a9b057b942f0d47c4f9ee5)
+- 2026-03-03T14:19:39+08:00 [feat(chart): 组合图排序代码整理](http://lf.git.oa.mt/publish_platform/web/publish/commit/baab4ed6bbd0a3bac46fccb1d3875af241368770)
+
 **2.1.6** fix(chart): 解决ts错误
 - 2026-03-03T06:38:38+08:00 [fix(chart): 解决ts错误](http://lf.git.oa.mt/publish_platform/web/publish/commit/a1a61c8cbfede6e0993a1101dd4f375ad3383302)
 - 2026-03-03T06:30:33+08:00 [fix(chart): 修复所有遗留问题](http://lf.git.oa.mt/publish_platform/web/publish/commit/73456fbb6fe853fc9069e2c6712851375dd372da)

package/dist/adapters/DataAdapter.js

@@ -106,7 +106,7 @@ class DataAdapter {
         if (config.y) dv.transform({
             type: 'map',
             callback: (row)=>{
-                row[config.y] = '' !== row[config.y] ? +row[config.y] : '-';
+                row[config.y] = '' !== row[config.y] && '-' !== row[config.y] && null !== row[config.y] ? +row[config.y] : '-';
                 return row;
             }
         });
@@ -158,10 +158,15 @@ class DataAdapter {
             });
             const xKey = config.x ?? 'x';
             const sortData = tdv.rows.map((item)=>item[xKey]);
-            if (config.isDescend) combinedv.rows.sort((a, b)=>sortData.indexOf(a[xKey]) - sortData.indexOf(b[xKey]));
-            else combinedv.rows.sort((a, b)=>sortData.indexOf(a[xKey]) - sortData.indexOf(b[xKey]));
+            combinedv.rows.sort((a, b)=>{
+                const aIndex = sortData.indexOf(a[xKey]);
+                const bIndex = sortData.indexOf(b[xKey]);
+                if (-1 === aIndex) return 1;
+                if (-1 === bIndex) return -1;
+                return aIndex - bIndex;
+            });
         }
-        console.log('renderG2CombineChart transformedData:leftData:', tdv.rows, 'rightData:', combinedv.rows);
+        console.log('leftData:', tdv.rows, 'rightData:', combinedv.rows);
         return {
             transformedData: dv.rows,
             leftData: tdv.rows,

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

@@ -31,6 +31,7 @@ const G2LineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap,
     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);
     const transformedData = useMemo(()=>{
@@ -72,6 +73,7 @@ const G2LineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap,
         safeY,
         auxiliaryLineData
     ]);
+    console.log('minY, maxY:', minY, maxY);
     const formatAxis = useCallback((val)=>getAxisFormat(val, safeIndicatorMap, safeLegend), [
         safeIndicatorMap,
         safeLegend
@@ -143,6 +145,7 @@ const G2LineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap,
             } : void 0,
             height: height - canvasMarginBottom,
             tooltipRender: (title, items)=>{
+                currentTooltipTitleRef.current = title;
                 const container = tooltipContainerRef.current;
                 if (!container) return null;
                 let safeItems = items.map((i)=>({
@@ -174,15 +177,18 @@ const G2LineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap,
             }
         });
         chartRef.current = chart;
-        if (onChartClick) chart.on("element:click", (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) {
+                console.log('使用 tooltip title 触发下钻:', tooltipTitle);
+                onChartClick({
+                    title: tooltipTitle
+                });
+            }
         });
         return ()=>{
             if (chartRef.current) {
-                chartRef.current.off("element:click");
+                chartRef.current.off("plot:click");
                 chartRef.current.off("element:mouseenter");
                 chartRef.current.off("element:mouseleave");
                 chartRef.current.destroy();

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

@@ -76,6 +76,7 @@ function applyAxisX(mark, options = {}) {
         size: isHorizontal ? Math.floor(containerWidth / 5) : 30,
         labelAutoEllipsis: {
             type: 'ellipsis',
+            minLength: 80,
             maxLength: isHorizontal ? Math.floor(containerWidth / 5) : Math.min(maxLabelChars * fontSize * 0.55, 90)
         },
         labelAlign: 'horizontal',

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

@@ -186,6 +186,7 @@ function renderG2CombineChart(container, options) {
                 ];
                 const groupType = String(datum?.groupType ?? '');
                 const index = groupTypeArr.findIndex((item)=>item === groupType);
+                console.log('line: groupTypeArr:', groupTypeArr, groupType, index, lineColors, getIndicatorCompareName(_indicatorMap, datum['groupType']), datum['groupType']);
                 return {
                     value: datum[LINE_Y_FIELD],
                     name: getIndicatorCompareName(_indicatorMap, datum['groupType']),

package/package.json

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