@univerjs/sheets-data-validation 0.4.0-alpha.1 → 0.4.0-experimental.d7288c0-20241017

package/lib/types/index.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 export { DATA_VALIDATION_PLUGIN_NAME } from './common/const';
-export { SheetDataValidationModel } from './models/sheet-data-validation-model';
+export { type IValidStatusChange, SheetDataValidationModel } from './models/sheet-data-validation-model';
 export { UniverSheetsDataValidationPlugin } from './plugin';
 export { DataValidationCacheService } from './services/dv-cache.service';
 export type { IDataValidationResCache } from './services/dv-cache.service';
@@ -30,5 +30,4 @@ export { DateValidator } from './validators/date-validator';
 export { CHECKBOX_FORMULA_1, CHECKBOX_FORMULA_2, CheckboxValidator, transformCheckboxValue } from './validators/checkbox-validator';
 export { ListMultipleValidator } from './validators/list-multiple-validator';
 export { deserializeListOptions, getDataValidationCellValue, serializeListOptions } from './validators/util';
-export { DataValidationModel } from '@univerjs/data-validation';
 export { AddSheetDataValidationCommand, ClearRangeDataValidationCommand, getDataValidationDiffMutations, type IAddSheetDataValidationCommandParams, type IClearRangeDataValidationCommandParams, type IRemoveSheetAllDataValidationCommandParams, type IRemoveSheetDataValidationCommandParams, type IUpdateSheetDataValidationOptionsCommandParams, type IUpdateSheetDataValidationRangeCommandParams, type IUpdateSheetDataValidationSettingCommandParams, RemoveSheetAllDataValidationCommand, RemoveSheetDataValidationCommand, UpdateSheetDataValidationOptionsCommand, UpdateSheetDataValidationRangeCommand, UpdateSheetDataValidationSettingCommand, } from './commands/commands/data-validation.command';

package/lib/types/models/sheet-data-validation-model.d.ts

@@ -1,10 +1,18 @@
-import { DataValidationType, ICellDataForSheetInterceptor, ISheetDataValidationRule, Nullable, DataValidationStatus, Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
-import { IRuleChange, IValidStatusChange, DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
+import { ISheetDataValidationRule, DataValidationStatus, DataValidationType, Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
+import { IRuleChange, DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
 import { ISheetLocation } from '@univerjs/sheets';
 import { DataValidationCacheService } from '../services/dv-cache.service';
 import { DataValidationCustomFormulaService } from '../services/dv-custom-formula.service';
 import { DataValidationFormulaService } from '../services/dv-formula.service';
 import { RuleMatrix } from './rule-matrix';
+export interface IValidStatusChange {
+    unitId: string;
+    subUnitId: string;
+    row: number;
+    col: number;
+    ruleId: string;
+    status: DataValidationStatus;
+}
 export declare class SheetDataValidationModel extends Disposable {
     private readonly _dataValidationModel;
     private readonly _univerInstanceService;
@@ -29,7 +37,7 @@ export declare class SheetDataValidationModel extends Disposable {
     getValidator(type: DataValidationType): import('@univerjs/data-validation').BaseDataValidator<import('@univerjs/core').CellValue> | undefined;
     getRuleIdByLocation(unitId: string, subUnitId: string, row: number, col: number): string | undefined;
     getRuleByLocation(unitId: string, subUnitId: string, row: number, col: number): ISheetDataValidationRule | undefined;
-    validator(cell: Nullable<ICellDataForSheetInterceptor>, rule: ISheetDataValidationRule, pos: ISheetLocation, _onCompete?: (status: DataValidationStatus, changed: boolean) => void): DataValidationStatus;
+    validator(rule: ISheetDataValidationRule, pos: ISheetLocation, _onCompete?: (status: DataValidationStatus, changed: boolean) => void): DataValidationStatus;
     getRuleErrorMsg(unitId: string, subUnitId: string, ruleId: string): string;
     getRuleObjectMatrix(unitId: string, subUnitId: string): RuleMatrix;
     getRuleById(unitId: string, subUnitId: string, ruleId: string): ISheetDataValidationRule | undefined;

package/lib/types/services/dv-cache.service.d.ts

@@ -1,13 +1,24 @@
-import { ObjectMatrix, CellValue, DataValidationStatus, IRange, ISheetDataValidationRule, Nullable } from '@univerjs/core';
+import { CellValue, DataValidationStatus, IRange, ISheetDataValidationRule, Nullable, Disposable, ICommandService, ObjectMatrix } from '@univerjs/core';
 export interface IDataValidationResCache {
     value: Nullable<CellValue>;
     interceptValue: Nullable<CellValue>;
     status: DataValidationStatus;
     ruleId: string;
     temp?: boolean;
+    formula1: string;
+    formula2: string;
 }
-export declare class DataValidationCacheService {
+export declare class DataValidationCacheService extends Disposable {
+    private readonly _commandService;
     private _cacheMatrix;
+    private _dirtyRanges$;
+    readonly dirtyRanges$: import('rxjs').Observable<{
+        unitId: string;
+        subUnitId: string;
+        ranges: IRange[];
+    }>;
+    constructor(_commandService: ICommandService);
+    private _initDirtyRanges;
     private _ensureCache;
     ensureCache(unitId: string, subUnitId: string): ObjectMatrix<Nullable<IDataValidationResCache>>;
     addRule(unitId: string, subUnitId: string, rule: ISheetDataValidationRule): void;

package/lib/types/services/dv-custom-formula.service.d.ts

@@ -1,4 +1,4 @@
-import { Disposable, ILogService, IUniverInstanceService, IRange, ISheetDataValidationRule } from '@univerjs/core';
+import { IRange, ISheetDataValidationRule, Disposable, Injector, IUniverInstanceService } from '@univerjs/core';
 import { DataValidationModel } from '@univerjs/data-validation';
 import { LexerTreeBuilder } from '@univerjs/engine-formula';
 import { RegisterOtherFormulaService } from '@univerjs/sheets-formula';
@@ -16,7 +16,7 @@ export declare class DataValidationCustomFormulaService extends Disposable {
     private _lexerTreeBuilder;
     private readonly _dataValidationModel;
     private readonly _dataValidationCacheService;
-    private readonly _logService;
+    private readonly _injector;
     private _formulaMap;
     /**
      * Map of origin formula of rule
@@ -26,7 +26,7 @@ export declare class DataValidationCustomFormulaService extends Disposable {
      * reflect of formulaId to cell, only store transformable formula
      */
     private _formulaCellMap;
-    constructor(_instanceSrv: IUniverInstanceService, _registerOtherFormulaService: RegisterOtherFormulaService, _lexerTreeBuilder: LexerTreeBuilder, _dataValidationModel: DataValidationModel, _dataValidationCacheService: DataValidationCacheService, _logService: ILogService);
+    constructor(_instanceSrv: IUniverInstanceService, _registerOtherFormulaService: RegisterOtherFormulaService, _lexerTreeBuilder: LexerTreeBuilder, _dataValidationModel: DataValidationModel, _dataValidationCacheService: DataValidationCacheService, _injector: Injector);
     private _initFormulaResultHandler;
     private _ensureMaps;
     private _registerFormula;

package/lib/types/services/dv-formula.service.d.ts

@@ -1,6 +1,6 @@
-import { Disposable, IUniverInstanceService, Nullable } from '@univerjs/core';
+import { Nullable, Disposable, IUniverInstanceService } from '@univerjs/core';
+import { IFormulaInfo, IOtherFormulaResult, RegisterOtherFormulaService } from '@univerjs/sheets-formula';
 import { DataValidationModel } from '@univerjs/data-validation';
-import { RegisterOtherFormulaService, IFormulaInfo, IOtherFormulaResult } from '@univerjs/sheets-formula';
 import { DataValidationCacheService } from './dv-cache.service';
 export declare class DataValidationFormulaService extends Disposable {
     private readonly _instanceService;

package/lib/types/services/dv-validator-service.d.ts

@@ -1,11 +1,13 @@
-import { DataValidationStatus, IUniverInstanceService, IDataValidationRule, IRange, Nullable, ObjectMatrix } from '@univerjs/core';
+import { IDataValidationRule, IRange, Nullable, ObjectMatrix, DataValidationStatus, Disposable, IUniverInstanceService, LifecycleService } from '@univerjs/core';
+import { IDataValidationResCache, DataValidationCacheService } from './dv-cache.service';
 import { SheetDataValidationModel } from '../models/sheet-data-validation-model';
-import { DataValidationCacheService, IDataValidationResCache } from './dv-cache.service';
-export declare class SheetsDataValidationValidatorService {
+export declare class SheetsDataValidationValidatorService extends Disposable {
     private readonly _univerInstanceService;
     private readonly _sheetDataValidationModel;
     private readonly _dataValidationCacheService;
-    constructor(_univerInstanceService: IUniverInstanceService, _sheetDataValidationModel: SheetDataValidationModel, _dataValidationCacheService: DataValidationCacheService);
+    private readonly _lifecycleService;
+    constructor(_univerInstanceService: IUniverInstanceService, _sheetDataValidationModel: SheetDataValidationModel, _dataValidationCacheService: DataValidationCacheService, _lifecycleService: LifecycleService);
+    private _initRecalculate;
     validatorCell(unitId: string, subUnitId: string, row: number, col: number): Promise<DataValidationStatus>;
     validatorRanges(unitId: string, subUnitId: string, ranges: IRange[]): Promise<Promise<DataValidationStatus>[][]>;
     validatorWorksheet(unitId: string, subUnitId: string): Promise<ObjectMatrix<Nullable<IDataValidationResCache>>>;