@univerjs/sheets-data-validation 0.6.4 → 0.6.5-nightly.202503131607

package/lib/es/index.js

@@ -1,8 +1,8 @@
 var ft = Object.defineProperty;
 var vt = (o, a, e) => a in o ? ft(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e;
 var g = (o, a, e) => vt(o, typeof a != "symbol" ? a + "" : a, e);
-import { Inject as R, ICommandService as x, IUniverInstanceService as w, Disposable as W, ObjectMatrix as Se, UniverInstanceType as N, Range as b, Rectangle as I, isFormulaString as S, DataValidationType as T, getOriginCellValue as Rt, RBush as St, debounce as Vt, Tools as V, DataValidationStatus as D, WrapStrategy as Re, DataValidationOperator as h, numfmt as j, dayjs as at, DataValidationRenderMode as Be, CommandType as z, IUndoRedoService as Z, sequenceExecute as Ie, isRangesEqual as rt, generateRandomId as Mt, toDisposable as Qe, IPermissionService as yt, Injector as qe, CellValueType as Et, RxDisposable as Tt, LifecycleService as Ft, LifecycleStages as ze, bufferDebounceTime as Nt, DependentOn as Ct, IConfigService as wt, Plugin as Ot, merge as It } from "@univerjs/core";
-import { DataValidationModel as Ge, DataValidatorRegistryService as q, UpdateRuleType as y, BaseDataValidator as G, TextLengthErrorTitleMap as At, AddDataValidationMutation as L, RemoveDataValidationMutation as A, UpdateDataValidationMutation as E, getRuleSetting as Dt, getRuleOptions as bt, UniverDataValidationPlugin as Lt } from "@univerjs/data-validation";
+import { Inject as R, ICommandService as x, IUniverInstanceService as O, Disposable as W, ObjectMatrix as Se, UniverInstanceType as C, Range as L, Rectangle as A, isFormulaString as S, DataValidationType as T, getOriginCellValue as Rt, RBush as St, debounce as Et, Tools as E, DataValidationStatus as b, WrapStrategy as Re, DataValidationOperator as h, numfmt as j, dayjs as at, DataValidationRenderMode as Be, CommandType as z, IUndoRedoService as Z, sequenceExecute as Ae, isRangesEqual as rt, generateRandomId as Vt, toDisposable as Qe, IPermissionService as Mt, Injector as qe, CellValueType as yt, RxDisposable as Tt, LifecycleService as Ft, LifecycleStages as ze, bufferDebounceTime as Ct, DependentOn as wt, IConfigService as Ot, Plugin as It, merge as At } from "@univerjs/core";
+import { DataValidationModel as Ge, DataValidatorRegistryService as q, UpdateRuleType as M, BaseDataValidator as G, TextLengthErrorTitleMap as Dt, AddDataValidationMutation as N, RemoveDataValidationMutation as D, UpdateDataValidationMutation as y, getRuleSetting as bt, getRuleOptions as Lt, UniverDataValidationPlugin as Nt } from "@univerjs/data-validation";
 import { SetRangeValuesMutation as se, RemoveSheetMutation as it, getSheetCommandTarget as Ye, SetRangeValuesUndoMutationFactory as ot, WorksheetViewPermission as xt, RefRangeService as Bt, handleCommonDefaultRangeChangeWithEffectRefCommands as Ut, SheetInterceptorService as st, RemoveSheetCommand as Ht, SheetsSelectionsService as nt, ClearSelectionAllCommand as Wt } from "@univerjs/sheets";
 import { Subject as je, bufferWhen as Pt, filter as Ze } from "rxjs";
 import { RegisterOtherFormulaService as lt, FormulaRefRangeService as ut } from "@univerjs/sheets-formula";
@@ -41,7 +41,7 @@ let Q = class extends W {
         (e = this._cacheMatrix.get(t)) == null || e.delete(r);
       }
     })), this.disposeWithMe(this._univerInstanceService.unitDisposed$.subscribe((a) => {
-      a.type === N.UNIVER_SHEET && this._cacheMatrix.delete(a.getUnitId());
+      a.type === C.UNIVER_SHEET && this._cacheMatrix.delete(a.getUnitId());
     }));
   }
   _ensureCache(a, e) {
@@ -62,7 +62,7 @@ let Q = class extends W {
   markRangeDirty(a, e, t, r) {
     const i = this._ensureCache(a, e);
     t.forEach((s) => {
-      b.foreach(s, (n, l) => {
+      L.foreach(s, (n, l) => {
         i.setValue(n, l, void 0);
       });
     }), this._dirtyRanges$.next({ unitId: a, subUnitId: e, ranges: t, isSetRange: r });
@@ -70,7 +70,7 @@ let Q = class extends W {
   _deleteRange(a, e, t) {
     const r = this._ensureCache(a, e);
     t.forEach((i) => {
-      b.foreach(i, (s, n) => {
+      L.foreach(i, (s, n) => {
         r.realDeleteValue(s, n);
       });
     }), this._dirtyRanges$.next({ unitId: a, subUnitId: e, ranges: t });
@@ -81,7 +81,7 @@ let Q = class extends W {
 };
 Q = Xt([
   Je(0, R(x)),
-  Je(1, R(w))
+  Je(1, R(O))
 ], Q);
 function oe(o) {
   var a, e;
@@ -91,7 +91,7 @@ function _e(o) {
   var a;
   return (a = o == null ? void 0 : o[0]) == null ? void 0 : a[0];
 }
-function C(o) {
+function w(o) {
   return !$t.has(o);
 }
 function de(o, a) {
@@ -118,7 +118,7 @@ let H = class extends W {
     this.disposeWithMe(this._registerOtherFormulaService.formulaResult$.subscribe((a) => {
       for (const e in a) {
         const t = a[e];
-        if (this._instanceSrv.getUnitType(e) === N.UNIVER_SHEET)
+        if (this._instanceSrv.getUnitType(e) === C.UNIVER_SHEET)
           for (const i in t) {
             const s = t[i], { ruleFormulaMap: n } = this._ensureMaps(e, i);
             s.forEach((l) => {
@@ -144,7 +144,7 @@ let H = class extends W {
   _handleDirtyRanges(a, e, t) {
     this._dataValidationModel.getRules(a, e).forEach((i) => {
       const s = i.ranges;
-      I.doAnyRangesIntersect(s, t) && this.makeRuleDirty(a, e, i.uid);
+      A.doAnyRangesIntersect(s, t) && this.makeRuleDirty(a, e, i.uid);
     });
   }
   _initDirtyRanges() {
@@ -231,7 +231,7 @@ let H = class extends W {
   }
 };
 H = zt([
-  re(0, w),
+  re(0, O),
   re(1, R(lt)),
   re(2, R(Ge)),
   re(3, R(Q)),
@@ -252,7 +252,7 @@ let K = class extends W {
     this.disposeWithMe(this._registerOtherFormulaService.formulaResult$.subscribe((a) => {
       for (const e in a) {
         const t = a[e];
-        if (this._instanceService.getUnitType(e) === N.UNIVER_SHEET)
+        if (this._instanceService.getUnitType(e) === C.UNIVER_SHEET)
           for (const i in t) {
             const s = t[i], n = this._ensureRuleFormulaMap(e, i);
             s.forEach((l) => {
@@ -323,7 +323,7 @@ let K = class extends W {
   }
 };
 K = Jt([
-  ie(0, w),
+  ie(0, O),
   ie(1, R(lt)),
   ie(2, R(Q)),
   ie(3, R(Ge)),
@@ -358,19 +358,19 @@ class Xe {
         });
       }), this._tree.load(a), this._dirty = !1;
     });
-    g(this, "_debonceBuildTree", Vt(this._buildTree, 0));
+    g(this, "_debonceBuildTree", Et(this._buildTree, 0));
     this._unitId = e, this._subUnitId = t, this._univerInstanceService = r, this._disableTree = i, this._map = a, this._buildTree();
   }
   get _worksheet() {
     var a;
-    return (a = this._univerInstanceService.getUnit(this._unitId, N.UNIVER_SHEET)) == null ? void 0 : a.getSheetBySheetId(this._subUnitId);
+    return (a = this._univerInstanceService.getUnit(this._unitId, C.UNIVER_SHEET)) == null ? void 0 : a.getSheetBySheetId(this._subUnitId);
   }
   _addRule(a, e) {
     if (!this._worksheet)
       return;
-    const t = I.mergeRanges(e.map((r) => b.transformRange(r, this._worksheet)));
+    const t = A.mergeRanges(e.map((r) => L.transformRange(r, this._worksheet)));
     this._map.forEach((r, i) => {
-      const s = I.subtractMulti(r, t);
+      const s = A.subtractMulti(r, t);
       s.length === 0 ? this._map.delete(i) : this._map.set(i, s);
     }), this._dirty = !0, this._map.set(a, t), this._debonceBuildTree();
   }
@@ -380,9 +380,9 @@ class Xe {
   removeRange(a) {
     if (!this._worksheet)
       return;
-    const e = a.map((t) => b.transformRange(t, this._worksheet));
+    const e = a.map((t) => L.transformRange(t, this._worksheet));
     this._map.forEach((t, r) => {
-      const i = I.subtractMulti(t, e);
+      const i = A.subtractMulti(t, e);
       i.length === 0 ? this._map.delete(r) : this._map.set(r, i);
     }), this._dirty = !0, this._debonceBuildTree();
   }
@@ -400,10 +400,10 @@ 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) => {
+      r ? (this._map.set(e, A.mergeRanges([...r, ...t])), r = this._map.get(e)) : (r = t, this._map.set(e, r)), this._map.forEach((i, s) => {
         if (s === e)
           return;
-        const n = I.subtractMulti(i, t);
+        const n = A.subtractMulti(i, t);
         n.length === 0 ? this._map.delete(s) : this._map.set(s, n);
       });
     }), this._dirty = !0, this._debonceBuildTree();
@@ -414,11 +414,11 @@ class Xe {
     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({
+      s.length !== 0 && (s.length !== n.length || s.some((u, d) => !A.equals(u, n[d]))) && e.push({
         type: "update",
         ruleId: r.uid,
         oldRanges: n,
-        newRanges: I.sort(s),
+        newRanges: A.sort(s),
         rule: r
       }), s.length === 0 && (e.push({
         type: "delete",
@@ -433,11 +433,11 @@ class Xe {
     return a.forEach((i, s) => {
       var u;
       const n = (u = this._map.get(i.uid)) != null ? u : [], l = i.ranges;
-      n.length !== 0 && (n.length !== l.length || n.some((d, c) => !I.equals(d, l[c]))) && t.push({
+      n.length !== 0 && (n.length !== l.length || n.some((d, c) => !A.equals(d, l[c]))) && t.push({
         type: "update",
         ruleId: i.uid,
         oldRanges: l,
-        newRanges: I.sort(n),
+        newRanges: A.sort(n),
         rule: i
       }), n.length === 0 && (t.push({
         type: "delete",
@@ -451,14 +451,14 @@ class Xe {
         type: "add",
         rule: {
           ...i,
-          ranges: I.sort(s)
+          ranges: A.sort(s)
         }
       });
     }), t;
   }
   clone() {
     return new Xe(
-      new Map(V.deepClone(Array.from(this._map.entries()))),
+      new Map(E.deepClone(Array.from(this._map.entries()))),
       this._unitId,
       this._subUnitId,
       this._univerInstanceService,
@@ -556,7 +556,7 @@ let F = class extends W {
       ...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 === M.RANGE ? s.updateRange(t, i.payload) : i.type === M.ALL && s.updateRange(t, i.payload.ranges), this._dataValidationCacheService.removeRule(a, e, r), this._dataValidationCacheService.addRule(a, e, n), this._dataValidationFormulaService.removeRule(a, e, r.uid), this._dataValidationFormulaService.addRule(a, e, n), this._dataValidationCustomFormulaService.deleteByRuleId(a, e, t), this._dataValidationCustomFormulaService.addRule(a, e, n);
   }
   _removeRule(a, e, t) {
     this._ensureRuleMatrix(a, e).removeRule(t), this._dataValidationCacheService.removeRule(a, e, t), this._dataValidationCustomFormulaService.deleteByRuleId(a, e, t.uid);
@@ -585,7 +585,7 @@ let F = class extends W {
     }, d = l.getCellValueOnly(i, r), c = this.getValidator(a.type), m = l.getCellRaw(i, r), p = ne(m);
     if (c) {
       const _ = this._dataValidationCacheService.ensureCache(s, n), v = _.getValue(i, r);
-      return v == null ? (_.setValue(i, r, D.VALIDATING), c.validator(
+      return v == null ? (_.setValue(i, r, b.VALIDATING), c.validator(
         {
           value: p,
           unitId: s,
@@ -598,14 +598,14 @@ let F = class extends W {
           t: m == null ? void 0 : m.t
         },
         a
-      ).then((M) => {
-        const f = M ? D.VALID : D.INVALID;
-        f === D.VALID ? _.realDeleteValue(i, r) : _.setValue(i, r, f);
-        const O = _.getValue(i, r);
-        u(f, v !== O);
-      }), D.VALIDATING) : (u(v != null ? v : D.VALID, !1), v != null ? v : D.VALID);
+      ).then((V) => {
+        const f = V ? b.VALID : b.INVALID;
+        f === b.VALID ? _.realDeleteValue(i, r) : _.setValue(i, r, f);
+        const I = _.getValue(i, r);
+        u(f, v !== I);
+      }), b.VALIDATING) : (u(v != null ? v : b.VALID, !1), v != null ? v : b.VALID);
     } else
-      return u(D.VALID, !1), D.VALID;
+      return u(b.VALID, !1), b.VALID;
   }
   getRuleObjectMatrix(a, e) {
     return this._ensureRuleMatrix(a, e);
@@ -634,18 +634,18 @@ let F = class extends W {
 };
 F = ta([
   X(0, R(Ge)),
-  X(1, w),
+  X(1, O),
   X(2, R(q)),
   X(3, R(Q)),
   X(4, R(K)),
   X(5, R(H)),
   X(6, x)
 ], F);
-const Ve = 1, Me = 0;
+const Ee = 1, Ve = 0;
 function et(o, a) {
-  return V.isBlank(o) ? a.t("dataValidation.validFail.value") : S(o) ? a.t("dataValidation.validFail.primitive") : "";
+  return E.isBlank(o) ? a.t("dataValidation.validFail.value") : S(o) ? a.t("dataValidation.validFail.primitive") : "";
 }
-const pe = (o) => V.isDefine(o) && String(o).toLowerCase() === "true" ? "1" : String(o).toLowerCase() === "false" ? "0" : o;
+const pe = (o) => E.isDefine(o) && String(o).toLowerCase() === "true" ? "1" : String(o).toLowerCase() === "false" ? "0" : o;
 class aa extends G {
   constructor() {
     super(...arguments);
@@ -662,7 +662,7 @@ class aa extends G {
   }
   validatorFormula(e, t, r) {
     const { formula1: i, formula2: s } = e, n = i === s;
-    if (V.isBlank(i) && V.isBlank(s))
+    if (E.isBlank(i) && E.isBlank(s))
       return {
         success: !0
       };
@@ -681,7 +681,7 @@ class aa extends G {
   }
   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));
+    const { formula1: i = Ee, formula2: s = Ve } = 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 = w(String(l)) && w(String(u));
     return {
       formula1: pe(l),
       formula2: pe(u),
@@ -697,7 +697,7 @@ class aa extends G {
   }
   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));
+    const { formula1: i = Ee, formula2: s = Ve } = 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 = w(String(l)) && w(String(u));
     return {
       formula1: pe(l),
       formula2: pe(u),
@@ -708,7 +708,7 @@ class aa extends G {
   }
   async isValidType(e, t, r) {
     const { value: i, unitId: s, subUnitId: n } = e, { formula1: l, formula2: u, originFormula1: d, originFormula2: c } = await this.parseFormula(r, s, n);
-    return !V.isDefine(l) || !V.isDefine(u) ? !0 : V.isDefine(i) && (String(i) === String(l) || String(i) === String(u) || String(i) === String(d != null ? d : "") || String(i) === String(c != null ? c : ""));
+    return !E.isDefine(l) || !E.isDefine(u) ? !0 : E.isDefine(i) && (String(i) === String(l) || String(i) === String(u) || String(i) === String(d != null ? d : "") || String(i) === String(c != null ? c : ""));
   }
   generateRuleErrorMessage(e) {
     return this.localeService.t("dataValidation.checkbox.error");
@@ -743,7 +743,7 @@ const ia = {
   [h.LESS_THAN_OR_EQUAL]: "dataValidation.date.errorMsg.lessThanOrEqual",
   [h.NOT_BETWEEN]: "dataValidation.date.errorMsg.notBetween",
   [h.NOT_EQUAL]: "dataValidation.date.errorMsg.notEqual"
-}, Ae = [
+}, De = [
   h.BETWEEN,
   h.NOT_BETWEEN
 ], le = "{FORMULA1}", ue = "{FORMULA2}";
@@ -757,7 +757,7 @@ function Xa(o) {
   const a = ne(o);
   return a == null ? "" : a.toString();
 }
-function De(o, a, e) {
+function be(o, a, e) {
   const { formula1: t, formula2: r } = a, i = a.ranges[0].startRow, s = a.ranges[0].startColumn, n = e.row - i, l = e.col - s, u = S(t) ? o.moveFormulaRefOffset(t, l, n, !0) : t, d = S(r) ? o.moveFormulaRefOffset(r, l, n, !0) : r;
   return {
     transformedFormula1: u,
@@ -771,7 +771,7 @@ const Ue = (o) => {
   if (typeof o == "number" || !Number.isNaN(+o))
     return +o;
   const a = (e = j.parseDate(o)) == null ? void 0 : e.v;
-  return V.isDefine(a) ? a : (t = j.parseDate(at(o).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : t.v;
+  return E.isDefine(a) ? a : (t = j.parseDate(at(o).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : t.v;
 };
 class sa extends G {
   constructor() {
@@ -793,7 +793,7 @@ class sa extends G {
     g(this, "_lexerTreeBuilder", this.injector.get(Y));
   }
   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));
+    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 = w(String(n == null ? void 0 : n.v)) && w(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),
@@ -805,7 +805,7 @@ class sa extends G {
     return typeof r == "number" && typeof t == "string" ? !0 : typeof t == "string" ? !!j.parseDate(t) : !1;
   }
   _validatorSingleFormula(e) {
-    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e) || !!(e && j.parseDate(e)));
+    return !E.isBlank(e) && (S(e) || !Number.isNaN(+e) || !!(e && j.parseDate(e)));
   }
   validatorFormula(e, t, r) {
     const i = e.operator;
@@ -814,7 +814,7 @@ class sa extends G {
         success: !1
       };
     const s = this._validatorSingleFormula(e.formula1), n = this.localeService.t("dataValidation.validFail.date");
-    if (Ae.includes(i)) {
+    if (De.includes(i)) {
       const u = this._validatorSingleFormula(e.formula2);
       return {
         success: s && u,
@@ -868,7 +868,7 @@ class sa extends G {
   generateRuleErrorMessage(e, t) {
     if (!e.operator)
       return this.titleStr;
-    const { transformedFormula1: r, transformedFormula2: i } = De(this._lexerTreeBuilder, e, t);
+    const { transformedFormula1: r, transformedFormula2: i } = be(this._lexerTreeBuilder, e, t);
     return `${this.localeService.t(oa[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
   }
 }
@@ -884,7 +884,7 @@ const ht = {
   [h.NOT_BETWEEN]: "dataValidation.errorMsg.notBetween",
   [h.NOT_EQUAL]: "dataValidation.errorMsg.notEqual"
 };
-function ye(o) {
+function Me(o) {
   let a = o;
   return typeof o == "string" ? ((o.startsWith("¥") || o.startsWith("$")) && (a = o.slice(1)), +a) : +o;
 }
@@ -908,24 +908,24 @@ class na extends G {
     g(this, "scopes", ["sheet"]);
   }
   _isFormulaOrNumber(e) {
-    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e));
+    return !E.isBlank(e) && (S(e) || !Number.isNaN(+e));
   }
   async isValidType(e, t, r) {
     const { value: i } = e;
-    return !Number.isNaN(ye(i));
+    return !Number.isNaN(Me(i));
   }
   transform(e, t, r) {
     const { value: i } = e;
     return {
       ...e,
-      value: ye(i)
+      value: Me(i)
     };
   }
   _parseNumber(e) {
     return e == null ? Number.NaN : +e;
   }
   async parseFormula(e, t, r, i, s) {
-    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, s), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, s), { formula1: u, formula2: d } = e, c = C(String(n == null ? void 0 : n.v)) && C(String(l == null ? void 0 : l.v));
+    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 = w(String(n == null ? void 0 : n.v)) && w(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),
@@ -938,7 +938,7 @@ class na extends G {
       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 s = E.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), n = E.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), l = De.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: s && n,
       formula1: s ? void 0 : u,
@@ -951,7 +951,7 @@ class na extends G {
   generateRuleErrorMessage(e, t) {
     if (!e.operator)
       return this.titleStr;
-    const { transformedFormula1: r, transformedFormula2: i } = De(this._lexerTreeBuilder, e, t);
+    const { transformedFormula1: r, transformedFormula2: i } = be(this._lexerTreeBuilder, e, t);
     return `${this.localeService.t(ht[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
   }
 }
@@ -969,7 +969,7 @@ function He(o) {
             a.add(j.format(t.s.n.pattern, r, { throws: !1 }));
             return;
           }
-          C(r.toString()) && a.add(r.toString());
+          w(r.toString()) && a.add(r.toString());
         }
       });
     }
@@ -991,7 +991,7 @@ function da(o, a) {
   const { formula1: e = "", ranges: t } = o;
   if (dt(e.slice(1))) {
     const i = jt(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((s) => A.intersects(s, i.range)))
       return !0;
   }
   return !1;
@@ -1001,7 +1001,7 @@ class mt extends G {
     super(...arguments);
     g(this, "formulaService", this.injector.get(K));
     g(this, "_lexer", this.injector.get(Y));
-    g(this, "_univerInstanceService", this.injector.get(w));
+    g(this, "_univerInstanceService", this.injector.get(O));
     g(this, "offsetFormulaByRange", !1);
     g(this, "id", T.LIST);
     g(this, "title", "dataValidation.list.title");
@@ -1011,7 +1011,7 @@ class mt extends G {
   }
   validatorFormula(e, t, r) {
     var u, d, c;
-    const i = !V.isBlank(e.formula1), s = ua((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 = da(e, n != null ? n : "");
+    const i = !E.isBlank(e.formula1), s = ua((u = e.formula1) != null ? u : "", this._lexer), n = (c = (d = this._univerInstanceService.getUnit(t, C.UNIVER_SHEET)) == null ? void 0 : d.getSheetBySheetId(r)) == null ? void 0 : c.getName(), l = da(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")
@@ -1044,7 +1044,7 @@ class mt extends G {
     return {
       formula1: void 0,
       formula2: void 0,
-      isFormulaValid: C(String(s))
+      isFormulaValid: w(String(s))
     };
   }
   async isValidType(e, t, r) {
@@ -1060,7 +1060,7 @@ class mt extends G {
   }
   getList(e, t, r) {
     var m, p, _, v;
-    const { formula1: i = "" } = e, s = this.injector.get(w), n = (m = t ? s.getUniverSheetInstance(t) : void 0) != null ? m : s.getCurrentUnitForType(N.UNIVER_SHEET);
+    const { formula1: i = "" } = e, s = this.injector.get(O), n = (m = t ? s.getUniverSheetInstance(t) : void 0) != null ? m : s.getCurrentUnitForType(C.UNIVER_SHEET);
     if (!n) return [];
     const l = (p = r ? n.getSheetBySheetId(r) : void 0) != null ? p : n.getActiveSheet();
     if (!l) return [];
@@ -1069,7 +1069,7 @@ class mt extends G {
   }
   async getListAsync(e, t, r) {
     var m, p, _, v;
-    const { formula1: i = "" } = e, s = this.injector.get(w), n = (m = t ? s.getUniverSheetInstance(t) : void 0) != null ? m : s.getCurrentUnitForType(N.UNIVER_SHEET);
+    const { formula1: i = "" } = e, s = this.injector.get(O), n = (m = t ? s.getUniverSheetInstance(t) : void 0) != null ? m : s.getCurrentUnitForType(C.UNIVER_SHEET);
     if (!n) return [];
     const l = (p = r ? n.getSheetBySheetId(r) : void 0) != null ? p : n.getActiveSheet();
     if (!l) return [];
@@ -1107,7 +1107,7 @@ class ca extends G {
     g(this, "_customFormulaService", this.injector.get(H));
   }
   _isFormulaOrInt(e) {
-    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+    return !E.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
   }
   validatorFormula(e, t, r) {
     const i = e.operator;
@@ -1115,7 +1115,7 @@ class ca extends G {
       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 s = E.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = E.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = De.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: s && n,
       formula1: s ? void 0 : u,
@@ -1129,7 +1129,7 @@ class ca extends G {
     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));
+    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 = w(String(n == null ? void 0 : n.v)) && w(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),
@@ -1149,16 +1149,16 @@ class ca extends G {
   generateRuleErrorMessage(e, t) {
     if (!e.operator)
       return this.titleStr;
-    const { transformedFormula1: r, transformedFormula2: i } = De(this._lexerTreeBuilder, e, t);
-    return `${this.localeService.t(At[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
+    const { transformedFormula1: r, transformedFormula2: i } = be(this._lexerTreeBuilder, e, t);
+    return `${this.localeService.t(Dt[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
   }
 }
 function gt(o) {
   var e, t;
-  return o ? o.p ? !((t = (e = o.p.body) == null ? void 0 : e.dataStream) != null ? t : "").slice(0, -2).trim() : V.isBlank(o.v) : !0;
+  return o ? o.p ? !((t = (e = o.p.body) == null ? void 0 : e.dataStream) != null ? t : "").slice(0, -2).trim() : E.isBlank(o.v) : !0;
 }
-function be(o, a, e, t, r = "command", i = !0) {
-  const s = t.get(Y), n = t.get(q), l = [], u = [], d = t.get(F), c = t.get(w), m = Ye(c, { unitId: o, subUnitId: a });
+function Le(o, a, e, t, r = "command", i = !0) {
+  const s = t.get(Y), n = t.get(q), l = [], u = [], d = t.get(F), c = t.get(O), m = Ye(c, { unitId: o, subUnitId: a });
   if (!m)
     return {
       redoMutations: l,
@@ -1166,12 +1166,12 @@ function be(o, a, e, t, r = "command", i = !0) {
     };
   const { worksheet: p } = m, _ = new Se();
   let v = !1;
-  function M(f, O) {
+  function V(f, I) {
     i && f.forEach((P) => {
-      b.foreach(P, (B, $) => {
+      L.foreach(P, (B, $) => {
         const U = p.getCellRaw(B, $), J = ct(U);
-        (gt(U) || J === O) && !(U != null && U.p) && (v = !0, _.setValue(B, $, {
-          v: O,
+        (gt(U) || J === I) && !(U != null && U.p) && (v = !0, _.setValue(B, $, {
+          v: I,
           p: null
         }));
       });
@@ -1181,7 +1181,7 @@ function be(o, a, e, t, r = "command", i = !0) {
     switch (f.type) {
       case "delete":
         l.push({
-          id: A.id,
+          id: D.id,
           params: {
             unitId: o,
             subUnitId: a,
@@ -1189,7 +1189,7 @@ function be(o, a, e, t, r = "command", i = !0) {
             source: r
           }
         }), u.unshift({
-          id: L.id,
+          id: N.id,
           params: {
             unitId: o,
             subUnitId: a,
@@ -1203,13 +1203,13 @@ function be(o, a, e, t, r = "command", i = !0) {
         if (de(f.rule.type, n)) {
           const P = f.oldRanges[0].startRow, B = f.oldRanges[0].startColumn, $ = f.newRanges[0].startRow, U = f.newRanges[0].startColumn, J = $ - P, 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({
-            id: E.id,
+            id: y.id,
             params: {
               unitId: o,
               subUnitId: a,
               ruleId: f.ruleId,
               payload: {
-                type: y.ALL,
+                type: M.ALL,
                 payload: {
                   formula1: he,
                   formula2: me,
@@ -1218,13 +1218,13 @@ function be(o, a, e, t, r = "command", i = !0) {
               }
             }
           }), u.unshift({
-            id: E.id,
+            id: y.id,
             params: {
               unitId: o,
               subUnitId: a,
               ruleId: f.ruleId,
               payload: {
-                type: y.ALL,
+                type: M.ALL,
                 payload: {
                   formula1: f.rule.formula1,
                   formula2: f.rule.formula2,
@@ -1233,25 +1233,25 @@ function be(o, a, e, t, r = "command", i = !0) {
               }
             }
           })) : (l.push({
-            id: E.id,
+            id: y.id,
             params: {
               unitId: o,
               subUnitId: a,
               ruleId: f.ruleId,
               payload: {
-                type: y.RANGE,
+                type: M.RANGE,
                 payload: f.newRanges
               },
               source: r
             }
           }), u.unshift({
-            id: E.id,
+            id: y.id,
             params: {
               unitId: o,
               subUnitId: a,
               ruleId: f.ruleId,
               payload: {
-                type: y.RANGE,
+                type: M.RANGE,
                 payload: f.oldRanges
               },
               source: r
@@ -1259,40 +1259,40 @@ function be(o, a, e, t, r = "command", i = !0) {
           }));
         } else
           l.push({
-            id: E.id,
+            id: y.id,
             params: {
               unitId: o,
               subUnitId: a,
               ruleId: f.ruleId,
               payload: {
-                type: y.RANGE,
+                type: M.RANGE,
                 payload: f.newRanges
               },
               source: r
             }
           }), u.unshift({
-            id: E.id,
+            id: y.id,
             params: {
               unitId: o,
               subUnitId: a,
               ruleId: f.ruleId,
               payload: {
-                type: y.RANGE,
+                type: M.RANGE,
                 payload: f.oldRanges
               },
               source: r
             }
           });
-        const O = d.getRuleById(o, a, f.ruleId);
-        if (O && O.type === T.CHECKBOX) {
-          const B = d.getValidator(T.CHECKBOX).parseFormulaSync(O, o, a);
-          M(f.newRanges, B.formula2);
+        const I = d.getRuleById(o, a, f.ruleId);
+        if (I && I.type === T.CHECKBOX) {
+          const B = d.getValidator(T.CHECKBOX).parseFormulaSync(I, o, a);
+          V(f.newRanges, B.formula2);
         }
         break;
       }
       case "add": {
         if (l.push({
-          id: L.id,
+          id: N.id,
           params: {
             unitId: o,
             subUnitId: a,
@@ -1300,7 +1300,7 @@ function be(o, a, e, t, r = "command", i = !0) {
             source: r
           }
         }), u.unshift({
-          id: A.id,
+          id: D.id,
           params: {
             unitId: o,
             subUnitId: a,
@@ -1309,7 +1309,7 @@ function be(o, a, e, t, r = "command", i = !0) {
           }
         }), f.rule.type === T.CHECKBOX) {
           const P = d.getValidator(T.CHECKBOX).parseFormulaSync(f.rule, o, a);
-          M(f.rule.ranges, P.originFormula2);
+          V(f.rule.ranges, P.originFormula2);
         }
         break;
       }
@@ -1322,11 +1322,11 @@ function be(o, a, e, t, r = "command", i = !0) {
         subUnitId: a,
         cellValue: _.getData()
       }
-    }, O = {
+    }, I = {
       id: se.id,
       params: ot(t, f.params)
     };
-    l.push(f), u.push(O);
+    l.push(f), u.push(I);
   }
   return {
     redoMutations: l,
@@ -1344,12 +1344,12 @@ const ha = {
       return !1;
     const d = s.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(s.getRules(e, t)), { redoMutations: m, undoMutations: p } = Le(e, t, c, o);
     return l.pushUndoRedo({
       undoMutations: p,
       redoMutations: m,
       unitID: e
-    }), Ie(m, n), !0;
+    }), Ae(m, n), !0;
   }
 }, ma = {
   type: z.COMMAND,
@@ -1366,12 +1366,12 @@ const ha = {
         ...r,
         ...d == null ? void 0 : d.normalizeFormula(r, e, t)
       }
-    }, { redoMutations: m, undoMutations: p } = be(e, t, u, o);
+    }, { redoMutations: m, undoMutations: p } = Le(e, t, u, o);
     return m.push({
-      id: L.id,
+      id: N.id,
       params: c
     }), p.unshift({
-      id: A.id,
+      id: D.id,
       params: {
         unitId: e,
         subUnitId: t,
@@ -1381,7 +1381,7 @@ const ha = {
       unitID: e,
       redoMutations: m,
       undoMutations: p
-    }), Ie(m, s), !0;
+    }), Ae(m, s), !0;
   }
 }, ga = {
   type: z.COMMAND,
@@ -1404,44 +1404,44 @@ const ha = {
       subUnitId: n,
       ruleId: l,
       payload: {
-        type: y.SETTING,
+        type: M.SETTING,
         payload: {
           ...u,
           ...d.normalizeFormula(m, s, n)
         }
       }
     }, _ = [{
-      id: E.id,
+      id: y.id,
       params: p
     }], v = {
       unitId: s,
       subUnitId: n,
       ruleId: l,
       payload: {
-        type: y.SETTING,
-        payload: Dt(c)
+        type: M.SETTING,
+        payload: bt(c)
       }
-    }, M = [{
-      id: E.id,
+    }, V = [{
+      id: y.id,
       params: v
     }];
     if (u.type === T.CHECKBOX) {
-      const O = c.ranges, P = o.get(w), B = Ye(P, { unitId: s, subUnitId: n });
+      const I = c.ranges, P = o.get(O), B = Ye(P, { unitId: s, subUnitId: n });
       if (B) {
-        const $ = new Se(), { worksheet: U } = B, { formula2: J = Me, formula1: ce = Ve } = c, { formula2: he = Me, formula1: me = Ve } = u;
-        let Le = !1;
-        if (O.forEach((ge) => {
-          b.foreach(ge, (ae, xe) => {
+        const $ = new Se(), { worksheet: U } = B, { formula2: J = Ve, formula1: ce = Ee } = c, { formula2: he = Ve, formula1: me = Ee } = u;
+        let Ne = !1;
+        if (I.forEach((ge) => {
+          L.foreach(ge, (ae, xe) => {
             const k = U.getCellRaw(ae, xe), Ke = ct(k);
             (gt(k) || Ke === String(J)) && !(k != null && k.p) ? ($.setValue(ae, xe, {
               v: he,
               p: null
-            }), Le = !0) : Ke === String(ce) && !(k != null && k.p) && ($.setValue(ae, xe, {
+            }), Ne = !0) : Ke === String(ce) && !(k != null && k.p) && ($.setValue(ae, xe, {
               v: me,
               p: null
-            }), Le = !0);
+            }), Ne = !0);
           });
-        }), Le) {
+        }), Ne) {
           const ge = {
             id: se.id,
             params: {
@@ -1453,14 +1453,14 @@ const ha = {
             id: se.id,
             params: ot(o, ge.params)
           };
-          _.push(ge), M.push(ae);
+          _.push(ge), V.push(ae);
         }
       }
     }
-    return Ie(_, e).result ? (t.pushUndoRedo({
+    return Ae(_, e).result ? (t.pushUndoRedo({
       unitID: s,
       redoMutations: _,
-      undoMutations: M
+      undoMutations: V
     }), !0) : !1;
   }
 }, _a = {
@@ -1477,29 +1477,29 @@ const ha = {
       subUnitId: s,
       ruleId: n,
       payload: {
-        type: y.OPTIONS,
+        type: M.OPTIONS,
         payload: l
       }
     }, c = [{
-      id: E.id,
+      id: y.id,
       params: d
     }], m = {
       unitId: i,
       subUnitId: s,
       ruleId: n,
       payload: {
-        type: y.OPTIONS,
-        payload: bt(u)
+        type: M.OPTIONS,
+        payload: Lt(u)
       }
     }, p = [{
-      id: E.id,
+      id: y.id,
       params: m
     }];
     return t.pushUndoRedo({
       unitID: i,
       redoMutations: c,
       undoMutations: p
-    }), e.executeCommand(E.id, d), !0;
+    }), e.executeCommand(y.id, d), !0;
   }
 }, pa = {
   type: z.COMMAND,
@@ -1507,16 +1507,16 @@ const ha = {
   handler(o, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, ranges: r } = a, i = o.get(x), s = o.get(w), n = Ye(s, { unitId: e, subUnitId: t }), l = o.get(F);
+    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);
     if (!n) return !1;
     const u = o.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: p } = Le(e, t, c, o);
     return u.pushUndoRedo({
       unitID: e,
       redoMutations: m,
       undoMutations: p
-    }), Ie(m, i).result;
+    }), Ae(m, i).result;
   }
 }, fa = {
   type: z.COMMAND,
@@ -1529,10 +1529,10 @@ const ha = {
       subUnitId: t,
       ruleId: n.map((c) => c.uid)
     }, u = [{
-      id: A.id,
+      id: D.id,
       params: l
     }], d = [{
-      id: L.id,
+      id: N.id,
       params: {
         unitId: e,
         subUnitId: t,
@@ -1543,14 +1543,14 @@ const ha = {
       redoMutations: u,
       undoMutations: d,
       unitID: e
-    }), r.executeCommand(A.id, l), !0;
+    }), r.executeCommand(D.id, l), !0;
   }
 }, va = (o, a) => {
   const e = o.get(F), { unitId: t, subUnitId: r, ruleId: i, source: s } = a;
   if (Array.isArray(i)) {
     const l = i.map((u) => e.getRuleById(t, r, u)).filter(Boolean);
     return [{
-      id: L.id,
+      id: N.id,
       params: {
         unitId: t,
         subUnitId: r,
@@ -1560,7 +1560,7 @@ const ha = {
     }];
   }
   return [{
-    id: L.id,
+    id: N.id,
     params: {
       unitId: t,
       subUnitId: r,
@@ -1577,10 +1577,10 @@ const ha = {
     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 = [{
-      id: A.id,
+      id: D.id,
       params: a
     }], u = [{
-      id: L.id,
+      id: N.id,
       params: {
         unitId: e,
         subUnitId: t,
@@ -1594,15 +1594,15 @@ const ha = {
       undoMutations: u,
       redoMutations: l,
       unitID: a.unitId
-    }), i.executeCommand(A.id, a), !0;
+    }), i.executeCommand(D.id, a), !0;
   }
 }, Sa = "sheets-data-validation.config", tt = {};
-var Va = Object.getOwnPropertyDescriptor, Ma = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Va(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+var Ea = Object.getOwnPropertyDescriptor, Va = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Ea(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, We = (o, a) => (e, t) => a(e, t, o);
-let Ee = class extends W {
+let ye = class extends W {
   constructor(a, e, t) {
     super();
     g(this, "_disposableMap", /* @__PURE__ */ new Map());
@@ -1620,7 +1620,7 @@ let Ee = class extends W {
       if (u.length === 0)
         return {
           undos: [{
-            id: L.id,
+            id: N.id,
             params: {
               unitId: a,
               subUnitId: e,
@@ -1629,7 +1629,7 @@ let Ee = class extends W {
             }
           }],
           redos: [{
-            id: A.id,
+            id: D.id,
             params: {
               unitId: a,
               subUnitId: e,
@@ -1640,13 +1640,13 @@ let Ee = class extends W {
         };
       const d = [], c = [], m = u[0];
       d.push({
-        id: E.id,
+        id: y.id,
         params: {
           unitId: a,
           subUnitId: e,
           ruleId: t.uid,
           payload: {
-            type: y.ALL,
+            type: M.ALL,
             payload: {
               ranges: m.ranges,
               formula1: m.formulas[0],
@@ -1656,13 +1656,13 @@ let Ee = class extends W {
           source: "patched"
         }
       }), c.push({
-        id: E.id,
+        id: y.id,
         params: {
           unitId: a,
           subUnitId: e,
           ruleId: t.uid,
           payload: {
-            type: y.ALL,
+            type: M.ALL,
             payload: {
               ranges: r,
               formula1: i,
@@ -1673,9 +1673,9 @@ let Ee = class extends W {
         }
       });
       for (let p = 1; p < u.length; p++) {
-        const _ = u[p], v = Mt();
+        const _ = u[p], v = Vt();
         d.push({
-          id: L.id,
+          id: N.id,
           params: {
             unitId: a,
             subUnitId: e,
@@ -1689,7 +1689,7 @@ let Ee = class extends W {
             source: "patched"
           }
         }), c.push({
-          id: A.id,
+          id: D.id,
           params: {
             unitId: a,
             subUnitId: e,
@@ -1739,13 +1739,13 @@ let Ee = class extends W {
     }));
   }
 };
-Ee = Ma([
+ye = Va([
   We(0, R(F)),
   We(1, R(ut)),
   We(2, R(q))
-], 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 || {}), ya = Object.getOwnPropertyDescriptor, Ea = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? ya(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+], ye);
+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 || {}), Ma = Object.getOwnPropertyDescriptor, ya = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Ma(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, Pe = (o, a) => (e, t) => a(e, t, o);
@@ -1762,7 +1762,7 @@ let Te = class extends W {
       const i = a[r];
       if (typeof i == "string")
         continue;
-      const { token: s } = i, n = Qt(s), l = this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET);
+      const { token: s } = i, n = Qt(s), l = this._univerInstanceService.getCurrentUnitForType(C.UNIVER_SHEET);
       let u = l.getActiveSheet();
       const d = l.getUnitId();
       if (n.sheetName) {
@@ -1775,8 +1775,8 @@ let Te = class extends W {
         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];
+        for (let V = p; V <= _; V++) {
+          const f = (t = (e = u.getCell(v, V)) == null ? void 0 : e.selectionProtection) == null ? void 0 : t[0];
           if ((f == null ? void 0 : f[_t.View]) === !1)
             return !1;
         }
@@ -1784,9 +1784,9 @@ let Te = class extends W {
     return !0;
   }
 };
-Te = Ea([
-  Pe(0, w),
-  Pe(1, yt),
+Te = ya([
+  Pe(0, O),
+  Pe(1, Mt),
   Pe(2, R(Y))
 ], Te);
 var Ta = Object.getOwnPropertyDescriptor, Fa = (o, a, e, t) => {
@@ -1821,7 +1821,7 @@ let Fe = class extends W {
         subUnitId: e,
         ruleId: t.uid,
         payload: {
-          type: y.SETTING,
+          type: M.SETTING,
           payload: {
             type: m.type,
             formula1: m.formula1,
@@ -1835,7 +1835,7 @@ let Fe = class extends W {
         subUnitId: e,
         ruleId: t.uid,
         payload: {
-          type: y.SETTING,
+          type: M.SETTING,
           payload: {
             type: m.type,
             formula1: m.formula1,
@@ -1843,18 +1843,18 @@ let Fe = class extends W {
           }
         },
         source: "patched"
-      }, M = [
+      }, V = [
         {
-          id: E.id,
+          id: y.id,
           params: _
         }
       ], f = [
         {
-          id: E.id,
+          id: y.id,
           params: v
         }
       ];
-      return { redos: M, undos: f };
+      return { redos: V, undos: f };
     }, l = this._dataValidationFormulaService.getRuleFormulaInfo(a, e, r);
     if (l) {
       const [d, c] = l;
@@ -1890,27 +1890,27 @@ let Fe = class extends W {
           subUnitId: e,
           ruleId: t.uid,
           payload: {
-            type: y.RANGE,
+            type: M.RANGE,
             payload: m
           },
           source: "patched"
-        }, v = [{ id: E.id, params: _ }], M = [{
-          id: E.id,
+        }, v = [{ id: y.id, params: _ }], V = [{
+          id: y.id,
           params: {
             unitId: a,
             subUnitId: e,
             ruleId: t.uid,
             payload: {
-              type: y.RANGE,
+              type: M.RANGE,
               payload: d
             },
             source: "patched"
           }
         }];
-        return { redos: v, undos: M };
+        return { redos: v, undos: V };
       } else {
-        const _ = { unitId: a, subUnitId: e, ruleId: t.uid }, v = [{ id: A.id, params: _ }], M = va(this._injector, _);
-        return { redos: v, undos: M };
+        const _ = { unitId: a, subUnitId: e, ruleId: t.uid }, v = [{ id: D.id, params: _ }], V = va(this._injector, _);
+        return { redos: v, undos: V };
       }
     }, i = [];
     t.ranges.forEach((u) => {
@@ -1962,12 +1962,12 @@ Fe = Fa([
   ee(4, R(ut)),
   ee(5, R(q))
 ], Fe);
-var Na = Object.getOwnPropertyDescriptor, Ca = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Na(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+var Ca = Object.getOwnPropertyDescriptor, wa = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Ca(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, $e = (o, a) => (e, t) => a(e, t, o);
-let Ne = class extends W {
+let Ce = class extends W {
   constructor(o, a, e) {
     super(), this._sheetInterceptorService = o, this._univerInstanceService = a, this._sheetDataValidationModel = e, this._initSheetChange();
   }
@@ -1977,7 +1977,7 @@ let Ne = class extends W {
         getMutations: (o) => {
           var a;
           if (o.id === Ht.id) {
-            const e = o.params, t = e.unitId || this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET).getUnitId(), r = this._univerInstanceService.getUniverSheetInstance(t);
+            const e = o.params, t = e.unitId || this._univerInstanceService.getCurrentUnitForType(C.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());
@@ -1999,11 +1999,11 @@ let Ne = class extends W {
             };
             return {
               redos: [{
-                id: A.id,
+                id: D.id,
                 params: l
               }],
               undos: [{
-                id: L.id,
+                id: N.id,
                 params: u
               }]
             };
@@ -2014,12 +2014,12 @@ let Ne = class extends W {
     );
   }
 };
-Ne = Ca([
+Ce = wa([
   $e(0, R(st)),
-  $e(1, R(w)),
+  $e(1, R(O)),
   $e(2, R(F))
-], Ne);
-class wa extends G {
+], Ce);
+class Oa extends G {
   constructor() {
     super(...arguments);
     g(this, "id", T.ANY);
@@ -2047,7 +2047,7 @@ class wa extends G {
     return this.localeService.t("dataValidation.any.error");
   }
 }
-class Oa extends G {
+class Ia extends G {
   constructor() {
     super(...arguments);
     g(this, "id", T.CUSTOM);
@@ -2074,7 +2074,7 @@ class Oa extends G {
   }
   async isValidType(e, t, r) {
     const { column: i, row: s, unitId: n, subUnitId: l } = e, u = await this._customFormulaService.getCellFormulaValue(n, l, r.uid, s, i), d = u == null ? void 0 : u.v;
-    return C(String(d)) && V.isDefine(d) && d !== "" ? u.t === Et.BOOLEAN ? !!d : typeof d == "boolean" ? d : typeof d == "number" ? !!d : typeof d == "string" ? C(d) : !!d : !1;
+    return w(String(d)) && E.isDefine(d) && d !== "" ? u.t === yt.BOOLEAN ? !!d : typeof d == "boolean" ? d : typeof d == "number" ? !!d : typeof d == "string" ? w(d) : !!d : !1;
   }
   generateRuleErrorMessage(e) {
     return this.localeService.t("dataValidation.custom.error");
@@ -2084,7 +2084,7 @@ class Oa extends G {
     return this.localeService.t("dataValidation.custom.ruleName").replace("{FORMULA1}", (t = e.formula1) != null ? t : "");
   }
 }
-class Ia extends mt {
+class Aa extends mt {
   constructor() {
     super(...arguments);
     g(this, "id", T.LIST_MULTIPLE);
@@ -2093,7 +2093,7 @@ class Ia extends mt {
     g(this, "skipDefaultFontRender", () => !0);
   }
 }
-class Aa extends G {
+class Da extends G {
   constructor() {
     super(...arguments);
     g(this, "_customFormulaService", this.injector.get(H));
@@ -2113,24 +2113,24 @@ class Aa extends G {
     g(this, "scopes", ["sheet"]);
   }
   _isFormulaOrInt(e) {
-    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+    return !E.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
   }
   async isValidType(e, t, r) {
-    const { value: i } = e, s = ye(i);
+    const { value: i } = e, s = Me(i);
     return !Number.isNaN(s) && Number.isInteger(s);
   }
   transform(e, t, r) {
     const { value: i } = e;
     return {
       ...e,
-      value: ye(i)
+      value: Me(i)
     };
   }
   _parseNumber(e) {
     return e == null ? Number.NaN : +e;
   }
   async parseFormula(e, t, r, i, s) {
-    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, s), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, s), { formula1: u, formula2: d } = e, c = S(u) ? n == null ? void 0 : n.v : u, m = S(d) ? l == null ? void 0 : l.v : d, p = C(`${c}`) && C(`${m}`);
+    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 = w(`${c}`) && w(`${m}`);
     return {
       formula1: this._parseNumber(c),
       formula2: this._parseNumber(m),
@@ -2143,7 +2143,7 @@ class Aa extends G {
       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 s = E.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = E.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = De.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: s && n,
       formula1: s ? void 0 : u,
@@ -2156,16 +2156,16 @@ class Aa extends G {
   generateRuleErrorMessage(e, t) {
     if (!e.operator)
       return this.titleStr;
-    const { transformedFormula1: r, transformedFormula2: i } = De(this._lexerTreeBuilder, e, t);
+    const { transformedFormula1: r, transformedFormula2: i } = be(this._lexerTreeBuilder, e, t);
     return `${this.localeService.t(ht[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
   }
 }
-var Da = Object.getOwnPropertyDescriptor, ba = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Da(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+var ba = Object.getOwnPropertyDescriptor, La = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? ba(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, te = (o, a) => (e, t) => a(e, t, o);
-let Ce = class extends Tt {
+let we = class extends Tt {
   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();
   }
@@ -2174,15 +2174,15 @@ let Ce = class extends Tt {
   }
   _registerValidators() {
     [
-      wa,
+      Oa,
       na,
-      Aa,
+      Da,
       ca,
       sa,
       aa,
       mt,
-      Ia,
-      Oa
+      Aa,
+      Ia
     ].forEach((o) => {
       const a = this._injector.createInstance(o);
       this.disposeWithMe(this._dataValidatorRegistryService.register(a)), this.disposeWithMe(Qe(() => this._injector.delete(o)));
@@ -2193,12 +2193,12 @@ let Ce = class extends Tt {
       getMutations: (o) => {
         var a;
         if (o.id === Wt.id) {
-          const e = this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET), t = e.getUnitId(), r = e.getActiveSheet();
+          const e = this._univerInstanceService.getCurrentUnitForType(C.UNIVER_SHEET), t = e.getUnitId(), r = e.getActiveSheet();
           if (!r)
             throw new Error("No active sheet found");
           const i = r.getSheetId(), s = (a = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : a.map((c) => c.range), n = this._sheetDataValidationModel.getRuleObjectMatrix(t, i).clone();
           s && n.removeRange(s);
-          const l = n.diff(this._sheetDataValidationModel.getRules(t, i)), { redoMutations: u, undoMutations: d } = be(t, i, l, this._injector, "patched");
+          const l = n.diff(this._sheetDataValidationModel.getRules(t, i)), { redoMutations: u, undoMutations: d } = Le(t, i, l, this._injector, "patched");
           return {
             undos: d,
             redos: u
@@ -2212,20 +2212,20 @@ let Ce = class extends Tt {
     });
   }
 };
-Ce = ba([
-  te(0, w),
+we = La([
+  te(0, O),
   te(1, R(q)),
   te(2, R(qe)),
   te(3, R(nt)),
   te(4, R(st)),
   te(5, R(F))
-], Ce);
-var 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--)
+], we);
+var Na = Object.getOwnPropertyDescriptor, xa = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Na(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, ve = (o, a) => (e, t) => a(e, t, o);
-let we = class extends W {
+let Oe = class extends W {
   constructor(o, a, e, t) {
     super(), this._univerInstanceService = o, this._sheetDataValidationModel = a, this._dataValidationCacheService = e, this._lifecycleService = t, this._initRecalculate();
   }
@@ -2233,11 +2233,11 @@ let we = class extends W {
     const o = (a) => {
       if (a.length === 0)
         return;
-      const e = this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET), t = e == null ? void 0 : e.getActiveSheet(), r = {};
+      const e = this._univerInstanceService.getCurrentUnitForType(C.UNIVER_SHEET), t = e == null ? void 0 : e.getActiveSheet(), r = {};
       a.flat().forEach((i) => {
         r[i.unitId] || (r[i.unitId] = {}), r[i.unitId][i.subUnitId] || (r[i.unitId][i.subUnitId] = []);
-        const s = this._univerInstanceService.getUnit(i.unitId, N.UNIVER_SHEET), n = s == null ? void 0 : s.getSheetBySheetId(i.subUnitId);
-        n && r[i.unitId][i.subUnitId].push(...i.ranges.map((l) => b.transformRange(l, n)));
+        const s = this._univerInstanceService.getUnit(i.unitId, C.UNIVER_SHEET), n = s == null ? void 0 : s.getSheetBySheetId(i.subUnitId);
+        n && r[i.unitId][i.subUnitId].push(...i.ranges.map((l) => L.transformRange(l, n)));
       }), Object.entries(r).forEach(([i, s]) => {
         Object.entries(s).forEach(([n, l]) => {
           (e == null ? void 0 : e.getUnitId()) === i && (t == null ? void 0 : t.getSheetId()) === n ? this.validatorRanges(i, n, l) : requestIdleCallback(() => {
@@ -2246,21 +2246,21 @@ let we = class extends W {
         });
       });
     };
-    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Pt(() => this._lifecycleService.lifecycle$.pipe(Ze((a) => a === ze.Rendered)))).subscribe(o)), this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Ze(() => this._lifecycleService.stage >= ze.Rendered), Nt(20)).subscribe(o));
+    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Pt(() => 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));
   }
   async _validatorByCell(o, a, e, t) {
     const r = o.getUnitId(), i = a.getSheetId();
-    if (!V.isDefine(e) || !V.isDefine(t))
+    if (!E.isDefine(e) || !E.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) => {
         n(l);
       });
-    }) : D.VALID;
+    }) : b.VALID;
   }
   async validatorCell(o, a, e, t) {
-    const r = this._univerInstanceService.getUnit(o, N.UNIVER_SHEET);
+    const r = this._univerInstanceService.getUnit(o, C.UNIVER_SHEET);
     if (!r)
       throw new Error(`cannot find current workbook, unitId: ${o}`);
     const i = r.getSheetBySheetId(a);
@@ -2271,7 +2271,7 @@ let we = class extends W {
   validatorRanges(o, a, e) {
     if (!e.length)
       return Promise.resolve([]);
-    const t = this._univerInstanceService.getUnit(o, N.UNIVER_SHEET);
+    const t = this._univerInstanceService.getUnit(o, C.UNIVER_SHEET);
     if (!t)
       throw new Error(`cannot find current workbook, unitId: ${o}`);
     const r = t.getSheetBySheetId(a);
@@ -2279,13 +2279,13 @@ let we = class extends W {
       throw new Error(`cannot find current worksheet, sheetId: ${a}`);
     return Promise.all(e.map((i) => {
       const s = [];
-      return b.foreach(i, (n, l) => {
+      return L.foreach(i, (n, l) => {
         s.push(this._validatorByCell(t, r, n, l));
       }), Promise.all(s);
     }));
   }
   async validatorWorksheet(o, a) {
-    const e = this._univerInstanceService.getUnit(o, N.UNIVER_SHEET);
+    const e = this._univerInstanceService.getUnit(o, C.UNIVER_SHEET);
     if (!e)
       throw new Error(`cannot find current workbook, unitId: ${o}`);
     const t = e.getSheetBySheetId(a);
@@ -2294,7 +2294,7 @@ let we = class extends W {
     const r = this._sheetDataValidationModel.getRules(o, a);
     return await Promise.all(r.map((i) => Promise.all(i.ranges.map((s) => {
       const n = [];
-      return b.foreach(s, (l, u) => {
+      return L.foreach(s, (l, u) => {
         n.push(this._validatorByCell(e, t, l, u));
       }), n;
     })))), this._dataValidationCacheService.ensureCache(o, a);
@@ -2308,7 +2308,7 @@ let we = class extends W {
   getDataValidations(o, a, e) {
     const t = this._sheetDataValidationModel.getRuleObjectMatrix(o, a), r = /* @__PURE__ */ new Set();
     return e.forEach((s) => {
-      b.foreach(s, (n, l) => {
+      L.foreach(s, (n, l) => {
         const u = t.getValue(n, l);
         u && r.add(u);
       });
@@ -2318,21 +2318,21 @@ let we = class extends W {
     return this.getDataValidations(o, a, e)[0];
   }
 };
-we = xa([
-  ve(0, w),
+Oe = xa([
+  ve(0, O),
   ve(1, R(F)),
   ve(2, R(Q)),
   ve(3, R(Ft))
-], we);
+], Oe);
 var Ba = Object.defineProperty, Ua = Object.getOwnPropertyDescriptor, Ha = (o, a, e) => a in o ? Ba(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e, Wa = (o, a, e, t) => {
   for (var r = t > 1 ? void 0 : t ? Ua(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, ke = (o, a) => (e, t) => a(e, t, o), pt = (o, a, e) => Ha(o, typeof a != "symbol" ? a + "" : a, e);
-let Oe = class extends Ot {
+let Ie = class extends It {
   constructor(o = tt, a, e, t) {
     super(), this._config = o, this._injector = a, this._commandService = e, this._configService = t;
-    const { ...r } = It(
+    const { ...r } = At(
       {},
       tt,
       this._config
@@ -2344,13 +2344,13 @@ let Oe = class extends Ot {
       [Q],
       [K],
       [H],
-      [we],
+      [Oe],
       [F],
-      [Ce],
+      [we],
       [Te],
-      [Ne],
+      [Ce],
       [Fe],
-      [Ee]
+      [ye]
     ].forEach((o) => {
       this._injector.add(o);
     }), [
@@ -2363,27 +2363,27 @@ let Oe = class extends Ot {
       pa
     ].forEach((o) => {
       this._commandService.registerCommand(o);
-    }), this._injector.get(Q), this._injector.get(we), this._injector.get(Ce), this._injector.get(Ee), this._injector.get(Fe);
+    }), this._injector.get(Q), this._injector.get(Oe), this._injector.get(we), this._injector.get(ye), this._injector.get(Fe);
   }
   onReady() {
-    this._injector.get(Ne);
+    this._injector.get(Ce);
   }
   onRendered() {
     this._injector.get(Te);
   }
 };
-pt(Oe, "pluginName", Gt);
-pt(Oe, "type", N.UNIVER_SHEET);
-Oe = Wa([
-  Ct(Lt),
+pt(Ie, "pluginName", Gt);
+pt(Ie, "type", C.UNIVER_SHEET);
+Ie = Wa([
+  wt(Nt),
   ke(1, R(qe)),
   ke(2, x),
-  ke(3, wt)
-], Oe);
+  ke(3, Ot)
+], Ie);
 function Ka(o) {
   const e = o.get(nt).getCurrentSelections().map((i) => i.range);
   return {
-    uid: V.generateRandomId(6),
+    uid: E.generateRandomId(6),
     type: T.DECIMAL,
     operator: h.EQUAL,
     formula1: "100",
@@ -2392,8 +2392,8 @@ function Ka(o) {
 }
 export {
   ma as AddSheetDataValidationCommand,
-  Ve as CHECKBOX_FORMULA_1,
-  Me as CHECKBOX_FORMULA_2,
+  Ee as CHECKBOX_FORMULA_1,
+  Ve as CHECKBOX_FORMULA_2,
   aa as CheckboxValidator,
   pa as ClearRangeDataValidationCommand,
   Gt as DATA_VALIDATION_PLUGIN_NAME,
@@ -2402,13 +2402,13 @@ export {
   Te as DataValidationFormulaController,
   K as DataValidationFormulaService,
   sa as DateValidator,
-  Ia as ListMultipleValidator,
+  Aa as ListMultipleValidator,
   mt as ListValidator,
   fa as RemoveSheetAllDataValidationCommand,
   Ra as RemoveSheetDataValidationCommand,
   F as SheetDataValidationModel,
-  we as SheetsDataValidationValidatorService,
-  Oe as UniverSheetsDataValidationPlugin,
+  Oe as SheetsDataValidationValidatorService,
+  Ie as UniverSheetsDataValidationPlugin,
   _a as UpdateSheetDataValidationOptionsCommand,
   ha as UpdateSheetDataValidationRangeCommand,
   ga as UpdateSheetDataValidationSettingCommand,
@@ -2416,10 +2416,10 @@ export {
   fe as deserializeListOptions,
   ne as getCellValueOrigin,
   Xa as getDataValidationCellValue,
-  be as getDataValidationDiffMutations,
+  Le as getDataValidationDiffMutations,
   _e as getFormulaCellData,
   oe as getFormulaResult,
-  C as isLegalFormulaResult,
+  w as isLegalFormulaResult,
   Ya as serializeListOptions,
   pe as transformCheckboxValue
 };