@publishfx/publish-chart 2.1.21 → 2.1.22

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 !== "";
@@ -257,7 +256,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 +281,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 +301,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;

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,7 +148,11 @@ 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({
             dx: 0,

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',
@@ -140,7 +140,9 @@ function renderG2BarChart(container, options) {
     else view.interaction('tooltip', {
         bounding: tooltipBounding
     });
-    applyAuxiliaryLineY(view, auxiliaryLineData);
+    applyAuxiliaryLineY(view, auxiliaryLineData, {
+        labelMaxLength: 5
+    });
     const nodeResult = applyNodeData(view, nodeData, x, y);
     if (isDataTag && formatLabel) interval.label({
         style: {
@@ -158,6 +160,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
@@ -265,9 +265,6 @@ function renderG2CombineChart(container, options) {
             crosshairsY: true,
             marker: false,
             bounding: tooltipBounding,
-            ...isTooltipContent ? {
-                mount: 'body'
-            } : {},
             render: (_event, payload)=>{
                 const { title, items } = payload;
                 let safeTitle = title.replace(/,.*$/, '');

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.22",
   "description": "A React chart component library for the Publish platform, including BarChart, LineChart, BarLineChart and other visualization components",
   "type": "module",
   "keywords": [