@univerjs/sheets-data-validation 0.1.13 → 0.1.14

package/lib/types/controllers/dv-ref-range.controller.d.ts

@@ -1,26 +1,20 @@
-import { ISheetDataValidationRule, Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
-import { SheetSkeletonManagerService } from '@univerjs/sheets-ui';
+import { ISheetDataValidationRule, Disposable } from '@univerjs/core';
 import { RefRangeService } from '@univerjs/sheets';
 import { Injector } from '@wendellhu/redi';
 import { DataValidationModel } from '@univerjs/data-validation';
 import { FormulaRefRangeService } from '@univerjs/sheets-formula';
 import { DataValidationCustomFormulaService } from '../services/dv-custom-formula.service';
 import { DataValidationFormulaService } from '../services/dv-formula.service';
-import { DataValidationCacheService } from '../services/dv-cache.service';
 
 export declare class DataValidationRefRangeController extends Disposable {
     private _dataValidationModel;
-    private _univerInstanceService;
     private _injector;
-    private _sheetSkeletonManagerService;
     private _refRangeService;
     private _dataValidationCustomFormulaService;
     private _dataValidationFormulaService;
     private _formulaRefRangeService;
-    private readonly _commandService;
-    private readonly _dataValidationCacheService;
     private _disposableMap;
-    constructor(_dataValidationModel: DataValidationModel, _univerInstanceService: IUniverInstanceService, _injector: Injector, _sheetSkeletonManagerService: SheetSkeletonManagerService, _refRangeService: RefRangeService, _dataValidationCustomFormulaService: DataValidationCustomFormulaService, _dataValidationFormulaService: DataValidationFormulaService, _formulaRefRangeService: FormulaRefRangeService, _commandService: ICommandService, _dataValidationCacheService: DataValidationCacheService);
+    constructor(_dataValidationModel: DataValidationModel, _injector: Injector, _refRangeService: RefRangeService, _dataValidationCustomFormulaService: DataValidationCustomFormulaService, _dataValidationFormulaService: DataValidationFormulaService, _formulaRefRangeService: FormulaRefRangeService);
     private _getIdWithUnitId;
     registerRule: (unitId: string, subUnitId: string, rule: ISheetDataValidationRule) => void;
     registerFormula(unitId: string, subUnitId: string, rule: ISheetDataValidationRule): void;

package/lib/types/controllers/dv-render.controller.d.ts

@@ -2,7 +2,7 @@ import { ICommandService, IUniverInstanceService, RxDisposable } from '@univerjs
 import { DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
 import { MenuConfig, ComponentManager, IMenuService } from '@univerjs/ui';
 import { Injector } from '@wendellhu/redi';
-import { AutoHeightController, IEditorBridgeService, SheetSkeletonManagerService } from '@univerjs/sheets-ui';
+import { AutoHeightController, IEditorBridgeService } from '@univerjs/sheets-ui';
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { SheetInterceptorService } from '@univerjs/sheets';
 import { DataValidationDropdownManagerService } from '../services/dropdown-manager.service';
@@ -14,23 +14,21 @@ export declare const DefaultSheetsDataValidation: {};
 /**
  * @todo RenderUnit
  */
-export declare class DataValidationRenderController extends RxDisposable {
+export declare class SheetsDataValidationRenderController extends RxDisposable {
     private readonly _config;
-    private _componentManager;
+    private readonly _commandService;
+    private readonly _editorBridgeService;
     private _menuService;
-    private readonly _dataValidationModel;
-    private readonly _sheetSkeletonManagerService;
     private readonly _renderManagerService;
     private readonly _univerInstanceService;
-    private readonly _dataValidatorRegistryService;
-    private readonly _editorBridgeService;
+    private readonly _autoHeightController;
+    private _componentManager;
     private readonly _dropdownManagerService;
-    private readonly _sheetInterceptorService;
+    private readonly _dataValidationModel;
+    private readonly _dataValidatorRegistryService;
     private readonly _injector;
-    private readonly _autoHeightController;
-    private readonly _commandService;
-    constructor(_config: Partial<IUniverSheetsDataValidation>, _componentManager: ComponentManager, _menuService: IMenuService, _dataValidationModel: DataValidationModel, _sheetSkeletonManagerService: SheetSkeletonManagerService, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _dataValidatorRegistryService: DataValidatorRegistryService, _editorBridgeService: IEditorBridgeService, _dropdownManagerService: DataValidationDropdownManagerService, _sheetInterceptorService: SheetInterceptorService, _injector: Injector, _autoHeightController: AutoHeightController, _commandService: ICommandService);
-    private _init;
+    private readonly _sheetInterceptorService;
+    constructor(_config: Partial<IUniverSheetsDataValidation>, _commandService: ICommandService, _editorBridgeService: IEditorBridgeService, _menuService: IMenuService, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _autoHeightController: AutoHeightController, _componentManager: ComponentManager, _dropdownManagerService: DataValidationDropdownManagerService, _dataValidationModel: DataValidationModel, _dataValidatorRegistryService: DataValidatorRegistryService, _injector: Injector, _sheetInterceptorService: SheetInterceptorService);
     private _initMenu;
     private _initComponents;
     private _initDropdown;

package/lib/types/index.d.ts

@@ -16,7 +16,7 @@
 export { UniverSheetsDataValidationPlugin } from './plugin';
 export type { IAddSheetDataValidationCommandParams, IUpdateSheetDataValidationRangeCommandParams } from './commands/commands/data-validation.command';
 export { ICommandService, LocaleService, Plugin } from '@univerjs/core';
-export { DataValidationRenderController } from './controllers/dv-render.controller';
+export { SheetsDataValidationRenderController } from './controllers/dv-render.controller';
 export { DataValidationController } from './controllers/dv.controller';
 export { SheetDataValidationService } from './services/dv.service';
 export { DataValidationAlertController } from './controllers/dv-alert.controller';
@@ -31,3 +31,4 @@ export { DataValidationCopyPasteController } from './controllers/dv-copy-paste.c
 export { HideDataValidationDropdown, ShowDataValidationDropdown } from './commands/operations/data-validation.operation';
 export { DataValidationRejectInputController } from './controllers/dv-reject-input.controller';
 export { DataValidationFormulaController } from './controllers/dv-formula.controller';
+export { SheetsDataValidationValidatorService } from './services/dv-validator-service';

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

@@ -1,6 +1,6 @@
 import { CellValue, ISheetDataValidationRule, Nullable, DataValidationStatus } from '@univerjs/core';
 import { DataValidationManager, IUpdateRulePayload } from '@univerjs/data-validation';
-import { ISheetLocation } from '@univerjs/sheets';
+import { ISheetLocationBase } from '@univerjs/sheets';
 import { Injector } from '@wendellhu/redi';
 import { RuleMatrix } from './rule-matrix';
 
@@ -23,7 +23,7 @@ export declare class SheetDataValidationManager extends DataValidationManager<IS
     removeRule(ruleId: string): void;
     getRuleIdByLocation(row: number, col: number): string | undefined;
     getRuleByLocation(row: number, col: number): ISheetDataValidationRule | undefined;
-    validator(cellValue: Nullable<CellValue>, rule: ISheetDataValidationRule, pos: ISheetLocation, onCompete: (status: DataValidationStatus) => void): DataValidationStatus;
+    validator(cellValue: Nullable<CellValue>, rule: ISheetDataValidationRule, pos: ISheetLocationBase, onCompete: (status: DataValidationStatus, changed: boolean) => void): DataValidationStatus;
     getRuleErrorMsg(ruleId: string): string;
     getRuleObjectMatrix(): RuleMatrix;
 }

package/lib/types/services/dropdown-manager.service.d.ts

@@ -1,6 +1,6 @@
 import { Disposable, IUniverInstanceService, Nullable } from '@univerjs/core';
 import { ISheetLocation } from '@univerjs/sheets';
-import { SheetCanvasPopManagerService, SheetSkeletonManagerService } from '@univerjs/sheets-ui';
+import { SheetCanvasPopManagerService } from '@univerjs/sheets-ui';
 import { DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
 import { IZenZoneService } from '@univerjs/ui';
 import { IRenderManagerService } from '@univerjs/engine-render';
@@ -18,7 +18,6 @@ export interface IDropdownComponentProps {
 export declare class DataValidationDropdownManagerService extends Disposable {
     private readonly _canvasPopupManagerService;
     private readonly _univerInstanceService;
-    private readonly _sheetSkeletonManagerService;
     private readonly _dataValidatorRegistryService;
     private readonly _zenZoneService;
     private readonly _renderManagerService;
@@ -29,7 +28,7 @@ export declare class DataValidationDropdownManagerService extends Disposable {
     activeDropdown$: import('rxjs').Observable<Nullable<IDropdownParam>>;
     private _zenVisible;
     get activeDropdown(): Nullable<IDropdownParam>;
-    constructor(_canvasPopupManagerService: SheetCanvasPopManagerService, _univerInstanceService: IUniverInstanceService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _dataValidatorRegistryService: DataValidatorRegistryService, _zenZoneService: IZenZoneService, _renderManagerService: IRenderManagerService, _dataValidationModel: DataValidationModel);
+    constructor(_canvasPopupManagerService: SheetCanvasPopManagerService, _univerInstanceService: IUniverInstanceService, _dataValidatorRegistryService: DataValidatorRegistryService, _zenZoneService: IZenZoneService, _renderManagerService: IRenderManagerService, _dataValidationModel: DataValidationModel);
     private _init;
     showDropdown(param: IDropdownParam): void;
     hideDropdown(): void;

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

@@ -0,0 +1,13 @@
+import { Nullable, ObjectMatrix, DataValidationStatus, IUniverInstanceService } from '@univerjs/core';
+import { DataValidationModel } from '@univerjs/data-validation';
+import { IDataValidationResCache, DataValidationCacheService } from './dv-cache.service';
+
+export declare class SheetsDataValidationValidatorService {
+    private readonly _univerInstanceService;
+    private readonly _dataValidationModel;
+    private readonly _dataValidationCacheService;
+    constructor(_univerInstanceService: IUniverInstanceService, _dataValidationModel: DataValidationModel, _dataValidationCacheService: DataValidationCacheService);
+    validatorCell(unitId: string, subUnitId: string, row: number, col: number): Promise<DataValidationStatus>;
+    validatorWorksheet(unitId: string, subUnitId: string): Promise<ObjectMatrix<Nullable<IDataValidationResCache>>>;
+    validatorWorkbook(unitId: string): Promise<Record<string, ObjectMatrix<Nullable<IDataValidationResCache>>>>;
+}