@univerjs/sheets-data-validation 0.10.12-nightly.202510251119 → 0.10.13-nightly.202510290902

package/lib/es/index.js

@@ -1,8 +1,8 @@
 var St = Object.defineProperty;
 var Et = (o, a, e) => a in o ? St(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e;
 var m = (o, a, e) => Et(o, typeof a != "symbol" ? a + "" : a, e);
-import { Inject as v, ICommandService as U, IUniverInstanceService as w, Disposable as W, ObjectMatrix as Se, getIntersectRange as ot, UniverInstanceType as C, Range as L, Rectangle as A, isFormulaString as S, DataValidationType as T, getOriginCellValue as Vt, RBush as Mt, debounce as yt, Tools as E, DataValidationStatus as b, WrapStrategy as ve, DataValidationOperator as h, numfmt as P, dayjs as st, DataValidationRenderMode as Pe, CommandType as z, IUndoRedoService as Z, sequenceExecute as De, isRangesEqual as nt, IPermissionService as Tt, generateRandomId as Ye, toDisposable as Xe, Injector as Ke, CellValueType as Ft, RxDisposable as Ct, LifecycleService as Ot, LifecycleStages as et, bufferDebounceTime as wt, DependentOn as It, IConfigService as At, 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 N, RemoveDataValidationMutation as D, UpdateDataValidationMutation as y, getRuleSetting as Lt, getRuleOptions as Ut, UniverDataValidationPlugin as Bt } from "@univerjs/data-validation";
+import { Inject as v, ICommandService as U, IUniverInstanceService as O, Disposable as W, ObjectMatrix as Se, getIntersectRange as ot, UniverInstanceType as N, Range as L, Rectangle as I, isFormulaString as S, DataValidationType as T, getOriginCellValue as Vt, RBush as Mt, debounce as yt, Tools as E, DataValidationStatus as b, WrapStrategy as ve, DataValidationOperator as h, numfmt as P, dayjs as st, DataValidationRenderMode as Pe, CommandType as z, IUndoRedoService as Z, sequenceExecute as Ae, isRangesEqual as nt, IPermissionService as Tt, generateRandomId as Ye, toDisposable as Xe, Injector as Ke, CellValueType as Ft, RxDisposable as Nt, LifecycleService as Ct, LifecycleStages as et, bufferDebounceTime as Ot, DependentOn as wt, IConfigService as It, Plugin as At, merge as Dt } from "@univerjs/core";
+import { DataValidationModel as De, DataValidatorRegistryService as q, UpdateRuleType as M, BaseDataValidator as G, TextLengthErrorTitleMap as bt, AddDataValidationMutation as D, RemoveDataValidationMutation as A, UpdateDataValidationMutation as y, getRuleSetting as Lt, getRuleOptions as Ut, UniverDataValidationPlugin as Bt } from "@univerjs/data-validation";
 import { ERROR_TYPE_SET as xt, LexerTreeBuilder as Y, isReferenceString as lt, sequenceNodeType as Pt, deserializeRangeWithSheet as Ht, deserializeRangeWithSheetWithCache as Wt, operatorToken as $t } from "@univerjs/engine-formula";
 import { SetRangeValuesMutation as se, RemoveSheetMutation as ut, getSheetCommandTarget as ze, SetRangeValuesUndoMutationFactory as dt, WorksheetViewPermission as kt, RefRangeService as jt, handleCommonDefaultRangeChangeWithEffectRefCommands as Qt, SheetInterceptorService as ct, RemoveSheetCommand as qt, CopySheetCommand as Gt, SheetsSelectionsService as ht, ClearSelectionAllCommand as Yt } from "@univerjs/sheets";
 import { Subject as Ge, bufferWhen as Xt, filter as tt } from "rxjs";
@@ -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 === C.UNIVER_SHEET && this._cacheMatrix.delete(a.getUnitId());
+      a.type === N.UNIVER_SHEET && this._cacheMatrix.delete(a.getUnitId());
     }));
   }
   _ensureCache(a, e) {
@@ -81,18 +81,18 @@ let Q = class extends W {
 };
 Q = zt([
   He(0, v(U)),
-  He(1, v(w)),
-  He(2, v(Ne))
+  He(1, v(O)),
+  He(2, v(De))
 ], Q);
 function oe(o) {
   var a, e;
   return (e = (a = o == null ? void 0 : o[0]) == null ? void 0 : a[0]) == null ? void 0 : e.v;
 }
-function _e(o) {
+function pe(o) {
   var a;
   return (a = o == null ? void 0 : o[0]) == null ? void 0 : a[0];
 }
-function O(o) {
+function C(o) {
   return !xt.has(o);
 }
 function de(o, a) {
@@ -122,7 +122,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) === C.UNIVER_SHEET)
+        if (this._instanceSrv.getUnitType(e) === N.UNIVER_SHEET)
           for (const i in t) {
             const s = t[i], { ruleFormulaMap: n } = this._ensureMaps(e, i);
             s.forEach((l) => {
@@ -148,7 +148,7 @@ let H = class extends W {
   _handleDirtyRanges(a, e, t) {
     this._dataValidationModel.getRules(a, e).forEach((i) => {
       const s = i.ranges;
-      A.doAnyRangesIntersect(s, t) && this.makeRuleDirty(a, e, i.uid);
+      I.doAnyRangesIntersect(s, t) && this.makeRuleDirty(a, e, i.uid);
     });
   }
   _initDirtyRanges() {
@@ -193,36 +193,36 @@ let H = class extends W {
     }
   }
   async getCellFormulaValue(a, e, t, r, i) {
-    var p, _;
+    var f, p;
     const { ruleFormulaMap: s } = this._ensureMaps(a, e), n = s.get(t);
     if (!n)
       return Promise.resolve(void 0);
     const l = await this._registerOtherFormulaService.getFormulaValue(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, g = i - d;
-    return _e((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[g]);
+    return pe((p = (f = l == null ? void 0 : l.result) == null ? void 0 : f[c]) == null ? void 0 : p[g]);
   }
   async getCellFormula2Value(a, e, t, r, i) {
-    var p, _;
+    var f, p;
     const { ruleFormulaMap2: s } = this._ensureMaps(a, e), n = s.get(t);
     if (!n)
       return Promise.resolve(void 0);
     const l = await this._registerOtherFormulaService.getFormulaValue(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, g = i - d;
-    return _e((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[g]);
+    return pe((p = (f = l == null ? void 0 : l.result) == null ? void 0 : f[c]) == null ? void 0 : p[g]);
   }
   getCellFormulaValueSync(a, e, t, r, i) {
-    var p, _;
+    var f, p;
     const { ruleFormulaMap: s } = this._ensureMaps(a, e), n = s.get(t);
     if (!n)
       return;
     const l = this._registerOtherFormulaService.getFormulaValueSync(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, g = i - d;
-    return _e((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[g]);
+    return pe((p = (f = l == null ? void 0 : l.result) == null ? void 0 : f[c]) == null ? void 0 : p[g]);
   }
   getCellFormula2ValueSync(a, e, t, r, i) {
-    var p, _;
+    var f, p;
     const { ruleFormulaMap2: s } = this._ensureMaps(a, e), n = s.get(t);
     if (!n)
       return;
     const l = this._registerOtherFormulaService.getFormulaValueSync(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, g = i - d;
-    return _e((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[g]);
+    return pe((p = (f = l == null ? void 0 : l.result) == null ? void 0 : f[c]) == null ? void 0 : p[g]);
   }
   getRuleFormulaInfo(a, e, t) {
     const { ruleFormulaMap: r } = this._ensureMaps(a, e);
@@ -235,9 +235,9 @@ let H = class extends W {
   }
 };
 H = Jt([
-  re(0, w),
+  re(0, O),
   re(1, v(mt)),
-  re(2, v(Ne)),
+  re(2, v(De)),
   re(3, v(Q)),
   re(4, v(q))
 ], H);
@@ -256,7 +256,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) === C.UNIVER_SHEET)
+        if (this._instanceService.getUnitType(e) === N.UNIVER_SHEET)
           for (const i in t) {
             const s = t[i], n = this._ensureRuleFormulaMap(e, i);
             s.forEach((l) => {
@@ -327,16 +327,16 @@ let K = class extends W {
   }
 };
 K = ta([
-  ie(0, w),
+  ie(0, O),
   ie(1, v(mt)),
   ie(2, v(Q)),
-  ie(3, v(Ne)),
+  ie(3, v(De)),
   ie(4, v(q))
 ], K);
 function ne(o) {
   return Vt(o);
 }
-function _t(o) {
+function pt(o) {
   var a;
   return String((a = ne(o)) != null ? a : "");
 }
@@ -367,14 +367,14 @@ class Ze {
   }
   get _worksheet() {
     var a;
-    return (a = this._univerInstanceService.getUnit(this._unitId, C.UNIVER_SHEET)) == null ? void 0 : a.getSheetBySheetId(this._subUnitId);
+    return (a = this._univerInstanceService.getUnit(this._unitId, N.UNIVER_SHEET)) == null ? void 0 : a.getSheetBySheetId(this._subUnitId);
   }
   _addRule(a, e) {
     if (!this._worksheet)
       return;
-    const t = A.mergeRanges(e.map((r) => L.transformRange(r, this._worksheet)));
+    const t = I.mergeRanges(e.map((r) => L.transformRange(r, this._worksheet)));
     this._map.forEach((r, i) => {
-      const s = A.subtractMulti(r, t);
+      const s = I.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();
   }
@@ -386,7 +386,7 @@ class Ze {
       return;
     const e = a.map((t) => L.transformRange(t, this._worksheet));
     this._map.forEach((t, r) => {
-      const i = A.subtractMulti(t, e);
+      const i = I.subtractMulti(t, e);
       i.length === 0 ? this._map.delete(r) : this._map.set(r, i);
     }), this._dirty = !0, this._debonceBuildTree();
   }
@@ -404,10 +404,10 @@ class Ze {
       if (!t.length)
         return;
       let r = this._map.get(e);
-      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) => {
+      r ? (this._map.set(e, I.mergeRanges([...r, ...t])), r = this._map.get(e)) : (r = t, this._map.set(e, r)), this._map.forEach((i, s) => {
         if (s === e)
           return;
-        const n = A.subtractMulti(i, t);
+        const n = I.subtractMulti(i, t);
         n.length === 0 ? this._map.delete(s) : this._map.set(s, n);
       });
     }), this._dirty = !0, this._debonceBuildTree();
@@ -418,11 +418,11 @@ class Ze {
     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) => !A.equals(u, n[d]))) && e.push({
+      s.length !== 0 && (s.length !== n.length || s.some((u, d) => !I.equals(u, n[d]))) && e.push({
         type: "update",
         ruleId: r.uid,
         oldRanges: n,
-        newRanges: A.sort(s),
+        newRanges: I.sort(s),
         rule: r
       }), s.length === 0 && (e.push({
         type: "delete",
@@ -437,11 +437,11 @@ class Ze {
     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) => !A.equals(d, l[c]))) && t.push({
+      n.length !== 0 && (n.length !== l.length || n.some((d, c) => !I.equals(d, l[c]))) && t.push({
         type: "update",
         ruleId: i.uid,
         oldRanges: l,
-        newRanges: A.sort(n),
+        newRanges: I.sort(n),
         rule: i
       }), n.length === 0 && (t.push({
         type: "delete",
@@ -455,7 +455,7 @@ class Ze {
         type: "add",
         rule: {
           ...i,
-          ranges: A.sort(s)
+          ranges: I.sort(s)
         }
       });
     }), t;
@@ -577,21 +577,21 @@ let F = class extends W {
       return this._dataValidationModel.getRuleById(a, e, i);
   }
   validator(a, e, t) {
-    const { col: r, row: i, unitId: s, subUnitId: n, worksheet: l } = e, u = (_, R) => {
-      t && t(_, R), R && this._validStatusChange$.next({
+    const { col: r, row: i, unitId: s, subUnitId: n, worksheet: l } = e, u = (p, R) => {
+      t && t(p, R), R && this._validStatusChange$.next({
         unitId: s,
         subUnitId: n,
         ruleId: a.uid,
-        status: _,
+        status: p,
         row: i,
         col: r
       });
-    }, d = l.getCellValueOnly(i, r), c = this.getValidator(a.type), g = l.getCellRaw(i, r), p = ne(g);
+    }, d = l.getCellValueOnly(i, r), c = this.getValidator(a.type), g = l.getCellRaw(i, r), f = ne(g);
     if (c) {
-      const _ = this._dataValidationCacheService.ensureCache(s, n), R = _.getValue(i, r);
-      return R == null ? (_.setValue(i, r, b.VALIDATING), c.validator(
+      const p = this._dataValidationCacheService.ensureCache(s, n), R = p.getValue(i, r);
+      return R == null ? (p.setValue(i, r, b.VALIDATING), c.validator(
         {
-          value: p,
+          value: f,
           unitId: s,
           subUnitId: n,
           row: i,
@@ -603,8 +603,8 @@ let F = class extends W {
         },
         a
       ).then((V) => {
-        const f = V ? b.VALID : b.INVALID, I = _.getValue(i, r);
-        f === b.VALID ? _.realDeleteValue(i, r) : _.setValue(i, r, f), u(f, R !== I);
+        const _ = V ? b.VALID : b.INVALID, w = p.getValue(i, r);
+        _ === b.VALID ? p.realDeleteValue(i, r) : p.setValue(i, r, _), u(_, R !== w);
       }), b.VALIDATING) : (u(R != null ? R : b.VALID, !1), R != null ? R : b.VALID);
     } else
       return u(b.VALID, !1), b.VALID;
@@ -635,8 +635,8 @@ let F = class extends W {
   }
 };
 F = ra([
-  X(0, v(Ne)),
-  X(1, w),
+  X(0, v(De)),
+  X(1, O),
   X(2, v(q)),
   X(3, v(Q)),
   X(4, v(K)),
@@ -647,7 +647,7 @@ const Ee = 1, Ve = 0;
 function at(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;
+const fe = (o) => E.isDefine(o) && String(o).toLowerCase() === "true" ? "1" : String(o).toLowerCase() === "false" ? "0" : o;
 class ia extends G {
   constructor() {
     super(...arguments);
@@ -683,11 +683,11 @@ class ia extends G {
     };
   }
   async parseFormula(e, t, r) {
-    var c, g, p, _;
-    const { formula1: i = Ee, 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 = O(String(l)) && O(String(u));
+    var c, g, f, p;
+    const { formula1: i = Ee, 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 = (f = n == null ? void 0 : n[1]) == null ? void 0 : f.result) == null ? void 0 : p[0][0]) : s, d = C(String(l)) && C(String(u));
     return {
-      formula1: pe(l),
-      formula2: pe(u),
+      formula1: fe(l),
+      formula2: fe(u),
       originFormula1: l,
       originFormula2: u,
       isFormulaValid: d
@@ -699,11 +699,11 @@ class ia extends G {
     };
   }
   parseFormulaSync(e, t, r) {
-    var c, g, p, _;
-    const { formula1: i = Ee, 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 = O(String(l)) && O(String(u));
+    var c, g, f, p;
+    const { formula1: i = Ee, 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 = (f = n == null ? void 0 : n[1]) == null ? void 0 : f.result) == null ? void 0 : p[0][0]) : s, d = C(String(l)) && C(String(u));
     return {
-      formula1: pe(l),
-      formula2: pe(u),
+      formula1: fe(l),
+      formula2: fe(u),
       originFormula1: l,
       originFormula2: u,
       isFormulaValid: d
@@ -758,7 +758,7 @@ const rt = {
 function Ka(o) {
   return o.filter(Boolean).join(",");
 }
-function fe(o) {
+function _e(o) {
   return o.split(",").filter(Boolean);
 }
 function za(o) {
@@ -802,7 +802,7 @@ class na extends G {
     m(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 = O(String(n == null ? void 0 : n.v)) && O(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 = C(String(n == null ? void 0 : n.v)) && C(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),
@@ -935,7 +935,7 @@ class la 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 = O(String(n == null ? void 0 : n.v)) && O(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 = C(String(n == null ? void 0 : n.v)) && C(String(l == null ? void 0 : l.v));
     return {
       formula1: this._parseNumber(S(u) ? n == null ? void 0 : n.v : u),
       formula2: this._parseNumber(S(d) ? l == null ? void 0 : l.v : d),
@@ -979,7 +979,7 @@ function $e(o) {
             a.add(P.format(t.s.n.pattern, r, { throws: !1 }));
             return;
           }
-          O(r.toString()) && a.add(r.toString());
+          C(r.toString()) && a.add(r.toString());
         }
       });
     }
@@ -1001,17 +1001,17 @@ function ca(o, a) {
   const { formula1: e = "", ranges: t } = o;
   if (lt(e.slice(1))) {
     const i = Ht(e.slice(1));
-    if ((!i.sheetName || i.sheetName === a) && t.some((s) => A.intersects(s, i.range)))
+    if ((!i.sheetName || i.sheetName === a) && t.some((s) => I.intersects(s, i.range)))
       return !0;
   }
   return !1;
 }
-class pt extends G {
+class ft extends G {
   constructor() {
     super(...arguments);
     m(this, "formulaService", this.injector.get(K));
     m(this, "_lexer", this.injector.get(Y));
-    m(this, "_univerInstanceService", this.injector.get(w));
+    m(this, "_univerInstanceService", this.injector.get(O));
     m(this, "order", 50);
     m(this, "offsetFormulaByRange", !1);
     m(this, "id", T.LIST);
@@ -1022,7 +1022,7 @@ class pt extends G {
   }
   validatorFormula(e, t, r) {
     var u, d, c;
-    const i = !E.isBlank(e.formula1), s = da((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 = ca(e, n != null ? n : "");
+    const i = !E.isBlank(e.formula1), s = da((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 = ca(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")
@@ -1047,7 +1047,7 @@ class pt extends G {
   }
   parseCellValue(e) {
     const t = e.toString();
-    return fe(t);
+    return _e(t);
   }
   async parseFormula(e, t, r) {
     var l, u;
@@ -1055,13 +1055,13 @@ class pt extends G {
     return {
       formula1: void 0,
       formula2: void 0,
-      isFormulaValid: O(String(s))
+      isFormulaValid: C(String(s))
     };
   }
   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);
-    return this.parseCellValue(i).every((_) => d.includes(_));
+    var g, f;
+    const { value: i, unitId: s, subUnitId: n } = e, { formula1: l = "" } = r, u = await this.formulaService.getRuleFormulaResult(s, n, r.uid), d = S(l) ? $e((f = (g = u == null ? void 0 : u[0]) == null ? void 0 : g.result) == null ? void 0 : f[0][0]) : _e(l);
+    return this.parseCellValue(i).every((p) => d.includes(p));
   }
   generateRuleName() {
     return this.localeService.t("dataValidation.list.name");
@@ -1070,22 +1070,22 @@ class pt extends G {
     return this.localeService.t("dataValidation.list.error");
   }
   getList(e, t, r) {
-    var g, p, _, R;
-    const { formula1: i = "" } = e, s = this.injector.get(w), n = (g = t ? s.getUniverSheetInstance(t) : void 0) != null ? g : s.getCurrentUnitForType(C.UNIVER_SHEET);
+    var g, f, p, R;
+    const { formula1: i = "" } = e, s = this.injector.get(O), n = (g = t ? s.getUniverSheetInstance(t) : void 0) != null ? g : s.getCurrentUnitForType(N.UNIVER_SHEET);
     if (!n) return [];
-    const l = (p = r ? n.getSheetBySheetId(r) : void 0) != null ? p : n.getActiveSheet();
+    const l = (f = r ? n.getSheetBySheetId(r) : void 0) != null ? f : n.getActiveSheet();
     if (!l) return [];
     const u = n.getUnitId(), d = l.getSheetId(), c = this.formulaService.getRuleFormulaResultSync(u, d, e.uid);
-    return S(i) ? $e((R = (_ = c == null ? void 0 : c[0]) == null ? void 0 : _.result) == null ? void 0 : R[0][0]) : fe(i);
+    return S(i) ? $e((R = (p = c == null ? void 0 : c[0]) == null ? void 0 : p.result) == null ? void 0 : R[0][0]) : _e(i);
   }
   async getListAsync(e, t, r) {
-    var g, p, _, R;
-    const { formula1: i = "" } = e, s = this.injector.get(w), n = (g = t ? s.getUniverSheetInstance(t) : void 0) != null ? g : s.getCurrentUnitForType(C.UNIVER_SHEET);
+    var g, f, p, R;
+    const { formula1: i = "" } = e, s = this.injector.get(O), n = (g = t ? s.getUniverSheetInstance(t) : void 0) != null ? g : s.getCurrentUnitForType(N.UNIVER_SHEET);
     if (!n) return [];
-    const l = (p = r ? n.getSheetBySheetId(r) : void 0) != null ? p : n.getActiveSheet();
+    const l = (f = r ? n.getSheetBySheetId(r) : void 0) != null ? f : 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((R = (_ = c == null ? void 0 : c[0]) == null ? void 0 : _.result) == null ? void 0 : R[0][0]) : fe(i);
+    return S(i) ? $e((R = (p = c == null ? void 0 : c[0]) == null ? void 0 : p.result) == null ? void 0 : R[0][0]) : _e(i);
   }
   getListWithColor(e, t, r) {
     const i = this.getList(e, t, r), s = (e.formula2 || "").split(",");
@@ -1141,7 +1141,7 @@ class ha 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 = O(String(n == null ? void 0 : n.v)) && O(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 = C(String(n == null ? void 0 : n.v)) && C(String(l == null ? void 0 : l.v));
     return {
       formula1: this._parseNumber(S(u) ? n == null ? void 0 : n.v : u),
       formula2: this._parseNumber(S(d) ? l == null ? void 0 : l.v : d),
@@ -1165,67 +1165,67 @@ class ha extends G {
     return `${this.localeService.t(bt[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
   }
 }
-function ft(o) {
+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() : E.isBlank(o.v) : !0;
 }
 function Ue(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 = ze(c, { unitId: o, subUnitId: a });
+  const s = t.get(Y), n = t.get(q), l = [], u = [], d = t.get(F), c = t.get(O), g = ze(c, { unitId: o, subUnitId: a });
   if (!g)
     return {
       redoMutations: l,
       undoMutations: u
     };
-  const { worksheet: p } = g, _ = new Se();
+  const { worksheet: f } = g, p = new Se();
   let R = !1;
-  function V(f, I) {
-    i && f.forEach(($) => {
+  function V(_, w) {
+    i && _.forEach(($) => {
       L.foreach($, (B, k) => {
-        const x = p.getCellRaw(B, k), J = _t(x);
-        (ft(x) || J === I) && !(x != null && x.p) && (R = !0, _.setValue(B, k, {
-          v: I,
+        const x = f.getCellRaw(B, k), J = pt(x);
+        (_t(x) || J === w) && !(x != null && x.p) && (R = !0, p.setValue(B, k, {
+          v: w,
           p: null
         }));
       });
     });
   }
-  if (e.forEach((f) => {
-    switch (f.type) {
+  if (e.forEach((_) => {
+    switch (_.type) {
       case "delete":
         l.push({
-          id: D.id,
+          id: A.id,
           params: {
             unitId: o,
             subUnitId: a,
-            ruleId: f.rule.uid,
+            ruleId: _.rule.uid,
             source: r
           }
         }), u.unshift({
-          id: N.id,
+          id: D.id,
           params: {
             unitId: o,
             subUnitId: a,
-            rule: f.rule,
-            index: f.index,
+            rule: _.rule,
+            index: _.index,
             source: r
           }
         });
         break;
       case "update": {
-        if (de(f.rule.type, n)) {
-          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 || !nt(f.newRanges, f.oldRanges) ? (l.push({
+        if (de(_.rule.type, n)) {
+          const $ = _.oldRanges[0].startRow, B = _.oldRanges[0].startColumn, k = _.newRanges[0].startRow, x = _.newRanges[0].startColumn, J = k - $, ce = x - B, he = S(_.rule.formula1) ? s.moveFormulaRefOffset(_.rule.formula1, ce, J) : _.rule.formula1, me = S(_.rule.formula2) ? s.moveFormulaRefOffset(_.rule.formula2, ce, J) : _.rule.formula2;
+          he !== _.rule.formula1 || me !== _.rule.formula2 || !nt(_.newRanges, _.oldRanges) ? (l.push({
             id: y.id,
             params: {
               unitId: o,
               subUnitId: a,
-              ruleId: f.ruleId,
+              ruleId: _.ruleId,
               payload: {
                 type: M.ALL,
                 payload: {
                   formula1: he,
                   formula2: me,
-                  ranges: f.newRanges
+                  ranges: _.newRanges
                 }
               }
             }
@@ -1234,13 +1234,13 @@ function Ue(o, a, e, t, r = "command", i = !0) {
             params: {
               unitId: o,
               subUnitId: a,
-              ruleId: f.ruleId,
+              ruleId: _.ruleId,
               payload: {
                 type: M.ALL,
                 payload: {
-                  formula1: f.rule.formula1,
-                  formula2: f.rule.formula2,
-                  ranges: f.oldRanges
+                  formula1: _.rule.formula1,
+                  formula2: _.rule.formula2,
+                  ranges: _.oldRanges
                 }
               }
             }
@@ -1249,10 +1249,10 @@ function Ue(o, a, e, t, r = "command", i = !0) {
             params: {
               unitId: o,
               subUnitId: a,
-              ruleId: f.ruleId,
+              ruleId: _.ruleId,
               payload: {
                 type: M.RANGE,
-                payload: f.newRanges
+                payload: _.newRanges
               },
               source: r
             }
@@ -1261,10 +1261,10 @@ function Ue(o, a, e, t, r = "command", i = !0) {
             params: {
               unitId: o,
               subUnitId: a,
-              ruleId: f.ruleId,
+              ruleId: _.ruleId,
               payload: {
                 type: M.RANGE,
-                payload: f.oldRanges
+                payload: _.oldRanges
               },
               source: r
             }
@@ -1275,10 +1275,10 @@ function Ue(o, a, e, t, r = "command", i = !0) {
             params: {
               unitId: o,
               subUnitId: a,
-              ruleId: f.ruleId,
+              ruleId: _.ruleId,
               payload: {
                 type: M.RANGE,
-                payload: f.newRanges
+                payload: _.newRanges
               },
               source: r
             }
@@ -1287,58 +1287,58 @@ function Ue(o, a, e, t, r = "command", i = !0) {
             params: {
               unitId: o,
               subUnitId: a,
-              ruleId: f.ruleId,
+              ruleId: _.ruleId,
               payload: {
                 type: M.RANGE,
-                payload: f.oldRanges
+                payload: _.oldRanges
               },
               source: r
             }
           });
-        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);
+        const w = d.getRuleById(o, a, _.ruleId);
+        if (w && w.type === T.CHECKBOX) {
+          const B = d.getValidator(T.CHECKBOX).parseFormulaSync(w, o, a);
+          V(_.newRanges, B.formula2);
         }
         break;
       }
       case "add": {
         if (l.push({
-          id: N.id,
+          id: D.id,
           params: {
             unitId: o,
             subUnitId: a,
-            rule: f.rule,
+            rule: _.rule,
             source: r
           }
         }), u.unshift({
-          id: D.id,
+          id: A.id,
           params: {
             unitId: o,
             subUnitId: a,
-            ruleId: f.rule.uid,
+            ruleId: _.rule.uid,
             source: r
           }
-        }), f.rule.type === T.CHECKBOX) {
-          const $ = d.getValidator(T.CHECKBOX).parseFormulaSync(f.rule, o, a);
-          V(f.rule.ranges, $.originFormula2);
+        }), _.rule.type === T.CHECKBOX) {
+          const $ = d.getValidator(T.CHECKBOX).parseFormulaSync(_.rule, o, a);
+          V(_.rule.ranges, $.originFormula2);
         }
         break;
       }
     }
   }), R) {
-    const f = {
+    const _ = {
       id: se.id,
       params: {
         unitId: o,
         subUnitId: a,
-        cellValue: _.getData()
+        cellValue: p.getData()
       }
-    }, I = {
+    }, w = {
       id: se.id,
-      params: dt(t, f.params)
+      params: dt(t, _.params)
     };
-    l.push(f), u.push(I);
+    l.push(_), u.push(w);
   }
   return {
     redoMutations: l,
@@ -1356,12 +1356,12 @@ const ma = {
       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 } = Ue(e, t, c, o);
+    const c = d.diff(s.getRules(e, t)), { redoMutations: g, undoMutations: f } = Ue(e, t, c, o);
     return l.pushUndoRedo({
-      undoMutations: p,
+      undoMutations: f,
       redoMutations: g,
       unitID: e
-    }), De(g, n), !0;
+    }), Ae(g, n), !0;
   }
 }, ga = {
   type: z.COMMAND,
@@ -1378,12 +1378,12 @@ const ma = {
         ...r,
         ...d == null ? void 0 : d.normalizeFormula(r, e, t)
       }
-    }, { redoMutations: g, undoMutations: p } = Ue(e, t, u, o);
+    }, { redoMutations: g, undoMutations: f } = Ue(e, t, u, o);
     return g.push({
-      id: N.id,
-      params: c
-    }), p.unshift({
       id: D.id,
+      params: c
+    }), f.unshift({
+      id: A.id,
       params: {
         unitId: e,
         subUnitId: t,
@@ -1392,10 +1392,10 @@ const ma = {
     }), n.pushUndoRedo({
       unitID: e,
       redoMutations: g,
-      undoMutations: p
-    }), De(g, s), !0;
+      undoMutations: f
+    }), Ae(g, s), !0;
   }
-}, _a = {
+}, pa = {
   type: z.COMMAND,
   id: "sheets.command.update-data-validation-setting",
   // eslint-disable-next-line max-lines-per-function
@@ -1411,7 +1411,7 @@ const ma = {
     const g = { ...c, ...u };
     if (!d.validatorFormula(g, s, n).success)
       return !1;
-    const p = {
+    const f = {
       unitId: s,
       subUnitId: n,
       ruleId: l,
@@ -1422,9 +1422,9 @@ const ma = {
           ...d.normalizeFormula(g, s, n)
         }
       }
-    }, _ = [{
+    }, p = [{
       id: y.id,
-      params: p
+      params: f
     }], R = {
       unitId: s,
       subUnitId: n,
@@ -1438,14 +1438,14 @@ const ma = {
       params: R
     }];
     if (u.type === T.CHECKBOX) {
-      const I = c.ranges, $ = o.get(w), B = ze($, { unitId: s, subUnitId: n });
+      const w = c.ranges, $ = o.get(O), B = ze($, { 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 Be = !1;
-        if (I.forEach((ge) => {
+        if (w.forEach((ge) => {
           L.foreach(ge, (ae, xe) => {
-            const j = x.getCellRaw(ae, xe), Je = _t(j);
-            (ft(j) || Je === String(J)) && !(j != null && j.p) ? (k.setValue(ae, xe, {
+            const j = x.getCellRaw(ae, xe), Je = pt(j);
+            (_t(j) || Je === String(J)) && !(j != null && j.p) ? (k.setValue(ae, xe, {
               v: he,
               p: null
             }), Be = !0) : Je === String(ce) && !(j != null && j.p) && (k.setValue(ae, xe, {
@@ -1465,17 +1465,17 @@ const ma = {
             id: se.id,
             params: dt(o, ge.params)
           };
-          _.push(ge), V.push(ae);
+          p.push(ge), V.push(ae);
         }
       }
     }
-    return De(_, e).result ? (t.pushUndoRedo({
+    return Ae(p, e).result ? (t.pushUndoRedo({
       unitID: s,
-      redoMutations: _,
+      redoMutations: p,
       undoMutations: V
     }), !0) : !1;
   }
-}, pa = {
+}, fa = {
   type: z.COMMAND,
   id: "sheets.command.update-data-validation-options",
   handler(o, a) {
@@ -1503,32 +1503,32 @@ const ma = {
         type: M.OPTIONS,
         payload: Ut(u)
       }
-    }, p = [{
+    }, f = [{
       id: y.id,
       params: g
     }];
     return t.pushUndoRedo({
       unitID: i,
       redoMutations: c,
-      undoMutations: p
+      undoMutations: f
     }), e.executeCommand(y.id, d), !0;
   }
-}, fa = {
+}, _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(U), s = o.get(w), n = ze(s, { unitId: e, subUnitId: t }), l = o.get(F);
+    const { unitId: e, subUnitId: t, ranges: r } = a, i = o.get(U), s = o.get(O), n = ze(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 } = Ue(e, t, c, o);
+    const c = d.diff(l.getRules(e, t)), { redoMutations: g, undoMutations: f } = Ue(e, t, c, o);
     return u.pushUndoRedo({
       unitID: e,
       redoMutations: g,
-      undoMutations: p
-    }), De(g, i).result;
+      undoMutations: f
+    }), Ae(g, i).result;
   }
 }, Ra = {
   type: z.COMMAND,
@@ -1541,10 +1541,10 @@ const ma = {
       subUnitId: t,
       ruleId: n.map((c) => c.uid)
     }, u = [{
-      id: D.id,
+      id: A.id,
       params: l
     }], d = [{
-      id: N.id,
+      id: D.id,
       params: {
         unitId: e,
         subUnitId: t,
@@ -1555,14 +1555,14 @@ const ma = {
       redoMutations: u,
       undoMutations: d,
       unitID: e
-    }), r.executeCommand(D.id, l), !0;
+    }), r.executeCommand(A.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: N.id,
+      id: D.id,
       params: {
         unitId: t,
         subUnitId: r,
@@ -1572,7 +1572,7 @@ const ma = {
     }];
   }
   return [{
-    id: N.id,
+    id: D.id,
     params: {
       unitId: t,
       subUnitId: r,
@@ -1589,10 +1589,10 @@ const ma = {
     if (!a)
       return !1;
     const { unitId: e, subUnitId: t, ruleId: r } = a, i = o.get(U), s = o.get(Z), n = o.get(F), l = [{
-      id: D.id,
+      id: A.id,
       params: a
     }], u = [{
-      id: N.id,
+      id: D.id,
       params: {
         unitId: e,
         subUnitId: t,
@@ -1606,7 +1606,7 @@ const ma = {
       undoMutations: u,
       redoMutations: l,
       unitID: a.unitId
-    }), i.executeCommand(D.id, a), !0;
+    }), i.executeCommand(A.id, a), !0;
   }
 }, Ea = "SHEET_DATA_VALIDATION_PLUGIN";
 var Rt = /* @__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))(Rt || {}), Va = Object.getOwnPropertyDescriptor, Ma = (o, a, e, t) => {
@@ -1627,7 +1627,7 @@ 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 = Wt(s), l = this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET);
       let u = l.getActiveSheet();
       const d = l.getUnitId();
       if (n.sheetName) {
@@ -1638,11 +1638,11 @@ let Te = class extends W {
       }
       if (!u)
         return !1;
-      const { startRow: c, endRow: g, startColumn: p, endColumn: _ } = n.range;
+      const { startRow: c, endRow: g, startColumn: f, endColumn: p } = n.range;
       for (let R = c; R <= g; R++)
-        for (let V = p; V <= _; V++) {
-          const f = (t = (e = u.getCell(R, V)) == null ? void 0 : e.selectionProtection) == null ? void 0 : t[0];
-          if ((f == null ? void 0 : f[Rt.View]) === !1)
+        for (let V = f; V <= p; V++) {
+          const _ = (t = (e = u.getCell(R, V)) == null ? void 0 : e.selectionProtection) == null ? void 0 : t[0];
+          if ((_ == null ? void 0 : _[Rt.View]) === !1)
             return !1;
         }
     }
@@ -1650,7 +1650,7 @@ let Te = class extends W {
   }
 };
 Te = Ma([
-  ke(0, w),
+  ke(0, O),
   ke(1, Tt),
   ke(2, v(Y))
 ], Te);
@@ -1678,7 +1678,7 @@ let Fe = class extends W {
       if (u.length === 0)
         return {
           undos: [{
-            id: N.id,
+            id: D.id,
             params: {
               unitId: a,
               subUnitId: e,
@@ -1687,7 +1687,7 @@ let Fe = class extends W {
             }
           }],
           redos: [{
-            id: D.id,
+            id: A.id,
             params: {
               unitId: a,
               subUnitId: e,
@@ -1730,24 +1730,24 @@ let Fe = class extends W {
           source: "patched"
         }
       });
-      for (let p = 1; p < u.length; p++) {
-        const _ = u[p], R = Ye();
+      for (let f = 1; f < u.length; f++) {
+        const p = u[f], R = Ye();
         d.push({
-          id: N.id,
+          id: D.id,
           params: {
             unitId: a,
             subUnitId: e,
             rule: {
               ...t,
               uid: R,
-              formula1: _.formulas[0],
-              formula2: _.formulas[1],
-              ranges: _.ranges
+              formula1: p.formulas[0],
+              formula2: p.formulas[1],
+              ranges: p.ranges
             },
             source: "patched"
           }
         }), c.push({
-          id: D.id,
+          id: A.id,
           params: {
             unitId: a,
             subUnitId: e,
@@ -1802,12 +1802,12 @@ Fe = Fa([
   je(1, v(gt)),
   je(2, v(q))
 ], Fe);
-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--)
+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--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, ee = (o, a) => (e, t) => a(e, t, o);
-let Ce = class extends W {
+let Ne = class extends W {
   constructor(a, e, t, r, i, s) {
     super();
     m(this, "_disposableMap", /* @__PURE__ */ new Map());
@@ -1826,10 +1826,10 @@ let Ce = class extends W {
       const g = this._dataValidationModel.getRuleById(a, e, r);
       if (!g)
         return { redos: [], undos: [] };
-      const p = g[d];
-      if (!p || p === c)
+      const f = g[d];
+      if (!f || f === c)
         return { redos: [], undos: [] };
-      const _ = {
+      const p = {
         unitId: a,
         subUnitId: e,
         ruleId: t.uid,
@@ -1859,15 +1859,15 @@ let Ce = class extends W {
       }, V = [
         {
           id: y.id,
-          params: _
+          params: p
         }
-      ], f = [
+      ], _ = [
         {
           id: y.id,
           params: R
         }
       ];
-      return { redos: V, undos: f };
+      return { redos: V, undos: _ };
     }, l = this._dataValidationFormulaService.getRuleFormulaInfo(a, e, r);
     if (l) {
       const [d, c] = l;
@@ -1876,7 +1876,7 @@ let Ce = class extends W {
           a,
           e,
           d.text,
-          (p) => n("formula1", p)
+          (f) => n("formula1", f)
         );
         s.add(() => g.dispose());
       }
@@ -1885,7 +1885,7 @@ let Ce = class extends W {
           a,
           e,
           c.text,
-          (p) => n("formula2", p)
+          (f) => n("formula2", f)
         );
         s.add(() => g.dispose());
       }
@@ -1894,11 +1894,11 @@ 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((p) => Qt(p, u)).filter((p) => !!p).flat();
       if (nt(g, d))
         return { redos: [], undos: [] };
       if (g.length) {
-        const _ = {
+        const p = {
           unitId: a,
           subUnitId: e,
           ruleId: t.uid,
@@ -1907,7 +1907,7 @@ let Ce = class extends W {
             payload: g
           },
           source: "patched"
-        }, R = [{ id: y.id, params: _ }], V = [{
+        }, R = [{ id: y.id, params: p }], V = [{
           id: y.id,
           params: {
             unitId: a,
@@ -1922,7 +1922,7 @@ let Ce = class extends W {
         }];
         return { redos: R, undos: V };
       } else {
-        const _ = { unitId: a, subUnitId: e, ruleId: t.uid }, R = [{ id: D.id, params: _ }], V = va(this._injector, _);
+        const p = { unitId: a, subUnitId: e, ruleId: t.uid }, R = [{ id: A.id, params: p }], V = va(this._injector, p);
         return { redos: R, undos: V };
       }
     }, i = [];
@@ -1967,20 +1967,20 @@ let Ce = class extends W {
     }));
   }
 };
-Ce = Oa([
+Ne = Ca([
   ee(0, v(F)),
   ee(1, v(Ke)),
   ee(2, v(jt)),
   ee(3, v(K)),
   ee(4, v(gt)),
   ee(5, v(q))
-], Ce);
-var wa = Object.getOwnPropertyDescriptor, Ia = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? wa(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+], Ne);
+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--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, Qe = (o, a) => (e, t) => a(e, t, o);
-let Oe = class extends W {
+let Ce = class extends W {
   constructor(o, a, e) {
     super(), this._sheetInterceptorService = o, this._univerInstanceService = a, this._sheetDataValidationModel = e, this._initSheetChange();
   }
@@ -1992,7 +1992,7 @@ let Oe = class extends W {
         getMutations: (o) => {
           var a;
           if (o.id === qt.id) {
-            const e = o.params, t = e.unitId || this._univerInstanceService.getCurrentUnitForType(C.UNIVER_SHEET).getUnitId(), r = this._univerInstanceService.getUniverSheetInstance(t);
+            const e = o.params, t = e.unitId || this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET).getUnitId(), r = this._univerInstanceService.getUniverSheetInstance(t);
             if (!r)
               return { redos: [], undos: [] };
             const i = e.subUnitId || ((a = r.getActiveSheet()) == null ? void 0 : a.getSheetId());
@@ -2014,11 +2014,11 @@ let Oe = class extends W {
             };
             return {
               redos: [{
-                id: D.id,
+                id: A.id,
                 params: l
               }],
               undos: [{
-                id: N.id,
+                id: D.id,
                 params: u
               }]
             };
@@ -2033,7 +2033,7 @@ let Oe = class extends W {
             return {
               redos: [
                 {
-                  id: N.id,
+                  id: D.id,
                   params: {
                     unitId: t,
                     subUnitId: i,
@@ -2044,7 +2044,7 @@ let Oe = class extends W {
               ],
               undos: [
                 {
-                  id: D.id,
+                  id: A.id,
                   params: {
                     unitId: t,
                     subUnitId: i,
@@ -2061,12 +2061,12 @@ let Oe = class extends W {
     );
   }
 };
-Oe = Ia([
+Ce = wa([
   Qe(0, v(ct)),
-  Qe(1, v(w)),
+  Qe(1, v(O)),
   Qe(2, v(F))
-], Oe);
-class Aa extends G {
+], Ce);
+class Ia extends G {
   constructor() {
     super(...arguments);
     m(this, "id", T.ANY);
@@ -2095,7 +2095,7 @@ class Aa extends G {
     return this.localeService.t("dataValidation.any.error");
   }
 }
-class Da extends G {
+class Aa extends G {
   constructor() {
     super(...arguments);
     m(this, "id", T.CUSTOM);
@@ -2123,7 +2123,7 @@ class Da 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 C(String(d)) && E.isDefine(d) && d !== "" ? u.t === Ft.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");
@@ -2133,7 +2133,7 @@ class Da extends G {
     return this.localeService.t("dataValidation.custom.ruleName").replace("{FORMULA1}", (t = e.formula1) != null ? t : "");
   }
 }
-class Na extends pt {
+class Da extends ft {
   constructor() {
     super(...arguments);
     m(this, "id", T.LIST_MULTIPLE);
@@ -2180,11 +2180,11 @@ class ba 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 = S(u) ? n == null ? void 0 : n.v : u, g = S(d) ? l == null ? void 0 : l.v : d, p = O(`${c}`) && O(`${g}`);
+    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, g = S(d) ? l == null ? void 0 : l.v : d, f = C(`${c}`) && C(`${g}`);
     return {
       formula1: this._parseNumber(c),
       formula2: this._parseNumber(g),
-      isFormulaValid: p
+      isFormulaValid: f
     };
   }
   validatorFormula(e, t, r) {
@@ -2215,7 +2215,7 @@ var La = Object.getOwnPropertyDescriptor, Ua = (o, a, e, t) => {
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, te = (o, a) => (e, t) => a(e, t, o);
-let we = class extends Ct {
+let Oe = class extends Nt {
   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();
   }
@@ -2224,15 +2224,15 @@ let we = class extends Ct {
   }
   _registerValidators() {
     [
-      Aa,
+      Ia,
       la,
       ba,
       ha,
       na,
       ia,
-      pt,
-      Na,
-      Da
+      ft,
+      Da,
+      Aa
     ].forEach((o) => {
       const a = this._injector.createInstance(o);
       this.disposeWithMe(this._dataValidatorRegistryService.register(a)), this.disposeWithMe(Xe(() => this._injector.delete(o)));
@@ -2243,7 +2243,7 @@ let we = class extends Ct {
       getMutations: (o) => {
         var a;
         if (o.id === Yt.id) {
-          const e = this._univerInstanceService.getCurrentUnitForType(C.UNIVER_SHEET), t = e.getUnitId(), r = e.getActiveSheet();
+          const e = this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET), t = e.getUnitId(), r = e.getActiveSheet();
           if (!r)
             throw new Error("No active sheet found");
           const i = r.getSheetId(), s = (a = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : a.map((c) => c.range), n = this._sheetDataValidationModel.getRuleObjectMatrix(t, i).clone();
@@ -2262,20 +2262,20 @@ let we = class extends Ct {
     });
   }
 };
-we = Ua([
-  te(0, w),
+Oe = Ua([
+  te(0, O),
   te(1, v(q)),
   te(2, v(Ke)),
   te(3, v(ht)),
   te(4, v(ct)),
   te(5, v(F))
-], we);
+], Oe);
 var Ba = Object.getOwnPropertyDescriptor, xa = (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;
 }, Re = (o, a) => (e, t) => a(e, t, o);
-let Ie = class extends W {
+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();
   }
@@ -2283,10 +2283,10 @@ let Ie = class extends W {
     const o = (a) => {
       if (a.length === 0)
         return;
-      const e = this._univerInstanceService.getCurrentUnitForType(C.UNIVER_SHEET), t = e == null ? void 0 : e.getActiveSheet(), r = {};
+      const e = this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET), t = e == null ? void 0 : e.getActiveSheet(), r = {};
       a.flat().forEach((i) => {
         r[i.unitId] || (r[i.unitId] = {}), r[i.unitId][i.subUnitId] || (r[i.unitId][i.subUnitId] = []);
-        const s = this._univerInstanceService.getUnit(i.unitId, C.UNIVER_SHEET), n = s == null ? void 0 : s.getSheetBySheetId(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) => L.transformRange(l, n)));
       }), Object.entries(r).forEach(([i, s]) => {
         Object.entries(s).forEach(([n, l]) => {
@@ -2296,7 +2296,7 @@ let Ie = class extends W {
         });
       });
     };
-    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Xt(() => this._lifecycleService.lifecycle$.pipe(tt((a) => a === et.Rendered)))).subscribe(o)), this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(tt(() => this._lifecycleService.stage >= et.Rendered), wt(20)).subscribe(o));
+    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Xt(() => this._lifecycleService.lifecycle$.pipe(tt((a) => a === et.Rendered)))).subscribe(o)), this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(tt(() => this._lifecycleService.stage >= et.Rendered), Ot(20)).subscribe(o));
   }
   async _validatorByCell(o, a, e, t) {
     const r = o.getUnitId(), i = a.getSheetId();
@@ -2310,7 +2310,7 @@ let Ie = class extends W {
     }) : b.VALID;
   }
   async validatorCell(o, a, e, t) {
-    const r = this._univerInstanceService.getUnit(o, C.UNIVER_SHEET);
+    const r = this._univerInstanceService.getUnit(o, N.UNIVER_SHEET);
     if (!r)
       throw new Error(`cannot find current workbook, unitId: ${o}`);
     const i = r.getSheetBySheetId(a);
@@ -2321,7 +2321,7 @@ let Ie = class extends W {
   validatorRanges(o, a, e) {
     if (!e.length)
       return Promise.resolve([]);
-    const t = this._univerInstanceService.getUnit(o, C.UNIVER_SHEET);
+    const t = this._univerInstanceService.getUnit(o, N.UNIVER_SHEET);
     if (!t)
       throw new Error(`cannot find current workbook, unitId: ${o}`);
     const r = t.getSheetBySheetId(a);
@@ -2336,7 +2336,7 @@ let Ie = class extends W {
     }));
   }
   async validatorWorksheet(o, a) {
-    const e = this._univerInstanceService.getUnit(o, C.UNIVER_SHEET);
+    const e = this._univerInstanceService.getUnit(o, N.UNIVER_SHEET);
     if (!e)
       throw new Error(`cannot find current workbook, unitId: ${o}`);
     const t = e.getSheetBySheetId(a);
@@ -2373,21 +2373,21 @@ let Ie = class extends W {
     return this.getDataValidations(o, a, e)[0];
   }
 };
-Ie = xa([
-  Re(0, w),
+we = xa([
+  Re(0, O),
   Re(1, v(F)),
   Re(2, v(Q)),
-  Re(3, v(Ot))
-], Ie);
+  Re(3, v(Ct))
+], we);
 var Pa = Object.defineProperty, Ha = Object.getOwnPropertyDescriptor, Wa = (o, a, e) => a in o ? Pa(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e, $a = (o, a, e, t) => {
   for (var r = t > 1 ? void 0 : t ? Ha(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) => Wa(o, typeof a != "symbol" ? a + "" : a, e);
-let Ae = class extends Dt {
+let Ie = class extends At {
   constructor(o = it, a, e, t) {
     super(), this._config = o, this._injector = a, this._commandService = e, this._configService = t;
-    const { ...r } = Nt(
+    const { ...r } = Dt(
       {},
       it,
       this._config
@@ -2399,42 +2399,42 @@ let Ae = class extends Dt {
       [Q],
       [K],
       [H],
-      [Ie],
-      [F],
       [we],
-      [Te],
+      [F],
       [Oe],
+      [Te],
       [Ce],
+      [Ne],
       [Fe]
     ].forEach((o) => {
       this._injector.add(o);
     }), [
       ga,
       ma,
-      _a,
       pa,
+      fa,
       Sa,
       Ra,
-      fa
+      _a
     ].forEach((o) => {
       this._commandService.registerCommand(o);
-    }), this._injector.get(Q), this._injector.get(Ie), this._injector.get(we), this._injector.get(Fe), this._injector.get(Ce);
+    }), this._injector.get(Q), this._injector.get(we), this._injector.get(Oe), this._injector.get(Fe), this._injector.get(Ne);
   }
   onReady() {
-    this._injector.get(Oe);
+    this._injector.get(Ce);
   }
   onRendered() {
     this._injector.get(Te);
   }
 };
-vt(Ae, "pluginName", Ea);
-vt(Ae, "type", C.UNIVER_SHEET);
-Ae = $a([
-  It(Bt),
+vt(Ie, "pluginName", Ea);
+vt(Ie, "type", N.UNIVER_SHEET);
+Ie = $a([
+  wt(Bt),
   qe(1, v(Ke)),
   qe(2, U),
-  qe(3, At)
-], Ae);
+  qe(3, It)
+], Ie);
 function Za(o) {
   const e = o.get(ht).getCurrentSelections().map((i) => i.range);
   return {
@@ -2454,7 +2454,7 @@ export {
   ar as CHECKBOX_FORMULA_INPUT_NAME,
   Ja as CUSTOM_FORMULA_INPUT_NAME,
   ia as CheckboxValidator,
-  fa as ClearRangeDataValidationCommand,
+  _a as ClearRangeDataValidationCommand,
   Ea as DATA_VALIDATION_PLUGIN_NAME,
   Q as DataValidationCacheService,
   H as DataValidationCustomFormulaService,
@@ -2462,26 +2462,26 @@ export {
   K as DataValidationFormulaService,
   na as DateValidator,
   tr as LIST_FORMULA_INPUT_NAME,
-  Na as ListMultipleValidator,
-  pt as ListValidator,
+  Da as ListMultipleValidator,
+  ft as ListValidator,
   Ra as RemoveSheetAllDataValidationCommand,
   Sa as RemoveSheetDataValidationCommand,
   F as SheetDataValidationModel,
-  Ie as SheetsDataValidationValidatorService,
-  Ae as UniverSheetsDataValidationPlugin,
-  pa as UpdateSheetDataValidationOptionsCommand,
+  we as SheetsDataValidationValidatorService,
+  Ie as UniverSheetsDataValidationPlugin,
+  fa as UpdateSheetDataValidationOptionsCommand,
   ma as UpdateSheetDataValidationRangeCommand,
-  _a as UpdateSheetDataValidationSettingCommand,
+  pa as UpdateSheetDataValidationSettingCommand,
   Za as createDefaultNewRule,
-  fe as deserializeListOptions,
+  _e as deserializeListOptions,
   ye as getCellValueNumber,
   ne as getCellValueOrigin,
   za as getDataValidationCellValue,
   Ue as getDataValidationDiffMutations,
-  _e as getFormulaCellData,
+  pe as getFormulaCellData,
   oe as getFormulaResult,
   Le as getTransformedFormula,
-  O as isLegalFormulaResult,
+  C as isLegalFormulaResult,
   Ka as serializeListOptions,
-  pe as transformCheckboxValue
+  fe as transformCheckboxValue
 };