@univerjs/sheets-data-validation 0.10.4-nightly.202508220605 → 0.10.4

package/lib/index.js

@@ -1,24 +1,24 @@
 var Rt = Object.defineProperty;
 var St = (o, a, e) => a in o ? Rt(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e;
 var m = (o, a, e) => St(o, typeof a != "symbol" ? a + "" : a, e);
-import { Inject as R, ICommandService as B, IUniverInstanceService as w, Disposable as W, ObjectMatrix as Se, getIntersectRange as Et, UniverInstanceType as C, Range as b, Rectangle as I, isFormulaString as S, DataValidationType as T, getOriginCellValue as Vt, RBush as Mt, debounce as yt, Tools as E, DataValidationStatus as N, WrapStrategy as Re, DataValidationOperator as h, numfmt as H, dayjs as it, DataValidationRenderMode as He, CommandType as z, IUndoRedoService as Z, sequenceExecute as De, isRangesEqual as ot, IPermissionService as Tt, generateRandomId as st, toDisposable as Ye, Injector as Xe, CellValueType as Ft, RxDisposable as Ct, LifecycleService as Ot, LifecycleStages as Je, bufferDebounceTime as wt, DependentOn as At, IConfigService as It, Plugin as Dt, merge as Nt } from "@univerjs/core";
-import { DataValidationModel as Ne, DataValidatorRegistryService as q, UpdateRuleType as M, BaseDataValidator as G, TextLengthErrorTitleMap as bt, AddDataValidationMutation as L, RemoveDataValidationMutation as D, UpdateDataValidationMutation as y, getRuleSetting as Lt, getRuleOptions as Bt, UniverDataValidationPlugin as Ut } from "@univerjs/data-validation";
-import { ERROR_TYPE_SET as xt, LexerTreeBuilder as Y, isReferenceString as nt, sequenceNodeType as Ht, deserializeRangeWithSheet as Pt, deserializeRangeWithSheetWithCache as Wt, operatorToken as $t } from "@univerjs/engine-formula";
-import { SetRangeValuesMutation as se, RemoveSheetMutation as lt, getSheetCommandTarget as Ke, SetRangeValuesUndoMutationFactory as ut, WorksheetViewPermission as kt, RefRangeService as jt, handleCommonDefaultRangeChangeWithEffectRefCommands as Qt, SheetInterceptorService as dt, RemoveSheetCommand as qt, SheetsSelectionsService as ct, ClearSelectionAllCommand as Gt } from "@univerjs/sheets";
-import { Subject as Ge, bufferWhen as Yt, filter as et } from "rxjs";
+import { Inject as R, ICommandService as U, IUniverInstanceService as w, Disposable as W, ObjectMatrix as Se, UniverInstanceType as C, Range as b, Rectangle as I, isFormulaString as S, DataValidationType as T, getOriginCellValue as Et, RBush as Vt, debounce as Mt, Tools as E, DataValidationStatus as N, WrapStrategy as Re, DataValidationOperator as h, numfmt as H, dayjs as it, DataValidationRenderMode as xe, CommandType as z, IUndoRedoService as Z, sequenceExecute as De, isRangesEqual as ot, IPermissionService as yt, generateRandomId as st, toDisposable as qe, Injector as Ge, CellValueType as Tt, RxDisposable as Ft, LifecycleService as Ct, LifecycleStages as Ze, bufferDebounceTime as Ot, DependentOn as wt, IConfigService as At, Plugin as It, merge as Dt } from "@univerjs/core";
+import { DataValidationModel as Ye, DataValidatorRegistryService as q, UpdateRuleType as M, BaseDataValidator as G, TextLengthErrorTitleMap as Nt, AddDataValidationMutation as L, RemoveDataValidationMutation as D, UpdateDataValidationMutation as y, getRuleSetting as bt, getRuleOptions as Lt, UniverDataValidationPlugin as Ut } from "@univerjs/data-validation";
+import { ERROR_TYPE_SET as Bt, LexerTreeBuilder as Y, isReferenceString as nt, sequenceNodeType as xt, deserializeRangeWithSheet as Ht, deserializeRangeWithSheetWithCache as Pt, operatorToken as Wt } from "@univerjs/engine-formula";
+import { SetRangeValuesMutation as se, RemoveSheetMutation as lt, getSheetCommandTarget as Xe, SetRangeValuesUndoMutationFactory as ut, WorksheetViewPermission as $t, RefRangeService as kt, handleCommonDefaultRangeChangeWithEffectRefCommands as jt, SheetInterceptorService as dt, RemoveSheetCommand as Qt, SheetsSelectionsService as ct, ClearSelectionAllCommand as qt } from "@univerjs/sheets";
+import { Subject as Qe, bufferWhen as Gt, filter as Je } from "rxjs";
 import { RegisterOtherFormulaService as ht, FormulaRefRangeService as mt } from "@univerjs/sheets-formula";
-var Xt = Object.getOwnPropertyDescriptor, Kt = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Xt(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+var Yt = Object.getOwnPropertyDescriptor, Xt = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Yt(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
-}, Pe = (o, a) => (e, t) => a(e, t, o);
+}, et = (o, a) => (e, t) => a(e, t, o);
 let Q = class extends W {
-  constructor(a, e, t) {
+  constructor(a, e) {
     super();
     m(this, "_cacheMatrix", /* @__PURE__ */ new Map());
-    m(this, "_dirtyRanges$", new Ge());
+    m(this, "_dirtyRanges$", new Qe());
     m(this, "dirtyRanges$", this._dirtyRanges$.asObservable());
-    this._commandService = a, this._univerInstanceService = e, this._sheetDataValidationModel = t, this._initDirtyRanges(), this._initSheetRemove();
+    this._commandService = a, this._univerInstanceService = e, this._initDirtyRanges(), this._initSheetRemove();
   }
   _initDirtyRanges() {
     this.disposeWithMe(this._commandService.onCommandExecuted((a) => {
@@ -27,8 +27,7 @@ let Q = class extends W {
         if (e) {
           const i = new Se(e).getDataRange();
           if (i.endRow === -1) return;
-          const l = this._sheetDataValidationModel.getRules(t, r).map((u) => u.ranges).flat().map((u) => Et(u, i)).filter(Boolean);
-          l.length && this.markRangeDirty(t, r, l, !0);
+          this.markRangeDirty(t, r, [i], !0);
         }
       }
     }));
@@ -79,10 +78,9 @@ let Q = class extends W {
     return this._ensureCache(a, e).getValue(t, r);
   }
 };
-Q = Kt([
-  Pe(0, R(B)),
-  Pe(1, R(w)),
-  Pe(2, R(Ne))
+Q = Xt([
+  et(0, R(U)),
+  et(1, R(w))
 ], Q);
 function oe(o) {
   var a, e;
@@ -93,15 +91,15 @@ function _e(o) {
   return (a = o == null ? void 0 : o[0]) == null ? void 0 : a[0];
 }
 function O(o) {
-  return !xt.has(o);
+  return !Bt.has(o);
 }
 function de(o, a) {
   var t;
   const e = a.getValidatorItem(o);
   return (t = e == null ? void 0 : e.offsetFormulaByRange) != null ? t : !1;
 }
-var zt = Object.getOwnPropertyDescriptor, Zt = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? zt(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+var Kt = Object.getOwnPropertyDescriptor, zt = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Kt(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, re = (o, a) => (e, t) => a(e, t, o);
@@ -231,15 +229,15 @@ let P = class extends W {
     r && this._registerOtherFormulaService.markFormulaDirty(a, e, r.formulaId), i && this._registerOtherFormulaService.markFormulaDirty(a, e, i.formulaId);
   }
 };
-P = Zt([
+P = zt([
   re(0, w),
   re(1, R(ht)),
-  re(2, R(Ne)),
+  re(2, R(Ye)),
   re(3, R(Q)),
   re(4, R(q))
 ], 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--)
+var Zt = Object.getOwnPropertyDescriptor, Jt = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Zt(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, ie = (o, a) => (e, t) => a(e, t, o);
@@ -323,24 +321,24 @@ let K = class extends W {
     return this._ensureRuleFormulaMap(a, e).get(t);
   }
 };
-K = ea([
+K = Jt([
   ie(0, w),
   ie(1, R(ht)),
   ie(2, R(Q)),
-  ie(3, R(Ne)),
+  ie(3, R(Ye)),
   ie(4, R(q))
 ], K);
 function ne(o) {
-  return Vt(o);
+  return Et(o);
 }
 function gt(o) {
   var a;
   return String((a = ne(o)) != null ? a : "");
 }
-class ze {
+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)
@@ -359,7 +357,7 @@ class ze {
         });
       }), this._tree.load(a), this._dirty = !1;
     });
-    m(this, "_debonceBuildTree", yt(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 +456,7 @@ class ze {
     }), t;
   }
   clone() {
-    return new ze(
+    return new Ke(
       new Map(E.deepClone(Array.from(this._map.entries()))),
       this._unitId,
       this._subUnitId,
@@ -478,8 +476,8 @@ class ze {
     return t.length > 0 ? t[0].ruleId : void 0;
   }
 }
-var ta = Object.getOwnPropertyDescriptor, aa = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? ta(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+var ea = Object.getOwnPropertyDescriptor, ta = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? ea(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, X = (o, a) => (e, t) => a(e, t, o);
@@ -487,8 +485,8 @@ let F = class extends W {
   constructor(a, e, t, r, i, s, n) {
     super();
     m(this, "_ruleMatrixMap", /* @__PURE__ */ new Map());
-    m(this, "_validStatusChange$", new Ge());
-    m(this, "_ruleChange$", new Ge());
+    m(this, "_validStatusChange$", new Qe());
+    m(this, "_ruleChange$", new Qe());
     m(this, "ruleChange$", this._ruleChange$.asObservable());
     m(this, "validStatusChange$", this._validStatusChange$.asObservable());
     this._dataValidationModel = a, this._univerInstanceService = e, this._dataValidatorRegistryService = t, this._dataValidationCacheService = r, this._dataValidationFormulaService = i, this._dataValidationCustomFormulaService = s, this._commandService = n, this._initRuleUpdateListener(), this.disposeWithMe(() => {
@@ -542,7 +540,7 @@ let F = class extends W {
     let t = this._ruleMatrixMap.get(a);
     t || (t = /* @__PURE__ */ new Map(), this._ruleMatrixMap.set(a, t));
     let r = t.get(e);
-    return r || (r = new ze(/* @__PURE__ */ new Map(), a, e, this._univerInstanceService), t.set(e, r)), r;
+    return r || (r = new Ke(/* @__PURE__ */ new Map(), a, e, this._univerInstanceService), t.set(e, r)), r;
   }
   _addRuleSideEffect(a, e, t) {
     this._ensureRuleMatrix(a, e).addRule(t), this._dataValidationCacheService.addRule(a, e, t), this._dataValidationFormulaService.addRule(a, e, t), this._dataValidationCustomFormulaService.addRule(a, e, t);
@@ -631,21 +629,21 @@ let F = class extends W {
     return this._dataValidationModel.getAll();
   }
 };
-F = aa([
-  X(0, R(Ne)),
+F = ta([
+  X(0, R(Ye)),
   X(1, w),
   X(2, R(q)),
   X(3, R(Q)),
   X(4, R(K)),
   X(5, R(P)),
-  X(6, B)
+  X(6, U)
 ], F);
 const Ee = 1, Ve = 0;
 function tt(o, a) {
   return E.isBlank(o) ? a.t("dataValidation.validFail.value") : S(o) ? a.t("dataValidation.validFail.primitive") : "";
 }
 const pe = (o) => E.isDefine(o) && String(o).toLowerCase() === "true" ? "1" : String(o).toLowerCase() === "false" ? "0" : o;
-class ra extends G {
+class aa extends G {
   constructor() {
     super(...arguments);
     m(this, "id", T.CHECKBOX);
@@ -717,7 +715,7 @@ class ra extends G {
     return this.titleStr;
   }
 }
-const ia = {
+const ra = {
   [h.BETWEEN]: "dataValidation.date.operators.between",
   [h.EQUAL]: "dataValidation.date.operators.equal",
   [h.GREATER_THAN]: "dataValidation.date.operators.greaterThan",
@@ -738,7 +736,7 @@ const at = {
   [h.NOT_BETWEEN]: "dataValidation.date.ruleName.notBetween",
   [h.NOT_EQUAL]: "dataValidation.date.ruleName.notEqual",
   NONE: "dataValidation.date.ruleName.legal"
-}, oa = {
+}, ia = {
   [h.BETWEEN]: "dataValidation.date.errorMsg.between",
   [h.EQUAL]: "dataValidation.date.errorMsg.equal",
   [h.GREATER_THAN]: "dataValidation.date.errorMsg.greaterThan",
@@ -748,28 +746,28 @@ const at = {
   [h.NOT_BETWEEN]: "dataValidation.date.errorMsg.notBetween",
   [h.NOT_EQUAL]: "dataValidation.date.errorMsg.notEqual",
   NONE: "dataValidation.date.errorMsg.legal"
-}, be = [
+}, Ne = [
   h.BETWEEN,
   h.NOT_BETWEEN
 ], le = "{FORMULA1}", ue = "{FORMULA2}";
-function Xa(o) {
+function Ya(o) {
   return o.filter(Boolean).join(",");
 }
 function fe(o) {
   return o.split(",").filter(Boolean);
 }
-function Ka(o) {
+function Xa(o) {
   const a = ne(o);
   return a == null ? "" : a.toString();
 }
-function Le(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,
     transformedFormula2: d
   };
 }
-const We = (o) => {
+const He = (o) => {
   var e, t;
   if (o == null || typeof o == "boolean")
     return;
@@ -778,7 +776,7 @@ const We = (o) => {
   const a = (e = H.parseDate(o)) == null ? void 0 : e.v;
   return E.isDefine(a) ? a : (t = H.parseDate(it(o).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : t.v;
 };
-class sa extends G {
+class oa extends G {
   constructor() {
     super(...arguments);
     m(this, "id", T.DATE);
@@ -801,8 +799,8 @@ class sa extends G {
   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 = O(String(n == null ? void 0 : n.v)) && O(String(l == null ? void 0 : l.v));
     return {
-      formula1: We(S(u) ? n == null ? void 0 : n.v : u),
-      formula2: We(S(d) ? l == null ? void 0 : l.v : d),
+      formula1: He(S(u) ? n == null ? void 0 : n.v : u),
+      formula2: He(S(d) ? l == null ? void 0 : l.v : d),
       isFormulaValid: c
     };
   }
@@ -820,7 +818,7 @@ class sa extends G {
         success: !0
       };
     const s = this._validatorSingleFormula(e.formula1), n = this.localeService.t("dataValidation.validFail.date");
-    if (be.includes(i)) {
+    if (Ne.includes(i)) {
       const u = this._validatorSingleFormula(e.formula2);
       return {
         success: s && u,
@@ -858,11 +856,11 @@ class sa extends G {
     const { value: i } = e;
     return {
       ...e,
-      value: We(i)
+      value: He(i)
     };
   }
   get operatorNames() {
-    return this.operators.map((e) => this.localeService.t(ia[e]));
+    return this.operators.map((e) => this.localeService.t(ra[e]));
   }
   generateRuleName(e) {
     var r, i;
@@ -874,8 +872,8 @@ class sa extends G {
   generateRuleErrorMessage(e, t) {
     if (!e.operator)
       return this.titleStr;
-    const { transformedFormula1: r, transformedFormula2: i } = Le(this._lexerTreeBuilder, e, t);
-    return `${this.localeService.t(oa[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(ia[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
   }
 }
 h.BETWEEN + "", h.EQUAL + "", h.GREATER_THAN + "", h.GREATER_THAN_OR_EQUAL + "", h.LESS_THAN + "", h.LESS_THAN_OR_EQUAL + "", h.NOT_BETWEEN + "", h.NOT_EQUAL + "";
@@ -894,7 +892,7 @@ const Me = {
 function ye(o) {
   return +o;
 }
-class na extends G {
+class sa extends G {
   constructor() {
     super(...arguments);
     m(this, "_customFormulaService", this.injector.get(P));
@@ -945,7 +943,7 @@ class na extends G {
       return {
         success: !0
       };
-    const s = E.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), n = E.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), l = be.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 = Ne.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: s && n,
       formula1: s ? void 0 : u,
@@ -958,11 +956,11 @@ class na extends G {
   generateRuleErrorMessage(e, t) {
     if (!e.operator)
       return this.localeService.t(Me.NONE).replace("{TYPE}", this.titleStr);
-    const { transformedFormula1: r, transformedFormula2: i } = Le(this._lexerTreeBuilder, e, t);
+    const { transformedFormula1: r, transformedFormula2: i } = be(this._lexerTreeBuilder, e, t);
     return `${this.localeService.t(Me[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
   }
 }
-function $e(o) {
+function Pe(o) {
   if (!o)
     return [];
   const a = /* @__PURE__ */ new Set();
@@ -982,22 +980,22 @@ function $e(o) {
     }
   ), [...a];
 }
-const la = [
+const na = [
   "if",
   "indirect",
   "choose",
   "offset"
 ];
-function ua(o, a) {
+function la(o, a) {
   if (!S(o) || nt(o.slice(1)))
     return !0;
   const t = a.sequenceNodesBuilder(o);
-  return t && t.some((r) => typeof r == "object" && r.nodeType === Ht.FUNCTION && la.indexOf(r.token.toLowerCase()) > -1);
+  return t && t.some((r) => typeof r == "object" && r.nodeType === xt.FUNCTION && na.indexOf(r.token.toLowerCase()) > -1);
 }
-function da(o, a) {
+function ua(o, a) {
   const { formula1: e = "", ranges: t } = o;
   if (nt(e.slice(1))) {
-    const i = Pt(e.slice(1));
+    const i = Ht(e.slice(1));
     if ((!i.sheetName || i.sheetName === a) && t.some((s) => I.intersects(s, i.range)))
       return !0;
   }
@@ -1015,11 +1013,11 @@ class _t extends G {
     m(this, "title", "dataValidation.list.title");
     m(this, "operators", []);
     m(this, "scopes", ["sheet"]);
-    m(this, "skipDefaultFontRender", (e) => e.renderMode !== He.TEXT);
+    m(this, "skipDefaultFontRender", (e) => e.renderMode !== xe.TEXT);
   }
   validatorFormula(e, t, r) {
     var u, d, c;
-    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 : "");
+    const i = !E.isBlank(e.formula1), s = la((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 = ua(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 +1026,7 @@ class _t 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 === He.ARROW || e.renderMode === He.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 {
@@ -1057,7 +1055,7 @@ class _t extends G {
   }
   async isValidType(e, t, r) {
     var g, p;
-    const { value: i, unitId: s, subUnitId: n } = e, { formula1: l = "" } = r, u = await this.formulaService.getRuleFormulaResult(s, n, r.uid), d = S(l) ? $e((p = (g = u == null ? void 0 : u[0]) == null ? void 0 : g.result) == null ? void 0 : p[0][0]) : fe(l);
+    const { value: i, unitId: s, subUnitId: n } = e, { formula1: l = "" } = r, u = await this.formulaService.getRuleFormulaResult(s, n, r.uid), d = S(l) ? Pe((p = (g = u == null ? void 0 : u[0]) == null ? void 0 : g.result) == null ? void 0 : p[0][0]) : fe(l);
     return this.parseCellValue(i).every((_) => d.includes(_));
   }
   generateRuleName() {
@@ -1073,7 +1071,7 @@ class _t extends G {
     const l = (p = r ? n.getSheetBySheetId(r) : void 0) != null ? p : n.getActiveSheet();
     if (!l) return [];
     const u = n.getUnitId(), d = l.getSheetId(), c = this.formulaService.getRuleFormulaResultSync(u, d, e.uid);
-    return S(i) ? $e((v = (_ = c == null ? void 0 : c[0]) == null ? void 0 : _.result) == null ? void 0 : v[0][0]) : fe(i);
+    return S(i) ? Pe((v = (_ = c == null ? void 0 : c[0]) == null ? void 0 : _.result) == null ? void 0 : v[0][0]) : fe(i);
   }
   async getListAsync(e, t, r) {
     var g, p, _, v;
@@ -1082,7 +1080,7 @@ class _t extends G {
     const l = (p = r ? n.getSheetBySheetId(r) : void 0) != null ? p : n.getActiveSheet();
     if (!l) return [];
     const u = n.getUnitId(), d = l.getSheetId(), c = await this.formulaService.getRuleFormulaResult(u, d, e.uid);
-    return S(i) ? $e((v = (_ = c == null ? void 0 : c[0]) == null ? void 0 : _.result) == null ? void 0 : v[0][0]) : fe(i);
+    return S(i) ? Pe((v = (_ = c == null ? void 0 : c[0]) == null ? void 0 : _.result) == null ? void 0 : v[0][0]) : fe(i);
   }
   getListWithColor(e, t, r) {
     const i = this.getList(e, t, r), s = (e.formula2 || "").split(",");
@@ -1095,7 +1093,7 @@ class _t extends G {
     }), s;
   }
 }
-class ca extends G {
+class da extends G {
   constructor() {
     super(...arguments);
     m(this, "id", T.TEXT_LENGTH);
@@ -1124,7 +1122,7 @@ class ca extends G {
       return {
         success: !1
       };
-    const s = E.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = E.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = be.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 = Ne.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: s && n,
       formula1: s ? void 0 : u,
@@ -1158,16 +1156,16 @@ class ca extends G {
   generateRuleErrorMessage(e, t) {
     if (!e.operator)
       return this.titleStr;
-    const { transformedFormula1: r, transformedFormula2: i } = Le(this._lexerTreeBuilder, e, t);
-    return `${this.localeService.t(bt[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(Nt[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
   }
 }
 function pt(o) {
   var e, t;
   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), g = Ke(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(w), g = Xe(c, { unitId: o, subUnitId: a });
   if (!g)
     return {
       redoMutations: l,
@@ -1177,9 +1175,9 @@ function Be(o, a, e, t, r = "command", i = !0) {
   let v = !1;
   function V(f, A) {
     i && f.forEach(($) => {
-      b.foreach($, (U, k) => {
-        const x = p.getCellRaw(U, k), J = gt(x);
-        (pt(x) || J === A) && !(x != null && x.p) && (v = !0, _.setValue(U, k, {
+      b.foreach($, (B, k) => {
+        const x = p.getCellRaw(B, k), J = gt(x);
+        (pt(x) || J === A) && !(x != null && x.p) && (v = !0, _.setValue(B, k, {
           v: A,
           p: null
         }));
@@ -1210,7 +1208,7 @@ function Be(o, a, e, t, r = "command", i = !0) {
         break;
       case "update": {
         if (de(f.rule.type, n)) {
-          const $ = f.oldRanges[0].startRow, U = f.oldRanges[0].startColumn, k = f.newRanges[0].startRow, x = f.newRanges[0].startColumn, J = k - $, ce = x - U, 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: y.id,
             params: {
@@ -1294,8 +1292,8 @@ function Be(o, a, e, t, r = "command", i = !0) {
           });
         const A = d.getRuleById(o, a, f.ruleId);
         if (A && A.type === T.CHECKBOX) {
-          const U = d.getValidator(T.CHECKBOX).parseFormulaSync(A, o, a);
-          V(f.newRanges, U.formula2);
+          const B = d.getValidator(T.CHECKBOX).parseFormulaSync(A, o, a);
+          V(f.newRanges, B.formula2);
         }
         break;
       }
@@ -1342,31 +1340,31 @@ function Be(o, a, e, t, r = "command", i = !0) {
     undoMutations: u
   };
 }
-const ha = {
+const ca = {
   type: z.COMMAND,
   id: "sheet.command.updateDataValidationRuleRange",
   handler(o, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, ranges: r, ruleId: i } = a, s = o.get(F), n = o.get(B), l = o.get(Z);
+    const { unitId: e, subUnitId: t, ranges: r, ruleId: i } = a, s = o.get(F), n = o.get(U), l = o.get(Z);
     if (!s.getRuleById(e, t, i))
       return !1;
     const d = s.getRuleObjectMatrix(e, t).clone();
     d.updateRange(i, r);
-    const c = d.diff(s.getRules(e, t)), { redoMutations: g, undoMutations: p } = Be(e, t, c, o);
+    const c = d.diff(s.getRules(e, t)), { redoMutations: g, undoMutations: p } = Le(e, t, c, o);
     return l.pushUndoRedo({
       undoMutations: p,
       redoMutations: g,
       unitID: e
     }), De(g, n), !0;
   }
-}, ma = {
+}, ha = {
   type: z.COMMAND,
   id: "sheet.command.addDataValidation",
   handler(o, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, rule: r } = a, i = o.get(F), s = o.get(B), n = o.get(Z), l = i.getRuleObjectMatrix(e, t).clone();
+    const { unitId: e, subUnitId: t, rule: r } = a, i = o.get(F), s = o.get(U), n = o.get(Z), l = i.getRuleObjectMatrix(e, t).clone();
     l.addRule(r);
     const u = l.diff(i.getRules(e, t)), d = i.getValidator(r.type), c = {
       unitId: e,
@@ -1375,7 +1373,7 @@ const ha = {
         ...r,
         ...d == null ? void 0 : d.normalizeFormula(r, e, t)
       }
-    }, { redoMutations: g, undoMutations: p } = Be(e, t, u, o);
+    }, { redoMutations: g, undoMutations: p } = Le(e, t, u, o);
     return g.push({
       id: L.id,
       params: c
@@ -1392,14 +1390,14 @@ const ha = {
       undoMutations: p
     }), De(g, s), !0;
   }
-}, ga = {
+}, ma = {
   type: z.COMMAND,
   id: "sheets.command.update-data-validation-setting",
   // eslint-disable-next-line max-lines-per-function
   handler(o, a) {
     if (!a)
       return !1;
-    const e = o.get(B), t = o.get(Z), r = o.get(F), i = o.get(q), { unitId: s, subUnitId: n, ruleId: l, setting: u } = a, d = i.getValidatorItem(u.type);
+    const e = o.get(U), t = o.get(Z), r = o.get(F), i = o.get(q), { unitId: s, subUnitId: n, ruleId: l, setting: u } = a, d = i.getValidatorItem(u.type);
     if (!d)
       return !1;
     const c = r.getRuleById(s, n, l);
@@ -1428,24 +1426,24 @@ const ha = {
       ruleId: l,
       payload: {
         type: M.SETTING,
-        payload: Lt(c)
+        payload: bt(c)
       }
     }, V = [{
       id: y.id,
       params: v
     }];
     if (u.type === T.CHECKBOX) {
-      const A = c.ranges, $ = o.get(w), U = Ke($, { unitId: s, subUnitId: n });
-      if (U) {
-        const k = new Se(), { worksheet: x } = U, { formula2: J = Ve, formula1: ce = Ee } = c, { formula2: he = Ve, formula1: me = Ee } = u;
+      const A = c.ranges, $ = o.get(w), B = Xe($, { unitId: s, subUnitId: n });
+      if (B) {
+        const k = new Se(), { worksheet: x } = B, { formula2: J = Ve, formula1: ce = Ee } = c, { formula2: he = Ve, formula1: me = Ee } = u;
         let Ue = !1;
         if (A.forEach((ge) => {
-          b.foreach(ge, (ae, xe) => {
-            const j = x.getCellRaw(ae, xe), Ze = gt(j);
-            (pt(j) || Ze === String(J)) && !(j != null && j.p) ? (k.setValue(ae, xe, {
+          b.foreach(ge, (ae, Be) => {
+            const j = x.getCellRaw(ae, Be), ze = gt(j);
+            (pt(j) || ze === String(J)) && !(j != null && j.p) ? (k.setValue(ae, Be, {
               v: he,
               p: null
-            }), Ue = !0) : Ze === String(ce) && !(j != null && j.p) && (k.setValue(ae, xe, {
+            }), Ue = !0) : ze === String(ce) && !(j != null && j.p) && (k.setValue(ae, Be, {
               v: me,
               p: null
             }), Ue = !0);
@@ -1472,13 +1470,13 @@ const ha = {
       undoMutations: V
     }), !0) : !1;
   }
-}, _a = {
+}, ga = {
   type: z.COMMAND,
   id: "sheets.command.update-data-validation-options",
   handler(o, a) {
     if (!a)
       return !1;
-    const e = o.get(B), t = o.get(Z), r = o.get(F), { unitId: i, subUnitId: s, ruleId: n, options: l } = a, u = r.getRuleById(i, s, n);
+    const e = o.get(U), t = o.get(Z), r = o.get(F), { unitId: i, subUnitId: s, ruleId: n, options: l } = a, u = r.getRuleById(i, s, n);
     if (!u)
       return !1;
     const d = {
@@ -1498,7 +1496,7 @@ const ha = {
       ruleId: n,
       payload: {
         type: M.OPTIONS,
-        payload: Bt(u)
+        payload: Lt(u)
       }
     }, p = [{
       id: y.id,
@@ -1510,30 +1508,30 @@ const ha = {
       undoMutations: p
     }), e.executeCommand(y.id, d), !0;
   }
-}, pa = {
+}, _a = {
   type: z.COMMAND,
   id: "sheets.command.clear-range-data-validation",
   handler(o, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, ranges: r } = a, i = o.get(B), s = o.get(w), n = Ke(s, { unitId: e, subUnitId: t }), l = o.get(F);
+    const { unitId: e, subUnitId: t, ranges: r } = a, i = o.get(U), s = o.get(w), n = Xe(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: g, undoMutations: p } = Be(e, t, c, o);
+    const c = d.diff(l.getRules(e, t)), { redoMutations: g, undoMutations: p } = Le(e, t, c, o);
     return u.pushUndoRedo({
       unitID: e,
       redoMutations: g,
       undoMutations: p
     }), De(g, i).result;
   }
-}, fa = {
+}, pa = {
   type: z.COMMAND,
   id: "sheet.command.remove-all-data-validation",
   handler(o, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t } = a, r = o.get(B), i = o.get(F), s = o.get(Z), n = [...i.getRules(e, t)], l = {
+    const { unitId: e, subUnitId: t } = a, r = o.get(U), i = o.get(F), s = o.get(Z), n = [...i.getRules(e, t)], l = {
       unitId: e,
       subUnitId: t,
       ruleId: n.map((c) => c.uid)
@@ -1554,7 +1552,7 @@ const ha = {
       unitID: e
     }), r.executeCommand(D.id, l), !0;
   }
-}, va = (o, a) => {
+}, fa = (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);
@@ -1579,13 +1577,13 @@ const ha = {
       index: e.getRuleIndex(t, r, i)
     }
   }];
-}, Ra = {
+}, va = {
   type: z.COMMAND,
   id: "sheet.command.remove-data-validation-rule",
   handler(o, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, ruleId: r } = a, i = o.get(B), s = o.get(Z), n = o.get(F), l = [{
+    const { unitId: e, subUnitId: t, ruleId: r } = a, i = o.get(U), s = o.get(Z), n = o.get(F), l = [{
       id: D.id,
       params: a
     }], u = [{
@@ -1605,12 +1603,12 @@ const ha = {
       unitID: a.unitId
     }), i.executeCommand(D.id, a), !0;
   }
-}, Sa = "SHEET_DATA_VALIDATION_PLUGIN";
-var ft = /* @__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))(ft || {}), 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--)
+}, Ra = "SHEET_DATA_VALIDATION_PLUGIN";
+var ft = /* @__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))(ft || {}), Sa = Object.getOwnPropertyDescriptor, Ea = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Sa(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);
+}, We = (o, a) => (e, t) => a(e, t, o);
 let Te = class extends W {
   constructor(o, a, e) {
     super(), this._univerInstanceService = o, this._permissionService = a, this._lexerTreeBuilder = e;
@@ -1624,14 +1622,14 @@ let Te = class extends W {
       const i = a[r];
       if (typeof i == "string")
         continue;
-      const { token: s } = i, n = Wt(s), l = this._univerInstanceService.getCurrentUnitForType(C.UNIVER_SHEET);
+      const { token: s } = i, n = Pt(s), l = this._univerInstanceService.getCurrentUnitForType(C.UNIVER_SHEET);
       let u = l.getActiveSheet();
       const d = l.getUnitId();
       if (n.sheetName) {
         if (u = l.getSheetBySheetName(n.sheetName), !u)
           return !1;
         const v = u == null ? void 0 : u.getSheetId();
-        if (!this._permissionService.getPermissionPoint(new kt(d, v).id)) return !1;
+        if (!this._permissionService.getPermissionPoint(new $t(d, v).id)) return !1;
       }
       if (!u)
         return !1;
@@ -1646,17 +1644,17 @@ let Te = class extends W {
     return !0;
   }
 };
-Te = Va([
-  ke(0, w),
-  ke(1, Tt),
-  ke(2, R(Y))
+Te = Ea([
+  We(0, w),
+  We(1, yt),
+  We(2, R(Y))
 ], Te);
-const Ma = "sheets-data-validation.config", rt = {};
-var ya = Object.getOwnPropertyDescriptor, Ta = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? ya(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+const Va = "sheets-data-validation.config", rt = {};
+var 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;
-}, je = (o, a) => (e, t) => a(e, t, o);
+}, $e = (o, a) => (e, t) => a(e, t, o);
 let Fe = class extends W {
   constructor(a, e, t) {
     super();
@@ -1787,20 +1785,20 @@ let Fe = class extends W {
           }
         }
       })
-    ), this.disposeWithMe(Ye(() => {
+    ), this.disposeWithMe(qe(() => {
       this._disposableMap.forEach((e) => {
         e.dispose();
       }), this._disposableMap.clear();
     }));
   }
 };
-Fe = Ta([
-  je(0, R(F)),
-  je(1, R(mt)),
-  je(2, R(q))
+Fe = ya([
+  $e(0, R(F)),
+  $e(1, R(mt)),
+  $e(2, R(q))
 ], Fe);
-var Fa = Object.getOwnPropertyDescriptor, Ca = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Fa(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+var Ta = Object.getOwnPropertyDescriptor, Fa = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Ta(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, ee = (o, a) => (e, t) => a(e, t, o);
@@ -1891,7 +1889,7 @@ let Ce = class extends W {
   register(a, e, t) {
     var l;
     const r = (u) => {
-      const d = [...t.ranges], g = d.map((_) => Qt(_, u)).filter((_) => !!_).flat();
+      const d = [...t.ranges], g = d.map((_) => jt(_, u)).filter((_) => !!_).flat();
       if (ot(g, d))
         return { redos: [], undos: [] };
       if (g.length) {
@@ -1919,7 +1917,7 @@ let Ce = class extends W {
         }];
         return { redos: v, undos: V };
       } else {
-        const _ = { unitId: a, subUnitId: e, ruleId: t.uid }, v = [{ id: D.id, params: _ }], V = va(this._injector, _);
+        const _ = { unitId: a, subUnitId: e, ruleId: t.uid }, v = [{ id: D.id, params: _ }], V = fa(this._injector, _);
         return { redos: v, undos: V };
       }
     }, i = [];
@@ -1957,26 +1955,26 @@ let Ce = class extends W {
           }
         }
       })
-    ), this.disposeWithMe(Ye(() => {
+    ), this.disposeWithMe(qe(() => {
       this._disposableMap.forEach((e) => {
         e.forEach((t) => t());
       }), this._disposableMap.clear();
     }));
   }
 };
-Ce = Ca([
+Ce = Fa([
   ee(0, R(F)),
-  ee(1, R(Xe)),
-  ee(2, R(jt)),
+  ee(1, R(Ge)),
+  ee(2, R(kt)),
   ee(3, R(K)),
   ee(4, R(mt)),
   ee(5, R(q))
 ], Ce);
-var Oa = Object.getOwnPropertyDescriptor, wa = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Oa(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+var Ca = Object.getOwnPropertyDescriptor, Oa = (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;
-}, Qe = (o, a) => (e, t) => a(e, t, o);
+}, ke = (o, a) => (e, t) => a(e, t, o);
 let Oe = class extends W {
   constructor(o, a, e) {
     super(), this._sheetInterceptorService = o, this._univerInstanceService = a, this._sheetDataValidationModel = e, this._initSheetChange();
@@ -1986,7 +1984,7 @@ let Oe = class extends W {
       this._sheetInterceptorService.interceptCommand({
         getMutations: (o) => {
           var a;
-          if (o.id === qt.id) {
+          if (o.id === Qt.id) {
             const e = o.params, t = e.unitId || this._univerInstanceService.getCurrentUnitForType(C.UNIVER_SHEET).getUnitId(), r = this._univerInstanceService.getUniverSheetInstance(t);
             if (!r)
               return { redos: [], undos: [] };
@@ -2024,12 +2022,12 @@ let Oe = class extends W {
     );
   }
 };
-Oe = wa([
-  Qe(0, R(dt)),
-  Qe(1, R(w)),
-  Qe(2, R(F))
+Oe = Oa([
+  ke(0, R(dt)),
+  ke(1, R(w)),
+  ke(2, R(F))
 ], Oe);
-class Aa extends G {
+class wa extends G {
   constructor() {
     super(...arguments);
     m(this, "id", T.ANY);
@@ -2058,7 +2056,7 @@ class Aa extends G {
     return this.localeService.t("dataValidation.any.error");
   }
 }
-class Ia extends G {
+class Aa extends G {
   constructor() {
     super(...arguments);
     m(this, "id", T.CUSTOM);
@@ -2071,7 +2069,7 @@ class Ia extends G {
   }
   validatorFormula(e, t, r) {
     var u;
-    const i = S(e.formula1), s = (u = e.formula1) != null ? u : "", l = this._lexerTreeBuilder.checkIfAddBracket(s) === 0 && s.startsWith($t.EQUALS);
+    const i = S(e.formula1), s = (u = e.formula1) != null ? u : "", l = this._lexerTreeBuilder.checkIfAddBracket(s) === 0 && s.startsWith(Wt.EQUALS);
     return {
       success: i && l,
       formula1: i && l ? "" : this.localeService.t("dataValidation.validFail.formula")
@@ -2086,7 +2084,7 @@ class Ia 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 O(String(d)) && E.isDefine(d) && d !== "" ? u.t === Ft.BOOLEAN ? !!d : typeof d == "boolean" ? d : typeof d == "number" ? !!d : typeof d == "string" ? O(d) : !!d : !1;
+    return O(String(d)) && E.isDefine(d) && d !== "" ? u.t === Tt.BOOLEAN ? !!d : typeof d == "boolean" ? d : typeof d == "number" ? !!d : typeof d == "string" ? O(d) : !!d : !1;
   }
   generateRuleErrorMessage(e) {
     return this.localeService.t("dataValidation.custom.error");
@@ -2096,7 +2094,7 @@ class Ia extends G {
     return this.localeService.t("dataValidation.custom.ruleName").replace("{FORMULA1}", (t = e.formula1) != null ? t : "");
   }
 }
-class Da extends _t {
+class Ia extends _t {
   constructor() {
     super(...arguments);
     m(this, "id", T.LIST_MULTIPLE);
@@ -2105,7 +2103,7 @@ class Da extends _t {
     m(this, "skipDefaultFontRender", () => !0);
   }
 }
-class Na extends G {
+class Da extends G {
   constructor() {
     super(...arguments);
     m(this, "_customFormulaService", this.injector.get(P));
@@ -2156,7 +2154,7 @@ class Na extends G {
       return {
         success: !0
       };
-    const s = E.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = E.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = be.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 = Ne.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: s && n,
       formula1: s ? void 0 : u,
@@ -2169,16 +2167,16 @@ class Na extends G {
   generateRuleErrorMessage(e, t) {
     if (!e.operator)
       return this.localeService.t(Me.NONE).replace("{TYPE}", this.titleStr);
-    const { transformedFormula1: r, transformedFormula2: i } = Le(this._lexerTreeBuilder, e, t);
+    const { transformedFormula1: r, transformedFormula2: i } = be(this._lexerTreeBuilder, e, t);
     return `${this.localeService.t(Me[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? 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--)
+var Na = Object.getOwnPropertyDescriptor, ba = (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;
 }, te = (o, a) => (e, t) => a(e, t, o);
-let we = class extends Ct {
+let we = class extends Ft {
   constructor(o, a, e, t, r, i) {
     super(), this._univerInstanceService = o, this._dataValidatorRegistryService = a, this._injector = e, this._selectionManagerService = t, this._sheetInterceptorService = r, this._sheetDataValidationModel = i, this._init();
   }
@@ -2187,31 +2185,31 @@ let we = class extends Ct {
   }
   _registerValidators() {
     [
-      Aa,
-      na,
-      Na,
-      ca,
+      wa,
       sa,
-      ra,
-      _t,
       Da,
-      Ia
+      da,
+      oa,
+      aa,
+      _t,
+      Ia,
+      Aa
     ].forEach((o) => {
       const a = this._injector.createInstance(o);
-      this.disposeWithMe(this._dataValidatorRegistryService.register(a)), this.disposeWithMe(Ye(() => this._injector.delete(o)));
+      this.disposeWithMe(this._dataValidatorRegistryService.register(a)), this.disposeWithMe(qe(() => this._injector.delete(o)));
     });
   }
   _initCommandInterceptor() {
     this._sheetInterceptorService.interceptCommand({
       getMutations: (o) => {
         var a;
-        if (o.id === Gt.id) {
+        if (o.id === qt.id) {
           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
@@ -2225,16 +2223,16 @@ let we = class extends Ct {
     });
   }
 };
-we = La([
+we = ba([
   te(0, w),
   te(1, R(q)),
-  te(2, R(Xe)),
+  te(2, R(Ge)),
   te(3, R(ct)),
   te(4, R(dt)),
   te(5, R(F))
 ], we);
-var Ba = Object.getOwnPropertyDescriptor, Ua = (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 La = Object.getOwnPropertyDescriptor, Ua = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? La(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, ve = (o, a) => (e, t) => a(e, t, o);
@@ -2259,7 +2257,7 @@ let Ae = class extends W {
         });
       });
     };
-    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Yt(() => this._lifecycleService.lifecycle$.pipe(et((a) => a === Je.Rendered)))).subscribe(o)), this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(et(() => this._lifecycleService.stage >= Je.Rendered), wt(20)).subscribe(o));
+    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Gt(() => this._lifecycleService.lifecycle$.pipe(Je((a) => a === Ze.Rendered)))).subscribe(o)), this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Je(() => this._lifecycleService.stage >= Ze.Rendered), Ot(20)).subscribe(o));
   }
   async _validatorByCell(o, a, e, t) {
     const r = o.getUnitId(), i = a.getSheetId();
@@ -2335,22 +2333,22 @@ Ae = Ua([
   ve(0, w),
   ve(1, R(F)),
   ve(2, R(Q)),
-  ve(3, R(Ot))
+  ve(3, R(Ct))
 ], Ae);
-var xa = Object.defineProperty, Ha = Object.getOwnPropertyDescriptor, Pa = (o, a, e) => a in o ? xa(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 ? Ha(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;
-}, qe = (o, a) => (e, t) => a(e, t, o), vt = (o, a, e) => Pa(o, typeof a != "symbol" ? a + "" : a, e);
-let Ie = class extends Dt {
+}, je = (o, a) => (e, t) => a(e, t, o), vt = (o, a, e) => Ha(o, typeof a != "symbol" ? a + "" : a, e);
+let Ie = class extends It {
   constructor(o = rt, a, e, t) {
     super(), this._config = o, this._injector = a, this._commandService = e, this._configService = t;
-    const { ...r } = Nt(
+    const { ...r } = Dt(
       {},
       rt,
       this._config
     );
-    this._configService.setConfig(Ma, r);
+    this._configService.setConfig(Va, r);
   }
   onStarting() {
     [
@@ -2367,13 +2365,13 @@ let Ie = class extends Dt {
     ].forEach((o) => {
       this._injector.add(o);
     }), [
-      ma,
       ha,
+      ca,
+      ma,
       ga,
-      _a,
-      Ra,
-      fa,
-      pa
+      va,
+      pa,
+      _a
     ].forEach((o) => {
       this._commandService.registerCommand(o);
     }), this._injector.get(Q), this._injector.get(Ae), this._injector.get(we), this._injector.get(Fe), this._injector.get(Ce);
@@ -2385,15 +2383,15 @@ let Ie = class extends Dt {
     this._injector.get(Te);
   }
 };
-vt(Ie, "pluginName", Sa);
+vt(Ie, "pluginName", Ra);
 vt(Ie, "type", C.UNIVER_SHEET);
-Ie = Wa([
-  At(Ut),
-  qe(1, R(Xe)),
-  qe(2, B),
-  qe(3, It)
+Ie = Pa([
+  wt(Ut),
+  je(1, R(Ge)),
+  je(2, U),
+  je(3, At)
 ], Ie);
-function za(o) {
+function Ka(o) {
   const e = o.get(ct).getCurrentSelections().map((i) => i.range);
   return {
     uid: st(6),
@@ -2403,43 +2401,43 @@ function za(o) {
     ranges: e != null ? e : [{ startColumn: 0, endColumn: 0, startRow: 0, endRow: 0 }]
   };
 }
-const Za = "data-validation.custom-formula-input", Ja = "data-validation.formula-input", er = "data-validation.list-formula-input", tr = "data-validation.checkbox-formula-input";
+const za = "data-validation.custom-formula-input", Za = "data-validation.formula-input", Ja = "data-validation.list-formula-input", er = "data-validation.checkbox-formula-input";
 export {
-  ma as AddSheetDataValidationCommand,
-  Ja as BASE_FORMULA_INPUT_NAME,
+  ha as AddSheetDataValidationCommand,
+  Za as BASE_FORMULA_INPUT_NAME,
   Ee as CHECKBOX_FORMULA_1,
   Ve as CHECKBOX_FORMULA_2,
-  tr as CHECKBOX_FORMULA_INPUT_NAME,
-  Za as CUSTOM_FORMULA_INPUT_NAME,
-  ra as CheckboxValidator,
-  pa as ClearRangeDataValidationCommand,
-  Sa as DATA_VALIDATION_PLUGIN_NAME,
+  er as CHECKBOX_FORMULA_INPUT_NAME,
+  za as CUSTOM_FORMULA_INPUT_NAME,
+  aa as CheckboxValidator,
+  _a as ClearRangeDataValidationCommand,
+  Ra as DATA_VALIDATION_PLUGIN_NAME,
   Q as DataValidationCacheService,
   P as DataValidationCustomFormulaService,
   Te as DataValidationFormulaController,
   K as DataValidationFormulaService,
-  sa as DateValidator,
-  er as LIST_FORMULA_INPUT_NAME,
-  Da as ListMultipleValidator,
+  oa as DateValidator,
+  Ja as LIST_FORMULA_INPUT_NAME,
+  Ia as ListMultipleValidator,
   _t as ListValidator,
-  fa as RemoveSheetAllDataValidationCommand,
-  Ra as RemoveSheetDataValidationCommand,
+  pa as RemoveSheetAllDataValidationCommand,
+  va as RemoveSheetDataValidationCommand,
   F as SheetDataValidationModel,
   Ae as SheetsDataValidationValidatorService,
   Ie as UniverSheetsDataValidationPlugin,
-  _a as UpdateSheetDataValidationOptionsCommand,
-  ha as UpdateSheetDataValidationRangeCommand,
-  ga as UpdateSheetDataValidationSettingCommand,
-  za as createDefaultNewRule,
+  ga as UpdateSheetDataValidationOptionsCommand,
+  ca as UpdateSheetDataValidationRangeCommand,
+  ma as UpdateSheetDataValidationSettingCommand,
+  Ka as createDefaultNewRule,
   fe as deserializeListOptions,
   ye as getCellValueNumber,
   ne as getCellValueOrigin,
-  Ka as getDataValidationCellValue,
-  Be as getDataValidationDiffMutations,
+  Xa as getDataValidationCellValue,
+  Le as getDataValidationDiffMutations,
   _e as getFormulaCellData,
   oe as getFormulaResult,
-  Le as getTransformedFormula,
+  be as getTransformedFormula,
   O as isLegalFormulaResult,
-  Xa as serializeListOptions,
+  Ya as serializeListOptions,
   pe as transformCheckboxValue
 };