@univerjs/sheets-data-validation 0.12.4 → 0.13.0

package/lib/es/index.js

@@ -1,10 +1,10 @@
 var Et = Object.defineProperty;
 var Mt = (s, a, e) => a in s ? Et(s, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[a] = e;
 var m = (s, a, e) => Mt(s, typeof a != "symbol" ? a + "" : a, e);
-import { Inject as v, ICommandService as B, IUniverInstanceService as I, Disposable as x, ObjectMatrix as Me, getIntersectRange as ot, UniverInstanceType as N, Range as U, Rectangle as w, isFormulaString as S, getOriginCellValue as Vt, Injector as be, numfmt as L, DataValidationType as T, RBush as yt, debounce as Tt, Tools as M, DataValidationStatus as b, WrapStrategy as Se, DataValidationOperator as h, dayjs as nt, DataValidationRenderMode as We, CommandType as z, IUndoRedoService as Z, sequenceExecute as Le, isRangesEqual as lt, IPermissionService as Ft, generateRandomId as Xe, toDisposable as Ke, CellValueType as Ct, RxDisposable as Nt, LifecycleService as Ot, LifecycleStages as et, bufferDebounceTime as wt, DependentOn as At, IConfigService as It, Plugin as Dt, merge as bt } from "@univerjs/core";
-import { DataValidationModel as ce, DataValidatorRegistryService as G, UpdateRuleType as V, BaseDataValidator as Y, TextLengthErrorTitleMap as Lt, AddDataValidationMutation as D, RemoveDataValidationMutation as A, UpdateDataValidationMutation as y, getRuleSetting as Ut, getRuleOptions as Bt, UniverDataValidationPlugin as xt } from "@univerjs/data-validation";
+import { Inject as v, ICommandService as U, IUniverInstanceService as D, Disposable as B, ObjectMatrix as Me, getIntersectRange as ot, UniverInstanceType as N, Range as H, Rectangle as O, isFormulaString as S, getOriginCellValue as Vt, Injector as be, numfmt as L, DataValidationType as C, RBush as yt, debounce as Ct, Tools as M, DataValidationStatus as A, WrapStrategy as Se, DataValidationOperator as h, dayjs as nt, DataValidationRenderMode as We, CommandType as z, IUndoRedoService as Z, sequenceExecute as Le, isRangesEqual as lt, IPermissionService as Tt, generateRandomId as Xe, toDisposable as Ke, CellValueType as Ft, RxDisposable as Nt, LifecycleService as wt, LifecycleStages as et, bufferDebounceTime as Ot, DependentOn as At, IConfigService as It, Plugin as Dt, merge as bt } from "@univerjs/core";
+import { DataValidationModel as de, DataValidatorRegistryService as q, UpdateRuleType as V, BaseDataValidator as Y, TextLengthErrorTitleMap as Lt, AddDataValidationMutation as b, RemoveDataValidationMutation as I, UpdateDataValidationMutation as y, getRuleSetting as Ut, getRuleOptions as Bt, UniverDataValidationPlugin as xt } from "@univerjs/data-validation";
 import { ERROR_TYPE_SET as Pt, LexerTreeBuilder as X, isReferenceString as ut, sequenceNodeType as Ht, deserializeRangeWithSheet as Wt, deserializeRangeWithSheetWithCache as $t, operatorToken as kt } from "@univerjs/engine-formula";
-import { SetRangeValuesMutation as ne, RemoveSheetMutation as dt, getSheetCommandTarget as ze, SetRangeValuesUndoMutationFactory as ct, WorksheetViewPermission as jt, RefRangeService as Qt, handleCommonDefaultRangeChangeWithEffectRefCommands as qt, SheetInterceptorService as ht, RemoveSheetCommand as Gt, CopySheetCommand as Yt, SheetsSelectionsService as mt, ClearSelectionAllCommand as Xt } from "@univerjs/sheets";
+import { SetRangeValuesMutation as ne, RemoveSheetMutation as ct, getSheetCommandTarget as ze, SetRangeValuesUndoMutationFactory as dt, WorksheetViewPermission as jt, RefRangeService as Qt, handleCommonDefaultRangeChangeWithEffectRefCommands as Gt, SheetInterceptorService as ht, RemoveSheetCommand as qt, CopySheetCommand as Yt, SheetsSelectionsService as mt, ClearSelectionAllCommand as Xt } from "@univerjs/sheets";
 import { Subject as Ye, bufferWhen as Kt, filter as tt } from "rxjs";
 import { RegisterOtherFormulaService as gt, FormulaRefRangeService as pt } from "@univerjs/sheets-formula";
 var zt = Object.getOwnPropertyDescriptor, Zt = (s, a, e, t) => {
@@ -12,7 +12,7 @@ var zt = Object.getOwnPropertyDescriptor, Zt = (s, a, e, t) => {
     (o = s[i]) && (r = o(r) || r);
   return r;
 }, $e = (s, a) => (e, t) => a(e, t, s);
-let Q = class extends x {
+let Q = class extends B {
   constructor(a, e, t) {
     super();
     m(this, "_cacheMatrix", /* @__PURE__ */ new Map());
@@ -27,7 +27,7 @@ let Q = class extends x {
         if (t) {
           const o = new Me(t).getDataRange();
           if (o.endRow === -1) return;
-          const u = this._sheetDataValidationModel.getRules(r, i).map((d) => d.ranges).flat().map((d) => ot(d, o)).filter(Boolean);
+          const u = this._sheetDataValidationModel.getRules(r, i).map((c) => c.ranges).flat().map((c) => ot(c, o)).filter(Boolean);
           u.length && this.markRangeDirty(r, i, u, !0);
         }
       }
@@ -36,7 +36,7 @@ let Q = class extends x {
   _initSheetRemove() {
     this.disposeWithMe(this._commandService.onCommandExecuted((a) => {
       var e;
-      if (a.id === dt.id) {
+      if (a.id === ct.id) {
         const { unitId: t, subUnitId: r } = a.params;
         (e = this._cacheMatrix.get(t)) == null || e.delete(r);
       }
@@ -62,7 +62,7 @@ let Q = class extends x {
   markRangeDirty(a, e, t, r) {
     const i = this._ensureCache(a, e);
     t.forEach((o) => {
-      U.foreach(o, (n, l) => {
+      H.foreach(o, (n, l) => {
         i.getValue(n, l) !== void 0 && i.setValue(n, l, void 0);
       });
     }), this._dirtyRanges$.next({ unitId: a, subUnitId: e, ranges: t, isSetRange: r });
@@ -70,7 +70,7 @@ let Q = class extends x {
   _deleteRange(a, e, t) {
     const r = this._ensureCache(a, e);
     t.forEach((i) => {
-      U.foreach(i, (o, n) => {
+      H.foreach(i, (o, n) => {
         r.realDeleteValue(o, n);
       });
     }), this._dirtyRanges$.next({ unitId: a, subUnitId: e, ranges: t });
@@ -80,9 +80,9 @@ let Q = class extends x {
   }
 };
 Q = Zt([
-  $e(0, v(B)),
-  $e(1, v(I)),
-  $e(2, v(ce))
+  $e(0, v(U)),
+  $e(1, v(D)),
+  $e(2, v(de))
 ], Q);
 function oe(s) {
   var a, e;
@@ -92,7 +92,7 @@ function _e(s) {
   var a;
   return (a = s == null ? void 0 : s[0]) == null ? void 0 : a[0];
 }
-function F(s) {
+function T(s) {
   return !Pt.has(s);
 }
 function he(s, a) {
@@ -105,7 +105,7 @@ var Jt = Object.getOwnPropertyDescriptor, ea = (s, a, e, t) => {
     (o = s[i]) && (r = o(r) || r);
   return r;
 }, se = (s, a) => (e, t) => a(e, t, s);
-let W = class extends x {
+let W = class extends B {
   constructor(a, e, t, r, i) {
     super();
     /**
@@ -126,9 +126,9 @@ let W = class extends x {
           for (const i in t) {
             const o = t[i], { ruleFormulaMap: n } = this._ensureMaps(e, i);
             o.forEach((l) => {
-              var c, g;
-              const u = n.get((c = l.extra) == null ? void 0 : c.ruleId), d = this._dataValidationModel.getRuleById(e, i, (g = l.extra) == null ? void 0 : g.ruleId);
-              d && u && this._dataValidationCacheService.markRangeDirty(e, i, d.ranges);
+              var d, g;
+              const u = n.get((d = l.extra) == null ? void 0 : d.ruleId), c = this._dataValidationModel.getRuleById(e, i, (g = l.extra) == null ? void 0 : g.ruleId);
+              c && u && this._dataValidationCacheService.markRangeDirty(e, i, c.ranges);
             });
           }
       }
@@ -148,7 +148,7 @@ let W = class extends x {
   _handleDirtyRanges(a, e, t) {
     this._dataValidationModel.getRules(a, e).forEach((i) => {
       const o = i.ranges;
-      w.doAnyRangesIntersect(o, t) && this.makeRuleDirty(a, e, i.uid);
+      O.doAnyRangesIntersect(o, t) && this.makeRuleDirty(a, e, i.uid);
     });
   }
   _initDirtyRanges() {
@@ -166,23 +166,23 @@ let W = class extends x {
     u && (i.delete(t), this._registerOtherFormulaService.deleteFormula(a, e, [u.formulaId]));
   }
   _addFormulaByRange(a, e, t, r, i, o) {
-    const { ruleFormulaMap: n, ruleFormulaMap2: l } = this._ensureMaps(a, e), u = o[0].startRow, d = o[0].startColumn;
+    const { ruleFormulaMap: n, ruleFormulaMap2: l } = this._ensureMaps(a, e), u = o[0].startRow, c = o[0].startColumn;
     if (r && S(r)) {
-      const c = this._registerFormula(a, e, t, r, o);
+      const d = this._registerFormula(a, e, t, r, o);
       n.set(t, {
         formula: r,
-        originCol: d,
+        originCol: c,
         originRow: u,
-        formulaId: c
+        formulaId: d
       });
     }
     if (i && S(i)) {
-      const c = this._registerFormula(a, e, t, i, o);
+      const d = this._registerFormula(a, e, t, i, o);
       l.set(t, {
         formula: i,
-        originCol: d,
+        originCol: c,
         originRow: u,
-        formulaId: c
+        formulaId: d
       });
     }
   }
@@ -193,36 +193,36 @@ let W = class extends x {
     }
   }
   async getCellFormulaValue(a, e, t, r, i) {
-    var _, f;
+    var f, p;
     const { ruleFormulaMap: o } = this._ensureMaps(a, e), n = o.get(t);
     if (!n)
       return Promise.resolve(void 0);
-    const l = await this._registerOtherFormulaService.getFormulaValue(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, g = i - d;
-    return _e((f = (_ = l == null ? void 0 : l.result) == null ? void 0 : _[c]) == null ? void 0 : f[g]);
+    const l = await this._registerOtherFormulaService.getFormulaValue(a, e, n.formulaId), { originRow: u, originCol: c } = n, d = r - u, g = i - c;
+    return _e((p = (f = l == null ? void 0 : l.result) == null ? void 0 : f[d]) == null ? void 0 : p[g]);
   }
   async getCellFormula2Value(a, e, t, r, i) {
-    var _, f;
+    var f, p;
     const { ruleFormulaMap2: o } = this._ensureMaps(a, e), n = o.get(t);
     if (!n)
       return Promise.resolve(void 0);
-    const l = await this._registerOtherFormulaService.getFormulaValue(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, g = i - d;
-    return _e((f = (_ = l == null ? void 0 : l.result) == null ? void 0 : _[c]) == null ? void 0 : f[g]);
+    const l = await this._registerOtherFormulaService.getFormulaValue(a, e, n.formulaId), { originRow: u, originCol: c } = n, d = r - u, g = i - c;
+    return _e((p = (f = l == null ? void 0 : l.result) == null ? void 0 : f[d]) == null ? void 0 : p[g]);
   }
   getCellFormulaValueSync(a, e, t, r, i) {
-    var _, f;
+    var f, p;
     const { ruleFormulaMap: o } = this._ensureMaps(a, e), n = o.get(t);
     if (!n)
       return;
-    const l = this._registerOtherFormulaService.getFormulaValueSync(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, g = i - d;
-    return _e((f = (_ = l == null ? void 0 : l.result) == null ? void 0 : _[c]) == null ? void 0 : f[g]);
+    const l = this._registerOtherFormulaService.getFormulaValueSync(a, e, n.formulaId), { originRow: u, originCol: c } = n, d = r - u, g = i - c;
+    return _e((p = (f = l == null ? void 0 : l.result) == null ? void 0 : f[d]) == null ? void 0 : p[g]);
   }
   getCellFormula2ValueSync(a, e, t, r, i) {
-    var _, f;
+    var f, p;
     const { ruleFormulaMap2: o } = this._ensureMaps(a, e), n = o.get(t);
     if (!n)
       return;
-    const l = this._registerOtherFormulaService.getFormulaValueSync(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, g = i - d;
-    return _e((f = (_ = l == null ? void 0 : l.result) == null ? void 0 : _[c]) == null ? void 0 : f[g]);
+    const l = this._registerOtherFormulaService.getFormulaValueSync(a, e, n.formulaId), { originRow: u, originCol: c } = n, d = r - u, g = i - c;
+    return _e((p = (f = l == null ? void 0 : l.result) == null ? void 0 : f[d]) == null ? void 0 : p[g]);
   }
   getRuleFormulaInfo(a, e, t) {
     const { ruleFormulaMap: r } = this._ensureMaps(a, e);
@@ -235,11 +235,11 @@ let W = class extends x {
   }
 };
 W = ea([
-  se(0, I),
+  se(0, D),
   se(1, v(gt)),
-  se(2, v(ce)),
+  se(2, v(de)),
   se(3, v(Q)),
-  se(4, v(G))
+  se(4, v(q))
 ], W);
 function re(s) {
   return Vt(s);
@@ -259,10 +259,10 @@ function tr(s) {
   return a == null ? "" : a.toString();
 }
 function Ue(s, a, e) {
-  const { formula1: t, formula2: r } = a, i = a.ranges[0].startRow, o = a.ranges[0].startColumn, n = e.row - i, l = e.col - o, u = S(t) ? s.moveFormulaRefOffset(t, l, n, !0) : t, d = S(r) ? s.moveFormulaRefOffset(r, l, n, !0) : r;
+  const { formula1: t, formula2: r } = a, i = a.ranges[0].startRow, o = a.ranges[0].startColumn, n = e.row - i, l = e.col - o, u = S(t) ? s.moveFormulaRefOffset(t, l, n, !0) : t, c = S(r) ? s.moveFormulaRefOffset(r, l, n, !0) : r;
   return {
     transformedFormula1: u,
-    transformedFormula2: d
+    transformedFormula2: c
   };
 }
 var ta = Object.getOwnPropertyDescriptor, aa = (s, a, e, t) => {
@@ -270,7 +270,7 @@ var ta = Object.getOwnPropertyDescriptor, aa = (s, a, e, t) => {
     (o = s[i]) && (r = o(r) || r);
   return r;
 }, at = (s, a) => (e, t) => a(e, t, s);
-let le = class extends x {
+let le = class extends B {
   constructor(a, e) {
     super();
     // Cache structure: unitId -> subUnitId -> ruleId -> cache item
@@ -291,7 +291,7 @@ let le = class extends x {
     const r = this.getCache(a, e, t.uid);
     if (r)
       return r;
-    const o = this._injector.get(q).getRuleFormulaResultSync(a, e, t.uid);
+    const o = this._injector.get(G).getRuleFormulaResultSync(a, e, t.uid);
     return this.computeAndCache(a, e, t, o);
   }
   _ensureCache(a, e) {
@@ -331,11 +331,11 @@ let le = class extends x {
    * Compute list data from formula result and cache it.
    */
   computeAndCache(a, e, t, r) {
-    var _, f, R;
-    const { formula1: i = "", formula2: o = "" } = t, n = S(i) ? this._getRuleFormulaResultSet((R = (f = (_ = r == null ? void 0 : r[0]) == null ? void 0 : _.result) == null ? void 0 : f[0]) == null ? void 0 : R[0]) : Ee(i), l = o.split(","), u = n.map((E, p) => ({ label: E, color: l[p] || "" })), d = {};
+    var f, p, R;
+    const { formula1: i = "", formula2: o = "" } = t, n = S(i) ? this._getRuleFormulaResultSet((R = (p = (f = r == null ? void 0 : r[0]) == null ? void 0 : f.result) == null ? void 0 : p[0]) == null ? void 0 : R[0]) : Ee(i), l = o.split(","), u = n.map((E, _) => ({ label: E, color: l[_] || "" })), c = {};
     for (const E of u)
-      E.color && (d[E.label] = E.color);
-    const c = new Set(n), g = { list: n, listWithColor: u, colorMap: d, set: c };
+      E.color && (c[E.label] = E.color);
+    const d = new Set(n), g = { list: n, listWithColor: u, colorMap: c, set: d };
     return this.setCache(a, e, t.uid, g), g;
   }
   /**
@@ -350,14 +350,14 @@ let le = class extends x {
       const n = a[i];
       if (n)
         for (let l = 0, u = n.length; l < u; l++) {
-          const d = n[l], c = re(d);
-          if (c != null) {
-            if (typeof c != "string" && typeof (d == null ? void 0 : d.s) == "object" && ((r = (t = d.s) == null ? void 0 : t.n) != null && r.pattern)) {
-              e.add(L.format(d.s.n.pattern, c, { throws: !1 }));
+          const c = n[l], d = re(c);
+          if (d != null) {
+            if (typeof d != "string" && typeof (c == null ? void 0 : c.s) == "object" && ((r = (t = c.s) == null ? void 0 : t.n) != null && r.pattern)) {
+              e.add(L.format(c.s.n.pattern, d, { throws: !1 }));
               continue;
             }
-            const g = typeof c == "string" ? c : String(c);
-            F(g) && e.add(g);
+            const g = typeof d == "string" ? d : String(d);
+            T(g) && e.add(g);
           }
         }
     }
@@ -366,14 +366,14 @@ let le = class extends x {
 };
 le = aa([
   at(0, v(be)),
-  at(1, v(ce))
+  at(1, v(de))
 ], le);
 var ra = Object.getOwnPropertyDescriptor, ia = (s, a, e, t) => {
   for (var r = t > 1 ? void 0 : t ? ra(a, e) : a, i = s.length - 1, o; i >= 0; i--)
     (o = s[i]) && (r = o(r) || r);
   return r;
 }, ee = (s, a) => (e, t) => a(e, t, s);
-let q = class extends x {
+let G = class extends B {
   constructor(a, e, t, r, i, o) {
     super();
     m(this, "_formulaRuleMap", /* @__PURE__ */ new Map());
@@ -387,11 +387,11 @@ let q = class extends x {
           for (const i in t) {
             const o = t[i], n = this._ensureRuleFormulaMap(e, i);
             o.forEach((l) => {
-              var d;
-              const u = (d = l.extra) == null ? void 0 : d.ruleId;
+              var c;
+              const u = (c = l.extra) == null ? void 0 : c.ruleId;
               if (u && n.get(u)) {
-                const c = this._dataValidationModel.getRuleById(e, i, u);
-                c && (this._listCacheService.markRuleDirty(e, i, u), this._dataValidationCacheService.markRangeDirty(e, i, c.ranges));
+                const d = this._dataValidationModel.getRuleById(e, i, u);
+                d && (this._listCacheService.markRuleDirty(e, i, u), this._dataValidationCacheService.markRangeDirty(e, i, d.ranges));
               }
             });
           }
@@ -409,20 +409,20 @@ let q = class extends x {
     return this._registerOtherFormulaService.registerFormulaWithRange(a, e, t, i, { ruleId: r });
   }
   addRule(a, e, t) {
-    if (!he(t.type, this._validatorRegistryService) && t.type !== T.CHECKBOX) {
+    if (!he(t.type, this._validatorRegistryService) && t.type !== C.CHECKBOX) {
       const { formula1: r, formula2: i, uid: o } = t, n = S(r), l = S(i);
       if (!n && !l)
         return;
-      const u = this._ensureRuleFormulaMap(a, e), d = [void 0, void 0];
+      const u = this._ensureRuleFormulaMap(a, e), c = [void 0, void 0];
       if (n) {
-        const c = this._registerSingleFormula(a, e, r, o);
-        d[0] = { id: c, text: r };
+        const d = this._registerSingleFormula(a, e, r, o);
+        c[0] = { id: d, text: r };
       }
       if (l) {
-        const c = this._registerSingleFormula(a, e, i, o);
-        d[1] = { id: c, text: i };
+        const d = this._registerSingleFormula(a, e, i, o);
+        c[1] = { id: d, text: i };
       }
-      u.set(o, d);
+      u.set(o, c);
     }
   }
   removeRule(a, e, t) {
@@ -454,14 +454,14 @@ let q = class extends x {
     return this._ensureRuleFormulaMap(a, e).get(t);
   }
 };
-q = ia([
-  ee(0, I),
+G = ia([
+  ee(0, D),
   ee(1, v(gt)),
   ee(2, v(Q)),
-  ee(3, v(ce)),
-  ee(4, v(G)),
+  ee(3, v(de)),
+  ee(4, v(q)),
   ee(5, v(le))
-], q);
+], G);
 class Ze {
   constructor(a, e, t, r, i = !1) {
     m(this, "_map");
@@ -484,7 +484,7 @@ class Ze {
         });
       }), this._tree.load(a), this._dirty = !1;
     });
-    m(this, "_debonceBuildTree", Tt(this._buildTree, 0));
+    m(this, "_debonceBuildTree", Ct(this._buildTree, 0));
     this._unitId = e, this._subUnitId = t, this._univerInstanceService = r, this._disableTree = i, this._map = a, this._buildTree();
   }
   get _worksheet() {
@@ -494,9 +494,9 @@ class Ze {
   _addRule(a, e) {
     if (!this._worksheet)
       return;
-    const t = w.mergeRanges(e.map((r) => U.transformRange(r, this._worksheet)));
+    const t = O.mergeRanges(e.map((r) => H.transformRange(r, this._worksheet)));
     this._map.forEach((r, i) => {
-      const o = w.subtractMulti(r, t);
+      const o = O.subtractMulti(r, t);
       o.length === 0 ? this._map.delete(i) : this._map.set(i, o);
     }), this._dirty = !0, this._map.set(a, t), this._debonceBuildTree();
   }
@@ -506,9 +506,9 @@ class Ze {
   removeRange(a) {
     if (!this._worksheet)
       return;
-    const e = a.map((t) => U.transformRange(t, this._worksheet));
+    const e = a.map((t) => H.transformRange(t, this._worksheet));
     this._map.forEach((t, r) => {
-      const i = w.subtractMulti(t, e);
+      const i = O.subtractMulti(t, e);
       i.length === 0 ? this._map.delete(r) : this._map.set(r, i);
     }), this._dirty = !0, this._debonceBuildTree();
   }
@@ -526,10 +526,10 @@ class Ze {
       if (!t.length)
         return;
       let r = this._map.get(e);
-      r ? (this._map.set(e, w.mergeRanges([...r, ...t])), r = this._map.get(e)) : (r = t, this._map.set(e, r)), this._map.forEach((i, o) => {
+      r ? (this._map.set(e, O.mergeRanges([...r, ...t])), r = this._map.get(e)) : (r = t, this._map.set(e, r)), this._map.forEach((i, o) => {
         if (o === e)
           return;
-        const n = w.subtractMulti(i, t);
+        const n = O.subtractMulti(i, t);
         n.length === 0 ? this._map.delete(o) : this._map.set(o, n);
       });
     }), this._dirty = !0, this._debonceBuildTree();
@@ -540,11 +540,11 @@ class Ze {
     return a.forEach((r, i) => {
       var l;
       const o = (l = this._map.get(r.uid)) != null ? l : [], n = r.ranges;
-      o.length !== 0 && (o.length !== n.length || o.some((u, d) => !w.equals(u, n[d]))) && e.push({
+      o.length !== 0 && (o.length !== n.length || o.some((u, c) => !O.equals(u, n[c]))) && e.push({
         type: "update",
         ruleId: r.uid,
         oldRanges: n,
-        newRanges: w.sort(o),
+        newRanges: O.sort(o),
         rule: r
       }), o.length === 0 && (e.push({
         type: "delete",
@@ -559,11 +559,11 @@ class Ze {
     return a.forEach((i, o) => {
       var u;
       const n = (u = this._map.get(i.uid)) != null ? u : [], l = i.ranges;
-      n.length !== 0 && (n.length !== l.length || n.some((d, c) => !w.equals(d, l[c]))) && t.push({
+      n.length !== 0 && (n.length !== l.length || n.some((c, d) => !O.equals(c, l[d]))) && t.push({
         type: "update",
         ruleId: i.uid,
         oldRanges: l,
-        newRanges: w.sort(n),
+        newRanges: O.sort(n),
         rule: i
       }), n.length === 0 && (t.push({
         type: "delete",
@@ -577,7 +577,7 @@ class Ze {
         type: "add",
         rule: {
           ...i,
-          ranges: w.sort(o)
+          ranges: O.sort(o)
         }
       });
     }), t;
@@ -608,7 +608,7 @@ var sa = Object.getOwnPropertyDescriptor, oa = (s, a, e, t) => {
     (o = s[i]) && (r = o(r) || r);
   return r;
 }, K = (s, a) => (e, t) => a(e, t, s);
-let C = class extends x {
+let F = class extends B {
   constructor(a, e, t, r, i, o, n) {
     super();
     m(this, "_ruleMatrixMap", /* @__PURE__ */ new Map());
@@ -627,7 +627,7 @@ let C = class extends x {
       })
     ), this.disposeWithMe(
       this._commandService.onCommandExecuted((a) => {
-        if (a.id === dt.id) {
+        if (a.id === ct.id) {
           const { unitId: e, subUnitId: t } = a.params, r = this._ruleMatrixMap.get(e);
           r && r.delete(t);
         }
@@ -699,37 +699,37 @@ let C = class extends x {
       return this._dataValidationModel.getRuleById(a, e, i);
   }
   validator(a, e, t) {
-    const { col: r, row: i, unitId: o, subUnitId: n, worksheet: l } = e, u = (f, R) => {
-      t && t(f, R), R && this._validStatusChange$.next({
+    const { col: r, row: i, unitId: o, subUnitId: n, worksheet: l } = e, u = (p, R) => {
+      t && t(p, R), R && this._validStatusChange$.next({
         unitId: o,
         subUnitId: n,
         ruleId: a.uid,
-        status: f,
+        status: p,
         row: i,
         col: r
       });
-    }, d = l.getCellValueOnly(i, r), c = this.getValidator(a.type), g = l.getCellRaw(i, r), _ = re(g);
-    if (c) {
-      const f = this._dataValidationCacheService.ensureCache(o, n), R = f.getValue(i, r);
-      return R == null ? (f.setValue(i, r, b.VALIDATING), c.validator(
+    }, c = l.getCellValueOnly(i, r), d = this.getValidator(a.type), g = l.getCellRaw(i, r), f = re(g);
+    if (d) {
+      const p = this._dataValidationCacheService.ensureCache(o, n), R = p.getValue(i, r);
+      return R == null ? (p.setValue(i, r, A.VALIDATING), d.validator(
         {
-          value: _,
+          value: f,
           unitId: o,
           subUnitId: n,
           row: i,
           column: r,
           worksheet: e.worksheet,
           workbook: e.workbook,
-          interceptValue: re(d),
+          interceptValue: re(c),
           t: g == null ? void 0 : g.t
         },
         a
       ).then((E) => {
-        const p = E ? b.VALID : b.INVALID, O = f.getValue(i, r);
-        p === b.VALID ? f.realDeleteValue(i, r) : f.setValue(i, r, p), u(p, R !== O);
-      }), b.VALIDATING) : (u(R != null ? R : b.VALID, !1), R != null ? R : b.VALID);
+        const _ = E ? A.VALID : A.INVALID, w = p.getValue(i, r);
+        _ === A.VALID ? p.realDeleteValue(i, r) : p.setValue(i, r, _), u(_, R !== w);
+      }), A.VALIDATING) : (u(R != null ? R : A.VALID, !1), R != null ? R : A.VALID);
     } else
-      return u(b.VALID, !1), b.VALID;
+      return u(A.VALID, !1), A.VALID;
   }
   getRuleObjectMatrix(a, e) {
     return this._ensureRuleMatrix(a, e);
@@ -756,15 +756,15 @@ let C = class extends x {
     return this._dataValidationModel.getAll();
   }
 };
-C = oa([
-  K(0, v(ce)),
-  K(1, I),
-  K(2, v(G)),
+F = oa([
+  K(0, v(de)),
+  K(1, D),
+  K(2, v(q)),
   K(3, v(Q)),
-  K(4, v(q)),
+  K(4, v(G)),
   K(5, v(W)),
-  K(6, B)
-], C);
+  K(6, U)
+], F);
 const Ve = 1, ye = 0;
 function rt(s, a) {
   return M.isBlank(s) ? a.t("dataValidation.validFail.value") : S(s) ? a.t("dataValidation.validFail.primitive") : "";
@@ -773,13 +773,13 @@ const ve = (s) => M.isDefine(s) && String(s).toLowerCase() === "true" ? "1" : St
 class na extends Y {
   constructor() {
     super(...arguments);
-    m(this, "id", T.CHECKBOX);
+    m(this, "id", C.CHECKBOX);
     m(this, "title", "dataValidation.checkbox.title");
     m(this, "operators", []);
     m(this, "scopes", ["sheet"]);
     m(this, "order", 41);
     m(this, "offsetFormulaByRange", !1);
-    m(this, "_formulaService", this.injector.get(q));
+    m(this, "_formulaService", this.injector.get(G));
     m(this, "skipDefaultFontRender", (e, t, r) => {
       const { unitId: i, subUnitId: o } = r, { formula1: n, formula2: l } = this.parseFormulaSync(e, i, o), u = `${t != null ? t : ""}`;
       return !u || u === `${n}` || u === `${l}`;
@@ -805,14 +805,14 @@ class na extends Y {
     };
   }
   async parseFormula(e, t, r) {
-    var c, g, _, f;
-    const { formula1: i = Ve, formula2: o = ye } = 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(o) ? oe((f = (_ = n == null ? void 0 : n[1]) == null ? void 0 : _.result) == null ? void 0 : f[0][0]) : o, d = F(String(l)) && F(String(u));
+    var d, g, f, p;
+    const { formula1: i = Ve, formula2: o = ye } = e, n = await this._formulaService.getRuleFormulaResult(t, r, e.uid), l = S(i) ? oe((g = (d = n == null ? void 0 : n[0]) == null ? void 0 : d.result) == null ? void 0 : g[0][0]) : i, u = S(o) ? oe((p = (f = n == null ? void 0 : n[1]) == null ? void 0 : f.result) == null ? void 0 : p[0][0]) : o, c = T(String(l)) && T(String(u));
     return {
       formula1: ve(l),
       formula2: ve(u),
       originFormula1: l,
       originFormula2: u,
-      isFormulaValid: d
+      isFormulaValid: c
     };
   }
   getExtraStyle(e, t) {
@@ -821,19 +821,19 @@ class na extends Y {
     };
   }
   parseFormulaSync(e, t, r) {
-    var c, g, _, f;
-    const { formula1: i = Ve, formula2: o = ye } = 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(o) ? oe((f = (_ = n == null ? void 0 : n[1]) == null ? void 0 : _.result) == null ? void 0 : f[0][0]) : o, d = F(String(l)) && F(String(u));
+    var d, g, f, p;
+    const { formula1: i = Ve, formula2: o = ye } = e, n = this._formulaService.getRuleFormulaResultSync(t, r, e.uid), l = S(i) ? oe((g = (d = n == null ? void 0 : n[0]) == null ? void 0 : d.result) == null ? void 0 : g[0][0]) : i, u = S(o) ? oe((p = (f = n == null ? void 0 : n[1]) == null ? void 0 : f.result) == null ? void 0 : p[0][0]) : o, c = T(String(l)) && T(String(u));
     return {
       formula1: ve(l),
       formula2: ve(u),
       originFormula1: l,
       originFormula2: u,
-      isFormulaValid: d
+      isFormulaValid: c
     };
   }
   async isValidType(e, t, r) {
-    const { value: i, unitId: o, subUnitId: n } = e, { formula1: l, formula2: u, originFormula1: d, originFormula2: c } = await this.parseFormula(r, o, n);
-    return !M.isDefine(l) || !M.isDefine(u) ? !0 : M.isDefine(i) && (String(i) === String(l) || String(i) === String(u) || String(i) === String(d != null ? d : "") || String(i) === String(c != null ? c : ""));
+    const { value: i, unitId: o, subUnitId: n } = e, { formula1: l, formula2: u, originFormula1: c, originFormula2: d } = await this.parseFormula(r, o, n);
+    return !M.isDefine(l) || !M.isDefine(u) ? !0 : M.isDefine(i) && (String(i) === String(l) || String(i) === String(u) || String(i) === String(c != null ? c : "") || String(i) === String(d != null ? d : ""));
   }
   generateRuleErrorMessage(e) {
     return this.localeService.t("dataValidation.checkbox.error");
@@ -876,7 +876,7 @@ const it = {
 }, Be = [
   h.BETWEEN,
   h.NOT_BETWEEN
-], ue = "{FORMULA1}", de = "{FORMULA2}", ke = (s) => {
+], ue = "{FORMULA1}", ce = "{FORMULA2}", ke = (s) => {
   var e, t;
   if (s == null || typeof s == "boolean")
     return;
@@ -885,10 +885,10 @@ const it = {
   const a = (e = L.parseDate(s)) == null ? void 0 : e.v;
   return M.isDefine(a) ? a : (t = L.parseDate(nt(s).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : t.v;
 };
-class da extends Y {
+class ca extends Y {
   constructor() {
     super(...arguments);
-    m(this, "id", T.DATE);
+    m(this, "id", C.DATE);
     m(this, "title", "dataValidation.date.title");
     m(this, "order", 40);
     m(this, "operators", [
@@ -906,11 +906,11 @@ class da extends Y {
     m(this, "_lexerTreeBuilder", this.injector.get(X));
   }
   async parseFormula(e, t, r, i, o) {
-    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, o), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, o), { formula1: u, formula2: d } = e, c = F(String(n == null ? void 0 : n.v)) && F(String(l == null ? void 0 : l.v));
+    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, o), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, o), { formula1: u, formula2: c } = e, d = T(String(n == null ? void 0 : n.v)) && T(String(l == null ? void 0 : l.v));
     return {
       formula1: ke(S(u) ? n == null ? void 0 : n.v : u),
-      formula2: ke(S(d) ? l == null ? void 0 : l.v : d),
-      isFormulaValid: c
+      formula2: ke(S(c) ? l == null ? void 0 : l.v : c),
+      isFormulaValid: d
     };
   }
   async isValidType(e) {
@@ -942,19 +942,19 @@ class da extends Y {
   }
   normalizeFormula(e, t, r) {
     const { formula1: i, formula2: o, bizInfo: n } = e, l = (u) => {
-      var c;
+      var d;
       if (!u)
         return u;
-      let d;
+      let c;
       if (!Number.isNaN(+u))
-        d = L.dateFromSerial(+u);
+        c = L.dateFromSerial(+u);
       else {
-        const g = (c = L.parseDate(u)) == null ? void 0 : c.v;
+        const g = (d = L.parseDate(u)) == null ? void 0 : d.v;
         if (g == null)
           return "";
-        d = L.dateFromSerial(g);
+        c = L.dateFromSerial(g);
       }
-      return nt(`${d[0]}/${d[1]}/${d[2]} ${d[3]}:${d[4]}:${d[5]}`).format(n != null && n.showTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD");
+      return nt(`${c[0]}/${c[1]}/${c[2]} ${c[3]}:${c[4]}:${c[5]}`).format(n != null && n.showTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD");
     };
     return {
       formula1: S(i) ? i : l(`${i}`),
@@ -975,19 +975,19 @@ class da extends Y {
     var r, i;
     if (!e.operator)
       return this.localeService.t(it.NONE);
-    const t = this.localeService.t(it[e.operator]).replace(ue, (r = e.formula1) != null ? r : "").replace(de, (i = e.formula2) != null ? i : "");
+    const t = this.localeService.t(it[e.operator]).replace(ue, (r = e.formula1) != null ? r : "").replace(ce, (i = e.formula2) != null ? i : "");
     return `${this.titleStr} ${t}`;
   }
   generateRuleErrorMessage(e, t) {
     if (!e.operator)
       return this.titleStr;
     const { transformedFormula1: r, transformedFormula2: i } = Ue(this._lexerTreeBuilder, e, t);
-    return `${this.localeService.t(ua[e.operator]).replace(ue, r != null ? r : "").replace(de, i != null ? i : "")}`;
+    return `${this.localeService.t(ua[e.operator]).replace(ue, r != null ? r : "").replace(ce, 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 + "";
 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 + "";
-const Te = {
+const Ce = {
   [h.BETWEEN]: "dataValidation.errorMsg.between",
   [h.EQUAL]: "dataValidation.errorMsg.equal",
   [h.GREATER_THAN]: "dataValidation.errorMsg.greaterThan",
@@ -998,14 +998,14 @@ const Te = {
   [h.NOT_EQUAL]: "dataValidation.errorMsg.notEqual",
   NONE: "dataValidation.errorMsg.legal"
 };
-function Fe(s) {
+function Te(s) {
   return +s;
 }
-class ca extends Y {
+class da extends Y {
   constructor() {
     super(...arguments);
     m(this, "_customFormulaService", this.injector.get(W));
-    m(this, "id", T.DECIMAL);
+    m(this, "id", C.DECIMAL);
     m(this, "_lexerTreeBuilder", this.injector.get(X));
     m(this, "title", "dataValidation.decimal.title");
     m(this, "order", 20);
@@ -1026,24 +1026,24 @@ class ca extends Y {
   }
   async isValidType(e, t, r) {
     const { value: i } = e;
-    return !Number.isNaN(Fe(i));
+    return !Number.isNaN(Te(i));
   }
   transform(e, t, r) {
     const { value: i } = e;
     return {
       ...e,
-      value: Fe(i)
+      value: Te(i)
     };
   }
   _parseNumber(e) {
     return e == null ? Number.NaN : +e;
   }
   async parseFormula(e, t, r, i, o) {
-    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, o), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, o), { formula1: u, formula2: d } = e, c = F(String(n == null ? void 0 : n.v)) && F(String(l == null ? void 0 : l.v));
+    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, o), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, o), { formula1: u, formula2: c } = e, d = T(String(n == null ? void 0 : n.v)) && T(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),
-      isFormulaValid: c
+      formula2: this._parseNumber(S(c) ? l == null ? void 0 : l.v : c),
+      isFormulaValid: d
     };
   }
   validatorFormula(e, t, r) {
@@ -1064,9 +1064,9 @@ class ca extends Y {
   }
   generateRuleErrorMessage(e, t) {
     if (!e.operator)
-      return this.localeService.t(Te.NONE).replace("{TYPE}", this.titleStr);
+      return this.localeService.t(Ce.NONE).replace("{TYPE}", this.titleStr);
     const { transformedFormula1: r, transformedFormula2: i } = Ue(this._lexerTreeBuilder, e, t);
-    return `${this.localeService.t(Te[e.operator]).replace(ue, r != null ? r : "").replace(de, i != null ? i : "")}`;
+    return `${this.localeService.t(Ce[e.operator]).replace(ue, r != null ? r : "").replace(ce, i != null ? i : "")}`;
   }
 }
 function ha(s) {
@@ -1078,14 +1078,14 @@ function ha(s) {
     const o = s[r];
     if (o)
       for (let n = 0, l = o.length; n < l; n++) {
-        const u = o[n], d = re(u);
-        if (d != null) {
-          if (typeof d != "string" && typeof (u == null ? void 0 : u.s) == "object" && ((t = (e = u.s) == null ? void 0 : e.n) != null && t.pattern)) {
-            a.add(L.format(u.s.n.pattern, d, { throws: !1 }));
+        const u = o[n], c = re(u);
+        if (c != null) {
+          if (typeof c != "string" && typeof (u == null ? void 0 : u.s) == "object" && ((t = (e = u.s) == null ? void 0 : e.n) != null && t.pattern)) {
+            a.add(L.format(u.s.n.pattern, c, { throws: !1 }));
             continue;
           }
-          const c = typeof d == "string" ? d : String(d);
-          F(c) && a.add(c);
+          const d = typeof c == "string" ? c : String(c);
+          T(d) && a.add(d);
         }
       }
   }
@@ -1107,7 +1107,7 @@ function pa(s, a) {
   const { formula1: e = "", ranges: t } = s;
   if (ut(e.slice(1))) {
     const i = Wt(e.slice(1));
-    if ((!i.sheetName || i.sheetName === a) && t.some((o) => w.intersects(o, i.range)))
+    if ((!i.sheetName || i.sheetName === a) && t.some((o) => O.intersects(o, i.range)))
       return !0;
   }
   return !1;
@@ -1115,21 +1115,21 @@ function pa(s, a) {
 class _t extends Y {
   constructor() {
     super(...arguments);
-    m(this, "formulaService", this.injector.get(q));
+    m(this, "formulaService", this.injector.get(G));
     m(this, "_lexer", this.injector.get(X));
-    m(this, "_univerInstanceService", this.injector.get(I));
+    m(this, "_univerInstanceService", this.injector.get(D));
     m(this, "_listCacheService", this.injector.get(le));
     m(this, "order", 50);
     m(this, "offsetFormulaByRange", !1);
-    m(this, "id", T.LIST);
+    m(this, "id", C.LIST);
     m(this, "title", "dataValidation.list.title");
     m(this, "operators", []);
     m(this, "scopes", ["sheet"]);
     m(this, "skipDefaultFontRender", (e) => e.renderMode !== We.TEXT);
   }
   validatorFormula(e, t, r) {
-    var u, d, c;
-    const i = !M.isBlank(e.formula1), o = ga((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 = pa(e, n != null ? n : "");
+    var u, c, d;
+    const i = !M.isBlank(e.formula1), o = ga((u = e.formula1) != null ? u : "", this._lexer), n = (d = (c = this._univerInstanceService.getUnit(t, N.UNIVER_SHEET)) == null ? void 0 : c.getSheetBySheetId(r)) == null ? void 0 : d.getName(), l = pa(e, n != null ? n : "");
     return {
       success: !!(i && o && !l),
       formula1: i ? o ? l ? this.localeService.t("dataValidation.validFail.listIntersects") : void 0 : this.localeService.t("dataValidation.validFail.listInvalid") : this.localeService.t("dataValidation.validFail.list")
@@ -1138,7 +1138,7 @@ class _t extends Y {
   getExtraStyle(e, t, { style: r }) {
     var o;
     const i = (o = r.tb !== Se.OVERFLOW ? r.tb : Se.CLIP) != null ? o : Se.WRAP;
-    if (e.type === T.LIST && (e.renderMode === We.ARROW || e.renderMode === We.TEXT)) {
+    if (e.type === C.LIST && (e.renderMode === We.ARROW || e.renderMode === We.TEXT)) {
       const n = this.getListWithColorMap(e), l = `${t != null ? t : ""}`, u = n[l];
       if (u)
         return {
@@ -1162,7 +1162,7 @@ class _t extends Y {
     return {
       formula1: void 0,
       formula2: void 0,
-      isFormulaValid: F(String(o))
+      isFormulaValid: T(String(o))
     };
   }
   async isValidType(e, t, r) {
@@ -1171,7 +1171,7 @@ class _t extends Y {
       n,
       r
     ).list : Ee(l);
-    return this.parseCellValue(i).every((c) => u.includes(c));
+    return this.parseCellValue(i).every((d) => u.includes(d));
   }
   generateRuleName() {
     return this.localeService.t("dataValidation.list.name");
@@ -1200,11 +1200,11 @@ class _t extends Y {
     ).list;
   }
   async getListAsync(e, t, r) {
-    var d, c;
+    var c, d;
     const { formula1: i = "" } = e, o = this._getUnitAndSubUnit(t, r);
     if (!o) return [];
     const { unitId: n, subUnitId: l } = o, u = await this.formulaService.getRuleFormulaResult(n, l, e.uid);
-    return S(i) ? ha((c = (d = u == null ? void 0 : u[0]) == null ? void 0 : d.result) == null ? void 0 : c[0][0]) : Ee(i);
+    return S(i) ? ha((d = (c = u == null ? void 0 : u[0]) == null ? void 0 : c.result) == null ? void 0 : d[0][0]) : Ee(i);
   }
   getListWithColor(e, t, r) {
     const i = this._getUnitAndSubUnit(t, r);
@@ -1230,7 +1230,7 @@ class _t extends Y {
 class fa extends Y {
   constructor() {
     super(...arguments);
-    m(this, "id", T.TEXT_LENGTH);
+    m(this, "id", C.TEXT_LENGTH);
     m(this, "title", "dataValidation.textLength.title");
     m(this, "_lexerTreeBuilder", this.injector.get(X));
     m(this, "order", 30);
@@ -1270,11 +1270,11 @@ class fa extends Y {
     return e == null ? Number.NaN : +e;
   }
   async parseFormula(e, t, r, i, o) {
-    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, o), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, o), { formula1: u, formula2: d } = e, c = F(String(n == null ? void 0 : n.v)) && F(String(l == null ? void 0 : l.v));
+    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, o), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, o), { formula1: u, formula2: c } = e, d = T(String(n == null ? void 0 : n.v)) && T(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),
-      isFormulaValid: c
+      formula2: this._parseNumber(S(c) ? l == null ? void 0 : l.v : c),
+      isFormulaValid: d
     };
   }
   transform(e, t, r) {
@@ -1291,7 +1291,7 @@ class fa extends Y {
     if (!e.operator)
       return this.titleStr;
     const { transformedFormula1: r, transformedFormula2: i } = Ue(this._lexerTreeBuilder, e, t);
-    return `${this.localeService.t(Lt[e.operator]).replace(ue, r != null ? r : "").replace(de, i != null ? i : "")}`;
+    return `${this.localeService.t(Lt[e.operator]).replace(ue, r != null ? r : "").replace(ce, i != null ? i : "")}`;
   }
 }
 function vt(s) {
@@ -1299,62 +1299,62 @@ function vt(s) {
   return s ? s.p ? !((t = (e = s.p.body) == null ? void 0 : e.dataStream) != null ? t : "").slice(0, -2).trim() : M.isBlank(s.v) : !0;
 }
 function xe(s, a, e, t, r = "command", i = !0) {
-  const o = t.get(X), n = t.get(G), l = [], u = [], d = t.get(C), c = t.get(I), g = ze(c, { unitId: s, subUnitId: a });
+  const o = t.get(X), n = t.get(q), l = [], u = [], c = t.get(F), d = t.get(D), g = ze(d, { unitId: s, subUnitId: a });
   if (!g)
     return {
       redoMutations: l,
       undoMutations: u
     };
-  const { worksheet: _ } = g, f = new Me();
+  const { worksheet: f } = g, p = new Me();
   let R = !1;
-  function E(p, O) {
-    i && p.forEach(($) => {
-      U.foreach($, (P, k) => {
-        const H = _.getCellRaw(P, k), J = ft(H);
-        (vt(H) || J === O) && !(H != null && H.p) && (R = !0, f.setValue(P, k, {
-          v: O,
+  function E(_, w) {
+    i && _.forEach(($) => {
+      H.foreach($, (x, k) => {
+        const P = f.getCellRaw(x, k), J = ft(P);
+        (vt(P) || J === w) && !(P != null && P.p) && (R = !0, p.setValue(x, k, {
+          v: w,
           p: null
         }));
       });
     });
   }
-  if (e.forEach((p) => {
-    switch (p.type) {
+  if (e.forEach((_) => {
+    switch (_.type) {
       case "delete":
         l.push({
-          id: A.id,
+          id: I.id,
           params: {
             unitId: s,
             subUnitId: a,
-            ruleId: p.rule.uid,
+            ruleId: _.rule.uid,
             source: r
           }
         }), u.unshift({
-          id: D.id,
+          id: b.id,
           params: {
             unitId: s,
             subUnitId: a,
-            rule: p.rule,
-            index: p.index,
+            rule: _.rule,
+            index: _.index,
             source: r
           }
         });
         break;
       case "update": {
-        if (he(p.rule.type, n)) {
-          const $ = p.oldRanges[0].startRow, P = p.oldRanges[0].startColumn, k = p.newRanges[0].startRow, H = p.newRanges[0].startColumn, J = k - $, me = H - P, ge = S(p.rule.formula1) ? o.moveFormulaRefOffset(p.rule.formula1, me, J) : p.rule.formula1, pe = S(p.rule.formula2) ? o.moveFormulaRefOffset(p.rule.formula2, me, J) : p.rule.formula2;
-          ge !== p.rule.formula1 || pe !== p.rule.formula2 || !lt(p.newRanges, p.oldRanges) ? (l.push({
+        if (he(_.rule.type, n)) {
+          const $ = _.oldRanges[0].startRow, x = _.oldRanges[0].startColumn, k = _.newRanges[0].startRow, P = _.newRanges[0].startColumn, J = k - $, me = P - x, ge = S(_.rule.formula1) ? o.moveFormulaRefOffset(_.rule.formula1, me, J) : _.rule.formula1, pe = S(_.rule.formula2) ? o.moveFormulaRefOffset(_.rule.formula2, me, J) : _.rule.formula2;
+          ge !== _.rule.formula1 || pe !== _.rule.formula2 || !lt(_.newRanges, _.oldRanges) ? (l.push({
             id: y.id,
             params: {
               unitId: s,
               subUnitId: a,
-              ruleId: p.ruleId,
+              ruleId: _.ruleId,
               payload: {
                 type: V.ALL,
                 payload: {
                   formula1: ge,
                   formula2: pe,
-                  ranges: p.newRanges
+                  ranges: _.newRanges
                 }
               }
             }
@@ -1363,13 +1363,13 @@ function xe(s, a, e, t, r = "command", i = !0) {
             params: {
               unitId: s,
               subUnitId: a,
-              ruleId: p.ruleId,
+              ruleId: _.ruleId,
               payload: {
                 type: V.ALL,
                 payload: {
-                  formula1: p.rule.formula1,
-                  formula2: p.rule.formula2,
-                  ranges: p.oldRanges
+                  formula1: _.rule.formula1,
+                  formula2: _.rule.formula2,
+                  ranges: _.oldRanges
                 }
               }
             }
@@ -1378,10 +1378,10 @@ function xe(s, a, e, t, r = "command", i = !0) {
             params: {
               unitId: s,
               subUnitId: a,
-              ruleId: p.ruleId,
+              ruleId: _.ruleId,
               payload: {
                 type: V.RANGE,
-                payload: p.newRanges
+                payload: _.newRanges
               },
               source: r
             }
@@ -1390,10 +1390,10 @@ function xe(s, a, e, t, r = "command", i = !0) {
             params: {
               unitId: s,
               subUnitId: a,
-              ruleId: p.ruleId,
+              ruleId: _.ruleId,
               payload: {
                 type: V.RANGE,
-                payload: p.oldRanges
+                payload: _.oldRanges
               },
               source: r
             }
@@ -1404,10 +1404,10 @@ function xe(s, a, e, t, r = "command", i = !0) {
             params: {
               unitId: s,
               subUnitId: a,
-              ruleId: p.ruleId,
+              ruleId: _.ruleId,
               payload: {
                 type: V.RANGE,
-                payload: p.newRanges
+                payload: _.newRanges
               },
               source: r
             }
@@ -1416,58 +1416,58 @@ function xe(s, a, e, t, r = "command", i = !0) {
             params: {
               unitId: s,
               subUnitId: a,
-              ruleId: p.ruleId,
+              ruleId: _.ruleId,
               payload: {
                 type: V.RANGE,
-                payload: p.oldRanges
+                payload: _.oldRanges
               },
               source: r
             }
           });
-        const O = d.getRuleById(s, a, p.ruleId);
-        if (O && O.type === T.CHECKBOX) {
-          const P = d.getValidator(T.CHECKBOX).parseFormulaSync(O, s, a);
-          E(p.newRanges, P.formula2);
+        const w = c.getRuleById(s, a, _.ruleId);
+        if (w && w.type === C.CHECKBOX) {
+          const x = c.getValidator(C.CHECKBOX).parseFormulaSync(w, s, a);
+          E(_.newRanges, x.formula2);
         }
         break;
       }
       case "add": {
         if (l.push({
-          id: D.id,
+          id: b.id,
           params: {
             unitId: s,
             subUnitId: a,
-            rule: p.rule,
+            rule: _.rule,
             source: r
           }
         }), u.unshift({
-          id: A.id,
+          id: I.id,
           params: {
             unitId: s,
             subUnitId: a,
-            ruleId: p.rule.uid,
+            ruleId: _.rule.uid,
             source: r
           }
-        }), p.rule.type === T.CHECKBOX) {
-          const $ = d.getValidator(T.CHECKBOX).parseFormulaSync(p.rule, s, a);
-          E(p.rule.ranges, $.originFormula2);
+        }), _.rule.type === C.CHECKBOX) {
+          const $ = c.getValidator(C.CHECKBOX).parseFormulaSync(_.rule, s, a);
+          E(_.rule.ranges, $.originFormula2);
         }
         break;
       }
     }
   }), R) {
-    const p = {
+    const _ = {
       id: ne.id,
       params: {
         unitId: s,
         subUnitId: a,
-        cellValue: f.getData()
+        cellValue: p.getData()
       }
-    }, O = {
+    }, w = {
       id: ne.id,
-      params: ct(t, p.params)
+      params: dt(t, _.params)
     };
-    l.push(p), u.push(O);
+    l.push(_), u.push(w);
   }
   return {
     redoMutations: l,
@@ -1480,14 +1480,14 @@ const _a = {
   handler(s, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, ranges: r, ruleId: i } = a, o = s.get(C), n = s.get(B), l = s.get(Z);
+    const { unitId: e, subUnitId: t, ranges: r, ruleId: i } = a, o = s.get(F), n = s.get(U), l = s.get(Z);
     if (!o.getRuleById(e, t, i))
       return !1;
-    const d = o.getRuleObjectMatrix(e, t).clone();
-    d.updateRange(i, r);
-    const c = d.diff(o.getRules(e, t)), { redoMutations: g, undoMutations: _ } = xe(e, t, c, s);
+    const c = o.getRuleObjectMatrix(e, t).clone();
+    c.updateRange(i, r);
+    const d = c.diff(o.getRules(e, t)), { redoMutations: g, undoMutations: f } = xe(e, t, d, s);
     return l.pushUndoRedo({
-      undoMutations: _,
+      undoMutations: f,
       redoMutations: g,
       unitID: e
     }), Le(g, n), !0;
@@ -1498,21 +1498,21 @@ const _a = {
   handler(s, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, rule: r } = a, i = s.get(C), o = s.get(B), n = s.get(Z), l = i.getRuleObjectMatrix(e, t).clone();
+    const { unitId: e, subUnitId: t, rule: r } = a, i = s.get(F), o = s.get(U), n = s.get(Z), l = i.getRuleObjectMatrix(e, t).clone();
     l.addRule(r);
-    const u = l.diff(i.getRules(e, t)), d = i.getValidator(r.type), c = {
+    const u = l.diff(i.getRules(e, t)), c = i.getValidator(r.type), d = {
       unitId: e,
       subUnitId: t,
       rule: {
         ...r,
-        ...d == null ? void 0 : d.normalizeFormula(r, e, t)
+        ...c == null ? void 0 : c.normalizeFormula(r, e, t)
       }
-    }, { redoMutations: g, undoMutations: _ } = xe(e, t, u, s);
+    }, { redoMutations: g, undoMutations: f } = xe(e, t, u, s);
     return g.push({
-      id: D.id,
-      params: c
-    }), _.unshift({
-      id: A.id,
+      id: b.id,
+      params: d
+    }), f.unshift({
+      id: I.id,
       params: {
         unitId: e,
         subUnitId: t,
@@ -1521,7 +1521,7 @@ const _a = {
     }), n.pushUndoRedo({
       unitID: e,
       redoMutations: g,
-      undoMutations: _
+      undoMutations: f
     }), Le(g, o), !0;
   }
 }, Ra = {
@@ -1531,16 +1531,16 @@ const _a = {
   handler(s, a) {
     if (!a)
       return !1;
-    const e = s.get(B), t = s.get(Z), r = s.get(C), i = s.get(G), { unitId: o, subUnitId: n, ruleId: l, setting: u } = a, d = i.getValidatorItem(u.type);
-    if (!d)
-      return !1;
-    const c = r.getRuleById(o, n, l);
+    const e = s.get(U), t = s.get(Z), r = s.get(F), i = s.get(q), { unitId: o, subUnitId: n, ruleId: l, setting: u } = a, c = i.getValidatorItem(u.type);
     if (!c)
       return !1;
-    const g = { ...c, ...u };
-    if (!d.validatorFormula(g, o, n).success)
+    const d = r.getRuleById(o, n, l);
+    if (!d)
       return !1;
-    const _ = {
+    const g = { ...d, ...u };
+    if (!c.validatorFormula(g, o, n).success)
+      return !1;
+    const f = {
       unitId: o,
       subUnitId: n,
       ruleId: l,
@@ -1548,32 +1548,32 @@ const _a = {
         type: V.SETTING,
         payload: {
           ...u,
-          ...d.normalizeFormula(g, o, n)
+          ...c.normalizeFormula(g, o, n)
         }
       }
-    }, f = [{
+    }, p = [{
       id: y.id,
-      params: _
+      params: f
     }], R = {
       unitId: o,
       subUnitId: n,
       ruleId: l,
       payload: {
         type: V.SETTING,
-        payload: Ut(c)
+        payload: Ut(d)
       }
     }, E = [{
       id: y.id,
       params: R
     }];
-    if (u.type === T.CHECKBOX) {
-      const O = c.ranges, $ = s.get(I), P = ze($, { unitId: o, subUnitId: n });
-      if (P) {
-        const k = new Me(), { worksheet: H } = P, { formula2: J = ye, formula1: me = Ve } = c, { formula2: ge = ye, formula1: pe = Ve } = u;
+    if (u.type === C.CHECKBOX) {
+      const w = d.ranges, $ = s.get(D), x = ze($, { unitId: o, subUnitId: n });
+      if (x) {
+        const k = new Me(), { worksheet: P } = x, { formula2: J = ye, formula1: me = Ve } = d, { formula2: ge = ye, formula1: pe = Ve } = u;
         let Pe = !1;
-        if (O.forEach((fe) => {
-          U.foreach(fe, (ie, He) => {
-            const j = H.getCellRaw(ie, He), Je = ft(j);
+        if (w.forEach((fe) => {
+          H.foreach(fe, (ie, He) => {
+            const j = P.getCellRaw(ie, He), Je = ft(j);
             (vt(j) || Je === String(J)) && !(j != null && j.p) ? (k.setValue(ie, He, {
               v: ge,
               p: null
@@ -1592,15 +1592,15 @@ const _a = {
             }
           }, ie = {
             id: ne.id,
-            params: ct(s, fe.params)
+            params: dt(s, fe.params)
           };
-          f.push(fe), E.push(ie);
+          p.push(fe), E.push(ie);
         }
       }
     }
-    return Le(f, e).result ? (t.pushUndoRedo({
+    return Le(p, e).result ? (t.pushUndoRedo({
       unitID: o,
-      redoMutations: f,
+      redoMutations: p,
       undoMutations: E
     }), !0) : !1;
   }
@@ -1610,10 +1610,10 @@ const _a = {
   handler(s, a) {
     if (!a)
       return !1;
-    const e = s.get(B), t = s.get(Z), r = s.get(C), { unitId: i, subUnitId: o, ruleId: n, options: l } = a, u = r.getRuleById(i, o, n);
+    const e = s.get(U), t = s.get(Z), r = s.get(F), { unitId: i, subUnitId: o, ruleId: n, options: l } = a, u = r.getRuleById(i, o, n);
     if (!u)
       return !1;
-    const d = {
+    const c = {
       unitId: i,
       subUnitId: o,
       ruleId: n,
@@ -1621,9 +1621,9 @@ const _a = {
         type: V.OPTIONS,
         payload: l
       }
-    }, c = [{
+    }, d = [{
       id: y.id,
-      params: d
+      params: c
     }], g = {
       unitId: i,
       subUnitId: o,
@@ -1632,15 +1632,15 @@ const _a = {
         type: V.OPTIONS,
         payload: Bt(u)
       }
-    }, _ = [{
+    }, f = [{
       id: y.id,
       params: g
     }];
     return t.pushUndoRedo({
       unitID: i,
-      redoMutations: c,
-      undoMutations: _
-    }), e.executeCommand(y.id, d), !0;
+      redoMutations: d,
+      undoMutations: f
+    }), e.executeCommand(y.id, c), !0;
   }
 }, Ea = {
   type: z.COMMAND,
@@ -1648,15 +1648,15 @@ const _a = {
   handler(s, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, ranges: r } = a, i = s.get(B), o = s.get(I), n = ze(o, { unitId: e, subUnitId: t }), l = s.get(C);
+    const { unitId: e, subUnitId: t, ranges: r } = a, i = s.get(U), o = s.get(D), n = ze(o, { unitId: e, subUnitId: t }), l = s.get(F);
     if (!n) return !1;
-    const u = s.get(Z), d = l.getRuleObjectMatrix(e, t).clone();
-    d.removeRange(r);
-    const c = d.diff(l.getRules(e, t)), { redoMutations: g, undoMutations: _ } = xe(e, t, c, s);
+    const u = s.get(Z), c = l.getRuleObjectMatrix(e, t).clone();
+    c.removeRange(r);
+    const d = c.diff(l.getRules(e, t)), { redoMutations: g, undoMutations: f } = xe(e, t, d, s);
     return u.pushUndoRedo({
       unitID: e,
       redoMutations: g,
-      undoMutations: _
+      undoMutations: f
     }), Le(g, i).result;
   }
 }, Ma = {
@@ -1665,15 +1665,15 @@ const _a = {
   handler(s, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t } = a, r = s.get(B), i = s.get(C), o = s.get(Z), n = [...i.getRules(e, t)], l = {
+    const { unitId: e, subUnitId: t } = a, r = s.get(U), i = s.get(F), o = s.get(Z), n = [...i.getRules(e, t)], l = {
       unitId: e,
       subUnitId: t,
-      ruleId: n.map((c) => c.uid)
+      ruleId: n.map((d) => d.uid)
     }, u = [{
-      id: A.id,
+      id: I.id,
       params: l
-    }], d = [{
-      id: D.id,
+    }], c = [{
+      id: b.id,
       params: {
         unitId: e,
         subUnitId: t,
@@ -1682,16 +1682,16 @@ const _a = {
     }];
     return o.pushUndoRedo({
       redoMutations: u,
-      undoMutations: d,
+      undoMutations: c,
       unitID: e
-    }), r.executeCommand(A.id, l), !0;
+    }), r.executeCommand(I.id, l), !0;
   }
 }, Va = (s, a) => {
-  const e = s.get(C), { unitId: t, subUnitId: r, ruleId: i, source: o } = a;
+  const e = s.get(F), { unitId: t, subUnitId: r, ruleId: i, source: o } = a;
   if (Array.isArray(i)) {
     const l = i.map((u) => e.getRuleById(t, r, u)).filter(Boolean);
     return [{
-      id: D.id,
+      id: b.id,
       params: {
         unitId: t,
         subUnitId: r,
@@ -1701,7 +1701,7 @@ const _a = {
     }];
   }
   return [{
-    id: D.id,
+    id: b.id,
     params: {
       unitId: t,
       subUnitId: r,
@@ -1717,11 +1717,11 @@ const _a = {
   handler(s, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, ruleId: r } = a, i = s.get(B), o = s.get(Z), n = s.get(C), l = [{
-      id: A.id,
+    const { unitId: e, subUnitId: t, ruleId: r } = a, i = s.get(U), o = s.get(Z), n = s.get(F), l = [{
+      id: I.id,
       params: a
     }], u = [{
-      id: D.id,
+      id: b.id,
       params: {
         unitId: e,
         subUnitId: t,
@@ -1735,15 +1735,15 @@ const _a = {
       undoMutations: u,
       redoMutations: l,
       unitID: a.unitId
-    }), i.executeCommand(A.id, a), !0;
+    }), i.executeCommand(I.id, a), !0;
   }
-}, Ta = "SHEET_DATA_VALIDATION_PLUGIN";
-var Rt = /* @__PURE__ */ ((s) => (s[s.View = 0] = "View", s[s.Edit = 1] = "Edit", s[s.ManageCollaborator = 2] = "ManageCollaborator", s[s.Print = 3] = "Print", s[s.Duplicate = 4] = "Duplicate", s[s.Comment = 5] = "Comment", s[s.Copy = 6] = "Copy", s[s.Share = 7] = "Share", s[s.Export = 8] = "Export", s[s.MoveWorksheet = 9] = "MoveWorksheet", s[s.DeleteWorksheet = 10] = "DeleteWorksheet", s[s.HideWorksheet = 11] = "HideWorksheet", s[s.RenameWorksheet = 12] = "RenameWorksheet", s[s.CreateWorksheet = 13] = "CreateWorksheet", s[s.SetWorksheetStyle = 14] = "SetWorksheetStyle", s[s.EditWorksheetCell = 15] = "EditWorksheetCell", s[s.InsertHyperlink = 16] = "InsertHyperlink", s[s.Sort = 17] = "Sort", s[s.Filter = 18] = "Filter", s[s.PivotTable = 19] = "PivotTable", s[s.FloatImg = 20] = "FloatImg", s[s.History = 21] = "History", s[s.RwHgtClWdt = 22] = "RwHgtClWdt", s[s.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", s[s.ViewFilter = 24] = "ViewFilter", s[s.MoveSheet = 25] = "MoveSheet", s[s.DeleteSheet = 26] = "DeleteSheet", s[s.HideSheet = 27] = "HideSheet", s[s.CopySheet = 28] = "CopySheet", s[s.RenameSheet = 29] = "RenameSheet", s[s.CreateSheet = 30] = "CreateSheet", s[s.SelectProtectedCells = 31] = "SelectProtectedCells", s[s.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", s[s.SetCellStyle = 33] = "SetCellStyle", s[s.SetCellValue = 34] = "SetCellValue", s[s.SetRowStyle = 35] = "SetRowStyle", s[s.SetColumnStyle = 36] = "SetColumnStyle", s[s.InsertRow = 37] = "InsertRow", s[s.InsertColumn = 38] = "InsertColumn", s[s.DeleteRow = 39] = "DeleteRow", s[s.DeleteColumn = 40] = "DeleteColumn", s[s.EditExtraObject = 41] = "EditExtraObject", s[s.Delete = 42] = "Delete", s[s.RecoverHistory = 43] = "RecoverHistory", s[s.ViewHistory = 44] = "ViewHistory", s[s.CreatePermissionObject = 45] = "CreatePermissionObject", s[s.UNRECOGNIZED = -1] = "UNRECOGNIZED", s))(Rt || {}), Fa = Object.getOwnPropertyDescriptor, Ca = (s, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Fa(a, e) : a, i = s.length - 1, o; i >= 0; i--)
+}, Ca = "SHEET_DATA_VALIDATION_PLUGIN";
+var Rt = /* @__PURE__ */ ((s) => (s[s.View = 0] = "View", s[s.Edit = 1] = "Edit", s[s.ManageCollaborator = 2] = "ManageCollaborator", s[s.Print = 3] = "Print", s[s.Duplicate = 4] = "Duplicate", s[s.Comment = 5] = "Comment", s[s.Copy = 6] = "Copy", s[s.Share = 7] = "Share", s[s.Export = 8] = "Export", s[s.MoveWorksheet = 9] = "MoveWorksheet", s[s.DeleteWorksheet = 10] = "DeleteWorksheet", s[s.HideWorksheet = 11] = "HideWorksheet", s[s.RenameWorksheet = 12] = "RenameWorksheet", s[s.CreateWorksheet = 13] = "CreateWorksheet", s[s.SetWorksheetStyle = 14] = "SetWorksheetStyle", s[s.EditWorksheetCell = 15] = "EditWorksheetCell", s[s.InsertHyperlink = 16] = "InsertHyperlink", s[s.Sort = 17] = "Sort", s[s.Filter = 18] = "Filter", s[s.PivotTable = 19] = "PivotTable", s[s.FloatImg = 20] = "FloatImg", s[s.History = 21] = "History", s[s.RwHgtClWdt = 22] = "RwHgtClWdt", s[s.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", s[s.ViewFilter = 24] = "ViewFilter", s[s.MoveSheet = 25] = "MoveSheet", s[s.DeleteSheet = 26] = "DeleteSheet", s[s.HideSheet = 27] = "HideSheet", s[s.CopySheet = 28] = "CopySheet", s[s.RenameSheet = 29] = "RenameSheet", s[s.CreateSheet = 30] = "CreateSheet", s[s.SelectProtectedCells = 31] = "SelectProtectedCells", s[s.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", s[s.SetCellStyle = 33] = "SetCellStyle", s[s.SetCellValue = 34] = "SetCellValue", s[s.SetRowStyle = 35] = "SetRowStyle", s[s.SetColumnStyle = 36] = "SetColumnStyle", s[s.InsertRow = 37] = "InsertRow", s[s.InsertColumn = 38] = "InsertColumn", s[s.DeleteRow = 39] = "DeleteRow", s[s.DeleteColumn = 40] = "DeleteColumn", s[s.EditExtraObject = 41] = "EditExtraObject", s[s.Delete = 42] = "Delete", s[s.RecoverHistory = 43] = "RecoverHistory", s[s.ViewHistory = 44] = "ViewHistory", s[s.CreatePermissionObject = 45] = "CreatePermissionObject", s[s.UNRECOGNIZED = -1] = "UNRECOGNIZED", s))(Rt || {}), Ta = Object.getOwnPropertyDescriptor, Fa = (s, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Ta(a, e) : a, i = s.length - 1, o; i >= 0; i--)
     (o = s[i]) && (r = o(r) || r);
   return r;
 }, je = (s, a) => (e, t) => a(e, t, s);
-let Ce = class extends x {
+let Fe = class extends B {
   constructor(s, a, e) {
     super(), this._univerInstanceService = s, this._permissionService = a, this._lexerTreeBuilder = e;
   }
@@ -1758,38 +1758,38 @@ let Ce = class extends x {
         continue;
       const { token: o } = i, n = $t(o), l = this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET);
       let u = l.getActiveSheet();
-      const d = l.getUnitId();
+      const c = l.getUnitId();
       if (n.sheetName) {
         if (u = l.getSheetBySheetName(n.sheetName), !u)
           return !1;
         const R = u == null ? void 0 : u.getSheetId();
-        if (!this._permissionService.getPermissionPoint(new jt(d, R).id)) return !1;
+        if (!this._permissionService.getPermissionPoint(new jt(c, R).id)) return !1;
       }
       if (!u)
         return !1;
-      const { startRow: c, endRow: g, startColumn: _, endColumn: f } = n.range;
-      for (let R = c; R <= g; R++)
-        for (let E = _; E <= f; E++) {
-          const p = (t = (e = u.getCell(R, E)) == null ? void 0 : e.selectionProtection) == null ? void 0 : t[0];
-          if ((p == null ? void 0 : p[Rt.View]) === !1)
+      const { startRow: d, endRow: g, startColumn: f, endColumn: p } = n.range;
+      for (let R = d; R <= g; R++)
+        for (let E = f; E <= p; E++) {
+          const _ = (t = (e = u.getCell(R, E)) == null ? void 0 : e.selectionProtection) == null ? void 0 : t[0];
+          if ((_ == null ? void 0 : _[Rt.View]) === !1)
             return !1;
         }
     }
     return !0;
   }
 };
-Ce = Ca([
-  je(0, I),
-  je(1, Ft),
+Fe = Fa([
+  je(0, D),
+  je(1, Tt),
   je(2, v(X))
-], Ce);
+], Fe);
 const Na = "sheets-data-validation.config", st = {};
-var Oa = Object.getOwnPropertyDescriptor, wa = (s, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Oa(a, e) : a, i = s.length - 1, o; i >= 0; i--)
+var wa = Object.getOwnPropertyDescriptor, Oa = (s, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? wa(a, e) : a, i = s.length - 1, o; i >= 0; i--)
     (o = s[i]) && (r = o(r) || r);
   return r;
 }, Qe = (s, a) => (e, t) => a(e, t, s);
-let Ne = class extends x {
+let Ne = class extends B {
   constructor(a, e, t) {
     super();
     m(this, "_disposableMap", /* @__PURE__ */ new Map());
@@ -1807,7 +1807,7 @@ let Ne = class extends x {
       if (u.length === 0)
         return {
           undos: [{
-            id: D.id,
+            id: b.id,
             params: {
               unitId: a,
               subUnitId: e,
@@ -1816,7 +1816,7 @@ let Ne = class extends x {
             }
           }],
           redos: [{
-            id: A.id,
+            id: I.id,
             params: {
               unitId: a,
               subUnitId: e,
@@ -1825,8 +1825,8 @@ let Ne = class extends x {
             }
           }]
         };
-      const d = [], c = [], g = u[0];
-      d.push({
+      const c = [], d = [], g = u[0];
+      c.push({
         id: y.id,
         params: {
           unitId: a,
@@ -1842,7 +1842,7 @@ let Ne = class extends x {
           },
           source: "patched"
         }
-      }), c.push({
+      }), d.push({
         id: y.id,
         params: {
           unitId: a,
@@ -1859,24 +1859,24 @@ let Ne = class extends x {
           source: "patched"
         }
       });
-      for (let _ = 1; _ < u.length; _++) {
-        const f = u[_], R = Xe();
-        d.push({
-          id: D.id,
+      for (let f = 1; f < u.length; f++) {
+        const p = u[f], R = Xe();
+        c.push({
+          id: b.id,
           params: {
             unitId: a,
             subUnitId: e,
             rule: {
               ...t,
               uid: R,
-              formula1: f.formulas[0],
-              formula2: f.formulas[1],
-              ranges: f.ranges
+              formula1: p.formulas[0],
+              formula2: p.formulas[1],
+              ranges: p.ranges
             },
             source: "patched"
           }
-        }), c.push({
-          id: A.id,
+        }), d.push({
+          id: I.id,
           params: {
             unitId: a,
             subUnitId: e,
@@ -1886,8 +1886,8 @@ let Ne = class extends x {
         });
       }
       return {
-        undos: c,
-        redos: d
+        undos: d,
+        redos: c
       };
     }), l = this._getIdWithUnitId(a, e, t.uid);
     this._disposableMap.set(l, n);
@@ -1926,17 +1926,17 @@ let Ne = class extends x {
     }));
   }
 };
-Ne = wa([
-  Qe(0, v(C)),
+Ne = Oa([
+  Qe(0, v(F)),
   Qe(1, v(pt)),
-  Qe(2, v(G))
+  Qe(2, v(q))
 ], Ne);
 var Aa = Object.getOwnPropertyDescriptor, Ia = (s, a, e, t) => {
   for (var r = t > 1 ? void 0 : t ? Aa(a, e) : a, i = s.length - 1, o; i >= 0; i--)
     (o = s[i]) && (r = o(r) || r);
   return r;
 }, te = (s, a) => (e, t) => a(e, t, s);
-let Oe = class extends x {
+let we = class extends B {
   constructor(a, e, t, r, i, o) {
     super();
     m(this, "_disposableMap", /* @__PURE__ */ new Map());
@@ -1951,14 +1951,14 @@ let Oe = class extends x {
   // eslint-disable-next-line max-lines-per-function
   registerFormula(a, e, t) {
     var u;
-    const r = t.uid, i = this._getIdWithUnitId(a, e, r), o = (u = this._disposableMap.get(i)) != null ? u : /* @__PURE__ */ new Set(), n = (d, c) => {
+    const r = t.uid, i = this._getIdWithUnitId(a, e, r), o = (u = this._disposableMap.get(i)) != null ? u : /* @__PURE__ */ new Set(), n = (c, d) => {
       const g = this._dataValidationModel.getRuleById(a, e, r);
       if (!g)
         return { redos: [], undos: [] };
-      const _ = g[d];
-      if (!_ || _ === c)
+      const f = g[c];
+      if (!f || f === d)
         return { redos: [], undos: [] };
-      const f = {
+      const p = {
         unitId: a,
         subUnitId: e,
         ruleId: t.uid,
@@ -1968,7 +1968,7 @@ let Oe = class extends x {
             type: g.type,
             formula1: g.formula1,
             formula2: g.formula2,
-            [d]: c
+            [c]: d
           }
         },
         source: "patched"
@@ -1988,33 +1988,33 @@ let Oe = class extends x {
       }, E = [
         {
           id: y.id,
-          params: f
+          params: p
         }
-      ], p = [
+      ], _ = [
         {
           id: y.id,
           params: R
         }
       ];
-      return { redos: E, undos: p };
+      return { redos: E, undos: _ };
     }, l = this._dataValidationFormulaService.getRuleFormulaInfo(a, e, r);
     if (l) {
-      const [d, c] = l;
-      if (d) {
+      const [c, d] = l;
+      if (c) {
         const g = this._formulaRefRangeService.registerFormula(
           a,
           e,
-          d.text,
-          (_) => n("formula1", _)
+          c.text,
+          (f) => n("formula1", f)
         );
         o.add(() => g.dispose());
       }
-      if (c) {
+      if (d) {
         const g = this._formulaRefRangeService.registerFormula(
           a,
           e,
-          c.text,
-          (_) => n("formula2", _)
+          d.text,
+          (f) => n("formula2", f)
         );
         o.add(() => g.dispose());
       }
@@ -2023,11 +2023,11 @@ let Oe = class extends x {
   register(a, e, t) {
     var l;
     const r = (u) => {
-      const d = [...t.ranges], g = d.map((f) => qt(f, u)).filter((f) => !!f).flat();
-      if (lt(g, d))
+      const c = [...t.ranges], g = c.map((p) => Gt(p, u)).filter((p) => !!p).flat();
+      if (lt(g, c))
         return { redos: [], undos: [] };
       if (g.length) {
-        const f = {
+        const p = {
           unitId: a,
           subUnitId: e,
           ruleId: t.uid,
@@ -2036,7 +2036,7 @@ let Oe = class extends x {
             payload: g
           },
           source: "patched"
-        }, R = [{ id: y.id, params: f }], E = [{
+        }, R = [{ id: y.id, params: p }], E = [{
           id: y.id,
           params: {
             unitId: a,
@@ -2044,20 +2044,20 @@ let Oe = class extends x {
             ruleId: t.uid,
             payload: {
               type: V.RANGE,
-              payload: d
+              payload: c
             },
             source: "patched"
           }
         }];
         return { redos: R, undos: E };
       } else {
-        const f = { unitId: a, subUnitId: e, ruleId: t.uid }, R = [{ id: A.id, params: f }], E = Va(this._injector, f);
+        const p = { unitId: a, subUnitId: e, ruleId: t.uid }, R = [{ id: I.id, params: p }], E = Va(this._injector, p);
         return { redos: R, undos: E };
       }
     }, i = [];
     t.ranges.forEach((u) => {
-      const d = this._refRangeService.registerRefRange(u, r, a, e);
-      i.push(() => d.dispose());
+      const c = this._refRangeService.registerRefRange(u, r, a, e);
+      i.push(() => c.dispose());
     });
     const o = this._getIdWithUnitId(a, e, t.uid), n = (l = this._disposableMap.get(o)) != null ? l : /* @__PURE__ */ new Set();
     n.add(() => i.forEach((u) => u())), this._disposableMap.set(o, n);
@@ -2096,20 +2096,20 @@ let Oe = class extends x {
     }));
   }
 };
-Oe = Ia([
-  te(0, v(C)),
+we = Ia([
+  te(0, v(F)),
   te(1, v(be)),
   te(2, v(Qt)),
-  te(3, v(q)),
+  te(3, v(G)),
   te(4, v(pt)),
-  te(5, v(G))
-], Oe);
+  te(5, v(q))
+], we);
 var Da = Object.getOwnPropertyDescriptor, ba = (s, a, e, t) => {
   for (var r = t > 1 ? void 0 : t ? Da(a, e) : a, i = s.length - 1, o; i >= 0; i--)
     (o = s[i]) && (r = o(r) || r);
   return r;
-}, qe = (s, a) => (e, t) => a(e, t, s);
-let we = class extends x {
+}, Ge = (s, a) => (e, t) => a(e, t, s);
+let Oe = class extends B {
   constructor(s, a, e) {
     super(), this._sheetInterceptorService = s, this._univerInstanceService = a, this._sheetDataValidationModel = e, this._initSheetChange();
   }
@@ -2120,7 +2120,7 @@ let we = class extends x {
         // eslint-disable-next-line max-lines-per-function
         getMutations: (s) => {
           var a;
-          if (s.id === Gt.id) {
+          if (s.id === qt.id) {
             const e = s.params, t = e.unitId || this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET).getUnitId(), r = this._univerInstanceService.getUniverSheetInstance(t);
             if (!r)
               return { redos: [], undos: [] };
@@ -2130,7 +2130,7 @@ let we = class extends x {
             const o = this._sheetDataValidationModel.getRules(t, i);
             if (o.length === 0)
               return { redos: [], undos: [] };
-            const n = o.map((d) => d.uid), l = {
+            const n = o.map((c) => c.uid), l = {
               unitId: t,
               subUnitId: i,
               ruleId: n,
@@ -2143,11 +2143,11 @@ let we = class extends x {
             };
             return {
               redos: [{
-                id: A.id,
+                id: I.id,
                 params: l
               }],
               undos: [{
-                id: D.id,
+                id: b.id,
                 params: u
               }]
             };
@@ -2162,7 +2162,7 @@ let we = class extends x {
             return {
               redos: [
                 {
-                  id: D.id,
+                  id: b.id,
                   params: {
                     unitId: t,
                     subUnitId: i,
@@ -2173,7 +2173,7 @@ let we = class extends x {
               ],
               undos: [
                 {
-                  id: A.id,
+                  id: I.id,
                   params: {
                     unitId: t,
                     subUnitId: i,
@@ -2190,15 +2190,15 @@ let we = class extends x {
     );
   }
 };
-we = ba([
-  qe(0, v(ht)),
-  qe(1, v(I)),
-  qe(2, v(C))
-], we);
+Oe = ba([
+  Ge(0, v(ht)),
+  Ge(1, v(D)),
+  Ge(2, v(F))
+], Oe);
 class La extends Y {
   constructor() {
     super(...arguments);
-    m(this, "id", T.ANY);
+    m(this, "id", C.ANY);
     m(this, "title", "dataValidation.any.title");
     m(this, "operators", []);
     m(this, "scopes", ["sheet"]);
@@ -2227,7 +2227,7 @@ class La extends Y {
 class Ua extends Y {
   constructor() {
     super(...arguments);
-    m(this, "id", T.CUSTOM);
+    m(this, "id", C.CUSTOM);
     m(this, "title", "dataValidation.custom.title");
     m(this, "operators", []);
     m(this, "scopes", ["sheet"]);
@@ -2251,8 +2251,8 @@ class Ua extends Y {
     };
   }
   async isValidType(e, t, r) {
-    const { column: i, row: o, unitId: n, subUnitId: l } = e, u = await this._customFormulaService.getCellFormulaValue(n, l, r.uid, o, i), d = u == null ? void 0 : u.v;
-    return F(String(d)) && M.isDefine(d) && d !== "" ? u.t === Ct.BOOLEAN ? !!d : typeof d == "boolean" ? d : typeof d == "number" ? !!d : typeof d == "string" ? F(d) : !!d : !1;
+    const { column: i, row: o, unitId: n, subUnitId: l } = e, u = await this._customFormulaService.getCellFormulaValue(n, l, r.uid, o, i), c = u == null ? void 0 : u.v;
+    return T(String(c)) && M.isDefine(c) && c !== "" ? u.t === Ft.BOOLEAN ? !!c : typeof c == "boolean" ? c : typeof c == "number" ? !!c : typeof c == "string" ? T(c) : !!c : !1;
   }
   generateRuleErrorMessage(e) {
     return this.localeService.t("dataValidation.custom.error");
@@ -2265,7 +2265,7 @@ class Ua extends Y {
 class Ba extends _t {
   constructor() {
     super(...arguments);
-    m(this, "id", T.LIST_MULTIPLE);
+    m(this, "id", C.LIST_MULTIPLE);
     m(this, "title", "dataValidation.listMultiple.title");
     m(this, "offsetFormulaByRange", !1);
     m(this, "skipDefaultFontRender", () => !0);
@@ -2276,7 +2276,7 @@ class xa extends Y {
     super(...arguments);
     m(this, "_customFormulaService", this.injector.get(W));
     m(this, "_lexerTreeBuilder", this.injector.get(X));
-    m(this, "id", T.WHOLE);
+    m(this, "id", C.WHOLE);
     m(this, "title", "dataValidation.whole.title");
     m(this, "order", 10);
     m(this, "operators", [
@@ -2295,25 +2295,25 @@ class xa extends Y {
     return !M.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
   }
   async isValidType(e, t, r) {
-    const { value: i } = e, o = Fe(i);
+    const { value: i } = e, o = Te(i);
     return !Number.isNaN(o) && Number.isInteger(o);
   }
   transform(e, t, r) {
     const { value: i } = e;
     return {
       ...e,
-      value: Fe(i)
+      value: Te(i)
     };
   }
   _parseNumber(e) {
     return e == null ? Number.NaN : +e;
   }
   async parseFormula(e, t, r, i, o) {
-    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, o), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, o), { formula1: u, formula2: d } = e, c = S(u) ? n == null ? void 0 : n.v : u, g = S(d) ? l == null ? void 0 : l.v : d, _ = F(`${c}`) && F(`${g}`);
+    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, o), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, o), { formula1: u, formula2: c } = e, d = S(u) ? n == null ? void 0 : n.v : u, g = S(c) ? l == null ? void 0 : l.v : c, f = T(`${d}`) && T(`${g}`);
     return {
-      formula1: this._parseNumber(c),
+      formula1: this._parseNumber(d),
       formula2: this._parseNumber(g),
-      isFormulaValid: _
+      isFormulaValid: f
     };
   }
   validatorFormula(e, t, r) {
@@ -2334,9 +2334,9 @@ class xa extends Y {
   }
   generateRuleErrorMessage(e, t) {
     if (!e.operator)
-      return this.localeService.t(Te.NONE).replace("{TYPE}", this.titleStr);
+      return this.localeService.t(Ce.NONE).replace("{TYPE}", this.titleStr);
     const { transformedFormula1: r, transformedFormula2: i } = Ue(this._lexerTreeBuilder, e, t);
-    return `${this.localeService.t(Te[e.operator]).replace(ue, r != null ? r : "").replace(de, i != null ? i : "")}`;
+    return `${this.localeService.t(Ce[e.operator]).replace(ue, r != null ? r : "").replace(ce, i != null ? i : "")}`;
   }
 }
 var Pa = Object.getOwnPropertyDescriptor, Ha = (s, a, e, t) => {
@@ -2354,10 +2354,10 @@ let Ae = class extends Nt {
   _registerValidators() {
     [
       La,
-      ca,
+      da,
       xa,
       fa,
-      da,
+      ca,
       na,
       _t,
       Ba,
@@ -2375,11 +2375,11 @@ let Ae = class extends Nt {
           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(), o = (a = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : a.map((c) => c.range), n = this._sheetDataValidationModel.getRuleObjectMatrix(t, i).clone();
+          const i = r.getSheetId(), o = (a = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : a.map((d) => d.range), n = this._sheetDataValidationModel.getRuleObjectMatrix(t, i).clone();
           o && n.removeRange(o);
-          const l = n.diff(this._sheetDataValidationModel.getRules(t, i)), { redoMutations: u, undoMutations: d } = xe(t, i, l, this._injector, "patched");
+          const l = n.diff(this._sheetDataValidationModel.getRules(t, i)), { redoMutations: u, undoMutations: c } = xe(t, i, l, this._injector, "patched");
           return {
-            undos: d,
+            undos: c,
             redos: u
           };
         }
@@ -2392,19 +2392,19 @@ let Ae = class extends Nt {
   }
 };
 Ae = Ha([
-  ae(0, I),
-  ae(1, v(G)),
+  ae(0, D),
+  ae(1, v(q)),
   ae(2, v(be)),
   ae(3, v(mt)),
   ae(4, v(ht)),
-  ae(5, v(C))
+  ae(5, v(F))
 ], Ae);
 var Wa = Object.getOwnPropertyDescriptor, $a = (s, a, e, t) => {
   for (var r = t > 1 ? void 0 : t ? Wa(a, e) : a, i = s.length - 1, o; i >= 0; i--)
     (o = s[i]) && (r = o(r) || r);
   return r;
 }, Re = (s, a) => (e, t) => a(e, t, s);
-let Ie = class extends x {
+let Ie = class extends B {
   constructor(s, a, e, t) {
     super(), this._univerInstanceService = s, this._sheetDataValidationModel = a, this._dataValidationCacheService = e, this._lifecycleService = t, this._initRecalculate();
   }
@@ -2416,7 +2416,7 @@ let Ie = class extends x {
       a.flat().forEach((i) => {
         r[i.unitId] || (r[i.unitId] = {}), r[i.unitId][i.subUnitId] || (r[i.unitId][i.subUnitId] = []);
         const o = this._univerInstanceService.getUnit(i.unitId, N.UNIVER_SHEET), n = o == null ? void 0 : o.getSheetBySheetId(i.subUnitId);
-        n && r[i.unitId][i.subUnitId].push(...i.ranges.map((l) => U.transformRange(l, n)));
+        n && r[i.unitId][i.subUnitId].push(...i.ranges.map((l) => H.transformRange(l, n)));
       }), Object.entries(r).forEach(([i, o]) => {
         Object.entries(o).forEach(([n, l]) => {
           (e == null ? void 0 : e.getUnitId()) === i && (t == null ? void 0 : t.getSheetId()) === n ? this.validatorRanges(i, n, l) : requestIdleCallback(() => {
@@ -2425,18 +2425,21 @@ let Ie = class extends x {
         });
       });
     };
-    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Kt(() => this._lifecycleService.lifecycle$.pipe(tt((a) => a === et.Rendered)))).subscribe(s)), this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(tt(() => this._lifecycleService.stage >= et.Rendered), wt(20)).subscribe(s));
+    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Kt(() => this._lifecycleService.lifecycle$.pipe(tt((a) => a === et.Rendered)))).subscribe(s)), this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(tt(() => this._lifecycleService.stage >= et.Rendered), Ot(20)).subscribe(s));
   }
   async _validatorByCell(s, a, e, t) {
     const r = s.getUnitId(), i = a.getSheetId();
     if (!M.isDefine(e) || !M.isDefine(t))
       throw new Error(`row or col is not defined, row: ${e}, col: ${t}`);
-    const o = this._sheetDataValidationModel.getRuleByLocation(r, i, e, t);
-    return o ? new Promise((n) => {
-      this._sheetDataValidationModel.validator(o, { unitId: r, subUnitId: i, row: e, col: t, worksheet: a, workbook: s }, (l) => {
-        n(l);
+    let o = e, n = t;
+    const l = a.getMergedCell(e, t);
+    l && (o = l.startRow, n = l.startColumn);
+    const u = this._sheetDataValidationModel.getRuleByLocation(r, i, o, n);
+    return u ? new Promise((c) => {
+      this._sheetDataValidationModel.validator(u, { unitId: r, subUnitId: i, row: o, col: n, worksheet: a, workbook: s }, (d) => {
+        c(d);
       });
-    }) : b.VALID;
+    }) : A.VALID;
   }
   async validatorCell(s, a, e, t) {
     const r = this._univerInstanceService.getUnit(s, N.UNIVER_SHEET);
@@ -2447,7 +2450,7 @@ let Ie = class extends x {
       throw new Error(`cannot find current worksheet, sheetId: ${a}`);
     return this._validatorByCell(r, i, e, t);
   }
-  validatorRanges(s, a, e) {
+  async validatorRanges(s, a, e) {
     if (!e.length)
       return Promise.resolve([]);
     const t = this._univerInstanceService.getUnit(s, N.UNIVER_SHEET);
@@ -2456,13 +2459,27 @@ let Ie = class extends x {
     const r = t.getSheetBySheetId(a);
     if (!r)
       throw new Error(`cannot find current worksheet, sheetId: ${a}`);
-    const o = this._sheetDataValidationModel.getRules(s, a).map((l) => l.ranges).flat(), n = e.map((l) => o.map((u) => ot(l, u))).flat().filter(Boolean);
-    return Promise.all(n.map((l) => {
-      const u = [];
-      return U.foreach(l, (d, c) => {
-        u.push(this._validatorByCell(t, r, d, c));
-      }), Promise.all(u);
-    }));
+    const o = this._sheetDataValidationModel.getRules(s, a).map((c) => c.ranges).flat(), n = e.map((c) => o.map((d) => ot(c, d))).flat().filter(Boolean), l = [], u = await Promise.all(
+      n.map((c, d) => {
+        const g = [];
+        for (let f = c.startRow; f <= c.endRow; f++)
+          for (let p = c.startColumn; p <= c.endColumn; p++) {
+            g.push(this._validatorByCell(t, r, f, p));
+            const R = r.getMergedCell(f, p);
+            R && l.push({
+              resultRowIndex: d,
+              resultColIndex: g.length - 1,
+              row: R.startRow,
+              col: R.startColumn
+            });
+          }
+        return Promise.all(g);
+      })
+    );
+    return l.length && l.forEach(({ resultRowIndex: c, resultColIndex: d, row: g, col: f }) => {
+      var p;
+      u[c][d] === A.VALIDATING && (u[c][d] = (p = this._dataValidationCacheService.getValue(s, a, g, f)) != null ? p : A.VALID);
+    }), u;
   }
   async validatorWorksheet(s, a) {
     const e = this._univerInstanceService.getUnit(s, N.UNIVER_SHEET);
@@ -2476,7 +2493,7 @@ let Ie = class extends x {
       r.map((i) => Promise.all(
         i.ranges.map((o) => {
           const n = [];
-          return U.foreach(o, (l, u) => {
+          return H.foreach(o, (l, u) => {
             n.push(this._validatorByCell(e, t, l, u));
           }), Promise.all(n);
         })
@@ -2492,7 +2509,7 @@ let Ie = class extends x {
   getDataValidations(s, a, e) {
     const t = this._sheetDataValidationModel.getRuleObjectMatrix(s, a), r = /* @__PURE__ */ new Set();
     return e.forEach((o) => {
-      U.foreach(o, (n, l) => {
+      H.foreach(o, (n, l) => {
         const u = t.getValue(n, l);
         u && r.add(u);
       });
@@ -2503,16 +2520,16 @@ let Ie = class extends x {
   }
 };
 Ie = $a([
-  Re(0, I),
-  Re(1, v(C)),
+  Re(0, D),
+  Re(1, v(F)),
   Re(2, v(Q)),
-  Re(3, v(Ot))
+  Re(3, v(wt))
 ], Ie);
-var ka = Object.defineProperty, ja = Object.getOwnPropertyDescriptor, Qa = (s, a, e) => a in s ? ka(s, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[a] = e, qa = (s, a, e, t) => {
+var ka = Object.defineProperty, ja = Object.getOwnPropertyDescriptor, Qa = (s, a, e) => a in s ? ka(s, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[a] = e, Ga = (s, a, e, t) => {
   for (var r = t > 1 ? void 0 : t ? ja(a, e) : a, i = s.length - 1, o; i >= 0; i--)
     (o = s[i]) && (r = o(r) || r);
   return r;
-}, Ge = (s, a) => (e, t) => a(e, t, s), St = (s, a, e) => Qa(s, typeof a != "symbol" ? a + "" : a, e);
+}, qe = (s, a) => (e, t) => a(e, t, s), St = (s, a, e) => Qa(s, typeof a != "symbol" ? a + "" : a, e);
 let De = class extends Dt {
   constructor(s = st, a, e, t) {
     super(), this._config = s, this._injector = a, this._commandService = e, this._configService = t;
@@ -2527,14 +2544,14 @@ let De = class extends Dt {
     [
       [Q],
       [le],
-      [q],
+      [G],
       [W],
       [Ie],
-      [C],
+      [F],
       [Ae],
-      [Ce],
-      [we],
+      [Fe],
       [Oe],
+      [we],
       [Ne]
     ].forEach((s) => {
       this._injector.add(s);
@@ -2548,28 +2565,28 @@ let De = class extends Dt {
       Ea
     ].forEach((s) => {
       this._commandService.registerCommand(s);
-    }), this._injector.get(Q), this._injector.get(Ie), this._injector.get(Ae), this._injector.get(Ne), this._injector.get(Oe);
+    }), this._injector.get(Q), this._injector.get(Ie), this._injector.get(Ae), this._injector.get(Ne), this._injector.get(we);
   }
   onReady() {
-    this._injector.get(we);
+    this._injector.get(Oe);
   }
   onRendered() {
-    this._injector.get(Ce);
+    this._injector.get(Fe);
   }
 };
-St(De, "pluginName", Ta);
+St(De, "pluginName", Ca);
 St(De, "type", N.UNIVER_SHEET);
-De = qa([
+De = Ga([
   At(xt),
-  Ge(1, v(be)),
-  Ge(2, B),
-  Ge(3, It)
+  qe(1, v(be)),
+  qe(2, U),
+  qe(3, It)
 ], De);
 function ar(s) {
   const e = s.get(mt).getCurrentSelections().map((i) => i.range);
   return {
     uid: Xe(6),
-    type: T.DECIMAL,
+    type: C.DECIMAL,
     operator: h.EQUAL,
     formula1: "100",
     ranges: e != null ? e : [{ startColumn: 0, endColumn: 0, startRow: 0, endRow: 0 }]
@@ -2585,19 +2602,19 @@ export {
   rr as CUSTOM_FORMULA_INPUT_NAME,
   na as CheckboxValidator,
   Ea as ClearRangeDataValidationCommand,
-  Ta as DATA_VALIDATION_PLUGIN_NAME,
+  Ca as DATA_VALIDATION_PLUGIN_NAME,
   Q as DataValidationCacheService,
   W as DataValidationCustomFormulaService,
-  Ce as DataValidationFormulaController,
-  q as DataValidationFormulaService,
+  Fe as DataValidationFormulaController,
+  G as DataValidationFormulaService,
   le as DataValidationListCacheService,
-  da as DateValidator,
+  ca as DateValidator,
   sr as LIST_FORMULA_INPUT_NAME,
   Ba as ListMultipleValidator,
   _t as ListValidator,
   Ma as RemoveSheetAllDataValidationCommand,
   ya as RemoveSheetDataValidationCommand,
-  C as SheetDataValidationModel,
+  F as SheetDataValidationModel,
   Ie as SheetsDataValidationValidatorService,
   De as UniverSheetsDataValidationPlugin,
   Sa as UpdateSheetDataValidationOptionsCommand,
@@ -2605,14 +2622,14 @@ export {
   Ra as UpdateSheetDataValidationSettingCommand,
   ar as createDefaultNewRule,
   Ee as deserializeListOptions,
-  Fe as getCellValueNumber,
+  Te as getCellValueNumber,
   re as getCellValueOrigin,
   tr as getDataValidationCellValue,
   xe as getDataValidationDiffMutations,
   _e as getFormulaCellData,
   oe as getFormulaResult,
   Ue as getTransformedFormula,
-  F as isLegalFormulaResult,
+  T as isLegalFormulaResult,
   er as serializeListOptions,
   ve as transformCheckboxValue
 };