@univerjs/sheets-data-validation 0.5.0 → 0.5.1-nightly.202412011605

package/lib/es/index.js

@@ -1,834 +1,448 @@
-var Vt = Object.defineProperty;
-var Nt = (o, t, e) => t in o ? Vt(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e;
-var f = (o, t, e) => Nt(o, typeof t != "symbol" ? t + "" : t, e);
-import { Inject as R, ICommandService as P, Disposable as $, ObjectMatrix as ve, Range as A, DataValidationType as M, UniverInstanceType as C, isFormulaString as S, IUniverInstanceService as O, getOriginCellValue as Mt, debounce as yt, Rectangle as b, Tools as N, DataValidationStatus as x, WrapStrategy as ge, DataValidationOperator as h, numfmt as k, dayjs as at, DataValidationRenderMode as Le, CommandType as K, IUndoRedoService as z, sequenceExecute as Ce, isRangesEqual as it, CellValueType as Et, Injector as ke, RxDisposable as wt, toDisposable as je, IPermissionService as Tt, generateRandomId as Ft, LifecycleService as Ct, LifecycleStages as Je, bufferDebounceTime as It, DependentOn as Ot, Plugin as bt, IConfigService as At } from "@univerjs/core";
-import { DataValidationModel as qe, DataValidatorRegistryService as Ge, UpdateRuleType as T, BaseDataValidator as q, TextLengthErrorTitleMap as Dt, AddDataValidationMutation as B, RemoveDataValidationMutation as D, UpdateDataValidationMutation as I, getRuleSetting as Lt, getRuleOptions as xt, UniverDataValidationPlugin as Bt } from "@univerjs/data-validation";
-import { SetRangeValuesMutation as ae, RemoveSheetMutation as Ut, getSheetCommandTarget as Qe, SetRangeValuesUndoMutationFactory as st, SheetsSelectionsService as ot, SheetInterceptorService as nt, ClearSelectionAllCommand as Pt, WorksheetViewPermission as $t, RefRangeService as Ht, handleCommonDefaultRangeChangeWithEffectRefCommands as Wt, RemoveSheetCommand as kt } from "@univerjs/sheets";
-import { Subject as He, bufferWhen as jt, filter as et } from "rxjs";
-import { RegisterOtherFormulaService as lt, FormulaRefRangeService as ut } from "@univerjs/sheets-formula";
-import { ERROR_TYPE_SET as qt, LexerTreeBuilder as Z, isReferenceString as ct, sequenceNodeType as Gt, deserializeRangeWithSheet as Qt, deserializeRangeWithSheetWithCache as Yt } from "@univerjs/engine-formula";
-const Xt = "SHEET_DATA_VALIDATION_PLUGIN";
-var Kt = Object.defineProperty, zt = Object.getOwnPropertyDescriptor, Zt = (o, t, e, r) => {
-  for (var a = r > 1 ? void 0 : r ? zt(t, e) : t, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (a = (r ? s(t, e, a) : s(a)) || a);
-  return r && a && Kt(t, e, a), a;
-}, Jt = (o, t) => (e, r) => t(e, r, o);
-let j = class extends $ {
-  constructor(t) {
+var vt = Object.defineProperty;
+var Rt = (o, a, e) => a in o ? vt(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e;
+var g = (o, a, e) => Rt(o, typeof a != "symbol" ? a + "" : a, e);
+import { Inject as R, ICommandService as x, IUniverInstanceService as O, Disposable as P, ObjectMatrix as fe, UniverInstanceType as N, Range as b, isFormulaString as S, DataValidationType as T, getOriginCellValue as St, RBush as Vt, debounce as Mt, Rectangle as A, Tools as V, DataValidationStatus as D, WrapStrategy as pe, DataValidationOperator as h, numfmt as W, dayjs as et, DataValidationRenderMode as be, CommandType as Y, IUndoRedoService as X, sequenceExecute as Ce, isRangesEqual as tt, generateRandomId as yt, toDisposable as We, IPermissionService as Et, Injector as je, CellValueType as Tt, RxDisposable as Ft, LifecycleService as Nt, LifecycleStages as Ke, bufferDebounceTime as Ct, DependentOn as Ot, Plugin as wt, IConfigService as It } from "@univerjs/core";
+import { DataValidationModel as Qe, DataValidatorRegistryService as Q, UpdateRuleType as y, BaseDataValidator as q, TextLengthErrorTitleMap as At, AddDataValidationMutation as L, RemoveDataValidationMutation as I, UpdateDataValidationMutation as E, getRuleSetting as Dt, getRuleOptions as bt, UniverDataValidationPlugin as Lt } from "@univerjs/data-validation";
+import { SetRangeValuesMutation as ie, RemoveSheetMutation as at, getSheetCommandTarget as qe, SetRangeValuesUndoMutationFactory as rt, WorksheetViewPermission as xt, RefRangeService as Bt, handleCommonDefaultRangeChangeWithEffectRefCommands as Ut, SheetInterceptorService as it, RemoveSheetCommand as Pt, SheetsSelectionsService as ot, ClearSelectionAllCommand as $t } from "@univerjs/sheets";
+import { Subject as He, bufferWhen as Ht, filter as ze } from "rxjs";
+import { RegisterOtherFormulaService as st, FormulaRefRangeService as nt } from "@univerjs/sheets-formula";
+import { ERROR_TYPE_SET as Wt, LexerTreeBuilder as K, isReferenceString as lt, sequenceNodeType as jt, deserializeRangeWithSheet as Qt, deserializeRangeWithSheetWithCache as qt } from "@univerjs/engine-formula";
+const Gt = "SHEET_DATA_VALIDATION_PLUGIN";
+var kt = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, Xt = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Yt(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+  return t && r && kt(a, e, r), r;
+}, Ze = (o, a) => (e, t) => a(e, t, o);
+let j = class extends P {
+  constructor(a, e) {
     super();
-    f(this, "_cacheMatrix", /* @__PURE__ */ new Map());
-    f(this, "_dirtyRanges$", new He());
-    f(this, "dirtyRanges$", this._dirtyRanges$.asObservable());
-    this._commandService = t, this._initDirtyRanges();
+    g(this, "_cacheMatrix", /* @__PURE__ */ new Map());
+    g(this, "_dirtyRanges$", new He());
+    g(this, "dirtyRanges$", this._dirtyRanges$.asObservable());
+    this._commandService = a, this._univerInstanceService = e, this._initDirtyRanges(), this._initSheetRemove();
   }
   _initDirtyRanges() {
-    this.disposeWithMe(this._commandService.onCommandExecuted((t) => {
-      if (t.id === ae.id) {
-        const { cellValue: e, unitId: r, subUnitId: a } = t.params;
+    this.disposeWithMe(this._commandService.onCommandExecuted((a) => {
+      if (a.id === ie.id) {
+        const { cellValue: e, unitId: t, subUnitId: r } = a.params;
         if (e) {
-          const i = new ve(e).getDataRange();
+          const i = new fe(e).getDataRange();
           if (i.endRow === -1) return;
-          this.markRangeDirty(r, a, [i]);
+          this.markRangeDirty(t, r, [i]);
         }
       }
     }));
   }
-  _ensureCache(t, e) {
-    let r = this._cacheMatrix.get(t);
-    r || (r = /* @__PURE__ */ new Map(), this._cacheMatrix.set(t, r));
-    let a = r.get(e);
-    return a || (a = new ve(), r.set(e, a)), a;
-  }
-  ensureCache(t, e) {
-    return this._ensureCache(t, e);
+  _initSheetRemove() {
+    this.disposeWithMe(this._commandService.onCommandExecuted((a) => {
+      var e;
+      if (a.id === at.id) {
+        const { unitId: t, subUnitId: r } = a.params;
+        (e = this._cacheMatrix.get(t)) == null || e.delete(r);
+      }
+    })), this.disposeWithMe(this._univerInstanceService.unitDisposed$.subscribe((a) => {
+      a.type === N.UNIVER_SHEET && this._cacheMatrix.delete(a.getUnitId());
+    }));
   }
-  addRule(t, e, r) {
-    this.markRangeDirty(t, e, r.ranges);
+  _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 fe(), t.set(e, r)), r;
   }
-  removeRule(t, e, r) {
-    this._deleteRange(t, e, r.ranges);
+  ensureCache(a, e) {
+    return this._ensureCache(a, e);
   }
-  markRangeDirty(t, e, r) {
-    const a = this._ensureCache(t, e);
-    r.forEach((i) => {
-      A.foreach(i, (s, n) => {
-        a.setValue(s, n, void 0);
-      });
-    }), this._dirtyRanges$.next({ unitId: t, subUnitId: e, ranges: r });
+  addRule(a, e, t) {
+    this.markRangeDirty(a, e, t.ranges);
   }
-  markCellDirty(t, e, r, a) {
-    this._ensureCache(t, e).setValue(r, a, void 0), this._dirtyRanges$.next({ unitId: t, subUnitId: e, ranges: [{ startRow: r, startColumn: a, endRow: r, endColumn: a }] });
+  removeRule(a, e, t) {
+    this._deleteRange(a, e, t.ranges);
   }
-  _deleteRange(t, e, r) {
-    const a = this._ensureCache(t, e);
-    r.forEach((i) => {
-      A.foreach(i, (s, n) => {
-        a.realDeleteValue(s, n);
+  markRangeDirty(a, e, t) {
+    const r = this._ensureCache(a, e);
+    t.forEach((i) => {
+      b.foreach(i, (s, n) => {
+        r.setValue(s, n, void 0);
       });
-    }), this._dirtyRanges$.next({ unitId: t, subUnitId: e, ranges: r });
+    }), this._dirtyRanges$.next({ unitId: a, subUnitId: e, ranges: t });
   }
-  getValue(t, e, r, a) {
-    return this._ensureCache(t, e).getValue(r, a);
+  _deleteRange(a, e, t) {
+    const r = this._ensureCache(a, e);
+    t.forEach((i) => {
+      b.foreach(i, (s, n) => {
+        r.realDeleteValue(s, n);
+      });
+    }), this._dirtyRanges$.next({ unitId: a, subUnitId: e, ranges: t });
   }
-  setValue(t, e, r, a, i) {
-    return this._ensureCache(t, e).setValue(r, a, i);
+  getValue(a, e, t, r) {
+    return this._ensureCache(a, e).getValue(t, r);
   }
 };
-j = Zt([
-  Jt(0, R(P))
+j = Xt([
+  Ze(0, R(x)),
+  Ze(1, R(O))
 ], j);
 function re(o) {
-  var t, e;
-  return (e = (t = o == null ? void 0 : o[0]) == null ? void 0 : t[0]) == null ? void 0 : e.v;
+  var a, e;
+  return (e = (a = o == null ? void 0 : o[0]) == null ? void 0 : a[0]) == null ? void 0 : e.v;
 }
-function de(o) {
-  var t;
-  return (t = o == null ? void 0 : o[0]) == null ? void 0 : t[0];
+function he(o) {
+  var a;
+  return (a = o == null ? void 0 : o[0]) == null ? void 0 : a[0];
 }
-function F(o) {
-  return !qt.has(o);
+function C(o) {
+  return !Wt.has(o);
 }
-function ne(o) {
-  return o !== M.LIST && o !== M.LIST_MULTIPLE && o !== M.CHECKBOX && o !== M.ANY;
+function le(o, a) {
+  var t;
+  const e = a.getValidatorItem(o);
+  return (t = e == null ? void 0 : e.offsetFormulaByRange) != null ? t : !1;
 }
-var er = Object.defineProperty, tr = Object.getOwnPropertyDescriptor, rr = (o, t, e, r) => {
-  for (var a = r > 1 ? void 0 : r ? tr(t, e) : t, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (a = (r ? s(t, e, a) : s(a)) || a);
-  return r && a && er(t, e, a), a;
-}, he = (o, t) => (e, r) => t(e, r, o);
-let U = class extends $ {
-  constructor(t, e, r, a) {
+var Kt = Object.defineProperty, zt = Object.getOwnPropertyDescriptor, Zt = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? zt(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+  return t && r && Kt(a, e, r), r;
+}, te = (o, a) => (e, t) => a(e, t, o);
+let U = class extends P {
+  constructor(a, e, t, r, i) {
     super();
     /**
      * Map of origin formula of rule
      */
-    f(this, "_ruleFormulaMap", /* @__PURE__ */ new Map());
-    f(this, "_ruleFormulaMap2", /* @__PURE__ */ new Map());
-    this._instanceSrv = t, this._registerOtherFormulaService = e, this._dataValidationModel = r, this._dataValidationCacheService = a, this._initFormulaResultHandler();
+    g(this, "_ruleFormulaMap", /* @__PURE__ */ new Map());
+    g(this, "_ruleFormulaMap2", /* @__PURE__ */ new Map());
+    this._instanceSrv = a, this._registerOtherFormulaService = e, this._dataValidationModel = t, this._dataValidationCacheService = r, this._validatorRegistryService = i, this._initFormulaResultHandler();
   }
   _initFormulaResultHandler() {
-    this.disposeWithMe(this._registerOtherFormulaService.formulaResult$.subscribe((t) => {
-      for (const e in t) {
-        const r = t[e];
-        if (this._instanceSrv.getUnitType(e) === C.UNIVER_SHEET)
-          for (const i in r) {
-            const s = r[i], { ruleFormulaMap: n } = this._ensureMaps(e, i);
+    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 s = t[i], { ruleFormulaMap: n } = this._ensureMaps(e, i);
             s.forEach((l) => {
-              var d, m;
-              const u = n.get((d = l.extra) == null ? void 0 : d.ruleId), c = this._dataValidationModel.getRuleById(e, i, (m = l.extra) == null ? void 0 : m.ruleId);
-              c && u && this._dataValidationCacheService.markRangeDirty(e, i, c.ranges);
+              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);
             });
           }
       }
     }));
   }
-  _ensureMaps(t, e) {
-    let r = this._ruleFormulaMap.get(t), a = this._ruleFormulaMap2.get(t);
-    r || (r = /* @__PURE__ */ new Map(), this._ruleFormulaMap.set(t, r)), a || (a = /* @__PURE__ */ new Map(), this._ruleFormulaMap2.set(t, a));
-    let i = r.get(e);
-    i || (i = /* @__PURE__ */ new Map(), r.set(e, i));
-    let s = a.get(e);
-    return s || (s = /* @__PURE__ */ new Map(), a.set(e, s)), { ruleFormulaMap: i, ruleFormulaMap2: s };
+  _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 s = r.get(e);
+    return s || (s = /* @__PURE__ */ new Map(), r.set(e, s)), { ruleFormulaMap: i, ruleFormulaMap2: s };
   }
-  _registerFormula(t, e, r, a, i) {
-    return this._registerOtherFormulaService.registerFormulaWithRange(t, e, a, i, { ruleId: r });
+  _registerFormula(a, e, t, r, i) {
+    return this._registerOtherFormulaService.registerFormulaWithRange(a, e, r, i, { ruleId: t });
   }
-  deleteByRuleId(t, e, r) {
-    const { ruleFormulaMap: a, ruleFormulaMap2: i } = this._ensureMaps(t, e), s = this._dataValidationModel.getRuleById(t, e, r), n = a.get(r);
+  deleteByRuleId(a, e, t) {
+    const { ruleFormulaMap: r, ruleFormulaMap2: i } = this._ensureMaps(a, e), s = this._dataValidationModel.getRuleById(a, e, t), n = r.get(t);
     if (!s || !n)
       return;
-    const l = a.get(r);
-    l && (a.delete(r), this._registerOtherFormulaService.deleteFormula(t, e, [l.formulaId]));
-    const u = i.get(r);
-    u && (i.delete(r), this._registerOtherFormulaService.deleteFormula(t, e, [u.formulaId]));
-  }
-  _addFormulaByRange(t, e, r, a, i, s) {
-    const { ruleFormulaMap: n, ruleFormulaMap2: l } = this._ensureMaps(t, e), u = s[0].startRow, c = s[0].startColumn;
-    if (a && S(a)) {
-      const d = this._registerFormula(t, e, r, a, s);
-      n.set(r, {
-        formula: a,
-        originCol: c,
+    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, s) {
+    const { ruleFormulaMap: n, ruleFormulaMap2: l } = this._ensureMaps(a, e), u = s[0].startRow, d = s[0].startColumn;
+    if (r && S(r)) {
+      const c = this._registerFormula(a, e, t, r, s);
+      n.set(t, {
+        formula: r,
+        originCol: d,
         originRow: u,
-        formulaId: d
+        formulaId: c
       });
     }
     if (i && S(i)) {
-      const d = this._registerFormula(t, e, r, i, s);
-      l.set(r, {
+      const c = this._registerFormula(a, e, t, i, s);
+      l.set(t, {
         formula: i,
-        originCol: c,
+        originCol: d,
         originRow: u,
-        formulaId: d
+        formulaId: c
       });
     }
   }
-  addRule(t, e, r) {
-    if (ne(r.type)) {
-      const { ranges: a, formula1: i, formula2: s, uid: n } = r;
-      this._addFormulaByRange(t, e, n, i, s, a);
+  addRule(a, e, t) {
+    if (le(t.type, this._validatorRegistryService)) {
+      const { ranges: r, formula1: i, formula2: s, uid: n } = t;
+      this._addFormulaByRange(a, e, n, i, s, r);
     }
   }
-  async getCellFormulaValue(t, e, r, a, i) {
-    var g, _;
-    const { ruleFormulaMap: s } = this._ensureMaps(t, e), n = s.get(r);
+  async getCellFormulaValue(a, e, t, r, i) {
+    var p, _;
+    const { ruleFormulaMap: s } = this._ensureMaps(a, e), n = s.get(t);
     if (!n)
       return Promise.resolve(void 0);
-    const l = await this._registerOtherFormulaService.getFormulaValue(t, e, n.formulaId), { originRow: u, originCol: c } = n, d = a - u, m = i - c;
-    return de((_ = (g = l == null ? void 0 : l.result) == null ? void 0 : g[d]) == null ? void 0 : _[m]);
+    const l = await this._registerOtherFormulaService.getFormulaValue(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, m = i - d;
+    return he((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
   }
-  async getCellFormula2Value(t, e, r, a, i) {
-    var g, _;
-    const { ruleFormulaMap2: s } = this._ensureMaps(t, e), n = s.get(r);
+  async getCellFormula2Value(a, e, t, r, i) {
+    var p, _;
+    const { ruleFormulaMap2: s } = this._ensureMaps(a, e), n = s.get(t);
     if (!n)
       return Promise.resolve(void 0);
-    const l = await this._registerOtherFormulaService.getFormulaValue(t, e, n.formulaId), { originRow: u, originCol: c } = n, d = a - u, m = i - c;
-    return de((_ = (g = l == null ? void 0 : l.result) == null ? void 0 : g[d]) == null ? void 0 : _[m]);
+    const l = await this._registerOtherFormulaService.getFormulaValue(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, m = i - d;
+    return he((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
   }
-  getCellFormulaValueSync(t, e, r, a, i) {
-    var g, _;
-    const { ruleFormulaMap: s } = this._ensureMaps(t, e), n = s.get(r);
+  getCellFormulaValueSync(a, e, t, r, i) {
+    var p, _;
+    const { ruleFormulaMap: s } = this._ensureMaps(a, e), n = s.get(t);
     if (!n)
       return;
-    const l = this._registerOtherFormulaService.getFormulaValueSync(t, e, n.formulaId), { originRow: u, originCol: c } = n, d = a - u, m = i - c;
-    return de((_ = (g = l == null ? void 0 : l.result) == null ? void 0 : g[d]) == null ? void 0 : _[m]);
+    const l = this._registerOtherFormulaService.getFormulaValueSync(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, m = i - d;
+    return he((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
   }
-  getCellFormula2ValueSync(t, e, r, a, i) {
-    var g, _;
-    const { ruleFormulaMap2: s } = this._ensureMaps(t, e), n = s.get(r);
+  getCellFormula2ValueSync(a, e, t, r, i) {
+    var p, _;
+    const { ruleFormulaMap2: s } = this._ensureMaps(a, e), n = s.get(t);
     if (!n)
       return;
-    const l = this._registerOtherFormulaService.getFormulaValueSync(t, e, n.formulaId), { originRow: u, originCol: c } = n, d = a - u, m = i - c;
-    return de((_ = (g = l == null ? void 0 : l.result) == null ? void 0 : g[d]) == null ? void 0 : _[m]);
+    const l = this._registerOtherFormulaService.getFormulaValueSync(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, m = i - d;
+    return he((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
   }
-  getRuleFormulaInfo(t, e, r) {
-    const { ruleFormulaMap: a } = this._ensureMaps(t, e);
-    return a.get(r);
+  getRuleFormulaInfo(a, e, t) {
+    const { ruleFormulaMap: r } = this._ensureMaps(a, e);
+    return r.get(t);
   }
 };
-U = rr([
-  he(0, O),
-  he(1, R(lt)),
-  he(2, R(qe)),
-  he(3, R(j))
+U = Zt([
+  te(0, O),
+  te(1, R(st)),
+  te(2, R(Qe)),
+  te(3, R(j)),
+  te(4, R(Q))
 ], U);
-var ar = Object.defineProperty, ir = Object.getOwnPropertyDescriptor, sr = (o, t, e, r) => {
-  for (var a = r > 1 ? void 0 : r ? ir(t, e) : t, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (a = (r ? s(t, e, a) : s(a)) || a);
-  return r && a && ar(t, e, a), a;
-}, me = (o, t) => (e, r) => t(e, r, o);
-let X = class extends $ {
-  constructor(t, e, r, a) {
+var Jt = Object.defineProperty, ea = Object.getOwnPropertyDescriptor, ta = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? ea(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+  return t && r && Jt(a, e, r), r;
+}, ae = (o, a) => (e, t) => a(e, t, o);
+let k = class extends P {
+  constructor(a, e, t, r, i) {
     super();
-    f(this, "_formulaRuleMap", /* @__PURE__ */ new Map());
-    this._instanceService = t, this._registerOtherFormulaService = e, this._dataValidationCacheService = r, this._dataValidationModel = a, this._initFormulaResultHandler();
+    g(this, "_formulaRuleMap", /* @__PURE__ */ new Map());
+    this._instanceService = a, this._registerOtherFormulaService = e, this._dataValidationCacheService = t, this._dataValidationModel = r, this._validatorRegistryService = i, this._initFormulaResultHandler();
   }
   _initFormulaResultHandler() {
-    this.disposeWithMe(this._registerOtherFormulaService.formulaResult$.subscribe((t) => {
-      for (const e in t) {
-        const r = t[e];
-        if (this._instanceService.getUnitType(e) === C.UNIVER_SHEET)
-          for (const i in r) {
-            const s = r[i], n = this._ensureRuleFormulaMap(e, i);
+    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 s = t[i], n = this._ensureRuleFormulaMap(e, i);
             s.forEach((l) => {
-              var u, c;
+              var u, d;
               if (n.get((u = l.extra) == null ? void 0 : u.ruleId)) {
-                const d = this._dataValidationModel.getRuleById(e, i, (c = l.extra) == null ? void 0 : c.ruleId);
-                d && this._dataValidationCacheService.markRangeDirty(e, i, d.ranges);
+                const c = this._dataValidationModel.getRuleById(e, i, (d = l.extra) == null ? void 0 : d.ruleId);
+                c && this._dataValidationCacheService.markRangeDirty(e, i, c.ranges);
               }
             });
           }
       }
     }));
   }
-  _ensureRuleFormulaMap(t, e) {
-    let r = this._formulaRuleMap.get(t);
-    r || (r = /* @__PURE__ */ new Map(), this._formulaRuleMap.set(t, r));
-    let a = r.get(e);
-    return a || (a = /* @__PURE__ */ new Map(), r.set(e, a)), a;
+  _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;
   }
-  _registerSingleFormula(t, e, r, a) {
+  _registerSingleFormula(a, e, t, r) {
     const i = [{ startColumn: 0, endColumn: 0, startRow: 0, endRow: 0 }];
-    return this._registerOtherFormulaService.registerFormulaWithRange(t, e, r, i, { ruleId: a });
+    return this._registerOtherFormulaService.registerFormulaWithRange(a, e, t, i, { ruleId: r });
   }
-  addRule(t, e, r) {
-    if (!ne(r.type) && r.type !== M.CHECKBOX) {
-      const { formula1: a, formula2: i, uid: s } = r, n = S(a), l = S(i);
+  addRule(a, e, t) {
+    if (!le(t.type, this._validatorRegistryService) && t.type !== T.CHECKBOX) {
+      const { formula1: r, formula2: i, uid: s } = t, n = S(r), l = S(i);
       if (!n && !l)
         return;
-      const u = this._ensureRuleFormulaMap(t, e), c = [void 0, void 0];
+      const u = this._ensureRuleFormulaMap(a, e), d = [void 0, void 0];
       if (n) {
-        const d = this._registerSingleFormula(t, e, a, s);
-        c[0] = { id: d, text: a };
+        const c = this._registerSingleFormula(a, e, r, s);
+        d[0] = { id: c, text: r };
       }
       if (l) {
-        const d = this._registerSingleFormula(t, e, i, s);
-        c[1] = { id: d, text: i };
+        const c = this._registerSingleFormula(a, e, i, s);
+        d[1] = { id: c, text: i };
       }
-      u.set(s, c);
+      u.set(s, d);
     }
   }
-  removeRule(t, e, r) {
-    const i = this._ensureRuleFormulaMap(t, e).get(r);
+  removeRule(a, e, t) {
+    const i = this._ensureRuleFormulaMap(a, e).get(t);
     if (!i)
       return;
     const [s, n] = i, l = [s == null ? void 0 : s.id, n == null ? void 0 : n.id].filter(Boolean);
-    l.length && this._registerOtherFormulaService.deleteFormula(t, e, l);
+    l.length && this._registerOtherFormulaService.deleteFormula(a, e, l);
   }
-  getRuleFormulaResult(t, e, r) {
-    const i = this._ensureRuleFormulaMap(t, e).get(r);
+  getRuleFormulaResult(a, e, t) {
+    const i = this._ensureRuleFormulaMap(a, e).get(t);
     if (!i)
       return Promise.resolve(null);
-    const s = async (n) => n && this._registerOtherFormulaService.getFormulaValue(t, e, n.id);
+    const s = async (n) => n && this._registerOtherFormulaService.getFormulaValue(a, e, n.id);
     return Promise.all([
       s(i[0]),
       s(i[1])
     ]);
   }
-  getRuleFormulaResultSync(t, e, r) {
-    const i = this._ensureRuleFormulaMap(t, e).get(r);
+  getRuleFormulaResultSync(a, e, t) {
+    const i = this._ensureRuleFormulaMap(a, e).get(t);
     if (i)
       return i.map((s) => {
         if (s)
-          return this._registerOtherFormulaService.getFormulaValueSync(t, e, s.id);
+          return this._registerOtherFormulaService.getFormulaValueSync(a, e, s.id);
       });
   }
-  getRuleFormulaInfo(t, e, r) {
-    return this._ensureRuleFormulaMap(t, e).get(r);
+  getRuleFormulaInfo(a, e, t) {
+    return this._ensureRuleFormulaMap(a, e).get(t);
   }
 };
-X = sr([
-  me(0, O),
-  me(1, R(lt)),
-  me(2, R(j)),
-  me(3, R(qe))
-], X);
-function ie(o) {
-  return Mt(o);
-}
-function dt(o) {
-  var t;
-  return String((t = ie(o)) != null ? t : "");
-}
-const or = class We {
-  /**
-   * Accept two comparable values and creates new instance of interval
-   * Predicate Interval.comparable_less(low, high) supposed to return true on these values
-   * @param low
-   * @param high
-   */
-  constructor(t, e) {
-    this.low = t, this.high = e;
-  }
-  /**
-   * Clone interval
-   * @returns {Interval}
-   */
-  clone() {
-    return new We(this.low, this.high);
-  }
-  /**
-   * Propery max returns clone of this interval
-   * @returns {Interval}
-   */
-  get max() {
-    return this.clone();
-  }
-  /**
-   * Predicate returns true is this interval less than other interval
-   * @param other_interval
-   * @returns {boolean}
-   */
-  less_than(t) {
-    return this.low < t.low || this.low === t.low && this.high < t.high;
-  }
-  /**
-   * Predicate returns true is this interval equals to other interval
-   * @param other_interval
-   * @returns {boolean}
-   */
-  equal_to(t) {
-    return this.low === t.low && this.high === t.high;
-  }
-  /**
-   * Predicate returns true if this interval intersects other interval
-   * @param other_interval
-   * @returns {boolean}
-   */
-  intersect(t) {
-    return !this.not_intersect(t);
-  }
-  /**
-   * Predicate returns true if this interval does not intersect other interval
-   * @param other_interval
-   * @returns {boolean}
-   */
-  not_intersect(t) {
-    return this.high < t.low || t.high < this.low;
-  }
-  /**
-   * Returns new interval merged with other interval
-   * @param {Interval} other_interval - Other interval to merge with
-   * @returns {Interval}
-   */
-  merge(t) {
-    return new We(
-      this.low === void 0 ? t.low : this.low < t.low ? this.low : t.low,
-      this.high === void 0 ? t.high : this.high > t.high ? this.high : t.high
-    );
-  }
-  /**
-   * Returns how key should return
-   */
-  output() {
-    return [this.low, this.high];
-  }
-  /**
-   * Function returns maximum between two comparable values
-   * @param interval1
-   * @param interval2
-   * @returns {Interval}
-   */
-  static comparable_max(t, e) {
-    return t.merge(e);
-  }
-  /**
-   * Predicate returns true if first value less than second value
-   * @param val1
-   * @param val2
-   * @returns {boolean}
-   */
-  static comparable_less_than(t, e) {
-    return t < e;
-  }
-}, E = 0, V = 1;
-class Q {
-  constructor(t = void 0, e = void 0, r = null, a = null, i = null, s = V) {
-    if (this.left = r, this.right = a, this.parent = i, this.color = s, this.item = { key: t, value: e }, t && t instanceof Array && t.length === 2 && !Number.isNaN(t[0]) && !Number.isNaN(t[1])) {
-      let [n, l] = t;
-      n > l && ([n, l] = [l, n]), this.item.key = new or(n, l);
-    }
-    this.max = this.item.key ? this.item.key.max : void 0;
-  }
-  isNil() {
-    return this.item.key === void 0 && this.item.value === void 0 && this.left === null && this.right === null && this.color === V;
-  }
-  _value_less_than(t) {
-    return this.item.value && t.item.value && this.item.value.less_than ? this.item.value.less_than(t.item.value) : this.item.value < t.item.value;
-  }
-  less_than(t) {
-    return this.item.value === this.item.key && t.item.value === t.item.key ? this.item.key.less_than(t.item.key) : this.item.key.less_than(t.item.key) || this.item.key.equal_to(t.item.key) && this._value_less_than(t);
-  }
-  _value_equal(t) {
-    return this.item.value && t.item.value && this.item.value.equal_to ? this.item.value.equal_to(t.item.value) : this.item.value === t.item.value;
-  }
-  equal_to(t) {
-    return this.item.value === this.item.key && t.item.value === t.item.key ? this.item.key.equal_to(t.item.key) : this.item.key.equal_to(t.item.key) && this._value_equal(t);
-  }
-  intersect(t) {
-    return this.item.key.intersect(t.item.key);
-  }
-  copy_data(t) {
-    this.item.key = t.item.key, this.item.value = t.item.value;
-  }
-  update_max() {
-    if (this.max = this.item.key ? this.item.key.max : void 0, this.right && this.right.max) {
-      const t = this.item.key.constructor.comparable_max;
-      this.max = t(this.max, this.right.max);
-    }
-    if (this.left && this.left.max) {
-      const t = this.item.key.constructor.comparable_max;
-      this.max = t(this.max, this.left.max);
-    }
-  }
-  // Other_node does not intersect any node of left subtree, if this.left.max < other_node.item.key.low
-  not_intersect_left_subtree(t) {
-    const e = this.item.key.constructor.comparable_less_than;
-    let r = this.left.max.high !== void 0 ? this.left.max.high : this.left.max;
-    return e(r, t.item.key.low);
-  }
-  // Other_node does not intersect right subtree if other_node.item.key.high < this.right.key.low
-  not_intersect_right_subtree(t) {
-    const e = this.item.key.constructor.comparable_less_than;
-    let r = this.right.max.low !== void 0 ? this.right.max.low : this.right.item.key.low;
-    return e(t.item.key.high, r);
-  }
+k = ta([
+  ae(0, O),
+  ae(1, R(st)),
+  ae(2, R(j)),
+  ae(3, R(Qe)),
+  ae(4, R(Q))
+], k);
+function oe(o) {
+  return St(o);
 }
-class Ye {
-  /**
-   * Construct new empty instance of IntervalTree
-   */
-  constructor() {
-    this.root = null, this.nil_node = new Q();
-  }
-  /**
-   * Returns number of items stored in the interval tree
-   * @returns {number}
-   */
-  get size() {
-    let t = 0;
-    return this.tree_walk(this.root, () => t++), t;
-  }
-  /**
-   * Returns array of sorted keys in the ascending order
-   * @returns {Array}
-   */
-  get keys() {
-    let t = [];
-    return this.tree_walk(this.root, (e) => t.push(
-      e.item.key.output ? e.item.key.output() : e.item.key
-    )), t;
-  }
-  /**
-   * Return array of values in the ascending keys order
-   * @returns {Array}
-   */
-  get values() {
-    let t = [];
-    return this.tree_walk(this.root, (e) => t.push(e.item.value)), t;
-  }
-  /**
-   * Returns array of items (<key,value> pairs) in the ascended keys order
-   * @returns {Array}
-   */
-  get items() {
-    let t = [];
-    return this.tree_walk(this.root, (e) => t.push({
-      key: e.item.key.output ? e.item.key.output() : e.item.key,
-      value: e.item.value
-    })), t;
-  }
-  /**
-   * Returns true if tree is empty
-   * @returns {boolean}
-   */
-  isEmpty() {
-    return this.root == null || this.root === this.nil_node;
-  }
-  /**
-   * Clear tree
-   */
-  clear() {
-    this.root = null;
-  }
-  /**
-   * Insert new item into interval tree
-   * @param {Interval} key - interval object or array of two numbers [low, high]
-   * @param {any} value - value representing any object (optional)
-   * @returns {Node} returns reference to inserted node as an object {key:interval, value: value}
-   */
-  insert(t, e = t) {
-    if (t === void 0) return;
-    let r = new Q(t, e, this.nil_node, this.nil_node, null, E);
-    return this.tree_insert(r), this.recalc_max(r), r;
-  }
-  /**
-   * Returns true if item {key,value} exist in the tree
-   * @param {Interval} key - interval correspondent to keys stored in the tree
-   * @param {any} value - value object to be checked
-   * @returns {boolean} true if item {key, value} exist in the tree, false otherwise
-   */
-  exist(t, e = t) {
-    let r = new Q(t, e);
-    return !!this.tree_search(this.root, r);
-  }
-  /**
-   * Remove entry {key, value} from the tree
-   * @param {Interval} key - interval correspondent to keys stored in the tree
-   * @param {any} value - value object
-   * @returns {boolean} true if item {key, value} deleted, false if not found
-   */
-  remove(t, e = t) {
-    let r = new Q(t, e), a = this.tree_search(this.root, r);
-    return a && this.tree_delete(a), a;
-  }
-  /**
-   * Returns array of entry values which keys intersect with given interval <br/>
-   * If no values stored in the tree, returns array of keys which intersect given interval
-   * @param {Interval} interval - search interval, or tuple [low, high]
-   * @param outputMapperFn(value,key) - optional function that maps (value, key) to custom output
-   * @returns {Array}
-   */
-  search(t, e = (r, a) => r === a ? a.output() : r) {
-    let r = new Q(t), a = [];
-    return this.tree_search_interval(this.root, r, a), a.map((i) => e(i.item.value, i.item.key));
-  }
-  /**
-   * Returns true if intersection between given and any interval stored in the tree found
-   * @param {Interval} interval - search interval or tuple [low, high]
-   * @returns {boolean}
-   */
-  intersect_any(t) {
-    let e = new Q(t);
-    return this.tree_find_any_interval(this.root, e);
-  }
-  /**
-   * Tree visitor. For each node implement a callback function. <br/>
-   * Method calls a callback function with two parameters (key, value)
-   * @param visitor(key,value) - function to be called for each tree item
-   */
-  forEach(t) {
-    this.tree_walk(this.root, (e) => t(e.item.key, e.item.value));
-  }
-  /**
-   * Value Mapper. Walk through every node and map node value to another value
-   * @param callback(value,key) - function to be called for each tree item
-   */
-  map(t) {
-    const e = new Ye();
-    return this.tree_walk(this.root, (r) => e.insert(r.item.key, t(r.item.value, r.item.key))), e;
-  }
-  /**
-   * @param {Interval} interval - optional if the iterator is intended to start from the beginning
-   * @param outputMapperFn(value,key) - optional function that maps (value, key) to custom output
-   * @returns {Iterator}
-   */
-  *iterate(t, e = (r, a) => r === a ? a.output() : r) {
-    let r;
-    for (t ? r = this.tree_search_nearest_forward(this.root, new Q(t)) : this.root && (r = this.local_minimum(this.root)); r; )
-      yield e(r.item.value, r.item.key), r = this.tree_successor(r);
-  }
-  recalc_max(t) {
-    let e = t;
-    for (; e.parent != null; )
-      e.parent.update_max(), e = e.parent;
-  }
-  tree_insert(t) {
-    let e = this.root, r = null;
-    if (this.root == null || this.root === this.nil_node)
-      this.root = t;
-    else {
-      for (; e !== this.nil_node; )
-        r = e, t.less_than(e) ? e = e.left : e = e.right;
-      t.parent = r, t.less_than(r) ? r.left = t : r.right = t;
-    }
-    this.insert_fixup(t);
-  }
-  // After insertion insert_node may have red-colored parent, and this is a single possible violation
-  // Go upwords to the root and re-color until violation will be resolved
-  insert_fixup(t) {
-    let e, r;
-    for (e = t; e !== this.root && e.parent.color === E; )
-      e.parent === e.parent.parent.left ? (r = e.parent.parent.right, r.color === E ? (e.parent.color = V, r.color = V, e.parent.parent.color = E, e = e.parent.parent) : (e === e.parent.right && (e = e.parent, this.rotate_left(e)), e.parent.color = V, e.parent.parent.color = E, this.rotate_right(e.parent.parent))) : (r = e.parent.parent.left, r.color === E ? (e.parent.color = V, r.color = V, e.parent.parent.color = E, e = e.parent.parent) : (e === e.parent.left && (e = e.parent, this.rotate_right(e)), e.parent.color = V, e.parent.parent.color = E, this.rotate_left(e.parent.parent)));
-    this.root.color = V;
-  }
-  tree_delete(t) {
-    let e, r;
-    t.left === this.nil_node || t.right === this.nil_node ? e = t : e = this.tree_successor(t), e.left !== this.nil_node ? r = e.left : r = e.right, r.parent = e.parent, e === this.root ? this.root = r : (e === e.parent.left ? e.parent.left = r : e.parent.right = r, e.parent.update_max()), this.recalc_max(r), e !== t && (t.copy_data(e), t.update_max(), this.recalc_max(t)), /*fix_node != this.nil_node && */
-    e.color === V && this.delete_fixup(r);
-  }
-  delete_fixup(t) {
-    let e = t, r;
-    for (; e !== this.root && e.parent != null && e.color === V; )
-      e === e.parent.left ? (r = e.parent.right, r.color === E && (r.color = V, e.parent.color = E, this.rotate_left(e.parent), r = e.parent.right), r.left.color === V && r.right.color === V ? (r.color = E, e = e.parent) : (r.right.color === V && (r.color = E, r.left.color = V, this.rotate_right(r), r = e.parent.right), r.color = e.parent.color, e.parent.color = V, r.right.color = V, this.rotate_left(e.parent), e = this.root)) : (r = e.parent.left, r.color === E && (r.color = V, e.parent.color = E, this.rotate_right(e.parent), r = e.parent.left), r.left.color === V && r.right.color === V ? (r.color = E, e = e.parent) : (r.left.color === V && (r.color = E, r.right.color = V, this.rotate_left(r), r = e.parent.left), r.color = e.parent.color, e.parent.color = V, r.left.color = V, this.rotate_right(e.parent), e = this.root));
-    e.color = V;
-  }
-  tree_search(t, e) {
-    if (!(t == null || t === this.nil_node))
-      return e.equal_to(t) ? t : e.less_than(t) ? this.tree_search(t.left, e) : this.tree_search(t.right, e);
-  }
-  tree_search_nearest_forward(t, e) {
-    let r, a = t;
-    for (; a && a !== this.nil_node; )
-      a.less_than(e) ? a.intersect(e) ? (r = a, a = a.left) : a = a.right : ((!r || a.less_than(r)) && (r = a), a = a.left);
-    return r || null;
-  }
-  // Original search_interval method; container res support push() insertion
-  // Search all intervals intersecting given one
-  tree_search_interval(t, e, r) {
-    t != null && t !== this.nil_node && (t.left !== this.nil_node && !t.not_intersect_left_subtree(e) && this.tree_search_interval(t.left, e, r), t.intersect(e) && r.push(t), t.right !== this.nil_node && !t.not_intersect_right_subtree(e) && this.tree_search_interval(t.right, e, r));
-  }
-  tree_find_any_interval(t, e) {
-    let r = !1;
-    return t != null && t !== this.nil_node && (t.left !== this.nil_node && !t.not_intersect_left_subtree(e) && (r = this.tree_find_any_interval(t.left, e)), r || (r = t.intersect(e)), !r && t.right !== this.nil_node && !t.not_intersect_right_subtree(e) && (r = this.tree_find_any_interval(t.right, e))), r;
-  }
-  local_minimum(t) {
-    let e = t;
-    for (; e.left != null && e.left !== this.nil_node; )
-      e = e.left;
-    return e;
-  }
-  // not in use
-  local_maximum(t) {
-    let e = t;
-    for (; e.right != null && e.right !== this.nil_node; )
-      e = e.right;
-    return e;
-  }
-  tree_successor(t) {
-    let e, r, a;
-    if (t.right !== this.nil_node)
-      e = this.local_minimum(t.right);
-    else {
-      for (r = t, a = t.parent; a != null && a.right === r; )
-        r = a, a = a.parent;
-      e = a;
-    }
-    return e;
-  }
-  //           |            right-rotate(T,y)       |
-  //           y            ---------------.       x
-  //          / \                                  / \
-  //         x   c          left-rotate(T,x)      a   y
-  //        / \             <---------------         / \
-  //       a   b                                    b   c
-  rotate_left(t) {
-    let e = t.right;
-    t.right = e.left, e.left !== this.nil_node && (e.left.parent = t), e.parent = t.parent, t === this.root ? this.root = e : t === t.parent.left ? t.parent.left = e : t.parent.right = e, e.left = t, t.parent = e, t != null && t !== this.nil_node && t.update_max(), e = t.parent, e != null && e !== this.nil_node && e.update_max();
-  }
-  rotate_right(t) {
-    let e = t.left;
-    t.left = e.right, e.right !== this.nil_node && (e.right.parent = t), e.parent = t.parent, t === this.root ? this.root = e : t === t.parent.left ? t.parent.left = e : t.parent.right = e, e.right = t, t.parent = e, t !== null && t !== this.nil_node && t.update_max(), e = t.parent, e != null && e !== this.nil_node && e.update_max();
-  }
-  tree_walk(t, e) {
-    t != null && t !== this.nil_node && (this.tree_walk(t.left, e), e(t), this.tree_walk(t.right, e));
-  }
-  /* Return true if all red nodes have exactly two black child nodes */
-  testRedBlackProperty() {
-    let t = !0;
-    return this.tree_walk(this.root, function(e) {
-      e.color === E && (e.left.color === V && e.right.color === V || (t = !1));
-    }), t;
-  }
-  /* Throw error if not every path from root to bottom has same black height */
-  testBlackHeightProperty(t) {
-    let e = 0, r = 0, a = 0;
-    if (t.color === V && e++, t.left !== this.nil_node ? r = this.testBlackHeightProperty(t.left) : r = 1, t.right !== this.nil_node ? a = this.testBlackHeightProperty(t.right) : a = 1, r !== a)
-      throw new Error("Red-black height property violated");
-    return e += r, e;
-  }
+function ut(o) {
+  var a;
+  return String((a = oe(o)) != null ? a : "");
 }
-class Xe {
-  constructor(t, e, r, a, i = !1) {
-    f(this, "_map");
-    f(this, "_tree", /* @__PURE__ */ new Map());
-    f(this, "_dirty", !0);
-    f(this, "_buildTree", () => {
+class Ge {
+  constructor(a, e, t, r, i = !1) {
+    g(this, "_map");
+    g(this, "_tree", new Vt());
+    g(this, "_dirty", !0);
+    g(this, "_buildTree", () => {
       if (!this._dirty || this._disableTree)
         return;
-      const t = /* @__PURE__ */ new Map();
-      this._map.forEach((r, a) => {
-        r.forEach((i) => {
-          for (let s = i.startColumn; s <= i.endColumn; s++) {
-            let n = t.get(s);
-            n || (n = [], t.set(s, n)), n.push({
-              startRow: i.startRow,
-              endRow: i.endRow,
-              ruleId: a
-            });
-          }
+      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 e = /* @__PURE__ */ new Map();
-      t.forEach((r, a) => {
-        const i = new Ye();
-        r.forEach((s) => {
-          i.insert([s.startRow, s.endRow], s.ruleId);
-        }), e.set(a, i);
-      }), this._tree = e, this._dirty = !1;
+      }), this._tree.load(a), this._dirty = !1;
     });
-    f(this, "_debonceBuildTree", yt(this._buildTree, 0));
-    this._unitId = e, this._subUnitId = r, this._univerInstanceService = a, this._disableTree = i, this._map = t, this._buildTree();
+    g(this, "_debonceBuildTree", Mt(this._buildTree, 0));
+    this._unitId = e, this._subUnitId = t, this._univerInstanceService = r, this._disableTree = i, this._map = a, this._buildTree();
   }
   get _worksheet() {
-    var t;
-    return (t = this._univerInstanceService.getUnit(this._unitId, C.UNIVER_SHEET)) == null ? void 0 : t.getSheetBySheetId(this._subUnitId);
+    var a;
+    return (a = this._univerInstanceService.getUnit(this._unitId, N.UNIVER_SHEET)) == null ? void 0 : a.getSheetBySheetId(this._subUnitId);
   }
-  addRule(t) {
+  _addRule(a, e) {
     if (!this._worksheet)
       return;
-    const e = t.uid, r = t.ranges.map((a) => A.transformRange(a, this._worksheet));
-    this._map.forEach((a, i) => {
-      const s = b.subtractMulti(a, r);
+    const t = e.map((r) => b.transformRange(r, this._worksheet));
+    this._map.forEach((r, i) => {
+      const s = A.subtractMulti(r, t);
       s.length === 0 ? this._map.delete(i) : this._map.set(i, s);
-    }), this._dirty = !0, this._map.set(e, r), this._debonceBuildTree();
+    }), this._dirty = !0, this._map.set(a, t), this._debonceBuildTree();
   }
-  removeRange(t) {
+  addRule(a) {
+    this._addRule(a.uid, a.ranges);
+  }
+  removeRange(a) {
     if (!this._worksheet)
       return;
-    const e = t.map((r) => A.transformRange(r, this._worksheet));
-    this._map.forEach((r, a) => {
-      const i = b.subtractMulti(r, e);
-      i.length === 0 ? this._map.delete(a) : this._map.set(a, i);
+    const e = a.map((t) => b.transformRange(t, this._worksheet));
+    this._map.forEach((t, r) => {
+      const i = A.subtractMulti(t, e);
+      i.length === 0 ? this._map.delete(r) : this._map.set(r, i);
     }), this._dirty = !0, this._debonceBuildTree();
   }
-  removeRule(t) {
-    this._map.delete(t.uid), this._dirty = !0, this._debonceBuildTree();
+  _removeRule(a) {
+    this._map.delete(a), this._dirty = !0, this._debonceBuildTree();
   }
-  updateRange(t, e) {
-    if (!this._worksheet)
-      return;
-    this._map.delete(t);
-    const r = e.map((a) => A.transformRange(a, this._worksheet));
-    this._map.forEach((a, i) => {
-      const s = b.subtractMulti(a, r);
-      s.length === 0 ? this._map.delete(i) : this._map.set(i, s);
-    }), this._map.set(t, r), this._dirty = !0, this._debonceBuildTree();
+  removeRule(a) {
+    this._removeRule(a.uid);
   }
-  addRangeRules(t) {
-    t.forEach(({ id: e, ranges: r }) => {
-      if (!r.length)
+  updateRange(a, e) {
+    this._removeRule(a), this._addRule(a, e);
+  }
+  addRangeRules(a) {
+    a.forEach(({ id: e, ranges: t }) => {
+      if (!t.length)
         return;
-      let a = this._map.get(e);
-      a ? (this._map.set(e, b.mergeRanges([...a, ...r])), a = this._map.get(e)) : (a = r, this._map.set(e, a)), this._map.forEach((i, s) => {
+      let r = this._map.get(e);
+      r ? (this._map.set(e, A.mergeRanges([...r, ...t])), r = this._map.get(e)) : (r = t, this._map.set(e, r)), this._map.forEach((i, s) => {
         if (s === e)
           return;
-        const n = b.subtractMulti(i, r);
+        const n = A.subtractMulti(i, t);
         n.length === 0 ? this._map.delete(s) : this._map.set(s, n);
       });
     }), this._dirty = !0, this._debonceBuildTree();
   }
-  diff(t) {
+  diff(a) {
     const e = [];
-    let r = 0;
-    return t.forEach((a, i) => {
+    let t = 0;
+    return a.forEach((r, i) => {
       var l;
-      const s = (l = this._map.get(a.uid)) != null ? l : [], n = a.ranges;
-      s.length !== 0 && (s.length !== n.length || s.some((u, c) => !b.equals(u, n[c]))) && e.push({
+      const s = (l = this._map.get(r.uid)) != null ? l : [], n = r.ranges;
+      s.length !== 0 && (s.length !== n.length || s.some((u, d) => !A.equals(u, n[d]))) && e.push({
         type: "update",
-        ruleId: a.uid,
+        ruleId: r.uid,
         oldRanges: n,
-        newRanges: b.sort(s),
-        rule: a
+        newRanges: A.sort(s),
+        rule: r
       }), s.length === 0 && (e.push({
         type: "delete",
-        rule: a,
-        index: i - r
-      }), r++);
+        rule: r,
+        index: i - t
+      }), t++);
     }), e;
   }
-  diffWithAddition(t, e) {
-    const r = [];
-    let a = 0;
-    return t.forEach((i, s) => {
+  diffWithAddition(a, e) {
+    const t = [];
+    let r = 0;
+    return a.forEach((i, s) => {
       var u;
       const n = (u = this._map.get(i.uid)) != null ? u : [], l = i.ranges;
-      n.length !== 0 && (n.length !== l.length || n.some((c, d) => !b.equals(c, l[d]))) && r.push({
+      n.length !== 0 && (n.length !== l.length || n.some((d, c) => !A.equals(d, l[c]))) && t.push({
         type: "update",
         ruleId: i.uid,
         oldRanges: l,
-        newRanges: b.sort(n),
+        newRanges: A.sort(n),
         rule: i
-      }), n.length === 0 && (r.push({
+      }), n.length === 0 && (t.push({
         type: "delete",
         rule: i,
-        index: s - a
-      }), a++);
+        index: s - r
+      }), r++);
     }), Array.from(e).forEach((i) => {
       var n;
       const s = (n = this._map.get(i.uid)) != null ? n : [];
-      r.push({
+      t.push({
         type: "add",
         rule: {
           ...i,
-          ranges: b.sort(s)
+          ranges: A.sort(s)
         }
       });
-    }), r;
+    }), t;
   }
   clone() {
-    return new Xe(
-      new Map(N.deepClone(Array.from(this._map.entries()))),
+    return new Ge(
+      new Map(V.deepClone(Array.from(this._map.entries()))),
       this._unitId,
       this._subUnitId,
       this._univerInstanceService,
@@ -836,55 +450,57 @@ class Xe {
       !0
     );
   }
-  getValue(t, e) {
+  getValue(a, e) {
     this._dirty && this._buildTree();
-    const r = this._tree.get(e);
-    if (!r)
-      return;
-    const a = r.search([t, t]);
-    return a.length > 0 ? a[0] : void 0;
+    const t = this._tree.search({
+      minX: a,
+      maxX: a,
+      minY: e,
+      maxY: e
+    });
+    return t.length > 0 ? t[0].ruleId : void 0;
   }
 }
-var nr = Object.defineProperty, lr = Object.getOwnPropertyDescriptor, ur = (o, t, e, r) => {
-  for (var a = r > 1 ? void 0 : r ? lr(t, e) : t, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (a = (r ? s(t, e, a) : s(a)) || a);
-  return r && a && nr(t, e, a), a;
-}, Y = (o, t) => (e, r) => t(e, r, o);
-let w = class extends $ {
-  constructor(t, e, r, a, i, s, n) {
+var aa = Object.defineProperty, ra = Object.getOwnPropertyDescriptor, ia = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? ra(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+  return t && r && aa(a, e, r), r;
+}, G = (o, a) => (e, t) => a(e, t, o);
+let F = class extends P {
+  constructor(a, e, t, r, i, s, n) {
     super();
-    f(this, "_ruleMatrixMap", /* @__PURE__ */ new Map());
-    f(this, "_validStatusChange$", new He());
-    f(this, "_ruleChange$", new He());
-    f(this, "ruleChange$", this._ruleChange$.asObservable());
-    f(this, "validStatusChange$", this._validStatusChange$.asObservable());
-    this._dataValidationModel = t, this._univerInstanceService = e, this._dataValidatorRegistryService = r, this._dataValidationCacheService = a, this._dataValidationFormulaService = i, this._dataValidationCustomFormulaService = s, this._commandService = n, this._initRuleUpdateListener(), this.disposeWithMe(() => {
+    g(this, "_ruleMatrixMap", /* @__PURE__ */ new Map());
+    g(this, "_validStatusChange$", new He());
+    g(this, "_ruleChange$", new He());
+    g(this, "ruleChange$", this._ruleChange$.asObservable());
+    g(this, "validStatusChange$", this._validStatusChange$.asObservable());
+    this._dataValidationModel = a, this._univerInstanceService = e, this._dataValidatorRegistryService = t, this._dataValidationCacheService = r, this._dataValidationFormulaService = i, this._dataValidationCustomFormulaService = s, this._commandService = n, this._initRuleUpdateListener(), this.disposeWithMe(() => {
       this._ruleChange$.complete(), this._validStatusChange$.complete();
     }), this._initUniverInstanceListener();
   }
   _initUniverInstanceListener() {
     this.disposeWithMe(
-      this._univerInstanceService.unitDisposed$.subscribe((t) => {
-        this._ruleMatrixMap.delete(t.getUnitId());
+      this._univerInstanceService.unitDisposed$.subscribe((a) => {
+        this._ruleMatrixMap.delete(a.getUnitId());
       })
     ), this.disposeWithMe(
-      this._commandService.onCommandExecuted((t) => {
-        if (t.id === Ut.id) {
-          const { unitId: e, subUnitId: r } = t.params, a = this._ruleMatrixMap.get(e);
-          a && a.delete(r);
+      this._commandService.onCommandExecuted((a) => {
+        if (a.id === at.id) {
+          const { unitId: e, subUnitId: t } = a.params, r = this._ruleMatrixMap.get(e);
+          r && r.delete(t);
         }
       })
     );
   }
   _initRuleUpdateListener() {
-    const t = this._dataValidationModel.getAll();
-    for (const [e, r] of t)
-      for (const [a, i] of r)
+    const a = this._dataValidationModel.getAll();
+    for (const [e, t] of a)
+      for (const [r, i] of t)
         for (const s of i)
-          this._addRule(e, a, s), this._ruleChange$.next({
+          this._addRule(e, r, s), this._ruleChange$.next({
             type: "add",
             unitId: e,
-            subUnitId: a,
+            subUnitId: r,
             rule: s,
             source: "patched"
           });
@@ -905,131 +521,132 @@ let w = class extends $ {
       })
     );
   }
-  _ensureRuleMatrix(t, e) {
-    let r = this._ruleMatrixMap.get(t);
-    r || (r = /* @__PURE__ */ new Map(), this._ruleMatrixMap.set(t, r));
-    let a = r.get(e);
-    return a || (a = new Xe(/* @__PURE__ */ new Map(), t, e, this._univerInstanceService), r.set(e, a)), a;
+  _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 Ge(/* @__PURE__ */ new Map(), a, e, this._univerInstanceService), t.set(e, r)), r;
   }
-  _addRuleSideEffect(t, e, r) {
-    this._ensureRuleMatrix(t, e).addRule(r), this._dataValidationCacheService.addRule(t, e, r), this._dataValidationFormulaService.addRule(t, e, r), this._dataValidationCustomFormulaService.addRule(t, e, r);
+  _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);
   }
-  _addRule(t, e, r) {
-    (Array.isArray(r) ? r : [r]).forEach((i) => {
-      this._addRuleSideEffect(t, e, i);
+  _addRule(a, e, t) {
+    (Array.isArray(t) ? t : [t]).forEach((i) => {
+      this._addRuleSideEffect(a, e, i);
     });
   }
-  _updateRule(t, e, r, a, i) {
-    const s = this._ensureRuleMatrix(t, e), n = {
-      ...a,
+  _updateRule(a, e, t, r, i) {
+    const s = this._ensureRuleMatrix(a, e), n = {
+      ...r,
       ...i.payload
     };
-    i.type === T.RANGE ? s.updateRange(r, i.payload) : i.type === T.ALL && s.updateRange(r, i.payload.ranges), this._dataValidationCacheService.removeRule(t, e, a), this._dataValidationCacheService.addRule(t, e, n), this._dataValidationFormulaService.removeRule(t, e, a.uid), this._dataValidationFormulaService.addRule(t, e, n), this._dataValidationCustomFormulaService.deleteByRuleId(t, e, r), this._dataValidationCustomFormulaService.addRule(t, e, n);
+    i.type === y.RANGE ? s.updateRange(t, i.payload) : i.type === y.ALL && s.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(t, e, r) {
-    this._ensureRuleMatrix(t, e).removeRule(r), this._dataValidationCacheService.removeRule(t, e, r), this._dataValidationCustomFormulaService.deleteByRuleId(t, e, r.uid);
+  _removeRule(a, e, t) {
+    this._ensureRuleMatrix(a, e).removeRule(t), this._dataValidationCacheService.removeRule(a, e, t), this._dataValidationCustomFormulaService.deleteByRuleId(a, e, t.uid);
   }
-  getValidator(t) {
-    return this._dataValidatorRegistryService.getValidatorItem(t);
+  getValidator(a) {
+    return this._dataValidatorRegistryService.getValidatorItem(a);
   }
-  getRuleIdByLocation(t, e, r, a) {
-    return this._ensureRuleMatrix(t, e).getValue(r, a);
+  getRuleIdByLocation(a, e, t, r) {
+    return this._ensureRuleMatrix(a, e).getValue(t, r);
   }
-  getRuleByLocation(t, e, r, a) {
-    const i = this.getRuleIdByLocation(t, e, r, a);
+  getRuleByLocation(a, e, t, r) {
+    const i = this.getRuleIdByLocation(a, e, t, r);
     if (i)
-      return this._dataValidationModel.getRuleById(t, e, i);
+      return this._dataValidationModel.getRuleById(a, e, i);
   }
-  validator(t, e, r) {
-    const { col: a, row: i, unitId: s, subUnitId: n, worksheet: l } = e, u = (_, v) => {
-      r && r(_, v), v && this._validStatusChange$.next({
+  validator(a, e, t) {
+    const { col: r, row: i, unitId: s, subUnitId: n, worksheet: l } = e, u = (_, v) => {
+      t && t(_, v), v && this._validStatusChange$.next({
         unitId: s,
         subUnitId: n,
-        ruleId: t.uid,
+        ruleId: a.uid,
         status: _,
         row: i,
-        col: a
+        col: r
       });
-    }, c = l.getCellValueOnly(i, a), d = this.getValidator(t.type), m = l.getCellRaw(i, a), g = ie(m);
-    if (d) {
-      const _ = this._dataValidationCacheService.ensureCache(s, n), v = _.getValue(i, a);
-      return v == null ? (_.setValue(i, a, x.VALIDATING), d.validator(
+    }, d = l.getCellValueOnly(i, r), c = this.getValidator(a.type), m = l.getCellRaw(i, r), p = oe(m);
+    if (c) {
+      const _ = this._dataValidationCacheService.ensureCache(s, n), v = _.getValue(i, r);
+      return v == null ? (_.setValue(i, r, D.VALIDATING), c.validator(
         {
-          value: g,
+          value: p,
           unitId: s,
           subUnitId: n,
           row: i,
-          column: a,
+          column: r,
           worksheet: e.worksheet,
           workbook: e.workbook,
-          interceptValue: ie(c),
+          interceptValue: oe(d),
           t: m == null ? void 0 : m.t
         },
-        t
-      ).then((p) => {
-        const y = p ? x.VALID : x.INVALID;
-        y === x.VALID ? _.realDeleteValue(i, a) : _.setValue(i, a, y);
-        const L = _.getValue(i, a);
-        u(y, v !== L);
-      }), x.VALIDATING) : (u(v != null ? v : x.VALID, !1), v != null ? v : x.VALID);
+        a
+      ).then((M) => {
+        const f = M ? D.VALID : D.INVALID;
+        f === D.VALID ? _.realDeleteValue(i, r) : _.setValue(i, r, f);
+        const w = _.getValue(i, r);
+        u(f, v !== w);
+      }), D.VALIDATING) : (u(v != null ? v : D.VALID, !1), v != null ? v : D.VALID);
     } else
-      return u(x.VALID, !1), x.VALID;
+      return u(D.VALID, !1), D.VALID;
   }
-  getRuleObjectMatrix(t, e) {
-    return this._ensureRuleMatrix(t, e);
+  getRuleObjectMatrix(a, e) {
+    return this._ensureRuleMatrix(a, e);
   }
-  getRuleById(t, e, r) {
-    return this._dataValidationModel.getRuleById(t, e, r);
+  getRuleById(a, e, t) {
+    return this._dataValidationModel.getRuleById(a, e, t);
   }
-  getRuleIndex(t, e, r) {
-    return this._dataValidationModel.getRuleIndex(t, e, r);
+  getRuleIndex(a, e, t) {
+    return this._dataValidationModel.getRuleIndex(a, e, t);
   }
-  getRules(t, e) {
-    return [...this._dataValidationModel.getRules(t, e)];
+  getRules(a, e) {
+    return [...this._dataValidationModel.getRules(a, e)];
   }
-  getUnitRules(t) {
-    return this._dataValidationModel.getUnitRules(t);
+  getUnitRules(a) {
+    return this._dataValidationModel.getUnitRules(a);
   }
-  deleteUnitRules(t) {
-    return this._dataValidationModel.deleteUnitRules(t);
+  deleteUnitRules(a) {
+    return this._dataValidationModel.deleteUnitRules(a);
   }
-  getSubUnitIds(t) {
-    return this._dataValidationModel.getSubUnitIds(t);
+  getSubUnitIds(a) {
+    return this._dataValidationModel.getSubUnitIds(a);
   }
   getAll() {
     return this._dataValidationModel.getAll();
   }
 };
-w = ur([
-  Y(0, R(qe)),
-  Y(1, O),
-  Y(2, R(Ge)),
-  Y(3, R(j)),
-  Y(4, R(X)),
-  Y(5, R(U)),
-  Y(6, P)
-], w);
-const Re = 1, Se = 0;
-function tt(o, t) {
-  return N.isBlank(o) ? t.t("dataValidation.validFail.value") : S(o) ? t.t("dataValidation.validFail.primitive") : "";
+F = ia([
+  G(0, R(Qe)),
+  G(1, O),
+  G(2, R(Q)),
+  G(3, R(j)),
+  G(4, R(k)),
+  G(5, R(U)),
+  G(6, x)
+], F);
+const ve = 1, Re = 0;
+function Je(o, a) {
+  return V.isBlank(o) ? a.t("dataValidation.validFail.value") : S(o) ? a.t("dataValidation.validFail.primitive") : "";
 }
-const fe = (o) => N.isDefine(o) && String(o).toLowerCase() === "true" ? "1" : String(o).toLowerCase() === "false" ? "0" : o;
-class cr extends q {
+const me = (o) => V.isDefine(o) && String(o).toLowerCase() === "true" ? "1" : String(o).toLowerCase() === "false" ? "0" : o;
+class oa extends q {
   constructor() {
     super(...arguments);
-    f(this, "id", M.CHECKBOX);
-    f(this, "title", "dataValidation.checkbox.title");
-    f(this, "operators", []);
-    f(this, "scopes", ["sheet"]);
-    f(this, "_formulaService", this.injector.get(X));
-    f(this, "skipDefaultFontRender", (e, r, a) => {
-      const { unitId: i, subUnitId: s } = a, { formula1: n, formula2: l } = this.parseFormulaSync(e, i, s), u = `${r != null ? r : ""}`;
+    g(this, "id", T.CHECKBOX);
+    g(this, "title", "dataValidation.checkbox.title");
+    g(this, "operators", []);
+    g(this, "scopes", ["sheet"]);
+    g(this, "offsetFormulaByRange", !1);
+    g(this, "_formulaService", this.injector.get(k));
+    g(this, "skipDefaultFontRender", (e, t, r) => {
+      const { unitId: i, subUnitId: s } = r, { formula1: n, formula2: l } = this.parseFormulaSync(e, i, s), u = `${t != null ? t : ""}`;
       return !u || u === `${n}` || u === `${l}`;
     });
   }
-  validatorFormula(e, r, a) {
+  validatorFormula(e, t, r) {
     const { formula1: i, formula2: s } = e, n = i === s;
-    if (N.isBlank(i) && N.isBlank(s))
+    if (V.isBlank(i) && V.isBlank(s))
       return {
         success: !0
       };
@@ -1039,49 +656,49 @@ class cr extends q {
         formula1: this.localeService.t("dataValidation.validFail.checkboxEqual"),
         formula2: this.localeService.t("dataValidation.validFail.checkboxEqual")
       };
-    const l = tt(i, this.localeService), u = tt(s, this.localeService);
+    const l = Je(i, this.localeService), u = Je(s, this.localeService);
     return {
       success: !l && !u,
       formula1: l,
       formula2: u
     };
   }
-  async parseFormula(e, r, a) {
-    var d, m, g, _;
-    const { formula1: i = Re, formula2: s = Se } = e, n = await this._formulaService.getRuleFormulaResult(r, a, e.uid), l = S(i) ? re((m = (d = n == null ? void 0 : n[0]) == null ? void 0 : d.result) == null ? void 0 : m[0][0]) : i, u = S(s) ? re((_ = (g = n == null ? void 0 : n[1]) == null ? void 0 : g.result) == null ? void 0 : _[0][0]) : s, c = F(String(l)) && F(String(u));
+  async parseFormula(e, t, r) {
+    var c, m, p, _;
+    const { formula1: i = ve, formula2: s = Re } = e, n = await this._formulaService.getRuleFormulaResult(t, r, e.uid), l = S(i) ? re((m = (c = n == null ? void 0 : n[0]) == null ? void 0 : c.result) == null ? void 0 : m[0][0]) : i, u = S(s) ? re((_ = (p = n == null ? void 0 : n[1]) == null ? void 0 : p.result) == null ? void 0 : _[0][0]) : s, d = C(String(l)) && C(String(u));
     return {
-      formula1: fe(l),
-      formula2: fe(u),
+      formula1: me(l),
+      formula2: me(u),
       originFormula1: l,
       originFormula2: u,
-      isFormulaValid: c
+      isFormulaValid: d
     };
   }
-  getExtraStyle(e, r) {
+  getExtraStyle(e, t) {
     return {
-      tb: ge.CLIP
+      tb: pe.CLIP
     };
   }
-  parseFormulaSync(e, r, a) {
-    var d, m, g, _;
-    const { formula1: i = Re, formula2: s = Se } = e, n = this._formulaService.getRuleFormulaResultSync(r, a, e.uid), l = S(i) ? re((m = (d = n == null ? void 0 : n[0]) == null ? void 0 : d.result) == null ? void 0 : m[0][0]) : i, u = S(s) ? re((_ = (g = n == null ? void 0 : n[1]) == null ? void 0 : g.result) == null ? void 0 : _[0][0]) : s, c = F(String(l)) && F(String(u));
+  parseFormulaSync(e, t, r) {
+    var c, m, p, _;
+    const { formula1: i = ve, formula2: s = Re } = e, n = this._formulaService.getRuleFormulaResultSync(t, r, e.uid), l = S(i) ? re((m = (c = n == null ? void 0 : n[0]) == null ? void 0 : c.result) == null ? void 0 : m[0][0]) : i, u = S(s) ? re((_ = (p = n == null ? void 0 : n[1]) == null ? void 0 : p.result) == null ? void 0 : _[0][0]) : s, d = C(String(l)) && C(String(u));
     return {
-      formula1: fe(l),
-      formula2: fe(u),
+      formula1: me(l),
+      formula2: me(u),
       originFormula1: l,
       originFormula2: u,
-      isFormulaValid: c
+      isFormulaValid: d
     };
   }
-  async isValidType(e, r, a) {
-    const { value: i, unitId: s, subUnitId: n } = e, { formula1: l, formula2: u, originFormula1: c, originFormula2: d } = await this.parseFormula(a, s, n);
-    return !N.isDefine(l) || !N.isDefine(u) ? !0 : N.isDefine(i) && (String(i) === String(l) || String(i) === String(u) || String(i) === String(c != null ? c : "") || String(i) === String(d != null ? d : ""));
+  async isValidType(e, t, r) {
+    const { value: i, unitId: s, subUnitId: n } = e, { formula1: l, formula2: u, originFormula1: d, originFormula2: c } = await this.parseFormula(r, s, 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 : ""));
   }
   generateRuleErrorMessage(e) {
     return this.localeService.t("dataValidation.checkbox.error");
   }
 }
-const dr = {
+const sa = {
   [h.BETWEEN]: "dataValidation.date.operators.between",
   [h.EQUAL]: "dataValidation.date.operators.equal",
   [h.GREATER_THAN]: "dataValidation.date.operators.greaterThan",
@@ -1092,7 +709,7 @@ const dr = {
   [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 hr = {
+const na = {
   [h.BETWEEN]: "dataValidation.date.ruleName.between",
   [h.EQUAL]: "dataValidation.date.ruleName.equal",
   [h.GREATER_THAN]: "dataValidation.date.ruleName.greaterThan",
@@ -1101,7 +718,7 @@ const hr = {
   [h.LESS_THAN_OR_EQUAL]: "dataValidation.date.ruleName.lessThanOrEqual",
   [h.NOT_BETWEEN]: "dataValidation.date.ruleName.notBetween",
   [h.NOT_EQUAL]: "dataValidation.date.ruleName.notEqual"
-}, mr = {
+}, la = {
   [h.BETWEEN]: "dataValidation.date.errorMsg.between",
   [h.EQUAL]: "dataValidation.date.errorMsg.equal",
   [h.GREATER_THAN]: "dataValidation.date.errorMsg.greaterThan",
@@ -1110,42 +727,42 @@ const hr = {
   [h.LESS_THAN_OR_EQUAL]: "dataValidation.date.errorMsg.lessThanOrEqual",
   [h.NOT_BETWEEN]: "dataValidation.date.errorMsg.notBetween",
   [h.NOT_EQUAL]: "dataValidation.date.errorMsg.notEqual"
-}, Ie = [
+}, Oe = [
   h.BETWEEN,
   h.NOT_BETWEEN
-], se = "{FORMULA1}", oe = "{FORMULA2}";
-function la(o) {
+], se = "{FORMULA1}", ne = "{FORMULA2}";
+function rr(o) {
   return o.filter(Boolean).join(",");
 }
-function _e(o) {
+function ge(o) {
   return o.split(",").filter(Boolean);
 }
-function ua(o) {
-  const t = ie(o);
-  return t == null ? "" : t.toString();
+function ir(o) {
+  const a = oe(o);
+  return a == null ? "" : a.toString();
 }
-function Oe(o, t, e) {
-  const { formula1: r, formula2: a } = t, i = t.ranges[0].startRow, s = t.ranges[0].startColumn, n = e.row - i, l = e.col - s, u = S(r) ? o.moveFormulaRefOffset(r, l, n, !0) : r, c = S(a) ? o.moveFormulaRefOffset(a, l, n, !0) : a;
+function we(o, a, e) {
+  const { formula1: t, formula2: r } = a, i = a.ranges[0].startRow, s = a.ranges[0].startColumn, n = e.row - i, l = e.col - s, u = S(t) ? o.moveFormulaRefOffset(t, l, n, !0) : t, d = S(r) ? o.moveFormulaRefOffset(r, l, n, !0) : r;
   return {
     transformedFormula1: u,
-    transformedFormula2: c
+    transformedFormula2: d
   };
 }
-const xe = (o) => {
-  var e, r;
+const Le = (o) => {
+  var e, t;
   if (o == null || typeof o == "boolean")
     return;
   if (typeof o == "number" || !Number.isNaN(+o))
     return +o;
-  const t = (e = k.parseDate(o)) == null ? void 0 : e.v;
-  return N.isDefine(t) ? t : (r = k.parseDate(at(o).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : r.v;
+  const a = (e = W.parseDate(o)) == null ? void 0 : e.v;
+  return V.isDefine(a) ? a : (t = W.parseDate(et(o).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : t.v;
 };
-class fr extends q {
+class ua extends q {
   constructor() {
     super(...arguments);
-    f(this, "id", M.DATE);
-    f(this, "title", "dataValidation.date.title");
-    f(this, "operators", [
+    g(this, "id", T.DATE);
+    g(this, "title", "dataValidation.date.title");
+    g(this, "operators", [
       h.BETWEEN,
       h.EQUAL,
       h.GREATER_THAN,
@@ -1155,33 +772,33 @@ class fr extends q {
       h.NOT_BETWEEN,
       h.NOT_EQUAL
     ]);
-    f(this, "scopes", ["sheet"]);
-    f(this, "_customFormulaService", this.injector.get(U));
-    f(this, "_lexerTreeBuilder", this.injector.get(Z));
+    g(this, "scopes", ["sheet"]);
+    g(this, "_customFormulaService", this.injector.get(U));
+    g(this, "_lexerTreeBuilder", this.injector.get(K));
   }
-  async parseFormula(e, r, a, i, s) {
-    const n = await this._customFormulaService.getCellFormulaValue(r, a, e.uid, i, s), l = await this._customFormulaService.getCellFormula2Value(r, a, e.uid, i, s), { formula1: u, formula2: c } = e, d = F(String(n == null ? void 0 : n.v)) && F(String(l == null ? void 0 : l.v));
+  async parseFormula(e, t, r, i, s) {
+    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, s), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, s), { formula1: u, formula2: d } = e, c = C(String(n == null ? void 0 : n.v)) && C(String(l == null ? void 0 : l.v));
     return {
-      formula1: xe(S(u) ? n == null ? void 0 : n.v : u),
-      formula2: xe(S(c) ? l == null ? void 0 : l.v : c),
-      isFormulaValid: d
+      formula1: Le(S(u) ? n == null ? void 0 : n.v : u),
+      formula2: Le(S(d) ? l == null ? void 0 : l.v : d),
+      isFormulaValid: c
     };
   }
   async isValidType(e) {
-    const { interceptValue: r, value: a } = e;
-    return typeof a == "number" && typeof r == "string" ? !0 : typeof r == "string" ? !!k.parseDate(r) : !1;
+    const { interceptValue: t, value: r } = e;
+    return typeof r == "number" && typeof t == "string" ? !0 : typeof t == "string" ? !!W.parseDate(t) : !1;
   }
   _validatorSingleFormula(e) {
-    return !N.isBlank(e) && (S(e) || !Number.isNaN(+e) || !!(e && k.parseDate(e)));
+    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e) || !!(e && W.parseDate(e)));
   }
-  validatorFormula(e, r, a) {
+  validatorFormula(e, t, r) {
     const i = e.operator;
     if (!i)
       return {
         success: !1
       };
     const s = this._validatorSingleFormula(e.formula1), n = this.localeService.t("dataValidation.validFail.date");
-    if (Ie.includes(i)) {
+    if (Oe.includes(i)) {
       const u = this._validatorSingleFormula(e.formula2);
       return {
         success: s && u,
@@ -1194,92 +811,54 @@ class fr extends q {
       formula1: s ? void 0 : n
     };
   }
-  normalizeFormula(e, r, a) {
+  normalizeFormula(e, t, r) {
     const { formula1: i, formula2: s, bizInfo: n } = e, l = (u) => {
-      var d;
+      var c;
       if (!u)
         return u;
-      let c;
+      let d;
       if (!Number.isNaN(+u))
-        c = k.dateFromSerial(+u);
+        d = W.dateFromSerial(+u);
       else {
-        const m = (d = k.parseDate(u)) == null ? void 0 : d.v;
+        const m = (c = W.parseDate(u)) == null ? void 0 : c.v;
         if (m == null)
           return "";
-        c = k.dateFromSerial(m);
+        d = W.dateFromSerial(m);
       }
-      return at(`${c[0]}/${c[1]}/${c[2]} ${c[3]}:${c[4]}:${c[5]}`).format(n != null && n.showTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD");
+      return et(`${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 {
       formula1: S(i) ? i : l(`${i}`),
       formula2: S(s) ? s : l(`${s}`)
     };
   }
-  transform(e, r, a) {
+  transform(e, t, r) {
     const { value: i } = e;
     return {
       ...e,
-      value: xe(i)
+      value: Le(i)
     };
   }
-  async validatorIsEqual(e, r, a) {
-    const { formula1: i } = r, { value: s } = e;
-    return Number.isNaN(i) ? !0 : s === i;
-  }
-  async validatorIsNotEqual(e, r, a) {
-    const { formula1: i } = r;
-    return Number.isNaN(i) ? !0 : e.value !== i;
-  }
-  async validatorIsBetween(e, r, a) {
-    const { formula1: i, formula2: s } = r;
-    if (Number.isNaN(i) || Number.isNaN(s))
-      return !0;
-    const n = Math.min(i, s), l = Math.max(i, s);
-    return e.value >= n && e.value <= l;
-  }
-  async validatorIsNotBetween(e, r, a) {
-    const { formula1: i, formula2: s } = r;
-    if (Number.isNaN(i) || Number.isNaN(s))
-      return !0;
-    const n = Math.min(i, s), l = Math.max(i, s);
-    return e.value < n || e.value > l;
-  }
-  async validatorIsGreaterThan(e, r, a) {
-    const { formula1: i } = r;
-    return Number.isNaN(i) ? !0 : e.value > i;
-  }
-  async validatorIsGreaterThanOrEqual(e, r, a) {
-    const { formula1: i } = r;
-    return Number.isNaN(i) ? !0 : e.value >= i;
-  }
-  async validatorIsLessThan(e, r, a) {
-    const { formula1: i } = r;
-    return Number.isNaN(i) ? !0 : e.value < i;
-  }
-  async validatorIsLessThanOrEqual(e, r, a) {
-    const { formula1: i } = r;
-    return Number.isNaN(i) ? !0 : e.value <= i;
-  }
   get operatorNames() {
-    return this.operators.map((e) => this.localeService.t(dr[e]));
+    return this.operators.map((e) => this.localeService.t(sa[e]));
   }
   generateRuleName(e) {
-    var a, i;
+    var r, i;
     if (!e.operator)
       return this.titleStr;
-    const r = this.localeService.t(hr[e.operator]).replace(se, (a = e.formula1) != null ? a : "").replace(oe, (i = e.formula2) != null ? i : "");
-    return `${this.titleStr} ${r}`;
+    const t = this.localeService.t(na[e.operator]).replace(se, (r = e.formula1) != null ? r : "").replace(ne, (i = e.formula2) != null ? i : "");
+    return `${this.titleStr} ${t}`;
   }
-  generateRuleErrorMessage(e, r) {
+  generateRuleErrorMessage(e, t) {
     if (!e.operator)
       return this.titleStr;
-    const { transformedFormula1: a, transformedFormula2: i } = Oe(this._lexerTreeBuilder, e, r);
-    return `${this.localeService.t(mr[e.operator]).replace(se, a != null ? a : "").replace(oe, i != null ? i : "")}`;
+    const { transformedFormula1: r, transformedFormula2: i } = we(this._lexerTreeBuilder, e, t);
+    return `${this.localeService.t(la[e.operator]).replace(se, r != null ? r : "").replace(ne, i != null ? i : "")}`;
   }
 }
 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 = {
+const dt = {
   [h.BETWEEN]: "dataValidation.errorMsg.between",
   [h.EQUAL]: "dataValidation.errorMsg.equal",
   [h.GREATER_THAN]: "dataValidation.errorMsg.greaterThan",
@@ -1289,18 +868,18 @@ const ht = {
   [h.NOT_BETWEEN]: "dataValidation.errorMsg.notBetween",
   [h.NOT_EQUAL]: "dataValidation.errorMsg.notEqual"
 };
-function Ve(o) {
-  let t = o;
-  return typeof o == "string" ? ((o.startsWith("¥") || o.startsWith("$")) && (t = o.slice(1)), +t) : +o;
+function Se(o) {
+  let a = o;
+  return typeof o == "string" ? ((o.startsWith("¥") || o.startsWith("$")) && (a = o.slice(1)), +a) : +o;
 }
-class _r extends q {
+class da extends q {
   constructor() {
     super(...arguments);
-    f(this, "_customFormulaService", this.injector.get(U));
-    f(this, "id", M.DECIMAL);
-    f(this, "_lexerTreeBuilder", this.injector.get(Z));
-    f(this, "title", "dataValidation.decimal.title");
-    f(this, "operators", [
+    g(this, "_customFormulaService", this.injector.get(U));
+    g(this, "id", T.DECIMAL);
+    g(this, "_lexerTreeBuilder", this.injector.get(K));
+    g(this, "title", "dataValidation.decimal.title");
+    g(this, "operators", [
       h.BETWEEN,
       h.EQUAL,
       h.GREATER_THAN,
@@ -1310,40 +889,40 @@ class _r extends q {
       h.NOT_BETWEEN,
       h.NOT_EQUAL
     ]);
-    f(this, "scopes", ["sheet"]);
+    g(this, "scopes", ["sheet"]);
   }
   _isFormulaOrNumber(e) {
-    return !N.isBlank(e) && (S(e) || !Number.isNaN(+e));
+    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e));
   }
-  async isValidType(e, r, a) {
+  async isValidType(e, t, r) {
     const { value: i } = e;
-    return !Number.isNaN(Ve(i));
+    return !Number.isNaN(Se(i));
   }
-  transform(e, r, a) {
+  transform(e, t, r) {
     const { value: i } = e;
     return {
       ...e,
-      value: Ve(i)
+      value: Se(i)
     };
   }
   _parseNumber(e) {
     return e == null ? Number.NaN : +e;
   }
-  async parseFormula(e, r, a, i, s) {
-    const n = await this._customFormulaService.getCellFormulaValue(r, a, e.uid, i, s), l = await this._customFormulaService.getCellFormula2Value(r, a, e.uid, i, s), { formula1: u, formula2: c } = e, d = F(String(n == null ? void 0 : n.v)) && F(String(l == null ? void 0 : l.v));
+  async parseFormula(e, t, r, i, s) {
+    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, s), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, s), { formula1: u, formula2: d } = e, c = C(String(n == null ? void 0 : n.v)) && C(String(l == null ? void 0 : l.v));
     return {
       formula1: this._parseNumber(S(u) ? n == null ? void 0 : n.v : u),
-      formula2: this._parseNumber(S(c) ? l == null ? void 0 : l.v : c),
-      isFormulaValid: d
+      formula2: this._parseNumber(S(d) ? l == null ? void 0 : l.v : d),
+      isFormulaValid: c
     };
   }
-  validatorFormula(e, r, a) {
+  validatorFormula(e, t, r) {
     const i = e.operator;
     if (!i)
       return {
         success: !1
       };
-    const s = N.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), n = N.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), l = Ie.includes(i), u = this.localeService.t("dataValidation.validFail.number");
+    const s = V.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), l = Oe.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: s && n,
       formula1: s ? void 0 : u,
@@ -1353,117 +932,80 @@ class _r extends q {
       formula1: s ? "" : u
     };
   }
-  async validatorIsEqual(e, r, a) {
-    const { formula1: i } = r, { value: s } = e;
-    return Number.isNaN(i) ? !0 : s === i;
-  }
-  async validatorIsNotEqual(e, r, a) {
-    const { formula1: i } = r;
-    return Number.isNaN(i) ? !0 : e.value !== i;
-  }
-  async validatorIsBetween(e, r, a) {
-    const { formula1: i, formula2: s } = r;
-    if (Number.isNaN(i) || Number.isNaN(s))
-      return !0;
-    const n = Math.min(i, s), l = Math.max(i, s);
-    return e.value >= n && e.value <= l;
-  }
-  async validatorIsNotBetween(e, r, a) {
-    const { formula1: i, formula2: s } = r;
-    if (Number.isNaN(i) || Number.isNaN(s))
-      return !0;
-    const n = Math.min(i, s), l = Math.max(i, s);
-    return e.value < n || e.value > l;
-  }
-  async validatorIsGreaterThan(e, r, a) {
-    const { formula1: i } = r;
-    return Number.isNaN(i) ? !0 : e.value > i;
-  }
-  async validatorIsGreaterThanOrEqual(e, r, a) {
-    const { formula1: i } = r;
-    return Number.isNaN(i) ? !0 : e.value >= i;
-  }
-  async validatorIsLessThan(e, r, a) {
-    const { formula1: i } = r;
-    return Number.isNaN(i) ? !0 : e.value < i;
-  }
-  async validatorIsLessThanOrEqual(e, r, a) {
-    const { formula1: i } = r;
-    return Number.isNaN(i) ? !0 : e.value <= i;
-  }
-  generateRuleErrorMessage(e, r) {
+  generateRuleErrorMessage(e, t) {
     if (!e.operator)
       return this.titleStr;
-    const { transformedFormula1: a, transformedFormula2: i } = Oe(this._lexerTreeBuilder, e, r);
-    return `${this.localeService.t(ht[e.operator]).replace(se, a != null ? a : "").replace(oe, i != null ? i : "")}`;
+    const { transformedFormula1: r, transformedFormula2: i } = we(this._lexerTreeBuilder, e, t);
+    return `${this.localeService.t(dt[e.operator]).replace(se, r != null ? r : "").replace(ne, i != null ? i : "")}`;
   }
 }
-function Be(o) {
+function xe(o) {
   if (!o)
     return [];
-  const t = /* @__PURE__ */ new Set();
+  const a = /* @__PURE__ */ new Set();
   return o.forEach(
     (e) => {
-      e.forEach((r) => {
+      e.forEach((t) => {
         var i, s;
-        const a = ie(r);
-        if (a != null) {
-          if (typeof a != "string" && typeof (r == null ? void 0 : r.s) == "object" && ((s = (i = r.s) == null ? void 0 : i.n) != null && s.pattern)) {
-            t.add(k.format(r.s.n.pattern, a, { throws: !1 }));
+        const r = oe(t);
+        if (r != null) {
+          if (typeof r != "string" && typeof (t == null ? void 0 : t.s) == "object" && ((s = (i = t.s) == null ? void 0 : i.n) != null && s.pattern)) {
+            a.add(W.format(t.s.n.pattern, r, { throws: !1 }));
             return;
           }
-          F(a.toString()) && t.add(a.toString());
+          C(r.toString()) && a.add(r.toString());
         }
       });
     }
-  ), [...t];
+  ), [...a];
 }
-const pr = [
+const ca = [
   "if",
   "indirect",
   "choose",
   "offset"
 ];
-function gr(o, t) {
-  if (!S(o) || ct(o.slice(1)))
+function ha(o, a) {
+  if (!S(o) || lt(o.slice(1)))
     return !0;
-  const r = t.sequenceNodesBuilder(o);
-  return r && r.some((a) => typeof a == "object" && a.nodeType === Gt.FUNCTION && pr.indexOf(a.token.toLowerCase()) > -1);
+  const t = a.sequenceNodesBuilder(o);
+  return t && t.some((r) => typeof r == "object" && r.nodeType === jt.FUNCTION && ca.indexOf(r.token.toLowerCase()) > -1);
 }
-function vr(o, t) {
-  const { formula1: e = "", ranges: r } = o;
-  if (ct(e.slice(1))) {
+function ma(o, a) {
+  const { formula1: e = "", ranges: t } = o;
+  if (lt(e.slice(1))) {
     const i = Qt(e.slice(1));
-    if ((!i.sheetName || i.sheetName === t) && r.some((s) => b.intersects(s, i.range)))
+    if ((!i.sheetName || i.sheetName === a) && t.some((s) => A.intersects(s, i.range)))
       return !0;
   }
   return !1;
 }
-class mt extends q {
+class ct extends q {
   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, "id", M.LIST);
-    f(this, "title", "dataValidation.list.title");
-    f(this, "operators", []);
-    f(this, "scopes", ["sheet"]);
-    f(this, "skipDefaultFontRender", (e) => e.renderMode !== Le.TEXT);
-  }
-  validatorFormula(e, r, a) {
-    var u, c, d;
-    const i = !N.isBlank(e.formula1), s = gr((u = e.formula1) != null ? u : "", this._lexer), n = (d = (c = this._univerInstanceService.getUnit(r, C.UNIVER_SHEET)) == null ? void 0 : c.getSheetBySheetId(a)) == null ? void 0 : d.getName(), l = vr(e, n != null ? n : "");
+    g(this, "formulaService", this.injector.get(k));
+    g(this, "_lexer", this.injector.get(K));
+    g(this, "_univerInstanceService", this.injector.get(O));
+    g(this, "offsetFormulaByRange", !1);
+    g(this, "id", T.LIST);
+    g(this, "title", "dataValidation.list.title");
+    g(this, "operators", []);
+    g(this, "scopes", ["sheet"]);
+    g(this, "skipDefaultFontRender", (e) => e.renderMode !== be.TEXT);
+  }
+  validatorFormula(e, t, r) {
+    var u, d, c;
+    const i = !V.isBlank(e.formula1), s = ha((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 = ma(e, n != null ? n : "");
     return {
       success: !!(i && s && !l),
       formula1: i ? s ? l ? this.localeService.t("dataValidation.validFail.listIntersects") : void 0 : this.localeService.t("dataValidation.validFail.listInvalid") : this.localeService.t("dataValidation.validFail.list")
     };
   }
-  getExtraStyle(e, r, { style: a }) {
+  getExtraStyle(e, t, { style: r }) {
     var s;
-    const i = (s = a.tb !== ge.OVERFLOW ? a.tb : ge.CLIP) != null ? s : ge.WRAP;
-    if (e.type === M.LIST && (e.renderMode === Le.ARROW || e.renderMode === Le.TEXT)) {
-      const n = this.getListWithColorMap(e), l = `${r != null ? r : ""}`, u = n[l];
+    const i = (s = r.tb !== pe.OVERFLOW ? r.tb : pe.CLIP) != null ? s : pe.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)
         return {
           bg: {
@@ -1477,21 +1019,22 @@ class mt extends q {
     };
   }
   parseCellValue(e) {
-    const r = e.toString();
-    return _e(r);
+    const t = e.toString();
+    return ge(t);
   }
-  async parseFormula(e, r, a) {
-    var u, c, d, m;
-    const { formula1: i = "" } = e, s = await this.formulaService.getRuleFormulaResult(r, a, e.uid), n = re((c = (u = s == null ? void 0 : s[0]) == null ? void 0 : u.result) == null ? void 0 : c[0][0]), l = F(String(n));
+  async parseFormula(e, t, r) {
+    var l, u;
+    const i = await this.formulaService.getRuleFormulaResult(t, r, e.uid), s = re((u = (l = i == null ? void 0 : i[0]) == null ? void 0 : l.result) == null ? void 0 : u[0][0]);
     return {
-      formula1: S(i) ? Be((m = (d = s == null ? void 0 : s[0]) == null ? void 0 : d.result) == null ? void 0 : m[0][0]) : _e(i),
+      formula1: void 0,
       formula2: void 0,
-      isFormulaValid: l
+      isFormulaValid: C(String(s))
     };
   }
-  async isValidType(e, r, a) {
-    const { value: i } = e, { formula1: s = [] } = r;
-    return this.parseCellValue(i).every((l) => s.includes(l));
+  async isValidType(e, t, r) {
+    var m, p;
+    const { value: i, unitId: s, subUnitId: n } = e, { formula1: l = "" } = r, u = await this.formulaService.getRuleFormulaResult(s, n, r.uid), d = S(l) ? xe((p = (m = u == null ? void 0 : u[0]) == null ? void 0 : m.result) == null ? void 0 : p[0][0]) : ge(l);
+    return this.parseCellValue(i).every((_) => d.includes(_));
   }
   generateRuleName() {
     return this.localeService.t("dataValidation.list.name");
@@ -1499,42 +1042,42 @@ class mt extends q {
   generateRuleErrorMessage() {
     return this.localeService.t("dataValidation.list.error");
   }
-  getList(e, r, a) {
-    var m, g, _, v;
-    const { formula1: i = "" } = e, s = this.injector.get(O), n = (m = r ? s.getUniverSheetInstance(r) : void 0) != null ? m : s.getCurrentUnitForType(C.UNIVER_SHEET);
+  getList(e, t, r) {
+    var m, p, _, v;
+    const { formula1: i = "" } = e, s = this.injector.get(O), n = (m = t ? s.getUniverSheetInstance(t) : void 0) != null ? m : s.getCurrentUnitForType(N.UNIVER_SHEET);
     if (!n) return [];
-    const l = (g = a ? n.getSheetBySheetId(a) : void 0) != null ? g : n.getActiveSheet();
+    const l = (p = r ? n.getSheetBySheetId(r) : void 0) != null ? p : n.getActiveSheet();
     if (!l) return [];
-    const u = n.getUnitId(), c = l.getSheetId(), d = this.formulaService.getRuleFormulaResultSync(u, c, e.uid);
-    return S(i) ? Be((v = (_ = d == null ? void 0 : d[0]) == null ? void 0 : _.result) == null ? void 0 : v[0][0]) : _e(i);
+    const u = n.getUnitId(), d = l.getSheetId(), c = this.formulaService.getRuleFormulaResultSync(u, d, e.uid);
+    return S(i) ? xe((v = (_ = c == null ? void 0 : c[0]) == null ? void 0 : _.result) == null ? void 0 : v[0][0]) : ge(i);
   }
-  async getListAsync(e, r, a) {
-    var m, g, _, v;
-    const { formula1: i = "" } = e, s = this.injector.get(O), n = (m = r ? s.getUniverSheetInstance(r) : void 0) != null ? m : s.getCurrentUnitForType(C.UNIVER_SHEET);
+  async getListAsync(e, t, r) {
+    var m, p, _, v;
+    const { formula1: i = "" } = e, s = this.injector.get(O), n = (m = t ? s.getUniverSheetInstance(t) : void 0) != null ? m : s.getCurrentUnitForType(N.UNIVER_SHEET);
     if (!n) return [];
-    const l = (g = a ? n.getSheetBySheetId(a) : void 0) != null ? g : n.getActiveSheet();
+    const l = (p = r ? n.getSheetBySheetId(r) : void 0) != null ? p : n.getActiveSheet();
     if (!l) return [];
-    const u = n.getUnitId(), c = l.getSheetId(), d = await this.formulaService.getRuleFormulaResult(u, c, e.uid);
-    return S(i) ? Be((v = (_ = d == null ? void 0 : d[0]) == null ? void 0 : _.result) == null ? void 0 : v[0][0]) : _e(i);
+    const u = n.getUnitId(), d = l.getSheetId(), c = await this.formulaService.getRuleFormulaResult(u, d, e.uid);
+    return S(i) ? xe((v = (_ = c == null ? void 0 : c[0]) == null ? void 0 : _.result) == null ? void 0 : v[0][0]) : ge(i);
   }
-  getListWithColor(e, r, a) {
-    const i = this.getList(e, r, a), s = (e.formula2 || "").split(",");
+  getListWithColor(e, t, r) {
+    const i = this.getList(e, t, r), s = (e.formula2 || "").split(",");
     return i.map((n, l) => ({ label: n, color: s[l] }));
   }
-  getListWithColorMap(e, r, a) {
-    const i = this.getListWithColor(e, r, a), s = {};
+  getListWithColorMap(e, t, r) {
+    const i = this.getListWithColor(e, t, r), s = {};
     return i.forEach((n) => {
       n.color && (s[n.label] = n.color);
     }), s;
   }
 }
-class Rr extends q {
+class ga extends q {
   constructor() {
     super(...arguments);
-    f(this, "id", M.TEXT_LENGTH);
-    f(this, "title", "dataValidation.textLength.title");
-    f(this, "_lexerTreeBuilder", this.injector.get(Z));
-    f(this, "operators", [
+    g(this, "id", T.TEXT_LENGTH);
+    g(this, "title", "dataValidation.textLength.title");
+    g(this, "_lexerTreeBuilder", this.injector.get(K));
+    g(this, "operators", [
       h.BETWEEN,
       h.EQUAL,
       h.GREATER_THAN,
@@ -1544,19 +1087,19 @@ class Rr extends q {
       h.NOT_BETWEEN,
       h.NOT_EQUAL
     ]);
-    f(this, "scopes", ["sheet"]);
-    f(this, "_customFormulaService", this.injector.get(U));
+    g(this, "scopes", ["sheet"]);
+    g(this, "_customFormulaService", this.injector.get(U));
   }
   _isFormulaOrInt(e) {
-    return !N.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
   }
-  validatorFormula(e, r, a) {
+  validatorFormula(e, t, r) {
     const i = e.operator;
     if (!i)
       return {
         success: !1
       };
-    const s = N.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = N.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Ie.includes(i), u = this.localeService.t("dataValidation.validFail.number");
+    const s = V.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Oe.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: s && n,
       formula1: s ? void 0 : u,
@@ -1569,881 +1112,584 @@ class Rr extends q {
   _parseNumber(e) {
     return e == null ? Number.NaN : +e;
   }
-  _isValidFormula(e) {
-    return !Number.isNaN(e);
-  }
-  async parseFormula(e, r, a, i, s) {
-    const n = await this._customFormulaService.getCellFormulaValue(r, a, e.uid, i, s), l = await this._customFormulaService.getCellFormula2Value(r, a, e.uid, i, s), { formula1: u, formula2: c } = e, d = F(String(n == null ? void 0 : n.v)) && F(String(l == null ? void 0 : l.v));
+  async parseFormula(e, t, r, i, s) {
+    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, s), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, s), { formula1: u, formula2: d } = e, c = C(String(n == null ? void 0 : n.v)) && C(String(l == null ? void 0 : l.v));
     return {
       formula1: this._parseNumber(S(u) ? n == null ? void 0 : n.v : u),
-      formula2: this._parseNumber(S(c) ? l == null ? void 0 : l.v : c),
-      isFormulaValid: d
+      formula2: this._parseNumber(S(d) ? l == null ? void 0 : l.v : d),
+      isFormulaValid: c
     };
   }
-  transform(e, r, a) {
+  transform(e, t, r) {
     return {
       ...e,
       value: e.value.toString().length
     };
   }
-  async isValidType(e, r, a) {
+  async isValidType(e, t, r) {
     const { value: i } = e;
     return typeof i == "string" || typeof i == "number";
   }
-  async validatorIsEqual(e, r, a) {
-    const { formula1: i } = r;
-    return N.isDefine(i) ? e.value === i : !1;
-  }
-  async validatorIsNotEqual(e, r, a) {
-    const { formula1: i } = r;
-    return N.isDefine(i) ? e.value !== i : !1;
-  }
-  async validatorIsBetween(e, r, a) {
-    const { formula1: i, formula2: s } = r, { value: n } = e;
-    if (!this._isValidFormula(i) || !this._isValidFormula(s))
-      return !1;
-    const l = Math.max(i, s), u = Math.min(i, s);
-    return n >= u && n <= l;
-  }
-  async validatorIsNotBetween(e, r, a) {
-    const { formula1: i, formula2: s } = r, { value: n } = e;
-    if (!this._isValidFormula(i) || !this._isValidFormula(s))
-      return !1;
-    const l = Math.max(i, s), u = Math.min(i, s);
-    return n < u || n > l;
-  }
-  async validatorIsGreaterThan(e, r, a) {
-    const { formula1: i } = r, { value: s } = e;
-    return this._isValidFormula(i) ? s > i : !1;
-  }
-  async validatorIsGreaterThanOrEqual(e, r, a) {
-    const { formula1: i } = r, { value: s } = e;
-    return this._isValidFormula(i) ? s >= i : !1;
-  }
-  async validatorIsLessThan(e, r, a) {
-    const { formula1: i } = r, { value: s } = e;
-    return this._isValidFormula(i) ? s < i : !1;
-  }
-  async validatorIsLessThanOrEqual(e, r, a) {
-    const { formula1: i } = r, { value: s } = e;
-    return this._isValidFormula(i) ? s <= i : !1;
-  }
-  generateRuleErrorMessage(e, r) {
+  generateRuleErrorMessage(e, t) {
     if (!e.operator)
       return this.titleStr;
-    const { transformedFormula1: a, transformedFormula2: i } = Oe(this._lexerTreeBuilder, e, r);
-    return `${this.localeService.t(Dt[e.operator]).replace(se, a != null ? a : "").replace(oe, i != null ? i : "")}`;
+    const { transformedFormula1: r, transformedFormula2: i } = we(this._lexerTreeBuilder, e, t);
+    return `${this.localeService.t(At[e.operator]).replace(se, r != null ? r : "").replace(ne, i != null ? i : "")}`;
   }
 }
-function ft(o) {
-  var e, r;
-  return o ? o.p ? !((r = (e = o.p.body) == null ? void 0 : e.dataStream) != null ? r : "").slice(0, -2).trim() : N.isBlank(o.v) : !0;
+function ht(o) {
+  var e, t;
+  return o ? o.p ? !((t = (e = o.p.body) == null ? void 0 : e.dataStream) != null ? t : "").slice(0, -2).trim() : V.isBlank(o.v) : !0;
 }
-function be(o, t, e, r, a = "command", i = !0) {
-  const s = r.get(Z), n = [], l = [], u = r.get(w), c = r.get(O), d = Qe(c, { unitId: o, subUnitId: t });
-  if (!d)
+function Ie(o, a, e, t, r = "command", i = !0) {
+  const s = t.get(K), n = t.get(Q), l = [], u = [], d = t.get(F), c = t.get(O), m = qe(c, { unitId: o, subUnitId: a });
+  if (!m)
     return {
-      redoMutations: n,
-      undoMutations: l
+      redoMutations: l,
+      undoMutations: u
     };
-  const { worksheet: m } = d, g = new ve();
-  let _ = !1;
-  function v(p, y) {
-    i && p.forEach((L) => {
-      A.foreach(L, (H, G) => {
-        const W = m.getCellRaw(H, G), J = dt(W);
-        (ft(W) || J === y) && (_ = !0, g.setValue(H, G, {
-          v: y,
+  const { worksheet: p } = m, _ = new fe();
+  let v = !1;
+  function M(f, w) {
+    i && f.forEach(($) => {
+      b.foreach($, (B, H) => {
+        const z = p.getCellRaw(B, H), Z = ut(z);
+        (ht(z) || Z === w) && (v = !0, _.setValue(B, H, {
+          v: w,
           p: null
         }));
       });
     });
   }
-  if (e.forEach((p) => {
-    switch (p.type) {
+  if (e.forEach((f) => {
+    switch (f.type) {
       case "delete":
-        n.push({
-          id: D.id,
+        l.push({
+          id: I.id,
           params: {
             unitId: o,
-            subUnitId: t,
-            ruleId: p.rule.uid,
-            source: a
+            subUnitId: a,
+            ruleId: f.rule.uid,
+            source: r
           }
-        }), l.unshift({
-          id: B.id,
+        }), u.unshift({
+          id: L.id,
           params: {
             unitId: o,
-            subUnitId: t,
-            rule: p.rule,
-            index: p.index,
-            source: a
+            subUnitId: a,
+            rule: f.rule,
+            index: f.index,
+            source: r
           }
         });
         break;
       case "update": {
-        if (ne(p.rule.type)) {
-          const L = p.oldRanges[0].startRow, H = p.oldRanges[0].startColumn, G = p.newRanges[0].startRow, W = p.newRanges[0].startColumn, J = G - L, le = W - H, ue = S(p.rule.formula1) ? s.moveFormulaRefOffset(p.rule.formula1, le, J) : p.rule.formula1, ce = S(p.rule.formula2) ? s.moveFormulaRefOffset(p.rule.formula2, le, J) : p.rule.formula2;
-          (ue !== p.rule.formula1 || ce !== p.rule.formula2 || !it(p.newRanges, p.oldRanges)) && (n.push({
-            id: I.id,
+        if (le(f.rule.type, n)) {
+          const $ = f.oldRanges[0].startRow, B = f.oldRanges[0].startColumn, H = f.newRanges[0].startRow, z = f.newRanges[0].startColumn, Z = H - $, ue = z - B, de = S(f.rule.formula1) ? s.moveFormulaRefOffset(f.rule.formula1, ue, Z) : f.rule.formula1, ce = S(f.rule.formula2) ? s.moveFormulaRefOffset(f.rule.formula2, ue, Z) : f.rule.formula2;
+          de !== f.rule.formula1 || ce !== f.rule.formula2 || !tt(f.newRanges, f.oldRanges) ? (l.push({
+            id: E.id,
             params: {
               unitId: o,
-              subUnitId: t,
-              ruleId: p.ruleId,
+              subUnitId: a,
+              ruleId: f.ruleId,
               payload: {
-                type: T.ALL,
+                type: y.ALL,
                 payload: {
-                  formula1: ue,
+                  formula1: de,
                   formula2: ce,
-                  ranges: p.newRanges
+                  ranges: f.newRanges
                 }
               }
             }
-          }), l.unshift({
-            id: I.id,
+          }), u.unshift({
+            id: E.id,
             params: {
               unitId: o,
-              subUnitId: t,
-              ruleId: p.ruleId,
+              subUnitId: a,
+              ruleId: f.ruleId,
               payload: {
-                type: T.ALL,
+                type: y.ALL,
                 payload: {
-                  formula1: p.rule.formula1,
-                  formula2: p.rule.formula2,
-                  ranges: p.oldRanges
+                  formula1: f.rule.formula1,
+                  formula2: f.rule.formula2,
+                  ranges: f.oldRanges
                 }
               }
             }
+          })) : (l.push({
+            id: E.id,
+            params: {
+              unitId: o,
+              subUnitId: a,
+              ruleId: f.ruleId,
+              payload: {
+                type: y.RANGE,
+                payload: f.newRanges
+              },
+              source: r
+            }
+          }), u.unshift({
+            id: E.id,
+            params: {
+              unitId: o,
+              subUnitId: a,
+              ruleId: f.ruleId,
+              payload: {
+                type: y.RANGE,
+                payload: f.oldRanges
+              },
+              source: r
+            }
           }));
         } else
-          n.push({
-            id: I.id,
+          l.push({
+            id: E.id,
             params: {
               unitId: o,
-              subUnitId: t,
-              ruleId: p.ruleId,
+              subUnitId: a,
+              ruleId: f.ruleId,
               payload: {
-                type: T.RANGE,
-                payload: p.newRanges
+                type: y.RANGE,
+                payload: f.newRanges
               },
-              source: a
+              source: r
             }
-          }), l.unshift({
-            id: I.id,
+          }), u.unshift({
+            id: E.id,
             params: {
               unitId: o,
-              subUnitId: t,
-              ruleId: p.ruleId,
+              subUnitId: a,
+              ruleId: f.ruleId,
               payload: {
-                type: T.RANGE,
-                payload: p.oldRanges
+                type: y.RANGE,
+                payload: f.oldRanges
               },
-              source: a
+              source: r
             }
           });
-        const y = u.getRuleById(o, t, p.ruleId);
-        if (y && y.type === M.CHECKBOX) {
-          const H = u.getValidator(M.CHECKBOX).parseFormulaSync(y, o, t);
-          v(p.newRanges, H.formula2);
+        const w = d.getRuleById(o, a, f.ruleId);
+        if (w && w.type === T.CHECKBOX) {
+          const B = d.getValidator(T.CHECKBOX).parseFormulaSync(w, o, a);
+          M(f.newRanges, B.formula2);
         }
         break;
       }
       case "add": {
-        if (n.push({
-          id: B.id,
+        if (l.push({
+          id: L.id,
           params: {
             unitId: o,
-            subUnitId: t,
-            rule: p.rule,
-            source: a
+            subUnitId: a,
+            rule: f.rule,
+            source: r
           }
-        }), l.unshift({
-          id: D.id,
+        }), u.unshift({
+          id: I.id,
           params: {
             unitId: o,
-            subUnitId: t,
-            ruleId: p.rule.uid,
-            source: a
+            subUnitId: a,
+            ruleId: f.rule.uid,
+            source: r
           }
-        }), p.rule.type === M.CHECKBOX) {
-          const L = u.getValidator(M.CHECKBOX).parseFormulaSync(p.rule, o, t);
-          v(p.rule.ranges, L.originFormula2);
+        }), f.rule.type === T.CHECKBOX) {
+          const $ = d.getValidator(T.CHECKBOX).parseFormulaSync(f.rule, o, a);
+          M(f.rule.ranges, $.originFormula2);
         }
         break;
       }
     }
-  }), _) {
-    const p = {
-      id: ae.id,
+  }), v) {
+    const f = {
+      id: ie.id,
       params: {
         unitId: o,
-        subUnitId: t,
-        cellValue: g.getData()
+        subUnitId: a,
+        cellValue: _.getData()
       }
-    }, y = {
-      id: ae.id,
-      params: st(r, p.params)
+    }, w = {
+      id: ie.id,
+      params: rt(t, f.params)
     };
-    n.push(p), l.push(y);
+    l.push(f), u.push(w);
   }
   return {
-    redoMutations: n,
-    undoMutations: l
+    redoMutations: l,
+    undoMutations: u
   };
 }
-const Sr = {
-  type: K.COMMAND,
+const _a = {
+  type: Y.COMMAND,
   id: "sheet.command.updateDataValidationRuleRange",
-  handler(o, t) {
-    if (!t)
+  handler(o, a) {
+    if (!a)
       return !1;
-    const { unitId: e, subUnitId: r, ranges: a, ruleId: i } = t, s = o.get(w), n = o.get(P), l = o.get(z);
-    if (!s.getRuleById(e, r, i))
+    const { unitId: e, subUnitId: t, ranges: r, ruleId: i } = a, s = o.get(F), n = o.get(x), l = o.get(X);
+    if (!s.getRuleById(e, t, i))
       return !1;
-    const c = s.getRuleObjectMatrix(e, r).clone();
-    c.updateRange(i, a);
-    const d = c.diff(s.getRules(e, r)), { redoMutations: m, undoMutations: g } = be(e, r, d, o);
+    const d = s.getRuleObjectMatrix(e, t).clone();
+    d.updateRange(i, r);
+    const c = d.diff(s.getRules(e, t)), { redoMutations: m, undoMutations: p } = Ie(e, t, c, o);
     return l.pushUndoRedo({
-      undoMutations: g,
+      undoMutations: p,
       redoMutations: m,
       unitID: e
     }), Ce(m, n), !0;
   }
-}, Vr = {
-  type: K.COMMAND,
+}, pa = {
+  type: Y.COMMAND,
   id: "sheet.command.addDataValidation",
-  handler(o, t) {
-    if (!t)
+  handler(o, a) {
+    if (!a)
       return !1;
-    const { unitId: e, subUnitId: r, rule: a } = t, i = o.get(w), s = o.get(P), n = o.get(z), l = i.getRuleObjectMatrix(e, r).clone();
-    l.addRule(a);
-    const u = l.diff(i.getRules(e, r)), c = i.getValidator(a.type), d = {
+    const { unitId: e, subUnitId: t, rule: r } = a, i = o.get(F), s = o.get(x), n = o.get(X), 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: r,
+      subUnitId: t,
       rule: {
-        ...a,
-        ...c == null ? void 0 : c.normalizeFormula(a, e, r)
+        ...r,
+        ...d == null ? void 0 : d.normalizeFormula(r, e, t)
       }
-    }, { redoMutations: m, undoMutations: g } = be(e, r, u, o);
+    }, { redoMutations: m, undoMutations: p } = Ie(e, t, u, o);
     return m.push({
-      id: B.id,
-      params: d
-    }), g.unshift({
-      id: D.id,
+      id: L.id,
+      params: c
+    }), p.unshift({
+      id: I.id,
       params: {
         unitId: e,
-        subUnitId: r,
-        ruleId: a.uid
+        subUnitId: t,
+        ruleId: r.uid
       }
     }), n.pushUndoRedo({
       unitID: e,
       redoMutations: m,
-      undoMutations: g
+      undoMutations: p
     }), Ce(m, s), !0;
   }
-}, Nr = {
-  type: K.COMMAND,
+}, fa = {
+  type: Y.COMMAND,
   id: "sheets.command.update-data-validation-setting",
   // eslint-disable-next-line max-lines-per-function
-  handler(o, t) {
-    if (!t)
-      return !1;
-    const e = o.get(P), r = o.get(z), a = o.get(w), i = o.get(Ge), { unitId: s, subUnitId: n, ruleId: l, setting: u } = t, c = i.getValidatorItem(u.type);
-    if (!c)
+  handler(o, a) {
+    if (!a)
       return !1;
-    const d = a.getRuleById(s, n, l);
+    const e = o.get(x), t = o.get(X), r = o.get(F), i = o.get(Q), { unitId: s, subUnitId: n, ruleId: l, setting: u } = a, d = i.getValidatorItem(u.type);
     if (!d)
       return !1;
-    const m = { ...d, ...u };
-    if (!c.validatorFormula(m, s, n).success)
+    const c = r.getRuleById(s, n, l);
+    if (!c)
+      return !1;
+    const m = { ...c, ...u };
+    if (!d.validatorFormula(m, s, n).success)
       return !1;
-    const g = {
+    const p = {
       unitId: s,
       subUnitId: n,
       ruleId: l,
       payload: {
-        type: T.SETTING,
+        type: y.SETTING,
         payload: {
           ...u,
-          ...c.normalizeFormula(m, s, n)
+          ...d.normalizeFormula(m, s, n)
         }
       }
     }, _ = [{
-      id: I.id,
-      params: g
+      id: E.id,
+      params: p
     }], v = {
       unitId: s,
       subUnitId: n,
       ruleId: l,
       payload: {
-        type: T.SETTING,
-        payload: Lt(d)
+        type: y.SETTING,
+        payload: Dt(c)
       }
-    }, p = [{
-      id: I.id,
+    }, M = [{
+      id: E.id,
       params: v
     }];
-    if (u.type === M.CHECKBOX) {
-      const L = d.ranges, H = o.get(O), G = Qe(H, { unitId: s, subUnitId: n });
-      if (G) {
-        const W = new ve(), { worksheet: J } = G, { formula2: le = Se, formula1: ue = Re } = d, { formula2: ce = Se, formula1: vt = Re } = u;
-        L.forEach((St) => {
-          A.foreach(St, (Ae, De) => {
-            const ze = J.getCellRaw(Ae, De), Ze = dt(ze);
-            ft(ze) || Ze === String(le) ? W.setValue(Ae, De, {
-              v: ce,
+    if (u.type === T.CHECKBOX) {
+      const w = c.ranges, $ = o.get(O), B = qe($, { unitId: s, subUnitId: n });
+      if (B) {
+        const H = new fe(), { worksheet: z } = B, { formula2: Z = Re, formula1: ue = ve } = c, { formula2: de = Re, formula1: ce = ve } = u;
+        w.forEach((ft) => {
+          b.foreach(ft, (Ae, De) => {
+            const Ye = z.getCellRaw(Ae, De), Xe = ut(Ye);
+            ht(Ye) || Xe === String(Z) ? H.setValue(Ae, De, {
+              v: de,
               p: null
-            }) : Ze === String(ue) && W.setValue(Ae, De, {
-              v: vt,
+            }) : Xe === String(ue) && H.setValue(Ae, De, {
+              v: ce,
               p: null
             });
           });
         });
-        const Ke = {
-          id: ae.id,
+        const ke = {
+          id: ie.id,
           params: {
             unitId: s,
             subUnitId: n,
-            cellValue: W.getData()
+            cellValue: H.getData()
           }
-        }, Rt = {
-          id: ae.id,
-          params: st(o, Ke.params)
+        }, pt = {
+          id: ie.id,
+          params: rt(o, ke.params)
         };
-        _.push(Ke), p.push(Rt);
+        _.push(ke), M.push(pt);
       }
     }
-    return Ce(_, e).result ? (r.pushUndoRedo({
+    return Ce(_, e).result ? (t.pushUndoRedo({
       unitID: s,
       redoMutations: _,
-      undoMutations: p
+      undoMutations: M
     }), !0) : !1;
   }
-}, Mr = {
-  type: K.COMMAND,
+}, va = {
+  type: Y.COMMAND,
   id: "sheets.command.update-data-validation-options",
-  handler(o, t) {
-    if (!t)
+  handler(o, a) {
+    if (!a)
       return !1;
-    const e = o.get(P), r = o.get(z), a = o.get(w), { unitId: i, subUnitId: s, ruleId: n, options: l } = t, u = a.getRuleById(i, s, n);
+    const e = o.get(x), t = o.get(X), r = o.get(F), { unitId: i, subUnitId: s, ruleId: n, options: l } = a, u = r.getRuleById(i, s, n);
     if (!u)
       return !1;
-    const c = {
+    const d = {
       unitId: i,
       subUnitId: s,
       ruleId: n,
       payload: {
-        type: T.OPTIONS,
+        type: y.OPTIONS,
         payload: l
       }
-    }, d = [{
-      id: I.id,
-      params: c
+    }, c = [{
+      id: E.id,
+      params: d
     }], m = {
       unitId: i,
       subUnitId: s,
       ruleId: n,
       payload: {
-        type: T.OPTIONS,
-        payload: xt(u)
+        type: y.OPTIONS,
+        payload: bt(u)
       }
-    }, g = [{
-      id: I.id,
+    }, p = [{
+      id: E.id,
       params: m
     }];
-    return r.pushUndoRedo({
+    return t.pushUndoRedo({
       unitID: i,
-      redoMutations: d,
-      undoMutations: g
-    }), e.executeCommand(I.id, c), !0;
+      redoMutations: c,
+      undoMutations: p
+    }), e.executeCommand(E.id, d), !0;
   }
-}, yr = {
-  type: K.COMMAND,
+}, Ra = {
+  type: Y.COMMAND,
   id: "sheets.command.clear-range-data-validation",
-  handler(o, t) {
-    if (!t)
+  handler(o, a) {
+    if (!a)
       return !1;
-    const { unitId: e, subUnitId: r, ranges: a } = t, i = o.get(P), s = o.get(O), n = Qe(s, { unitId: e, subUnitId: r }), l = o.get(w);
+    const { unitId: e, subUnitId: t, ranges: r } = a, i = o.get(x), s = o.get(O), n = qe(s, { unitId: e, subUnitId: t }), l = o.get(F);
     if (!n) return !1;
-    const u = o.get(z), c = l.getRuleObjectMatrix(e, r).clone();
-    c.removeRange(a);
-    const d = c.diff(l.getRules(e, r)), { redoMutations: m, undoMutations: g } = be(e, r, d, o);
+    const u = o.get(X), d = l.getRuleObjectMatrix(e, t).clone();
+    d.removeRange(r);
+    const c = d.diff(l.getRules(e, t)), { redoMutations: m, undoMutations: p } = Ie(e, t, c, o);
     return u.pushUndoRedo({
       unitID: e,
       redoMutations: m,
-      undoMutations: g
+      undoMutations: p
     }), Ce(m, i).result;
   }
-}, Er = {
-  type: K.COMMAND,
+}, Sa = {
+  type: Y.COMMAND,
   id: "sheet.command.remove-all-data-validation",
-  handler(o, t) {
-    if (!t)
+  handler(o, a) {
+    if (!a)
       return !1;
-    const { unitId: e, subUnitId: r } = t, a = o.get(P), i = o.get(w), s = o.get(z), n = [...i.getRules(e, r)], l = {
+    const { unitId: e, subUnitId: t } = a, r = o.get(x), i = o.get(F), s = o.get(X), n = [...i.getRules(e, t)], l = {
       unitId: e,
-      subUnitId: r,
-      ruleId: n.map((d) => d.uid)
+      subUnitId: t,
+      ruleId: n.map((c) => c.uid)
     }, u = [{
-      id: D.id,
+      id: I.id,
       params: l
-    }], c = [{
-      id: B.id,
+    }], d = [{
+      id: L.id,
       params: {
         unitId: e,
-        subUnitId: r,
+        subUnitId: t,
         rule: n
       }
     }];
     return s.pushUndoRedo({
       redoMutations: u,
-      undoMutations: c,
+      undoMutations: d,
       unitID: e
-    }), a.executeCommand(D.id, l), !0;
+    }), r.executeCommand(I.id, l), !0;
   }
-}, wr = (o, t) => {
-  const e = o.get(w), { unitId: r, subUnitId: a, ruleId: i, source: s } = t;
+}, Va = (o, a) => {
+  const e = o.get(F), { unitId: t, subUnitId: r, ruleId: i, source: s } = a;
   if (Array.isArray(i)) {
-    const l = i.map((u) => e.getRuleById(r, a, u)).filter(Boolean);
+    const l = i.map((u) => e.getRuleById(t, r, u)).filter(Boolean);
     return [{
-      id: B.id,
+      id: L.id,
       params: {
-        unitId: r,
-        subUnitId: a,
+        unitId: t,
+        subUnitId: r,
         rule: l,
         source: s
       }
     }];
   }
   return [{
-    id: B.id,
+    id: L.id,
     params: {
-      unitId: r,
-      subUnitId: a,
+      unitId: t,
+      subUnitId: r,
       rule: {
-        ...e.getRuleById(r, a, i)
+        ...e.getRuleById(t, r, i)
       },
-      index: e.getRuleIndex(r, a, i)
+      index: e.getRuleIndex(t, r, i)
     }
   }];
-}, Tr = {
-  type: K.COMMAND,
+}, Ma = {
+  type: Y.COMMAND,
   id: "sheet.command.remove-data-validation-rule",
-  handler(o, t) {
-    if (!t)
+  handler(o, a) {
+    if (!a)
       return !1;
-    const { unitId: e, subUnitId: r, ruleId: a } = t, i = o.get(P), s = o.get(z), n = o.get(w), l = [{
-      id: D.id,
-      params: t
+    const { unitId: e, subUnitId: t, ruleId: r } = a, i = o.get(x), s = o.get(X), n = o.get(F), l = [{
+      id: I.id,
+      params: a
     }], u = [{
-      id: B.id,
+      id: L.id,
       params: {
         unitId: e,
-        subUnitId: r,
+        subUnitId: t,
         rule: {
-          ...n.getRuleById(e, r, a)
+          ...n.getRuleById(e, t, r)
         },
-        index: n.getRuleIndex(e, r, a)
+        index: n.getRuleIndex(e, t, r)
       }
     }];
     return s.pushUndoRedo({
       undoMutations: u,
       redoMutations: l,
-      unitID: t.unitId
-    }), i.executeCommand(D.id, t), !0;
-  }
-}, Fr = "sheets-data-validation.config", Cr = {};
-class Ir extends q {
-  constructor() {
-    super(...arguments);
-    f(this, "id", M.ANY);
-    f(this, "title", "dataValidation.any.title");
-    f(this, "operators", []);
-    f(this, "scopes", ["sheet"]);
-  }
-  async parseFormula(e, r, a) {
-    return {
-      formula1: e.formula1,
-      formula2: e.formula2,
-      isFormulaValid: !0
-    };
-  }
-  validatorFormula(e, r, a) {
-    return {
-      success: !0
-    };
-  }
-  async isValidType(e, r, a) {
-    return !0;
+      unitID: a.unitId
+    }), i.executeCommand(I.id, a), !0;
+  }
+}, ya = "sheets-data-validation.config", Ea = {};
+var Ta = Object.defineProperty, Fa = Object.getOwnPropertyDescriptor, Na = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Fa(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+  return t && r && Ta(a, e, r), r;
+}, Be = (o, a) => (e, t) => a(e, t, o);
+let Ve = class extends P {
+  constructor(a, e, t) {
+    super();
+    g(this, "_disposableMap", /* @__PURE__ */ new Map());
+    g(this, "registerRule", (a, e, t) => {
+      le(t.type, this._validatorRegistryService) && this.register(a, e, t);
+    });
+    this._dataValidationModel = a, this._formulaRefRangeService = e, this._validatorRegistryService = t, this._initRefRange();
   }
-  generateRuleErrorMessage(e) {
-    return this.localeService.t("dataValidation.any.error");
+  _getIdWithUnitId(a, e, t) {
+    return `${a}_${e}_${t}`;
   }
-}
-class Or extends q {
-  constructor() {
-    super(...arguments);
-    f(this, "id", M.CUSTOM);
-    f(this, "title", "dataValidation.custom.title");
-    f(this, "operators", []);
-    f(this, "scopes", ["sheet"]);
-    f(this, "_customFormulaService", this.injector.get(U));
-  }
-  validatorFormula(e, r, a) {
-    const i = S(e.formula1);
-    return {
-      success: i,
-      formula1: i ? "" : this.localeService.t("dataValidation.validFail.formula")
-    };
-  }
-  async parseFormula(e, r, a) {
-    return {
-      formula1: void 0,
-      formula2: void 0,
-      isFormulaValid: !0
-    };
-  }
-  async isValidType(e, r, a) {
-    const { column: i, row: s, unitId: n, subUnitId: l } = e, u = await this._customFormulaService.getCellFormulaValue(n, l, a.uid, s, i), c = u == null ? void 0 : u.v;
-    return F(String(c)) && N.isDefine(c) && c !== "" ? u.t === Et.BOOLEAN ? !!c : typeof c == "boolean" ? c : typeof c == "number" ? !!c : typeof c == "string" ? F(c) : !!c : !1;
-  }
-  generateRuleErrorMessage(e) {
-    return this.localeService.t("dataValidation.custom.error");
-  }
-  generateRuleName(e) {
-    var r;
-    return this.localeService.t("dataValidation.custom.ruleName").replace("{FORMULA1}", (r = e.formula1) != null ? r : "");
-  }
-}
-class br extends mt {
-  constructor() {
-    super(...arguments);
-    f(this, "id", M.LIST_MULTIPLE);
-    f(this, "title", "dataValidation.listMultiple.title");
-    f(this, "skipDefaultFontRender", () => !0);
-  }
-}
-class Ar extends q {
-  constructor() {
-    super(...arguments);
-    f(this, "_customFormulaService", this.injector.get(U));
-    f(this, "_lexerTreeBuilder", this.injector.get(Z));
-    f(this, "id", M.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
-    ]);
-    f(this, "scopes", ["sheet"]);
-  }
-  _isFormulaOrInt(e) {
-    return !N.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
-  }
-  async isValidType(e, r, a) {
-    const { value: i } = e, s = Ve(i);
-    return !Number.isNaN(s) && Number.isInteger(s);
-  }
-  transform(e, r, a) {
-    const { value: i } = e;
-    return {
-      ...e,
-      value: Ve(i)
-    };
-  }
-  _parseNumber(e) {
-    return e == null ? Number.NaN : +e;
-  }
-  async parseFormula(e, r, a, i, s) {
-    const n = await this._customFormulaService.getCellFormulaValue(r, a, e.uid, i, s), l = await this._customFormulaService.getCellFormula2Value(r, a, e.uid, i, s), { formula1: u, formula2: c } = e, d = S(u) ? n == null ? void 0 : n.v : u, m = S(c) ? l == null ? void 0 : l.v : c, g = F(`${d}`) && F(`${m}`);
-    return {
-      formula1: this._parseNumber(d),
-      formula2: this._parseNumber(m),
-      isFormulaValid: g
-    };
-  }
-  validatorFormula(e, r, a) {
-    const i = e.operator;
-    if (!i)
-      return {
-        success: !1
-      };
-    const s = N.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = N.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Ie.includes(i), u = this.localeService.t("dataValidation.validFail.number");
-    return l ? {
-      success: s && n,
-      formula1: s ? void 0 : u,
-      formula2: n ? void 0 : u
-    } : {
-      success: s,
-      formula1: u
-    };
-  }
-  async validatorIsEqual(e, r, a) {
-    const { formula1: i } = r, { value: s } = e;
-    return Number.isNaN(i) ? !0 : s === i;
-  }
-  async validatorIsNotEqual(e, r, a) {
-    const { formula1: i } = r;
-    return Number.isNaN(i) ? !0 : e.value !== i;
-  }
-  async validatorIsBetween(e, r, a) {
-    const { formula1: i, formula2: s } = r;
-    if (Number.isNaN(i) || Number.isNaN(s))
-      return !0;
-    const n = Math.min(i, s), l = Math.max(i, s);
-    return e.value >= n && e.value <= l;
-  }
-  async validatorIsNotBetween(e, r, a) {
-    const { formula1: i, formula2: s } = r;
-    if (Number.isNaN(i) || Number.isNaN(s))
-      return !0;
-    const n = Math.min(i, s), l = Math.max(i, s);
-    return e.value < n || e.value > l;
-  }
-  async validatorIsGreaterThan(e, r, a) {
-    const { formula1: i } = r;
-    return Number.isNaN(i) ? !0 : e.value > i;
-  }
-  async validatorIsGreaterThanOrEqual(e, r, a) {
-    const { formula1: i } = r;
-    return Number.isNaN(i) ? !0 : e.value >= i;
-  }
-  async validatorIsLessThan(e, r, a) {
-    const { formula1: i } = r;
-    return Number.isNaN(i) ? !0 : e.value < i;
-  }
-  async validatorIsLessThanOrEqual(e, r, a) {
-    const { formula1: i } = r;
-    return Number.isNaN(i) ? !0 : e.value <= i;
-  }
-  generateRuleErrorMessage(e, r) {
-    if (!e.operator)
-      return this.titleStr;
-    const { transformedFormula1: a, transformedFormula2: i } = Oe(this._lexerTreeBuilder, e, r);
-    return `${this.localeService.t(ht[e.operator]).replace(se, a != null ? a : "").replace(oe, i != null ? i : "")}`;
-  }
-}
-var Dr = Object.defineProperty, Lr = Object.getOwnPropertyDescriptor, xr = (o, t, e, r) => {
-  for (var a = r > 1 ? void 0 : r ? Lr(t, e) : t, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (a = (r ? s(t, e, a) : s(a)) || a);
-  return r && a && Dr(t, e, a), a;
-}, ee = (o, t) => (e, r) => t(e, r, o);
-let Ne = class extends wt {
-  constructor(o, t, e, r, a, i) {
-    super(), this._univerInstanceService = o, this._dataValidatorRegistryService = t, this._injector = e, this._selectionManagerService = r, this._sheetInterceptorService = a, this._sheetDataValidationModel = i, this._init();
-  }
-  _init() {
-    this._registerValidators(), this._initCommandInterceptor();
-  }
-  _registerValidators() {
-    [
-      Ir,
-      _r,
-      Ar,
-      Rr,
-      fr,
-      cr,
-      mt,
-      br,
-      Or
-    ].forEach((o) => {
-      const t = this._injector.createInstance(o);
-      this.disposeWithMe(this._dataValidatorRegistryService.register(t)), this.disposeWithMe(je(() => this._injector.delete(o)));
-    });
-  }
-  _initCommandInterceptor() {
-    this._sheetInterceptorService.interceptCommand({
-      getMutations: (o) => {
-        var t;
-        if (o.id === Pt.id) {
-          const e = this._univerInstanceService.getCurrentUnitForType(C.UNIVER_SHEET), r = e.getUnitId(), a = e.getActiveSheet();
-          if (!a)
-            throw new Error("No active sheet found");
-          const i = a.getSheetId(), s = (t = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : t.map((d) => d.range), n = this._sheetDataValidationModel.getRuleObjectMatrix(r, i).clone();
-          s && n.removeRange(s);
-          const l = n.diff(this._sheetDataValidationModel.getRules(r, i)), { redoMutations: u, undoMutations: c } = be(r, i, l, this._injector, "patched");
-          return {
-            undos: c,
-            redos: u
-          };
-        }
-        return {
-          undos: [],
-          redos: []
-        };
-      }
-    });
-  }
-};
-Ne = xr([
-  ee(0, O),
-  ee(1, R(Ge)),
-  ee(2, R(ke)),
-  ee(3, R(ot)),
-  ee(4, R(nt)),
-  ee(5, R(w))
-], Ne);
-var _t = /* @__PURE__ */ ((o) => (o[o.View = 0] = "View", o[o.Edit = 1] = "Edit", o[o.ManageCollaborator = 2] = "ManageCollaborator", o[o.Print = 3] = "Print", o[o.Duplicate = 4] = "Duplicate", o[o.Comment = 5] = "Comment", o[o.Copy = 6] = "Copy", o[o.Share = 7] = "Share", o[o.Export = 8] = "Export", o[o.MoveWorksheet = 9] = "MoveWorksheet", o[o.DeleteWorksheet = 10] = "DeleteWorksheet", o[o.HideWorksheet = 11] = "HideWorksheet", o[o.RenameWorksheet = 12] = "RenameWorksheet", o[o.CreateWorksheet = 13] = "CreateWorksheet", o[o.SetWorksheetStyle = 14] = "SetWorksheetStyle", o[o.EditWorksheetCell = 15] = "EditWorksheetCell", o[o.InsertHyperlink = 16] = "InsertHyperlink", o[o.Sort = 17] = "Sort", o[o.Filter = 18] = "Filter", o[o.PivotTable = 19] = "PivotTable", o[o.FloatImg = 20] = "FloatImg", o[o.History = 21] = "History", o[o.RwHgtClWdt = 22] = "RwHgtClWdt", o[o.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", o[o.ViewFilter = 24] = "ViewFilter", o[o.MoveSheet = 25] = "MoveSheet", o[o.DeleteSheet = 26] = "DeleteSheet", o[o.HideSheet = 27] = "HideSheet", o[o.CopySheet = 28] = "CopySheet", o[o.RenameSheet = 29] = "RenameSheet", o[o.CreateSheet = 30] = "CreateSheet", o[o.SelectProtectedCells = 31] = "SelectProtectedCells", o[o.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", o[o.SetCellStyle = 33] = "SetCellStyle", o[o.SetCellValue = 34] = "SetCellValue", o[o.SetRowStyle = 35] = "SetRowStyle", o[o.SetColumnStyle = 36] = "SetColumnStyle", o[o.InsertRow = 37] = "InsertRow", o[o.InsertColumn = 38] = "InsertColumn", o[o.DeleteRow = 39] = "DeleteRow", o[o.DeleteColumn = 40] = "DeleteColumn", o[o.EditExtraObject = 41] = "EditExtraObject", o[o.Delete = 42] = "Delete", o[o.RecoverHistory = 43] = "RecoverHistory", o[o.ViewHistory = 44] = "ViewHistory", o[o.CreatePermissionObject = 45] = "CreatePermissionObject", o[o.UNRECOGNIZED = -1] = "UNRECOGNIZED", o))(_t || {}), Br = Object.defineProperty, Ur = Object.getOwnPropertyDescriptor, Pr = (o, t, e, r) => {
-  for (var a = r > 1 ? void 0 : r ? Ur(t, e) : t, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (a = (r ? s(t, e, a) : s(a)) || a);
-  return r && a && Br(t, e, a), a;
-}, Ue = (o, t) => (e, r) => t(e, r, o);
-let Me = class extends $ {
-  constructor(o, t, e) {
-    super(), this._univerInstanceService = o, this._permissionService = t, this._lexerTreeBuilder = e;
-  }
-  getFormulaRefCheck(o) {
-    var e, r;
-    const t = this._lexerTreeBuilder.sequenceNodesBuilder(o);
-    if (!t)
-      return !0;
-    for (let a = 0; a < t.length; a++) {
-      const i = t[a];
-      if (typeof i == "string")
-        continue;
-      const { token: s } = i, n = Yt(s), l = this._univerInstanceService.getCurrentUnitForType(C.UNIVER_SHEET);
-      let u = l.getActiveSheet();
-      const c = l.getUnitId();
-      if (n.sheetName) {
-        if (u = l.getSheetBySheetName(n.sheetName), !u)
-          return !1;
-        const v = u == null ? void 0 : u.getSheetId();
-        if (!this._permissionService.getPermissionPoint(new $t(c, v).id)) return !1;
-      }
-      if (!u)
-        return !1;
-      const { startRow: d, endRow: m, startColumn: g, endColumn: _ } = n.range;
-      for (let v = d; v <= m; v++)
-        for (let p = g; p <= _; p++) {
-          const y = (r = (e = u.getCell(v, p)) == null ? void 0 : e.selectionProtection) == null ? void 0 : r[0];
-          if ((y == null ? void 0 : y[_t.View]) === !1)
-            return !1;
-        }
-    }
-    return !0;
-  }
-};
-Me = Pr([
-  Ue(0, O),
-  Ue(1, Tt),
-  Ue(2, R(Z))
-], Me);
-var $r = Object.defineProperty, Hr = Object.getOwnPropertyDescriptor, Wr = (o, t, e, r) => {
-  for (var a = r > 1 ? void 0 : r ? Hr(t, e) : t, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (a = (r ? s(t, e, a) : s(a)) || a);
-  return r && a && $r(t, e, a), a;
-}, rt = (o, t) => (e, r) => t(e, r, o);
-let ye = class extends $ {
-  constructor(t, e) {
-    super();
-    f(this, "_disposableMap", /* @__PURE__ */ new Map());
-    f(this, "registerRule", (t, e, r) => {
-      ne(r.type) && this.register(t, e, r);
-    });
-    this._dataValidationModel = t, this._formulaRefRangeService = e, this._initRefRange();
-  }
-  _getIdWithUnitId(t, e, r) {
-    return `${t}_${e}_${r}`;
-  }
-  // eslint-disable-next-line max-lines-per-function
-  register(t, e, r) {
-    const a = r.ranges, i = r.formula1, s = r.formula2, n = this._formulaRefRangeService.registerRangeFormula(t, e, a, [i != null ? i : "", s != null ? s : ""], (u) => {
-      if (u.length === 0)
-        return {
-          undos: [{
-            id: B.id,
-            params: {
-              unitId: t,
-              subUnitId: e,
-              rule: r
-            }
-          }],
-          redos: [{
-            id: D.id,
-            params: {
-              unitId: t,
-              subUnitId: e,
-              ruleId: r.uid
-            }
-          }]
-        };
-      const c = [], d = [], m = u[0];
-      c.push({
-        id: I.id,
-        params: {
-          unitId: t,
-          subUnitId: e,
-          ruleId: r.uid,
-          payload: {
-            type: T.ALL,
-            payload: {
-              ranges: m.ranges,
-              formula1: m.formulas[0],
-              formula2: m.formulas[1]
-            }
-          }
-        }
-      }), d.push({
-        id: I.id,
-        params: {
-          unitId: t,
-          subUnitId: e,
-          ruleId: r.uid,
-          payload: {
-            type: T.ALL,
-            payload: {
-              ranges: a,
-              formula1: i,
-              formula2: s
-            }
-          }
-        }
-      });
-      for (let g = 1; g < u.length; g++) {
-        const _ = u[g], v = Ft();
-        c.push({
-          id: B.id,
-          params: {
-            unitId: t,
-            subUnitId: e,
-            rule: {
-              ...r,
-              uid: v,
-              formula1: _.formulas[0],
-              formula2: _.formulas[1],
-              ranges: _.ranges
-            }
-          }
-        }), d.push({
-          id: D.id,
-          params: {
-            unitId: t,
-            subUnitId: e,
-            ruleId: v
-          }
-        });
-      }
-      return {
-        undos: d,
-        redos: c
-      };
-    }), l = this._getIdWithUnitId(t, e, r.uid);
-    this._disposableMap.set(l, n);
+  // eslint-disable-next-line max-lines-per-function
+  register(a, e, t) {
+    const r = t.ranges, i = t.formula1, s = t.formula2, n = this._formulaRefRangeService.registerRangeFormula(a, e, r, [i != null ? i : "", s != null ? s : ""], (u) => {
+      if (u.length === 0)
+        return {
+          undos: [{
+            id: L.id,
+            params: {
+              unitId: a,
+              subUnitId: e,
+              rule: t
+            }
+          }],
+          redos: [{
+            id: I.id,
+            params: {
+              unitId: a,
+              subUnitId: e,
+              ruleId: t.uid
+            }
+          }]
+        };
+      const d = [], c = [], m = u[0];
+      d.push({
+        id: E.id,
+        params: {
+          unitId: a,
+          subUnitId: e,
+          ruleId: t.uid,
+          payload: {
+            type: y.ALL,
+            payload: {
+              ranges: m.ranges,
+              formula1: m.formulas[0],
+              formula2: m.formulas[1]
+            }
+          }
+        }
+      }), c.push({
+        id: E.id,
+        params: {
+          unitId: a,
+          subUnitId: e,
+          ruleId: t.uid,
+          payload: {
+            type: y.ALL,
+            payload: {
+              ranges: r,
+              formula1: i,
+              formula2: s
+            }
+          }
+        }
+      });
+      for (let p = 1; p < u.length; p++) {
+        const _ = u[p], v = yt();
+        d.push({
+          id: L.id,
+          params: {
+            unitId: a,
+            subUnitId: e,
+            rule: {
+              ...t,
+              uid: v,
+              formula1: _.formulas[0],
+              formula2: _.formulas[1],
+              ranges: _.ranges
+            }
+          }
+        }), c.push({
+          id: I.id,
+          params: {
+            unitId: a,
+            subUnitId: e,
+            ruleId: v
+          }
+        });
+      }
+      return {
+        undos: c,
+        redos: d
+      };
+    }), l = this._getIdWithUnitId(a, e, t.uid);
+    this._disposableMap.set(l, n);
   }
   _initRefRange() {
-    const t = this._dataValidationModel.getAll();
-    for (const [e, r] of t)
-      for (const [a, i] of r)
+    const a = this._dataValidationModel.getAll();
+    for (const [e, t] of a)
+      for (const [r, i] of t)
         for (const s of i)
-          this.registerRule(e, a, s);
+          this.registerRule(e, r, s);
     this.disposeWithMe(
       this._dataValidationModel.ruleChange$.subscribe((e) => {
-        const { unitId: r, subUnitId: a, rule: i } = e;
+        const { unitId: t, subUnitId: r, rule: i } = e;
         switch (e.type) {
           case "add": {
             const s = e.rule;
@@ -2451,165 +1697,211 @@ let ye = class extends $ {
             break;
           }
           case "remove": {
-            const s = this._disposableMap.get(this._getIdWithUnitId(r, a, i.uid));
+            const s = this._disposableMap.get(this._getIdWithUnitId(t, r, i.uid));
             s && s.dispose();
             break;
           }
           case "update": {
-            const s = e.rule, n = this._disposableMap.get(this._getIdWithUnitId(r, a, s.uid));
+            const s = e.rule, n = this._disposableMap.get(this._getIdWithUnitId(t, r, s.uid));
             n && n.dispose(), this.registerRule(e.unitId, e.subUnitId, s);
             break;
           }
         }
       })
-    ), this.disposeWithMe(je(() => {
+    ), this.disposeWithMe(We(() => {
       this._disposableMap.forEach((e) => {
         e.dispose();
       }), this._disposableMap.clear();
     }));
   }
 };
-ye = Wr([
-  rt(0, R(w)),
-  rt(1, R(ut))
-], ye);
-var kr = Object.defineProperty, jr = Object.getOwnPropertyDescriptor, qr = (o, t, e, r) => {
-  for (var a = r > 1 ? void 0 : r ? jr(t, e) : t, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (a = (r ? s(t, e, a) : s(a)) || a);
-  return r && a && kr(t, e, a), a;
-}, te = (o, t) => (e, r) => t(e, r, o);
-let Ee = class extends $ {
-  constructor(t, e, r, a, i, s) {
+Ve = Na([
+  Be(0, R(F)),
+  Be(1, R(nt)),
+  Be(2, R(Q))
+], Ve);
+var mt = /* @__PURE__ */ ((o) => (o[o.View = 0] = "View", o[o.Edit = 1] = "Edit", o[o.ManageCollaborator = 2] = "ManageCollaborator", o[o.Print = 3] = "Print", o[o.Duplicate = 4] = "Duplicate", o[o.Comment = 5] = "Comment", o[o.Copy = 6] = "Copy", o[o.Share = 7] = "Share", o[o.Export = 8] = "Export", o[o.MoveWorksheet = 9] = "MoveWorksheet", o[o.DeleteWorksheet = 10] = "DeleteWorksheet", o[o.HideWorksheet = 11] = "HideWorksheet", o[o.RenameWorksheet = 12] = "RenameWorksheet", o[o.CreateWorksheet = 13] = "CreateWorksheet", o[o.SetWorksheetStyle = 14] = "SetWorksheetStyle", o[o.EditWorksheetCell = 15] = "EditWorksheetCell", o[o.InsertHyperlink = 16] = "InsertHyperlink", o[o.Sort = 17] = "Sort", o[o.Filter = 18] = "Filter", o[o.PivotTable = 19] = "PivotTable", o[o.FloatImg = 20] = "FloatImg", o[o.History = 21] = "History", o[o.RwHgtClWdt = 22] = "RwHgtClWdt", o[o.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", o[o.ViewFilter = 24] = "ViewFilter", o[o.MoveSheet = 25] = "MoveSheet", o[o.DeleteSheet = 26] = "DeleteSheet", o[o.HideSheet = 27] = "HideSheet", o[o.CopySheet = 28] = "CopySheet", o[o.RenameSheet = 29] = "RenameSheet", o[o.CreateSheet = 30] = "CreateSheet", o[o.SelectProtectedCells = 31] = "SelectProtectedCells", o[o.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", o[o.SetCellStyle = 33] = "SetCellStyle", o[o.SetCellValue = 34] = "SetCellValue", o[o.SetRowStyle = 35] = "SetRowStyle", o[o.SetColumnStyle = 36] = "SetColumnStyle", o[o.InsertRow = 37] = "InsertRow", o[o.InsertColumn = 38] = "InsertColumn", o[o.DeleteRow = 39] = "DeleteRow", o[o.DeleteColumn = 40] = "DeleteColumn", o[o.EditExtraObject = 41] = "EditExtraObject", o[o.Delete = 42] = "Delete", o[o.RecoverHistory = 43] = "RecoverHistory", o[o.ViewHistory = 44] = "ViewHistory", o[o.CreatePermissionObject = 45] = "CreatePermissionObject", o[o.UNRECOGNIZED = -1] = "UNRECOGNIZED", o))(mt || {}), Ca = Object.defineProperty, Oa = Object.getOwnPropertyDescriptor, wa = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Oa(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+  return t && r && Ca(a, e, r), r;
+}, Ue = (o, a) => (e, t) => a(e, t, o);
+let Me = class extends P {
+  constructor(o, a, e) {
+    super(), this._univerInstanceService = o, this._permissionService = a, this._lexerTreeBuilder = e;
+  }
+  getFormulaRefCheck(o) {
+    var e, t;
+    const a = this._lexerTreeBuilder.sequenceNodesBuilder(o);
+    if (!a)
+      return !0;
+    for (let r = 0; r < a.length; r++) {
+      const i = a[r];
+      if (typeof i == "string")
+        continue;
+      const { token: s } = i, n = qt(s), 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)
+          return !1;
+        const v = u == null ? void 0 : u.getSheetId();
+        if (!this._permissionService.getPermissionPoint(new xt(d, v).id)) return !1;
+      }
+      if (!u)
+        return !1;
+      const { startRow: c, endRow: m, startColumn: p, endColumn: _ } = n.range;
+      for (let v = c; v <= m; v++)
+        for (let M = p; M <= _; M++) {
+          const f = (t = (e = u.getCell(v, M)) == null ? void 0 : e.selectionProtection) == null ? void 0 : t[0];
+          if ((f == null ? void 0 : f[mt.View]) === !1)
+            return !1;
+        }
+    }
+    return !0;
+  }
+};
+Me = wa([
+  Ue(0, O),
+  Ue(1, Et),
+  Ue(2, R(K))
+], Me);
+var Ia = Object.defineProperty, Aa = Object.getOwnPropertyDescriptor, Da = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Aa(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+  return t && r && Ia(a, e, r), r;
+}, J = (o, a) => (e, t) => a(e, t, o);
+let ye = class extends P {
+  constructor(a, e, t, r, i, s) {
     super();
-    f(this, "_disposableMap", /* @__PURE__ */ new Map());
-    f(this, "registerRule", (t, e, r) => {
-      ne(r.type) || (this.register(t, e, r), this.registerFormula(t, e, r));
+    g(this, "_disposableMap", /* @__PURE__ */ new Map());
+    g(this, "registerRule", (a, e, t) => {
+      le(t.type, this._validatorRegistryService) || (this.register(a, e, t), this.registerFormula(a, e, t));
     });
-    this._dataValidationModel = t, this._injector = e, this._refRangeService = r, this._dataValidationCustomFormulaService = a, this._dataValidationFormulaService = i, this._formulaRefRangeService = s, this._initRefRange();
+    this._dataValidationModel = a, this._injector = e, this._refRangeService = t, this._dataValidationFormulaService = r, this._formulaRefRangeService = i, this._validatorRegistryService = s, this._initRefRange();
   }
-  _getIdWithUnitId(t, e, r) {
-    return `${t}_${e}_${r}`;
+  _getIdWithUnitId(a, e, t) {
+    return `${a}_${e}_${t}`;
   }
-  registerFormula(t, e, r) {
+  registerFormula(a, e, t) {
     var u;
-    const a = r.uid, i = this._getIdWithUnitId(t, e, a), s = (u = this._disposableMap.get(i)) != null ? u : /* @__PURE__ */ new Set(), n = (c, d) => {
-      const m = this._dataValidationModel.getRuleById(t, e, a);
+    const r = t.uid, i = this._getIdWithUnitId(a, e, r), s = (u = this._disposableMap.get(i)) != null ? u : /* @__PURE__ */ new Set(), n = (d, c) => {
+      const m = this._dataValidationModel.getRuleById(a, e, r);
       if (!m)
         return { redos: [], undos: [] };
-      const g = m[c];
-      if (!g || g === d)
+      const p = m[d];
+      if (!p || p === c)
         return { redos: [], undos: [] };
       const _ = {
-        unitId: t,
+        unitId: a,
         subUnitId: e,
-        ruleId: r.uid,
+        ruleId: t.uid,
         payload: {
-          type: T.SETTING,
+          type: y.SETTING,
           payload: {
             type: m.type,
             formula1: m.formula1,
             formula2: m.formula2,
-            [c]: d
+            [d]: c
           }
         }
       }, v = {
-        unitId: t,
+        unitId: a,
         subUnitId: e,
-        ruleId: r.uid,
+        ruleId: t.uid,
         payload: {
-          type: T.SETTING,
+          type: y.SETTING,
           payload: {
             type: m.type,
             formula1: m.formula1,
             formula2: m.formula2
           }
         }
-      }, p = [
+      }, M = [
         {
-          id: I.id,
+          id: E.id,
           params: _
         }
-      ], y = [
+      ], f = [
         {
-          id: I.id,
+          id: E.id,
           params: v
         }
       ];
-      return { redos: p, undos: y };
-    }, l = this._dataValidationFormulaService.getRuleFormulaInfo(t, e, a);
+      return { redos: M, undos: f };
+    }, l = this._dataValidationFormulaService.getRuleFormulaInfo(a, e, r);
     if (l) {
-      const [c, d] = l;
-      if (c) {
+      const [d, c] = l;
+      if (d) {
         const m = this._formulaRefRangeService.registerFormula(
-          t,
+          a,
           e,
-          c.text,
-          (g) => n("formula1", g)
+          d.text,
+          (p) => n("formula1", p)
         );
         s.add(() => m.dispose());
       }
-      if (d) {
+      if (c) {
         const m = this._formulaRefRangeService.registerFormula(
-          t,
+          a,
           e,
-          d.text,
-          (g) => n("formula2", g)
+          c.text,
+          (p) => n("formula2", p)
         );
         s.add(() => m.dispose());
       }
     }
   }
-  register(t, e, r) {
+  register(a, e, t) {
     var l;
-    const a = (u) => {
-      const c = [...r.ranges], m = c.map((_) => Wt(_, u)).filter((_) => !!_).flat();
-      if (it(m, c))
+    const r = (u) => {
+      const d = [...t.ranges], m = d.map((_) => Ut(_, u)).filter((_) => !!_).flat();
+      if (tt(m, d))
         return { redos: [], undos: [] };
       if (m.length) {
         const _ = {
-          unitId: t,
+          unitId: a,
           subUnitId: e,
-          ruleId: r.uid,
+          ruleId: t.uid,
           payload: {
-            type: T.RANGE,
+            type: y.RANGE,
             payload: m
           },
           source: "patched"
-        }, v = [{ id: I.id, params: _ }], p = [{
-          id: I.id,
+        }, v = [{ id: E.id, params: _ }], M = [{
+          id: E.id,
           params: {
-            unitId: t,
+            unitId: a,
             subUnitId: e,
-            ruleId: r.uid,
+            ruleId: t.uid,
             payload: {
-              type: T.RANGE,
-              payload: c
+              type: y.RANGE,
+              payload: d
             },
             source: "patched"
           }
         }];
-        return { redos: v, undos: p };
+        return { redos: v, undos: M };
       } else {
-        const _ = { unitId: t, subUnitId: e, ruleId: r.uid }, v = [{ id: D.id, params: _ }], p = wr(this._injector, _);
-        return { redos: v, undos: p };
+        const _ = { unitId: a, subUnitId: e, ruleId: t.uid }, v = [{ id: I.id, params: _ }], M = Va(this._injector, _);
+        return { redos: v, undos: M };
       }
     }, i = [];
-    r.ranges.forEach((u) => {
-      const c = this._refRangeService.registerRefRange(u, a, t, e);
-      i.push(() => c.dispose());
+    t.ranges.forEach((u) => {
+      const d = this._refRangeService.registerRefRange(u, r, a, e);
+      i.push(() => d.dispose());
     });
-    const s = this._getIdWithUnitId(t, e, r.uid), n = (l = this._disposableMap.get(s)) != null ? l : /* @__PURE__ */ new Set();
+    const s = this._getIdWithUnitId(a, e, t.uid), n = (l = this._disposableMap.get(s)) != null ? l : /* @__PURE__ */ new Set();
     n.add(() => i.forEach((u) => u())), this._disposableMap.set(s, n);
   }
   _initRefRange() {
-    const t = this._dataValidationModel.getAll();
-    for (const [e, r] of t)
-      for (const [a, i] of r)
+    const a = this._dataValidationModel.getAll();
+    for (const [e, t] of a)
+      for (const [r, i] of t)
         for (const s of i)
-          this.registerRule(e, a, s);
+          this.registerRule(e, r, s);
     this.disposeWithMe(
       this._dataValidationModel.ruleChange$.subscribe((e) => {
-        const { unitId: r, subUnitId: a, rule: i } = e;
+        const { unitId: t, subUnitId: r, rule: i } = e;
         switch (e.type) {
           case "add": {
             const s = e.rule;
@@ -2617,74 +1909,74 @@ let Ee = class extends $ {
             break;
           }
           case "remove": {
-            const s = this._disposableMap.get(this._getIdWithUnitId(r, a, i.uid));
+            const s = this._disposableMap.get(this._getIdWithUnitId(t, r, i.uid));
             s && s.forEach((n) => n());
             break;
           }
           case "update": {
-            const s = e.rule, n = this._disposableMap.get(this._getIdWithUnitId(r, a, s.uid));
+            const s = e.rule, n = this._disposableMap.get(this._getIdWithUnitId(t, r, s.uid));
             n && n.forEach((l) => l()), this.registerRule(e.unitId, e.subUnitId, s);
             break;
           }
         }
       })
-    ), this.disposeWithMe(je(() => {
+    ), this.disposeWithMe(We(() => {
       this._disposableMap.forEach((e) => {
-        e.forEach((r) => r());
+        e.forEach((t) => t());
       }), this._disposableMap.clear();
     }));
   }
 };
-Ee = qr([
-  te(0, R(w)),
-  te(1, R(ke)),
-  te(2, R(Ht)),
-  te(3, R(U)),
-  te(4, R(X)),
-  te(5, R(ut))
-], Ee);
-var Gr = Object.defineProperty, Qr = Object.getOwnPropertyDescriptor, Yr = (o, t, e, r) => {
-  for (var a = r > 1 ? void 0 : r ? Qr(t, e) : t, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (a = (r ? s(t, e, a) : s(a)) || a);
-  return r && a && Gr(t, e, a), a;
-}, Pe = (o, t) => (e, r) => t(e, r, o);
-let we = class extends $ {
-  constructor(o, t, e) {
-    super(), this._sheetInterceptorService = o, this._univerInstanceService = t, this._sheetDataValidationModel = e, this._initSheetChange();
+ye = Da([
+  J(0, R(F)),
+  J(1, R(je)),
+  J(2, R(Bt)),
+  J(3, R(k)),
+  J(4, R(nt)),
+  J(5, R(Q))
+], ye);
+var ba = Object.defineProperty, La = Object.getOwnPropertyDescriptor, xa = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? La(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+  return t && r && ba(a, e, r), r;
+}, Pe = (o, a) => (e, t) => a(e, t, o);
+let Ee = class extends P {
+  constructor(o, a, e) {
+    super(), this._sheetInterceptorService = o, this._univerInstanceService = a, this._sheetDataValidationModel = e, this._initSheetChange();
   }
   _initSheetChange() {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
         getMutations: (o) => {
-          var t;
-          if (o.id === kt.id) {
-            const e = o.params, r = e.unitId || this._univerInstanceService.getCurrentUnitForType(C.UNIVER_SHEET).getUnitId(), a = this._univerInstanceService.getUniverSheetInstance(r);
-            if (!a)
+          var a;
+          if (o.id === Pt.id) {
+            const e = o.params, t = e.unitId || this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET).getUnitId(), r = this._univerInstanceService.getUniverSheetInstance(t);
+            if (!r)
               return { redos: [], undos: [] };
-            const i = e.subUnitId || ((t = a.getActiveSheet()) == null ? void 0 : t.getSheetId());
+            const i = e.subUnitId || ((a = r.getActiveSheet()) == null ? void 0 : a.getSheetId());
             if (!i)
               return { redos: [], undos: [] };
-            const s = this._sheetDataValidationModel.getRules(r, i);
+            const s = this._sheetDataValidationModel.getRules(t, i);
             if (s.length === 0)
               return { redos: [], undos: [] };
-            const n = s.map((c) => c.uid), l = {
-              unitId: r,
+            const n = s.map((d) => d.uid), l = {
+              unitId: t,
               subUnitId: i,
               ruleId: n,
               source: "patched"
             }, u = {
-              unitId: r,
+              unitId: t,
               subUnitId: i,
               rule: [...s],
               source: "patched"
             };
             return {
               redos: [{
-                id: D.id,
+                id: I.id,
                 params: l
               }],
               undos: [{
-                id: B.id,
+                id: L.id,
                 params: u
               }]
             };
@@ -2695,205 +1987,406 @@ let we = class extends $ {
     );
   }
 };
-we = Yr([
-  Pe(0, R(nt)),
+Ee = xa([
+  Pe(0, R(it)),
   Pe(1, R(O)),
-  Pe(2, R(w))
-], we);
-var Xr = Object.defineProperty, Kr = Object.getOwnPropertyDescriptor, zr = (o, t, e, r) => {
-  for (var a = r > 1 ? void 0 : r ? Kr(t, e) : t, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (a = (r ? s(t, e, a) : s(a)) || a);
-  return r && a && Xr(t, e, a), a;
-}, pe = (o, t) => (e, r) => t(e, r, o);
-let Te = class extends $ {
-  constructor(o, t, e, r) {
-    super(), this._univerInstanceService = o, this._sheetDataValidationModel = t, this._dataValidationCacheService = e, this._lifecycleService = r, this._initRecalculate();
+  Pe(2, R(F))
+], Ee);
+class Ba extends q {
+  constructor() {
+    super(...arguments);
+    g(this, "id", T.ANY);
+    g(this, "title", "dataValidation.any.title");
+    g(this, "operators", []);
+    g(this, "scopes", ["sheet"]);
+    g(this, "offsetFormulaByRange", !1);
+  }
+  async parseFormula(e, t, r) {
+    return {
+      formula1: e.formula1,
+      formula2: e.formula2,
+      isFormulaValid: !0
+    };
+  }
+  validatorFormula(e, t, r) {
+    return {
+      success: !0
+    };
+  }
+  async isValidType(e, t, r) {
+    return !0;
+  }
+  generateRuleErrorMessage(e) {
+    return this.localeService.t("dataValidation.any.error");
+  }
+}
+class Ua extends q {
+  constructor() {
+    super(...arguments);
+    g(this, "id", T.CUSTOM);
+    g(this, "title", "dataValidation.custom.title");
+    g(this, "operators", []);
+    g(this, "scopes", ["sheet"]);
+    g(this, "_customFormulaService", this.injector.get(U));
+  }
+  validatorFormula(e, t, r) {
+    const i = S(e.formula1);
+    return {
+      success: i,
+      formula1: i ? "" : this.localeService.t("dataValidation.validFail.formula")
+    };
+  }
+  async parseFormula(e, t, r) {
+    return {
+      formula1: void 0,
+      formula2: void 0,
+      isFormulaValid: !0
+    };
+  }
+  async isValidType(e, t, r) {
+    const { column: i, row: s, unitId: n, subUnitId: l } = e, u = await this._customFormulaService.getCellFormulaValue(n, l, r.uid, s, 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;
+  }
+  generateRuleErrorMessage(e) {
+    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 : "");
+  }
+}
+class Pa extends ct {
+  constructor() {
+    super(...arguments);
+    g(this, "id", T.LIST_MULTIPLE);
+    g(this, "title", "dataValidation.listMultiple.title");
+    g(this, "offsetFormulaByRange", !1);
+    g(this, "skipDefaultFontRender", () => !0);
+  }
+}
+class $a extends q {
+  constructor() {
+    super(...arguments);
+    g(this, "_customFormulaService", this.injector.get(U));
+    g(this, "_lexerTreeBuilder", this.injector.get(K));
+    g(this, "id", T.WHOLE);
+    g(this, "title", "dataValidation.whole.title");
+    g(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
+    ]);
+    g(this, "scopes", ["sheet"]);
+  }
+  _isFormulaOrInt(e) {
+    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+  }
+  async isValidType(e, t, r) {
+    const { value: i } = e, s = Se(i);
+    return !Number.isNaN(s) && Number.isInteger(s);
+  }
+  transform(e, t, r) {
+    const { value: i } = e;
+    return {
+      ...e,
+      value: Se(i)
+    };
+  }
+  _parseNumber(e) {
+    return e == null ? Number.NaN : +e;
+  }
+  async parseFormula(e, t, r, i, s) {
+    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, s), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, s), { formula1: u, formula2: d } = e, c = S(u) ? n == null ? void 0 : n.v : u, m = S(d) ? l == null ? void 0 : l.v : d, p = C(`${c}`) && C(`${m}`);
+    return {
+      formula1: this._parseNumber(c),
+      formula2: this._parseNumber(m),
+      isFormulaValid: p
+    };
+  }
+  validatorFormula(e, t, r) {
+    const i = e.operator;
+    if (!i)
+      return {
+        success: !1
+      };
+    const s = V.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Oe.includes(i), u = this.localeService.t("dataValidation.validFail.number");
+    return l ? {
+      success: s && n,
+      formula1: s ? void 0 : u,
+      formula2: n ? void 0 : u
+    } : {
+      success: s,
+      formula1: u
+    };
+  }
+  generateRuleErrorMessage(e, t) {
+    if (!e.operator)
+      return this.titleStr;
+    const { transformedFormula1: r, transformedFormula2: i } = we(this._lexerTreeBuilder, e, t);
+    return `${this.localeService.t(dt[e.operator]).replace(se, r != null ? r : "").replace(ne, i != null ? i : "")}`;
+  }
+}
+var Ha = Object.defineProperty, Wa = Object.getOwnPropertyDescriptor, ja = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Wa(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+  return t && r && Ha(a, e, r), r;
+}, ee = (o, a) => (e, t) => a(e, t, o);
+let Te = class extends Ft {
+  constructor(o, a, e, t, r, i) {
+    super(), this._univerInstanceService = o, this._dataValidatorRegistryService = a, this._injector = e, this._selectionManagerService = t, this._sheetInterceptorService = r, this._sheetDataValidationModel = i, this._init();
+  }
+  _init() {
+    this._registerValidators(), this._initCommandInterceptor();
+  }
+  _registerValidators() {
+    [
+      Ba,
+      da,
+      $a,
+      ga,
+      ua,
+      oa,
+      ct,
+      Pa,
+      Ua
+    ].forEach((o) => {
+      const a = this._injector.createInstance(o);
+      this.disposeWithMe(this._dataValidatorRegistryService.register(a)), this.disposeWithMe(We(() => this._injector.delete(o)));
+    });
+  }
+  _initCommandInterceptor() {
+    this._sheetInterceptorService.interceptCommand({
+      getMutations: (o) => {
+        var a;
+        if (o.id === $t.id) {
+          const e = this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET), t = e.getUnitId(), r = e.getActiveSheet();
+          if (!r)
+            throw new Error("No active sheet found");
+          const i = r.getSheetId(), s = (a = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : a.map((c) => c.range), n = this._sheetDataValidationModel.getRuleObjectMatrix(t, i).clone();
+          s && n.removeRange(s);
+          const l = n.diff(this._sheetDataValidationModel.getRules(t, i)), { redoMutations: u, undoMutations: d } = Ie(t, i, l, this._injector, "patched");
+          return {
+            undos: d,
+            redos: u
+          };
+        }
+        return {
+          undos: [],
+          redos: []
+        };
+      }
+    });
+  }
+};
+Te = ja([
+  ee(0, O),
+  ee(1, R(Q)),
+  ee(2, R(je)),
+  ee(3, R(ot)),
+  ee(4, R(it)),
+  ee(5, R(F))
+], Te);
+var Qa = Object.defineProperty, qa = Object.getOwnPropertyDescriptor, Ga = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? qa(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+  return t && r && Qa(a, e, r), r;
+}, _e = (o, a) => (e, t) => a(e, t, o);
+let Fe = class extends P {
+  constructor(o, a, e, t) {
+    super(), this._univerInstanceService = o, this._sheetDataValidationModel = a, this._dataValidationCacheService = e, this._lifecycleService = t, this._initRecalculate();
   }
   _initRecalculate() {
-    const o = (t) => {
-      if (t.length === 0)
+    const o = (a) => {
+      if (a.length === 0)
         return;
-      const e = this._univerInstanceService.getCurrentUnitForType(C.UNIVER_SHEET), r = e == null ? void 0 : e.getActiveSheet(), a = {};
-      t.flat().forEach((i) => {
-        a[i.unitId] || (a[i.unitId] = {}), a[i.unitId][i.subUnitId] || (a[i.unitId][i.subUnitId] = []);
-        const s = this._univerInstanceService.getUnit(i.unitId, C.UNIVER_SHEET), n = s == null ? void 0 : s.getSheetBySheetId(i.subUnitId);
-        n && a[i.unitId][i.subUnitId].push(...i.ranges.map((l) => A.transformRange(l, n)));
-      }), Object.entries(a).forEach(([i, s]) => {
+      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 s = this._univerInstanceService.getUnit(i.unitId, N.UNIVER_SHEET), n = s == null ? void 0 : s.getSheetBySheetId(i.subUnitId);
+        n && r[i.unitId][i.subUnitId].push(...i.ranges.map((l) => b.transformRange(l, n)));
+      }), Object.entries(r).forEach(([i, s]) => {
         Object.entries(s).forEach(([n, l]) => {
-          (e == null ? void 0 : e.getUnitId()) === i && (r == null ? void 0 : r.getSheetId()) === n ? this.validatorRanges(i, n, l) : requestIdleCallback(() => {
+          (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);
           });
         });
       });
     };
-    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(jt(() => this._lifecycleService.lifecycle$.pipe(et((t) => t === Je.Rendered)))).subscribe(o)), this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(et(() => this._lifecycleService.stage >= Je.Rendered), It(20)).subscribe(o));
+    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Ht(() => this._lifecycleService.lifecycle$.pipe(ze((a) => a === Ke.Rendered)))).subscribe(o)), this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(ze(() => this._lifecycleService.stage >= Ke.Rendered), Ct(20)).subscribe(o));
   }
-  async _validatorByCell(o, t, e, r) {
-    const a = o.getUnitId(), i = t.getSheetId();
-    if (!N.isDefine(e) || !N.isDefine(r))
-      throw new Error(`row or col is not defined, row: ${e}, col: ${r}`);
-    const s = this._sheetDataValidationModel.getRuleByLocation(a, i, e, r);
+  async _validatorByCell(o, a, e, t) {
+    const r = o.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 s = this._sheetDataValidationModel.getRuleByLocation(r, i, e, t);
     return s ? new Promise((n) => {
-      this._sheetDataValidationModel.validator(s, { unitId: a, subUnitId: i, row: e, col: r, worksheet: t, workbook: o }, (l) => {
+      this._sheetDataValidationModel.validator(s, { unitId: r, subUnitId: i, row: e, col: t, worksheet: a, workbook: o }, (l) => {
         n(l);
       });
-    }) : x.VALID;
+    }) : D.VALID;
   }
-  async validatorCell(o, t, e, r) {
-    const a = this._univerInstanceService.getUnit(o, C.UNIVER_SHEET);
-    if (!a)
+  async validatorCell(o, a, e, t) {
+    const r = this._univerInstanceService.getUnit(o, N.UNIVER_SHEET);
+    if (!r)
       throw new Error(`cannot find current workbook, unitId: ${o}`);
-    const i = a.getSheetBySheetId(t);
+    const i = r.getSheetBySheetId(a);
     if (!i)
-      throw new Error(`cannot find current worksheet, sheetId: ${t}`);
-    return this._validatorByCell(a, i, e, r);
+      throw new Error(`cannot find current worksheet, sheetId: ${a}`);
+    return this._validatorByCell(r, i, e, t);
   }
-  validatorRanges(o, t, e) {
-    const r = this._univerInstanceService.getUnit(o, C.UNIVER_SHEET);
-    if (!r)
+  validatorRanges(o, a, e) {
+    if (!e.length)
+      return Promise.resolve([]);
+    const t = this._univerInstanceService.getUnit(o, N.UNIVER_SHEET);
+    if (!t)
       throw new Error(`cannot find current workbook, unitId: ${o}`);
-    const a = r.getSheetBySheetId(t);
-    if (!a)
-      throw new Error(`cannot find current worksheet, sheetId: ${t}`);
+    const r = t.getSheetBySheetId(a);
+    if (!r)
+      throw new Error(`cannot find current worksheet, sheetId: ${a}`);
     return Promise.all(e.map((i) => {
       const s = [];
-      return A.foreach(i, (n, l) => {
-        s.push(this._validatorByCell(r, a, n, l));
+      return b.foreach(i, (n, l) => {
+        s.push(this._validatorByCell(t, r, n, l));
       }), s;
     }));
   }
-  async validatorWorksheet(o, t) {
-    const e = this._univerInstanceService.getUnit(o, C.UNIVER_SHEET);
+  async validatorWorksheet(o, a) {
+    const e = this._univerInstanceService.getUnit(o, N.UNIVER_SHEET);
     if (!e)
       throw new Error(`cannot find current workbook, unitId: ${o}`);
-    const r = e.getSheetBySheetId(t);
-    if (!r)
-      throw new Error(`cannot find current worksheet, sheetId: ${t}`);
-    const a = this._sheetDataValidationModel.getRules(o, t);
-    return await Promise.all(a.map((i) => Promise.all(i.ranges.map((s) => {
+    const t = e.getSheetBySheetId(a);
+    if (!t)
+      throw new Error(`cannot find current worksheet, sheetId: ${a}`);
+    const r = this._sheetDataValidationModel.getRules(o, a);
+    return await Promise.all(r.map((i) => Promise.all(i.ranges.map((s) => {
       const n = [];
-      return A.foreach(s, (l, u) => {
-        n.push(this._validatorByCell(e, r, l, u));
+      return b.foreach(s, (l, u) => {
+        n.push(this._validatorByCell(e, t, l, u));
       }), n;
-    })))), this._dataValidationCacheService.ensureCache(o, t);
+    })))), this._dataValidationCacheService.ensureCache(o, a);
   }
   async validatorWorkbook(o) {
-    const t = this._sheetDataValidationModel.getSubUnitIds(o), e = await Promise.all(t.map((a) => this.validatorWorksheet(o, a))), r = {};
-    return e.forEach((a, i) => {
-      r[t[i]] = a;
-    }), r;
+    const a = this._sheetDataValidationModel.getSubUnitIds(o), e = await Promise.all(a.map((r) => this.validatorWorksheet(o, r))), t = {};
+    return e.forEach((r, i) => {
+      t[a[i]] = r;
+    }), t;
   }
-  getDataValidations(o, t, e) {
-    const r = this._sheetDataValidationModel.getRuleObjectMatrix(o, t), a = /* @__PURE__ */ new Set();
+  getDataValidations(o, a, e) {
+    const t = this._sheetDataValidationModel.getRuleObjectMatrix(o, a), r = /* @__PURE__ */ new Set();
     return e.forEach((s) => {
-      A.foreach(s, (n, l) => {
-        const u = r.getValue(n, l);
-        u && a.add(u);
+      b.foreach(s, (n, l) => {
+        const u = t.getValue(n, l);
+        u && r.add(u);
       });
-    }), Array.from(a).map((s) => this._sheetDataValidationModel.getRuleById(o, t, s)).filter(Boolean);
+    }), Array.from(r).map((s) => this._sheetDataValidationModel.getRuleById(o, a, s)).filter(Boolean);
   }
-  getDataValidation(o, t, e) {
-    return this.getDataValidations(o, t, e)[0];
+  getDataValidation(o, a, e) {
+    return this.getDataValidations(o, a, e)[0];
   }
 };
-Te = zr([
-  pe(0, O),
-  pe(1, R(w)),
-  pe(2, R(j)),
-  pe(3, R(Ct))
-], Te);
-var pt = Object.defineProperty, Zr = Object.getOwnPropertyDescriptor, Jr = (o, t, e) => t in o ? pt(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e, ea = (o, t, e, r) => {
-  for (var a = r > 1 ? void 0 : r ? Zr(t, e) : t, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (a = (r ? s(t, e, a) : s(a)) || a);
-  return r && a && pt(t, e, a), a;
-}, $e = (o, t) => (e, r) => t(e, r, o), gt = (o, t, e) => Jr(o, typeof t != "symbol" ? t + "" : t, e);
-let Fe = class extends bt {
-  constructor(o = Cr, t, e, r) {
-    super(), this._config = o, this._injector = t, this._commandService = e, this._configService = r;
-    const { ...a } = this._config;
-    this._configService.setConfig(Fr, a);
+Fe = Ga([
+  _e(0, O),
+  _e(1, R(F)),
+  _e(2, R(j)),
+  _e(3, R(Nt))
+], Fe);
+var gt = Object.defineProperty, ka = Object.getOwnPropertyDescriptor, Ya = (o, a, e) => a in o ? gt(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e, Xa = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? ka(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+  return t && r && gt(a, e, r), r;
+}, $e = (o, a) => (e, t) => a(e, t, o), _t = (o, a, e) => Ya(o, typeof a != "symbol" ? a + "" : a, e);
+let Ne = class extends wt {
+  constructor(o = Ea, a, e, t) {
+    super(), this._config = o, this._injector = a, this._commandService = e, this._configService = t;
+    const { ...r } = this._config;
+    this._configService.setConfig(ya, r);
   }
   onStarting() {
     [
       [j],
-      [X],
+      [k],
       [U],
+      [Fe],
+      [F],
       [Te],
-      [w],
-      [Ne],
       [Me],
-      [we],
       [Ee],
-      [ye]
+      [ye],
+      [Ve]
     ].forEach((o) => {
       this._injector.add(o);
     }), [
-      Vr,
-      Sr,
-      Nr,
-      Mr,
-      Tr,
-      Er,
-      yr
+      pa,
+      _a,
+      fa,
+      va,
+      Ma,
+      Sa,
+      Ra
     ].forEach((o) => {
       this._commandService.registerCommand(o);
-    }), this._injector.get(j), this._injector.get(Te), this._injector.get(ye), this._injector.get(Ee);
+    }), this._injector.get(j), this._injector.get(Fe), this._injector.get(Ve), this._injector.get(ye);
   }
   onReady() {
-    this._injector.get(we);
+    this._injector.get(Ee);
   }
   onRendered() {
-    this._injector.get(Ne), this._injector.get(Me);
+    this._injector.get(Te), this._injector.get(Me);
   }
 };
-gt(Fe, "pluginName", Xt);
-gt(Fe, "type", C.UNIVER_SHEET);
-Fe = ea([
-  Ot(Bt),
-  $e(1, R(ke)),
-  $e(2, P),
-  $e(3, At)
-], Fe);
-function ca(o) {
+_t(Ne, "pluginName", Gt);
+_t(Ne, "type", N.UNIVER_SHEET);
+Ne = Xa([
+  Ot(Lt),
+  $e(1, R(je)),
+  $e(2, x),
+  $e(3, It)
+], Ne);
+function or(o) {
   const e = o.get(ot).getCurrentSelections().map((i) => i.range);
   return {
-    uid: N.generateRandomId(6),
-    type: M.DECIMAL,
+    uid: V.generateRandomId(6),
+    type: T.DECIMAL,
     operator: h.EQUAL,
     formula1: "100",
     ranges: e != null ? e : [{ startColumn: 0, endColumn: 0, startRow: 0, endRow: 0 }]
   };
 }
 export {
-  Vr as AddSheetDataValidationCommand,
-  Re as CHECKBOX_FORMULA_1,
-  Se as CHECKBOX_FORMULA_2,
-  cr as CheckboxValidator,
-  yr as ClearRangeDataValidationCommand,
-  Xt as DATA_VALIDATION_PLUGIN_NAME,
+  pa as AddSheetDataValidationCommand,
+  ve as CHECKBOX_FORMULA_1,
+  Re as CHECKBOX_FORMULA_2,
+  oa as CheckboxValidator,
+  Ra as ClearRangeDataValidationCommand,
+  Gt as DATA_VALIDATION_PLUGIN_NAME,
   j as DataValidationCacheService,
   U as DataValidationCustomFormulaService,
   Me as DataValidationFormulaController,
-  X as DataValidationFormulaService,
-  fr as DateValidator,
-  br as ListMultipleValidator,
-  mt as ListValidator,
-  Er as RemoveSheetAllDataValidationCommand,
-  Tr as RemoveSheetDataValidationCommand,
-  w as SheetDataValidationModel,
-  Te as SheetsDataValidationValidatorService,
-  Fe as UniverSheetsDataValidationPlugin,
-  Mr as UpdateSheetDataValidationOptionsCommand,
-  Sr as UpdateSheetDataValidationRangeCommand,
-  Nr as UpdateSheetDataValidationSettingCommand,
-  ca as createDefaultNewRule,
-  _e as deserializeListOptions,
-  ie as getCellValueOrigin,
-  ua as getDataValidationCellValue,
-  be as getDataValidationDiffMutations,
-  de as getFormulaCellData,
+  k as DataValidationFormulaService,
+  ua as DateValidator,
+  Pa as ListMultipleValidator,
+  ct as ListValidator,
+  Sa as RemoveSheetAllDataValidationCommand,
+  Ma as RemoveSheetDataValidationCommand,
+  F as SheetDataValidationModel,
+  Fe as SheetsDataValidationValidatorService,
+  Ne as UniverSheetsDataValidationPlugin,
+  va as UpdateSheetDataValidationOptionsCommand,
+  _a as UpdateSheetDataValidationRangeCommand,
+  fa as UpdateSheetDataValidationSettingCommand,
+  or as createDefaultNewRule,
+  ge as deserializeListOptions,
+  oe as getCellValueOrigin,
+  ir as getDataValidationCellValue,
+  Ie as getDataValidationDiffMutations,
+  he as getFormulaCellData,
   re as getFormulaResult,
-  F as isLegalFormulaResult,
-  la as serializeListOptions,
-  fe as transformCheckboxValue
+  C as isLegalFormulaResult,
+  rr as serializeListOptions,
+  me as transformCheckboxValue
 };