@univerjs/sheets-data-validation 0.1.13 → 0.1.15

package/lib/locale/en-US.json

@@ -10,13 +10,14 @@
       "list": "Please input options",
       "listInvalid": "The list source must be a delimited list or a reference to a single row or column",
       "checkboxEqual": "Enter different values for ticked and unticked cell contents.",
-      "formulaError": "The reference range contains invisible data, please readjust the range"
+      "formulaError": "The reference range contains invisible data, please readjust the range",
+      "listIntersects": "The selected range cannot intersect with the scope of the rules"
     },
     "panel": {
       "title": "Data validation management",
       "addTitle": "Create new data validation",
       "removeAll": "Remove All",
-      "add": "Create Data validation",
+      "add": "Add Rule",
       "range": "Ranges",
       "type": "Type",
       "options": "Advance options",

package/lib/locale/ru-RU.json

@@ -10,13 +10,14 @@
       "list": "Пожалуйста, введите параметры",
       "listInvalid": "Источник списка должен быть разделенным списком или ссылкой на одну строку или столбец",
       "checkboxEqual": "Для выбранных и не выбранных ячеек введите разные значения",
-      "formulaError": "Диапазон ссылок содержит невидимые данные, пожалуйста, пересмотрите диапазон"
+      "formulaError": "Диапазон ссылок содержит невидимые данные, пожалуйста, пересмотрите диапазон",
+      "listIntersects": "Выбранный диапазон не может пересекаться с диапазоном правила."
     },
     "panel": {
       "title": "Управление проверкой данных",
       "addTitle": "Создать новую проверку данных",
       "removeAll": "Удалить все",
-      "add": "Создать проверку данных",
+      "add": "добавить правило",
       "range": "Диапазоны",
       "type": "Тип",
       "options": "Дополнительные параметры",

package/lib/locale/zh-CN.json

@@ -10,7 +10,8 @@
       "list": "请输入至少一个合法选项",
       "listInvalid": "列表源必须是分隔列表或对单行或列的引用。",
       "checkboxEqual": "为勾选和未勾选的单元格内容输入不同的值。",
-      "formulaError": "引用范围内包含不可见的数据，请重新调整范围"
+      "formulaError": "引用范围内包含不可见的数据，请重新调整范围",
+      "listIntersects": "所选范围不能和规则范围相交"
     },
     "panel": {
       "title": "管理数据验证",

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/locale/zh-CN.d.ts

@@ -26,6 +26,7 @@ declare const locale: {
             listInvalid: string;
             checkboxEqual: string;
             formulaError: string;
+            listIntersects: string;
         };
         panel: {
             title: string;

package/lib/types/models/rule-matrix.d.ts

@@ -1,4 +1,4 @@
-import { IRange, ISheetDataValidationRule, ObjectMatrix } from '@univerjs/core';
+import { IRange, ISheetDataValidationRule, Worksheet, ObjectMatrix } from '@univerjs/core';
 
 export type RangeMutation = {
     type: 'update';
@@ -14,12 +14,13 @@ export type RangeMutation = {
     rule: ISheetDataValidationRule;
 };
 export declare class RuleMatrix {
+    private _worksheet;
     readonly value: ObjectMatrix<string>;
-    constructor(value: ObjectMatrix<string>);
+    constructor(value: ObjectMatrix<string>, _worksheet: Worksheet);
     addRule(rule: ISheetDataValidationRule): void;
     removeRange(ranges: IRange[]): void;
     removeRule(rule: ISheetDataValidationRule): void;
-    updateRange(ruleId: string, oldRanges: IRange[], newRanges: IRange[]): void;
+    updateRange(ruleId: string, _oldRanges: IRange[], _newRanges: IRange[]): void;
     diff(rules: ISheetDataValidationRule[]): RangeMutation[];
     diffWithAddition(rules: ISheetDataValidationRule[], additionRules: IterableIterator<ISheetDataValidationRule>): RangeMutation[];
     clone(): RuleMatrix;

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>>>>;
+}

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

@@ -14,7 +14,7 @@ export declare class CheckboxValidator extends BaseDataValidator {
     canvasRender: CheckboxRender;
     private _formulaService;
     skipDefaultFontRender(rule: ISheetDataValidationRule, cellValue: Nullable<CellValue>, pos: ISheetLocation): boolean;
-    validatorFormula(rule: IDataValidationRuleBase): IFormulaValidResult;
+    validatorFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): IFormulaValidResult;
     parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<IFormulaResult>;
     parseFormulaSync(rule: IDataValidationRule, unitId: string, subUnitId: string): {
         formula1: Nullable<CellValue>;

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

@@ -8,7 +8,7 @@ export declare class CustomFormulaValidator extends BaseDataValidator {
     scopes: string | string[];
     formulaInput: string;
     private _customFormulaService;
-    validatorFormula(rule: IDataValidationRuleBase): IFormulaValidResult;
+    validatorFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): IFormulaValidResult;
     parseFormula(_rule: IDataValidationRule, _unitId: string, _subUnitId: string): Promise<IFormulaResult>;
     isValidType(cellInfo: IValidatorCellInfo<CellValue>, _formula: IFormulaResult, _rule: IDataValidationRule): Promise<boolean>;
     generateRuleErrorMessage(rule: IDataValidationRuleBase): string;

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

@@ -14,7 +14,7 @@ export declare class DateValidator extends BaseDataValidator<Dayjs> {
     transformDate: (value: Nullable<CellValue>) => Dayjs | undefined;
     isValidType(info: IValidatorCellInfo): Promise<boolean>;
     private _validatorSingleFormula;
-    validatorFormula(rule: IDataValidationRuleBase): IFormulaValidResult;
+    validatorFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): IFormulaValidResult;
     transform(cellInfo: IValidatorCellInfo<CellValue>, _formula: IFormulaResult, _rule: IDataValidationRule): IValidatorCellInfo<Dayjs>;
     validatorIsEqual(info: IValidatorCellInfo<Dayjs>, formula: IFormulaResult<Dayjs | undefined>, _rule: IDataValidationRule): Promise<boolean>;
     validatorIsNotEqual(info: IValidatorCellInfo<Dayjs>, formula: IFormulaResult<Dayjs | undefined>): Promise<boolean>;
@@ -24,7 +24,7 @@ export declare class DateValidator extends BaseDataValidator<Dayjs> {
     validatorIsGreaterThanOrEqual(info: IValidatorCellInfo<Dayjs>, formula: IFormulaResult<Dayjs | undefined>): Promise<boolean>;
     validatorIsLessThan(info: IValidatorCellInfo<Dayjs>, formula: IFormulaResult<Dayjs | undefined>): Promise<boolean>;
     validatorIsLessThanOrEqual(info: IValidatorCellInfo<Dayjs>, formula: IFormulaResult<Dayjs | undefined>): Promise<boolean>;
-    validatorFormulaValue(rule: IDataValidationRuleBase): string | undefined;
+    validatorFormulaValue(rule: IDataValidationRule): string | undefined;
     get operatorNames(): string[];
     generateRuleName(rule: IDataValidationRuleBase): string;
     generateRuleErrorMessage(rule: IDataValidationRuleBase): string;

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

@@ -1,4 +1,4 @@
-import { DataValidationOperator, CellValue, IDataValidationRule, IDataValidationRuleBase } from '@univerjs/core';
+import { DataValidationOperator, CellValue, IDataValidationRule } from '@univerjs/core';
 import { IFormulaResult, IFormulaValidResult, IValidatorCellInfo, BaseDataValidator } from '@univerjs/data-validation';
 
 export declare function getCellValueNumber(cellValue: CellValue): number;
@@ -24,7 +24,7 @@ export declare class DecimalValidator extends BaseDataValidator<number> {
         formula1: number;
         formula2: number;
     }>;
-    validatorFormula(rule: IDataValidationRuleBase): IFormulaValidResult;
+    validatorFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): IFormulaValidResult;
     validatorIsEqual(cellInfo: IValidatorCellInfo<CellValue>, formula: IFormulaResult, rule: IDataValidationRule): Promise<boolean>;
     validatorIsNotEqual(cellInfo: IValidatorCellInfo<number>, formula: IFormulaResult, _rule: IDataValidationRule): Promise<boolean>;
     validatorIsBetween(cellInfo: IValidatorCellInfo<number>, formula: IFormulaResult, _rule: IDataValidationRule): Promise<boolean>;

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

@@ -1,4 +1,4 @@
-import { CellValue, DataValidationOperator, ICellData, IDataValidationRule, IDataValidationRuleBase, ISheetDataValidationRule, Nullable } from '@univerjs/core';
+import { CellValue, DataValidationOperator, ICellData, IDataValidationRule, ISheetDataValidationRule, Nullable } from '@univerjs/core';
 import { IBaseDataValidationWidget, IFormulaResult, IFormulaValidResult, IValidatorCellInfo, BaseDataValidator } from '@univerjs/data-validation';
 import { LexerTreeBuilder } from '@univerjs/engine-formula';
 import { DataValidationFormulaService } from '../services/dv-formula.service';
@@ -8,6 +8,7 @@ export declare function isValidListFormula(formula: string, lexer: LexerTreeBuil
 export declare class ListValidator extends BaseDataValidator {
     protected formulaService: DataValidationFormulaService;
     private _lexer;
+    private _univerInstanceService;
     id: string;
     title: string;
     operators: DataValidationOperator[];
@@ -17,7 +18,7 @@ export declare class ListValidator extends BaseDataValidator {
     dropdown: string | undefined;
     optionsInput: string | undefined;
     skipDefaultFontRender(rule: ISheetDataValidationRule): boolean;
-    validatorFormula(rule: IDataValidationRuleBase): IFormulaValidResult;
+    validatorFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): IFormulaValidResult;
     parseCellValue(cellValue: CellValue): string[];
     parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<IFormulaResult<string[] | undefined>>;
     isValidType(cellInfo: IValidatorCellInfo<Nullable<CellValue>>, formula: IFormulaResult<string[] | undefined>, rule: IDataValidationRule): Promise<boolean>;

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

@@ -9,7 +9,7 @@ export declare class TextLengthValidator extends BaseDataValidator<number> {
     formulaInput: string;
     private _formulaService;
     private _isFormulaOrInt;
-    validatorFormula(rule: IDataValidationRuleBase): IFormulaValidResult;
+    validatorFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): IFormulaValidResult;
     private _parseNumber;
     private _isValidFormula;
     parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<IFormulaResult<any>>;

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

@@ -23,7 +23,7 @@ export declare class WholeValidator extends BaseDataValidator<number> {
         formula1: number;
         formula2: number;
     }>;
-    validatorFormula(rule: IDataValidationRuleBase): IFormulaValidResult;
+    validatorFormula(rule: IDataValidationRuleBase, unitId: string, subUnitId: string): IFormulaValidResult;
     validatorIsEqual(cellInfo: IValidatorCellInfo<CellValue>, formula: IFormulaResult, rule: IDataValidationRule): Promise<boolean>;
     validatorIsNotEqual(cellInfo: IValidatorCellInfo<number>, formula: IFormulaResult, _rule: IDataValidationRule): Promise<boolean>;
     validatorIsBetween(cellInfo: IValidatorCellInfo<number>, formula: IFormulaResult, _rule: IDataValidationRule): Promise<boolean>;