@univerjs/sheets-data-validation 0.4.0-alpha.1 → 0.4.0-experimental.d7288c0-20241017

package/lib/es/index.js

@@ -2,16 +2,41 @@ 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 { ObjectMatrix, Range, Inject, Disposable, UniverInstanceType, DataValidationType, isFormulaString, IUniverInstanceService, ILogService, getOriginCellValue, debounce, Rectangle, Tools, DataValidationStatus, ICommandService, WrapStrategy, DataValidationOperator, numfmt, DataValidationRenderMode, CommandType, IUndoRedoService, sequenceExecuteAsync, sequenceExecute, CellValueType, Injector, RxDisposable, toDisposable, IPermissionService, isRangesEqual, DependentOn, Plugin, IConfigService } from "@univerjs/core";
+import { Inject, ICommandService, Disposable, ObjectMatrix, Range, Injector, UniverInstanceType, DataValidationType, isFormulaString, IUniverInstanceService, getOriginCellValue, debounce, Rectangle, Tools, DataValidationStatus, WrapStrategy, DataValidationOperator, numfmt, DataValidationRenderMode, CommandType, IUndoRedoService, sequenceExecute, CellValueType, RxDisposable, toDisposable, IPermissionService, isRangesEqual, LifecycleService, LifecycleStages, bufferDebounceTime, DependentOn, Plugin, IConfigService } from "@univerjs/core";
 import { DataValidationModel, DataValidatorRegistryService, UpdateRuleType, BaseDataValidator, TextLengthErrorTitleMap, AddDataValidationMutation, RemoveDataValidationMutation, UpdateDataValidationMutation, getRuleSetting, getRuleOptions, UniverDataValidationPlugin } from "@univerjs/data-validation";
-import { DataValidationModel as DataValidationModel2 } from "@univerjs/data-validation";
-import { RemoveSheetMutation, getSheetCommandTarget, SetRangeValuesMutation, SetRangeValuesUndoMutationFactory, SheetsSelectionsService, SheetInterceptorService, ClearSelectionAllCommand, WorksheetViewPermission, RefRangeService, handleCommonDefaultRangeChangeWithEffectRefCommands, RemoveSheetCommand } from "@univerjs/sheets";
-import { Subject } from "rxjs";
+import { SetRangeValuesMutation, RemoveSheetMutation, getSheetCommandTarget, SetRangeValuesUndoMutationFactory, SheetsSelectionsService, SheetInterceptorService, ClearSelectionAllCommand, WorksheetViewPermission, RefRangeService, handleCommonDefaultRangeChangeWithEffectRefCommands, RemoveSheetCommand } from "@univerjs/sheets";
+import { Subject, bufferWhen, filter } from "rxjs";
 import { LexerTreeBuilder, isReferenceString, sequenceNodeType, deserializeRangeWithSheet, ERROR_TYPE_SET } from "@univerjs/engine-formula";
 import { RegisterOtherFormulaService, FormulaRefRangeService } from "@univerjs/sheets-formula";
-const DATA_VALIDATION_PLUGIN_NAME = "SHEET_DATA_VALIDATION_PLUGIN", _DataValidationCacheService = class _DataValidationCacheService {
-  constructor() {
+const DATA_VALIDATION_PLUGIN_NAME = "SHEET_DATA_VALIDATION_PLUGIN";
+var __defProp$9 = Object.defineProperty, __getOwnPropDesc$9 = Object.getOwnPropertyDescriptor, __decorateClass$9 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  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"), _a;
+let DataValidationCacheService = (_a = class extends Disposable {
+  constructor(_commandService) {
+    super();
     __publicField(this, "_cacheMatrix", /* @__PURE__ */ new Map());
+    __publicField(this, "_dirtyRanges$", new Subject());
+    __publicField(this, "dirtyRanges$", this._dirtyRanges$.asObservable());
+    this._commandService = _commandService, this._initDirtyRanges();
+  }
+  _initDirtyRanges() {
+    this.disposeWithMe(this._commandService.onCommandExecuted((commandInfo) => {
+      if (commandInfo.id === SetRangeValuesMutation.id) {
+        const { cellValue, unitId, subUnitId } = commandInfo.params;
+        if (cellValue) {
+          const range = new ObjectMatrix(cellValue).getDataRange();
+          if (range.endRow === -1) return;
+          this._dirtyRanges$.next({
+            unitId,
+            subUnitId,
+            ranges: [range]
+          });
+        }
+      }
+    }));
   }
   _ensureCache(unitId, subUnitId) {
     let unitMap = this._cacheMatrix.get(unitId);
@@ -45,7 +70,7 @@ const DATA_VALIDATION_PLUGIN_NAME = "SHEET_DATA_VALIDATION_PLUGIN", _DataValidat
         const item = cache.getValue(row, col);
         item && item.temp === !0 && cache.realDeleteValue(row, col);
       });
-    });
+    }), this._dirtyRanges$.next({ unitId, subUnitId, ranges: [...oldRanges, ...newRanges] });
   }
   markRangeDirty(unitId, subUnitId, ranges) {
     const cache = this._ensureCache(unitId, subUnitId);
@@ -53,10 +78,10 @@ const DATA_VALIDATION_PLUGIN_NAME = "SHEET_DATA_VALIDATION_PLUGIN", _DataValidat
       Range.foreach(range, (row, col) => {
         cache.setValue(row, col, void 0);
       });
-    });
+    }), this._dirtyRanges$.next({ unitId, subUnitId, ranges });
   }
   markCellDirty(unitId, subUnitId, row, col) {
-    this._ensureCache(unitId, subUnitId).setValue(row, col, void 0);
+    this._ensureCache(unitId, subUnitId).setValue(row, col, void 0), this._dirtyRanges$.next({ unitId, subUnitId, ranges: [{ startRow: row, startColumn: col, endRow: row, endColumn: col }] });
   }
   _deleteRange(unitId, subUnitId, ranges) {
     const cache = this._ensureCache(unitId, subUnitId);
@@ -64,7 +89,7 @@ const DATA_VALIDATION_PLUGIN_NAME = "SHEET_DATA_VALIDATION_PLUGIN", _DataValidat
       Range.foreach(range, (row, col) => {
         cache.realDeleteValue(row, col);
       });
-    });
+    }), this._dirtyRanges$.next({ unitId, subUnitId, ranges });
   }
   getValue(unitId, subUnitId, row, col) {
     return this._ensureCache(unitId, subUnitId).getValue(row, col);
@@ -72,9 +97,10 @@ const DATA_VALIDATION_PLUGIN_NAME = "SHEET_DATA_VALIDATION_PLUGIN", _DataValidat
   setValue(unitId, subUnitId, row, col, value) {
     return this._ensureCache(unitId, subUnitId).setValue(row, col, value);
   }
-};
-__name(_DataValidationCacheService, "DataValidationCacheService");
-let DataValidationCacheService = _DataValidationCacheService;
+}, __name(_a, "DataValidationCacheService"), _a);
+DataValidationCacheService = __decorateClass$9([
+  __decorateParam$9(0, Inject(ICommandService))
+], DataValidationCacheService);
 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--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
@@ -84,9 +110,9 @@ function transformFormula(lexerTreeBuilder, formula, originRow, originCol, targe
   return lexerTreeBuilder.moveFormulaRefOffset(formula, targetCol - originCol, targetRow - originRow);
 }
 __name(transformFormula, "transformFormula");
-var _a;
-let DataValidationCustomFormulaService = (_a = class extends Disposable {
-  constructor(_instanceSrv, _registerOtherFormulaService, _lexerTreeBuilder, _dataValidationModel, _dataValidationCacheService, _logService) {
+var _a2;
+let DataValidationCustomFormulaService = (_a2 = class extends Disposable {
+  constructor(_instanceSrv, _registerOtherFormulaService, _lexerTreeBuilder, _dataValidationModel, _dataValidationCacheService, _injector) {
     super();
     __publicField(this, "_formulaMap", /* @__PURE__ */ new Map());
     /**
@@ -97,7 +123,7 @@ let DataValidationCustomFormulaService = (_a = 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._logService = _logService, this._initFormulaResultHandler();
+    this._instanceSrv = _instanceSrv, this._registerOtherFormulaService = _registerOtherFormulaService, this._lexerTreeBuilder = _lexerTreeBuilder, this._dataValidationModel = _dataValidationModel, this._dataValidationCacheService = _dataValidationCacheService, this._injector = _injector, this._initFormulaResultHandler();
   }
   _initFormulaResultHandler() {
     this.disposeWithMe(this._registerOtherFormulaService.formulaResult$.subscribe((resultMap) => {
@@ -107,8 +133,8 @@ let DataValidationCustomFormulaService = (_a = class extends Disposable {
           for (const subUnitId in unitMap) {
             const results = unitMap[subUnitId], { formulaCellMap, ruleFormulaMap } = this._ensureMaps(unitId, subUnitId);
             results.forEach((result) => {
-              var _a11, _b;
-              const ruleInfo = ruleFormulaMap.get((_a11 = result.extra) == null ? void 0 : _a11.ruleId), cellInfo = formulaCellMap.get(result.formulaId), rule = this._dataValidationModel.getRuleById(unitId, subUnitId, (_b = result.extra) == null ? void 0 : _b.ruleId);
+              var _a12, _b;
+              const ruleInfo = ruleFormulaMap.get((_a12 = result.extra) == null ? void 0 : _a12.ruleId), cellInfo = formulaCellMap.get(result.formulaId), rule = this._dataValidationModel.getRuleById(unitId, subUnitId, (_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);
             });
           }
@@ -186,8 +212,8 @@ let DataValidationCustomFormulaService = (_a = class extends Disposable {
       });
     }), newRanges.forEach((range) => {
       Range.foreach(range, (row, col) => {
-        var _a11;
-        const oldValue = (_a11 = formulaMap.getValue(row, col)) != null ? _a11 : {};
+        var _a12;
+        const oldValue = (_a12 = formulaMap.getValue(row, col)) != null ? _a12 : {};
         if (oldValue.ruleId !== ruleId) {
           const oldRuleFormula = ruleFormulaMap.get(oldValue.ruleId);
           if (oldRuleFormula != null && oldRuleFormula.isTransformable && deleteFormulaIdList.add(oldValue.formulaId), isTransformable) {
@@ -226,21 +252,21 @@ let DataValidationCustomFormulaService = (_a = class extends Disposable {
     const { ruleFormulaMap } = this._ensureMaps(unitId, subUnitId);
     return ruleFormulaMap.get(ruleId);
   }
-}, __name(_a, "DataValidationCustomFormulaService"), _a);
+}, __name(_a2, "DataValidationCustomFormulaService"), _a2);
 DataValidationCustomFormulaService = __decorateClass$8([
   __decorateParam$8(0, IUniverInstanceService),
   __decorateParam$8(1, Inject(RegisterOtherFormulaService)),
   __decorateParam$8(2, Inject(LexerTreeBuilder)),
   __decorateParam$8(3, Inject(DataValidationModel)),
   __decorateParam$8(4, Inject(DataValidationCacheService)),
-  __decorateParam$8(5, ILogService)
+  __decorateParam$8(5, Inject(Injector))
 ], DataValidationCustomFormulaService);
 var __defProp$7 = Object.defineProperty, __getOwnPropDesc$7 = Object.getOwnPropertyDescriptor, __decorateClass$7 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   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"), _a2;
-let DataValidationFormulaService = (_a2 = class extends Disposable {
+}, "__decorateClass$7"), __decorateParam$7 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$7"), _a3;
+let DataValidationFormulaService = (_a3 = class extends Disposable {
   constructor(_instanceService, _registerOtherFormulaService, _dataValidationCacheService, _dataValidationModel) {
     super();
     __publicField(this, "_formulaRuleMap", /* @__PURE__ */ new Map());
@@ -254,8 +280,8 @@ let DataValidationFormulaService = (_a2 = class extends Disposable {
           for (const subUnitId in unitMap) {
             const results = unitMap[subUnitId], formulaMap = this._ensureRuleFormulaMap(unitId, subUnitId);
             results.forEach((result) => {
-              var _a11, _b;
-              if (formulaMap.get((_a11 = result.extra) == null ? void 0 : _a11.ruleId)) {
+              var _a12, _b;
+              if (formulaMap.get((_a12 = result.extra) == null ? void 0 : _a12.ruleId)) {
                 const rule = this._dataValidationModel.getRuleById(unitId, subUnitId, (_b = result.extra) == null ? void 0 : _b.ruleId);
                 rule && this._dataValidationCacheService.markRangeDirty(unitId, subUnitId, rule.ranges);
               }
@@ -339,7 +365,7 @@ let DataValidationFormulaService = (_a2 = class extends Disposable {
   getRuleFormulaInfo(unitId, subUnitId, ruleId) {
     return this._ensureRuleFormulaMap(unitId, subUnitId).get(ruleId);
   }
-}, __name(_a2, "DataValidationFormulaService"), _a2);
+}, __name(_a3, "DataValidationFormulaService"), _a3);
 DataValidationFormulaService = __decorateClass$7([
   __decorateParam$7(0, IUniverInstanceService),
   __decorateParam$7(1, Inject(RegisterOtherFormulaService)),
@@ -351,12 +377,12 @@ function getCellValueOrigin(cell) {
 }
 __name(getCellValueOrigin, "getCellValueOrigin");
 function getStringCellValue(cell) {
-  var _a11;
-  return String((_a11 = getCellValueOrigin(cell)) != null ? _a11 : "");
+  var _a12;
+  return String((_a12 = getCellValueOrigin(cell)) != null ? _a12 : "");
 }
 __name(getStringCellValue, "getStringCellValue");
-var _a3;
-const Interval = (_a3 = class {
+var _a4;
+const Interval = (_a4 = class {
   /**
    * Accept two comparable values and creates new instance of interval
    * Predicate Interval.comparable_less(low, high) supposed to return true on these values
@@ -371,7 +397,7 @@ const Interval = (_a3 = class {
    * @returns {Interval}
    */
   clone() {
-    return new _a3(this.low, this.high);
+    return new _a4(this.low, this.high);
   }
   /**
    * Propery max returns clone of this interval
@@ -418,7 +444,7 @@ const Interval = (_a3 = class {
    * @returns {Interval}
    */
   merge(other_interval) {
-    return new _a3(
+    return new _a4(
       this.low === void 0 ? other_interval.low : this.low < other_interval.low ? this.low : other_interval.low,
       this.high === void 0 ? other_interval.high : this.high > other_interval.high ? this.high : other_interval.high
     );
@@ -447,7 +473,7 @@ const Interval = (_a3 = class {
   static comparable_less_than(val1, val2) {
     return val1 < val2;
   }
-}, __name(_a3, "Interval"), _a3), RB_TREE_COLOR_RED = 0, RB_TREE_COLOR_BLACK = 1, _Node = class _Node {
+}, __name(_a4, "Interval"), _a4), RB_TREE_COLOR_RED = 0, RB_TREE_COLOR_BLACK = 1, _Node = class _Node {
   constructor(key = void 0, value = void 0, left = null, right = null, parent = null, color = RB_TREE_COLOR_BLACK) {
     if (this.left = left, this.right = right, this.parent = parent, this.color = color, this.item = { key, value }, key && key instanceof Array && key.length === 2 && !Number.isNaN(key[0]) && !Number.isNaN(key[1])) {
       let [low, high] = key;
@@ -780,8 +806,8 @@ const _RuleMatrix = class _RuleMatrix {
     this._unitId = _unitId, this._subUnitId = _subUnitId, this._univerInstanceService = _univerInstanceService, this._disableTree = _disableTree, this._map = value, this._buildTree();
   }
   get _worksheet() {
-    var _a11;
-    return (_a11 = this._univerInstanceService.getUnit(this._unitId, UniverInstanceType.UNIVER_SHEET)) == null ? void 0 : _a11.getSheetBySheetId(this._subUnitId);
+    var _a12;
+    return (_a12 = this._univerInstanceService.getUnit(this._unitId, UniverInstanceType.UNIVER_SHEET)) == null ? void 0 : _a12.getSheetBySheetId(this._subUnitId);
   }
   addRule(rule) {
     if (!this._worksheet)
@@ -831,8 +857,8 @@ const _RuleMatrix = class _RuleMatrix {
     const mutations = [];
     let deleteIndex = 0;
     return rules.forEach((rule, index) => {
-      var _a11;
-      const newRanges = (_a11 = this._map.get(rule.uid)) != null ? _a11 : [], oldRanges = rule.ranges;
+      var _a12;
+      const newRanges = (_a12 = this._map.get(rule.uid)) != null ? _a12 : [], oldRanges = rule.ranges;
       newRanges.length !== 0 && (newRanges.length !== oldRanges.length || newRanges.some((range, i) => !Rectangle.equals(range, oldRanges[i]))) && mutations.push({
         type: "update",
         ruleId: rule.uid,
@@ -849,8 +875,8 @@ const _RuleMatrix = class _RuleMatrix {
     const mutations = [];
     let deleteIndex = 0;
     return rules.forEach((rule, index) => {
-      var _a11;
-      const newRanges = (_a11 = this._map.get(rule.uid)) != null ? _a11 : [], oldRanges = rule.ranges;
+      var _a12;
+      const newRanges = (_a12 = this._map.get(rule.uid)) != null ? _a12 : [], oldRanges = rule.ranges;
       newRanges.length !== 0 && (newRanges.length !== oldRanges.length || newRanges.some((range, i) => !Rectangle.equals(range, oldRanges[i]))) && mutations.push({
         type: "update",
         ruleId: rule.uid,
@@ -862,8 +888,8 @@ const _RuleMatrix = class _RuleMatrix {
         index: index - deleteIndex
       }), deleteIndex++);
     }), Array.from(additionRules).forEach((rule) => {
-      var _a11;
-      const newRanges = (_a11 = this._map.get(rule.uid)) != null ? _a11 : [];
+      var _a12;
+      const newRanges = (_a12 = this._map.get(rule.uid)) != null ? _a12 : [];
       mutations.push({
         type: "add",
         rule: {
@@ -898,8 +924,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"), _a4;
-let SheetDataValidationModel = (_a4 = class extends Disposable {
+}, "__decorateClass$6"), __decorateParam$6 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$6"), _a5;
+let SheetDataValidationModel = (_a5 = class extends Disposable {
   constructor(_dataValidationModel, _univerInstanceService, _dataValidatorRegistryService, _dataValidationCacheService, _dataValidationFormulaService, _dataValidationCustomFormulaService, _commandService) {
     super();
     __publicField(this, "_ruleMatrixMap", /* @__PURE__ */ new Map());
@@ -960,7 +986,7 @@ let SheetDataValidationModel = (_a4 = class extends Disposable {
     return matrix || (matrix = new RuleMatrix(/* @__PURE__ */ new Map(), unitId, subUnitId, this._univerInstanceService), unitMap.set(subUnitId, matrix)), matrix;
   }
   _addRuleSideEffect(unitId, subUnitId, rule) {
-    this._ensureRuleMatrix(unitId, subUnitId).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);
+    this._ensureRuleMatrix(unitId, subUnitId).addRule(rule), this._dataValidationCacheService.addRule(unitId, subUnitId, rule), this._dataValidationFormulaService.addRule(unitId, subUnitId, rule.uid, rule.formula1, rule.formula2), rule.type === DataValidationType.CUSTOM && this._dataValidationCustomFormulaService.addRule(unitId, subUnitId, rule);
   }
   _addRule(unitId, subUnitId, rule) {
     (Array.isArray(rule) ? rule : [rule]).forEach((item) => {
@@ -969,10 +995,13 @@ let SheetDataValidationModel = (_a4 = class extends Disposable {
   }
   _updateRule(unitId, subUnitId, ruleId, oldRule, payload) {
     const ruleMatrix = this._ensureRuleMatrix(unitId, subUnitId);
-    payload.type === UpdateRuleType.RANGE ? (ruleMatrix.updateRange(ruleId, payload.payload), this._dataValidationCacheService.updateRuleRanges(unitId, subUnitId, ruleId, payload.payload, oldRule.ranges), this._dataValidationCustomFormulaService.updateRuleRanges(unitId, subUnitId, ruleId, oldRule.ranges, payload.payload)) : payload.type === UpdateRuleType.SETTING && (this._dataValidationCacheService.markRangeDirty(unitId, subUnitId, oldRule.ranges), this._dataValidationFormulaService.updateRuleFormulaText(unitId, subUnitId, ruleId, payload.payload.formula1, payload.payload.formula2), this._dataValidationCustomFormulaService.updateRuleFormula(unitId, subUnitId, ruleId, oldRule.ranges, payload.payload.formula1));
+    payload.type === UpdateRuleType.RANGE ? (ruleMatrix.updateRange(ruleId, payload.payload), this._dataValidationCacheService.updateRuleRanges(unitId, subUnitId, ruleId, payload.payload, oldRule.ranges), oldRule.type === DataValidationType.CUSTOM && this._dataValidationCustomFormulaService.updateRuleRanges(unitId, subUnitId, ruleId, oldRule.ranges, payload.payload)) : payload.type === UpdateRuleType.SETTING && (this._dataValidationCacheService.markRangeDirty(unitId, subUnitId, oldRule.ranges), this._dataValidationFormulaService.updateRuleFormulaText(unitId, subUnitId, ruleId, payload.payload.formula1, payload.payload.formula2), oldRule.type === DataValidationType.CUSTOM ? this._dataValidationCustomFormulaService.updateRuleFormula(unitId, subUnitId, ruleId, oldRule.ranges, payload.payload.formula1) : payload.payload.type === DataValidationType.CUSTOM && this._dataValidationCustomFormulaService.addRule(unitId, subUnitId, {
+      ...oldRule,
+      ...payload.payload
+    }));
   }
   _removeRule(unitId, subUnitId, oldRule) {
-    this._ensureRuleMatrix(unitId, subUnitId).removeRule(oldRule), this._dataValidationCacheService.removeRule(unitId, subUnitId, oldRule);
+    this._ensureRuleMatrix(unitId, subUnitId).removeRule(oldRule), this._dataValidationCacheService.removeRule(unitId, subUnitId, oldRule), oldRule.type === DataValidationType.CUSTOM && this._dataValidationCustomFormulaService.deleteByRuleId(unitId, subUnitId, oldRule.uid);
   }
   getValidator(type) {
     return this._dataValidatorRegistryService.getValidatorItem(type);
@@ -985,22 +1014,26 @@ let SheetDataValidationModel = (_a4 = class extends Disposable {
     if (ruleId)
       return this._dataValidationModel.getRuleById(unitId, subUnitId, ruleId);
   }
-  validator(cell, rule, pos, _onCompete) {
-    const { col, row, unitId, subUnitId, worksheet } = pos, ruleId = rule.uid, onCompete = /* @__PURE__ */ __name((status, changed) => {
+  validator(rule, pos, _onCompete) {
+    const { col, row, unitId, subUnitId, worksheet } = pos, ruleId = rule.uid, formula1 = rule.formula1, formula2 = rule.formula2, onCompete = /* @__PURE__ */ __name((status, changed) => {
       _onCompete && _onCompete(status, changed), changed && this._validStatusChange$.next({
         unitId,
         subUnitId,
         ruleId: rule.uid,
-        status
+        status,
+        row,
+        col
       });
-    }, "onCompete"), validator = this.getValidator(rule.type), cellRaw = worksheet.getCellRaw(row, col), cellValue = getCellValueOrigin(cellRaw), interceptValue = getCellValueOrigin(cell);
+    }, "onCompete"), cell = worksheet.getCellValueOnly(row, col), validator = this.getValidator(rule.type), cellRaw = worksheet.getCellRaw(row, col), cellValue = getCellValueOrigin(cellRaw), interceptValue = getCellValueOrigin(cell);
     if (validator) {
       const cache = this._dataValidationCacheService.ensureCache(unitId, subUnitId), current = cache.getValue(row, col);
-      return !current || current.value !== cellValue || current.interceptValue !== interceptValue || current.ruleId !== ruleId ? (cache.setValue(row, col, {
+      return !current || current.value !== cellValue || current.interceptValue !== interceptValue || current.ruleId !== ruleId || current.formula1 !== formula1 || current.formula2 !== formula2 ? (cache.setValue(row, col, {
         value: cellValue,
         interceptValue,
         status: DataValidationStatus.VALIDATING,
-        ruleId
+        ruleId,
+        formula1: formula1 || "",
+        formula2: formula2 || ""
       }), validator.validator(
         {
           value: cellValue,
@@ -1020,7 +1053,9 @@ let SheetDataValidationModel = (_a4 = class extends Disposable {
           value: cellValue,
           status: realStatus,
           ruleId,
-          interceptValue
+          interceptValue,
+          formula1: formula1 || "",
+          formula2: formula2 || ""
         }), onCompete(realStatus, !0);
       }), DataValidationStatus.VALIDATING) : (onCompete(current.status, !1), current.status);
     } else
@@ -1057,7 +1092,7 @@ let SheetDataValidationModel = (_a4 = class extends Disposable {
   getAll() {
     return this._dataValidationModel.getAll();
   }
-}, __name(_a4, "SheetDataValidationModel"), _a4);
+}, __name(_a5, "SheetDataValidationModel"), _a5);
 SheetDataValidationModel = __decorateClass$6([
   __decorateParam$6(0, Inject(DataValidationModel)),
   __decorateParam$6(1, IUniverInstanceService),
@@ -1068,13 +1103,13 @@ SheetDataValidationModel = __decorateClass$6([
   __decorateParam$6(6, ICommandService)
 ], SheetDataValidationModel);
 function getFormulaResult(result) {
-  var _a11, _b;
-  return (_b = (_a11 = result == null ? void 0 : result[0]) == null ? void 0 : _a11[0]) == null ? void 0 : _b.v;
+  var _a12, _b;
+  return (_b = (_a12 = result == null ? void 0 : result[0]) == null ? void 0 : _a12[0]) == null ? void 0 : _b.v;
 }
 __name(getFormulaResult, "getFormulaResult");
 function getFormulaCellData(result) {
-  var _a11;
-  return (_a11 = result == null ? void 0 : result[0]) == null ? void 0 : _a11[0];
+  var _a12;
+  return (_a12 = result == null ? void 0 : result[0]) == null ? void 0 : _a12[0];
 }
 __name(getFormulaCellData, "getFormulaCellData");
 const CHECKBOX_FORMULA_1 = 1, CHECKBOX_FORMULA_2 = 0;
@@ -1115,8 +1150,8 @@ const transformCheckboxValue = /* @__PURE__ */ __name((value) => Tools.isDefine(
     };
   }
   async parseFormula(rule, unitId, subUnitId) {
-    var _a11, _b;
-    const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), originFormula1 = isFormulaString(formula1) ? getFormulaResult((_a11 = results == null ? void 0 : results[0]) == null ? void 0 : _a11.result) : formula1, originFormula2 = isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2;
+    var _a12, _b;
+    const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), originFormula1 = isFormulaString(formula1) ? getFormulaResult((_a12 = results == null ? void 0 : results[0]) == null ? void 0 : _a12.result) : formula1, originFormula2 = isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2;
     return {
       formula1: transformCheckboxValue(originFormula1),
       formula2: transformCheckboxValue(originFormula2),
@@ -1130,8 +1165,8 @@ const transformCheckboxValue = /* @__PURE__ */ __name((value) => Tools.isDefine(
     };
   }
   parseFormulaSync(rule, unitId, subUnitId) {
-    var _a11, _b;
-    const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = this._formulaService.getRuleFormulaResultSync(unitId, subUnitId, rule.uid), originFormula1 = isFormulaString(formula1) ? getFormulaResult((_a11 = results == null ? void 0 : results[0]) == null ? void 0 : _a11.result) : formula1, originFormula2 = isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2;
+    var _a12, _b;
+    const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = this._formulaService.getRuleFormulaResultSync(unitId, subUnitId, rule.uid), originFormula1 = isFormulaString(formula1) ? getFormulaResult((_a12 = results == null ? void 0 : results[0]) == null ? void 0 : _a12.result) : formula1, originFormula2 = isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2;
     return {
       formula1: transformCheckboxValue(originFormula1),
       formula2: transformCheckboxValue(originFormula2),
@@ -1178,8 +1213,8 @@ var dayjs_min = { exports: {} };
       return { M: c, y: h, w: o, d: a, D: d, h: u, m: s, s: i, ms: r, Q: f }[t2] || String(t2 || "").toLowerCase().replace(/s$/, "");
     }, "p"), u: /* @__PURE__ */ __name(function(t2) {
       return t2 === void 0;
-    }, "u") }, g = "en", D = {};
-    D[g] = M;
+    }, "u") }, g = "en", D2 = {};
+    D2[g] = M;
     var p = "$isDayjsObject", S = /* @__PURE__ */ __name(function(t2) {
       return t2 instanceof _ || !(!t2 || !t2[p]);
     }, "S"), w = /* @__PURE__ */ __name(function t2(e2, n2, r2) {
@@ -1187,12 +1222,12 @@ var dayjs_min = { exports: {} };
       if (!e2) return g;
       if (typeof e2 == "string") {
         var s2 = e2.toLowerCase();
-        D[s2] && (i2 = s2), n2 && (D[s2] = n2, i2 = s2);
+        D2[s2] && (i2 = s2), n2 && (D2[s2] = n2, i2 = s2);
         var u2 = e2.split("-");
         if (!i2 && u2.length > 1) return t2(u2[0]);
       } else {
         var a2 = e2.name;
-        D[a2] = e2, i2 = a2;
+        D2[a2] = e2, i2 = a2;
       }
       return !r2 && i2 && (g = i2), i2 || !r2 && g;
     }, "t"), O = /* @__PURE__ */ __name(function(t2, e2) {
@@ -1257,8 +1292,8 @@ var dayjs_min = { exports: {} };
           case c:
             return r2 ? l2(1, M3) : l2(0, M3 + 1);
           case o:
-            var g2 = this.$locale().weekStart || 0, D2 = (y2 < g2 ? y2 + 7 : y2) - g2;
-            return l2(r2 ? m3 - D2 : m3 + (6 - D2), M3);
+            var g2 = this.$locale().weekStart || 0, D3 = (y2 < g2 ? y2 + 7 : y2) - g2;
+            return l2(r2 ? m3 - D3 : m3 + (6 - D3), M3);
           case a:
           case d:
             return $2(v2 + "Hours", 0);
@@ -1368,18 +1403,18 @@ var dayjs_min = { exports: {} };
       }, m2.utcOffset = function() {
         return 15 * -Math.round(this.$d.getTimezoneOffset() / 15);
       }, m2.diff = function(r2, d2, l2) {
-        var $2, y2 = this, M3 = b.p(d2), m3 = O(r2), v2 = (m3.utcOffset() - this.utcOffset()) * e, g2 = this - m3, D2 = /* @__PURE__ */ __name(function() {
+        var $2, y2 = this, M3 = b.p(d2), m3 = O(r2), v2 = (m3.utcOffset() - this.utcOffset()) * e, g2 = this - m3, D3 = /* @__PURE__ */ __name(function() {
           return b.m(y2, m3);
         }, "D");
         switch (M3) {
           case h:
-            $2 = D2() / 12;
+            $2 = D3() / 12;
             break;
           case c:
-            $2 = D2();
+            $2 = D3();
             break;
           case f:
-            $2 = D2() / 3;
+            $2 = D3() / 3;
             break;
           case o:
             $2 = (g2 - v2) / 6048e5;
@@ -1403,7 +1438,7 @@ var dayjs_min = { exports: {} };
       }, m2.daysInMonth = function() {
         return this.endOf(c).$D;
       }, m2.$locale = function() {
-        return D[this.$L];
+        return D2[this.$L];
       }, m2.locale = function(t2, e2) {
         if (!t2) return this.$L;
         var n2 = this.clone(), r2 = w(t2, e2, !0);
@@ -1428,7 +1463,7 @@ var dayjs_min = { exports: {} };
       return t2.$i || (t2(e2, _, O), t2.$i = !0), O;
     }, O.locale = w, O.isDayjs = S, O.unix = function(t2) {
       return O(1e3 * t2);
-    }, O.en = D[g], O.Ls = D, O.p = {}, O;
+    }, O.en = D2[g], O.Ls = D2, O.p = {}, O;
   });
 })(dayjs_min);
 var dayjs_minExports = dayjs_min.exports;
@@ -1465,12 +1500,12 @@ const DateOperatorTitleMap = {
   DataValidationOperator.BETWEEN,
   DataValidationOperator.NOT_BETWEEN
 ], FORMULA1$1 = "{FORMULA1}", FORMULA2$1 = "{FORMULA2}", transformDate2SerialNumber = /* @__PURE__ */ __name((value) => {
-  var _a11, _b;
+  var _a12, _b;
   if (value == null || typeof value == "boolean")
     return;
   if (typeof value == "number" || !Number.isNaN(+value))
     return +value;
-  const v = (_a11 = numfmt.parseDate(value)) == null ? void 0 : _a11.v;
+  const v = (_a12 = numfmt.parseDate(value)) == null ? void 0 : _a12.v;
   return Tools.isDefine(v) ? v : (_b = numfmt.parseDate(dayjs(value).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : _b.v;
 }, "transformDate2SerialNumber"), _DateValidator = class _DateValidator extends BaseDataValidator {
   constructor() {
@@ -1491,18 +1526,18 @@ const DateOperatorTitleMap = {
     __publicField(this, "_formulaService", this.injector.get(DataValidationFormulaService));
   }
   async parseFormula(rule, unitId, subUnitId) {
-    var _a11, _b;
+    var _a12, _b;
     const results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule;
     return {
-      formula1: transformDate2SerialNumber(isFormulaString(formula1) ? getFormulaResult((_a11 = results == null ? void 0 : results[0]) == null ? void 0 : _a11.result) : formula1),
+      formula1: transformDate2SerialNumber(isFormulaString(formula1) ? getFormulaResult((_a12 = results == null ? void 0 : results[0]) == null ? void 0 : _a12.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 _a11, _b;
+    var _a12, _b;
     const results = this._formulaService.getRuleFormulaResultSync(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule;
     return {
-      formula1: transformDate2SerialNumber(isFormulaString(formula1) ? getFormulaResult((_a11 = results == null ? void 0 : results[0]) == null ? void 0 : _a11.result) : formula1),
+      formula1: transformDate2SerialNumber(isFormulaString(formula1) ? getFormulaResult((_a12 = results == null ? void 0 : results[0]) == null ? void 0 : _a12.result) : formula1),
       formula2: transformDate2SerialNumber(isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2)
     };
   }
@@ -1535,14 +1570,14 @@ const DateOperatorTitleMap = {
   }
   normalizeFormula(rule, _unitId, _subUnitId) {
     const { formula1, formula2, bizInfo } = rule, normlizeSingleFormula = /* @__PURE__ */ __name((formula) => {
-      var _a11;
+      var _a12;
       if (!formula)
         return formula;
       let date;
       if (!Number.isNaN(+formula))
         date = numfmt.dateFromSerial(+formula);
       else {
-        const res = (_a11 = numfmt.parseDate(formula)) == null ? void 0 : _a11.v;
+        const res = (_a12 = numfmt.parseDate(formula)) == null ? void 0 : _a12.v;
         if (res == null)
           return "";
         date = numfmt.dateFromSerial(res);
@@ -1603,15 +1638,15 @@ const DateOperatorTitleMap = {
     return this.operators.map((operator) => this.localeService.t(DateOperatorNameMap[operator]));
   }
   generateRuleName(rule) {
-    var _a11, _b;
+    var _a12, _b;
     if (!rule.operator)
       return this.titleStr;
-    const ruleName = this.localeService.t(DateOperatorTitleMap[rule.operator]).replace(FORMULA1$1, (_a11 = rule.formula1) != null ? _a11 : "").replace(FORMULA2$1, (_b = rule.formula2) != null ? _b : "");
+    const ruleName = this.localeService.t(DateOperatorTitleMap[rule.operator]).replace(FORMULA1$1, (_a12 = rule.formula1) != null ? _a12 : "").replace(FORMULA2$1, (_b = rule.formula2) != null ? _b : "");
     return `${this.titleStr} ${ruleName}`;
   }
   generateRuleErrorMessage(rule) {
-    var _a11, _b;
-    return rule.operator ? `${this.localeService.t(DateOperatorErrorTitleMap[rule.operator]).replace(FORMULA1$1, (_a11 = rule.formula1) != null ? _a11 : "").replace(FORMULA2$1, (_b = rule.formula2) != null ? _b : "")}` : this.titleStr;
+    var _a12, _b;
+    return rule.operator ? `${this.localeService.t(DateOperatorErrorTitleMap[rule.operator]).replace(FORMULA1$1, (_a12 = rule.formula1) != null ? _a12 : "").replace(FORMULA2$1, (_b = rule.formula2) != null ? _b : "")}` : this.titleStr;
   }
 };
 __name(_DateValidator, "DateValidator");
@@ -1657,10 +1692,10 @@ const _DecimalValidator = class _DecimalValidator extends BaseDataValidator {
     return formula == null ? Number.NaN : +formula;
   }
   async parseFormula(rule, unitId, subUnitId) {
-    var _a11, _b, _c, _d, _e, _f, _g, _h;
+    var _a12, _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 = (_a11 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a11.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 = (_a12 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a12.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)
     };
   }
@@ -1741,10 +1776,10 @@ function getRuleFormulaResultSet(result) {
   return result.forEach(
     (row) => {
       row.forEach((cell) => {
-        var _a11, _b;
+        var _a12, _b;
         const value = getCellValueOrigin(cell);
         if (value != null) {
-          if (typeof value != "string" && typeof (cell == null ? void 0 : cell.s) == "object" && ((_b = (_a11 = cell.s) == null ? void 0 : _a11.n) != null && _b.pattern)) {
+          if (typeof value != "string" && typeof (cell == null ? void 0 : cell.s) == "object" && ((_b = (_a12 = cell.s) == null ? void 0 : _a12.n) != null && _b.pattern)) {
             resultSet.add(numfmt.format(cell.s.n.pattern, value, { throws: !1 }));
             return;
           }
@@ -1791,16 +1826,16 @@ const _ListValidator = class _ListValidator extends BaseDataValidator {
     __publicField(this, "skipDefaultFontRender", /* @__PURE__ */ __name((rule) => rule.renderMode !== DataValidationRenderMode.TEXT, "skipDefaultFontRender"));
   }
   validatorFormula(rule, unitId, subUnitId) {
-    var _a11, _b, _c;
-    const success = !Tools.isBlank(rule.formula1), valid = isValidListFormula((_a11 = rule.formula1) != null ? _a11 : "", 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 _a12, _b, _c;
+    const success = !Tools.isBlank(rule.formula1), valid = isValidListFormula((_a12 = rule.formula1) != null ? _a12 : "", 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")
     };
   }
   getExtraStyle(rule, value, { style: defaultStyle }) {
-    var _a11;
-    const tb = (_a11 = defaultStyle.tb !== WrapStrategy.OVERFLOW ? defaultStyle.tb : WrapStrategy.CLIP) != null ? _a11 : WrapStrategy.WRAP;
+    var _a12;
+    const tb = (_a12 = defaultStyle.tb !== WrapStrategy.OVERFLOW ? defaultStyle.tb : WrapStrategy.CLIP) != null ? _a12 : WrapStrategy.WRAP;
     if (rule.type === DataValidationType.LIST && (rule.renderMode === DataValidationRenderMode.ARROW || rule.renderMode === DataValidationRenderMode.TEXT)) {
       const colorMap = this.getListWithColorMap(rule), valueStr = `${value != null ? value : ""}`, color = colorMap[valueStr];
       if (color)
@@ -1820,10 +1855,10 @@ const _ListValidator = class _ListValidator extends BaseDataValidator {
     return deserializeListOptions(cellString);
   }
   async parseFormula(rule, unitId, subUnitId) {
-    var _a11;
+    var _a12;
     const { formula1 = "" } = rule, results = await this.formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid);
     return {
-      formula1: isFormulaString(formula1) ? getRuleFormulaResultSet((_a11 = results == null ? void 0 : results[0]) == null ? void 0 : _a11.result) : deserializeListOptions(formula1),
+      formula1: isFormulaString(formula1) ? getRuleFormulaResultSet((_a12 = results == null ? void 0 : results[0]) == null ? void 0 : _a12.result) : deserializeListOptions(formula1),
       formula2: void 0
     };
   }
@@ -1838,8 +1873,8 @@ const _ListValidator = class _ListValidator extends BaseDataValidator {
     return this.localeService.t("dataValidation.list.error");
   }
   getList(rule, currentUnitId, currentSubUnitId) {
-    var _a11, _b, _c;
-    const { formula1 = "" } = rule, univerInstanceService = this.injector.get(IUniverInstanceService), workbook = (_a11 = currentUnitId ? univerInstanceService.getUniverSheetInstance(currentUnitId) : void 0) != null ? _a11 : univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+    var _a12, _b, _c;
+    const { formula1 = "" } = rule, univerInstanceService = this.injector.get(IUniverInstanceService), workbook = (_a12 = currentUnitId ? univerInstanceService.getUniverSheetInstance(currentUnitId) : void 0) != null ? _a12 : univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
     if (!workbook) return [];
     const worksheet = (_b = currentSubUnitId ? workbook.getSheetBySheetId(currentSubUnitId) : void 0) != null ? _b : workbook.getActiveSheet();
     if (!worksheet) return [];
@@ -1847,8 +1882,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 _a11, _b, _c;
-    const { formula1 = "" } = rule, univerInstanceService = this.injector.get(IUniverInstanceService), workbook = (_a11 = currentUnitId ? univerInstanceService.getUniverSheetInstance(currentUnitId) : void 0) != null ? _a11 : univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+    var _a12, _b, _c;
+    const { formula1 = "" } = rule, univerInstanceService = this.injector.get(IUniverInstanceService), workbook = (_a12 = currentUnitId ? univerInstanceService.getUniverSheetInstance(currentUnitId) : void 0) != null ? _a12 : univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
     if (!workbook) return [];
     const worksheet = (_b = currentSubUnitId ? workbook.getSheetBySheetId(currentSubUnitId) : void 0) != null ? _b : workbook.getActiveSheet();
     if (!worksheet) return [];
@@ -1912,10 +1947,10 @@ const FORMULA1 = "{FORMULA1}", FORMULA2 = "{FORMULA2}", _TextLengthValidator = c
     return !Number.isNaN(formula);
   }
   async parseFormula(rule, unitId, subUnitId) {
-    var _a11, _b, _c, _d, _e, _f, _g, _h;
+    var _a12, _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 = (_a11 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a11.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 = (_a12 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a12.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)
     };
   }
@@ -1968,15 +2003,15 @@ const FORMULA1 = "{FORMULA1}", FORMULA2 = "{FORMULA2}", _TextLengthValidator = c
     return this._isValidFormula(formula1) ? cellValue <= formula1 : !1;
   }
   generateRuleErrorMessage(rule) {
-    var _a11, _b;
-    return rule.operator ? `${this.localeService.t(TextLengthErrorTitleMap[rule.operator]).replace(FORMULA1, (_a11 = rule.formula1) != null ? _a11 : "").replace(FORMULA2, (_b = rule.formula2) != null ? _b : "")}` : this.titleStr;
+    var _a12, _b;
+    return rule.operator ? `${this.localeService.t(TextLengthErrorTitleMap[rule.operator]).replace(FORMULA1, (_a12 = rule.formula1) != null ? _a12 : "").replace(FORMULA2, (_b = rule.formula2) != null ? _b : "")}` : this.titleStr;
   }
 };
 __name(_TextLengthValidator, "TextLengthValidator");
 let TextLengthValidator = _TextLengthValidator;
 function isBlankCell(cellData) {
-  var _a11, _b;
-  return cellData ? cellData.p ? !((_b = (_a11 = cellData.p.body) == null ? void 0 : _a11.dataStream) != null ? _b : "").slice(0, -2).trim() : Tools.isBlank(cellData.v) : !0;
+  var _a12, _b;
+  return cellData ? cellData.p ? !((_b = (_a12 = cellData.p.body) == null ? void 0 : _a12.dataStream) != null ? _b : "").slice(0, -2).trim() : Tools.isBlank(cellData.v) : !0;
 }
 __name(isBlankCell, "isBlankCell");
 function getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor, source = "command", fillDefaultValue = !0) {
@@ -2098,7 +2133,7 @@ __name(getDataValidationDiffMutations, "getDataValidationDiffMutations");
 const UpdateSheetDataValidationRangeCommand = {
   type: CommandType.COMMAND,
   id: "sheet.command.updateDataValidationRuleRange",
-  async handler(accessor, params) {
+  handler(accessor, params) {
     if (!params)
       return !1;
     const { unitId, subUnitId, ranges, ruleId } = params, sheetDataValidationModel = accessor.get(SheetDataValidationModel), commandService = accessor.get(ICommandService), undoRedoService = accessor.get(IUndoRedoService);
@@ -2111,12 +2146,12 @@ const UpdateSheetDataValidationRangeCommand = {
       undoMutations,
       redoMutations,
       unitID: unitId
-    }), await sequenceExecuteAsync(redoMutations, commandService), !0;
+    }), sequenceExecute(redoMutations, commandService), !0;
   }
 }, AddSheetDataValidationCommand = {
   type: CommandType.COMMAND,
   id: "sheet.command.addDataValidation",
-  async handler(accessor, params) {
+  handler(accessor, params) {
     if (!params)
       return !1;
     const { unitId, subUnitId, rule } = params, sheetDataValidationModel = accessor.get(SheetDataValidationModel), commandService = accessor.get(ICommandService), undoRedoService = accessor.get(IUndoRedoService), matrix = sheetDataValidationModel.getRuleObjectMatrix(unitId, subUnitId).clone();
@@ -2140,7 +2175,7 @@ const UpdateSheetDataValidationRangeCommand = {
       unitID: unitId,
       redoMutations,
       undoMutations
-    }), await sequenceExecuteAsync(redoMutations, commandService), !0;
+    }), sequenceExecute(redoMutations, commandService), !0;
   }
 }, UpdateSheetDataValidationSettingCommand = {
   type: CommandType.COMMAND,
@@ -2436,10 +2471,10 @@ const _WholeValidator = class _WholeValidator extends BaseDataValidator {
     return formula == null ? Number.NaN : +formula;
   }
   async parseFormula(rule, unitId, subUnitId) {
-    var _a11, _b, _c, _d, _e, _f, _g, _h;
+    var _a12, _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 = (_a11 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a11.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 = (_a12 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a12.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)
     };
   }
@@ -2504,8 +2539,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"), _a5;
-let DataValidationController = (_a5 = class extends RxDisposable {
+}, "__decorateClass$5"), __decorateParam$5 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$5"), _a6;
+let DataValidationController = (_a6 = class extends RxDisposable {
   constructor(_univerInstanceService, _dataValidatorRegistryService, _injector, _selectionManagerService, _sheetInterceptorService, _sheetDataValidationModel) {
     super(), this._univerInstanceService = _univerInstanceService, this._dataValidatorRegistryService = _dataValidatorRegistryService, this._injector = _injector, this._selectionManagerService = _selectionManagerService, this._sheetInterceptorService = _sheetInterceptorService, this._sheetDataValidationModel = _sheetDataValidationModel, this._init();
   }
@@ -2530,12 +2565,12 @@ let DataValidationController = (_a5 = class extends RxDisposable {
   _initCommandInterceptor() {
     this._sheetInterceptorService.interceptCommand({
       getMutations: /* @__PURE__ */ __name((commandInfo) => {
-        var _a11;
+        var _a12;
         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 = (_a11 = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : _a11.map((s) => s.range), ruleMatrix = this._sheetDataValidationModel.getRuleObjectMatrix(unitId, subUnitId).clone();
+          const subUnitId = worksheet.getSheetId(), selections = (_a12 = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : _a12.map((s) => s.range), ruleMatrix = this._sheetDataValidationModel.getRuleObjectMatrix(unitId, subUnitId).clone();
           selections && ruleMatrix.removeRange(selections);
           const diffs = ruleMatrix.diff(this._sheetDataValidationModel.getRules(unitId, subUnitId)), { redoMutations, undoMutations } = getDataValidationDiffMutations(unitId, subUnitId, diffs, this._injector, "patched");
           return {
@@ -2550,7 +2585,7 @@ let DataValidationController = (_a5 = class extends RxDisposable {
       }, "getMutations")
     });
   }
-}, __name(_a5, "DataValidationController"), _a5);
+}, __name(_a6, "DataValidationController"), _a6);
 DataValidationController = __decorateClass$5([
   __decorateParam$5(0, IUniverInstanceService),
   __decorateParam$5(1, Inject(DataValidatorRegistryService)),
@@ -2559,17 +2594,17 @@ DataValidationController = __decorateClass$5([
   __decorateParam$5(4, Inject(SheetInterceptorService)),
   __decorateParam$5(5, Inject(SheetDataValidationModel))
 ], DataValidationController);
-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$4 = Object.defineProperty, __getOwnPropDesc$4 = Object.getOwnPropertyDescriptor, __decorateClass$4 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+var D = /* @__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))(D || {}), __defProp$4 = Object.defineProperty, __getOwnPropDesc$4 = Object.getOwnPropertyDescriptor, __decorateClass$4 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   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"), _a6;
-let DataValidationFormulaController = (_a6 = class extends Disposable {
+}, "__decorateClass$4"), __decorateParam$4 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$4"), _a7;
+let DataValidationFormulaController = (_a7 = class extends Disposable {
   constructor(_univerInstanceService, _permissionService, _lexerTreeBuilder) {
     super(), this._univerInstanceService = _univerInstanceService, this._permissionService = _permissionService, this._lexerTreeBuilder = _lexerTreeBuilder;
   }
   getFormulaRefCheck(formulaString) {
-    var _a11, _b;
+    var _a12, _b;
     const sequenceNodes = this._lexerTreeBuilder.sequenceNodesBuilder(formulaString);
     if (!sequenceNodes)
       return !0;
@@ -2591,14 +2626,14 @@ let DataValidationFormulaController = (_a6 = 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 = (_a11 = targetSheet.getCell(i2, j)) == null ? void 0 : _a11.selectionProtection) == null ? void 0 : _b[0];
-          if ((permission == null ? void 0 : permission[P.View]) === !1)
+          const permission = (_b = (_a12 = targetSheet.getCell(i2, j)) == null ? void 0 : _a12.selectionProtection) == null ? void 0 : _b[0];
+          if ((permission == null ? void 0 : permission[D.View]) === !1)
             return !1;
         }
     }
     return !0;
   }
-}, __name(_a6, "DataValidationFormulaController"), _a6);
+}, __name(_a7, "DataValidationFormulaController"), _a7);
 DataValidationFormulaController = __decorateClass$4([
   __decorateParam$4(0, IUniverInstanceService),
   __decorateParam$4(1, IPermissionService),
@@ -2608,8 +2643,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"), _a7;
-let DataValidationRefRangeController = (_a7 = class extends Disposable {
+}, "__decorateClass$3"), __decorateParam$3 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$3"), _a8;
+let DataValidationRefRangeController = (_a8 = class extends Disposable {
   constructor(_dataValidationModel, _injector, _refRangeService, _dataValidationCustomFormulaService, _dataValidationFormulaService, _formulaRefRangeService) {
     super();
     __publicField(this, "_disposableMap", /* @__PURE__ */ new Map());
@@ -2623,8 +2658,8 @@ let DataValidationRefRangeController = (_a7 = class extends Disposable {
   }
   // eslint-disable-next-line max-lines-per-function
   registerFormula(unitId, subUnitId, rule) {
-    var _a11;
-    const ruleId = rule.uid, id = this._getIdWithUnitId(unitId, subUnitId, ruleId), disposeSet = (_a11 = this._disposableMap.get(id)) != null ? _a11 : /* @__PURE__ */ new Set(), handleFormulaChange = /* @__PURE__ */ __name((type, formulaString) => {
+    var _a12;
+    const ruleId = rule.uid, id = this._getIdWithUnitId(unitId, subUnitId, ruleId), disposeSet = (_a12 = this._disposableMap.get(id)) != null ? _a12 : /* @__PURE__ */ new Set(), handleFormulaChange = /* @__PURE__ */ __name((type, formulaString) => {
       const oldRule = this._dataValidationModel.getRuleById(unitId, subUnitId, ruleId);
       if (!oldRule)
         return { redos: [], undos: [] };
@@ -2701,7 +2736,7 @@ let DataValidationRefRangeController = (_a7 = class extends Disposable {
     }
   }
   register(unitId, subUnitId, rule) {
-    var _a11;
+    var _a12;
     const handleRangeChange = /* @__PURE__ */ __name((commandInfo) => {
       const oldRanges = [...rule.ranges], resultRanges = oldRanges.map((range) => handleCommonDefaultRangeChangeWithEffectRefCommands(range, commandInfo)).filter((range) => !!range).flat();
       if (isRangesEqual(resultRanges, oldRanges))
@@ -2739,7 +2774,7 @@ let DataValidationRefRangeController = (_a7 = 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 = (_a11 = this._disposableMap.get(id)) != null ? _a11 : /* @__PURE__ */ new Set();
+    const id = this._getIdWithUnitId(unitId, subUnitId, rule.uid), current = (_a12 = this._disposableMap.get(id)) != null ? _a12 : /* @__PURE__ */ new Set();
     current.add(() => disposeList.forEach((dispose) => dispose())), this._disposableMap.set(id, current);
   }
   _initRefRange() {
@@ -2775,7 +2810,7 @@ let DataValidationRefRangeController = (_a7 = class extends Disposable {
       }), this._disposableMap.clear();
     }));
   }
-}, __name(_a7, "DataValidationRefRangeController"), _a7);
+}, __name(_a8, "DataValidationRefRangeController"), _a8);
 DataValidationRefRangeController = __decorateClass$3([
   __decorateParam$3(0, Inject(SheetDataValidationModel)),
   __decorateParam$3(1, Inject(Injector)),
@@ -2788,8 +2823,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"), _a8;
-let SheetDataValidationSheetController = (_a8 = class extends Disposable {
+}, "__decorateClass$2"), __decorateParam$2 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$2"), _a9;
+let SheetDataValidationSheetController = (_a9 = class extends Disposable {
   constructor(_sheetInterceptorService, _univerInstanceService, _sheetDataValidationModel) {
     super(), this._sheetInterceptorService = _sheetInterceptorService, this._univerInstanceService = _univerInstanceService, this._sheetDataValidationModel = _sheetDataValidationModel, this._initSheetChange();
   }
@@ -2797,12 +2832,12 @@ let SheetDataValidationSheetController = (_a8 = class extends Disposable {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
         getMutations: /* @__PURE__ */ __name((commandInfo) => {
-          var _a11;
+          var _a12;
           if (commandInfo.id === RemoveSheetCommand.id) {
             const params = commandInfo.params, unitId = params.unitId || this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET).getUnitId(), workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
             if (!workbook)
               return { redos: [], undos: [] };
-            const subUnitId = params.subUnitId || ((_a11 = workbook.getActiveSheet()) == null ? void 0 : _a11.getSheetId());
+            const subUnitId = params.subUnitId || ((_a12 = workbook.getActiveSheet()) == null ? void 0 : _a12.getSheetId());
             if (!subUnitId)
               return { redos: [], undos: [] };
             const rules = this._sheetDataValidationModel.getRules(unitId, subUnitId);
@@ -2835,7 +2870,7 @@ let SheetDataValidationSheetController = (_a8 = class extends Disposable {
       })
     );
   }
-}, __name(_a8, "SheetDataValidationSheetController"), _a8);
+}, __name(_a9, "SheetDataValidationSheetController"), _a9);
 SheetDataValidationSheetController = __decorateClass$2([
   __decorateParam$2(0, Inject(SheetInterceptorService)),
   __decorateParam$2(1, Inject(IUniverInstanceService)),
@@ -2845,10 +2880,29 @@ 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"), _a9;
-let SheetsDataValidationValidatorService = (_a9 = class {
-  constructor(_univerInstanceService, _sheetDataValidationModel, _dataValidationCacheService) {
-    this._univerInstanceService = _univerInstanceService, this._sheetDataValidationModel = _sheetDataValidationModel, this._dataValidationCacheService = _dataValidationCacheService;
+}, "__decorateClass$1"), __decorateParam$1 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$1"), _a10;
+let SheetsDataValidationValidatorService = (_a10 = class extends Disposable {
+  constructor(_univerInstanceService, _sheetDataValidationModel, _dataValidationCacheService, _lifecycleService) {
+    super(), this._univerInstanceService = _univerInstanceService, this._sheetDataValidationModel = _sheetDataValidationModel, this._dataValidationCacheService = _dataValidationCacheService, this._lifecycleService = _lifecycleService, this._initRecalculate();
+  }
+  _initRecalculate() {
+    const handleDirtyRanges = /* @__PURE__ */ __name((ranges) => {
+      if (ranges.length === 0)
+        return;
+      const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET), worksheet = workbook == null ? void 0 : workbook.getActiveSheet(), map = {};
+      ranges.flat().forEach((range) => {
+        map[range.unitId] || (map[range.unitId] = {}), map[range.unitId][range.subUnitId] || (map[range.unitId][range.subUnitId] = []);
+        const workbook2 = this._univerInstanceService.getUnit(range.unitId, UniverInstanceType.UNIVER_SHEET), worksheet2 = workbook2 == null ? void 0 : workbook2.getSheetBySheetId(range.subUnitId);
+        worksheet2 && map[range.unitId][range.subUnitId].push(...range.ranges.map((range2) => Range.transformRange(range2, worksheet2)));
+      }), Object.entries(map).forEach(([unitId, subUnitMap]) => {
+        Object.entries(subUnitMap).forEach(([subUnitId, ranges2]) => {
+          (workbook == null ? void 0 : workbook.getUnitId()) === unitId && (worksheet == null ? void 0 : worksheet.getSheetId()) === subUnitId ? this.validatorRanges(unitId, subUnitId, ranges2) : requestIdleCallback(() => {
+            this.validatorRanges(unitId, subUnitId, ranges2);
+          });
+        });
+      });
+    }, "handleDirtyRanges");
+    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(bufferWhen(() => this._lifecycleService.lifecycle$.pipe(filter((stage) => stage === LifecycleStages.Rendered)))).subscribe(handleDirtyRanges)), this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(filter(() => this._lifecycleService.stage >= LifecycleStages.Rendered), bufferDebounceTime(20)).subscribe(handleDirtyRanges));
   }
   async validatorCell(unitId, subUnitId, row, col) {
     const workbook = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
@@ -2859,9 +2913,11 @@ let SheetsDataValidationValidatorService = (_a9 = class {
       throw new Error(`cannot find current worksheet, sheetId: ${subUnitId}`);
     if (!Tools.isDefine(row) || !Tools.isDefine(col))
       throw new Error(`row or col is not defined, row: ${row}, col: ${col}`);
-    const cell = worksheet.getCell(row, col), rule = this._sheetDataValidationModel.getRuleByLocation(unitId, subUnitId, row, col);
+    const rule = this._sheetDataValidationModel.getRuleByLocation(unitId, subUnitId, row, col);
     return rule ? new Promise((resolve) => {
-      this._sheetDataValidationModel.validator(cell, rule, { unitId, subUnitId, row, col, worksheet, workbook }, resolve);
+      this._sheetDataValidationModel.validator(rule, { unitId, subUnitId, row, col, worksheet, workbook }, (status) => {
+        resolve(status);
+      });
     }) : DataValidationStatus.VALID;
   }
   validatorRanges(unitId, subUnitId, ranges) {
@@ -2899,18 +2955,19 @@ let SheetsDataValidationValidatorService = (_a9 = class {
   getDataValidation(unitId, subUnitId, ranges) {
     return this.getDataValidations(unitId, subUnitId, ranges)[0];
   }
-}, __name(_a9, "SheetsDataValidationValidatorService"), _a9);
+}, __name(_a10, "SheetsDataValidationValidatorService"), _a10);
 SheetsDataValidationValidatorService = __decorateClass$1([
   __decorateParam$1(0, IUniverInstanceService),
   __decorateParam$1(1, Inject(SheetDataValidationModel)),
-  __decorateParam$1(2, Inject(DataValidationCacheService))
+  __decorateParam$1(2, Inject(DataValidationCacheService)),
+  __decorateParam$1(3, Inject(LifecycleService))
 ], SheetsDataValidationValidatorService);
 var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __defNormalProp2 = /* @__PURE__ */ __name((obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value, "__defNormalProp"), __decorateClass = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
     (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"), _a10;
-let UniverSheetsDataValidationPlugin = (_a10 = 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"), _a11;
+let UniverSheetsDataValidationPlugin = (_a11 = class extends Plugin {
   constructor(_config = defaultPluginConfig, _injector, _commandService, _configService) {
     super(), this._config = _config, this._injector = _injector, this._commandService = _commandService, this._configService = _configService;
     const { ...rest } = this._config;
@@ -2939,7 +2996,7 @@ let UniverSheetsDataValidationPlugin = (_a10 = class extends Plugin {
       ClearRangeDataValidationCommand
     ].forEach((command) => {
       this._commandService.registerCommand(command);
-    }), this._injector.get(DataValidationRefRangeController);
+    }), this._injector.get(DataValidationCacheService), this._injector.get(SheetsDataValidationValidatorService), this._injector.get(DataValidationRefRangeController);
   }
   onReady() {
     this._injector.get(SheetDataValidationSheetController);
@@ -2947,7 +3004,7 @@ let UniverSheetsDataValidationPlugin = (_a10 = class extends Plugin {
   onRendered() {
     this._injector.get(DataValidationController), this._injector.get(DataValidationFormulaController);
   }
-}, __name(_a10, "UniverSheetsDataValidationPlugin"), _a10);
+}, __name(_a11, "UniverSheetsDataValidationPlugin"), _a11);
 __publicField2(UniverSheetsDataValidationPlugin, "pluginName", DATA_VALIDATION_PLUGIN_NAME);
 __publicField2(UniverSheetsDataValidationPlugin, "type", UniverInstanceType.UNIVER_SHEET);
 UniverSheetsDataValidationPlugin = __decorateClass([
@@ -2978,7 +3035,6 @@ export {
   DataValidationCustomFormulaService,
   DataValidationFormulaController,
   DataValidationFormulaService,
-  DataValidationModel2 as DataValidationModel,
   DateValidator,
   ListMultipleValidator,
   ListValidator,