fix: update

dream-num · Sep 19, 2024 · 13105e0 · 13105e0
1 parent 42ce257
commit 13105e0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/core/src/shared/__tests__/range.spec.ts b/packages/core/src/shared/__tests__/range.spec.ts
@@ -394,7 +394,7 @@ describe('mergeRanges', () => {
                 endRow: 10,
             },
             {
-                startColumn: 6,
+                startColumn: 4,
                 startRow: 8,
                 endColumn: 7,
                 endRow: 8,

diff --git a/packages/sheets-data-validation/src/controllers/dv-copy-paste.controller.ts b/packages/sheets-data-validation/src/controllers/dv-copy-paste.controller.ts
@@ -114,6 +114,8 @@ export class DataValidationCopyPasteController extends Disposable {
 
         if (copyInfo.unitId !== unitId || subUnitId !== copyInfo.subUnitId) {
             const ruleMatrix = this._sheetDataValidationModel.getRuleObjectMatrix(copyInfo.unitId, copyInfo.subUnitId).clone();
+            const additionMatrix = new ObjectMatrix();
+            const addRules = new Set<string>();
 
             const { ranges: [vCopyRange, vPastedRange], mapFunc } = virtualizeDiscreteRanges([copyInfo.copyRange, pastedRange]);
 
@@ -139,10 +141,14 @@ export class DataValidationCopyPasteController extends Disposable {
                     }
 
                     const { row: startRow, col: startColumn } = mapFunc(range.startRow, range.startColumn);
-                    // ruleMatrix.setValue(startRow, startColumn, transformedRuleId);
+                    addRules.add(transformedRuleId);
+                    additionMatrix.setValue(startRow, startColumn, transformedRuleId);
                 });
             });
 
+            const additions = Array.from(addRules).map((id) => ({ id, ranges: queryObjectMatrix(additionMatrix, (value) => value === id) }));
+            ruleMatrix.addRangeRules(additions);
+
             const { redoMutations, undoMutations } = getDataValidationDiffMutations(
                 copyInfo.unitId,
                 copyInfo.subUnitId,