Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(conditional-formatting): distinguish between settings and purges when padding down (#2605)

Gpound.liu6dd8bbee9359
diff --git a/packages/sheets-conditional-formatting-ui/src/controllers/cf.auto-fill.controller.ts b/packages/sheets-conditional-formatting-ui/src/controllers/cf.auto-fill.controller.ts
index 40598942c3..2fb7f46f72 100644
--- a/packages/sheets-conditional-formatting-ui/src/controllers/cf.auto-fill.controller.ts
+++ b/packages/sheets-conditional-formatting-ui/src/controllers/cf.auto-fill.controller.ts
@@ -21,8 +21,8 @@ import { createTopMatrixFromMatrix, findAllRectangle } from '@univerjs/sheets';
import type { IDiscreteRange, ISheetAutoFillHook } from '@univerjs/sheets-ui';
import { APPLY_TYPE, getAutoFillRepeatRange, IAutoFillService, virtualizeDiscreteRanges } from '@univerjs/sheets-ui';
import { Inject, Injector } from '@wendellhu/redi';
-import { ConditionalFormattingRuleModel, ConditionalFormattingViewModel, SetConditionalRuleMutation, setConditionalRuleMutationUndoFactory, SHEET_CONDITIONAL_FORMATTING_PLUGIN } from '@univerjs/sheets-conditional-formatting';
-import type { ISetConditionalRuleMutationParams } from '@univerjs/sheets-conditional-formatting';
+import { ConditionalFormattingRuleModel, ConditionalFormattingViewModel, DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory, SetConditionalRuleMutation, setConditionalRuleMutationUndoFactory, SHEET_CONDITIONAL_FORMATTING_PLUGIN } from '@univerjs/sheets-conditional-formatting';
+import type { IDeleteConditionalRuleMutationParams, ISetConditionalRuleMutationParams } from '@univerjs/sheets-conditional-formatting';
@OnLifecycle(LifecycleStages.Rendered, ConditionalFormattingAutoFillController)
export class ConditionalFormattingAutoFillController extends Disposable {
@@ -175,11 +175,19 @@ export class ConditionalFormattingAutoFillController extends Disposable {
return;
}
const ranges = findAllRectangle(createTopMatrixFromMatrix(item));
- const params: ISetConditionalRuleMutationParams = {
- unitId, subUnitId, rule: { ...rule, ranges },
- };
- redos.push({ id: SetConditionalRuleMutation.id, params });
- undos.push(...setConditionalRuleMutationUndoFactory(this._injector, params));
+ if (ranges.length) {
+ const params: ISetConditionalRuleMutationParams = {
+ unitId, subUnitId, rule: { ...rule, ranges },
+ };
+ redos.push({ id: SetConditionalRuleMutation.id, params });
+ undos.push(...setConditionalRuleMutationUndoFactory(this._injector, params));
+ } else {
+ const params: IDeleteConditionalRuleMutationParams = {
+ unitId, subUnitId, cfId: rule.cfId,
+ };
+ redos.push({ id: DeleteConditionalRuleMutation.id, params });
+ undos.push(...DeleteConditionalRuleMutationUndoFactory(this._injector, params));
+ }
});
return {
undos,