@univerjs/sheets-data-validation 0.5.3-nightly.202501071618 → 0.5.3-nightly.202501090742

package/lib/es/index.js

@@ -1,32 +1,32 @@
-var vt = Object.defineProperty;
-var Rt = (o, a, e) => a in o ? vt(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e;
-var g = (o, a, e) => Rt(o, typeof a != "symbol" ? a + "" : a, e);
-import { Inject as R, ICommandService as x, IUniverInstanceService as O, Disposable as $, ObjectMatrix as Se, UniverInstanceType as N, Range as b, isFormulaString as S, DataValidationType as T, getOriginCellValue as St, RBush as Vt, debounce as Mt, Rectangle as I, Tools as V, DataValidationStatus as D, WrapStrategy as Re, DataValidationOperator as h, numfmt as Q, dayjs as at, DataValidationRenderMode as Be, CommandType as K, IUndoRedoService as z, sequenceExecute as Ie, isRangesEqual as rt, generateRandomId as yt, toDisposable as qe, IPermissionService as Et, Injector as Ge, CellValueType as Tt, RxDisposable as Ft, LifecycleService as Nt, LifecycleStages as ze, bufferDebounceTime as Ct, DependentOn as Ot, Plugin as wt, merge as It, IConfigService as At } from "@univerjs/core";
+var Rt = Object.defineProperty;
+var St = (s, a, e) => a in s ? Rt(s, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[a] = e;
+var f = (s, a, e) => St(s, typeof a != "symbol" ? a + "" : a, e);
+import { Inject as S, ICommandService as x, IUniverInstanceService as O, Disposable as $, ObjectMatrix as ve, UniverInstanceType as N, Range as b, isFormulaString as v, DataValidationType as T, getOriginCellValue as vt, RBush as Vt, debounce as Mt, Rectangle as I, Tools as V, DataValidationStatus as D, WrapStrategy as Se, DataValidationOperator as h, numfmt as Q, dayjs as at, DataValidationRenderMode as Be, CommandType as K, IUndoRedoService as z, sequenceExecute as Ie, isRangesEqual as rt, generateRandomId as yt, toDisposable as qe, IPermissionService as Et, Injector as Ge, CellValueType as Tt, RxDisposable as Ft, LifecycleService as Nt, LifecycleStages as ze, bufferDebounceTime as Ct, DependentOn as Ot, Plugin as wt, merge as It, IConfigService as At } from "@univerjs/core";
 import { DataValidationModel as ke, DataValidatorRegistryService as G, UpdateRuleType as y, BaseDataValidator as k, TextLengthErrorTitleMap as Dt, AddDataValidationMutation as L, RemoveDataValidationMutation as A, UpdateDataValidationMutation as E, getRuleSetting as bt, getRuleOptions as Lt, UniverDataValidationPlugin as xt } from "@univerjs/data-validation";
-import { SetRangeValuesMutation as se, RemoveSheetMutation as it, getSheetCommandTarget as Ye, SetRangeValuesUndoMutationFactory as ot, WorksheetViewPermission as Bt, RefRangeService as Ut, handleCommonDefaultRangeChangeWithEffectRefCommands as Pt, SheetInterceptorService as st, RemoveSheetCommand as $t, SheetsSelectionsService as nt, ClearSelectionAllCommand as Ht } from "@univerjs/sheets";
+import { SetRangeValuesMutation as oe, RemoveSheetMutation as it, getSheetCommandTarget as Ye, SetRangeValuesUndoMutationFactory as st, WorksheetViewPermission as Bt, RefRangeService as Ut, handleCommonDefaultRangeChangeWithEffectRefCommands as Pt, SheetInterceptorService as ot, RemoveSheetCommand as $t, SheetsSelectionsService as nt, ClearSelectionAllCommand as Ht } from "@univerjs/sheets";
 import { Subject as Qe, bufferWhen as Wt, filter as Ze } from "rxjs";
 import { RegisterOtherFormulaService as lt, FormulaRefRangeService as ut } from "@univerjs/sheets-formula";
 import { ERROR_TYPE_SET as jt, LexerTreeBuilder as Z, isReferenceString as dt, sequenceNodeType as Qt, deserializeRangeWithSheet as qt, deserializeRangeWithSheetWithCache as Gt } from "@univerjs/engine-formula";
 const kt = "SHEET_DATA_VALIDATION_PLUGIN";
-var Yt = Object.defineProperty, Xt = Object.getOwnPropertyDescriptor, Kt = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Xt(a, e) : a, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+var Yt = Object.defineProperty, Xt = Object.getOwnPropertyDescriptor, Kt = (s, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Xt(a, e) : a, i = s.length - 1, o; i >= 0; i--)
+    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
   return t && r && Yt(a, e, r), r;
-}, Je = (o, a) => (e, t) => a(e, t, o);
+}, Je = (s, a) => (e, t) => a(e, t, s);
 let q = class extends $ {
   constructor(a, e) {
     super();
-    g(this, "_cacheMatrix", /* @__PURE__ */ new Map());
-    g(this, "_dirtyRanges$", new Qe());
-    g(this, "dirtyRanges$", this._dirtyRanges$.asObservable());
+    f(this, "_cacheMatrix", /* @__PURE__ */ new Map());
+    f(this, "_dirtyRanges$", new Qe());
+    f(this, "dirtyRanges$", this._dirtyRanges$.asObservable());
     this._commandService = a, this._univerInstanceService = e, this._initDirtyRanges(), this._initSheetRemove();
   }
   _initDirtyRanges() {
     this.disposeWithMe(this._commandService.onCommandExecuted((a) => {
-      if (a.id === se.id) {
+      if (a.id === oe.id) {
         const { cellValue: e, unitId: t, subUnitId: r } = a.params;
         if (e) {
-          const i = new Se(e).getDataRange();
+          const i = new ve(e).getDataRange();
           if (i.endRow === -1) return;
           this.markRangeDirty(t, r, [i]);
         }
@@ -48,7 +48,7 @@ let q = class extends $ {
     let t = this._cacheMatrix.get(a);
     t || (t = /* @__PURE__ */ new Map(), this._cacheMatrix.set(a, t));
     let r = t.get(e);
-    return r || (r = new Se(), t.set(e, r)), r;
+    return r || (r = new ve(), t.set(e, r)), r;
   }
   ensureCache(a, e) {
     return this._ensureCache(a, e);
@@ -62,16 +62,16 @@ let q = class extends $ {
   markRangeDirty(a, e, t) {
     const r = this._ensureCache(a, e);
     t.forEach((i) => {
-      b.foreach(i, (s, n) => {
-        r.setValue(s, n, void 0);
+      b.foreach(i, (o, n) => {
+        r.setValue(o, n, void 0);
       });
     }), this._dirtyRanges$.next({ unitId: a, subUnitId: e, ranges: t });
   }
   _deleteRange(a, e, t) {
     const r = this._ensureCache(a, e);
     t.forEach((i) => {
-      b.foreach(i, (s, n) => {
-        r.realDeleteValue(s, n);
+      b.foreach(i, (o, n) => {
+        r.realDeleteValue(o, n);
       });
     }), this._dirtyRanges$.next({ unitId: a, subUnitId: e, ranges: t });
   }
@@ -80,38 +80,38 @@ let q = class extends $ {
   }
 };
 q = Kt([
-  Je(0, R(x)),
-  Je(1, R(O))
+  Je(0, S(x)),
+  Je(1, S(O))
 ], q);
-function oe(o) {
+function se(s) {
   var a, e;
-  return (e = (a = o == null ? void 0 : o[0]) == null ? void 0 : a[0]) == null ? void 0 : e.v;
+  return (e = (a = s == null ? void 0 : s[0]) == null ? void 0 : a[0]) == null ? void 0 : e.v;
 }
-function _e(o) {
+function ge(s) {
   var a;
-  return (a = o == null ? void 0 : o[0]) == null ? void 0 : a[0];
+  return (a = s == null ? void 0 : s[0]) == null ? void 0 : a[0];
 }
-function C(o) {
-  return !jt.has(o);
+function C(s) {
+  return !jt.has(s);
 }
-function de(o, a) {
+function de(s, a) {
   var t;
-  const e = a.getValidatorItem(o);
+  const e = a.getValidatorItem(s);
   return (t = e == null ? void 0 : e.offsetFormulaByRange) != null ? t : !1;
 }
-var zt = Object.defineProperty, Zt = Object.getOwnPropertyDescriptor, Jt = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Zt(a, e) : a, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+var zt = Object.defineProperty, Zt = Object.getOwnPropertyDescriptor, Jt = (s, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Zt(a, e) : a, i = s.length - 1, o; i >= 0; i--)
+    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
   return t && r && zt(a, e, r), r;
-}, re = (o, a) => (e, t) => a(e, t, o);
+}, re = (s, a) => (e, t) => a(e, t, s);
 let P = class extends $ {
   constructor(a, e, t, r, i) {
     super();
     /**
      * Map of origin formula of rule
      */
-    g(this, "_ruleFormulaMap", /* @__PURE__ */ new Map());
-    g(this, "_ruleFormulaMap2", /* @__PURE__ */ new Map());
+    f(this, "_ruleFormulaMap", /* @__PURE__ */ new Map());
+    f(this, "_ruleFormulaMap2", /* @__PURE__ */ new Map());
     this._instanceSrv = a, this._registerOtherFormulaService = e, this._dataValidationModel = t, this._dataValidationCacheService = r, this._validatorRegistryService = i, this._initFormulaResultHandler();
   }
   _initFormulaResultHandler() {
@@ -120,8 +120,8 @@ let P = class extends $ {
         const t = a[e];
         if (this._instanceSrv.getUnitType(e) === N.UNIVER_SHEET)
           for (const i in t) {
-            const s = t[i], { ruleFormulaMap: n } = this._ensureMaps(e, i);
-            s.forEach((l) => {
+            const o = t[i], { ruleFormulaMap: n } = this._ensureMaps(e, i);
+            o.forEach((l) => {
               var c, m;
               const u = n.get((c = l.extra) == null ? void 0 : c.ruleId), d = this._dataValidationModel.getRuleById(e, i, (m = l.extra) == null ? void 0 : m.ruleId);
               d && u && this._dataValidationCacheService.markRangeDirty(e, i, d.ranges);
@@ -135,25 +135,25 @@ let P = class extends $ {
     t || (t = /* @__PURE__ */ new Map(), this._ruleFormulaMap.set(a, t)), r || (r = /* @__PURE__ */ new Map(), this._ruleFormulaMap2.set(a, r));
     let i = t.get(e);
     i || (i = /* @__PURE__ */ new Map(), t.set(e, i));
-    let s = r.get(e);
-    return s || (s = /* @__PURE__ */ new Map(), r.set(e, s)), { ruleFormulaMap: i, ruleFormulaMap2: s };
+    let o = r.get(e);
+    return o || (o = /* @__PURE__ */ new Map(), r.set(e, o)), { ruleFormulaMap: i, ruleFormulaMap2: o };
   }
   _registerFormula(a, e, t, r, i) {
     return this._registerOtherFormulaService.registerFormulaWithRange(a, e, r, i, { ruleId: t });
   }
   deleteByRuleId(a, e, t) {
-    const { ruleFormulaMap: r, ruleFormulaMap2: i } = this._ensureMaps(a, e), s = this._dataValidationModel.getRuleById(a, e, t), n = r.get(t);
-    if (!s || !n)
+    const { ruleFormulaMap: r, ruleFormulaMap2: i } = this._ensureMaps(a, e), o = this._dataValidationModel.getRuleById(a, e, t), n = r.get(t);
+    if (!o || !n)
       return;
     const l = r.get(t);
     l && (r.delete(t), this._registerOtherFormulaService.deleteFormula(a, e, [l.formulaId]));
     const u = i.get(t);
     u && (i.delete(t), this._registerOtherFormulaService.deleteFormula(a, e, [u.formulaId]));
   }
-  _addFormulaByRange(a, e, t, r, i, s) {
-    const { ruleFormulaMap: n, ruleFormulaMap2: l } = this._ensureMaps(a, e), u = s[0].startRow, d = s[0].startColumn;
-    if (r && S(r)) {
-      const c = this._registerFormula(a, e, t, r, s);
+  _addFormulaByRange(a, e, t, r, i, o) {
+    const { ruleFormulaMap: n, ruleFormulaMap2: l } = this._ensureMaps(a, e), u = o[0].startRow, d = o[0].startColumn;
+    if (r && v(r)) {
+      const c = this._registerFormula(a, e, t, r, o);
       n.set(t, {
         formula: r,
         originCol: d,
@@ -161,8 +161,8 @@ let P = class extends $ {
         formulaId: c
       });
     }
-    if (i && S(i)) {
-      const c = this._registerFormula(a, e, t, i, s);
+    if (i && v(i)) {
+      const c = this._registerFormula(a, e, t, i, o);
       l.set(t, {
         formula: i,
         originCol: d,
@@ -173,41 +173,41 @@ let P = class extends $ {
   }
   addRule(a, e, t) {
     if (de(t.type, this._validatorRegistryService)) {
-      const { ranges: r, formula1: i, formula2: s, uid: n } = t;
-      this._addFormulaByRange(a, e, n, i, s, r);
+      const { ranges: r, formula1: i, formula2: o, uid: n } = t;
+      this._addFormulaByRange(a, e, n, i, o, r);
     }
   }
   async getCellFormulaValue(a, e, t, r, i) {
-    var p, _;
-    const { ruleFormulaMap: s } = this._ensureMaps(a, e), n = s.get(t);
+    var _, g;
+    const { ruleFormulaMap: o } = this._ensureMaps(a, e), n = o.get(t);
     if (!n)
       return Promise.resolve(void 0);
     const l = await this._registerOtherFormulaService.getFormulaValue(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, m = i - d;
-    return _e((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
+    return ge((g = (_ = l == null ? void 0 : l.result) == null ? void 0 : _[c]) == null ? void 0 : g[m]);
   }
   async getCellFormula2Value(a, e, t, r, i) {
-    var p, _;
-    const { ruleFormulaMap2: s } = this._ensureMaps(a, e), n = s.get(t);
+    var _, g;
+    const { ruleFormulaMap2: o } = this._ensureMaps(a, e), n = o.get(t);
     if (!n)
       return Promise.resolve(void 0);
     const l = await this._registerOtherFormulaService.getFormulaValue(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, m = i - d;
-    return _e((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
+    return ge((g = (_ = l == null ? void 0 : l.result) == null ? void 0 : _[c]) == null ? void 0 : g[m]);
   }
   getCellFormulaValueSync(a, e, t, r, i) {
-    var p, _;
-    const { ruleFormulaMap: s } = this._ensureMaps(a, e), n = s.get(t);
+    var _, g;
+    const { ruleFormulaMap: o } = this._ensureMaps(a, e), n = o.get(t);
     if (!n)
       return;
     const l = this._registerOtherFormulaService.getFormulaValueSync(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, m = i - d;
-    return _e((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
+    return ge((g = (_ = l == null ? void 0 : l.result) == null ? void 0 : _[c]) == null ? void 0 : g[m]);
   }
   getCellFormula2ValueSync(a, e, t, r, i) {
-    var p, _;
-    const { ruleFormulaMap2: s } = this._ensureMaps(a, e), n = s.get(t);
+    var _, g;
+    const { ruleFormulaMap2: o } = this._ensureMaps(a, e), n = o.get(t);
     if (!n)
       return;
     const l = this._registerOtherFormulaService.getFormulaValueSync(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, m = i - d;
-    return _e((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
+    return ge((g = (_ = l == null ? void 0 : l.result) == null ? void 0 : _[c]) == null ? void 0 : g[m]);
   }
   getRuleFormulaInfo(a, e, t) {
     const { ruleFormulaMap: r } = this._ensureMaps(a, e);
@@ -216,20 +216,20 @@ let P = class extends $ {
 };
 P = Jt([
   re(0, O),
-  re(1, R(lt)),
-  re(2, R(ke)),
-  re(3, R(q)),
-  re(4, R(G))
+  re(1, S(lt)),
+  re(2, S(ke)),
+  re(3, S(q)),
+  re(4, S(G))
 ], P);
-var ea = Object.defineProperty, ta = Object.getOwnPropertyDescriptor, aa = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? ta(a, e) : a, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+var ea = Object.defineProperty, ta = Object.getOwnPropertyDescriptor, aa = (s, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? ta(a, e) : a, i = s.length - 1, o; i >= 0; i--)
+    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
   return t && r && ea(a, e, r), r;
-}, ie = (o, a) => (e, t) => a(e, t, o);
+}, ie = (s, a) => (e, t) => a(e, t, s);
 let X = class extends $ {
   constructor(a, e, t, r, i) {
     super();
-    g(this, "_formulaRuleMap", /* @__PURE__ */ new Map());
+    f(this, "_formulaRuleMap", /* @__PURE__ */ new Map());
     this._instanceService = a, this._registerOtherFormulaService = e, this._dataValidationCacheService = t, this._dataValidationModel = r, this._validatorRegistryService = i, this._initFormulaResultHandler();
   }
   _initFormulaResultHandler() {
@@ -238,8 +238,8 @@ let X = class extends $ {
         const t = a[e];
         if (this._instanceService.getUnitType(e) === N.UNIVER_SHEET)
           for (const i in t) {
-            const s = t[i], n = this._ensureRuleFormulaMap(e, i);
-            s.forEach((l) => {
+            const o = t[i], n = this._ensureRuleFormulaMap(e, i);
+            o.forEach((l) => {
               var u, d;
               if (n.get((u = l.extra) == null ? void 0 : u.ruleId)) {
                 const c = this._dataValidationModel.getRuleById(e, i, (d = l.extra) == null ? void 0 : d.ruleId);
@@ -262,44 +262,44 @@ let X = class extends $ {
   }
   addRule(a, e, t) {
     if (!de(t.type, this._validatorRegistryService) && t.type !== T.CHECKBOX) {
-      const { formula1: r, formula2: i, uid: s } = t, n = S(r), l = S(i);
+      const { formula1: r, formula2: i, uid: o } = t, n = v(r), l = v(i);
       if (!n && !l)
         return;
       const u = this._ensureRuleFormulaMap(a, e), d = [void 0, void 0];
       if (n) {
-        const c = this._registerSingleFormula(a, e, r, s);
+        const c = this._registerSingleFormula(a, e, r, o);
         d[0] = { id: c, text: r };
       }
       if (l) {
-        const c = this._registerSingleFormula(a, e, i, s);
+        const c = this._registerSingleFormula(a, e, i, o);
         d[1] = { id: c, text: i };
       }
-      u.set(s, d);
+      u.set(o, d);
     }
   }
   removeRule(a, e, t) {
     const i = this._ensureRuleFormulaMap(a, e).get(t);
     if (!i)
       return;
-    const [s, n] = i, l = [s == null ? void 0 : s.id, n == null ? void 0 : n.id].filter(Boolean);
+    const [o, n] = i, l = [o == null ? void 0 : o.id, n == null ? void 0 : n.id].filter(Boolean);
     l.length && this._registerOtherFormulaService.deleteFormula(a, e, l);
   }
   getRuleFormulaResult(a, e, t) {
     const i = this._ensureRuleFormulaMap(a, e).get(t);
     if (!i)
       return Promise.resolve(null);
-    const s = async (n) => n && this._registerOtherFormulaService.getFormulaValue(a, e, n.id);
+    const o = async (n) => n && this._registerOtherFormulaService.getFormulaValue(a, e, n.id);
     return Promise.all([
-      s(i[0]),
-      s(i[1])
+      o(i[0]),
+      o(i[1])
     ]);
   }
   getRuleFormulaResultSync(a, e, t) {
     const i = this._ensureRuleFormulaMap(a, e).get(t);
     if (i)
-      return i.map((s) => {
-        if (s)
-          return this._registerOtherFormulaService.getFormulaValueSync(a, e, s.id);
+      return i.map((o) => {
+        if (o)
+          return this._registerOtherFormulaService.getFormulaValueSync(a, e, o.id);
       });
   }
   getRuleFormulaInfo(a, e, t) {
@@ -308,24 +308,24 @@ let X = class extends $ {
 };
 X = aa([
   ie(0, O),
-  ie(1, R(lt)),
-  ie(2, R(q)),
-  ie(3, R(ke)),
-  ie(4, R(G))
+  ie(1, S(lt)),
+  ie(2, S(q)),
+  ie(3, S(ke)),
+  ie(4, S(G))
 ], X);
-function ne(o) {
-  return St(o);
+function ne(s) {
+  return vt(s);
 }
-function ct(o) {
+function ct(s) {
   var a;
-  return String((a = ne(o)) != null ? a : "");
+  return String((a = ne(s)) != null ? a : "");
 }
 class Xe {
   constructor(a, e, t, r, i = !1) {
-    g(this, "_map");
-    g(this, "_tree", new Vt());
-    g(this, "_dirty", !0);
-    g(this, "_buildTree", () => {
+    f(this, "_map");
+    f(this, "_tree", new Vt());
+    f(this, "_dirty", !0);
+    f(this, "_buildTree", () => {
       if (!this._dirty || this._disableTree)
         return;
       this._tree.clear();
@@ -342,7 +342,7 @@ class Xe {
         });
       }), this._tree.load(a), this._dirty = !1;
     });
-    g(this, "_debonceBuildTree", Mt(this._buildTree, 0));
+    f(this, "_debonceBuildTree", Mt(this._buildTree, 0));
     this._unitId = e, this._subUnitId = t, this._univerInstanceService = r, this._disableTree = i, this._map = a, this._buildTree();
   }
   get _worksheet() {
@@ -354,8 +354,8 @@ class Xe {
       return;
     const t = I.mergeRanges(e.map((r) => b.transformRange(r, this._worksheet)));
     this._map.forEach((r, i) => {
-      const s = I.subtractMulti(r, t);
-      s.length === 0 ? this._map.delete(i) : this._map.set(i, s);
+      const o = I.subtractMulti(r, t);
+      o.length === 0 ? this._map.delete(i) : this._map.set(i, o);
     }), this._dirty = !0, this._map.set(a, t), this._debonceBuildTree();
   }
   addRule(a) {
@@ -384,11 +384,11 @@ class Xe {
       if (!t.length)
         return;
       let r = this._map.get(e);
-      r ? (this._map.set(e, I.mergeRanges([...r, ...t])), r = this._map.get(e)) : (r = t, this._map.set(e, r)), this._map.forEach((i, s) => {
-        if (s === e)
+      r ? (this._map.set(e, I.mergeRanges([...r, ...t])), r = this._map.get(e)) : (r = t, this._map.set(e, r)), this._map.forEach((i, o) => {
+        if (o === e)
           return;
         const n = I.subtractMulti(i, t);
-        n.length === 0 ? this._map.delete(s) : this._map.set(s, n);
+        n.length === 0 ? this._map.delete(o) : this._map.set(o, n);
       });
     }), this._dirty = !0, this._debonceBuildTree();
   }
@@ -397,14 +397,14 @@ class Xe {
     let t = 0;
     return a.forEach((r, i) => {
       var l;
-      const s = (l = this._map.get(r.uid)) != null ? l : [], n = r.ranges;
-      s.length !== 0 && (s.length !== n.length || s.some((u, d) => !I.equals(u, n[d]))) && e.push({
+      const o = (l = this._map.get(r.uid)) != null ? l : [], n = r.ranges;
+      o.length !== 0 && (o.length !== n.length || o.some((u, d) => !I.equals(u, n[d]))) && e.push({
         type: "update",
         ruleId: r.uid,
         oldRanges: n,
-        newRanges: I.sort(s),
+        newRanges: I.sort(o),
         rule: r
-      }), s.length === 0 && (e.push({
+      }), o.length === 0 && (e.push({
         type: "delete",
         rule: r,
         index: i - t
@@ -414,7 +414,7 @@ class Xe {
   diffWithAddition(a, e) {
     const t = [];
     let r = 0;
-    return a.forEach((i, s) => {
+    return a.forEach((i, o) => {
       var u;
       const n = (u = this._map.get(i.uid)) != null ? u : [], l = i.ranges;
       n.length !== 0 && (n.length !== l.length || n.some((d, c) => !I.equals(d, l[c]))) && t.push({
@@ -426,16 +426,16 @@ class Xe {
       }), n.length === 0 && (t.push({
         type: "delete",
         rule: i,
-        index: s - r
+        index: o - r
       }), r++);
     }), Array.from(e).forEach((i) => {
       var n;
-      const s = (n = this._map.get(i.uid)) != null ? n : [];
+      const o = (n = this._map.get(i.uid)) != null ? n : [];
       t.push({
         type: "add",
         rule: {
           ...i,
-          ranges: I.sort(s)
+          ranges: I.sort(o)
         }
       });
     }), t;
@@ -461,20 +461,20 @@ class Xe {
     return t.length > 0 ? t[0].ruleId : void 0;
   }
 }
-var ra = Object.defineProperty, ia = Object.getOwnPropertyDescriptor, oa = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? ia(a, e) : a, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+var ra = Object.defineProperty, ia = Object.getOwnPropertyDescriptor, sa = (s, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? ia(a, e) : a, i = s.length - 1, o; i >= 0; i--)
+    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
   return t && r && ra(a, e, r), r;
-}, Y = (o, a) => (e, t) => a(e, t, o);
+}, Y = (s, a) => (e, t) => a(e, t, s);
 let F = class extends $ {
-  constructor(a, e, t, r, i, s, n) {
+  constructor(a, e, t, r, i, o, n) {
     super();
-    g(this, "_ruleMatrixMap", /* @__PURE__ */ new Map());
-    g(this, "_validStatusChange$", new Qe());
-    g(this, "_ruleChange$", new Qe());
-    g(this, "ruleChange$", this._ruleChange$.asObservable());
-    g(this, "validStatusChange$", this._validStatusChange$.asObservable());
-    this._dataValidationModel = a, this._univerInstanceService = e, this._dataValidatorRegistryService = t, this._dataValidationCacheService = r, this._dataValidationFormulaService = i, this._dataValidationCustomFormulaService = s, this._commandService = n, this._initRuleUpdateListener(), this.disposeWithMe(() => {
+    f(this, "_ruleMatrixMap", /* @__PURE__ */ new Map());
+    f(this, "_validStatusChange$", new Qe());
+    f(this, "_ruleChange$", new Qe());
+    f(this, "ruleChange$", this._ruleChange$.asObservable());
+    f(this, "validStatusChange$", this._validStatusChange$.asObservable());
+    this._dataValidationModel = a, this._univerInstanceService = e, this._dataValidatorRegistryService = t, this._dataValidationCacheService = r, this._dataValidationFormulaService = i, this._dataValidationCustomFormulaService = o, this._commandService = n, this._initRuleUpdateListener(), this.disposeWithMe(() => {
       this._ruleChange$.complete(), this._validStatusChange$.complete();
     }), this._initUniverInstanceListener();
   }
@@ -496,12 +496,12 @@ let F = class extends $ {
     const a = this._dataValidationModel.getAll();
     for (const [e, t] of a)
       for (const [r, i] of t)
-        for (const s of i)
-          this._addRule(e, r, s), this._ruleChange$.next({
+        for (const o of i)
+          this._addRule(e, r, o), this._ruleChange$.next({
             type: "add",
             unitId: e,
             subUnitId: r,
-            rule: s,
+            rule: o,
             source: "patched"
           });
     this.disposeWithMe(
@@ -536,11 +536,11 @@ let F = class extends $ {
     });
   }
   _updateRule(a, e, t, r, i) {
-    const s = this._ensureRuleMatrix(a, e), n = {
+    const o = this._ensureRuleMatrix(a, e), n = {
       ...r,
       ...i.payload
     };
-    i.type === y.RANGE ? s.updateRange(t, i.payload) : i.type === y.ALL && s.updateRange(t, i.payload.ranges), this._dataValidationCacheService.removeRule(a, e, r), this._dataValidationCacheService.addRule(a, e, n), this._dataValidationFormulaService.removeRule(a, e, r.uid), this._dataValidationFormulaService.addRule(a, e, n), this._dataValidationCustomFormulaService.deleteByRuleId(a, e, t), this._dataValidationCustomFormulaService.addRule(a, e, n);
+    i.type === y.RANGE ? o.updateRange(t, i.payload) : i.type === y.ALL && o.updateRange(t, i.payload.ranges), this._dataValidationCacheService.removeRule(a, e, r), this._dataValidationCacheService.addRule(a, e, n), this._dataValidationFormulaService.removeRule(a, e, r.uid), this._dataValidationFormulaService.addRule(a, e, n), this._dataValidationCustomFormulaService.deleteByRuleId(a, e, t), this._dataValidationCustomFormulaService.addRule(a, e, n);
   }
   _removeRule(a, e, t) {
     this._ensureRuleMatrix(a, e).removeRule(t), this._dataValidationCacheService.removeRule(a, e, t), this._dataValidationCustomFormulaService.deleteByRuleId(a, e, t.uid);
@@ -557,22 +557,22 @@ let F = class extends $ {
       return this._dataValidationModel.getRuleById(a, e, i);
   }
   validator(a, e, t) {
-    const { col: r, row: i, unitId: s, subUnitId: n, worksheet: l } = e, u = (_, v) => {
-      t && t(_, v), v && this._validStatusChange$.next({
-        unitId: s,
+    const { col: r, row: i, unitId: o, subUnitId: n, worksheet: l } = e, u = (g, R) => {
+      t && t(g, R), R && this._validStatusChange$.next({
+        unitId: o,
         subUnitId: n,
         ruleId: a.uid,
-        status: _,
+        status: g,
         row: i,
         col: r
       });
-    }, d = l.getCellValueOnly(i, r), c = this.getValidator(a.type), m = l.getCellRaw(i, r), p = ne(m);
+    }, d = l.getCellValueOnly(i, r), c = this.getValidator(a.type), m = l.getCellRaw(i, r), _ = ne(m);
     if (c) {
-      const _ = this._dataValidationCacheService.ensureCache(s, n), v = _.getValue(i, r);
-      return v == null ? (_.setValue(i, r, D.VALIDATING), c.validator(
+      const g = this._dataValidationCacheService.ensureCache(o, n), R = g.getValue(i, r);
+      return R == null ? (g.setValue(i, r, D.VALIDATING), c.validator(
         {
-          value: p,
-          unitId: s,
+          value: _,
+          unitId: o,
           subUnitId: n,
           row: i,
           column: r,
@@ -583,11 +583,11 @@ let F = class extends $ {
         },
         a
       ).then((M) => {
-        const f = M ? D.VALID : D.INVALID;
-        f === D.VALID ? _.realDeleteValue(i, r) : _.setValue(i, r, f);
-        const w = _.getValue(i, r);
-        u(f, v !== w);
-      }), D.VALIDATING) : (u(v != null ? v : D.VALID, !1), v != null ? v : D.VALID);
+        const p = M ? D.VALID : D.INVALID;
+        p === D.VALID ? g.realDeleteValue(i, r) : g.setValue(i, r, p);
+        const w = g.getValue(i, r);
+        u(p, R !== w);
+      }), D.VALIDATING) : (u(R != null ? R : D.VALID, !1), R != null ? R : D.VALID);
     } else
       return u(D.VALID, !1), D.VALID;
   }
@@ -616,37 +616,37 @@ let F = class extends $ {
     return this._dataValidationModel.getAll();
   }
 };
-F = oa([
-  Y(0, R(ke)),
+F = sa([
+  Y(0, S(ke)),
   Y(1, O),
-  Y(2, R(G)),
-  Y(3, R(q)),
-  Y(4, R(X)),
-  Y(5, R(P)),
+  Y(2, S(G)),
+  Y(3, S(q)),
+  Y(4, S(X)),
+  Y(5, S(P)),
   Y(6, x)
 ], F);
 const Ve = 1, Me = 0;
-function et(o, a) {
-  return V.isBlank(o) ? a.t("dataValidation.validFail.value") : S(o) ? a.t("dataValidation.validFail.primitive") : "";
+function et(s, a) {
+  return V.isBlank(s) ? a.t("dataValidation.validFail.value") : v(s) ? a.t("dataValidation.validFail.primitive") : "";
 }
-const pe = (o) => V.isDefine(o) && String(o).toLowerCase() === "true" ? "1" : String(o).toLowerCase() === "false" ? "0" : o;
-class sa extends k {
+const _e = (s) => V.isDefine(s) && String(s).toLowerCase() === "true" ? "1" : String(s).toLowerCase() === "false" ? "0" : s;
+class oa extends k {
   constructor() {
     super(...arguments);
-    g(this, "id", T.CHECKBOX);
-    g(this, "title", "dataValidation.checkbox.title");
-    g(this, "operators", []);
-    g(this, "scopes", ["sheet"]);
-    g(this, "offsetFormulaByRange", !1);
-    g(this, "_formulaService", this.injector.get(X));
-    g(this, "skipDefaultFontRender", (e, t, r) => {
-      const { unitId: i, subUnitId: s } = r, { formula1: n, formula2: l } = this.parseFormulaSync(e, i, s), u = `${t != null ? t : ""}`;
+    f(this, "id", T.CHECKBOX);
+    f(this, "title", "dataValidation.checkbox.title");
+    f(this, "operators", []);
+    f(this, "scopes", ["sheet"]);
+    f(this, "offsetFormulaByRange", !1);
+    f(this, "_formulaService", this.injector.get(X));
+    f(this, "skipDefaultFontRender", (e, t, r) => {
+      const { unitId: i, subUnitId: o } = r, { formula1: n, formula2: l } = this.parseFormulaSync(e, i, o), u = `${t != null ? t : ""}`;
       return !u || u === `${n}` || u === `${l}`;
     });
   }
   validatorFormula(e, t, r) {
-    const { formula1: i, formula2: s } = e, n = i === s;
-    if (V.isBlank(i) && V.isBlank(s))
+    const { formula1: i, formula2: o } = e, n = i === o;
+    if (V.isBlank(i) && V.isBlank(o))
       return {
         success: !0
       };
@@ -656,7 +656,7 @@ class sa extends k {
         formula1: this.localeService.t("dataValidation.validFail.checkboxEqual"),
         formula2: this.localeService.t("dataValidation.validFail.checkboxEqual")
       };
-    const l = et(i, this.localeService), u = et(s, this.localeService);
+    const l = et(i, this.localeService), u = et(o, this.localeService);
     return {
       success: !l && !u,
       formula1: l,
@@ -664,11 +664,11 @@ class sa extends k {
     };
   }
   async parseFormula(e, t, r) {
-    var c, m, p, _;
-    const { formula1: i = Ve, formula2: s = Me } = e, n = await this._formulaService.getRuleFormulaResult(t, r, e.uid), l = S(i) ? oe((m = (c = n == null ? void 0 : n[0]) == null ? void 0 : c.result) == null ? void 0 : m[0][0]) : i, u = S(s) ? oe((_ = (p = n == null ? void 0 : n[1]) == null ? void 0 : p.result) == null ? void 0 : _[0][0]) : s, d = C(String(l)) && C(String(u));
+    var c, m, _, g;
+    const { formula1: i = Ve, formula2: o = Me } = e, n = await this._formulaService.getRuleFormulaResult(t, r, e.uid), l = v(i) ? se((m = (c = n == null ? void 0 : n[0]) == null ? void 0 : c.result) == null ? void 0 : m[0][0]) : i, u = v(o) ? se((g = (_ = n == null ? void 0 : n[1]) == null ? void 0 : _.result) == null ? void 0 : g[0][0]) : o, d = C(String(l)) && C(String(u));
     return {
-      formula1: pe(l),
-      formula2: pe(u),
+      formula1: _e(l),
+      formula2: _e(u),
       originFormula1: l,
       originFormula2: u,
       isFormulaValid: d
@@ -676,22 +676,22 @@ class sa extends k {
   }
   getExtraStyle(e, t) {
     return {
-      tb: Re.CLIP
+      tb: Se.CLIP
     };
   }
   parseFormulaSync(e, t, r) {
-    var c, m, p, _;
-    const { formula1: i = Ve, formula2: s = Me } = e, n = this._formulaService.getRuleFormulaResultSync(t, r, e.uid), l = S(i) ? oe((m = (c = n == null ? void 0 : n[0]) == null ? void 0 : c.result) == null ? void 0 : m[0][0]) : i, u = S(s) ? oe((_ = (p = n == null ? void 0 : n[1]) == null ? void 0 : p.result) == null ? void 0 : _[0][0]) : s, d = C(String(l)) && C(String(u));
+    var c, m, _, g;
+    const { formula1: i = Ve, formula2: o = Me } = e, n = this._formulaService.getRuleFormulaResultSync(t, r, e.uid), l = v(i) ? se((m = (c = n == null ? void 0 : n[0]) == null ? void 0 : c.result) == null ? void 0 : m[0][0]) : i, u = v(o) ? se((g = (_ = n == null ? void 0 : n[1]) == null ? void 0 : _.result) == null ? void 0 : g[0][0]) : o, d = C(String(l)) && C(String(u));
     return {
-      formula1: pe(l),
-      formula2: pe(u),
+      formula1: _e(l),
+      formula2: _e(u),
       originFormula1: l,
       originFormula2: u,
       isFormulaValid: d
     };
   }
   async isValidType(e, t, r) {
-    const { value: i, unitId: s, subUnitId: n } = e, { formula1: l, formula2: u, originFormula1: d, originFormula2: c } = await this.parseFormula(r, s, n);
+    const { value: i, unitId: o, subUnitId: n } = e, { formula1: l, formula2: u, originFormula1: d, originFormula2: c } = await this.parseFormula(r, o, n);
     return !V.isDefine(l) || !V.isDefine(u) ? !0 : V.isDefine(i) && (String(i) === String(l) || String(i) === String(u) || String(i) === String(d != null ? d : "") || String(i) === String(c != null ? c : ""));
   }
   generateRuleErrorMessage(e) {
@@ -731,38 +731,38 @@ const la = {
   h.BETWEEN,
   h.NOT_BETWEEN
 ], le = "{FORMULA1}", ue = "{FORMULA2}";
-function rr(o) {
-  return o.filter(Boolean).join(",");
+function rr(s) {
+  return s.filter(Boolean).join(",");
 }
-function fe(o) {
-  return o.split(",").filter(Boolean);
+function pe(s) {
+  return s.split(",").filter(Boolean);
 }
-function ir(o) {
-  const a = ne(o);
+function ir(s) {
+  const a = ne(s);
   return a == null ? "" : a.toString();
 }
-function De(o, a, e) {
-  const { formula1: t, formula2: r } = a, i = a.ranges[0].startRow, s = a.ranges[0].startColumn, n = e.row - i, l = e.col - s, u = S(t) ? o.moveFormulaRefOffset(t, l, n, !0) : t, d = S(r) ? o.moveFormulaRefOffset(r, l, n, !0) : r;
+function De(s, a, e) {
+  const { formula1: t, formula2: r } = a, i = a.ranges[0].startRow, o = a.ranges[0].startColumn, n = e.row - i, l = e.col - o, u = v(t) ? s.moveFormulaRefOffset(t, l, n, !0) : t, d = v(r) ? s.moveFormulaRefOffset(r, l, n, !0) : r;
   return {
     transformedFormula1: u,
     transformedFormula2: d
   };
 }
-const Ue = (o) => {
+const Ue = (s) => {
   var e, t;
-  if (o == null || typeof o == "boolean")
+  if (s == null || typeof s == "boolean")
     return;
-  if (typeof o == "number" || !Number.isNaN(+o))
-    return +o;
-  const a = (e = Q.parseDate(o)) == null ? void 0 : e.v;
-  return V.isDefine(a) ? a : (t = Q.parseDate(at(o).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : t.v;
+  if (typeof s == "number" || !Number.isNaN(+s))
+    return +s;
+  const a = (e = Q.parseDate(s)) == null ? void 0 : e.v;
+  return V.isDefine(a) ? a : (t = Q.parseDate(at(s).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : t.v;
 };
 class da extends k {
   constructor() {
     super(...arguments);
-    g(this, "id", T.DATE);
-    g(this, "title", "dataValidation.date.title");
-    g(this, "operators", [
+    f(this, "id", T.DATE);
+    f(this, "title", "dataValidation.date.title");
+    f(this, "operators", [
       h.BETWEEN,
       h.EQUAL,
       h.GREATER_THAN,
@@ -772,15 +772,15 @@ class da extends k {
       h.NOT_BETWEEN,
       h.NOT_EQUAL
     ]);
-    g(this, "scopes", ["sheet"]);
-    g(this, "_customFormulaService", this.injector.get(P));
-    g(this, "_lexerTreeBuilder", this.injector.get(Z));
+    f(this, "scopes", ["sheet"]);
+    f(this, "_customFormulaService", this.injector.get(P));
+    f(this, "_lexerTreeBuilder", this.injector.get(Z));
   }
-  async parseFormula(e, t, r, i, s) {
-    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, s), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, s), { formula1: u, formula2: d } = e, c = C(String(n == null ? void 0 : n.v)) && C(String(l == null ? void 0 : l.v));
+  async parseFormula(e, t, r, i, o) {
+    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, o), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, o), { formula1: u, formula2: d } = e, c = C(String(n == null ? void 0 : n.v)) && C(String(l == null ? void 0 : l.v));
     return {
-      formula1: Ue(S(u) ? n == null ? void 0 : n.v : u),
-      formula2: Ue(S(d) ? l == null ? void 0 : l.v : d),
+      formula1: Ue(v(u) ? n == null ? void 0 : n.v : u),
+      formula2: Ue(v(d) ? l == null ? void 0 : l.v : d),
       isFormulaValid: c
     };
   }
@@ -789,7 +789,7 @@ class da extends k {
     return typeof r == "number" && typeof t == "string" ? !0 : typeof t == "string" ? !!Q.parseDate(t) : !1;
   }
   _validatorSingleFormula(e) {
-    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e) || !!(e && Q.parseDate(e)));
+    return !V.isBlank(e) && (v(e) || !Number.isNaN(+e) || !!(e && Q.parseDate(e)));
   }
   validatorFormula(e, t, r) {
     const i = e.operator;
@@ -797,22 +797,22 @@ class da extends k {
       return {
         success: !1
       };
-    const s = this._validatorSingleFormula(e.formula1), n = this.localeService.t("dataValidation.validFail.date");
+    const o = this._validatorSingleFormula(e.formula1), n = this.localeService.t("dataValidation.validFail.date");
     if (Ae.includes(i)) {
       const u = this._validatorSingleFormula(e.formula2);
       return {
-        success: s && u,
-        formula1: s ? void 0 : n,
+        success: o && u,
+        formula1: o ? void 0 : n,
         formula2: u ? void 0 : n
       };
     }
     return {
-      success: s,
-      formula1: s ? void 0 : n
+      success: o,
+      formula1: o ? void 0 : n
     };
   }
   normalizeFormula(e, t, r) {
-    const { formula1: i, formula2: s, bizInfo: n } = e, l = (u) => {
+    const { formula1: i, formula2: o, bizInfo: n } = e, l = (u) => {
       var c;
       if (!u)
         return u;
@@ -828,8 +828,8 @@ class da extends k {
       return at(`${d[0]}/${d[1]}/${d[2]} ${d[3]}:${d[4]}:${d[5]}`).format(n != null && n.showTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD");
     };
     return {
-      formula1: S(i) ? i : l(`${i}`),
-      formula2: S(s) ? s : l(`${s}`)
+      formula1: v(i) ? i : l(`${i}`),
+      formula2: v(o) ? o : l(`${o}`)
     };
   }
   transform(e, t, r) {
@@ -868,18 +868,18 @@ const ht = {
   [h.NOT_BETWEEN]: "dataValidation.errorMsg.notBetween",
   [h.NOT_EQUAL]: "dataValidation.errorMsg.notEqual"
 };
-function ye(o) {
-  let a = o;
-  return typeof o == "string" ? ((o.startsWith("¥") || o.startsWith("$")) && (a = o.slice(1)), +a) : +o;
+function ye(s) {
+  let a = s;
+  return typeof s == "string" ? ((s.startsWith("¥") || s.startsWith("$")) && (a = s.slice(1)), +a) : +s;
 }
 class ca extends k {
   constructor() {
     super(...arguments);
-    g(this, "_customFormulaService", this.injector.get(P));
-    g(this, "id", T.DECIMAL);
-    g(this, "_lexerTreeBuilder", this.injector.get(Z));
-    g(this, "title", "dataValidation.decimal.title");
-    g(this, "operators", [
+    f(this, "_customFormulaService", this.injector.get(P));
+    f(this, "id", T.DECIMAL);
+    f(this, "_lexerTreeBuilder", this.injector.get(Z));
+    f(this, "title", "dataValidation.decimal.title");
+    f(this, "operators", [
       h.BETWEEN,
       h.EQUAL,
       h.GREATER_THAN,
@@ -889,10 +889,10 @@ class ca extends k {
       h.NOT_BETWEEN,
       h.NOT_EQUAL
     ]);
-    g(this, "scopes", ["sheet"]);
+    f(this, "scopes", ["sheet"]);
   }
   _isFormulaOrNumber(e) {
-    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e));
+    return !V.isBlank(e) && (v(e) || !Number.isNaN(+e));
   }
   async isValidType(e, t, r) {
     const { value: i } = e;
@@ -908,11 +908,11 @@ class ca extends k {
   _parseNumber(e) {
     return e == null ? Number.NaN : +e;
   }
-  async parseFormula(e, t, r, i, s) {
-    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, s), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, s), { formula1: u, formula2: d } = e, c = C(String(n == null ? void 0 : n.v)) && C(String(l == null ? void 0 : l.v));
+  async parseFormula(e, t, r, i, o) {
+    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, o), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, o), { formula1: u, formula2: d } = e, c = C(String(n == null ? void 0 : n.v)) && C(String(l == null ? void 0 : l.v));
     return {
-      formula1: this._parseNumber(S(u) ? n == null ? void 0 : n.v : u),
-      formula2: this._parseNumber(S(d) ? l == null ? void 0 : l.v : d),
+      formula1: this._parseNumber(v(u) ? n == null ? void 0 : n.v : u),
+      formula2: this._parseNumber(v(d) ? l == null ? void 0 : l.v : d),
       isFormulaValid: c
     };
   }
@@ -922,14 +922,14 @@ class ca extends k {
       return {
         success: !1
       };
-    const s = V.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), l = Ae.includes(i), u = this.localeService.t("dataValidation.validFail.number");
+    const o = V.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), l = Ae.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
-      success: s && n,
-      formula1: s ? void 0 : u,
+      success: o && n,
+      formula1: o ? void 0 : u,
       formula2: n ? void 0 : u
     } : {
-      success: s,
-      formula1: s ? "" : u
+      success: o,
+      formula1: o ? "" : u
     };
   }
   generateRuleErrorMessage(e, t) {
@@ -939,17 +939,17 @@ class ca extends k {
     return `${this.localeService.t(ht[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
   }
 }
-function Pe(o) {
-  if (!o)
+function Pe(s) {
+  if (!s)
     return [];
   const a = /* @__PURE__ */ new Set();
-  return o.forEach(
+  return s.forEach(
     (e) => {
       e.forEach((t) => {
-        var i, s;
+        var i, o;
         const r = ne(t);
         if (r != null) {
-          if (typeof r != "string" && typeof (t == null ? void 0 : t.s) == "object" && ((s = (i = t.s) == null ? void 0 : i.n) != null && s.pattern)) {
+          if (typeof r != "string" && typeof (t == null ? void 0 : t.s) == "object" && ((o = (i = t.s) == null ? void 0 : i.n) != null && o.pattern)) {
             a.add(Q.format(t.s.n.pattern, r, { throws: !1 }));
             return;
           }
@@ -965,17 +965,17 @@ const ha = [
   "choose",
   "offset"
 ];
-function ma(o, a) {
-  if (!S(o) || dt(o.slice(1)))
+function ma(s, a) {
+  if (!v(s) || dt(s.slice(1)))
     return !0;
-  const t = a.sequenceNodesBuilder(o);
+  const t = a.sequenceNodesBuilder(s);
   return t && t.some((r) => typeof r == "object" && r.nodeType === Qt.FUNCTION && ha.indexOf(r.token.toLowerCase()) > -1);
 }
-function ga(o, a) {
-  const { formula1: e = "", ranges: t } = o;
+function fa(s, a) {
+  const { formula1: e = "", ranges: t } = s;
   if (dt(e.slice(1))) {
     const i = qt(e.slice(1));
-    if ((!i.sheetName || i.sheetName === a) && t.some((s) => I.intersects(s, i.range)))
+    if ((!i.sheetName || i.sheetName === a) && t.some((o) => I.intersects(o, i.range)))
       return !0;
   }
   return !1;
@@ -983,27 +983,27 @@ function ga(o, a) {
 class mt extends k {
   constructor() {
     super(...arguments);
-    g(this, "formulaService", this.injector.get(X));
-    g(this, "_lexer", this.injector.get(Z));
-    g(this, "_univerInstanceService", this.injector.get(O));
-    g(this, "offsetFormulaByRange", !1);
-    g(this, "id", T.LIST);
-    g(this, "title", "dataValidation.list.title");
-    g(this, "operators", []);
-    g(this, "scopes", ["sheet"]);
-    g(this, "skipDefaultFontRender", (e) => e.renderMode !== Be.TEXT);
+    f(this, "formulaService", this.injector.get(X));
+    f(this, "_lexer", this.injector.get(Z));
+    f(this, "_univerInstanceService", this.injector.get(O));
+    f(this, "offsetFormulaByRange", !1);
+    f(this, "id", T.LIST);
+    f(this, "title", "dataValidation.list.title");
+    f(this, "operators", []);
+    f(this, "scopes", ["sheet"]);
+    f(this, "skipDefaultFontRender", (e) => e.renderMode !== Be.TEXT);
   }
   validatorFormula(e, t, r) {
     var u, d, c;
-    const i = !V.isBlank(e.formula1), s = ma((u = e.formula1) != null ? u : "", this._lexer), n = (c = (d = this._univerInstanceService.getUnit(t, N.UNIVER_SHEET)) == null ? void 0 : d.getSheetBySheetId(r)) == null ? void 0 : c.getName(), l = ga(e, n != null ? n : "");
+    const i = !V.isBlank(e.formula1), o = ma((u = e.formula1) != null ? u : "", this._lexer), n = (c = (d = this._univerInstanceService.getUnit(t, N.UNIVER_SHEET)) == null ? void 0 : d.getSheetBySheetId(r)) == null ? void 0 : c.getName(), l = fa(e, n != null ? n : "");
     return {
-      success: !!(i && s && !l),
-      formula1: i ? s ? l ? this.localeService.t("dataValidation.validFail.listIntersects") : void 0 : this.localeService.t("dataValidation.validFail.listInvalid") : this.localeService.t("dataValidation.validFail.list")
+      success: !!(i && o && !l),
+      formula1: i ? o ? l ? this.localeService.t("dataValidation.validFail.listIntersects") : void 0 : this.localeService.t("dataValidation.validFail.listInvalid") : this.localeService.t("dataValidation.validFail.list")
     };
   }
   getExtraStyle(e, t, { style: r }) {
-    var s;
-    const i = (s = r.tb !== Re.OVERFLOW ? r.tb : Re.CLIP) != null ? s : Re.WRAP;
+    var o;
+    const i = (o = r.tb !== Se.OVERFLOW ? r.tb : Se.CLIP) != null ? o : Se.WRAP;
     if (e.type === T.LIST && (e.renderMode === Be.ARROW || e.renderMode === Be.TEXT)) {
       const n = this.getListWithColorMap(e), l = `${t != null ? t : ""}`, u = n[l];
       if (u)
@@ -1020,21 +1020,21 @@ class mt extends k {
   }
   parseCellValue(e) {
     const t = e.toString();
-    return fe(t);
+    return pe(t);
   }
   async parseFormula(e, t, r) {
     var l, u;
-    const i = await this.formulaService.getRuleFormulaResult(t, r, e.uid), s = oe((u = (l = i == null ? void 0 : i[0]) == null ? void 0 : l.result) == null ? void 0 : u[0][0]);
+    const i = await this.formulaService.getRuleFormulaResult(t, r, e.uid), o = se((u = (l = i == null ? void 0 : i[0]) == null ? void 0 : l.result) == null ? void 0 : u[0][0]);
     return {
       formula1: void 0,
       formula2: void 0,
-      isFormulaValid: C(String(s))
+      isFormulaValid: C(String(o))
     };
   }
   async isValidType(e, t, r) {
-    var m, p;
-    const { value: i, unitId: s, subUnitId: n } = e, { formula1: l = "" } = r, u = await this.formulaService.getRuleFormulaResult(s, n, r.uid), d = S(l) ? Pe((p = (m = u == null ? void 0 : u[0]) == null ? void 0 : m.result) == null ? void 0 : p[0][0]) : fe(l);
-    return this.parseCellValue(i).every((_) => d.includes(_));
+    var m, _;
+    const { value: i, unitId: o, subUnitId: n } = e, { formula1: l = "" } = r, u = await this.formulaService.getRuleFormulaResult(o, n, r.uid), d = v(l) ? Pe((_ = (m = u == null ? void 0 : u[0]) == null ? void 0 : m.result) == null ? void 0 : _[0][0]) : pe(l);
+    return this.parseCellValue(i).every((g) => d.includes(g));
   }
   generateRuleName() {
     return this.localeService.t("dataValidation.list.name");
@@ -1043,41 +1043,41 @@ class mt extends k {
     return this.localeService.t("dataValidation.list.error");
   }
   getList(e, t, r) {
-    var m, p, _, v;
-    const { formula1: i = "" } = e, s = this.injector.get(O), n = (m = t ? s.getUniverSheetInstance(t) : void 0) != null ? m : s.getCurrentUnitForType(N.UNIVER_SHEET);
+    var m, _, g, R;
+    const { formula1: i = "" } = e, o = this.injector.get(O), n = (m = t ? o.getUniverSheetInstance(t) : void 0) != null ? m : o.getCurrentUnitForType(N.UNIVER_SHEET);
     if (!n) return [];
-    const l = (p = r ? n.getSheetBySheetId(r) : void 0) != null ? p : n.getActiveSheet();
+    const l = (_ = r ? n.getSheetBySheetId(r) : void 0) != null ? _ : n.getActiveSheet();
     if (!l) return [];
     const u = n.getUnitId(), d = l.getSheetId(), c = this.formulaService.getRuleFormulaResultSync(u, d, e.uid);
-    return S(i) ? Pe((v = (_ = c == null ? void 0 : c[0]) == null ? void 0 : _.result) == null ? void 0 : v[0][0]) : fe(i);
+    return v(i) ? Pe((R = (g = c == null ? void 0 : c[0]) == null ? void 0 : g.result) == null ? void 0 : R[0][0]) : pe(i);
   }
   async getListAsync(e, t, r) {
-    var m, p, _, v;
-    const { formula1: i = "" } = e, s = this.injector.get(O), n = (m = t ? s.getUniverSheetInstance(t) : void 0) != null ? m : s.getCurrentUnitForType(N.UNIVER_SHEET);
+    var m, _, g, R;
+    const { formula1: i = "" } = e, o = this.injector.get(O), n = (m = t ? o.getUniverSheetInstance(t) : void 0) != null ? m : o.getCurrentUnitForType(N.UNIVER_SHEET);
     if (!n) return [];
-    const l = (p = r ? n.getSheetBySheetId(r) : void 0) != null ? p : n.getActiveSheet();
+    const l = (_ = r ? n.getSheetBySheetId(r) : void 0) != null ? _ : n.getActiveSheet();
     if (!l) return [];
     const u = n.getUnitId(), d = l.getSheetId(), c = await this.formulaService.getRuleFormulaResult(u, d, e.uid);
-    return S(i) ? Pe((v = (_ = c == null ? void 0 : c[0]) == null ? void 0 : _.result) == null ? void 0 : v[0][0]) : fe(i);
+    return v(i) ? Pe((R = (g = c == null ? void 0 : c[0]) == null ? void 0 : g.result) == null ? void 0 : R[0][0]) : pe(i);
   }
   getListWithColor(e, t, r) {
-    const i = this.getList(e, t, r), s = (e.formula2 || "").split(",");
-    return i.map((n, l) => ({ label: n, color: s[l] }));
+    const i = this.getList(e, t, r), o = (e.formula2 || "").split(",");
+    return i.map((n, l) => ({ label: n, color: o[l] }));
   }
   getListWithColorMap(e, t, r) {
-    const i = this.getListWithColor(e, t, r), s = {};
+    const i = this.getListWithColor(e, t, r), o = {};
     return i.forEach((n) => {
-      n.color && (s[n.label] = n.color);
-    }), s;
+      n.color && (o[n.label] = n.color);
+    }), o;
   }
 }
-class _a extends k {
+class ga extends k {
   constructor() {
     super(...arguments);
-    g(this, "id", T.TEXT_LENGTH);
-    g(this, "title", "dataValidation.textLength.title");
-    g(this, "_lexerTreeBuilder", this.injector.get(Z));
-    g(this, "operators", [
+    f(this, "id", T.TEXT_LENGTH);
+    f(this, "title", "dataValidation.textLength.title");
+    f(this, "_lexerTreeBuilder", this.injector.get(Z));
+    f(this, "operators", [
       h.BETWEEN,
       h.EQUAL,
       h.GREATER_THAN,
@@ -1087,11 +1087,11 @@ class _a extends k {
       h.NOT_BETWEEN,
       h.NOT_EQUAL
     ]);
-    g(this, "scopes", ["sheet"]);
-    g(this, "_customFormulaService", this.injector.get(P));
+    f(this, "scopes", ["sheet"]);
+    f(this, "_customFormulaService", this.injector.get(P));
   }
   _isFormulaOrInt(e) {
-    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+    return !V.isBlank(e) && (v(e) || !Number.isNaN(+e) && Number.isInteger(+e));
   }
   validatorFormula(e, t, r) {
     const i = e.operator;
@@ -1099,24 +1099,24 @@ class _a extends k {
       return {
         success: !1
       };
-    const s = V.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Ae.includes(i), u = this.localeService.t("dataValidation.validFail.number");
+    const o = V.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Ae.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
-      success: s && n,
-      formula1: s ? void 0 : u,
+      success: o && n,
+      formula1: o ? void 0 : u,
       formula2: n ? void 0 : u
     } : {
-      success: s,
+      success: o,
       formula1: u
     };
   }
   _parseNumber(e) {
     return e == null ? Number.NaN : +e;
   }
-  async parseFormula(e, t, r, i, s) {
-    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, s), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, s), { formula1: u, formula2: d } = e, c = C(String(n == null ? void 0 : n.v)) && C(String(l == null ? void 0 : l.v));
+  async parseFormula(e, t, r, i, o) {
+    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, o), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, o), { formula1: u, formula2: d } = e, c = C(String(n == null ? void 0 : n.v)) && C(String(l == null ? void 0 : l.v));
     return {
-      formula1: this._parseNumber(S(u) ? n == null ? void 0 : n.v : u),
-      formula2: this._parseNumber(S(d) ? l == null ? void 0 : l.v : d),
+      formula1: this._parseNumber(v(u) ? n == null ? void 0 : n.v : u),
+      formula2: this._parseNumber(v(d) ? l == null ? void 0 : l.v : d),
       isFormulaValid: c
     };
   }
@@ -1137,106 +1137,106 @@ class _a extends k {
     return `${this.localeService.t(Dt[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
   }
 }
-function gt(o) {
+function ft(s) {
   var e, t;
-  return o ? o.p ? !((t = (e = o.p.body) == null ? void 0 : e.dataStream) != null ? t : "").slice(0, -2).trim() : V.isBlank(o.v) : !0;
+  return s ? s.p ? !((t = (e = s.p.body) == null ? void 0 : e.dataStream) != null ? t : "").slice(0, -2).trim() : V.isBlank(s.v) : !0;
 }
-function be(o, a, e, t, r = "command", i = !0) {
-  const s = t.get(Z), n = t.get(G), l = [], u = [], d = t.get(F), c = t.get(O), m = Ye(c, { unitId: o, subUnitId: a });
+function be(s, a, e, t, r = "command", i = !0) {
+  const o = t.get(Z), n = t.get(G), l = [], u = [], d = t.get(F), c = t.get(O), m = Ye(c, { unitId: s, subUnitId: a });
   if (!m)
     return {
       redoMutations: l,
       undoMutations: u
     };
-  const { worksheet: p } = m, _ = new Se();
-  let v = !1;
-  function M(f, w) {
-    i && f.forEach((H) => {
+  const { worksheet: _ } = m, g = new ve();
+  let R = !1;
+  function M(p, w) {
+    i && p.forEach((H) => {
       b.foreach(H, (B, W) => {
-        const U = p.getCellRaw(B, W), J = ct(U);
-        (gt(U) || J === w) && !(U != null && U.p) && (v = !0, _.setValue(B, W, {
+        const U = _.getCellRaw(B, W), J = ct(U);
+        (ft(U) || J === w) && !(U != null && U.p) && (R = !0, g.setValue(B, W, {
           v: w,
           p: null
         }));
       });
     });
   }
-  if (e.forEach((f) => {
-    switch (f.type) {
+  if (e.forEach((p) => {
+    switch (p.type) {
       case "delete":
         l.push({
           id: A.id,
           params: {
-            unitId: o,
+            unitId: s,
             subUnitId: a,
-            ruleId: f.rule.uid,
+            ruleId: p.rule.uid,
             source: r
           }
         }), u.unshift({
           id: L.id,
           params: {
-            unitId: o,
+            unitId: s,
             subUnitId: a,
-            rule: f.rule,
-            index: f.index,
+            rule: p.rule,
+            index: p.index,
             source: r
           }
         });
         break;
       case "update": {
-        if (de(f.rule.type, n)) {
-          const H = f.oldRanges[0].startRow, B = f.oldRanges[0].startColumn, W = f.newRanges[0].startRow, U = f.newRanges[0].startColumn, J = W - H, ce = U - B, he = S(f.rule.formula1) ? s.moveFormulaRefOffset(f.rule.formula1, ce, J) : f.rule.formula1, me = S(f.rule.formula2) ? s.moveFormulaRefOffset(f.rule.formula2, ce, J) : f.rule.formula2;
-          he !== f.rule.formula1 || me !== f.rule.formula2 || !rt(f.newRanges, f.oldRanges) ? (l.push({
+        if (de(p.rule.type, n)) {
+          const H = p.oldRanges[0].startRow, B = p.oldRanges[0].startColumn, W = p.newRanges[0].startRow, U = p.newRanges[0].startColumn, J = W - H, ce = U - B, he = v(p.rule.formula1) ? o.moveFormulaRefOffset(p.rule.formula1, ce, J) : p.rule.formula1, me = v(p.rule.formula2) ? o.moveFormulaRefOffset(p.rule.formula2, ce, J) : p.rule.formula2;
+          he !== p.rule.formula1 || me !== p.rule.formula2 || !rt(p.newRanges, p.oldRanges) ? (l.push({
             id: E.id,
             params: {
-              unitId: o,
+              unitId: s,
               subUnitId: a,
-              ruleId: f.ruleId,
+              ruleId: p.ruleId,
               payload: {
                 type: y.ALL,
                 payload: {
                   formula1: he,
                   formula2: me,
-                  ranges: f.newRanges
+                  ranges: p.newRanges
                 }
               }
             }
           }), u.unshift({
             id: E.id,
             params: {
-              unitId: o,
+              unitId: s,
               subUnitId: a,
-              ruleId: f.ruleId,
+              ruleId: p.ruleId,
               payload: {
                 type: y.ALL,
                 payload: {
-                  formula1: f.rule.formula1,
-                  formula2: f.rule.formula2,
-                  ranges: f.oldRanges
+                  formula1: p.rule.formula1,
+                  formula2: p.rule.formula2,
+                  ranges: p.oldRanges
                 }
               }
             }
           })) : (l.push({
             id: E.id,
             params: {
-              unitId: o,
+              unitId: s,
               subUnitId: a,
-              ruleId: f.ruleId,
+              ruleId: p.ruleId,
               payload: {
                 type: y.RANGE,
-                payload: f.newRanges
+                payload: p.newRanges
               },
               source: r
             }
           }), u.unshift({
             id: E.id,
             params: {
-              unitId: o,
+              unitId: s,
               subUnitId: a,
-              ruleId: f.ruleId,
+              ruleId: p.ruleId,
               payload: {
                 type: y.RANGE,
-                payload: f.oldRanges
+                payload: p.oldRanges
               },
               source: r
             }
@@ -1245,32 +1245,32 @@ function be(o, a, e, t, r = "command", i = !0) {
           l.push({
             id: E.id,
             params: {
-              unitId: o,
+              unitId: s,
               subUnitId: a,
-              ruleId: f.ruleId,
+              ruleId: p.ruleId,
               payload: {
                 type: y.RANGE,
-                payload: f.newRanges
+                payload: p.newRanges
               },
               source: r
             }
           }), u.unshift({
             id: E.id,
             params: {
-              unitId: o,
+              unitId: s,
               subUnitId: a,
-              ruleId: f.ruleId,
+              ruleId: p.ruleId,
               payload: {
                 type: y.RANGE,
-                payload: f.oldRanges
+                payload: p.oldRanges
               },
               source: r
             }
           });
-        const w = d.getRuleById(o, a, f.ruleId);
+        const w = d.getRuleById(s, a, p.ruleId);
         if (w && w.type === T.CHECKBOX) {
-          const B = d.getValidator(T.CHECKBOX).parseFormulaSync(w, o, a);
-          M(f.newRanges, B.formula2);
+          const B = d.getValidator(T.CHECKBOX).parseFormulaSync(w, s, a);
+          M(p.newRanges, B.formula2);
         }
         break;
       }
@@ -1278,70 +1278,70 @@ function be(o, a, e, t, r = "command", i = !0) {
         if (l.push({
           id: L.id,
           params: {
-            unitId: o,
+            unitId: s,
             subUnitId: a,
-            rule: f.rule,
+            rule: p.rule,
             source: r
           }
         }), u.unshift({
           id: A.id,
           params: {
-            unitId: o,
+            unitId: s,
             subUnitId: a,
-            ruleId: f.rule.uid,
+            ruleId: p.rule.uid,
             source: r
           }
-        }), f.rule.type === T.CHECKBOX) {
-          const H = d.getValidator(T.CHECKBOX).parseFormulaSync(f.rule, o, a);
-          M(f.rule.ranges, H.originFormula2);
+        }), p.rule.type === T.CHECKBOX) {
+          const H = d.getValidator(T.CHECKBOX).parseFormulaSync(p.rule, s, a);
+          M(p.rule.ranges, H.originFormula2);
         }
         break;
       }
     }
-  }), v) {
-    const f = {
-      id: se.id,
+  }), R) {
+    const p = {
+      id: oe.id,
       params: {
-        unitId: o,
+        unitId: s,
         subUnitId: a,
-        cellValue: _.getData()
+        cellValue: g.getData()
       }
     }, w = {
-      id: se.id,
-      params: ot(t, f.params)
+      id: oe.id,
+      params: st(t, p.params)
     };
-    l.push(f), u.push(w);
+    l.push(p), u.push(w);
   }
   return {
     redoMutations: l,
     undoMutations: u
   };
 }
-const pa = {
+const _a = {
   type: K.COMMAND,
   id: "sheet.command.updateDataValidationRuleRange",
-  handler(o, a) {
+  handler(s, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, ranges: r, ruleId: i } = a, s = o.get(F), n = o.get(x), l = o.get(z);
-    if (!s.getRuleById(e, t, i))
+    const { unitId: e, subUnitId: t, ranges: r, ruleId: i } = a, o = s.get(F), n = s.get(x), l = s.get(z);
+    if (!o.getRuleById(e, t, i))
       return !1;
-    const d = s.getRuleObjectMatrix(e, t).clone();
+    const d = o.getRuleObjectMatrix(e, t).clone();
     d.updateRange(i, r);
-    const c = d.diff(s.getRules(e, t)), { redoMutations: m, undoMutations: p } = be(e, t, c, o);
+    const c = d.diff(o.getRules(e, t)), { redoMutations: m, undoMutations: _ } = be(e, t, c, s);
     return l.pushUndoRedo({
-      undoMutations: p,
+      undoMutations: _,
       redoMutations: m,
       unitID: e
     }), Ie(m, n), !0;
   }
-}, fa = {
+}, pa = {
   type: K.COMMAND,
   id: "sheet.command.addDataValidation",
-  handler(o, a) {
+  handler(s, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, rule: r } = a, i = o.get(F), s = o.get(x), n = o.get(z), l = i.getRuleObjectMatrix(e, t).clone();
+    const { unitId: e, subUnitId: t, rule: r } = a, i = s.get(F), o = s.get(x), n = s.get(z), l = i.getRuleObjectMatrix(e, t).clone();
     l.addRule(r);
     const u = l.diff(i.getRules(e, t)), d = i.getValidator(r.type), c = {
       unitId: e,
@@ -1350,11 +1350,11 @@ const pa = {
         ...r,
         ...d == null ? void 0 : d.normalizeFormula(r, e, t)
       }
-    }, { redoMutations: m, undoMutations: p } = be(e, t, u, o);
+    }, { redoMutations: m, undoMutations: _ } = be(e, t, u, s);
     return m.push({
       id: L.id,
       params: c
-    }), p.unshift({
+    }), _.unshift({
       id: A.id,
       params: {
         unitId: e,
@@ -1364,41 +1364,41 @@ const pa = {
     }), n.pushUndoRedo({
       unitID: e,
       redoMutations: m,
-      undoMutations: p
-    }), Ie(m, s), !0;
+      undoMutations: _
+    }), Ie(m, o), !0;
   }
-}, va = {
+}, Ra = {
   type: K.COMMAND,
   id: "sheets.command.update-data-validation-setting",
   // eslint-disable-next-line max-lines-per-function
-  handler(o, a) {
+  handler(s, a) {
     if (!a)
       return !1;
-    const e = o.get(x), t = o.get(z), r = o.get(F), i = o.get(G), { unitId: s, subUnitId: n, ruleId: l, setting: u } = a, d = i.getValidatorItem(u.type);
+    const e = s.get(x), t = s.get(z), r = s.get(F), i = s.get(G), { unitId: o, subUnitId: n, ruleId: l, setting: u } = a, d = i.getValidatorItem(u.type);
     if (!d)
       return !1;
-    const c = r.getRuleById(s, n, l);
+    const c = r.getRuleById(o, n, l);
     if (!c)
       return !1;
     const m = { ...c, ...u };
-    if (!d.validatorFormula(m, s, n).success)
+    if (!d.validatorFormula(m, o, n).success)
       return !1;
-    const p = {
-      unitId: s,
+    const _ = {
+      unitId: o,
       subUnitId: n,
       ruleId: l,
       payload: {
         type: y.SETTING,
         payload: {
           ...u,
-          ...d.normalizeFormula(m, s, n)
+          ...d.normalizeFormula(m, o, n)
         }
       }
-    }, _ = [{
+    }, g = [{
       id: E.id,
-      params: p
-    }], v = {
-      unitId: s,
+      params: _
+    }], R = {
+      unitId: o,
       subUnitId: n,
       ruleId: l,
       payload: {
@@ -1407,17 +1407,17 @@ const pa = {
       }
     }, M = [{
       id: E.id,
-      params: v
+      params: R
     }];
     if (u.type === T.CHECKBOX) {
-      const w = c.ranges, H = o.get(O), B = Ye(H, { unitId: s, subUnitId: n });
+      const w = c.ranges, H = s.get(O), B = Ye(H, { unitId: o, subUnitId: n });
       if (B) {
-        const W = new Se(), { worksheet: U } = B, { formula2: J = Me, formula1: ce = Ve } = c, { formula2: he = Me, formula1: me = Ve } = u;
+        const W = new ve(), { worksheet: U } = B, { formula2: J = Me, formula1: ce = Ve } = c, { formula2: he = Me, formula1: me = Ve } = u;
         let Le = !1;
-        if (w.forEach((ge) => {
-          b.foreach(ge, (ae, xe) => {
+        if (w.forEach((fe) => {
+          b.foreach(fe, (ae, xe) => {
             const j = U.getCellRaw(ae, xe), Ke = ct(j);
-            (gt(j) || Ke === String(J)) && !(j != null && j.p) ? (W.setValue(ae, xe, {
+            (ft(j) || Ke === String(J)) && !(j != null && j.p) ? (W.setValue(ae, xe, {
               v: he,
               p: null
             }), Le = !0) : Ke === String(ce) && !(j != null && j.p) && (W.setValue(ae, xe, {
@@ -1426,39 +1426,39 @@ const pa = {
             }), Le = !0);
           });
         }), Le) {
-          const ge = {
-            id: se.id,
+          const fe = {
+            id: oe.id,
             params: {
-              unitId: s,
+              unitId: o,
               subUnitId: n,
               cellValue: W.getData()
             }
           }, ae = {
-            id: se.id,
-            params: ot(o, ge.params)
+            id: oe.id,
+            params: st(s, fe.params)
           };
-          _.push(ge), M.push(ae);
+          g.push(fe), M.push(ae);
         }
       }
     }
-    return Ie(_, e).result ? (t.pushUndoRedo({
-      unitID: s,
-      redoMutations: _,
+    return Ie(g, e).result ? (t.pushUndoRedo({
+      unitID: o,
+      redoMutations: g,
       undoMutations: M
     }), !0) : !1;
   }
-}, Ra = {
+}, Sa = {
   type: K.COMMAND,
   id: "sheets.command.update-data-validation-options",
-  handler(o, a) {
+  handler(s, a) {
     if (!a)
       return !1;
-    const e = o.get(x), t = o.get(z), r = o.get(F), { unitId: i, subUnitId: s, ruleId: n, options: l } = a, u = r.getRuleById(i, s, n);
+    const e = s.get(x), t = s.get(z), r = s.get(F), { unitId: i, subUnitId: o, ruleId: n, options: l } = a, u = r.getRuleById(i, o, n);
     if (!u)
       return !1;
     const d = {
       unitId: i,
-      subUnitId: s,
+      subUnitId: o,
       ruleId: n,
       payload: {
         type: y.OPTIONS,
@@ -1469,46 +1469,46 @@ const pa = {
       params: d
     }], m = {
       unitId: i,
-      subUnitId: s,
+      subUnitId: o,
       ruleId: n,
       payload: {
         type: y.OPTIONS,
         payload: Lt(u)
       }
-    }, p = [{
+    }, _ = [{
       id: E.id,
       params: m
     }];
     return t.pushUndoRedo({
       unitID: i,
       redoMutations: c,
-      undoMutations: p
+      undoMutations: _
     }), e.executeCommand(E.id, d), !0;
   }
-}, Sa = {
+}, va = {
   type: K.COMMAND,
   id: "sheets.command.clear-range-data-validation",
-  handler(o, a) {
+  handler(s, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, ranges: r } = a, i = o.get(x), s = o.get(O), n = Ye(s, { unitId: e, subUnitId: t }), l = o.get(F);
+    const { unitId: e, subUnitId: t, ranges: r } = a, i = s.get(x), o = s.get(O), n = Ye(o, { unitId: e, subUnitId: t }), l = s.get(F);
     if (!n) return !1;
-    const u = o.get(z), d = l.getRuleObjectMatrix(e, t).clone();
+    const u = s.get(z), d = l.getRuleObjectMatrix(e, t).clone();
     d.removeRange(r);
-    const c = d.diff(l.getRules(e, t)), { redoMutations: m, undoMutations: p } = be(e, t, c, o);
+    const c = d.diff(l.getRules(e, t)), { redoMutations: m, undoMutations: _ } = be(e, t, c, s);
     return u.pushUndoRedo({
       unitID: e,
       redoMutations: m,
-      undoMutations: p
+      undoMutations: _
     }), Ie(m, i).result;
   }
 }, Va = {
   type: K.COMMAND,
   id: "sheet.command.remove-all-data-validation",
-  handler(o, a) {
+  handler(s, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t } = a, r = o.get(x), i = o.get(F), s = o.get(z), n = [...i.getRules(e, t)], l = {
+    const { unitId: e, subUnitId: t } = a, r = s.get(x), i = s.get(F), o = s.get(z), n = [...i.getRules(e, t)], l = {
       unitId: e,
       subUnitId: t,
       ruleId: n.map((c) => c.uid)
@@ -1523,14 +1523,14 @@ const pa = {
         rule: n
       }
     }];
-    return s.pushUndoRedo({
+    return o.pushUndoRedo({
       redoMutations: u,
       undoMutations: d,
       unitID: e
     }), r.executeCommand(A.id, l), !0;
   }
-}, Ma = (o, a) => {
-  const e = o.get(F), { unitId: t, subUnitId: r, ruleId: i, source: s } = a;
+}, Ma = (s, a) => {
+  const e = s.get(F), { unitId: t, subUnitId: r, ruleId: i, source: o } = a;
   if (Array.isArray(i)) {
     const l = i.map((u) => e.getRuleById(t, r, u)).filter(Boolean);
     return [{
@@ -1539,7 +1539,7 @@ const pa = {
         unitId: t,
         subUnitId: r,
         rule: l,
-        source: s
+        source: o
       }
     }];
   }
@@ -1557,10 +1557,10 @@ const pa = {
 }, ya = {
   type: K.COMMAND,
   id: "sheet.command.remove-data-validation-rule",
-  handler(o, a) {
+  handler(s, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, ruleId: r } = a, i = o.get(x), s = o.get(z), n = o.get(F), l = [{
+    const { unitId: e, subUnitId: t, ruleId: r } = a, i = s.get(x), o = s.get(z), n = s.get(F), l = [{
       id: A.id,
       params: a
     }], u = [{
@@ -1574,23 +1574,23 @@ const pa = {
         index: n.getRuleIndex(e, t, r)
       }
     }];
-    return s.pushUndoRedo({
+    return o.pushUndoRedo({
       undoMutations: u,
       redoMutations: l,
       unitID: a.unitId
     }), i.executeCommand(A.id, a), !0;
   }
 }, Ea = "sheets-data-validation.config", tt = {};
-var Ta = Object.defineProperty, Fa = Object.getOwnPropertyDescriptor, Na = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Fa(a, e) : a, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+var Ta = Object.defineProperty, Fa = Object.getOwnPropertyDescriptor, Na = (s, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Fa(a, e) : a, i = s.length - 1, o; i >= 0; i--)
+    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
   return t && r && Ta(a, e, r), r;
-}, $e = (o, a) => (e, t) => a(e, t, o);
+}, $e = (s, a) => (e, t) => a(e, t, s);
 let Ee = class extends $ {
   constructor(a, e, t) {
     super();
-    g(this, "_disposableMap", /* @__PURE__ */ new Map());
-    g(this, "registerRule", (a, e, t) => {
+    f(this, "_disposableMap", /* @__PURE__ */ new Map());
+    f(this, "registerRule", (a, e, t) => {
       de(t.type, this._validatorRegistryService) && this.register(a, e, t);
     });
     this._dataValidationModel = a, this._formulaRefRangeService = e, this._validatorRegistryService = t, this._initRefRange();
@@ -1600,7 +1600,7 @@ let Ee = class extends $ {
   }
   // eslint-disable-next-line max-lines-per-function
   register(a, e, t) {
-    const r = t.ranges, i = t.formula1, s = t.formula2, n = this._formulaRefRangeService.registerRangeFormula(a, e, r, [i != null ? i : "", s != null ? s : ""], (u) => {
+    const r = t.ranges, i = t.formula1, o = t.formula2, n = this._formulaRefRangeService.registerRangeFormula(a, e, r, [i != null ? i : "", o != null ? o : ""], (u) => {
       if (u.length === 0)
         return {
           undos: [{
@@ -1650,14 +1650,14 @@ let Ee = class extends $ {
             payload: {
               ranges: r,
               formula1: i,
-              formula2: s
+              formula2: o
             }
           },
           source: "patched"
         }
       });
-      for (let p = 1; p < u.length; p++) {
-        const _ = u[p], v = yt();
+      for (let _ = 1; _ < u.length; _++) {
+        const g = u[_], R = yt();
         d.push({
           id: L.id,
           params: {
@@ -1665,10 +1665,10 @@ let Ee = class extends $ {
             subUnitId: e,
             rule: {
               ...t,
-              uid: v,
-              formula1: _.formulas[0],
-              formula2: _.formulas[1],
-              ranges: _.ranges
+              uid: R,
+              formula1: g.formulas[0],
+              formula2: g.formulas[1],
+              ranges: g.ranges
             },
             source: "patched"
           }
@@ -1677,7 +1677,7 @@ let Ee = class extends $ {
           params: {
             unitId: a,
             subUnitId: e,
-            ruleId: v,
+            ruleId: R,
             source: "patched"
           }
         });
@@ -1693,25 +1693,25 @@ let Ee = class extends $ {
     const a = this._dataValidationModel.getAll();
     for (const [e, t] of a)
       for (const [r, i] of t)
-        for (const s of i)
-          this.registerRule(e, r, s);
+        for (const o of i)
+          this.registerRule(e, r, o);
     this.disposeWithMe(
       this._dataValidationModel.ruleChange$.subscribe((e) => {
         const { unitId: t, subUnitId: r, rule: i } = e;
         switch (e.type) {
           case "add": {
-            const s = e.rule;
-            this.registerRule(e.unitId, e.subUnitId, s);
+            const o = e.rule;
+            this.registerRule(e.unitId, e.subUnitId, o);
             break;
           }
           case "remove": {
-            const s = this._disposableMap.get(this._getIdWithUnitId(t, r, i.uid));
-            s && s.dispose();
+            const o = this._disposableMap.get(this._getIdWithUnitId(t, r, i.uid));
+            o && o.dispose();
             break;
           }
           case "update": {
-            const s = e.rule, n = this._disposableMap.get(this._getIdWithUnitId(t, r, s.uid));
-            n && n.dispose(), this.registerRule(e.unitId, e.subUnitId, s);
+            const o = e.rule, n = this._disposableMap.get(this._getIdWithUnitId(t, r, o.uid));
+            n && n.dispose(), this.registerRule(e.unitId, e.subUnitId, o);
             break;
           }
         }
@@ -1724,44 +1724,44 @@ let Ee = class extends $ {
   }
 };
 Ee = Na([
-  $e(0, R(F)),
-  $e(1, R(ut)),
-  $e(2, R(G))
+  $e(0, S(F)),
+  $e(1, S(ut)),
+  $e(2, S(G))
 ], Ee);
-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 || {}), Ca = Object.defineProperty, Oa = Object.getOwnPropertyDescriptor, wa = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Oa(a, e) : a, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+var gt = /* @__PURE__ */ ((s) => (s[s.View = 0] = "View", s[s.Edit = 1] = "Edit", s[s.ManageCollaborator = 2] = "ManageCollaborator", s[s.Print = 3] = "Print", s[s.Duplicate = 4] = "Duplicate", s[s.Comment = 5] = "Comment", s[s.Copy = 6] = "Copy", s[s.Share = 7] = "Share", s[s.Export = 8] = "Export", s[s.MoveWorksheet = 9] = "MoveWorksheet", s[s.DeleteWorksheet = 10] = "DeleteWorksheet", s[s.HideWorksheet = 11] = "HideWorksheet", s[s.RenameWorksheet = 12] = "RenameWorksheet", s[s.CreateWorksheet = 13] = "CreateWorksheet", s[s.SetWorksheetStyle = 14] = "SetWorksheetStyle", s[s.EditWorksheetCell = 15] = "EditWorksheetCell", s[s.InsertHyperlink = 16] = "InsertHyperlink", s[s.Sort = 17] = "Sort", s[s.Filter = 18] = "Filter", s[s.PivotTable = 19] = "PivotTable", s[s.FloatImg = 20] = "FloatImg", s[s.History = 21] = "History", s[s.RwHgtClWdt = 22] = "RwHgtClWdt", s[s.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", s[s.ViewFilter = 24] = "ViewFilter", s[s.MoveSheet = 25] = "MoveSheet", s[s.DeleteSheet = 26] = "DeleteSheet", s[s.HideSheet = 27] = "HideSheet", s[s.CopySheet = 28] = "CopySheet", s[s.RenameSheet = 29] = "RenameSheet", s[s.CreateSheet = 30] = "CreateSheet", s[s.SelectProtectedCells = 31] = "SelectProtectedCells", s[s.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", s[s.SetCellStyle = 33] = "SetCellStyle", s[s.SetCellValue = 34] = "SetCellValue", s[s.SetRowStyle = 35] = "SetRowStyle", s[s.SetColumnStyle = 36] = "SetColumnStyle", s[s.InsertRow = 37] = "InsertRow", s[s.InsertColumn = 38] = "InsertColumn", s[s.DeleteRow = 39] = "DeleteRow", s[s.DeleteColumn = 40] = "DeleteColumn", s[s.EditExtraObject = 41] = "EditExtraObject", s[s.Delete = 42] = "Delete", s[s.RecoverHistory = 43] = "RecoverHistory", s[s.ViewHistory = 44] = "ViewHistory", s[s.CreatePermissionObject = 45] = "CreatePermissionObject", s[s.UNRECOGNIZED = -1] = "UNRECOGNIZED", s))(gt || {}), Ca = Object.defineProperty, Oa = Object.getOwnPropertyDescriptor, wa = (s, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Oa(a, e) : a, i = s.length - 1, o; i >= 0; i--)
+    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
   return t && r && Ca(a, e, r), r;
-}, He = (o, a) => (e, t) => a(e, t, o);
+}, He = (s, a) => (e, t) => a(e, t, s);
 let Te = class extends $ {
-  constructor(o, a, e) {
-    super(), this._univerInstanceService = o, this._permissionService = a, this._lexerTreeBuilder = e;
+  constructor(s, a, e) {
+    super(), this._univerInstanceService = s, this._permissionService = a, this._lexerTreeBuilder = e;
   }
-  getFormulaRefCheck(o) {
+  getFormulaRefCheck(s) {
     var e, t;
-    const a = this._lexerTreeBuilder.sequenceNodesBuilder(o);
+    const a = this._lexerTreeBuilder.sequenceNodesBuilder(s);
     if (!a)
       return !0;
     for (let r = 0; r < a.length; r++) {
       const i = a[r];
       if (typeof i == "string")
         continue;
-      const { token: s } = i, n = Gt(s), l = this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET);
+      const { token: o } = i, n = Gt(o), l = this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET);
       let u = l.getActiveSheet();
       const d = l.getUnitId();
       if (n.sheetName) {
         if (u = l.getSheetBySheetName(n.sheetName), !u)
           return !1;
-        const v = u == null ? void 0 : u.getSheetId();
-        if (!this._permissionService.getPermissionPoint(new Bt(d, v).id)) return !1;
+        const R = u == null ? void 0 : u.getSheetId();
+        if (!this._permissionService.getPermissionPoint(new Bt(d, R).id)) return !1;
       }
       if (!u)
         return !1;
-      const { startRow: c, endRow: m, startColumn: p, endColumn: _ } = n.range;
-      for (let v = c; v <= m; v++)
-        for (let M = p; M <= _; M++) {
-          const f = (t = (e = u.getCell(v, M)) == null ? void 0 : e.selectionProtection) == null ? void 0 : t[0];
-          if ((f == null ? void 0 : f[_t.View]) === !1)
+      const { startRow: c, endRow: m, startColumn: _, endColumn: g } = n.range;
+      for (let R = c; R <= m; R++)
+        for (let M = _; M <= g; M++) {
+          const p = (t = (e = u.getCell(R, M)) == null ? void 0 : e.selectionProtection) == null ? void 0 : t[0];
+          if ((p == null ? void 0 : p[gt.View]) === !1)
             return !1;
         }
     }
@@ -1771,21 +1771,21 @@ let Te = class extends $ {
 Te = wa([
   He(0, O),
   He(1, Et),
-  He(2, R(Z))
+  He(2, S(Z))
 ], Te);
-var Ia = Object.defineProperty, Aa = Object.getOwnPropertyDescriptor, Da = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Aa(a, e) : a, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+var Ia = Object.defineProperty, Aa = Object.getOwnPropertyDescriptor, Da = (s, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Aa(a, e) : a, i = s.length - 1, o; i >= 0; i--)
+    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
   return t && r && Ia(a, e, r), r;
-}, ee = (o, a) => (e, t) => a(e, t, o);
+}, ee = (s, a) => (e, t) => a(e, t, s);
 let Fe = class extends $ {
-  constructor(a, e, t, r, i, s) {
+  constructor(a, e, t, r, i, o) {
     super();
-    g(this, "_disposableMap", /* @__PURE__ */ new Map());
-    g(this, "registerRule", (a, e, t) => {
+    f(this, "_disposableMap", /* @__PURE__ */ new Map());
+    f(this, "registerRule", (a, e, t) => {
       de(t.type, this._validatorRegistryService) || (this.register(a, e, t), this.registerFormula(a, e, t));
     });
-    this._dataValidationModel = a, this._injector = e, this._refRangeService = t, this._dataValidationFormulaService = r, this._formulaRefRangeService = i, this._validatorRegistryService = s, this._initRefRange();
+    this._dataValidationModel = a, this._injector = e, this._refRangeService = t, this._dataValidationFormulaService = r, this._formulaRefRangeService = i, this._validatorRegistryService = o, this._initRefRange();
   }
   _getIdWithUnitId(a, e, t) {
     return `${a}_${e}_${t}`;
@@ -1793,14 +1793,14 @@ let Fe = class extends $ {
   // eslint-disable-next-line max-lines-per-function
   registerFormula(a, e, t) {
     var u;
-    const r = t.uid, i = this._getIdWithUnitId(a, e, r), s = (u = this._disposableMap.get(i)) != null ? u : /* @__PURE__ */ new Set(), n = (d, c) => {
+    const r = t.uid, i = this._getIdWithUnitId(a, e, r), o = (u = this._disposableMap.get(i)) != null ? u : /* @__PURE__ */ new Set(), n = (d, c) => {
       const m = this._dataValidationModel.getRuleById(a, e, r);
       if (!m)
         return { redos: [], undos: [] };
-      const p = m[d];
-      if (!p || p === c)
+      const _ = m[d];
+      if (!_ || _ === c)
         return { redos: [], undos: [] };
-      const _ = {
+      const g = {
         unitId: a,
         subUnitId: e,
         ruleId: t.uid,
@@ -1814,7 +1814,7 @@ let Fe = class extends $ {
           }
         },
         source: "patched"
-      }, v = {
+      }, R = {
         unitId: a,
         subUnitId: e,
         ruleId: t.uid,
@@ -1830,15 +1830,15 @@ let Fe = class extends $ {
       }, M = [
         {
           id: E.id,
-          params: _
+          params: g
         }
-      ], f = [
+      ], p = [
         {
           id: E.id,
-          params: v
+          params: R
         }
       ];
-      return { redos: M, undos: f };
+      return { redos: M, undos: p };
     }, l = this._dataValidationFormulaService.getRuleFormulaInfo(a, e, r);
     if (l) {
       const [d, c] = l;
@@ -1847,29 +1847,29 @@ let Fe = class extends $ {
           a,
           e,
           d.text,
-          (p) => n("formula1", p)
+          (_) => n("formula1", _)
         );
-        s.add(() => m.dispose());
+        o.add(() => m.dispose());
       }
       if (c) {
         const m = this._formulaRefRangeService.registerFormula(
           a,
           e,
           c.text,
-          (p) => n("formula2", p)
+          (_) => n("formula2", _)
         );
-        s.add(() => m.dispose());
+        o.add(() => m.dispose());
       }
     }
   }
   register(a, e, t) {
     var l;
     const r = (u) => {
-      const d = [...t.ranges], m = d.map((_) => Pt(_, u)).filter((_) => !!_).flat();
+      const d = [...t.ranges], m = d.map((g) => Pt(g, u)).filter((g) => !!g).flat();
       if (rt(m, d))
         return { redos: [], undos: [] };
       if (m.length) {
-        const _ = {
+        const g = {
           unitId: a,
           subUnitId: e,
           ruleId: t.uid,
@@ -1878,7 +1878,7 @@ let Fe = class extends $ {
             payload: m
           },
           source: "patched"
-        }, v = [{ id: E.id, params: _ }], M = [{
+        }, R = [{ id: E.id, params: g }], M = [{
           id: E.id,
           params: {
             unitId: a,
@@ -1891,42 +1891,42 @@ let Fe = class extends $ {
             source: "patched"
           }
         }];
-        return { redos: v, undos: M };
+        return { redos: R, undos: M };
       } else {
-        const _ = { unitId: a, subUnitId: e, ruleId: t.uid }, v = [{ id: A.id, params: _ }], M = Ma(this._injector, _);
-        return { redos: v, undos: M };
+        const g = { unitId: a, subUnitId: e, ruleId: t.uid }, R = [{ id: A.id, params: g }], M = Ma(this._injector, g);
+        return { redos: R, undos: M };
       }
     }, i = [];
     t.ranges.forEach((u) => {
       const d = this._refRangeService.registerRefRange(u, r, a, e);
       i.push(() => d.dispose());
     });
-    const s = this._getIdWithUnitId(a, e, t.uid), n = (l = this._disposableMap.get(s)) != null ? l : /* @__PURE__ */ new Set();
-    n.add(() => i.forEach((u) => u())), this._disposableMap.set(s, n);
+    const o = this._getIdWithUnitId(a, e, t.uid), n = (l = this._disposableMap.get(o)) != null ? l : /* @__PURE__ */ new Set();
+    n.add(() => i.forEach((u) => u())), this._disposableMap.set(o, n);
   }
   _initRefRange() {
     const a = this._dataValidationModel.getAll();
     for (const [e, t] of a)
       for (const [r, i] of t)
-        for (const s of i)
-          this.registerRule(e, r, s);
+        for (const o of i)
+          this.registerRule(e, r, o);
     this.disposeWithMe(
       this._dataValidationModel.ruleChange$.subscribe((e) => {
         const { unitId: t, subUnitId: r, rule: i } = e;
         switch (e.type) {
           case "add": {
-            const s = e.rule;
-            this.registerRule(e.unitId, e.subUnitId, s);
+            const o = e.rule;
+            this.registerRule(e.unitId, e.subUnitId, o);
             break;
           }
           case "remove": {
-            const s = this._disposableMap.get(this._getIdWithUnitId(t, r, i.uid));
-            s && s.forEach((n) => n());
+            const o = this._disposableMap.get(this._getIdWithUnitId(t, r, i.uid));
+            o && o.forEach((n) => n());
             break;
           }
           case "update": {
-            const s = e.rule, n = this._disposableMap.get(this._getIdWithUnitId(t, r, s.uid));
-            n && n.forEach((l) => l()), this.registerRule(e.unitId, e.subUnitId, s);
+            const o = e.rule, n = this._disposableMap.get(this._getIdWithUnitId(t, r, o.uid));
+            n && n.forEach((l) => l()), this.registerRule(e.unitId, e.subUnitId, o);
             break;
           }
         }
@@ -1939,38 +1939,38 @@ let Fe = class extends $ {
   }
 };
 Fe = Da([
-  ee(0, R(F)),
-  ee(1, R(Ge)),
-  ee(2, R(Ut)),
-  ee(3, R(X)),
-  ee(4, R(ut)),
-  ee(5, R(G))
+  ee(0, S(F)),
+  ee(1, S(Ge)),
+  ee(2, S(Ut)),
+  ee(3, S(X)),
+  ee(4, S(ut)),
+  ee(5, S(G))
 ], Fe);
-var ba = Object.defineProperty, La = Object.getOwnPropertyDescriptor, xa = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? La(a, e) : a, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+var ba = Object.defineProperty, La = Object.getOwnPropertyDescriptor, xa = (s, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? La(a, e) : a, i = s.length - 1, o; i >= 0; i--)
+    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
   return t && r && ba(a, e, r), r;
-}, We = (o, a) => (e, t) => a(e, t, o);
+}, We = (s, a) => (e, t) => a(e, t, s);
 let Ne = class extends $ {
-  constructor(o, a, e) {
-    super(), this._sheetInterceptorService = o, this._univerInstanceService = a, this._sheetDataValidationModel = e, this._initSheetChange();
+  constructor(s, a, e) {
+    super(), this._sheetInterceptorService = s, this._univerInstanceService = a, this._sheetDataValidationModel = e, this._initSheetChange();
   }
   _initSheetChange() {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
-        getMutations: (o) => {
+        getMutations: (s) => {
           var a;
-          if (o.id === $t.id) {
-            const e = o.params, t = e.unitId || this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET).getUnitId(), r = this._univerInstanceService.getUniverSheetInstance(t);
+          if (s.id === $t.id) {
+            const e = s.params, t = e.unitId || this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET).getUnitId(), r = this._univerInstanceService.getUniverSheetInstance(t);
             if (!r)
               return { redos: [], undos: [] };
             const i = e.subUnitId || ((a = r.getActiveSheet()) == null ? void 0 : a.getSheetId());
             if (!i)
               return { redos: [], undos: [] };
-            const s = this._sheetDataValidationModel.getRules(t, i);
-            if (s.length === 0)
+            const o = this._sheetDataValidationModel.getRules(t, i);
+            if (o.length === 0)
               return { redos: [], undos: [] };
-            const n = s.map((d) => d.uid), l = {
+            const n = o.map((d) => d.uid), l = {
               unitId: t,
               subUnitId: i,
               ruleId: n,
@@ -1978,7 +1978,7 @@ let Ne = class extends $ {
             }, u = {
               unitId: t,
               subUnitId: i,
-              rule: [...s],
+              rule: [...o],
               source: "patched"
             };
             return {
@@ -1999,18 +1999,18 @@ let Ne = class extends $ {
   }
 };
 Ne = xa([
-  We(0, R(st)),
-  We(1, R(O)),
-  We(2, R(F))
+  We(0, S(ot)),
+  We(1, S(O)),
+  We(2, S(F))
 ], Ne);
 class Ba extends k {
   constructor() {
     super(...arguments);
-    g(this, "id", T.ANY);
-    g(this, "title", "dataValidation.any.title");
-    g(this, "operators", []);
-    g(this, "scopes", ["sheet"]);
-    g(this, "offsetFormulaByRange", !1);
+    f(this, "id", T.ANY);
+    f(this, "title", "dataValidation.any.title");
+    f(this, "operators", []);
+    f(this, "scopes", ["sheet"]);
+    f(this, "offsetFormulaByRange", !1);
   }
   async parseFormula(e, t, r) {
     return {
@@ -2034,14 +2034,14 @@ class Ba extends k {
 class Ua extends k {
   constructor() {
     super(...arguments);
-    g(this, "id", T.CUSTOM);
-    g(this, "title", "dataValidation.custom.title");
-    g(this, "operators", []);
-    g(this, "scopes", ["sheet"]);
-    g(this, "_customFormulaService", this.injector.get(P));
+    f(this, "id", T.CUSTOM);
+    f(this, "title", "dataValidation.custom.title");
+    f(this, "operators", []);
+    f(this, "scopes", ["sheet"]);
+    f(this, "_customFormulaService", this.injector.get(P));
   }
   validatorFormula(e, t, r) {
-    const i = S(e.formula1);
+    const i = v(e.formula1);
     return {
       success: i,
       formula1: i ? "" : this.localeService.t("dataValidation.validFail.formula")
@@ -2055,7 +2055,7 @@ class Ua extends k {
     };
   }
   async isValidType(e, t, r) {
-    const { column: i, row: s, unitId: n, subUnitId: l } = e, u = await this._customFormulaService.getCellFormulaValue(n, l, r.uid, s, i), d = u == null ? void 0 : u.v;
+    const { column: i, row: o, unitId: n, subUnitId: l } = e, u = await this._customFormulaService.getCellFormulaValue(n, l, r.uid, o, i), d = u == null ? void 0 : u.v;
     return C(String(d)) && V.isDefine(d) && d !== "" ? u.t === Tt.BOOLEAN ? !!d : typeof d == "boolean" ? d : typeof d == "number" ? !!d : typeof d == "string" ? C(d) : !!d : !1;
   }
   generateRuleErrorMessage(e) {
@@ -2069,20 +2069,20 @@ class Ua extends k {
 class Pa extends mt {
   constructor() {
     super(...arguments);
-    g(this, "id", T.LIST_MULTIPLE);
-    g(this, "title", "dataValidation.listMultiple.title");
-    g(this, "offsetFormulaByRange", !1);
-    g(this, "skipDefaultFontRender", () => !0);
+    f(this, "id", T.LIST_MULTIPLE);
+    f(this, "title", "dataValidation.listMultiple.title");
+    f(this, "offsetFormulaByRange", !1);
+    f(this, "skipDefaultFontRender", () => !0);
   }
 }
 class $a extends k {
   constructor() {
     super(...arguments);
-    g(this, "_customFormulaService", this.injector.get(P));
-    g(this, "_lexerTreeBuilder", this.injector.get(Z));
-    g(this, "id", T.WHOLE);
-    g(this, "title", "dataValidation.whole.title");
-    g(this, "operators", [
+    f(this, "_customFormulaService", this.injector.get(P));
+    f(this, "_lexerTreeBuilder", this.injector.get(Z));
+    f(this, "id", T.WHOLE);
+    f(this, "title", "dataValidation.whole.title");
+    f(this, "operators", [
       h.BETWEEN,
       h.EQUAL,
       h.GREATER_THAN,
@@ -2092,14 +2092,14 @@ class $a extends k {
       h.NOT_BETWEEN,
       h.NOT_EQUAL
     ]);
-    g(this, "scopes", ["sheet"]);
+    f(this, "scopes", ["sheet"]);
   }
   _isFormulaOrInt(e) {
-    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+    return !V.isBlank(e) && (v(e) || !Number.isNaN(+e) && Number.isInteger(+e));
   }
   async isValidType(e, t, r) {
-    const { value: i } = e, s = ye(i);
-    return !Number.isNaN(s) && Number.isInteger(s);
+    const { value: i } = e, o = ye(i);
+    return !Number.isNaN(o) && Number.isInteger(o);
   }
   transform(e, t, r) {
     const { value: i } = e;
@@ -2111,12 +2111,12 @@ class $a extends k {
   _parseNumber(e) {
     return e == null ? Number.NaN : +e;
   }
-  async parseFormula(e, t, r, i, s) {
-    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, s), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, s), { formula1: u, formula2: d } = e, c = S(u) ? n == null ? void 0 : n.v : u, m = S(d) ? l == null ? void 0 : l.v : d, p = C(`${c}`) && C(`${m}`);
+  async parseFormula(e, t, r, i, o) {
+    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, o), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, o), { formula1: u, formula2: d } = e, c = v(u) ? n == null ? void 0 : n.v : u, m = v(d) ? l == null ? void 0 : l.v : d, _ = C(`${c}`) && C(`${m}`);
     return {
       formula1: this._parseNumber(c),
       formula2: this._parseNumber(m),
-      isFormulaValid: p
+      isFormulaValid: _
     };
   }
   validatorFormula(e, t, r) {
@@ -2125,13 +2125,13 @@ class $a extends k {
       return {
         success: !1
       };
-    const s = V.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Ae.includes(i), u = this.localeService.t("dataValidation.validFail.number");
+    const o = V.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Ae.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
-      success: s && n,
-      formula1: s ? void 0 : u,
+      success: o && n,
+      formula1: o ? void 0 : u,
       formula2: n ? void 0 : u
     } : {
-      success: s,
+      success: o,
       formula1: u
     };
   }
@@ -2142,14 +2142,14 @@ class $a extends k {
     return `${this.localeService.t(ht[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
   }
 }
-var Ha = Object.defineProperty, Wa = Object.getOwnPropertyDescriptor, ja = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Wa(a, e) : a, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+var Ha = Object.defineProperty, Wa = Object.getOwnPropertyDescriptor, ja = (s, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Wa(a, e) : a, i = s.length - 1, o; i >= 0; i--)
+    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
   return t && r && Ha(a, e, r), r;
-}, te = (o, a) => (e, t) => a(e, t, o);
+}, te = (s, a) => (e, t) => a(e, t, s);
 let Ce = class extends Ft {
-  constructor(o, a, e, t, r, i) {
-    super(), this._univerInstanceService = o, this._dataValidatorRegistryService = a, this._injector = e, this._selectionManagerService = t, this._sheetInterceptorService = r, this._sheetDataValidationModel = i, this._init();
+  constructor(s, a, e, t, r, i) {
+    super(), this._univerInstanceService = s, this._dataValidatorRegistryService = a, this._injector = e, this._selectionManagerService = t, this._sheetInterceptorService = r, this._sheetDataValidationModel = i, this._init();
   }
   _init() {
     this._registerValidators(), this._initCommandInterceptor();
@@ -2159,27 +2159,27 @@ let Ce = class extends Ft {
       Ba,
       ca,
       $a,
-      _a,
+      ga,
       da,
-      sa,
+      oa,
       mt,
       Pa,
       Ua
-    ].forEach((o) => {
-      const a = this._injector.createInstance(o);
-      this.disposeWithMe(this._dataValidatorRegistryService.register(a)), this.disposeWithMe(qe(() => this._injector.delete(o)));
+    ].forEach((s) => {
+      const a = this._injector.createInstance(s);
+      this.disposeWithMe(this._dataValidatorRegistryService.register(a)), this.disposeWithMe(qe(() => this._injector.delete(s)));
     });
   }
   _initCommandInterceptor() {
     this._sheetInterceptorService.interceptCommand({
-      getMutations: (o) => {
+      getMutations: (s) => {
         var a;
-        if (o.id === Ht.id) {
+        if (s.id === Ht.id) {
           const e = this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET), t = e.getUnitId(), r = e.getActiveSheet();
           if (!r)
             throw new Error("No active sheet found");
-          const i = r.getSheetId(), s = (a = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : a.map((c) => c.range), n = this._sheetDataValidationModel.getRuleObjectMatrix(t, i).clone();
-          s && n.removeRange(s);
+          const i = r.getSheetId(), o = (a = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : a.map((c) => c.range), n = this._sheetDataValidationModel.getRuleObjectMatrix(t, i).clone();
+          o && n.removeRange(o);
           const l = n.diff(this._sheetDataValidationModel.getRules(t, i)), { redoMutations: u, undoMutations: d } = be(t, i, l, this._injector, "patched");
           return {
             undos: d,
@@ -2196,124 +2196,124 @@ let Ce = class extends Ft {
 };
 Ce = ja([
   te(0, O),
-  te(1, R(G)),
-  te(2, R(Ge)),
-  te(3, R(nt)),
-  te(4, R(st)),
-  te(5, R(F))
+  te(1, S(G)),
+  te(2, S(Ge)),
+  te(3, S(nt)),
+  te(4, S(ot)),
+  te(5, S(F))
 ], Ce);
-var Qa = Object.defineProperty, qa = Object.getOwnPropertyDescriptor, Ga = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? qa(a, e) : a, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
+var Qa = Object.defineProperty, qa = Object.getOwnPropertyDescriptor, Ga = (s, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? qa(a, e) : a, i = s.length - 1, o; i >= 0; i--)
+    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
   return t && r && Qa(a, e, r), r;
-}, ve = (o, a) => (e, t) => a(e, t, o);
+}, Re = (s, a) => (e, t) => a(e, t, s);
 let Oe = class extends $ {
-  constructor(o, a, e, t) {
-    super(), this._univerInstanceService = o, this._sheetDataValidationModel = a, this._dataValidationCacheService = e, this._lifecycleService = t, this._initRecalculate();
+  constructor(s, a, e, t) {
+    super(), this._univerInstanceService = s, this._sheetDataValidationModel = a, this._dataValidationCacheService = e, this._lifecycleService = t, this._initRecalculate();
   }
   _initRecalculate() {
-    const o = (a) => {
+    const s = (a) => {
       if (a.length === 0)
         return;
       const e = this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET), t = e == null ? void 0 : e.getActiveSheet(), r = {};
       a.flat().forEach((i) => {
         r[i.unitId] || (r[i.unitId] = {}), r[i.unitId][i.subUnitId] || (r[i.unitId][i.subUnitId] = []);
-        const s = this._univerInstanceService.getUnit(i.unitId, N.UNIVER_SHEET), n = s == null ? void 0 : s.getSheetBySheetId(i.subUnitId);
+        const o = this._univerInstanceService.getUnit(i.unitId, N.UNIVER_SHEET), n = o == null ? void 0 : o.getSheetBySheetId(i.subUnitId);
         n && r[i.unitId][i.subUnitId].push(...i.ranges.map((l) => b.transformRange(l, n)));
-      }), Object.entries(r).forEach(([i, s]) => {
-        Object.entries(s).forEach(([n, l]) => {
+      }), Object.entries(r).forEach(([i, o]) => {
+        Object.entries(o).forEach(([n, l]) => {
           (e == null ? void 0 : e.getUnitId()) === i && (t == null ? void 0 : t.getSheetId()) === n ? this.validatorRanges(i, n, l) : requestIdleCallback(() => {
             this.validatorRanges(i, n, l);
           });
         });
       });
     };
-    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Wt(() => this._lifecycleService.lifecycle$.pipe(Ze((a) => a === ze.Rendered)))).subscribe(o)), this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Ze(() => this._lifecycleService.stage >= ze.Rendered), Ct(20)).subscribe(o));
+    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Wt(() => this._lifecycleService.lifecycle$.pipe(Ze((a) => a === ze.Rendered)))).subscribe(s)), this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Ze(() => this._lifecycleService.stage >= ze.Rendered), Ct(20)).subscribe(s));
   }
-  async _validatorByCell(o, a, e, t) {
-    const r = o.getUnitId(), i = a.getSheetId();
+  async _validatorByCell(s, a, e, t) {
+    const r = s.getUnitId(), i = a.getSheetId();
     if (!V.isDefine(e) || !V.isDefine(t))
       throw new Error(`row or col is not defined, row: ${e}, col: ${t}`);
-    const s = this._sheetDataValidationModel.getRuleByLocation(r, i, e, t);
-    return s ? new Promise((n) => {
-      this._sheetDataValidationModel.validator(s, { unitId: r, subUnitId: i, row: e, col: t, worksheet: a, workbook: o }, (l) => {
+    const o = this._sheetDataValidationModel.getRuleByLocation(r, i, e, t);
+    return o ? new Promise((n) => {
+      this._sheetDataValidationModel.validator(o, { unitId: r, subUnitId: i, row: e, col: t, worksheet: a, workbook: s }, (l) => {
         n(l);
       });
     }) : D.VALID;
   }
-  async validatorCell(o, a, e, t) {
-    const r = this._univerInstanceService.getUnit(o, N.UNIVER_SHEET);
+  async validatorCell(s, a, e, t) {
+    const r = this._univerInstanceService.getUnit(s, N.UNIVER_SHEET);
     if (!r)
-      throw new Error(`cannot find current workbook, unitId: ${o}`);
+      throw new Error(`cannot find current workbook, unitId: ${s}`);
     const i = r.getSheetBySheetId(a);
     if (!i)
       throw new Error(`cannot find current worksheet, sheetId: ${a}`);
     return this._validatorByCell(r, i, e, t);
   }
-  validatorRanges(o, a, e) {
+  validatorRanges(s, a, e) {
     if (!e.length)
       return Promise.resolve([]);
-    const t = this._univerInstanceService.getUnit(o, N.UNIVER_SHEET);
+    const t = this._univerInstanceService.getUnit(s, N.UNIVER_SHEET);
     if (!t)
-      throw new Error(`cannot find current workbook, unitId: ${o}`);
+      throw new Error(`cannot find current workbook, unitId: ${s}`);
     const r = t.getSheetBySheetId(a);
     if (!r)
       throw new Error(`cannot find current worksheet, sheetId: ${a}`);
     return Promise.all(e.map((i) => {
-      const s = [];
+      const o = [];
       return b.foreach(i, (n, l) => {
-        s.push(this._validatorByCell(t, r, n, l));
-      }), s;
+        o.push(this._validatorByCell(t, r, n, l));
+      }), o;
     }));
   }
-  async validatorWorksheet(o, a) {
-    const e = this._univerInstanceService.getUnit(o, N.UNIVER_SHEET);
+  async validatorWorksheet(s, a) {
+    const e = this._univerInstanceService.getUnit(s, N.UNIVER_SHEET);
     if (!e)
-      throw new Error(`cannot find current workbook, unitId: ${o}`);
+      throw new Error(`cannot find current workbook, unitId: ${s}`);
     const t = e.getSheetBySheetId(a);
     if (!t)
       throw new Error(`cannot find current worksheet, sheetId: ${a}`);
-    const r = this._sheetDataValidationModel.getRules(o, a);
-    return await Promise.all(r.map((i) => Promise.all(i.ranges.map((s) => {
+    const r = this._sheetDataValidationModel.getRules(s, a);
+    return await Promise.all(r.map((i) => Promise.all(i.ranges.map((o) => {
       const n = [];
-      return b.foreach(s, (l, u) => {
+      return b.foreach(o, (l, u) => {
         n.push(this._validatorByCell(e, t, l, u));
       }), n;
-    })))), this._dataValidationCacheService.ensureCache(o, a);
+    })))), this._dataValidationCacheService.ensureCache(s, a);
   }
-  async validatorWorkbook(o) {
-    const a = this._sheetDataValidationModel.getSubUnitIds(o), e = await Promise.all(a.map((r) => this.validatorWorksheet(o, r))), t = {};
+  async validatorWorkbook(s) {
+    const a = this._sheetDataValidationModel.getSubUnitIds(s), e = await Promise.all(a.map((r) => this.validatorWorksheet(s, r))), t = {};
     return e.forEach((r, i) => {
       t[a[i]] = r;
     }), t;
   }
-  getDataValidations(o, a, e) {
-    const t = this._sheetDataValidationModel.getRuleObjectMatrix(o, a), r = /* @__PURE__ */ new Set();
-    return e.forEach((s) => {
-      b.foreach(s, (n, l) => {
+  getDataValidations(s, a, e) {
+    const t = this._sheetDataValidationModel.getRuleObjectMatrix(s, a), r = /* @__PURE__ */ new Set();
+    return e.forEach((o) => {
+      b.foreach(o, (n, l) => {
         const u = t.getValue(n, l);
         u && r.add(u);
       });
-    }), Array.from(r).map((s) => this._sheetDataValidationModel.getRuleById(o, a, s)).filter(Boolean);
+    }), Array.from(r).map((o) => this._sheetDataValidationModel.getRuleById(s, a, o)).filter(Boolean);
   }
-  getDataValidation(o, a, e) {
-    return this.getDataValidations(o, a, e)[0];
+  getDataValidation(s, a, e) {
+    return this.getDataValidations(s, a, e)[0];
   }
 };
 Oe = Ga([
-  ve(0, O),
-  ve(1, R(F)),
-  ve(2, R(q)),
-  ve(3, R(Nt))
+  Re(0, O),
+  Re(1, S(F)),
+  Re(2, S(q)),
+  Re(3, S(Nt))
 ], Oe);
-var pt = Object.defineProperty, ka = Object.getOwnPropertyDescriptor, Ya = (o, a, e) => a in o ? pt(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e, Xa = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? ka(a, e) : a, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
-  return t && r && pt(a, e, r), r;
-}, je = (o, a) => (e, t) => a(e, t, o), ft = (o, a, e) => Ya(o, typeof a != "symbol" ? a + "" : a, e);
+var _t = Object.defineProperty, ka = Object.getOwnPropertyDescriptor, Ya = (s, a, e) => a in s ? _t(s, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[a] = e, Xa = (s, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? ka(a, e) : a, i = s.length - 1, o; i >= 0; i--)
+    (o = s[i]) && (r = (t ? o(a, e, r) : o(r)) || r);
+  return t && r && _t(a, e, r), r;
+}, je = (s, a) => (e, t) => a(e, t, s), pt = (s, a, e) => Ya(s, typeof a != "symbol" ? a + "" : a, e);
 let we = class extends wt {
-  constructor(o = tt, a, e, t) {
-    super(), this._config = o, this._injector = a, this._commandService = e, this._configService = t;
+  constructor(s = tt, a, e, t) {
+    super(), this._config = s, this._injector = a, this._commandService = e, this._configService = t;
     const { ...r } = It(
       {},
       tt,
@@ -2333,18 +2333,18 @@ let we = class extends wt {
       [Ne],
       [Fe],
       [Ee]
-    ].forEach((o) => {
-      this._injector.add(o);
+    ].forEach((s) => {
+      this._injector.add(s);
     }), [
-      fa,
       pa,
-      va,
+      _a,
       Ra,
+      Sa,
       ya,
       Va,
-      Sa
-    ].forEach((o) => {
-      this._commandService.registerCommand(o);
+      va
+    ].forEach((s) => {
+      this._commandService.registerCommand(s);
     }), this._injector.get(q), this._injector.get(Oe), this._injector.get(Ee), this._injector.get(Fe);
   }
   onReady() {
@@ -2354,16 +2354,16 @@ let we = class extends wt {
     this._injector.get(Ce), this._injector.get(Te);
   }
 };
-ft(we, "pluginName", kt);
-ft(we, "type", N.UNIVER_SHEET);
+pt(we, "pluginName", kt);
+pt(we, "type", N.UNIVER_SHEET);
 we = Xa([
   Ot(xt),
-  je(1, R(Ge)),
+  je(1, S(Ge)),
   je(2, x),
   je(3, At)
 ], we);
-function or(o) {
-  const e = o.get(nt).getCurrentSelections().map((i) => i.range);
+function sr(s) {
+  const e = s.get(nt).getCurrentSelections().map((i) => i.range);
   return {
     uid: V.generateRandomId(6),
     type: T.DECIMAL,
@@ -2373,11 +2373,11 @@ function or(o) {
   };
 }
 export {
-  fa as AddSheetDataValidationCommand,
+  pa as AddSheetDataValidationCommand,
   Ve as CHECKBOX_FORMULA_1,
   Me as CHECKBOX_FORMULA_2,
-  sa as CheckboxValidator,
-  Sa as ClearRangeDataValidationCommand,
+  oa as CheckboxValidator,
+  va as ClearRangeDataValidationCommand,
   kt as DATA_VALIDATION_PLUGIN_NAME,
   q as DataValidationCacheService,
   P as DataValidationCustomFormulaService,
@@ -2391,17 +2391,17 @@ export {
   F as SheetDataValidationModel,
   Oe as SheetsDataValidationValidatorService,
   we as UniverSheetsDataValidationPlugin,
-  Ra as UpdateSheetDataValidationOptionsCommand,
-  pa as UpdateSheetDataValidationRangeCommand,
-  va as UpdateSheetDataValidationSettingCommand,
-  or as createDefaultNewRule,
-  fe as deserializeListOptions,
+  Sa as UpdateSheetDataValidationOptionsCommand,
+  _a as UpdateSheetDataValidationRangeCommand,
+  Ra as UpdateSheetDataValidationSettingCommand,
+  sr as createDefaultNewRule,
+  pe as deserializeListOptions,
   ne as getCellValueOrigin,
   ir as getDataValidationCellValue,
   be as getDataValidationDiffMutations,
-  _e as getFormulaCellData,
-  oe as getFormulaResult,
+  ge as getFormulaCellData,
+  se as getFormulaResult,
   C as isLegalFormulaResult,
   rr as serializeListOptions,
-  pe as transformCheckboxValue
+  _e as transformCheckboxValue
 };