@univerjs/sheets-data-validation 0.2.11 → 0.2.13

package/lib/types/commands/commands/data-validation.command.d.ts

@@ -1,5 +1,5 @@
-import { IAccessor, ICommand, IDataValidationRuleBase, IDataValidationRuleOptions, IMutationInfo, IRange, ISheetDataValidationRule } from '@univerjs/core';
-import { DataValidationChangeSource } from '@univerjs/data-validation';
+import { IAccessor, ICommand, IDataValidationRuleBase, IDataValidationRuleOptions, IMutationInfo, Injector, IRange, ISheetDataValidationRule } from '@univerjs/core';
+import { DataValidationChangeSource, IRemoveDataValidationMutationParams } from '@univerjs/data-validation';
 import { ISheetCommandSharedParams } from '@univerjs/sheets';
 import { RangeMutation } from '../../models/rule-matrix';
 export interface IUpdateSheetDataValidationRangeCommandParams {
@@ -8,7 +8,7 @@ export interface IUpdateSheetDataValidationRangeCommandParams {
     ruleId: string;
     ranges: IRange[];
 }
-export declare function getDataValidationDiffMutations(unitId: string, subUnitId: string, diffs: RangeMutation[], accessor: IAccessor, source?: DataValidationChangeSource): {
+export declare function getDataValidationDiffMutations(unitId: string, subUnitId: string, diffs: RangeMutation[], accessor: IAccessor, source?: DataValidationChangeSource, fillDefaultValue?: boolean): {
     redoMutations: IMutationInfo<object>[];
     undoMutations: IMutationInfo<object>[];
 };
@@ -36,3 +36,11 @@ export interface IClearRangeDataValidationCommandParams {
     ranges: IRange[];
 }
 export declare const ClearRangeDataValidationCommand: ICommand<IClearRangeDataValidationCommandParams>;
+export interface IRemoveSheetAllDataValidationCommandParams extends ISheetCommandSharedParams {
+}
+export declare const RemoveSheetAllDataValidationCommand: ICommand<IRemoveSheetAllDataValidationCommandParams>;
+export interface IRemoveSheetDataValidationCommandParams extends ISheetCommandSharedParams {
+    ruleId: string;
+}
+export declare const removeDataValidationUndoFactory: (accessor: Injector, redoParams: IRemoveDataValidationMutationParams) => IMutationInfo<object>[];
+export declare const RemoveSheetDataValidationCommand: ICommand<IRemoveSheetDataValidationCommandParams>;

package/lib/types/controllers/config.schema.d.ts

@@ -0,0 +1,7 @@
+import { MenuConfig } from '@univerjs/ui';
+export declare const PLUGIN_CONFIG_KEY = "sheets-data-validation.config";
+export declare const configSymbol: unique symbol;
+export interface IUniverSheetsDataValidationConfig {
+    menu?: MenuConfig;
+}
+export declare const defaultPluginConfig: IUniverSheetsDataValidationConfig;

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

@@ -1,11 +1,14 @@
 import { Disposable, IUniverInstanceService, LocaleService } from '@univerjs/core';
 import { CellAlertManagerService, HoverManagerService } from '@univerjs/sheets-ui';
+import { IZenZoneService } from '@univerjs/ui';
 export declare class DataValidationAlertController extends Disposable {
     private readonly _hoverManagerService;
     private readonly _cellAlertManagerService;
     private readonly _univerInstanceService;
     private readonly _localeService;
-    constructor(_hoverManagerService: HoverManagerService, _cellAlertManagerService: CellAlertManagerService, _univerInstanceService: IUniverInstanceService, _localeService: LocaleService);
+    private readonly _zenZoneService;
+    constructor(_hoverManagerService: HoverManagerService, _cellAlertManagerService: CellAlertManagerService, _univerInstanceService: IUniverInstanceService, _localeService: LocaleService, _zenZoneService: IZenZoneService);
     private _init;
     private _initCellAlertPopup;
+    private _initZenService;
 }

package/lib/types/controllers/dv-auto-fill.controller.d.ts

@@ -1,10 +1,10 @@
 import { Disposable, Injector } from '@univerjs/core';
 import { IAutoFillService } from '@univerjs/sheets-ui';
-import { DataValidationModel } from '@univerjs/data-validation';
+import { SheetDataValidationModel } from '../models/sheet-data-validation-model';
 export declare class DataValidationAutoFillController extends Disposable {
     private readonly _autoFillService;
     private readonly _dataValidationModel;
     private readonly _injector;
-    constructor(_autoFillService: IAutoFillService, _dataValidationModel: DataValidationModel, _injector: Injector);
+    constructor(_autoFillService: IAutoFillService, _dataValidationModel: SheetDataValidationModel, _injector: Injector);
     private _initAutoFill;
 }

package/lib/types/controllers/dv-copy-paste.controller.d.ts

@@ -1,12 +1,12 @@
 import { Disposable, Injector } from '@univerjs/core';
 import { ISheetClipboardService } from '@univerjs/sheets-ui';
-import { DataValidationModel } from '@univerjs/data-validation';
+import { SheetDataValidationModel } from '../models/sheet-data-validation-model';
 export declare class DataValidationCopyPasteController extends Disposable {
     private _sheetClipboardService;
-    private _dataValidationModel;
+    private _sheetDataValidationModel;
     private _injector;
     private _copyInfo;
-    constructor(_sheetClipboardService: ISheetClipboardService, _dataValidationModel: DataValidationModel, _injector: Injector);
+    constructor(_sheetClipboardService: ISheetClipboardService, _sheetDataValidationModel: SheetDataValidationModel, _injector: Injector);
     private _initCopyPaste;
     private _collect;
     private _generateMutations;

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

@@ -1,6 +1,6 @@
-import { ISheetDataValidationRule, Disposable, Injector } from '@univerjs/core';
-import { RefRangeService } from '@univerjs/sheets';
+import { Disposable, Injector, ISheetDataValidationRule } from '@univerjs/core';
 import { DataValidationModel } from '@univerjs/data-validation';
+import { RefRangeService } from '@univerjs/sheets';
 import { FormulaRefRangeService } from '@univerjs/sheets-formula';
 import { DataValidationCustomFormulaService } from '../services/dv-custom-formula.service';
 import { DataValidationFormulaService } from '../services/dv-formula.service';

package/lib/types/controllers/dv-reject-input.controller.d.ts

@@ -1,14 +1,15 @@
 import { Disposable, LocaleService } from '@univerjs/core';
-import { DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
+import { DataValidatorRegistryService } from '@univerjs/data-validation';
 import { IEditorBridgeService } from '@univerjs/sheets-ui';
 import { IDialogService } from '@univerjs/ui';
+import { SheetDataValidationModel } from '../models/sheet-data-validation-model';
 export declare class DataValidationRejectInputController extends Disposable {
     private readonly _editorBridgeService;
     private readonly _dataValidationModel;
     private readonly _dataValidatorRegistryService;
     private readonly _dialogService;
     private readonly _localeService;
-    constructor(_editorBridgeService: IEditorBridgeService, _dataValidationModel: DataValidationModel, _dataValidatorRegistryService: DataValidatorRegistryService, _dialogService: IDialogService, _localeService: LocaleService);
+    constructor(_editorBridgeService: IEditorBridgeService, _dataValidationModel: SheetDataValidationModel, _dataValidatorRegistryService: DataValidatorRegistryService, _dialogService: IDialogService, _localeService: LocaleService);
     private _initEditorBridgeInterceptor;
     showReject(title: string): void;
 }

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

@@ -1,29 +1,23 @@
-import { ICommandService, Injector, IUniverInstanceService, RxDisposable } from '@univerjs/core';
-import { DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
-import { MenuConfig, ComponentManager, IMenuService } from '@univerjs/ui';
-import { AutoHeightController, IEditorBridgeService } from '@univerjs/sheets-ui';
+import { ICommandService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
+import { DataValidatorRegistryService } from '@univerjs/data-validation';
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { SheetInterceptorService } from '@univerjs/sheets';
+import { AutoHeightController, IEditorBridgeService } from '@univerjs/sheets-ui';
+import { IMenuManagerService } from '@univerjs/ui';
+import { SheetDataValidationModel } from '../models/sheet-data-validation-model';
 import { DataValidationDropdownManagerService } from '../services/dropdown-manager.service';
-export interface IUniverSheetsDataValidation {
-    menu?: MenuConfig;
-}
-export declare const DefaultSheetsDataValidation: {};
 export declare class SheetsDataValidationRenderController extends RxDisposable {
-    private readonly _config;
     private readonly _commandService;
-    private _menuService;
+    private readonly _menuManagerService;
     private readonly _renderManagerService;
     private readonly _univerInstanceService;
     private readonly _autoHeightController;
-    private _componentManager;
     private readonly _dropdownManagerService;
-    private readonly _dataValidationModel;
+    private readonly _sheetDataValidationModel;
     private readonly _dataValidatorRegistryService;
-    private readonly _injector;
     private readonly _sheetInterceptorService;
     private readonly _editorBridgeService?;
-    constructor(_config: Partial<IUniverSheetsDataValidation>, _commandService: ICommandService, _menuService: IMenuService, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _autoHeightController: AutoHeightController, _componentManager: ComponentManager, _dropdownManagerService: DataValidationDropdownManagerService, _dataValidationModel: DataValidationModel, _dataValidatorRegistryService: DataValidatorRegistryService, _injector: Injector, _sheetInterceptorService: SheetInterceptorService, _editorBridgeService?: IEditorBridgeService | undefined);
+    constructor(_commandService: ICommandService, _menuManagerService: IMenuManagerService, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _autoHeightController: AutoHeightController, _dropdownManagerService: DataValidationDropdownManagerService, _sheetDataValidationModel: SheetDataValidationModel, _dataValidatorRegistryService: DataValidatorRegistryService, _sheetInterceptorService: SheetInterceptorService, _editorBridgeService?: IEditorBridgeService | undefined);
     private _initMenu;
     private _initDropdown;
     private _initSkeletonChange;
@@ -31,15 +25,14 @@ export declare class SheetsDataValidationRenderController extends RxDisposable {
     private _initAutoHeight;
 }
 export declare class SheetsDataValidationMobileRenderController extends RxDisposable {
-    private readonly _config;
     private readonly _commandService;
     private readonly _renderManagerService;
     private readonly _univerInstanceService;
     private readonly _autoHeightController;
-    private readonly _dataValidationModel;
     private readonly _dataValidatorRegistryService;
     private readonly _sheetInterceptorService;
-    constructor(_config: Partial<IUniverSheetsDataValidation>, _commandService: ICommandService, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _autoHeightController: AutoHeightController, _dataValidationModel: DataValidationModel, _dataValidatorRegistryService: DataValidatorRegistryService, _sheetInterceptorService: SheetInterceptorService);
+    private readonly _sheetDataValidationModel;
+    constructor(_commandService: ICommandService, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _autoHeightController: AutoHeightController, _dataValidatorRegistryService: DataValidatorRegistryService, _sheetInterceptorService: SheetInterceptorService, _sheetDataValidationModel: SheetDataValidationModel);
     private _initSkeletonChange;
     private _initViewModelIntercept;
     private _initAutoHeight;

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

@@ -0,0 +1,10 @@
+import { Disposable, IUniverInstanceService } from '@univerjs/core';
+import { SheetInterceptorService } from '@univerjs/sheets';
+import { SheetDataValidationModel } from '../models/sheet-data-validation-model';
+export declare class SheetDataValidationSheetController extends Disposable {
+    private _sheetInterceptorService;
+    private _univerInstanceService;
+    private readonly _sheetDataValidationModel;
+    constructor(_sheetInterceptorService: SheetInterceptorService, _univerInstanceService: IUniverInstanceService, _sheetDataValidationModel: SheetDataValidationModel);
+    private _initSheetChange;
+}

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

@@ -1,7 +1,8 @@
 import { Injector, IUniverInstanceService, RxDisposable } from '@univerjs/core';
-import { DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
-import { ComponentManager } from '@univerjs/ui';
+import { DataValidatorRegistryService } from '@univerjs/data-validation';
 import { SheetInterceptorService, SheetsSelectionsService } from '@univerjs/sheets';
+import { ComponentManager } from '@univerjs/ui';
+import { SheetDataValidationModel } from '../models/sheet-data-validation-model';
 export declare class DataValidationController extends RxDisposable {
     private readonly _univerInstanceService;
     private readonly _dataValidatorRegistryService;
@@ -9,8 +10,8 @@ export declare class DataValidationController extends RxDisposable {
     private readonly _componentManger;
     private _selectionManagerService;
     private readonly _sheetInterceptorService;
-    private readonly _dataValidationModel;
-    constructor(_univerInstanceService: IUniverInstanceService, _dataValidatorRegistryService: DataValidatorRegistryService, _injector: Injector, _componentManger: ComponentManager, _selectionManagerService: SheetsSelectionsService, _sheetInterceptorService: SheetInterceptorService, _dataValidationModel: DataValidationModel);
+    private readonly _sheetDataValidationModel;
+    constructor(_univerInstanceService: IUniverInstanceService, _dataValidatorRegistryService: DataValidatorRegistryService, _injector: Injector, _componentManger: ComponentManager, _selectionManagerService: SheetsSelectionsService, _sheetInterceptorService: SheetInterceptorService, _sheetDataValidationModel: SheetDataValidationModel);
     private _init;
     private _registerValidators;
     private _initCommandInterceptor;

package/lib/types/controllers/dv.menu.d.ts

@@ -1,6 +1,7 @@
 import { IMenuItem } from '@univerjs/ui';
 import { IAccessor } from '@univerjs/core';
 export declare const DataValidationIcon = "data-validation-single";
+export declare const DATA_VALIDATION_MENU_ID = "sheet.menu.data-validation";
 export declare function dataValidationMenuFactory(accessor: IAccessor): IMenuItem;
 export declare function openDataValidationMenuFactory(_accessor: IAccessor): IMenuItem;
 export declare function addDataValidationMenuFactory(_accessor: IAccessor): IMenuItem;

package/lib/types/controllers/menu.schema.d.ts

@@ -0,0 +1,2 @@
+import { MenuSchemaType } from '@univerjs/ui';
+export declare const menuSchema: MenuSchemaType;

package/lib/types/index.d.ts

@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { UniverSheetsDataValidationPlugin } from './plugin';
+export { AddSheetDataValidationAndOpenCommand, AddSheetDataValidationCommand, ClearRangeDataValidationCommand, 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';
+export { CloseValidationPanelOperation, HideDataValidationDropdown, OpenValidationPanelOperation, ShowDataValidationDropdown, ToggleValidationPanelOperation, } from './commands/operations/data-validation.operation';
+export { DATA_VALIDATION_PLUGIN_NAME } from './common/const';
 export { UniverSheetsDataValidationMobilePlugin } from './mobile-plugin';
+export { 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';
-export { DataValidationFormulaService } from './services/dv-formula.service';
 export { DataValidationCustomFormulaService } from './services/dv-custom-formula.service';
-export { DATA_VALIDATION_PLUGIN_NAME } from './common/const';
+export { DataValidationFormulaService } from './services/dv-formula.service';
 export { SheetsDataValidationValidatorService } from './services/dv-validator-service';
-export { DataValidationModel, RemoveAllDataValidationCommand as RemoveSheetAllDataValidationCommand, type IRemoveAllDataValidationCommandParams as IRemoveSheetAllDataValidationCommandParams, } from '@univerjs/data-validation';
-export { SheetDataValidationManager } from './models/sheet-data-validation-manager';
-export { RemoveDataValidationCommand as RemoveSheetDataValidationCommand, type IRemoveDataValidationCommandParams as IRemoveSheetDataValidationCommandParams, } from '@univerjs/data-validation';
-export { UpdateSheetDataValidationRangeCommand, UpdateSheetDataValidationOptionsCommand, UpdateSheetDataValidationSettingCommand, AddSheetDataValidationCommand, AddSheetDataValidationAndOpenCommand, ClearRangeDataValidationCommand, type IAddSheetDataValidationCommandParams, type IUpdateSheetDataValidationRangeCommandParams, type IUpdateSheetDataValidationOptionsCommandParams, type IUpdateSheetDataValidationSettingCommandParams, type IClearRangeDataValidationCommandParams, } from './commands/commands/data-validation.command';
-export { OpenValidationPanelOperation, CloseValidationPanelOperation, ToggleValidationPanelOperation, ShowDataValidationDropdown, HideDataValidationDropdown, } from './commands/operations/data-validation.operation';
+export { DATE_DROPDOWN_KEY, LIST_DROPDOWN_KEY } from './views';
+export { DataValidationModel } from '@univerjs/data-validation';

package/lib/types/mobile-plugin.d.ts

@@ -1,12 +1,12 @@
-import { ICommandService, LocaleService, Plugin, UniverInstanceType, Injector } from '@univerjs/core';
-import { IUniverSheetsDataValidation } from './controllers/dv-render.controller';
+import { ICommandService, IConfigService, Plugin, UniverInstanceType, Injector } from '@univerjs/core';
+import { IUniverSheetsDataValidationConfig } from './controllers/config.schema';
 export declare class UniverSheetsDataValidationMobilePlugin extends Plugin {
-    private _config;
+    private readonly _config;
     protected _injector: Injector;
     private readonly _commandService;
-    private readonly _localeService;
+    private readonly _configService;
     static pluginName: string;
     static type: UniverInstanceType;
-    constructor(_config: Partial<IUniverSheetsDataValidation>, _injector: Injector, _commandService: ICommandService, _localeService: LocaleService);
+    constructor(_config: Partial<IUniverSheetsDataValidationConfig> | undefined, _injector: Injector, _commandService: ICommandService, _configService: IConfigService);
     onStarting(): void;
 }

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

@@ -0,0 +1,40 @@
+import { DataValidationStatus, DataValidationType, Disposable, IUniverInstanceService, ICellDataForSheetInterceptor, ISheetDataValidationRule, Nullable } from '@univerjs/core';
+import { DataValidationModel, DataValidatorRegistryService, IRuleChange, IValidStatusChange } 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 declare class SheetDataValidationModel extends Disposable {
+    private readonly _dataValidationModel;
+    private readonly _univerInstanceService;
+    private _dataValidatorRegistryService;
+    private _dataValidationCacheService;
+    private _dataValidationFormulaService;
+    private _dataValidationCustomFormulaService;
+    private readonly _ruleMatrixMap;
+    private readonly _validStatusChange$;
+    private readonly _ruleChange$;
+    readonly ruleChange$: import('rxjs').Observable<IRuleChange>;
+    readonly validStatusChange$: import('rxjs').Observable<IValidStatusChange>;
+    constructor(_dataValidationModel: DataValidationModel, _univerInstanceService: IUniverInstanceService, _dataValidatorRegistryService: DataValidatorRegistryService, _dataValidationCacheService: DataValidationCacheService, _dataValidationFormulaService: DataValidationFormulaService, _dataValidationCustomFormulaService: DataValidationCustomFormulaService);
+    private _initRuleUpdateListener;
+    private _ensureRuleMatrix;
+    private _addRuleSideEffect;
+    private _addRule;
+    private _updateRule;
+    private _removeRule;
+    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;
+    getRuleErrorMsg(unitId: string, subUnitId: string, ruleId: string): string;
+    getRuleObjectMatrix(unitId: string, subUnitId: string): RuleMatrix;
+    getRuleById(unitId: string, subUnitId: string, ruleId: string): ISheetDataValidationRule | undefined;
+    getRuleIndex(unitId: string, subUnitId: string, ruleId: string): number;
+    getRules(unitId: string, subUnitId: string): ISheetDataValidationRule[];
+    getUnitRules(unitId: string): [string, ISheetDataValidationRule[]][];
+    deleteUnitRules(unitId: string): void;
+    getSubUnitIds(unitId: string): string[];
+    getAll(): (readonly [string, [string, import('@univerjs/core').IDataValidationRule[]][]])[];
+}

package/lib/types/plugin.d.ts

@@ -1,12 +1,12 @@
-import { ICommandService, LocaleService, Plugin, UniverInstanceType, Injector } from '@univerjs/core';
-import { IUniverSheetsDataValidation } from './controllers/dv-render.controller';
+import { ICommandService, IConfigService, Plugin, UniverInstanceType, Injector } from '@univerjs/core';
+import { IUniverSheetsDataValidationConfig } from './controllers/config.schema';
 export declare class UniverSheetsDataValidationPlugin extends Plugin {
-    private _config;
+    private readonly _config;
     protected _injector: Injector;
     private readonly _commandService;
-    private readonly _localeService;
+    private readonly _configService;
     static pluginName: string;
     static type: UniverInstanceType;
-    constructor(_config: Partial<IUniverSheetsDataValidation>, _injector: Injector, _commandService: ICommandService, _localeService: LocaleService);
+    constructor(_config: Partial<IUniverSheetsDataValidationConfig> | undefined, _injector: Injector, _commandService: ICommandService, _configService: IConfigService);
     onStarting(): void;
 }

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

@@ -1,9 +1,10 @@
-import { Nullable, Disposable, IUniverInstanceService } from '@univerjs/core';
+import { Disposable, IUniverInstanceService, Nullable } from '@univerjs/core';
+import { DataValidatorRegistryService } from '@univerjs/data-validation';
+import { IRenderManagerService } from '@univerjs/engine-render';
 import { ISheetLocation, SheetsSelectionsService } from '@univerjs/sheets';
 import { SheetCanvasPopManagerService } from '@univerjs/sheets-ui';
-import { DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
 import { IZenZoneService } from '@univerjs/ui';
-import { IRenderManagerService } from '@univerjs/engine-render';
+import { SheetDataValidationModel } from '../models/sheet-data-validation-model';
 export interface IDropdownParam {
     location: ISheetLocation;
     onHide?: () => void;
@@ -29,7 +30,7 @@ export declare class DataValidationDropdownManagerService extends Disposable {
     activeDropdown$: import('rxjs').Observable<Nullable<IDropdownParam>>;
     private _zenVisible;
     get activeDropdown(): Nullable<IDropdownParam>;
-    constructor(_canvasPopupManagerService: SheetCanvasPopManagerService, _univerInstanceService: IUniverInstanceService, _dataValidatorRegistryService: DataValidatorRegistryService, _zenZoneService: IZenZoneService, _renderManagerService: IRenderManagerService, _dataValidationModel: DataValidationModel, _sheetsSelectionsService: SheetsSelectionsService);
+    constructor(_canvasPopupManagerService: SheetCanvasPopManagerService, _univerInstanceService: IUniverInstanceService, _dataValidatorRegistryService: DataValidatorRegistryService, _zenZoneService: IZenZoneService, _renderManagerService: IRenderManagerService, _dataValidationModel: SheetDataValidationModel, _sheetsSelectionsService: SheetsSelectionsService);
     private _init;
     private _getDropdownByCell;
     private _initSelectionChange;

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

@@ -1,6 +1,6 @@
-import { IRange, ISheetDataValidationRule, Disposable, ILogService, IUniverInstanceService } from '@univerjs/core';
-import { LexerTreeBuilder } from '@univerjs/engine-formula';
+import { Disposable, ILogService, IUniverInstanceService, IRange, ISheetDataValidationRule } from '@univerjs/core';
 import { DataValidationModel } from '@univerjs/data-validation';
+import { LexerTreeBuilder } from '@univerjs/engine-formula';
 import { RegisterOtherFormulaService } from '@univerjs/sheets-formula';
 import { DataValidationCacheService } from './dv-cache.service';
 interface IFormulaData {

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

@@ -1,6 +1,6 @@
-import { Nullable, Disposable, IUniverInstanceService } from '@univerjs/core';
+import { Disposable, IUniverInstanceService, Nullable } from '@univerjs/core';
 import { DataValidationModel } from '@univerjs/data-validation';
-import { IFormulaInfo, IOtherFormulaResult, RegisterOtherFormulaService } from '@univerjs/sheets-formula';
+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,11 @@
-import { IDataValidationRule, IRange, Nullable, ObjectMatrix, DataValidationStatus, IUniverInstanceService } from '@univerjs/core';
-import { DataValidationModel } from '@univerjs/data-validation';
-import { IDataValidationResCache, DataValidationCacheService } from './dv-cache.service';
+import { DataValidationStatus, IUniverInstanceService, IDataValidationRule, IRange, Nullable, ObjectMatrix } from '@univerjs/core';
+import { SheetDataValidationModel } from '../models/sheet-data-validation-model';
+import { DataValidationCacheService, IDataValidationResCache } from './dv-cache.service';
 export declare class SheetsDataValidationValidatorService {
     private readonly _univerInstanceService;
-    private readonly _dataValidationModel;
+    private readonly _sheetDataValidationModel;
     private readonly _dataValidationCacheService;
-    constructor(_univerInstanceService: IUniverInstanceService, _dataValidationModel: DataValidationModel, _dataValidationCacheService: DataValidationCacheService);
+    constructor(_univerInstanceService: IUniverInstanceService, _sheetDataValidationModel: SheetDataValidationModel, _dataValidationCacheService: DataValidationCacheService);
     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>>>;

package/lib/types/utils/create.d.ts

@@ -0,0 +1,8 @@
+import { DataValidationOperator, DataValidationType, IAccessor } from '@univerjs/core';
+export declare function createDefaultNewRule(accessor: IAccessor): {
+    uid: string;
+    type: DataValidationType;
+    operator: DataValidationOperator;
+    formula1: string;
+    ranges: import('@univerjs/core').IRange[];
+};

package/lib/types/validators/checkbox-validator.d.ts

@@ -1,8 +1,13 @@
-import { CellValue, DataValidationOperator, IDataValidationRule, IDataValidationRuleBase, ISheetDataValidationRule, Nullable } from '@univerjs/core';
 import { BaseDataValidator, IFormulaResult, IFormulaValidResult, IValidatorCellInfo } from '@univerjs/data-validation';
+import { CellValue, DataValidationOperator, IDataValidationRule, IDataValidationRuleBase, ISheetDataValidationRule, Nullable } from '@univerjs/core';
 import { CheckboxRender } from '../widgets/checkbox-widget';
 export declare const CHECKBOX_FORMULA_1 = 1;
 export declare const CHECKBOX_FORMULA_2 = 0;
+interface ICheckboxFormulaResult extends IFormulaResult {
+    originFormula1: Nullable<CellValue>;
+    originFormula2: Nullable<CellValue>;
+}
+export declare const transformCheckboxValue: (value: Nullable<CellValue>) => Nullable<CellValue>;
 export declare class CheckboxValidator extends BaseDataValidator {
     id: string;
     title: string;
@@ -16,11 +21,14 @@ export declare class CheckboxValidator extends BaseDataValidator {
         subUnitId: string;
     }): boolean;
     validatorFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): IFormulaValidResult;
-    parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<IFormulaResult>;
+    parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<ICheckboxFormulaResult>;
     parseFormulaSync(rule: IDataValidationRule, unitId: string, subUnitId: string): {
         formula1: Nullable<CellValue>;
         formula2: Nullable<CellValue>;
+        originFormula1: Nullable<CellValue>;
+        originFormula2: Nullable<CellValue>;
     };
     isValidType(cellInfo: IValidatorCellInfo<CellValue>, formula: IFormulaResult, rule: IDataValidationRule): Promise<boolean>;
     generateRuleErrorMessage(rule: IDataValidationRuleBase): string;
 }
+export {};

package/lib/types/validators/date-validator.d.ts

@@ -1,5 +1,5 @@
 import { DataValidationOperator, CellValue, IDataValidationRule, IDataValidationRuleBase } from '@univerjs/core';
-import { IFormulaResult, IFormulaValidResult, IValidatorCellInfo, BaseDataValidator } from '@univerjs/data-validation';
+import { BaseDataValidator, IFormulaResult, IFormulaValidResult, IValidatorCellInfo } from '@univerjs/data-validation';
 export declare class DateValidator extends BaseDataValidator<number> {
     id: string;
     title: string;
@@ -17,6 +17,10 @@ export declare class DateValidator extends BaseDataValidator<number> {
     isValidType(info: IValidatorCellInfo): Promise<boolean>;
     private _validatorSingleFormula;
     validatorFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): IFormulaValidResult;
+    normalizeFormula(rule: IDataValidationRule, _unitId: string, _subUnitId: string): {
+        formula1: string | undefined;
+        formula2: string | undefined;
+    };
     transform(cellInfo: IValidatorCellInfo<CellValue>, _formula: IFormulaResult, _rule: IDataValidationRule): IValidatorCellInfo<number>;
     validatorIsEqual(cellInfo: IValidatorCellInfo<CellValue>, formula: IFormulaResult, rule: IDataValidationRule): Promise<boolean>;
     validatorIsNotEqual(cellInfo: IValidatorCellInfo<number>, formula: IFormulaResult, _rule: IDataValidationRule): Promise<boolean>;

package/lib/types/widgets/checkbox-widget.d.ts

@@ -1,6 +1,6 @@
-import { IMouseEvent, IPointerEvent, UniverRenderingContext2D } from '@univerjs/engine-render';
 import { ICommandService, ThemeService, ICellRenderContext } from '@univerjs/core';
 import { IBaseDataValidationWidget } from '@univerjs/data-validation';
+import { IMouseEvent, IPointerEvent, UniverRenderingContext2D } from '@univerjs/engine-render';
 import { DataValidationFormulaService } from '../services/dv-formula.service';
 export declare class CheckboxRender implements IBaseDataValidationWidget {
     private readonly _commandService;