diff --git a/packages/s2-core/__tests__/unit/utils/export/__snapshots__/copy-spec.ts.snap b/packages/s2-core/__tests__/unit/utils/export/__snapshots__/copy-spec.ts.snap index 0fc3318e58..a2304dec16 100644 --- a/packages/s2-core/__tests__/unit/utils/export/__snapshots__/copy-spec.ts.snap +++ b/packages/s2-core/__tests__/unit/utils/export/__snapshots__/copy-spec.ts.snap @@ -163,16 +163,16 @@ exports[`Pivot Table Core Data Process should copy format total(root) data in gr `; exports[`Pivot Table Core Data Process should copy normal data with format header in grid mode 1`] = ` -" 家具-类 - 桌子-子类 - 数量 +" type 家具-类 + sub_type 桌子-子类 +province 城市 数量 浙江省-省 杭州市-市 7789元" `; exports[`Pivot Table Core Data Process should copy normal data with format header in grid mode 2`] = ` -" 家具-类 - 桌子-子类 - 数量 +" type 家具-类 + sub_type 桌子-子类 +province 城市 数量 浙江省-省 小计 18375元" `; diff --git a/packages/s2-core/__tests__/unit/utils/export/copy-spec.ts b/packages/s2-core/__tests__/unit/utils/export/copy-spec.ts index d652ee2494..e9607ca6d7 100644 --- a/packages/s2-core/__tests__/unit/utils/export/copy-spec.ts +++ b/packages/s2-core/__tests__/unit/utils/export/copy-spec.ts @@ -928,7 +928,7 @@ describe('Pivot Table Core Data Process', () => { }); expect(getCopyPlainContent(s2)).toEqual( - `\t\t家具\r\n\t\t桌子\r\n\t\tnumber\r\n浙江省\t杭州市\t7789`, + `\ttype\t家具\r\n\tsub_type\t桌子\r\nprovince\tcity\tnumber\r\n浙江省\t杭州市\t7789`, ); // 小计节点 @@ -937,7 +937,7 @@ describe('Pivot Table Core Data Process', () => { stateName: InteractionStateName.SELECTED, }); expect(getCopyPlainContent(s2)).toEqual( - `\t\t家具\r\n\t\t桌子\r\n\t\tnumber\r\n浙江省\t小计\t18375`, + `\ttype\t家具\r\n\tsub_type\t桌子\r\nprovince\tcity\tnumber\r\n浙江省\t小计\t18375`, ); }); diff --git a/packages/s2-core/src/utils/export/copy/pivot-data-cell-copy.ts b/packages/s2-core/src/utils/export/copy/pivot-data-cell-copy.ts index 8bc326096b..df607c4429 100644 --- a/packages/s2-core/src/utils/export/copy/pivot-data-cell-copy.ts +++ b/packages/s2-core/src/utils/export/copy/pivot-data-cell-copy.ts @@ -395,9 +395,10 @@ export class PivotDataCellCopy extends BaseDataCellCopy { // 带表头复制 const rowMatrix = this.getRowMatrix(); const colMatrix = this.getColMatrix(); + const cornerMatrix = this.getCornerMatrix(rowMatrix); return this.matrixTransformer( - assembleMatrix({ rowMatrix, colMatrix, dataMatrix }), + assembleMatrix({ rowMatrix, colMatrix, dataMatrix, cornerMatrix }), this.config.separator, ); }; @@ -414,9 +415,10 @@ export class PivotDataCellCopy extends BaseDataCellCopy { // 带表头复制 const rowMatrix = this.getRowMatrix(); const colMatrix = this.getColMatrix(); + const cornerMatrix = this.getCornerMatrix(rowMatrix); return this.matrixTransformer( - assembleMatrix({ rowMatrix, colMatrix, dataMatrix }), + assembleMatrix({ rowMatrix, colMatrix, dataMatrix, cornerMatrix }), this.config.separator, ); }