@univerjs/sheets-data-validation 0.5.0-alpha.0 → 0.5.0-beta.1

package/lib/es/index.js

@@ -1,37 +1,37 @@
-var bt = Object.defineProperty;
-var Dt = (s, t, e) => t in s ? bt(s, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[t] = e;
-var g = (s, t, e) => Dt(s, typeof t != "symbol" ? t + "" : t, e);
-import { Inject as E, ICommandService as re, Disposable as ce, ObjectMatrix as Ue, Range as Q, UniverInstanceType as K, DataValidationType as $, isFormulaString as F, IUniverInstanceService as Z, getOriginCellValue as It, debounce as $t, Rectangle as ee, Tools as b, DataValidationStatus as ge, WrapStrategy as Le, DataValidationOperator as _, numfmt as oe, DataValidationRenderMode as Ke, CommandType as ve, IUndoRedoService as Se, sequenceExecute as Ye, CellValueType as xt, Injector as st, RxDisposable as At, toDisposable as gt, IPermissionService as Lt, isRangesEqual as Ut, LifecycleService as Bt, LifecycleStages as ht, bufferDebounceTime as Pt, DependentOn as Ht, Plugin as kt, IConfigService as Wt } from "@univerjs/core";
-import { DataValidationModel as nt, DataValidatorRegistryService as ot, UpdateRuleType as Y, BaseDataValidator as de, TextLengthErrorTitleMap as jt, AddDataValidationMutation as le, RemoveDataValidationMutation as ie, UpdateDataValidationMutation as X, getRuleSetting as rt, getRuleOptions as qt, UniverDataValidationPlugin as Gt } from "@univerjs/data-validation";
-import { SetRangeValuesMutation as Ce, RemoveSheetMutation as Qt, getSheetCommandTarget as lt, SetRangeValuesUndoMutationFactory as vt, SheetsSelectionsService as St, SheetInterceptorService as Rt, ClearSelectionAllCommand as Yt, WorksheetViewPermission as Xt, RefRangeService as zt, handleCommonDefaultRangeChangeWithEffectRefCommands as Kt, RemoveSheetCommand as Zt } from "@univerjs/sheets";
-import { Subject as at, bufferWhen as Jt, filter as mt } from "rxjs";
-import { RegisterOtherFormulaService as yt, FormulaRefRangeService as er } from "@univerjs/sheets-formula";
-import { ERROR_TYPE_SET as tr, LexerTreeBuilder as ut, isReferenceString as Mt, sequenceNodeType as rr, deserializeRangeWithSheet as ar, deserializeRangeWithSheetWithCache as ir } from "@univerjs/engine-formula";
-const sr = "SHEET_DATA_VALIDATION_PLUGIN";
-var nr = Object.defineProperty, or = Object.getOwnPropertyDescriptor, lr = (s, t, e, r) => {
-  for (var i = r > 1 ? void 0 : r ? or(t, e) : t, a = s.length - 1, n; a >= 0; a--)
-    (n = s[a]) && (i = (r ? n(t, e, i) : n(i)) || i);
-  return r && i && nr(t, e, i), i;
-}, ur = (s, t) => (e, r) => t(e, r, s);
-let ue = class extends ce {
+var St = Object.defineProperty;
+var Vt = (o, t, e) => t in o ? St(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e;
+var f = (o, t, e) => Vt(o, typeof t != "symbol" ? t + "" : t, e);
+import { Inject as v, ICommandService as H, Disposable as W, ObjectMatrix as Re, Range as I, DataValidationType as M, UniverInstanceType as A, isFormulaString as R, IUniverInstanceService as D, getOriginCellValue as Nt, debounce as Mt, Rectangle as B, Tools as N, DataValidationStatus as Y, WrapStrategy as ve, DataValidationOperator as h, numfmt as k, dayjs as it, DataValidationRenderMode as Le, CommandType as K, IUndoRedoService as z, sequenceExecute as Oe, CellValueType as yt, Injector as je, RxDisposable as Et, toDisposable as qe, IPermissionService as Tt, generateRandomId as wt, isRangesEqual as Ft, LifecycleService as Ct, LifecycleStages as et, bufferDebounceTime as Ot, DependentOn as bt, Plugin as It, IConfigService as At } from "@univerjs/core";
+import { DataValidationModel as Ge, DataValidatorRegistryService as Qe, UpdateRuleType as w, BaseDataValidator as q, TextLengthErrorTitleMap as Dt, AddDataValidationMutation as U, RemoveDataValidationMutation as P, UpdateDataValidationMutation as b, getRuleSetting as xt, getRuleOptions as Lt, UniverDataValidationPlugin as Bt } from "@univerjs/data-validation";
+import { SetRangeValuesMutation as se, RemoveSheetMutation as Pt, getSheetCommandTarget as Ye, SetRangeValuesUndoMutationFactory as st, SheetsSelectionsService as ot, SheetInterceptorService as nt, ClearSelectionAllCommand as Ut, WorksheetViewPermission as $t, RefRangeService as Ht, handleCommonDefaultRangeChangeWithEffectRefCommands as Wt, RemoveSheetCommand as kt } from "@univerjs/sheets";
+import { Subject as We, bufferWhen as jt, filter as tt } 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 W {
   constructor(t) {
     super();
-    g(this, "_cacheMatrix", /* @__PURE__ */ new Map());
-    g(this, "_dirtyRanges$", new at());
-    g(this, "dirtyRanges$", this._dirtyRanges$.asObservable());
+    f(this, "_cacheMatrix", /* @__PURE__ */ new Map());
+    f(this, "_dirtyRanges$", new We());
+    f(this, "dirtyRanges$", this._dirtyRanges$.asObservable());
     this._commandService = t, this._initDirtyRanges();
   }
   _initDirtyRanges() {
     this.disposeWithMe(this._commandService.onCommandExecuted((t) => {
-      if (t.id === Ce.id) {
-        const { cellValue: e, unitId: r, subUnitId: i } = t.params;
+      if (t.id === se.id) {
+        const { cellValue: e, unitId: r, subUnitId: a } = t.params;
         if (e) {
-          const a = new Ue(e).getDataRange();
-          if (a.endRow === -1) return;
+          const i = new Re(e).getDataRange();
+          if (i.endRow === -1) return;
           this._dirtyRanges$.next({
             unitId: r,
-            subUnitId: i,
-            ranges: [a]
+            subUnitId: a,
+            ranges: [i]
           });
         }
       }
@@ -40,8 +40,8 @@ let ue = class extends ce {
   _ensureCache(t, e) {
     let r = this._cacheMatrix.get(t);
     r || (r = /* @__PURE__ */ new Map(), this._cacheMatrix.set(t, r));
-    let i = r.get(e);
-    return i || (i = new Ue(), r.set(e, i)), i;
+    let a = r.get(e);
+    return a || (a = new Re(), r.set(e, a)), a;
   }
   ensureCache(t, e) {
     return this._ensureCache(t, e);
@@ -52,170 +52,212 @@ let ue = class extends ce {
   removeRule(t, e, r) {
     this._deleteRange(t, e, r.ranges);
   }
-  updateRuleRanges(t, e, r, i, a) {
-    const n = this._ensureCache(t, e);
-    a.forEach((o) => {
-      Q.foreach(o, (l, u) => {
-        const c = n.getValue(l, u);
+  updateRuleRanges(t, e, r, a, i) {
+    const s = this._ensureCache(t, e);
+    i.forEach((n) => {
+      I.foreach(n, (l, u) => {
+        const c = s.getValue(l, u);
         c && (c.temp = !0);
       });
-    }), i.forEach((o) => {
-      Q.foreach(o, (l, u) => {
-        const c = n.getValue(l, u);
-        c && c.ruleId === r ? c.temp = !1 : n.setValue(l, u, void 0);
+    }), a.forEach((n) => {
+      I.foreach(n, (l, u) => {
+        const c = s.getValue(l, u);
+        c && c.ruleId === r ? c.temp = !1 : s.setValue(l, u, void 0);
       });
-    }), a.forEach((o) => {
-      Q.foreach(o, (l, u) => {
-        const c = n.getValue(l, u);
-        c && c.temp === !0 && n.realDeleteValue(l, u);
+    }), i.forEach((n) => {
+      I.foreach(n, (l, u) => {
+        const c = s.getValue(l, u);
+        c && c.temp === !0 && s.realDeleteValue(l, u);
       });
-    }), this._dirtyRanges$.next({ unitId: t, subUnitId: e, ranges: [...a, ...i] });
+    }), this._dirtyRanges$.next({ unitId: t, subUnitId: e, ranges: [...i, ...a] });
   }
   markRangeDirty(t, e, r) {
-    const i = this._ensureCache(t, e);
-    r.forEach((a) => {
-      Q.foreach(a, (n, o) => {
-        i.setValue(n, o, void 0);
+    const a = this._ensureCache(t, e);
+    r.forEach((i) => {
+      I.foreach(i, (s, n) => {
+        a.setValue(s, n, void 0);
       });
     }), this._dirtyRanges$.next({ unitId: t, subUnitId: e, ranges: r });
   }
-  markCellDirty(t, e, r, i) {
-    this._ensureCache(t, e).setValue(r, i, void 0), this._dirtyRanges$.next({ unitId: t, subUnitId: e, ranges: [{ startRow: r, startColumn: i, endRow: r, endColumn: i }] });
+  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 }] });
   }
   _deleteRange(t, e, r) {
-    const i = this._ensureCache(t, e);
-    r.forEach((a) => {
-      Q.foreach(a, (n, o) => {
-        i.realDeleteValue(n, o);
+    const a = this._ensureCache(t, e);
+    r.forEach((i) => {
+      I.foreach(i, (s, n) => {
+        a.realDeleteValue(s, n);
       });
     }), this._dirtyRanges$.next({ unitId: t, subUnitId: e, ranges: r });
   }
-  getValue(t, e, r, i) {
-    return this._ensureCache(t, e).getValue(r, i);
+  getValue(t, e, r, a) {
+    return this._ensureCache(t, e).getValue(r, a);
   }
-  setValue(t, e, r, i, a) {
-    return this._ensureCache(t, e).setValue(r, i, a);
+  setValue(t, e, r, a, i) {
+    return this._ensureCache(t, e).setValue(r, a, i);
   }
 };
-ue = lr([
-  ur(0, E(re))
-], ue);
-function z(s) {
+j = Zt([
+  Jt(0, v(H))
+], j);
+function ie(o) {
   var t, e;
-  return (e = (t = s == null ? void 0 : s[0]) == null ? void 0 : t[0]) == null ? void 0 : e.v;
+  return (e = (t = o == null ? void 0 : o[0]) == null ? void 0 : t[0]) == null ? void 0 : e.v;
 }
-function cr(s) {
+function he(o) {
   var t;
-  return (t = s == null ? void 0 : s[0]) == null ? void 0 : t[0];
+  return (t = o == null ? void 0 : o[0]) == null ? void 0 : t[0];
 }
-function W(s) {
-  return !tr.has(s);
+function O(o) {
+  return !qt.has(o);
 }
-var dr = Object.defineProperty, hr = Object.getOwnPropertyDescriptor, mr = (s, t, e, r) => {
-  for (var i = r > 1 ? void 0 : r ? hr(t, e) : t, a = s.length - 1, n; a >= 0; a--)
-    (n = s[a]) && (i = (r ? n(t, e, i) : n(i)) || i);
-  return r && i && dr(t, e, i), i;
-}, De = (s, t) => (e, r) => t(e, r, s);
-let we = class extends ce {
-  constructor(t, e, r, i) {
+function le(o) {
+  return o !== M.LIST && o !== M.LIST_MULTIPLE && o !== M.CHECKBOX && o !== M.ANY;
+}
+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;
+}, me = (o, t) => (e, r) => t(e, r, o);
+let $ = class extends W {
+  constructor(t, e, r, a) {
     super();
     /**
      * Map of origin formula of rule
      */
-    g(this, "_ruleFormulaMap", /* @__PURE__ */ new Map());
-    this._instanceSrv = t, this._registerOtherFormulaService = e, this._dataValidationModel = r, this._dataValidationCacheService = i, this._initFormulaResultHandler();
+    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();
   }
   _initFormulaResultHandler() {
     this.disposeWithMe(this._registerOtherFormulaService.formulaResult$.subscribe((t) => {
       for (const e in t) {
         const r = t[e];
-        if (this._instanceSrv.getUnitType(e) === K.UNIVER_SHEET)
-          for (const a in r) {
-            const n = r[a], { ruleFormulaMap: o } = this._ensureMaps(e, a);
-            n.forEach((l) => {
+        if (this._instanceSrv.getUnitType(e) === A.UNIVER_SHEET)
+          for (const i in r) {
+            const s = r[i], { ruleFormulaMap: n } = this._ensureMaps(e, i);
+            s.forEach((l) => {
               var d, m;
-              const u = o.get((d = l.extra) == null ? void 0 : d.ruleId), c = this._dataValidationModel.getRuleById(e, a, (m = l.extra) == null ? void 0 : m.ruleId);
-              c && u && !u.isTransformable && this._dataValidationCacheService.markRangeDirty(e, a, c.ranges);
+              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);
             });
           }
       }
     }));
   }
   _ensureMaps(t, e) {
-    let r = this._ruleFormulaMap.get(t);
-    r || (r = /* @__PURE__ */ new Map(), this._ruleFormulaMap.set(t, r));
+    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);
-    return i || (i = /* @__PURE__ */ new Map(), r.set(e, i)), { ruleFormulaMap: i };
+    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 };
   }
-  _registerFormula(t, e, r, i, a) {
-    return this._registerOtherFormulaService.registerFormulaWithRange(t, e, i, a, { ruleId: r });
+  _registerFormula(t, e, r, a, i) {
+    return this._registerOtherFormulaService.registerFormulaWithRange(t, e, a, i, { ruleId: r });
   }
   deleteByRuleId(t, e, r) {
-    const { ruleFormulaMap: i } = this._ensureMaps(t, e), a = this._dataValidationModel.getRuleById(t, e, r), n = i.get(r);
-    if (!a || !n)
-      return;
-    const o = i.get(r);
-    o && (i.delete(r), this._registerOtherFormulaService.deleteFormula(t, e, [o.formulaId]));
-  }
-  _addFormulaByRange(t, e, r, i, a) {
-    const { ruleFormulaMap: n } = this._ensureMaps(t, e);
-    if (!i)
+    const { ruleFormulaMap: a, ruleFormulaMap2: i } = this._ensureMaps(t, e), s = this._dataValidationModel.getRuleById(t, e, r), n = a.get(r);
+    if (!s || !n)
       return;
-    const o = a[0].startRow, l = a[0].startColumn, u = this._registerFormula(t, e, r, i, a);
-    n.set(r, {
-      formula: i,
-      originCol: l,
-      originRow: o,
-      formulaId: u,
-      isTransformable: !0
-    });
+    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 && R(a)) {
+      const d = this._registerFormula(t, e, r, a, s);
+      n.set(r, {
+        formula: a,
+        originCol: c,
+        originRow: u,
+        formulaId: d
+      });
+    }
+    if (i && R(i)) {
+      const d = this._registerFormula(t, e, r, i, s);
+      l.set(r, {
+        formula: i,
+        originCol: c,
+        originRow: u,
+        formulaId: d
+      });
+    }
   }
   addRule(t, e, r) {
-    const { ranges: i, formula1: a, uid: n, type: o } = r;
-    o !== $.CUSTOM || !a || !F(a) || this._addFormulaByRange(t, e, n, a, i);
+    if (le(r.type)) {
+      const { ranges: a, formula1: i, formula2: s, uid: n } = r;
+      this._addFormulaByRange(t, e, n, i, s, a);
+    }
   }
-  async getCellFormulaValue(t, e, r, i, a) {
-    var v, S;
-    const { ruleFormulaMap: n } = this._ensureMaps(t, e), o = n.get(r);
-    if (!o)
+  async getCellFormulaValue(t, e, r, a, i) {
+    var _, p;
+    const { ruleFormulaMap: s } = this._ensureMaps(t, e), n = s.get(r);
+    if (!n)
       return Promise.resolve(void 0);
-    const l = await this._registerOtherFormulaService.getFormulaValue(t, e, o.formulaId), { originRow: u, originCol: c } = o, d = i - u, m = a - c;
-    return cr((S = (v = l == null ? void 0 : l.result) == null ? void 0 : v[d]) == null ? void 0 : S[m]);
+    const l = await this._registerOtherFormulaService.getFormulaValue(t, e, n.formulaId), { originRow: u, originCol: c } = n, d = a - u, m = i - c;
+    return he((p = (_ = l == null ? void 0 : l.result) == null ? void 0 : _[d]) == null ? void 0 : p[m]);
+  }
+  async getCellFormula2Value(t, e, r, a, i) {
+    var _, p;
+    const { ruleFormulaMap2: s } = this._ensureMaps(t, e), n = s.get(r);
+    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 he((p = (_ = l == null ? void 0 : l.result) == null ? void 0 : _[d]) == null ? void 0 : p[m]);
+  }
+  getCellFormulaValueSync(t, e, r, a, i) {
+    var _, p;
+    const { ruleFormulaMap: s } = this._ensureMaps(t, e), n = s.get(r);
+    if (!n)
+      return;
+    const l = this._registerOtherFormulaService.getFormulaValueSync(t, e, n.formulaId), { originRow: u, originCol: c } = n, d = a - u, m = i - c;
+    return he((p = (_ = l == null ? void 0 : l.result) == null ? void 0 : _[d]) == null ? void 0 : p[m]);
+  }
+  getCellFormula2ValueSync(t, e, r, a, i) {
+    var _, p;
+    const { ruleFormulaMap2: s } = this._ensureMaps(t, e), n = s.get(r);
+    if (!n)
+      return;
+    const l = this._registerOtherFormulaService.getFormulaValueSync(t, e, n.formulaId), { originRow: u, originCol: c } = n, d = a - u, m = i - c;
+    return he((p = (_ = l == null ? void 0 : l.result) == null ? void 0 : _[d]) == null ? void 0 : p[m]);
   }
   getRuleFormulaInfo(t, e, r) {
-    const { ruleFormulaMap: i } = this._ensureMaps(t, e);
-    return i.get(r);
+    const { ruleFormulaMap: a } = this._ensureMaps(t, e);
+    return a.get(r);
   }
 };
-we = mr([
-  De(0, Z),
-  De(1, E(yt)),
-  De(2, E(nt)),
-  De(3, E(ue))
-], we);
-var fr = Object.defineProperty, _r = Object.getOwnPropertyDescriptor, pr = (s, t, e, r) => {
-  for (var i = r > 1 ? void 0 : r ? _r(t, e) : t, a = s.length - 1, n; a >= 0; a--)
-    (n = s[a]) && (i = (r ? n(t, e, i) : n(i)) || i);
-  return r && i && fr(t, e, i), i;
-}, Ie = (s, t) => (e, r) => t(e, r, s);
-let te = class extends ce {
-  constructor(t, e, r, i) {
+$ = rr([
+  me(0, D),
+  me(1, v(lt)),
+  me(2, v(Ge)),
+  me(3, v(j))
+], $);
+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;
+}, fe = (o, t) => (e, r) => t(e, r, o);
+let X = class extends W {
+  constructor(t, e, r, a) {
     super();
-    g(this, "_formulaRuleMap", /* @__PURE__ */ new Map());
-    this._instanceService = t, this._registerOtherFormulaService = e, this._dataValidationCacheService = r, this._dataValidationModel = i, this._initFormulaResultHandler();
+    f(this, "_formulaRuleMap", /* @__PURE__ */ new Map());
+    this._instanceService = t, this._registerOtherFormulaService = e, this._dataValidationCacheService = r, this._dataValidationModel = a, this._initFormulaResultHandler();
   }
   _initFormulaResultHandler() {
     this.disposeWithMe(this._registerOtherFormulaService.formulaResult$.subscribe((t) => {
       for (const e in t) {
         const r = t[e];
-        if (this._instanceService.getUnitType(e) === K.UNIVER_SHEET)
-          for (const a in r) {
-            const n = r[a], o = this._ensureRuleFormulaMap(e, a);
-            n.forEach((l) => {
+        if (this._instanceService.getUnitType(e) === A.UNIVER_SHEET)
+          for (const i in r) {
+            const s = r[i], n = this._ensureRuleFormulaMap(e, i);
+            s.forEach((l) => {
               var u, c;
-              if (o.get((u = l.extra) == null ? void 0 : u.ruleId)) {
-                const d = this._dataValidationModel.getRuleById(e, a, (c = l.extra) == null ? void 0 : c.ruleId);
-                d && this._dataValidationCacheService.markRangeDirty(e, a, d.ranges);
+              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);
               }
             });
           }
@@ -225,97 +267,73 @@ let te = class extends ce {
   _ensureRuleFormulaMap(t, e) {
     let r = this._formulaRuleMap.get(t);
     r || (r = /* @__PURE__ */ new Map(), this._formulaRuleMap.set(t, r));
-    let i = r.get(e);
-    return i || (i = /* @__PURE__ */ new Map(), r.set(e, i)), i;
+    let a = r.get(e);
+    return a || (a = /* @__PURE__ */ new Map(), r.set(e, a)), a;
   }
-  _registerSingleFormula(t, e, r, i) {
-    const a = [{ startColumn: 0, endColumn: 0, startRow: 0, endRow: 0 }];
-    return this._registerOtherFormulaService.registerFormulaWithRange(t, e, r, a, { ruleId: i });
+  _registerSingleFormula(t, e, r, a) {
+    const i = [{ startColumn: 0, endColumn: 0, startRow: 0, endRow: 0 }];
+    return this._registerOtherFormulaService.registerFormulaWithRange(t, e, r, i, { ruleId: a });
   }
-  addRule(t, e, r, i, a, n) {
-    const o = F(i), l = F(a);
-    if (!o && !l)
-      return;
-    const u = this._ensureRuleFormulaMap(t, e), c = [void 0, void 0];
-    if (o) {
-      const d = this._registerSingleFormula(t, e, i, r);
-      c[0] = { id: d, text: i };
-    }
-    if (l) {
-      const d = this._registerSingleFormula(t, e, a, r);
-      c[1] = { id: d, text: a };
+  addRule(t, e, r) {
+    if (!le(r.type) && r.type !== M.CHECKBOX) {
+      const { formula1: a, formula2: i, uid: s } = r, n = R(a), l = R(i);
+      if (!n && !l)
+        return;
+      const u = this._ensureRuleFormulaMap(t, e), c = [void 0, void 0];
+      if (n) {
+        const d = this._registerSingleFormula(t, e, a, s);
+        c[0] = { id: d, text: a };
+      }
+      if (l) {
+        const d = this._registerSingleFormula(t, e, i, s);
+        c[1] = { id: d, text: i };
+      }
+      u.set(s, c);
     }
-    u.set(r, c);
   }
   removeRule(t, e, r) {
-    const a = this._ensureRuleFormulaMap(t, e).get(r);
-    if (!a)
+    const i = this._ensureRuleFormulaMap(t, e).get(r);
+    if (!i)
       return;
-    const [n, o] = a, l = [n == null ? void 0 : n.id, o == null ? void 0 : o.id].filter(Boolean);
+    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);
   }
-  updateRuleFormulaText(t, e, r, i, a, n) {
-    const l = this._ensureRuleFormulaMap(t, e).get(r);
-    if (!l) {
-      this.addRule(t, e, r, i, a, n);
-      return;
-    }
-    const [u, c] = l;
-    if ((u == null ? void 0 : u.text) !== i)
-      if (u && this._registerOtherFormulaService.deleteFormula(t, e, [u.id]), F(i)) {
-        const d = this._registerSingleFormula(t, e, i, r);
-        l[0] = {
-          text: i,
-          id: d
-        };
-      } else
-        l[0] = void 0;
-    if ((c == null ? void 0 : c.text) !== a)
-      if (c && this._registerOtherFormulaService.deleteFormula(t, e, [c.id]), F(a)) {
-        const d = this._registerSingleFormula(t, e, a, r);
-        l[1] = {
-          text: a,
-          id: d
-        };
-      } else
-        l[1] = void 0;
-  }
   getRuleFormulaResult(t, e, r) {
-    const a = this._ensureRuleFormulaMap(t, e).get(r);
-    if (!a)
+    const i = this._ensureRuleFormulaMap(t, e).get(r);
+    if (!i)
       return Promise.resolve(null);
-    const n = async (o) => o && this._registerOtherFormulaService.getFormulaValue(t, e, o.id);
+    const s = async (n) => n && this._registerOtherFormulaService.getFormulaValue(t, e, n.id);
     return Promise.all([
-      n(a[0]),
-      n(a[1])
+      s(i[0]),
+      s(i[1])
     ]);
   }
   getRuleFormulaResultSync(t, e, r) {
-    const a = this._ensureRuleFormulaMap(t, e).get(r);
-    if (a)
-      return a.map((n) => {
-        if (n)
-          return this._registerOtherFormulaService.getFormulaValueSync(t, e, n.id);
+    const i = this._ensureRuleFormulaMap(t, e).get(r);
+    if (i)
+      return i.map((s) => {
+        if (s)
+          return this._registerOtherFormulaService.getFormulaValueSync(t, e, s.id);
       });
   }
   getRuleFormulaInfo(t, e, r) {
     return this._ensureRuleFormulaMap(t, e).get(r);
   }
 };
-te = pr([
-  Ie(0, Z),
-  Ie(1, E(yt)),
-  Ie(2, E(ue)),
-  Ie(3, E(nt))
-], te);
-function Ve(s) {
-  return It(s);
+X = sr([
+  fe(0, D),
+  fe(1, v(lt)),
+  fe(2, v(j)),
+  fe(3, v(Ge))
+], X);
+function ae(o) {
+  return Nt(o);
 }
-function Nt(s) {
+function dt(o) {
   var t;
-  return String((t = Ve(s)) != null ? t : "");
+  return String((t = ae(o)) != null ? t : "");
 }
-const gr = class it {
+const or = class ke {
   /**
    * Accept two comparable values and creates new instance of interval
    * Predicate Interval.comparable_less(low, high) supposed to return true on these values
@@ -330,7 +348,7 @@ const gr = class it {
    * @returns {Interval}
    */
   clone() {
-    return new it(this.low, this.high);
+    return new ke(this.low, this.high);
   }
   /**
    * Propery max returns clone of this interval
@@ -377,7 +395,7 @@ const gr = class it {
    * @returns {Interval}
    */
   merge(t) {
-    return new it(
+    return new ke(
       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
     );
@@ -406,17 +424,17 @@ const gr = class it {
   static comparable_less_than(t, e) {
     return t < e;
   }
-}, P = 0, C = 1;
-class _e {
-  constructor(t = void 0, e = void 0, r = null, i = null, a = null, n = C) {
-    if (this.left = r, this.right = i, this.parent = a, this.color = n, this.item = { key: t, value: e }, t && t instanceof Array && t.length === 2 && !Number.isNaN(t[0]) && !Number.isNaN(t[1])) {
-      let [o, l] = t;
-      o > l && ([o, l] = [l, o]), this.item.key = new gr(o, l);
+}, T = 0, V = 1;
+class G {
+  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 === C;
+    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;
@@ -459,12 +477,12 @@ class _e {
     return e(t.item.key.high, r);
   }
 }
-class ct {
+class Xe {
   /**
    * Construct new empty instance of IntervalTree
    */
   constructor() {
-    this.root = null, this.nil_node = new _e();
+    this.root = null, this.nil_node = new G();
   }
   /**
    * Returns number of items stored in the interval tree
@@ -524,7 +542,7 @@ class ct {
    */
   insert(t, e = t) {
     if (t === void 0) return;
-    let r = new _e(t, e, this.nil_node, this.nil_node, null, P);
+    let r = new G(t, e, this.nil_node, this.nil_node, null, T);
     return this.tree_insert(r), this.recalc_max(r), r;
   }
   /**
@@ -534,7 +552,7 @@ class ct {
    * @returns {boolean} true if item {key, value} exist in the tree, false otherwise
    */
   exist(t, e = t) {
-    let r = new _e(t, e);
+    let r = new G(t, e);
     return !!this.tree_search(this.root, r);
   }
   /**
@@ -544,8 +562,8 @@ class ct {
    * @returns {boolean} true if item {key, value} deleted, false if not found
    */
   remove(t, e = t) {
-    let r = new _e(t, e), i = this.tree_search(this.root, r);
-    return i && this.tree_delete(i), i;
+    let r = new G(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/>
@@ -554,9 +572,9 @@ class ct {
    * @param outputMapperFn(value,key) - optional function that maps (value, key) to custom output
    * @returns {Array}
    */
-  search(t, e = (r, i) => r === i ? i.output() : r) {
-    let r = new _e(t), i = [];
-    return this.tree_search_interval(this.root, r, i), i.map((a) => e(a.item.value, a.item.key));
+  search(t, e = (r, a) => r === a ? a.output() : r) {
+    let r = new G(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
@@ -564,7 +582,7 @@ class ct {
    * @returns {boolean}
    */
   intersect_any(t) {
-    let e = new _e(t);
+    let e = new G(t);
     return this.tree_find_any_interval(this.root, e);
   }
   /**
@@ -580,7 +598,7 @@ class ct {
    * @param callback(value,key) - function to be called for each tree item
    */
   map(t) {
-    const e = new ct();
+    const e = new Xe();
     return this.tree_walk(this.root, (r) => e.insert(r.item.key, t(r.item.value, r.item.key))), e;
   }
   /**
@@ -588,9 +606,9 @@ class ct {
    * @param outputMapperFn(value,key) - optional function that maps (value, key) to custom output
    * @returns {Iterator}
    */
-  *iterate(t, e = (r, i) => r === i ? i.output() : r) {
+  *iterate(t, e = (r, a) => r === a ? a.output() : r) {
     let r;
-    for (t ? r = this.tree_search_nearest_forward(this.root, new _e(t)) : this.root && (r = this.local_minimum(this.root)); r; )
+    for (t ? r = this.tree_search_nearest_forward(this.root, new G(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) {
@@ -613,29 +631,29 @@ class ct {
   // 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 === P; )
-      e.parent === e.parent.parent.left ? (r = e.parent.parent.right, r.color === P ? (e.parent.color = C, r.color = C, e.parent.parent.color = P, e = e.parent.parent) : (e === e.parent.right && (e = e.parent, this.rotate_left(e)), e.parent.color = C, e.parent.parent.color = P, this.rotate_right(e.parent.parent))) : (r = e.parent.parent.left, r.color === P ? (e.parent.color = C, r.color = C, e.parent.parent.color = P, e = e.parent.parent) : (e === e.parent.left && (e = e.parent, this.rotate_right(e)), e.parent.color = C, e.parent.parent.color = P, this.rotate_left(e.parent.parent)));
-    this.root.color = C;
+    for (e = t; e !== this.root && e.parent.color === T; )
+      e.parent === e.parent.parent.left ? (r = e.parent.parent.right, r.color === T ? (e.parent.color = V, r.color = V, e.parent.parent.color = T, e = e.parent.parent) : (e === e.parent.right && (e = e.parent, this.rotate_left(e)), e.parent.color = V, e.parent.parent.color = T, this.rotate_right(e.parent.parent))) : (r = e.parent.parent.left, r.color === T ? (e.parent.color = V, r.color = V, e.parent.parent.color = T, e = e.parent.parent) : (e === e.parent.left && (e = e.parent, this.rotate_right(e)), e.parent.color = V, e.parent.parent.color = T, 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 === C && this.delete_fixup(r);
+    e.color === V && this.delete_fixup(r);
   }
   delete_fixup(t) {
     let e = t, r;
-    for (; e !== this.root && e.parent != null && e.color === C; )
-      e === e.parent.left ? (r = e.parent.right, r.color === P && (r.color = C, e.parent.color = P, this.rotate_left(e.parent), r = e.parent.right), r.left.color === C && r.right.color === C ? (r.color = P, e = e.parent) : (r.right.color === C && (r.color = P, r.left.color = C, this.rotate_right(r), r = e.parent.right), r.color = e.parent.color, e.parent.color = C, r.right.color = C, this.rotate_left(e.parent), e = this.root)) : (r = e.parent.left, r.color === P && (r.color = C, e.parent.color = P, this.rotate_right(e.parent), r = e.parent.left), r.left.color === C && r.right.color === C ? (r.color = P, e = e.parent) : (r.left.color === C && (r.color = P, r.right.color = C, this.rotate_left(r), r = e.parent.left), r.color = e.parent.color, e.parent.color = C, r.left.color = C, this.rotate_right(e.parent), e = this.root));
-    e.color = C;
+    for (; e !== this.root && e.parent != null && e.color === V; )
+      e === e.parent.left ? (r = e.parent.right, r.color === T && (r.color = V, e.parent.color = T, this.rotate_left(e.parent), r = e.parent.right), r.left.color === V && r.right.color === V ? (r.color = T, e = e.parent) : (r.right.color === V && (r.color = T, 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 === T && (r.color = V, e.parent.color = T, this.rotate_right(e.parent), r = e.parent.left), r.left.color === V && r.right.color === V ? (r.color = T, e = e.parent) : (r.left.color === V && (r.color = T, 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, i = t;
-    for (; i && i !== this.nil_node; )
-      i.less_than(e) ? i.intersect(e) ? (r = i, i = i.left) : i = i.right : ((!r || i.less_than(r)) && (r = i), i = i.left);
+    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
@@ -661,13 +679,13 @@ class ct {
     return e;
   }
   tree_successor(t) {
-    let e, r, i;
+    let e, r, a;
     if (t.right !== this.nil_node)
       e = this.local_minimum(t.right);
     else {
-      for (r = t, i = t.parent; i != null && i.right === r; )
-        r = i, i = i.parent;
-      e = i;
+      for (r = t, a = t.parent; a != null && a.right === r; )
+        r = a, a = a.parent;
+      e = a;
     }
     return e;
   }
@@ -692,69 +710,69 @@ class ct {
   testRedBlackProperty() {
     let t = !0;
     return this.tree_walk(this.root, function(e) {
-      e.color === P && (e.left.color === C && e.right.color === C || (t = !1));
+      e.color === T && (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, i = 0;
-    if (t.color === C && e++, t.left !== this.nil_node ? r = this.testBlackHeightProperty(t.left) : r = 1, t.right !== this.nil_node ? i = this.testBlackHeightProperty(t.right) : i = 1, r !== i)
+    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;
   }
 }
-class dt {
-  constructor(t, e, r, i, a = !1) {
-    g(this, "_map");
-    g(this, "_tree", /* @__PURE__ */ new Map());
-    g(this, "_dirty", !0);
-    g(this, "_buildTree", () => {
+class Ke {
+  constructor(t, e, r, a, i = !1) {
+    f(this, "_map");
+    f(this, "_tree", /* @__PURE__ */ new Map());
+    f(this, "_dirty", !0);
+    f(this, "_buildTree", () => {
       if (!this._dirty || this._disableTree)
         return;
       const t = /* @__PURE__ */ new Map();
-      this._map.forEach((r, i) => {
-        r.forEach((a) => {
-          for (let n = a.startColumn; n <= a.endColumn; n++) {
-            let o = t.get(n);
-            o || (o = [], t.set(n, o)), o.push({
-              startRow: a.startRow,
-              endRow: a.endRow,
-              ruleId: i
+      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
             });
           }
         });
       });
       const e = /* @__PURE__ */ new Map();
-      t.forEach((r, i) => {
-        const a = new ct();
-        r.forEach((n) => {
-          a.insert([n.startRow, n.endRow], n.ruleId);
-        }), e.set(i, a);
+      t.forEach((r, a) => {
+        const i = new Xe();
+        r.forEach((s) => {
+          i.insert([s.startRow, s.endRow], s.ruleId);
+        }), e.set(a, i);
       }), this._tree = e, this._dirty = !1;
     });
-    g(this, "_debonceBuildTree", $t(this._buildTree, 0));
-    this._unitId = e, this._subUnitId = r, this._univerInstanceService = i, this._disableTree = a, this._map = t, this._buildTree();
+    f(this, "_debonceBuildTree", Mt(this._buildTree, 0));
+    this._unitId = e, this._subUnitId = r, this._univerInstanceService = a, this._disableTree = i, this._map = t, this._buildTree();
   }
   get _worksheet() {
     var t;
-    return (t = this._univerInstanceService.getUnit(this._unitId, K.UNIVER_SHEET)) == null ? void 0 : t.getSheetBySheetId(this._subUnitId);
+    return (t = this._univerInstanceService.getUnit(this._unitId, A.UNIVER_SHEET)) == null ? void 0 : t.getSheetBySheetId(this._subUnitId);
   }
   addRule(t) {
     if (!this._worksheet)
       return;
-    const e = t.uid, r = t.ranges.map((i) => Q.transformRange(i, this._worksheet));
-    this._map.forEach((i, a) => {
-      const n = ee.subtractMulti(i, r);
-      n.length === 0 ? this._map.delete(a) : this._map.set(a, n);
+    const e = t.uid, r = t.ranges.map((a) => I.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._dirty = !0, this._map.set(e, r), this._debonceBuildTree();
   }
   removeRange(t) {
     if (!this._worksheet)
       return;
-    const e = t.map((r) => Q.transformRange(r, this._worksheet));
-    this._map.forEach((r, i) => {
-      const a = ee.subtractMulti(r, e);
-      a.length === 0 ? this._map.delete(i) : this._map.set(i, a);
+    const e = t.map((r) => I.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);
     }), this._dirty = !0, this._debonceBuildTree();
   }
   removeRule(t) {
@@ -764,76 +782,76 @@ class dt {
     if (!this._worksheet)
       return;
     this._map.delete(t);
-    const r = e.map((i) => Q.transformRange(i, this._worksheet));
-    this._map.forEach((i, a) => {
-      const n = ee.subtractMulti(i, r);
-      n.length === 0 ? this._map.delete(a) : this._map.set(a, n);
+    const r = e.map((a) => I.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();
   }
   addRangeRules(t) {
     t.forEach(({ id: e, ranges: r }) => {
       if (!r.length)
         return;
-      let i = this._map.get(e);
-      i ? (this._map.set(e, ee.mergeRanges([...i, ...r])), i = this._map.get(e)) : (i = r, this._map.set(e, i)), this._map.forEach((a, n) => {
-        if (n === e)
+      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) => {
+        if (s === e)
           return;
-        const o = ee.subtractMulti(a, r);
-        o.length === 0 ? this._map.delete(n) : this._map.set(n, o);
+        const n = B.subtractMulti(i, r);
+        n.length === 0 ? this._map.delete(s) : this._map.set(s, n);
       });
     }), this._dirty = !0, this._debonceBuildTree();
   }
   diff(t) {
     const e = [];
     let r = 0;
-    return t.forEach((i, a) => {
+    return t.forEach((a, i) => {
       var l;
-      const n = (l = this._map.get(i.uid)) != null ? l : [], o = i.ranges;
-      n.length !== 0 && (n.length !== o.length || n.some((u, c) => !ee.equals(u, o[c]))) && e.push({
+      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({
         type: "update",
-        ruleId: i.uid,
-        oldRanges: o,
-        newRanges: ee.sort(n),
-        rule: i
-      }), n.length === 0 && (e.push({
+        ruleId: a.uid,
+        oldRanges: n,
+        newRanges: B.sort(s),
+        rule: a
+      }), s.length === 0 && (e.push({
         type: "delete",
-        rule: i,
-        index: a - r
+        rule: a,
+        index: i - r
       }), r++);
     }), e;
   }
   diffWithAddition(t, e) {
     const r = [];
-    let i = 0;
-    return t.forEach((a, n) => {
+    let a = 0;
+    return t.forEach((i, s) => {
       var u;
-      const o = (u = this._map.get(a.uid)) != null ? u : [], l = a.ranges;
-      o.length !== 0 && (o.length !== l.length || o.some((c, d) => !ee.equals(c, l[d]))) && r.push({
+      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({
         type: "update",
-        ruleId: a.uid,
+        ruleId: i.uid,
         oldRanges: l,
-        newRanges: ee.sort(o),
-        rule: a
-      }), o.length === 0 && (r.push({
+        newRanges: B.sort(n),
+        rule: i
+      }), n.length === 0 && (r.push({
         type: "delete",
-        rule: a,
-        index: n - i
-      }), i++);
-    }), Array.from(e).forEach((a) => {
-      var o;
-      const n = (o = this._map.get(a.uid)) != null ? o : [];
+        rule: i,
+        index: s - a
+      }), a++);
+    }), Array.from(e).forEach((i) => {
+      var n;
+      const s = (n = this._map.get(i.uid)) != null ? n : [];
       r.push({
         type: "add",
         rule: {
-          ...a,
-          ranges: ee.sort(n)
+          ...i,
+          ranges: B.sort(s)
         }
       });
     }), r;
   }
   clone() {
-    return new dt(
-      new Map(b.deepClone(Array.from(this._map.entries()))),
+    return new Ke(
+      new Map(N.deepClone(Array.from(this._map.entries()))),
       this._unitId,
       this._subUnitId,
       this._univerInstanceService,
@@ -846,24 +864,24 @@ class dt {
     const r = this._tree.get(e);
     if (!r)
       return;
-    const i = r.search([t, t]);
-    return i.length > 0 ? i[0] : void 0;
+    const a = r.search([t, t]);
+    return a.length > 0 ? a[0] : void 0;
   }
 }
-var vr = Object.defineProperty, Sr = Object.getOwnPropertyDescriptor, Rr = (s, t, e, r) => {
-  for (var i = r > 1 ? void 0 : r ? Sr(t, e) : t, a = s.length - 1, n; a >= 0; a--)
-    (n = s[a]) && (i = (r ? n(t, e, i) : n(i)) || i);
-  return r && i && vr(t, e, i), i;
-}, pe = (s, t) => (e, r) => t(e, r, s);
-let j = class extends ce {
-  constructor(t, e, r, i, a, n, o) {
+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;
+}, Q = (o, t) => (e, r) => t(e, r, o);
+let F = class extends W {
+  constructor(t, e, r, a, i, s, n) {
     super();
-    g(this, "_ruleMatrixMap", /* @__PURE__ */ new Map());
-    g(this, "_validStatusChange$", new at());
-    g(this, "_ruleChange$", new at());
-    g(this, "ruleChange$", this._ruleChange$.asObservable());
-    g(this, "validStatusChange$", this._validStatusChange$.asObservable());
-    this._dataValidationModel = t, this._univerInstanceService = e, this._dataValidatorRegistryService = r, this._dataValidationCacheService = i, this._dataValidationFormulaService = a, this._dataValidationCustomFormulaService = n, this._commandService = o, this._initRuleUpdateListener(), this.disposeWithMe(() => {
+    f(this, "_ruleMatrixMap", /* @__PURE__ */ new Map());
+    f(this, "_validStatusChange$", new We());
+    f(this, "_ruleChange$", new We());
+    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(() => {
       this._ruleChange$.complete(), this._validStatusChange$.complete();
     }), this._initUniverInstanceListener();
   }
@@ -874,9 +892,9 @@ let j = class extends ce {
       })
     ), this.disposeWithMe(
       this._commandService.onCommandExecuted((t) => {
-        if (t.id === Qt.id) {
-          const { unitId: e, subUnitId: r } = t.params, i = this._ruleMatrixMap.get(e);
-          i && i.delete(r);
+        if (t.id === Pt.id) {
+          const { unitId: e, subUnitId: r } = t.params, a = this._ruleMatrixMap.get(e);
+          a && a.delete(r);
         }
       })
     );
@@ -884,13 +902,13 @@ let j = class extends ce {
   _initRuleUpdateListener() {
     const t = this._dataValidationModel.getAll();
     for (const [e, r] of t)
-      for (const [i, a] of r)
-        for (const n of a)
-          this._addRule(e, i, n), this._ruleChange$.next({
+      for (const [a, i] of r)
+        for (const s of i)
+          this._addRule(e, a, s), this._ruleChange$.next({
             type: "add",
             unitId: e,
-            subUnitId: i,
-            rule: n,
+            subUnitId: a,
+            rule: s,
             source: "patched"
           });
     this.disposeWithMe(
@@ -913,97 +931,84 @@ let j = class extends ce {
   _ensureRuleMatrix(t, e) {
     let r = this._ruleMatrixMap.get(t);
     r || (r = /* @__PURE__ */ new Map(), this._ruleMatrixMap.set(t, r));
-    let i = r.get(e);
-    return i || (i = new dt(/* @__PURE__ */ new Map(), t, e, this._univerInstanceService), r.set(e, i)), i;
+    let a = r.get(e);
+    return a || (a = new Ke(/* @__PURE__ */ new Map(), t, e, this._univerInstanceService), r.set(e, a)), a;
   }
   _addRuleSideEffect(t, e, r) {
-    this._ensureRuleMatrix(t, e).addRule(r), this._dataValidationCacheService.addRule(t, e, r), this._dataValidationFormulaService.addRule(t, e, r.uid, r.formula1, r.formula2, r.ranges), r.type === $.CUSTOM && this._dataValidationCustomFormulaService.addRule(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);
   }
   _addRule(t, e, r) {
-    (Array.isArray(r) ? r : [r]).forEach((a) => {
-      this._addRuleSideEffect(t, e, a);
+    (Array.isArray(r) ? r : [r]).forEach((i) => {
+      this._addRuleSideEffect(t, e, i);
     });
   }
-  _updateRule(t, e, r, i, a) {
-    const n = this._ensureRuleMatrix(t, e);
-    a.type === Y.RANGE ? (n.updateRange(r, a.payload), this._dataValidationCacheService.updateRuleRanges(t, e, r, a.payload, i.ranges), i.type === $.CUSTOM && (this._dataValidationCustomFormulaService.deleteByRuleId(t, e, r), this._dataValidationCustomFormulaService.addRule(t, e, {
-      ...i,
-      ranges: a.payload
-    }))) : a.type === Y.SETTING && (this._dataValidationCacheService.markRangeDirty(t, e, i.ranges), this._dataValidationFormulaService.updateRuleFormulaText(t, e, r, a.payload.formula1, a.payload.formula2, i.ranges), i.type === $.CUSTOM ? (this._dataValidationCustomFormulaService.deleteByRuleId(t, e, r), this._dataValidationCustomFormulaService.addRule(t, e, {
-      ...i,
-      ...a.payload
-    })) : a.payload.type === $.CUSTOM && this._dataValidationCustomFormulaService.addRule(t, e, {
-      ...i,
-      ...a.payload
-    }));
+  _updateRule(t, e, r, a, i) {
+    const s = this._ensureRuleMatrix(t, e), n = {
+      ...a,
+      ...i.payload
+    };
+    i.type === w.RANGE ? (s.updateRange(r, i.payload), this._dataValidationCacheService.updateRuleRanges(t, e, r, i.payload, a.ranges)) : i.type === w.SETTING ? this._dataValidationCacheService.markRangeDirty(t, e, a.ranges) : i.type === w.ALL && (s.updateRange(r, i.payload.ranges), this._dataValidationCacheService.updateRuleRanges(t, e, r, i.payload.ranges, a.ranges), this._dataValidationCacheService.markRangeDirty(t, e, a.ranges)), 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);
   }
   _removeRule(t, e, r) {
-    this._ensureRuleMatrix(t, e).removeRule(r), this._dataValidationCacheService.removeRule(t, e, r), r.type === $.CUSTOM && this._dataValidationCustomFormulaService.deleteByRuleId(t, e, r.uid);
+    this._ensureRuleMatrix(t, e).removeRule(r), this._dataValidationCacheService.removeRule(t, e, r), this._dataValidationCustomFormulaService.deleteByRuleId(t, e, r.uid);
   }
   getValidator(t) {
     return this._dataValidatorRegistryService.getValidatorItem(t);
   }
-  getRuleIdByLocation(t, e, r, i) {
-    return this._ensureRuleMatrix(t, e).getValue(r, i);
+  getRuleIdByLocation(t, e, r, a) {
+    return this._ensureRuleMatrix(t, e).getValue(r, a);
   }
-  getRuleByLocation(t, e, r, i) {
-    const a = this.getRuleIdByLocation(t, e, r, i);
-    if (a)
-      return this._dataValidationModel.getRuleById(t, e, a);
+  getRuleByLocation(t, e, r, a) {
+    const i = this.getRuleIdByLocation(t, e, r, a);
+    if (i)
+      return this._dataValidationModel.getRuleById(t, e, i);
   }
   validator(t, e, r) {
-    const { col: i, row: a, unitId: n, subUnitId: o, worksheet: l } = e, u = t.uid, c = t.formula1, d = t.formula2, m = (x, O) => {
-      r && r(x, O), O && this._validStatusChange$.next({
-        unitId: n,
-        subUnitId: o,
+    const { col: a, row: i, unitId: s, subUnitId: n, worksheet: l } = e, u = t.uid, c = t.formula1, d = t.formula2, m = (C, E) => {
+      r && r(C, E), E && this._validStatusChange$.next({
+        unitId: s,
+        subUnitId: n,
         ruleId: t.uid,
-        status: x,
-        row: a,
-        col: i
+        status: C,
+        row: i,
+        col: a
       });
-    }, v = l.getCellValueOnly(a, i), S = this.getValidator(t.type), w = l.getCellRaw(a, i), I = Ve(w), M = Ve(v);
-    if (S) {
-      const x = this._dataValidationCacheService.ensureCache(n, o), O = x.getValue(a, i);
-      return !O || O.value !== I || O.interceptValue !== M || O.ruleId !== u || O.formula1 !== c || O.formula2 !== d ? (x.setValue(a, i, {
-        value: I,
-        interceptValue: M,
-        status: ge.VALIDATING,
+    }, _ = l.getCellValueOnly(i, a), p = this.getValidator(t.type), S = l.getCellRaw(i, a), y = ae(S), g = ae(_);
+    if (p) {
+      const C = this._dataValidationCacheService.ensureCache(s, n), E = C.getValue(i, a);
+      return !E || E.value !== y || E.interceptValue !== g || E.ruleId !== u || E.formula1 !== c || E.formula2 !== d ? (C.setValue(i, a, {
+        value: y,
+        interceptValue: g,
+        status: Y.VALIDATING,
         ruleId: u,
         formula1: c || "",
         formula2: d || ""
-      }), S.validator(
+      }), p.validator(
         {
-          value: I,
-          unitId: n,
-          subUnitId: o,
-          row: a,
-          column: i,
+          value: y,
+          unitId: s,
+          subUnitId: n,
+          row: i,
+          column: a,
           worksheet: e.worksheet,
           workbook: e.workbook,
-          interceptValue: Ve(v),
-          t: w == null ? void 0 : w.t
+          interceptValue: ae(_),
+          t: S == null ? void 0 : S.t
         },
         t
-      ).then((H) => {
-        const L = H ? ge.VALID : ge.INVALID;
-        x.setValue(a, i, {
-          value: I,
+      ).then((x) => {
+        const L = x ? Y.VALID : Y.INVALID;
+        C.setValue(i, a, {
+          value: y,
           status: L,
           ruleId: u,
-          interceptValue: M,
+          interceptValue: g,
           formula1: c || "",
           formula2: d || ""
         }), m(L, !0);
-      }), ge.VALIDATING) : (m(O.status, !1), O.status);
+      }), Y.VALIDATING) : (m(E.status, !1), E.status);
     } else
-      return m(ge.VALID, !1), ge.VALID;
-  }
-  getRuleErrorMsg(t, e, r) {
-    const i = this._dataValidationModel.getRuleById(t, e, r);
-    if (!i)
-      return "";
-    const a = this._dataValidatorRegistryService.getValidatorItem(i.type);
-    return i.error ? i.error : a ? a.getRuleFinalError(i) : "";
+      return m(Y.VALID, !1), Y.VALID;
   }
   getRuleObjectMatrix(t, e) {
     return this._ensureRuleMatrix(t, e);
@@ -1030,58 +1035,58 @@ let j = class extends ce {
     return this._dataValidationModel.getAll();
   }
 };
-j = Rr([
-  pe(0, E(nt)),
-  pe(1, Z),
-  pe(2, E(ot)),
-  pe(3, E(ue)),
-  pe(4, E(te)),
-  pe(5, E(we)),
-  pe(6, re)
-], j);
-const Be = 1, Pe = 0;
-function ft(s, t) {
-  return b.isBlank(s) ? t.t("dataValidation.validFail.value") : F(s) ? t.t("dataValidation.validFail.primitive") : "";
+F = ur([
+  Q(0, v(Ge)),
+  Q(1, D),
+  Q(2, v(Qe)),
+  Q(3, v(j)),
+  Q(4, v(X)),
+  Q(5, v($)),
+  Q(6, H)
+], F);
+const Se = 1, Ve = 0;
+function rt(o, t) {
+  return N.isBlank(o) ? t.t("dataValidation.validFail.value") : R(o) ? t.t("dataValidation.validFail.primitive") : "";
 }
-const $e = (s) => b.isDefine(s) && String(s).toLowerCase() === "true" ? "1" : String(s).toLowerCase() === "false" ? "0" : s;
-class yr extends de {
+const _e = (o) => N.isDefine(o) && String(o).toLowerCase() === "true" ? "1" : String(o).toLowerCase() === "false" ? "0" : o;
+class cr extends q {
   constructor() {
     super(...arguments);
-    g(this, "id", $.CHECKBOX);
-    g(this, "title", "dataValidation.checkbox.title");
-    g(this, "operators", []);
-    g(this, "scopes", ["sheet"]);
-    g(this, "_formulaService", this.injector.get(te));
-    g(this, "skipDefaultFontRender", (e, r, i) => {
-      const { unitId: a, subUnitId: n } = i, { formula1: o, formula2: l } = this.parseFormulaSync(e, a, n), u = `${r != null ? r : ""}`;
-      return !u || u === `${o}` || u === `${l}`;
+    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 : ""}`;
+      return !u || u === `${n}` || u === `${l}`;
     });
   }
-  validatorFormula(e, r, i) {
-    const { formula1: a, formula2: n } = e, o = a === n;
-    if (b.isBlank(a) && b.isBlank(n))
+  validatorFormula(e, r, a) {
+    const { formula1: i, formula2: s } = e, n = i === s;
+    if (N.isBlank(i) && N.isBlank(s))
       return {
         success: !0
       };
-    if (o)
+    if (n)
       return {
         success: !1,
         formula1: this.localeService.t("dataValidation.validFail.checkboxEqual"),
         formula2: this.localeService.t("dataValidation.validFail.checkboxEqual")
       };
-    const l = ft(a, this.localeService), u = ft(n, this.localeService);
+    const l = rt(i, this.localeService), u = rt(s, this.localeService);
     return {
       success: !l && !u,
       formula1: l,
       formula2: u
     };
   }
-  async parseFormula(e, r, i) {
-    var d, m, v, S;
-    const { formula1: a = Be, formula2: n = Pe } = e, o = await this._formulaService.getRuleFormulaResult(r, i, e.uid), l = F(a) ? z((m = (d = o == null ? void 0 : o[0]) == null ? void 0 : d.result) == null ? void 0 : m[0][0]) : a, u = F(n) ? z((S = (v = o == null ? void 0 : o[1]) == null ? void 0 : v.result) == null ? void 0 : S[0][0]) : n, c = W(String(l)) && W(String(u));
+  async parseFormula(e, r, a) {
+    var d, m, _, p;
+    const { formula1: i = Se, formula2: s = Ve } = e, n = await this._formulaService.getRuleFormulaResult(r, a, e.uid), l = R(i) ? ie((m = (d = n == null ? void 0 : n[0]) == null ? void 0 : d.result) == null ? void 0 : m[0][0]) : i, u = R(s) ? ie((p = (_ = n == null ? void 0 : n[1]) == null ? void 0 : _.result) == null ? void 0 : p[0][0]) : s, c = O(String(l)) && O(String(u));
     return {
-      formula1: $e(l),
-      formula2: $e(u),
+      formula1: _e(l),
+      formula2: _e(u),
       originFormula1: l,
       originFormula2: u,
       isFormulaValid: c
@@ -1089,700 +1094,439 @@ class yr extends de {
   }
   getExtraStyle(e, r) {
     return {
-      tb: Le.CLIP
+      tb: ve.CLIP
     };
   }
-  parseFormulaSync(e, r, i) {
-    var d, m, v, S;
-    const { formula1: a = Be, formula2: n = Pe } = e, o = this._formulaService.getRuleFormulaResultSync(r, i, e.uid), l = F(a) ? z((m = (d = o == null ? void 0 : o[0]) == null ? void 0 : d.result) == null ? void 0 : m[0][0]) : a, u = F(n) ? z((S = (v = o == null ? void 0 : o[1]) == null ? void 0 : v.result) == null ? void 0 : S[0][0]) : n, c = W(String(l)) && W(String(u));
+  parseFormulaSync(e, r, a) {
+    var d, m, _, p;
+    const { formula1: i = Se, formula2: s = Ve } = e, n = this._formulaService.getRuleFormulaResultSync(r, a, e.uid), l = R(i) ? ie((m = (d = n == null ? void 0 : n[0]) == null ? void 0 : d.result) == null ? void 0 : m[0][0]) : i, u = R(s) ? ie((p = (_ = n == null ? void 0 : n[1]) == null ? void 0 : _.result) == null ? void 0 : p[0][0]) : s, c = O(String(l)) && O(String(u));
     return {
-      formula1: $e(l),
-      formula2: $e(u),
+      formula1: _e(l),
+      formula2: _e(u),
       originFormula1: l,
       originFormula2: u,
       isFormulaValid: c
     };
   }
-  async isValidType(e, r, i) {
-    const { value: a, unitId: n, subUnitId: o } = e, { formula1: l, formula2: u, originFormula1: c, originFormula2: d } = await this.parseFormula(i, n, o);
-    return !b.isDefine(l) || !b.isDefine(u) ? !0 : b.isDefine(a) && (String(a) === String(l) || String(a) === String(u) || String(a) === String(c != null ? c : "") || String(a) === String(d != null ? 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 : ""));
   }
   generateRuleErrorMessage(e) {
     return this.localeService.t("dataValidation.checkbox.error");
   }
 }
-var Mr = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {};
-function Nr(s) {
-  return s && s.__esModule && Object.prototype.hasOwnProperty.call(s, "default") ? s.default : s;
-}
-var Vt = { exports: {} };
-(function(s, t) {
-  (function(e, r) {
-    s.exports = r();
-  })(Mr, function() {
-    var e = 1e3, r = 6e4, i = 36e5, a = "millisecond", n = "second", o = "minute", l = "hour", u = "day", c = "week", d = "month", m = "quarter", v = "year", S = "date", w = "Invalid Date", I = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/, M = /\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g, x = { name: "en", weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), ordinal: function(y) {
-      var f = ["th", "st", "nd", "rd"], h = y % 100;
-      return "[" + y + (f[(h - 20) % 10] || f[h] || f[0]) + "]";
-    } }, O = function(y, f, h) {
-      var R = String(y);
-      return !R || R.length >= f ? y : "" + Array(f + 1 - R.length).join(h) + y;
-    }, H = { s: O, z: function(y) {
-      var f = -y.utcOffset(), h = Math.abs(f), R = Math.floor(h / 60), p = h % 60;
-      return (f <= 0 ? "+" : "-") + O(R, 2, "0") + ":" + O(p, 2, "0");
-    }, m: function y(f, h) {
-      if (f.date() < h.date()) return -y(h, f);
-      var R = 12 * (h.year() - f.year()) + (h.month() - f.month()), p = f.clone().add(R, d), N = h - p < 0, V = f.clone().add(R + (N ? -1 : 1), d);
-      return +(-(R + (h - p) / (N ? p - V : V - p)) || 0);
-    }, a: function(y) {
-      return y < 0 ? Math.ceil(y) || 0 : Math.floor(y);
-    }, p: function(y) {
-      return { M: d, y: v, w: c, d: u, D: S, h: l, m: o, s: n, ms: a, Q: m }[y] || String(y || "").toLowerCase().replace(/s$/, "");
-    }, u: function(y) {
-      return y === void 0;
-    } }, L = "en", q = {};
-    q[L] = x;
-    var se = "$isDayjsObject", he = function(y) {
-      return y instanceof Re || !(!y || !y[se]);
-    }, ae = function y(f, h, R) {
-      var p;
-      if (!f) return L;
-      if (typeof f == "string") {
-        var N = f.toLowerCase();
-        q[N] && (p = N), h && (q[N] = h, p = N);
-        var V = f.split("-");
-        if (!p && V.length > 1) return y(V[0]);
-      } else {
-        var D = f.name;
-        q[D] = f, p = D;
-      }
-      return !R && p && (L = p), p || !R && L;
-    }, U = function(y, f) {
-      if (he(y)) return y.clone();
-      var h = typeof f == "object" ? f : {};
-      return h.date = y, h.args = arguments, new Re(h);
-    }, T = H;
-    T.l = ae, T.i = he, T.w = function(y, f) {
-      return U(y, { locale: f.$L, utc: f.$u, x: f.$x, $offset: f.$offset });
-    };
-    var Re = function() {
-      function y(h) {
-        this.$L = ae(h.locale, null, !0), this.parse(h), this.$x = this.$x || h.x || {}, this[se] = !0;
-      }
-      var f = y.prototype;
-      return f.parse = function(h) {
-        this.$d = function(R) {
-          var p = R.date, N = R.utc;
-          if (p === null) return /* @__PURE__ */ new Date(NaN);
-          if (T.u(p)) return /* @__PURE__ */ new Date();
-          if (p instanceof Date) return new Date(p);
-          if (typeof p == "string" && !/Z$/i.test(p)) {
-            var V = p.match(I);
-            if (V) {
-              var D = V[2] - 1 || 0, A = (V[7] || "0").substring(0, 3);
-              return N ? new Date(Date.UTC(V[1], D, V[3] || 1, V[4] || 0, V[5] || 0, V[6] || 0, A)) : new Date(V[1], D, V[3] || 1, V[4] || 0, V[5] || 0, V[6] || 0, A);
-            }
-          }
-          return new Date(p);
-        }(h), this.init();
-      }, f.init = function() {
-        var h = this.$d;
-        this.$y = h.getFullYear(), this.$M = h.getMonth(), this.$D = h.getDate(), this.$W = h.getDay(), this.$H = h.getHours(), this.$m = h.getMinutes(), this.$s = h.getSeconds(), this.$ms = h.getMilliseconds();
-      }, f.$utils = function() {
-        return T;
-      }, f.isValid = function() {
-        return this.$d.toString() !== w;
-      }, f.isSame = function(h, R) {
-        var p = U(h);
-        return this.startOf(R) <= p && p <= this.endOf(R);
-      }, f.isAfter = function(h, R) {
-        return U(h) < this.startOf(R);
-      }, f.isBefore = function(h, R) {
-        return this.endOf(R) < U(h);
-      }, f.$g = function(h, R, p) {
-        return T.u(h) ? this[R] : this.set(p, h);
-      }, f.unix = function() {
-        return Math.floor(this.valueOf() / 1e3);
-      }, f.valueOf = function() {
-        return this.$d.getTime();
-      }, f.startOf = function(h, R) {
-        var p = this, N = !!T.u(R) || R, V = T.p(h), D = function(fe, G) {
-          var ne = T.w(p.$u ? Date.UTC(p.$y, G, fe) : new Date(p.$y, G, fe), p);
-          return N ? ne : ne.endOf(u);
-        }, A = function(fe, G) {
-          return T.w(p.toDate()[fe].apply(p.toDate("s"), (N ? [0, 0, 0, 0] : [23, 59, 59, 999]).slice(G)), p);
-        }, B = this.$W, k = this.$M, J = this.$D, ye = "set" + (this.$u ? "UTC" : "");
-        switch (V) {
-          case v:
-            return N ? D(1, 0) : D(31, 11);
-          case d:
-            return N ? D(1, k) : D(0, k + 1);
-          case c:
-            var me = this.$locale().weekStart || 0, Te = (B < me ? B + 7 : B) - me;
-            return D(N ? J - Te : J + (6 - Te), k);
-          case u:
-          case S:
-            return A(ye + "Hours", 0);
-          case l:
-            return A(ye + "Minutes", 1);
-          case o:
-            return A(ye + "Seconds", 2);
-          case n:
-            return A(ye + "Milliseconds", 3);
-          default:
-            return this.clone();
-        }
-      }, f.endOf = function(h) {
-        return this.startOf(h, !1);
-      }, f.$set = function(h, R) {
-        var p, N = T.p(h), V = "set" + (this.$u ? "UTC" : ""), D = (p = {}, p[u] = V + "Date", p[S] = V + "Date", p[d] = V + "Month", p[v] = V + "FullYear", p[l] = V + "Hours", p[o] = V + "Minutes", p[n] = V + "Seconds", p[a] = V + "Milliseconds", p)[N], A = N === u ? this.$D + (R - this.$W) : R;
-        if (N === d || N === v) {
-          var B = this.clone().set(S, 1);
-          B.$d[D](A), B.init(), this.$d = B.set(S, Math.min(this.$D, B.daysInMonth())).$d;
-        } else D && this.$d[D](A);
-        return this.init(), this;
-      }, f.set = function(h, R) {
-        return this.clone().$set(h, R);
-      }, f.get = function(h) {
-        return this[T.p(h)]();
-      }, f.add = function(h, R) {
-        var p, N = this;
-        h = Number(h);
-        var V = T.p(R), D = function(k) {
-          var J = U(N);
-          return T.w(J.date(J.date() + Math.round(k * h)), N);
-        };
-        if (V === d) return this.set(d, this.$M + h);
-        if (V === v) return this.set(v, this.$y + h);
-        if (V === u) return D(1);
-        if (V === c) return D(7);
-        var A = (p = {}, p[o] = r, p[l] = i, p[n] = e, p)[V] || 1, B = this.$d.getTime() + h * A;
-        return T.w(B, this);
-      }, f.subtract = function(h, R) {
-        return this.add(-1 * h, R);
-      }, f.format = function(h) {
-        var R = this, p = this.$locale();
-        if (!this.isValid()) return p.invalidDate || w;
-        var N = h || "YYYY-MM-DDTHH:mm:ssZ", V = T.z(this), D = this.$H, A = this.$m, B = this.$M, k = p.weekdays, J = p.months, ye = p.meridiem, me = function(G, ne, Fe, be) {
-          return G && (G[ne] || G(R, N)) || Fe[ne].slice(0, be);
-        }, Te = function(G) {
-          return T.s(D % 12 || 12, G, "0");
-        }, fe = ye || function(G, ne, Fe) {
-          var be = G < 12 ? "AM" : "PM";
-          return Fe ? be.toLowerCase() : be;
-        };
-        return N.replace(M, function(G, ne) {
-          return ne || function(Fe) {
-            switch (Fe) {
-              case "YY":
-                return String(R.$y).slice(-2);
-              case "YYYY":
-                return T.s(R.$y, 4, "0");
-              case "M":
-                return B + 1;
-              case "MM":
-                return T.s(B + 1, 2, "0");
-              case "MMM":
-                return me(p.monthsShort, B, J, 3);
-              case "MMMM":
-                return me(J, B);
-              case "D":
-                return R.$D;
-              case "DD":
-                return T.s(R.$D, 2, "0");
-              case "d":
-                return String(R.$W);
-              case "dd":
-                return me(p.weekdaysMin, R.$W, k, 2);
-              case "ddd":
-                return me(p.weekdaysShort, R.$W, k, 3);
-              case "dddd":
-                return k[R.$W];
-              case "H":
-                return String(D);
-              case "HH":
-                return T.s(D, 2, "0");
-              case "h":
-                return Te(1);
-              case "hh":
-                return Te(2);
-              case "a":
-                return fe(D, A, !0);
-              case "A":
-                return fe(D, A, !1);
-              case "m":
-                return String(A);
-              case "mm":
-                return T.s(A, 2, "0");
-              case "s":
-                return String(R.$s);
-              case "ss":
-                return T.s(R.$s, 2, "0");
-              case "SSS":
-                return T.s(R.$ms, 3, "0");
-              case "Z":
-                return V;
-            }
-            return null;
-          }(G) || V.replace(":", "");
-        });
-      }, f.utcOffset = function() {
-        return 15 * -Math.round(this.$d.getTimezoneOffset() / 15);
-      }, f.diff = function(h, R, p) {
-        var N, V = this, D = T.p(R), A = U(h), B = (A.utcOffset() - this.utcOffset()) * r, k = this - A, J = function() {
-          return T.m(V, A);
-        };
-        switch (D) {
-          case v:
-            N = J() / 12;
-            break;
-          case d:
-            N = J();
-            break;
-          case m:
-            N = J() / 3;
-            break;
-          case c:
-            N = (k - B) / 6048e5;
-            break;
-          case u:
-            N = (k - B) / 864e5;
-            break;
-          case l:
-            N = k / i;
-            break;
-          case o:
-            N = k / r;
-            break;
-          case n:
-            N = k / e;
-            break;
-          default:
-            N = k;
-        }
-        return p ? N : T.a(N);
-      }, f.daysInMonth = function() {
-        return this.endOf(d).$D;
-      }, f.$locale = function() {
-        return q[this.$L];
-      }, f.locale = function(h, R) {
-        if (!h) return this.$L;
-        var p = this.clone(), N = ae(h, R, !0);
-        return N && (p.$L = N), p;
-      }, f.clone = function() {
-        return T.w(this.$d, this);
-      }, f.toDate = function() {
-        return new Date(this.valueOf());
-      }, f.toJSON = function() {
-        return this.isValid() ? this.toISOString() : null;
-      }, f.toISOString = function() {
-        return this.$d.toISOString();
-      }, f.toString = function() {
-        return this.$d.toUTCString();
-      }, y;
-    }(), Oe = Re.prototype;
-    return U.prototype = Oe, [["$ms", a], ["$s", n], ["$m", o], ["$H", l], ["$W", u], ["$M", d], ["$y", v], ["$D", S]].forEach(function(y) {
-      Oe[y[1]] = function(f) {
-        return this.$g(f, y[0], y[1]);
-      };
-    }), U.extend = function(y, f) {
-      return y.$i || (y(f, Re, U), y.$i = !0), U;
-    }, U.locale = ae, U.isDayjs = he, U.unix = function(y) {
-      return U(1e3 * y);
-    }, U.en = q[L], U.Ls = q, U.p = {}, U;
-  });
-})(Vt);
-var Vr = Vt.exports;
-const wt = /* @__PURE__ */ Nr(Vr), wr = {
-  [_.BETWEEN]: "dataValidation.date.operators.between",
-  [_.EQUAL]: "dataValidation.date.operators.equal",
-  [_.GREATER_THAN]: "dataValidation.date.operators.greaterThan",
-  [_.GREATER_THAN_OR_EQUAL]: "dataValidation.date.operators.greaterThanOrEqual",
-  [_.LESS_THAN]: "dataValidation.date.operators.lessThan",
-  [_.LESS_THAN_OR_EQUAL]: "dataValidation.date.operators.lessThanOrEqual",
-  [_.NOT_BETWEEN]: "dataValidation.date.operators.notBetween",
-  [_.NOT_EQUAL]: "dataValidation.date.operators.notEqual"
+const dr = {
+  [h.BETWEEN]: "dataValidation.date.operators.between",
+  [h.EQUAL]: "dataValidation.date.operators.equal",
+  [h.GREATER_THAN]: "dataValidation.date.operators.greaterThan",
+  [h.GREATER_THAN_OR_EQUAL]: "dataValidation.date.operators.greaterThanOrEqual",
+  [h.LESS_THAN]: "dataValidation.date.operators.lessThan",
+  [h.LESS_THAN_OR_EQUAL]: "dataValidation.date.operators.lessThanOrEqual",
+  [h.NOT_BETWEEN]: "dataValidation.date.operators.notBetween",
+  [h.NOT_EQUAL]: "dataValidation.date.operators.notEqual"
 };
-_.BETWEEN + "", _.EQUAL + "", _.GREATER_THAN + "", _.GREATER_THAN_OR_EQUAL + "", _.LESS_THAN + "", _.LESS_THAN_OR_EQUAL + "", _.NOT_BETWEEN + "", _.NOT_EQUAL + "";
-const Tr = {
-  [_.BETWEEN]: "dataValidation.date.ruleName.between",
-  [_.EQUAL]: "dataValidation.date.ruleName.equal",
-  [_.GREATER_THAN]: "dataValidation.date.ruleName.greaterThan",
-  [_.GREATER_THAN_OR_EQUAL]: "dataValidation.date.ruleName.greaterThanOrEqual",
-  [_.LESS_THAN]: "dataValidation.date.ruleName.lessThan",
-  [_.LESS_THAN_OR_EQUAL]: "dataValidation.date.ruleName.lessThanOrEqual",
-  [_.NOT_BETWEEN]: "dataValidation.date.ruleName.notBetween",
-  [_.NOT_EQUAL]: "dataValidation.date.ruleName.notEqual"
-}, Fr = {
-  [_.BETWEEN]: "dataValidation.date.errorMsg.between",
-  [_.EQUAL]: "dataValidation.date.errorMsg.equal",
-  [_.GREATER_THAN]: "dataValidation.date.errorMsg.greaterThan",
-  [_.GREATER_THAN_OR_EQUAL]: "dataValidation.date.errorMsg.greaterThanOrEqual",
-  [_.LESS_THAN]: "dataValidation.date.errorMsg.lessThan",
-  [_.LESS_THAN_OR_EQUAL]: "dataValidation.date.errorMsg.lessThanOrEqual",
-  [_.NOT_BETWEEN]: "dataValidation.date.errorMsg.notBetween",
-  [_.NOT_EQUAL]: "dataValidation.date.errorMsg.notEqual"
-}, Xe = [
-  _.BETWEEN,
-  _.NOT_BETWEEN
-], _t = "{FORMULA1}", pt = "{FORMULA2}", Ee = (s) => {
+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 = {
+  [h.BETWEEN]: "dataValidation.date.ruleName.between",
+  [h.EQUAL]: "dataValidation.date.ruleName.equal",
+  [h.GREATER_THAN]: "dataValidation.date.ruleName.greaterThan",
+  [h.GREATER_THAN_OR_EQUAL]: "dataValidation.date.ruleName.greaterThanOrEqual",
+  [h.LESS_THAN]: "dataValidation.date.ruleName.lessThan",
+  [h.LESS_THAN_OR_EQUAL]: "dataValidation.date.ruleName.lessThanOrEqual",
+  [h.NOT_BETWEEN]: "dataValidation.date.ruleName.notBetween",
+  [h.NOT_EQUAL]: "dataValidation.date.ruleName.notEqual"
+}, mr = {
+  [h.BETWEEN]: "dataValidation.date.errorMsg.between",
+  [h.EQUAL]: "dataValidation.date.errorMsg.equal",
+  [h.GREATER_THAN]: "dataValidation.date.errorMsg.greaterThan",
+  [h.GREATER_THAN_OR_EQUAL]: "dataValidation.date.errorMsg.greaterThanOrEqual",
+  [h.LESS_THAN]: "dataValidation.date.errorMsg.lessThan",
+  [h.LESS_THAN_OR_EQUAL]: "dataValidation.date.errorMsg.lessThanOrEqual",
+  [h.NOT_BETWEEN]: "dataValidation.date.errorMsg.notBetween",
+  [h.NOT_EQUAL]: "dataValidation.date.errorMsg.notEqual"
+}, be = [
+  h.BETWEEN,
+  h.NOT_BETWEEN
+], oe = "{FORMULA1}", ne = "{FORMULA2}";
+function la(o) {
+  return o.filter(Boolean).join(",");
+}
+function pe(o) {
+  return o.split(",").filter(Boolean);
+}
+function ua(o) {
+  const t = ae(o);
+  return t == null ? "" : t.toString();
+}
+function Ie(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 = R(r) ? o.moveFormulaRefOffset(r, l, n, !0) : r, c = R(a) ? o.moveFormulaRefOffset(a, l, n, !0) : a;
+  return {
+    transformedFormula1: u,
+    transformedFormula2: c
+  };
+}
+const Be = (o) => {
   var e, r;
-  if (s == null || typeof s == "boolean")
+  if (o == null || typeof o == "boolean")
     return;
-  if (typeof s == "number" || !Number.isNaN(+s))
-    return +s;
-  const t = (e = oe.parseDate(s)) == null ? void 0 : e.v;
-  return b.isDefine(t) ? t : (r = oe.parseDate(wt(s).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : r.v;
+  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(it(o).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : r.v;
 };
-class Er extends de {
+class fr extends q {
   constructor() {
     super(...arguments);
-    g(this, "id", $.DATE);
-    g(this, "title", "dataValidation.date.title");
-    g(this, "operators", [
-      _.BETWEEN,
-      _.EQUAL,
-      _.GREATER_THAN,
-      _.GREATER_THAN_OR_EQUAL,
-      _.LESS_THAN,
-      _.LESS_THAN_OR_EQUAL,
-      _.NOT_BETWEEN,
-      _.NOT_EQUAL
+    f(this, "id", M.DATE);
+    f(this, "title", "dataValidation.date.title");
+    f(this, "operators", [
+      h.BETWEEN,
+      h.EQUAL,
+      h.GREATER_THAN,
+      h.GREATER_THAN_OR_EQUAL,
+      h.LESS_THAN,
+      h.LESS_THAN_OR_EQUAL,
+      h.NOT_BETWEEN,
+      h.NOT_EQUAL
     ]);
-    g(this, "scopes", ["sheet"]);
-    g(this, "_formulaService", this.injector.get(te));
-  }
-  async parseFormula(e, r, i) {
-    var d, m, v, S;
-    const a = await this._formulaService.getRuleFormulaResult(r, i, e.uid), { formula1: n, formula2: o } = e, l = z((m = (d = a == null ? void 0 : a[0]) == null ? void 0 : d.result) == null ? void 0 : m[0][0]), u = z((S = (v = a == null ? void 0 : a[1]) == null ? void 0 : v.result) == null ? void 0 : S[0][0]), c = W(String(l)) && W(String(u));
-    return {
-      formula1: Ee(F(n) ? l : n),
-      formula2: Ee(F(o) ? u : o),
-      isFormulaValid: c
-    };
+    f(this, "scopes", ["sheet"]);
+    f(this, "_customFormulaService", this.injector.get($));
+    f(this, "_lexerTreeBuilder", this.injector.get(Z));
   }
-  parseFormulaSync(e, r, i) {
-    var l, u, c, d;
-    const a = this._formulaService.getRuleFormulaResultSync(r, i, e.uid), { formula1: n, formula2: o } = 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 = O(String(n == null ? void 0 : n.v)) && O(String(l == null ? void 0 : l.v));
     return {
-      formula1: Ee(F(n) ? z((u = (l = a == null ? void 0 : a[0]) == null ? void 0 : l.result) == null ? void 0 : u[0][0]) : n),
-      formula2: Ee(F(o) ? z((d = (c = a == null ? void 0 : a[1]) == null ? void 0 : c.result) == null ? void 0 : d[0][0]) : o)
+      formula1: Be(R(u) ? n == null ? void 0 : n.v : u),
+      formula2: Be(R(c) ? l == null ? void 0 : l.v : c),
+      isFormulaValid: d
     };
   }
   async isValidType(e) {
-    const { interceptValue: r, value: i } = e;
-    return typeof i == "number" && typeof r == "string" ? !0 : typeof r == "string" ? !!oe.parseDate(r) : !1;
+    const { interceptValue: r, value: a } = e;
+    return typeof a == "number" && typeof r == "string" ? !0 : typeof r == "string" ? !!k.parseDate(r) : !1;
   }
   _validatorSingleFormula(e) {
-    return !b.isBlank(e) && (F(e) || !Number.isNaN(+e) || !!(e && oe.parseDate(e)));
+    return !N.isBlank(e) && (R(e) || !Number.isNaN(+e) || !!(e && k.parseDate(e)));
   }
-  validatorFormula(e, r, i) {
-    const a = e.operator;
-    if (!a)
+  validatorFormula(e, r, a) {
+    const i = e.operator;
+    if (!i)
       return {
         success: !1
       };
-    const n = this._validatorSingleFormula(e.formula1), o = this.localeService.t("dataValidation.validFail.date");
-    if (Xe.includes(a)) {
+    const s = this._validatorSingleFormula(e.formula1), n = this.localeService.t("dataValidation.validFail.date");
+    if (be.includes(i)) {
       const u = this._validatorSingleFormula(e.formula2);
       return {
-        success: n && u,
-        formula1: n ? void 0 : o,
-        formula2: u ? void 0 : o
+        success: s && u,
+        formula1: s ? void 0 : n,
+        formula2: u ? void 0 : n
       };
     }
     return {
-      success: n,
-      formula1: n ? void 0 : o
+      success: s,
+      formula1: s ? void 0 : n
     };
   }
-  normalizeFormula(e, r, i) {
-    const { formula1: a, formula2: n, bizInfo: o } = e, l = (u) => {
+  normalizeFormula(e, r, a) {
+    const { formula1: i, formula2: s, bizInfo: n } = e, l = (u) => {
       var d;
       if (!u)
         return u;
       let c;
       if (!Number.isNaN(+u))
-        c = oe.dateFromSerial(+u);
+        c = k.dateFromSerial(+u);
       else {
-        const m = (d = oe.parseDate(u)) == null ? void 0 : d.v;
+        const m = (d = k.parseDate(u)) == null ? void 0 : d.v;
         if (m == null)
           return "";
-        c = oe.dateFromSerial(m);
+        c = k.dateFromSerial(m);
       }
-      return wt(`${c[0]}/${c[1]}/${c[2]} ${c[3]}:${c[4]}:${c[5]}`).format(o != null && o.showTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD");
+      return it(`${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 {
-      formula1: F(a) ? a : l(`${a}`),
-      formula2: F(n) ? n : l(`${n}`)
+      formula1: R(i) ? i : l(`${i}`),
+      formula2: R(s) ? s : l(`${s}`)
     };
   }
-  transform(e, r, i) {
-    const { value: a } = e;
+  transform(e, r, a) {
+    const { value: i } = e;
     return {
       ...e,
-      value: Ee(a)
+      value: Be(i)
     };
   }
-  async validatorIsEqual(e, r, i) {
-    const { formula1: a } = r, { value: n } = e;
-    return Number.isNaN(a) ? !0 : n === a;
+  async validatorIsEqual(e, r, a) {
+    const { formula1: i } = r, { value: s } = e;
+    return Number.isNaN(i) ? !0 : s === i;
   }
-  async validatorIsNotEqual(e, r, i) {
-    const { formula1: a } = r;
-    return Number.isNaN(a) ? !0 : e.value !== a;
+  async validatorIsNotEqual(e, r, a) {
+    const { formula1: i } = r;
+    return Number.isNaN(i) ? !0 : e.value !== i;
   }
-  async validatorIsBetween(e, r, i) {
-    const { formula1: a, formula2: n } = r;
-    if (Number.isNaN(a) || Number.isNaN(n))
+  async validatorIsBetween(e, r, a) {
+    const { formula1: i, formula2: s } = r;
+    if (Number.isNaN(i) || Number.isNaN(s))
       return !0;
-    const o = Math.min(a, n), l = Math.max(a, n);
-    return e.value >= o && e.value <= l;
+    const n = Math.min(i, s), l = Math.max(i, s);
+    return e.value >= n && e.value <= l;
   }
-  async validatorIsNotBetween(e, r, i) {
-    const { formula1: a, formula2: n } = r;
-    if (Number.isNaN(a) || Number.isNaN(n))
+  async validatorIsNotBetween(e, r, a) {
+    const { formula1: i, formula2: s } = r;
+    if (Number.isNaN(i) || Number.isNaN(s))
       return !0;
-    const o = Math.min(a, n), l = Math.max(a, n);
-    return e.value < o || e.value > l;
+    const n = Math.min(i, s), l = Math.max(i, s);
+    return e.value < n || e.value > l;
   }
-  async validatorIsGreaterThan(e, r, i) {
-    const { formula1: a } = r;
-    return Number.isNaN(a) ? !0 : e.value > a;
+  async validatorIsGreaterThan(e, r, a) {
+    const { formula1: i } = r;
+    return Number.isNaN(i) ? !0 : e.value > i;
   }
-  async validatorIsGreaterThanOrEqual(e, r, i) {
-    const { formula1: a } = r;
-    return Number.isNaN(a) ? !0 : e.value >= a;
+  async validatorIsGreaterThanOrEqual(e, r, a) {
+    const { formula1: i } = r;
+    return Number.isNaN(i) ? !0 : e.value >= i;
   }
-  async validatorIsLessThan(e, r, i) {
-    const { formula1: a } = r;
-    return Number.isNaN(a) ? !0 : e.value < a;
+  async validatorIsLessThan(e, r, a) {
+    const { formula1: i } = r;
+    return Number.isNaN(i) ? !0 : e.value < i;
   }
-  async validatorIsLessThanOrEqual(e, r, i) {
-    const { formula1: a } = r;
-    return Number.isNaN(a) ? !0 : e.value <= a;
+  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(wr[e]));
+    return this.operators.map((e) => this.localeService.t(dr[e]));
   }
   generateRuleName(e) {
-    var i, a;
+    var a, i;
     if (!e.operator)
       return this.titleStr;
-    const r = this.localeService.t(Tr[e.operator]).replace(_t, (i = e.formula1) != null ? i : "").replace(pt, (a = e.formula2) != null ? a : "");
+    const r = this.localeService.t(hr[e.operator]).replace(oe, (a = e.formula1) != null ? a : "").replace(ne, (i = e.formula2) != null ? i : "");
     return `${this.titleStr} ${r}`;
   }
-  generateRuleErrorMessage(e) {
-    var i, a;
-    return e.operator ? `${this.localeService.t(Fr[e.operator]).replace(_t, (i = e.formula1) != null ? i : "").replace(pt, (a = e.formula2) != null ? a : "")}` : this.titleStr;
+  generateRuleErrorMessage(e, r) {
+    if (!e.operator)
+      return this.titleStr;
+    const { transformedFormula1: a, transformedFormula2: i } = Ie(this._lexerTreeBuilder, e, r);
+    return `${this.localeService.t(mr[e.operator]).replace(oe, a != null ? a : "").replace(ne, i != null ? i : "")}`;
   }
 }
-function He(s) {
-  let t = s;
-  return typeof s == "string" ? ((s.startsWith("¥") || s.startsWith("$")) && (t = s.slice(1)), +t) : +s;
+h.BETWEEN + "", h.EQUAL + "", h.GREATER_THAN + "", h.GREATER_THAN_OR_EQUAL + "", h.LESS_THAN + "", h.LESS_THAN_OR_EQUAL + "", h.NOT_BETWEEN + "", h.NOT_EQUAL + "";
+h.BETWEEN + "", h.EQUAL + "", h.GREATER_THAN + "", h.GREATER_THAN_OR_EQUAL + "", h.LESS_THAN + "", h.LESS_THAN_OR_EQUAL + "", h.NOT_BETWEEN + "", h.NOT_EQUAL + "";
+const ht = {
+  [h.BETWEEN]: "dataValidation.errorMsg.between",
+  [h.EQUAL]: "dataValidation.errorMsg.equal",
+  [h.GREATER_THAN]: "dataValidation.errorMsg.greaterThan",
+  [h.GREATER_THAN_OR_EQUAL]: "dataValidation.errorMsg.greaterThanOrEqual",
+  [h.LESS_THAN]: "dataValidation.errorMsg.lessThan",
+  [h.LESS_THAN_OR_EQUAL]: "dataValidation.errorMsg.lessThanOrEqual",
+  [h.NOT_BETWEEN]: "dataValidation.errorMsg.notBetween",
+  [h.NOT_EQUAL]: "dataValidation.errorMsg.notEqual"
+};
+function Ne(o) {
+  let t = o;
+  return typeof o == "string" ? ((o.startsWith("¥") || o.startsWith("$")) && (t = o.slice(1)), +t) : +o;
 }
-class Cr extends de {
+class _r extends q {
   constructor() {
     super(...arguments);
-    g(this, "_formulaService", this.injector.get(te));
-    g(this, "id", $.DECIMAL);
-    g(this, "title", "dataValidation.decimal.title");
-    g(this, "operators", [
-      _.BETWEEN,
-      _.EQUAL,
-      _.GREATER_THAN,
-      _.GREATER_THAN_OR_EQUAL,
-      _.LESS_THAN,
-      _.LESS_THAN_OR_EQUAL,
-      _.NOT_BETWEEN,
-      _.NOT_EQUAL
+    f(this, "_customFormulaService", this.injector.get($));
+    f(this, "id", M.DECIMAL);
+    f(this, "_lexerTreeBuilder", this.injector.get(Z));
+    f(this, "title", "dataValidation.decimal.title");
+    f(this, "operators", [
+      h.BETWEEN,
+      h.EQUAL,
+      h.GREATER_THAN,
+      h.GREATER_THAN_OR_EQUAL,
+      h.LESS_THAN,
+      h.LESS_THAN_OR_EQUAL,
+      h.NOT_BETWEEN,
+      h.NOT_EQUAL
     ]);
-    g(this, "scopes", ["sheet"]);
+    f(this, "scopes", ["sheet"]);
   }
   _isFormulaOrNumber(e) {
-    return !b.isBlank(e) && (F(e) || !Number.isNaN(+e));
+    return !N.isBlank(e) && (R(e) || !Number.isNaN(+e));
   }
-  async isValidType(e, r, i) {
-    const { value: a } = e;
-    return !Number.isNaN(He(a));
+  async isValidType(e, r, a) {
+    const { value: i } = e;
+    return !Number.isNaN(Ne(i));
   }
-  transform(e, r, i) {
-    const { value: a } = e;
+  transform(e, r, a) {
+    const { value: i } = e;
     return {
       ...e,
-      value: He(a)
+      value: Ne(i)
     };
   }
   _parseNumber(e) {
     return e == null ? Number.NaN : +e;
   }
-  async parseFormula(e, r, i) {
-    var m, v, S, w;
-    const a = await this._formulaService.getRuleFormulaResult(r, i, e.uid), { formula1: n, formula2: o } = e, l = z((v = (m = a == null ? void 0 : a[0]) == null ? void 0 : m.result) == null ? void 0 : v[0][0]), u = z((w = (S = a == null ? void 0 : a[1]) == null ? void 0 : S.result) == null ? void 0 : w[0][0]), c = W(String(l)) && W(String(u));
+  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 = O(String(n == null ? void 0 : n.v)) && O(String(l == null ? void 0 : l.v));
     return {
-      formula1: this._parseNumber(F(n) ? l : n),
-      formula2: this._parseNumber(F(o) ? u : o),
-      isFormulaValid: c
+      formula1: this._parseNumber(R(u) ? n == null ? void 0 : n.v : u),
+      formula2: this._parseNumber(R(c) ? l == null ? void 0 : l.v : c),
+      isFormulaValid: d
     };
   }
-  validatorFormula(e, r, i) {
-    const a = e.operator;
-    if (!a)
+  validatorFormula(e, r, a) {
+    const i = e.operator;
+    if (!i)
       return {
         success: !1
       };
-    const n = b.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), o = b.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), l = Xe.includes(a), u = this.localeService.t("dataValidation.validFail.number");
+    const s = N.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), n = N.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), l = be.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
-      success: n && o,
-      formula1: n ? void 0 : u,
-      formula2: o ? void 0 : u
+      success: s && n,
+      formula1: s ? void 0 : u,
+      formula2: n ? void 0 : u
     } : {
-      success: n,
-      formula1: n ? "" : u
+      success: s,
+      formula1: s ? "" : u
     };
   }
-  async validatorIsEqual(e, r, i) {
-    const { formula1: a } = r, { value: n } = e;
-    return Number.isNaN(a) ? !0 : n === a;
+  async validatorIsEqual(e, r, a) {
+    const { formula1: i } = r, { value: s } = e;
+    return Number.isNaN(i) ? !0 : s === i;
   }
-  async validatorIsNotEqual(e, r, i) {
-    const { formula1: a } = r;
-    return Number.isNaN(a) ? !0 : e.value !== a;
+  async validatorIsNotEqual(e, r, a) {
+    const { formula1: i } = r;
+    return Number.isNaN(i) ? !0 : e.value !== i;
   }
-  async validatorIsBetween(e, r, i) {
-    const { formula1: a, formula2: n } = r;
-    if (Number.isNaN(a) || Number.isNaN(n))
+  async validatorIsBetween(e, r, a) {
+    const { formula1: i, formula2: s } = r;
+    if (Number.isNaN(i) || Number.isNaN(s))
       return !0;
-    const o = Math.min(a, n), l = Math.max(a, n);
-    return e.value >= o && e.value <= l;
+    const n = Math.min(i, s), l = Math.max(i, s);
+    return e.value >= n && e.value <= l;
   }
-  async validatorIsNotBetween(e, r, i) {
-    const { formula1: a, formula2: n } = r;
-    if (Number.isNaN(a) || Number.isNaN(n))
+  async validatorIsNotBetween(e, r, a) {
+    const { formula1: i, formula2: s } = r;
+    if (Number.isNaN(i) || Number.isNaN(s))
       return !0;
-    const o = Math.min(a, n), l = Math.max(a, n);
-    return e.value < o || e.value > l;
+    const n = Math.min(i, s), l = Math.max(i, s);
+    return e.value < n || e.value > l;
   }
-  async validatorIsGreaterThan(e, r, i) {
-    const { formula1: a } = r;
-    return Number.isNaN(a) ? !0 : e.value > a;
+  async validatorIsGreaterThan(e, r, a) {
+    const { formula1: i } = r;
+    return Number.isNaN(i) ? !0 : e.value > i;
   }
-  async validatorIsGreaterThanOrEqual(e, r, i) {
-    const { formula1: a } = r;
-    return Number.isNaN(a) ? !0 : e.value >= a;
+  async validatorIsGreaterThanOrEqual(e, r, a) {
+    const { formula1: i } = r;
+    return Number.isNaN(i) ? !0 : e.value >= i;
   }
-  async validatorIsLessThan(e, r, i) {
-    const { formula1: a } = r;
-    return Number.isNaN(a) ? !0 : e.value < a;
+  async validatorIsLessThan(e, r, a) {
+    const { formula1: i } = r;
+    return Number.isNaN(i) ? !0 : e.value < i;
   }
-  async validatorIsLessThanOrEqual(e, r, i) {
-    const { formula1: a } = r;
-    return Number.isNaN(a) ? !0 : e.value <= a;
+  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 } = Ie(this._lexerTreeBuilder, e, r);
+    return `${this.localeService.t(ht[e.operator]).replace(oe, a != null ? a : "").replace(ne, i != null ? i : "")}`;
   }
 }
-function ya(s) {
-  return s.filter(Boolean).join(",");
-}
-function xe(s) {
-  return s.split(",").filter(Boolean);
-}
-function Ma(s) {
-  const t = Ve(s);
-  return t == null ? "" : t.toString();
-}
-function Ze(s) {
-  if (!s)
+function Pe(o) {
+  if (!o)
     return [];
   const t = /* @__PURE__ */ new Set();
-  return s.forEach(
+  return o.forEach(
     (e) => {
       e.forEach((r) => {
-        var a, n;
-        const i = Ve(r);
-        if (i != null) {
-          if (typeof i != "string" && typeof (r == null ? void 0 : r.s) == "object" && ((n = (a = r.s) == null ? void 0 : a.n) != null && n.pattern)) {
-            t.add(oe.format(r.s.n.pattern, i, { throws: !1 }));
+        var i, s;
+        const a = ae(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 }));
             return;
           }
-          W(i.toString()) && t.add(i.toString());
+          O(a.toString()) && t.add(a.toString());
         }
       });
     }
   ), [...t];
 }
-const Or = [
+const pr = [
   "if",
   "indirect",
   "choose",
   "offset"
 ];
-function br(s, t) {
-  if (!F(s) || Mt(s.slice(1)))
+function gr(o, t) {
+  if (!R(o) || ct(o.slice(1)))
     return !0;
-  const r = t.sequenceNodesBuilder(s);
-  return r && r.some((i) => typeof i == "object" && i.nodeType === rr.FUNCTION && Or.indexOf(i.token.toLowerCase()) > -1);
+  const r = t.sequenceNodesBuilder(o);
+  return r && r.some((a) => typeof a == "object" && a.nodeType === Gt.FUNCTION && pr.indexOf(a.token.toLowerCase()) > -1);
 }
-function Dr(s, t) {
-  const { formula1: e = "", ranges: r } = s;
-  if (Mt(e.slice(1))) {
-    const a = ar(e.slice(1));
-    if ((!a.sheetName || a.sheetName === t) && r.some((n) => ee.intersects(n, a.range)))
+function vr(o, t) {
+  const { formula1: e = "", ranges: r } = o;
+  if (ct(e.slice(1))) {
+    const i = Qt(e.slice(1));
+    if ((!i.sheetName || i.sheetName === t) && r.some((s) => B.intersects(s, i.range)))
       return !0;
   }
   return !1;
 }
-class Tt extends de {
+class mt extends q {
   constructor() {
     super(...arguments);
-    g(this, "formulaService", this.injector.get(te));
-    g(this, "_lexer", this.injector.get(ut));
-    g(this, "_univerInstanceService", this.injector.get(Z));
-    g(this, "id", $.LIST);
-    g(this, "title", "dataValidation.list.title");
-    g(this, "operators", []);
-    g(this, "scopes", ["sheet"]);
-    g(this, "skipDefaultFontRender", (e) => e.renderMode !== Ke.TEXT);
-  }
-  validatorFormula(e, r, i) {
+    f(this, "formulaService", this.injector.get(X));
+    f(this, "_lexer", this.injector.get(Z));
+    f(this, "_univerInstanceService", this.injector.get(D));
+    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 a = !b.isBlank(e.formula1), n = br((u = e.formula1) != null ? u : "", this._lexer), o = (d = (c = this._univerInstanceService.getUnit(r, K.UNIVER_SHEET)) == null ? void 0 : c.getSheetBySheetId(i)) == null ? void 0 : d.getName(), l = Dr(e, o != null ? o : "");
+    const i = !N.isBlank(e.formula1), s = gr((u = e.formula1) != null ? u : "", this._lexer), n = (d = (c = this._univerInstanceService.getUnit(r, A.UNIVER_SHEET)) == null ? void 0 : c.getSheetBySheetId(a)) == null ? void 0 : d.getName(), l = vr(e, n != null ? n : "");
     return {
-      success: !!(a && n && !l),
-      formula1: a ? n ? l ? this.localeService.t("dataValidation.validFail.listIntersects") : void 0 : this.localeService.t("dataValidation.validFail.listInvalid") : this.localeService.t("dataValidation.validFail.list")
+      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: i }) {
-    var n;
-    const a = (n = i.tb !== Le.OVERFLOW ? i.tb : Le.CLIP) != null ? n : Le.WRAP;
-    if (e.type === $.LIST && (e.renderMode === Ke.ARROW || e.renderMode === Ke.TEXT)) {
-      const o = this.getListWithColorMap(e), l = `${r != null ? r : ""}`, u = o[l];
+  getExtraStyle(e, r, { style: a }) {
+    var s;
+    const i = (s = a.tb !== ve.OVERFLOW ? a.tb : ve.CLIP) != null ? s : ve.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];
       if (u)
         return {
           bg: {
             rgb: u
           },
-          tb: a
+          tb: i
         };
     }
     return {
-      tb: a
+      tb: i
     };
   }
   parseCellValue(e) {
     const r = e.toString();
-    return xe(r);
+    return pe(r);
   }
-  async parseFormula(e, r, i) {
+  async parseFormula(e, r, a) {
     var u, c, d, m;
-    const { formula1: a = "" } = e, n = await this.formulaService.getRuleFormulaResult(r, i, e.uid), o = z((c = (u = n == null ? void 0 : n[0]) == null ? void 0 : u.result) == null ? void 0 : c[0][0]), l = W(String(o));
+    const { formula1: i = "" } = e, s = await this.formulaService.getRuleFormulaResult(r, a, e.uid), n = ie((c = (u = s == null ? void 0 : s[0]) == null ? void 0 : u.result) == null ? void 0 : c[0][0]), l = O(String(n));
     return {
-      formula1: F(a) ? Ze((m = (d = n == null ? void 0 : n[0]) == null ? void 0 : d.result) == null ? void 0 : m[0][0]) : xe(a),
+      formula1: R(i) ? Pe((m = (d = s == null ? void 0 : s[0]) == null ? void 0 : d.result) == null ? void 0 : m[0][0]) : pe(i),
       formula2: void 0,
       isFormulaValid: l
     };
   }
-  async isValidType(e, r, i) {
-    const { value: a } = e, { formula1: n = [] } = r;
-    return this.parseCellValue(a).every((l) => n.includes(l));
+  async isValidType(e, r, a) {
+    const { value: i } = e, { formula1: s = [] } = r;
+    return this.parseCellValue(i).every((l) => s.includes(l));
   }
   generateRuleName() {
     return this.localeService.t("dataValidation.list.name");
@@ -1790,70 +1534,70 @@ class Tt extends de {
   generateRuleErrorMessage() {
     return this.localeService.t("dataValidation.list.error");
   }
-  getList(e, r, i) {
-    var m, v, S, w;
-    const { formula1: a = "" } = e, n = this.injector.get(Z), o = (m = r ? n.getUniverSheetInstance(r) : void 0) != null ? m : n.getCurrentUnitForType(K.UNIVER_SHEET);
-    if (!o) return [];
-    const l = (v = i ? o.getSheetBySheetId(i) : void 0) != null ? v : o.getActiveSheet();
+  getList(e, r, a) {
+    var m, _, p, S;
+    const { formula1: i = "" } = e, s = this.injector.get(D), n = (m = r ? s.getUniverSheetInstance(r) : void 0) != null ? m : s.getCurrentUnitForType(A.UNIVER_SHEET);
+    if (!n) return [];
+    const l = (_ = a ? n.getSheetBySheetId(a) : void 0) != null ? _ : n.getActiveSheet();
     if (!l) return [];
-    const u = o.getUnitId(), c = l.getSheetId(), d = this.formulaService.getRuleFormulaResultSync(u, c, e.uid);
-    return F(a) ? Ze((w = (S = d == null ? void 0 : d[0]) == null ? void 0 : S.result) == null ? void 0 : w[0][0]) : xe(a);
-  }
-  async getListAsync(e, r, i) {
-    var m, v, S, w;
-    const { formula1: a = "" } = e, n = this.injector.get(Z), o = (m = r ? n.getUniverSheetInstance(r) : void 0) != null ? m : n.getCurrentUnitForType(K.UNIVER_SHEET);
-    if (!o) return [];
-    const l = (v = i ? o.getSheetBySheetId(i) : void 0) != null ? v : o.getActiveSheet();
+    const u = n.getUnitId(), c = l.getSheetId(), d = this.formulaService.getRuleFormulaResultSync(u, c, e.uid);
+    return R(i) ? Pe((S = (p = d == null ? void 0 : d[0]) == null ? void 0 : p.result) == null ? void 0 : S[0][0]) : pe(i);
+  }
+  async getListAsync(e, r, a) {
+    var m, _, p, S;
+    const { formula1: i = "" } = e, s = this.injector.get(D), n = (m = r ? s.getUniverSheetInstance(r) : void 0) != null ? m : s.getCurrentUnitForType(A.UNIVER_SHEET);
+    if (!n) return [];
+    const l = (_ = a ? n.getSheetBySheetId(a) : void 0) != null ? _ : n.getActiveSheet();
     if (!l) return [];
-    const u = o.getUnitId(), c = l.getSheetId(), d = await this.formulaService.getRuleFormulaResult(u, c, e.uid);
-    return F(a) ? Ze((w = (S = d == null ? void 0 : d[0]) == null ? void 0 : S.result) == null ? void 0 : w[0][0]) : xe(a);
+    const u = n.getUnitId(), c = l.getSheetId(), d = await this.formulaService.getRuleFormulaResult(u, c, e.uid);
+    return R(i) ? Pe((S = (p = d == null ? void 0 : d[0]) == null ? void 0 : p.result) == null ? void 0 : S[0][0]) : pe(i);
   }
-  getListWithColor(e, r, i) {
-    const a = this.getList(e, r, i), n = (e.formula2 || "").split(",");
-    return a.map((o, l) => ({ label: o, color: n[l] }));
+  getListWithColor(e, r, a) {
+    const i = this.getList(e, r, a), s = (e.formula2 || "").split(",");
+    return i.map((n, l) => ({ label: n, color: s[l] }));
   }
-  getListWithColorMap(e, r, i) {
-    const a = this.getListWithColor(e, r, i), n = {};
-    return a.forEach((o) => {
-      o.color && (n[o.label] = o.color);
-    }), n;
+  getListWithColorMap(e, r, a) {
+    const i = this.getListWithColor(e, r, a), s = {};
+    return i.forEach((n) => {
+      n.color && (s[n.label] = n.color);
+    }), s;
   }
 }
-const Ir = "{FORMULA1}", $r = "{FORMULA2}";
-class xr extends de {
+class Rr extends q {
   constructor() {
     super(...arguments);
-    g(this, "id", $.TEXT_LENGTH);
-    g(this, "title", "dataValidation.textLength.title");
-    g(this, "operators", [
-      _.BETWEEN,
-      _.EQUAL,
-      _.GREATER_THAN,
-      _.GREATER_THAN_OR_EQUAL,
-      _.LESS_THAN,
-      _.LESS_THAN_OR_EQUAL,
-      _.NOT_BETWEEN,
-      _.NOT_EQUAL
+    f(this, "id", M.TEXT_LENGTH);
+    f(this, "title", "dataValidation.textLength.title");
+    f(this, "_lexerTreeBuilder", this.injector.get(Z));
+    f(this, "operators", [
+      h.BETWEEN,
+      h.EQUAL,
+      h.GREATER_THAN,
+      h.GREATER_THAN_OR_EQUAL,
+      h.LESS_THAN,
+      h.LESS_THAN_OR_EQUAL,
+      h.NOT_BETWEEN,
+      h.NOT_EQUAL
     ]);
-    g(this, "scopes", ["sheet"]);
-    g(this, "_formulaService", this.injector.get(te));
+    f(this, "scopes", ["sheet"]);
+    f(this, "_customFormulaService", this.injector.get($));
   }
   _isFormulaOrInt(e) {
-    return !b.isBlank(e) && (F(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+    return !N.isBlank(e) && (R(e) || !Number.isNaN(+e) && Number.isInteger(+e));
   }
-  validatorFormula(e, r, i) {
-    const a = e.operator;
-    if (!a)
+  validatorFormula(e, r, a) {
+    const i = e.operator;
+    if (!i)
       return {
         success: !1
       };
-    const n = b.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), o = b.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Xe.includes(a), u = this.localeService.t("dataValidation.validFail.number");
+    const s = N.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = N.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = be.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
-      success: n && o,
-      formula1: n ? void 0 : u,
-      formula2: o ? void 0 : u
+      success: s && n,
+      formula1: s ? void 0 : u,
+      formula2: n ? void 0 : u
     } : {
-      success: n,
+      success: s,
       formula1: u
     };
   }
@@ -1863,527 +1607,537 @@ class xr extends de {
   _isValidFormula(e) {
     return !Number.isNaN(e);
   }
-  async parseFormula(e, r, i) {
-    var d, m, v, S;
-    const a = await this._formulaService.getRuleFormulaResult(r, i, e.uid), { formula1: n, formula2: o } = e, l = z((m = (d = a == null ? void 0 : a[0]) == null ? void 0 : d.result) == null ? void 0 : m[0][0]), u = z((S = (v = a == null ? void 0 : a[1]) == null ? void 0 : v.result) == null ? void 0 : S[0][0]), c = W(String(l)) && W(String(u));
+  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 = O(String(n == null ? void 0 : n.v)) && O(String(l == null ? void 0 : l.v));
     return {
-      formula1: this._parseNumber(F(n) ? l : n),
-      formula2: this._parseNumber(F(o) ? u : o),
-      isFormulaValid: c
+      formula1: this._parseNumber(R(u) ? n == null ? void 0 : n.v : u),
+      formula2: this._parseNumber(R(c) ? l == null ? void 0 : l.v : c),
+      isFormulaValid: d
     };
   }
-  transform(e, r, i) {
+  transform(e, r, a) {
     return {
       ...e,
       value: e.value.toString().length
     };
   }
-  async isValidType(e, r, i) {
-    const { value: a } = e;
-    return typeof a == "string" || typeof a == "number";
+  async isValidType(e, r, a) {
+    const { value: i } = e;
+    return typeof i == "string" || typeof i == "number";
   }
-  async validatorIsEqual(e, r, i) {
-    const { formula1: a } = r;
-    return b.isDefine(a) ? e.value === a : !1;
+  async validatorIsEqual(e, r, a) {
+    const { formula1: i } = r;
+    return N.isDefine(i) ? e.value === i : !1;
   }
-  async validatorIsNotEqual(e, r, i) {
-    const { formula1: a } = r;
-    return b.isDefine(a) ? e.value !== a : !1;
+  async validatorIsNotEqual(e, r, a) {
+    const { formula1: i } = r;
+    return N.isDefine(i) ? e.value !== i : !1;
   }
-  async validatorIsBetween(e, r, i) {
-    const { formula1: a, formula2: n } = r, { value: o } = e;
-    if (!this._isValidFormula(a) || !this._isValidFormula(n))
+  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(a, n), u = Math.min(a, n);
-    return o >= u && o <= l;
+    const l = Math.max(i, s), u = Math.min(i, s);
+    return n >= u && n <= l;
   }
-  async validatorIsNotBetween(e, r, i) {
-    const { formula1: a, formula2: n } = r, { value: o } = e;
-    if (!this._isValidFormula(a) || !this._isValidFormula(n))
+  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(a, n), u = Math.min(a, n);
-    return o < u || o > l;
+    const l = Math.max(i, s), u = Math.min(i, s);
+    return n < u || n > l;
   }
-  async validatorIsGreaterThan(e, r, i) {
-    const { formula1: a } = r, { value: n } = e;
-    return this._isValidFormula(a) ? n > a : !1;
+  async validatorIsGreaterThan(e, r, a) {
+    const { formula1: i } = r, { value: s } = e;
+    return this._isValidFormula(i) ? s > i : !1;
   }
-  async validatorIsGreaterThanOrEqual(e, r, i) {
-    const { formula1: a } = r, { value: n } = e;
-    return this._isValidFormula(a) ? n >= a : !1;
+  async validatorIsGreaterThanOrEqual(e, r, a) {
+    const { formula1: i } = r, { value: s } = e;
+    return this._isValidFormula(i) ? s >= i : !1;
   }
-  async validatorIsLessThan(e, r, i) {
-    const { formula1: a } = r, { value: n } = e;
-    return this._isValidFormula(a) ? n < a : !1;
+  async validatorIsLessThan(e, r, a) {
+    const { formula1: i } = r, { value: s } = e;
+    return this._isValidFormula(i) ? s < i : !1;
   }
-  async validatorIsLessThanOrEqual(e, r, i) {
-    const { formula1: a } = r, { value: n } = e;
-    return this._isValidFormula(a) ? n <= a : !1;
+  async validatorIsLessThanOrEqual(e, r, a) {
+    const { formula1: i } = r, { value: s } = e;
+    return this._isValidFormula(i) ? s <= i : !1;
   }
-  generateRuleErrorMessage(e) {
-    var i, a;
-    return e.operator ? `${this.localeService.t(jt[e.operator]).replace(Ir, (i = e.formula1) != null ? i : "").replace($r, (a = e.formula2) != null ? a : "")}` : this.titleStr;
+  generateRuleErrorMessage(e, r) {
+    if (!e.operator)
+      return this.titleStr;
+    const { transformedFormula1: a, transformedFormula2: i } = Ie(this._lexerTreeBuilder, e, r);
+    return `${this.localeService.t(Dt[e.operator]).replace(oe, a != null ? a : "").replace(ne, i != null ? i : "")}`;
   }
 }
-function Ft(s) {
+function ft(o) {
   var e, r;
-  return s ? s.p ? !((r = (e = s.p.body) == null ? void 0 : e.dataStream) != null ? r : "").slice(0, -2).trim() : b.isBlank(s.v) : !0;
+  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 ze(s, t, e, r, i = "command", a = !0) {
-  const n = r.get(ut), o = [], l = [], u = r.get(j), c = r.get(Z), d = lt(c, { unitId: s, subUnitId: t });
+function Ae(o, t, e, r, a = "command", i = !0) {
+  const s = r.get(Z), n = [], l = [], u = r.get(F), c = r.get(D), d = Ye(c, { unitId: o, subUnitId: t });
   if (!d)
     return {
-      redoMutations: o,
+      redoMutations: n,
       undoMutations: l
     };
-  const { worksheet: m } = d, v = new Ue();
-  function S(M, x) {
-    a && M.forEach((O) => {
-      Q.foreach(O, (H, L) => {
-        const q = m.getCellRaw(H, L), se = Nt(q);
-        (Ft(q) || se === x) && v.setValue(H, L, {
-          v: x,
+  const { worksheet: m } = d, _ = new Re();
+  function p(g, C) {
+    i && g.forEach((E) => {
+      I.foreach(E, (x, L) => {
+        const J = m.getCellRaw(x, L), ee = dt(J);
+        (ft(J) || ee === C) && _.setValue(x, L, {
+          v: C,
           p: null
         });
       });
     });
   }
-  e.forEach((M) => {
-    switch (M.type) {
+  e.forEach((g) => {
+    switch (g.type) {
       case "delete":
-        o.push({
-          id: ie.id,
+        n.push({
+          id: P.id,
           params: {
-            unitId: s,
+            unitId: o,
             subUnitId: t,
-            ruleId: M.rule.uid,
-            source: i
+            ruleId: g.rule.uid,
+            source: a
           }
         }), l.unshift({
-          id: le.id,
+          id: U.id,
           params: {
-            unitId: s,
+            unitId: o,
             subUnitId: t,
-            rule: M.rule,
-            index: M.index,
-            source: i
+            rule: g.rule,
+            index: g.index,
+            source: a
           }
         });
         break;
       case "update": {
-        if (o.push({
-          id: X.id,
-          params: {
-            unitId: s,
-            subUnitId: t,
-            ruleId: M.ruleId,
-            payload: {
-              type: Y.RANGE,
-              payload: M.newRanges
-            },
-            source: i
-          }
-        }), l.unshift({
-          id: X.id,
-          params: {
-            unitId: s,
-            subUnitId: t,
-            ruleId: M.ruleId,
-            payload: {
-              type: Y.RANGE,
-              payload: M.oldRanges
-            },
-            source: i
-          }
-        }), M.rule.type === $.CUSTOM) {
-          const O = M.oldRanges[0].startRow, H = M.oldRanges[0].startColumn, L = M.newRanges[0].startRow, q = M.newRanges[0].startColumn, se = L - O, he = q - H, ae = n.moveFormulaRefOffset(M.rule.formula1, he, se);
-          ae !== M.rule.formula1 && (o.push({
-            id: X.id,
+        if (le(g.rule.type)) {
+          const E = g.oldRanges[0].startRow, x = g.oldRanges[0].startColumn, L = g.newRanges[0].startRow, J = g.newRanges[0].startColumn, ee = L - E, ue = J - x, ce = R(g.rule.formula1) ? s.moveFormulaRefOffset(g.rule.formula1, ue, ee) : g.rule.formula1, de = R(g.rule.formula2) ? s.moveFormulaRefOffset(g.rule.formula2, ue, ee) : g.rule.formula2;
+          (ce !== g.rule.formula1 || de !== g.rule.formula2) && (n.push({
+            id: b.id,
             params: {
-              unitId: s,
+              unitId: o,
               subUnitId: t,
-              ruleId: M.ruleId,
+              ruleId: g.ruleId,
               payload: {
-                type: Y.SETTING,
+                type: w.ALL,
                 payload: {
-                  ...rt(M.rule),
-                  formula1: ae
+                  formula1: ce,
+                  formula2: de,
+                  ranges: g.newRanges
                 }
               }
             }
           }), l.unshift({
-            id: X.id,
+            id: b.id,
             params: {
-              unitId: s,
+              unitId: o,
               subUnitId: t,
-              ruleId: M.ruleId,
+              ruleId: g.ruleId,
               payload: {
-                type: Y.SETTING,
-                payload: rt(M.rule)
+                type: w.ALL,
+                payload: {
+                  formula1: g.rule.formula1,
+                  formula2: g.rule.formula2,
+                  ranges: g.oldRanges
+                }
               }
             }
           }));
-        }
-        const x = u.getRuleById(s, t, M.ruleId);
-        if (x && x.type === $.CHECKBOX) {
-          const H = u.getValidator($.CHECKBOX).parseFormulaSync(x, s, t);
-          S(M.newRanges, H.formula2);
+        } else
+          n.push({
+            id: b.id,
+            params: {
+              unitId: o,
+              subUnitId: t,
+              ruleId: g.ruleId,
+              payload: {
+                type: w.RANGE,
+                payload: g.newRanges
+              },
+              source: a
+            }
+          }), l.unshift({
+            id: b.id,
+            params: {
+              unitId: o,
+              subUnitId: t,
+              ruleId: g.ruleId,
+              payload: {
+                type: w.RANGE,
+                payload: g.oldRanges
+              },
+              source: a
+            }
+          });
+        const C = u.getRuleById(o, t, g.ruleId);
+        if (C && C.type === M.CHECKBOX) {
+          const x = u.getValidator(M.CHECKBOX).parseFormulaSync(C, o, t);
+          p(g.newRanges, x.formula2);
         }
         break;
       }
       case "add": {
-        if (o.push({
-          id: le.id,
+        if (n.push({
+          id: U.id,
           params: {
-            unitId: s,
+            unitId: o,
             subUnitId: t,
-            rule: M.rule,
-            source: i
+            rule: g.rule,
+            source: a
           }
         }), l.unshift({
-          id: ie.id,
+          id: P.id,
           params: {
-            unitId: s,
+            unitId: o,
             subUnitId: t,
-            ruleId: M.rule.uid,
-            source: i
+            ruleId: g.rule.uid,
+            source: a
           }
-        }), M.rule.type === $.CHECKBOX) {
-          const O = u.getValidator($.CHECKBOX).parseFormulaSync(M.rule, s, t);
-          S(M.rule.ranges, O.originFormula2);
+        }), g.rule.type === M.CHECKBOX) {
+          const E = u.getValidator(M.CHECKBOX).parseFormulaSync(g.rule, o, t);
+          p(g.rule.ranges, E.originFormula2);
         }
         break;
       }
     }
   });
-  const w = {
-    id: Ce.id,
+  const S = {
+    id: se.id,
     params: {
-      unitId: s,
+      unitId: o,
       subUnitId: t,
-      cellValue: v.getData()
+      cellValue: _.getData()
     }
-  }, I = {
-    id: Ce.id,
-    params: vt(r, w.params)
+  }, y = {
+    id: se.id,
+    params: st(r, S.params)
   };
-  return o.push(w), l.push(I), {
-    redoMutations: o,
+  return n.push(S), l.push(y), {
+    redoMutations: n,
     undoMutations: l
   };
 }
-const Ar = {
-  type: ve.COMMAND,
+const Sr = {
+  type: K.COMMAND,
   id: "sheet.command.updateDataValidationRuleRange",
-  handler(s, t) {
+  handler(o, t) {
     if (!t)
       return !1;
-    const { unitId: e, subUnitId: r, ranges: i, ruleId: a } = t, n = s.get(j), o = s.get(re), l = s.get(Se);
-    if (!n.getRuleById(e, r, a))
+    const { unitId: e, subUnitId: r, ranges: a, ruleId: i } = t, s = o.get(F), n = o.get(H), l = o.get(z);
+    if (!s.getRuleById(e, r, i))
       return !1;
-    const c = n.getRuleObjectMatrix(e, r).clone();
-    c.updateRange(a, i);
-    const d = c.diff(n.getRules(e, r)), { redoMutations: m, undoMutations: v } = ze(e, r, d, s);
+    const c = s.getRuleObjectMatrix(e, r).clone();
+    c.updateRange(i, a);
+    const d = c.diff(s.getRules(e, r)), { redoMutations: m, undoMutations: _ } = Ae(e, r, d, o);
     return l.pushUndoRedo({
-      undoMutations: v,
+      undoMutations: _,
       redoMutations: m,
       unitID: e
-    }), Ye(m, o), !0;
+    }), Oe(m, n), !0;
   }
-}, Lr = {
-  type: ve.COMMAND,
+}, Vr = {
+  type: K.COMMAND,
   id: "sheet.command.addDataValidation",
-  handler(s, t) {
+  handler(o, t) {
     if (!t)
       return !1;
-    const { unitId: e, subUnitId: r, rule: i } = t, a = s.get(j), n = s.get(re), o = s.get(Se), l = a.getRuleObjectMatrix(e, r).clone();
-    l.addRule(i);
-    const u = l.diff(a.getRules(e, r)), c = {
+    const { unitId: e, subUnitId: r, rule: a } = t, i = o.get(F), s = o.get(H), 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 = {
       unitId: e,
       subUnitId: r,
-      rule: i
-    }, { redoMutations: d, undoMutations: m } = ze(e, r, u, s);
-    return d.push({
-      id: le.id,
-      params: c
-    }), m.unshift({
-      id: ie.id,
+      rule: {
+        ...a,
+        ...c == null ? void 0 : c.normalizeFormula(a, e, r)
+      }
+    }, { redoMutations: m, undoMutations: _ } = Ae(e, r, u, o);
+    return m.push({
+      id: U.id,
+      params: d
+    }), _.unshift({
+      id: P.id,
       params: {
         unitId: e,
         subUnitId: r,
-        ruleId: i.uid
+        ruleId: a.uid
       }
-    }), o.pushUndoRedo({
+    }), n.pushUndoRedo({
       unitID: e,
-      redoMutations: d,
-      undoMutations: m
-    }), Ye(d, n), !0;
+      redoMutations: m,
+      undoMutations: _
+    }), Oe(m, s), !0;
   }
-}, Ur = {
-  type: ve.COMMAND,
+}, Nr = {
+  type: K.COMMAND,
   id: "sheets.command.update-data-validation-setting",
   // eslint-disable-next-line max-lines-per-function
-  handler(s, t) {
+  handler(o, t) {
     if (!t)
       return !1;
-    const e = s.get(re), r = s.get(Se), i = s.get(j), a = s.get(ot), { unitId: n, subUnitId: o, ruleId: l, setting: u } = t, c = a.getValidatorItem(u.type);
+    const e = o.get(H), r = o.get(z), a = o.get(F), i = o.get(Qe), { unitId: s, subUnitId: n, ruleId: l, setting: u } = t, c = i.getValidatorItem(u.type);
     if (!c)
       return !1;
-    const d = i.getRuleById(n, o, l);
+    const d = a.getRuleById(s, n, l);
     if (!d)
       return !1;
     const m = { ...d, ...u };
-    if (!c.validatorFormula(m, n, o).success)
+    if (!c.validatorFormula(m, s, n).success)
       return !1;
-    const v = {
-      unitId: n,
-      subUnitId: o,
+    const _ = {
+      unitId: s,
+      subUnitId: n,
       ruleId: l,
       payload: {
-        type: Y.SETTING,
+        type: w.SETTING,
         payload: {
           ...u,
-          ...c.normalizeFormula(m, n, o)
+          ...c.normalizeFormula(m, s, n)
         }
       }
-    }, S = [{
-      id: X.id,
-      params: v
-    }], w = {
-      unitId: n,
-      subUnitId: o,
+    }, p = [{
+      id: b.id,
+      params: _
+    }], S = {
+      unitId: s,
+      subUnitId: n,
       ruleId: l,
       payload: {
-        type: Y.SETTING,
-        payload: rt(d)
+        type: w.SETTING,
+        payload: xt(d)
       }
-    }, I = [{
-      id: X.id,
-      params: w
+    }, y = [{
+      id: b.id,
+      params: S
     }];
-    if (u.type === $.CHECKBOX) {
-      const x = d.ranges, O = s.get(Z), H = lt(O, { unitId: n, subUnitId: o });
-      if (H) {
-        const L = new Ue(), { worksheet: q } = H, { formula2: se = Pe, formula1: he = Be } = d, { formula2: ae = Pe, formula1: U = Be } = u;
-        x.forEach((Oe) => {
-          Q.foreach(Oe, (y, f) => {
-            const h = q.getCellRaw(y, f), R = Nt(h);
-            Ft(h) || R === String(se) ? L.setValue(y, f, {
-              v: ae,
+    if (u.type === M.CHECKBOX) {
+      const C = d.ranges, E = o.get(D), x = Ye(E, { unitId: s, subUnitId: n });
+      if (x) {
+        const L = new Re(), { worksheet: J } = x, { formula2: ee = Ve, formula1: ue = Se } = d, { formula2: ce = Ve, formula1: de = Se } = u;
+        C.forEach((Rt) => {
+          I.foreach(Rt, (De, xe) => {
+            const Ze = J.getCellRaw(De, xe), Je = dt(Ze);
+            ft(Ze) || Je === String(ee) ? L.setValue(De, xe, {
+              v: ce,
               p: null
-            }) : R === String(he) && L.setValue(y, f, {
-              v: U,
+            }) : Je === String(ue) && L.setValue(De, xe, {
+              v: de,
               p: null
             });
           });
         });
-        const T = {
-          id: Ce.id,
+        const ze = {
+          id: se.id,
           params: {
-            unitId: n,
-            subUnitId: o,
+            unitId: s,
+            subUnitId: n,
             cellValue: L.getData()
           }
-        }, Re = {
-          id: Ce.id,
-          params: vt(s, T.params)
+        }, vt = {
+          id: se.id,
+          params: st(o, ze.params)
         };
-        S.push(T), I.push(Re);
+        p.push(ze), y.push(vt);
       }
     }
-    return Ye(S, e).result ? (r.pushUndoRedo({
-      unitID: n,
-      redoMutations: S,
-      undoMutations: I
+    return Oe(p, e).result ? (r.pushUndoRedo({
+      unitID: s,
+      redoMutations: p,
+      undoMutations: y
     }), !0) : !1;
   }
-}, Br = {
-  type: ve.COMMAND,
+}, Mr = {
+  type: K.COMMAND,
   id: "sheets.command.update-data-validation-options",
-  handler(s, t) {
+  handler(o, t) {
     if (!t)
       return !1;
-    const e = s.get(re), r = s.get(Se), i = s.get(j), { unitId: a, subUnitId: n, ruleId: o, options: l } = t, u = i.getRuleById(a, n, o);
+    const e = o.get(H), r = o.get(z), a = o.get(F), { unitId: i, subUnitId: s, ruleId: n, options: l } = t, u = a.getRuleById(i, s, n);
     if (!u)
       return !1;
     const c = {
-      unitId: a,
-      subUnitId: n,
-      ruleId: o,
+      unitId: i,
+      subUnitId: s,
+      ruleId: n,
       payload: {
-        type: Y.OPTIONS,
+        type: w.OPTIONS,
         payload: l
       }
     }, d = [{
-      id: X.id,
+      id: b.id,
       params: c
     }], m = {
-      unitId: a,
-      subUnitId: n,
-      ruleId: o,
+      unitId: i,
+      subUnitId: s,
+      ruleId: n,
       payload: {
-        type: Y.OPTIONS,
-        payload: qt(u)
+        type: w.OPTIONS,
+        payload: Lt(u)
       }
-    }, v = [{
-      id: X.id,
+    }, _ = [{
+      id: b.id,
       params: m
     }];
     return r.pushUndoRedo({
-      unitID: a,
+      unitID: i,
       redoMutations: d,
-      undoMutations: v
-    }), e.executeCommand(X.id, c), !0;
+      undoMutations: _
+    }), e.executeCommand(b.id, c), !0;
   }
-}, Pr = {
-  type: ve.COMMAND,
+}, yr = {
+  type: K.COMMAND,
   id: "sheets.command.clear-range-data-validation",
-  handler(s, t) {
+  handler(o, t) {
     if (!t)
       return !1;
-    const { unitId: e, subUnitId: r, ranges: i } = t, a = s.get(re), n = s.get(Z), o = lt(n, { unitId: e, subUnitId: r }), l = s.get(j);
-    if (!o) return !1;
-    const u = s.get(Se), c = l.getRuleObjectMatrix(e, r).clone();
-    c.removeRange(i);
-    const d = c.diff(l.getRules(e, r)), { redoMutations: m, undoMutations: v } = ze(e, r, d, s);
+    const { unitId: e, subUnitId: r, ranges: a } = t, i = o.get(H), s = o.get(D), n = Ye(s, { unitId: e, subUnitId: r }), 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: _ } = Ae(e, r, d, o);
     return u.pushUndoRedo({
       unitID: e,
       redoMutations: m,
-      undoMutations: v
-    }), Ye(m, a).result;
+      undoMutations: _
+    }), Oe(m, i).result;
   }
-}, Hr = {
-  type: ve.COMMAND,
+}, Er = {
+  type: K.COMMAND,
   id: "sheet.command.remove-all-data-validation",
-  handler(s, t) {
+  handler(o, t) {
     if (!t)
       return !1;
-    const { unitId: e, subUnitId: r } = t, i = s.get(re), a = s.get(j), n = s.get(Se), o = [...a.getRules(e, r)], l = {
+    const { unitId: e, subUnitId: r } = t, a = o.get(H), i = o.get(F), s = o.get(z), n = [...i.getRules(e, r)], l = {
       unitId: e,
       subUnitId: r,
-      ruleId: o.map((d) => d.uid)
+      ruleId: n.map((d) => d.uid)
     }, u = [{
-      id: ie.id,
+      id: P.id,
       params: l
     }], c = [{
-      id: le.id,
+      id: U.id,
       params: {
         unitId: e,
         subUnitId: r,
-        rule: o
+        rule: n
       }
     }];
-    return n.pushUndoRedo({
+    return s.pushUndoRedo({
       redoMutations: u,
       undoMutations: c,
       unitID: e
-    }), i.executeCommand(ie.id, l), !0;
+    }), a.executeCommand(P.id, l), !0;
   }
-}, kr = (s, t) => {
-  const e = s.get(j), { unitId: r, subUnitId: i, ruleId: a, source: n } = t;
-  if (Array.isArray(a)) {
-    const l = a.map((u) => e.getRuleById(r, i, u)).filter(Boolean);
+}, Tr = (o, t) => {
+  const e = o.get(F), { unitId: r, subUnitId: a, ruleId: i, source: s } = t;
+  if (Array.isArray(i)) {
+    const l = i.map((u) => e.getRuleById(r, a, u)).filter(Boolean);
     return [{
-      id: le.id,
+      id: U.id,
       params: {
         unitId: r,
-        subUnitId: i,
+        subUnitId: a,
         rule: l,
-        source: n
+        source: s
       }
     }];
   }
   return [{
-    id: le.id,
+    id: U.id,
     params: {
       unitId: r,
-      subUnitId: i,
+      subUnitId: a,
       rule: {
-        ...e.getRuleById(r, i, a)
+        ...e.getRuleById(r, a, i)
       },
-      index: e.getRuleIndex(r, i, a)
+      index: e.getRuleIndex(r, a, i)
     }
   }];
-}, Wr = {
-  type: ve.COMMAND,
+}, wr = {
+  type: K.COMMAND,
   id: "sheet.command.remove-data-validation-rule",
-  handler(s, t) {
+  handler(o, t) {
     if (!t)
       return !1;
-    const { unitId: e, subUnitId: r, ruleId: i } = t, a = s.get(re), n = s.get(Se), o = s.get(j), l = [{
-      id: ie.id,
+    const { unitId: e, subUnitId: r, ruleId: a } = t, i = o.get(H), s = o.get(z), n = o.get(F), l = [{
+      id: P.id,
       params: t
     }], u = [{
-      id: le.id,
+      id: U.id,
       params: {
         unitId: e,
         subUnitId: r,
         rule: {
-          ...o.getRuleById(e, r, i)
+          ...n.getRuleById(e, r, a)
         },
-        index: o.getRuleIndex(e, r, i)
+        index: n.getRuleIndex(e, r, a)
       }
     }];
-    return n.pushUndoRedo({
+    return s.pushUndoRedo({
       undoMutations: u,
       redoMutations: l,
       unitID: t.unitId
-    }), a.executeCommand(ie.id, t), !0;
+    }), i.executeCommand(P.id, t), !0;
   }
-}, jr = "sheets-data-validation.config", qr = {};
-class Gr extends de {
+}, Fr = "sheets-data-validation.config", Cr = {};
+class Or extends q {
   constructor() {
     super(...arguments);
-    g(this, "id", $.ANY);
-    g(this, "title", "dataValidation.any.title");
-    g(this, "operators", []);
-    g(this, "scopes", ["sheet"]);
+    f(this, "id", M.ANY);
+    f(this, "title", "dataValidation.any.title");
+    f(this, "operators", []);
+    f(this, "scopes", ["sheet"]);
   }
-  async parseFormula(e, r, i) {
+  async parseFormula(e, r, a) {
     return {
       formula1: e.formula1,
       formula2: e.formula2,
       isFormulaValid: !0
     };
   }
-  validatorFormula(e, r, i) {
+  validatorFormula(e, r, a) {
     return {
       success: !0
     };
   }
-  async isValidType(e, r, i) {
+  async isValidType(e, r, a) {
     return !0;
   }
   generateRuleErrorMessage(e) {
     return this.localeService.t("dataValidation.any.error");
   }
 }
-class Qr extends de {
+class br extends q {
   constructor() {
     super(...arguments);
-    g(this, "id", $.CUSTOM);
-    g(this, "title", "dataValidation.custom.title");
-    g(this, "operators", []);
-    g(this, "scopes", ["sheet"]);
-    g(this, "_customFormulaService", this.injector.get(we));
-  }
-  validatorFormula(e, r, i) {
-    const a = F(e.formula1);
+    f(this, "id", M.CUSTOM);
+    f(this, "title", "dataValidation.custom.title");
+    f(this, "operators", []);
+    f(this, "scopes", ["sheet"]);
+    f(this, "_customFormulaService", this.injector.get($));
+  }
+  validatorFormula(e, r, a) {
+    const i = R(e.formula1);
     return {
-      success: a,
-      formula1: a ? "" : this.localeService.t("dataValidation.validFail.formula")
+      success: i,
+      formula1: i ? "" : this.localeService.t("dataValidation.validFail.formula")
     };
   }
-  async parseFormula(e, r, i) {
+  async parseFormula(e, r, a) {
     return {
       formula1: void 0,
       formula2: void 0,
       isFormulaValid: !0
     };
   }
-  async isValidType(e, r, i) {
-    const { column: a, row: n, unitId: o, subUnitId: l } = e, u = await this._customFormulaService.getCellFormulaValue(o, l, i.uid, n, a), c = u == null ? void 0 : u.v;
-    return W(String(c)) && b.isDefine(c) && c !== "" ? u.t === xt.BOOLEAN ? !!c : typeof c == "boolean" ? c : typeof c == "number" ? !!c : typeof c == "string" ? W(c) : !!c : !1;
+  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 O(String(c)) && N.isDefine(c) && c !== "" ? u.t === yt.BOOLEAN ? !!c : typeof c == "boolean" ? c : typeof c == "number" ? !!c : typeof c == "string" ? O(c) : !!c : !1;
   }
   generateRuleErrorMessage(e) {
     return this.localeService.t("dataValidation.custom.error");
@@ -2393,152 +2147,158 @@ class Qr extends de {
     return this.localeService.t("dataValidation.custom.ruleName").replace("{FORMULA1}", (r = e.formula1) != null ? r : "");
   }
 }
-class Yr extends Tt {
+class Ir extends mt {
   constructor() {
     super(...arguments);
-    g(this, "id", $.LIST_MULTIPLE);
-    g(this, "title", "dataValidation.listMultiple.title");
-    g(this, "skipDefaultFontRender", () => !0);
+    f(this, "id", M.LIST_MULTIPLE);
+    f(this, "title", "dataValidation.listMultiple.title");
+    f(this, "skipDefaultFontRender", () => !0);
   }
 }
-class Xr extends de {
+class Ar extends q {
   constructor() {
     super(...arguments);
-    g(this, "_formulaService", this.injector.get(te));
-    g(this, "id", $.WHOLE);
-    g(this, "title", "dataValidation.whole.title");
-    g(this, "operators", [
-      _.BETWEEN,
-      _.EQUAL,
-      _.GREATER_THAN,
-      _.GREATER_THAN_OR_EQUAL,
-      _.LESS_THAN,
-      _.LESS_THAN_OR_EQUAL,
-      _.NOT_BETWEEN,
-      _.NOT_EQUAL
+    f(this, "_customFormulaService", this.injector.get($));
+    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
     ]);
-    g(this, "scopes", ["sheet"]);
+    f(this, "scopes", ["sheet"]);
   }
   _isFormulaOrInt(e) {
-    return !b.isBlank(e) && (F(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+    return !N.isBlank(e) && (R(e) || !Number.isNaN(+e) && Number.isInteger(+e));
   }
-  async isValidType(e, r, i) {
-    const { value: a } = e, n = He(a);
-    return !Number.isNaN(n) && Number.isInteger(n);
+  async isValidType(e, r, a) {
+    const { value: i } = e, s = Ne(i);
+    return !Number.isNaN(s) && Number.isInteger(s);
   }
-  transform(e, r, i) {
-    const { value: a } = e;
+  transform(e, r, a) {
+    const { value: i } = e;
     return {
       ...e,
-      value: He(a)
+      value: Ne(i)
     };
   }
   _parseNumber(e) {
     return e == null ? Number.NaN : +e;
   }
-  async parseFormula(e, r, i) {
-    var m, v, S, w, I, M, x, O, H, L;
-    const a = await this._formulaService.getRuleFormulaResult(r, i, e.uid), { formula1: n, formula2: o } = e, l = F(n) ? (I = (w = (S = (v = (m = a == null ? void 0 : a[0]) == null ? void 0 : m.result) == null ? void 0 : v[0]) == null ? void 0 : S[0]) == null ? void 0 : w[0][0]) == null ? void 0 : I.v : n, u = F(o) ? (L = (H = (O = (x = (M = a == null ? void 0 : a[1]) == null ? void 0 : M.result) == null ? void 0 : x[0]) == null ? void 0 : O[0]) == null ? void 0 : H[0][0]) == null ? void 0 : L.v : o, c = W(`${l}`) && W(`${u}`);
+  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 = R(u) ? n == null ? void 0 : n.v : u, m = R(c) ? l == null ? void 0 : l.v : c, _ = O(`${d}`) && O(`${m}`);
     return {
-      formula1: this._parseNumber(l),
-      formula2: this._parseNumber(u),
-      isFormulaValid: c
+      formula1: this._parseNumber(d),
+      formula2: this._parseNumber(m),
+      isFormulaValid: _
     };
   }
-  validatorFormula(e, r, i) {
-    const a = e.operator;
-    if (!a)
+  validatorFormula(e, r, a) {
+    const i = e.operator;
+    if (!i)
       return {
         success: !1
       };
-    const n = b.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), o = b.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Xe.includes(a), u = this.localeService.t("dataValidation.validFail.number");
+    const s = N.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = N.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = be.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
-      success: n && o,
-      formula1: n ? void 0 : u,
-      formula2: o ? void 0 : u
+      success: s && n,
+      formula1: s ? void 0 : u,
+      formula2: n ? void 0 : u
     } : {
-      success: n,
+      success: s,
       formula1: u
     };
   }
-  async validatorIsEqual(e, r, i) {
-    const { formula1: a } = r, { value: n } = e;
-    return Number.isNaN(a) ? !0 : n === a;
+  async validatorIsEqual(e, r, a) {
+    const { formula1: i } = r, { value: s } = e;
+    return Number.isNaN(i) ? !0 : s === i;
   }
-  async validatorIsNotEqual(e, r, i) {
-    const { formula1: a } = r;
-    return Number.isNaN(a) ? !0 : e.value !== a;
+  async validatorIsNotEqual(e, r, a) {
+    const { formula1: i } = r;
+    return Number.isNaN(i) ? !0 : e.value !== i;
   }
-  async validatorIsBetween(e, r, i) {
-    const { formula1: a, formula2: n } = r;
-    if (Number.isNaN(a) || Number.isNaN(n))
+  async validatorIsBetween(e, r, a) {
+    const { formula1: i, formula2: s } = r;
+    if (Number.isNaN(i) || Number.isNaN(s))
       return !0;
-    const o = Math.min(a, n), l = Math.max(a, n);
-    return e.value >= o && e.value <= l;
+    const n = Math.min(i, s), l = Math.max(i, s);
+    return e.value >= n && e.value <= l;
   }
-  async validatorIsNotBetween(e, r, i) {
-    const { formula1: a, formula2: n } = r;
-    if (Number.isNaN(a) || Number.isNaN(n))
+  async validatorIsNotBetween(e, r, a) {
+    const { formula1: i, formula2: s } = r;
+    if (Number.isNaN(i) || Number.isNaN(s))
       return !0;
-    const o = Math.min(a, n), l = Math.max(a, n);
-    return e.value < o || e.value > l;
+    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 validatorIsGreaterThan(e, r, i) {
-    const { formula1: a } = r;
-    return Number.isNaN(a) ? !0 : e.value > a;
+  async validatorIsGreaterThanOrEqual(e, r, a) {
+    const { formula1: i } = r;
+    return Number.isNaN(i) ? !0 : e.value >= i;
   }
-  async validatorIsGreaterThanOrEqual(e, r, i) {
-    const { formula1: a } = r;
-    return Number.isNaN(a) ? !0 : e.value >= a;
+  async validatorIsLessThan(e, r, a) {
+    const { formula1: i } = r;
+    return Number.isNaN(i) ? !0 : e.value < i;
   }
-  async validatorIsLessThan(e, r, i) {
-    const { formula1: a } = r;
-    return Number.isNaN(a) ? !0 : e.value < a;
+  async validatorIsLessThanOrEqual(e, r, a) {
+    const { formula1: i } = r;
+    return Number.isNaN(i) ? !0 : e.value <= i;
   }
-  async validatorIsLessThanOrEqual(e, r, i) {
-    const { formula1: a } = r;
-    return Number.isNaN(a) ? !0 : e.value <= a;
+  generateRuleErrorMessage(e, r) {
+    if (!e.operator)
+      return this.titleStr;
+    const { transformedFormula1: a, transformedFormula2: i } = Ie(this._lexerTreeBuilder, e, r);
+    return `${this.localeService.t(ht[e.operator]).replace(oe, a != null ? a : "").replace(ne, i != null ? i : "")}`;
   }
 }
-var zr = Object.defineProperty, Kr = Object.getOwnPropertyDescriptor, Zr = (s, t, e, r) => {
-  for (var i = r > 1 ? void 0 : r ? Kr(t, e) : t, a = s.length - 1, n; a >= 0; a--)
-    (n = s[a]) && (i = (r ? n(t, e, i) : n(i)) || i);
-  return r && i && zr(t, e, i), i;
-}, Me = (s, t) => (e, r) => t(e, r, s);
-let ke = class extends At {
-  constructor(s, t, e, r, i, a) {
-    super(), this._univerInstanceService = s, this._dataValidatorRegistryService = t, this._injector = e, this._selectionManagerService = r, this._sheetInterceptorService = i, this._sheetDataValidationModel = a, this._init();
+var Dr = Object.defineProperty, xr = Object.getOwnPropertyDescriptor, Lr = (o, t, e, r) => {
+  for (var a = r > 1 ? void 0 : r ? xr(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;
+}, te = (o, t) => (e, r) => t(e, r, o);
+let Me = class extends Et {
+  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() {
     [
-      Gr,
-      Cr,
-      Xr,
-      xr,
-      Er,
-      yr,
-      Tt,
-      Yr,
-      Qr
-    ].forEach((s) => {
-      const t = this._injector.createInstance(s);
-      this.disposeWithMe(this._dataValidatorRegistryService.register(t)), this.disposeWithMe(gt(() => this._injector.delete(s)));
+      Or,
+      _r,
+      Ar,
+      Rr,
+      fr,
+      cr,
+      mt,
+      Ir,
+      br
+    ].forEach((o) => {
+      const t = this._injector.createInstance(o);
+      this.disposeWithMe(this._dataValidatorRegistryService.register(t)), this.disposeWithMe(qe(() => this._injector.delete(o)));
     });
   }
   _initCommandInterceptor() {
     this._sheetInterceptorService.interceptCommand({
-      getMutations: (s) => {
+      getMutations: (o) => {
         var t;
-        if (s.id === Yt.id) {
-          const e = this._univerInstanceService.getCurrentUnitForType(K.UNIVER_SHEET), r = e.getUnitId(), i = e.getActiveSheet();
-          if (!i)
+        if (o.id === Ut.id) {
+          const e = this._univerInstanceService.getCurrentUnitForType(A.UNIVER_SHEET), r = e.getUnitId(), a = e.getActiveSheet();
+          if (!a)
             throw new Error("No active sheet found");
-          const a = i.getSheetId(), n = (t = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : t.map((d) => d.range), o = this._sheetDataValidationModel.getRuleObjectMatrix(r, a).clone();
-          n && o.removeRange(n);
-          const l = o.diff(this._sheetDataValidationModel.getRules(r, a)), { redoMutations: u, undoMutations: c } = ze(r, a, l, this._injector, "patched");
+          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 } = Ae(r, i, l, this._injector, "patched");
           return {
             undos: c,
             redos: u
@@ -2552,97 +2312,236 @@ let ke = class extends At {
     });
   }
 };
-ke = Zr([
-  Me(0, Z),
-  Me(1, E(ot)),
-  Me(2, E(st)),
-  Me(3, E(St)),
-  Me(4, E(Rt)),
-  Me(5, E(j))
-], ke);
-var Et = /* @__PURE__ */ ((s) => (s[s.View = 0] = "View", s[s.Edit = 1] = "Edit", s[s.ManageCollaborator = 2] = "ManageCollaborator", s[s.Print = 3] = "Print", s[s.Duplicate = 4] = "Duplicate", s[s.Comment = 5] = "Comment", s[s.Copy = 6] = "Copy", s[s.Share = 7] = "Share", s[s.Export = 8] = "Export", s[s.MoveWorksheet = 9] = "MoveWorksheet", s[s.DeleteWorksheet = 10] = "DeleteWorksheet", s[s.HideWorksheet = 11] = "HideWorksheet", s[s.RenameWorksheet = 12] = "RenameWorksheet", s[s.CreateWorksheet = 13] = "CreateWorksheet", s[s.SetWorksheetStyle = 14] = "SetWorksheetStyle", s[s.EditWorksheetCell = 15] = "EditWorksheetCell", s[s.InsertHyperlink = 16] = "InsertHyperlink", s[s.Sort = 17] = "Sort", s[s.Filter = 18] = "Filter", s[s.PivotTable = 19] = "PivotTable", s[s.FloatImg = 20] = "FloatImg", s[s.History = 21] = "History", s[s.RwHgtClWdt = 22] = "RwHgtClWdt", s[s.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", s[s.ViewFilter = 24] = "ViewFilter", s[s.MoveSheet = 25] = "MoveSheet", s[s.DeleteSheet = 26] = "DeleteSheet", s[s.HideSheet = 27] = "HideSheet", s[s.CopySheet = 28] = "CopySheet", s[s.RenameSheet = 29] = "RenameSheet", s[s.CreateSheet = 30] = "CreateSheet", s[s.SelectProtectedCells = 31] = "SelectProtectedCells", s[s.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", s[s.SetCellStyle = 33] = "SetCellStyle", s[s.SetCellValue = 34] = "SetCellValue", s[s.SetRowStyle = 35] = "SetRowStyle", s[s.SetColumnStyle = 36] = "SetColumnStyle", s[s.InsertRow = 37] = "InsertRow", s[s.InsertColumn = 38] = "InsertColumn", s[s.DeleteRow = 39] = "DeleteRow", s[s.DeleteColumn = 40] = "DeleteColumn", s[s.EditExtraObject = 41] = "EditExtraObject", s[s.Delete = 42] = "Delete", s[s.RecoverHistory = 43] = "RecoverHistory", s[s.ViewHistory = 44] = "ViewHistory", s[s.CreatePermissionObject = 45] = "CreatePermissionObject", s[s.UNRECOGNIZED = -1] = "UNRECOGNIZED", s))(Et || {}), Jr = Object.defineProperty, ea = Object.getOwnPropertyDescriptor, ta = (s, t, e, r) => {
-  for (var i = r > 1 ? void 0 : r ? ea(t, e) : t, a = s.length - 1, n; a >= 0; a--)
-    (n = s[a]) && (i = (r ? n(t, e, i) : n(i)) || i);
-  return r && i && Jr(t, e, i), i;
-}, Je = (s, t) => (e, r) => t(e, r, s);
-let We = class extends ce {
-  constructor(s, t, e) {
-    super(), this._univerInstanceService = s, this._permissionService = t, this._lexerTreeBuilder = e;
-  }
-  getFormulaRefCheck(s) {
+Me = Lr([
+  te(0, D),
+  te(1, v(Qe)),
+  te(2, v(je)),
+  te(3, v(ot)),
+  te(4, v(nt)),
+  te(5, v(F))
+], Me);
+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, Pr = Object.getOwnPropertyDescriptor, Ur = (o, t, e, r) => {
+  for (var a = r > 1 ? void 0 : r ? Pr(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 ye = class extends W {
+  constructor(o, t, e) {
+    super(), this._univerInstanceService = o, this._permissionService = t, this._lexerTreeBuilder = e;
+  }
+  getFormulaRefCheck(o) {
     var e, r;
-    const t = this._lexerTreeBuilder.sequenceNodesBuilder(s);
+    const t = this._lexerTreeBuilder.sequenceNodesBuilder(o);
     if (!t)
       return !0;
-    for (let i = 0; i < t.length; i++) {
-      const a = t[i];
-      if (typeof a == "string")
+    for (let a = 0; a < t.length; a++) {
+      const i = t[a];
+      if (typeof i == "string")
         continue;
-      const { token: n } = a, o = ir(n), l = this._univerInstanceService.getCurrentUnitForType(K.UNIVER_SHEET);
+      const { token: s } = i, n = Yt(s), l = this._univerInstanceService.getCurrentUnitForType(A.UNIVER_SHEET);
       let u = l.getActiveSheet();
       const c = l.getUnitId();
-      if (o.sheetName) {
-        if (u = l.getSheetBySheetName(o.sheetName), !u)
+      if (n.sheetName) {
+        if (u = l.getSheetBySheetName(n.sheetName), !u)
           return !1;
-        const w = u == null ? void 0 : u.getSheetId();
-        if (!this._permissionService.getPermissionPoint(new Xt(c, w).id)) return !1;
+        const S = u == null ? void 0 : u.getSheetId();
+        if (!this._permissionService.getPermissionPoint(new $t(c, S).id)) return !1;
       }
       if (!u)
         return !1;
-      const { startRow: d, endRow: m, startColumn: v, endColumn: S } = o.range;
-      for (let w = d; w <= m; w++)
-        for (let I = v; I <= S; I++) {
-          const M = (r = (e = u.getCell(w, I)) == null ? void 0 : e.selectionProtection) == null ? void 0 : r[0];
-          if ((M == null ? void 0 : M[Et.View]) === !1)
+      const { startRow: d, endRow: m, startColumn: _, endColumn: p } = n.range;
+      for (let S = d; S <= m; S++)
+        for (let y = _; y <= p; y++) {
+          const g = (r = (e = u.getCell(S, y)) == null ? void 0 : e.selectionProtection) == null ? void 0 : r[0];
+          if ((g == null ? void 0 : g[_t.View]) === !1)
             return !1;
         }
     }
     return !0;
   }
 };
-We = ta([
-  Je(0, Z),
-  Je(1, Lt),
-  Je(2, E(ut))
-], We);
-var ra = Object.defineProperty, aa = Object.getOwnPropertyDescriptor, ia = (s, t, e, r) => {
-  for (var i = r > 1 ? void 0 : r ? aa(t, e) : t, a = s.length - 1, n; a >= 0; a--)
-    (n = s[a]) && (i = (r ? n(t, e, i) : n(i)) || i);
-  return r && i && ra(t, e, i), i;
-}, Ne = (s, t) => (e, r) => t(e, r, s);
-let je = class extends ce {
-  constructor(t, e, r, i, a, n) {
+ye = Ur([
+  Ue(0, D),
+  Ue(1, Tt),
+  Ue(2, v(Z))
+], ye);
+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;
+}, at = (o, t) => (e, r) => t(e, r, o);
+let Ee = class extends W {
+  constructor(t, e) {
     super();
-    g(this, "_disposableMap", /* @__PURE__ */ new Map());
-    g(this, "registerRule", (t, e, r) => {
-      this.register(t, e, r), this.registerFormula(t, e, r);
+    f(this, "_disposableMap", /* @__PURE__ */ new Map());
+    f(this, "registerRule", (t, e, r) => {
+      le(r.type) && this.register(t, e, r);
     });
-    this._dataValidationModel = t, this._injector = e, this._refRangeService = r, this._dataValidationCustomFormulaService = i, this._dataValidationFormulaService = a, this._formulaRefRangeService = n, this._initRefRange();
+    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: U.id,
+            params: {
+              unitId: t,
+              subUnitId: e,
+              rule: r
+            }
+          }],
+          redos: [{
+            id: P.id,
+            params: {
+              unitId: t,
+              subUnitId: e,
+              ruleId: r.uid
+            }
+          }]
+        };
+      const c = [], d = [], m = u[0];
+      c.push({
+        id: b.id,
+        params: {
+          unitId: t,
+          subUnitId: e,
+          ruleId: r.uid,
+          payload: {
+            type: w.ALL,
+            payload: {
+              ranges: m.ranges,
+              formula1: m.formulas[0],
+              formula2: m.formulas[1]
+            }
+          }
+        }
+      }), d.push({
+        id: b.id,
+        params: {
+          unitId: t,
+          subUnitId: e,
+          ruleId: r.uid,
+          payload: {
+            type: w.ALL,
+            payload: {
+              ranges: a,
+              formula1: i,
+              formula2: s
+            }
+          }
+        }
+      });
+      for (let _ = 1; _ < u.length; _++) {
+        const p = u[_], S = wt();
+        c.push({
+          id: U.id,
+          params: {
+            unitId: t,
+            subUnitId: e,
+            rule: {
+              ...r,
+              uid: S,
+              formula1: p.formulas[0],
+              formula2: p.formulas[1],
+              ranges: p.ranges
+            }
+          }
+        }), d.push({
+          id: P.id,
+          params: {
+            unitId: t,
+            subUnitId: e,
+            ruleId: S
+          }
+        });
+      }
+      return {
+        undos: d,
+        redos: c
+      };
+    }), l = this._getIdWithUnitId(t, e, r.uid);
+    this._disposableMap.set(l, n);
+  }
+  _initRefRange() {
+    const t = this._dataValidationModel.getAll();
+    for (const [e, r] of t)
+      for (const [a, i] of r)
+        for (const s of i)
+          this.registerRule(e, a, s);
+    this.disposeWithMe(
+      this._dataValidationModel.ruleChange$.subscribe((e) => {
+        const { unitId: r, subUnitId: a, rule: i } = e;
+        switch (e.type) {
+          case "add": {
+            const s = e.rule;
+            this.registerRule(e.unitId, e.subUnitId, s);
+            break;
+          }
+          case "remove": {
+            const s = this._disposableMap.get(this._getIdWithUnitId(r, a, i.uid));
+            s && s.dispose();
+            break;
+          }
+          case "update": {
+            const s = e.rule, n = this._disposableMap.get(this._getIdWithUnitId(r, a, s.uid));
+            n && n.dispose(), this.registerRule(e.unitId, e.subUnitId, s);
+            break;
+          }
+        }
+      })
+    ), this.disposeWithMe(qe(() => {
+      this._disposableMap.forEach((e) => {
+        e.dispose();
+      }), this._disposableMap.clear();
+    }));
+  }
+};
+Ee = Wr([
+  at(0, v(F)),
+  at(1, v(ut))
+], Ee);
+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;
+}, re = (o, t) => (e, r) => t(e, r, o);
+let Te = class extends W {
+  constructor(t, e, r, a, i, s) {
+    super();
+    f(this, "_disposableMap", /* @__PURE__ */ new Map());
+    f(this, "registerRule", (t, e, r) => {
+      le(r.type) || (this.register(t, e, r), this.registerFormula(t, e, r));
+    });
+    this._dataValidationModel = t, this._injector = e, this._refRangeService = r, this._dataValidationCustomFormulaService = a, this._dataValidationFormulaService = i, this._formulaRefRangeService = s, this._initRefRange();
+  }
+  _getIdWithUnitId(t, e, r) {
+    return `${t}_${e}_${r}`;
+  }
   registerFormula(t, e, r) {
-    var l;
-    const i = r.uid, a = this._getIdWithUnitId(t, e, i), n = (l = this._disposableMap.get(a)) != null ? l : /* @__PURE__ */ new Set(), o = (u, c) => {
-      const d = this._dataValidationModel.getRuleById(t, e, i);
-      if (!d)
+    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);
+      if (!m)
         return { redos: [], undos: [] };
-      const m = d[u];
-      if (!m || m === c)
+      const _ = m[c];
+      if (!_ || _ === d)
         return { redos: [], undos: [] };
-      const v = {
+      const p = {
         unitId: t,
         subUnitId: e,
         ruleId: r.uid,
         payload: {
-          type: Y.SETTING,
+          type: w.SETTING,
           payload: {
-            type: d.type,
-            formula1: d.formula1,
-            formula2: d.formula2,
-            [u]: c
+            type: m.type,
+            formula1: m.formula1,
+            formula2: m.formula2,
+            [c]: d
           }
         }
       }, S = {
@@ -2650,188 +2549,174 @@ let je = class extends ce {
         subUnitId: e,
         ruleId: r.uid,
         payload: {
-          type: Y.SETTING,
+          type: w.SETTING,
           payload: {
-            type: d.type,
-            formula1: d.formula1,
-            formula2: d.formula2
+            type: m.type,
+            formula1: m.formula1,
+            formula2: m.formula2
           }
         }
-      }, w = [
+      }, y = [
         {
-          id: X.id,
-          params: v
+          id: b.id,
+          params: p
         }
-      ], I = [
+      ], g = [
         {
-          id: X.id,
+          id: b.id,
           params: S
         }
       ];
-      return { redos: w, undos: I };
-    };
-    if (r.type === $.CUSTOM) {
-      const u = this._dataValidationCustomFormulaService.getRuleFormulaInfo(t, e, i);
-      if (u) {
-        const c = this._formulaRefRangeService.registerFormula(
+      return { redos: y, undos: g };
+    }, l = this._dataValidationFormulaService.getRuleFormulaInfo(t, e, a);
+    if (l) {
+      const [c, d] = l;
+      if (c) {
+        const m = this._formulaRefRangeService.registerFormula(
           t,
           e,
-          u.formula,
-          (d) => o("formula1", d)
+          c.text,
+          (_) => n("formula1", _)
         );
-        n.add(() => c.dispose());
+        s.add(() => m.dispose());
       }
-    } else {
-      const u = this._dataValidationFormulaService.getRuleFormulaInfo(t, e, i);
-      if (u) {
-        const [c, d] = u;
-        if (c) {
-          const m = this._formulaRefRangeService.registerFormula(
-            t,
-            e,
-            c.text,
-            (v) => o("formula1", v)
-          );
-          n.add(() => m.dispose());
-        }
-        if (d) {
-          const m = this._formulaRefRangeService.registerFormula(
-            t,
-            e,
-            d.text,
-            (v) => o("formula2", v)
-          );
-          n.add(() => m.dispose());
-        }
+      if (d) {
+        const m = this._formulaRefRangeService.registerFormula(
+          t,
+          e,
+          d.text,
+          (_) => n("formula2", _)
+        );
+        s.add(() => m.dispose());
       }
     }
   }
   register(t, e, r) {
     var l;
-    const i = (u) => {
-      const c = [...r.ranges], m = c.map((S) => Kt(S, u)).filter((S) => !!S).flat();
-      if (Ut(m, c))
+    const a = (u) => {
+      const c = [...r.ranges], m = c.map((p) => Wt(p, u)).filter((p) => !!p).flat();
+      if (Ft(m, c))
         return { redos: [], undos: [] };
       if (m.length) {
-        const S = {
+        const p = {
           unitId: t,
           subUnitId: e,
           ruleId: r.uid,
           payload: {
-            type: Y.RANGE,
+            type: w.RANGE,
             payload: m
           },
           source: "patched"
-        }, w = [{ id: X.id, params: S }], I = [{
-          id: X.id,
+        }, S = [{ id: b.id, params: p }], y = [{
+          id: b.id,
           params: {
             unitId: t,
             subUnitId: e,
             ruleId: r.uid,
             payload: {
-              type: Y.RANGE,
+              type: w.RANGE,
               payload: c
             },
             source: "patched"
           }
         }];
-        return { redos: w, undos: I };
+        return { redos: S, undos: y };
       } else {
-        const S = { unitId: t, subUnitId: e, ruleId: r.uid }, w = [{ id: ie.id, params: S }], I = kr(this._injector, S);
-        return { redos: w, undos: I };
+        const p = { unitId: t, subUnitId: e, ruleId: r.uid }, S = [{ id: P.id, params: p }], y = Tr(this._injector, p);
+        return { redos: S, undos: y };
       }
-    }, a = [];
+    }, i = [];
     r.ranges.forEach((u) => {
-      const c = this._refRangeService.registerRefRange(u, i, t, e);
-      a.push(() => c.dispose());
+      const c = this._refRangeService.registerRefRange(u, a, t, e);
+      i.push(() => c.dispose());
     });
-    const n = this._getIdWithUnitId(t, e, r.uid), o = (l = this._disposableMap.get(n)) != null ? l : /* @__PURE__ */ new Set();
-    o.add(() => a.forEach((u) => u())), this._disposableMap.set(n, o);
+    const s = this._getIdWithUnitId(t, e, r.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 [i, a] of r)
-        for (const n of a)
-          this.registerRule(e, i, n);
+      for (const [a, i] of r)
+        for (const s of i)
+          this.registerRule(e, a, s);
     this.disposeWithMe(
       this._dataValidationModel.ruleChange$.subscribe((e) => {
-        const { unitId: r, subUnitId: i, rule: a } = e;
+        const { unitId: r, subUnitId: a, rule: i } = e;
         switch (e.type) {
           case "add": {
-            const n = e.rule;
-            this.registerRule(e.unitId, e.subUnitId, n);
+            const s = e.rule;
+            this.registerRule(e.unitId, e.subUnitId, s);
             break;
           }
           case "remove": {
-            const n = this._disposableMap.get(this._getIdWithUnitId(r, i, a.uid));
-            n && n.forEach((o) => o());
+            const s = this._disposableMap.get(this._getIdWithUnitId(r, a, i.uid));
+            s && s.forEach((n) => n());
             break;
           }
           case "update": {
-            const n = e.rule, o = this._disposableMap.get(this._getIdWithUnitId(r, i, n.uid));
-            o && o.forEach((l) => l()), this.registerRule(e.unitId, e.subUnitId, n);
+            const s = e.rule, n = this._disposableMap.get(this._getIdWithUnitId(r, a, s.uid));
+            n && n.forEach((l) => l()), this.registerRule(e.unitId, e.subUnitId, s);
             break;
           }
         }
       })
-    ), this.disposeWithMe(gt(() => {
+    ), this.disposeWithMe(qe(() => {
       this._disposableMap.forEach((e) => {
         e.forEach((r) => r());
       }), this._disposableMap.clear();
     }));
   }
 };
-je = ia([
-  Ne(0, E(j)),
-  Ne(1, E(st)),
-  Ne(2, E(zt)),
-  Ne(3, E(we)),
-  Ne(4, E(te)),
-  Ne(5, E(er))
-], je);
-var sa = Object.defineProperty, na = Object.getOwnPropertyDescriptor, oa = (s, t, e, r) => {
-  for (var i = r > 1 ? void 0 : r ? na(t, e) : t, a = s.length - 1, n; a >= 0; a--)
-    (n = s[a]) && (i = (r ? n(t, e, i) : n(i)) || i);
-  return r && i && sa(t, e, i), i;
-}, et = (s, t) => (e, r) => t(e, r, s);
-let qe = class extends ce {
-  constructor(s, t, e) {
-    super(), this._sheetInterceptorService = s, this._univerInstanceService = t, this._sheetDataValidationModel = e, this._initSheetChange();
+Te = qr([
+  re(0, v(F)),
+  re(1, v(je)),
+  re(2, v(Ht)),
+  re(3, v($)),
+  re(4, v(X)),
+  re(5, v(ut))
+], Te);
+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;
+}, $e = (o, t) => (e, r) => t(e, r, o);
+let we = class extends W {
+  constructor(o, t, e) {
+    super(), this._sheetInterceptorService = o, this._univerInstanceService = t, this._sheetDataValidationModel = e, this._initSheetChange();
   }
   _initSheetChange() {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
-        getMutations: (s) => {
+        getMutations: (o) => {
           var t;
-          if (s.id === Zt.id) {
-            const e = s.params, r = e.unitId || this._univerInstanceService.getCurrentUnitForType(K.UNIVER_SHEET).getUnitId(), i = this._univerInstanceService.getUniverSheetInstance(r);
-            if (!i)
-              return { redos: [], undos: [] };
-            const a = e.subUnitId || ((t = i.getActiveSheet()) == null ? void 0 : t.getSheetId());
+          if (o.id === kt.id) {
+            const e = o.params, r = e.unitId || this._univerInstanceService.getCurrentUnitForType(A.UNIVER_SHEET).getUnitId(), a = this._univerInstanceService.getUniverSheetInstance(r);
             if (!a)
               return { redos: [], undos: [] };
-            const n = this._sheetDataValidationModel.getRules(r, a);
-            if (n.length === 0)
+            const i = e.subUnitId || ((t = a.getActiveSheet()) == null ? void 0 : t.getSheetId());
+            if (!i)
+              return { redos: [], undos: [] };
+            const s = this._sheetDataValidationModel.getRules(r, i);
+            if (s.length === 0)
               return { redos: [], undos: [] };
-            const o = n.map((c) => c.uid), l = {
+            const n = s.map((c) => c.uid), l = {
               unitId: r,
-              subUnitId: a,
-              ruleId: o,
+              subUnitId: i,
+              ruleId: n,
               source: "patched"
             }, u = {
               unitId: r,
-              subUnitId: a,
-              rule: [...n],
+              subUnitId: i,
+              rule: [...s],
               source: "patched"
             };
             return {
               redos: [{
-                id: ie.id,
+                id: P.id,
                 params: l
               }],
               undos: [{
-                id: le.id,
+                id: U.id,
                 params: u
               }]
             };
@@ -2842,188 +2727,189 @@ let qe = class extends ce {
     );
   }
 };
-qe = oa([
-  et(0, E(Rt)),
-  et(1, E(Z)),
-  et(2, E(j))
-], qe);
-var la = Object.defineProperty, ua = Object.getOwnPropertyDescriptor, ca = (s, t, e, r) => {
-  for (var i = r > 1 ? void 0 : r ? ua(t, e) : t, a = s.length - 1, n; a >= 0; a--)
-    (n = s[a]) && (i = (r ? n(t, e, i) : n(i)) || i);
-  return r && i && la(t, e, i), i;
-}, Ae = (s, t) => (e, r) => t(e, r, s);
-let Ge = class extends ce {
-  constructor(s, t, e, r) {
-    super(), this._univerInstanceService = s, this._sheetDataValidationModel = t, this._dataValidationCacheService = e, this._lifecycleService = r, this._initRecalculate();
+we = Yr([
+  $e(0, v(nt)),
+  $e(1, v(D)),
+  $e(2, v(F))
+], 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;
+}, ge = (o, t) => (e, r) => t(e, r, o);
+let Fe = class extends W {
+  constructor(o, t, e, r) {
+    super(), this._univerInstanceService = o, this._sheetDataValidationModel = t, this._dataValidationCacheService = e, this._lifecycleService = r, this._initRecalculate();
   }
   _initRecalculate() {
-    const s = (t) => {
+    const o = (t) => {
       if (t.length === 0)
         return;
-      const e = this._univerInstanceService.getCurrentUnitForType(K.UNIVER_SHEET), r = e == null ? void 0 : e.getActiveSheet(), i = {};
-      t.flat().forEach((a) => {
-        i[a.unitId] || (i[a.unitId] = {}), i[a.unitId][a.subUnitId] || (i[a.unitId][a.subUnitId] = []);
-        const n = this._univerInstanceService.getUnit(a.unitId, K.UNIVER_SHEET), o = n == null ? void 0 : n.getSheetBySheetId(a.subUnitId);
-        o && i[a.unitId][a.subUnitId].push(...a.ranges.map((l) => Q.transformRange(l, o)));
-      }), Object.entries(i).forEach(([a, n]) => {
-        Object.entries(n).forEach(([o, l]) => {
-          (e == null ? void 0 : e.getUnitId()) === a && (r == null ? void 0 : r.getSheetId()) === o ? this.validatorRanges(a, o, l) : requestIdleCallback(() => {
-            this.validatorRanges(a, o, l);
+      const e = this._univerInstanceService.getCurrentUnitForType(A.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, A.UNIVER_SHEET), n = s == null ? void 0 : s.getSheetBySheetId(i.subUnitId);
+        n && a[i.unitId][i.subUnitId].push(...i.ranges.map((l) => I.transformRange(l, n)));
+      }), Object.entries(a).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(() => {
+            this.validatorRanges(i, n, l);
           });
         });
       });
     };
-    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Jt(() => this._lifecycleService.lifecycle$.pipe(mt((t) => t === ht.Rendered)))).subscribe(s)), this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(mt(() => this._lifecycleService.stage >= ht.Rendered), Pt(20)).subscribe(s));
+    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(jt(() => this._lifecycleService.lifecycle$.pipe(tt((t) => t === et.Rendered)))).subscribe(o)), this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(tt(() => this._lifecycleService.stage >= et.Rendered), Ot(20)).subscribe(o));
   }
-  async validatorCell(s, t, e, r) {
-    const i = this._univerInstanceService.getUnit(s, K.UNIVER_SHEET);
-    if (!i)
-      throw new Error(`cannot find current workbook, unitId: ${s}`);
-    const a = i.getSheetBySheetId(t);
+  async validatorCell(o, t, e, r) {
+    const a = this._univerInstanceService.getUnit(o, A.UNIVER_SHEET);
     if (!a)
+      throw new Error(`cannot find current workbook, unitId: ${o}`);
+    const i = a.getSheetBySheetId(t);
+    if (!i)
       throw new Error(`cannot find current worksheet, sheetId: ${t}`);
-    if (!b.isDefine(e) || !b.isDefine(r))
+    if (!N.isDefine(e) || !N.isDefine(r))
       throw new Error(`row or col is not defined, row: ${e}, col: ${r}`);
-    const n = this._sheetDataValidationModel.getRuleByLocation(s, t, e, r);
-    return n ? new Promise((o) => {
-      this._sheetDataValidationModel.validator(n, { unitId: s, subUnitId: t, row: e, col: r, worksheet: a, workbook: i }, (l) => {
-        o(l);
+    const s = this._sheetDataValidationModel.getRuleByLocation(o, t, e, r);
+    return s ? new Promise((n) => {
+      this._sheetDataValidationModel.validator(s, { unitId: o, subUnitId: t, row: e, col: r, worksheet: i, workbook: a }, (l) => {
+        n(l);
       });
-    }) : ge.VALID;
+    }) : Y.VALID;
   }
-  validatorRanges(s, t, e) {
+  validatorRanges(o, t, e) {
     return Promise.all(e.map((r) => {
-      const i = [];
-      return Q.foreach(r, (a, n) => {
-        i.push(this.validatorCell(s, t, a, n));
-      }), i;
-    }));
-  }
-  async validatorWorksheet(s, t) {
-    const e = this._sheetDataValidationModel.getRules(s, t);
-    return await Promise.all(e.map((r) => Promise.all(r.ranges.map((i) => {
       const a = [];
-      return Q.foreach(i, (n, o) => {
-        a.push(this.validatorCell(s, t, n, o));
+      return I.foreach(r, (i, s) => {
+        a.push(this.validatorCell(o, t, i, s));
       }), a;
-    })))), this._dataValidationCacheService.ensureCache(s, t);
+    }));
+  }
+  async validatorWorksheet(o, t) {
+    const e = this._sheetDataValidationModel.getRules(o, t);
+    return await Promise.all(e.map((r) => Promise.all(r.ranges.map((a) => {
+      const i = [];
+      return I.foreach(a, (s, n) => {
+        i.push(this.validatorCell(o, t, s, n));
+      }), i;
+    })))), this._dataValidationCacheService.ensureCache(o, t);
   }
-  async validatorWorkbook(s) {
-    const t = this._sheetDataValidationModel.getSubUnitIds(s), e = await Promise.all(t.map((i) => this.validatorWorksheet(s, i))), r = {};
-    return e.forEach((i, a) => {
-      r[t[a]] = i;
+  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;
   }
-  getDataValidations(s, t, e) {
-    const r = this._sheetDataValidationModel.getRuleObjectMatrix(s, t), i = /* @__PURE__ */ new Set();
-    return e.forEach((n) => {
-      Q.foreach(n, (o, l) => {
-        const u = r.getValue(o, l);
-        u && i.add(u);
+  getDataValidations(o, t, e) {
+    const r = this._sheetDataValidationModel.getRuleObjectMatrix(o, t), a = /* @__PURE__ */ new Set();
+    return e.forEach((s) => {
+      I.foreach(s, (n, l) => {
+        const u = r.getValue(n, l);
+        u && a.add(u);
       });
-    }), Array.from(i).map((n) => this._sheetDataValidationModel.getRuleById(s, t, n)).filter(Boolean);
+    }), Array.from(a).map((s) => this._sheetDataValidationModel.getRuleById(o, t, s)).filter(Boolean);
   }
-  getDataValidation(s, t, e) {
-    return this.getDataValidations(s, t, e)[0];
+  getDataValidation(o, t, e) {
+    return this.getDataValidations(o, t, e)[0];
   }
 };
-Ge = ca([
-  Ae(0, Z),
-  Ae(1, E(j)),
-  Ae(2, E(ue)),
-  Ae(3, E(Bt))
-], Ge);
-var Ct = Object.defineProperty, da = Object.getOwnPropertyDescriptor, ha = (s, t, e) => t in s ? Ct(s, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[t] = e, ma = (s, t, e, r) => {
-  for (var i = r > 1 ? void 0 : r ? da(t, e) : t, a = s.length - 1, n; a >= 0; a--)
-    (n = s[a]) && (i = (r ? n(t, e, i) : n(i)) || i);
-  return r && i && Ct(t, e, i), i;
-}, tt = (s, t) => (e, r) => t(e, r, s), Ot = (s, t, e) => ha(s, typeof t != "symbol" ? t + "" : t, e);
-let Qe = class extends kt {
-  constructor(s = qr, t, e, r) {
-    super(), this._config = s, this._injector = t, this._commandService = e, this._configService = r;
-    const { ...i } = this._config;
-    this._configService.setConfig(jr, i);
+Fe = zr([
+  ge(0, D),
+  ge(1, v(F)),
+  ge(2, v(j)),
+  ge(3, v(Ct))
+], Fe);
+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;
+}, He = (o, t) => (e, r) => t(e, r, o), gt = (o, t, e) => Jr(o, typeof t != "symbol" ? t + "" : t, e);
+let Ce = class extends It {
+  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);
   }
   onStarting() {
     [
-      [ue],
-      [te],
-      [we],
-      [Ge],
       [j],
-      [ke],
-      [je],
-      [We],
-      [qe]
-    ].forEach((s) => {
-      this._injector.add(s);
+      [X],
+      [$],
+      [Fe],
+      [F],
+      [Me],
+      [ye],
+      [we],
+      [Te],
+      [Ee]
+    ].forEach((o) => {
+      this._injector.add(o);
     }), [
-      Lr,
-      Ar,
-      Ur,
-      Br,
-      Wr,
-      Hr,
-      Pr
-    ].forEach((s) => {
-      this._commandService.registerCommand(s);
-    }), this._injector.get(ue), this._injector.get(Ge), this._injector.get(je);
+      Vr,
+      Sr,
+      Nr,
+      Mr,
+      wr,
+      Er,
+      yr
+    ].forEach((o) => {
+      this._commandService.registerCommand(o);
+    }), this._injector.get(j), this._injector.get(Fe), this._injector.get(Ee), this._injector.get(Te);
   }
   onReady() {
-    this._injector.get(qe);
+    this._injector.get(we);
   }
   onRendered() {
-    this._injector.get(ke), this._injector.get(We);
+    this._injector.get(Me), this._injector.get(ye);
   }
 };
-Ot(Qe, "pluginName", sr);
-Ot(Qe, "type", K.UNIVER_SHEET);
-Qe = ma([
-  Ht(Gt),
-  tt(1, E(st)),
-  tt(2, re),
-  tt(3, Wt)
-], Qe);
-function Na(s) {
-  const e = s.get(St).getCurrentSelections().map((a) => a.range);
+gt(Ce, "pluginName", Xt);
+gt(Ce, "type", A.UNIVER_SHEET);
+Ce = ea([
+  bt(Bt),
+  He(1, v(je)),
+  He(2, H),
+  He(3, At)
+], Ce);
+function ca(o) {
+  const e = o.get(ot).getCurrentSelections().map((i) => i.range);
   return {
-    uid: b.generateRandomId(6),
-    type: $.DECIMAL,
-    operator: _.EQUAL,
+    uid: N.generateRandomId(6),
+    type: M.DECIMAL,
+    operator: h.EQUAL,
     formula1: "100",
     ranges: e != null ? e : [{ startColumn: 0, endColumn: 0, startRow: 0, endRow: 0 }]
   };
 }
 export {
-  Lr as AddSheetDataValidationCommand,
-  Be as CHECKBOX_FORMULA_1,
-  Pe as CHECKBOX_FORMULA_2,
-  yr as CheckboxValidator,
-  Pr as ClearRangeDataValidationCommand,
-  sr as DATA_VALIDATION_PLUGIN_NAME,
-  ue as DataValidationCacheService,
-  we as DataValidationCustomFormulaService,
-  We as DataValidationFormulaController,
-  te as DataValidationFormulaService,
-  Er as DateValidator,
-  Yr as ListMultipleValidator,
-  Tt as ListValidator,
-  Hr as RemoveSheetAllDataValidationCommand,
-  Wr as RemoveSheetDataValidationCommand,
-  j as SheetDataValidationModel,
-  Ge as SheetsDataValidationValidatorService,
-  Qe as UniverSheetsDataValidationPlugin,
-  Br as UpdateSheetDataValidationOptionsCommand,
-  Ar as UpdateSheetDataValidationRangeCommand,
-  Ur as UpdateSheetDataValidationSettingCommand,
-  Na as createDefaultNewRule,
-  xe as deserializeListOptions,
-  Ve as getCellValueOrigin,
-  Ma as getDataValidationCellValue,
-  ze as getDataValidationDiffMutations,
-  cr as getFormulaCellData,
-  z as getFormulaResult,
-  W as isLegalFormulaResult,
-  ya as serializeListOptions,
-  $e as transformCheckboxValue
+  Vr as AddSheetDataValidationCommand,
+  Se as CHECKBOX_FORMULA_1,
+  Ve as CHECKBOX_FORMULA_2,
+  cr as CheckboxValidator,
+  yr as ClearRangeDataValidationCommand,
+  Xt as DATA_VALIDATION_PLUGIN_NAME,
+  j as DataValidationCacheService,
+  $ as DataValidationCustomFormulaService,
+  ye as DataValidationFormulaController,
+  X as DataValidationFormulaService,
+  fr as DateValidator,
+  Ir as ListMultipleValidator,
+  mt as ListValidator,
+  Er as RemoveSheetAllDataValidationCommand,
+  wr as RemoveSheetDataValidationCommand,
+  F as SheetDataValidationModel,
+  Fe as SheetsDataValidationValidatorService,
+  Ce as UniverSheetsDataValidationPlugin,
+  Mr as UpdateSheetDataValidationOptionsCommand,
+  Sr as UpdateSheetDataValidationRangeCommand,
+  Nr as UpdateSheetDataValidationSettingCommand,
+  ca as createDefaultNewRule,
+  pe as deserializeListOptions,
+  ae as getCellValueOrigin,
+  ua as getDataValidationCellValue,
+  Ae as getDataValidationDiffMutations,
+  he as getFormulaCellData,
+  ie as getFormulaResult,
+  O as isLegalFormulaResult,
+  la as serializeListOptions,
+  _e as transformCheckboxValue
 };