@publishfx/publish-chart 2.1.13 → 2.1.15

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

@@ -13,7 +13,6 @@ function renderG2GroupBarChart(container, options) {
         paddingBottom: 0,
         insetBottom: 0
     });
-    console.log('isLegend:', legend, isLegend);
     const view = getMainView(chart);
     view.attr('marginBottom', isLegend ? 0 : 16);
     if (isHorizontal) view.coordinate({
@@ -23,7 +22,6 @@ function renderG2GroupBarChart(container, options) {
             }
         ]
     });
-    console.log(legendItems, 'legendItems');
     view.data(data);
     applyScaleYLinear(view, {
         field: 'y',
@@ -124,7 +122,6 @@ function renderG2GroupBarChart(container, options) {
     }
     applyAuxiliaryLineY(view, auxiliaryLineData);
     const nodeList = [];
-    console.log('nodeList data:', data);
     data.forEach((item)=>{
         view.shape().data([
             {

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

@@ -2,7 +2,6 @@ import { applyAuxiliaryLineY, applyAxisX, applyAxisY, applyHighlightDate, applyN
 const Y_AXIS_FIELD = 'groupValue';
 function renderG2LineChart(container, options) {
     const { data, nodeData, x, y, minY, maxY, timeRange: _timeRange, themeColors, indicators = [], indicatorMap: _indicatorMap = {}, formatAxis, highlightDate = [], auxiliaryLineData = [], isDataTag = false, isLegend = true, isHighlight = true, formatLabel, height = 300, legendLength: _legendLength, legendSize: _legendSize, tooltipRender, onNodeListChange, onChartRender } = options;
-    console.log('g2line data:', data, x, y);
     const colorOpts = {
         themeColors,
         primaryKey: y,
@@ -28,12 +27,11 @@ function renderG2LineChart(container, options) {
         key: 'main'
     });
     applyHighlightDate(view, x, data, highlightDate, isHighlight);
-    console.log('g2linets:', x, Y_AXIS_FIELD, data, indicators);
-    const line = view.line().data(data.filter((item)=>!item.groupType.includes('_compare'))).encode('x', x).encode('y', Y_AXIS_FIELD).encode('color', 'groupType').encode('series', 'groupType').style({
+    const line = view.line().data(data.filter((item)=>!item.groupType.includes('_compare'))).encode('x', x).encode('y', Y_AXIS_FIELD).encode('color', 'groupType').encode('series', 'groupType').animate(false).style({
         lineWidth: 2,
         stroke: (datum)=>getColorByGroupType(datum[0]?.groupType ?? '', colorOpts)
     });
-    const compareLine = view.line().data(data.filter((item)=>item.groupType.includes('_compare'))).encode('x', x).encode('y', Y_AXIS_FIELD).encode('color', 'groupType').style({
+    const compareLine = view.line().data(data.filter((item)=>item.groupType.includes('_compare'))).encode('x', x).encode('y', Y_AXIS_FIELD).encode('color', 'groupType').encode('series', 'groupType').animate(false).style({
         lineDash: [
             4,
             4
@@ -62,7 +60,6 @@ function renderG2LineChart(container, options) {
         ]
     });
     const hasCompareData = data.some((item)=>item.groupType.includes('_compare'));
-    console.log('hasCompareData:', hasCompareData, data);
     if (hasCompareData) compareLine.tooltip({
         items: [
             (datum)=>({
@@ -95,16 +92,13 @@ function renderG2LineChart(container, options) {
         bounding: tooltipBounding,
         render: (_event, payload)=>{
             const { title, items } = payload;
-            console.log('tooltipRender:', title, items, indicators);
             if (indicators.length) {
                 const groupedItems = indicators.map((indicator)=>items.filter((i)=>i.indicatorId === String(indicator)));
-                console.log(groupedItems.flat(), 'tooltip groupedItems');
                 const sortedItems = groupedItems.map((group)=>[
                         group.filter((i)=>i.name === i.indicatorId),
                         group.filter((i)=>i.compareTime),
                         group.filter((i)=>i.name.includes('_change'))
                     ].filter(Boolean).flat()).flat();
-                console.log(sortedItems, 'tooltip sortedItems');
                 const formatItems = sortedItems.map((item)=>({
                         ...item,
                         color: getColorByGroupType(item?.indicatorId, colorOpts)

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

@@ -7,47 +7,20 @@ function isValidColor(color) {
     return "" !== s.color;
 }
 function validateAndNormalizeProps(props) {
-    const isDev = "development" === process.env.NODE_ENV;
+    process.env.NODE_ENV;
     let { min = 0, max } = props;
-    if ("number" != typeof max || !isFinite(max)) {
-        if (isDev) console.warn("[G2GaugeChart] max 必须是有效的数字，使用默认值 100", {
-            max
-        });
-        max = 100;
-    }
-    if ("number" != typeof min || !isFinite(min)) {
-        if (isDev) console.warn("[G2GaugeChart] min 必须是有效的数字，使用默认值 0", {
-            min
-        });
-        min = 0;
-    }
+    if ("number" != typeof max || !isFinite(max)) max = 100;
+    if ("number" != typeof min || !isFinite(min)) min = 0;
     if (min >= max) {
-        if (isDev) console.warn(`[G2GaugeChart] min (${min}) 必须小于 max (${max})，自动调整为 max - 1`, {
-            min,
-            max
-        });
         min = max - 1;
         if (min < 0) {
             min = 0;
             max = 100;
-            if (isDev) console.warn("[G2GaugeChart] min 和 max 都无效，使用默认值 min=0, max=100");
         }
     }
     let { value } = props;
-    if ("number" != typeof value || !isFinite(value)) {
-        if (isDev) console.warn(`[G2GaugeChart] value 必须是有效的数字，使用默认值 (min + max) / 2`, {
-            value
-        });
-        value = (min + max) / 2;
-    }
-    const originalValue = value;
+    if ("number" != typeof value || !isFinite(value)) value = (min + max) / 2;
     value = Math.min(Math.max(value, min), max);
-    if (originalValue !== value && isDev) console.warn(`[G2GaugeChart] value (${originalValue}) 超出范围 [${min}, ${max}]，已限制为 ${value}`, {
-        originalValue,
-        min,
-        max,
-        clampedValue: value
-    });
     let thresholds = [];
     const defaultColors = [
         '#9596d9',
@@ -68,33 +41,18 @@ function validateAndNormalizeProps(props) {
     let colors = [];
     if (props.thresholds && Array.isArray(props.thresholds) && props.thresholds.length > 0 && "object" == typeof props.thresholds[0]) colors = props.thresholds.map((t)=>t.color).filter((c)=>!!c && isValidColor(c));
     if (0 === colors.length && props.thresholdColors) colors = props.thresholdColors.filter((c)=>isValidColor(c));
-    if (0 === colors.length) {
-        colors = [
-            ...defaultColors
-        ];
-        if (isDev) console.warn("[G2GaugeChart] 未提供有效的颜色，使用默认颜色", {
-            colors
-        });
-    }
+    if (0 === colors.length) colors = [
+        ...defaultColors
+    ];
     while(colors.length < thresholds.length){
         const lastColor = colors[colors.length - 1];
         colors.push(lastColor || defaultColors[0]);
     }
     let height = props.height ?? 300;
-    if ("number" != typeof height || !isFinite(height) || height <= 0) {
-        if (isDev) console.warn(`[G2GaugeChart] height 必须是大于 0 的数字，使用默认值 300`, {
-            height: props.height
-        });
-        height = 300;
-    }
+    if ("number" != typeof height || !isFinite(height) || height <= 0) height = 300;
     height = Math.min(Math.max(height, 100), 2000);
     let pointerColor = props.pointerColor ?? "#c5c5c5";
-    if (!isValidColor(pointerColor)) {
-        if (isDev) console.warn(`[G2GaugeChart] pointerColor 无效，使用默认值 #c5c5c5`, {
-            pointerColor: props.pointerColor
-        });
-        pointerColor = "#c5c5c5";
-    }
+    if (!isValidColor(pointerColor)) pointerColor = "#c5c5c5";
     const formatter = props.formatter;
     const tickFormatter = props.tickFormatter;
     return {
@@ -116,11 +74,7 @@ function safeFormat(formatter, value, percent, fallback) {
     try {
         return formatter(value, percent);
     } catch (error) {
-        if ("development" === process.env.NODE_ENV) console.warn("[G2GaugeChart] formatter 函数执行出错，使用降级值", {
-            error,
-            value,
-            percent
-        });
+        process.env.NODE_ENV;
         return fallback;
     }
 }
@@ -129,10 +83,7 @@ function safeTickFormat(tickFormatter, value, fallback) {
     try {
         return tickFormatter(value);
     } catch (error) {
-        if ("development" === process.env.NODE_ENV) console.warn("[G2GaugeChart] tickFormatter 函数执行出错，使用降级值", {
-            error,
-            value
-        });
+        process.env.NODE_ENV;
         return fallback;
     }
 }

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

@@ -1,3 +1,4 @@
+import type { AuxiliaryLineData } from "../../../core/ChartTypes";
 type Item = {
     color?: string;
     name?: string;
@@ -7,6 +8,7 @@ type Item = {
     indicatorId?: string;
     percent?: string | number;
     hidden?: boolean;
+    isCombine?: boolean;
 };
 interface Props {
     isGroupBar?: boolean;
@@ -15,10 +17,7 @@ interface Props {
     safeIndicatorMap: any;
     formatter: any;
     safeLegend: string;
-    auxiliaryLineData: undefined | {
-        name: string;
-        value: string | number;
-    }[];
+    auxiliaryLineData?: AuxiliaryLineData[];
 }
 declare const _default: import("react").NamedExoticComponent<Props>;
 export default _default;

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

@@ -3,8 +3,8 @@ 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 })=>{
-    let auxiIndicatorId = "";
-    console.log('G2CompareTooltip:', items);
+    let auxiIndicatorId = '';
+    let combineIndicatorId = '';
     const uniqueColors = [];
     return /*#__PURE__*/ jsxs("div", {
         style: {
@@ -14,7 +14,8 @@ const G2CompareTooltip = ({ isGroupBar = false, title, items, safeIndicatorMap,
             /*#__PURE__*/ jsx("div", {
                 children: title
             }),
-            items?.map(({ color, value, isChange, compareTime, indicatorId, name, percent, hidden }, index)=>{
+            items?.map(({ color, value, isChange, compareTime, indicatorId, name, percent, hidden, isCombine }, index)=>{
+                if (isCombine) combineIndicatorId = indicatorId ?? "";
                 let isFirst = false;
                 if (0 === index) auxiIndicatorId = indicatorId ?? "";
                 if (color && !uniqueColors.includes(color)) {
@@ -61,9 +62,7 @@ const G2CompareTooltip = ({ isGroupBar = false, title, items, safeIndicatorMap,
                     ]
                 }, index);
             }),
-            auxiliaryLineData?.map(({ name, value }, index)=>{
-                console.log("auxiliaryLineData:", name, value, safeLegend);
-                return /*#__PURE__*/ jsxs("div", {
+            auxiliaryLineData?.map(({ name, value, axis }, index)=>/*#__PURE__*/ jsxs("div", {
                     style: {
                         display: "flex",
                         justifyContent: "space-between",
@@ -82,11 +81,10 @@ const G2CompareTooltip = ({ isGroupBar = false, title, items, safeIndicatorMap,
                             ]
                         }),
                         /*#__PURE__*/ jsx("div", {
-                            children: formatter.formatIndicator(value, safeIndicatorMap[auxiIndicatorId ?? ""] ?? {})
+                            children: 'right' === axis ? formatter.formatIndicator(value, safeIndicatorMap[combineIndicatorId ?? ''] ?? {}) : formatter.formatIndicator(value, safeIndicatorMap[auxiIndicatorId ?? ''] ?? {})
                         })
                     ]
-                }, index);
-            })
+                }, index))
         ]
     });
 };

package/dist/components/shared/NodeDetail.js

@@ -3,9 +3,7 @@ import "react";
 import { Popover } from "@arco-design/web-react";
 import { nodeMap } from "../../core/ChartConfig.js";
 import { NodePopoverContent } from "./NodePopoverContent.js";
-const NodeDetail = ({ chartWidth, chartOffset, dvRows, ratio = 1 })=>{
-    console.log(dvRows, 'dvRows');
-    return /*#__PURE__*/ jsx("div", {
+const NodeDetail = ({ chartWidth, chartOffset, dvRows, ratio = 1 })=>/*#__PURE__*/ jsx("div", {
         style: {
             display: 'flex',
             justifyContent: 'space-around',
@@ -106,5 +104,4 @@ const NodeDetail = ({ chartWidth, chartOffset, dvRows, ratio = 1 })=>{
             });
         })
     });
-};
 export { NodeDetail };

package/dist/components/shared/NodePopover.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import React from "react";
 type NodeInfoItem = {
     area: string;
     description: string;

package/dist/components/shared/NodePopover.js

@@ -15,19 +15,25 @@ const NodePopover = ({ style, pointData, pointP })=>{
     return /*#__PURE__*/ jsx(Fragment, {
         children: /*#__PURE__*/ jsx(Popover, {
             blurToHide: true,
-            unmountOnExit: true,
+            unmountOnExit: false,
             position: "right",
             style: {
-                maxWidth: 'auto'
+                maxWidth: "auto"
             },
             content: /*#__PURE__*/ jsx(Fragment, {
                 children: /*#__PURE__*/ jsx(NodePopoverContent, {
                     nodeInfos: nodeInfos
                 })
             }),
+            onVisibleChange: (visible)=>{
+                if (visible) {
+                    const tooltip = document.querySelector(".g2-tooltip");
+                    if (tooltip) tooltip.style.visibility = "hidden";
+                }
+            },
             children: /*#__PURE__*/ jsx("div", {
                 style: {
-                    position: 'absolute',
+                    position: "absolute",
                     top: pointP.y - 10,
                     left: pointP.x - 10,
                     zIndex: 999,

package/dist/utils/chartHelpers.js

@@ -16,9 +16,7 @@ const calculateBarWidth = (chart, data, xField, widthRatio = 0.5)=>{
             const estimatedBarWidth = xValueWidth * widthRatio;
             return estimatedBarWidth;
         }
-    } catch (error) {
-        console.error('计算主图柱状图宽度失败', error);
-    }
+    } catch (error) {}
 };
 const getAxisHorPaddingByText = (value, indicatorMap, y)=>7 * getAxisFormat(value, indicatorMap, y).length + 26;
 const getAxisFormat = (val, indicatorMap, y)=>{

package/package.json

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