@univerjs/sheets-data-validation 0.2.11 → 0.2.12

package/lib/es/index.js

@@ -2,12 +2,12 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
-import { DEFAULT_EMPTY_DOCUMENT_VALUE, useDependency, Inject, Disposable, UniverInstanceType, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DisposableCollection, IUniverInstanceService, toDisposable, CommandType, ICommandService, ObjectMatrix, Range, isFormulaString, ThemeService, VerticalAlign, HorizontalAlign, createInternalEditorID, LocaleService, OnLifecycle, LifecycleStages, IPermissionService, DataValidationType, Tools, DataValidationOperator, DataValidationErrorStyle, UndoCommand, RedoCommand, isUnitRangesEqual, isValidRange, debounce, shallowEqual, Injector, DataValidationRenderMode, UNIVER_INTERNAL, numfmt, CellValueType, DEFAULT_STYLES, WrapStrategy, DocumentDataModel, BooleanNumber, Rectangle, IUndoRedoService, sequenceExecuteAsync, sequenceExecute, Optional, RxDisposable, DataValidationStatus, ILogService, isRangesEqual, queryObjectMatrix, IResourceManagerService, DependentOn, Plugin } from "@univerjs/core";
+import { DEFAULT_EMPTY_DOCUMENT_VALUE, useDependency, Inject, Disposable, UniverInstanceType, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DisposableCollection, IUniverInstanceService, toDisposable, CommandType, ICommandService, ObjectMatrix, Range, isFormulaString, ThemeService, VerticalAlign, HorizontalAlign, createInternalEditorID, LocaleService, OnLifecycle, LifecycleStages, IPermissionService, DataValidationType, Tools, DataValidationOperator, DataValidationErrorStyle, UndoCommand, RedoCommand, isUnitRangesEqual, isValidRange, debounce, shallowEqual, Injector, DataValidationRenderMode, UNIVER_INTERNAL, numfmt, CellValueType, DEFAULT_STYLES, WrapStrategy, DocumentDataModel, BooleanNumber, Rectangle, IUndoRedoService, sequenceExecuteAsync, sequenceExecute, Optional, RxDisposable, DataValidationStatus, ILogService, isRangesEqual, queryObjectMatrix, IResourceManagerService, DependentOn, Plugin, IConfigService } from "@univerjs/core";
 import { DataValidatorRegistryService, DataValidationModel, BaseDataValidator, DataValidatorRegistryScope, TWO_FORMULA_OPERATOR_COUNT as TWO_FORMULA_OPERATOR_COUNT$1, getRuleOptions, getRuleSetting, RemoveDataValidationCommand, createDefaultNewRule, RemoveAllDataValidationCommand, TextLengthErrorTitleMap, AddDataValidationMutation, RemoveDataValidationMutation, UpdateRuleType, UpdateDataValidationMutation, removeDataValidationUndoFactory, DataValidationManager, AddDataValidationCommand, UniverDataValidationPlugin } from "@univerjs/data-validation";
 import { DataValidationModel as DataValidationModel2, RemoveAllDataValidationCommand as RemoveAllDataValidationCommand2, RemoveDataValidationCommand as RemoveDataValidationCommand2 } from "@univerjs/data-validation";
 import { SheetsSelectionsService, getSheetCommandTarget, SetRangeValuesCommand, WorksheetViewPermission, checkRangesEditablePermission, SetRangeValuesMutation, SetRangeValuesUndoMutationFactory, WorkbookEditablePermission, WorksheetSetCellStylePermission, WorksheetEditPermission, RangeProtectionPermissionEditPoint, SheetInterceptorService, INTERCEPTOR_POINT, InterceptCellContentPriority, ClearSelectionAllCommand, RefRangeService, handleCommonDefaultRangeChangeWithEffectRefCommands, UniverSheetsPlugin } from "@univerjs/sheets";
 import { SheetCanvasPopManagerService, IMarkSelectionService, IEditorBridgeService, getCurrentRangeDisable$, AutoHeightController, SheetSkeletonManagerService, HoverManagerService, CellAlertManagerService, CellAlertType, IAutoFillService, APPLY_TYPE, virtualizeDiscreteRanges, getAutoFillRepeatRange, COPY_TYPE, rangeToDiscreteRange, PREDEFINED_HOOK_NAME, getRepeatRange, ISheetClipboardService, SheetPermissionInterceptorBaseController, UniverSheetsUIPlugin } from "@univerjs/sheets-ui";
-import { useObservable, ComponentManager, IZenZoneService, ISidebarService, TextEditor, useEvent, RangeSelector, KeyCode, IDialogService, MenuItemType, MenuPosition, MenuGroup, getMenuHiddenObservable, IMenuService } from "@univerjs/ui";
+import { useObservable, ComponentManager, IZenZoneService, ISidebarService, TextEditor, useEvent, RangeSelector, KeyCode, IDialogService, MenuItemType, getMenuHiddenObservable, RibbonStartGroup, IMenuManagerService } from "@univerjs/ui";
 import { IRenderManagerService, fixLineWidthByScale, Transform, Checkbox, DeviceInputEventType, getDocsSkeletonPageSize, Rect, DocumentViewModel, DocumentSkeleton, Documents, FontCache, Shape, getFontStyleString } from "@univerjs/engine-render";
 import { Subject, filter, BehaviorSubject, distinctUntilChanged, debounceTime, bufferTime } from "rxjs";
 import React, { forwardRef, useRef, createElement, useState, useMemo, useEffect } from "react";
@@ -129,7 +129,7 @@ let DataValidationDropdownManagerService = (_a = class extends Disposable {
     }));
   }
   showDropdown(param, closeOnOutSide = !0) {
-    const { location } = param, { row, col } = location;
+    const { location } = param, { row, col, unitId, subUnitId } = location;
     if (this._currentPopup && this._currentPopup.dispose(), this._zenVisible)
       return;
     this._activeDropdown = param, this._activeDropdown$.next(this._activeDropdown);
@@ -143,7 +143,9 @@ let DataValidationDropdownManagerService = (_a = class extends Disposable {
         }, "onClickOutside"),
         offset: [0, 3],
         excludeOutside: [currentRender == null ? void 0 : currentRender.engine.getCanvasElement()].filter(Boolean)
-      }
+      },
+      unitId,
+      subUnitId
     );
     if (!popupDisposable)
       throw new Error("[DataValidationDropdownManagerService]: cannot show dropdown!");
@@ -620,7 +622,7 @@ function CustomFormulaInput(props) {
       onChange: /* @__PURE__ */ __name((newValue) => {
         onChange == null || onChange({
           ...value,
-          formula1: newValue != null ? newValue : ""
+          formula1: (newValue != null ? newValue : "").trim()
         });
       }, "onChange"),
       onlyInputFormula: !0,
@@ -1050,7 +1052,7 @@ function ListFormulaInput(props) {
           openForSheetSubUnitId: subUnitId,
           onlyInputFormula: !0,
           onChange: /* @__PURE__ */ __name(async (newString) => {
-            const str = newString != null ? newString : "";
+            const str = (newString != null ? newString : "").trim();
             setFormulaStrCopy(str), updateFormula(str);
           }, "onChange")
         }
@@ -2004,13 +2006,13 @@ function DateShowTimeOption(props) {
 __name(DateShowTimeOption, "DateShowTimeOption");
 DateShowTimeOption.componentKey = DATE_SHOW_TIME_OPTION;
 const FORMULA1$1 = "{FORMULA1}", FORMULA2$1 = "{FORMULA2}", transformDate2SerialNumber = /* @__PURE__ */ __name((value) => {
-  var _a22;
+  var _a22, _b;
   if (value == null || typeof value == "boolean")
     return;
   if (typeof value == "number" || !Number.isNaN(+value))
     return +value;
-  const dateStr = `${dayjs(value).format("YYYY-MM-DD HH:mm:ss")}`;
-  return (_a22 = numfmt.parseDate(dateStr)) == null ? void 0 : _a22.v;
+  const v = (_a22 = numfmt.parseDate(value)) == null ? void 0 : _a22.v;
+  return Tools.isDefine(v) ? v : (_b = numfmt.parseDate(dayjs(value).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : _b.v;
 }, "transformDate2SerialNumber"), _DateValidator = class _DateValidator extends BaseDataValidator {
   constructor() {
     super(...arguments);
@@ -2053,7 +2055,7 @@ const FORMULA1$1 = "{FORMULA1}", FORMULA2$1 = "{FORMULA2}", transformDate2Serial
     return typeof value == "number" && typeof interceptValue == "string" ? !0 : typeof interceptValue == "string" ? !!numfmt.parseDate(interceptValue) : !1;
   }
   _validatorSingleFormula(formula) {
-    return !Tools.isBlank(formula) && (isFormulaString(formula) || !Number.isNaN(+formula) || !!formula && dayjs(formula).isValid());
+    return !Tools.isBlank(formula) && (isFormulaString(formula) || !Number.isNaN(+formula) || !!(formula && numfmt.parseDate(formula)));
   }
   validatorFormula(rule, unitId, subUnitId) {
     const operator = rule.operator;
@@ -2075,6 +2077,22 @@ const FORMULA1$1 = "{FORMULA1}", FORMULA2$1 = "{FORMULA2}", transformDate2Serial
       formula1: formula1Success ? void 0 : errorMsg
     };
   }
+  normlizeFormula(rule, unitId, subUnitId) {
+    const { formula1, formula2, bizInfo } = rule, normlizeSingleFormula = /* @__PURE__ */ __name((formula) => {
+      var _a22;
+      if (!formula)
+        return formula;
+      const res = (_a22 = numfmt.parseDate(formula)) == null ? void 0 : _a22.v;
+      if (res == null)
+        return "";
+      const date = numfmt.dateFromSerial(res);
+      return dayjs(`${date[0]}/${date[1]}/${date[2]} ${date[3]}:${date[4]}:${date[5]}`).format(bizInfo != null && bizInfo.showTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD");
+    }, "normlizeSingleFormula");
+    return {
+      formula1: isFormulaString(formula1) ? formula1 : normlizeSingleFormula(`${formula1}`),
+      formula2: isFormulaString(formula2) ? formula2 : normlizeSingleFormula(`${formula2}`)
+    };
+  }
   transform(cellInfo, _formula, _rule) {
     const { value } = cellInfo;
     return {
@@ -2725,7 +2743,7 @@ function isBlankCell(cellData) {
   return cellData ? cellData.p ? !((_b = (_a22 = cellData.p.body) == null ? void 0 : _a22.dataStream) != null ? _b : "").slice(0, -2).trim() : Tools.isBlank(cellData.v) : !0;
 }
 __name(isBlankCell, "isBlankCell");
-function getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor, source = "command") {
+function getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor, source = "command", fillDefaultValue = !0) {
   const redoMutations = [], undoMutations = [], manager = accessor.get(DataValidationModel).ensureManager(unitId, subUnitId), univerInstanceService = accessor.get(IUniverInstanceService), target = getSheetCommandTarget(univerInstanceService, { unitId, subUnitId });
   if (!target)
     return {
@@ -2734,7 +2752,7 @@ function getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor, sour
     };
   const { worksheet } = target, redoMatrix = new ObjectMatrix();
   function setRangesDefaultValue(ranges, defaultValue) {
-    ranges.forEach((range) => {
+    fillDefaultValue && ranges.forEach((range) => {
       Range.foreach(range, (row, column) => {
         const cellData = worksheet.getCellRaw(row, column), value = getStringCellValue(cellData);
         (isBlankCell(cellData) || value === defaultValue) && redoMatrix.setValue(row, column, {
@@ -2915,7 +2933,10 @@ const UpdateSheetDataValidationRangeCommand = {
     if (!validator)
       return !1;
     const rule = dataValidationModel.getRuleById(unitId, subUnitId, ruleId);
-    if (!rule || !validator.validatorFormula({ ...rule, ...setting }, unitId, subUnitId).success)
+    if (!rule)
+      return !1;
+    const newRule = { ...rule, ...setting };
+    if (!validator.validatorFormula(newRule, unitId, subUnitId).success)
       return !1;
     const mutationParams = {
       unitId,
@@ -2923,7 +2944,10 @@ const UpdateSheetDataValidationRangeCommand = {
       ruleId,
       payload: {
         type: UpdateRuleType.SETTING,
-        payload: setting
+        payload: {
+          ...setting,
+          ...validator.normlizeFormula(newRule, unitId, subUnitId)
+        }
       }
     }, redoMutations = [{
       id: UpdateDataValidationMutation.id,
@@ -3036,8 +3060,6 @@ function dataValidationMenuFactory(accessor) {
   return {
     id: DATA_VALIDATION_MENU_ID,
     type: MenuItemType.SUBITEMS,
-    positions: [MenuPosition.TOOLBAR_START],
-    group: MenuGroup.TOOLBAR_FORMULAS_INSERT,
     icon: DataValidationIcon,
     tooltip: "dataValidation.title",
     hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
@@ -3049,8 +3071,7 @@ function openDataValidationMenuFactory(_accessor) {
   return {
     id: OpenValidationPanelOperation.id,
     title: "dataValidation.panel.title",
-    type: MenuItemType.BUTTON,
-    positions: [DATA_VALIDATION_MENU_ID]
+    type: MenuItemType.BUTTON
   };
 }
 __name(openDataValidationMenuFactory, "openDataValidationMenuFactory");
@@ -3058,17 +3079,32 @@ function addDataValidationMenuFactory(_accessor) {
   return {
     id: AddSheetDataValidationAndOpenCommand.id,
     title: "dataValidation.panel.add",
-    type: MenuItemType.BUTTON,
-    positions: [DATA_VALIDATION_MENU_ID]
+    type: MenuItemType.BUTTON
   };
 }
 __name(addDataValidationMenuFactory, "addDataValidationMenuFactory");
+const menuSchema = {
+  [RibbonStartGroup.FORMULAS_INSERT]: {
+    [DATA_VALIDATION_MENU_ID]: {
+      order: 9,
+      menuItemFactory: dataValidationMenuFactory,
+      [OpenValidationPanelOperation.id]: {
+        order: 0,
+        menuItemFactory: openDataValidationMenuFactory
+      },
+      [AddSheetDataValidationAndOpenCommand.id]: {
+        order: 1,
+        menuItemFactory: addDataValidationMenuFactory
+      }
+    }
+  }
+};
 var __defProp$c = Object.defineProperty, __getOwnPropDesc$c = Object.getOwnPropertyDescriptor, __decorateClass$c = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$c(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
   return kind && result && __defProp$c(target, key, result), result;
 }, "__decorateClass$c"), __decorateParam$c = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$c");
-const DefaultSheetsDataValidation = {}, INVALID_MARK = {
+const INVALID_MARK = {
   tr: {
     size: 6,
     color: "#fe4b4b"
@@ -3076,20 +3112,11 @@ const DefaultSheetsDataValidation = {}, INVALID_MARK = {
 };
 var _a8;
 let SheetsDataValidationRenderController = (_a8 = class extends RxDisposable {
-  constructor(_config, _commandService, _menuService, _renderManagerService, _univerInstanceService, _autoHeightController, _componentManager, _dropdownManagerService, _dataValidationModel, _dataValidatorRegistryService, _injector, _sheetInterceptorService, _editorBridgeService) {
-    super(), this._config = _config, this._commandService = _commandService, this._menuService = _menuService, this._renderManagerService = _renderManagerService, this._univerInstanceService = _univerInstanceService, this._autoHeightController = _autoHeightController, this._componentManager = _componentManager, this._dropdownManagerService = _dropdownManagerService, this._dataValidationModel = _dataValidationModel, this._dataValidatorRegistryService = _dataValidatorRegistryService, this._injector = _injector, this._sheetInterceptorService = _sheetInterceptorService, this._editorBridgeService = _editorBridgeService, this._initMenu(), this._initSkeletonChange(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
+  constructor(_commandService, _menuManagerService, _renderManagerService, _univerInstanceService, _autoHeightController, _dropdownManagerService, _dataValidationModel, _dataValidatorRegistryService, _sheetInterceptorService, _editorBridgeService) {
+    super(), this._commandService = _commandService, this._menuManagerService = _menuManagerService, this._renderManagerService = _renderManagerService, this._univerInstanceService = _univerInstanceService, this._autoHeightController = _autoHeightController, this._dropdownManagerService = _dropdownManagerService, this._dataValidationModel = _dataValidationModel, this._dataValidatorRegistryService = _dataValidatorRegistryService, this._sheetInterceptorService = _sheetInterceptorService, this._editorBridgeService = _editorBridgeService, this._initMenu(), this._initSkeletonChange(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
   }
   _initMenu() {
-    const { menu = {} } = this._config;
-    [
-      dataValidationMenuFactory,
-      openDataValidationMenuFactory,
-      addDataValidationMenuFactory
-    ].forEach((factory) => {
-      this.disposeWithMe(
-        this._menuService.addMenuItem(factory(this._injector), menu)
-      );
-    });
+    this._menuManagerService.mergeMenu(menuSchema);
   }
   _initDropdown() {
     this._editorBridgeService && this.disposeWithMe(this._editorBridgeService.visible$.subscribe((visible) => {
@@ -3274,23 +3301,21 @@ let SheetsDataValidationRenderController = (_a8 = class extends RxDisposable {
 }, __name(_a8, "SheetsDataValidationRenderController"), _a8);
 SheetsDataValidationRenderController = __decorateClass$c([
   OnLifecycle(LifecycleStages.Rendered, SheetsDataValidationRenderController),
-  __decorateParam$c(1, ICommandService),
-  __decorateParam$c(2, IMenuService),
-  __decorateParam$c(3, IRenderManagerService),
-  __decorateParam$c(4, IUniverInstanceService),
-  __decorateParam$c(5, Inject(AutoHeightController)),
-  __decorateParam$c(6, Inject(ComponentManager)),
-  __decorateParam$c(7, Inject(DataValidationDropdownManagerService)),
-  __decorateParam$c(8, Inject(DataValidationModel)),
-  __decorateParam$c(9, Inject(DataValidatorRegistryService)),
-  __decorateParam$c(10, Inject(Injector)),
-  __decorateParam$c(11, Inject(SheetInterceptorService)),
-  __decorateParam$c(12, Optional(IEditorBridgeService))
+  __decorateParam$c(0, ICommandService),
+  __decorateParam$c(1, IMenuManagerService),
+  __decorateParam$c(2, IRenderManagerService),
+  __decorateParam$c(3, IUniverInstanceService),
+  __decorateParam$c(4, Inject(AutoHeightController)),
+  __decorateParam$c(5, Inject(DataValidationDropdownManagerService)),
+  __decorateParam$c(6, Inject(DataValidationModel)),
+  __decorateParam$c(7, Inject(DataValidatorRegistryService)),
+  __decorateParam$c(8, Inject(SheetInterceptorService)),
+  __decorateParam$c(9, Optional(IEditorBridgeService))
 ], SheetsDataValidationRenderController);
 var _a9;
 let SheetsDataValidationMobileRenderController = (_a9 = class extends RxDisposable {
-  constructor(_config, _commandService, _renderManagerService, _univerInstanceService, _autoHeightController, _dataValidationModel, _dataValidatorRegistryService, _sheetInterceptorService) {
-    super(), this._config = _config, this._commandService = _commandService, this._renderManagerService = _renderManagerService, this._univerInstanceService = _univerInstanceService, this._autoHeightController = _autoHeightController, this._dataValidationModel = _dataValidationModel, this._dataValidatorRegistryService = _dataValidatorRegistryService, this._sheetInterceptorService = _sheetInterceptorService, this._initSkeletonChange(), this._initViewModelIntercept(), this._initAutoHeight();
+  constructor(_commandService, _renderManagerService, _univerInstanceService, _autoHeightController, _dataValidationModel, _dataValidatorRegistryService, _sheetInterceptorService) {
+    super(), this._commandService = _commandService, this._renderManagerService = _renderManagerService, this._univerInstanceService = _univerInstanceService, this._autoHeightController = _autoHeightController, this._dataValidationModel = _dataValidationModel, this._dataValidatorRegistryService = _dataValidatorRegistryService, this._sheetInterceptorService = _sheetInterceptorService, this._initSkeletonChange(), this._initViewModelIntercept(), this._initAutoHeight();
   }
   _initSkeletonChange() {
     const markSkeletonDirty = /* @__PURE__ */ __name(() => {
@@ -3427,13 +3452,13 @@ let SheetsDataValidationMobileRenderController = (_a9 = class extends RxDisposab
 }, __name(_a9, "SheetsDataValidationMobileRenderController"), _a9);
 SheetsDataValidationMobileRenderController = __decorateClass$c([
   OnLifecycle(LifecycleStages.Rendered, SheetsDataValidationMobileRenderController),
-  __decorateParam$c(1, ICommandService),
-  __decorateParam$c(2, IRenderManagerService),
-  __decorateParam$c(3, IUniverInstanceService),
-  __decorateParam$c(4, Inject(AutoHeightController)),
-  __decorateParam$c(5, Inject(DataValidationModel)),
-  __decorateParam$c(6, Inject(DataValidatorRegistryService)),
-  __decorateParam$c(7, Inject(SheetInterceptorService))
+  __decorateParam$c(0, ICommandService),
+  __decorateParam$c(1, IRenderManagerService),
+  __decorateParam$c(2, IUniverInstanceService),
+  __decorateParam$c(3, Inject(AutoHeightController)),
+  __decorateParam$c(4, Inject(DataValidationModel)),
+  __decorateParam$c(5, Inject(DataValidatorRegistryService)),
+  __decorateParam$c(6, Inject(SheetInterceptorService))
 ], SheetsDataValidationMobileRenderController);
 var __defProp$b = Object.defineProperty, __getOwnPropDesc$b = Object.getOwnPropertyDescriptor, __decorateClass$b = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$b(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
@@ -4239,7 +4264,7 @@ let DataValidationAutoFillController = (_a15 = class extends Disposable {
   }
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
-    const noopReturnFunc = /* @__PURE__ */ __name(() => ({ redos: [], undos: [] }), "noopReturnFunc"), generalApplyFunc = /* @__PURE__ */ __name((location) => {
+    const noopReturnFunc = /* @__PURE__ */ __name(() => ({ redos: [], undos: [] }), "noopReturnFunc"), generalApplyFunc = /* @__PURE__ */ __name((location, applyType) => {
       const { source: sourceRange, target: targetRange, unitId, subUnitId } = location, manager = this._dataValidationModel.ensureManager(unitId, subUnitId), ruleMatrixCopy = manager.getRuleObjectMatrix().clone(), virtualRange = virtualizeDiscreteRanges([sourceRange, targetRange]), [vSourceRange, vTargetRange] = virtualRange.ranges, { mapFunc } = virtualRange, sourceStartCell = {
         row: vSourceRange.startRow,
         col: vSourceRange.startColumn
@@ -4280,7 +4305,7 @@ let DataValidationAutoFillController = (_a15 = class extends Disposable {
           }
         });
       });
-      const diffs = ruleMatrixCopy.diff(manager.getDataValidations()), { redoMutations, undoMutations } = getDataValidationDiffMutations(unitId, subUnitId, diffs, this._injector, "patched");
+      const diffs = ruleMatrixCopy.diff(manager.getDataValidations()), { redoMutations, undoMutations } = getDataValidationDiffMutations(unitId, subUnitId, diffs, this._injector, "patched", applyType === APPLY_TYPE.ONLY_FORMAT);
       return {
         undos: undoMutations,
         redos: redoMutations
@@ -4300,7 +4325,7 @@ let DataValidationAutoFillController = (_a15 = class extends Disposable {
             }
           }
       }, "onBeforeFillData"),
-      onFillData: /* @__PURE__ */ __name((location, direction, applyType) => applyType === APPLY_TYPE.COPY || applyType === APPLY_TYPE.ONLY_FORMAT || applyType === APPLY_TYPE.SERIES ? generalApplyFunc(location) : noopReturnFunc(), "onFillData"),
+      onFillData: /* @__PURE__ */ __name((location, direction, applyType) => applyType === APPLY_TYPE.COPY || applyType === APPLY_TYPE.ONLY_FORMAT || applyType === APPLY_TYPE.SERIES ? generalApplyFunc(location, applyType) : noopReturnFunc(), "onFillData"),
       onAfterFillData: /* @__PURE__ */ __name(() => {
       }, "onAfterFillData")
     };
@@ -4754,14 +4779,17 @@ SheetsDataValidationValidatorService = __decorateClass$2([
   __decorateParam$2(1, Inject(DataValidationModel)),
   __decorateParam$2(2, Inject(DataValidationCacheService))
 ], SheetsDataValidationValidatorService);
+const PLUGIN_CONFIG_KEY = "sheets-data-validation.config", defaultPluginConfig = {};
 var __defProp$1 = Object.defineProperty, __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor, __defNormalProp$1 = /* @__PURE__ */ __name((obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value, "__defNormalProp$1"), __decorateClass$1 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$1(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
   return kind && result && __defProp$1(target, key, result), result;
 }, "__decorateClass$1"), __decorateParam$1 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$1"), __publicField$1 = /* @__PURE__ */ __name((obj, key, value) => __defNormalProp$1(obj, typeof key != "symbol" ? key + "" : key, value), "__publicField$1"), _a20;
 let UniverSheetsDataValidationPlugin = (_a20 = class extends Plugin {
-  constructor(_config = {}, _injector, _commandService, _localeService) {
-    super(), this._config = _config, this._injector = _injector, this._commandService = _commandService, this._localeService = _localeService, this._config = Tools.deepMerge({}, DefaultSheetsDataValidation, this._config);
+  constructor(_config = defaultPluginConfig, _injector, _commandService, _configService) {
+    super(), this._config = _config, this._injector = _injector, this._commandService = _commandService, this._configService = _configService;
+    const { menu, ...rest } = this._config;
+    menu && this._configService.setConfig("menu", menu, { merge: !0 }), this._configService.setConfig(PLUGIN_CONFIG_KEY, rest);
   }
   onStarting() {
     [
@@ -4774,12 +4802,7 @@ let UniverSheetsDataValidationPlugin = (_a20 = class extends Plugin {
       // controller
       [DataValidationModelController],
       [DataValidationController],
-      [
-        SheetsDataValidationRenderController,
-        {
-          useFactory: /* @__PURE__ */ __name(() => this._injector.createInstance(SheetsDataValidationRenderController, this._config), "useFactory")
-        }
-      ],
+      [SheetsDataValidationRenderController],
       [DataValidationAlertController],
       [DataValidationRefRangeController],
       [DataValidationPermissionController],
@@ -4812,7 +4835,7 @@ UniverSheetsDataValidationPlugin = __decorateClass$1([
   DependentOn(UniverDataValidationPlugin, UniverSheetsPlugin, UniverSheetsUIPlugin),
   __decorateParam$1(1, Inject(Injector)),
   __decorateParam$1(2, ICommandService),
-  __decorateParam$1(3, Inject(LocaleService))
+  __decorateParam$1(3, IConfigService)
 ], UniverSheetsDataValidationPlugin);
 var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __defNormalProp2 = /* @__PURE__ */ __name((obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value, "__defNormalProp"), __decorateClass = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
@@ -4820,8 +4843,10 @@ var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnProperty
   return kind && result && __defProp2(target, key, result), result;
 }, "__decorateClass"), __decorateParam = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam"), __publicField2 = /* @__PURE__ */ __name((obj, key, value) => __defNormalProp2(obj, typeof key != "symbol" ? key + "" : key, value), "__publicField"), _a21;
 let UniverSheetsDataValidationMobilePlugin = (_a21 = class extends Plugin {
-  constructor(_config = {}, _injector, _commandService, _localeService) {
-    super(), this._config = _config, this._injector = _injector, this._commandService = _commandService, this._localeService = _localeService, this._config = Tools.deepMerge({}, DefaultSheetsDataValidation, this._config);
+  constructor(_config = defaultPluginConfig, _injector, _commandService, _configService) {
+    super(), this._config = _config, this._injector = _injector, this._commandService = _commandService, this._configService = _configService;
+    const { menu, ...rest } = this._config;
+    menu && this._configService.setConfig("menu", menu, { merge: !0 }), this._configService.setConfig(PLUGIN_CONFIG_KEY, rest);
   }
   onStarting() {
     [
@@ -4834,12 +4859,7 @@ let UniverSheetsDataValidationMobilePlugin = (_a21 = class extends Plugin {
       // controller
       [DataValidationModelController],
       [DataValidationController],
-      [
-        SheetsDataValidationMobileRenderController,
-        {
-          useFactory: /* @__PURE__ */ __name(() => this._injector.createInstance(SheetsDataValidationMobileRenderController, this._config), "useFactory")
-        }
-      ],
+      [SheetsDataValidationMobileRenderController],
       [DataValidationAlertController],
       [DataValidationRefRangeController],
       [DataValidationPermissionController],
@@ -4868,7 +4888,7 @@ UniverSheetsDataValidationMobilePlugin = __decorateClass([
   DependentOn(UniverDataValidationPlugin, UniverSheetsPlugin, UniverSheetsUIPlugin),
   __decorateParam(1, Inject(Injector)),
   __decorateParam(2, ICommandService),
-  __decorateParam(3, Inject(LocaleService))
+  __decorateParam(3, IConfigService)
 ], UniverSheetsDataValidationMobilePlugin);
 export {
   AddSheetDataValidationAndOpenCommand,
@@ -4876,11 +4896,13 @@ export {
   ClearRangeDataValidationCommand,
   CloseValidationPanelOperation,
   DATA_VALIDATION_PLUGIN_NAME,
+  DATE_DROPDOWN_KEY,
   DataValidationCacheService,
   DataValidationCustomFormulaService,
   DataValidationFormulaService,
   DataValidationModel2 as DataValidationModel,
   HideDataValidationDropdown,
+  LIST_DROPDOWN_KEY,
   OpenValidationPanelOperation,
   RemoveAllDataValidationCommand2 as RemoveSheetAllDataValidationCommand,
   RemoveDataValidationCommand2 as RemoveSheetDataValidationCommand,

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

@@ -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>[];
 };

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-render.controller.d.ts

@@ -1,29 +1,22 @@
-import { ICommandService, Injector, IUniverInstanceService, RxDisposable } from '@univerjs/core';
+import { ICommandService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
 import { DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
-import { MenuConfig, ComponentManager, IMenuService } from '@univerjs/ui';
+import { IMenuManagerService } from '@univerjs/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';
-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 _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, _dataValidationModel: DataValidationModel, _dataValidatorRegistryService: DataValidatorRegistryService, _sheetInterceptorService: SheetInterceptorService, _editorBridgeService?: IEditorBridgeService | undefined);
     private _initMenu;
     private _initDropdown;
     private _initSkeletonChange;
@@ -31,7 +24,6 @@ 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;
@@ -39,7 +31,7 @@ export declare class SheetsDataValidationMobileRenderController extends RxDispos
     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);
+    constructor(_commandService: ICommandService, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _autoHeightController: AutoHeightController, _dataValidationModel: DataValidationModel, _dataValidatorRegistryService: DataValidatorRegistryService, _sheetInterceptorService: SheetInterceptorService);
     private _initSkeletonChange;
     private _initViewModelIntercept;
     private _initAutoHeight;

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

@@ -26,3 +26,4 @@ export { SheetDataValidationManager } from './models/sheet-data-validation-manag
 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 { LIST_DROPDOWN_KEY, DATE_DROPDOWN_KEY } from './views';

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>, _injector: Injector, _commandService: ICommandService, _configService: IConfigService);
     onStarting(): void;
 }

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>, _injector: Injector, _commandService: ICommandService, _configService: IConfigService);
     onStarting(): void;
 }

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

@@ -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;
+    normlizeFormula(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>;