@publishfx/publish-chart 2.1.29 → 2.1.31

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

@@ -294,21 +294,24 @@ function fillMissingIndicator(baseItems, safeTitle, isCompare, isGroup = false)
                     name: indicatorId,
                     value: '-',
                     x: safeTitle,
-                    color: color
+                    color: color,
+                    dataType: 'manual'
                 });
                 if (!baseItems.find((item)=>item.indicatorId === indicatorId && item.name === indicatorId + '_compare')) baseItems.push({
                     indicatorId: indicatorId,
                     name: indicatorId + '_compare',
                     tipType: 'compareline',
                     value: '-',
-                    x: safeTitle
+                    x: safeTitle,
+                    dataType: 'manual'
                 });
                 if (!baseItems.find((item)=>item.indicatorId === indicatorId && item.name === indicatorId + '_change')) baseItems.push({
                     indicatorId: indicatorId,
                     name: indicatorId + '_change',
                     isChange: true,
                     value: '-',
-                    x: safeTitle
+                    x: safeTitle,
+                    dataType: 'manual'
                 });
             }
         });

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

@@ -34,7 +34,7 @@ function renderG2BarChart(container, options) {
         key: 'main'
     });
     if (!CLOSE_HIGHLIGHT_DEBUG) applyHighlightDate(view, x, data, highlightDate, isHighlight);
-    const minLabelWidth = data.some((d)=>d.groupName.length < 3) ? 30 : 90;
+    const minLabelWidth = data.some((d)=>d.groupName.length < 3) ? 30 : isHorizontal ? 30 : 90;
     const interval = view.interval().encode('x', x).encode('y', y).encode('color', 'groupType').transform({
         type: 'dodgeX',
         padding: isHorizontal ? 0.2 : 0

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

@@ -9,6 +9,7 @@ type Item = {
     percent?: string | number;
     hidden?: boolean;
     isCombine?: boolean;
+    dataType?: string;
 };
 interface Props {
     isGroupBar?: boolean;

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

@@ -3,8 +3,9 @@ import { memo } from "react";
 import { CompareChange } from "@publishfx/publish-components";
 import { getIndicatorCompareName } from "../../../utils/indicatorHelpers.js";
 const G2CompareTooltip = ({ isGroupBar = false, title, items, safeIndicatorMap, formatter, auxiliaryLineData })=>{
-    let auxiIndicatorId = '';
-    let combineIndicatorId = '';
+    let auxiIndicatorId = "";
+    let combineIndicatorId = "";
+    let changeValue = null;
     const uniqueColors = [];
     return /*#__PURE__*/ jsxs("div", {
         style: {
@@ -14,7 +15,7 @@ const G2CompareTooltip = ({ isGroupBar = false, title, items, safeIndicatorMap,
             /*#__PURE__*/ jsx("div", {
                 children: title
             }),
-            items?.map(({ color, value, isChange, compareTime, indicatorId, name, percent, hidden, isCombine }, index)=>{
+            items?.map(({ color, value, isChange, compareTime, indicatorId, name, percent, hidden, isCombine, dataType }, index)=>{
                 if (isCombine) combineIndicatorId = indicatorId ?? "";
                 let isFirst = false;
                 if (0 === index) auxiIndicatorId = indicatorId ?? "";
@@ -22,6 +23,9 @@ const G2CompareTooltip = ({ isGroupBar = false, title, items, safeIndicatorMap,
                     isFirst = true;
                     uniqueColors.push(color);
                 }
+                if (null !== changeValue && combineIndicatorId === auxiIndicatorId && "manual" === dataType && isChange) value = changeValue ?? '';
+                if (isChange) changeValue = value ?? '';
+                if (combineIndicatorId === auxiIndicatorId && "-" === value && "manual" === dataType && !isChange) return null;
                 return !hidden && /*#__PURE__*/ jsxs("div", {
                     style: {
                         display: "flex",
@@ -42,7 +46,7 @@ const G2CompareTooltip = ({ isGroupBar = false, title, items, safeIndicatorMap,
                                         borderRadius: "50%"
                                     }
                                 }),
-                                isChange ? "相比变化" : compareTime ? `${getIndicatorCompareName(safeIndicatorMap, indicatorId ?? '')}（${compareTime}）` : isGroupBar ? name : `${getIndicatorCompareName(safeIndicatorMap, indicatorId ?? '')}`,
+                                isChange ? "相比变化" : compareTime ? `${getIndicatorCompareName(safeIndicatorMap, indicatorId ?? "")}（${compareTime}）` : isGroupBar ? name : `${getIndicatorCompareName(safeIndicatorMap, indicatorId ?? "")}`,
                                 "："
                             ]
                         }),
@@ -81,7 +85,7 @@ const G2CompareTooltip = ({ isGroupBar = false, title, items, safeIndicatorMap,
                             ]
                         }),
                         /*#__PURE__*/ jsx("div", {
-                            children: 'right' === axis ? formatter.formatIndicator(value, safeIndicatorMap[combineIndicatorId ?? ''] ?? {}) : formatter.formatIndicator(value, safeIndicatorMap[auxiIndicatorId ?? ''] ?? {})
+                            children: "right" === axis ? formatter.formatIndicator(value, safeIndicatorMap[combineIndicatorId ?? ""] ?? {}) : formatter.formatIndicator(value, safeIndicatorMap[auxiIndicatorId ?? ""] ?? {})
                         })
                     ]
                 }, index))

package/package.json

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