@publishfx/publish-chart 2.1.21 → 2.1.23

package/dist/adapters/DataAdapter.js

@@ -122,14 +122,7 @@ class DataAdapter {
             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] : '-';
+                    row[config.y] = '' !== row[config.y] ? +row[config.y] : null;
                     return row;
                 }
             });
@@ -145,6 +138,20 @@ class DataAdapter {
                     return row.isCombine;
                 }
             });
+            tdv.transform({
+                type: 'map',
+                callback: (row)=>{
+                    row[config.y] = '' !== row[config.y] ? +row[config.y] : null;
+                    return row;
+                }
+            });
+            combinedv.transform({
+                type: 'map',
+                callback: (row)=>{
+                    row[config.y] = '' !== row[config.y] ? +row[config.y] : null;
+                    return row;
+                }
+            });
             if (config.isDescend) tdv.transform({
                 type: 'sort',
                 callback (a, b) {

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

@@ -144,7 +144,6 @@ const G2BarChart = ({ height = 300, data, x = "", y = "", indicatorMap, onChartC
                     items: safeItems,
                     safeIndicatorMap: safeIndicatorMap,
                     formatter: formatter,
-                    safeLegend: safeLegend,
                     auxiliaryLineData: auxiliaryLineData
                 }), container);
                 return container;

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

@@ -70,7 +70,6 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
     isGroupRef.current = isGroup;
     const themeColors = contextConfig?.theme?.colors || [];
     const safeIndicatorMap = indicatorMap || contextConfig.indicatorMap || {};
-    const safeLegend = legend || "groupType";
     const safeZ = z;
     const safeY = "groupValue";
     const isCompare = timeRange?.compareStartTime !== "";
@@ -124,13 +123,9 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
         safeIndicatorMap,
         y
     ]);
-    const formatLineAxis = useCallback((val)=>{
-        const indicatorId = indicators?.length > 2 ? "" : safeZ;
-        return getAxisFormat(val, safeIndicatorMap, indicatorId);
-    }, [
+    const formatLineAxis = useCallback((val)=>getAxisFormat(val, safeIndicatorMap, safeZ), [
         safeIndicatorMap,
-        safeZ,
-        indicators
+        safeZ
     ]);
     useEffect(()=>{
         if (!transformedData.length) {
@@ -183,7 +178,7 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
                         groupName: key,
                         isCombine: false,
                         groupType: groupType,
-                        groupValue: "",
+                        groupValue: null,
                         total: 0,
                         percent: ""
                     });
@@ -257,7 +252,7 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
             isDataTag,
             isCombineDataTag,
             isLegend: false,
-            isCompare,
+            isCompare: isCompare && isOldData,
             isHighlight,
             isClickable: !!onChartClick,
             formatLabel: (isDataTag || isCombineDataTag) && !isOldData ? (d)=>{
@@ -282,7 +277,6 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
                     items: safeItems,
                     safeIndicatorMap: safeIndicatorMap,
                     formatter: formatter,
-                    safeLegend: safeLegend,
                     auxiliaryLineData: auxiliaryLineData
                 }), container);
                 return container;
@@ -303,8 +297,7 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
             lineColors,
             legendItems,
             indicatorId: y,
-            isGroup: isGroupRef.current,
-            isTooltipContent
+            isGroup: isGroupRef.current
         });
         chartRef.current = chart;
         if (onChartClick) chart.on("plot:click", (_e)=>{

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

@@ -133,7 +133,6 @@ const G2GroupBarChart = ({ height = 300, data, x = "", y = "", indicatorMap, onC
                     items: safeItems,
                     safeIndicatorMap: safeIndicatorMap,
                     formatter: formatter,
-                    safeLegend: safeLegend,
                     auxiliaryLineData: auxiliaryLineData
                 }), container);
                 return container;

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

@@ -165,7 +165,6 @@ const G2LineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap,
                     items: safeItems,
                     safeIndicatorMap: safeIndicatorMap,
                     formatter: formatter,
-                    safeLegend: safeLegend,
                     auxiliaryLineData: auxiliaryLineData
                 }), container);
                 return container;
@@ -204,7 +203,6 @@ const G2LineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap,
         };
     }, [
         filteredData,
-        height,
         x,
         y,
         safeLegend,

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

@@ -72,6 +72,7 @@ function applyAxisX(mark, options = {}) {
         labelAutoRotate: false,
         labelFontSize: fontSize,
         labelFontColor: '#000',
+        size: isHorizontal ? Math.min(180, Math.floor(containerWidth / 5)) : 30,
         labelAutoEllipsis: {
             type: 'ellipsis',
             minLength: 80,
@@ -147,14 +148,20 @@ function applyAuxiliaryLineY(view, lines, options = {}) {
     if (!lines?.length) return;
     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').animate(false).scale('y', {
+        view.lineY().data([
+            {
+                y: auxLine.value
+            }
+        ]).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({
+            opacity: 1,
             dx: 0,
             dy: 0,
             text: splitTextToMultiline(auxLine.name, labelMaxLength, '<br />'),
             position: auxLine?.axis === 'right' ? 'bottom-right' : 'bottom-left',
-            render: (text)=>`<div style="background-color: transparent; padding: 5px; border-radius: 5px;font-size: 14px;position: absolute;left: ${auxLine?.axis === 'right' ? '-105px' : '0px'}; top: -24px; width: 100px;color: ${stroke}; font-family: 'PingFang SC', 'Microsoft YaHei', sans-serif;">${text}</div>`
+            render: (text)=>`<div style="background-color: transparent; padding: 5px; border-radius: 5px;font-size: 12px;position: absolute;left: ${auxLine?.axis === 'right' ? '-105px' : '0px'}; top: ${auxLine?.name?.length > 5 ? '-38px' : '-24px'} ; width: 100px; line-height: 14px; color: ${stroke}; text-shadow: 0 0 10px red;
+          font-family: 'PingFang SC', 'Microsoft YaHei', sans-serif;">${text}</div>`
         });
     });
 }

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

@@ -19,7 +19,7 @@ function renderG2BarChart(container, options) {
         insetBottom: 0
     });
     const view = getMainView(chart);
-    view.attr('marginLeft', 0).attr('marginRight', 0).attr('marginBottom', isLegend ? 0 : 16);
+    view.attr('marginLeft', 0).attr('marginRight', isHorizontal ? 30 : 0).attr('marginBottom', isLegend ? 0 : 16);
     if (isHorizontal) view.coordinate({
         transform: [
             {
@@ -79,8 +79,8 @@ function renderG2BarChart(container, options) {
     });
     view.legend(false);
     view.interaction('poptip', {
-        offsetY: -20,
-        offsetX: 0,
+        offsetY: -50,
+        offsetX: -10,
         tipBackgroundColor: '#fcfcfc',
         tipColor: '#333',
         tipBorderRadius: '6px',
@@ -114,18 +114,11 @@ function renderG2BarChart(container, options) {
                 }) : null
         ].filter(Boolean)
     });
-    const tooltipBounding = {
-        x: 0,
-        y: 0,
-        width: container.clientWidth || container.offsetWidth,
-        height: container.clientHeight || container.offsetHeight
-    };
     if (tooltipRender) view.interaction('tooltip', {
         shared: true,
         crosshairsY: true,
         wait: 100,
         marker: false,
-        bounding: tooltipBounding,
         render: (_event, payload)=>{
             const { title, items } = payload;
             const lastIsChange = items.filter((item)=>item.isChange);
@@ -137,10 +130,9 @@ function renderG2BarChart(container, options) {
             return tooltipRender(title, safeItems ?? []) ?? null;
         }
     });
-    else view.interaction('tooltip', {
-        bounding: tooltipBounding
+    applyAuxiliaryLineY(view, auxiliaryLineData, {
+        labelMaxLength: 5
     });
-    applyAuxiliaryLineY(view, auxiliaryLineData);
     const nodeResult = applyNodeData(view, nodeData, x, y);
     if (isDataTag && formatLabel) interval.label({
         style: {
@@ -158,6 +150,15 @@ function renderG2BarChart(container, options) {
             }
         ]
     });
+    view.labelTransform([
+        {
+            type: 'exceedAdjust',
+            bounds: 'main'
+        },
+        {
+            type: 'overlapHide'
+        }
+    ]);
     chart.render();
     let hasEmittedNodeList = false;
     chart.on('afterrender', (_e)=>{

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

@@ -87,8 +87,6 @@ export interface RenderG2CombineChartOptions {
     }>;
     /** 当前指标 id（用于 tooltip 展示） */
     indicatorId?: string;
-    /** 是否将 tooltip 挂载到 body（用于可视化看板、编辑看板场景，避免被父容器裁剪） */
-    isTooltipContent?: boolean;
 }
 /**
  * 在容器上渲染 G2 柱状 + 折线组合图，返回 Chart 实例便于 destroy/更新

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, z: _z, maxLeft, maxRight, themeColors, indicatorMap: _indicatorMap, formatAxis, formatLineAxis, isDataTag = true, isCombineDataTag = true, isLegend: _isLegend = false, isCompare = false, formatLabel, highlightDate = [], 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 = [], isHighlight = true, isClickable = false, indicators = [], tooltipRender, auxiliaryLineData = [], onNodeListChange, lineColors, onChartRender, isGroup, legendItems = [], indicatorId } = options;
     const chart = createChart({
         container,
         autoFit: true
@@ -104,7 +104,7 @@ function renderG2CombineChart(container, options) {
                 const groupType = String(datum.groupType ?? '');
                 const index = legendItems.findIndex((item)=>item.id === `${groupType}_${datum.isCombine}`);
                 return {
-                    value: datum[Y_AXIS_FIELD],
+                    value: datum[BAR_Y_FIELD],
                     name: datum['groupType'],
                     indicatorId,
                     channel: Y_AXIS_FIELD,
@@ -253,52 +253,40 @@ function renderG2CombineChart(container, options) {
                 } : false
         ].filter(Boolean)
     });
-    if (tooltipRender) {
-        const tooltipBounding = {
-            x: 0,
-            y: 0,
-            width: container.clientWidth || container.offsetWidth,
-            height: container.clientHeight || container.offsetHeight
-        };
-        view.interaction('tooltip', {
-            shared: true,
-            crosshairsY: true,
-            marker: false,
-            bounding: tooltipBounding,
-            ...isTooltipContent ? {
-                mount: 'body'
-            } : {},
-            render: (_event, payload)=>{
-                const { title, items } = payload;
-                let safeTitle = title.replace(/,.*$/, '');
-                const baseItems = items.filter((item)=>item.hasOwnProperty('isCombine') && !item.isCombine);
-                const safeItems = fillMissingIndicator(baseItems, safeTitle, isCompare, isGroup);
-                const combineItems = items.filter((item)=>item.hasOwnProperty('isCombine') && item.isCombine);
-                const safeCombineItems = fillMissingIndicator(combineItems, safeTitle, isCompare, isGroup);
-                const indicatorOrder = new Map(indicators.map((id, i)=>[
-                        id,
-                        i
-                    ]));
-                const sortedCombineItems = [
-                    ...safeCombineItems
-                ].sort((a, b)=>{
-                    const orderA = indicatorOrder.get(a.indicatorId) ?? 1 / 0;
-                    const orderB = indicatorOrder.get(b.indicatorId) ?? 1 / 0;
-                    if (orderA !== orderB) return orderA - orderB;
-                    const typeRank = (item)=>{
-                        if (item.isChange) return 2;
-                        if ('compareline' === item.tipType) return 1;
-                        return 0;
-                    };
-                    return typeRank(a) - typeRank(b);
-                });
-                return tooltipRender(safeTitle, [
-                    ...safeItems,
-                    ...sortedCombineItems
-                ]) ?? null;
-            }
-        });
-    }
+    if (tooltipRender) view.interaction('tooltip', {
+        shared: true,
+        crosshairsY: true,
+        marker: false,
+        render: (_event, payload)=>{
+            const { title, items } = payload;
+            let safeTitle = title.replace(/,.*$/, '');
+            const baseItems = items.filter((item)=>item.hasOwnProperty('isCombine') && !item.isCombine);
+            const safeItems = fillMissingIndicator(baseItems, safeTitle, isCompare, isGroup);
+            const combineItems = items.filter((item)=>item.hasOwnProperty('isCombine') && item.isCombine);
+            const safeCombineItems = fillMissingIndicator(combineItems, safeTitle, isCompare, isGroup);
+            const indicatorOrder = new Map(indicators.map((id, i)=>[
+                    id,
+                    i
+                ]));
+            const sortedCombineItems = [
+                ...safeCombineItems
+            ].sort((a, b)=>{
+                const orderA = indicatorOrder.get(a.indicatorId) ?? 1 / 0;
+                const orderB = indicatorOrder.get(b.indicatorId) ?? 1 / 0;
+                if (orderA !== orderB) return orderA - orderB;
+                const typeRank = (item)=>{
+                    if (item.isChange) return 2;
+                    if ('compareline' === item.tipType) return 1;
+                    return 0;
+                };
+                return typeRank(a) - typeRank(b);
+            });
+            return tooltipRender(safeTitle, [
+                ...safeItems,
+                ...sortedCombineItems
+            ]) ?? null;
+        }
+    });
     view.legend(false);
     view.interaction('poptip', {
         offsetY: -20,

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

@@ -79,16 +79,9 @@ function renderG2LineChart(container, options) {
                 })
         ]
     });
-    const tooltipBounding = {
-        x: 0,
-        y: 0,
-        width: container.clientWidth || container.offsetWidth,
-        height: container.clientHeight || container.offsetHeight
-    };
     if (tooltipRender) view.interaction('tooltip', {
         shared: true,
         marker: false,
-        bounding: tooltipBounding,
         render: (_event, payload)=>{
             const { title, items } = payload;
             if (indicators.length) {

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

@@ -16,7 +16,6 @@ interface Props {
     items: Item[];
     safeIndicatorMap: any;
     formatter: any;
-    safeLegend: string;
     auxiliaryLineData?: AuxiliaryLineData[];
 }
 declare const _default: import("react").NamedExoticComponent<Props>;

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

@@ -2,7 +2,7 @@ import { jsx, jsxs } from "react/jsx-runtime";
 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 })=>{
+const G2CompareTooltip = ({ isGroupBar = false, title, items, safeIndicatorMap, formatter, auxiliaryLineData })=>{
     let auxiIndicatorId = '';
     let combineIndicatorId = '';
     const uniqueColors = [];

package/package.json

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