From 5c0e6ab59ff800d92942c9ce3dfc396324d53ab7 Mon Sep 17 00:00:00 2001 From: "xuying.xu" Date: Wed, 29 May 2024 11:47:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20size=E6=94=AF=E6=8C=81px?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/f2/src/components/geometry/index.tsx | 5 ++ .../src/components/interval/withInterval.tsx | 1 - ...nge-\346\224\257\346\214\201px-1-snap.png" | Bin 0 -> 13047 bytes ...ze-\346\224\257\346\214\201-px-1-snap.png" | Bin 0 -> 13925 bytes .../f2/test/components/geometry/attr.test.tsx | 48 ++++++++++++++++++ 5 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 "packages/f2/test/components/geometry/__image_snapshots__/attr-test-tsx-geometry-attr-size-field-range-\346\224\257\346\214\201px-1-snap.png" create mode 100644 "packages/f2/test/components/geometry/__image_snapshots__/attr-test-tsx-geometry-attr-size-\346\224\257\346\214\201-px-1-snap.png" diff --git a/packages/f2/src/components/geometry/index.tsx b/packages/f2/src/components/geometry/index.tsx index b176a9295..4eea8186b 100644 --- a/packages/f2/src/components/geometry/index.tsx +++ b/packages/f2/src/components/geometry/index.tsx @@ -122,6 +122,10 @@ class Geometry< this.attrController = new AttrController(chart.scale, attrsRange); const { attrController, justifyContent } = this; + if (props?.size) { + props.size = context.px2hd(props.size); + } + const attrOptions = attrController.getAttrOptions(props, !coord.isCyclic() || justifyContent); attrController.create(attrOptions); } @@ -473,6 +477,7 @@ class Geometry< const defaultAttrValues = attrController.getDefaultAttrValues(); const mappedRecords = []; + for (let i = 0, len = records.length; i < len; i++) { const record = records[i]; const { children } = record; diff --git a/packages/f2/src/components/interval/withInterval.tsx b/packages/f2/src/components/interval/withInterval.tsx index 76a8822e9..b005a5502 100644 --- a/packages/f2/src/components/interval/withInterval.tsx +++ b/packages/f2/src/components/interval/withInterval.tsx @@ -75,7 +75,6 @@ export default (Views) => { mapping() { const records = super.mapping(); - const { props } = this; const { coord, sizeZoom } = props; const y0 = this.getY0Value(); diff --git "a/packages/f2/test/components/geometry/__image_snapshots__/attr-test-tsx-geometry-attr-size-field-range-\346\224\257\346\214\201px-1-snap.png" "b/packages/f2/test/components/geometry/__image_snapshots__/attr-test-tsx-geometry-attr-size-field-range-\346\224\257\346\214\201px-1-snap.png" new file mode 100644 index 0000000000000000000000000000000000000000..c4d1871287cacb1a8b9b5850335e87f7dfe94d83 GIT binary patch literal 13047 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.NxEC$2@QOc09>a;eSCQ?AjD_! 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
o>au7i^%n(R?>Fi*gxABUoe_8XBrC-BlTQ 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 literal 0 HcmV?d00001 diff --git a/packages/f2/test/components/geometry/attr.test.tsx b/packages/f2/test/components/geometry/attr.test.tsx index eb6f9800c..211afb085 100644 --- a/packages/f2/test/components/geometry/attr.test.tsx +++ b/packages/f2/test/components/geometry/attr.test.tsx @@ -456,6 +456,27 @@ describe('Geometry - Attr', () => { expect(geometryRef.current.records[1].children[0].size).toBe(16); }); + it('size 支持 px', async () => { + const ref = {}; + const context = createContext('size 支持px'); + const { type, props } = ( + + + + + + + + + ); + + const canvas = new Canvas(props); + await canvas.render(); + + await delay(1000); + expect(context).toMatchImageSnapshot(); + }); + it('size = {field} 用size大小来做分类', async () => { const context = createContext('size = {field} 用size大小来做分类', { width: '380px' }); const geometryRef = { current: null }; @@ -477,6 +498,33 @@ describe('Geometry - Attr', () => { expect(geometryRef.current.records[1].children[0].size).toBe(3); }); + it('size = {{ field, range }} 支持px', async () => { + const ref = {}; + const context = createContext('size = {{ field, range }} 支持px'); + const { type, props } = ( + + + + + + + + ); + + const canvas = new Canvas(props); + await canvas.render(); + + await delay(1000); + expect(context).toMatchImageSnapshot(); + }); + it('size = {{ field, range }} 用size大小来做分类', async () => { const context = createContext('size = {{ field, range }} 用size大小来做分类', { width: '380px',