@univerjs/sheets-data-validation 0.2.7 → 0.2.9

package/lib/es/index.js

@@ -2,10 +2,10 @@ 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, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DisposableCollection, IUniverInstanceService, UniverInstanceType, 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, WrapStrategy, DocumentDataModel, BooleanNumber, Rectangle, IUndoRedoService, sequenceExecuteAsync, sequenceExecute, Optional, RxDisposable, DataValidationStatus, isRangesEqual, queryObjectMatrix, IResourceManagerService, DependentOn, Plugin } from "@univerjs/core";
-import { ICommandService as ICommandService2, LocaleService as LocaleService2, Plugin as Plugin2 } 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, numfmt, CellValueType, DEFAULT_STYLES, WrapStrategy, DocumentDataModel, BooleanNumber, Rectangle, IUndoRedoService, sequenceExecuteAsync, sequenceExecute, Optional, RxDisposable, DataValidationStatus, ILogService, isRangesEqual, queryObjectMatrix, IResourceManagerService, DependentOn, Plugin } 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 { getSheetCommandTarget, SetRangeValuesCommand, WorksheetViewPermission, SetRangeValuesMutation, SetRangeValuesUndoMutationFactory, WorkbookEditablePermission, WorksheetSetCellStylePermission, WorksheetEditPermission, RangeProtectionPermissionEditPoint, SheetInterceptorService, INTERCEPTOR_POINT, SheetsSelectionsService, ClearSelectionAllCommand, RefRangeService, handleCommonDefaultRangeChangeWithEffectRefCommands, UniverSheetsPlugin } from "@univerjs/sheets";
+import { DataValidationModel as DataValidationModel2, 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 { IRenderManagerService, fixLineWidthByScale, Transform, Checkbox, DeviceInputEventType, getDocsSkeletonPageSize, Rect, DocumentViewModel, DocumentSkeleton, Documents, FontCache, Shape, getFontStyleString } from "@univerjs/engine-render";
@@ -14,9 +14,9 @@ import React, { forwardRef, useRef, createElement, useState, useMemo, useEffect
 import { RegisterOtherFormulaService, FormulaRefRangeService } from "@univerjs/sheets-formula";
 import { FormLayout, Input, RadioGroup, Radio, DraggableList, Select, Checkbox as Checkbox$1, Button, RectPopup, Scrollbar, DatePanel } from "@univerjs/design";
 import cs from "clsx";
-import { LexerTreeBuilder, deserializeRangeWithSheet, serializeRange, isReferenceString, sequenceNodeType, isFormulaTransformable, transformFormula } from "@univerjs/engine-formula";
+import { LexerTreeBuilder, deserializeRangeWithSheet, serializeRange, isReferenceString, sequenceNodeType, ERROR_TYPE_SET } from "@univerjs/engine-formula";
 import dayjs from "dayjs";
-import { numfmt } from "@univerjs/engine-numfmt";
+import { RichTextEditingMutation, getPlainTextFormDocument } from "@univerjs/docs";
 function getCellValueOrigin(cell) {
   if (cell === null)
     return "";
@@ -31,8 +31,8 @@ function getCellValueOrigin(cell) {
 }
 __name(getCellValueOrigin, "getCellValueOrigin");
 function getStringCellValue(cell) {
-  var _a23;
-  return String((_a23 = getCellValueOrigin(cell)) != null ? _a23 : "");
+  var _a22;
+  return String((_a22 = getCellValueOrigin(cell)) != null ? _a22 : "");
 }
 __name(getStringCellValue, "getStringCellValue");
 var commonjsGlobal = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {};
@@ -85,20 +85,20 @@ function CellDropdown() {
 }
 __name(CellDropdown, "CellDropdown");
 const DROP_DOWN_KEY = "sheet.ui.dropdown";
-var __defProp$k = Object.defineProperty, __getOwnPropDesc$k = Object.getOwnPropertyDescriptor, __decorateClass$k = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$k(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+var __defProp$j = Object.defineProperty, __getOwnPropDesc$j = Object.getOwnPropertyDescriptor, __decorateClass$j = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$j(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$k(target, key, result), result;
-}, "__decorateClass$k"), __decorateParam$k = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$k"), _a;
+  return kind && result && __defProp$j(target, key, result), result;
+}, "__decorateClass$j"), __decorateParam$j = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$j"), _a;
 let DataValidationDropdownManagerService = (_a = class extends Disposable {
-  constructor(_canvasPopupManagerService, _univerInstanceService, _dataValidatorRegistryService, _zenZoneService, _renderManagerService, _dataValidationModel) {
+  constructor(_canvasPopupManagerService, _univerInstanceService, _dataValidatorRegistryService, _zenZoneService, _renderManagerService, _dataValidationModel, _sheetsSelectionsService) {
     super();
     __publicField(this, "_activeDropdown");
     __publicField(this, "_activeDropdown$", new Subject());
     __publicField(this, "_currentPopup", null);
     __publicField(this, "activeDropdown$", this._activeDropdown$.asObservable());
     __publicField(this, "_zenVisible", !1);
-    this._canvasPopupManagerService = _canvasPopupManagerService, this._univerInstanceService = _univerInstanceService, this._dataValidatorRegistryService = _dataValidatorRegistryService, this._zenZoneService = _zenZoneService, this._renderManagerService = _renderManagerService, this._dataValidationModel = _dataValidationModel, this._init(), this.disposeWithMe(() => {
+    this._canvasPopupManagerService = _canvasPopupManagerService, this._univerInstanceService = _univerInstanceService, this._dataValidatorRegistryService = _dataValidatorRegistryService, this._zenZoneService = _zenZoneService, this._renderManagerService = _renderManagerService, this._dataValidationModel = _dataValidationModel, this._sheetsSelectionsService = _sheetsSelectionsService, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
       this._activeDropdown$.complete();
     });
   }
@@ -110,6 +110,24 @@ let DataValidationDropdownManagerService = (_a = class extends Disposable {
       this._zenVisible = visible, visible && this.hideDropdown();
     }));
   }
+  _getDropdownByCell(unitId, subUnitId, row, col) {
+    const workbook = unitId ? this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET) : this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+    if (!workbook)
+      return;
+    const worksheet = subUnitId ? workbook.getSheetBySheetId(subUnitId) : workbook.getActiveSheet();
+    if (!worksheet)
+      return;
+    const rule = this._dataValidationModel.ensureManager(workbook.getUnitId(), worksheet.getSheetId()).getRuleByLocation(row, col);
+    if (!rule)
+      return;
+    const validator = this._dataValidatorRegistryService.getValidatorItem(rule.type);
+    return validator == null ? void 0 : validator.dropdown;
+  }
+  _initSelectionChange() {
+    this.disposeWithMe(this._sheetsSelectionsService.selectionMoveEnd$.subscribe((selections) => {
+      selections && selections.every((selection) => !(selection.primary && this._getDropdownByCell(selection.primary.unitId, selection.primary.sheetId, selection.primary.actualRow, selection.primary.actualColumn))) && this.hideDropdown();
+    }));
+  }
   showDropdown(param, closeOnOutSide = !0) {
     const { location } = param, { row, col } = location;
     if (this._currentPopup && this._currentPopup.dispose(), this._zenVisible)
@@ -132,8 +150,8 @@ let DataValidationDropdownManagerService = (_a = class extends Disposable {
     const disposableCollection = new DisposableCollection();
     disposableCollection.add(popupDisposable), disposableCollection.add({
       dispose: /* @__PURE__ */ __name(() => {
-        var _a23, _b;
-        (_b = (_a23 = this._activeDropdown) == null ? void 0 : _a23.onHide) == null || _b.call(_a23);
+        var _a22, _b;
+        (_b = (_a22 = this._activeDropdown) == null ? void 0 : _a22.onHide) == null || _b.call(_a22);
       }, "dispose")
     }), this._currentPopup = disposableCollection;
   }
@@ -141,7 +159,7 @@ let DataValidationDropdownManagerService = (_a = class extends Disposable {
     this._activeDropdown && (this._currentPopup && this._currentPopup.dispose(), this._currentPopup = null, this._activeDropdown = null, this._activeDropdown$.next(null));
   }
   showDataValidationDropdown(unitId, subUnitId, row, col, onHide) {
-    const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+    const workbook = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
     if (!workbook)
       return;
     const worksheet = workbook.getSheetBySheetId(subUnitId);
@@ -169,19 +187,20 @@ let DataValidationDropdownManagerService = (_a = class extends Disposable {
     });
   }
 }, __name(_a, "DataValidationDropdownManagerService"), _a);
-DataValidationDropdownManagerService = __decorateClass$k([
-  __decorateParam$k(0, Inject(SheetCanvasPopManagerService)),
-  __decorateParam$k(1, IUniverInstanceService),
-  __decorateParam$k(2, Inject(DataValidatorRegistryService)),
-  __decorateParam$k(3, IZenZoneService),
-  __decorateParam$k(4, IRenderManagerService),
-  __decorateParam$k(5, Inject(DataValidationModel))
+DataValidationDropdownManagerService = __decorateClass$j([
+  __decorateParam$j(0, Inject(SheetCanvasPopManagerService)),
+  __decorateParam$j(1, IUniverInstanceService),
+  __decorateParam$j(2, Inject(DataValidatorRegistryService)),
+  __decorateParam$j(3, IZenZoneService),
+  __decorateParam$j(4, IRenderManagerService),
+  __decorateParam$j(5, Inject(DataValidationModel)),
+  __decorateParam$j(6, Inject(SheetsSelectionsService))
 ], DataValidationDropdownManagerService);
-var __defProp$j = Object.defineProperty, __getOwnPropDesc$j = Object.getOwnPropertyDescriptor, __decorateClass$j = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$j(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+var __defProp$i = Object.defineProperty, __getOwnPropDesc$i = Object.getOwnPropertyDescriptor, __decorateClass$i = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$i(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$j(target, key, result), result;
-}, "__decorateClass$j"), __decorateParam$j = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$j"), _a2;
+  return kind && result && __defProp$i(target, key, result), result;
+}, "__decorateClass$i"), __decorateParam$i = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$i"), _a2;
 let DataValidationPanelService = (_a2 = class extends Disposable {
   constructor(_univerInstanceService, _sidebarService) {
     super();
@@ -204,15 +223,15 @@ let DataValidationPanelService = (_a2 = class extends Disposable {
     return this._open$.getValue();
   }
   dispose() {
-    var _a23;
-    super.dispose(), this._open$.next(!1), this._open$.complete(), this._activeRule$.complete(), (_a23 = this._closeDisposable) == null || _a23.dispose();
+    var _a22;
+    super.dispose(), this._open$.next(!1), this._open$.complete(), this._activeRule$.complete(), (_a22 = this._closeDisposable) == null || _a22.dispose();
   }
   open() {
     this._open$.next(!0);
   }
   close() {
-    var _a23;
-    this._open$.next(!1), (_a23 = this._closeDisposable) == null || _a23.dispose();
+    var _a22;
+    this._open$.next(!1), (_a22 = this._closeDisposable) == null || _a22.dispose();
   }
   setCloseDisposable(disposable) {
     this._closeDisposable = toDisposable(() => {
@@ -223,9 +242,9 @@ let DataValidationPanelService = (_a2 = class extends Disposable {
     this._activeRule = rule, this._activeRule$.next(rule);
   }
 }, __name(_a2, "DataValidationPanelService"), _a2);
-DataValidationPanelService = __decorateClass$j([
-  __decorateParam$j(0, IUniverInstanceService),
-  __decorateParam$j(1, ISidebarService)
+DataValidationPanelService = __decorateClass$i([
+  __decorateParam$i(0, IUniverInstanceService),
+  __decorateParam$i(1, ISidebarService)
 ], DataValidationPanelService);
 const DATA_VALIDATION_PANEL = "DataValidationPanel", OpenValidationPanelOperation = {
   id: "data-validation.operation.open-validation-panel",
@@ -348,11 +367,11 @@ const DATA_VALIDATION_PANEL = "DataValidationPanel", OpenValidationPanelOperatio
 };
 __name(_DataValidationCacheService, "DataValidationCacheService");
 let DataValidationCacheService = _DataValidationCacheService;
-var __defProp$i = Object.defineProperty, __getOwnPropDesc$i = Object.getOwnPropertyDescriptor, __decorateClass$i = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$i(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+var __defProp$h = Object.defineProperty, __getOwnPropDesc$h = Object.getOwnPropertyDescriptor, __decorateClass$h = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$h(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$i(target, key, result), result;
-}, "__decorateClass$i"), __decorateParam$i = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$i"), _a3;
+  return kind && result && __defProp$h(target, key, result), result;
+}, "__decorateClass$h"), __decorateParam$h = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$h"), _a3;
 let DataValidationFormulaService = (_a3 = class extends Disposable {
   constructor(_instanceService, _registerOtherFormulaService, _dataValidationCacheService, _dataValidationModel) {
     super();
@@ -367,8 +386,8 @@ let DataValidationFormulaService = (_a3 = class extends Disposable {
           for (const subUnitId in unitMap) {
             const results = unitMap[subUnitId], formulaMap = this._ensureRuleFormulaMap(unitId, subUnitId), manager = this._dataValidationModel.ensureManager(unitId, subUnitId);
             results.forEach((result) => {
-              var _a23, _b;
-              if (formulaMap.get((_a23 = result.extra) == null ? void 0 : _a23.ruleId)) {
+              var _a22, _b;
+              if (formulaMap.get((_a22 = result.extra) == null ? void 0 : _a22.ruleId)) {
                 const rule = manager.getRuleById((_b = result.extra) == null ? void 0 : _b.ruleId);
                 rule && this._dataValidationCacheService.markRangeDirty(unitId, subUnitId, rule.ranges);
               }
@@ -453,22 +472,27 @@ let DataValidationFormulaService = (_a3 = class extends Disposable {
     return this._ensureRuleFormulaMap(unitId, subUnitId).get(ruleId);
   }
 }, __name(_a3, "DataValidationFormulaService"), _a3);
-DataValidationFormulaService = __decorateClass$i([
-  __decorateParam$i(0, IUniverInstanceService),
-  __decorateParam$i(1, Inject(RegisterOtherFormulaService)),
-  __decorateParam$i(2, Inject(DataValidationCacheService)),
-  __decorateParam$i(3, Inject(DataValidationModel))
+DataValidationFormulaService = __decorateClass$h([
+  __decorateParam$h(0, IUniverInstanceService),
+  __decorateParam$h(1, Inject(RegisterOtherFormulaService)),
+  __decorateParam$h(2, Inject(DataValidationCacheService)),
+  __decorateParam$h(3, Inject(DataValidationModel))
 ], DataValidationFormulaService);
 function getFormulaResult(result) {
-  var _a23, _b;
-  return (_b = (_a23 = result == null ? void 0 : result[0]) == null ? void 0 : _a23[0]) == null ? void 0 : _b.v;
+  var _a22, _b;
+  return (_b = (_a22 = result == null ? void 0 : result[0]) == null ? void 0 : _a22[0]) == null ? void 0 : _b.v;
 }
 __name(getFormulaResult, "getFormulaResult");
-var __defProp$h = Object.defineProperty, __getOwnPropDesc$h = Object.getOwnPropertyDescriptor, __decorateClass$h = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$h(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+function getFormulaCellData(result) {
+  var _a22;
+  return (_a22 = result == null ? void 0 : result[0]) == null ? void 0 : _a22[0];
+}
+__name(getFormulaCellData, "getFormulaCellData");
+var __defProp$g = Object.defineProperty, __getOwnPropDesc$g = Object.getOwnPropertyDescriptor, __decorateClass$g = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$g(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$h(target, key, result), result;
-}, "__decorateClass$h"), __decorateParam$h = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$h");
+  return kind && result && __defProp$g(target, key, result), result;
+}, "__decorateClass$g"), __decorateParam$g = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$g");
 const MARGIN_H$2 = 6;
 var _a4;
 let CheckboxRender = (_a4 = class {
@@ -476,8 +500,8 @@ let CheckboxRender = (_a4 = class {
     this._commandService = _commandService, this._formulaService = _formulaService, this._themeService = _themeService;
   }
   _calc(cellInfo, style) {
-    var _a23, _b, _c;
-    const { vt, ht } = style || {}, width = cellInfo.endX - cellInfo.startX - MARGIN_H$2 * 2, height = cellInfo.endY - cellInfo.startY, size = ((_a23 = style == null ? void 0 : style.fs) != null ? _a23 : 10) * 1.6;
+    var _a22, _b, _c;
+    const { vt, ht } = style || {}, width = cellInfo.endX - cellInfo.startX - MARGIN_H$2 * 2, height = cellInfo.endY - cellInfo.startY, size = ((_a22 = style == null ? void 0 : style.fs) != null ? _a22 : 10) * 1.6;
     let widgetLeft = 0, widgetTop = 0;
     switch (vt) {
       case VerticalAlign.TOP:
@@ -509,21 +533,21 @@ let CheckboxRender = (_a4 = class {
     };
   }
   calcCellAutoHeight(info) {
-    var _a23;
+    var _a22;
     const { style } = info;
-    return ((_a23 = style == null ? void 0 : style.fs) != null ? _a23 : 10) * 1.6;
+    return ((_a22 = style == null ? void 0 : style.fs) != null ? _a22 : 10) * 1.6;
   }
   async _parseFormula(rule, unitId, subUnitId) {
-    var _a23, _b;
+    var _a22, _b;
     const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid);
     return {
-      formula1: isFormulaString(formula1) ? getFormulaResult((_a23 = results == null ? void 0 : results[0]) == null ? void 0 : _a23.result) : formula1,
+      formula1: isFormulaString(formula1) ? getFormulaResult((_a22 = results == null ? void 0 : results[0]) == null ? void 0 : _a22.result) : formula1,
       formula2: isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2
     };
   }
   drawWith(ctx, info) {
-    var _a23, _b, _c, _d, _e;
-    const { style, data, primaryWithCoord, unitId, subUnitId, worksheet, row, col } = info, cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord, value = getCellValueOrigin(worksheet.getCellRaw(row, col)), rule = (_a23 = data.dataValidation) == null ? void 0 : _a23.rule, validator = (_b = data.dataValidation) == null ? void 0 : _b.validator;
+    var _a22, _b, _c, _d, _e;
+    const { style, data, primaryWithCoord, unitId, subUnitId, worksheet, row, col } = info, cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord, value = getCellValueOrigin(worksheet.getCellRaw(row, col)), rule = (_a22 = data.dataValidation) == null ? void 0 : _a22.rule, validator = (_b = data.dataValidation) == null ? void 0 : _b.validator;
     if (!rule || !validator)
       return;
     const colors = this._themeService.getCurrentTheme();
@@ -556,10 +580,10 @@ let CheckboxRender = (_a4 = class {
     return offsetX <= endX && offsetX >= startX && offsetY <= endY && offsetY >= startY;
   }
   async onPointerDown(info, evt) {
-    var _a23, _b;
+    var _a22, _b;
     if (evt.button === 2)
       return;
-    const { primaryWithCoord, unitId, subUnitId, data, worksheet, row, col } = info, value = getCellValueOrigin(worksheet.getCellRaw(row, col)), rule = (_a23 = data.dataValidation) == null ? void 0 : _a23.rule, validator = (_b = data.dataValidation) == null ? void 0 : _b.validator;
+    const { primaryWithCoord, unitId, subUnitId, data, worksheet, row, col } = info, value = getCellValueOrigin(worksheet.getCellRaw(row, col)), rule = (_a22 = data.dataValidation) == null ? void 0 : _a22.rule, validator = (_b = data.dataValidation) == null ? void 0 : _b.validator;
     if (!rule || !validator || !validator.skipDefaultFontRender(rule, value, { unitId, subUnitId }))
       return;
     const { formula1, formula2 } = await this._parseFormula(rule, unitId, subUnitId), params = {
@@ -580,18 +604,18 @@ let CheckboxRender = (_a4 = class {
     );
   }
 }, __name(_a4, "CheckboxRender"), _a4);
-CheckboxRender = __decorateClass$h([
-  __decorateParam$h(0, ICommandService),
-  __decorateParam$h(1, Inject(DataValidationFormulaService)),
-  __decorateParam$h(2, Inject(ThemeService))
+CheckboxRender = __decorateClass$g([
+  __decorateParam$g(0, ICommandService),
+  __decorateParam$g(1, Inject(DataValidationFormulaService)),
+  __decorateParam$g(2, Inject(ThemeService))
 ], CheckboxRender);
 function CustomFormulaInput(props) {
-  var _a23;
+  var _a22;
   const { unitId, subUnitId, value, onChange, showError, validResult } = props, formula1Res = showError ? validResult == null ? void 0 : validResult.formula1 : "";
   return /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { error: formula1Res, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
     TextEditor,
     {
-      value: (_a23 = value == null ? void 0 : value.formula1) != null ? _a23 : "",
+      value: (_a22 = value == null ? void 0 : value.formula1) != null ? _a22 : "",
       id: createInternalEditorID(`dataValidation-custom-formula-${unitId}-${subUnitId}`),
       onChange: /* @__PURE__ */ __name((newValue) => {
         onChange == null || onChange({
@@ -689,15 +713,15 @@ function replaceRuntimeIdsAndExtInAttrs(node, runtimeProps, extend) {
   var attrs = __assign({}, node.attrs);
   extend != null && extend.colorChannel1 && attrs.fill === "colorChannel1" && (attrs.fill = extend.colorChannel1);
   var defIds = runtimeProps.defIds;
-  return !defIds || defIds.length === 0 || (node.tag === "use" && attrs["xlink:href"] && (attrs["xlink:href"] = attrs["xlink:href"] + runtimeProps.idSuffix), Object.entries(attrs).forEach(function(_a23) {
-    var key = _a23[0], value = _a23[1];
+  return !defIds || defIds.length === 0 || (node.tag === "use" && attrs["xlink:href"] && (attrs["xlink:href"] = attrs["xlink:href"] + runtimeProps.idSuffix), Object.entries(attrs).forEach(function(_a22) {
+    var key = _a22[0], value = _a22[1];
     typeof value == "string" && (attrs[key] = value.replace(/url\(#(.*)\)/, "url(#$1".concat(runtimeProps.idSuffix, ")")));
   })), attrs;
 }
 __name(replaceRuntimeIdsAndExtInAttrs, "replaceRuntimeIdsAndExtInAttrs");
 function replaceRuntimeIdsInDefs(node, runtimeProps) {
-  var _a23, defIds = runtimeProps.defIds;
-  return !defIds || defIds.length === 0 ? node : node.tag === "defs" && (!((_a23 = node.children) === null || _a23 === void 0) && _a23.length) ? __assign(__assign({}, node), { children: node.children.map(function(child) {
+  var _a22, defIds = runtimeProps.defIds;
+  return !defIds || defIds.length === 0 ? node : node.tag === "defs" && (!((_a22 = node.children) === null || _a22 === void 0) && _a22.length) ? __assign(__assign({}, node), { children: node.children.map(function(child) {
     return typeof child.attrs.id == "string" && defIds && defIds.indexOf(child.attrs.id) > -1 ? __assign(__assign({}, child), { attrs: __assign(__assign({}, child.attrs), { id: child.attrs.id + runtimeProps.idSuffix }) }) : child;
   }) }) : node;
 }
@@ -777,17 +801,17 @@ function getDataValidationCellValue(cellData) {
 }
 __name(getDataValidationCellValue, "getDataValidationCellValue");
 const DATA_VALIDATION_PLUGIN_NAME = "SHEET_DATA_VALIDATION_PLUGIN", DROP_DOWN_DEFAULT_COLOR = "#ECECEC";
-var P = /* @__PURE__ */ ((E) => (E[E.View = 0] = "View", E[E.Edit = 1] = "Edit", E[E.ManageCollaborator = 2] = "ManageCollaborator", E[E.Print = 3] = "Print", E[E.Duplicate = 4] = "Duplicate", E[E.Comment = 5] = "Comment", E[E.Copy = 6] = "Copy", E[E.Share = 7] = "Share", E[E.Export = 8] = "Export", E[E.MoveWorksheet = 9] = "MoveWorksheet", E[E.DeleteWorksheet = 10] = "DeleteWorksheet", E[E.HideWorksheet = 11] = "HideWorksheet", E[E.RenameWorksheet = 12] = "RenameWorksheet", E[E.CreateWorksheet = 13] = "CreateWorksheet", E[E.SetWorksheetStyle = 14] = "SetWorksheetStyle", E[E.EditWorksheetCell = 15] = "EditWorksheetCell", E[E.InsertHyperlink = 16] = "InsertHyperlink", E[E.Sort = 17] = "Sort", E[E.Filter = 18] = "Filter", E[E.PivotTable = 19] = "PivotTable", E[E.FloatImg = 20] = "FloatImg", E[E.History = 21] = "History", E[E.RwHgtClWdt = 22] = "RwHgtClWdt", E[E.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", E[E.ViewFilter = 24] = "ViewFilter", E[E.MoveSheet = 25] = "MoveSheet", E[E.DeleteSheet = 26] = "DeleteSheet", E[E.HideSheet = 27] = "HideSheet", E[E.CopySheet = 28] = "CopySheet", E[E.RenameSheet = 29] = "RenameSheet", E[E.CreateSheet = 30] = "CreateSheet", E[E.SelectProtectedCells = 31] = "SelectProtectedCells", E[E.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", E[E.SetCellStyle = 33] = "SetCellStyle", E[E.SetCellValue = 34] = "SetCellValue", E[E.SetRowStyle = 35] = "SetRowStyle", E[E.SetColumnStyle = 36] = "SetColumnStyle", E[E.InsertRow = 37] = "InsertRow", E[E.InsertColumn = 38] = "InsertColumn", E[E.DeleteRow = 39] = "DeleteRow", E[E.DeleteColumn = 40] = "DeleteColumn", E[E.EditExtraObject = 41] = "EditExtraObject", E[E.Delete = 42] = "Delete", E[E.RecoverHistory = 43] = "RecoverHistory", E[E.ViewHistory = 44] = "ViewHistory", E[E.UNRECOGNIZED = -1] = "UNRECOGNIZED", E))(P || {}), __defProp$g = Object.defineProperty, __getOwnPropDesc$g = Object.getOwnPropertyDescriptor, __decorateClass$g = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$g(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+var L = /* @__PURE__ */ ((E) => (E[E.View = 0] = "View", E[E.Edit = 1] = "Edit", E[E.ManageCollaborator = 2] = "ManageCollaborator", E[E.Print = 3] = "Print", E[E.Duplicate = 4] = "Duplicate", E[E.Comment = 5] = "Comment", E[E.Copy = 6] = "Copy", E[E.Share = 7] = "Share", E[E.Export = 8] = "Export", E[E.MoveWorksheet = 9] = "MoveWorksheet", E[E.DeleteWorksheet = 10] = "DeleteWorksheet", E[E.HideWorksheet = 11] = "HideWorksheet", E[E.RenameWorksheet = 12] = "RenameWorksheet", E[E.CreateWorksheet = 13] = "CreateWorksheet", E[E.SetWorksheetStyle = 14] = "SetWorksheetStyle", E[E.EditWorksheetCell = 15] = "EditWorksheetCell", E[E.InsertHyperlink = 16] = "InsertHyperlink", E[E.Sort = 17] = "Sort", E[E.Filter = 18] = "Filter", E[E.PivotTable = 19] = "PivotTable", E[E.FloatImg = 20] = "FloatImg", E[E.History = 21] = "History", E[E.RwHgtClWdt = 22] = "RwHgtClWdt", E[E.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", E[E.ViewFilter = 24] = "ViewFilter", E[E.MoveSheet = 25] = "MoveSheet", E[E.DeleteSheet = 26] = "DeleteSheet", E[E.HideSheet = 27] = "HideSheet", E[E.CopySheet = 28] = "CopySheet", E[E.RenameSheet = 29] = "RenameSheet", E[E.CreateSheet = 30] = "CreateSheet", E[E.SelectProtectedCells = 31] = "SelectProtectedCells", E[E.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", E[E.SetCellStyle = 33] = "SetCellStyle", E[E.SetCellValue = 34] = "SetCellValue", E[E.SetRowStyle = 35] = "SetRowStyle", E[E.SetColumnStyle = 36] = "SetColumnStyle", E[E.InsertRow = 37] = "InsertRow", E[E.InsertColumn = 38] = "InsertColumn", E[E.DeleteRow = 39] = "DeleteRow", E[E.DeleteColumn = 40] = "DeleteColumn", E[E.EditExtraObject = 41] = "EditExtraObject", E[E.Delete = 42] = "Delete", E[E.RecoverHistory = 43] = "RecoverHistory", E[E.ViewHistory = 44] = "ViewHistory", E[E.UNRECOGNIZED = -1] = "UNRECOGNIZED", E))(L || {}), __defProp$f = Object.defineProperty, __getOwnPropDesc$f = Object.getOwnPropertyDescriptor, __decorateClass$f = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$f(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$g(target, key, result), result;
-}, "__decorateClass$g"), __decorateParam$g = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$g"), _a5;
+  return kind && result && __defProp$f(target, key, result), result;
+}, "__decorateClass$f"), __decorateParam$f = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$f"), _a5;
 let DataValidationFormulaController = (_a5 = class extends Disposable {
   constructor(_univerInstanceService, _permissionService, _lexerTreeBuilder) {
     super(), this._univerInstanceService = _univerInstanceService, this._permissionService = _permissionService, this._lexerTreeBuilder = _lexerTreeBuilder;
   }
   getFormulaRefCheck(formulaString) {
-    var _a23, _b;
+    var _a22, _b;
     const sequenceNodes = this._lexerTreeBuilder.sequenceNodesBuilder(formulaString);
     if (!sequenceNodes)
       return !0;
@@ -809,19 +833,19 @@ let DataValidationFormulaController = (_a5 = class extends Disposable {
       const { startRow, endRow, startColumn, endColumn } = sequenceGrid.range;
       for (let i2 = startRow; i2 <= endRow; i2++)
         for (let j = startColumn; j <= endColumn; j++) {
-          const permission = (_b = (_a23 = targetSheet.getCell(i2, j)) == null ? void 0 : _a23.selectionProtection) == null ? void 0 : _b[0];
-          if ((permission == null ? void 0 : permission[P.View]) === !1)
+          const permission = (_b = (_a22 = targetSheet.getCell(i2, j)) == null ? void 0 : _a22.selectionProtection) == null ? void 0 : _b[0];
+          if ((permission == null ? void 0 : permission[L.View]) === !1)
             return !1;
         }
     }
     return !0;
   }
 }, __name(_a5, "DataValidationFormulaController"), _a5);
-DataValidationFormulaController = __decorateClass$g([
+DataValidationFormulaController = __decorateClass$f([
   OnLifecycle(LifecycleStages.Rendered, DataValidationFormulaController),
-  __decorateParam$g(0, IUniverInstanceService),
-  __decorateParam$g(1, IPermissionService),
-  __decorateParam$g(2, Inject(LexerTreeBuilder))
+  __decorateParam$f(0, IUniverInstanceService),
+  __decorateParam$f(1, IPermissionService),
+  __decorateParam$f(2, Inject(LexerTreeBuilder))
 ], DataValidationFormulaController);
 const DEFAULT_COLOR_PRESET = [
   "#FFFFFF",
@@ -1168,18 +1192,18 @@ const _CheckboxValidator = class _CheckboxValidator extends BaseDataValidator {
     };
   }
   async parseFormula(rule, unitId, subUnitId) {
-    var _a23, _b;
+    var _a22, _b;
     const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid);
     return {
-      formula1: isFormulaString(formula1) ? getFormulaResult((_a23 = results == null ? void 0 : results[0]) == null ? void 0 : _a23.result) : formula1,
+      formula1: isFormulaString(formula1) ? getFormulaResult((_a22 = results == null ? void 0 : results[0]) == null ? void 0 : _a22.result) : formula1,
       formula2: isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2
     };
   }
   parseFormulaSync(rule, unitId, subUnitId) {
-    var _a23, _b;
+    var _a22, _b;
     const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = this._formulaService.getRuleFormulaResultSync(unitId, subUnitId, rule.uid);
     return {
-      formula1: isFormulaString(formula1) ? getFormulaResult((_a23 = results == null ? void 0 : results[0]) == null ? void 0 : _a23.result) : formula1,
+      formula1: isFormulaString(formula1) ? getFormulaResult((_a22 = results == null ? void 0 : results[0]) == null ? void 0 : _a22.result) : formula1,
       formula2: isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2
     };
   }
@@ -1196,17 +1220,12 @@ let CheckboxValidator = _CheckboxValidator;
 const TWO_FORMULA_OPERATOR_COUNT = [
   DataValidationOperator.BETWEEN,
   DataValidationOperator.NOT_BETWEEN
-];
-function excelSerialToUnixTimestamp(excelSerial) {
-  return new Date((excelSerial - 25569) * 86400).getTime();
-}
-__name(excelSerialToUnixTimestamp, "excelSerialToUnixTimestamp");
-const timestamp2SerialTime = /* @__PURE__ */ __name((timestamp) => timestamp / 86400 + 25569, "timestamp2SerialTime"), dataValidationOptionsButton = "univer-data-validation-options-button", dataValidationOptionsButtonIcon = "univer-data-validation-options-button-icon", styles$5 = {
+], dataValidationOptionsButton = "univer-data-validation-options-button", dataValidationOptionsButtonIcon = "univer-data-validation-options-button-icon", styles$5 = {
   dataValidationOptionsButton,
   dataValidationOptionsButtonIcon
 };
 function DataValidationOptions(props) {
-  var _a23;
+  var _a22;
   const localeService = useDependency(LocaleService), componentManager = useDependency(ComponentManager), { value, onChange, extraComponent } = props, [show, setShow] = useState(!1), ExtraOptions = extraComponent ? componentManager.get(extraComponent) : null;
   return /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
     /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$5.dataValidationOptionsButton, onClick: /* @__PURE__ */ __name(() => setShow(!show), "onClick"), children: [
@@ -1222,7 +1241,7 @@ function DataValidationOptions(props) {
           children: /* @__PURE__ */ jsxRuntimeExports.jsxs(
             RadioGroup,
             {
-              value: `${(_a23 = value.errorStyle) != null ? _a23 : DataValidationErrorStyle.WARNING}`,
+              value: `${(_a22 = value.errorStyle) != null ? _a22 : DataValidationErrorStyle.WARNING}`,
               onChange: /* @__PURE__ */ __name((errorStyle) => onChange({ ...value, errorStyle: +errorStyle }), "onChange"),
               children: [
                 /* @__PURE__ */ jsxRuntimeExports.jsx(Radio, { value: `${DataValidationErrorStyle.WARNING}`, children: localeService.t("dataValidation.panel.showWarning") }),
@@ -1239,17 +1258,17 @@ function DataValidationOptions(props) {
           children: /* @__PURE__ */ jsxRuntimeExports.jsx(
             Checkbox$1,
             {
-              checked: value.showInputMessage,
+              checked: value.showErrorMessage,
               onChange: /* @__PURE__ */ __name(() => onChange({
                 ...value,
-                showInputMessage: !value.showInputMessage
+                showErrorMessage: !value.showErrorMessage
               }), "onChange"),
               children: localeService.t("dataValidation.panel.showInfo")
             }
           )
         }
       ),
-      value.showInputMessage ? /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(Input, { value: value.error, onChange: /* @__PURE__ */ __name((error) => onChange({ ...value, error }), "onChange") }) }) : null
+      value.showErrorMessage ? /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(Input, { value: value.error, onChange: /* @__PURE__ */ __name((error) => onChange({ ...value, error }), "onChange") }) }) : null
     ] })
   ] });
 }
@@ -1454,8 +1473,8 @@ const dataValidationItemContainer = "univer-data-validation-item-container", dat
     }), e.stopPropagation();
   }, "handleDelete");
   return useEffect(() => () => {
-    var _a23;
-    ids.current && ((_a23 = ids.current) == null || _a23.forEach((id) => {
+    var _a22;
+    ids.current && ((_a22 = ids.current) == null || _a22.forEach((id) => {
       id && markSelectionService.removeShape(id);
     }));
   }, [markSelectionService]), /* @__PURE__ */ jsxRuntimeExports.jsxs(
@@ -1486,8 +1505,8 @@ const dataValidationItemContainer = "univer-data-validation-item-container", dat
         })));
       }, "onMouseEnter"),
       onMouseLeave: /* @__PURE__ */ __name(() => {
-        var _a23;
-        setIsHover(!1), (_a23 = ids.current) == null || _a23.forEach((id) => {
+        var _a22;
+        setIsHover(!1), (_a22 = ids.current) == null || _a22.forEach((id) => {
           id && markSelectionService.removeShape(id);
         }), ids.current = void 0;
       }, "onMouseLeave"),
@@ -1540,25 +1559,12 @@ function DataValidationListWithWorkbook(props) {
       subUnitId
     });
   }, "handleRemoveAll"), rulesByPermissionCheck = (/* @__PURE__ */ __name((rules2) => {
-    const worksheet2 = univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET).getActiveSheet();
-    return rules2.map((rule) => {
-      const { ranges } = rule;
-      return (ranges == null ? void 0 : ranges.some((range) => {
-        var _a23, _b;
-        const { startRow, startColumn, endRow, endColumn } = range;
-        for (let row = startRow; row <= endRow; row++)
-          for (let col = startColumn; col <= endColumn; col++) {
-            const permission = (_b = (_a23 = worksheet2 == null ? void 0 : worksheet2.getCell(row, col)) == null ? void 0 : _a23.selectionProtection) == null ? void 0 : _b[0];
-            if ((permission == null ? void 0 : permission[P.Edit]) === !1 || (permission == null ? void 0 : permission[P.View]) === !1)
-              return !0;
-          }
-        return !1;
-      })) ? { ...rule, disable: !0 } : { ...rule };
-    });
+    const workbook2 = univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET), worksheet2 = workbook2.getActiveSheet(), unitId2 = workbook2.getUnitId(), subUnitId2 = worksheet2.getSheetId();
+    return rules2.map((rule) => checkRangesEditablePermission(injector, unitId2, subUnitId2, rule.ranges) ? { ...rule } : { ...rule, disable: !0 });
   }, "getDvRulesByPermissionCorrect"))(rules), hasDisableRule = rulesByPermissionCheck == null ? void 0 : rulesByPermissionCheck.some((rule) => rule.disable);
   return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
     rulesByPermissionCheck == null ? void 0 : rulesByPermissionCheck.map((rule) => {
-      var _a23;
+      var _a22;
       return /* @__PURE__ */ jsxRuntimeExports.jsx(
         DataValidationItem,
         {
@@ -1572,7 +1578,7 @@ function DataValidationListWithWorkbook(props) {
             });
           }, "onClick"),
           rule,
-          disable: (_a23 = rule.disable) != null ? _a23 : !1
+          disable: (_a22 = rule.disable) != null ? _a22 : !1
         },
         rule.uid
       );
@@ -1598,10 +1604,10 @@ const DataValidationPanel = /* @__PURE__ */ __name(() => {
   dvListDropdownSplit,
   dvListDropdownEdit
 }, SelectList = /* @__PURE__ */ __name((props) => {
-  const { value, onChange, multiple, options, title, onEdit, style } = props;
+  const { value, onChange, multiple, options, title, onEdit, style, filter: filter2 } = props, localeService = useDependency(LocaleService), lowerFilter = filter2 == null ? void 0 : filter2.toLowerCase(), filteredOptions = options.filter((item) => lowerFilter ? item.label.toLowerCase().includes(lowerFilter) : !0);
   return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$1.dvListDropdown, style, children: [
     /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dvListDropdownTitle, children: title }),
-    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dvListDropdownList, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Scrollbar, { children: /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dvListDropdownListContainer, children: options.map((item, i) => {
+    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dvListDropdownList, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Scrollbar, { children: /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dvListDropdownListContainer, children: filteredOptions.map((item, i) => {
       const selected = value.indexOf(item.value) > -1, handleClick = /* @__PURE__ */ __name(() => {
         let set;
         selected ? set = new Set(value.filter((sub) => sub !== item.value)) : set = new Set(multiple ? [...value, item.value] : [item.value]);
@@ -1609,31 +1615,52 @@ const DataValidationPanel = /* @__PURE__ */ __name(() => {
         options.forEach((opt) => {
           set.has(opt.value) && newValue.push(opt.value);
         }), onChange(newValue);
-      }, "handleClick");
+      }, "handleClick"), index = item.label.toLocaleLowerCase().indexOf(lowerFilter);
       return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$1.dvListDropdownItemContainer, onClick: handleClick, children: [
-        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dvListDropdownItem, style: { background: item.color || DROP_DOWN_DEFAULT_COLOR }, children: item.label }),
+        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dvListDropdownItem, style: { background: item.color || DROP_DOWN_DEFAULT_COLOR }, children: lowerFilter && item.label.toLowerCase().includes(lowerFilter) ? /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: item.label.substring(0, index) }),
+          /* @__PURE__ */ jsxRuntimeExports.jsx("span", { style: { fontWeight: "bold" }, children: item.label.substring(index, index + lowerFilter.length) }),
+          /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: item.label.substring(index + lowerFilter.length) })
+        ] }) : item.label }),
         /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dvListDropdownSelectedIcon, children: selected ? /* @__PURE__ */ jsxRuntimeExports.jsx(CheckMarkSingle, {}) : null })
       ] }, i);
-    }) }) }) }),
+    }) }) }, filter2) }),
     /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dvListDropdownSplit }),
-    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dvListDropdownEdit, children: /* @__PURE__ */ jsxRuntimeExports.jsx("a", { onClick: onEdit, children: "编辑" }) })
+    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dvListDropdownEdit, children: /* @__PURE__ */ jsxRuntimeExports.jsx("a", { onClick: onEdit, children: localeService.t("dataValidation.list.edit") }) })
   ] });
 }, "SelectList");
 function ListDropDown(props) {
-  var _a23, _b;
-  const { location, hideFn } = props, { worksheet, row, col, unitId, subUnitId } = location, dataValidationModel = useDependency(DataValidationModel), commandService = useDependency(ICommandService), localeService = useDependency(LocaleService), [localValue, setLocalValue] = useState(""), editorBridgeService = useDependency(IEditorBridgeService), ruleChange$ = useMemo(() => dataValidationModel.ruleChange$.pipe(debounceTime(16)), []);
+  var _a22, _b;
+  const { location, hideFn } = props, { worksheet, row, col, unitId, subUnitId } = location, dataValidationModel = useDependency(DataValidationModel), [editingText, setEditingText] = useState(""), commandService = useDependency(ICommandService), localeService = useDependency(LocaleService), [localValue, setLocalValue] = useState(""), editorBridgeService = useDependency(IEditorBridgeService), instanceService = useDependency(IUniverInstanceService), ruleChange$ = useMemo(() => dataValidationModel.ruleChange$.pipe(debounceTime(16)), []);
   useObservable(ruleChange$);
   const anchorRect = RectPopup.useContext(), cellWidth = anchorRect.right - anchorRect.left;
-  if (!worksheet)
+  if (useEffect(() => {
+    const dispose = commandService.onCommandExecuted((command) => {
+      if (command.id === RichTextEditingMutation.id) {
+        const params = command.params, { unitId: unitId2 } = params, unit = instanceService.getUnit(unitId2, UniverInstanceType.UNIVER_DOC);
+        if (!unit)
+          return;
+        const text = getPlainTextFormDocument(unit.getSnapshot());
+        setEditingText(text);
+      }
+    });
+    return () => {
+      dispose.dispose();
+    };
+  }, [commandService, instanceService]), !worksheet)
     return null;
-  const cellData = worksheet.getCell(row, col), rule = (_a23 = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _a23.rule, validator = (_b = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _b.validator, showColor = (rule == null ? void 0 : rule.renderMode) === DataValidationRenderMode.CUSTOM || (rule == null ? void 0 : rule.renderMode) === void 0;
-  if (!cellData || !rule || !validator)
+  const cellData = worksheet.getCell(row, col), rule = (_a22 = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _a22.rule, validator = (_b = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _b.validator, showColor = (rule == null ? void 0 : rule.renderMode) === DataValidationRenderMode.CUSTOM || (rule == null ? void 0 : rule.renderMode) === void 0;
+  if (!cellData || !rule || !validator || validator.id.indexOf(DataValidationType.LIST) !== 0)
     return;
   const multiple = rule.type === DataValidationType.LIST_MULTIPLE, list = validator.getListWithColor(rule, unitId, subUnitId), cellStr = localValue || getDataValidationCellValue(worksheet.getCellRaw(row, col)), value = deserializeListOptions(cellStr), handleEdit = /* @__PURE__ */ __name(() => {
     commandService.executeCommand(OpenValidationPanelOperation.id, {
       ruleId: rule.uid
     }), hideFn();
-  }, "handleEdit");
+  }, "handleEdit"), options = list.map((item) => ({
+    label: item.label,
+    value: item.label,
+    color: showColor ? item.color : "transparent"
+  }));
   return /* @__PURE__ */ jsxRuntimeExports.jsx(
     SelectList,
     {
@@ -1668,12 +1695,9 @@ function ListDropDown(props) {
           unitId
         }), commandService.executeCommand(SetRangeValuesCommand.id, params), setLocalValue(str), multiple || hideFn();
       }, "onChange"),
-      options: list.map((item) => ({
-        label: item.label,
-        value: item.label,
-        color: showColor ? item.color : "transparent"
-      })),
-      onEdit: handleEdit
+      options,
+      onEdit: handleEdit,
+      filter: editingText
     }
   );
 }
@@ -1754,11 +1778,11 @@ var utc$1 = { exports: {} };
 })(utc$1);
 var utcExports = utc$1.exports;
 const utc = /* @__PURE__ */ getDefaultExportFromCjs(utcExports);
-var __defProp$f = Object.defineProperty, __getOwnPropDesc$f = Object.getOwnPropertyDescriptor, __decorateClass$f = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$f(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+var __defProp$e = Object.defineProperty, __getOwnPropDesc$e = Object.getOwnPropertyDescriptor, __decorateClass$e = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$e(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$f(target, key, result), result;
-}, "__decorateClass$f"), __decorateParam$f = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$f"), _a6;
+  return kind && result && __defProp$e(target, key, result), result;
+}, "__decorateClass$e"), __decorateParam$e = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$e"), _a6;
 let DataValidationRejectInputController = (_a6 = class extends Disposable {
   constructor(_editorBridgeService, _dataValidationModel, _dataValidatorRegistryService, _dialogService, _localeService) {
     super(), this._editorBridgeService = _editorBridgeService, this._dataValidationModel = _dataValidationModel, this._dataValidatorRegistryService = _dataValidatorRegistryService, this._dialogService = _dialogService, this._localeService = _localeService, this._initEditorBridgeInterceptor();
@@ -1768,17 +1792,21 @@ let DataValidationRejectInputController = (_a6 = class extends Disposable {
       this._editorBridgeService.interceptor.getInterceptPoints().AFTER_CELL_EDIT_ASYNC,
       {
         handler: /* @__PURE__ */ __name(async (cellPromise, context, next) => {
-          const cell = await cellPromise, { worksheet, row, col, unitId, subUnitId } = context, manager = this._dataValidationModel.ensureManager(unitId, subUnitId), ruleId = manager.getRuleIdByLocation(row, col), rule = ruleId ? manager.getRuleById(ruleId) : void 0;
+          const cell = await cellPromise, { worksheet, row, col, unitId, subUnitId, workbook } = context, manager = this._dataValidationModel.ensureManager(unitId, subUnitId), ruleId = manager.getRuleIdByLocation(row, col), rule = ruleId ? manager.getRuleById(ruleId) : void 0;
           if (!rule || rule.errorStyle !== DataValidationErrorStyle.STOP)
             return next(Promise.resolve(cell));
           const validator = await this._dataValidatorRegistryService.getValidatorItem(rule.type);
           if (!validator || await validator.validator(
             {
               value: getCellValueOrigin(cell),
+              interceptValue: getCellValueOrigin(cell),
               row,
               column: col,
               unitId,
-              subUnitId
+              subUnitId,
+              worksheet,
+              workbook,
+              t: cell == null ? void 0 : cell.t
             },
             rule
           ))
@@ -1837,13 +1865,13 @@ let DataValidationRejectInputController = (_a6 = class extends Disposable {
     });
   }
 }, __name(_a6, "DataValidationRejectInputController"), _a6);
-DataValidationRejectInputController = __decorateClass$f([
+DataValidationRejectInputController = __decorateClass$e([
   OnLifecycle(LifecycleStages.Ready, DataValidationRejectInputController),
-  __decorateParam$f(0, IEditorBridgeService),
-  __decorateParam$f(1, Inject(DataValidationModel)),
-  __decorateParam$f(2, Inject(DataValidatorRegistryService)),
-  __decorateParam$f(3, IDialogService),
-  __decorateParam$f(4, Inject(LocaleService))
+  __decorateParam$e(0, IEditorBridgeService),
+  __decorateParam$e(1, Inject(DataValidationModel)),
+  __decorateParam$e(2, Inject(DataValidatorRegistryService)),
+  __decorateParam$e(3, IDialogService),
+  __decorateParam$e(4, Inject(LocaleService))
 ], DataValidationRejectInputController);
 const dvDateDropdown = "univer-dv-date-dropdown", dvDateDropdownBtns = "univer-dv-date-dropdown-btns", styles = {
   dvDateDropdown,
@@ -1853,29 +1881,32 @@ dayjs.extend(utc);
 const transformDate = /* @__PURE__ */ __name((value) => {
   if (value == null || typeof value == "boolean")
     return;
-  if (typeof value == "number" || !Number.isNaN(+value)) {
-    const date2 = dayjs.unix(excelSerialToUnixTimestamp(+value)).utc().format().slice(0, -1);
-    return dayjs(date2);
-  }
+  if (typeof value == "number" || !Number.isNaN(+value))
+    return dayjs(numfmt.format("yyyy-MM-dd HH:mm:ss", value));
   const date = dayjs(value);
   if (date.isValid())
     return date;
 }, "transformDate");
 function DateDropdown(props) {
-  var _a23, _b, _c;
-  const { location, hideFn } = props, { worksheet, row, col, unitId, subUnitId } = location, commandService = useDependency(ICommandService), rejectInputController = useDependency(DataValidationRejectInputController), cellData = worksheet.getCell(row, col), rule = (_a23 = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _a23.rule, validator = (_b = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _b.validator, cellStr = getCellValueOrigin(worksheet.getCellRaw(row, col)), originDate = transformDate(cellStr), [localDate, setLocalDate] = useState(originDate), showTime = !!((_c = rule == null ? void 0 : rule.bizInfo) != null && _c.showTime), date = localDate && localDate.isValid() ? localDate : dayjs();
+  var _a22, _b, _c;
+  const { location, hideFn } = props, { worksheet, row, col, unitId, subUnitId, workbook } = location, commandService = useDependency(ICommandService), rejectInputController = useDependency(DataValidationRejectInputController), cellData = worksheet.getCell(row, col), rule = (_a22 = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _a22.rule, validator = (_b = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _b.validator, cellStr = getCellValueOrigin(worksheet.getCellRaw(row, col)), originDate = transformDate(cellStr), [localDate, setLocalDate] = useState(originDate), showTime = !!((_c = rule == null ? void 0 : rule.bizInfo) != null && _c.showTime), date = localDate && localDate.isValid() ? localDate : dayjs(), localeService = useDependency(LocaleService);
   if (!cellData || !rule || !validator)
     return;
   const handleSave = /* @__PURE__ */ __name(async () => {
-    if (!localDate)
+    var _a23;
+    if (!date)
       return;
-    const dateStr = `${localDate.format(showTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00").split(" ").join("T")}Z`, serialTime = timestamp2SerialTime(dayjs(dateStr).unix());
+    const dateStr = date.format(showTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00"), serialTime = (_a23 = numfmt.parseDate(dateStr)) == null ? void 0 : _a23.v;
     rule.errorStyle !== DataValidationErrorStyle.STOP || await validator.validator({
       value: serialTime,
       unitId,
       subUnitId,
       row,
-      column: col
+      column: col,
+      worksheet,
+      workbook,
+      interceptValue: dateStr.replace("Z", "").replace("T", " "),
+      t: CellValueType.NUMBER
     }, rule) ? (commandService.executeCommand(SetRangeValuesCommand.id, {
       unitId,
       subUnitId,
@@ -1903,18 +1934,19 @@ function DateDropdown(props) {
     /* @__PURE__ */ jsxRuntimeExports.jsx(
       DatePanel,
       {
-        defaultValue: localDate,
-        pickerValue: localDate != null ? localDate : date,
+        defaultValue: date,
+        pickerValue: date,
         showTime: showTime || void 0,
         onSelect: /* @__PURE__ */ __name(async (newValue) => {
           setLocalDate(newValue);
         }, "onSelect"),
         onPanelChange: /* @__PURE__ */ __name((value) => {
           setLocalDate(value);
-        }, "onPanelChange")
+        }, "onPanelChange"),
+        disabledDate: /* @__PURE__ */ __name((current) => !numfmt.parseDate(current.format("YYYY-MM-DD")), "disabledDate")
       }
     ),
-    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles.dvDateDropdownBtns, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { size: "small", type: "primary", onClick: handleSave, disabled: !localDate, children: "确定" }) })
+    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles.dvDateDropdownBtns, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { size: "small", type: "primary", onClick: handleSave, disabled: !date.isValid(), children: localeService.t("dataValidation.alert.ok") }) })
   ] });
 }
 __name(DateDropdown, "DateDropdown");
@@ -1949,12 +1981,12 @@ const DateOperatorTitleMap = {
   [DataValidationOperator.NOT_EQUAL]: "dataValidation.date.errorMsg.notEqual"
 }, DATE_SHOW_TIME_OPTION = "DATE_SHOW_TIME_OPTION";
 function DateShowTimeOption(props) {
-  var _a23;
+  var _a22;
   const { value, onChange } = props, localeService = useDependency(LocaleService);
   return /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(
     Checkbox$1,
     {
-      checked: (_a23 = value.bizInfo) == null ? void 0 : _a23.showTime,
+      checked: (_a22 = value.bizInfo) == null ? void 0 : _a22.showTime,
       onChange: /* @__PURE__ */ __name((showTime) => {
         onChange({
           ...value,
@@ -1971,12 +2003,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;
   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").split(" ").join("T")}Z`;
-  return timestamp2SerialTime(dayjs(dateStr).unix());
+  const dateStr = `${dayjs(value).format("YYYY-MM-DD HH:mm:ss")}`;
+  return (_a22 = numfmt.parseDate(dateStr)) == null ? void 0 : _a22.v;
 }, "transformDate2SerialNumber"), _DateValidator = class _DateValidator extends BaseDataValidator {
   constructor() {
     super(...arguments);
@@ -1999,24 +2032,24 @@ const FORMULA1$1 = "{FORMULA1}", FORMULA2$1 = "{FORMULA2}", transformDate2Serial
     __publicField(this, "_formulaService", this.injector.get(DataValidationFormulaService));
   }
   async parseFormula(rule, unitId, subUnitId) {
-    var _a23, _b;
+    var _a22, _b;
     const results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule;
     return {
-      formula1: transformDate2SerialNumber(isFormulaString(formula1) ? getFormulaResult((_a23 = results == null ? void 0 : results[0]) == null ? void 0 : _a23.result) : formula1),
+      formula1: transformDate2SerialNumber(isFormulaString(formula1) ? getFormulaResult((_a22 = results == null ? void 0 : results[0]) == null ? void 0 : _a22.result) : formula1),
       formula2: transformDate2SerialNumber(isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2)
     };
   }
   parseFormulaSync(rule, unitId, subUnitId) {
-    var _a23, _b;
+    var _a22, _b;
     const results = this._formulaService.getRuleFormulaResultSync(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule;
     return {
-      formula1: transformDate2SerialNumber(isFormulaString(formula1) ? getFormulaResult((_a23 = results == null ? void 0 : results[0]) == null ? void 0 : _a23.result) : formula1),
+      formula1: transformDate2SerialNumber(isFormulaString(formula1) ? getFormulaResult((_a22 = results == null ? void 0 : results[0]) == null ? void 0 : _a22.result) : formula1),
       formula2: transformDate2SerialNumber(isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2)
     };
   }
   async isValidType(info) {
-    const { value } = info;
-    return typeof value == "string" ? dayjs(value, "YYYY-MM-DD HH:mm:ss", !0).isValid() : typeof value == "number";
+    const { interceptValue } = info;
+    return typeof interceptValue == "string" ? !!numfmt.parseDate(interceptValue) : !1;
   }
   _validatorSingleFormula(formula) {
     return !Tools.isBlank(formula) && (isFormulaString(formula) || !Number.isNaN(+formula) || !!formula && dayjs(formula).isValid());
@@ -2090,25 +2123,25 @@ const FORMULA1$1 = "{FORMULA1}", FORMULA2$1 = "{FORMULA2}", transformDate2Serial
     return this.operators.map((operator) => this.localeService.t(DateOperatorNameMap[operator]));
   }
   generateRuleName(rule) {
-    var _a23, _b;
+    var _a22, _b;
     if (!rule.operator)
       return this.titleStr;
-    const ruleName = this.localeService.t(DateOperatorTitleMap[rule.operator]).replace(FORMULA1$1, (_a23 = rule.formula1) != null ? _a23 : "").replace(FORMULA2$1, (_b = rule.formula2) != null ? _b : "");
+    const ruleName = this.localeService.t(DateOperatorTitleMap[rule.operator]).replace(FORMULA1$1, (_a22 = rule.formula1) != null ? _a22 : "").replace(FORMULA2$1, (_b = rule.formula2) != null ? _b : "");
     return `${this.titleStr} ${ruleName}`;
   }
   generateRuleErrorMessage(rule) {
-    var _a23, _b;
-    return rule.operator ? `${this.localeService.t(DateOperatorErrorTitleMap[rule.operator]).replace(FORMULA1$1, (_a23 = rule.formula1) != null ? _a23 : "").replace(FORMULA2$1, (_b = rule.formula2) != null ? _b : "")}` : this.titleStr;
+    var _a22, _b;
+    return rule.operator ? `${this.localeService.t(DateOperatorErrorTitleMap[rule.operator]).replace(FORMULA1$1, (_a22 = rule.formula1) != null ? _a22 : "").replace(FORMULA2$1, (_b = rule.formula2) != null ? _b : "")}` : this.titleStr;
   }
 };
 __name(_DateValidator, "DateValidator");
 let DateValidator = _DateValidator;
-var __defProp$e = Object.defineProperty, __getOwnPropDesc$e = Object.getOwnPropertyDescriptor, __decorateClass$e = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$e(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+var __defProp$d = Object.defineProperty, __getOwnPropDesc$d = Object.getOwnPropertyDescriptor, __decorateClass$d = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$d(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$e(target, key, result), result;
-}, "__decorateClass$e"), __decorateParam$e = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$e");
-const PADDING_H$1 = 4, ICON_SIZE = 6, ICON_PLACE$1 = 14, MARGIN_H$1 = 6, MARGIN_V$1 = 4, DROP_DOWN_ICON_COLOR = "#565656", downPath$1 = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
+  return kind && result && __defProp$d(target, key, result), result;
+}, "__decorateClass$d"), __decorateParam$d = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$d");
+const PADDING_H$1 = 4, ICON_SIZE = 4, ICON_PLACE$1 = 14, MARGIN_H$1 = 6, MARGIN_V$1 = 4, DROP_DOWN_ICON_COLOR = "#565656", downPath$1 = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
 function convertToDocumentData(text, style) {
   const contentLength = text.length;
   return {
@@ -2176,19 +2209,21 @@ function createDocuments(text, localeService, style) {
   };
 }
 __name(createDocuments, "createDocuments");
-function calcPadding(cellWidth, cellHeight, fontWidth, fontHeight, vt, ht) {
+function calcPadding(cellWidth, cellHeight, fontWidth, fontHeight, vt, ht, margin = !0) {
   let paddingTop = 0;
+  const realMargin = margin ? MARGIN_V$1 : 0;
   switch (vt) {
     case VerticalAlign.BOTTOM:
-      paddingTop = cellHeight - MARGIN_V$1 * 2 - fontHeight + MARGIN_V$1;
+      paddingTop = cellHeight - realMargin * 2 - fontHeight + realMargin;
       break;
     case VerticalAlign.MIDDLE:
-      paddingTop = (cellHeight - MARGIN_V$1 * 2 - fontHeight) / 2 + MARGIN_V$1;
+      paddingTop = (cellHeight - realMargin * 2 - fontHeight) / 2 + realMargin;
       break;
     default:
-      paddingTop = MARGIN_V$1;
+      paddingTop = realMargin;
       break;
   }
+  paddingTop = Math.max(MARGIN_V$1, paddingTop);
   let paddingLeft = 0;
   switch (ht) {
     case HorizontalAlign.CENTER:
@@ -2198,7 +2233,7 @@ function calcPadding(cellWidth, cellHeight, fontWidth, fontHeight, vt, ht) {
       paddingLeft = cellWidth - fontWidth;
       break;
   }
-  return {
+  return paddingLeft = Math.max(MARGIN_H$1, paddingLeft), {
     paddingLeft,
     paddingTop
   };
@@ -2207,6 +2242,12 @@ __name(calcPadding, "calcPadding");
 var _a7;
 let DropdownWidget = (_a7 = class {
   constructor(_localeService, _commandService) {
+    // static padding: IPaddingData = {
+    //     l: MARGIN_H + PADDING_H,
+    //     r: ICON_PLACE + MARGIN_H,
+    //     t: MARGIN_V,
+    //     b: MARGIN_V,
+    // };
     __publicField(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     __publicField(this, "zIndex");
     __publicField(this, "onPointerEnter");
@@ -2220,24 +2261,27 @@ let DropdownWidget = (_a7 = class {
   _generateKey(row, col) {
     return `${row}.${col}`;
   }
-  _drawDownIcon(ctx, cellBounding, cellWidth, cellHeight, vt) {
-    const left = cellWidth - ICON_PLACE$1 + 4;
-    let top = 9;
+  _drawDownIcon(ctx, cellBounding, cellWidth, cellHeight, fontHeight, vt, pd) {
+    const { t = DEFAULT_STYLES.pd.t, b = DEFAULT_STYLES.pd.b } = pd, left = cellWidth - ICON_PLACE$1;
+    let top;
     switch (vt) {
       case VerticalAlign.MIDDLE:
-        top = (cellHeight - ICON_PLACE$1) / 2 + 4;
+        top = (cellHeight - ICON_SIZE) / 2;
         break;
       case VerticalAlign.BOTTOM:
-        top = cellHeight - ICON_PLACE$1 - 1;
+        top = cellHeight - ICON_SIZE / 2 - b - fontHeight / 2;
+        break;
+      default:
+        top = t + fontHeight / 2 - ICON_SIZE / 2;
         break;
     }
     ctx.save(), ctx.translateWithPrecision(cellBounding.startX + left, cellBounding.startY + top), ctx.fillStyle = "#565656", ctx.fill(downPath$1), ctx.restore();
   }
-  // eslint-disable-next-line max-lines-per-function
+  // eslint-disable-next-line max-lines-per-function, complexity
   drawWith(ctx, info, skeleton) {
-    var _a23, _b;
-    const { primaryWithCoord, row, col, style, data, subUnitId } = info, _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord, rule = (_a23 = data.dataValidation) == null ? void 0 : _a23.rule, validator = (_b = data.dataValidation) == null ? void 0 : _b.validator, fontRenderExtension = data.fontRenderExtension, { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {};
-    if (!rule || !validator || !validator.skipDefaultFontRender(rule))
+    var _a22, _b;
+    const { primaryWithCoord, row, col, style, data, subUnitId } = info, _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord, rule = (_a22 = data.dataValidation) == null ? void 0 : _a22.rule, validator = (_b = data.dataValidation) == null ? void 0 : _b.validator, fontRenderExtension = data.fontRenderExtension, { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {};
+    if (!rule || !validator || !validator || validator.id.indexOf(DataValidationType.LIST) !== 0 || !validator.skipDefaultFontRender(rule))
       return;
     const cellBounding = {
       startX: _cellBounding.startX + leftOffset,
@@ -2245,31 +2289,30 @@ let DropdownWidget = (_a7 = class {
       startY: _cellBounding.startY + topOffset,
       endY: _cellBounding.endY - downOffset
     }, cellWidth = cellBounding.endX - cellBounding.startX, cellHeight = cellBounding.endY - cellBounding.startY, map = this._ensureMap(subUnitId), key = this._generateKey(row, col), list = validator.getListWithColor(rule), value = getCellValueOrigin(data), valueStr = `${value != null ? value : ""}`, activeItem = list.find((i) => i.label === valueStr);
-    let { tb, vt, ht } = style || {};
-    if (tb = tb != null ? tb : WrapStrategy.WRAP, vt = vt != null ? vt : VerticalAlign.BOTTOM, ht = ht != null ? ht : HorizontalAlign.LEFT, rule.renderMode === DataValidationRenderMode.ARROW) {
-      this._drawDownIcon(ctx, cellBounding, cellWidth, cellHeight, vt), ctx.save(), ctx.translateWithPrecision(cellBounding.startX, cellBounding.startY), ctx.beginPath(), ctx.rect(0, 0, cellWidth, cellHeight), ctx.clip();
-      const realWidth = cellWidth - ICON_PLACE$1, { documentSkeleton, documents, docModel } = createDocuments(valueStr, this._localeService, style);
+    let { tb, vt, ht, pd } = style || {};
+    if (tb = tb != null ? tb : WrapStrategy.WRAP, vt = vt != null ? vt : VerticalAlign.BOTTOM, ht = ht != null ? ht : DEFAULT_STYLES.ht, pd = pd != null ? pd : DEFAULT_STYLES.pd, rule.renderMode === DataValidationRenderMode.ARROW) {
+      const { l: l2 = DEFAULT_STYLES.pd.l, t = DEFAULT_STYLES.pd.t, r = DEFAULT_STYLES.pd.r, b = DEFAULT_STYLES.pd.b } = pd, realWidth = cellWidth - l2 - r - ICON_PLACE$1, { documentSkeleton, documents, docModel } = createDocuments(valueStr, this._localeService, style);
       tb === WrapStrategy.WRAP && docModel.updateDocumentDataPageSize(Math.max(realWidth, 1)), documentSkeleton.calculate(), documentSkeleton.getActualSize();
-      const textLayout = getDocsSkeletonPageSize(documentSkeleton), { height: fontHeight, width: fontWidth } = textLayout, { paddingTop, paddingLeft } = calcPadding(realWidth, cellHeight, fontWidth, fontHeight, vt, ht);
-      ctx.translate(0, paddingTop), ctx.save(), ctx.translateWithPrecision(PADDING_H$1, 0), ctx.beginPath(), ctx.rect(0, 0, realWidth, fontHeight), ctx.clip(), documents.render(ctx), ctx.translateWithPrecision(paddingLeft, 0), ctx.restore(), ctx.restore(), map.set(key, {
-        left: cellBounding.endX + skeleton.rowHeaderWidth - ICON_PLACE$1,
-        top: cellBounding.startY + skeleton.columnHeaderHeight,
+      const textLayout = getDocsSkeletonPageSize(documentSkeleton), { height: fontHeight, width: fontWidth } = textLayout, { paddingTop, paddingLeft } = calcPadding(realWidth, cellHeight - t - b, fontWidth, fontHeight, vt, ht, !1);
+      this._drawDownIcon(ctx, cellBounding, cellWidth, cellHeight, fontHeight, vt, pd), ctx.save(), ctx.translateWithPrecision(cellBounding.startX + l2, cellBounding.startY + t), ctx.beginPath(), ctx.rect(0, 0, cellWidth - l2 - r, cellHeight - t - b), ctx.clip(), ctx.translateWithPrecision(0, paddingTop), ctx.save(), ctx.translateWithPrecision(PADDING_H$1, 0), ctx.beginPath(), ctx.rect(0, 0, realWidth, fontHeight), ctx.clip(), documents.render(ctx), ctx.translateWithPrecision(paddingLeft, 0), ctx.restore(), ctx.restore(), map.set(key, {
+        left: cellBounding.endX + l2 + skeleton.rowHeaderWidth - ICON_PLACE$1,
+        top: cellBounding.startY + t + skeleton.columnHeaderHeight,
         width: ICON_PLACE$1,
-        height: cellHeight
+        height: cellHeight - t - b
       });
     } else {
       ctx.save(), ctx.translateWithPrecision(cellBounding.startX, cellBounding.startY), ctx.beginPath(), ctx.rect(0, 0, cellWidth, cellHeight), ctx.clip();
       const realWidth = cellWidth - MARGIN_H$1 * 2 - PADDING_H$1 - ICON_PLACE$1, { documentSkeleton, documents, docModel } = createDocuments(valueStr, this._localeService, style);
       tb === WrapStrategy.WRAP && docModel.updateDocumentDataPageSize(Math.max(realWidth, 1)), documentSkeleton.calculate();
       const textLayout = getDocsSkeletonPageSize(documentSkeleton), { height: fontHeight, width: fontWidth } = textLayout, { paddingTop, paddingLeft } = calcPadding(realWidth, cellHeight, fontWidth, fontHeight, vt, ht);
-      ctx.translate(MARGIN_H$1, paddingTop);
+      ctx.translateWithPrecision(MARGIN_H$1, paddingTop);
       const rectWidth = Math.max(cellWidth - MARGIN_H$1 * 2, 1), rectHeight = fontHeight;
       Rect.drawWith(ctx, {
         width: rectWidth,
         height: rectHeight,
         fill: (activeItem == null ? void 0 : activeItem.color) || DROP_DOWN_DEFAULT_COLOR,
         radius: 8
-      }), ctx.save(), ctx.translateWithPrecision(PADDING_H$1, 0), ctx.beginPath(), ctx.rect(0, 0, realWidth, fontHeight), ctx.clip(), ctx.translateWithPrecision(paddingLeft, 0), documents.render(ctx), ctx.restore(), ctx.translate(realWidth + PADDING_H$1 + 4, (fontHeight - ICON_SIZE) / 2), ctx.fillStyle = DROP_DOWN_ICON_COLOR, ctx.fill(downPath$1), ctx.restore(), map.set(key, {
+      }), ctx.save(), ctx.translateWithPrecision(PADDING_H$1, 0), ctx.beginPath(), ctx.rect(0, 0, realWidth, fontHeight), ctx.clip(), ctx.translateWithPrecision(paddingLeft, 0), documents.render(ctx), ctx.restore(), ctx.translateWithPrecision(realWidth + PADDING_H$1 + 4, (fontHeight - ICON_SIZE) / 2), ctx.fillStyle = DROP_DOWN_ICON_COLOR, ctx.fill(downPath$1), ctx.restore(), map.set(key, {
         left: cellBounding.startX + MARGIN_H$1 + skeleton.rowHeaderWidth,
         top: cellBounding.startY + paddingTop + skeleton.columnHeaderHeight,
         width: rectWidth,
@@ -2278,8 +2321,8 @@ let DropdownWidget = (_a7 = class {
     }
   }
   calcCellAutoHeight(info) {
-    var _a23;
-    const { primaryWithCoord, style, data } = info, _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord, fontRenderExtension = data.fontRenderExtension, { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {}, rule = (_a23 = data.dataValidation) == null ? void 0 : _a23.rule;
+    var _a22;
+    const { primaryWithCoord, style, data } = info, _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord, fontRenderExtension = data.fontRenderExtension, { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {}, rule = (_a22 = data.dataValidation) == null ? void 0 : _a22.rule;
     if (!rule || rule.renderMode === DataValidationRenderMode.TEXT)
       return;
     const cellBounding = {
@@ -2288,12 +2331,13 @@ let DropdownWidget = (_a7 = class {
       startY: _cellBounding.startY + topOffset,
       endY: _cellBounding.endY - downOffset
     }, cellWidth = cellBounding.endX - cellBounding.startX, value = getCellValueOrigin(data), valueStr = `${value != null ? value : ""}`;
-    let { tb } = style || {};
+    let { tb, pd } = style || {};
+    const { t = DEFAULT_STYLES.pd.t, b = DEFAULT_STYLES.pd.b } = pd != null ? pd : {};
     if (tb = tb != null ? tb : WrapStrategy.WRAP, rule.renderMode === DataValidationRenderMode.ARROW) {
       const realWidth = cellWidth - ICON_PLACE$1, { documentSkeleton, docModel } = createDocuments(valueStr, this._localeService, style);
       tb === WrapStrategy.WRAP && docModel.updateDocumentDataPageSize(Math.max(realWidth, 1)), documentSkeleton.calculate(), documentSkeleton.getActualSize();
       const textLayout = getDocsSkeletonPageSize(documentSkeleton), { height: fontHeight } = textLayout;
-      return fontHeight;
+      return fontHeight + t + b;
     } else {
       const realWidth = cellWidth - MARGIN_H$1 * 2 - PADDING_H$1 - ICON_PLACE$1, { documentSkeleton, docModel } = createDocSkeleton(valueStr, this._localeService, style);
       tb === WrapStrategy.WRAP && docModel.updateDocumentDataPageSize(Math.max(realWidth, 1)), documentSkeleton.calculate();
@@ -2321,21 +2365,16 @@ let DropdownWidget = (_a7 = class {
     };
     this._commandService.executeCommand(ShowDataValidationDropdown.id, params);
   }
-}, __name(_a7, "DropdownWidget"), __publicField(_a7, "padding", {
-  l: MARGIN_H$1 + PADDING_H$1,
-  r: ICON_PLACE$1 + MARGIN_H$1,
-  t: MARGIN_V$1,
-  b: MARGIN_V$1
-}), _a7);
-DropdownWidget = __decorateClass$e([
-  __decorateParam$e(0, Inject(LocaleService)),
-  __decorateParam$e(1, ICommandService)
+}, __name(_a7, "DropdownWidget"), _a7);
+DropdownWidget = __decorateClass$d([
+  __decorateParam$d(0, Inject(LocaleService)),
+  __decorateParam$d(1, ICommandService)
 ], DropdownWidget);
 const LIST_RENDER_MODE_OPTION_INPUT = "LIST_RENDER_MODE_OPTION_INPUT";
 function ListRenderModeInput(props) {
-  var _a23;
+  var _a22;
   const { value, onChange } = props, localeService = useDependency(LocaleService);
-  return /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { label: localeService.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ jsxRuntimeExports.jsxs(RadioGroup, { value: `${(_a23 = value.renderMode) != null ? _a23 : DataValidationRenderMode.CUSTOM}`, onChange: /* @__PURE__ */ __name((renderMode) => onChange({ ...value, renderMode: +renderMode }), "onChange"), children: [
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { label: localeService.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ jsxRuntimeExports.jsxs(RadioGroup, { value: `${(_a22 = value.renderMode) != null ? _a22 : DataValidationRenderMode.CUSTOM}`, onChange: /* @__PURE__ */ __name((renderMode) => onChange({ ...value, renderMode: +renderMode }), "onChange"), children: [
     /* @__PURE__ */ jsxRuntimeExports.jsx(Radio, { value: `${DataValidationRenderMode.CUSTOM}`, children: localeService.t("dataValidation.renderMode.chip") }),
     /* @__PURE__ */ jsxRuntimeExports.jsx(Radio, { value: `${DataValidationRenderMode.ARROW}`, children: localeService.t("dataValidation.renderMode.arrow") }),
     /* @__PURE__ */ jsxRuntimeExports.jsx(Radio, { value: `${DataValidationRenderMode.TEXT}`, children: localeService.t("dataValidation.renderMode.text") })
@@ -2350,10 +2389,10 @@ function getRuleFormulaResultSet(result) {
   return result.forEach(
     (row) => {
       row.forEach((cell) => {
-        var _a23, _b;
+        var _a22, _b;
         const value = getCellValueOrigin(cell);
         if (value != null) {
-          if (typeof value != "string" && typeof (cell == null ? void 0 : cell.s) == "object" && ((_b = (_a23 = cell.s) == null ? void 0 : _a23.n) != null && _b.pattern)) {
+          if (typeof value != "string" && typeof (cell == null ? void 0 : cell.s) == "object" && ((_b = (_a22 = cell.s) == null ? void 0 : _a22.n) != null && _b.pattern)) {
             resultSet.add(numfmt.format(cell.s.n.pattern, value));
             return;
           }
@@ -2406,8 +2445,8 @@ const _ListValidator = class _ListValidator extends BaseDataValidator {
     return rule.renderMode !== DataValidationRenderMode.TEXT;
   }
   validatorFormula(rule, unitId, subUnitId) {
-    var _a23, _b, _c;
-    const success = !Tools.isBlank(rule.formula1), valid = isValidListFormula((_a23 = rule.formula1) != null ? _a23 : "", this._lexer), sheetName = (_c = (_b = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET)) == null ? void 0 : _b.getSheetBySheetId(subUnitId)) == null ? void 0 : _c.getName(), isIntersects = isRuleIntersects(rule, sheetName != null ? sheetName : "");
+    var _a22, _b, _c;
+    const success = !Tools.isBlank(rule.formula1), valid = isValidListFormula((_a22 = rule.formula1) != null ? _a22 : "", this._lexer), sheetName = (_c = (_b = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET)) == null ? void 0 : _b.getSheetBySheetId(subUnitId)) == null ? void 0 : _c.getName(), isIntersects = isRuleIntersects(rule, sheetName != null ? sheetName : "");
     return {
       success: !!(success && valid && !isIntersects),
       formula1: success ? valid ? isIntersects ? this.localeService.t("dataValidation.validFail.listIntersects") : void 0 : this.localeService.t("dataValidation.validFail.listInvalid") : this.localeService.t("dataValidation.validFail.list")
@@ -2418,10 +2457,10 @@ const _ListValidator = class _ListValidator extends BaseDataValidator {
     return deserializeListOptions(cellString);
   }
   async parseFormula(rule, unitId, subUnitId) {
-    var _a23;
+    var _a22;
     const { formula1 = "" } = rule, results = await this.formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid);
     return {
-      formula1: isFormulaString(formula1) ? getRuleFormulaResultSet((_a23 = results == null ? void 0 : results[0]) == null ? void 0 : _a23.result) : deserializeListOptions(formula1),
+      formula1: isFormulaString(formula1) ? getRuleFormulaResultSet((_a22 = results == null ? void 0 : results[0]) == null ? void 0 : _a22.result) : deserializeListOptions(formula1),
       formula2: void 0
     };
   }
@@ -2436,8 +2475,8 @@ const _ListValidator = class _ListValidator extends BaseDataValidator {
     return this.localeService.t("dataValidation.list.error");
   }
   getList(rule, currentUnitId, currentSubUnitId) {
-    var _a23, _b, _c;
-    const { formula1 = "" } = rule, univerInstanceService = this.injector.get(IUniverInstanceService), workbook = (_a23 = currentUnitId ? univerInstanceService.getUniverSheetInstance(currentUnitId) : void 0) != null ? _a23 : univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+    var _a22, _b, _c;
+    const { formula1 = "" } = rule, univerInstanceService = this.injector.get(IUniverInstanceService), workbook = (_a22 = currentUnitId ? univerInstanceService.getUniverSheetInstance(currentUnitId) : void 0) != null ? _a22 : univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
     if (!workbook) return [];
     const worksheet = (_b = currentSubUnitId ? workbook.getSheetBySheetId(currentSubUnitId) : void 0) != null ? _b : workbook.getActiveSheet();
     if (!worksheet) return [];
@@ -2445,8 +2484,8 @@ const _ListValidator = class _ListValidator extends BaseDataValidator {
     return isFormulaString(formula1) ? getRuleFormulaResultSet((_c = results == null ? void 0 : results[0]) == null ? void 0 : _c.result) : deserializeListOptions(formula1);
   }
   async getListAsync(rule, currentUnitId, currentSubUnitId) {
-    var _a23, _b, _c;
-    const { formula1 = "" } = rule, univerInstanceService = this.injector.get(IUniverInstanceService), workbook = (_a23 = currentUnitId ? univerInstanceService.getUniverSheetInstance(currentUnitId) : void 0) != null ? _a23 : univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+    var _a22, _b, _c;
+    const { formula1 = "" } = rule, univerInstanceService = this.injector.get(IUniverInstanceService), workbook = (_a22 = currentUnitId ? univerInstanceService.getUniverSheetInstance(currentUnitId) : void 0) != null ? _a22 : univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
     if (!workbook) return [];
     const worksheet = (_b = currentSubUnitId ? workbook.getSheetBySheetId(currentSubUnitId) : void 0) != null ? _b : workbook.getActiveSheet();
     if (!worksheet) return [];
@@ -2509,10 +2548,10 @@ const _DecimalValidator = class _DecimalValidator extends BaseDataValidator {
     return formula == null ? Number.NaN : +formula;
   }
   async parseFormula(rule, unitId, subUnitId) {
-    var _a23, _b, _c, _d, _e, _f, _g, _h;
+    var _a22, _b, _c, _d, _e, _f, _g, _h;
     const formulaInfo = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule;
     return {
-      formula1: this._parseNumber(isFormulaString(formula1) ? (_d = (_c = (_b = (_a23 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a23.result) == null ? void 0 : _b[0]) == null ? void 0 : _c[0]) == null ? void 0 : _d.v : formula1),
+      formula1: this._parseNumber(isFormulaString(formula1) ? (_d = (_c = (_b = (_a22 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a22.result) == null ? void 0 : _b[0]) == null ? void 0 : _c[0]) == null ? void 0 : _d.v : formula1),
       formula2: this._parseNumber(isFormulaString(formula2) ? (_h = (_g = (_f = (_e = formulaInfo == null ? void 0 : formulaInfo[1]) == null ? void 0 : _e.result) == null ? void 0 : _f[0]) == null ? void 0 : _g[0]) == null ? void 0 : _h.v : formula2)
     };
   }
@@ -2618,10 +2657,10 @@ const FORMULA1 = "{FORMULA1}", FORMULA2 = "{FORMULA2}", _TextLengthValidator = c
     return !Number.isNaN(formula);
   }
   async parseFormula(rule, unitId, subUnitId) {
-    var _a23, _b, _c, _d, _e, _f, _g, _h;
+    var _a22, _b, _c, _d, _e, _f, _g, _h;
     const formulaInfo = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule;
     return {
-      formula1: this._parseNumber(isFormulaString(formula1) ? (_d = (_c = (_b = (_a23 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a23.result) == null ? void 0 : _b[0]) == null ? void 0 : _c[0]) == null ? void 0 : _d.v : formula1),
+      formula1: this._parseNumber(isFormulaString(formula1) ? (_d = (_c = (_b = (_a22 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a22.result) == null ? void 0 : _b[0]) == null ? void 0 : _c[0]) == null ? void 0 : _d.v : formula1),
       formula2: this._parseNumber(isFormulaString(formula2) ? (_h = (_g = (_f = (_e = formulaInfo == null ? void 0 : formulaInfo[1]) == null ? void 0 : _e.result) == null ? void 0 : _f[0]) == null ? void 0 : _g[0]) == null ? void 0 : _h.v : formula2)
     };
   }
@@ -2674,15 +2713,15 @@ const FORMULA1 = "{FORMULA1}", FORMULA2 = "{FORMULA2}", _TextLengthValidator = c
     return this._isValidFormula(formula1) ? cellValue <= formula1 : !1;
   }
   generateRuleErrorMessage(rule) {
-    var _a23, _b;
-    return rule.operator ? `${this.localeService.t(TextLengthErrorTitleMap[rule.operator]).replace(FORMULA1, (_a23 = rule.formula1) != null ? _a23 : "").replace(FORMULA2, (_b = rule.formula2) != null ? _b : "")}` : this.titleStr;
+    var _a22, _b;
+    return rule.operator ? `${this.localeService.t(TextLengthErrorTitleMap[rule.operator]).replace(FORMULA1, (_a22 = rule.formula1) != null ? _a22 : "").replace(FORMULA2, (_b = rule.formula2) != null ? _b : "")}` : this.titleStr;
   }
 };
 __name(_TextLengthValidator, "TextLengthValidator");
 let TextLengthValidator = _TextLengthValidator;
 function isBlankCell(cellData) {
-  var _a23, _b;
-  return cellData ? cellData.p ? !((_b = (_a23 = cellData.p.body) == null ? void 0 : _a23.dataStream) != null ? _b : "").slice(0, -2).trim() : Tools.isBlank(cellData.v) : !0;
+  var _a22, _b;
+  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") {
@@ -2974,6 +3013,12 @@ const UpdateSheetDataValidationRangeCommand = {
       undoMutations
     }), commandService.executeCommand(UpdateDataValidationMutation.id, mutationParams), !0;
   }
+}, ClearRangeDataValidationCommand = {
+  type: CommandType.COMMAND,
+  id: "sheets.command.clear-range-data-validation",
+  handler(accessor, params) {
+    return params ? (accessor.get(ICommandService), !0) : !1;
+  }
 }, DataValidationIcon = "data-validation-single", DATA_VALIDATION_MENU_ID = "sheet.menu.data-validation";
 function dataValidationMenuFactory(accessor) {
   return {
@@ -3006,11 +3051,11 @@ function addDataValidationMenuFactory(_accessor) {
   };
 }
 __name(addDataValidationMenuFactory, "addDataValidationMenuFactory");
-var __defProp$d = Object.defineProperty, __getOwnPropDesc$d = Object.getOwnPropertyDescriptor, __decorateClass$d = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$d(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+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$d(target, key, result), result;
-}, "__decorateClass$d"), __decorateParam$d = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$d");
+  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 = {
   tr: {
     size: 6,
@@ -3036,9 +3081,9 @@ let SheetsDataValidationRenderController = (_a8 = class extends RxDisposable {
   }
   _initDropdown() {
     this._editorBridgeService && this.disposeWithMe(this._editorBridgeService.visible$.subscribe((visible) => {
-      var _a23;
+      var _a22;
       if (!visible.visible) {
-        ((_a23 = this._dropdownManagerService.activeDropdown) == null ? void 0 : _a23.trigger) === "editor-bridge" && this._dropdownManagerService.hideDropdown();
+        ((_a22 = this._dropdownManagerService.activeDropdown) == null ? void 0 : _a22.trigger) === "editor-bridge" && this._dropdownManagerService.hideDropdown();
         return;
       }
       const state = this._editorBridgeService.getEditCellState();
@@ -3079,10 +3124,10 @@ let SheetsDataValidationRenderController = (_a8 = class extends RxDisposable {
   }
   _initSkeletonChange() {
     const markSkeletonDirty = /* @__PURE__ */ __name(() => {
-      var _a23, _b, _c;
+      var _a22, _b, _c;
       const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
       if (!workbook) return;
-      const unitId = workbook.getUnitId(), subUnitId = (_a23 = workbook.getActiveSheet()) == null ? void 0 : _a23.getSheetId();
+      const unitId = workbook.getUnitId(), subUnitId = (_a22 = workbook.getActiveSheet()) == null ? void 0 : _a22.getSheetId();
       if (!subUnitId) return;
       const skeleton = (_c = (_b = this._renderManagerService.getRenderById(unitId)) == null ? void 0 : _b.with(SheetSkeletonManagerService).getWorksheetSkeleton(subUnitId)) == null ? void 0 : _c.skeleton, currentRender = this._renderManagerService.getRenderById(unitId);
       skeleton == null || skeleton.makeDirty(!0), skeleton == null || skeleton.calculate(), currentRender && currentRender.mainComponent.makeForceDirty();
@@ -3095,14 +3140,15 @@ let SheetsDataValidationRenderController = (_a8 = class extends RxDisposable {
       this._sheetInterceptorService.intercept(
         INTERCEPTOR_POINT.CELL_CONTENT,
         {
-          priority: 200,
+          // must be after numfmt
+          priority: InterceptCellContentPriority.DATA_VALIDATION,
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: /* @__PURE__ */ __name((cell, pos, next) => {
-            var _a23, _b, _c, _d, _e, _f;
+            var _a22, _b, _c, _d, _e, _f;
             const { row, col, unitId, subUnitId, workbook, worksheet } = pos, manager = this._dataValidationModel.ensureManager(unitId, subUnitId);
             if (!manager)
               return next(cell);
-            const skeleton = (_b = (_a23 = this._renderManagerService.getRenderById(unitId)) == null ? void 0 : _a23.with(SheetSkeletonManagerService).getWorksheetSkeleton(subUnitId)) == null ? void 0 : _b.skeleton;
+            const skeleton = (_b = (_a22 = this._renderManagerService.getRenderById(unitId)) == null ? void 0 : _a22.with(SheetSkeletonManagerService).getWorksheetSkeleton(subUnitId)) == null ? void 0 : _b.skeleton;
             if (!skeleton)
               return next(cell);
             const styleMap = pos.workbook.getStyles(), defaultStyle = (typeof (cell == null ? void 0 : cell.s) == "string" ? styleMap.get(cell == null ? void 0 : cell.s) : cell == null ? void 0 : cell.s) || {}, ruleId = manager.getRuleIdByLocation(row, col);
@@ -3111,7 +3157,7 @@ let SheetsDataValidationRenderController = (_a8 = class extends RxDisposable {
             const rule = manager.getRuleById(ruleId);
             if (!rule)
               return next(cell);
-            const cellRaw = worksheet.getCellRaw(pos.row, pos.col), validStatus = this._dataValidationModel.validator(getCellValueOrigin(cellRaw), rule, pos), validator = this._dataValidatorRegistryService.getValidatorItem(rule.type), cellValue = getCellValueOrigin(cell);
+            const validStatus = this._dataValidationModel.validator(rule, pos, cell), validator = this._dataValidatorRegistryService.getValidatorItem(rule.type), cellValue = getCellValueOrigin(cell);
             let extra = {};
             if ((rule.type === DataValidationType.LIST || rule.type === DataValidationType.LIST_MULTIPLE) && (extra = {
               interceptorStyle: {
@@ -3163,7 +3209,7 @@ let SheetsDataValidationRenderController = (_a8 = class extends RxDisposable {
                 ...extra.interceptorStyle
               },
               get interceptorAutoHeight() {
-                var _a24, _b2, _c2, _d2;
+                var _a23, _b2, _c2, _d2;
                 const mergeCell = skeleton.mergeData.find((range) => {
                   const { startColumn, startRow, endColumn, endRow } = range;
                   return row >= startRow && col >= startColumn && row <= endRow && col <= endColumn;
@@ -3178,7 +3224,7 @@ let SheetsDataValidationRenderController = (_a8 = class extends RxDisposable {
                     }
                   },
                   style: skeleton.getsStyles().getStyleByCell(cell),
-                  primaryWithCoord: skeleton.getCellByIndex((_a24 = mergeCell == null ? void 0 : mergeCell.startRow) != null ? _a24 : row, (_b2 = mergeCell == null ? void 0 : mergeCell.startColumn) != null ? _b2 : col),
+                  primaryWithCoord: skeleton.getCellByIndex((_a23 = mergeCell == null ? void 0 : mergeCell.startRow) != null ? _a23 : row, (_b2 = mergeCell == null ? void 0 : mergeCell.startColumn) != null ? _b2 : col),
                   unitId,
                   subUnitId,
                   row,
@@ -3204,8 +3250,8 @@ let SheetsDataValidationRenderController = (_a8 = class extends RxDisposable {
     ).subscribe((infos) => {
       const ranges = [];
       if (infos.forEach((info) => {
-        var _a23;
-        (_a23 = info.rule) != null && _a23.ranges && ranges.push(...info.rule.ranges);
+        var _a22;
+        (_a22 = info.rule) != null && _a22.ranges && ranges.push(...info.rule.ranges);
       }), ranges.length) {
         const mutations = this._autoHeightController.getUndoRedoParamsOfAutoHeight(ranges);
         sequenceExecute(mutations.redos, this._commandService);
@@ -3213,20 +3259,20 @@ let SheetsDataValidationRenderController = (_a8 = class extends RxDisposable {
     });
   }
 }, __name(_a8, "SheetsDataValidationRenderController"), _a8);
-SheetsDataValidationRenderController = __decorateClass$d([
+SheetsDataValidationRenderController = __decorateClass$c([
   OnLifecycle(LifecycleStages.Rendered, SheetsDataValidationRenderController),
-  __decorateParam$d(1, ICommandService),
-  __decorateParam$d(2, IMenuService),
-  __decorateParam$d(3, IRenderManagerService),
-  __decorateParam$d(4, IUniverInstanceService),
-  __decorateParam$d(5, Inject(AutoHeightController)),
-  __decorateParam$d(6, Inject(ComponentManager)),
-  __decorateParam$d(7, Inject(DataValidationDropdownManagerService)),
-  __decorateParam$d(8, Inject(DataValidationModel)),
-  __decorateParam$d(9, Inject(DataValidatorRegistryService)),
-  __decorateParam$d(10, Inject(Injector)),
-  __decorateParam$d(11, Inject(SheetInterceptorService)),
-  __decorateParam$d(12, Optional(IEditorBridgeService))
+  __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))
 ], SheetsDataValidationRenderController);
 var _a9;
 let SheetsDataValidationMobileRenderController = (_a9 = class extends RxDisposable {
@@ -3235,10 +3281,10 @@ let SheetsDataValidationMobileRenderController = (_a9 = class extends RxDisposab
   }
   _initSkeletonChange() {
     const markSkeletonDirty = /* @__PURE__ */ __name(() => {
-      var _a23, _b, _c;
+      var _a22, _b, _c;
       const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
       if (!workbook) return;
-      const unitId = workbook.getUnitId(), subUnitId = (_a23 = workbook.getActiveSheet()) == null ? void 0 : _a23.getSheetId();
+      const unitId = workbook.getUnitId(), subUnitId = (_a22 = workbook.getActiveSheet()) == null ? void 0 : _a22.getSheetId();
       if (!subUnitId) return;
       const skeleton = (_c = (_b = this._renderManagerService.getRenderById(unitId)) == null ? void 0 : _b.with(SheetSkeletonManagerService).getWorksheetSkeleton(subUnitId)) == null ? void 0 : _c.skeleton, currentRender = this._renderManagerService.getRenderById(unitId);
       skeleton == null || skeleton.makeDirty(!0), skeleton == null || skeleton.calculate(), currentRender && currentRender.mainComponent.makeForceDirty();
@@ -3251,14 +3297,14 @@ let SheetsDataValidationMobileRenderController = (_a9 = class extends RxDisposab
       this._sheetInterceptorService.intercept(
         INTERCEPTOR_POINT.CELL_CONTENT,
         {
-          priority: 200,
-          // eslint-disable-next-line max-lines-per-function
+          priority: InterceptCellContentPriority.DATA_VALIDATION,
+          // eslint-disable-next-line max-lines-per-function, complexity
           handler: /* @__PURE__ */ __name((cell, pos, next) => {
-            var _a23, _b, _c, _d, _e;
+            var _a22, _b, _c, _d, _e;
             const { row, col, unitId, subUnitId, workbook, worksheet } = pos, manager = this._dataValidationModel.ensureManager(unitId, subUnitId);
             if (!manager)
               return next(cell);
-            const skeleton = (_b = (_a23 = this._renderManagerService.getRenderById(unitId)) == null ? void 0 : _a23.with(SheetSkeletonManagerService).getWorksheetSkeleton(subUnitId)) == null ? void 0 : _b.skeleton;
+            const skeleton = (_b = (_a22 = this._renderManagerService.getRenderById(unitId)) == null ? void 0 : _a22.with(SheetSkeletonManagerService).getWorksheetSkeleton(subUnitId)) == null ? void 0 : _b.skeleton;
             if (!skeleton)
               return next(cell);
             const styleMap = pos.workbook.getStyles(), defaultStyle = (typeof (cell == null ? void 0 : cell.s) == "string" ? styleMap.get(cell == null ? void 0 : cell.s) : cell == null ? void 0 : cell.s) || {}, ruleId = manager.getRuleIdByLocation(row, col);
@@ -3267,7 +3313,7 @@ let SheetsDataValidationMobileRenderController = (_a9 = class extends RxDisposab
             const rule = manager.getRuleById(ruleId);
             if (!rule)
               return next(cell);
-            const cellRaw = pos.worksheet.getCellRaw(pos.row, pos.col), validStatus = this._dataValidationModel.validator(getCellValueOrigin(cellRaw), rule, pos), validator = this._dataValidatorRegistryService.getValidatorItem(rule.type), cellValue = getCellValueOrigin(cell);
+            const validStatus = this._dataValidationModel.validator(rule, pos, cell), validator = this._dataValidatorRegistryService.getValidatorItem(rule.type), cellValue = getCellValueOrigin(cell);
             let extra = {};
             if ((rule.type === DataValidationType.LIST || rule.type === DataValidationType.LIST_MULTIPLE) && (extra = {
               interceptorStyle: {
@@ -3319,7 +3365,7 @@ let SheetsDataValidationMobileRenderController = (_a9 = class extends RxDisposab
                 ...extra.interceptorStyle
               },
               get interceptorAutoHeight() {
-                var _a24, _b2, _c2, _d2;
+                var _a23, _b2, _c2, _d2;
                 const mergeCell = skeleton.mergeData.find((range) => {
                   const { startColumn, startRow, endColumn, endRow } = range;
                   return row >= startRow && col >= startColumn && row <= endRow && col <= endColumn;
@@ -3334,7 +3380,7 @@ let SheetsDataValidationMobileRenderController = (_a9 = class extends RxDisposab
                     }
                   },
                   style: skeleton.getsStyles().getStyleByCell(cell),
-                  primaryWithCoord: skeleton.getCellByIndex((_a24 = mergeCell == null ? void 0 : mergeCell.startRow) != null ? _a24 : row, (_b2 = mergeCell == null ? void 0 : mergeCell.startColumn) != null ? _b2 : col),
+                  primaryWithCoord: skeleton.getCellByIndex((_a23 = mergeCell == null ? void 0 : mergeCell.startRow) != null ? _a23 : row, (_b2 = mergeCell == null ? void 0 : mergeCell.startColumn) != null ? _b2 : col),
                   unitId,
                   subUnitId,
                   row,
@@ -3357,8 +3403,8 @@ let SheetsDataValidationMobileRenderController = (_a9 = class extends RxDisposab
     ).subscribe((infos) => {
       const ranges = [];
       if (infos.forEach((info) => {
-        var _a23;
-        (_a23 = info.rule) != null && _a23.ranges && ranges.push(...info.rule.ranges);
+        var _a22;
+        (_a22 = info.rule) != null && _a22.ranges && ranges.push(...info.rule.ranges);
       }), ranges.length) {
         const mutations = this._autoHeightController.getUndoRedoParamsOfAutoHeight(ranges);
         sequenceExecute(mutations.redos, this._commandService);
@@ -3366,62 +3412,28 @@ let SheetsDataValidationMobileRenderController = (_a9 = class extends RxDisposab
     });
   }
 }, __name(_a9, "SheetsDataValidationMobileRenderController"), _a9);
-SheetsDataValidationMobileRenderController = __decorateClass$d([
+SheetsDataValidationMobileRenderController = __decorateClass$c([
   OnLifecycle(LifecycleStages.Rendered, SheetsDataValidationMobileRenderController),
-  __decorateParam$d(1, ICommandService),
-  __decorateParam$d(2, IRenderManagerService),
-  __decorateParam$d(3, IUniverInstanceService),
-  __decorateParam$d(4, Inject(AutoHeightController)),
-  __decorateParam$d(5, Inject(DataValidationModel)),
-  __decorateParam$d(6, Inject(DataValidatorRegistryService)),
-  __decorateParam$d(7, Inject(SheetInterceptorService))
+  __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))
 ], SheetsDataValidationMobileRenderController);
-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"), _a10;
-let SheetDataValidationService = (_a10 = class extends Disposable {
-  constructor(_dataValidationModel) {
-    super();
-    __publicField(this, "_currentManager");
-    __publicField(this, "_currentManager$", new Subject());
-    __publicField(this, "currentManager$", this._currentManager$.asObservable());
-    this._dataValidationModel = _dataValidationModel, this.disposeWithMe(() => {
-      this._currentManager$.complete();
-    });
-  }
-  get currentManager() {
-    return this._currentManager;
-  }
-  _ensureManager(unitId, subUnitId) {
-    return this._dataValidationModel.ensureManager(unitId, subUnitId);
-  }
-  switchCurrent(unitId, subUnitId) {
-    var _a23, _b;
-    if (unitId === ((_a23 = this.currentManager) == null ? void 0 : _a23.unitId) && subUnitId === ((_b = this._currentManager) == null ? void 0 : _b.subUnitId))
-      return;
-    const manager = this._ensureManager(unitId, subUnitId);
-    this._currentManager = {
-      manager,
-      unitId,
-      subUnitId
-    }, this._currentManager$.next(this._currentManager);
-  }
-  get(unitId, subUnitId) {
-    return this._ensureManager(unitId, subUnitId);
-  }
-}, __name(_a10, "SheetDataValidationService"), _a10);
-SheetDataValidationService = __decorateClass$c([
-  __decorateParam$c(0, Inject(DataValidationModel))
-], SheetDataValidationService);
 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--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
   return kind && result && __defProp$b(target, key, result), result;
-}, "__decorateClass$b"), __decorateParam$b = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$b"), _a11;
-let DataValidationCustomFormulaService = (_a11 = class extends Disposable {
-  constructor(_instanceSrv, _registerOtherFormulaService, _lexerTreeBuilder, _dataValidationModel, _dataValidationCacheService) {
+}, "__decorateClass$b"), __decorateParam$b = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$b");
+function transformFormula(lexerTreeBuilder, formula, originRow, originCol, targetRow, targetCol) {
+  return lexerTreeBuilder.moveFormulaRefOffset(formula, targetCol - originCol, targetRow - originRow);
+}
+__name(transformFormula, "transformFormula");
+var _a10;
+let DataValidationCustomFormulaService = (_a10 = class extends Disposable {
+  constructor(_instanceSrv, _registerOtherFormulaService, _lexerTreeBuilder, _dataValidationModel, _dataValidationCacheService, _logService) {
     super();
     __publicField(this, "_formulaMap", /* @__PURE__ */ new Map());
     /**
@@ -3432,7 +3444,7 @@ let DataValidationCustomFormulaService = (_a11 = class extends Disposable {
      * reflect of formulaId to cell, only store transformable formula
      */
     __publicField(this, "_formulaCellMap", /* @__PURE__ */ new Map());
-    this._instanceSrv = _instanceSrv, this._registerOtherFormulaService = _registerOtherFormulaService, this._lexerTreeBuilder = _lexerTreeBuilder, this._dataValidationModel = _dataValidationModel, this._dataValidationCacheService = _dataValidationCacheService, this._initFormulaResultHandler();
+    this._instanceSrv = _instanceSrv, this._registerOtherFormulaService = _registerOtherFormulaService, this._lexerTreeBuilder = _lexerTreeBuilder, this._dataValidationModel = _dataValidationModel, this._dataValidationCacheService = _dataValidationCacheService, this._logService = _logService, this._initFormulaResultHandler();
   }
   _initFormulaResultHandler() {
     this.disposeWithMe(this._registerOtherFormulaService.formulaResult$.subscribe((resultMap) => {
@@ -3442,8 +3454,8 @@ let DataValidationCustomFormulaService = (_a11 = class extends Disposable {
           for (const subUnitId in unitMap) {
             const results = unitMap[subUnitId], { formulaCellMap, ruleFormulaMap } = this._ensureMaps(unitId, subUnitId), manager = this._dataValidationModel.ensureManager(unitId, subUnitId);
             results.forEach((result) => {
-              var _a23, _b;
-              const ruleInfo = ruleFormulaMap.get((_a23 = result.extra) == null ? void 0 : _a23.ruleId), cellInfo = formulaCellMap.get(result.formulaId), rule = manager.getRuleById((_b = result.extra) == null ? void 0 : _b.ruleId);
+              var _a22, _b;
+              const ruleInfo = ruleFormulaMap.get((_a22 = result.extra) == null ? void 0 : _a22.ruleId), cellInfo = formulaCellMap.get(result.formulaId), rule = manager.getRuleById((_b = result.extra) == null ? void 0 : _b.ruleId);
               rule && ruleInfo && !ruleInfo.isTransformable && this._dataValidationCacheService.markRangeDirty(unitId, subUnitId, rule.ranges), cellInfo && this._dataValidationCacheService.markCellDirty(unitId, subUnitId, cellInfo.row, cellInfo.column);
             });
           }
@@ -3479,12 +3491,9 @@ let DataValidationCustomFormulaService = (_a11 = class extends Disposable {
     const { formulaMap, ruleFormulaMap, formulaCellMap } = this._ensureMaps(unitId, subUnitId);
     if (!formula)
       return;
-    const isTransformable = isFormulaTransformable(
-      this._lexerTreeBuilder,
-      formula
-    ), originRow = ranges[0].startRow, originCol = ranges[0].startColumn;
+    const originRow = ranges[0].startRow, originCol = ranges[0].startColumn;
     let originFormulaId;
-    isTransformable ? ranges.forEach((range) => {
+    ranges.forEach((range) => {
       Range.foreach(range, (row, column) => {
         const relativeFormula = transformFormula(
           this._lexerTreeBuilder,
@@ -3500,20 +3509,12 @@ let DataValidationCustomFormulaService = (_a11 = class extends Disposable {
           ruleId
         }), formulaCellMap.set(formulaId, { row, column });
       });
-    }) : (originFormulaId = this._registerFormula(unitId, subUnitId, ruleId, formula), ranges.forEach((range) => {
-      Range.foreach(range, (row, col) => {
-        formulaMap.setValue(row, col, {
-          formulaId: originFormulaId,
-          // formulaText: formula,
-          ruleId
-        });
-      });
-    })), ruleFormulaMap.set(ruleId, {
+    }), ruleFormulaMap.set(ruleId, {
       formula,
       originCol,
       originRow,
-      isTransformable,
-      formulaId: originFormulaId
+      formulaId: originFormulaId,
+      isTransformable: !0
     });
   }
   addRule(unitId, subUnitId, rule) {
@@ -3532,14 +3533,13 @@ let DataValidationCustomFormulaService = (_a11 = class extends Disposable {
       });
     }), newRanges.forEach((range) => {
       Range.foreach(range, (row, col) => {
-        var _a23;
-        const oldValue = (_a23 = formulaMap.getValue(row, col)) != null ? _a23 : {};
+        var _a22;
+        const oldValue = (_a22 = formulaMap.getValue(row, col)) != null ? _a22 : {};
         if (oldValue.ruleId !== ruleId) {
           const oldRuleFormula = ruleFormulaMap.get(oldValue.ruleId);
           if (oldRuleFormula != null && oldRuleFormula.isTransformable && deleteFormulaIdList.add(oldValue.formulaId), isTransformable) {
             const relativeText = transformFormula(this._lexerTreeBuilder, formula, originRow, originCol, row, col), formulaId2 = this._registerFormula(unitId, subUnitId, ruleId, relativeText);
             formulaMap.setValue(row, col, {
-              // formulaText: relativeText,
               ruleId,
               formulaId: formulaId2
             }), formulaCellMap.set(formulaId2, { row, column: col });
@@ -3573,14 +3573,19 @@ let DataValidationCustomFormulaService = (_a11 = class extends Disposable {
     const { ruleFormulaMap } = this._ensureMaps(unitId, subUnitId);
     return ruleFormulaMap.get(ruleId);
   }
-}, __name(_a11, "DataValidationCustomFormulaService"), _a11);
+}, __name(_a10, "DataValidationCustomFormulaService"), _a10);
 DataValidationCustomFormulaService = __decorateClass$b([
   __decorateParam$b(0, IUniverInstanceService),
   __decorateParam$b(1, Inject(RegisterOtherFormulaService)),
   __decorateParam$b(2, Inject(LexerTreeBuilder)),
   __decorateParam$b(3, Inject(DataValidationModel)),
-  __decorateParam$b(4, Inject(DataValidationCacheService))
+  __decorateParam$b(4, Inject(DataValidationCacheService)),
+  __decorateParam$b(5, ILogService)
 ], DataValidationCustomFormulaService);
+function isLegalFormulaResult(res) {
+  return !ERROR_TYPE_SET.has(res);
+}
+__name(isLegalFormulaResult, "isLegalFormulaResult");
 const _CustomFormulaValidator = class _CustomFormulaValidator extends BaseDataValidator {
   constructor() {
     super(...arguments);
@@ -3605,8 +3610,8 @@ const _CustomFormulaValidator = class _CustomFormulaValidator extends BaseDataVa
     };
   }
   async isValidType(cellInfo, _formula, _rule) {
-    const { column, row, unitId, subUnitId } = cellInfo, result = await this._customFormulaService.getCellFormulaValue(unitId, subUnitId, row, column);
-    return !!getFormulaResult(result == null ? void 0 : result.result);
+    const { column, row, unitId, subUnitId } = cellInfo, result = await this._customFormulaService.getCellFormulaValue(unitId, subUnitId, row, column), cellData = getFormulaCellData(result == null ? void 0 : result.result), formulaResult = cellData == null ? void 0 : cellData.v;
+    return Tools.isDefine(formulaResult) && formulaResult !== "" ? cellData.t === CellValueType.BOOLEAN ? !!formulaResult : typeof formulaResult == "boolean" ? formulaResult : typeof formulaResult == "number" ? !!formulaResult : typeof formulaResult == "string" ? isLegalFormulaResult(formulaResult) : !!formulaResult : !1;
   }
   generateRuleErrorMessage(rule) {
     return this.localeService.t("dataValidation.custom.error");
@@ -3652,10 +3657,10 @@ const _WholeValidator = class _WholeValidator extends BaseDataValidator {
     return formula == null ? Number.NaN : +formula;
   }
   async parseFormula(rule, unitId, subUnitId) {
-    var _a23, _b, _c, _d, _e, _f, _g, _h;
+    var _a22, _b, _c, _d, _e, _f, _g, _h;
     const formulaInfo = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule;
     return {
-      formula1: this._parseNumber(isFormulaString(formula1) ? (_d = (_c = (_b = (_a23 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a23.result) == null ? void 0 : _b[0]) == null ? void 0 : _c[0]) == null ? void 0 : _d.v : formula1),
+      formula1: this._parseNumber(isFormulaString(formula1) ? (_d = (_c = (_b = (_a22 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a22.result) == null ? void 0 : _b[0]) == null ? void 0 : _c[0]) == null ? void 0 : _d.v : formula1),
       formula2: this._parseNumber(isFormulaString(formula2) ? (_h = (_g = (_f = (_e = formulaInfo == null ? void 0 : formulaInfo[1]) == null ? void 0 : _e.result) == null ? void 0 : _f[0]) == null ? void 0 : _g[0]) == null ? void 0 : _h.v : formula2)
     };
   }
@@ -3778,8 +3783,8 @@ var __defProp$a = Object.defineProperty, __getOwnPropDesc$a = Object.getOwnPrope
   return kind && result && __defProp$a(target, key, result), result;
 }, "__decorateClass$a"), __decorateParam$a = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$a");
 const downPath = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
-var _a12;
-let DropdownMultipleWidget = (_a12 = class {
+var _a11;
+let DropdownMultipleWidget = (_a11 = class {
   constructor(_commandService) {
     __publicField(this, "zIndex");
     __publicField(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
@@ -3807,7 +3812,7 @@ let DropdownMultipleWidget = (_a12 = class {
   }
   // eslint-disable-next-line max-lines-per-function
   drawWith(ctx, info, skeleton, spreadsheets) {
-    var _a23, _b;
+    var _a22, _b;
     const { primaryWithCoord, row, col, style, data, subUnitId } = info, _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord, fontRenderExtension = data.fontRenderExtension, { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {}, validation = data.dataValidation, map = this._ensureMap(subUnitId), key = this._generateKey(row, col);
     if (!validation)
       return;
@@ -3816,7 +3821,7 @@ let DropdownMultipleWidget = (_a12 = class {
       endX: _cellBounding.endX - rightOffset,
       startY: _cellBounding.startY + topOffset,
       endY: _cellBounding.endY - downOffset
-    }, cellWidth = cellBounding.endX - cellBounding.startX, cellHeight = cellBounding.endY - cellBounding.startY, { cl } = style || {}, color = (_a23 = typeof cl == "object" ? cl == null ? void 0 : cl.rgb : cl) != null ? _a23 : "#000", fontStyle = getFontStyleString(style != null ? style : void 0), { rule, validator: _validator } = validation, validator = _validator, { vt: _vt, ht } = style || {}, vt = _vt != null ? _vt : VerticalAlign.MIDDLE, cellValue = (_b = getCellValueOrigin(data)) != null ? _b : "", items = validator.parseCellValue(cellValue), labelColorMap = validator.getListWithColorMap(rule), layout = layoutDropdowns(items, fontStyle, cellWidth, cellHeight);
+    }, cellWidth = cellBounding.endX - cellBounding.startX, cellHeight = cellBounding.endY - cellBounding.startY, { cl } = style || {}, color = (_a22 = typeof cl == "object" ? cl == null ? void 0 : cl.rgb : cl) != null ? _a22 : "#000", fontStyle = getFontStyleString(style != null ? style : void 0), { rule, validator: _validator } = validation, validator = _validator, { vt: _vt, ht } = style || {}, vt = _vt != null ? _vt : VerticalAlign.MIDDLE, cellValue = (_b = getCellValueOrigin(data)) != null ? _b : "", items = validator.parseCellValue(cellValue), labelColorMap = validator.getListWithColorMap(rule), layout = layoutDropdowns(items, fontStyle, cellWidth, cellHeight);
     this._drawDownIcon(ctx, cellBounding, cellWidth, cellHeight, vt), ctx.save(), ctx.translateWithPrecision(cellBounding.startX, cellBounding.startY), ctx.beginPath(), ctx.rect(0, 0, cellWidth - ICON_PLACE, cellHeight), ctx.clip(), ctx.translateWithPrecision(CELL_PADDING_H, CELL_PADDING_V);
     let top = 0;
     switch (vt) {
@@ -3855,7 +3860,7 @@ let DropdownMultipleWidget = (_a12 = class {
     });
   }
   calcCellAutoHeight(info) {
-    var _a23;
+    var _a22;
     const { primaryWithCoord, style, data } = info, fontRenderExtension = data.fontRenderExtension, { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {}, _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord, cellBounding = {
       startX: _cellBounding.startX + leftOffset,
       endX: _cellBounding.endX - rightOffset,
@@ -3864,7 +3869,7 @@ let DropdownMultipleWidget = (_a12 = class {
     }, validation = data.dataValidation;
     if (!validation)
       return;
-    const cellWidth = cellBounding.endX - cellBounding.startX, cellHeight = cellBounding.endY - cellBounding.startY, cellValue = (_a23 = getCellValueOrigin(data)) != null ? _a23 : "", { validator: _validator } = validation, items = _validator.parseCellValue(cellValue), fontStyle = getFontStyleString(style != null ? style : void 0);
+    const cellWidth = cellBounding.endX - cellBounding.startX, cellHeight = cellBounding.endY - cellBounding.startY, cellValue = (_a22 = getCellValueOrigin(data)) != null ? _a22 : "", { validator: _validator } = validation, items = _validator.parseCellValue(cellValue), fontStyle = getFontStyleString(style != null ? style : void 0);
     return layoutDropdowns(items, fontStyle, cellWidth, cellHeight).cellAutoHeight;
   }
   isHit(position, info) {
@@ -3882,7 +3887,7 @@ let DropdownMultipleWidget = (_a12 = class {
     };
     this._commandService.executeCommand(ShowDataValidationDropdown.id, params);
   }
-}, __name(_a12, "DropdownMultipleWidget"), _a12);
+}, __name(_a11, "DropdownMultipleWidget"), _a11);
 DropdownMultipleWidget = __decorateClass$a([
   __decorateParam$a(0, ICommandService)
 ], DropdownMultipleWidget);
@@ -3903,13 +3908,13 @@ var __defProp$9 = Object.defineProperty, __getOwnPropDesc$9 = Object.getOwnPrope
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$9(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$9(target, key, result), result;
-}, "__decorateClass$9"), __decorateParam$9 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$9"), _a13;
-let DataValidationController = (_a13 = class extends RxDisposable {
-  constructor(_univerInstanceService, _sheetDataValidationService, _dataValidatorRegistryService, _injector, _componentManger, _selectionManagerService, _sheetInterceptorService, _dataValidationModel) {
-    super(), this._univerInstanceService = _univerInstanceService, this._sheetDataValidationService = _sheetDataValidationService, this._dataValidatorRegistryService = _dataValidatorRegistryService, this._injector = _injector, this._componentManger = _componentManger, this._selectionManagerService = _selectionManagerService, this._sheetInterceptorService = _sheetInterceptorService, this._dataValidationModel = _dataValidationModel, this._init();
+}, "__decorateClass$9"), __decorateParam$9 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$9"), _a12;
+let DataValidationController = (_a12 = class extends RxDisposable {
+  constructor(_univerInstanceService, _dataValidatorRegistryService, _injector, _componentManger, _selectionManagerService, _sheetInterceptorService, _dataValidationModel) {
+    super(), this._univerInstanceService = _univerInstanceService, this._dataValidatorRegistryService = _dataValidatorRegistryService, this._injector = _injector, this._componentManger = _componentManger, this._selectionManagerService = _selectionManagerService, this._sheetInterceptorService = _sheetInterceptorService, this._dataValidationModel = _dataValidationModel, this._init();
   }
   _init() {
-    this._registerValidators(), this._initInstanceChange(), this._initCommandInterceptor(), this._initComponents();
+    this._registerValidators(), this._initCommandInterceptor(), this._initComponents();
   }
   _registerValidators() {
     [
@@ -3932,31 +3937,15 @@ let DataValidationController = (_a13 = class extends RxDisposable {
       });
     });
   }
-  _initInstanceChange() {
-    const disposableCollection = new DisposableCollection();
-    this.disposeWithMe(this._univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).subscribe((workbook) => {
-      if (disposableCollection.dispose(), !workbook)
-        return;
-      const worksheet = workbook.getActiveSheet();
-      worksheet && (this._sheetDataValidationService.switchCurrent(workbook.getUnitId(), worksheet.getSheetId()), disposableCollection.add(toDisposable(
-        workbook.activeSheet$.subscribe((worksheet2) => {
-          if (worksheet2) {
-            const unitId = workbook.getUnitId(), subUnitId = worksheet2.getSheetId();
-            this._sheetDataValidationService.switchCurrent(unitId, subUnitId);
-          }
-        })
-      )));
-    })), this.disposeWithMe(disposableCollection);
-  }
   _initCommandInterceptor() {
     this._sheetInterceptorService.interceptCommand({
       getMutations: /* @__PURE__ */ __name((commandInfo) => {
-        var _a23;
+        var _a22;
         if (commandInfo.id === ClearSelectionAllCommand.id) {
           const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET), unitId = workbook.getUnitId(), worksheet = workbook.getActiveSheet();
           if (!worksheet)
             throw new Error("No active sheet found");
-          const subUnitId = worksheet.getSheetId(), selections = (_a23 = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : _a23.map((s) => s.range), manager = this._dataValidationModel.ensureManager(unitId, subUnitId), ruleMatrix = manager.getRuleObjectMatrix().clone();
+          const subUnitId = worksheet.getSheetId(), selections = (_a22 = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : _a22.map((s) => s.range), manager = this._dataValidationModel.ensureManager(unitId, subUnitId), ruleMatrix = manager.getRuleObjectMatrix().clone();
           selections && ruleMatrix.removeRange(selections);
           const diffs = ruleMatrix.diff(manager.getDataValidations()), { redoMutations, undoMutations } = getDataValidationDiffMutations(unitId, subUnitId, diffs, this._injector, "patched");
           return {
@@ -3988,17 +3977,16 @@ let DataValidationController = (_a13 = class extends RxDisposable {
       ));
     });
   }
-}, __name(_a13, "DataValidationController"), _a13);
+}, __name(_a12, "DataValidationController"), _a12);
 DataValidationController = __decorateClass$9([
   OnLifecycle(LifecycleStages.Rendered, DataValidationController),
   __decorateParam$9(0, IUniverInstanceService),
-  __decorateParam$9(1, Inject(SheetDataValidationService)),
-  __decorateParam$9(2, Inject(DataValidatorRegistryService)),
-  __decorateParam$9(3, Inject(Injector)),
-  __decorateParam$9(4, Inject(ComponentManager)),
-  __decorateParam$9(5, Inject(SheetsSelectionsService)),
-  __decorateParam$9(6, Inject(SheetInterceptorService)),
-  __decorateParam$9(7, Inject(DataValidationModel))
+  __decorateParam$9(1, Inject(DataValidatorRegistryService)),
+  __decorateParam$9(2, Inject(Injector)),
+  __decorateParam$9(3, Inject(ComponentManager)),
+  __decorateParam$9(4, Inject(SheetsSelectionsService)),
+  __decorateParam$9(5, Inject(SheetInterceptorService)),
+  __decorateParam$9(6, Inject(DataValidationModel))
 ], DataValidationController);
 var __defProp$8 = Object.defineProperty, __getOwnPropDesc$8 = Object.getOwnPropertyDescriptor, __decorateClass$8 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$8(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
@@ -4006,8 +3994,8 @@ var __defProp$8 = Object.defineProperty, __getOwnPropDesc$8 = Object.getOwnPrope
   return kind && result && __defProp$8(target, key, result), result;
 }, "__decorateClass$8"), __decorateParam$8 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$8");
 const ALERT_KEY = "SHEET_DATA_VALIDATION_ALERT";
-var _a14;
-let DataValidationAlertController = (_a14 = class extends Disposable {
+var _a13;
+let DataValidationAlertController = (_a13 = class extends Disposable {
   constructor(_hoverManagerService, _cellAlertManagerService, _univerInstanceService, _localeService) {
     super(), this._hoverManagerService = _hoverManagerService, this._cellAlertManagerService = _cellAlertManagerService, this._univerInstanceService = _univerInstanceService, this._localeService = _localeService, this._init();
   }
@@ -4016,12 +4004,12 @@ let DataValidationAlertController = (_a14 = class extends Disposable {
   }
   _initCellAlertPopup() {
     this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(debounceTime(100)).subscribe((cellPos) => {
-      var _a23, _b;
+      var _a22, _b;
       if (cellPos) {
         const worksheet = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET).getActiveSheet();
         if (!worksheet) return;
         const cellData = worksheet.getCell(cellPos.location.row, cellPos.location.col);
-        if (((_a23 = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _a23.validStatus) === DataValidationStatus.INVALID) {
+        if (((_a22 = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _a22.validStatus) === DataValidationStatus.INVALID) {
           const currentAlert = this._cellAlertManagerService.currentAlert.get(ALERT_KEY), currentLoc = (_b = currentAlert == null ? void 0 : currentAlert.alert) == null ? void 0 : _b.location;
           if (currentLoc && currentLoc.row === cellPos.location.row && currentLoc.col === cellPos.location.col && currentLoc.subUnitId === cellPos.location.subUnitId && currentLoc.unitId === cellPos.location.unitId)
             return;
@@ -4043,7 +4031,7 @@ let DataValidationAlertController = (_a14 = class extends Disposable {
       this._cellAlertManagerService.removeAlert(ALERT_KEY);
     }));
   }
-}, __name(_a14, "DataValidationAlertController"), _a14);
+}, __name(_a13, "DataValidationAlertController"), _a13);
 DataValidationAlertController = __decorateClass$8([
   OnLifecycle(LifecycleStages.Rendered, DataValidationAlertController),
   __decorateParam$8(0, Inject(HoverManagerService)),
@@ -4055,8 +4043,8 @@ var __defProp$7 = Object.defineProperty, __getOwnPropDesc$7 = Object.getOwnPrope
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$7(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$7(target, key, result), result;
-}, "__decorateClass$7"), __decorateParam$7 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$7"), _a15;
-let DataValidationRefRangeController = (_a15 = class extends Disposable {
+}, "__decorateClass$7"), __decorateParam$7 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$7"), _a14;
+let DataValidationRefRangeController = (_a14 = class extends Disposable {
   constructor(_dataValidationModel, _injector, _refRangeService, _dataValidationCustomFormulaService, _dataValidationFormulaService, _formulaRefRangeService) {
     super();
     __publicField(this, "_disposableMap", /* @__PURE__ */ new Map());
@@ -4070,8 +4058,8 @@ let DataValidationRefRangeController = (_a15 = class extends Disposable {
   }
   // eslint-disable-next-line max-lines-per-function
   registerFormula(unitId, subUnitId, rule) {
-    var _a23;
-    const ruleId = rule.uid, id = this._getIdWithUnitId(unitId, subUnitId, ruleId), disposeSet = (_a23 = this._disposableMap.get(id)) != null ? _a23 : /* @__PURE__ */ new Set(), handleFormulaChange = /* @__PURE__ */ __name((type, formulaString) => {
+    var _a22;
+    const ruleId = rule.uid, id = this._getIdWithUnitId(unitId, subUnitId, ruleId), disposeSet = (_a22 = this._disposableMap.get(id)) != null ? _a22 : /* @__PURE__ */ new Set(), handleFormulaChange = /* @__PURE__ */ __name((type, formulaString) => {
       const oldRule = this._dataValidationModel.getRuleById(unitId, subUnitId, ruleId);
       if (!oldRule)
         return { redos: [], undos: [] };
@@ -4148,7 +4136,7 @@ let DataValidationRefRangeController = (_a15 = class extends Disposable {
     }
   }
   register(unitId, subUnitId, rule) {
-    var _a23;
+    var _a22;
     const handleRangeChange = /* @__PURE__ */ __name((commandInfo) => {
       const oldRanges = [...rule.ranges], resultRanges = oldRanges.map((range) => handleCommonDefaultRangeChangeWithEffectRefCommands(range, commandInfo)).filter((range) => !!range).flat();
       if (isRangesEqual(resultRanges, oldRanges))
@@ -4186,7 +4174,7 @@ let DataValidationRefRangeController = (_a15 = class extends Disposable {
       const disposable = this._refRangeService.registerRefRange(range, handleRangeChange, unitId, subUnitId);
       disposeList.push(() => disposable.dispose());
     });
-    const id = this._getIdWithUnitId(unitId, subUnitId, rule.uid), current = (_a23 = this._disposableMap.get(id)) != null ? _a23 : /* @__PURE__ */ new Set();
+    const id = this._getIdWithUnitId(unitId, subUnitId, rule.uid), current = (_a22 = this._disposableMap.get(id)) != null ? _a22 : /* @__PURE__ */ new Set();
     current.add(() => disposeList.forEach((dispose) => dispose())), this._disposableMap.set(id, current);
   }
   _initRefRange() {
@@ -4217,7 +4205,7 @@ let DataValidationRefRangeController = (_a15 = class extends Disposable {
       }), this._disposableMap.clear();
     }));
   }
-}, __name(_a15, "DataValidationRefRangeController"), _a15);
+}, __name(_a14, "DataValidationRefRangeController"), _a14);
 DataValidationRefRangeController = __decorateClass$7([
   OnLifecycle(LifecycleStages.Starting, DataValidationRefRangeController),
   __decorateParam$7(0, Inject(DataValidationModel)),
@@ -4231,8 +4219,8 @@ var __defProp$6 = Object.defineProperty, __getOwnPropDesc$6 = Object.getOwnPrope
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$6(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$6(target, key, result), result;
-}, "__decorateClass$6"), __decorateParam$6 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$6"), _a16;
-let DataValidationAutoFillController = (_a16 = class extends Disposable {
+}, "__decorateClass$6"), __decorateParam$6 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$6"), _a15;
+let DataValidationAutoFillController = (_a15 = class extends Disposable {
   constructor(_autoFillService, _dataValidationModel, _injector) {
     super(), this._autoFillService = _autoFillService, this._dataValidationModel = _dataValidationModel, this._injector = _injector, this._initAutoFill();
   }
@@ -4305,7 +4293,7 @@ let DataValidationAutoFillController = (_a16 = class extends Disposable {
     };
     this.disposeWithMe(this._autoFillService.addHook(hook));
   }
-}, __name(_a16, "DataValidationAutoFillController"), _a16);
+}, __name(_a15, "DataValidationAutoFillController"), _a15);
 DataValidationAutoFillController = __decorateClass$6([
   OnLifecycle(LifecycleStages.Ready, DataValidationAutoFillController),
   __decorateParam$6(0, IAutoFillService),
@@ -4316,8 +4304,8 @@ var __defProp$5 = Object.defineProperty, __getOwnPropDesc$5 = Object.getOwnPrope
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$5(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$5(target, key, result), result;
-}, "__decorateClass$5"), __decorateParam$5 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$5"), _a17;
-let DataValidationCopyPasteController = (_a17 = class extends Disposable {
+}, "__decorateClass$5"), __decorateParam$5 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$5"), _a16;
+let DataValidationCopyPasteController = (_a16 = class extends Disposable {
   constructor(_sheetClipboardService, _dataValidationModel, _injector) {
     super();
     __publicField(this, "_copyInfo");
@@ -4340,9 +4328,7 @@ let DataValidationCopyPasteController = (_a17 = class extends Disposable {
       subUnitId,
       matrix
     };
-    const manager = this._dataValidationModel.ensureManager(unitId, subUnitId), accessor = {
-      get: this._injector.get.bind(this._injector)
-    }, discreteRange = rangeToDiscreteRange(range, accessor, unitId, subUnitId);
+    const manager = this._dataValidationModel.ensureManager(unitId, subUnitId), discreteRange = this._injector.invoke((accessor) => rangeToDiscreteRange(range, accessor, unitId, subUnitId));
     if (!discreteRange)
       return;
     const { rows, cols } = discreteRange;
@@ -4374,8 +4360,8 @@ let DataValidationCopyPasteController = (_a17 = class extends Disposable {
     if (copyInfo.unitId !== unitId || subUnitId !== copyInfo.subUnitId) {
       const originManager = this._dataValidationModel.ensureManager(unitId, subUnitId), manager = this._dataValidationModel.ensureManager(copyInfo.unitId, copyInfo.subUnitId), ruleMatrix = manager.getRuleObjectMatrix().clone(), { ranges: [vCopyRange, vPastedRange], mapFunc } = virtualizeDiscreteRanges([copyInfo.copyRange, pastedRange]), repeatRange = getRepeatRange(vCopyRange, vPastedRange, !0), additionRules = /* @__PURE__ */ new Map();
       repeatRange.forEach(({ startRange }) => {
-        var _a23;
-        (_a23 = this._copyInfo) == null || _a23.matrix.forValue((row, col, ruleId) => {
+        var _a22;
+        (_a22 = this._copyInfo) == null || _a22.matrix.forValue((row, col, ruleId) => {
           const range = Rectangle.getPositionRange(
             {
               startRow: row,
@@ -4404,8 +4390,8 @@ let DataValidationCopyPasteController = (_a17 = class extends Disposable {
     } else {
       const manager = this._dataValidationModel.ensureManager(unitId, subUnitId), ruleMatrix = manager.getRuleObjectMatrix().clone(), { ranges: [vCopyRange, vPastedRange], mapFunc } = virtualizeDiscreteRanges([copyInfo.copyRange, pastedRange]);
       getRepeatRange(vCopyRange, vPastedRange, !0).forEach(({ startRange }) => {
-        var _a23;
-        (_a23 = this._copyInfo) == null || _a23.matrix.forValue((row, col, ruleId) => {
+        var _a22;
+        (_a22 = this._copyInfo) == null || _a22.matrix.forValue((row, col, ruleId) => {
           const range = Rectangle.getPositionRange(
             {
               startRow: row,
@@ -4431,7 +4417,7 @@ let DataValidationCopyPasteController = (_a17 = class extends Disposable {
       };
     }
   }
-}, __name(_a17, "DataValidationCopyPasteController"), _a17);
+}, __name(_a16, "DataValidationCopyPasteController"), _a16);
 DataValidationCopyPasteController = __decorateClass$5([
   OnLifecycle(LifecycleStages.Ready, DataValidationCopyPasteController),
   __decorateParam$5(0, ISheetClipboardService),
@@ -4556,9 +4542,9 @@ const _SheetDataValidationManager = class _SheetDataValidationManager extends Da
     this._ruleMatrix = new RuleMatrix(matrix, worksheet);
   }
   _addRuleSideEffect(rule) {
-    var _a23;
+    var _a22;
     const { unitId, subUnitId } = this;
-    (rule.type === DataValidationType.LIST || rule.type === DataValidationType.LIST_MULTIPLE) && isReferenceString((_a23 = rule.formula1) != null ? _a23 : "") && (rule.formula1 = `=${rule.formula1}`), this._ruleMatrix.addRule(rule), this._dataValidationCacheService.addRule(unitId, subUnitId, rule), this._dataValidationFormulaService.addRule(unitId, subUnitId, rule.uid, rule.formula1, rule.formula2), this._dataValidationCustomFormulaService.addRule(unitId, subUnitId, rule);
+    (rule.type === DataValidationType.LIST || rule.type === DataValidationType.LIST_MULTIPLE) && isReferenceString((_a22 = rule.formula1) != null ? _a22 : "") && (rule.formula1 = `=${rule.formula1}`), this._ruleMatrix.addRule(rule), this._dataValidationCacheService.addRule(unitId, subUnitId, rule), this._dataValidationFormulaService.addRule(unitId, subUnitId, rule.uid, rule.formula1, rule.formula2), this._dataValidationCustomFormulaService.addRule(unitId, subUnitId, rule);
   }
   addRule(rule, index) {
     (Array.isArray(rule) ? rule : [rule]).forEach((item) => {
@@ -4586,20 +4572,35 @@ const _SheetDataValidationManager = class _SheetDataValidationManager extends Da
     if (ruleId)
       return this.getRuleById(ruleId);
   }
-  validator(cellValue, rule, pos, onCompete) {
-    const { col, row, unitId, subUnitId } = pos, ruleId = rule.uid, validator = this.getValidator(rule.type);
+  validator(cell, rule, pos, onCompete) {
+    const { col, row, unitId, subUnitId, worksheet } = pos, ruleId = rule.uid, validator = this.getValidator(rule.type), cellRaw = worksheet.getCellRaw(row, col), cellValue = getCellValueOrigin(cellRaw), interceptValue = getCellValueOrigin(cell);
     if (validator) {
       const current = this._cache.getValue(row, col);
-      return !current || current.value !== cellValue ? (this._cache.setValue(row, col, {
+      return !current || current.value !== cellValue || current.interceptValue !== interceptValue || current.ruleId !== ruleId ? (this._cache.setValue(row, col, {
         value: cellValue,
+        interceptValue,
         status: DataValidationStatus.VALIDATING,
         ruleId
-      }), validator.validator({ value: cellValue, unitId, subUnitId, row, column: col }, rule).then((status) => {
+      }), validator.validator(
+        {
+          value: cellValue,
+          unitId,
+          subUnitId,
+          row,
+          column: col,
+          worksheet: pos.worksheet,
+          workbook: pos.workbook,
+          interceptValue: getCellValueOrigin(cell),
+          t: cellRaw == null ? void 0 : cellRaw.t
+        },
+        rule
+      ).then((status) => {
         const realStatus = status ? DataValidationStatus.VALID : DataValidationStatus.INVALID;
         this._cache.setValue(row, col, {
           value: cellValue,
           status: realStatus,
-          ruleId
+          ruleId,
+          interceptValue
         }), onCompete(realStatus, !0);
       }), DataValidationStatus.VALIDATING) : (onCompete(current.status, !1), current.status);
     } else
@@ -4622,8 +4623,8 @@ var __defProp$4 = Object.defineProperty, __getOwnPropDesc$4 = Object.getOwnPrope
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$4(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$4(target, key, result), result;
-}, "__decorateClass$4"), __decorateParam$4 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$4"), _a18;
-let DataValidationModelController = (_a18 = class extends Disposable {
+}, "__decorateClass$4"), __decorateParam$4 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$4"), _a17;
+let DataValidationModelController = (_a17 = class extends Disposable {
   constructor(_resourceManagerService, _univerInstanceService, _dataValidationModel, _injector) {
     super(), this._resourceManagerService = _resourceManagerService, this._univerInstanceService = _univerInstanceService, this._dataValidationModel = _dataValidationModel, this._injector = _injector, this._initDataValidationDataSource();
   }
@@ -4637,7 +4638,7 @@ let DataValidationModelController = (_a18 = class extends Disposable {
   _initDataValidationDataSource() {
     this._dataValidationModel.setManagerCreator(this._createSheetDataValidationManager.bind(this));
   }
-}, __name(_a18, "DataValidationModelController"), _a18);
+}, __name(_a17, "DataValidationModelController"), _a17);
 DataValidationModelController = __decorateClass$4([
   OnLifecycle(LifecycleStages.Starting, DataValidationModelController),
   __decorateParam$4(0, IResourceManagerService),
@@ -4649,8 +4650,8 @@ var __defProp$3 = Object.defineProperty, __getOwnPropDesc$3 = Object.getOwnPrope
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$3(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$3(target, key, result), result;
-}, "__decorateClass$3"), __decorateParam$3 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$3"), _a19;
-let DataValidationPermissionController = (_a19 = class extends Disposable {
+}, "__decorateClass$3"), __decorateParam$3 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$3"), _a18;
+let DataValidationPermissionController = (_a18 = class extends Disposable {
   constructor(_localeService, _commandService, _sheetPermissionInterceptorBaseController) {
     super(), this._localeService = _localeService, this._commandService = _commandService, this._sheetPermissionInterceptorBaseController = _sheetPermissionInterceptorBaseController, this._commandExecutedListener();
   }
@@ -4669,7 +4670,7 @@ let DataValidationPermissionController = (_a19 = class extends Disposable {
       })
     );
   }
-}, __name(_a19, "DataValidationPermissionController"), _a19);
+}, __name(_a18, "DataValidationPermissionController"), _a18);
 DataValidationPermissionController = __decorateClass$3([
   OnLifecycle(LifecycleStages.Ready, DataValidationPermissionController),
   __decorateParam$3(0, Inject(LocaleService)),
@@ -4680,8 +4681,8 @@ var __defProp$2 = Object.defineProperty, __getOwnPropDesc$2 = Object.getOwnPrope
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(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$2(target, key, result), result;
-}, "__decorateClass$2"), __decorateParam$2 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$2"), _a20;
-let SheetsDataValidationValidatorService = (_a20 = class {
+}, "__decorateClass$2"), __decorateParam$2 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$2"), _a19;
+let SheetsDataValidationValidatorService = (_a19 = class {
   constructor(_univerInstanceService, _dataValidationModel, _dataValidationCacheService) {
     this._univerInstanceService = _univerInstanceService, this._dataValidationModel = _dataValidationModel, this._dataValidationCacheService = _dataValidationCacheService;
   }
@@ -4692,11 +4693,21 @@ let SheetsDataValidationValidatorService = (_a20 = class {
     const worksheet = workbook.getSheetBySheetId(subUnitId);
     if (!worksheet)
       throw new Error(`cannot find current worksheet, sheetId: ${subUnitId}`);
-    const cellRaw = worksheet.getCellRaw(row, col), manager = this._dataValidationModel.ensureManager(unitId, subUnitId), rule = manager.getRuleByLocation(row, col);
+    if (!Tools.isDefine(row) || !Tools.isDefine(col))
+      throw new Error(`row or col is not defined, row: ${row}, col: ${col}`);
+    const manager = this._dataValidationModel.ensureManager(unitId, subUnitId), cell = worksheet.getCell(row, col), rule = manager.getRuleByLocation(row, col);
     return rule ? new Promise((resolve) => {
-      manager.validator(getCellValueOrigin(cellRaw), rule, { unitId, subUnitId, row, col }, resolve);
+      manager.validator(cell, rule, { unitId, subUnitId, row, col, worksheet, workbook }, resolve);
     }) : DataValidationStatus.VALID;
   }
+  validatorRanges(unitId, subUnitId, ranges) {
+    return Promise.all(ranges.map((range) => {
+      const promises = [];
+      return Range.foreach(range, (row, col) => {
+        promises.push(this.validatorCell(unitId, subUnitId, row, col));
+      }), promises;
+    }));
+  }
   async validatorWorksheet(unitId, subUnitId) {
     const rules = this._dataValidationModel.ensureManager(unitId, subUnitId).getDataValidations();
     return await Promise.all(rules.map((rule) => Promise.all(rule.ranges.map((range) => {
@@ -4712,7 +4723,19 @@ let SheetsDataValidationValidatorService = (_a20 = class {
       map[sheetIds[i]] = result;
     }), map;
   }
-}, __name(_a20, "SheetsDataValidationValidatorService"), _a20);
+  getDataValidations(unitId, subUnitId, ranges) {
+    const manager = this._dataValidationModel.ensureManager(unitId, subUnitId), ruleMatrix = manager.getRuleObjectMatrix(), ruleIdSet = /* @__PURE__ */ new Set();
+    return ranges.forEach((range) => {
+      Range.foreach(range, (row, col) => {
+        const ruleId = ruleMatrix.getValue(row, col);
+        ruleId && ruleIdSet.add(ruleId);
+      });
+    }), Array.from(ruleIdSet).map((id) => manager.getRuleById(id)).filter(Boolean);
+  }
+  getDataValidation(unitId, subUnitId, ranges) {
+    return this.getDataValidations(unitId, subUnitId, ranges)[0];
+  }
+}, __name(_a19, "SheetsDataValidationValidatorService"), _a19);
 SheetsDataValidationValidatorService = __decorateClass$2([
   __decorateParam$2(0, IUniverInstanceService),
   __decorateParam$2(1, Inject(DataValidationModel)),
@@ -4722,15 +4745,14 @@ var __defProp$1 = Object.defineProperty, __getOwnPropDesc$1 = Object.getOwnPrope
   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"), _a21;
-let UniverSheetsDataValidationPlugin = (_a21 = class extends Plugin {
+}, "__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);
   }
   onStarting() {
     [
       [DataValidationPanelService],
-      [SheetDataValidationService],
       [DataValidationCacheService],
       [DataValidationFormulaService],
       [DataValidationCustomFormulaService],
@@ -4770,7 +4792,7 @@ let UniverSheetsDataValidationPlugin = (_a21 = class extends Plugin {
       this._commandService.registerCommand(command);
     });
   }
-}, __name(_a21, "UniverSheetsDataValidationPlugin"), _a21);
+}, __name(_a20, "UniverSheetsDataValidationPlugin"), _a20);
 __publicField$1(UniverSheetsDataValidationPlugin, "pluginName", DATA_VALIDATION_PLUGIN_NAME);
 __publicField$1(UniverSheetsDataValidationPlugin, "type", UniverInstanceType.UNIVER_SHEET);
 UniverSheetsDataValidationPlugin = __decorateClass$1([
@@ -4783,15 +4805,14 @@ var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnProperty
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(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 && __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"), _a22;
-let UniverSheetsDataValidationMobilePlugin = (_a22 = class extends Plugin {
+}, "__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);
   }
   onStarting() {
     [
       [DataValidationPanelService],
-      [SheetDataValidationService],
       [DataValidationCacheService],
       [DataValidationFormulaService],
       [DataValidationCustomFormulaService],
@@ -4827,7 +4848,7 @@ let UniverSheetsDataValidationMobilePlugin = (_a22 = class extends Plugin {
       this._commandService.registerCommand(command);
     });
   }
-}, __name(_a22, "UniverSheetsDataValidationMobilePlugin"), _a22);
+}, __name(_a21, "UniverSheetsDataValidationMobilePlugin"), _a21);
 __publicField2(UniverSheetsDataValidationMobilePlugin, "pluginName", DATA_VALIDATION_PLUGIN_NAME);
 __publicField2(UniverSheetsDataValidationMobilePlugin, "type", UniverInstanceType.UNIVER_SHEET);
 UniverSheetsDataValidationMobilePlugin = __decorateClass([
@@ -4839,29 +4860,23 @@ UniverSheetsDataValidationMobilePlugin = __decorateClass([
 export {
   AddSheetDataValidationAndOpenCommand,
   AddSheetDataValidationCommand,
+  ClearRangeDataValidationCommand,
   CloseValidationPanelOperation,
   DATA_VALIDATION_PLUGIN_NAME,
-  DataValidationAlertController,
-  DataValidationAutoFillController,
   DataValidationCacheService,
-  DataValidationController,
-  DataValidationCopyPasteController,
   DataValidationCustomFormulaService,
-  DataValidationFormulaController,
   DataValidationFormulaService,
-  DataValidationRefRangeController,
-  DataValidationRejectInputController,
+  DataValidationModel2 as DataValidationModel,
   HideDataValidationDropdown,
-  ICommandService2 as ICommandService,
-  LocaleService2 as LocaleService,
   OpenValidationPanelOperation,
-  Plugin2 as Plugin,
-  SheetDataValidationService,
-  SheetsDataValidationRenderController,
+  RemoveDataValidationCommand2 as RemoveSheetDataValidationCommand,
+  SheetDataValidationManager,
   SheetsDataValidationValidatorService,
   ShowDataValidationDropdown,
   ToggleValidationPanelOperation,
   UniverSheetsDataValidationMobilePlugin,
   UniverSheetsDataValidationPlugin,
-  UpdateSheetDataValidationRangeCommand
+  UpdateSheetDataValidationOptionsCommand,
+  UpdateSheetDataValidationRangeCommand,
+  UpdateSheetDataValidationSettingCommand
 };