@univerjs/sheets-data-validation 0.3.0 → 0.4.0-alpha.0

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

@@ -19,7 +19,6 @@ export interface IAddSheetDataValidationCommandParams {
     rule: ISheetDataValidationRule;
 }
 export declare const AddSheetDataValidationCommand: ICommand<IAddSheetDataValidationCommandParams>;
-export declare const AddSheetDataValidationAndOpenCommand: ICommand;
 export interface IUpdateSheetDataValidationSettingCommandParams extends ISheetCommandSharedParams {
     ruleId: string;
     setting: IDataValidationRuleBase;

package/lib/types/common/const.d.ts

@@ -14,5 +14,4 @@
  * limitations under the License.
  */
 export declare const DATA_VALIDATION_PLUGIN_NAME = "SHEET_DATA_VALIDATION_PLUGIN";
-export declare const DROP_DOWN_DEFAULT_COLOR = "#ECECEC";
 export declare const DROP_DOWN_COLORS: never[];

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

@@ -1,8 +1,20 @@
-import { MenuConfig } from '@univerjs/ui';
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 export declare const PLUGIN_CONFIG_KEY = "sheets-data-validation.config";
 export declare const configSymbol: unique symbol;
 export interface IUniverSheetsDataValidationConfig {
-    menu?: MenuConfig;
-    showEditOnDropdown?: boolean;
 }
 export declare const defaultPluginConfig: IUniverSheetsDataValidationConfig;

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

@@ -1,4 +1,4 @@
-import { Disposable, Injector, ISheetDataValidationRule } from '@univerjs/core';
+import { ISheetDataValidationRule, Disposable, Injector } from '@univerjs/core';
 import { RefRangeService } from '@univerjs/sheets';
 import { FormulaRefRangeService } from '@univerjs/sheets-formula';
 import { SheetDataValidationModel } from '../models/sheet-data-validation-model';

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

@@ -1,19 +1,16 @@
 import { Injector, IUniverInstanceService, RxDisposable } from '@univerjs/core';
 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;
     private readonly _injector;
-    private readonly _componentManger;
     private _selectionManagerService;
     private readonly _sheetInterceptorService;
     private readonly _sheetDataValidationModel;
-    constructor(_univerInstanceService: IUniverInstanceService, _dataValidatorRegistryService: DataValidatorRegistryService, _injector: Injector, _componentManger: ComponentManager, _selectionManagerService: SheetsSelectionsService, _sheetInterceptorService: SheetInterceptorService, _sheetDataValidationModel: SheetDataValidationModel);
+    constructor(_univerInstanceService: IUniverInstanceService, _dataValidatorRegistryService: DataValidatorRegistryService, _injector: Injector, _selectionManagerService: SheetsSelectionsService, _sheetInterceptorService: SheetInterceptorService, _sheetDataValidationModel: SheetDataValidationModel);
     private _init;
     private _registerValidators;
     private _initCommandInterceptor;
-    private _initComponents;
 }

package/lib/types/index.d.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 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';
@@ -22,7 +21,14 @@ export type { IDataValidationResCache } from './services/dv-cache.service';
 export { DataValidationCustomFormulaService } from './services/dv-custom-formula.service';
 export { DataValidationFormulaService } from './services/dv-formula.service';
 export { SheetsDataValidationValidatorService } from './services/dv-validator-service';
-export { DATE_DROPDOWN_KEY, LIST_DROPDOWN_KEY } from './views';
+export { createDefaultNewRule } from './utils/create';
+export { DataValidationFormulaController } from './controllers/dv-formula.controller';
+export { getFormulaCellData, getFormulaResult } from './utils/formula';
+export { getCellValueOrigin } from './utils/get-cell-data-origin';
+export { ListValidator } from './validators/list-validator';
+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 { 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 { 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/plugin.d.ts

@@ -1,5 +1,5 @@
-import { ICommandService, IConfigService, Plugin, UniverInstanceType, Injector } from '@univerjs/core';
 import { IUniverSheetsDataValidationConfig } from './controllers/config.schema';
+import { ICommandService, IConfigService, Plugin, UniverInstanceType, Injector } from '@univerjs/core';
 export declare class UniverSheetsDataValidationPlugin extends Plugin {
     private readonly _config;
     protected _injector: Injector;
@@ -9,4 +9,6 @@ export declare class UniverSheetsDataValidationPlugin extends Plugin {
     static type: UniverInstanceType;
     constructor(_config: Partial<IUniverSheetsDataValidationConfig> | undefined, _injector: Injector, _commandService: ICommandService, _configService: IConfigService);
     onStarting(): void;
+    onReady(): void;
+    onRendered(): void;
 }

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

@@ -1,4 +1,4 @@
-import { DataValidationOperator, DataValidationType, IAccessor } from '@univerjs/core';
+import { IAccessor, DataValidationOperator, DataValidationType } from '@univerjs/core';
 export declare function createDefaultNewRule(accessor: IAccessor): {
     uid: string;
     type: DataValidationType;

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

@@ -1,6 +1,5 @@
-import { WrapStrategy, CellValue, DataValidationOperator, IDataValidationRule, IDataValidationRuleBase, ISheetDataValidationRule, Nullable } from '@univerjs/core';
-import { BaseDataValidator, IFormulaResult, IFormulaValidResult, IValidatorCellInfo } from '@univerjs/data-validation';
-import { CheckboxRender } from '../widgets/checkbox-widget';
+import { CellValue, DataValidationOperator, IDataValidationRule, IDataValidationRuleBase, ISheetDataValidationRule, Nullable, WrapStrategy } from '@univerjs/core';
+import { IFormulaResult, IFormulaValidResult, IValidatorCellInfo, BaseDataValidator } from '@univerjs/data-validation';
 export declare const CHECKBOX_FORMULA_1 = 1;
 export declare const CHECKBOX_FORMULA_2 = 0;
 interface ICheckboxFormulaResult extends IFormulaResult {
@@ -13,8 +12,6 @@ export declare class CheckboxValidator extends BaseDataValidator {
     title: string;
     operators: DataValidationOperator[];
     scopes: string | string[];
-    formulaInput: string;
-    canvasRender: CheckboxRender;
     private _formulaService;
     skipDefaultFontRender: (rule: ISheetDataValidationRule, cellValue: Nullable<CellValue>, pos: {
         unitId: string;

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

@@ -5,7 +5,6 @@ export declare class CustomFormulaValidator extends BaseDataValidator {
     title: string;
     operators: DataValidationOperator[];
     scopes: string | string[];
-    formulaInput: string;
     private _customFormulaService;
     validatorFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): IFormulaValidResult;
     parseFormula(_rule: IDataValidationRule, _unitId: string, _subUnitId: string): Promise<IFormulaResult>;

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

@@ -1,13 +1,10 @@
-import { DataValidationOperator, CellValue, IDataValidationRule, IDataValidationRuleBase } from '@univerjs/core';
-import { BaseDataValidator, IFormulaResult, IFormulaValidResult, IValidatorCellInfo } from '@univerjs/data-validation';
+import { CellValue, IDataValidationRule, IDataValidationRuleBase, DataValidationOperator } from '@univerjs/core';
+import { IFormulaResult, IFormulaValidResult, IValidatorCellInfo, BaseDataValidator } from '@univerjs/data-validation';
 export declare class DateValidator extends BaseDataValidator<number> {
     id: string;
     title: string;
     operators: DataValidationOperator[];
     scopes: string | string[];
-    formulaInput: string;
-    optionsInput: string;
-    dropdown: string;
     private _formulaService;
     parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<IFormulaResult<number | undefined>>;
     parseFormulaSync(rule: IDataValidationRule, unitId: string, subUnitId: string): {

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

@@ -1,4 +1,4 @@
-import { DataValidationOperator, CellValue, IDataValidationRule, Nullable } from '@univerjs/core';
+import { CellValue, IDataValidationRule, Nullable, DataValidationOperator } from '@univerjs/core';
 import { IFormulaResult, IFormulaValidResult, IValidatorCellInfo, BaseDataValidator } from '@univerjs/data-validation';
 export declare function getCellValueNumber(cellValue: CellValue): number;
 export declare class DecimalValidator extends BaseDataValidator<number> {
@@ -7,8 +7,6 @@ export declare class DecimalValidator extends BaseDataValidator<number> {
     title: string;
     operators: DataValidationOperator[];
     scopes: string | string[];
-    formulaInput: string;
-    dropDownInput?: string;
     private _isFormulaOrNumber;
     isValidType(cellInfo: IValidatorCellInfo<CellValue>, formula: IFormulaResult, rule: IDataValidationRule): Promise<boolean>;
     transform(cellInfo: IValidatorCellInfo<CellValue>, formula: IFormulaResult, rule: IDataValidationRule): {

package/lib/types/validators/list-multiple-validator.d.ts

@@ -1,8 +1,6 @@
-import { DropdownMultipleWidget } from '../widgets/dropdown-multiple-widget';
 import { ListValidator } from './list-validator';
 export declare class ListMultipleValidator extends ListValidator {
     id: string;
     title: string;
-    canvasRender: DropdownMultipleWidget;
     skipDefaultFontRender: () => boolean;
 }

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

@@ -1,6 +1,6 @@
-import { BaseDataValidator, IBaseDataValidationWidget, IFormulaResult, IFormulaValidResult, IValidatorCellInfo } from '@univerjs/data-validation';
-import { LexerTreeBuilder } from '@univerjs/engine-formula';
 import { CellValue, DataValidationOperator, ICellData, IDataValidationRule, ISheetDataValidationRule, IStyleData, Nullable } from '@univerjs/core';
+import { IFormulaResult, IFormulaValidResult, IValidatorCellInfo, BaseDataValidator } from '@univerjs/data-validation';
+import { LexerTreeBuilder } from '@univerjs/engine-formula';
 import { DataValidationFormulaService } from '../services/dv-formula.service';
 export declare function getRuleFormulaResultSet(result: Nullable<Nullable<ICellData>[][]>): string[];
 export declare function isValidListFormula(formula: string, lexer: LexerTreeBuilder): boolean | undefined;
@@ -12,10 +12,6 @@ export declare class ListValidator extends BaseDataValidator {
     title: string;
     operators: DataValidationOperator[];
     scopes: string | string[];
-    formulaInput: string;
-    canvasRender: Nullable<IBaseDataValidationWidget>;
-    dropdown: string | undefined;
-    optionsInput: string | undefined;
     skipDefaultFontRender: (rule: ISheetDataValidationRule) => boolean;
     validatorFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): IFormulaValidResult;
     getExtraStyle(rule: IDataValidationRule, value: Nullable<CellValue>, { style: defaultStyle }: {

package/lib/types/validators/text-length-validator.d.ts

@@ -1,11 +1,10 @@
-import { DataValidationOperator, CellValue, IDataValidationRule, IDataValidationRuleBase, Nullable } from '@univerjs/core';
+import { CellValue, IDataValidationRule, IDataValidationRuleBase, Nullable, DataValidationOperator } from '@univerjs/core';
 import { IFormulaResult, IFormulaValidResult, IValidatorCellInfo, BaseDataValidator } from '@univerjs/data-validation';
 export declare class TextLengthValidator extends BaseDataValidator<number> {
     id: string;
     title: string;
     operators: DataValidationOperator[];
     scopes: string | string[];
-    formulaInput: string;
     private _formulaService;
     private _isFormulaOrInt;
     validatorFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): IFormulaValidResult;

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

@@ -1,4 +1,4 @@
-import { DataValidationOperator, CellValue, IDataValidationRule, IDataValidationRuleBase, Nullable } from '@univerjs/core';
+import { CellValue, IDataValidationRule, IDataValidationRuleBase, Nullable, DataValidationOperator } from '@univerjs/core';
 import { IFormulaResult, IFormulaValidResult, IValidatorCellInfo, BaseDataValidator } from '@univerjs/data-validation';
 export declare class WholeValidator extends BaseDataValidator<number> {
     private _formulaService;
@@ -6,8 +6,6 @@ export declare class WholeValidator extends BaseDataValidator<number> {
     title: string;
     operators: DataValidationOperator[];
     scopes: string | string[];
-    formulaInput: string;
-    dropDownInput?: string;
     private _isFormulaOrInt;
     isValidType(cellInfo: IValidatorCellInfo<CellValue>, formula: IFormulaResult, rule: IDataValidationRule): Promise<boolean>;
     transform(cellInfo: IValidatorCellInfo<CellValue>, formula: IFormulaResult, rule: IDataValidationRule): {