@publishfx/publish-chart 2.1.3 → 2.1.4

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+**2.1.4** feat(chart): 柱状、折线、组合三个图表支持onChartClick
+- 2026-03-02T15:27:33+08:00 [feat(chart): 柱状、折线、组合三个图表支持onChartClick](http://lf.git.oa.mt/publish_platform/web/publish/commit/0cbed83b537a5b0a08f676256b8e69bb9ae0741a)
+- 2026-03-02T14:38:28+08:00 [fix(chart): 组合图针对副轴数据全为0时，Y刻度的处理。](http://lf.git.oa.mt/publish_platform/web/publish/commit/2b262810e33d3660255831fb7ef0e345907841e9)
+
 **2.1.3** fix(chart): 组合图分组时inset置为0
 - 2026-02-28T23:48:20+08:00 [fix(chart): 组合图分组时inset置为0](http://lf.git.oa.mt/publish_platform/web/publish/commit/047e02d3cfbce21101277f48e904864163b2a02c)
 - 2026-02-28T22:42:20+08:00 [feat(chart): 组合图tooltip数据调整](http://lf.git.oa.mt/publish_platform/web/publish/commit/f79461050699b0755c8837e26b035083ec980cf1)

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

@@ -122,6 +122,7 @@ const G2BarChart = ({ height = 300, data, x = "", y = "", indicatorMap, onChartC
             isLegend: !!isCompare,
             isHorizontal,
             isHighlight,
+            isClickable: !!onChartClick,
             legend: safeLegend || void 0,
             formatLabel: isDataTag && safeY ? (d)=>{
                 const v = d[safeY];
@@ -160,8 +161,11 @@ const G2BarChart = ({ height = 300, data, x = "", y = "", indicatorMap, onChartC
         });
         chartRef.current = chart;
         if (onChartClick) chart.on("element:click", (e)=>{
+            console.log('e:', e);
             const datum = e.data?.data;
-            if (datum) onChartClick(datum);
+            if (datum) onChartClick({
+                title: datum[x]
+            });
         });
         return ()=>{
             if (chartRef.current) {

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

@@ -194,6 +194,7 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
             isDataTag,
             isLegend: false,
             isCompare,
+            isClickable: !!onChartClick,
             height: height - canvasMarginBottom,
             formatLabel: isDataTag ? (d)=>{
                 const indicatorId = d.groupType.split("_")[0];
@@ -239,7 +240,9 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
         chartRef.current = chart;
         if (onChartClick) chart.on("element:click", (e)=>{
             const datum = e.data?.data;
-            if (datum) onChartClick(datum);
+            if (datum) onChartClick({
+                title: datum[x]
+            });
         });
         return ()=>{
             if (chartRef.current) {
@@ -265,14 +268,6 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
         isGroup,
         legendItems
     ]);
-    if (!z) return /*#__PURE__*/ jsx("div", {
-        style: {
-            width: "100%",
-            color: "#86909c",
-            padding: 16
-        },
-        children: "请传入 z 作为折线指标字段，以展示柱状+折线组合图。"
-    });
     return /*#__PURE__*/ jsxs("div", {
         style: {
             width: "100%",

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

@@ -12,7 +12,7 @@ import useG2TooltipContainer from "../shared/useG2TooltipContainer.js";
 import { getIndicatorCompareName } from "../../../utils/indicatorHelpers.js";
 import { G2BarLegend } from "./G2BarLegend.js";
 import { renderG2LineChart } from "./g2line.js";
-const G2LineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap, onChartClick: _onChartClick, timeRange, legend = "", config, nodeSetting = {
+const G2LineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap, onChartClick, timeRange, legend = "", config, nodeSetting = {
     showType: 0,
     type: []
 }, auxiliaryLineData, highlightDate, indicators = [] })=>{
@@ -169,6 +169,12 @@ 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]
+            });
+        });
         return ()=>{
             if (chartRef.current) {
                 chartRef.current.off("element:click");

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

@@ -33,6 +33,8 @@ export interface RenderG2BarChartOptions {
     isHighlight?: boolean;
     /** 图例字段名（与 y 不同时表示分组柱），通常为 groupType */
     isCompare?: boolean;
+    /** 是否启用点击事件 */
+    isClickable?: boolean;
     legend?: string;
     /** 数据标签格式化：formatLabel(datum) */
     formatLabel?: (datum: any) => string;

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

@@ -2,7 +2,7 @@ import { lines } from "@antv/g-pattern";
 import { applyAuxiliaryLineY, applyAxisX, applyAxisY, applyHighlightDate, applyScaleYLinear, createChart, getColorByGroupType, getMainView } from "./g2Helpers.js";
 const Y_AXIS_FIELD = 'groupValue';
 function renderG2BarChart(container, options) {
-    const { data, x, y, maxY, timeRange: _timeRange, themeColors, indicators = [], indicatorMap: _indicatorMap = {}, formatAxis, highlightDate = [], isDataTag = false, isLegend = true, isHorizontal = false, isHighlight = true, isCompare = false, legend, formatLabel, height = 300, tooltipRender, auxiliaryLineData = [], onNodeListChange, onChartRender } = options;
+    const { data, x, y, maxY, timeRange: _timeRange, themeColors, indicators = [], indicatorMap: _indicatorMap = {}, formatAxis, highlightDate = [], isDataTag = false, isLegend = true, isHorizontal = false, isHighlight = true, isCompare = false, isClickable = false, legend, formatLabel, height = 300, tooltipRender, auxiliaryLineData = [], onNodeListChange, onChartRender } = options;
     const colorOpts = {
         themeColors,
         primaryKey: y,
@@ -68,7 +68,8 @@ function renderG2BarChart(container, options) {
                 transform: 'rotate(-30deg)'
             };
             return getColorByGroupType(groupType, colorOpts);
-        }
+        },
+        cursor: isClickable ? 'pointer' : 'default'
     });
     applyAxisX(view, {
         grid: false

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

@@ -33,6 +33,8 @@ export interface RenderG2CombineChartOptions {
     isHighlight?: boolean;
     /** 是否启用对比期 */
     isCompare?: boolean;
+    /** 是否启用点击事件 */
+    isClickable?: boolean;
     /** 数据标签格式化：formatLabel(datum) */
     formatLabel?: (datum: any) => string;
     /** 图表高度 */

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, x, y, z: _z, maxY, themeColors, indicatorMap: _indicatorMap, formatAxis, formatLineAxis, isDataTag = false, isLegend: _isLegend = false, isCompare = false, formatLabel, highlightDate = [], height = 300, isHighlight = true, indicators = [], tooltipRender, onNodeListChange, lineColors, onChartRender, isGroup, legendItems = [], indicatorId } = options;
+    const { data, x, y, z: _z, maxY, themeColors, indicatorMap: _indicatorMap, formatAxis, formatLineAxis, isDataTag = false, isLegend: _isLegend = false, isCompare = false, formatLabel, highlightDate = [], height = 300, isHighlight = true, isClickable = false, indicators = [], tooltipRender, onNodeListChange, lineColors, onChartRender, isGroup, legendItems = [], indicatorId } = options;
     const chart = createChart({
         container,
         height,
@@ -71,6 +71,7 @@ function renderG2CombineChart(container, options) {
             };
             return barColor;
         },
+        cursor: isClickable ? 'pointer' : 'default',
         stroke: 'transparent'
     });
     interval.scale('y', {
@@ -153,7 +154,7 @@ function renderG2CombineChart(container, options) {
     console.log('compareLineData:', compareLineData);
     const lineMaxY = lineData.reduce((max, item)=>Math.max(max, item[LINE_Y_FIELD]), 0);
     const compareLineMaxY = compareLineData.reduce((max, item)=>Math.max(max, item[LINE_Y_FIELD]), 0);
-    const lineFinalMaxY = Math.max(lineMaxY, compareLineMaxY);
+    const lineFinalMaxY = Math.max(lineMaxY, compareLineMaxY) || 1;
     console.log('lineFinalMaxY:', lineFinalMaxY);
     const line = view.line().data(lineData).encode("x", x).encode("y", LINE_Y_FIELD).encode('color', 'groupType').style({
         lineWidth: 2,
@@ -195,7 +196,7 @@ function renderG2CombineChart(container, options) {
         domainMax: lineFinalMaxY,
         nice: true,
         clamp: true,
-        key: 'bar',
+        key: 'line',
         independent: true,
         tickMethod: (min, max)=>Array.from({
                 length: 6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@publishfx/publish-chart",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "A React chart component library for the Publish platform, including BarChart, LineChart, BarLineChart and other visualization components",
   "type": "module",
   "keywords": [
@@ -24,20 +24,10 @@
     "CHANGELOG.md",
     "README.md"
   ],
-  "scripts": {
-    "build": "rslib build",
-    "dev": "rslib build --watch",
-    "lint": "eslint src --ext .ts,.tsx",
-    "lint:fix": "eslint src --ext .ts,.tsx --fix",
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "test:coverage": "jest --coverage"
-  },
   "devDependencies": {
     "@antv/data-set": "^0.11.8",
     "@antv/g-pattern": "^2.0.42",
     "@antv/g2": "^5.3.0",
-    "@publishfx/publish-components": "workspace:^",
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.17.20",
     "@types/react": "^18.3.18",
@@ -55,7 +45,8 @@
     "react-dom": "^18.3.1",
     "styled-components": "^5.3.11",
     "ts-jest": "^29.1.2",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "@publishfx/publish-components": "^2.1.0"
   },
   "peerDependencies": {
     "@antv/data-set": "^0.11.8",
@@ -71,5 +62,14 @@
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
+  },
+  "scripts": {
+    "build": "rslib build",
+    "dev": "rslib build --watch",
+    "lint": "eslint src --ext .ts,.tsx",
+    "lint:fix": "eslint src --ext .ts,.tsx --fix",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage"
   }
-}
+}