From 3439da88eb8f72d1cf00a6190eda6d4cd2a8c187 Mon Sep 17 00:00:00 2001 From: Wenjun Xu <906626481@qq.com> Date: Fri, 1 Dec 2023 17:12:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=E7=BB=B4=E5=BA=A6=E6=89=80=E7=94=9F=E6=88=90=E7=9A=84=20query?= =?UTF-8?q?=20=E5=A4=9A=E4=BA=86=20empty=20extra=20value=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20(#2444)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spreadsheet/miss-dimension-values-spec.ts | 173 ++++++++++-------- .../layout/get-dims-condition-by-node.ts | 3 +- 2 files changed, 97 insertions(+), 79 deletions(-) diff --git a/packages/s2-core/__tests__/spreadsheet/miss-dimension-values-spec.ts b/packages/s2-core/__tests__/spreadsheet/miss-dimension-values-spec.ts index 0ebf2b44af..3542ef8f85 100644 --- a/packages/s2-core/__tests__/spreadsheet/miss-dimension-values-spec.ts +++ b/packages/s2-core/__tests__/spreadsheet/miss-dimension-values-spec.ts @@ -15,10 +15,7 @@ const s2Options: S2Options = { }, reverseLayout: false, reverseSubLayout: false, - subTotalsDimensions: [ - '2d7feabd-76a2-4c11-8f24-79764af936b4', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec', - ], + subTotalsDimensions: ['first', 'second'], }, col: { showGrandTotals: false, @@ -40,133 +37,142 @@ const s2Options: S2Options = { const testDataCfg: S2DataConfig = { meta: [ { - field: '2d7feabd-76a2-4c11-8f24-79764af936b4', + field: 'first', name: '一级维度', }, { - field: '30b4b32d-d69a-4772-b7f9-84cd54cf0cec', + field: 'second', name: '二级维度', }, { - field: 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee', + field: 'third', + name: '三级维度', + }, + { + field: 'number', name: '数值', }, ], fields: { - rows: [ - '2d7feabd-76a2-4c11-8f24-79764af936b4', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec', - ], + rows: ['first', 'second', 'third'], columns: [], - values: ['c5ce4e54-795a-42b3-9cc8-e8b685da44ee'], + values: ['number'], valueInCols: true, }, data: [ { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '总计', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 1732771, + first: '总计', + number: 1732771, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '维值-1', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec': '维值-2', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 172245, + first: '维值-1', + second: '维值-2', + third: '维度-3', + number: 172245, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '维值-1', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec': '维值-2', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 12222, + first: '维值-1', + second: '维值-2', + third: '维度-3', + number: 12222, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '维值-1', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec': '维值-3', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 11111, + first: '维值-1', + second: '维值-3', + third: '维值-3', + number: 11111, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '维值-1', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec': '维值-3', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 11111, + first: '维值-1', + second: '维值-3', + third: '维度-3', + number: 11111, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '维值-1', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 456, + first: '维值-1', + number: 456, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '测试-1', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec': '测试-2', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 12, + first: '测试-1', + second: '测试-2', + third: '维度-3', + number: 12, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '测试-1', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec': '测试-2', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 4444567, + first: '测试-1', + second: '测试-2', + third: '维度-3', + number: 4444567, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '测试-1', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec': '测试-3', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 111233, + first: '测试-1', + second: '测试-3', + number: 111233, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '测试-1', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec': '测试-3', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 785222, + first: '测试-1', + second: '测试-3', + number: 785222, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '测试-1', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec': '测试-4', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 6455644, + first: '测试-1', + second: '测试-4', + third: '维度-3', + number: 6455644, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '测试-1', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec': '测试-4', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 289898, + first: '测试-1', + second: '测试-4', + number: 289898, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '测试-1', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec': '测试-5', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 2222, + first: '测试-1', + second: '测试-5', + number: 2222, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '测试-1', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec': '测试-5', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 1111, + first: '测试-1', + second: '测试-5', + third: '维度-3', + number: 1111, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '测试-1', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 125555, + first: '测试-1', + number: 125555, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '测试-6', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec': '测试-x', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 409090, + first: '测试-6', + second: '测试-x', + number: 409090, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '测试-6', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec': '测试-x', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 111111, + first: '测试-6', + second: '测试-x', + number: 111111, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '测试-6', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec': '测试-7', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 5555, + first: '测试-6', + second: '测试-7', + number: 5555, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '测试-6', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec': '测试-7', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 67878, + first: '测试-6', + second: '测试-7', + number: 67878, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '测试-6', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec': '测试-8', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 53445.464, + first: '测试-6', + second: '测试-8', + number: 53445.464, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '测试-6', - '30b4b32d-d69a-4772-b7f9-84cd54cf0cec': '测试-8', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 456.464, + first: '测试-6', + second: '测试-8', + number: 456.464, }, { - '2d7feabd-76a2-4c11-8f24-79764af936b4': '测试-6', - 'c5ce4e54-795a-42b3-9cc8-e8b685da44ee': 123.416, + first: '测试-6', + number: 123.416, }, ], }; @@ -181,7 +187,6 @@ describe('Miss Dimension Values Tests', () => { test('should get correctly empty dimension values', () => { const emptyDimensionValueNode = s2.getRowNodes()[0].children[0]; - expect(emptyDimensionValueNode.value).toEqual(EMPTY_FIELD_VALUE); expect(emptyDimensionValueNode.id).toEqual( `root[&]总计[&]${EMPTY_FIELD_VALUE}`, @@ -203,6 +208,18 @@ describe('Miss Dimension Values Tests', () => { ); }); + test('should generate correct query for empty node', () => { + const emptyDimensionValueNode1 = s2.facet.layoutResult.rowNodes[0]; + expect(emptyDimensionValueNode1.query).toEqual({ + first: '总计', + }); + + const emptyDimensionValueNode2 = s2.facet.layoutResult.rowNodes[1]; + expect(emptyDimensionValueNode2.query).toEqual({ + first: '总计', + }); + }); + test('should get correctly dimension data and ignore empty dimension value', () => { const emptyDimensionValueNode = s2.getRowNodes()[0].children[0]; @@ -221,10 +238,10 @@ describe('Miss Dimension Values Tests', () => { Array [ Array [ Object { - "$$extra$$": "c5ce4e54-795a-42b3-9cc8-e8b685da44ee", + "$$extra$$": "number", "$$value$$": 1732771, - "2d7feabd-76a2-4c11-8f24-79764af936b4": "总计", - "c5ce4e54-795a-42b3-9cc8-e8b685da44ee": 1732771, + "first": "总计", + "number": 1732771, }, ], ] diff --git a/packages/s2-core/src/utils/layout/get-dims-condition-by-node.ts b/packages/s2-core/src/utils/layout/get-dims-condition-by-node.ts index 3bc44b3b31..b87cbd452c 100644 --- a/packages/s2-core/src/utils/layout/get-dims-condition-by-node.ts +++ b/packages/s2-core/src/utils/layout/get-dims-condition-by-node.ts @@ -1,3 +1,4 @@ +import { EMPTY_FIELD_VALUE } from '../../common/constant'; import type { Node } from '../../facet/layout/node'; export function getDimsCondition(parent: Node, force?: boolean) { @@ -8,7 +9,7 @@ export function getDimsCondition(parent: Node, force?: boolean) { * 当为表格布局时，小计行的内容是“小计”不需要作为筛选条件 * 当为树状布局时，force可以强行指定小计行，即父类目作为筛选条件 */ - if (!p.isTotalRoot || force) { + if ((!p.isTotalRoot || force) && p.value !== EMPTY_FIELD_VALUE) { cond[p.key] = p.value; } p = p.parent; From 17a2d00f13ff1db4cc8236176b2a26c5212a2dbd Mon Sep 17 00:00:00 2001 From: Wenjun Xu <906626481@qq.com> Date: Fri, 1 Dec 2023 18:04:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E6=A0=87=E7=82=B9=E7=AC=A6=E5=8F=B7=20(#2442)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 修复中英文标点符号 * test: 单测修复 --- packages/s2-core/__tests__/unit/common/i18n/index-spec.ts | 6 ++++-- packages/s2-core/src/common/i18n/en_US.ts | 3 ++- packages/s2-core/src/common/i18n/zh_CN.ts | 3 ++- .../strategy-sheet/custom-tooltip/custom-data-tooltip.tsx | 3 ++- .../strategy-sheet/custom-tooltip/custom-row-tooltip.tsx | 3 ++- .../src/components/tooltip/components/description.tsx | 3 ++- .../src/components/tooltip/components/head-info.tsx | 3 ++- .../s2-react/src/components/tooltip/components/summary.tsx | 3 ++- packages/s2-shared/src/constant/i18n/en_US.ts | 2 +- packages/s2-shared/src/constant/i18n/zh_CN.ts | 2 +- 10 files changed, 20 insertions(+), 11 deletions(-) diff --git a/packages/s2-core/__tests__/unit/common/i18n/index-spec.ts b/packages/s2-core/__tests__/unit/common/i18n/index-spec.ts index 13535a9eb0..74cfae1c14 100644 --- a/packages/s2-core/__tests__/unit/common/i18n/index-spec.ts +++ b/packages/s2-core/__tests__/unit/common/i18n/index-spec.ts @@ -19,7 +19,7 @@ describe('I18n Test', () => { setLang('en_US'); expect(i18n('小计')).toEqual('Total'); expect(i18n('总计')).toEqual('Total'); - expect(i18n('总和')).toEqual('SUM'); + expect(i18n('总和')).toEqual('(SUM)'); expect(i18n('项')).toEqual('items'); expect(i18n('已选择')).toEqual('selected'); expect(i18n('序号')).toEqual('Index'); @@ -27,13 +27,14 @@ describe('I18n Test', () => { expect(i18n('数值')).toEqual('Measure'); expect(i18n('共计')).toEqual('Total'); expect(i18n('条')).toEqual(''); + expect(i18n('，')).toEqual(', '); }); test('should show Chinese text when set lang to zh', () => { setLang('zh_CN'); expect(i18n('小计')).toEqual('小计'); expect(i18n('总计')).toEqual('总计'); - expect(i18n('总和')).toEqual('总和'); + expect(i18n('总和')).toEqual('（总和）'); expect(i18n('项')).toEqual('项'); expect(i18n('已选择')).toEqual('已选择'); expect(i18n('序号')).toEqual('序号'); @@ -41,5 +42,6 @@ describe('I18n Test', () => { expect(i18n('数值')).toEqual('数值'); expect(i18n('共计')).toEqual('共计'); expect(i18n('条')).toEqual('条'); + expect(i18n('，')).toEqual('，'); }); }); diff --git a/packages/s2-core/src/common/i18n/en_US.ts b/packages/s2-core/src/common/i18n/en_US.ts index f067f4b7d9..acabe99a22 100644 --- a/packages/s2-core/src/common/i18n/en_US.ts +++ b/packages/s2-core/src/common/i18n/en_US.ts @@ -1,7 +1,7 @@ export const EN_US = { 小计: 'Total', 总计: 'Total', - 总和: 'SUM', + 总和: '(SUM)', 项: 'items', 已选择: 'selected', 序号: 'Index', @@ -16,4 +16,5 @@ export const EN_US = { 升序: 'ASC', 降序: 'DESC', 不排序: 'No order', + '，': ', ', }; diff --git a/packages/s2-core/src/common/i18n/zh_CN.ts b/packages/s2-core/src/common/i18n/zh_CN.ts index 6e677d4684..45913deb78 100644 --- a/packages/s2-core/src/common/i18n/zh_CN.ts +++ b/packages/s2-core/src/common/i18n/zh_CN.ts @@ -1,7 +1,7 @@ export const ZH_CN = { 小计: '小计', 总计: '总计', - 总和: '总和', + 总和: '（总和）', 项: '项', 已选择: '已选择', 序号: '序号', @@ -16,4 +16,5 @@ export const ZH_CN = { 降序: '降序', 组内降序: '组内降序', 不排序: '不排序', + '，': '，', }; diff --git a/packages/s2-react/src/components/sheets/strategy-sheet/custom-tooltip/custom-data-tooltip.tsx b/packages/s2-react/src/components/sheets/strategy-sheet/custom-tooltip/custom-data-tooltip.tsx index 80bce6d221..9b4938009c 100644 --- a/packages/s2-react/src/components/sheets/strategy-sheet/custom-tooltip/custom-data-tooltip.tsx +++ b/packages/s2-react/src/components/sheets/strategy-sheet/custom-tooltip/custom-data-tooltip.tsx @@ -112,7 +112,8 @@ export const StrategySheetDataTooltip: React.FC = ({ )} {rowDescription && (
- {i18n('说明')}: {rowDescription} + {i18n('说明')} + {rowDescription}
)} diff --git a/packages/s2-react/src/components/sheets/strategy-sheet/custom-tooltip/custom-row-tooltip.tsx b/packages/s2-react/src/components/sheets/strategy-sheet/custom-tooltip/custom-row-tooltip.tsx index d69b744226..fd6f6f3f79 100644 --- a/packages/s2-react/src/components/sheets/strategy-sheet/custom-tooltip/custom-row-tooltip.tsx +++ b/packages/s2-react/src/components/sheets/strategy-sheet/custom-tooltip/custom-row-tooltip.tsx @@ -22,7 +22,8 @@ export const StrategySheetRowTooltip: React.FC = ({
{rowName}
{description && (
- {i18n('说明')}: {description} + {i18n('说明')} + {description}
)} diff --git a/packages/s2-react/src/components/tooltip/components/description.tsx b/packages/s2-react/src/components/tooltip/components/description.tsx index e21f4fdce9..66c1ac4527 100644 --- a/packages/s2-react/src/components/tooltip/components/description.tsx +++ b/packages/s2-react/src/components/tooltip/components/description.tsx @@ -12,7 +12,8 @@ export const TooltipDescription: React.FC = ({ <> {description && (
- {i18n('说明')}：{description} + {i18n('说明')} + {description}
)} diff --git a/packages/s2-react/src/components/tooltip/components/head-info.tsx b/packages/s2-react/src/components/tooltip/components/head-info.tsx index 9048217a5c..37f0156682 100644 --- a/packages/s2-react/src/components/tooltip/components/head-info.tsx +++ b/packages/s2-react/src/components/tooltip/components/head-info.tsx @@ -3,6 +3,7 @@ import { type TooltipDetailListItem, type TooltipHeadInfo, TOOLTIP_PREFIX_CLS, + i18n, } from '@antv/s2'; export const TooltipHead: React.FC = (props) => { @@ -11,7 +12,7 @@ export const TooltipHead: React.FC = (props) => { return (
{cols.map((item: TooltipDetailListItem) => item.value)?.join('/')} - {cols.length > 0 && rows.length > 0 && '，'} + {cols.length > 0 && rows.length > 0 && i18n('，')} {rows.map((item: TooltipDetailListItem) => item.value)?.join('/')}
); diff --git a/packages/s2-react/src/components/tooltip/components/summary.tsx b/packages/s2-react/src/components/tooltip/components/summary.tsx index a0e4a839fa..e41275d68f 100644 --- a/packages/s2-react/src/components/tooltip/components/summary.tsx +++ b/packages/s2-react/src/components/tooltip/components/summary.tsx @@ -33,7 +33,8 @@ export const TooltipSummary: React.FC = React.memo( > {name ? ( - {name} （{i18n('总和')}) + {name} + {i18n('总和')} ) : ( diff --git a/packages/s2-shared/src/constant/i18n/en_US.ts b/packages/s2-shared/src/constant/i18n/en_US.ts index 5137f8ca23..91e3386c9d 100644 --- a/packages/s2-shared/src/constant/i18n/en_US.ts +++ b/packages/s2-shared/src/constant/i18n/en_US.ts @@ -30,7 +30,7 @@ export const EN_US: Record = { '按以下规则进行排序（优先级由低到高）': 'Order according to the following rules (from low to high priority)', 按: 'By', - 说明: 'Description', + 说明: 'Description: ', // export 复制原始数据: 'Copy raw data', diff --git a/packages/s2-shared/src/constant/i18n/zh_CN.ts b/packages/s2-shared/src/constant/i18n/zh_CN.ts index 4763cb138b..681ae4bd17 100644 --- a/packages/s2-shared/src/constant/i18n/zh_CN.ts +++ b/packages/s2-shared/src/constant/i18n/zh_CN.ts @@ -30,7 +30,7 @@ export const ZH_CN: Record = { '按以下规则进行排序（优先级由低到高）': '按以下规则进行排序（优先级由低到高）', 按: '按', - 说明: '说明', + 说明: '说明：', // export 复制原始数据: '复制原始数据', From d2c1cd343712484b0a68dddca3471aef771e0ff2 Mon Sep 17 00:00:00 2001 From: Jinke Li Date: Fri, 1 Dec 2023 18:24:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=F0=9F=A4=96=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=20changelog=20=E6=96=87=E4=BB=B6=20(#2445)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/s2-core/CHANGELOG.md | 13 +++++++++++++ packages/s2-core/package.json | 2 +- packages/s2-react/CHANGELOG.md | 8 ++++++++ packages/s2-react/package.json | 2 +- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/packages/s2-core/CHANGELOG.md b/packages/s2-core/CHANGELOG.md index b30cd2f4b2..2ac1c83bd7 100644 --- a/packages/s2-core/CHANGELOG.md +++ b/packages/s2-core/CHANGELOG.md @@ -1,3 +1,16 @@ +# [@antv/s2-v1.52.1](https://github.com/antvis/S2/compare/@antv/s2-v1.52.0...@antv/s2-v1.52.1) (2023-12-01) + + +### Bug Fixes + +* **copy:** 修复刷选复制行列头时, 数值单元格未格式化 & 存在省略号时未复制原始值 ([#2410](https://github.com/antvis/S2/issues/2410)) ([708fde4](https://github.com/antvis/S2/commit/708fde479bb48b941445b3adaf1f56cf5cb6b301)) +* **interaction:** 修复行列头圈选后滑出可视范围后, 错误的选择了数值单元格 close [#2340](https://github.com/antvis/S2/issues/2340) ([#2411](https://github.com/antvis/S2/issues/2411)) ([3c0884b](https://github.com/antvis/S2/commit/3c0884b4c95efc65279db375327860a3b4335af8)) +* 修复中英文标点符号 ([#2442](https://github.com/antvis/S2/issues/2442)) ([17a2d00](https://github.com/antvis/S2/commit/17a2d00f13ff1db4cc8236176b2a26c5212a2dbd)) +* 修复交叉模式下 行序号位置不正确&总计行未添加行序号 ([#2412](https://github.com/antvis/S2/issues/2412)) ([55359af](https://github.com/antvis/S2/commit/55359af64d08492298187c2ef15d0a780440d1fd)) +* 修复维度缺失部分维值时, 行维值以及对应的数值展示错误 ([#2436](https://github.com/antvis/S2/issues/2436)) ([1207fa0](https://github.com/antvis/S2/commit/1207fa041d1ab31f68785ff683a90954dda5c05c)) +* 修复缺失维度所生成的 query 多了 empty extra value 字段 ([#2444](https://github.com/antvis/S2/issues/2444)) ([3439da8](https://github.com/antvis/S2/commit/3439da88eb8f72d1cf00a6190eda6d4cd2a8c187)) +* 修复隐藏列总计时行总计也被隐藏问题 ([#2417](https://github.com/antvis/S2/issues/2417)) ([3b771c0](https://github.com/antvis/S2/commit/3b771c0df436ef3687f6e20968cf5aa20680e732)) + # [@antv/s2-v1.52.0](https://github.com/antvis/S2/compare/@antv/s2-v1.51.2...@antv/s2-v1.52.0) (2023-11-10) diff --git a/packages/s2-core/package.json b/packages/s2-core/package.json index 8105495a7b..bef1d2be54 100644 --- a/packages/s2-core/package.json +++ b/packages/s2-core/package.json @@ -1,7 +1,7 @@ { "private": false, "name": "@antv/s2", - "version": "1.52.0", + "version": "1.52.1", "main": "lib/index.js", "unpkg": "dist/index.min.js", "module": "esm/index.js", diff --git a/packages/s2-react/CHANGELOG.md b/packages/s2-react/CHANGELOG.md index a3b2a28948..d55bf4078a 100644 --- a/packages/s2-react/CHANGELOG.md +++ b/packages/s2-react/CHANGELOG.md @@ -1,3 +1,11 @@ +# [@antv/s2-react-v1.44.3](https://github.com/antvis/S2/compare/@antv/s2-react-v1.44.2...@antv/s2-react-v1.44.3) (2023-12-01) + + +### Bug Fixes + +* **copy:** 修复刷选复制行列头时, 数值单元格未格式化 & 存在省略号时未复制原始值 ([#2410](https://github.com/antvis/S2/issues/2410)) ([708fde4](https://github.com/antvis/S2/commit/708fde479bb48b941445b3adaf1f56cf5cb6b301)) +* 修复中英文标点符号 ([#2442](https://github.com/antvis/S2/issues/2442)) ([17a2d00](https://github.com/antvis/S2/commit/17a2d00f13ff1db4cc8236176b2a26c5212a2dbd)) + # [@antv/s2-react-v1.44.2](https://github.com/antvis/S2/compare/@antv/s2-react-v1.44.1...@antv/s2-react-v1.44.2) (2023-11-10) diff --git a/packages/s2-react/package.json b/packages/s2-react/package.json index c799e419b4..0df00779c9 100644 --- a/packages/s2-react/package.json +++ b/packages/s2-react/package.json @@ -1,7 +1,7 @@ { "private": false, "name": "@antv/s2-react", - "version": "1.44.2", + "version": "1.44.3", "main": "lib/index.js", "unpkg": "dist/index.min.js", "module": "esm/index.js",