@univerjs/sheets-data-validation 0.5.4 → 0.5.5-experimental.20250122-3362a4a

package/lib/es/index.js

@@ -1,448 +1,455 @@
-var Rt = Object.defineProperty;
-var St = (s, a, e) => a in s ? Rt(s, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[a] = e;
-var f = (s, a, e) => St(s, typeof a != "symbol" ? a + "" : a, e);
-import { Inject as S, ICommandService as x, IUniverInstanceService as O, Disposable as $, ObjectMatrix as ve, UniverInstanceType as N, Range as b, isFormulaString as v, DataValidationType as T, getOriginCellValue as vt, RBush as Vt, debounce as Mt, Rectangle as I, Tools as V, DataValidationStatus as D, WrapStrategy as Se, DataValidationOperator as h, numfmt as Q, dayjs as at, DataValidationRenderMode as Be, CommandType as K, IUndoRedoService as z, sequenceExecute as Ie, isRangesEqual as rt, generateRandomId as yt, toDisposable as qe, IPermissionService as Et, Injector as Ge, CellValueType as Tt, RxDisposable as Ft, LifecycleService as Nt, LifecycleStages as ze, bufferDebounceTime as Ct, DependentOn as Ot, Plugin as wt, merge as It, IConfigService as At } from "@univerjs/core";
-import { DataValidationModel as ke, DataValidatorRegistryService as G, UpdateRuleType as y, BaseDataValidator as k, TextLengthErrorTitleMap as Dt, AddDataValidationMutation as L, RemoveDataValidationMutation as A, UpdateDataValidationMutation as E, getRuleSetting as bt, getRuleOptions as Lt, UniverDataValidationPlugin as xt } from "@univerjs/data-validation";
-import { SetRangeValuesMutation as oe, RemoveSheetMutation as it, getSheetCommandTarget as Ye, SetRangeValuesUndoMutationFactory as st, WorksheetViewPermission as Bt, RefRangeService as Ut, handleCommonDefaultRangeChangeWithEffectRefCommands as Pt, SheetInterceptorService as ot, RemoveSheetCommand as $t, SheetsSelectionsService as nt, ClearSelectionAllCommand as Ht } from "@univerjs/sheets";
-import { Subject as Qe, bufferWhen as Wt, filter as Ze } from "rxjs";
-import { RegisterOtherFormulaService as lt, FormulaRefRangeService as ut } from "@univerjs/sheets-formula";
-import { ERROR_TYPE_SET as jt, LexerTreeBuilder as Z, isReferenceString as dt, sequenceNodeType as Qt, deserializeRangeWithSheet as qt, deserializeRangeWithSheetWithCache as Gt } from "@univerjs/engine-formula";
-const kt = "SHEET_DATA_VALIDATION_PLUGIN";
-var Yt = Object.defineProperty, Xt = Object.getOwnPropertyDescriptor, Kt = (s, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Xt(a, e) : a, i = s.length - 1, o; i >= 0; i--)
-    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
-  return t && r && Yt(a, e, r), r;
-}, Je = (s, a) => (e, t) => a(e, t, s);
-let q = class extends $ {
-  constructor(a, e) {
+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 { Inject, ICommandService, IUniverInstanceService, Disposable, ObjectMatrix, UniverInstanceType, Range, isFormulaString, DataValidationType, getOriginCellValue, RBush, debounce, Rectangle, Tools, DataValidationStatus, WrapStrategy, DataValidationOperator, numfmt, dayjs, DataValidationRenderMode, CommandType, IUndoRedoService, sequenceExecute, isRangesEqual, generateRandomId, toDisposable, IPermissionService, Injector, CellValueType, RxDisposable, LifecycleService, LifecycleStages, bufferDebounceTime, DependentOn, Plugin, merge, IConfigService } from "@univerjs/core";
+import { DataValidationModel, DataValidatorRegistryService, UpdateRuleType, BaseDataValidator, TextLengthErrorTitleMap, AddDataValidationMutation, RemoveDataValidationMutation, UpdateDataValidationMutation, getRuleSetting, getRuleOptions, UniverDataValidationPlugin } from "@univerjs/data-validation";
+import { SetRangeValuesMutation, RemoveSheetMutation, getSheetCommandTarget, SetRangeValuesUndoMutationFactory, WorksheetViewPermission, RefRangeService, handleCommonDefaultRangeChangeWithEffectRefCommands, SheetInterceptorService, RemoveSheetCommand, SheetsSelectionsService, ClearSelectionAllCommand } from "@univerjs/sheets";
+import { Subject, bufferWhen, filter } from "rxjs";
+import { RegisterOtherFormulaService, FormulaRefRangeService } from "@univerjs/sheets-formula";
+import { ERROR_TYPE_SET, LexerTreeBuilder, isReferenceString, sequenceNodeType, deserializeRangeWithSheet, deserializeRangeWithSheetWithCache, operatorToken } from "@univerjs/engine-formula";
+const DATA_VALIDATION_PLUGIN_NAME = "SHEET_DATA_VALIDATION_PLUGIN";
+var __defProp$a = Object.defineProperty, __getOwnPropDesc$a = Object.getOwnPropertyDescriptor, __decorateClass$a = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$a(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$a(target, key, result), result;
+}, "__decorateClass$a"), __decorateParam$a = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$a"), _a;
+let DataValidationCacheService = (_a = class extends Disposable {
+  constructor(_commandService, _univerInstanceService) {
     super();
-    f(this, "_cacheMatrix", /* @__PURE__ */ new Map());
-    f(this, "_dirtyRanges$", new Qe());
-    f(this, "dirtyRanges$", this._dirtyRanges$.asObservable());
-    this._commandService = a, this._univerInstanceService = e, this._initDirtyRanges(), this._initSheetRemove();
+    __publicField(this, "_cacheMatrix", /* @__PURE__ */ new Map());
+    __publicField(this, "_dirtyRanges$", new Subject());
+    __publicField(this, "dirtyRanges$", this._dirtyRanges$.asObservable());
+    this._commandService = _commandService, this._univerInstanceService = _univerInstanceService, this._initDirtyRanges(), this._initSheetRemove();
   }
   _initDirtyRanges() {
-    this.disposeWithMe(this._commandService.onCommandExecuted((a) => {
-      if (a.id === oe.id) {
-        const { cellValue: e, unitId: t, subUnitId: r } = a.params;
-        if (e) {
-          const i = new ve(e).getDataRange();
-          if (i.endRow === -1) return;
-          this.markRangeDirty(t, r, [i]);
+    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.markRangeDirty(unitId, subUnitId, [range]);
         }
       }
     }));
   }
   _initSheetRemove() {
-    this.disposeWithMe(this._commandService.onCommandExecuted((a) => {
-      var e;
-      if (a.id === it.id) {
-        const { unitId: t, subUnitId: r } = a.params;
-        (e = this._cacheMatrix.get(t)) == null || e.delete(r);
+    this.disposeWithMe(this._commandService.onCommandExecuted((commandInfo) => {
+      var _a12;
+      if (commandInfo.id === RemoveSheetMutation.id) {
+        const { unitId, subUnitId } = commandInfo.params;
+        (_a12 = this._cacheMatrix.get(unitId)) == null || _a12.delete(subUnitId);
       }
-    })), this.disposeWithMe(this._univerInstanceService.unitDisposed$.subscribe((a) => {
-      a.type === N.UNIVER_SHEET && this._cacheMatrix.delete(a.getUnitId());
+    })), this.disposeWithMe(this._univerInstanceService.unitDisposed$.subscribe((univerInstance) => {
+      univerInstance.type === UniverInstanceType.UNIVER_SHEET && this._cacheMatrix.delete(univerInstance.getUnitId());
     }));
   }
-  _ensureCache(a, e) {
-    let t = this._cacheMatrix.get(a);
-    t || (t = /* @__PURE__ */ new Map(), this._cacheMatrix.set(a, t));
-    let r = t.get(e);
-    return r || (r = new ve(), t.set(e, r)), r;
+  _ensureCache(unitId, subUnitId) {
+    let unitMap = this._cacheMatrix.get(unitId);
+    unitMap || (unitMap = /* @__PURE__ */ new Map(), this._cacheMatrix.set(unitId, unitMap));
+    let cacheMatrix = unitMap.get(subUnitId);
+    return cacheMatrix || (cacheMatrix = new ObjectMatrix(), unitMap.set(subUnitId, cacheMatrix)), cacheMatrix;
   }
-  ensureCache(a, e) {
-    return this._ensureCache(a, e);
+  ensureCache(unitId, subUnitId) {
+    return this._ensureCache(unitId, subUnitId);
   }
-  addRule(a, e, t) {
-    this.markRangeDirty(a, e, t.ranges);
+  addRule(unitId, subUnitId, rule) {
+    this.markRangeDirty(unitId, subUnitId, rule.ranges);
   }
-  removeRule(a, e, t) {
-    this._deleteRange(a, e, t.ranges);
+  removeRule(unitId, subUnitId, rule) {
+    this._deleteRange(unitId, subUnitId, rule.ranges);
   }
-  markRangeDirty(a, e, t) {
-    const r = this._ensureCache(a, e);
-    t.forEach((i) => {
-      b.foreach(i, (o, n) => {
-        r.setValue(o, n, void 0);
+  markRangeDirty(unitId, subUnitId, ranges) {
+    const cache = this._ensureCache(unitId, subUnitId);
+    ranges.forEach((range) => {
+      Range.foreach(range, (row, col) => {
+        cache.setValue(row, col, void 0);
       });
-    }), this._dirtyRanges$.next({ unitId: a, subUnitId: e, ranges: t });
+    }), this._dirtyRanges$.next({ unitId, subUnitId, ranges });
   }
-  _deleteRange(a, e, t) {
-    const r = this._ensureCache(a, e);
-    t.forEach((i) => {
-      b.foreach(i, (o, n) => {
-        r.realDeleteValue(o, n);
+  _deleteRange(unitId, subUnitId, ranges) {
+    const cache = this._ensureCache(unitId, subUnitId);
+    ranges.forEach((range) => {
+      Range.foreach(range, (row, col) => {
+        cache.realDeleteValue(row, col);
       });
-    }), this._dirtyRanges$.next({ unitId: a, subUnitId: e, ranges: t });
-  }
-  getValue(a, e, t, r) {
-    return this._ensureCache(a, e).getValue(t, r);
-  }
-};
-q = Kt([
-  Je(0, S(x)),
-  Je(1, S(O))
-], q);
-function se(s) {
-  var a, e;
-  return (e = (a = s == null ? void 0 : s[0]) == null ? void 0 : a[0]) == null ? void 0 : e.v;
+    }), this._dirtyRanges$.next({ unitId, subUnitId, ranges });
+  }
+  getValue(unitId, subUnitId, row, col) {
+    return this._ensureCache(unitId, subUnitId).getValue(row, col);
+  }
+}, __name(_a, "DataValidationCacheService"), _a);
+DataValidationCacheService = __decorateClass$a([
+  __decorateParam$a(0, Inject(ICommandService)),
+  __decorateParam$a(1, Inject(IUniverInstanceService))
+], DataValidationCacheService);
+function getFormulaResult(result) {
+  var _a12, _b;
+  return (_b = (_a12 = result == null ? void 0 : result[0]) == null ? void 0 : _a12[0]) == null ? void 0 : _b.v;
 }
-function ge(s) {
-  var a;
-  return (a = s == null ? void 0 : s[0]) == null ? void 0 : a[0];
+__name(getFormulaResult, "getFormulaResult");
+function getFormulaCellData(result) {
+  var _a12;
+  return (_a12 = result == null ? void 0 : result[0]) == null ? void 0 : _a12[0];
 }
-function C(s) {
-  return !jt.has(s);
+__name(getFormulaCellData, "getFormulaCellData");
+function isLegalFormulaResult(res) {
+  return !ERROR_TYPE_SET.has(res);
 }
-function de(s, a) {
-  var t;
-  const e = a.getValidatorItem(s);
-  return (t = e == null ? void 0 : e.offsetFormulaByRange) != null ? t : !1;
+__name(isLegalFormulaResult, "isLegalFormulaResult");
+function shouldOffsetFormulaByRange(type, validatorRegistryService) {
+  var _a12;
+  const validator = validatorRegistryService.getValidatorItem(type);
+  return (_a12 = validator == null ? void 0 : validator.offsetFormulaByRange) != null ? _a12 : !1;
 }
-var zt = Object.defineProperty, Zt = Object.getOwnPropertyDescriptor, Jt = (s, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Zt(a, e) : a, i = s.length - 1, o; i >= 0; i--)
-    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
-  return t && r && zt(a, e, r), r;
-}, re = (s, a) => (e, t) => a(e, t, s);
-let P = class extends $ {
-  constructor(a, e, t, r, i) {
+__name(shouldOffsetFormulaByRange, "shouldOffsetFormulaByRange");
+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"), _a2;
+let DataValidationCustomFormulaService = (_a2 = class extends Disposable {
+  constructor(_instanceSrv, _registerOtherFormulaService, _dataValidationModel, _dataValidationCacheService, _validatorRegistryService) {
     super();
     /**
      * Map of origin formula of rule
      */
-    f(this, "_ruleFormulaMap", /* @__PURE__ */ new Map());
-    f(this, "_ruleFormulaMap2", /* @__PURE__ */ new Map());
-    this._instanceSrv = a, this._registerOtherFormulaService = e, this._dataValidationModel = t, this._dataValidationCacheService = r, this._validatorRegistryService = i, this._initFormulaResultHandler();
+    __publicField(this, "_ruleFormulaMap", /* @__PURE__ */ new Map());
+    __publicField(this, "_ruleFormulaMap2", /* @__PURE__ */ new Map());
+    this._instanceSrv = _instanceSrv, this._registerOtherFormulaService = _registerOtherFormulaService, this._dataValidationModel = _dataValidationModel, this._dataValidationCacheService = _dataValidationCacheService, this._validatorRegistryService = _validatorRegistryService, this._initFormulaResultHandler();
   }
   _initFormulaResultHandler() {
-    this.disposeWithMe(this._registerOtherFormulaService.formulaResult$.subscribe((a) => {
-      for (const e in a) {
-        const t = a[e];
-        if (this._instanceSrv.getUnitType(e) === N.UNIVER_SHEET)
-          for (const i in t) {
-            const o = t[i], { ruleFormulaMap: n } = this._ensureMaps(e, i);
-            o.forEach((l) => {
-              var c, m;
-              const u = n.get((c = l.extra) == null ? void 0 : c.ruleId), d = this._dataValidationModel.getRuleById(e, i, (m = l.extra) == null ? void 0 : m.ruleId);
-              d && u && this._dataValidationCacheService.markRangeDirty(e, i, d.ranges);
+    this.disposeWithMe(this._registerOtherFormulaService.formulaResult$.subscribe((resultMap) => {
+      for (const unitId in resultMap) {
+        const unitMap = resultMap[unitId];
+        if (this._instanceSrv.getUnitType(unitId) === UniverInstanceType.UNIVER_SHEET)
+          for (const subUnitId in unitMap) {
+            const results = unitMap[subUnitId], { ruleFormulaMap } = this._ensureMaps(unitId, subUnitId);
+            results.forEach((result) => {
+              var _a12, _b;
+              const ruleInfo = ruleFormulaMap.get((_a12 = result.extra) == null ? void 0 : _a12.ruleId), rule = this._dataValidationModel.getRuleById(unitId, subUnitId, (_b = result.extra) == null ? void 0 : _b.ruleId);
+              rule && ruleInfo && this._dataValidationCacheService.markRangeDirty(unitId, subUnitId, rule.ranges);
             });
           }
       }
     }));
   }
-  _ensureMaps(a, e) {
-    let t = this._ruleFormulaMap.get(a), r = this._ruleFormulaMap2.get(a);
-    t || (t = /* @__PURE__ */ new Map(), this._ruleFormulaMap.set(a, t)), r || (r = /* @__PURE__ */ new Map(), this._ruleFormulaMap2.set(a, r));
-    let i = t.get(e);
-    i || (i = /* @__PURE__ */ new Map(), t.set(e, i));
-    let o = r.get(e);
-    return o || (o = /* @__PURE__ */ new Map(), r.set(e, o)), { ruleFormulaMap: i, ruleFormulaMap2: o };
+  _ensureMaps(unitId, subUnitId) {
+    let ruleFormulaUnitMap = this._ruleFormulaMap.get(unitId), ruleFormulaUnitMap2 = this._ruleFormulaMap2.get(unitId);
+    ruleFormulaUnitMap || (ruleFormulaUnitMap = /* @__PURE__ */ new Map(), this._ruleFormulaMap.set(unitId, ruleFormulaUnitMap)), ruleFormulaUnitMap2 || (ruleFormulaUnitMap2 = /* @__PURE__ */ new Map(), this._ruleFormulaMap2.set(unitId, ruleFormulaUnitMap2));
+    let ruleFormulaMap = ruleFormulaUnitMap.get(subUnitId);
+    ruleFormulaMap || (ruleFormulaMap = /* @__PURE__ */ new Map(), ruleFormulaUnitMap.set(subUnitId, ruleFormulaMap));
+    let ruleFormulaMap2 = ruleFormulaUnitMap2.get(subUnitId);
+    return ruleFormulaMap2 || (ruleFormulaMap2 = /* @__PURE__ */ new Map(), ruleFormulaUnitMap2.set(subUnitId, ruleFormulaMap2)), { ruleFormulaMap, ruleFormulaMap2 };
   }
-  _registerFormula(a, e, t, r, i) {
-    return this._registerOtherFormulaService.registerFormulaWithRange(a, e, r, i, { ruleId: t });
+  _registerFormula(unitId, subUnitId, ruleId, formulaString, ranges) {
+    return this._registerOtherFormulaService.registerFormulaWithRange(unitId, subUnitId, formulaString, ranges, { ruleId });
   }
-  deleteByRuleId(a, e, t) {
-    const { ruleFormulaMap: r, ruleFormulaMap2: i } = this._ensureMaps(a, e), o = this._dataValidationModel.getRuleById(a, e, t), n = r.get(t);
-    if (!o || !n)
+  deleteByRuleId(unitId, subUnitId, ruleId) {
+    const { ruleFormulaMap, ruleFormulaMap2 } = this._ensureMaps(unitId, subUnitId), rule = this._dataValidationModel.getRuleById(unitId, subUnitId, ruleId), formulaInfo = ruleFormulaMap.get(ruleId);
+    if (!rule || !formulaInfo)
       return;
-    const l = r.get(t);
-    l && (r.delete(t), this._registerOtherFormulaService.deleteFormula(a, e, [l.formulaId]));
-    const u = i.get(t);
-    u && (i.delete(t), this._registerOtherFormulaService.deleteFormula(a, e, [u.formulaId]));
-  }
-  _addFormulaByRange(a, e, t, r, i, o) {
-    const { ruleFormulaMap: n, ruleFormulaMap2: l } = this._ensureMaps(a, e), u = o[0].startRow, d = o[0].startColumn;
-    if (r && v(r)) {
-      const c = this._registerFormula(a, e, t, r, o);
-      n.set(t, {
-        formula: r,
-        originCol: d,
-        originRow: u,
-        formulaId: c
+    const current = ruleFormulaMap.get(ruleId);
+    current && (ruleFormulaMap.delete(ruleId), this._registerOtherFormulaService.deleteFormula(unitId, subUnitId, [current.formulaId]));
+    const current2 = ruleFormulaMap2.get(ruleId);
+    current2 && (ruleFormulaMap2.delete(ruleId), this._registerOtherFormulaService.deleteFormula(unitId, subUnitId, [current2.formulaId]));
+  }
+  _addFormulaByRange(unitId, subUnitId, ruleId, formula, formula2, ranges) {
+    const { ruleFormulaMap, ruleFormulaMap2 } = this._ensureMaps(unitId, subUnitId), originRow = ranges[0].startRow, originCol = ranges[0].startColumn;
+    if (formula && isFormulaString(formula)) {
+      const formulaId = this._registerFormula(unitId, subUnitId, ruleId, formula, ranges);
+      ruleFormulaMap.set(ruleId, {
+        formula,
+        originCol,
+        originRow,
+        formulaId
       });
     }
-    if (i && v(i)) {
-      const c = this._registerFormula(a, e, t, i, o);
-      l.set(t, {
-        formula: i,
-        originCol: d,
-        originRow: u,
-        formulaId: c
+    if (formula2 && isFormulaString(formula2)) {
+      const formulaId2 = this._registerFormula(unitId, subUnitId, ruleId, formula2, ranges);
+      ruleFormulaMap2.set(ruleId, {
+        formula: formula2,
+        originCol,
+        originRow,
+        formulaId: formulaId2
       });
     }
   }
-  addRule(a, e, t) {
-    if (de(t.type, this._validatorRegistryService)) {
-      const { ranges: r, formula1: i, formula2: o, uid: n } = t;
-      this._addFormulaByRange(a, e, n, i, o, r);
+  addRule(unitId, subUnitId, rule) {
+    if (shouldOffsetFormulaByRange(rule.type, this._validatorRegistryService)) {
+      const { ranges, formula1, formula2, uid: ruleId } = rule;
+      this._addFormulaByRange(unitId, subUnitId, ruleId, formula1, formula2, ranges);
     }
   }
-  async getCellFormulaValue(a, e, t, r, i) {
-    var _, g;
-    const { ruleFormulaMap: o } = this._ensureMaps(a, e), n = o.get(t);
-    if (!n)
+  async getCellFormulaValue(unitId, subUnitId, ruleId, row, column) {
+    var _a12, _b;
+    const { ruleFormulaMap } = this._ensureMaps(unitId, subUnitId), current = ruleFormulaMap.get(ruleId);
+    if (!current)
       return Promise.resolve(void 0);
-    const l = await this._registerOtherFormulaService.getFormulaValue(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, m = i - d;
-    return ge((g = (_ = l == null ? void 0 : l.result) == null ? void 0 : _[c]) == null ? void 0 : g[m]);
+    const result = await this._registerOtherFormulaService.getFormulaValue(unitId, subUnitId, current.formulaId), { originRow, originCol } = current, offsetRow = row - originRow, offsetCol = column - originCol;
+    return getFormulaCellData((_b = (_a12 = result == null ? void 0 : result.result) == null ? void 0 : _a12[offsetRow]) == null ? void 0 : _b[offsetCol]);
   }
-  async getCellFormula2Value(a, e, t, r, i) {
-    var _, g;
-    const { ruleFormulaMap2: o } = this._ensureMaps(a, e), n = o.get(t);
-    if (!n)
+  async getCellFormula2Value(unitId, subUnitId, ruleId, row, column) {
+    var _a12, _b;
+    const { ruleFormulaMap2 } = this._ensureMaps(unitId, subUnitId), current = ruleFormulaMap2.get(ruleId);
+    if (!current)
       return Promise.resolve(void 0);
-    const l = await this._registerOtherFormulaService.getFormulaValue(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, m = i - d;
-    return ge((g = (_ = l == null ? void 0 : l.result) == null ? void 0 : _[c]) == null ? void 0 : g[m]);
+    const result = await this._registerOtherFormulaService.getFormulaValue(unitId, subUnitId, current.formulaId), { originRow, originCol } = current, offsetRow = row - originRow, offsetCol = column - originCol;
+    return getFormulaCellData((_b = (_a12 = result == null ? void 0 : result.result) == null ? void 0 : _a12[offsetRow]) == null ? void 0 : _b[offsetCol]);
   }
-  getCellFormulaValueSync(a, e, t, r, i) {
-    var _, g;
-    const { ruleFormulaMap: o } = this._ensureMaps(a, e), n = o.get(t);
-    if (!n)
+  getCellFormulaValueSync(unitId, subUnitId, ruleId, row, column) {
+    var _a12, _b;
+    const { ruleFormulaMap } = this._ensureMaps(unitId, subUnitId), current = ruleFormulaMap.get(ruleId);
+    if (!current)
       return;
-    const l = this._registerOtherFormulaService.getFormulaValueSync(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, m = i - d;
-    return ge((g = (_ = l == null ? void 0 : l.result) == null ? void 0 : _[c]) == null ? void 0 : g[m]);
+    const result = this._registerOtherFormulaService.getFormulaValueSync(unitId, subUnitId, current.formulaId), { originRow, originCol } = current, offsetRow = row - originRow, offsetCol = column - originCol;
+    return getFormulaCellData((_b = (_a12 = result == null ? void 0 : result.result) == null ? void 0 : _a12[offsetRow]) == null ? void 0 : _b[offsetCol]);
   }
-  getCellFormula2ValueSync(a, e, t, r, i) {
-    var _, g;
-    const { ruleFormulaMap2: o } = this._ensureMaps(a, e), n = o.get(t);
-    if (!n)
+  getCellFormula2ValueSync(unitId, subUnitId, ruleId, row, column) {
+    var _a12, _b;
+    const { ruleFormulaMap2 } = this._ensureMaps(unitId, subUnitId), current = ruleFormulaMap2.get(ruleId);
+    if (!current)
       return;
-    const l = this._registerOtherFormulaService.getFormulaValueSync(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, m = i - d;
-    return ge((g = (_ = l == null ? void 0 : l.result) == null ? void 0 : _[c]) == null ? void 0 : g[m]);
-  }
-  getRuleFormulaInfo(a, e, t) {
-    const { ruleFormulaMap: r } = this._ensureMaps(a, e);
-    return r.get(t);
-  }
-};
-P = Jt([
-  re(0, O),
-  re(1, S(lt)),
-  re(2, S(ke)),
-  re(3, S(q)),
-  re(4, S(G))
-], P);
-var ea = Object.defineProperty, ta = Object.getOwnPropertyDescriptor, aa = (s, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? ta(a, e) : a, i = s.length - 1, o; i >= 0; i--)
-    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
-  return t && r && ea(a, e, r), r;
-}, ie = (s, a) => (e, t) => a(e, t, s);
-let X = class extends $ {
-  constructor(a, e, t, r, i) {
+    const result = this._registerOtherFormulaService.getFormulaValueSync(unitId, subUnitId, current.formulaId), { originRow, originCol } = current, offsetRow = row - originRow, offsetCol = column - originCol;
+    return getFormulaCellData((_b = (_a12 = result == null ? void 0 : result.result) == null ? void 0 : _a12[offsetRow]) == null ? void 0 : _b[offsetCol]);
+  }
+  getRuleFormulaInfo(unitId, subUnitId, ruleId) {
+    const { ruleFormulaMap } = this._ensureMaps(unitId, subUnitId);
+    return ruleFormulaMap.get(ruleId);
+  }
+}, __name(_a2, "DataValidationCustomFormulaService"), _a2);
+DataValidationCustomFormulaService = __decorateClass$9([
+  __decorateParam$9(0, IUniverInstanceService),
+  __decorateParam$9(1, Inject(RegisterOtherFormulaService)),
+  __decorateParam$9(2, Inject(DataValidationModel)),
+  __decorateParam$9(3, Inject(DataValidationCacheService)),
+  __decorateParam$9(4, Inject(DataValidatorRegistryService))
+], DataValidationCustomFormulaService);
+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);
+  return kind && result && __defProp$8(target, key, result), result;
+}, "__decorateClass$8"), __decorateParam$8 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$8"), _a3;
+let DataValidationFormulaService = (_a3 = class extends Disposable {
+  constructor(_instanceService, _registerOtherFormulaService, _dataValidationCacheService, _dataValidationModel, _validatorRegistryService) {
     super();
-    f(this, "_formulaRuleMap", /* @__PURE__ */ new Map());
-    this._instanceService = a, this._registerOtherFormulaService = e, this._dataValidationCacheService = t, this._dataValidationModel = r, this._validatorRegistryService = i, this._initFormulaResultHandler();
+    __publicField(this, "_formulaRuleMap", /* @__PURE__ */ new Map());
+    this._instanceService = _instanceService, this._registerOtherFormulaService = _registerOtherFormulaService, this._dataValidationCacheService = _dataValidationCacheService, this._dataValidationModel = _dataValidationModel, this._validatorRegistryService = _validatorRegistryService, this._initFormulaResultHandler();
   }
   _initFormulaResultHandler() {
-    this.disposeWithMe(this._registerOtherFormulaService.formulaResult$.subscribe((a) => {
-      for (const e in a) {
-        const t = a[e];
-        if (this._instanceService.getUnitType(e) === N.UNIVER_SHEET)
-          for (const i in t) {
-            const o = t[i], n = this._ensureRuleFormulaMap(e, i);
-            o.forEach((l) => {
-              var u, d;
-              if (n.get((u = l.extra) == null ? void 0 : u.ruleId)) {
-                const c = this._dataValidationModel.getRuleById(e, i, (d = l.extra) == null ? void 0 : d.ruleId);
-                c && this._dataValidationCacheService.markRangeDirty(e, i, c.ranges);
+    this.disposeWithMe(this._registerOtherFormulaService.formulaResult$.subscribe((resultMap) => {
+      for (const unitId in resultMap) {
+        const unitMap = resultMap[unitId];
+        if (this._instanceService.getUnitType(unitId) === UniverInstanceType.UNIVER_SHEET)
+          for (const subUnitId in unitMap) {
+            const results = unitMap[subUnitId], formulaMap = this._ensureRuleFormulaMap(unitId, subUnitId);
+            results.forEach((result) => {
+              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);
               }
             });
           }
       }
     }));
   }
-  _ensureRuleFormulaMap(a, e) {
-    let t = this._formulaRuleMap.get(a);
-    t || (t = /* @__PURE__ */ new Map(), this._formulaRuleMap.set(a, t));
-    let r = t.get(e);
-    return r || (r = /* @__PURE__ */ new Map(), t.set(e, r)), r;
+  _ensureRuleFormulaMap(unitId, subUnitId) {
+    let unitMap = this._formulaRuleMap.get(unitId);
+    unitMap || (unitMap = /* @__PURE__ */ new Map(), this._formulaRuleMap.set(unitId, unitMap));
+    let subUnitMap = unitMap.get(subUnitId);
+    return subUnitMap || (subUnitMap = /* @__PURE__ */ new Map(), unitMap.set(subUnitId, subUnitMap)), subUnitMap;
   }
-  _registerSingleFormula(a, e, t, r) {
-    const i = [{ startColumn: 0, endColumn: 0, startRow: 0, endRow: 0 }];
-    return this._registerOtherFormulaService.registerFormulaWithRange(a, e, t, i, { ruleId: r });
+  _registerSingleFormula(unitId, subUnitId, formula, ruleId) {
+    const ranges = [{ startColumn: 0, endColumn: 0, startRow: 0, endRow: 0 }];
+    return this._registerOtherFormulaService.registerFormulaWithRange(unitId, subUnitId, formula, ranges, { ruleId });
   }
-  addRule(a, e, t) {
-    if (!de(t.type, this._validatorRegistryService) && t.type !== T.CHECKBOX) {
-      const { formula1: r, formula2: i, uid: o } = t, n = v(r), l = v(i);
-      if (!n && !l)
+  addRule(unitId, subUnitId, rule) {
+    if (!shouldOffsetFormulaByRange(rule.type, this._validatorRegistryService) && rule.type !== DataValidationType.CHECKBOX) {
+      const { formula1, formula2, uid: ruleId } = rule, isFormula1Legal = isFormulaString(formula1), isFormula2Legal = isFormulaString(formula2);
+      if (!isFormula1Legal && !isFormula2Legal)
         return;
-      const u = this._ensureRuleFormulaMap(a, e), d = [void 0, void 0];
-      if (n) {
-        const c = this._registerSingleFormula(a, e, r, o);
-        d[0] = { id: c, text: r };
+      const formulaRuleMap = this._ensureRuleFormulaMap(unitId, subUnitId), item = [void 0, void 0];
+      if (isFormula1Legal) {
+        const id = this._registerSingleFormula(unitId, subUnitId, formula1, ruleId);
+        item[0] = { id, text: formula1 };
       }
-      if (l) {
-        const c = this._registerSingleFormula(a, e, i, o);
-        d[1] = { id: c, text: i };
+      if (isFormula2Legal) {
+        const id = this._registerSingleFormula(unitId, subUnitId, formula2, ruleId);
+        item[1] = { id, text: formula2 };
       }
-      u.set(o, d);
+      formulaRuleMap.set(ruleId, item);
     }
   }
-  removeRule(a, e, t) {
-    const i = this._ensureRuleFormulaMap(a, e).get(t);
-    if (!i)
+  removeRule(unitId, subUnitId, ruleId) {
+    const item = this._ensureRuleFormulaMap(unitId, subUnitId).get(ruleId);
+    if (!item)
       return;
-    const [o, n] = i, l = [o == null ? void 0 : o.id, n == null ? void 0 : n.id].filter(Boolean);
-    l.length && this._registerOtherFormulaService.deleteFormula(a, e, l);
+    const [formula1, formula2] = item, idList = [formula1 == null ? void 0 : formula1.id, formula2 == null ? void 0 : formula2.id].filter(Boolean);
+    idList.length && this._registerOtherFormulaService.deleteFormula(unitId, subUnitId, idList);
   }
-  getRuleFormulaResult(a, e, t) {
-    const i = this._ensureRuleFormulaMap(a, e).get(t);
-    if (!i)
+  getRuleFormulaResult(unitId, subUnitId, ruleId) {
+    const formulaInfo = this._ensureRuleFormulaMap(unitId, subUnitId).get(ruleId);
+    if (!formulaInfo)
       return Promise.resolve(null);
-    const o = async (n) => n && this._registerOtherFormulaService.getFormulaValue(a, e, n.id);
+    const getResult = /* @__PURE__ */ __name(async (info) => info && this._registerOtherFormulaService.getFormulaValue(unitId, subUnitId, info.id), "getResult");
     return Promise.all([
-      o(i[0]),
-      o(i[1])
+      getResult(formulaInfo[0]),
+      getResult(formulaInfo[1])
     ]);
   }
-  getRuleFormulaResultSync(a, e, t) {
-    const i = this._ensureRuleFormulaMap(a, e).get(t);
-    if (i)
-      return i.map((o) => {
-        if (o)
-          return this._registerOtherFormulaService.getFormulaValueSync(a, e, o.id);
+  getRuleFormulaResultSync(unitId, subUnitId, ruleId) {
+    const formulaInfo = this._ensureRuleFormulaMap(unitId, subUnitId).get(ruleId);
+    if (formulaInfo)
+      return formulaInfo.map((i) => {
+        if (i)
+          return this._registerOtherFormulaService.getFormulaValueSync(unitId, subUnitId, i.id);
       });
   }
-  getRuleFormulaInfo(a, e, t) {
-    return this._ensureRuleFormulaMap(a, e).get(t);
-  }
-};
-X = aa([
-  ie(0, O),
-  ie(1, S(lt)),
-  ie(2, S(q)),
-  ie(3, S(ke)),
-  ie(4, S(G))
-], X);
-function ne(s) {
-  return vt(s);
+  getRuleFormulaInfo(unitId, subUnitId, ruleId) {
+    return this._ensureRuleFormulaMap(unitId, subUnitId).get(ruleId);
+  }
+}, __name(_a3, "DataValidationFormulaService"), _a3);
+DataValidationFormulaService = __decorateClass$8([
+  __decorateParam$8(0, IUniverInstanceService),
+  __decorateParam$8(1, Inject(RegisterOtherFormulaService)),
+  __decorateParam$8(2, Inject(DataValidationCacheService)),
+  __decorateParam$8(3, Inject(DataValidationModel)),
+  __decorateParam$8(4, Inject(DataValidatorRegistryService))
+], DataValidationFormulaService);
+function getCellValueOrigin(cell) {
+  return getOriginCellValue(cell);
 }
-function ct(s) {
-  var a;
-  return String((a = ne(s)) != null ? a : "");
+__name(getCellValueOrigin, "getCellValueOrigin");
+function getStringCellValue(cell) {
+  var _a12;
+  return String((_a12 = getCellValueOrigin(cell)) != null ? _a12 : "");
 }
-class Xe {
-  constructor(a, e, t, r, i = !1) {
-    f(this, "_map");
-    f(this, "_tree", new Vt());
-    f(this, "_dirty", !0);
-    f(this, "_buildTree", () => {
+__name(getStringCellValue, "getStringCellValue");
+const _RuleMatrix = class _RuleMatrix {
+  constructor(value, _unitId, _subUnitId, _univerInstanceService, _disableTree = !1) {
+    __publicField(this, "_map");
+    __publicField(this, "_tree", new RBush());
+    __publicField(this, "_dirty", !0);
+    __publicField(this, "_buildTree", /* @__PURE__ */ __name(() => {
       if (!this._dirty || this._disableTree)
         return;
       this._tree.clear();
-      const a = [];
-      this._map.forEach((e, t) => {
-        e.forEach((r) => {
-          a.push({
-            minX: r.startRow,
-            maxX: r.endRow,
-            minY: r.startColumn,
-            maxY: r.endColumn,
-            ruleId: t
+      const items = [];
+      this._map.forEach((ranges, ruleId) => {
+        ranges.forEach((range) => {
+          items.push({
+            minX: range.startRow,
+            maxX: range.endRow,
+            minY: range.startColumn,
+            maxY: range.endColumn,
+            ruleId
           });
         });
-      }), this._tree.load(a), this._dirty = !1;
-    });
-    f(this, "_debonceBuildTree", Mt(this._buildTree, 0));
-    this._unitId = e, this._subUnitId = t, this._univerInstanceService = r, this._disableTree = i, this._map = a, this._buildTree();
+      }), this._tree.load(items), this._dirty = !1;
+    }, "_buildTree"));
+    __publicField(this, "_debonceBuildTree", debounce(this._buildTree, 0));
+    this._unitId = _unitId, this._subUnitId = _subUnitId, this._univerInstanceService = _univerInstanceService, this._disableTree = _disableTree, this._map = value, this._buildTree();
   }
   get _worksheet() {
-    var a;
-    return (a = this._univerInstanceService.getUnit(this._unitId, N.UNIVER_SHEET)) == null ? void 0 : a.getSheetBySheetId(this._subUnitId);
+    var _a12;
+    return (_a12 = this._univerInstanceService.getUnit(this._unitId, UniverInstanceType.UNIVER_SHEET)) == null ? void 0 : _a12.getSheetBySheetId(this._subUnitId);
   }
-  _addRule(a, e) {
+  _addRule(ruleId, _ranges) {
     if (!this._worksheet)
       return;
-    const t = I.mergeRanges(e.map((r) => b.transformRange(r, this._worksheet)));
-    this._map.forEach((r, i) => {
-      const o = I.subtractMulti(r, t);
-      o.length === 0 ? this._map.delete(i) : this._map.set(i, o);
-    }), this._dirty = !0, this._map.set(a, t), this._debonceBuildTree();
+    const ranges = Rectangle.mergeRanges(_ranges.map((range) => Range.transformRange(range, this._worksheet)));
+    this._map.forEach((value, key) => {
+      const newRanges = Rectangle.subtractMulti(value, ranges);
+      newRanges.length === 0 ? this._map.delete(key) : this._map.set(key, newRanges);
+    }), this._dirty = !0, this._map.set(ruleId, ranges), this._debonceBuildTree();
   }
-  addRule(a) {
-    this._addRule(a.uid, a.ranges);
+  addRule(rule) {
+    this._addRule(rule.uid, rule.ranges);
   }
-  removeRange(a) {
+  removeRange(_ranges) {
     if (!this._worksheet)
       return;
-    const e = a.map((t) => b.transformRange(t, this._worksheet));
-    this._map.forEach((t, r) => {
-      const i = I.subtractMulti(t, e);
-      i.length === 0 ? this._map.delete(r) : this._map.set(r, i);
+    const ranges = _ranges.map((range) => Range.transformRange(range, this._worksheet));
+    this._map.forEach((value, key) => {
+      const newRanges = Rectangle.subtractMulti(value, ranges);
+      newRanges.length === 0 ? this._map.delete(key) : this._map.set(key, newRanges);
     }), this._dirty = !0, this._debonceBuildTree();
   }
-  _removeRule(a) {
-    this._map.delete(a), this._dirty = !0, this._debonceBuildTree();
+  _removeRule(ruleId) {
+    this._map.delete(ruleId), this._dirty = !0, this._debonceBuildTree();
   }
-  removeRule(a) {
-    this._removeRule(a.uid);
+  removeRule(rule) {
+    this._removeRule(rule.uid);
   }
-  updateRange(a, e) {
-    this._removeRule(a), this._addRule(a, e);
+  updateRange(ruleId, _newRanges) {
+    this._removeRule(ruleId), this._addRule(ruleId, _newRanges);
   }
-  addRangeRules(a) {
-    a.forEach(({ id: e, ranges: t }) => {
-      if (!t.length)
+  addRangeRules(rules) {
+    rules.forEach(({ id: ruleId, ranges }) => {
+      if (!ranges.length)
         return;
-      let r = this._map.get(e);
-      r ? (this._map.set(e, I.mergeRanges([...r, ...t])), r = this._map.get(e)) : (r = t, this._map.set(e, r)), this._map.forEach((i, o) => {
-        if (o === e)
+      let current = this._map.get(ruleId);
+      current ? (this._map.set(ruleId, Rectangle.mergeRanges([...current, ...ranges])), current = this._map.get(ruleId)) : (current = ranges, this._map.set(ruleId, current)), this._map.forEach((value, key) => {
+        if (key === ruleId)
           return;
-        const n = I.subtractMulti(i, t);
-        n.length === 0 ? this._map.delete(o) : this._map.set(o, n);
+        const newRanges = Rectangle.subtractMulti(value, ranges);
+        newRanges.length === 0 ? this._map.delete(key) : this._map.set(key, newRanges);
       });
     }), this._dirty = !0, this._debonceBuildTree();
   }
-  diff(a) {
-    const e = [];
-    let t = 0;
-    return a.forEach((r, i) => {
-      var l;
-      const o = (l = this._map.get(r.uid)) != null ? l : [], n = r.ranges;
-      o.length !== 0 && (o.length !== n.length || o.some((u, d) => !I.equals(u, n[d]))) && e.push({
+  diff(rules) {
+    const mutations = [];
+    let deleteIndex = 0;
+    return rules.forEach((rule, index) => {
+      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: r.uid,
-        oldRanges: n,
-        newRanges: I.sort(o),
-        rule: r
-      }), o.length === 0 && (e.push({
+        ruleId: rule.uid,
+        oldRanges,
+        newRanges: Rectangle.sort(newRanges),
+        rule
+      }), newRanges.length === 0 && (mutations.push({
         type: "delete",
-        rule: r,
-        index: i - t
-      }), t++);
-    }), e;
-  }
-  diffWithAddition(a, e) {
-    const t = [];
-    let r = 0;
-    return a.forEach((i, o) => {
-      var u;
-      const n = (u = this._map.get(i.uid)) != null ? u : [], l = i.ranges;
-      n.length !== 0 && (n.length !== l.length || n.some((d, c) => !I.equals(d, l[c]))) && t.push({
+        rule,
+        index: index - deleteIndex
+      }), deleteIndex++);
+    }), mutations;
+  }
+  diffWithAddition(rules, additionRules) {
+    const mutations = [];
+    let deleteIndex = 0;
+    return rules.forEach((rule, index) => {
+      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: i.uid,
-        oldRanges: l,
-        newRanges: I.sort(n),
-        rule: i
-      }), n.length === 0 && (t.push({
+        ruleId: rule.uid,
+        oldRanges,
+        newRanges: Rectangle.sort(newRanges),
+        rule
+      }), newRanges.length === 0 && (mutations.push({
         type: "delete",
-        rule: i,
-        index: o - r
-      }), r++);
-    }), Array.from(e).forEach((i) => {
-      var n;
-      const o = (n = this._map.get(i.uid)) != null ? n : [];
-      t.push({
+        rule,
+        index: index - deleteIndex
+      }), deleteIndex++);
+    }), Array.from(additionRules).forEach((rule) => {
+      var _a12;
+      const newRanges = (_a12 = this._map.get(rule.uid)) != null ? _a12 : [];
+      mutations.push({
         type: "add",
         rule: {
-          ...i,
-          ranges: I.sort(o)
+          ...rule,
+          ranges: Rectangle.sort(newRanges)
         }
       });
-    }), t;
+    }), mutations;
   }
   clone() {
-    return new Xe(
-      new Map(V.deepClone(Array.from(this._map.entries()))),
+    return new _RuleMatrix(
+      new Map(Tools.deepClone(Array.from(this._map.entries()))),
       this._unitId,
       this._subUnitId,
       this._univerInstanceService,
@@ -450,591 +457,606 @@ class Xe {
       !0
     );
   }
-  getValue(a, e) {
+  getValue(row, col) {
     this._dirty && this._buildTree();
-    const t = this._tree.search({
-      minX: a,
-      maxX: a,
-      minY: e,
-      maxY: e
+    const result = this._tree.search({
+      minX: row,
+      maxX: row,
+      minY: col,
+      maxY: col
     });
-    return t.length > 0 ? t[0].ruleId : void 0;
+    return result.length > 0 ? result[0].ruleId : void 0;
   }
-}
-var ra = Object.defineProperty, ia = Object.getOwnPropertyDescriptor, sa = (s, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? ia(a, e) : a, i = s.length - 1, o; i >= 0; i--)
-    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
-  return t && r && ra(a, e, r), r;
-}, Y = (s, a) => (e, t) => a(e, t, s);
-let F = class extends $ {
-  constructor(a, e, t, r, i, o, n) {
+};
+__name(_RuleMatrix, "RuleMatrix");
+let RuleMatrix = _RuleMatrix;
+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"), _a4;
+let SheetDataValidationModel = (_a4 = class extends Disposable {
+  constructor(_dataValidationModel, _univerInstanceService, _dataValidatorRegistryService, _dataValidationCacheService, _dataValidationFormulaService, _dataValidationCustomFormulaService, _commandService) {
     super();
-    f(this, "_ruleMatrixMap", /* @__PURE__ */ new Map());
-    f(this, "_validStatusChange$", new Qe());
-    f(this, "_ruleChange$", new Qe());
-    f(this, "ruleChange$", this._ruleChange$.asObservable());
-    f(this, "validStatusChange$", this._validStatusChange$.asObservable());
-    this._dataValidationModel = a, this._univerInstanceService = e, this._dataValidatorRegistryService = t, this._dataValidationCacheService = r, this._dataValidationFormulaService = i, this._dataValidationCustomFormulaService = o, this._commandService = n, this._initRuleUpdateListener(), this.disposeWithMe(() => {
+    __publicField(this, "_ruleMatrixMap", /* @__PURE__ */ new Map());
+    __publicField(this, "_validStatusChange$", new Subject());
+    __publicField(this, "_ruleChange$", new Subject());
+    __publicField(this, "ruleChange$", this._ruleChange$.asObservable());
+    __publicField(this, "validStatusChange$", this._validStatusChange$.asObservable());
+    this._dataValidationModel = _dataValidationModel, this._univerInstanceService = _univerInstanceService, this._dataValidatorRegistryService = _dataValidatorRegistryService, this._dataValidationCacheService = _dataValidationCacheService, this._dataValidationFormulaService = _dataValidationFormulaService, this._dataValidationCustomFormulaService = _dataValidationCustomFormulaService, this._commandService = _commandService, this._initRuleUpdateListener(), this.disposeWithMe(() => {
       this._ruleChange$.complete(), this._validStatusChange$.complete();
     }), this._initUniverInstanceListener();
   }
   _initUniverInstanceListener() {
     this.disposeWithMe(
-      this._univerInstanceService.unitDisposed$.subscribe((a) => {
-        this._ruleMatrixMap.delete(a.getUnitId());
+      this._univerInstanceService.unitDisposed$.subscribe((unit) => {
+        this._ruleMatrixMap.delete(unit.getUnitId());
       })
     ), this.disposeWithMe(
-      this._commandService.onCommandExecuted((a) => {
-        if (a.id === it.id) {
-          const { unitId: e, subUnitId: t } = a.params, r = this._ruleMatrixMap.get(e);
-          r && r.delete(t);
+      this._commandService.onCommandExecuted((command) => {
+        if (command.id === RemoveSheetMutation.id) {
+          const { unitId, subUnitId } = command.params, subUnitMap = this._ruleMatrixMap.get(unitId);
+          subUnitMap && subUnitMap.delete(subUnitId);
         }
       })
     );
   }
   _initRuleUpdateListener() {
-    const a = this._dataValidationModel.getAll();
-    for (const [e, t] of a)
-      for (const [r, i] of t)
-        for (const o of i)
-          this._addRule(e, r, o), this._ruleChange$.next({
+    const allRules = this._dataValidationModel.getAll();
+    for (const [unitId, subUnitMap] of allRules)
+      for (const [subUnitId, rules] of subUnitMap)
+        for (const rule of rules)
+          this._addRule(unitId, subUnitId, rule), this._ruleChange$.next({
             type: "add",
-            unitId: e,
-            subUnitId: r,
-            rule: o,
+            unitId,
+            subUnitId,
+            rule,
             source: "patched"
           });
     this.disposeWithMe(
-      this._dataValidationModel.ruleChange$.subscribe((e) => {
-        switch (e.type) {
+      this._dataValidationModel.ruleChange$.subscribe((ruleChange) => {
+        switch (ruleChange.type) {
           case "add":
-            this._addRule(e.unitId, e.subUnitId, e.rule);
+            this._addRule(ruleChange.unitId, ruleChange.subUnitId, ruleChange.rule);
             break;
           case "update":
-            this._updateRule(e.unitId, e.subUnitId, e.rule.uid, e.oldRule, e.updatePayload);
+            this._updateRule(ruleChange.unitId, ruleChange.subUnitId, ruleChange.rule.uid, ruleChange.oldRule, ruleChange.updatePayload);
             break;
           case "remove":
-            this._removeRule(e.unitId, e.subUnitId, e.rule);
+            this._removeRule(ruleChange.unitId, ruleChange.subUnitId, ruleChange.rule);
             break;
         }
-        this._ruleChange$.next(e);
+        this._ruleChange$.next(ruleChange);
       })
     );
   }
-  _ensureRuleMatrix(a, e) {
-    let t = this._ruleMatrixMap.get(a);
-    t || (t = /* @__PURE__ */ new Map(), this._ruleMatrixMap.set(a, t));
-    let r = t.get(e);
-    return r || (r = new Xe(/* @__PURE__ */ new Map(), a, e, this._univerInstanceService), t.set(e, r)), r;
+  _ensureRuleMatrix(unitId, subUnitId) {
+    let unitMap = this._ruleMatrixMap.get(unitId);
+    unitMap || (unitMap = /* @__PURE__ */ new Map(), this._ruleMatrixMap.set(unitId, unitMap));
+    let matrix = unitMap.get(subUnitId);
+    return matrix || (matrix = new RuleMatrix(/* @__PURE__ */ new Map(), unitId, subUnitId, this._univerInstanceService), unitMap.set(subUnitId, matrix)), matrix;
   }
-  _addRuleSideEffect(a, e, t) {
-    this._ensureRuleMatrix(a, e).addRule(t), this._dataValidationCacheService.addRule(a, e, t), this._dataValidationFormulaService.addRule(a, e, t), this._dataValidationCustomFormulaService.addRule(a, e, t);
+  _addRuleSideEffect(unitId, subUnitId, rule) {
+    this._ensureRuleMatrix(unitId, subUnitId).addRule(rule), this._dataValidationCacheService.addRule(unitId, subUnitId, rule), this._dataValidationFormulaService.addRule(unitId, subUnitId, rule), this._dataValidationCustomFormulaService.addRule(unitId, subUnitId, rule);
   }
-  _addRule(a, e, t) {
-    (Array.isArray(t) ? t : [t]).forEach((i) => {
-      this._addRuleSideEffect(a, e, i);
+  _addRule(unitId, subUnitId, rule) {
+    (Array.isArray(rule) ? rule : [rule]).forEach((item) => {
+      this._addRuleSideEffect(unitId, subUnitId, item);
     });
   }
-  _updateRule(a, e, t, r, i) {
-    const o = this._ensureRuleMatrix(a, e), n = {
-      ...r,
-      ...i.payload
+  _updateRule(unitId, subUnitId, ruleId, oldRule, payload) {
+    const ruleMatrix = this._ensureRuleMatrix(unitId, subUnitId), newRule = {
+      ...oldRule,
+      ...payload.payload
     };
-    i.type === y.RANGE ? o.updateRange(t, i.payload) : i.type === y.ALL && o.updateRange(t, i.payload.ranges), this._dataValidationCacheService.removeRule(a, e, r), this._dataValidationCacheService.addRule(a, e, n), this._dataValidationFormulaService.removeRule(a, e, r.uid), this._dataValidationFormulaService.addRule(a, e, n), this._dataValidationCustomFormulaService.deleteByRuleId(a, e, t), this._dataValidationCustomFormulaService.addRule(a, e, n);
-  }
-  _removeRule(a, e, t) {
-    this._ensureRuleMatrix(a, e).removeRule(t), this._dataValidationCacheService.removeRule(a, e, t), this._dataValidationCustomFormulaService.deleteByRuleId(a, e, t.uid);
-  }
-  getValidator(a) {
-    return this._dataValidatorRegistryService.getValidatorItem(a);
-  }
-  getRuleIdByLocation(a, e, t, r) {
-    return this._ensureRuleMatrix(a, e).getValue(t, r);
-  }
-  getRuleByLocation(a, e, t, r) {
-    const i = this.getRuleIdByLocation(a, e, t, r);
-    if (i)
-      return this._dataValidationModel.getRuleById(a, e, i);
-  }
-  validator(a, e, t) {
-    const { col: r, row: i, unitId: o, subUnitId: n, worksheet: l } = e, u = (g, R) => {
-      t && t(g, R), R && this._validStatusChange$.next({
-        unitId: o,
-        subUnitId: n,
-        ruleId: a.uid,
-        status: g,
-        row: i,
-        col: r
+    payload.type === UpdateRuleType.RANGE ? ruleMatrix.updateRange(ruleId, payload.payload) : payload.type === UpdateRuleType.ALL && ruleMatrix.updateRange(ruleId, payload.payload.ranges), this._dataValidationCacheService.removeRule(unitId, subUnitId, oldRule), this._dataValidationCacheService.addRule(unitId, subUnitId, newRule), this._dataValidationFormulaService.removeRule(unitId, subUnitId, oldRule.uid), this._dataValidationFormulaService.addRule(unitId, subUnitId, newRule), this._dataValidationCustomFormulaService.deleteByRuleId(unitId, subUnitId, ruleId), this._dataValidationCustomFormulaService.addRule(unitId, subUnitId, newRule);
+  }
+  _removeRule(unitId, subUnitId, oldRule) {
+    this._ensureRuleMatrix(unitId, subUnitId).removeRule(oldRule), this._dataValidationCacheService.removeRule(unitId, subUnitId, oldRule), this._dataValidationCustomFormulaService.deleteByRuleId(unitId, subUnitId, oldRule.uid);
+  }
+  getValidator(type) {
+    return this._dataValidatorRegistryService.getValidatorItem(type);
+  }
+  getRuleIdByLocation(unitId, subUnitId, row, col) {
+    return this._ensureRuleMatrix(unitId, subUnitId).getValue(row, col);
+  }
+  getRuleByLocation(unitId, subUnitId, row, col) {
+    const ruleId = this.getRuleIdByLocation(unitId, subUnitId, row, col);
+    if (ruleId)
+      return this._dataValidationModel.getRuleById(unitId, subUnitId, ruleId);
+  }
+  validator(rule, pos, _onCompete) {
+    const { col, row, unitId, subUnitId, worksheet } = pos, onCompete = /* @__PURE__ */ __name((status, changed) => {
+      _onCompete && _onCompete(status, changed), changed && this._validStatusChange$.next({
+        unitId,
+        subUnitId,
+        ruleId: rule.uid,
+        status,
+        row,
+        col
       });
-    }, d = l.getCellValueOnly(i, r), c = this.getValidator(a.type), m = l.getCellRaw(i, r), _ = ne(m);
-    if (c) {
-      const g = this._dataValidationCacheService.ensureCache(o, n), R = g.getValue(i, r);
-      return R == null ? (g.setValue(i, r, D.VALIDATING), c.validator(
+    }, "onCompete"), cell = worksheet.getCellValueOnly(row, col), validator = this.getValidator(rule.type), cellRaw = worksheet.getCellRaw(row, col), cellValue = getCellValueOrigin(cellRaw);
+    if (validator) {
+      const cache = this._dataValidationCacheService.ensureCache(unitId, subUnitId), current = cache.getValue(row, col);
+      return current == null ? (cache.setValue(row, col, DataValidationStatus.VALIDATING), validator.validator(
         {
-          value: _,
-          unitId: o,
-          subUnitId: n,
-          row: i,
-          column: r,
-          worksheet: e.worksheet,
-          workbook: e.workbook,
-          interceptValue: ne(d),
-          t: m == null ? void 0 : m.t
+          value: cellValue,
+          unitId,
+          subUnitId,
+          row,
+          column: col,
+          worksheet: pos.worksheet,
+          workbook: pos.workbook,
+          interceptValue: getCellValueOrigin(cell),
+          t: cellRaw == null ? void 0 : cellRaw.t
         },
-        a
-      ).then((M) => {
-        const p = M ? D.VALID : D.INVALID;
-        p === D.VALID ? g.realDeleteValue(i, r) : g.setValue(i, r, p);
-        const w = g.getValue(i, r);
-        u(p, R !== w);
-      }), D.VALIDATING) : (u(R != null ? R : D.VALID, !1), R != null ? R : D.VALID);
+        rule
+      ).then((status) => {
+        const realStatus = status ? DataValidationStatus.VALID : DataValidationStatus.INVALID;
+        realStatus === DataValidationStatus.VALID ? cache.realDeleteValue(row, col) : cache.setValue(row, col, realStatus);
+        const now = cache.getValue(row, col);
+        onCompete(realStatus, current !== now);
+      }), DataValidationStatus.VALIDATING) : (onCompete(current != null ? current : DataValidationStatus.VALID, !1), current != null ? current : DataValidationStatus.VALID);
     } else
-      return u(D.VALID, !1), D.VALID;
+      return onCompete(DataValidationStatus.VALID, !1), DataValidationStatus.VALID;
   }
-  getRuleObjectMatrix(a, e) {
-    return this._ensureRuleMatrix(a, e);
+  getRuleObjectMatrix(unitId, subUnitId) {
+    return this._ensureRuleMatrix(unitId, subUnitId);
   }
-  getRuleById(a, e, t) {
-    return this._dataValidationModel.getRuleById(a, e, t);
+  getRuleById(unitId, subUnitId, ruleId) {
+    return this._dataValidationModel.getRuleById(unitId, subUnitId, ruleId);
   }
-  getRuleIndex(a, e, t) {
-    return this._dataValidationModel.getRuleIndex(a, e, t);
+  getRuleIndex(unitId, subUnitId, ruleId) {
+    return this._dataValidationModel.getRuleIndex(unitId, subUnitId, ruleId);
   }
-  getRules(a, e) {
-    return [...this._dataValidationModel.getRules(a, e)];
+  getRules(unitId, subUnitId) {
+    return [...this._dataValidationModel.getRules(unitId, subUnitId)];
   }
-  getUnitRules(a) {
-    return this._dataValidationModel.getUnitRules(a);
+  getUnitRules(unitId) {
+    return this._dataValidationModel.getUnitRules(unitId);
   }
-  deleteUnitRules(a) {
-    return this._dataValidationModel.deleteUnitRules(a);
+  deleteUnitRules(unitId) {
+    return this._dataValidationModel.deleteUnitRules(unitId);
   }
-  getSubUnitIds(a) {
-    return this._dataValidationModel.getSubUnitIds(a);
+  getSubUnitIds(unitId) {
+    return this._dataValidationModel.getSubUnitIds(unitId);
   }
   getAll() {
     return this._dataValidationModel.getAll();
   }
-};
-F = sa([
-  Y(0, S(ke)),
-  Y(1, O),
-  Y(2, S(G)),
-  Y(3, S(q)),
-  Y(4, S(X)),
-  Y(5, S(P)),
-  Y(6, x)
-], F);
-const Ve = 1, Me = 0;
-function et(s, a) {
-  return V.isBlank(s) ? a.t("dataValidation.validFail.value") : v(s) ? a.t("dataValidation.validFail.primitive") : "";
+}, __name(_a4, "SheetDataValidationModel"), _a4);
+SheetDataValidationModel = __decorateClass$7([
+  __decorateParam$7(0, Inject(DataValidationModel)),
+  __decorateParam$7(1, IUniverInstanceService),
+  __decorateParam$7(2, Inject(DataValidatorRegistryService)),
+  __decorateParam$7(3, Inject(DataValidationCacheService)),
+  __decorateParam$7(4, Inject(DataValidationFormulaService)),
+  __decorateParam$7(5, Inject(DataValidationCustomFormulaService)),
+  __decorateParam$7(6, ICommandService)
+], SheetDataValidationModel);
+const CHECKBOX_FORMULA_1 = 1, CHECKBOX_FORMULA_2 = 0;
+function getFailMessage(formula, localeService) {
+  return Tools.isBlank(formula) ? localeService.t("dataValidation.validFail.value") : isFormulaString(formula) ? localeService.t("dataValidation.validFail.primitive") : "";
 }
-const _e = (s) => V.isDefine(s) && String(s).toLowerCase() === "true" ? "1" : String(s).toLowerCase() === "false" ? "0" : s;
-class oa extends k {
+__name(getFailMessage, "getFailMessage");
+const transformCheckboxValue = /* @__PURE__ */ __name((value) => Tools.isDefine(value) && String(value).toLowerCase() === "true" ? "1" : String(value).toLowerCase() === "false" ? "0" : value, "transformCheckboxValue"), _CheckboxValidator = class _CheckboxValidator extends BaseDataValidator {
   constructor() {
     super(...arguments);
-    f(this, "id", T.CHECKBOX);
-    f(this, "title", "dataValidation.checkbox.title");
-    f(this, "operators", []);
-    f(this, "scopes", ["sheet"]);
-    f(this, "offsetFormulaByRange", !1);
-    f(this, "_formulaService", this.injector.get(X));
-    f(this, "skipDefaultFontRender", (e, t, r) => {
-      const { unitId: i, subUnitId: o } = r, { formula1: n, formula2: l } = this.parseFormulaSync(e, i, o), u = `${t != null ? t : ""}`;
-      return !u || u === `${n}` || u === `${l}`;
-    });
-  }
-  validatorFormula(e, t, r) {
-    const { formula1: i, formula2: o } = e, n = i === o;
-    if (V.isBlank(i) && V.isBlank(o))
+    __publicField(this, "id", DataValidationType.CHECKBOX);
+    __publicField(this, "title", "dataValidation.checkbox.title");
+    __publicField(this, "operators", []);
+    __publicField(this, "scopes", ["sheet"]);
+    __publicField(this, "offsetFormulaByRange", !1);
+    __publicField(this, "_formulaService", this.injector.get(DataValidationFormulaService));
+    __publicField(this, "skipDefaultFontRender", /* @__PURE__ */ __name((rule, cellValue, pos) => {
+      const { unitId, subUnitId } = pos, { formula1, formula2 } = this.parseFormulaSync(rule, unitId, subUnitId), valueStr = `${cellValue != null ? cellValue : ""}`;
+      return !valueStr || valueStr === `${formula1}` || valueStr === `${formula2}`;
+    }, "skipDefaultFontRender"));
+  }
+  validatorFormula(rule, unitId, subUnitId) {
+    const { formula1, formula2 } = rule, isEqual = formula1 === formula2;
+    if (Tools.isBlank(formula1) && Tools.isBlank(formula2))
       return {
         success: !0
       };
-    if (n)
+    if (isEqual)
       return {
         success: !1,
         formula1: this.localeService.t("dataValidation.validFail.checkboxEqual"),
         formula2: this.localeService.t("dataValidation.validFail.checkboxEqual")
       };
-    const l = et(i, this.localeService), u = et(o, this.localeService);
+    const error1 = getFailMessage(formula1, this.localeService), error2 = getFailMessage(formula2, this.localeService);
     return {
-      success: !l && !u,
-      formula1: l,
-      formula2: u
+      success: !error1 && !error2,
+      formula1: error1,
+      formula2: error2
     };
   }
-  async parseFormula(e, t, r) {
-    var c, m, _, g;
-    const { formula1: i = Ve, formula2: o = Me } = e, n = await this._formulaService.getRuleFormulaResult(t, r, e.uid), l = v(i) ? se((m = (c = n == null ? void 0 : n[0]) == null ? void 0 : c.result) == null ? void 0 : m[0][0]) : i, u = v(o) ? se((g = (_ = n == null ? void 0 : n[1]) == null ? void 0 : _.result) == null ? void 0 : g[0][0]) : o, d = C(String(l)) && C(String(u));
+  async parseFormula(rule, unitId, subUnitId) {
+    var _a12, _b, _c, _d;
+    const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), originFormula1 = isFormulaString(formula1) ? getFormulaResult((_b = (_a12 = results == null ? void 0 : results[0]) == null ? void 0 : _a12.result) == null ? void 0 : _b[0][0]) : formula1, originFormula2 = isFormulaString(formula2) ? getFormulaResult((_d = (_c = results == null ? void 0 : results[1]) == null ? void 0 : _c.result) == null ? void 0 : _d[0][0]) : formula2, isFormulaValid = isLegalFormulaResult(String(originFormula1)) && isLegalFormulaResult(String(originFormula2));
     return {
-      formula1: _e(l),
-      formula2: _e(u),
-      originFormula1: l,
-      originFormula2: u,
-      isFormulaValid: d
+      formula1: transformCheckboxValue(originFormula1),
+      formula2: transformCheckboxValue(originFormula2),
+      originFormula1,
+      originFormula2,
+      isFormulaValid
     };
   }
-  getExtraStyle(e, t) {
+  getExtraStyle(rule, value) {
     return {
-      tb: Se.CLIP
+      tb: WrapStrategy.CLIP
     };
   }
-  parseFormulaSync(e, t, r) {
-    var c, m, _, g;
-    const { formula1: i = Ve, formula2: o = Me } = e, n = this._formulaService.getRuleFormulaResultSync(t, r, e.uid), l = v(i) ? se((m = (c = n == null ? void 0 : n[0]) == null ? void 0 : c.result) == null ? void 0 : m[0][0]) : i, u = v(o) ? se((g = (_ = n == null ? void 0 : n[1]) == null ? void 0 : _.result) == null ? void 0 : g[0][0]) : o, d = C(String(l)) && C(String(u));
+  parseFormulaSync(rule, unitId, subUnitId) {
+    var _a12, _b, _c, _d;
+    const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = this._formulaService.getRuleFormulaResultSync(unitId, subUnitId, rule.uid), originFormula1 = isFormulaString(formula1) ? getFormulaResult((_b = (_a12 = results == null ? void 0 : results[0]) == null ? void 0 : _a12.result) == null ? void 0 : _b[0][0]) : formula1, originFormula2 = isFormulaString(formula2) ? getFormulaResult((_d = (_c = results == null ? void 0 : results[1]) == null ? void 0 : _c.result) == null ? void 0 : _d[0][0]) : formula2, isFormulaValid = isLegalFormulaResult(String(originFormula1)) && isLegalFormulaResult(String(originFormula2));
     return {
-      formula1: _e(l),
-      formula2: _e(u),
-      originFormula1: l,
-      originFormula2: u,
-      isFormulaValid: d
+      formula1: transformCheckboxValue(originFormula1),
+      formula2: transformCheckboxValue(originFormula2),
+      originFormula1,
+      originFormula2,
+      isFormulaValid
     };
   }
-  async isValidType(e, t, r) {
-    const { value: i, unitId: o, subUnitId: n } = e, { formula1: l, formula2: u, originFormula1: d, originFormula2: c } = await this.parseFormula(r, o, n);
-    return !V.isDefine(l) || !V.isDefine(u) ? !0 : V.isDefine(i) && (String(i) === String(l) || String(i) === String(u) || String(i) === String(d != null ? d : "") || String(i) === String(c != null ? c : ""));
+  async isValidType(cellInfo, formula, rule) {
+    const { value, unitId, subUnitId } = cellInfo, { formula1, formula2, originFormula1, originFormula2 } = await this.parseFormula(rule, unitId, subUnitId);
+    return !Tools.isDefine(formula1) || !Tools.isDefine(formula2) ? !0 : Tools.isDefine(value) && (String(value) === String(formula1) || String(value) === String(formula2) || String(value) === String(originFormula1 != null ? originFormula1 : "") || String(value) === String(originFormula2 != null ? originFormula2 : ""));
   }
-  generateRuleErrorMessage(e) {
+  generateRuleErrorMessage(rule) {
     return this.localeService.t("dataValidation.checkbox.error");
   }
-}
-const na = {
-  [h.BETWEEN]: "dataValidation.date.operators.between",
-  [h.EQUAL]: "dataValidation.date.operators.equal",
-  [h.GREATER_THAN]: "dataValidation.date.operators.greaterThan",
-  [h.GREATER_THAN_OR_EQUAL]: "dataValidation.date.operators.greaterThanOrEqual",
-  [h.LESS_THAN]: "dataValidation.date.operators.lessThan",
-  [h.LESS_THAN_OR_EQUAL]: "dataValidation.date.operators.lessThanOrEqual",
-  [h.NOT_BETWEEN]: "dataValidation.date.operators.notBetween",
-  [h.NOT_EQUAL]: "dataValidation.date.operators.notEqual"
 };
-h.BETWEEN + "", h.EQUAL + "", h.GREATER_THAN + "", h.GREATER_THAN_OR_EQUAL + "", h.LESS_THAN + "", h.LESS_THAN_OR_EQUAL + "", h.NOT_BETWEEN + "", h.NOT_EQUAL + "";
-const la = {
-  [h.BETWEEN]: "dataValidation.date.ruleName.between",
-  [h.EQUAL]: "dataValidation.date.ruleName.equal",
-  [h.GREATER_THAN]: "dataValidation.date.ruleName.greaterThan",
-  [h.GREATER_THAN_OR_EQUAL]: "dataValidation.date.ruleName.greaterThanOrEqual",
-  [h.LESS_THAN]: "dataValidation.date.ruleName.lessThan",
-  [h.LESS_THAN_OR_EQUAL]: "dataValidation.date.ruleName.lessThanOrEqual",
-  [h.NOT_BETWEEN]: "dataValidation.date.ruleName.notBetween",
-  [h.NOT_EQUAL]: "dataValidation.date.ruleName.notEqual"
-}, ua = {
-  [h.BETWEEN]: "dataValidation.date.errorMsg.between",
-  [h.EQUAL]: "dataValidation.date.errorMsg.equal",
-  [h.GREATER_THAN]: "dataValidation.date.errorMsg.greaterThan",
-  [h.GREATER_THAN_OR_EQUAL]: "dataValidation.date.errorMsg.greaterThanOrEqual",
-  [h.LESS_THAN]: "dataValidation.date.errorMsg.lessThan",
-  [h.LESS_THAN_OR_EQUAL]: "dataValidation.date.errorMsg.lessThanOrEqual",
-  [h.NOT_BETWEEN]: "dataValidation.date.errorMsg.notBetween",
-  [h.NOT_EQUAL]: "dataValidation.date.errorMsg.notEqual"
-}, Ae = [
-  h.BETWEEN,
-  h.NOT_BETWEEN
-], le = "{FORMULA1}", ue = "{FORMULA2}";
-function rr(s) {
-  return s.filter(Boolean).join(",");
+__name(_CheckboxValidator, "CheckboxValidator");
+let CheckboxValidator = _CheckboxValidator;
+const DateOperatorNameMap = {
+  [DataValidationOperator.BETWEEN]: "dataValidation.date.operators.between",
+  [DataValidationOperator.EQUAL]: "dataValidation.date.operators.equal",
+  [DataValidationOperator.GREATER_THAN]: "dataValidation.date.operators.greaterThan",
+  [DataValidationOperator.GREATER_THAN_OR_EQUAL]: "dataValidation.date.operators.greaterThanOrEqual",
+  [DataValidationOperator.LESS_THAN]: "dataValidation.date.operators.lessThan",
+  [DataValidationOperator.LESS_THAN_OR_EQUAL]: "dataValidation.date.operators.lessThanOrEqual",
+  [DataValidationOperator.NOT_BETWEEN]: "dataValidation.date.operators.notBetween",
+  [DataValidationOperator.NOT_EQUAL]: "dataValidation.date.operators.notEqual"
+};
+DataValidationOperator.BETWEEN + "", DataValidationOperator.EQUAL + "", DataValidationOperator.GREATER_THAN + "", DataValidationOperator.GREATER_THAN_OR_EQUAL + "", DataValidationOperator.LESS_THAN + "", DataValidationOperator.LESS_THAN_OR_EQUAL + "", DataValidationOperator.NOT_BETWEEN + "", DataValidationOperator.NOT_EQUAL + "";
+const DateOperatorTitleMap = {
+  [DataValidationOperator.BETWEEN]: "dataValidation.date.ruleName.between",
+  [DataValidationOperator.EQUAL]: "dataValidation.date.ruleName.equal",
+  [DataValidationOperator.GREATER_THAN]: "dataValidation.date.ruleName.greaterThan",
+  [DataValidationOperator.GREATER_THAN_OR_EQUAL]: "dataValidation.date.ruleName.greaterThanOrEqual",
+  [DataValidationOperator.LESS_THAN]: "dataValidation.date.ruleName.lessThan",
+  [DataValidationOperator.LESS_THAN_OR_EQUAL]: "dataValidation.date.ruleName.lessThanOrEqual",
+  [DataValidationOperator.NOT_BETWEEN]: "dataValidation.date.ruleName.notBetween",
+  [DataValidationOperator.NOT_EQUAL]: "dataValidation.date.ruleName.notEqual"
+}, DateOperatorErrorTitleMap = {
+  [DataValidationOperator.BETWEEN]: "dataValidation.date.errorMsg.between",
+  [DataValidationOperator.EQUAL]: "dataValidation.date.errorMsg.equal",
+  [DataValidationOperator.GREATER_THAN]: "dataValidation.date.errorMsg.greaterThan",
+  [DataValidationOperator.GREATER_THAN_OR_EQUAL]: "dataValidation.date.errorMsg.greaterThanOrEqual",
+  [DataValidationOperator.LESS_THAN]: "dataValidation.date.errorMsg.lessThan",
+  [DataValidationOperator.LESS_THAN_OR_EQUAL]: "dataValidation.date.errorMsg.lessThanOrEqual",
+  [DataValidationOperator.NOT_BETWEEN]: "dataValidation.date.errorMsg.notBetween",
+  [DataValidationOperator.NOT_EQUAL]: "dataValidation.date.errorMsg.notEqual"
+}, TWO_FORMULA_OPERATOR_COUNT = [
+  DataValidationOperator.BETWEEN,
+  DataValidationOperator.NOT_BETWEEN
+], FORMULA1 = "{FORMULA1}", FORMULA2 = "{FORMULA2}";
+function serializeListOptions(options) {
+  return options.filter(Boolean).join(",");
 }
-function pe(s) {
-  return s.split(",").filter(Boolean);
+__name(serializeListOptions, "serializeListOptions");
+function deserializeListOptions(optionsStr) {
+  return optionsStr.split(",").filter(Boolean);
 }
-function ir(s) {
-  const a = ne(s);
-  return a == null ? "" : a.toString();
+__name(deserializeListOptions, "deserializeListOptions");
+function getDataValidationCellValue(cellData) {
+  const cellValue = getCellValueOrigin(cellData);
+  return cellValue == null ? "" : cellValue.toString();
 }
-function De(s, a, e) {
-  const { formula1: t, formula2: r } = a, i = a.ranges[0].startRow, o = a.ranges[0].startColumn, n = e.row - i, l = e.col - o, u = v(t) ? s.moveFormulaRefOffset(t, l, n, !0) : t, d = v(r) ? s.moveFormulaRefOffset(r, l, n, !0) : r;
+__name(getDataValidationCellValue, "getDataValidationCellValue");
+function getTransformedFormula(lexerTreeBuilder, rule, position) {
+  const { formula1, formula2 } = rule, originStartRow = rule.ranges[0].startRow, originStartColumn = rule.ranges[0].startColumn, offsetRow = position.row - originStartRow, offsetColumn = position.col - originStartColumn, transformedFormula1 = isFormulaString(formula1) ? lexerTreeBuilder.moveFormulaRefOffset(formula1, offsetColumn, offsetRow, !0) : formula1, transformedFormula2 = isFormulaString(formula2) ? lexerTreeBuilder.moveFormulaRefOffset(formula2, offsetColumn, offsetRow, !0) : formula2;
   return {
-    transformedFormula1: u,
-    transformedFormula2: d
+    transformedFormula1,
+    transformedFormula2
   };
 }
-const Ue = (s) => {
-  var e, t;
-  if (s == null || typeof s == "boolean")
+__name(getTransformedFormula, "getTransformedFormula");
+const transformDate2SerialNumber = /* @__PURE__ */ __name((value) => {
+  var _a12, _b;
+  if (value == null || typeof value == "boolean")
     return;
-  if (typeof s == "number" || !Number.isNaN(+s))
-    return +s;
-  const a = (e = Q.parseDate(s)) == null ? void 0 : e.v;
-  return V.isDefine(a) ? a : (t = Q.parseDate(at(s).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : t.v;
-};
-class da extends k {
+  if (typeof value == "number" || !Number.isNaN(+value))
+    return +value;
+  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() {
     super(...arguments);
-    f(this, "id", T.DATE);
-    f(this, "title", "dataValidation.date.title");
-    f(this, "operators", [
-      h.BETWEEN,
-      h.EQUAL,
-      h.GREATER_THAN,
-      h.GREATER_THAN_OR_EQUAL,
-      h.LESS_THAN,
-      h.LESS_THAN_OR_EQUAL,
-      h.NOT_BETWEEN,
-      h.NOT_EQUAL
+    __publicField(this, "id", DataValidationType.DATE);
+    __publicField(this, "title", "dataValidation.date.title");
+    __publicField(this, "operators", [
+      DataValidationOperator.BETWEEN,
+      DataValidationOperator.EQUAL,
+      DataValidationOperator.GREATER_THAN,
+      DataValidationOperator.GREATER_THAN_OR_EQUAL,
+      DataValidationOperator.LESS_THAN,
+      DataValidationOperator.LESS_THAN_OR_EQUAL,
+      DataValidationOperator.NOT_BETWEEN,
+      DataValidationOperator.NOT_EQUAL
     ]);
-    f(this, "scopes", ["sheet"]);
-    f(this, "_customFormulaService", this.injector.get(P));
-    f(this, "_lexerTreeBuilder", this.injector.get(Z));
+    __publicField(this, "scopes", ["sheet"]);
+    __publicField(this, "_customFormulaService", this.injector.get(DataValidationCustomFormulaService));
+    __publicField(this, "_lexerTreeBuilder", this.injector.get(LexerTreeBuilder));
   }
-  async parseFormula(e, t, r, i, o) {
-    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, o), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, o), { formula1: u, formula2: d } = e, c = C(String(n == null ? void 0 : n.v)) && C(String(l == null ? void 0 : l.v));
+  async parseFormula(rule, unitId, subUnitId, row, column) {
+    const formulaResult1 = await this._customFormulaService.getCellFormulaValue(unitId, subUnitId, rule.uid, row, column), formulaResult2 = await this._customFormulaService.getCellFormula2Value(unitId, subUnitId, rule.uid, row, column), { formula1, formula2 } = rule, isFormulaValid = isLegalFormulaResult(String(formulaResult1 == null ? void 0 : formulaResult1.v)) && isLegalFormulaResult(String(formulaResult2 == null ? void 0 : formulaResult2.v));
     return {
-      formula1: Ue(v(u) ? n == null ? void 0 : n.v : u),
-      formula2: Ue(v(d) ? l == null ? void 0 : l.v : d),
-      isFormulaValid: c
+      formula1: transformDate2SerialNumber(isFormulaString(formula1) ? formulaResult1 == null ? void 0 : formulaResult1.v : formula1),
+      formula2: transformDate2SerialNumber(isFormulaString(formula2) ? formulaResult2 == null ? void 0 : formulaResult2.v : formula2),
+      isFormulaValid
     };
   }
-  async isValidType(e) {
-    const { interceptValue: t, value: r } = e;
-    return typeof r == "number" && typeof t == "string" ? !0 : typeof t == "string" ? !!Q.parseDate(t) : !1;
+  async isValidType(info) {
+    const { interceptValue, value } = info;
+    return typeof value == "number" && typeof interceptValue == "string" ? !0 : typeof interceptValue == "string" ? !!numfmt.parseDate(interceptValue) : !1;
   }
-  _validatorSingleFormula(e) {
-    return !V.isBlank(e) && (v(e) || !Number.isNaN(+e) || !!(e && Q.parseDate(e)));
+  _validatorSingleFormula(formula) {
+    return !Tools.isBlank(formula) && (isFormulaString(formula) || !Number.isNaN(+formula) || !!(formula && numfmt.parseDate(formula)));
   }
-  validatorFormula(e, t, r) {
-    const i = e.operator;
-    if (!i)
+  validatorFormula(rule, unitId, subUnitId) {
+    const operator = rule.operator;
+    if (!operator)
       return {
         success: !1
       };
-    const o = this._validatorSingleFormula(e.formula1), n = this.localeService.t("dataValidation.validFail.date");
-    if (Ae.includes(i)) {
-      const u = this._validatorSingleFormula(e.formula2);
+    const formula1Success = this._validatorSingleFormula(rule.formula1), errorMsg = this.localeService.t("dataValidation.validFail.date");
+    if (TWO_FORMULA_OPERATOR_COUNT.includes(operator)) {
+      const formula2Success = this._validatorSingleFormula(rule.formula2);
       return {
-        success: o && u,
-        formula1: o ? void 0 : n,
-        formula2: u ? void 0 : n
+        success: formula1Success && formula2Success,
+        formula1: formula1Success ? void 0 : errorMsg,
+        formula2: formula2Success ? void 0 : errorMsg
       };
     }
     return {
-      success: o,
-      formula1: o ? void 0 : n
+      success: formula1Success,
+      formula1: formula1Success ? void 0 : errorMsg
     };
   }
-  normalizeFormula(e, t, r) {
-    const { formula1: i, formula2: o, bizInfo: n } = e, l = (u) => {
-      var c;
-      if (!u)
-        return u;
-      let d;
-      if (!Number.isNaN(+u))
-        d = Q.dateFromSerial(+u);
+  normalizeFormula(rule, _unitId, _subUnitId) {
+    const { formula1, formula2, bizInfo } = rule, normlizeSingleFormula = /* @__PURE__ */ __name((formula) => {
+      var _a12;
+      if (!formula)
+        return formula;
+      let date;
+      if (!Number.isNaN(+formula))
+        date = numfmt.dateFromSerial(+formula);
       else {
-        const m = (c = Q.parseDate(u)) == null ? void 0 : c.v;
-        if (m == null)
+        const res = (_a12 = numfmt.parseDate(formula)) == null ? void 0 : _a12.v;
+        if (res == null)
           return "";
-        d = Q.dateFromSerial(m);
+        date = numfmt.dateFromSerial(res);
       }
-      return at(`${d[0]}/${d[1]}/${d[2]} ${d[3]}:${d[4]}:${d[5]}`).format(n != null && n.showTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD");
-    };
+      return dayjs(`${date[0]}/${date[1]}/${date[2]} ${date[3]}:${date[4]}:${date[5]}`).format(bizInfo != null && bizInfo.showTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD");
+    }, "normlizeSingleFormula");
     return {
-      formula1: v(i) ? i : l(`${i}`),
-      formula2: v(o) ? o : l(`${o}`)
+      formula1: isFormulaString(formula1) ? formula1 : normlizeSingleFormula(`${formula1}`),
+      formula2: isFormulaString(formula2) ? formula2 : normlizeSingleFormula(`${formula2}`)
     };
   }
-  transform(e, t, r) {
-    const { value: i } = e;
+  transform(cellInfo, _formula, _rule) {
+    const { value } = cellInfo;
     return {
-      ...e,
-      value: Ue(i)
+      ...cellInfo,
+      value: transformDate2SerialNumber(value)
     };
   }
   get operatorNames() {
-    return this.operators.map((e) => this.localeService.t(na[e]));
+    return this.operators.map((operator) => this.localeService.t(DateOperatorNameMap[operator]));
   }
-  generateRuleName(e) {
-    var r, i;
-    if (!e.operator)
+  generateRuleName(rule) {
+    var _a12, _b;
+    if (!rule.operator)
       return this.titleStr;
-    const t = this.localeService.t(la[e.operator]).replace(le, (r = e.formula1) != null ? r : "").replace(ue, (i = e.formula2) != null ? i : "");
-    return `${this.titleStr} ${t}`;
+    const ruleName = this.localeService.t(DateOperatorTitleMap[rule.operator]).replace(FORMULA1, (_a12 = rule.formula1) != null ? _a12 : "").replace(FORMULA2, (_b = rule.formula2) != null ? _b : "");
+    return `${this.titleStr} ${ruleName}`;
   }
-  generateRuleErrorMessage(e, t) {
-    if (!e.operator)
+  generateRuleErrorMessage(rule, pos) {
+    if (!rule.operator)
       return this.titleStr;
-    const { transformedFormula1: r, transformedFormula2: i } = De(this._lexerTreeBuilder, e, t);
-    return `${this.localeService.t(ua[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
+    const { transformedFormula1, transformedFormula2 } = getTransformedFormula(this._lexerTreeBuilder, rule, pos);
+    return `${this.localeService.t(DateOperatorErrorTitleMap[rule.operator]).replace(FORMULA1, transformedFormula1 != null ? transformedFormula1 : "").replace(FORMULA2, transformedFormula2 != null ? transformedFormula2 : "")}`;
   }
-}
-h.BETWEEN + "", h.EQUAL + "", h.GREATER_THAN + "", h.GREATER_THAN_OR_EQUAL + "", h.LESS_THAN + "", h.LESS_THAN_OR_EQUAL + "", h.NOT_BETWEEN + "", h.NOT_EQUAL + "";
-h.BETWEEN + "", h.EQUAL + "", h.GREATER_THAN + "", h.GREATER_THAN_OR_EQUAL + "", h.LESS_THAN + "", h.LESS_THAN_OR_EQUAL + "", h.NOT_BETWEEN + "", h.NOT_EQUAL + "";
-const ht = {
-  [h.BETWEEN]: "dataValidation.errorMsg.between",
-  [h.EQUAL]: "dataValidation.errorMsg.equal",
-  [h.GREATER_THAN]: "dataValidation.errorMsg.greaterThan",
-  [h.GREATER_THAN_OR_EQUAL]: "dataValidation.errorMsg.greaterThanOrEqual",
-  [h.LESS_THAN]: "dataValidation.errorMsg.lessThan",
-  [h.LESS_THAN_OR_EQUAL]: "dataValidation.errorMsg.lessThanOrEqual",
-  [h.NOT_BETWEEN]: "dataValidation.errorMsg.notBetween",
-  [h.NOT_EQUAL]: "dataValidation.errorMsg.notEqual"
 };
-function ye(s) {
-  let a = s;
-  return typeof s == "string" ? ((s.startsWith("¥") || s.startsWith("$")) && (a = s.slice(1)), +a) : +s;
+__name(_DateValidator, "DateValidator");
+let DateValidator = _DateValidator;
+DataValidationOperator.BETWEEN + "", DataValidationOperator.EQUAL + "", DataValidationOperator.GREATER_THAN + "", DataValidationOperator.GREATER_THAN_OR_EQUAL + "", DataValidationOperator.LESS_THAN + "", DataValidationOperator.LESS_THAN_OR_EQUAL + "", DataValidationOperator.NOT_BETWEEN + "", DataValidationOperator.NOT_EQUAL + "";
+DataValidationOperator.BETWEEN + "", DataValidationOperator.EQUAL + "", DataValidationOperator.GREATER_THAN + "", DataValidationOperator.GREATER_THAN_OR_EQUAL + "", DataValidationOperator.LESS_THAN + "", DataValidationOperator.LESS_THAN_OR_EQUAL + "", DataValidationOperator.NOT_BETWEEN + "", DataValidationOperator.NOT_EQUAL + "";
+const OperatorErrorTitleMap = {
+  [DataValidationOperator.BETWEEN]: "dataValidation.errorMsg.between",
+  [DataValidationOperator.EQUAL]: "dataValidation.errorMsg.equal",
+  [DataValidationOperator.GREATER_THAN]: "dataValidation.errorMsg.greaterThan",
+  [DataValidationOperator.GREATER_THAN_OR_EQUAL]: "dataValidation.errorMsg.greaterThanOrEqual",
+  [DataValidationOperator.LESS_THAN]: "dataValidation.errorMsg.lessThan",
+  [DataValidationOperator.LESS_THAN_OR_EQUAL]: "dataValidation.errorMsg.lessThanOrEqual",
+  [DataValidationOperator.NOT_BETWEEN]: "dataValidation.errorMsg.notBetween",
+  [DataValidationOperator.NOT_EQUAL]: "dataValidation.errorMsg.notEqual"
+};
+function getCellValueNumber(cellValue) {
+  let str = cellValue;
+  return typeof cellValue == "string" ? ((cellValue.startsWith("¥") || cellValue.startsWith("$")) && (str = cellValue.slice(1)), +str) : +cellValue;
 }
-class ca extends k {
+__name(getCellValueNumber, "getCellValueNumber");
+const _DecimalValidator = class _DecimalValidator extends BaseDataValidator {
   constructor() {
     super(...arguments);
-    f(this, "_customFormulaService", this.injector.get(P));
-    f(this, "id", T.DECIMAL);
-    f(this, "_lexerTreeBuilder", this.injector.get(Z));
-    f(this, "title", "dataValidation.decimal.title");
-    f(this, "operators", [
-      h.BETWEEN,
-      h.EQUAL,
-      h.GREATER_THAN,
-      h.GREATER_THAN_OR_EQUAL,
-      h.LESS_THAN,
-      h.LESS_THAN_OR_EQUAL,
-      h.NOT_BETWEEN,
-      h.NOT_EQUAL
+    __publicField(this, "_customFormulaService", this.injector.get(DataValidationCustomFormulaService));
+    __publicField(this, "id", DataValidationType.DECIMAL);
+    __publicField(this, "_lexerTreeBuilder", this.injector.get(LexerTreeBuilder));
+    __publicField(this, "title", "dataValidation.decimal.title");
+    __publicField(this, "operators", [
+      DataValidationOperator.BETWEEN,
+      DataValidationOperator.EQUAL,
+      DataValidationOperator.GREATER_THAN,
+      DataValidationOperator.GREATER_THAN_OR_EQUAL,
+      DataValidationOperator.LESS_THAN,
+      DataValidationOperator.LESS_THAN_OR_EQUAL,
+      DataValidationOperator.NOT_BETWEEN,
+      DataValidationOperator.NOT_EQUAL
     ]);
-    f(this, "scopes", ["sheet"]);
+    __publicField(this, "scopes", ["sheet"]);
   }
-  _isFormulaOrNumber(e) {
-    return !V.isBlank(e) && (v(e) || !Number.isNaN(+e));
+  _isFormulaOrNumber(formula) {
+    return !Tools.isBlank(formula) && (isFormulaString(formula) || !Number.isNaN(+formula));
   }
-  async isValidType(e, t, r) {
-    const { value: i } = e;
-    return !Number.isNaN(ye(i));
+  async isValidType(cellInfo, formula, rule) {
+    const { value: cellValue } = cellInfo;
+    return !Number.isNaN(getCellValueNumber(cellValue));
   }
-  transform(e, t, r) {
-    const { value: i } = e;
+  transform(cellInfo, formula, rule) {
+    const { value: cellValue } = cellInfo;
     return {
-      ...e,
-      value: ye(i)
+      ...cellInfo,
+      value: getCellValueNumber(cellValue)
     };
   }
-  _parseNumber(e) {
-    return e == null ? Number.NaN : +e;
+  _parseNumber(formula) {
+    return formula == null ? Number.NaN : +formula;
   }
-  async parseFormula(e, t, r, i, o) {
-    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, o), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, o), { formula1: u, formula2: d } = e, c = C(String(n == null ? void 0 : n.v)) && C(String(l == null ? void 0 : l.v));
+  async parseFormula(rule, unitId, subUnitId, row, column) {
+    const formulaResult1 = await this._customFormulaService.getCellFormulaValue(unitId, subUnitId, rule.uid, row, column), formulaResult2 = await this._customFormulaService.getCellFormula2Value(unitId, subUnitId, rule.uid, row, column), { formula1, formula2 } = rule, isFormulaValid = isLegalFormulaResult(String(formulaResult1 == null ? void 0 : formulaResult1.v)) && isLegalFormulaResult(String(formulaResult2 == null ? void 0 : formulaResult2.v));
     return {
-      formula1: this._parseNumber(v(u) ? n == null ? void 0 : n.v : u),
-      formula2: this._parseNumber(v(d) ? l == null ? void 0 : l.v : d),
-      isFormulaValid: c
+      formula1: this._parseNumber(isFormulaString(formula1) ? formulaResult1 == null ? void 0 : formulaResult1.v : formula1),
+      formula2: this._parseNumber(isFormulaString(formula2) ? formulaResult2 == null ? void 0 : formulaResult2.v : formula2),
+      isFormulaValid
     };
   }
-  validatorFormula(e, t, r) {
-    const i = e.operator;
-    if (!i)
+  validatorFormula(rule, unitId, subUnitId) {
+    const operator = rule.operator;
+    if (!operator)
       return {
         success: !1
       };
-    const o = V.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), l = Ae.includes(i), u = this.localeService.t("dataValidation.validFail.number");
-    return l ? {
-      success: o && n,
-      formula1: o ? void 0 : u,
-      formula2: n ? void 0 : u
+    const formula1Success = Tools.isDefine(rule.formula1) && this._isFormulaOrNumber(rule.formula1), formula2Success = Tools.isDefine(rule.formula2) && this._isFormulaOrNumber(rule.formula2), isTwoFormula = TWO_FORMULA_OPERATOR_COUNT.includes(operator), errorMsg = this.localeService.t("dataValidation.validFail.number");
+    return isTwoFormula ? {
+      success: formula1Success && formula2Success,
+      formula1: formula1Success ? void 0 : errorMsg,
+      formula2: formula2Success ? void 0 : errorMsg
     } : {
-      success: o,
-      formula1: o ? "" : u
+      success: formula1Success,
+      formula1: formula1Success ? "" : errorMsg
     };
   }
-  generateRuleErrorMessage(e, t) {
-    if (!e.operator)
+  generateRuleErrorMessage(rule, position) {
+    if (!rule.operator)
       return this.titleStr;
-    const { transformedFormula1: r, transformedFormula2: i } = De(this._lexerTreeBuilder, e, t);
-    return `${this.localeService.t(ht[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
+    const { transformedFormula1, transformedFormula2 } = getTransformedFormula(this._lexerTreeBuilder, rule, position);
+    return `${this.localeService.t(OperatorErrorTitleMap[rule.operator]).replace(FORMULA1, transformedFormula1 != null ? transformedFormula1 : "").replace(FORMULA2, transformedFormula2 != null ? transformedFormula2 : "")}`;
   }
-}
-function Pe(s) {
-  if (!s)
+};
+__name(_DecimalValidator, "DecimalValidator");
+let DecimalValidator = _DecimalValidator;
+function getRuleFormulaResultSet(result) {
+  if (!result)
     return [];
-  const a = /* @__PURE__ */ new Set();
-  return s.forEach(
-    (e) => {
-      e.forEach((t) => {
-        var i, o;
-        const r = ne(t);
-        if (r != null) {
-          if (typeof r != "string" && typeof (t == null ? void 0 : t.s) == "object" && ((o = (i = t.s) == null ? void 0 : i.n) != null && o.pattern)) {
-            a.add(Q.format(t.s.n.pattern, r, { throws: !1 }));
+  const resultSet = /* @__PURE__ */ new Set();
+  return result.forEach(
+    (row) => {
+      row.forEach((cell) => {
+        var _a12, _b;
+        const value = getCellValueOrigin(cell);
+        if (value != null) {
+          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;
           }
-          C(r.toString()) && a.add(r.toString());
+          isLegalFormulaResult(value.toString()) && resultSet.add(value.toString());
         }
       });
     }
-  ), [...a];
+  ), [...resultSet];
 }
-const ha = [
+__name(getRuleFormulaResultSet, "getRuleFormulaResultSet");
+const supportedFormula = [
   "if",
   "indirect",
   "choose",
   "offset"
 ];
-function ma(s, a) {
-  if (!v(s) || dt(s.slice(1)))
+function isValidListFormula(formula, lexer) {
+  if (!isFormulaString(formula) || isReferenceString(formula.slice(1)))
     return !0;
-  const t = a.sequenceNodesBuilder(s);
-  return t && t.some((r) => typeof r == "object" && r.nodeType === Qt.FUNCTION && ha.indexOf(r.token.toLowerCase()) > -1);
+  const nodes = lexer.sequenceNodesBuilder(formula);
+  return nodes && nodes.some((node) => typeof node == "object" && node.nodeType === sequenceNodeType.FUNCTION && supportedFormula.indexOf(node.token.toLowerCase()) > -1);
 }
-function fa(s, a) {
-  const { formula1: e = "", ranges: t } = s;
-  if (dt(e.slice(1))) {
-    const i = qt(e.slice(1));
-    if ((!i.sheetName || i.sheetName === a) && t.some((o) => I.intersects(o, i.range)))
+__name(isValidListFormula, "isValidListFormula");
+function isRuleIntersects(rule, sheetName) {
+  const { formula1 = "", ranges } = rule;
+  if (isReferenceString(formula1.slice(1))) {
+    const refRange = deserializeRangeWithSheet(formula1.slice(1));
+    if ((!refRange.sheetName || refRange.sheetName === sheetName) && ranges.some((range) => Rectangle.intersects(range, refRange.range)))
       return !0;
   }
   return !1;
 }
-class mt extends k {
+__name(isRuleIntersects, "isRuleIntersects");
+const _ListValidator = class _ListValidator extends BaseDataValidator {
   constructor() {
     super(...arguments);
-    f(this, "formulaService", this.injector.get(X));
-    f(this, "_lexer", this.injector.get(Z));
-    f(this, "_univerInstanceService", this.injector.get(O));
-    f(this, "offsetFormulaByRange", !1);
-    f(this, "id", T.LIST);
-    f(this, "title", "dataValidation.list.title");
-    f(this, "operators", []);
-    f(this, "scopes", ["sheet"]);
-    f(this, "skipDefaultFontRender", (e) => e.renderMode !== Be.TEXT);
-  }
-  validatorFormula(e, t, r) {
-    var u, d, c;
-    const i = !V.isBlank(e.formula1), o = ma((u = e.formula1) != null ? u : "", this._lexer), n = (c = (d = this._univerInstanceService.getUnit(t, N.UNIVER_SHEET)) == null ? void 0 : d.getSheetBySheetId(r)) == null ? void 0 : c.getName(), l = fa(e, n != null ? n : "");
+    __publicField(this, "formulaService", this.injector.get(DataValidationFormulaService));
+    __publicField(this, "_lexer", this.injector.get(LexerTreeBuilder));
+    __publicField(this, "_univerInstanceService", this.injector.get(IUniverInstanceService));
+    __publicField(this, "offsetFormulaByRange", !1);
+    __publicField(this, "id", DataValidationType.LIST);
+    __publicField(this, "title", "dataValidation.list.title");
+    __publicField(this, "operators", []);
+    __publicField(this, "scopes", ["sheet"]);
+    __publicField(this, "skipDefaultFontRender", /* @__PURE__ */ __name((rule) => rule.renderMode !== DataValidationRenderMode.TEXT, "skipDefaultFontRender"));
+  }
+  validatorFormula(rule, unitId, subUnitId) {
+    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: !!(i && o && !l),
-      formula1: i ? o ? l ? this.localeService.t("dataValidation.validFail.listIntersects") : void 0 : this.localeService.t("dataValidation.validFail.listInvalid") : this.localeService.t("dataValidation.validFail.list")
+      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(e, t, { style: r }) {
-    var o;
-    const i = (o = r.tb !== Se.OVERFLOW ? r.tb : Se.CLIP) != null ? o : Se.WRAP;
-    if (e.type === T.LIST && (e.renderMode === Be.ARROW || e.renderMode === Be.TEXT)) {
-      const n = this.getListWithColorMap(e), l = `${t != null ? t : ""}`, u = n[l];
-      if (u)
+  getExtraStyle(rule, value, { style: defaultStyle }) {
+    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)
         return {
           bg: {
-            rgb: u
+            rgb: color
           },
-          tb: i
+          tb
         };
     }
     return {
-      tb: i
+      tb
     };
   }
-  parseCellValue(e) {
-    const t = e.toString();
-    return pe(t);
+  parseCellValue(cellValue) {
+    const cellString = cellValue.toString();
+    return deserializeListOptions(cellString);
   }
-  async parseFormula(e, t, r) {
-    var l, u;
-    const i = await this.formulaService.getRuleFormulaResult(t, r, e.uid), o = se((u = (l = i == null ? void 0 : i[0]) == null ? void 0 : l.result) == null ? void 0 : u[0][0]);
+  async parseFormula(rule, unitId, subUnitId) {
+    var _a12, _b;
+    const results = await this.formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), formulaResult1 = getFormulaResult((_b = (_a12 = results == null ? void 0 : results[0]) == null ? void 0 : _a12.result) == null ? void 0 : _b[0][0]);
     return {
       formula1: void 0,
       formula2: void 0,
-      isFormulaValid: C(String(o))
+      isFormulaValid: isLegalFormulaResult(String(formulaResult1))
     };
   }
-  async isValidType(e, t, r) {
-    var m, _;
-    const { value: i, unitId: o, subUnitId: n } = e, { formula1: l = "" } = r, u = await this.formulaService.getRuleFormulaResult(o, n, r.uid), d = v(l) ? Pe((_ = (m = u == null ? void 0 : u[0]) == null ? void 0 : m.result) == null ? void 0 : _[0][0]) : pe(l);
-    return this.parseCellValue(i).every((g) => d.includes(g));
+  async isValidType(cellInfo, formula, rule) {
+    var _a12, _b;
+    const { value, unitId, subUnitId } = cellInfo, { formula1 = "" } = rule, results = await this.formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), formula1Result = isFormulaString(formula1) ? getRuleFormulaResultSet((_b = (_a12 = results == null ? void 0 : results[0]) == null ? void 0 : _a12.result) == null ? void 0 : _b[0][0]) : deserializeListOptions(formula1);
+    return this.parseCellValue(value).every((i) => formula1Result.includes(i));
   }
   generateRuleName() {
     return this.localeService.t("dataValidation.list.name");
@@ -1042,1366 +1064,1383 @@ class mt extends k {
   generateRuleErrorMessage() {
     return this.localeService.t("dataValidation.list.error");
   }
-  getList(e, t, r) {
-    var m, _, g, R;
-    const { formula1: i = "" } = e, o = this.injector.get(O), n = (m = t ? o.getUniverSheetInstance(t) : void 0) != null ? m : o.getCurrentUnitForType(N.UNIVER_SHEET);
-    if (!n) return [];
-    const l = (_ = r ? n.getSheetBySheetId(r) : void 0) != null ? _ : n.getActiveSheet();
-    if (!l) return [];
-    const u = n.getUnitId(), d = l.getSheetId(), c = this.formulaService.getRuleFormulaResultSync(u, d, e.uid);
-    return v(i) ? Pe((R = (g = c == null ? void 0 : c[0]) == null ? void 0 : g.result) == null ? void 0 : R[0][0]) : pe(i);
-  }
-  async getListAsync(e, t, r) {
-    var m, _, g, R;
-    const { formula1: i = "" } = e, o = this.injector.get(O), n = (m = t ? o.getUniverSheetInstance(t) : void 0) != null ? m : o.getCurrentUnitForType(N.UNIVER_SHEET);
-    if (!n) return [];
-    const l = (_ = r ? n.getSheetBySheetId(r) : void 0) != null ? _ : n.getActiveSheet();
-    if (!l) return [];
-    const u = n.getUnitId(), d = l.getSheetId(), c = await this.formulaService.getRuleFormulaResult(u, d, e.uid);
-    return v(i) ? Pe((R = (g = c == null ? void 0 : c[0]) == null ? void 0 : g.result) == null ? void 0 : R[0][0]) : pe(i);
-  }
-  getListWithColor(e, t, r) {
-    const i = this.getList(e, t, r), o = (e.formula2 || "").split(",");
-    return i.map((n, l) => ({ label: n, color: o[l] }));
-  }
-  getListWithColorMap(e, t, r) {
-    const i = this.getListWithColor(e, t, r), o = {};
-    return i.forEach((n) => {
-      n.color && (o[n.label] = n.color);
-    }), o;
+  getList(rule, currentUnitId, currentSubUnitId) {
+    var _a12, _b, _c, _d;
+    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 [];
+    const unitId = workbook.getUnitId(), subUnitId = worksheet.getSheetId(), results = this.formulaService.getRuleFormulaResultSync(unitId, subUnitId, rule.uid);
+    return isFormulaString(formula1) ? getRuleFormulaResultSet((_d = (_c = results == null ? void 0 : results[0]) == null ? void 0 : _c.result) == null ? void 0 : _d[0][0]) : deserializeListOptions(formula1);
+  }
+  async getListAsync(rule, currentUnitId, currentSubUnitId) {
+    var _a12, _b, _c, _d;
+    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 [];
+    const unitId = workbook.getUnitId(), subUnitId = worksheet.getSheetId(), results = await this.formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid);
+    return isFormulaString(formula1) ? getRuleFormulaResultSet((_d = (_c = results == null ? void 0 : results[0]) == null ? void 0 : _c.result) == null ? void 0 : _d[0][0]) : deserializeListOptions(formula1);
+  }
+  getListWithColor(rule, currentUnitId, currentSubUnitId) {
+    const list = this.getList(rule, currentUnitId, currentSubUnitId), colorList = (rule.formula2 || "").split(",");
+    return list.map((label, i) => ({ label, color: colorList[i] }));
+  }
+  getListWithColorMap(rule, currentUnitId, currentSubUnitId) {
+    const list = this.getListWithColor(rule, currentUnitId, currentSubUnitId), map = {};
+    return list.forEach((item) => {
+      item.color && (map[item.label] = item.color);
+    }), map;
   }
-}
-class ga extends k {
+};
+__name(_ListValidator, "ListValidator");
+let ListValidator = _ListValidator;
+const _TextLengthValidator = class _TextLengthValidator extends BaseDataValidator {
   constructor() {
     super(...arguments);
-    f(this, "id", T.TEXT_LENGTH);
-    f(this, "title", "dataValidation.textLength.title");
-    f(this, "_lexerTreeBuilder", this.injector.get(Z));
-    f(this, "operators", [
-      h.BETWEEN,
-      h.EQUAL,
-      h.GREATER_THAN,
-      h.GREATER_THAN_OR_EQUAL,
-      h.LESS_THAN,
-      h.LESS_THAN_OR_EQUAL,
-      h.NOT_BETWEEN,
-      h.NOT_EQUAL
+    __publicField(this, "id", DataValidationType.TEXT_LENGTH);
+    __publicField(this, "title", "dataValidation.textLength.title");
+    __publicField(this, "_lexerTreeBuilder", this.injector.get(LexerTreeBuilder));
+    __publicField(this, "operators", [
+      DataValidationOperator.BETWEEN,
+      DataValidationOperator.EQUAL,
+      DataValidationOperator.GREATER_THAN,
+      DataValidationOperator.GREATER_THAN_OR_EQUAL,
+      DataValidationOperator.LESS_THAN,
+      DataValidationOperator.LESS_THAN_OR_EQUAL,
+      DataValidationOperator.NOT_BETWEEN,
+      DataValidationOperator.NOT_EQUAL
     ]);
-    f(this, "scopes", ["sheet"]);
-    f(this, "_customFormulaService", this.injector.get(P));
+    __publicField(this, "scopes", ["sheet"]);
+    __publicField(this, "_customFormulaService", this.injector.get(DataValidationCustomFormulaService));
   }
-  _isFormulaOrInt(e) {
-    return !V.isBlank(e) && (v(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+  _isFormulaOrInt(formula) {
+    return !Tools.isBlank(formula) && (isFormulaString(formula) || !Number.isNaN(+formula) && Number.isInteger(+formula));
   }
-  validatorFormula(e, t, r) {
-    const i = e.operator;
-    if (!i)
+  validatorFormula(rule, _unitId, _subUnitId) {
+    const operator = rule.operator;
+    if (!operator)
       return {
         success: !1
       };
-    const o = V.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Ae.includes(i), u = this.localeService.t("dataValidation.validFail.number");
-    return l ? {
-      success: o && n,
-      formula1: o ? void 0 : u,
-      formula2: n ? void 0 : u
+    const formula1Success = Tools.isDefine(rule.formula1) && this._isFormulaOrInt(rule.formula1), formula2Success = Tools.isDefine(rule.formula2) && this._isFormulaOrInt(rule.formula2), isTwoFormula = TWO_FORMULA_OPERATOR_COUNT.includes(operator), errorMsg = this.localeService.t("dataValidation.validFail.number");
+    return isTwoFormula ? {
+      success: formula1Success && formula2Success,
+      formula1: formula1Success ? void 0 : errorMsg,
+      formula2: formula2Success ? void 0 : errorMsg
     } : {
-      success: o,
-      formula1: u
+      success: formula1Success,
+      formula1: errorMsg
     };
   }
-  _parseNumber(e) {
-    return e == null ? Number.NaN : +e;
+  _parseNumber(formula) {
+    return formula == null ? Number.NaN : +formula;
   }
-  async parseFormula(e, t, r, i, o) {
-    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, o), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, o), { formula1: u, formula2: d } = e, c = C(String(n == null ? void 0 : n.v)) && C(String(l == null ? void 0 : l.v));
+  async parseFormula(rule, unitId, subUnitId, row, column) {
+    const formulaResult1 = await this._customFormulaService.getCellFormulaValue(unitId, subUnitId, rule.uid, row, column), formulaResult2 = await this._customFormulaService.getCellFormula2Value(unitId, subUnitId, rule.uid, row, column), { formula1, formula2 } = rule, isFormulaValid = isLegalFormulaResult(String(formulaResult1 == null ? void 0 : formulaResult1.v)) && isLegalFormulaResult(String(formulaResult2 == null ? void 0 : formulaResult2.v));
     return {
-      formula1: this._parseNumber(v(u) ? n == null ? void 0 : n.v : u),
-      formula2: this._parseNumber(v(d) ? l == null ? void 0 : l.v : d),
-      isFormulaValid: c
+      formula1: this._parseNumber(isFormulaString(formula1) ? formulaResult1 == null ? void 0 : formulaResult1.v : formula1),
+      formula2: this._parseNumber(isFormulaString(formula2) ? formulaResult2 == null ? void 0 : formulaResult2.v : formula2),
+      isFormulaValid
     };
   }
-  transform(e, t, r) {
+  transform(cellInfo, _formula, _rule) {
     return {
-      ...e,
-      value: e.value.toString().length
+      ...cellInfo,
+      value: cellInfo.value.toString().length
     };
   }
-  async isValidType(e, t, r) {
-    const { value: i } = e;
-    return typeof i == "string" || typeof i == "number";
+  async isValidType(cellInfo, _formula, _rule) {
+    const { value: cellValue } = cellInfo;
+    return typeof cellValue == "string" || typeof cellValue == "number";
   }
-  generateRuleErrorMessage(e, t) {
-    if (!e.operator)
+  generateRuleErrorMessage(rule, pos) {
+    if (!rule.operator)
       return this.titleStr;
-    const { transformedFormula1: r, transformedFormula2: i } = De(this._lexerTreeBuilder, e, t);
-    return `${this.localeService.t(Dt[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
+    const { transformedFormula1, transformedFormula2 } = getTransformedFormula(this._lexerTreeBuilder, rule, pos);
+    return `${this.localeService.t(TextLengthErrorTitleMap[rule.operator]).replace(FORMULA1, transformedFormula1 != null ? transformedFormula1 : "").replace(FORMULA2, transformedFormula2 != null ? transformedFormula2 : "")}`;
   }
+};
+__name(_TextLengthValidator, "TextLengthValidator");
+let TextLengthValidator = _TextLengthValidator;
+function isBlankCell(cellData) {
+  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;
 }
-function ft(s) {
-  var e, t;
-  return s ? s.p ? !((t = (e = s.p.body) == null ? void 0 : e.dataStream) != null ? t : "").slice(0, -2).trim() : V.isBlank(s.v) : !0;
-}
-function be(s, a, e, t, r = "command", i = !0) {
-  const o = t.get(Z), n = t.get(G), l = [], u = [], d = t.get(F), c = t.get(O), m = Ye(c, { unitId: s, subUnitId: a });
-  if (!m)
+__name(isBlankCell, "isBlankCell");
+function getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor, source = "command", fillDefaultValue = !0) {
+  const lexerTreeBuilder = accessor.get(LexerTreeBuilder), validatorRegistryService = accessor.get(DataValidatorRegistryService), redoMutations = [], undoMutations = [], sheetDataValidationModel = accessor.get(SheetDataValidationModel), univerInstanceService = accessor.get(IUniverInstanceService), target = getSheetCommandTarget(univerInstanceService, { unitId, subUnitId });
+  if (!target)
     return {
-      redoMutations: l,
-      undoMutations: u
+      redoMutations,
+      undoMutations
     };
-  const { worksheet: _ } = m, g = new ve();
-  let R = !1;
-  function M(p, w) {
-    i && p.forEach((H) => {
-      b.foreach(H, (B, W) => {
-        const U = _.getCellRaw(B, W), J = ct(U);
-        (ft(U) || J === w) && !(U != null && U.p) && (R = !0, g.setValue(B, W, {
-          v: w,
+  const { worksheet } = target, redoMatrix = new ObjectMatrix();
+  let setRangeValue = !1;
+  function setRangesDefaultValue(ranges, defaultValue) {
+    fillDefaultValue && ranges.forEach((range) => {
+      Range.foreach(range, (row, column) => {
+        const cellData = worksheet.getCellRaw(row, column), value = getStringCellValue(cellData);
+        (isBlankCell(cellData) || value === defaultValue) && !(cellData != null && cellData.p) && (setRangeValue = !0, redoMatrix.setValue(row, column, {
+          v: defaultValue,
           p: null
         }));
       });
     });
   }
-  if (e.forEach((p) => {
-    switch (p.type) {
+  if (__name(setRangesDefaultValue, "setRangesDefaultValue"), diffs.forEach((diff) => {
+    switch (diff.type) {
       case "delete":
-        l.push({
-          id: A.id,
+        redoMutations.push({
+          id: RemoveDataValidationMutation.id,
           params: {
-            unitId: s,
-            subUnitId: a,
-            ruleId: p.rule.uid,
-            source: r
+            unitId,
+            subUnitId,
+            ruleId: diff.rule.uid,
+            source
           }
-        }), u.unshift({
-          id: L.id,
+        }), undoMutations.unshift({
+          id: AddDataValidationMutation.id,
           params: {
-            unitId: s,
-            subUnitId: a,
-            rule: p.rule,
-            index: p.index,
-            source: r
+            unitId,
+            subUnitId,
+            rule: diff.rule,
+            index: diff.index,
+            source
           }
         });
         break;
       case "update": {
-        if (de(p.rule.type, n)) {
-          const H = p.oldRanges[0].startRow, B = p.oldRanges[0].startColumn, W = p.newRanges[0].startRow, U = p.newRanges[0].startColumn, J = W - H, ce = U - B, he = v(p.rule.formula1) ? o.moveFormulaRefOffset(p.rule.formula1, ce, J) : p.rule.formula1, me = v(p.rule.formula2) ? o.moveFormulaRefOffset(p.rule.formula2, ce, J) : p.rule.formula2;
-          he !== p.rule.formula1 || me !== p.rule.formula2 || !rt(p.newRanges, p.oldRanges) ? (l.push({
-            id: E.id,
+        if (shouldOffsetFormulaByRange(diff.rule.type, validatorRegistryService)) {
+          const originRow = diff.oldRanges[0].startRow, originColumn = diff.oldRanges[0].startColumn, newRow = diff.newRanges[0].startRow, newColumn = diff.newRanges[0].startColumn, rowDiff = newRow - originRow, columnDiff = newColumn - originColumn, newFormula = isFormulaString(diff.rule.formula1) ? lexerTreeBuilder.moveFormulaRefOffset(diff.rule.formula1, columnDiff, rowDiff) : diff.rule.formula1, newFormula2 = isFormulaString(diff.rule.formula2) ? lexerTreeBuilder.moveFormulaRefOffset(diff.rule.formula2, columnDiff, rowDiff) : diff.rule.formula2;
+          newFormula !== diff.rule.formula1 || newFormula2 !== diff.rule.formula2 || !isRangesEqual(diff.newRanges, diff.oldRanges) ? (redoMutations.push({
+            id: UpdateDataValidationMutation.id,
             params: {
-              unitId: s,
-              subUnitId: a,
-              ruleId: p.ruleId,
+              unitId,
+              subUnitId,
+              ruleId: diff.ruleId,
               payload: {
-                type: y.ALL,
+                type: UpdateRuleType.ALL,
                 payload: {
-                  formula1: he,
-                  formula2: me,
-                  ranges: p.newRanges
+                  formula1: newFormula,
+                  formula2: newFormula2,
+                  ranges: diff.newRanges
                 }
               }
             }
-          }), u.unshift({
-            id: E.id,
+          }), undoMutations.unshift({
+            id: UpdateDataValidationMutation.id,
             params: {
-              unitId: s,
-              subUnitId: a,
-              ruleId: p.ruleId,
+              unitId,
+              subUnitId,
+              ruleId: diff.ruleId,
               payload: {
-                type: y.ALL,
+                type: UpdateRuleType.ALL,
                 payload: {
-                  formula1: p.rule.formula1,
-                  formula2: p.rule.formula2,
-                  ranges: p.oldRanges
+                  formula1: diff.rule.formula1,
+                  formula2: diff.rule.formula2,
+                  ranges: diff.oldRanges
                 }
               }
             }
-          })) : (l.push({
-            id: E.id,
+          })) : (redoMutations.push({
+            id: UpdateDataValidationMutation.id,
             params: {
-              unitId: s,
-              subUnitId: a,
-              ruleId: p.ruleId,
+              unitId,
+              subUnitId,
+              ruleId: diff.ruleId,
               payload: {
-                type: y.RANGE,
-                payload: p.newRanges
+                type: UpdateRuleType.RANGE,
+                payload: diff.newRanges
               },
-              source: r
+              source
             }
-          }), u.unshift({
-            id: E.id,
+          }), undoMutations.unshift({
+            id: UpdateDataValidationMutation.id,
             params: {
-              unitId: s,
-              subUnitId: a,
-              ruleId: p.ruleId,
+              unitId,
+              subUnitId,
+              ruleId: diff.ruleId,
               payload: {
-                type: y.RANGE,
-                payload: p.oldRanges
+                type: UpdateRuleType.RANGE,
+                payload: diff.oldRanges
               },
-              source: r
+              source
             }
           }));
         } else
-          l.push({
-            id: E.id,
+          redoMutations.push({
+            id: UpdateDataValidationMutation.id,
             params: {
-              unitId: s,
-              subUnitId: a,
-              ruleId: p.ruleId,
+              unitId,
+              subUnitId,
+              ruleId: diff.ruleId,
               payload: {
-                type: y.RANGE,
-                payload: p.newRanges
+                type: UpdateRuleType.RANGE,
+                payload: diff.newRanges
               },
-              source: r
+              source
             }
-          }), u.unshift({
-            id: E.id,
+          }), undoMutations.unshift({
+            id: UpdateDataValidationMutation.id,
             params: {
-              unitId: s,
-              subUnitId: a,
-              ruleId: p.ruleId,
+              unitId,
+              subUnitId,
+              ruleId: diff.ruleId,
               payload: {
-                type: y.RANGE,
-                payload: p.oldRanges
+                type: UpdateRuleType.RANGE,
+                payload: diff.oldRanges
               },
-              source: r
+              source
             }
           });
-        const w = d.getRuleById(s, a, p.ruleId);
-        if (w && w.type === T.CHECKBOX) {
-          const B = d.getValidator(T.CHECKBOX).parseFormulaSync(w, s, a);
-          M(p.newRanges, B.formula2);
+        const rule = sheetDataValidationModel.getRuleById(unitId, subUnitId, diff.ruleId);
+        if (rule && rule.type === DataValidationType.CHECKBOX) {
+          const formula = sheetDataValidationModel.getValidator(DataValidationType.CHECKBOX).parseFormulaSync(rule, unitId, subUnitId);
+          setRangesDefaultValue(diff.newRanges, formula.formula2);
         }
         break;
       }
       case "add": {
-        if (l.push({
-          id: L.id,
+        if (redoMutations.push({
+          id: AddDataValidationMutation.id,
           params: {
-            unitId: s,
-            subUnitId: a,
-            rule: p.rule,
-            source: r
+            unitId,
+            subUnitId,
+            rule: diff.rule,
+            source
           }
-        }), u.unshift({
-          id: A.id,
+        }), undoMutations.unshift({
+          id: RemoveDataValidationMutation.id,
           params: {
-            unitId: s,
-            subUnitId: a,
-            ruleId: p.rule.uid,
-            source: r
+            unitId,
+            subUnitId,
+            ruleId: diff.rule.uid,
+            source
           }
-        }), p.rule.type === T.CHECKBOX) {
-          const H = d.getValidator(T.CHECKBOX).parseFormulaSync(p.rule, s, a);
-          M(p.rule.ranges, H.originFormula2);
+        }), diff.rule.type === DataValidationType.CHECKBOX) {
+          const formula = sheetDataValidationModel.getValidator(DataValidationType.CHECKBOX).parseFormulaSync(diff.rule, unitId, subUnitId);
+          setRangesDefaultValue(diff.rule.ranges, formula.originFormula2);
         }
         break;
       }
     }
-  }), R) {
-    const p = {
-      id: oe.id,
+  }), setRangeValue) {
+    const redoSetRangeValues = {
+      id: SetRangeValuesMutation.id,
       params: {
-        unitId: s,
-        subUnitId: a,
-        cellValue: g.getData()
+        unitId,
+        subUnitId,
+        cellValue: redoMatrix.getData()
       }
-    }, w = {
-      id: oe.id,
-      params: st(t, p.params)
+    }, undoSetRangeValues = {
+      id: SetRangeValuesMutation.id,
+      params: SetRangeValuesUndoMutationFactory(accessor, redoSetRangeValues.params)
     };
-    l.push(p), u.push(w);
+    redoMutations.push(redoSetRangeValues), undoMutations.push(undoSetRangeValues);
   }
   return {
-    redoMutations: l,
-    undoMutations: u
+    redoMutations,
+    undoMutations
   };
 }
-const _a = {
-  type: K.COMMAND,
+__name(getDataValidationDiffMutations, "getDataValidationDiffMutations");
+const UpdateSheetDataValidationRangeCommand = {
+  type: CommandType.COMMAND,
   id: "sheet.command.updateDataValidationRuleRange",
-  handler(s, a) {
-    if (!a)
+  handler(accessor, params) {
+    if (!params)
       return !1;
-    const { unitId: e, subUnitId: t, ranges: r, ruleId: i } = a, o = s.get(F), n = s.get(x), l = s.get(z);
-    if (!o.getRuleById(e, t, i))
+    const { unitId, subUnitId, ranges, ruleId } = params, sheetDataValidationModel = accessor.get(SheetDataValidationModel), commandService = accessor.get(ICommandService), undoRedoService = accessor.get(IUndoRedoService);
+    if (!sheetDataValidationModel.getRuleById(unitId, subUnitId, ruleId))
       return !1;
-    const d = o.getRuleObjectMatrix(e, t).clone();
-    d.updateRange(i, r);
-    const c = d.diff(o.getRules(e, t)), { redoMutations: m, undoMutations: _ } = be(e, t, c, s);
-    return l.pushUndoRedo({
-      undoMutations: _,
-      redoMutations: m,
-      unitID: e
-    }), Ie(m, n), !0;
-  }
-}, pa = {
-  type: K.COMMAND,
+    const matrix = sheetDataValidationModel.getRuleObjectMatrix(unitId, subUnitId).clone();
+    matrix.updateRange(ruleId, ranges);
+    const diffs = matrix.diff(sheetDataValidationModel.getRules(unitId, subUnitId)), { redoMutations, undoMutations } = getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor);
+    return undoRedoService.pushUndoRedo({
+      undoMutations,
+      redoMutations,
+      unitID: unitId
+    }), sequenceExecute(redoMutations, commandService), !0;
+  }
+}, AddSheetDataValidationCommand = {
+  type: CommandType.COMMAND,
   id: "sheet.command.addDataValidation",
-  handler(s, a) {
-    if (!a)
+  handler(accessor, params) {
+    if (!params)
       return !1;
-    const { unitId: e, subUnitId: t, rule: r } = a, i = s.get(F), o = s.get(x), n = s.get(z), l = i.getRuleObjectMatrix(e, t).clone();
-    l.addRule(r);
-    const u = l.diff(i.getRules(e, t)), d = i.getValidator(r.type), c = {
-      unitId: e,
-      subUnitId: t,
+    const { unitId, subUnitId, rule } = params, sheetDataValidationModel = accessor.get(SheetDataValidationModel), commandService = accessor.get(ICommandService), undoRedoService = accessor.get(IUndoRedoService), matrix = sheetDataValidationModel.getRuleObjectMatrix(unitId, subUnitId).clone();
+    matrix.addRule(rule);
+    const diffs = matrix.diff(sheetDataValidationModel.getRules(unitId, subUnitId)), validator = sheetDataValidationModel.getValidator(rule.type), mutationParams = {
+      unitId,
+      subUnitId,
       rule: {
-        ...r,
-        ...d == null ? void 0 : d.normalizeFormula(r, e, t)
+        ...rule,
+        ...validator == null ? void 0 : validator.normalizeFormula(rule, unitId, subUnitId)
       }
-    }, { redoMutations: m, undoMutations: _ } = be(e, t, u, s);
-    return m.push({
-      id: L.id,
-      params: c
-    }), _.unshift({
-      id: A.id,
+    }, { redoMutations, undoMutations } = getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor);
+    return redoMutations.push({
+      id: AddDataValidationMutation.id,
+      params: mutationParams
+    }), undoMutations.unshift({
+      id: RemoveDataValidationMutation.id,
       params: {
-        unitId: e,
-        subUnitId: t,
-        ruleId: r.uid
+        unitId,
+        subUnitId,
+        ruleId: rule.uid
       }
-    }), n.pushUndoRedo({
-      unitID: e,
-      redoMutations: m,
-      undoMutations: _
-    }), Ie(m, o), !0;
-  }
-}, Ra = {
-  type: K.COMMAND,
+    }), undoRedoService.pushUndoRedo({
+      unitID: unitId,
+      redoMutations,
+      undoMutations
+    }), sequenceExecute(redoMutations, commandService), !0;
+  }
+}, UpdateSheetDataValidationSettingCommand = {
+  type: CommandType.COMMAND,
   id: "sheets.command.update-data-validation-setting",
   // eslint-disable-next-line max-lines-per-function
-  handler(s, a) {
-    if (!a)
+  handler(accessor, params) {
+    if (!params)
       return !1;
-    const e = s.get(x), t = s.get(z), r = s.get(F), i = s.get(G), { unitId: o, subUnitId: n, ruleId: l, setting: u } = a, d = i.getValidatorItem(u.type);
-    if (!d)
+    const commandService = accessor.get(ICommandService), redoUndoService = accessor.get(IUndoRedoService), sheetDataValidationModel = accessor.get(SheetDataValidationModel), dataValidatorRegistryService = accessor.get(DataValidatorRegistryService), { unitId, subUnitId, ruleId, setting } = params, validator = dataValidatorRegistryService.getValidatorItem(setting.type);
+    if (!validator)
       return !1;
-    const c = r.getRuleById(o, n, l);
-    if (!c)
+    const rule = sheetDataValidationModel.getRuleById(unitId, subUnitId, ruleId);
+    if (!rule)
       return !1;
-    const m = { ...c, ...u };
-    if (!d.validatorFormula(m, o, n).success)
+    const newRule = { ...rule, ...setting };
+    if (!validator.validatorFormula(newRule, unitId, subUnitId).success)
       return !1;
-    const _ = {
-      unitId: o,
-      subUnitId: n,
-      ruleId: l,
+    const mutationParams = {
+      unitId,
+      subUnitId,
+      ruleId,
       payload: {
-        type: y.SETTING,
+        type: UpdateRuleType.SETTING,
         payload: {
-          ...u,
-          ...d.normalizeFormula(m, o, n)
+          ...setting,
+          ...validator.normalizeFormula(newRule, unitId, subUnitId)
         }
       }
-    }, g = [{
-      id: E.id,
-      params: _
-    }], R = {
-      unitId: o,
-      subUnitId: n,
-      ruleId: l,
+    }, redoMutations = [{
+      id: UpdateDataValidationMutation.id,
+      params: mutationParams
+    }], undoMutationParams = {
+      unitId,
+      subUnitId,
+      ruleId,
       payload: {
-        type: y.SETTING,
-        payload: bt(c)
+        type: UpdateRuleType.SETTING,
+        payload: getRuleSetting(rule)
       }
-    }, M = [{
-      id: E.id,
-      params: R
+    }, undoMutations = [{
+      id: UpdateDataValidationMutation.id,
+      params: undoMutationParams
     }];
-    if (u.type === T.CHECKBOX) {
-      const w = c.ranges, H = s.get(O), B = Ye(H, { unitId: o, subUnitId: n });
-      if (B) {
-        const W = new ve(), { worksheet: U } = B, { formula2: J = Me, formula1: ce = Ve } = c, { formula2: he = Me, formula1: me = Ve } = u;
-        let Le = !1;
-        if (w.forEach((fe) => {
-          b.foreach(fe, (ae, xe) => {
-            const j = U.getCellRaw(ae, xe), Ke = ct(j);
-            (ft(j) || Ke === String(J)) && !(j != null && j.p) ? (W.setValue(ae, xe, {
-              v: he,
+    if (setting.type === DataValidationType.CHECKBOX) {
+      const ranges = rule.ranges, univerInstanceService = accessor.get(IUniverInstanceService), target = getSheetCommandTarget(univerInstanceService, { unitId, subUnitId });
+      if (target) {
+        const redoMatrix = new ObjectMatrix(), { worksheet } = target, { formula2: oldFormula2 = CHECKBOX_FORMULA_2, formula1: oldFormula1 = CHECKBOX_FORMULA_1 } = rule, { formula2 = CHECKBOX_FORMULA_2, formula1 = CHECKBOX_FORMULA_1 } = setting;
+        let setted = !1;
+        if (ranges.forEach((range) => {
+          Range.foreach(range, (row, column) => {
+            const cellData = worksheet.getCellRaw(row, column), value = getStringCellValue(cellData);
+            (isBlankCell(cellData) || value === String(oldFormula2)) && !(cellData != null && cellData.p) ? (redoMatrix.setValue(row, column, {
+              v: formula2,
               p: null
-            }), Le = !0) : Ke === String(ce) && !(j != null && j.p) && (W.setValue(ae, xe, {
-              v: me,
+            }), setted = !0) : value === String(oldFormula1) && !(cellData != null && cellData.p) && (redoMatrix.setValue(row, column, {
+              v: formula1,
               p: null
-            }), Le = !0);
+            }), setted = !0);
           });
-        }), Le) {
-          const fe = {
-            id: oe.id,
+        }), setted) {
+          const redoSetRangeValues = {
+            id: SetRangeValuesMutation.id,
             params: {
-              unitId: o,
-              subUnitId: n,
-              cellValue: W.getData()
+              unitId,
+              subUnitId,
+              cellValue: redoMatrix.getData()
             }
-          }, ae = {
-            id: oe.id,
-            params: st(s, fe.params)
+          }, undoSetRangeValues = {
+            id: SetRangeValuesMutation.id,
+            params: SetRangeValuesUndoMutationFactory(accessor, redoSetRangeValues.params)
           };
-          g.push(fe), M.push(ae);
+          redoMutations.push(redoSetRangeValues), undoMutations.push(undoSetRangeValues);
         }
       }
     }
-    return Ie(g, e).result ? (t.pushUndoRedo({
-      unitID: o,
-      redoMutations: g,
-      undoMutations: M
+    return sequenceExecute(redoMutations, commandService).result ? (redoUndoService.pushUndoRedo({
+      unitID: unitId,
+      redoMutations,
+      undoMutations
     }), !0) : !1;
   }
-}, Sa = {
-  type: K.COMMAND,
+}, UpdateSheetDataValidationOptionsCommand = {
+  type: CommandType.COMMAND,
   id: "sheets.command.update-data-validation-options",
-  handler(s, a) {
-    if (!a)
+  handler(accessor, params) {
+    if (!params)
       return !1;
-    const e = s.get(x), t = s.get(z), r = s.get(F), { unitId: i, subUnitId: o, ruleId: n, options: l } = a, u = r.getRuleById(i, o, n);
-    if (!u)
+    const commandService = accessor.get(ICommandService), redoUndoService = accessor.get(IUndoRedoService), sheetDataValidationModel = accessor.get(SheetDataValidationModel), { unitId, subUnitId, ruleId, options } = params, rule = sheetDataValidationModel.getRuleById(unitId, subUnitId, ruleId);
+    if (!rule)
       return !1;
-    const d = {
-      unitId: i,
-      subUnitId: o,
-      ruleId: n,
+    const mutationParams = {
+      unitId,
+      subUnitId,
+      ruleId,
       payload: {
-        type: y.OPTIONS,
-        payload: l
+        type: UpdateRuleType.OPTIONS,
+        payload: options
       }
-    }, c = [{
-      id: E.id,
-      params: d
-    }], m = {
-      unitId: i,
-      subUnitId: o,
-      ruleId: n,
+    }, redoMutations = [{
+      id: UpdateDataValidationMutation.id,
+      params: mutationParams
+    }], undoMutationParams = {
+      unitId,
+      subUnitId,
+      ruleId,
       payload: {
-        type: y.OPTIONS,
-        payload: Lt(u)
+        type: UpdateRuleType.OPTIONS,
+        payload: getRuleOptions(rule)
       }
-    }, _ = [{
-      id: E.id,
-      params: m
+    }, undoMutations = [{
+      id: UpdateDataValidationMutation.id,
+      params: undoMutationParams
     }];
-    return t.pushUndoRedo({
-      unitID: i,
-      redoMutations: c,
-      undoMutations: _
-    }), e.executeCommand(E.id, d), !0;
-  }
-}, va = {
-  type: K.COMMAND,
+    return redoUndoService.pushUndoRedo({
+      unitID: unitId,
+      redoMutations,
+      undoMutations
+    }), commandService.executeCommand(UpdateDataValidationMutation.id, mutationParams), !0;
+  }
+}, ClearRangeDataValidationCommand = {
+  type: CommandType.COMMAND,
   id: "sheets.command.clear-range-data-validation",
-  handler(s, a) {
-    if (!a)
+  handler(accessor, params) {
+    if (!params)
       return !1;
-    const { unitId: e, subUnitId: t, ranges: r } = a, i = s.get(x), o = s.get(O), n = Ye(o, { unitId: e, subUnitId: t }), l = s.get(F);
-    if (!n) return !1;
-    const u = s.get(z), d = l.getRuleObjectMatrix(e, t).clone();
-    d.removeRange(r);
-    const c = d.diff(l.getRules(e, t)), { redoMutations: m, undoMutations: _ } = be(e, t, c, s);
-    return u.pushUndoRedo({
-      unitID: e,
-      redoMutations: m,
-      undoMutations: _
-    }), Ie(m, i).result;
-  }
-}, Va = {
-  type: K.COMMAND,
+    const { unitId, subUnitId, ranges } = params, commandService = accessor.get(ICommandService), univerInstanceService = accessor.get(IUniverInstanceService), target = getSheetCommandTarget(univerInstanceService, { unitId, subUnitId }), sheetDataValidationModel = accessor.get(SheetDataValidationModel);
+    if (!target) return !1;
+    const undoRedoService = accessor.get(IUndoRedoService), matrix = sheetDataValidationModel.getRuleObjectMatrix(unitId, subUnitId).clone();
+    matrix.removeRange(ranges);
+    const diffs = matrix.diff(sheetDataValidationModel.getRules(unitId, subUnitId)), { redoMutations, undoMutations } = getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor);
+    return undoRedoService.pushUndoRedo({
+      unitID: unitId,
+      redoMutations,
+      undoMutations
+    }), sequenceExecute(redoMutations, commandService).result;
+  }
+}, RemoveSheetAllDataValidationCommand = {
+  type: CommandType.COMMAND,
   id: "sheet.command.remove-all-data-validation",
-  handler(s, a) {
-    if (!a)
+  handler(accessor, params) {
+    if (!params)
       return !1;
-    const { unitId: e, subUnitId: t } = a, r = s.get(x), i = s.get(F), o = s.get(z), n = [...i.getRules(e, t)], l = {
-      unitId: e,
-      subUnitId: t,
-      ruleId: n.map((c) => c.uid)
-    }, u = [{
-      id: A.id,
-      params: l
-    }], d = [{
-      id: L.id,
+    const { unitId, subUnitId } = params, commandService = accessor.get(ICommandService), sheetDataValidationModel = accessor.get(SheetDataValidationModel), undoRedoService = accessor.get(IUndoRedoService), currentRules = [...sheetDataValidationModel.getRules(unitId, subUnitId)], redoParams = {
+      unitId,
+      subUnitId,
+      ruleId: currentRules.map((rule) => rule.uid)
+    }, redoMutations = [{
+      id: RemoveDataValidationMutation.id,
+      params: redoParams
+    }], undoMutations = [{
+      id: AddDataValidationMutation.id,
       params: {
-        unitId: e,
-        subUnitId: t,
-        rule: n
+        unitId,
+        subUnitId,
+        rule: currentRules
       }
     }];
-    return o.pushUndoRedo({
-      redoMutations: u,
-      undoMutations: d,
-      unitID: e
-    }), r.executeCommand(A.id, l), !0;
-  }
-}, Ma = (s, a) => {
-  const e = s.get(F), { unitId: t, subUnitId: r, ruleId: i, source: o } = a;
-  if (Array.isArray(i)) {
-    const l = i.map((u) => e.getRuleById(t, r, u)).filter(Boolean);
+    return undoRedoService.pushUndoRedo({
+      redoMutations,
+      undoMutations,
+      unitID: unitId
+    }), commandService.executeCommand(RemoveDataValidationMutation.id, redoParams), !0;
+  }
+}, removeDataValidationUndoFactory = /* @__PURE__ */ __name((accessor, redoParams) => {
+  const sheetDataValidationModel = accessor.get(SheetDataValidationModel), { unitId, subUnitId, ruleId, source } = redoParams;
+  if (Array.isArray(ruleId)) {
+    const rules = ruleId.map((id) => sheetDataValidationModel.getRuleById(unitId, subUnitId, id)).filter(Boolean);
     return [{
-      id: L.id,
+      id: AddDataValidationMutation.id,
       params: {
-        unitId: t,
-        subUnitId: r,
-        rule: l,
-        source: o
+        unitId,
+        subUnitId,
+        rule: rules,
+        source
       }
     }];
   }
   return [{
-    id: L.id,
+    id: AddDataValidationMutation.id,
     params: {
-      unitId: t,
-      subUnitId: r,
+      unitId,
+      subUnitId,
       rule: {
-        ...e.getRuleById(t, r, i)
+        ...sheetDataValidationModel.getRuleById(unitId, subUnitId, ruleId)
       },
-      index: e.getRuleIndex(t, r, i)
+      index: sheetDataValidationModel.getRuleIndex(unitId, subUnitId, ruleId)
     }
   }];
-}, ya = {
-  type: K.COMMAND,
+}, "removeDataValidationUndoFactory"), RemoveSheetDataValidationCommand = {
+  type: CommandType.COMMAND,
   id: "sheet.command.remove-data-validation-rule",
-  handler(s, a) {
-    if (!a)
+  handler(accessor, params) {
+    if (!params)
       return !1;
-    const { unitId: e, subUnitId: t, ruleId: r } = a, i = s.get(x), o = s.get(z), n = s.get(F), l = [{
-      id: A.id,
-      params: a
-    }], u = [{
-      id: L.id,
+    const { unitId, subUnitId, ruleId } = params, commandService = accessor.get(ICommandService), undoRedoService = accessor.get(IUndoRedoService), sheetDataValidationModel = accessor.get(SheetDataValidationModel), redoMutations = [{
+      id: RemoveDataValidationMutation.id,
+      params
+    }], undoMutations = [{
+      id: AddDataValidationMutation.id,
       params: {
-        unitId: e,
-        subUnitId: t,
+        unitId,
+        subUnitId,
         rule: {
-          ...n.getRuleById(e, t, r)
+          ...sheetDataValidationModel.getRuleById(unitId, subUnitId, ruleId)
         },
-        index: n.getRuleIndex(e, t, r)
+        index: sheetDataValidationModel.getRuleIndex(unitId, subUnitId, ruleId)
       }
     }];
-    return o.pushUndoRedo({
-      undoMutations: u,
-      redoMutations: l,
-      unitID: a.unitId
-    }), i.executeCommand(A.id, a), !0;
-  }
-}, Ea = "sheets-data-validation.config", tt = {};
-var Ta = Object.defineProperty, Fa = Object.getOwnPropertyDescriptor, Na = (s, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Fa(a, e) : a, i = s.length - 1, o; i >= 0; i--)
-    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
-  return t && r && Ta(a, e, r), r;
-}, $e = (s, a) => (e, t) => a(e, t, s);
-let Ee = class extends $ {
-  constructor(a, e, t) {
+    return undoRedoService.pushUndoRedo({
+      undoMutations,
+      redoMutations,
+      unitID: params.unitId
+    }), commandService.executeCommand(RemoveDataValidationMutation.id, params), !0;
+  }
+}, SHEETS_DATA_VALIDATION_PLUGIN_CONFIG_KEY = "sheets-data-validation.config", defaultPluginConfig = {};
+var __defProp$6 = Object.defineProperty, __getOwnPropDesc$6 = Object.getOwnPropertyDescriptor, __decorateClass$6 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  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"), _a5;
+let DataValidationFormulaRefRangeController = (_a5 = class extends Disposable {
+  constructor(_dataValidationModel, _formulaRefRangeService, _validatorRegistryService) {
     super();
-    f(this, "_disposableMap", /* @__PURE__ */ new Map());
-    f(this, "registerRule", (a, e, t) => {
-      de(t.type, this._validatorRegistryService) && this.register(a, e, t);
-    });
-    this._dataValidationModel = a, this._formulaRefRangeService = e, this._validatorRegistryService = t, this._initRefRange();
+    __publicField(this, "_disposableMap", /* @__PURE__ */ new Map());
+    __publicField(this, "registerRule", /* @__PURE__ */ __name((unitId, subUnitId, rule) => {
+      shouldOffsetFormulaByRange(rule.type, this._validatorRegistryService) && this.register(unitId, subUnitId, rule);
+    }, "registerRule"));
+    this._dataValidationModel = _dataValidationModel, this._formulaRefRangeService = _formulaRefRangeService, this._validatorRegistryService = _validatorRegistryService, this._initRefRange();
   }
-  _getIdWithUnitId(a, e, t) {
-    return `${a}_${e}_${t}`;
+  _getIdWithUnitId(unitID, subUnitId, ruleId) {
+    return `${unitID}_${subUnitId}_${ruleId}`;
   }
   // eslint-disable-next-line max-lines-per-function
-  register(a, e, t) {
-    const r = t.ranges, i = t.formula1, o = t.formula2, n = this._formulaRefRangeService.registerRangeFormula(a, e, r, [i != null ? i : "", o != null ? o : ""], (u) => {
-      if (u.length === 0)
+  register(unitId, subUnitId, rule) {
+    const oldRanges = rule.ranges, oldFormula1 = rule.formula1, oldFormula2 = rule.formula2, disposable = this._formulaRefRangeService.registerRangeFormula(unitId, subUnitId, oldRanges, [oldFormula1 != null ? oldFormula1 : "", oldFormula2 != null ? oldFormula2 : ""], (res) => {
+      if (res.length === 0)
         return {
           undos: [{
-            id: L.id,
+            id: AddDataValidationMutation.id,
             params: {
-              unitId: a,
-              subUnitId: e,
-              rule: t,
+              unitId,
+              subUnitId,
+              rule,
               source: "patched"
             }
           }],
           redos: [{
-            id: A.id,
+            id: RemoveDataValidationMutation.id,
             params: {
-              unitId: a,
-              subUnitId: e,
-              ruleId: t.uid,
+              unitId,
+              subUnitId,
+              ruleId: rule.uid,
               source: "patched"
             }
           }]
         };
-      const d = [], c = [], m = u[0];
-      d.push({
-        id: E.id,
+      const redos = [], undos = [], first = res[0];
+      redos.push({
+        id: UpdateDataValidationMutation.id,
         params: {
-          unitId: a,
-          subUnitId: e,
-          ruleId: t.uid,
+          unitId,
+          subUnitId,
+          ruleId: rule.uid,
           payload: {
-            type: y.ALL,
+            type: UpdateRuleType.ALL,
             payload: {
-              ranges: m.ranges,
-              formula1: m.formulas[0],
-              formula2: m.formulas[1]
+              ranges: first.ranges,
+              formula1: first.formulas[0],
+              formula2: first.formulas[1]
             }
           },
           source: "patched"
         }
-      }), c.push({
-        id: E.id,
+      }), undos.push({
+        id: UpdateDataValidationMutation.id,
         params: {
-          unitId: a,
-          subUnitId: e,
-          ruleId: t.uid,
+          unitId,
+          subUnitId,
+          ruleId: rule.uid,
           payload: {
-            type: y.ALL,
+            type: UpdateRuleType.ALL,
             payload: {
-              ranges: r,
-              formula1: i,
-              formula2: o
+              ranges: oldRanges,
+              formula1: oldFormula1,
+              formula2: oldFormula2
             }
           },
           source: "patched"
         }
       });
-      for (let _ = 1; _ < u.length; _++) {
-        const g = u[_], R = yt();
-        d.push({
-          id: L.id,
+      for (let i = 1; i < res.length; i++) {
+        const item = res[i], id2 = generateRandomId();
+        redos.push({
+          id: AddDataValidationMutation.id,
           params: {
-            unitId: a,
-            subUnitId: e,
+            unitId,
+            subUnitId,
             rule: {
-              ...t,
-              uid: R,
-              formula1: g.formulas[0],
-              formula2: g.formulas[1],
-              ranges: g.ranges
+              ...rule,
+              uid: id2,
+              formula1: item.formulas[0],
+              formula2: item.formulas[1],
+              ranges: item.ranges
             },
             source: "patched"
           }
-        }), c.push({
-          id: A.id,
+        }), undos.push({
+          id: RemoveDataValidationMutation.id,
           params: {
-            unitId: a,
-            subUnitId: e,
-            ruleId: R,
+            unitId,
+            subUnitId,
+            ruleId: id2,
             source: "patched"
           }
         });
       }
       return {
-        undos: c,
-        redos: d
+        undos,
+        redos
       };
-    }), l = this._getIdWithUnitId(a, e, t.uid);
-    this._disposableMap.set(l, n);
+    }), id = this._getIdWithUnitId(unitId, subUnitId, rule.uid);
+    this._disposableMap.set(id, disposable);
   }
   _initRefRange() {
-    const a = this._dataValidationModel.getAll();
-    for (const [e, t] of a)
-      for (const [r, i] of t)
-        for (const o of i)
-          this.registerRule(e, r, o);
+    const allRules = this._dataValidationModel.getAll();
+    for (const [unitId, subUnitMap] of allRules)
+      for (const [subUnitId, rules] of subUnitMap)
+        for (const rule of rules)
+          this.registerRule(unitId, subUnitId, rule);
     this.disposeWithMe(
-      this._dataValidationModel.ruleChange$.subscribe((e) => {
-        const { unitId: t, subUnitId: r, rule: i } = e;
-        switch (e.type) {
+      this._dataValidationModel.ruleChange$.subscribe((option) => {
+        const { unitId, subUnitId, rule } = option;
+        switch (option.type) {
           case "add": {
-            const o = e.rule;
-            this.registerRule(e.unitId, e.subUnitId, o);
+            const rule2 = option.rule;
+            this.registerRule(option.unitId, option.subUnitId, rule2);
             break;
           }
           case "remove": {
-            const o = this._disposableMap.get(this._getIdWithUnitId(t, r, i.uid));
-            o && o.dispose();
+            const disposeSet = this._disposableMap.get(this._getIdWithUnitId(unitId, subUnitId, rule.uid));
+            disposeSet && disposeSet.dispose();
             break;
           }
           case "update": {
-            const o = e.rule, n = this._disposableMap.get(this._getIdWithUnitId(t, r, o.uid));
-            n && n.dispose(), this.registerRule(e.unitId, e.subUnitId, o);
+            const rule2 = option.rule, disposeSet = this._disposableMap.get(this._getIdWithUnitId(unitId, subUnitId, rule2.uid));
+            disposeSet && disposeSet.dispose(), this.registerRule(option.unitId, option.subUnitId, rule2);
             break;
           }
         }
       })
-    ), this.disposeWithMe(qe(() => {
-      this._disposableMap.forEach((e) => {
-        e.dispose();
+    ), this.disposeWithMe(toDisposable(() => {
+      this._disposableMap.forEach((item) => {
+        item.dispose();
       }), this._disposableMap.clear();
     }));
   }
-};
-Ee = Na([
-  $e(0, S(F)),
-  $e(1, S(ut)),
-  $e(2, S(G))
-], Ee);
-var gt = /* @__PURE__ */ ((s) => (s[s.View = 0] = "View", s[s.Edit = 1] = "Edit", s[s.ManageCollaborator = 2] = "ManageCollaborator", s[s.Print = 3] = "Print", s[s.Duplicate = 4] = "Duplicate", s[s.Comment = 5] = "Comment", s[s.Copy = 6] = "Copy", s[s.Share = 7] = "Share", s[s.Export = 8] = "Export", s[s.MoveWorksheet = 9] = "MoveWorksheet", s[s.DeleteWorksheet = 10] = "DeleteWorksheet", s[s.HideWorksheet = 11] = "HideWorksheet", s[s.RenameWorksheet = 12] = "RenameWorksheet", s[s.CreateWorksheet = 13] = "CreateWorksheet", s[s.SetWorksheetStyle = 14] = "SetWorksheetStyle", s[s.EditWorksheetCell = 15] = "EditWorksheetCell", s[s.InsertHyperlink = 16] = "InsertHyperlink", s[s.Sort = 17] = "Sort", s[s.Filter = 18] = "Filter", s[s.PivotTable = 19] = "PivotTable", s[s.FloatImg = 20] = "FloatImg", s[s.History = 21] = "History", s[s.RwHgtClWdt = 22] = "RwHgtClWdt", s[s.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", s[s.ViewFilter = 24] = "ViewFilter", s[s.MoveSheet = 25] = "MoveSheet", s[s.DeleteSheet = 26] = "DeleteSheet", s[s.HideSheet = 27] = "HideSheet", s[s.CopySheet = 28] = "CopySheet", s[s.RenameSheet = 29] = "RenameSheet", s[s.CreateSheet = 30] = "CreateSheet", s[s.SelectProtectedCells = 31] = "SelectProtectedCells", s[s.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", s[s.SetCellStyle = 33] = "SetCellStyle", s[s.SetCellValue = 34] = "SetCellValue", s[s.SetRowStyle = 35] = "SetRowStyle", s[s.SetColumnStyle = 36] = "SetColumnStyle", s[s.InsertRow = 37] = "InsertRow", s[s.InsertColumn = 38] = "InsertColumn", s[s.DeleteRow = 39] = "DeleteRow", s[s.DeleteColumn = 40] = "DeleteColumn", s[s.EditExtraObject = 41] = "EditExtraObject", s[s.Delete = 42] = "Delete", s[s.RecoverHistory = 43] = "RecoverHistory", s[s.ViewHistory = 44] = "ViewHistory", s[s.CreatePermissionObject = 45] = "CreatePermissionObject", s[s.UNRECOGNIZED = -1] = "UNRECOGNIZED", s))(gt || {}), Ca = Object.defineProperty, Oa = Object.getOwnPropertyDescriptor, wa = (s, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Oa(a, e) : a, i = s.length - 1, o; i >= 0; i--)
-    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
-  return t && r && Ca(a, e, r), r;
-}, He = (s, a) => (e, t) => a(e, t, s);
-let Te = class extends $ {
-  constructor(s, a, e) {
-    super(), this._univerInstanceService = s, this._permissionService = a, this._lexerTreeBuilder = e;
-  }
-  getFormulaRefCheck(s) {
-    var e, t;
-    const a = this._lexerTreeBuilder.sequenceNodesBuilder(s);
-    if (!a)
+}, __name(_a5, "DataValidationFormulaRefRangeController"), _a5);
+DataValidationFormulaRefRangeController = __decorateClass$6([
+  __decorateParam$6(0, Inject(SheetDataValidationModel)),
+  __decorateParam$6(1, Inject(FormulaRefRangeService)),
+  __decorateParam$6(2, Inject(DataValidatorRegistryService))
+], DataValidationFormulaRefRangeController);
+var R = /* @__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.CreatePermissionObject = 45] = "CreatePermissionObject", E[E.UNRECOGNIZED = -1] = "UNRECOGNIZED", E))(R || {}), __defProp$5 = Object.defineProperty, __getOwnPropDesc$5 = Object.getOwnPropertyDescriptor, __decorateClass$5 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  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"), _a6;
+let DataValidationFormulaController = (_a6 = class extends Disposable {
+  constructor(_univerInstanceService, _permissionService, _lexerTreeBuilder) {
+    super(), this._univerInstanceService = _univerInstanceService, this._permissionService = _permissionService, this._lexerTreeBuilder = _lexerTreeBuilder;
+  }
+  getFormulaRefCheck(formulaString) {
+    var _a12, _b;
+    const sequenceNodes = this._lexerTreeBuilder.sequenceNodesBuilder(formulaString);
+    if (!sequenceNodes)
       return !0;
-    for (let r = 0; r < a.length; r++) {
-      const i = a[r];
-      if (typeof i == "string")
+    for (let i = 0; i < sequenceNodes.length; i++) {
+      const node = sequenceNodes[i];
+      if (typeof node == "string")
         continue;
-      const { token: o } = i, n = Gt(o), l = this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET);
-      let u = l.getActiveSheet();
-      const d = l.getUnitId();
-      if (n.sheetName) {
-        if (u = l.getSheetBySheetName(n.sheetName), !u)
+      const { token } = node, sequenceGrid = deserializeRangeWithSheetWithCache(token), workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+      let targetSheet = workbook.getActiveSheet();
+      const unitId = workbook.getUnitId();
+      if (sequenceGrid.sheetName) {
+        if (targetSheet = workbook.getSheetBySheetName(sequenceGrid.sheetName), !targetSheet)
           return !1;
-        const R = u == null ? void 0 : u.getSheetId();
-        if (!this._permissionService.getPermissionPoint(new Bt(d, R).id)) return !1;
+        const subUnitId = targetSheet == null ? void 0 : targetSheet.getSheetId();
+        if (!this._permissionService.getPermissionPoint(new WorksheetViewPermission(unitId, subUnitId).id)) return !1;
       }
-      if (!u)
+      if (!targetSheet)
         return !1;
-      const { startRow: c, endRow: m, startColumn: _, endColumn: g } = n.range;
-      for (let R = c; R <= m; R++)
-        for (let M = _; M <= g; M++) {
-          const p = (t = (e = u.getCell(R, M)) == null ? void 0 : e.selectionProtection) == null ? void 0 : t[0];
-          if ((p == null ? void 0 : p[gt.View]) === !1)
+      const { startRow, endRow, startColumn, endColumn } = sequenceGrid.range;
+      for (let i2 = startRow; i2 <= endRow; i2++)
+        for (let j = startColumn; j <= endColumn; j++) {
+          const permission = (_b = (_a12 = targetSheet.getCell(i2, j)) == null ? void 0 : _a12.selectionProtection) == null ? void 0 : _b[0];
+          if ((permission == null ? void 0 : permission[R.View]) === !1)
             return !1;
         }
     }
     return !0;
   }
-};
-Te = wa([
-  He(0, O),
-  He(1, Et),
-  He(2, S(Z))
-], Te);
-var Ia = Object.defineProperty, Aa = Object.getOwnPropertyDescriptor, Da = (s, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Aa(a, e) : a, i = s.length - 1, o; i >= 0; i--)
-    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
-  return t && r && Ia(a, e, r), r;
-}, ee = (s, a) => (e, t) => a(e, t, s);
-let Fe = class extends $ {
-  constructor(a, e, t, r, i, o) {
+}, __name(_a6, "DataValidationFormulaController"), _a6);
+DataValidationFormulaController = __decorateClass$5([
+  __decorateParam$5(0, IUniverInstanceService),
+  __decorateParam$5(1, IPermissionService),
+  __decorateParam$5(2, Inject(LexerTreeBuilder))
+], DataValidationFormulaController);
+var __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"), _a7;
+let DataValidationRefRangeController = (_a7 = class extends Disposable {
+  constructor(_dataValidationModel, _injector, _refRangeService, _dataValidationFormulaService, _formulaRefRangeService, _validatorRegistryService) {
     super();
-    f(this, "_disposableMap", /* @__PURE__ */ new Map());
-    f(this, "registerRule", (a, e, t) => {
-      de(t.type, this._validatorRegistryService) || (this.register(a, e, t), this.registerFormula(a, e, t));
-    });
-    this._dataValidationModel = a, this._injector = e, this._refRangeService = t, this._dataValidationFormulaService = r, this._formulaRefRangeService = i, this._validatorRegistryService = o, this._initRefRange();
+    __publicField(this, "_disposableMap", /* @__PURE__ */ new Map());
+    __publicField(this, "registerRule", /* @__PURE__ */ __name((unitId, subUnitId, rule) => {
+      shouldOffsetFormulaByRange(rule.type, this._validatorRegistryService) || (this.register(unitId, subUnitId, rule), this.registerFormula(unitId, subUnitId, rule));
+    }, "registerRule"));
+    this._dataValidationModel = _dataValidationModel, this._injector = _injector, this._refRangeService = _refRangeService, this._dataValidationFormulaService = _dataValidationFormulaService, this._formulaRefRangeService = _formulaRefRangeService, this._validatorRegistryService = _validatorRegistryService, this._initRefRange();
   }
-  _getIdWithUnitId(a, e, t) {
-    return `${a}_${e}_${t}`;
+  _getIdWithUnitId(unitID, subUnitId, ruleId) {
+    return `${unitID}_${subUnitId}_${ruleId}`;
   }
   // eslint-disable-next-line max-lines-per-function
-  registerFormula(a, e, t) {
-    var u;
-    const r = t.uid, i = this._getIdWithUnitId(a, e, r), o = (u = this._disposableMap.get(i)) != null ? u : /* @__PURE__ */ new Set(), n = (d, c) => {
-      const m = this._dataValidationModel.getRuleById(a, e, r);
-      if (!m)
+  registerFormula(unitId, subUnitId, rule) {
+    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: [] };
-      const _ = m[d];
-      if (!_ || _ === c)
+      const oldFormula = oldRule[type];
+      if (!oldFormula || oldFormula === formulaString)
         return { redos: [], undos: [] };
-      const g = {
-        unitId: a,
-        subUnitId: e,
-        ruleId: t.uid,
+      const redoParams = {
+        unitId,
+        subUnitId,
+        ruleId: rule.uid,
         payload: {
-          type: y.SETTING,
+          type: UpdateRuleType.SETTING,
           payload: {
-            type: m.type,
-            formula1: m.formula1,
-            formula2: m.formula2,
-            [d]: c
+            type: oldRule.type,
+            formula1: oldRule.formula1,
+            formula2: oldRule.formula2,
+            [type]: formulaString
           }
         },
         source: "patched"
-      }, R = {
-        unitId: a,
-        subUnitId: e,
-        ruleId: t.uid,
+      }, undoParams = {
+        unitId,
+        subUnitId,
+        ruleId: rule.uid,
         payload: {
-          type: y.SETTING,
+          type: UpdateRuleType.SETTING,
           payload: {
-            type: m.type,
-            formula1: m.formula1,
-            formula2: m.formula2
+            type: oldRule.type,
+            formula1: oldRule.formula1,
+            formula2: oldRule.formula2
           }
         },
         source: "patched"
-      }, M = [
+      }, redos = [
         {
-          id: E.id,
-          params: g
+          id: UpdateDataValidationMutation.id,
+          params: redoParams
         }
-      ], p = [
+      ], undos = [
         {
-          id: E.id,
-          params: R
+          id: UpdateDataValidationMutation.id,
+          params: undoParams
         }
       ];
-      return { redos: M, undos: p };
-    }, l = this._dataValidationFormulaService.getRuleFormulaInfo(a, e, r);
-    if (l) {
-      const [d, c] = l;
-      if (d) {
-        const m = this._formulaRefRangeService.registerFormula(
-          a,
-          e,
-          d.text,
-          (_) => n("formula1", _)
+      return { redos, undos };
+    }, "handleFormulaChange"), currentFormula = this._dataValidationFormulaService.getRuleFormulaInfo(unitId, subUnitId, ruleId);
+    if (currentFormula) {
+      const [formula1, formula2] = currentFormula;
+      if (formula1) {
+        const disposable = this._formulaRefRangeService.registerFormula(
+          unitId,
+          subUnitId,
+          formula1.text,
+          (newFormulaString) => handleFormulaChange("formula1", newFormulaString)
         );
-        o.add(() => m.dispose());
+        disposeSet.add(() => disposable.dispose());
       }
-      if (c) {
-        const m = this._formulaRefRangeService.registerFormula(
-          a,
-          e,
-          c.text,
-          (_) => n("formula2", _)
+      if (formula2) {
+        const disposable = this._formulaRefRangeService.registerFormula(
+          unitId,
+          subUnitId,
+          formula2.text,
+          (newFormulaString) => handleFormulaChange("formula2", newFormulaString)
         );
-        o.add(() => m.dispose());
+        disposeSet.add(() => disposable.dispose());
       }
     }
   }
-  register(a, e, t) {
-    var l;
-    const r = (u) => {
-      const d = [...t.ranges], m = d.map((g) => Pt(g, u)).filter((g) => !!g).flat();
-      if (rt(m, d))
+  register(unitId, subUnitId, rule) {
+    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))
         return { redos: [], undos: [] };
-      if (m.length) {
-        const g = {
-          unitId: a,
-          subUnitId: e,
-          ruleId: t.uid,
+      if (resultRanges.length) {
+        const redoParams = {
+          unitId,
+          subUnitId,
+          ruleId: rule.uid,
           payload: {
-            type: y.RANGE,
-            payload: m
+            type: UpdateRuleType.RANGE,
+            payload: resultRanges
           },
           source: "patched"
-        }, R = [{ id: E.id, params: g }], M = [{
-          id: E.id,
+        }, redos = [{ id: UpdateDataValidationMutation.id, params: redoParams }], undos = [{
+          id: UpdateDataValidationMutation.id,
           params: {
-            unitId: a,
-            subUnitId: e,
-            ruleId: t.uid,
+            unitId,
+            subUnitId,
+            ruleId: rule.uid,
             payload: {
-              type: y.RANGE,
-              payload: d
+              type: UpdateRuleType.RANGE,
+              payload: oldRanges
             },
             source: "patched"
           }
         }];
-        return { redos: R, undos: M };
+        return { redos, undos };
       } else {
-        const g = { unitId: a, subUnitId: e, ruleId: t.uid }, R = [{ id: A.id, params: g }], M = Ma(this._injector, g);
-        return { redos: R, undos: M };
+        const redoParams = { unitId, subUnitId, ruleId: rule.uid }, redos = [{ id: RemoveDataValidationMutation.id, params: redoParams }], undos = removeDataValidationUndoFactory(this._injector, redoParams);
+        return { redos, undos };
       }
-    }, i = [];
-    t.ranges.forEach((u) => {
-      const d = this._refRangeService.registerRefRange(u, r, a, e);
-      i.push(() => d.dispose());
+    }, "handleRangeChange"), disposeList = [];
+    rule.ranges.forEach((range) => {
+      const disposable = this._refRangeService.registerRefRange(range, handleRangeChange, unitId, subUnitId);
+      disposeList.push(() => disposable.dispose());
     });
-    const o = this._getIdWithUnitId(a, e, t.uid), n = (l = this._disposableMap.get(o)) != null ? l : /* @__PURE__ */ new Set();
-    n.add(() => i.forEach((u) => u())), this._disposableMap.set(o, n);
+    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() {
-    const a = this._dataValidationModel.getAll();
-    for (const [e, t] of a)
-      for (const [r, i] of t)
-        for (const o of i)
-          this.registerRule(e, r, o);
+    const allRules = this._dataValidationModel.getAll();
+    for (const [unitId, subUnitMap] of allRules)
+      for (const [subUnitId, rules] of subUnitMap)
+        for (const rule of rules)
+          this.registerRule(unitId, subUnitId, rule);
     this.disposeWithMe(
-      this._dataValidationModel.ruleChange$.subscribe((e) => {
-        const { unitId: t, subUnitId: r, rule: i } = e;
-        switch (e.type) {
+      this._dataValidationModel.ruleChange$.subscribe((option) => {
+        const { unitId, subUnitId, rule } = option;
+        switch (option.type) {
           case "add": {
-            const o = e.rule;
-            this.registerRule(e.unitId, e.subUnitId, o);
+            const rule2 = option.rule;
+            this.registerRule(option.unitId, option.subUnitId, rule2);
             break;
           }
           case "remove": {
-            const o = this._disposableMap.get(this._getIdWithUnitId(t, r, i.uid));
-            o && o.forEach((n) => n());
+            const disposeSet = this._disposableMap.get(this._getIdWithUnitId(unitId, subUnitId, rule.uid));
+            disposeSet && disposeSet.forEach((dispose) => dispose());
             break;
           }
           case "update": {
-            const o = e.rule, n = this._disposableMap.get(this._getIdWithUnitId(t, r, o.uid));
-            n && n.forEach((l) => l()), this.registerRule(e.unitId, e.subUnitId, o);
+            const rule2 = option.rule, disposeSet = this._disposableMap.get(this._getIdWithUnitId(unitId, subUnitId, rule2.uid));
+            disposeSet && disposeSet.forEach((dispose) => dispose()), this.registerRule(option.unitId, option.subUnitId, rule2);
             break;
           }
         }
       })
-    ), this.disposeWithMe(qe(() => {
-      this._disposableMap.forEach((e) => {
-        e.forEach((t) => t());
+    ), this.disposeWithMe(toDisposable(() => {
+      this._disposableMap.forEach((item) => {
+        item.forEach((dispose) => dispose());
       }), this._disposableMap.clear();
     }));
   }
-};
-Fe = Da([
-  ee(0, S(F)),
-  ee(1, S(Ge)),
-  ee(2, S(Ut)),
-  ee(3, S(X)),
-  ee(4, S(ut)),
-  ee(5, S(G))
-], Fe);
-var ba = Object.defineProperty, La = Object.getOwnPropertyDescriptor, xa = (s, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? La(a, e) : a, i = s.length - 1, o; i >= 0; i--)
-    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
-  return t && r && ba(a, e, r), r;
-}, We = (s, a) => (e, t) => a(e, t, s);
-let Ne = class extends $ {
-  constructor(s, a, e) {
-    super(), this._sheetInterceptorService = s, this._univerInstanceService = a, this._sheetDataValidationModel = e, this._initSheetChange();
+}, __name(_a7, "DataValidationRefRangeController"), _a7);
+DataValidationRefRangeController = __decorateClass$4([
+  __decorateParam$4(0, Inject(SheetDataValidationModel)),
+  __decorateParam$4(1, Inject(Injector)),
+  __decorateParam$4(2, Inject(RefRangeService)),
+  __decorateParam$4(3, Inject(DataValidationFormulaService)),
+  __decorateParam$4(4, Inject(FormulaRefRangeService)),
+  __decorateParam$4(5, Inject(DataValidatorRegistryService))
+], DataValidationRefRangeController);
+var __defProp$3 = Object.defineProperty, __getOwnPropDesc$3 = Object.getOwnPropertyDescriptor, __decorateClass$3 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  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"), _a8;
+let SheetDataValidationSheetController = (_a8 = class extends Disposable {
+  constructor(_sheetInterceptorService, _univerInstanceService, _sheetDataValidationModel) {
+    super(), this._sheetInterceptorService = _sheetInterceptorService, this._univerInstanceService = _univerInstanceService, this._sheetDataValidationModel = _sheetDataValidationModel, this._initSheetChange();
   }
   _initSheetChange() {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
-        getMutations: (s) => {
-          var a;
-          if (s.id === $t.id) {
-            const e = s.params, t = e.unitId || this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET).getUnitId(), r = this._univerInstanceService.getUniverSheetInstance(t);
-            if (!r)
+        getMutations: /* @__PURE__ */ __name((commandInfo) => {
+          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 i = e.subUnitId || ((a = r.getActiveSheet()) == null ? void 0 : a.getSheetId());
-            if (!i)
+            const subUnitId = params.subUnitId || ((_a12 = workbook.getActiveSheet()) == null ? void 0 : _a12.getSheetId());
+            if (!subUnitId)
               return { redos: [], undos: [] };
-            const o = this._sheetDataValidationModel.getRules(t, i);
-            if (o.length === 0)
+            const rules = this._sheetDataValidationModel.getRules(unitId, subUnitId);
+            if (rules.length === 0)
               return { redos: [], undos: [] };
-            const n = o.map((d) => d.uid), l = {
-              unitId: t,
-              subUnitId: i,
-              ruleId: n,
+            const ids = rules.map((i) => i.uid), redoParams = {
+              unitId,
+              subUnitId,
+              ruleId: ids,
               source: "patched"
-            }, u = {
-              unitId: t,
-              subUnitId: i,
-              rule: [...o],
+            }, undoParams = {
+              unitId,
+              subUnitId,
+              rule: [...rules],
               source: "patched"
             };
             return {
               redos: [{
-                id: A.id,
-                params: l
+                id: RemoveDataValidationMutation.id,
+                params: redoParams
               }],
               undos: [{
-                id: L.id,
-                params: u
+                id: AddDataValidationMutation.id,
+                params: undoParams
               }]
             };
           }
           return { redos: [], undos: [] };
-        }
+        }, "getMutations")
       })
     );
   }
-};
-Ne = xa([
-  We(0, S(ot)),
-  We(1, S(O)),
-  We(2, S(F))
-], Ne);
-class Ba extends k {
+}, __name(_a8, "SheetDataValidationSheetController"), _a8);
+SheetDataValidationSheetController = __decorateClass$3([
+  __decorateParam$3(0, Inject(SheetInterceptorService)),
+  __decorateParam$3(1, Inject(IUniverInstanceService)),
+  __decorateParam$3(2, Inject(SheetDataValidationModel))
+], SheetDataValidationSheetController);
+const _AnyValidator = class _AnyValidator extends BaseDataValidator {
   constructor() {
     super(...arguments);
-    f(this, "id", T.ANY);
-    f(this, "title", "dataValidation.any.title");
-    f(this, "operators", []);
-    f(this, "scopes", ["sheet"]);
-    f(this, "offsetFormulaByRange", !1);
+    __publicField(this, "id", DataValidationType.ANY);
+    __publicField(this, "title", "dataValidation.any.title");
+    __publicField(this, "operators", []);
+    __publicField(this, "scopes", ["sheet"]);
+    __publicField(this, "offsetFormulaByRange", !1);
   }
-  async parseFormula(e, t, r) {
+  async parseFormula(rule, unitId, subUnitId) {
     return {
-      formula1: e.formula1,
-      formula2: e.formula2,
+      formula1: rule.formula1,
+      formula2: rule.formula2,
       isFormulaValid: !0
     };
   }
-  validatorFormula(e, t, r) {
+  validatorFormula(rule, unitId, subUnitId) {
     return {
       success: !0
     };
   }
-  async isValidType(e, t, r) {
+  async isValidType(cellInfo, formula, rule) {
     return !0;
   }
-  generateRuleErrorMessage(e) {
+  generateRuleErrorMessage(rule) {
     return this.localeService.t("dataValidation.any.error");
   }
-}
-class Ua extends k {
+};
+__name(_AnyValidator, "AnyValidator");
+let AnyValidator = _AnyValidator;
+const _CustomFormulaValidator = class _CustomFormulaValidator extends BaseDataValidator {
   constructor() {
     super(...arguments);
-    f(this, "id", T.CUSTOM);
-    f(this, "title", "dataValidation.custom.title");
-    f(this, "operators", []);
-    f(this, "scopes", ["sheet"]);
-    f(this, "_customFormulaService", this.injector.get(P));
-  }
-  validatorFormula(e, t, r) {
-    const i = v(e.formula1);
+    __publicField(this, "id", DataValidationType.CUSTOM);
+    __publicField(this, "title", "dataValidation.custom.title");
+    __publicField(this, "operators", []);
+    __publicField(this, "scopes", ["sheet"]);
+    __publicField(this, "_customFormulaService", this.injector.get(DataValidationCustomFormulaService));
+    __publicField(this, "_lexerTreeBuilder", this.injector.get(LexerTreeBuilder));
+  }
+  validatorFormula(rule, unitId, subUnitId) {
+    var _a12;
+    const success = isFormulaString(rule.formula1), formulaText = (_a12 = rule.formula1) != null ? _a12 : "", valid = this._lexerTreeBuilder.checkIfAddBracket(formulaText) === 0 && formulaText.startsWith(operatorToken.EQUALS);
     return {
-      success: i,
-      formula1: i ? "" : this.localeService.t("dataValidation.validFail.formula")
+      success: success && valid,
+      formula1: success && valid ? "" : this.localeService.t("dataValidation.validFail.formula")
     };
   }
-  async parseFormula(e, t, r) {
+  async parseFormula(_rule, _unitId, _subUnitId) {
     return {
       formula1: void 0,
       formula2: void 0,
       isFormulaValid: !0
     };
   }
-  async isValidType(e, t, r) {
-    const { column: i, row: o, unitId: n, subUnitId: l } = e, u = await this._customFormulaService.getCellFormulaValue(n, l, r.uid, o, i), d = u == null ? void 0 : u.v;
-    return C(String(d)) && V.isDefine(d) && d !== "" ? u.t === Tt.BOOLEAN ? !!d : typeof d == "boolean" ? d : typeof d == "number" ? !!d : typeof d == "string" ? C(d) : !!d : !1;
+  async isValidType(cellInfo, _formula, _rule) {
+    const { column, row, unitId, subUnitId } = cellInfo, cellData = await this._customFormulaService.getCellFormulaValue(unitId, subUnitId, _rule.uid, row, column), formulaResult = cellData == null ? void 0 : cellData.v;
+    return isLegalFormulaResult(String(formulaResult)) && 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(e) {
+  generateRuleErrorMessage(rule) {
     return this.localeService.t("dataValidation.custom.error");
   }
-  generateRuleName(e) {
-    var t;
-    return this.localeService.t("dataValidation.custom.ruleName").replace("{FORMULA1}", (t = e.formula1) != null ? t : "");
+  generateRuleName(rule) {
+    var _a12;
+    return this.localeService.t("dataValidation.custom.ruleName").replace("{FORMULA1}", (_a12 = rule.formula1) != null ? _a12 : "");
   }
-}
-class Pa extends mt {
+};
+__name(_CustomFormulaValidator, "CustomFormulaValidator");
+let CustomFormulaValidator = _CustomFormulaValidator;
+const _ListMultipleValidator = class _ListMultipleValidator extends ListValidator {
   constructor() {
     super(...arguments);
-    f(this, "id", T.LIST_MULTIPLE);
-    f(this, "title", "dataValidation.listMultiple.title");
-    f(this, "offsetFormulaByRange", !1);
-    f(this, "skipDefaultFontRender", () => !0);
+    __publicField(this, "id", DataValidationType.LIST_MULTIPLE);
+    __publicField(this, "title", "dataValidation.listMultiple.title");
+    __publicField(this, "offsetFormulaByRange", !1);
+    __publicField(this, "skipDefaultFontRender", /* @__PURE__ */ __name(() => !0, "skipDefaultFontRender"));
   }
-}
-class $a extends k {
+};
+__name(_ListMultipleValidator, "ListMultipleValidator");
+let ListMultipleValidator = _ListMultipleValidator;
+const _WholeValidator = class _WholeValidator extends BaseDataValidator {
   constructor() {
     super(...arguments);
-    f(this, "_customFormulaService", this.injector.get(P));
-    f(this, "_lexerTreeBuilder", this.injector.get(Z));
-    f(this, "id", T.WHOLE);
-    f(this, "title", "dataValidation.whole.title");
-    f(this, "operators", [
-      h.BETWEEN,
-      h.EQUAL,
-      h.GREATER_THAN,
-      h.GREATER_THAN_OR_EQUAL,
-      h.LESS_THAN,
-      h.LESS_THAN_OR_EQUAL,
-      h.NOT_BETWEEN,
-      h.NOT_EQUAL
+    __publicField(this, "_customFormulaService", this.injector.get(DataValidationCustomFormulaService));
+    __publicField(this, "_lexerTreeBuilder", this.injector.get(LexerTreeBuilder));
+    __publicField(this, "id", DataValidationType.WHOLE);
+    __publicField(this, "title", "dataValidation.whole.title");
+    __publicField(this, "operators", [
+      DataValidationOperator.BETWEEN,
+      DataValidationOperator.EQUAL,
+      DataValidationOperator.GREATER_THAN,
+      DataValidationOperator.GREATER_THAN_OR_EQUAL,
+      DataValidationOperator.LESS_THAN,
+      DataValidationOperator.LESS_THAN_OR_EQUAL,
+      DataValidationOperator.NOT_BETWEEN,
+      DataValidationOperator.NOT_EQUAL
     ]);
-    f(this, "scopes", ["sheet"]);
+    __publicField(this, "scopes", ["sheet"]);
   }
-  _isFormulaOrInt(e) {
-    return !V.isBlank(e) && (v(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+  _isFormulaOrInt(formula) {
+    return !Tools.isBlank(formula) && (isFormulaString(formula) || !Number.isNaN(+formula) && Number.isInteger(+formula));
   }
-  async isValidType(e, t, r) {
-    const { value: i } = e, o = ye(i);
-    return !Number.isNaN(o) && Number.isInteger(o);
+  async isValidType(cellInfo, _formula, _rule) {
+    const { value: cellValue } = cellInfo, num = getCellValueNumber(cellValue);
+    return !Number.isNaN(num) && Number.isInteger(num);
   }
-  transform(e, t, r) {
-    const { value: i } = e;
+  transform(cellInfo, _formula, _rule) {
+    const { value: cellValue } = cellInfo;
     return {
-      ...e,
-      value: ye(i)
+      ...cellInfo,
+      value: getCellValueNumber(cellValue)
     };
   }
-  _parseNumber(e) {
-    return e == null ? Number.NaN : +e;
+  _parseNumber(formula) {
+    return formula == null ? Number.NaN : +formula;
   }
-  async parseFormula(e, t, r, i, o) {
-    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, o), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, o), { formula1: u, formula2: d } = e, c = v(u) ? n == null ? void 0 : n.v : u, m = v(d) ? l == null ? void 0 : l.v : d, _ = C(`${c}`) && C(`${m}`);
+  async parseFormula(rule, unitId, subUnitId, row, column) {
+    const res1 = await this._customFormulaService.getCellFormulaValue(unitId, subUnitId, rule.uid, row, column), res2 = await this._customFormulaService.getCellFormula2Value(unitId, subUnitId, rule.uid, row, column), { formula1, formula2 } = rule, formula1Result = isFormulaString(formula1) ? res1 == null ? void 0 : res1.v : formula1, formula2Result = isFormulaString(formula2) ? res2 == null ? void 0 : res2.v : formula2, isFormulaValid = isLegalFormulaResult(`${formula1Result}`) && isLegalFormulaResult(`${formula2Result}`);
     return {
-      formula1: this._parseNumber(c),
-      formula2: this._parseNumber(m),
-      isFormulaValid: _
+      formula1: this._parseNumber(formula1Result),
+      formula2: this._parseNumber(formula2Result),
+      isFormulaValid
     };
   }
-  validatorFormula(e, t, r) {
-    const i = e.operator;
-    if (!i)
+  validatorFormula(rule, _unitId, _subUnitId) {
+    const operator = rule.operator;
+    if (!operator)
       return {
         success: !1
       };
-    const o = V.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Ae.includes(i), u = this.localeService.t("dataValidation.validFail.number");
-    return l ? {
-      success: o && n,
-      formula1: o ? void 0 : u,
-      formula2: n ? void 0 : u
+    const formula1Success = Tools.isDefine(rule.formula1) && this._isFormulaOrInt(rule.formula1), formula2Success = Tools.isDefine(rule.formula2) && this._isFormulaOrInt(rule.formula2), isTwoFormula = TWO_FORMULA_OPERATOR_COUNT.includes(operator), errorMsg = this.localeService.t("dataValidation.validFail.number");
+    return isTwoFormula ? {
+      success: formula1Success && formula2Success,
+      formula1: formula1Success ? void 0 : errorMsg,
+      formula2: formula2Success ? void 0 : errorMsg
     } : {
-      success: o,
-      formula1: u
+      success: formula1Success,
+      formula1: errorMsg
     };
   }
-  generateRuleErrorMessage(e, t) {
-    if (!e.operator)
+  generateRuleErrorMessage(rule, position) {
+    if (!rule.operator)
       return this.titleStr;
-    const { transformedFormula1: r, transformedFormula2: i } = De(this._lexerTreeBuilder, e, t);
-    return `${this.localeService.t(ht[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
+    const { transformedFormula1, transformedFormula2 } = getTransformedFormula(this._lexerTreeBuilder, rule, position);
+    return `${this.localeService.t(OperatorErrorTitleMap[rule.operator]).replace(FORMULA1, transformedFormula1 != null ? transformedFormula1 : "").replace(FORMULA2, transformedFormula2 != null ? transformedFormula2 : "")}`;
   }
-}
-var Ha = Object.defineProperty, Wa = Object.getOwnPropertyDescriptor, ja = (s, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Wa(a, e) : a, i = s.length - 1, o; i >= 0; i--)
-    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
-  return t && r && Ha(a, e, r), r;
-}, te = (s, a) => (e, t) => a(e, t, s);
-let Ce = class extends Ft {
-  constructor(s, a, e, t, r, i) {
-    super(), this._univerInstanceService = s, this._dataValidatorRegistryService = a, this._injector = e, this._selectionManagerService = t, this._sheetInterceptorService = r, this._sheetDataValidationModel = i, this._init();
+};
+__name(_WholeValidator, "WholeValidator");
+let WholeValidator = _WholeValidator;
+var __defProp$2 = Object.defineProperty, __getOwnPropDesc$2 = Object.getOwnPropertyDescriptor, __decorateClass$2 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  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"), _a9;
+let DataValidationController = (_a9 = 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();
   }
   _init() {
     this._registerValidators(), this._initCommandInterceptor();
   }
   _registerValidators() {
     [
-      Ba,
-      ca,
-      $a,
-      ga,
-      da,
-      oa,
-      mt,
-      Pa,
-      Ua
-    ].forEach((s) => {
-      const a = this._injector.createInstance(s);
-      this.disposeWithMe(this._dataValidatorRegistryService.register(a)), this.disposeWithMe(qe(() => this._injector.delete(s)));
+      AnyValidator,
+      DecimalValidator,
+      WholeValidator,
+      TextLengthValidator,
+      DateValidator,
+      CheckboxValidator,
+      ListValidator,
+      ListMultipleValidator,
+      CustomFormulaValidator
+    ].forEach((Validator) => {
+      const validator = this._injector.createInstance(Validator);
+      this.disposeWithMe(this._dataValidatorRegistryService.register(validator)), this.disposeWithMe(toDisposable(() => this._injector.delete(Validator)));
     });
   }
   _initCommandInterceptor() {
     this._sheetInterceptorService.interceptCommand({
-      getMutations: (s) => {
-        var a;
-        if (s.id === Ht.id) {
-          const e = this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET), t = e.getUnitId(), r = e.getActiveSheet();
-          if (!r)
+      getMutations: /* @__PURE__ */ __name((commandInfo) => {
+        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 i = r.getSheetId(), o = (a = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : a.map((c) => c.range), n = this._sheetDataValidationModel.getRuleObjectMatrix(t, i).clone();
-          o && n.removeRange(o);
-          const l = n.diff(this._sheetDataValidationModel.getRules(t, i)), { redoMutations: u, undoMutations: d } = be(t, i, l, this._injector, "patched");
+          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 {
-            undos: d,
-            redos: u
+            undos: undoMutations,
+            redos: redoMutations
           };
         }
         return {
           undos: [],
           redos: []
         };
-      }
+      }, "getMutations")
     });
   }
-};
-Ce = ja([
-  te(0, O),
-  te(1, S(G)),
-  te(2, S(Ge)),
-  te(3, S(nt)),
-  te(4, S(ot)),
-  te(5, S(F))
-], Ce);
-var Qa = Object.defineProperty, qa = Object.getOwnPropertyDescriptor, Ga = (s, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? qa(a, e) : a, i = s.length - 1, o; i >= 0; i--)
-    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
-  return t && r && Qa(a, e, r), r;
-}, Re = (s, a) => (e, t) => a(e, t, s);
-let Oe = class extends $ {
-  constructor(s, a, e, t) {
-    super(), this._univerInstanceService = s, this._sheetDataValidationModel = a, this._dataValidationCacheService = e, this._lifecycleService = t, this._initRecalculate();
+}, __name(_a9, "DataValidationController"), _a9);
+DataValidationController = __decorateClass$2([
+  __decorateParam$2(0, IUniverInstanceService),
+  __decorateParam$2(1, Inject(DataValidatorRegistryService)),
+  __decorateParam$2(2, Inject(Injector)),
+  __decorateParam$2(3, Inject(SheetsSelectionsService)),
+  __decorateParam$2(4, Inject(SheetInterceptorService)),
+  __decorateParam$2(5, Inject(SheetDataValidationModel))
+], DataValidationController);
+var __defProp$1 = Object.defineProperty, __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor, __decorateClass$1 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$1(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$1(target, key, result), result;
+}, "__decorateClass$1"), __decorateParam$1 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$1"), _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 s = (a) => {
-      if (a.length === 0)
+    const handleDirtyRanges = /* @__PURE__ */ __name((ranges) => {
+      if (ranges.length === 0)
         return;
-      const e = this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET), t = e == null ? void 0 : e.getActiveSheet(), r = {};
-      a.flat().forEach((i) => {
-        r[i.unitId] || (r[i.unitId] = {}), r[i.unitId][i.subUnitId] || (r[i.unitId][i.subUnitId] = []);
-        const o = this._univerInstanceService.getUnit(i.unitId, N.UNIVER_SHEET), n = o == null ? void 0 : o.getSheetBySheetId(i.subUnitId);
-        n && r[i.unitId][i.subUnitId].push(...i.ranges.map((l) => b.transformRange(l, n)));
-      }), Object.entries(r).forEach(([i, o]) => {
-        Object.entries(o).forEach(([n, l]) => {
-          (e == null ? void 0 : e.getUnitId()) === i && (t == null ? void 0 : t.getSheetId()) === n ? this.validatorRanges(i, n, l) : requestIdleCallback(() => {
-            this.validatorRanges(i, n, l);
+      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);
           });
         });
       });
-    };
-    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Wt(() => this._lifecycleService.lifecycle$.pipe(Ze((a) => a === ze.Rendered)))).subscribe(s)), this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Ze(() => this._lifecycleService.stage >= ze.Rendered), Ct(20)).subscribe(s));
-  }
-  async _validatorByCell(s, a, e, t) {
-    const r = s.getUnitId(), i = a.getSheetId();
-    if (!V.isDefine(e) || !V.isDefine(t))
-      throw new Error(`row or col is not defined, row: ${e}, col: ${t}`);
-    const o = this._sheetDataValidationModel.getRuleByLocation(r, i, e, t);
-    return o ? new Promise((n) => {
-      this._sheetDataValidationModel.validator(o, { unitId: r, subUnitId: i, row: e, col: t, worksheet: a, workbook: s }, (l) => {
-        n(l);
+    }, "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 _validatorByCell(workbook, worksheet, row, col) {
+    const unitId = workbook.getUnitId(), subUnitId = worksheet.getSheetId();
+    if (!Tools.isDefine(row) || !Tools.isDefine(col))
+      throw new Error(`row or col is not defined, row: ${row}, col: ${col}`);
+    const rule = this._sheetDataValidationModel.getRuleByLocation(unitId, subUnitId, row, col);
+    return rule ? new Promise((resolve) => {
+      this._sheetDataValidationModel.validator(rule, { unitId, subUnitId, row, col, worksheet, workbook }, (status) => {
+        resolve(status);
       });
-    }) : D.VALID;
-  }
-  async validatorCell(s, a, e, t) {
-    const r = this._univerInstanceService.getUnit(s, N.UNIVER_SHEET);
-    if (!r)
-      throw new Error(`cannot find current workbook, unitId: ${s}`);
-    const i = r.getSheetBySheetId(a);
-    if (!i)
-      throw new Error(`cannot find current worksheet, sheetId: ${a}`);
-    return this._validatorByCell(r, i, e, t);
-  }
-  validatorRanges(s, a, e) {
-    if (!e.length)
+    }) : DataValidationStatus.VALID;
+  }
+  async validatorCell(unitId, subUnitId, row, col) {
+    const workbook = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
+    if (!workbook)
+      throw new Error(`cannot find current workbook, unitId: ${unitId}`);
+    const worksheet = workbook.getSheetBySheetId(subUnitId);
+    if (!worksheet)
+      throw new Error(`cannot find current worksheet, sheetId: ${subUnitId}`);
+    return this._validatorByCell(workbook, worksheet, row, col);
+  }
+  validatorRanges(unitId, subUnitId, ranges) {
+    if (!ranges.length)
       return Promise.resolve([]);
-    const t = this._univerInstanceService.getUnit(s, N.UNIVER_SHEET);
-    if (!t)
-      throw new Error(`cannot find current workbook, unitId: ${s}`);
-    const r = t.getSheetBySheetId(a);
-    if (!r)
-      throw new Error(`cannot find current worksheet, sheetId: ${a}`);
-    return Promise.all(e.map((i) => {
-      const o = [];
-      return b.foreach(i, (n, l) => {
-        o.push(this._validatorByCell(t, r, n, l));
-      }), o;
+    const workbook = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
+    if (!workbook)
+      throw new Error(`cannot find current workbook, unitId: ${unitId}`);
+    const worksheet = workbook.getSheetBySheetId(subUnitId);
+    if (!worksheet)
+      throw new Error(`cannot find current worksheet, sheetId: ${subUnitId}`);
+    return Promise.all(ranges.map((range) => {
+      const promises = [];
+      return Range.foreach(range, (row, col) => {
+        promises.push(this._validatorByCell(workbook, worksheet, row, col));
+      }), Promise.all(promises);
     }));
   }
-  async validatorWorksheet(s, a) {
-    const e = this._univerInstanceService.getUnit(s, N.UNIVER_SHEET);
-    if (!e)
-      throw new Error(`cannot find current workbook, unitId: ${s}`);
-    const t = e.getSheetBySheetId(a);
-    if (!t)
-      throw new Error(`cannot find current worksheet, sheetId: ${a}`);
-    const r = this._sheetDataValidationModel.getRules(s, a);
-    return await Promise.all(r.map((i) => Promise.all(i.ranges.map((o) => {
-      const n = [];
-      return b.foreach(o, (l, u) => {
-        n.push(this._validatorByCell(e, t, l, u));
-      }), n;
-    })))), this._dataValidationCacheService.ensureCache(s, a);
-  }
-  async validatorWorkbook(s) {
-    const a = this._sheetDataValidationModel.getSubUnitIds(s), e = await Promise.all(a.map((r) => this.validatorWorksheet(s, r))), t = {};
-    return e.forEach((r, i) => {
-      t[a[i]] = r;
-    }), t;
-  }
-  getDataValidations(s, a, e) {
-    const t = this._sheetDataValidationModel.getRuleObjectMatrix(s, a), r = /* @__PURE__ */ new Set();
-    return e.forEach((o) => {
-      b.foreach(o, (n, l) => {
-        const u = t.getValue(n, l);
-        u && r.add(u);
+  async validatorWorksheet(unitId, subUnitId) {
+    const workbook = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
+    if (!workbook)
+      throw new Error(`cannot find current workbook, unitId: ${unitId}`);
+    const worksheet = workbook.getSheetBySheetId(subUnitId);
+    if (!worksheet)
+      throw new Error(`cannot find current worksheet, sheetId: ${subUnitId}`);
+    const rules = this._sheetDataValidationModel.getRules(unitId, subUnitId);
+    return await Promise.all(rules.map((rule) => Promise.all(rule.ranges.map((range) => {
+      const promises = [];
+      return Range.foreach(range, (row, col) => {
+        promises.push(this._validatorByCell(workbook, worksheet, row, col));
+      }), promises;
+    })))), this._dataValidationCacheService.ensureCache(unitId, subUnitId);
+  }
+  async validatorWorkbook(unitId) {
+    const sheetIds = this._sheetDataValidationModel.getSubUnitIds(unitId), results = await Promise.all(sheetIds.map((id) => this.validatorWorksheet(unitId, id))), map = {};
+    return results.forEach((result, i) => {
+      map[sheetIds[i]] = result;
+    }), map;
+  }
+  getDataValidations(unitId, subUnitId, ranges) {
+    const ruleMatrix = this._sheetDataValidationModel.getRuleObjectMatrix(unitId, subUnitId), ruleIdSet = /* @__PURE__ */ new Set();
+    return ranges.forEach((range) => {
+      Range.foreach(range, (row, col) => {
+        const ruleId = ruleMatrix.getValue(row, col);
+        ruleId && ruleIdSet.add(ruleId);
       });
-    }), Array.from(r).map((o) => this._sheetDataValidationModel.getRuleById(s, a, o)).filter(Boolean);
-  }
-  getDataValidation(s, a, e) {
-    return this.getDataValidations(s, a, e)[0];
-  }
-};
-Oe = Ga([
-  Re(0, O),
-  Re(1, S(F)),
-  Re(2, S(q)),
-  Re(3, S(Nt))
-], Oe);
-var _t = Object.defineProperty, ka = Object.getOwnPropertyDescriptor, Ya = (s, a, e) => a in s ? _t(s, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[a] = e, Xa = (s, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? ka(a, e) : a, i = s.length - 1, o; i >= 0; i--)
-    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
-  return t && r && _t(a, e, r), r;
-}, je = (s, a) => (e, t) => a(e, t, s), pt = (s, a, e) => Ya(s, typeof a != "symbol" ? a + "" : a, e);
-let we = class extends wt {
-  constructor(s = tt, a, e, t) {
-    super(), this._config = s, this._injector = a, this._commandService = e, this._configService = t;
-    const { ...r } = It(
+    }), Array.from(ruleIdSet).map((id) => this._sheetDataValidationModel.getRuleById(unitId, subUnitId, id)).filter(Boolean);
+  }
+  getDataValidation(unitId, subUnitId, ranges) {
+    return this.getDataValidations(unitId, subUnitId, ranges)[0];
+  }
+}, __name(_a10, "SheetsDataValidationValidatorService"), _a10);
+SheetsDataValidationValidatorService = __decorateClass$1([
+  __decorateParam$1(0, IUniverInstanceService),
+  __decorateParam$1(1, Inject(SheetDataValidationModel)),
+  __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"), _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 } = merge(
       {},
-      tt,
+      defaultPluginConfig,
       this._config
     );
-    this._configService.setConfig(Ea, r);
+    this._configService.setConfig(SHEETS_DATA_VALIDATION_PLUGIN_CONFIG_KEY, rest);
   }
   onStarting() {
     [
-      [q],
-      [X],
-      [P],
-      [Oe],
-      [F],
-      [Ce],
-      [Te],
-      [Ne],
-      [Fe],
-      [Ee]
-    ].forEach((s) => {
-      this._injector.add(s);
+      [DataValidationCacheService],
+      [DataValidationFormulaService],
+      [DataValidationCustomFormulaService],
+      [SheetsDataValidationValidatorService],
+      [SheetDataValidationModel],
+      [DataValidationController],
+      [DataValidationFormulaController],
+      [SheetDataValidationSheetController],
+      [DataValidationRefRangeController],
+      [DataValidationFormulaRefRangeController]
+    ].forEach((dep) => {
+      this._injector.add(dep);
     }), [
-      pa,
-      _a,
-      Ra,
-      Sa,
-      ya,
-      Va,
-      va
-    ].forEach((s) => {
-      this._commandService.registerCommand(s);
-    }), this._injector.get(q), this._injector.get(Oe), this._injector.get(Ee), this._injector.get(Fe);
+      AddSheetDataValidationCommand,
+      UpdateSheetDataValidationRangeCommand,
+      UpdateSheetDataValidationSettingCommand,
+      UpdateSheetDataValidationOptionsCommand,
+      RemoveSheetDataValidationCommand,
+      RemoveSheetAllDataValidationCommand,
+      ClearRangeDataValidationCommand
+    ].forEach((command) => {
+      this._commandService.registerCommand(command);
+    }), this._injector.get(DataValidationCacheService), this._injector.get(SheetsDataValidationValidatorService), this._injector.get(DataValidationFormulaRefRangeController), this._injector.get(DataValidationRefRangeController);
   }
   onReady() {
-    this._injector.get(Ne);
+    this._injector.get(SheetDataValidationSheetController);
   }
   onRendered() {
-    this._injector.get(Ce), this._injector.get(Te);
-  }
-};
-pt(we, "pluginName", kt);
-pt(we, "type", N.UNIVER_SHEET);
-we = Xa([
-  Ot(xt),
-  je(1, S(Ge)),
-  je(2, x),
-  je(3, At)
-], we);
-function sr(s) {
-  const e = s.get(nt).getCurrentSelections().map((i) => i.range);
+    this._injector.get(DataValidationController), this._injector.get(DataValidationFormulaController);
+  }
+}, __name(_a11, "UniverSheetsDataValidationPlugin"), _a11);
+__publicField2(UniverSheetsDataValidationPlugin, "pluginName", DATA_VALIDATION_PLUGIN_NAME);
+__publicField2(UniverSheetsDataValidationPlugin, "type", UniverInstanceType.UNIVER_SHEET);
+UniverSheetsDataValidationPlugin = __decorateClass([
+  DependentOn(UniverDataValidationPlugin),
+  __decorateParam(1, Inject(Injector)),
+  __decorateParam(2, ICommandService),
+  __decorateParam(3, IConfigService)
+], UniverSheetsDataValidationPlugin);
+function createDefaultNewRule(accessor) {
+  const currentRanges = accessor.get(SheetsSelectionsService).getCurrentSelections().map((s) => s.range);
   return {
-    uid: V.generateRandomId(6),
-    type: T.DECIMAL,
-    operator: h.EQUAL,
+    uid: Tools.generateRandomId(6),
+    type: DataValidationType.DECIMAL,
+    operator: DataValidationOperator.EQUAL,
     formula1: "100",
-    ranges: e != null ? e : [{ startColumn: 0, endColumn: 0, startRow: 0, endRow: 0 }]
+    ranges: currentRanges != null ? currentRanges : [{ startColumn: 0, endColumn: 0, startRow: 0, endRow: 0 }]
   };
 }
+__name(createDefaultNewRule, "createDefaultNewRule");
 export {
-  pa as AddSheetDataValidationCommand,
-  Ve as CHECKBOX_FORMULA_1,
-  Me as CHECKBOX_FORMULA_2,
-  oa as CheckboxValidator,
-  va as ClearRangeDataValidationCommand,
-  kt as DATA_VALIDATION_PLUGIN_NAME,
-  q as DataValidationCacheService,
-  P as DataValidationCustomFormulaService,
-  Te as DataValidationFormulaController,
-  X as DataValidationFormulaService,
-  da as DateValidator,
-  Pa as ListMultipleValidator,
-  mt as ListValidator,
-  Va as RemoveSheetAllDataValidationCommand,
-  ya as RemoveSheetDataValidationCommand,
-  F as SheetDataValidationModel,
-  Oe as SheetsDataValidationValidatorService,
-  we as UniverSheetsDataValidationPlugin,
-  Sa as UpdateSheetDataValidationOptionsCommand,
-  _a as UpdateSheetDataValidationRangeCommand,
-  Ra as UpdateSheetDataValidationSettingCommand,
-  sr as createDefaultNewRule,
-  pe as deserializeListOptions,
-  ne as getCellValueOrigin,
-  ir as getDataValidationCellValue,
-  be as getDataValidationDiffMutations,
-  ge as getFormulaCellData,
-  se as getFormulaResult,
-  C as isLegalFormulaResult,
-  rr as serializeListOptions,
-  _e as transformCheckboxValue
+  AddSheetDataValidationCommand,
+  CHECKBOX_FORMULA_1,
+  CHECKBOX_FORMULA_2,
+  CheckboxValidator,
+  ClearRangeDataValidationCommand,
+  DATA_VALIDATION_PLUGIN_NAME,
+  DataValidationCacheService,
+  DataValidationCustomFormulaService,
+  DataValidationFormulaController,
+  DataValidationFormulaService,
+  DateValidator,
+  ListMultipleValidator,
+  ListValidator,
+  RemoveSheetAllDataValidationCommand,
+  RemoveSheetDataValidationCommand,
+  SheetDataValidationModel,
+  SheetsDataValidationValidatorService,
+  UniverSheetsDataValidationPlugin,
+  UpdateSheetDataValidationOptionsCommand,
+  UpdateSheetDataValidationRangeCommand,
+  UpdateSheetDataValidationSettingCommand,
+  createDefaultNewRule,
+  deserializeListOptions,
+  getCellValueOrigin,
+  getDataValidationCellValue,
+  getDataValidationDiffMutations,
+  getFormulaCellData,
+  getFormulaResult,
+  isLegalFormulaResult,
+  serializeListOptions,
+  transformCheckboxValue
 };