fix: 修复复制整行时错位 (#2278)

* fix: 修复复制整行时错位 * fix: 修复选行复制时的排序问题 --------- Co-authored-by: owen.wjh <[email protected]>
antvis · Aug 7, 2023 · 6e5f24a · 6e5f24a
1 parent 65b9b41
commit 6e5f24a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/packages/s2-core/__tests__/unit/utils/export/copy-spec.ts b/packages/s2-core/__tests__/unit/utils/export/copy-spec.ts
@@ -183,7 +183,7 @@ describe('List Table Core Data Process', () => {
     });
 
     const data = getSelectedData(ss);
-    expect(data).toBe('2367\t浙江省_formatted\t绍兴市\t家具\t桌子');
+    expect(data).toBe('浙江省_formatted\t绍兴市\t家具\t桌子\t2367');
   });
 
   // https://github.com/antvis/S2/issues/1770
@@ -256,7 +256,7 @@ describe('List Table Core Data Process', () => {
       stateName: InteractionStateName.SELECTED,
     });
     const data = getSelectedData(s2);
-    expect(data).toBe('2330\t四川省\t乐山市\t家具\t桌子');
+    expect(data).toBe('四川省\t乐山市\t家具\t桌子\t2330');
 
     s2.interaction.changeState({
       stateName: InteractionStateName.ALL_SELECTED,
@@ -286,7 +286,7 @@ describe('List Table Core Data Process', () => {
       stateName: InteractionStateName.SELECTED,
     });
     const data = getSelectedData(s2);
-    expect(data).toBe('7234\t浙江省\t宁波市\t家具\t沙发');
+    expect(data).toBe('浙江省\t宁波市\t家具\t沙发\t7234');
     s2.interaction.changeState({
       stateName: InteractionStateName.ALL_SELECTED,
     });

diff --git a/packages/s2-core/src/utils/export/copy.ts b/packages/s2-core/src/utils/export/copy.ts
@@ -478,7 +478,14 @@ const processTableRowSelected = (
   const matrix = displayData
     .filter((_, i) => selectedRows.map((row) => row.rowIndex).includes(i))
     .map((entry) => {
+      // 确保顺序和表格中的列顺序一致
+      const idxMap = spreadsheet.getColumnNodes().reduce((prev, curr, idx) => {
+        prev[curr.field] = idx;
+        return prev;
+      }, {});
+
       return Object.keys(entry)
+        .sort((a, b) => idxMap[a] - idxMap[b])
         .map((cName) =>
           spreadsheet.getColumnNodes().find((n) => n.field === cName),
         )