@univerjs/sheets-data-validation 0.6.10 → 0.7.0-beta.0

package/lib/index.js

@@ -1,9 +1,9 @@
 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 m = (o, a, e) => Rt(o, typeof a != "symbol" ? a + "" : a, e);
-import { Inject as R, ICommandService as U, IUniverInstanceService as O, Disposable as P, ObjectMatrix as Se, UniverInstanceType as N, Range as b, Rectangle as A, isFormulaString as S, DataValidationType as T, getOriginCellValue as St, RBush as Mt, debounce as Vt, Tools as M, DataValidationStatus as D, WrapStrategy as Re, DataValidationOperator as h, numfmt as j, dayjs as it, DataValidationRenderMode as Be, CommandType as z, IUndoRedoService as Z, sequenceExecute as Ie, isRangesEqual as ot, 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, IConfigService as wt, Plugin as At, merge as It } from "@univerjs/core";
+import { Inject as R, ICommandService as U, IUniverInstanceService as O, Disposable as W, ObjectMatrix as Se, UniverInstanceType as N, Range as b, Rectangle as A, isFormulaString as S, DataValidationType as T, getOriginCellValue as St, RBush as Vt, debounce as Mt, Tools as V, DataValidationStatus as D, WrapStrategy as Re, DataValidationOperator as h, numfmt as H, dayjs as it, DataValidationRenderMode as xe, CommandType as z, IUndoRedoService as Z, sequenceExecute as Ie, isRangesEqual as ot, 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, IConfigService as wt, Plugin as At, merge as It } from "@univerjs/core";
 import { DataValidationModel as Ye, DataValidatorRegistryService as q, UpdateRuleType as y, BaseDataValidator as G, TextLengthErrorTitleMap as Dt, AddDataValidationMutation as L, RemoveDataValidationMutation as I, UpdateDataValidationMutation as E, getRuleSetting as bt, getRuleOptions as Lt, UniverDataValidationPlugin as Ut } from "@univerjs/data-validation";
-import { SetRangeValuesMutation as se, RemoveSheetMutation as st, getSheetCommandTarget as Xe, SetRangeValuesUndoMutationFactory as nt, WorksheetViewPermission as xt, RefRangeService as Bt, handleCommonDefaultRangeChangeWithEffectRefCommands as Ht, SheetInterceptorService as lt, RemoveSheetCommand as Pt, SheetsSelectionsService as ut, ClearSelectionAllCommand as Wt } from "@univerjs/sheets";
+import { SetRangeValuesMutation as se, RemoveSheetMutation as st, getSheetCommandTarget as Xe, SetRangeValuesUndoMutationFactory as nt, WorksheetViewPermission as Bt, RefRangeService as xt, handleCommonDefaultRangeChangeWithEffectRefCommands as Ht, SheetInterceptorService as lt, RemoveSheetCommand as Pt, SheetsSelectionsService as ut, ClearSelectionAllCommand as Wt } from "@univerjs/sheets";
 import { Subject as Qe, bufferWhen as $t, filter as Je } from "rxjs";
 import { RegisterOtherFormulaService as dt, FormulaRefRangeService as ct } from "@univerjs/sheets-formula";
 import { ERROR_TYPE_SET as kt, LexerTreeBuilder as Y, isReferenceString as ht, sequenceNodeType as jt, deserializeRangeWithSheet as Qt, deserializeRangeWithSheetWithCache as qt, operatorToken as Gt } from "@univerjs/engine-formula";
@@ -13,7 +13,7 @@ var Xt = Object.getOwnPropertyDescriptor, Kt = (o, a, e, t) => {
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, et = (o, a) => (e, t) => a(e, t, o);
-let Q = class extends P {
+let Q = class extends W {
   constructor(a, e) {
     super();
     m(this, "_cacheMatrix", /* @__PURE__ */ new Map());
@@ -104,7 +104,7 @@ var zt = Object.getOwnPropertyDescriptor, Zt = (o, a, e, t) => {
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, re = (o, a) => (e, t) => a(e, t, o);
-let H = class extends P {
+let P = class extends W {
   constructor(a, e, t, r, i) {
     super();
     /**
@@ -230,19 +230,19 @@ let H = class extends P {
     r && this._registerOtherFormulaService.markFormulaDirty(a, e, r.formulaId), i && this._registerOtherFormulaService.markFormulaDirty(a, e, i.formulaId);
   }
 };
-H = Zt([
+P = Zt([
   re(0, O),
   re(1, R(dt)),
   re(2, R(Ye)),
   re(3, R(Q)),
   re(4, R(q))
-], H);
+], P);
 var Jt = Object.getOwnPropertyDescriptor, ea = (o, a, e, t) => {
   for (var r = t > 1 ? void 0 : t ? Jt(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, ie = (o, a) => (e, t) => a(e, t, o);
-let K = class extends P {
+let K = class extends W {
   constructor(a, e, t, r, i) {
     super();
     m(this, "_formulaRuleMap", /* @__PURE__ */ new Map());
@@ -339,7 +339,7 @@ function mt(o) {
 class Ke {
   constructor(a, e, t, r, i = !1) {
     m(this, "_map");
-    m(this, "_tree", new Mt());
+    m(this, "_tree", new Vt());
     m(this, "_dirty", !0);
     m(this, "_buildTree", () => {
       if (!this._dirty || this._disableTree)
@@ -358,7 +358,7 @@ class Ke {
         });
       }), this._tree.load(a), this._dirty = !1;
     });
-    m(this, "_debonceBuildTree", Vt(this._buildTree, 0));
+    m(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() {
@@ -458,7 +458,7 @@ class Ke {
   }
   clone() {
     return new Ke(
-      new Map(M.deepClone(Array.from(this._map.entries()))),
+      new Map(V.deepClone(Array.from(this._map.entries()))),
       this._unitId,
       this._subUnitId,
       this._univerInstanceService,
@@ -482,7 +482,7 @@ var ta = Object.getOwnPropertyDescriptor, aa = (o, a, e, t) => {
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, X = (o, a) => (e, t) => a(e, t, o);
-let F = class extends P {
+let F = class extends W {
   constructor(a, e, t, r, i, s, n) {
     super();
     m(this, "_ruleMatrixMap", /* @__PURE__ */ new Map());
@@ -598,8 +598,8 @@ let F = class extends P {
           t: g == null ? void 0 : g.t
         },
         a
-      ).then((V) => {
-        const f = V ? D.VALID : D.INVALID, w = _.getValue(i, r);
+      ).then((M) => {
+        const f = M ? D.VALID : D.INVALID, w = _.getValue(i, r);
         f === D.VALID ? _.realDeleteValue(i, r) : _.setValue(i, r, f), u(f, v !== w);
       }), D.VALIDATING) : (u(v != null ? v : D.VALID, !1), v != null ? v : D.VALID);
     } else
@@ -636,14 +636,14 @@ F = aa([
   X(2, R(q)),
   X(3, R(Q)),
   X(4, R(K)),
-  X(5, R(H)),
+  X(5, R(P)),
   X(6, U)
 ], F);
-const Me = 1, Ve = 0;
+const Ve = 1, Me = 0;
 function tt(o, a) {
-  return M.isBlank(o) ? a.t("dataValidation.validFail.value") : S(o) ? a.t("dataValidation.validFail.primitive") : "";
+  return V.isBlank(o) ? a.t("dataValidation.validFail.value") : S(o) ? a.t("dataValidation.validFail.primitive") : "";
 }
-const pe = (o) => M.isDefine(o) && String(o).toLowerCase() === "true" ? "1" : String(o).toLowerCase() === "false" ? "0" : o;
+const pe = (o) => V.isDefine(o) && String(o).toLowerCase() === "true" ? "1" : String(o).toLowerCase() === "false" ? "0" : o;
 class ra extends G {
   constructor() {
     super(...arguments);
@@ -661,7 +661,7 @@ class ra extends G {
   }
   validatorFormula(e, t, r) {
     const { formula1: i, formula2: s } = e, n = i === s;
-    if (M.isBlank(i) && M.isBlank(s))
+    if (V.isBlank(i) && V.isBlank(s))
       return {
         success: !0
       };
@@ -680,7 +680,7 @@ class ra extends G {
   }
   async parseFormula(e, t, r) {
     var c, g, p, _;
-    const { formula1: i = Me, formula2: s = Ve } = e, n = await this._formulaService.getRuleFormulaResult(t, r, e.uid), l = S(i) ? oe((g = (c = n == null ? void 0 : n[0]) == null ? void 0 : c.result) == null ? void 0 : g[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 = Ve, formula2: s = Me } = e, n = await this._formulaService.getRuleFormulaResult(t, r, e.uid), l = S(i) ? oe((g = (c = n == null ? void 0 : n[0]) == null ? void 0 : c.result) == null ? void 0 : g[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));
     return {
       formula1: pe(l),
       formula2: pe(u),
@@ -696,7 +696,7 @@ class ra extends G {
   }
   parseFormulaSync(e, t, r) {
     var c, g, p, _;
-    const { formula1: i = Me, formula2: s = Ve } = e, n = this._formulaService.getRuleFormulaResultSync(t, r, e.uid), l = S(i) ? oe((g = (c = n == null ? void 0 : n[0]) == null ? void 0 : c.result) == null ? void 0 : g[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 = Ve, formula2: s = Me } = e, n = this._formulaService.getRuleFormulaResultSync(t, r, e.uid), l = S(i) ? oe((g = (c = n == null ? void 0 : n[0]) == null ? void 0 : c.result) == null ? void 0 : g[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));
     return {
       formula1: pe(l),
       formula2: pe(u),
@@ -707,7 +707,7 @@ class ra 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 !M.isDefine(l) || !M.isDefine(u) ? !0 : M.isDefine(i) && (String(i) === String(l) || String(i) === String(u) || String(i) === String(d != null ? d : "") || String(i) === String(c != null ? c : ""));
+    return !V.isDefine(l) || !V.isDefine(u) ? !0 : V.isDefine(i) && (String(i) === String(l) || String(i) === String(u) || String(i) === String(d != null ? d : "") || String(i) === String(c != null ? c : ""));
   }
   generateRuleErrorMessage(e) {
     return this.localeService.t("dataValidation.checkbox.error");
@@ -774,8 +774,8 @@ const He = (o) => {
     return;
   if (typeof o == "number" || !Number.isNaN(+o))
     return +o;
-  const a = (e = j.parseDate(o)) == null ? void 0 : e.v;
-  return M.isDefine(a) ? a : (t = j.parseDate(it(o).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : t.v;
+  const a = (e = H.parseDate(o)) == null ? void 0 : e.v;
+  return V.isDefine(a) ? a : (t = H.parseDate(it(o).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : t.v;
 };
 class sa extends G {
   constructor() {
@@ -794,7 +794,7 @@ class sa extends G {
       h.NOT_EQUAL
     ]);
     m(this, "scopes", ["sheet"]);
-    m(this, "_customFormulaService", this.injector.get(H));
+    m(this, "_customFormulaService", this.injector.get(P));
     m(this, "_lexerTreeBuilder", this.injector.get(Y));
   }
   async parseFormula(e, t, r, i, s) {
@@ -807,10 +807,10 @@ class sa extends G {
   }
   async isValidType(e) {
     const { interceptValue: t, value: r } = e;
-    return typeof r == "number" && typeof t == "string" ? !0 : typeof t == "string" ? !!j.parseDate(t) : !1;
+    return typeof r == "number" && typeof t == "string" ? !!H.parseDate(t) : typeof t == "string" ? !!H.parseDate(t) : !1;
   }
   _validatorSingleFormula(e) {
-    return !M.isBlank(e) && (S(e) || !Number.isNaN(+e) || !!(e && j.parseDate(e)));
+    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e) || !!(e && H.parseDate(e)));
   }
   validatorFormula(e, t, r) {
     const i = e.operator;
@@ -839,12 +839,12 @@ class sa extends G {
         return u;
       let d;
       if (!Number.isNaN(+u))
-        d = j.dateFromSerial(+u);
+        d = H.dateFromSerial(+u);
       else {
-        const g = (c = j.parseDate(u)) == null ? void 0 : c.v;
+        const g = (c = H.parseDate(u)) == null ? void 0 : c.v;
         if (g == null)
           return "";
-        d = j.dateFromSerial(g);
+        d = H.dateFromSerial(g);
       }
       return it(`${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");
     };
@@ -891,13 +891,12 @@ const ye = {
   NONE: "dataValidation.errorMsg.legal"
 };
 function Ee(o) {
-  let a = o;
-  return typeof o == "string" ? ((o.startsWith("¥") || o.startsWith("$")) && (a = o.slice(1)), +a) : +o;
+  return +o;
 }
 class na extends G {
   constructor() {
     super(...arguments);
-    m(this, "_customFormulaService", this.injector.get(H));
+    m(this, "_customFormulaService", this.injector.get(P));
     m(this, "id", T.DECIMAL);
     m(this, "_lexerTreeBuilder", this.injector.get(Y));
     m(this, "title", "dataValidation.decimal.title");
@@ -915,7 +914,7 @@ class na extends G {
     m(this, "scopes", ["sheet"]);
   }
   _isFormulaOrNumber(e) {
-    return !M.isBlank(e) && (S(e) || !Number.isNaN(+e));
+    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e));
   }
   async isValidType(e, t, r) {
     const { value: i } = e;
@@ -945,7 +944,7 @@ class na extends G {
       return {
         success: !0
       };
-    const s = M.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), n = M.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), l = De.includes(i), u = this.localeService.t("dataValidation.validFail.number");
+    const s = V.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), l = De.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: s && n,
       formula1: s ? void 0 : u,
@@ -973,7 +972,7 @@ function Pe(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)) {
-            a.add(j.format(t.s.n.pattern, r, { throws: !1 }));
+            a.add(H.format(t.s.n.pattern, r, { throws: !1 }));
             return;
           }
           C(r.toString()) && a.add(r.toString());
@@ -1015,11 +1014,11 @@ class gt extends G {
     m(this, "title", "dataValidation.list.title");
     m(this, "operators", []);
     m(this, "scopes", ["sheet"]);
-    m(this, "skipDefaultFontRender", (e) => e.renderMode !== Be.TEXT);
+    m(this, "skipDefaultFontRender", (e) => e.renderMode !== xe.TEXT);
   }
   validatorFormula(e, t, r) {
     var u, d, c;
-    const i = !M.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 = !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 : "");
     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")
@@ -1028,7 +1027,7 @@ class gt extends G {
   getExtraStyle(e, t, { style: r }) {
     var s;
     const i = (s = r.tb !== Re.OVERFLOW ? r.tb : Re.CLIP) != null ? s : Re.WRAP;
-    if (e.type === T.LIST && (e.renderMode === Be.ARROW || e.renderMode === Be.TEXT)) {
+    if (e.type === T.LIST && (e.renderMode === xe.ARROW || e.renderMode === xe.TEXT)) {
       const n = this.getListWithColorMap(e), l = `${t != null ? t : ""}`, u = n[l];
       if (u)
         return {
@@ -1113,10 +1112,10 @@ class ca extends G {
       h.NOT_EQUAL
     ]);
     m(this, "scopes", ["sheet"]);
-    m(this, "_customFormulaService", this.injector.get(H));
+    m(this, "_customFormulaService", this.injector.get(P));
   }
   _isFormulaOrInt(e) {
-    return !M.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
   }
   validatorFormula(e, t, r) {
     const i = e.operator;
@@ -1124,7 +1123,7 @@ class ca extends G {
       return {
         success: !1
       };
-    const s = M.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = M.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = De.includes(i), u = this.localeService.t("dataValidation.validFail.number");
+    const s = V.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = De.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: s && n,
       formula1: s ? void 0 : u,
@@ -1164,7 +1163,7 @@ class ca extends G {
 }
 function _t(o) {
   var e, t;
-  return o ? o.p ? !((t = (e = o.p.body) == null ? void 0 : e.dataStream) != null ? t : "").slice(0, -2).trim() : M.isBlank(o.v) : !0;
+  return o ? o.p ? !((t = (e = o.p.body) == null ? void 0 : e.dataStream) != null ? t : "").slice(0, -2).trim() : V.isBlank(o.v) : !0;
 }
 function 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), g = Xe(c, { unitId: o, subUnitId: a });
@@ -1175,11 +1174,11 @@ function Le(o, a, e, t, r = "command", i = !0) {
     };
   const { worksheet: p } = g, _ = new Se();
   let v = !1;
-  function V(f, w) {
-    i && f.forEach((W) => {
-      b.foreach(W, (x, $) => {
-        const B = p.getCellRaw(x, $), J = mt(B);
-        (_t(B) || J === w) && !(B != null && B.p) && (v = !0, _.setValue(x, $, {
+  function M(f, w) {
+    i && f.forEach(($) => {
+      b.foreach($, (B, k) => {
+        const x = p.getCellRaw(B, k), J = mt(x);
+        (_t(x) || J === w) && !(x != null && x.p) && (v = !0, _.setValue(B, k, {
           v: w,
           p: null
         }));
@@ -1210,7 +1209,7 @@ function Le(o, a, e, t, r = "command", i = !0) {
         break;
       case "update": {
         if (de(f.rule.type, n)) {
-          const W = f.oldRanges[0].startRow, x = f.oldRanges[0].startColumn, $ = f.newRanges[0].startRow, B = f.newRanges[0].startColumn, J = $ - W, ce = B - x, 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;
+          const $ = f.oldRanges[0].startRow, B = f.oldRanges[0].startColumn, k = f.newRanges[0].startRow, x = f.newRanges[0].startColumn, J = k - $, ce = x - 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 || !ot(f.newRanges, f.oldRanges) ? (l.push({
             id: E.id,
             params: {
@@ -1294,8 +1293,8 @@ function Le(o, a, e, t, r = "command", i = !0) {
           });
         const w = d.getRuleById(o, a, f.ruleId);
         if (w && w.type === T.CHECKBOX) {
-          const x = d.getValidator(T.CHECKBOX).parseFormulaSync(w, o, a);
-          V(f.newRanges, x.formula2);
+          const B = d.getValidator(T.CHECKBOX).parseFormulaSync(w, o, a);
+          M(f.newRanges, B.formula2);
         }
         break;
       }
@@ -1317,8 +1316,8 @@ function Le(o, a, e, t, r = "command", i = !0) {
             source: r
           }
         }), f.rule.type === T.CHECKBOX) {
-          const W = d.getValidator(T.CHECKBOX).parseFormulaSync(f.rule, o, a);
-          V(f.rule.ranges, W.originFormula2);
+          const $ = d.getValidator(T.CHECKBOX).parseFormulaSync(f.rule, o, a);
+          M(f.rule.ranges, $.originFormula2);
         }
         break;
       }
@@ -1430,22 +1429,22 @@ const ha = {
         type: y.SETTING,
         payload: bt(c)
       }
-    }, V = [{
+    }, M = [{
       id: E.id,
       params: v
     }];
     if (u.type === T.CHECKBOX) {
-      const w = c.ranges, W = o.get(O), x = Xe(W, { unitId: s, subUnitId: n });
-      if (x) {
-        const $ = new Se(), { worksheet: B } = x, { formula2: J = Ve, formula1: ce = Me } = c, { formula2: he = Ve, formula1: me = Me } = u;
+      const w = c.ranges, $ = o.get(O), B = Xe($, { unitId: s, subUnitId: n });
+      if (B) {
+        const k = new Se(), { worksheet: x } = B, { formula2: J = Me, formula1: ce = Ve } = c, { formula2: he = Me, formula1: me = Ve } = u;
         let Ue = !1;
         if (w.forEach((ge) => {
-          b.foreach(ge, (ae, xe) => {
-            const k = B.getCellRaw(ae, xe), ze = mt(k);
-            (_t(k) || ze === String(J)) && !(k != null && k.p) ? ($.setValue(ae, xe, {
+          b.foreach(ge, (ae, Be) => {
+            const j = x.getCellRaw(ae, Be), ze = mt(j);
+            (_t(j) || ze === String(J)) && !(j != null && j.p) ? (k.setValue(ae, Be, {
               v: he,
               p: null
-            }), Ue = !0) : ze === String(ce) && !(k != null && k.p) && ($.setValue(ae, xe, {
+            }), Ue = !0) : ze === String(ce) && !(j != null && j.p) && (k.setValue(ae, Be, {
               v: me,
               p: null
             }), Ue = !0);
@@ -1456,20 +1455,20 @@ const ha = {
             params: {
               unitId: s,
               subUnitId: n,
-              cellValue: $.getData()
+              cellValue: k.getData()
             }
           }, ae = {
             id: se.id,
             params: nt(o, ge.params)
           };
-          _.push(ge), V.push(ae);
+          _.push(ge), M.push(ae);
         }
       }
     }
     return Ie(_, e).result ? (t.pushUndoRedo({
       unitID: s,
       redoMutations: _,
-      undoMutations: V
+      undoMutations: M
     }), !0) : !1;
   }
 }, _a = {
@@ -1606,12 +1605,12 @@ const ha = {
     }), i.executeCommand(I.id, a), !0;
   }
 }, Sa = "sheets-data-validation.config", rt = {};
-var Ma = Object.getOwnPropertyDescriptor, Va = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Ma(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+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--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, We = (o, a) => (e, t) => a(e, t, o);
-let Te = class extends P {
+let Te = class extends W {
   constructor(a, e, t) {
     super();
     m(this, "_disposableMap", /* @__PURE__ */ new Map());
@@ -1748,7 +1747,7 @@ let Te = class extends P {
     }));
   }
 };
-Te = Va([
+Te = Ma([
   We(0, R(F)),
   We(1, R(ct)),
   We(2, R(q))
@@ -1758,7 +1757,7 @@ var pt = /* @__PURE__ */ ((o) => (o[o.View = 0] = "View", o[o.Edit = 1] = "Edit"
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, $e = (o, a) => (e, t) => a(e, t, o);
-let Fe = class extends P {
+let Fe = class extends W {
   constructor(o, a, e) {
     super(), this._univerInstanceService = o, this._permissionService = a, this._lexerTreeBuilder = e;
   }
@@ -1778,14 +1777,14 @@ let Fe = class extends P {
         if (u = l.getSheetBySheetName(n.sheetName), !u)
           return !1;
         const v = u == null ? void 0 : u.getSheetId();
-        if (!this._permissionService.getPermissionPoint(new xt(d, v).id)) return !1;
+        if (!this._permissionService.getPermissionPoint(new Bt(d, v).id)) return !1;
       }
       if (!u)
         return !1;
       const { startRow: c, endRow: g, startColumn: p, endColumn: _ } = n.range;
       for (let v = c; v <= g; v++)
-        for (let V = p; V <= _; V++) {
-          const f = (t = (e = u.getCell(v, V)) == null ? void 0 : e.selectionProtection) == null ? void 0 : t[0];
+        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[pt.View]) === !1)
             return !1;
         }
@@ -1803,7 +1802,7 @@ var Ta = Object.getOwnPropertyDescriptor, Fa = (o, a, e, t) => {
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, ee = (o, a) => (e, t) => a(e, t, o);
-let Ne = class extends P {
+let Ne = class extends W {
   constructor(a, e, t, r, i, s) {
     super();
     m(this, "_disposableMap", /* @__PURE__ */ new Map());
@@ -1852,7 +1851,7 @@ let Ne = class extends P {
           }
         },
         source: "patched"
-      }, V = [
+      }, M = [
         {
           id: E.id,
           params: _
@@ -1863,7 +1862,7 @@ let Ne = class extends P {
           params: v
         }
       ];
-      return { redos: V, undos: f };
+      return { redos: M, undos: f };
     }, l = this._dataValidationFormulaService.getRuleFormulaInfo(a, e, r);
     if (l) {
       const [d, c] = l;
@@ -1903,7 +1902,7 @@ let Ne = class extends P {
             payload: g
           },
           source: "patched"
-        }, v = [{ id: E.id, params: _ }], V = [{
+        }, v = [{ id: E.id, params: _ }], M = [{
           id: E.id,
           params: {
             unitId: a,
@@ -1916,10 +1915,10 @@ let Ne = class extends P {
             source: "patched"
           }
         }];
-        return { redos: v, undos: V };
+        return { redos: v, undos: M };
       } else {
-        const _ = { unitId: a, subUnitId: e, ruleId: t.uid }, v = [{ id: I.id, params: _ }], V = va(this._injector, _);
-        return { redos: v, undos: V };
+        const _ = { unitId: a, subUnitId: e, ruleId: t.uid }, v = [{ id: I.id, params: _ }], M = va(this._injector, _);
+        return { redos: v, undos: M };
       }
     }, i = [];
     t.ranges.forEach((u) => {
@@ -1966,7 +1965,7 @@ let Ne = class extends P {
 Ne = Fa([
   ee(0, R(F)),
   ee(1, R(Ge)),
-  ee(2, R(Bt)),
+  ee(2, R(xt)),
   ee(3, R(K)),
   ee(4, R(ct)),
   ee(5, R(q))
@@ -1976,7 +1975,7 @@ var Na = Object.getOwnPropertyDescriptor, Ca = (o, a, e, t) => {
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, ke = (o, a) => (e, t) => a(e, t, o);
-let Ce = class extends P {
+let Ce = class extends W {
   constructor(o, a, e) {
     super(), this._sheetInterceptorService = o, this._univerInstanceService = a, this._sheetDataValidationModel = e, this._initSheetChange();
   }
@@ -2065,7 +2064,7 @@ class wa extends G {
     m(this, "operators", []);
     m(this, "scopes", ["sheet"]);
     m(this, "order", 60);
-    m(this, "_customFormulaService", this.injector.get(H));
+    m(this, "_customFormulaService", this.injector.get(P));
     m(this, "_lexerTreeBuilder", this.injector.get(Y));
   }
   validatorFormula(e, t, r) {
@@ -2085,7 +2084,7 @@ class wa 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)) && M.isDefine(d) && d !== "" ? u.t === Tt.BOOLEAN ? !!d : typeof d == "boolean" ? d : typeof d == "number" ? !!d : typeof d == "string" ? C(d) : !!d : !1;
+    return C(String(d)) && V.isDefine(d) && d !== "" ? u.t === Tt.BOOLEAN ? !!d : typeof d == "boolean" ? d : typeof d == "number" ? !!d : typeof d == "string" ? C(d) : !!d : !1;
   }
   generateRuleErrorMessage(e) {
     return this.localeService.t("dataValidation.custom.error");
@@ -2107,7 +2106,7 @@ class Aa extends gt {
 class Ia extends G {
   constructor() {
     super(...arguments);
-    m(this, "_customFormulaService", this.injector.get(H));
+    m(this, "_customFormulaService", this.injector.get(P));
     m(this, "_lexerTreeBuilder", this.injector.get(Y));
     m(this, "id", T.WHOLE);
     m(this, "title", "dataValidation.whole.title");
@@ -2125,7 +2124,7 @@ class Ia extends G {
     m(this, "scopes", ["sheet"]);
   }
   _isFormulaOrInt(e) {
-    return !M.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
   }
   async isValidType(e, t, r) {
     const { value: i } = e, s = Ee(i);
@@ -2155,7 +2154,7 @@ class Ia extends G {
       return {
         success: !0
       };
-    const s = M.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = M.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = De.includes(i), u = this.localeService.t("dataValidation.validFail.number");
+    const s = V.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = De.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: s && n,
       formula1: s ? void 0 : u,
@@ -2237,7 +2236,7 @@ var La = Object.getOwnPropertyDescriptor, Ua = (o, a, e, t) => {
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, ve = (o, a) => (e, t) => a(e, t, o);
-let we = class extends P {
+let we = class extends W {
   constructor(o, a, e, t) {
     super(), this._univerInstanceService = o, this._sheetDataValidationModel = a, this._dataValidationCacheService = e, this._lifecycleService = t, this._initRecalculate();
   }
@@ -2262,7 +2261,7 @@ let we = class extends P {
   }
   async _validatorByCell(o, a, e, t) {
     const r = o.getUnitId(), i = a.getSheetId();
-    if (!M.isDefine(e) || !M.isDefine(t))
+    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) => {
@@ -2336,8 +2335,8 @@ we = Ua([
   ve(2, R(Q)),
   ve(3, R(Nt))
 ], we);
-var xa = Object.defineProperty, Ba = Object.getOwnPropertyDescriptor, Ha = (o, a, e) => a in o ? xa(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e, Pa = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Ba(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+var Ba = Object.defineProperty, xa = Object.getOwnPropertyDescriptor, Ha = (o, a, e) => a in o ? Ba(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e, Pa = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? xa(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, je = (o, a) => (e, t) => a(e, t, o), ft = (o, a, e) => Ha(o, typeof a != "symbol" ? a + "" : a, e);
@@ -2355,7 +2354,7 @@ let Ae = class extends At {
     [
       [Q],
       [K],
-      [H],
+      [P],
       [we],
       [F],
       [Oe],
@@ -2395,7 +2394,7 @@ Ae = Pa([
 function Ka(o) {
   const e = o.get(ut).getCurrentSelections().map((i) => i.range);
   return {
-    uid: M.generateRandomId(6),
+    uid: V.generateRandomId(6),
     type: T.DECIMAL,
     operator: h.EQUAL,
     formula1: "100",
@@ -2406,15 +2405,15 @@ const za = "data-validation.custom-formula-input", Za = "data-validation.formula
 export {
   ma as AddSheetDataValidationCommand,
   Za as BASE_FORMULA_INPUT_NAME,
-  Me as CHECKBOX_FORMULA_1,
-  Ve as CHECKBOX_FORMULA_2,
+  Ve as CHECKBOX_FORMULA_1,
+  Me as CHECKBOX_FORMULA_2,
   er as CHECKBOX_FORMULA_INPUT_NAME,
   za as CUSTOM_FORMULA_INPUT_NAME,
   ra as CheckboxValidator,
   pa as ClearRangeDataValidationCommand,
   Yt as DATA_VALIDATION_PLUGIN_NAME,
   Q as DataValidationCacheService,
-  H as DataValidationCustomFormulaService,
+  P as DataValidationCustomFormulaService,
   Fe as DataValidationFormulaController,
   K as DataValidationFormulaService,
   sa as DateValidator,