@univerjs/sheets-data-validation 0.2.12 → 0.2.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
- import { IAccessor, ICommand, IDataValidationRuleBase, IDataValidationRuleOptions, IMutationInfo, IRange, ISheetDataValidationRule } from '@univerjs/core';
2
- import { DataValidationChangeSource } from '@univerjs/data-validation';
1
+ import { IAccessor, ICommand, IDataValidationRuleBase, IDataValidationRuleOptions, IMutationInfo, Injector, IRange, ISheetDataValidationRule } from '@univerjs/core';
2
+ import { DataValidationChangeSource, IRemoveDataValidationMutationParams } from '@univerjs/data-validation';
3
3
  import { ISheetCommandSharedParams } from '@univerjs/sheets';
4
4
  import { RangeMutation } from '../../models/rule-matrix';
5
5
  export interface IUpdateSheetDataValidationRangeCommandParams {
@@ -36,3 +36,11 @@ export interface IClearRangeDataValidationCommandParams {
36
36
  ranges: IRange[];
37
37
  }
38
38
  export declare const ClearRangeDataValidationCommand: ICommand<IClearRangeDataValidationCommandParams>;
39
+ export interface IRemoveSheetAllDataValidationCommandParams extends ISheetCommandSharedParams {
40
+ }
41
+ export declare const RemoveSheetAllDataValidationCommand: ICommand<IRemoveSheetAllDataValidationCommandParams>;
42
+ export interface IRemoveSheetDataValidationCommandParams extends ISheetCommandSharedParams {
43
+ ruleId: string;
44
+ }
45
+ export declare const removeDataValidationUndoFactory: (accessor: Injector, redoParams: IRemoveDataValidationMutationParams) => IMutationInfo<object>[];
46
+ export declare const RemoveSheetDataValidationCommand: ICommand<IRemoveSheetDataValidationCommandParams>;
@@ -1,11 +1,14 @@
1
1
  import { Disposable, IUniverInstanceService, LocaleService } from '@univerjs/core';
2
2
  import { CellAlertManagerService, HoverManagerService } from '@univerjs/sheets-ui';
3
+ import { IZenZoneService } from '@univerjs/ui';
3
4
  export declare class DataValidationAlertController extends Disposable {
4
5
  private readonly _hoverManagerService;
5
6
  private readonly _cellAlertManagerService;
6
7
  private readonly _univerInstanceService;
7
8
  private readonly _localeService;
8
- constructor(_hoverManagerService: HoverManagerService, _cellAlertManagerService: CellAlertManagerService, _univerInstanceService: IUniverInstanceService, _localeService: LocaleService);
9
+ private readonly _zenZoneService;
10
+ constructor(_hoverManagerService: HoverManagerService, _cellAlertManagerService: CellAlertManagerService, _univerInstanceService: IUniverInstanceService, _localeService: LocaleService, _zenZoneService: IZenZoneService);
9
11
  private _init;
10
12
  private _initCellAlertPopup;
13
+ private _initZenService;
11
14
  }
@@ -1,10 +1,10 @@
1
1
  import { Disposable, Injector } from '@univerjs/core';
2
2
  import { IAutoFillService } from '@univerjs/sheets-ui';
3
- import { DataValidationModel } from '@univerjs/data-validation';
3
+ import { SheetDataValidationModel } from '../models/sheet-data-validation-model';
4
4
  export declare class DataValidationAutoFillController extends Disposable {
5
5
  private readonly _autoFillService;
6
6
  private readonly _dataValidationModel;
7
7
  private readonly _injector;
8
- constructor(_autoFillService: IAutoFillService, _dataValidationModel: DataValidationModel, _injector: Injector);
8
+ constructor(_autoFillService: IAutoFillService, _dataValidationModel: SheetDataValidationModel, _injector: Injector);
9
9
  private _initAutoFill;
10
10
  }
@@ -1,12 +1,12 @@
1
1
  import { Disposable, Injector } from '@univerjs/core';
2
2
  import { ISheetClipboardService } from '@univerjs/sheets-ui';
3
- import { DataValidationModel } from '@univerjs/data-validation';
3
+ import { SheetDataValidationModel } from '../models/sheet-data-validation-model';
4
4
  export declare class DataValidationCopyPasteController extends Disposable {
5
5
  private _sheetClipboardService;
6
- private _dataValidationModel;
6
+ private _sheetDataValidationModel;
7
7
  private _injector;
8
8
  private _copyInfo;
9
- constructor(_sheetClipboardService: ISheetClipboardService, _dataValidationModel: DataValidationModel, _injector: Injector);
9
+ constructor(_sheetClipboardService: ISheetClipboardService, _sheetDataValidationModel: SheetDataValidationModel, _injector: Injector);
10
10
  private _initCopyPaste;
11
11
  private _collect;
12
12
  private _generateMutations;
@@ -1,6 +1,6 @@
1
- import { ISheetDataValidationRule, Disposable, Injector } from '@univerjs/core';
2
- import { RefRangeService } from '@univerjs/sheets';
1
+ import { Disposable, Injector, ISheetDataValidationRule } from '@univerjs/core';
3
2
  import { DataValidationModel } from '@univerjs/data-validation';
3
+ import { RefRangeService } from '@univerjs/sheets';
4
4
  import { FormulaRefRangeService } from '@univerjs/sheets-formula';
5
5
  import { DataValidationCustomFormulaService } from '../services/dv-custom-formula.service';
6
6
  import { DataValidationFormulaService } from '../services/dv-formula.service';
@@ -1,14 +1,15 @@
1
1
  import { Disposable, LocaleService } from '@univerjs/core';
2
- import { DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
2
+ import { DataValidatorRegistryService } from '@univerjs/data-validation';
3
3
  import { IEditorBridgeService } from '@univerjs/sheets-ui';
4
4
  import { IDialogService } from '@univerjs/ui';
5
+ import { SheetDataValidationModel } from '../models/sheet-data-validation-model';
5
6
  export declare class DataValidationRejectInputController extends Disposable {
6
7
  private readonly _editorBridgeService;
7
8
  private readonly _dataValidationModel;
8
9
  private readonly _dataValidatorRegistryService;
9
10
  private readonly _dialogService;
10
11
  private readonly _localeService;
11
- constructor(_editorBridgeService: IEditorBridgeService, _dataValidationModel: DataValidationModel, _dataValidatorRegistryService: DataValidatorRegistryService, _dialogService: IDialogService, _localeService: LocaleService);
12
+ constructor(_editorBridgeService: IEditorBridgeService, _dataValidationModel: SheetDataValidationModel, _dataValidatorRegistryService: DataValidatorRegistryService, _dialogService: IDialogService, _localeService: LocaleService);
12
13
  private _initEditorBridgeInterceptor;
13
14
  showReject(title: string): void;
14
15
  }
@@ -1,9 +1,10 @@
1
1
  import { ICommandService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
2
- import { DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
3
- import { IMenuManagerService } from '@univerjs/ui';
4
- import { AutoHeightController, IEditorBridgeService } from '@univerjs/sheets-ui';
2
+ import { DataValidatorRegistryService } from '@univerjs/data-validation';
5
3
  import { IRenderManagerService } from '@univerjs/engine-render';
6
4
  import { SheetInterceptorService } from '@univerjs/sheets';
5
+ import { AutoHeightController, IEditorBridgeService } from '@univerjs/sheets-ui';
6
+ import { IMenuManagerService } from '@univerjs/ui';
7
+ import { SheetDataValidationModel } from '../models/sheet-data-validation-model';
7
8
  import { DataValidationDropdownManagerService } from '../services/dropdown-manager.service';
8
9
  export declare class SheetsDataValidationRenderController extends RxDisposable {
9
10
  private readonly _commandService;
@@ -12,11 +13,11 @@ export declare class SheetsDataValidationRenderController extends RxDisposable {
12
13
  private readonly _univerInstanceService;
13
14
  private readonly _autoHeightController;
14
15
  private readonly _dropdownManagerService;
15
- private readonly _dataValidationModel;
16
+ private readonly _sheetDataValidationModel;
16
17
  private readonly _dataValidatorRegistryService;
17
18
  private readonly _sheetInterceptorService;
18
19
  private readonly _editorBridgeService?;
19
- constructor(_commandService: ICommandService, _menuManagerService: IMenuManagerService, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _autoHeightController: AutoHeightController, _dropdownManagerService: DataValidationDropdownManagerService, _dataValidationModel: DataValidationModel, _dataValidatorRegistryService: DataValidatorRegistryService, _sheetInterceptorService: SheetInterceptorService, _editorBridgeService?: IEditorBridgeService | undefined);
20
+ constructor(_commandService: ICommandService, _menuManagerService: IMenuManagerService, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _autoHeightController: AutoHeightController, _dropdownManagerService: DataValidationDropdownManagerService, _sheetDataValidationModel: SheetDataValidationModel, _dataValidatorRegistryService: DataValidatorRegistryService, _sheetInterceptorService: SheetInterceptorService, _editorBridgeService?: IEditorBridgeService | undefined);
20
21
  private _initMenu;
21
22
  private _initDropdown;
22
23
  private _initSkeletonChange;
@@ -28,10 +29,10 @@ export declare class SheetsDataValidationMobileRenderController extends RxDispos
28
29
  private readonly _renderManagerService;
29
30
  private readonly _univerInstanceService;
30
31
  private readonly _autoHeightController;
31
- private readonly _dataValidationModel;
32
32
  private readonly _dataValidatorRegistryService;
33
33
  private readonly _sheetInterceptorService;
34
- constructor(_commandService: ICommandService, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _autoHeightController: AutoHeightController, _dataValidationModel: DataValidationModel, _dataValidatorRegistryService: DataValidatorRegistryService, _sheetInterceptorService: SheetInterceptorService);
34
+ private readonly _sheetDataValidationModel;
35
+ constructor(_commandService: ICommandService, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _autoHeightController: AutoHeightController, _dataValidatorRegistryService: DataValidatorRegistryService, _sheetInterceptorService: SheetInterceptorService, _sheetDataValidationModel: SheetDataValidationModel);
35
36
  private _initSkeletonChange;
36
37
  private _initViewModelIntercept;
37
38
  private _initAutoHeight;
@@ -0,0 +1,10 @@
1
+ import { Disposable, IUniverInstanceService } from '@univerjs/core';
2
+ import { SheetInterceptorService } from '@univerjs/sheets';
3
+ import { SheetDataValidationModel } from '../models/sheet-data-validation-model';
4
+ export declare class SheetDataValidationSheetController extends Disposable {
5
+ private _sheetInterceptorService;
6
+ private _univerInstanceService;
7
+ private readonly _sheetDataValidationModel;
8
+ constructor(_sheetInterceptorService: SheetInterceptorService, _univerInstanceService: IUniverInstanceService, _sheetDataValidationModel: SheetDataValidationModel);
9
+ private _initSheetChange;
10
+ }
@@ -1,7 +1,8 @@
1
1
  import { Injector, IUniverInstanceService, RxDisposable } from '@univerjs/core';
2
- import { DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
3
- import { ComponentManager } from '@univerjs/ui';
2
+ import { DataValidatorRegistryService } from '@univerjs/data-validation';
4
3
  import { SheetInterceptorService, SheetsSelectionsService } from '@univerjs/sheets';
4
+ import { ComponentManager } from '@univerjs/ui';
5
+ import { SheetDataValidationModel } from '../models/sheet-data-validation-model';
5
6
  export declare class DataValidationController extends RxDisposable {
6
7
  private readonly _univerInstanceService;
7
8
  private readonly _dataValidatorRegistryService;
@@ -9,8 +10,8 @@ export declare class DataValidationController extends RxDisposable {
9
10
  private readonly _componentManger;
10
11
  private _selectionManagerService;
11
12
  private readonly _sheetInterceptorService;
12
- private readonly _dataValidationModel;
13
- constructor(_univerInstanceService: IUniverInstanceService, _dataValidatorRegistryService: DataValidatorRegistryService, _injector: Injector, _componentManger: ComponentManager, _selectionManagerService: SheetsSelectionsService, _sheetInterceptorService: SheetInterceptorService, _dataValidationModel: DataValidationModel);
13
+ private readonly _sheetDataValidationModel;
14
+ constructor(_univerInstanceService: IUniverInstanceService, _dataValidatorRegistryService: DataValidatorRegistryService, _injector: Injector, _componentManger: ComponentManager, _selectionManagerService: SheetsSelectionsService, _sheetInterceptorService: SheetInterceptorService, _sheetDataValidationModel: SheetDataValidationModel);
14
15
  private _init;
15
16
  private _registerValidators;
16
17
  private _initCommandInterceptor;
@@ -13,17 +13,16 @@
13
13
  * See the License for the specific language governing permissions and
14
14
  * limitations under the License.
15
15
  */
16
- export { UniverSheetsDataValidationPlugin } from './plugin';
16
+ 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';
17
+ export { CloseValidationPanelOperation, HideDataValidationDropdown, OpenValidationPanelOperation, ShowDataValidationDropdown, ToggleValidationPanelOperation, } from './commands/operations/data-validation.operation';
18
+ export { DATA_VALIDATION_PLUGIN_NAME } from './common/const';
17
19
  export { UniverSheetsDataValidationMobilePlugin } from './mobile-plugin';
20
+ export { SheetDataValidationModel } from './models/sheet-data-validation-model';
21
+ export { UniverSheetsDataValidationPlugin } from './plugin';
18
22
  export { DataValidationCacheService } from './services/dv-cache.service';
19
23
  export type { IDataValidationResCache } from './services/dv-cache.service';
20
- export { DataValidationFormulaService } from './services/dv-formula.service';
21
24
  export { DataValidationCustomFormulaService } from './services/dv-custom-formula.service';
22
- export { DATA_VALIDATION_PLUGIN_NAME } from './common/const';
25
+ export { DataValidationFormulaService } from './services/dv-formula.service';
23
26
  export { SheetsDataValidationValidatorService } from './services/dv-validator-service';
24
- export { DataValidationModel, RemoveAllDataValidationCommand as RemoveSheetAllDataValidationCommand, type IRemoveAllDataValidationCommandParams as IRemoveSheetAllDataValidationCommandParams, } from '@univerjs/data-validation';
25
- export { SheetDataValidationManager } from './models/sheet-data-validation-manager';
26
- export { RemoveDataValidationCommand as RemoveSheetDataValidationCommand, type IRemoveDataValidationCommandParams as IRemoveSheetDataValidationCommandParams, } from '@univerjs/data-validation';
27
- export { UpdateSheetDataValidationRangeCommand, UpdateSheetDataValidationOptionsCommand, UpdateSheetDataValidationSettingCommand, AddSheetDataValidationCommand, AddSheetDataValidationAndOpenCommand, ClearRangeDataValidationCommand, type IAddSheetDataValidationCommandParams, type IUpdateSheetDataValidationRangeCommandParams, type IUpdateSheetDataValidationOptionsCommandParams, type IUpdateSheetDataValidationSettingCommandParams, type IClearRangeDataValidationCommandParams, } from './commands/commands/data-validation.command';
28
- export { OpenValidationPanelOperation, CloseValidationPanelOperation, ToggleValidationPanelOperation, ShowDataValidationDropdown, HideDataValidationDropdown, } from './commands/operations/data-validation.operation';
29
- export { LIST_DROPDOWN_KEY, DATE_DROPDOWN_KEY } from './views';
27
+ export { DATE_DROPDOWN_KEY, LIST_DROPDOWN_KEY } from './views';
28
+ export { DataValidationModel } from '@univerjs/data-validation';
@@ -7,6 +7,6 @@ export declare class UniverSheetsDataValidationMobilePlugin extends Plugin {
7
7
  private readonly _configService;
8
8
  static pluginName: string;
9
9
  static type: UniverInstanceType;
10
- constructor(_config: Partial<IUniverSheetsDataValidationConfig>, _injector: Injector, _commandService: ICommandService, _configService: IConfigService);
10
+ constructor(_config: Partial<IUniverSheetsDataValidationConfig> | undefined, _injector: Injector, _commandService: ICommandService, _configService: IConfigService);
11
11
  onStarting(): void;
12
12
  }
@@ -0,0 +1,40 @@
1
+ import { DataValidationStatus, DataValidationType, Disposable, IUniverInstanceService, ICellDataForSheetInterceptor, ISheetDataValidationRule, Nullable } from '@univerjs/core';
2
+ import { DataValidationModel, DataValidatorRegistryService, IRuleChange, IValidStatusChange } from '@univerjs/data-validation';
3
+ import { ISheetLocation } from '@univerjs/sheets';
4
+ import { DataValidationCacheService } from '../services/dv-cache.service';
5
+ import { DataValidationCustomFormulaService } from '../services/dv-custom-formula.service';
6
+ import { DataValidationFormulaService } from '../services/dv-formula.service';
7
+ import { RuleMatrix } from './rule-matrix';
8
+ export declare class SheetDataValidationModel extends Disposable {
9
+ private readonly _dataValidationModel;
10
+ private readonly _univerInstanceService;
11
+ private _dataValidatorRegistryService;
12
+ private _dataValidationCacheService;
13
+ private _dataValidationFormulaService;
14
+ private _dataValidationCustomFormulaService;
15
+ private readonly _ruleMatrixMap;
16
+ private readonly _validStatusChange$;
17
+ private readonly _ruleChange$;
18
+ readonly ruleChange$: import('rxjs').Observable<IRuleChange>;
19
+ readonly validStatusChange$: import('rxjs').Observable<IValidStatusChange>;
20
+ constructor(_dataValidationModel: DataValidationModel, _univerInstanceService: IUniverInstanceService, _dataValidatorRegistryService: DataValidatorRegistryService, _dataValidationCacheService: DataValidationCacheService, _dataValidationFormulaService: DataValidationFormulaService, _dataValidationCustomFormulaService: DataValidationCustomFormulaService);
21
+ private _initRuleUpdateListener;
22
+ private _ensureRuleMatrix;
23
+ private _addRuleSideEffect;
24
+ private _addRule;
25
+ private _updateRule;
26
+ private _removeRule;
27
+ getValidator(type: DataValidationType): import('@univerjs/data-validation').BaseDataValidator<import('@univerjs/core').CellValue> | undefined;
28
+ getRuleIdByLocation(unitId: string, subUnitId: string, row: number, col: number): string | undefined;
29
+ getRuleByLocation(unitId: string, subUnitId: string, row: number, col: number): ISheetDataValidationRule | undefined;
30
+ validator(cell: Nullable<ICellDataForSheetInterceptor>, rule: ISheetDataValidationRule, pos: ISheetLocation, _onCompete?: (status: DataValidationStatus, changed: boolean) => void): DataValidationStatus;
31
+ getRuleErrorMsg(unitId: string, subUnitId: string, ruleId: string): string;
32
+ getRuleObjectMatrix(unitId: string, subUnitId: string): RuleMatrix;
33
+ getRuleById(unitId: string, subUnitId: string, ruleId: string): ISheetDataValidationRule | undefined;
34
+ getRuleIndex(unitId: string, subUnitId: string, ruleId: string): number;
35
+ getRules(unitId: string, subUnitId: string): ISheetDataValidationRule[];
36
+ getUnitRules(unitId: string): [string, ISheetDataValidationRule[]][];
37
+ deleteUnitRules(unitId: string): void;
38
+ getSubUnitIds(unitId: string): string[];
39
+ getAll(): (readonly [string, [string, import('@univerjs/core').IDataValidationRule[]][]])[];
40
+ }
@@ -7,6 +7,6 @@ export declare class UniverSheetsDataValidationPlugin extends Plugin {
7
7
  private readonly _configService;
8
8
  static pluginName: string;
9
9
  static type: UniverInstanceType;
10
- constructor(_config: Partial<IUniverSheetsDataValidationConfig>, _injector: Injector, _commandService: ICommandService, _configService: IConfigService);
10
+ constructor(_config: Partial<IUniverSheetsDataValidationConfig> | undefined, _injector: Injector, _commandService: ICommandService, _configService: IConfigService);
11
11
  onStarting(): void;
12
12
  }
@@ -1,9 +1,10 @@
1
- import { Nullable, Disposable, IUniverInstanceService } from '@univerjs/core';
1
+ import { Disposable, IUniverInstanceService, Nullable } from '@univerjs/core';
2
+ import { DataValidatorRegistryService } from '@univerjs/data-validation';
3
+ import { IRenderManagerService } from '@univerjs/engine-render';
2
4
  import { ISheetLocation, SheetsSelectionsService } from '@univerjs/sheets';
3
5
  import { SheetCanvasPopManagerService } from '@univerjs/sheets-ui';
4
- import { DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
5
6
  import { IZenZoneService } from '@univerjs/ui';
6
- import { IRenderManagerService } from '@univerjs/engine-render';
7
+ import { SheetDataValidationModel } from '../models/sheet-data-validation-model';
7
8
  export interface IDropdownParam {
8
9
  location: ISheetLocation;
9
10
  onHide?: () => void;
@@ -29,7 +30,7 @@ export declare class DataValidationDropdownManagerService extends Disposable {
29
30
  activeDropdown$: import('rxjs').Observable<Nullable<IDropdownParam>>;
30
31
  private _zenVisible;
31
32
  get activeDropdown(): Nullable<IDropdownParam>;
32
- constructor(_canvasPopupManagerService: SheetCanvasPopManagerService, _univerInstanceService: IUniverInstanceService, _dataValidatorRegistryService: DataValidatorRegistryService, _zenZoneService: IZenZoneService, _renderManagerService: IRenderManagerService, _dataValidationModel: DataValidationModel, _sheetsSelectionsService: SheetsSelectionsService);
33
+ constructor(_canvasPopupManagerService: SheetCanvasPopManagerService, _univerInstanceService: IUniverInstanceService, _dataValidatorRegistryService: DataValidatorRegistryService, _zenZoneService: IZenZoneService, _renderManagerService: IRenderManagerService, _dataValidationModel: SheetDataValidationModel, _sheetsSelectionsService: SheetsSelectionsService);
33
34
  private _init;
34
35
  private _getDropdownByCell;
35
36
  private _initSelectionChange;
@@ -1,6 +1,6 @@
1
- import { IRange, ISheetDataValidationRule, Disposable, ILogService, IUniverInstanceService } from '@univerjs/core';
2
- import { LexerTreeBuilder } from '@univerjs/engine-formula';
1
+ import { Disposable, ILogService, IUniverInstanceService, IRange, ISheetDataValidationRule } from '@univerjs/core';
3
2
  import { DataValidationModel } from '@univerjs/data-validation';
3
+ import { LexerTreeBuilder } from '@univerjs/engine-formula';
4
4
  import { RegisterOtherFormulaService } from '@univerjs/sheets-formula';
5
5
  import { DataValidationCacheService } from './dv-cache.service';
6
6
  interface IFormulaData {
@@ -1,6 +1,6 @@
1
- import { Nullable, Disposable, IUniverInstanceService } from '@univerjs/core';
1
+ import { Disposable, IUniverInstanceService, Nullable } from '@univerjs/core';
2
2
  import { DataValidationModel } from '@univerjs/data-validation';
3
- import { IFormulaInfo, IOtherFormulaResult, RegisterOtherFormulaService } from '@univerjs/sheets-formula';
3
+ import { RegisterOtherFormulaService, IFormulaInfo, IOtherFormulaResult } from '@univerjs/sheets-formula';
4
4
  import { DataValidationCacheService } from './dv-cache.service';
5
5
  export declare class DataValidationFormulaService extends Disposable {
6
6
  private readonly _instanceService;
@@ -1,11 +1,11 @@
1
- import { IDataValidationRule, IRange, Nullable, ObjectMatrix, DataValidationStatus, IUniverInstanceService } from '@univerjs/core';
2
- import { DataValidationModel } from '@univerjs/data-validation';
3
- import { IDataValidationResCache, DataValidationCacheService } from './dv-cache.service';
1
+ import { DataValidationStatus, IUniverInstanceService, IDataValidationRule, IRange, Nullable, ObjectMatrix } from '@univerjs/core';
2
+ import { SheetDataValidationModel } from '../models/sheet-data-validation-model';
3
+ import { DataValidationCacheService, IDataValidationResCache } from './dv-cache.service';
4
4
  export declare class SheetsDataValidationValidatorService {
5
5
  private readonly _univerInstanceService;
6
- private readonly _dataValidationModel;
6
+ private readonly _sheetDataValidationModel;
7
7
  private readonly _dataValidationCacheService;
8
- constructor(_univerInstanceService: IUniverInstanceService, _dataValidationModel: DataValidationModel, _dataValidationCacheService: DataValidationCacheService);
8
+ constructor(_univerInstanceService: IUniverInstanceService, _sheetDataValidationModel: SheetDataValidationModel, _dataValidationCacheService: DataValidationCacheService);
9
9
  validatorCell(unitId: string, subUnitId: string, row: number, col: number): Promise<DataValidationStatus>;
10
10
  validatorRanges(unitId: string, subUnitId: string, ranges: IRange[]): Promise<Promise<DataValidationStatus>[][]>;
11
11
  validatorWorksheet(unitId: string, subUnitId: string): Promise<ObjectMatrix<Nullable<IDataValidationResCache>>>;
@@ -0,0 +1,8 @@
1
+ import { DataValidationOperator, DataValidationType, IAccessor } from '@univerjs/core';
2
+ export declare function createDefaultNewRule(accessor: IAccessor): {
3
+ uid: string;
4
+ type: DataValidationType;
5
+ operator: DataValidationOperator;
6
+ formula1: string;
7
+ ranges: import('@univerjs/core').IRange[];
8
+ };
@@ -1,8 +1,13 @@
1
- import { CellValue, DataValidationOperator, IDataValidationRule, IDataValidationRuleBase, ISheetDataValidationRule, Nullable } from '@univerjs/core';
2
1
  import { BaseDataValidator, IFormulaResult, IFormulaValidResult, IValidatorCellInfo } from '@univerjs/data-validation';
2
+ import { CellValue, DataValidationOperator, IDataValidationRule, IDataValidationRuleBase, ISheetDataValidationRule, Nullable } from '@univerjs/core';
3
3
  import { CheckboxRender } from '../widgets/checkbox-widget';
4
4
  export declare const CHECKBOX_FORMULA_1 = 1;
5
5
  export declare const CHECKBOX_FORMULA_2 = 0;
6
+ interface ICheckboxFormulaResult extends IFormulaResult {
7
+ originFormula1: Nullable<CellValue>;
8
+ originFormula2: Nullable<CellValue>;
9
+ }
10
+ export declare const transformCheckboxValue: (value: Nullable<CellValue>) => Nullable<CellValue>;
6
11
  export declare class CheckboxValidator extends BaseDataValidator {
7
12
  id: string;
8
13
  title: string;
@@ -16,11 +21,14 @@ export declare class CheckboxValidator extends BaseDataValidator {
16
21
  subUnitId: string;
17
22
  }): boolean;
18
23
  validatorFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): IFormulaValidResult;
19
- parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<IFormulaResult>;
24
+ parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<ICheckboxFormulaResult>;
20
25
  parseFormulaSync(rule: IDataValidationRule, unitId: string, subUnitId: string): {
21
26
  formula1: Nullable<CellValue>;
22
27
  formula2: Nullable<CellValue>;
28
+ originFormula1: Nullable<CellValue>;
29
+ originFormula2: Nullable<CellValue>;
23
30
  };
24
31
  isValidType(cellInfo: IValidatorCellInfo<CellValue>, formula: IFormulaResult, rule: IDataValidationRule): Promise<boolean>;
25
32
  generateRuleErrorMessage(rule: IDataValidationRuleBase): string;
26
33
  }
34
+ export {};
@@ -1,5 +1,5 @@
1
1
  import { DataValidationOperator, CellValue, IDataValidationRule, IDataValidationRuleBase } from '@univerjs/core';
2
- import { IFormulaResult, IFormulaValidResult, IValidatorCellInfo, BaseDataValidator } from '@univerjs/data-validation';
2
+ import { BaseDataValidator, IFormulaResult, IFormulaValidResult, IValidatorCellInfo } from '@univerjs/data-validation';
3
3
  export declare class DateValidator extends BaseDataValidator<number> {
4
4
  id: string;
5
5
  title: string;
@@ -17,7 +17,7 @@ export declare class DateValidator extends BaseDataValidator<number> {
17
17
  isValidType(info: IValidatorCellInfo): Promise<boolean>;
18
18
  private _validatorSingleFormula;
19
19
  validatorFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): IFormulaValidResult;
20
- normlizeFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): {
20
+ normalizeFormula(rule: IDataValidationRule, _unitId: string, _subUnitId: string): {
21
21
  formula1: string | undefined;
22
22
  formula2: string | undefined;
23
23
  };
@@ -1,6 +1,6 @@
1
- import { IMouseEvent, IPointerEvent, UniverRenderingContext2D } from '@univerjs/engine-render';
2
1
  import { ICommandService, ThemeService, ICellRenderContext } from '@univerjs/core';
3
2
  import { IBaseDataValidationWidget } from '@univerjs/data-validation';
3
+ import { IMouseEvent, IPointerEvent, UniverRenderingContext2D } from '@univerjs/engine-render';
4
4
  import { DataValidationFormulaService } from '../services/dv-formula.service';
5
5
  export declare class CheckboxRender implements IBaseDataValidationWidget {
6
6
  private readonly _commandService;