@univerjs/sheets-conditional-formatting 0.13.0 → 0.14.0

package/lib/types/index.d.ts

@@ -22,7 +22,6 @@ export { type IMoveCfCommandParams, MoveCfCommand } from './commands/commands/mo
 export { type ISetCfCommandParams, SetCfCommand } from './commands/commands/set-cf.command';
 export { AddConditionalRuleMutation, AddConditionalRuleMutationUndoFactory, type IAddConditionalRuleMutationParams, } from './commands/mutations/add-conditional-rule.mutation';
 export { DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory, type IDeleteConditionalRuleMutationParams, } from './commands/mutations/delete-conditional-rule.mutation';
-export { ConditionalFormattingFormulaMarkDirty } from './commands/mutations/formula-mark-dirty.mutation';
 export { type IMoveConditionalRuleMutationParams, MoveConditionalRuleMutation, MoveConditionalRuleMutationUndoFactory, } from './commands/mutations/move-conditional-rule.mutation';
 export type { ISetConditionalRuleMutationParams } from './commands/mutations/set-conditional-rule.mutation';
 export { SetConditionalRuleMutation, setConditionalRuleMutationUndoFactory } from './commands/mutations/set-conditional-rule.mutation';

package/lib/types/models/calculate-unit-v2/utils.d.ts

@@ -1,8 +1,8 @@
 import { CellValue, ICellData, IObjectMatrixPrimitiveType, IRange, Nullable, ColorKit, ObjectMatrix } from '@univerjs/core';
 import { IConditionFormattingRule, IValueConfig } from '../../models/type';
 import { IContext } from './base-calculate-unit';
+import { FormulaResultStatus } from '@univerjs/engine-formula';
 import { CFNumberOperator } from '../../base/const';
-import { FormulaResultStatus } from '../../services/conditional-formatting-formula.service';
 export declare function isFloatsEqual(a: number, b: number): boolean;
 export declare const isNullable: (v: any) => boolean;
 export declare const getCellValue: (cell?: ICellData) => Nullable<CellValue>;
@@ -14,7 +14,7 @@ export declare const getValueByType: (value: IValueConfig, matrix: ObjectMatrix<
     status: FormulaResultStatus;
     result?: undefined;
 } | {
-    result: Nullable<string | number | boolean | void | null | undefined>;
+    result: string | number | boolean | void | null | undefined;
     status: FormulaResultStatus;
 };
 export declare const getCacheStyleMatrix: <S = any>(unitId: string, subUnitId: string, rule: IConditionFormattingRule, context: IContext) => ObjectMatrix<S>;

package/lib/types/models/conditional-formatting-rule-model.d.ts

@@ -1,5 +1,5 @@
 import { IAnchor } from '../utils/anchor';
-import { IConditionFormattingRule } from './type';
+import { IConditionFormattingRule, IRuleModel } from './type';
 type RuleOperatorType = 'delete' | 'set' | 'add' | 'sort';
 export declare class ConditionalFormattingRuleModel {
     private _model;
@@ -15,6 +15,7 @@ export declare class ConditionalFormattingRuleModel {
     getRule(unitId: string, subUnitId: string, cfId?: string): IConditionFormattingRule<import('./type').IConditionalFormattingRuleConfig> | null | undefined;
     getUnitRules(unitId: string): Map<string, IConditionFormattingRule<import('./type').IConditionalFormattingRuleConfig>[]> | null;
     getSubunitRules(unitId: string, subUnitId: string): IConditionFormattingRule<import('./type').IConditionalFormattingRuleConfig>[] | null;
+    getAll(): IRuleModel;
     deleteRule(unitId: string, subUnitId: string, cfId: string): void;
     setRule(unitId: string, subUnitId: string, rule: IConditionFormattingRule, oldCfId: string): void;
     addRule(unitId: string, subUnitId: string, rule: IConditionFormattingRule): void;

package/lib/types/services/conditional-formatting-formula.service.d.ts

@@ -1,5 +1,5 @@
-import { IRange, Nullable, Disposable, ICommandService, ObjectMatrix, RefAlias } from '@univerjs/core';
-import { IActiveDirtyManagerService } from '@univerjs/engine-formula';
+import { IRange, Disposable, ObjectMatrix, RefAlias } from '@univerjs/core';
+import { FormulaResultStatus, RegisterOtherFormulaService } from '@univerjs/engine-formula';
 import { ConditionalFormattingRuleModel } from '../models/conditional-formatting-rule-model';
 type IFormulaItem = {
     formulaText: string;
@@ -7,29 +7,23 @@ type IFormulaItem = {
     id: string;
     unitId: string;
     subUnitId: string;
-    ranges: IRange[];
-    status: FormulaResultStatus;
     formulaId: string;
-    result: ObjectMatrix<string | number | boolean | undefined | null | void>;
 };
-export declare enum FormulaResultStatus {
-    NOT_REGISTER = 1,
-    SUCCESS = 2,
-    WAIT = 3,
-    ERROR = 4
-}
 export declare class ConditionalFormattingFormulaService extends Disposable {
-    private _commandService;
-    private _activeDirtyManagerService;
+    private _registerOtherFormulaService;
     private _conditionalFormattingRuleModel;
     private _formulaMap;
     private _result$;
     result$: import('rxjs').Observable<IFormulaItem & {
         isAllFinished: boolean;
     }>;
-    constructor(_commandService: ICommandService, _activeDirtyManagerService: IActiveDirtyManagerService, _conditionalFormattingRuleModel: ConditionalFormattingRuleModel);
+    constructor(_registerOtherFormulaService: RegisterOtherFormulaService, _conditionalFormattingRuleModel: ConditionalFormattingRuleModel);
     private _initRuleChange;
-    private _initFormulaCalculationResultChange;
+    /**
+     * Register formulas for a specific rule based on its type
+     */
+    private _registerRuleFormulas;
+    private _initFormulaResultChange;
     private _ensureSubunitFormulaMap;
     getSubUnitFormulaMap(unitId: string, subUnitId: string): RefAlias<IFormulaItem, "id" | "formulaId"> | undefined;
     registerFormulaWithRange(unitId: string, subUnitId: string, cfId: string, formulaText: string, ranges?: IRange[]): void;
@@ -38,7 +32,7 @@ export declare class ConditionalFormattingFormulaService extends Disposable {
         status: FormulaResultStatus;
         result?: undefined;
     } | {
-        result: Nullable<string | number | boolean | void | null | undefined>;
+        result: string | number | boolean | void | null | undefined;
         status: FormulaResultStatus;
     };
     getFormulaMatrix(unitId: string, subUnitId: string, cfId: string, formulaText: string): {
@@ -47,16 +41,13 @@ export declare class ConditionalFormattingFormulaService extends Disposable {
     } | {
         result: ObjectMatrix<string | number | boolean | void | null | undefined>;
         status: FormulaResultStatus;
-    } | undefined;
+    };
+    private _getCellValue;
     /**
      * If `formulaText` is not provided, then all caches related to `cfId` will be deleted.
      */
     deleteCache(unitId: string, subUnitId: string, cfId: string, formulaText?: string): IFormulaItem[];
     private _getAllFormulaResultByCfId;
-    /**
-     * The external environment is not aware of`formulaId`;it communicates internally with the formula engine.
-     */
-    private _createFormulaId;
     /**
      * A conditional formatting may have multiple formulas;if the formulas are identical,then the results will be consistent.
      */