@univerjs/sheets-conditional-formatting 0.4.2 → 0.5.0-beta.0

package/lib/types/render/data-bar.render.d.ts

@@ -1,5 +1,5 @@
-import { SheetExtension, SpreadsheetSkeleton, UniverRenderingContext } from '@univerjs/engine-render';
 import { IRange, IScale } from '@univerjs/core';
+import { SpreadsheetSkeleton, UniverRenderingContext, SheetExtension } from '@univerjs/engine-render';
 export declare const dataBarUKey = "sheet-conditional-rule-data-bar";
 export declare const defaultDataBarPositiveColor = "#ffbe38";
 export declare const defaultDataBarNativeColor = "#abd91a";

package/lib/types/render/icon.render.d.ts

@@ -1,5 +1,5 @@
-import { SheetExtension, SpreadsheetSkeleton, UniverRenderingContext } from '@univerjs/engine-render';
 import { IRange, IScale } from '@univerjs/core';
+import { SpreadsheetSkeleton, UniverRenderingContext, SheetExtension } from '@univerjs/engine-render';
 export declare const IconUKey = "sheet-conditional-rule-icon";
 export declare const DEFAULT_WIDTH = 15;
 export declare const DEFAULT_PADDING = 2;

package/lib/types/services/calculate-unit/utils.d.ts

@@ -1,11 +1,11 @@
-import { ICellData, IRange, ColorKit, ObjectMatrix } from '@univerjs/core';
+import { CellValue, ICellData, IObjectMatrixPrimitiveType, IRange, Nullable, ColorKit, ObjectMatrix } from '@univerjs/core';
 import { IConditionFormattingRule, IValueConfig } from '../../models/type';
 import { IContext } from './type';
 import { CFNumberOperator } from '../../base/const';
 import { FormulaResultStatus } from '../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) => import('@univerjs/core').Nullable<import('@univerjs/core').CellValue>;
+export declare const getCellValue: (cell?: ICellData) => Nullable<CellValue>;
 export declare function toYMD_1900(ord: number, leap1900?: boolean): number[];
 export declare const serialTimeToTimestamp: (value: number) => number;
 export declare const getValueByType: (value: IValueConfig, matrix: ObjectMatrix<number>, context: IContext & {
@@ -14,7 +14,7 @@ export declare const getValueByType: (value: IValueConfig, matrix: ObjectMatrix<
     status: FormulaResultStatus;
     result?: undefined;
 } | {
-    result: string | number | boolean | undefined;
+    result: Nullable<string | number | boolean | void | null | undefined>;
     status: FormulaResultStatus;
 };
 export declare const getCacheStyleMatrix: <S = any>(unitId: string, subUnitId: string, rule: IConditionFormattingRule, context: IContext) => ObjectMatrix<S>;
@@ -28,3 +28,4 @@ export declare const getColorScaleFromValue: (colorList: {
     value: number;
 }[], value: number) => string | undefined;
 export declare const filterRange: (ranges: IRange[], maxRow: number, maxCol: number) => IRange[];
+export declare function getMaxInFormulaResult(result: IObjectMatrixPrimitiveType<Nullable<CellValue>>): number;

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

@@ -1,14 +1,15 @@
-import { ObjectMatrix, Disposable, ICommandService, Injector, RefAlias } from '@univerjs/core';
+import { IRange, Nullable, Disposable, ICommandService, Injector, ObjectMatrix, RefAlias } from '@univerjs/core';
 import { IActiveDirtyManagerService } from '@univerjs/engine-formula';
 import { ConditionalFormattingRuleModel } from '../models/conditional-formatting-rule-model';
 import { ConditionalFormattingViewModel } from '../models/conditional-formatting-view-model';
 type IFormulaItem = {
     formulaText: string;
     cfId: string;
-    result?: boolean | number | string;
+    id: string;
+    ranges: IRange[];
     status: FormulaResultStatus;
-    count: number;
     formulaId: string;
+    result: ObjectMatrix<string | number | boolean | undefined | null | void>;
 };
 export declare enum FormulaResultStatus {
     NOT_REGISTER = 1,
@@ -24,16 +25,7 @@ export declare class ConditionalFormattingFormulaService extends Disposable {
     private _conditionalFormattingRuleModel;
     private _formulaMap;
     private _cache;
-    private _formulaChange$;
-    formulaChange$: import('rxjs').Observable<{
-        unitId: string;
-        subUnitId: string;
-        cfId: string;
-        formulaText: string;
-        formulaId: string;
-    }>;
     constructor(_commandService: ICommandService, _injector: Injector, _activeDirtyManagerService: IActiveDirtyManagerService, _conditionalFormattingViewModel: ConditionalFormattingViewModel, _conditionalFormattingRuleModel: ConditionalFormattingRuleModel);
-    dispose(): void;
     private _initCache;
     private _initRuleChange;
     private _initFormulaCalculationResultChange;
@@ -41,16 +33,17 @@ export declare class ConditionalFormattingFormulaService extends Disposable {
     private _ensureCacheMap;
     private _deleteCache;
     getCache(unitId: string, subUnitId: string, cfId: string): ObjectMatrix<unknown> | undefined;
-    getSubUnitFormulaMap(unitId: string, subUnitId: string): RefAlias<IFormulaItem, "formulaId" | "formulaText"> | undefined;
-    registerFormula(unitId: string, subUnitId: string, cfId: string, formulaText: string): void;
+    getSubUnitFormulaMap(unitId: string, subUnitId: string): RefAlias<IFormulaItem, "id" | "formulaId"> | undefined;
+    registerFormulaWithRange(unitId: string, subUnitId: string, cfId: string, formulaText: string, ranges?: IRange[]): void;
     private _removeFormulaByCfId;
-    getFormulaResult(unitId: string, subUnitId: string, formulaText: string): {
+    getFormulaResult(unitId: string, subUnitId: string, cfId: string, formulaText: string, row?: number, col?: number): {
         status: FormulaResultStatus;
         result?: undefined;
     } | {
-        result: string | number | boolean | undefined;
+        result: Nullable<string | number | boolean | void | null | undefined>;
         status: FormulaResultStatus;
     };
-    _createFormulaId(unitId: string, subUnitId: string): string;
+    private _createFormulaId;
+    createCFormulaId(cfId: string, formulaText: string): string;
 }
 export {};