@univerjs/sheets-data-validation 0.2.8 → 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, DEFAULT_STYLES, WrapStrategy, DocumentDataModel, BooleanNumber, numfmt, Rectangle, IUndoRedoService, sequenceExecuteAsync, sequenceExecute, Optional, RxDisposable, DataValidationStatus, isRangesEqual, queryObjectMatrix, IResourceManagerService, DependentOn, Plugin } from "@univerjs/core";
+import { DEFAULT_EMPTY_DOCUMENT_VALUE, useDependency, Inject, Disposable, UniverInstanceType, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DisposableCollection, IUniverInstanceService, toDisposable, CommandType, ICommandService, ObjectMatrix, Range, isFormulaString, ThemeService, VerticalAlign, HorizontalAlign, createInternalEditorID, LocaleService, OnLifecycle, LifecycleStages, IPermissionService, DataValidationType, Tools, DataValidationOperator, DataValidationErrorStyle, UndoCommand, RedoCommand, isUnitRangesEqual, isValidRange, debounce, shallowEqual, Injector, DataValidationRenderMode, 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 { DataValidationModel as DataValidationModel2, RemoveDataValidationCommand as RemoveDataValidationCommand2 } 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 { 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,7 +14,7 @@ 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 { RichTextEditingMutation, getPlainTextFormDocument } from "@univerjs/docs";
 function getCellValueOrigin(cell) {
@@ -91,14 +91,14 @@ var __defProp$j = Object.defineProperty, __getOwnPropDesc$j = Object.getOwnPrope
   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)
@@ -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);
@@ -175,7 +193,8 @@ DataValidationDropdownManagerService = __decorateClass$j([
   __decorateParam$j(2, Inject(DataValidatorRegistryService)),
   __decorateParam$j(3, IZenZoneService),
   __decorateParam$j(4, IRenderManagerService),
-  __decorateParam$j(5, Inject(DataValidationModel))
+  __decorateParam$j(5, Inject(DataValidationModel)),
+  __decorateParam$j(6, Inject(SheetsSelectionsService))
 ], DataValidationDropdownManagerService);
 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--)
@@ -464,6 +483,11 @@ function getFormulaResult(result) {
   return (_b = (_a22 = result == null ? void 0 : result[0]) == null ? void 0 : _a22[0]) == null ? void 0 : _b.v;
 }
 __name(getFormulaResult, "getFormulaResult");
+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);
@@ -777,7 +801,7 @@ 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$f = Object.defineProperty, __getOwnPropDesc$f = Object.getOwnPropertyDescriptor, __decorateClass$f = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+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$f(target, key, result), result;
@@ -810,7 +834,7 @@ let DataValidationFormulaController = (_a5 = class extends Disposable {
       for (let i2 = startRow; i2 <= endRow; i2++)
         for (let j = startColumn; j <= endColumn; j++) {
           const permission = (_b = (_a22 = targetSheet.getCell(i2, j)) == null ? void 0 : _a22.selectionProtection) == null ? void 0 : _b[0];
-          if ((permission == null ? void 0 : permission[P.View]) === !1)
+          if ((permission == null ? void 0 : permission[L.View]) === !1)
             return !1;
         }
     }
@@ -1196,12 +1220,7 @@ 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
 };
@@ -1540,21 +1559,8 @@ 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 _a22, _b;
-        const { startRow, startColumn, endRow, endColumn } = range;
-        for (let row = startRow; row <= endRow; row++)
-          for (let col = startColumn; col <= endColumn; col++) {
-            const permission = (_b = (_a22 = worksheet2 == null ? void 0 : worksheet2.getCell(row, col)) == null ? void 0 : _a22.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) => {
@@ -1793,12 +1799,14 @@ let DataValidationRejectInputController = (_a6 = class extends Disposable {
           if (!validator || await validator.validator(
             {
               value: getCellValueOrigin(cell),
+              interceptValue: getCellValueOrigin(cell),
               row,
               column: col,
               unitId,
               subUnitId,
               worksheet,
-              workbook
+              workbook,
+              t: cell == null ? void 0 : cell.t
             },
             rule
           ))
@@ -1873,10 +1881,8 @@ 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;
@@ -1887,9 +1893,10 @@ function DateDropdown(props) {
   if (!cellData || !rule || !validator)
     return;
   const handleSave = /* @__PURE__ */ __name(async () => {
+    var _a23;
     if (!date)
       return;
-    const dateStr = `${date.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,
@@ -1897,7 +1904,9 @@ function DateDropdown(props) {
       row,
       column: col,
       worksheet,
-      workbook
+      workbook,
+      interceptValue: dateStr.replace("Z", "").replace("T", " "),
+      t: CellValueType.NUMBER
     }, rule) ? (commandService.executeCommand(SetRangeValuesCommand.id, {
       unitId,
       subUnitId,
@@ -1933,7 +1942,8 @@ function DateDropdown(props) {
         }, "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: !date.isValid(), children: localeService.t("dataValidation.alert.ok") }) })
@@ -1993,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);
@@ -2037,8 +2048,8 @@ const FORMULA1$1 = "{FORMULA1}", FORMULA2$1 = "{FORMULA2}", transformDate2Serial
     };
   }
   async isValidType(info) {
-    const { value, worksheet, row, column } = info, cell = worksheet.getCell(row, column), interceptValue = getCellValueOrigin(cell);
-    return typeof interceptValue == "string" && typeof value == "number" ? dayjs(interceptValue).isValid() : !1;
+    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());
@@ -2212,6 +2223,7 @@ function calcPadding(cellWidth, cellHeight, fontWidth, fontHeight, vt, ht, margi
       paddingTop = realMargin;
       break;
   }
+  paddingTop = Math.max(MARGIN_V$1, paddingTop);
   let paddingLeft = 0;
   switch (ht) {
     case HorizontalAlign.CENTER:
@@ -2221,7 +2233,7 @@ function calcPadding(cellWidth, cellHeight, fontWidth, fontHeight, vt, ht, margi
       paddingLeft = cellWidth - fontWidth;
       break;
   }
-  return {
+  return paddingLeft = Math.max(MARGIN_H$1, paddingLeft), {
     paddingLeft,
     paddingTop
   };
@@ -3128,7 +3140,8 @@ 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 _a22, _b, _c, _d, _e, _f;
@@ -3144,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: {
@@ -3284,7 +3297,7 @@ let SheetsDataValidationMobileRenderController = (_a9 = class extends RxDisposab
       this._sheetInterceptorService.intercept(
         INTERCEPTOR_POINT.CELL_CONTENT,
         {
-          priority: 200,
+          priority: InterceptCellContentPriority.DATA_VALIDATION,
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: /* @__PURE__ */ __name((cell, pos, next) => {
             var _a22, _b, _c, _d, _e;
@@ -3300,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: {
@@ -3413,9 +3426,14 @@ var __defProp$b = Object.defineProperty, __getOwnPropDesc$b = Object.getOwnPrope
   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"), _a10;
+}, "__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) {
+  constructor(_instanceSrv, _registerOtherFormulaService, _lexerTreeBuilder, _dataValidationModel, _dataValidationCacheService, _logService) {
     super();
     __publicField(this, "_formulaMap", /* @__PURE__ */ new Map());
     /**
@@ -3426,7 +3444,7 @@ let DataValidationCustomFormulaService = (_a10 = 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) => {
@@ -3473,12 +3491,9 @@ let DataValidationCustomFormulaService = (_a10 = 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,
@@ -3494,20 +3509,12 @@ let DataValidationCustomFormulaService = (_a10 = 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) {
@@ -3533,7 +3540,6 @@ let DataValidationCustomFormulaService = (_a10 = class extends Disposable {
           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,8 +3579,13 @@ DataValidationCustomFormulaService = __decorateClass$b([
   __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);
@@ -3599,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");
@@ -4561,12 +4572,13 @@ 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(
@@ -4577,7 +4589,9 @@ const _SheetDataValidationManager = class _SheetDataValidationManager extends Da
           row,
           column: col,
           worksheet: pos.worksheet,
-          workbook: pos.workbook
+          workbook: pos.workbook,
+          interceptValue: getCellValueOrigin(cell),
+          t: cellRaw == null ? void 0 : cellRaw.t
         },
         rule
       ).then((status) => {
@@ -4585,7 +4599,8 @@ const _SheetDataValidationManager = class _SheetDataValidationManager extends Da
         this._cache.setValue(row, col, {
           value: cellValue,
           status: realStatus,
-          ruleId
+          ruleId,
+          interceptValue
         }), onCompete(realStatus, !0);
       }), DataValidationStatus.VALIDATING) : (onCompete(current.status, !1), current.status);
     } else
@@ -4678,9 +4693,11 @@ let SheetsDataValidationValidatorService = (_a19 = 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, worksheet, workbook }, resolve);
+      manager.validator(cell, rule, { unitId, subUnitId, row, col, worksheet, workbook }, resolve);
     }) : DataValidationStatus.VALID;
   }
   validatorRanges(unitId, subUnitId, ranges) {

package/lib/types/index.d.ts

@@ -16,6 +16,7 @@
 export { UniverSheetsDataValidationPlugin } from './plugin';
 export { UniverSheetsDataValidationMobilePlugin } from './mobile-plugin';
 export { DataValidationCacheService } from './services/dv-cache.service';
+export type { IDataValidationResCache } from './services/dv-cache.service';
 export { DataValidationFormulaService } from './services/dv-formula.service';
 export { DataValidationCustomFormulaService } from './services/dv-custom-formula.service';
 export { DATA_VALIDATION_PLUGIN_NAME } from './common/const';

package/lib/types/models/sheet-data-validation-manager.d.ts

@@ -1,4 +1,4 @@
-import { CellValue, Injector, ISheetDataValidationRule, Nullable, DataValidationStatus, DataValidationType } from '@univerjs/core';
+import { ICellDataForSheetInterceptor, Injector, ISheetDataValidationRule, Nullable, DataValidationStatus, DataValidationType } from '@univerjs/core';
 import { DataValidationManager, IUpdateRulePayload } from '@univerjs/data-validation';
 import { ISheetLocation } from '@univerjs/sheets';
 import { RuleMatrix } from './rule-matrix';
@@ -18,10 +18,10 @@ export declare class SheetDataValidationManager extends DataValidationManager<IS
     addRule(rule: ISheetDataValidationRule | ISheetDataValidationRule[], index?: number): void;
     updateRule(ruleId: string, payload: IUpdateRulePayload): ISheetDataValidationRule;
     removeRule(ruleId: string): void;
-    getValidator(type: DataValidationType): import('@univerjs/data-validation').BaseDataValidator<CellValue> | undefined;
+    getValidator(type: DataValidationType): import('@univerjs/data-validation').BaseDataValidator<import('@univerjs/core').CellValue> | undefined;
     getRuleIdByLocation(row: number, col: number): string | undefined;
     getRuleByLocation(row: number, col: number): ISheetDataValidationRule | undefined;
-    validator(cellValue: Nullable<CellValue>, rule: ISheetDataValidationRule, pos: ISheetLocation, onCompete: (status: DataValidationStatus, changed: boolean) => void): DataValidationStatus;
+    validator(cell: Nullable<ICellDataForSheetInterceptor>, rule: ISheetDataValidationRule, pos: ISheetLocation, onCompete: (status: DataValidationStatus, changed: boolean) => void): DataValidationStatus;
     getRuleErrorMsg(ruleId: string): string;
     getRuleObjectMatrix(): RuleMatrix;
 }

package/lib/types/services/dropdown-manager.service.d.ts

@@ -1,5 +1,5 @@
 import { Nullable, Disposable, IUniverInstanceService } from '@univerjs/core';
-import { ISheetLocation } from '@univerjs/sheets';
+import { ISheetLocation, SheetsSelectionsService } from '@univerjs/sheets';
 import { SheetCanvasPopManagerService } from '@univerjs/sheets-ui';
 import { DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
 import { IZenZoneService } from '@univerjs/ui';
@@ -22,14 +22,17 @@ export declare class DataValidationDropdownManagerService extends Disposable {
     private readonly _zenZoneService;
     private readonly _renderManagerService;
     private readonly _dataValidationModel;
+    private readonly _sheetsSelectionsService;
     private _activeDropdown;
     private _activeDropdown$;
     private _currentPopup;
     activeDropdown$: import('rxjs').Observable<Nullable<IDropdownParam>>;
     private _zenVisible;
     get activeDropdown(): Nullable<IDropdownParam>;
-    constructor(_canvasPopupManagerService: SheetCanvasPopManagerService, _univerInstanceService: IUniverInstanceService, _dataValidatorRegistryService: DataValidatorRegistryService, _zenZoneService: IZenZoneService, _renderManagerService: IRenderManagerService, _dataValidationModel: DataValidationModel);
+    constructor(_canvasPopupManagerService: SheetCanvasPopManagerService, _univerInstanceService: IUniverInstanceService, _dataValidatorRegistryService: DataValidatorRegistryService, _zenZoneService: IZenZoneService, _renderManagerService: IRenderManagerService, _dataValidationModel: DataValidationModel, _sheetsSelectionsService: SheetsSelectionsService);
     private _init;
+    private _getDropdownByCell;
+    private _initSelectionChange;
     showDropdown(param: IDropdownParam, closeOnOutSide?: boolean): void;
     hideDropdown(): void;
     showDataValidationDropdown(unitId: string, subUnitId: string, row: number, col: number, onHide?: () => void): void;

package/lib/types/services/dv-cache.service.d.ts

@@ -1,6 +1,7 @@
 import { ObjectMatrix, CellValue, DataValidationStatus, IRange, ISheetDataValidationRule, Nullable } from '@univerjs/core';
 export interface IDataValidationResCache {
     value: Nullable<CellValue>;
+    interceptValue: Nullable<CellValue>;
     status: DataValidationStatus;
     ruleId: string;
     temp?: boolean;

package/lib/types/services/dv-custom-formula.service.d.ts

@@ -1,4 +1,4 @@
-import { IRange, ISheetDataValidationRule, Disposable, IUniverInstanceService } from '@univerjs/core';
+import { IRange, ISheetDataValidationRule, Disposable, ILogService, IUniverInstanceService } from '@univerjs/core';
 import { LexerTreeBuilder } from '@univerjs/engine-formula';
 import { DataValidationModel } from '@univerjs/data-validation';
 import { RegisterOtherFormulaService } from '@univerjs/sheets-formula';
@@ -16,6 +16,7 @@ export declare class DataValidationCustomFormulaService extends Disposable {
     private _lexerTreeBuilder;
     private readonly _dataValidationModel;
     private readonly _dataValidationCacheService;
+    private readonly _logService;
     private _formulaMap;
     /**
      * Map of origin formula of rule
@@ -25,7 +26,7 @@ export declare class DataValidationCustomFormulaService extends Disposable {
      * reflect of formulaId to cell, only store transformable formula
      */
     private _formulaCellMap;
-    constructor(_instanceSrv: IUniverInstanceService, _registerOtherFormulaService: RegisterOtherFormulaService, _lexerTreeBuilder: LexerTreeBuilder, _dataValidationModel: DataValidationModel, _dataValidationCacheService: DataValidationCacheService);
+    constructor(_instanceSrv: IUniverInstanceService, _registerOtherFormulaService: RegisterOtherFormulaService, _lexerTreeBuilder: LexerTreeBuilder, _dataValidationModel: DataValidationModel, _dataValidationCacheService: DataValidationCacheService, _logService: ILogService);
     private _initFormulaResultHandler;
     private _ensureMaps;
     private _registerFormula;

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

@@ -1,2 +1,3 @@
 import { ICellData, Nullable } from '@univerjs/core';
 export declare function getFormulaResult(result: Nullable<Nullable<ICellData>[][]>): Nullable<import('@univerjs/core').CellValue>;
+export declare function getFormulaCellData(result: Nullable<Nullable<ICellData>[][]>): Nullable<ICellData>;

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

@@ -11,8 +11,8 @@ export declare class DateValidator extends BaseDataValidator<number> {
     private _formulaService;
     parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<IFormulaResult<number | undefined>>;
     parseFormulaSync(rule: IDataValidationRule, unitId: string, subUnitId: string): {
-        formula1: number | undefined;
-        formula2: number | undefined;
+        formula1: any;
+        formula2: any;
     };
     isValidType(info: IValidatorCellInfo): Promise<boolean>;
     private _validatorSingleFormula;

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

@@ -1,4 +1,4 @@
-import { DataValidationOperator, CellValue, IDataValidationRule } from '@univerjs/core';
+import { DataValidationOperator, CellValue, IDataValidationRule, Nullable } from '@univerjs/core';
 import { IFormulaResult, IFormulaValidResult, IValidatorCellInfo, BaseDataValidator } from '@univerjs/data-validation';
 export declare function getCellValueNumber(cellValue: CellValue): number;
 export declare class DecimalValidator extends BaseDataValidator<number> {
@@ -13,12 +13,14 @@ export declare class DecimalValidator extends BaseDataValidator<number> {
     isValidType(cellInfo: IValidatorCellInfo<CellValue>, formula: IFormulaResult, rule: IDataValidationRule): Promise<boolean>;
     transform(cellInfo: IValidatorCellInfo<CellValue>, formula: IFormulaResult, rule: IDataValidationRule): {
         value: number;
+        interceptValue: Nullable<CellValue>;
         row: number;
         column: number;
         unitId: string;
         subUnitId: string;
         worksheet: import('@univerjs/core').Worksheet;
         workbook: import('@univerjs/core').Workbook;
+        t: Nullable<import('@univerjs/protocol').CellValueType>;
     };
     private _parseNumber;
     parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<{

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

@@ -1,4 +1,4 @@
-import { DataValidationOperator, CellValue, IDataValidationRule, IDataValidationRuleBase } from '@univerjs/core';
+import { DataValidationOperator, CellValue, IDataValidationRule, IDataValidationRuleBase, Nullable } from '@univerjs/core';
 import { IFormulaResult, IFormulaValidResult, IValidatorCellInfo, BaseDataValidator } from '@univerjs/data-validation';
 export declare class TextLengthValidator extends BaseDataValidator<number> {
     id: string;
@@ -14,12 +14,14 @@ export declare class TextLengthValidator extends BaseDataValidator<number> {
     parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<IFormulaResult<any>>;
     transform(cellInfo: IValidatorCellInfo<CellValue>, _formula: IFormulaResult, _rule: IDataValidationRule): {
         value: number;
+        interceptValue: Nullable<CellValue>;
         row: number;
         column: number;
         unitId: string;
         subUnitId: string;
         worksheet: import('@univerjs/core').Worksheet;
         workbook: import('@univerjs/core').Workbook;
+        t: Nullable<import('@univerjs/protocol').CellValueType>;
     };
     isValidType(cellInfo: IValidatorCellInfo<number>, formula: IFormulaResult, rule: IDataValidationRule): Promise<boolean>;
     validatorIsEqual(cellInfo: IValidatorCellInfo<number>, formula: IFormulaResult, rule: IDataValidationRule): Promise<boolean>;

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

@@ -1,4 +1,4 @@
-import { DataValidationOperator, CellValue, IDataValidationRule, IDataValidationRuleBase } from '@univerjs/core';
+import { DataValidationOperator, CellValue, IDataValidationRule, IDataValidationRuleBase, Nullable } from '@univerjs/core';
 import { IFormulaResult, IFormulaValidResult, IValidatorCellInfo, BaseDataValidator } from '@univerjs/data-validation';
 export declare class WholeValidator extends BaseDataValidator<number> {
     private _formulaService;
@@ -12,12 +12,14 @@ export declare class WholeValidator extends BaseDataValidator<number> {
     isValidType(cellInfo: IValidatorCellInfo<CellValue>, formula: IFormulaResult, rule: IDataValidationRule): Promise<boolean>;
     transform(cellInfo: IValidatorCellInfo<CellValue>, formula: IFormulaResult, rule: IDataValidationRule): {
         value: number;
+        interceptValue: Nullable<CellValue>;
         row: number;
         column: number;
         unitId: string;
         subUnitId: string;
         worksheet: import('@univerjs/core').Worksheet;
         workbook: import('@univerjs/core').Workbook;
+        t: Nullable<import('@univerjs/protocol').CellValueType>;
     };
     private _parseNumber;
     parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<{