Merge branch 'master' into fix/0402/addCustomMappingField

Author: 荊芥

.github/workflows/build.yml

@@ -13,11 +13,11 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/[email protected]
         with:
-          node-version: '14'
+          node-version: '18'
 
       - name: Run CI
         run: |
-          npm install
+          npm install --legacy-peer-deps
           npm run lint
           npm run build
           npm run coverage

CHANGELOG.md

@@ -1,3 +1,26 @@
+#### 2.4.32 (2024-07-30)
+
+##### Chores
+
+*  update github action ([#3608](https://github.com/antvis/G2plot/pull/3608)) ([90020297](https://github.com/antvis/G2plot/commit/90020297669dbe0d213ebae7abebf3f7d9509ec8))
+*  fix customized stock demo typo ([#3564](https://github.com/antvis/G2plot/pull/3564)) ([99b9f638](https://github.com/antvis/G2plot/commit/99b9f63863684dc592f79388c99888c5d24184bd))
+*  update version of @antv/component to 0.8.34 for dist build ([#3545](https://github.com/antvis/G2plot/pull/3545)) ([ec015ea5](https://github.com/antvis/G2plot/commit/ec015ea55490621de20cc2e8cdae872272f3789d))
+
+##### Documentation Changes
+
+*  update readme ([#3757](https://github.com/antvis/G2plot/pull/3757)) ([3725803e](https://github.com/antvis/G2plot/commit/3725803e982e7b4eb6595742462afbc23172ea76))
+*  fix link ([#3514](https://github.com/antvis/G2plot/pull/3514)) ([0f570eb0](https://github.com/antvis/G2plot/commit/0f570eb085612910651cd9cd57b3c95cea97a1db))
+*  Fix a few typos ([#3525](https://github.com/antvis/G2plot/pull/3525)) ([ce615a2a](https://github.com/antvis/G2plot/commit/ce615a2a17fae845fd6badf044491447a713cb90))
+
+##### Bug Fixes
+
+*  line,area,radar label style with callback ([02bf66f3](https://github.com/antvis/G2plot/commit/02bf66f36a39539a326d15689bd22f5f0a9b6025))
+
+##### Other Changes
+
+*  the default value of isPercent option should be false ([#3725](https://github.com/antvis/G2plot/pull/3725)) ([bdc1342e](https://github.com/antvis/G2plot/commit/bdc1342e3cc8a71d8cb1284acec9299b64648774))
+* **demo:**   heatmap-base parameter error ([#3679](https://github.com/antvis/G2plot/pull/3679)) ([bd6af004](https://github.com/antvis/G2plot/commit/bd6af0044efe869b503c2d388adac8326d1e6f31))
+
 #### 2.4.31 (2023-05-10)
 
 ##### Chores

__tests__/bugs/issue-3804-spec.ts

@@ -0,0 +1,41 @@
+import { get } from '@antv/util';
+import { Line } from '../../src';
+import { createDiv } from '../utils/dom';
+
+describe('#3804', () => {
+  it('line label style with callback', () => {
+    const line = new Line(createDiv(), {
+      width: 400,
+      height: 300,
+      autoFit: false,
+      data: [
+        { year: '1991', value: 3 },
+        { year: '1992', value: 4 },
+        { year: '1993', value: 3.5 },
+        { year: '1994', value: 5 },
+        { year: '1995', value: 4.9 },
+        { year: '1996', value: 6 },
+        { year: '1997', value: 7 },
+        { year: '1998', value: 9 },
+        { year: '1999', value: 13 },
+      ],
+      xField: 'year',
+      yField: 'value',
+      label: {
+        fields: ['year', 'value'],
+        callback: (year, value) => {
+          return {
+            style: {
+              text: value,
+              fill: value > 10 ? '#f24' : '#000',
+            },
+          };
+        },
+      },
+    });
+    line.render();
+    const geometry = line.chart.geometries[0];
+    expect(get(geometry, ['labelOption', 'fields'])).toEqual(['year', 'value']);
+    line.destroy();
+  });
+});

__tests__/unit/utils/pattern/line-spec.ts

@@ -29,7 +29,7 @@ describe('utils: line pattern', () => {
     drawLine(ctx, cfg as LinePatternCfg, d);
     // 传入的是呈现的位置
     expect(getPixelColor(canvas, 0, 0).hex).toEqual('#ff0000');
-    expect(getPixelColor(canvas, 0, height - 1).hex).toEqual('#ff0000');
+    expect(getPixelColor(canvas, 0, height - 1).hex).toEqual('#000000');
   });
 
   it('lineUnitPattern with strokeOpacity', () => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/g2plot",
-  "version": "2.4.31",
+  "version": "2.4.32",
   "description": "An interactive and responsive charting library",
   "keywords": [
     "chart",

site/docs/manual/contact.en.md

@@ -14,7 +14,3 @@ If you have any questions, suggestions, feedback or willingness to communicate,
 - Zhihu：https://zhuanlan.zhihu.com/aiux-antv
 
 - Contribution Guide：https://www.yuque.com/antv/g2plot/apubgw
-
-- DingTalk Group Number: 30233731 / 35686967 (Group 2) / 44788198 （Group 3）
-
-<img src="https://gw.alipayobjects.com/zos/antfincdn/hTzzaqgHgQ/Antv%252520G2%252520%26%252520G2Plot.png" width="200" height="266" />

site/docs/manual/contact.zh.md

@@ -14,7 +14,3 @@ order: 9
 - 知乎专栏：https://zhuanlan.zhihu.com/aiux-antv
 
 - 共建指南：https://www.yuque.com/antv/g2plot/apubgw
-
-- 钉钉群组号码: 30233731 / 35686967 (2 群) / 44788198 （3 群）
-
-<img src="https://gw.alipayobjects.com/zos/antfincdn/hTzzaqgHgQ/Antv%252520G2%252520%26%252520G2Plot.png" width="200" height="266" />

src/index.ts

@@ -1,4 +1,4 @@
-export const version = '2.4.31';
+export const version = '2.4.32';
 
 // G2 自定义能力透出
 import * as G2 from '@antv/g2';

src/plots/area/adaptor.ts

@@ -118,9 +118,9 @@ function label(params: Params<AreaOptions>): Params<AreaOptions> {
   if (!label) {
     areaGeometry.label(false);
   } else {
-    const { callback, ...cfg } = label;
+    const { fields, callback, ...cfg } = label;
     areaGeometry.label({
-      fields: [yField],
+      fields: fields || [yField],
       callback,
       cfg: {
         layout: [

src/plots/dual-axes/util/render-sider.ts

@@ -21,8 +21,8 @@ export const doSliderFilter = (view: View, sliderValue: [number, number]) => {
   const values = valuesOfKey(data, xScale.field);
   const xValues = isHorizontal ? values : values.reverse();
   const xTickCount = size(xValues);
-  const minIndex = Math.floor(min * (xTickCount - 1));
-  const maxIndex = Math.floor(max * (xTickCount - 1));
+  const minIndex = Math.round(min * (xTickCount - 1));
+  const maxIndex = Math.round(max * (xTickCount - 1));
 
   // 增加 x 轴的过滤器
   view.filter(xScale.field, (value: any) => {