@univerjs/sheets-data-validation 0.6.10-experimental.20250411-f5b7b16 → 0.6.10-experimental.20250418-8830bd4

package/lib/es/index.js

@@ -1,24 +1,24 @@
-var ft = Object.defineProperty;
-var Rt = (o, a, e) => a in o ? ft(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e;
-var g = (o, a, e) => Rt(o, typeof a != "symbol" ? a + "" : a, e);
-import { Inject as v, ICommandService as x, IUniverInstanceService as w, Disposable as W, ObjectMatrix as Se, UniverInstanceType as N, Range as b, Rectangle as I, isFormulaString as S, DataValidationType as T, getOriginCellValue as vt, RBush as St, debounce as Vt, Tools as V, DataValidationStatus as D, WrapStrategy as ve, DataValidationOperator as h, numfmt as j, dayjs as at, DataValidationRenderMode as Be, CommandType as z, IUndoRedoService as Z, sequenceExecute as Ie, isRangesEqual as rt, generateRandomId as Mt, toDisposable as Qe, IPermissionService as yt, Injector as qe, CellValueType as Et, RxDisposable as Tt, LifecycleService as Ft, LifecycleStages as ze, bufferDebounceTime as Nt, DependentOn as Ct, IConfigService as wt, Plugin as Ot, merge as It } from "@univerjs/core";
-import { DataValidationModel as Ge, DataValidatorRegistryService as q, UpdateRuleType as y, BaseDataValidator as G, TextLengthErrorTitleMap as At, AddDataValidationMutation as L, RemoveDataValidationMutation as A, UpdateDataValidationMutation as E, getRuleSetting as Dt, getRuleOptions as bt, UniverDataValidationPlugin as Lt } from "@univerjs/data-validation";
-import { SetRangeValuesMutation as se, RemoveSheetMutation as it, getSheetCommandTarget as Ye, SetRangeValuesUndoMutationFactory as ot, WorksheetViewPermission as xt, RefRangeService as Bt, handleCommonDefaultRangeChangeWithEffectRefCommands as Ut, SheetInterceptorService as st, RemoveSheetCommand as Ht, SheetsSelectionsService as nt, ClearSelectionAllCommand as Wt } from "@univerjs/sheets";
-import { Subject as je, bufferWhen as Pt, filter as Ze } from "rxjs";
-import { RegisterOtherFormulaService as lt, FormulaRefRangeService as ut } from "@univerjs/sheets-formula";
-import { ERROR_TYPE_SET as $t, LexerTreeBuilder as Y, isReferenceString as dt, sequenceNodeType as kt, deserializeRangeWithSheet as jt, deserializeRangeWithSheetWithCache as Qt, operatorToken as qt } from "@univerjs/engine-formula";
-const Gt = "SHEET_DATA_VALIDATION_PLUGIN";
-var Yt = Object.getOwnPropertyDescriptor, Xt = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Yt(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+var vt = Object.defineProperty;
+var Rt = (o, a, e) => a in o ? vt(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e;
+var m = (o, a, e) => Rt(o, typeof a != "symbol" ? a + "" : a, e);
+import { Inject as R, ICommandService as U, IUniverInstanceService as O, Disposable as P, ObjectMatrix as Se, UniverInstanceType as N, Range as b, Rectangle as A, isFormulaString as S, DataValidationType as T, getOriginCellValue as St, RBush as Mt, debounce as Vt, Tools as M, DataValidationStatus as D, WrapStrategy as Re, DataValidationOperator as h, numfmt as j, dayjs as it, DataValidationRenderMode as Be, CommandType as z, IUndoRedoService as Z, sequenceExecute as Ie, isRangesEqual as ot, generateRandomId as yt, toDisposable as qe, IPermissionService as Et, Injector as Ge, CellValueType as Tt, RxDisposable as Ft, LifecycleService as Nt, LifecycleStages as Ze, bufferDebounceTime as Ct, DependentOn as Ot, IConfigService as wt, Plugin as At, merge as It } from "@univerjs/core";
+import { DataValidationModel as Ye, DataValidatorRegistryService as q, UpdateRuleType as y, BaseDataValidator as G, TextLengthErrorTitleMap as Dt, AddDataValidationMutation as L, RemoveDataValidationMutation as I, UpdateDataValidationMutation as E, getRuleSetting as bt, getRuleOptions as Lt, UniverDataValidationPlugin as Ut } from "@univerjs/data-validation";
+import { SetRangeValuesMutation as se, RemoveSheetMutation as st, getSheetCommandTarget as Xe, SetRangeValuesUndoMutationFactory as nt, WorksheetViewPermission as xt, RefRangeService as Bt, handleCommonDefaultRangeChangeWithEffectRefCommands as Ht, SheetInterceptorService as lt, RemoveSheetCommand as Pt, SheetsSelectionsService as ut, ClearSelectionAllCommand as Wt } from "@univerjs/sheets";
+import { Subject as Qe, bufferWhen as $t, filter as Je } from "rxjs";
+import { RegisterOtherFormulaService as dt, FormulaRefRangeService as ct } from "@univerjs/sheets-formula";
+import { ERROR_TYPE_SET as kt, LexerTreeBuilder as Y, isReferenceString as ht, sequenceNodeType as jt, deserializeRangeWithSheet as Qt, deserializeRangeWithSheetWithCache as qt, operatorToken as Gt } from "@univerjs/engine-formula";
+const Yt = "SHEET_DATA_VALIDATION_PLUGIN";
+var Xt = Object.getOwnPropertyDescriptor, Kt = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Xt(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
-}, Je = (o, a) => (e, t) => a(e, t, o);
-let Q = class extends W {
+}, et = (o, a) => (e, t) => a(e, t, o);
+let Q = class extends P {
   constructor(a, e) {
     super();
-    g(this, "_cacheMatrix", /* @__PURE__ */ new Map());
-    g(this, "_dirtyRanges$", new je());
-    g(this, "dirtyRanges$", this._dirtyRanges$.asObservable());
+    m(this, "_cacheMatrix", /* @__PURE__ */ new Map());
+    m(this, "_dirtyRanges$", new Qe());
+    m(this, "dirtyRanges$", this._dirtyRanges$.asObservable());
     this._commandService = a, this._univerInstanceService = e, this._initDirtyRanges(), this._initSheetRemove();
   }
   _initDirtyRanges() {
@@ -36,7 +36,7 @@ let Q = class extends W {
   _initSheetRemove() {
     this.disposeWithMe(this._commandService.onCommandExecuted((a) => {
       var e;
-      if (a.id === it.id) {
+      if (a.id === st.id) {
         const { unitId: t, subUnitId: r } = a.params;
         (e = this._cacheMatrix.get(t)) == null || e.delete(r);
       }
@@ -79,9 +79,9 @@ let Q = class extends W {
     return this._ensureCache(a, e).getValue(t, r);
   }
 };
-Q = Xt([
-  Je(0, v(x)),
-  Je(1, v(w))
+Q = Kt([
+  et(0, R(U)),
+  et(1, R(O))
 ], Q);
 function oe(o) {
   var a, e;
@@ -92,26 +92,26 @@ function _e(o) {
   return (a = o == null ? void 0 : o[0]) == null ? void 0 : a[0];
 }
 function C(o) {
-  return !$t.has(o);
+  return !kt.has(o);
 }
 function de(o, a) {
   var t;
   const e = a.getValidatorItem(o);
   return (t = e == null ? void 0 : e.offsetFormulaByRange) != null ? t : !1;
 }
-var Kt = Object.getOwnPropertyDescriptor, zt = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Kt(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+var zt = Object.getOwnPropertyDescriptor, Zt = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? zt(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, re = (o, a) => (e, t) => a(e, t, o);
-let H = class extends W {
+let H = class extends P {
   constructor(a, e, t, r, i) {
     super();
     /**
      * Map of origin formula of rule
      */
-    g(this, "_ruleFormulaMap", /* @__PURE__ */ new Map());
-    g(this, "_ruleFormulaMap2", /* @__PURE__ */ new Map());
+    m(this, "_ruleFormulaMap", /* @__PURE__ */ new Map());
+    m(this, "_ruleFormulaMap2", /* @__PURE__ */ new Map());
     this._instanceSrv = a, this._registerOtherFormulaService = e, this._dataValidationModel = t, this._dataValidationCacheService = r, this._validatorRegistryService = i, this._initFormulaResultHandler(), this._initDirtyRanges();
   }
   _initFormulaResultHandler() {
@@ -122,8 +122,8 @@ let H = class extends W {
           for (const i in t) {
             const s = t[i], { ruleFormulaMap: n } = this._ensureMaps(e, i);
             s.forEach((l) => {
-              var c, m;
-              const u = n.get((c = l.extra) == null ? void 0 : c.ruleId), d = this._dataValidationModel.getRuleById(e, i, (m = l.extra) == null ? void 0 : m.ruleId);
+              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);
             });
           }
@@ -144,7 +144,7 @@ let H = class extends W {
   _handleDirtyRanges(a, e, t) {
     this._dataValidationModel.getRules(a, e).forEach((i) => {
       const s = i.ranges;
-      I.doAnyRangesIntersect(s, t) && this.makeRuleDirty(a, e, i.uid);
+      A.doAnyRangesIntersect(s, t) && this.makeRuleDirty(a, e, i.uid);
     });
   }
   _initDirtyRanges() {
@@ -193,32 +193,32 @@ let H = class extends W {
     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, m = i - d;
-    return _e((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
+    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]);
   }
   async getCellFormula2Value(a, e, t, r, i) {
     var 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, m = i - d;
-    return _e((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
+    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]);
   }
   getCellFormulaValueSync(a, e, t, r, i) {
     var 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, m = i - d;
-    return _e((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
+    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]);
   }
   getCellFormula2ValueSync(a, e, t, r, i) {
     var 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, m = i - d;
-    return _e((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
+    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]);
   }
   getRuleFormulaInfo(a, e, t) {
     const { ruleFormulaMap: r } = this._ensureMaps(a, e);
@@ -230,22 +230,22 @@ let H = class extends W {
     r && this._registerOtherFormulaService.markFormulaDirty(a, e, r.formulaId), i && this._registerOtherFormulaService.markFormulaDirty(a, e, i.formulaId);
   }
 };
-H = zt([
-  re(0, w),
-  re(1, v(lt)),
-  re(2, v(Ge)),
-  re(3, v(Q)),
-  re(4, v(q))
+H = Zt([
+  re(0, O),
+  re(1, R(dt)),
+  re(2, R(Ye)),
+  re(3, R(Q)),
+  re(4, R(q))
 ], H);
-var Zt = Object.getOwnPropertyDescriptor, Jt = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Zt(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+var Jt = Object.getOwnPropertyDescriptor, ea = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Jt(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, ie = (o, a) => (e, t) => a(e, t, o);
-let K = class extends W {
+let K = class extends P {
   constructor(a, e, t, r, i) {
     super();
-    g(this, "_formulaRuleMap", /* @__PURE__ */ new Map());
+    m(this, "_formulaRuleMap", /* @__PURE__ */ new Map());
     this._instanceService = a, this._registerOtherFormulaService = e, this._dataValidationCacheService = t, this._dataValidationModel = r, this._validatorRegistryService = i, this._initFormulaResultHandler();
   }
   _initFormulaResultHandler() {
@@ -322,26 +322,26 @@ let K = class extends W {
     return this._ensureRuleFormulaMap(a, e).get(t);
   }
 };
-K = Jt([
-  ie(0, w),
-  ie(1, v(lt)),
-  ie(2, v(Q)),
-  ie(3, v(Ge)),
-  ie(4, v(q))
+K = ea([
+  ie(0, O),
+  ie(1, R(dt)),
+  ie(2, R(Q)),
+  ie(3, R(Ye)),
+  ie(4, R(q))
 ], K);
 function ne(o) {
-  return vt(o);
+  return St(o);
 }
-function ct(o) {
+function mt(o) {
   var a;
   return String((a = ne(o)) != null ? a : "");
 }
-class Xe {
+class Ke {
   constructor(a, e, t, r, i = !1) {
-    g(this, "_map");
-    g(this, "_tree", new St());
-    g(this, "_dirty", !0);
-    g(this, "_buildTree", () => {
+    m(this, "_map");
+    m(this, "_tree", new Mt());
+    m(this, "_dirty", !0);
+    m(this, "_buildTree", () => {
       if (!this._dirty || this._disableTree)
         return;
       this._tree.clear();
@@ -358,7 +358,7 @@ class Xe {
         });
       }), this._tree.load(a), this._dirty = !1;
     });
-    g(this, "_debonceBuildTree", Vt(this._buildTree, 0));
+    m(this, "_debonceBuildTree", Vt(this._buildTree, 0));
     this._unitId = e, this._subUnitId = t, this._univerInstanceService = r, this._disableTree = i, this._map = a, this._buildTree();
   }
   get _worksheet() {
@@ -368,9 +368,9 @@ class Xe {
   _addRule(a, e) {
     if (!this._worksheet)
       return;
-    const t = I.mergeRanges(e.map((r) => b.transformRange(r, this._worksheet)));
+    const t = A.mergeRanges(e.map((r) => b.transformRange(r, this._worksheet)));
     this._map.forEach((r, i) => {
-      const s = I.subtractMulti(r, t);
+      const s = A.subtractMulti(r, t);
       s.length === 0 ? this._map.delete(i) : this._map.set(i, s);
     }), this._dirty = !0, this._map.set(a, t), this._debonceBuildTree();
   }
@@ -382,7 +382,7 @@ class Xe {
       return;
     const e = a.map((t) => b.transformRange(t, this._worksheet));
     this._map.forEach((t, r) => {
-      const i = I.subtractMulti(t, e);
+      const i = A.subtractMulti(t, e);
       i.length === 0 ? this._map.delete(r) : this._map.set(r, i);
     }), this._dirty = !0, this._debonceBuildTree();
   }
@@ -400,10 +400,10 @@ class Xe {
       if (!t.length)
         return;
       let r = this._map.get(e);
-      r ? (this._map.set(e, I.mergeRanges([...r, ...t])), r = this._map.get(e)) : (r = t, this._map.set(e, r)), this._map.forEach((i, s) => {
+      r ? (this._map.set(e, A.mergeRanges([...r, ...t])), r = this._map.get(e)) : (r = t, this._map.set(e, r)), this._map.forEach((i, s) => {
         if (s === e)
           return;
-        const n = I.subtractMulti(i, t);
+        const n = A.subtractMulti(i, t);
         n.length === 0 ? this._map.delete(s) : this._map.set(s, n);
       });
     }), this._dirty = !0, this._debonceBuildTree();
@@ -414,11 +414,11 @@ class Xe {
     return a.forEach((r, i) => {
       var l;
       const s = (l = this._map.get(r.uid)) != null ? l : [], n = r.ranges;
-      s.length !== 0 && (s.length !== n.length || s.some((u, d) => !I.equals(u, n[d]))) && e.push({
+      s.length !== 0 && (s.length !== n.length || s.some((u, d) => !A.equals(u, n[d]))) && e.push({
         type: "update",
         ruleId: r.uid,
         oldRanges: n,
-        newRanges: I.sort(s),
+        newRanges: A.sort(s),
         rule: r
       }), s.length === 0 && (e.push({
         type: "delete",
@@ -433,11 +433,11 @@ class Xe {
     return a.forEach((i, s) => {
       var u;
       const n = (u = this._map.get(i.uid)) != null ? u : [], l = i.ranges;
-      n.length !== 0 && (n.length !== l.length || n.some((d, c) => !I.equals(d, l[c]))) && t.push({
+      n.length !== 0 && (n.length !== l.length || n.some((d, c) => !A.equals(d, l[c]))) && t.push({
         type: "update",
         ruleId: i.uid,
         oldRanges: l,
-        newRanges: I.sort(n),
+        newRanges: A.sort(n),
         rule: i
       }), n.length === 0 && (t.push({
         type: "delete",
@@ -451,14 +451,14 @@ class Xe {
         type: "add",
         rule: {
           ...i,
-          ranges: I.sort(s)
+          ranges: A.sort(s)
         }
       });
     }), t;
   }
   clone() {
-    return new Xe(
-      new Map(V.deepClone(Array.from(this._map.entries()))),
+    return new Ke(
+      new Map(M.deepClone(Array.from(this._map.entries()))),
       this._unitId,
       this._subUnitId,
       this._univerInstanceService,
@@ -477,19 +477,19 @@ class Xe {
     return t.length > 0 ? t[0].ruleId : void 0;
   }
 }
-var ea = Object.getOwnPropertyDescriptor, ta = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? ea(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+var ta = Object.getOwnPropertyDescriptor, aa = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? ta(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, X = (o, a) => (e, t) => a(e, t, o);
-let F = class extends W {
+let F = class extends P {
   constructor(a, e, t, r, i, s, n) {
     super();
-    g(this, "_ruleMatrixMap", /* @__PURE__ */ new Map());
-    g(this, "_validStatusChange$", new je());
-    g(this, "_ruleChange$", new je());
-    g(this, "ruleChange$", this._ruleChange$.asObservable());
-    g(this, "validStatusChange$", this._validStatusChange$.asObservable());
+    m(this, "_ruleMatrixMap", /* @__PURE__ */ new Map());
+    m(this, "_validStatusChange$", new Qe());
+    m(this, "_ruleChange$", new Qe());
+    m(this, "ruleChange$", this._ruleChange$.asObservable());
+    m(this, "validStatusChange$", this._validStatusChange$.asObservable());
     this._dataValidationModel = a, this._univerInstanceService = e, this._dataValidatorRegistryService = t, this._dataValidationCacheService = r, this._dataValidationFormulaService = i, this._dataValidationCustomFormulaService = s, this._commandService = n, this._initRuleUpdateListener(), this.disposeWithMe(() => {
       this._ruleChange$.complete(), this._validStatusChange$.complete();
     }), this._initUniverInstanceListener();
@@ -501,7 +501,7 @@ let F = class extends W {
       })
     ), this.disposeWithMe(
       this._commandService.onCommandExecuted((a) => {
-        if (a.id === it.id) {
+        if (a.id === st.id) {
           const { unitId: e, subUnitId: t } = a.params, r = this._ruleMatrixMap.get(e);
           r && r.delete(t);
         }
@@ -541,7 +541,7 @@ let F = class extends W {
     let t = this._ruleMatrixMap.get(a);
     t || (t = /* @__PURE__ */ new Map(), this._ruleMatrixMap.set(a, t));
     let r = t.get(e);
-    return r || (r = new Xe(/* @__PURE__ */ new Map(), a, e, this._univerInstanceService), t.set(e, r)), r;
+    return r || (r = new Ke(/* @__PURE__ */ new Map(), a, e, this._univerInstanceService), t.set(e, r)), r;
   }
   _addRuleSideEffect(a, e, t) {
     this._ensureRuleMatrix(a, e).addRule(t), this._dataValidationCacheService.addRule(a, e, t), this._dataValidationFormulaService.addRule(a, e, t), this._dataValidationCustomFormulaService.addRule(a, e, t);
@@ -573,8 +573,8 @@ 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 = (_, v) => {
+      t && t(_, v), v && this._validStatusChange$.next({
         unitId: s,
         subUnitId: n,
         ruleId: a.uid,
@@ -582,10 +582,10 @@ let F = class extends W {
         row: i,
         col: r
       });
-    }, d = l.getCellValueOnly(i, r), c = this.getValidator(a.type), m = l.getCellRaw(i, r), p = ne(m);
+    }, d = l.getCellValueOnly(i, r), c = this.getValidator(a.type), g = l.getCellRaw(i, r), p = ne(g);
     if (c) {
-      const _ = this._dataValidationCacheService.ensureCache(s, n), R = _.getValue(i, r);
-      return R == null ? (_.setValue(i, r, D.VALIDATING), c.validator(
+      const _ = this._dataValidationCacheService.ensureCache(s, n), v = _.getValue(i, r);
+      return v == null ? (_.setValue(i, r, D.VALIDATING), c.validator(
         {
           value: p,
           unitId: s,
@@ -595,13 +595,13 @@ let F = class extends W {
           worksheet: e.worksheet,
           workbook: e.workbook,
           interceptValue: ne(d),
-          t: m == null ? void 0 : m.t
+          t: g == null ? void 0 : g.t
         },
         a
-      ).then((M) => {
-        const f = M ? D.VALID : D.INVALID, O = _.getValue(i, r);
-        f === D.VALID ? _.realDeleteValue(i, r) : _.setValue(i, r, f), u(f, R !== O);
-      }), D.VALIDATING) : (u(R != null ? R : D.VALID, !1), R != null ? R : D.VALID);
+      ).then((V) => {
+        const f = V ? D.VALID : D.INVALID, w = _.getValue(i, r);
+        f === D.VALID ? _.realDeleteValue(i, r) : _.setValue(i, r, f), u(f, v !== w);
+      }), D.VALIDATING) : (u(v != null ? v : D.VALID, !1), v != null ? v : D.VALID);
     } else
       return u(D.VALID, !1), D.VALID;
   }
@@ -630,37 +630,38 @@ let F = class extends W {
     return this._dataValidationModel.getAll();
   }
 };
-F = ta([
-  X(0, v(Ge)),
-  X(1, w),
-  X(2, v(q)),
-  X(3, v(Q)),
-  X(4, v(K)),
-  X(5, v(H)),
-  X(6, x)
+F = aa([
+  X(0, R(Ye)),
+  X(1, O),
+  X(2, R(q)),
+  X(3, R(Q)),
+  X(4, R(K)),
+  X(5, R(H)),
+  X(6, U)
 ], F);
-const Ve = 1, Me = 0;
-function et(o, a) {
-  return V.isBlank(o) ? a.t("dataValidation.validFail.value") : S(o) ? a.t("dataValidation.validFail.primitive") : "";
+const Me = 1, Ve = 0;
+function tt(o, a) {
+  return M.isBlank(o) ? a.t("dataValidation.validFail.value") : S(o) ? a.t("dataValidation.validFail.primitive") : "";
 }
-const pe = (o) => V.isDefine(o) && String(o).toLowerCase() === "true" ? "1" : String(o).toLowerCase() === "false" ? "0" : o;
-class aa extends G {
+const pe = (o) => M.isDefine(o) && String(o).toLowerCase() === "true" ? "1" : String(o).toLowerCase() === "false" ? "0" : o;
+class ra extends G {
   constructor() {
     super(...arguments);
-    g(this, "id", T.CHECKBOX);
-    g(this, "title", "dataValidation.checkbox.title");
-    g(this, "operators", []);
-    g(this, "scopes", ["sheet"]);
-    g(this, "offsetFormulaByRange", !1);
-    g(this, "_formulaService", this.injector.get(K));
-    g(this, "skipDefaultFontRender", (e, t, r) => {
+    m(this, "id", T.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(K));
+    m(this, "skipDefaultFontRender", (e, t, r) => {
       const { unitId: i, subUnitId: s } = r, { formula1: n, formula2: l } = this.parseFormulaSync(e, i, s), u = `${t != null ? t : ""}`;
       return !u || u === `${n}` || u === `${l}`;
     });
   }
   validatorFormula(e, t, r) {
     const { formula1: i, formula2: s } = e, n = i === s;
-    if (V.isBlank(i) && V.isBlank(s))
+    if (M.isBlank(i) && M.isBlank(s))
       return {
         success: !0
       };
@@ -670,7 +671,7 @@ class aa extends G {
         formula1: this.localeService.t("dataValidation.validFail.checkboxEqual"),
         formula2: this.localeService.t("dataValidation.validFail.checkboxEqual")
       };
-    const l = et(i, this.localeService), u = et(s, this.localeService);
+    const l = tt(i, this.localeService), u = tt(s, this.localeService);
     return {
       success: !l && !u,
       formula1: l,
@@ -678,8 +679,8 @@ class aa extends G {
     };
   }
   async parseFormula(e, t, r) {
-    var c, m, p, _;
-    const { formula1: i = Ve, formula2: s = Me } = e, n = await this._formulaService.getRuleFormulaResult(t, r, e.uid), l = S(i) ? oe((m = (c = n == null ? void 0 : n[0]) == null ? void 0 : c.result) == null ? void 0 : m[0][0]) : i, u = S(s) ? oe((_ = (p = n == null ? void 0 : n[1]) == null ? void 0 : p.result) == null ? void 0 : _[0][0]) : s, d = C(String(l)) && C(String(u));
+    var c, g, p, _;
+    const { formula1: i = Me, formula2: s = Ve } = e, n = await this._formulaService.getRuleFormulaResult(t, r, e.uid), l = S(i) ? oe((g = (c = n == null ? void 0 : n[0]) == null ? void 0 : c.result) == null ? void 0 : g[0][0]) : i, u = S(s) ? oe((_ = (p = n == null ? void 0 : n[1]) == null ? void 0 : p.result) == null ? void 0 : _[0][0]) : s, d = C(String(l)) && C(String(u));
     return {
       formula1: pe(l),
       formula2: pe(u),
@@ -690,12 +691,12 @@ class aa extends G {
   }
   getExtraStyle(e, t) {
     return {
-      tb: ve.CLIP
+      tb: Re.CLIP
     };
   }
   parseFormulaSync(e, t, r) {
-    var c, m, p, _;
-    const { formula1: i = Ve, formula2: s = Me } = e, n = this._formulaService.getRuleFormulaResultSync(t, r, e.uid), l = S(i) ? oe((m = (c = n == null ? void 0 : n[0]) == null ? void 0 : c.result) == null ? void 0 : m[0][0]) : i, u = S(s) ? oe((_ = (p = n == null ? void 0 : n[1]) == null ? void 0 : p.result) == null ? void 0 : _[0][0]) : s, d = C(String(l)) && C(String(u));
+    var c, g, p, _;
+    const { formula1: i = Me, formula2: s = Ve } = e, n = this._formulaService.getRuleFormulaResultSync(t, r, e.uid), l = S(i) ? oe((g = (c = n == null ? void 0 : n[0]) == null ? void 0 : c.result) == null ? void 0 : g[0][0]) : i, u = S(s) ? oe((_ = (p = n == null ? void 0 : n[1]) == null ? void 0 : p.result) == null ? void 0 : _[0][0]) : s, d = C(String(l)) && C(String(u));
     return {
       formula1: pe(l),
       formula2: pe(u),
@@ -706,13 +707,16 @@ class aa extends G {
   }
   async isValidType(e, t, r) {
     const { value: i, unitId: s, subUnitId: n } = e, { formula1: l, formula2: u, originFormula1: d, originFormula2: c } = await this.parseFormula(r, s, n);
-    return !V.isDefine(l) || !V.isDefine(u) ? !0 : V.isDefine(i) && (String(i) === String(l) || String(i) === String(u) || String(i) === String(d != null ? d : "") || String(i) === String(c != null ? c : ""));
+    return !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 : ""));
   }
   generateRuleErrorMessage(e) {
     return this.localeService.t("dataValidation.checkbox.error");
   }
+  generateRuleName(e) {
+    return this.titleStr;
+  }
 }
-const ra = {
+const ia = {
   [h.BETWEEN]: "dataValidation.date.operators.between",
   [h.EQUAL]: "dataValidation.date.operators.equal",
   [h.GREATER_THAN]: "dataValidation.date.operators.greaterThan",
@@ -723,7 +727,7 @@ const ra = {
   [h.NOT_EQUAL]: "dataValidation.date.operators.notEqual"
 };
 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 ia = {
+const at = {
   [h.BETWEEN]: "dataValidation.date.ruleName.between",
   [h.EQUAL]: "dataValidation.date.ruleName.equal",
   [h.GREATER_THAN]: "dataValidation.date.ruleName.greaterThan",
@@ -731,7 +735,8 @@ const ia = {
   [h.LESS_THAN]: "dataValidation.date.ruleName.lessThan",
   [h.LESS_THAN_OR_EQUAL]: "dataValidation.date.ruleName.lessThanOrEqual",
   [h.NOT_BETWEEN]: "dataValidation.date.ruleName.notBetween",
-  [h.NOT_EQUAL]: "dataValidation.date.ruleName.notEqual"
+  [h.NOT_EQUAL]: "dataValidation.date.ruleName.notEqual",
+  NONE: "dataValidation.date.ruleName.legal"
 }, oa = {
   [h.BETWEEN]: "dataValidation.date.errorMsg.between",
   [h.EQUAL]: "dataValidation.date.errorMsg.equal",
@@ -740,8 +745,9 @@ const ia = {
   [h.LESS_THAN]: "dataValidation.date.errorMsg.lessThan",
   [h.LESS_THAN_OR_EQUAL]: "dataValidation.date.errorMsg.lessThanOrEqual",
   [h.NOT_BETWEEN]: "dataValidation.date.errorMsg.notBetween",
-  [h.NOT_EQUAL]: "dataValidation.date.errorMsg.notEqual"
-}, Ae = [
+  [h.NOT_EQUAL]: "dataValidation.date.errorMsg.notEqual",
+  NONE: "dataValidation.date.errorMsg.legal"
+}, De = [
   h.BETWEEN,
   h.NOT_BETWEEN
 ], le = "{FORMULA1}", ue = "{FORMULA2}";
@@ -755,28 +761,29 @@ function Xa(o) {
   const a = ne(o);
   return a == null ? "" : a.toString();
 }
-function De(o, a, e) {
+function be(o, a, e) {
   const { formula1: t, formula2: r } = a, i = a.ranges[0].startRow, s = a.ranges[0].startColumn, n = e.row - i, l = e.col - s, u = S(t) ? o.moveFormulaRefOffset(t, l, n, !0) : t, d = S(r) ? o.moveFormulaRefOffset(r, l, n, !0) : r;
   return {
     transformedFormula1: u,
     transformedFormula2: d
   };
 }
-const Ue = (o) => {
+const He = (o) => {
   var e, t;
   if (o == null || typeof o == "boolean")
     return;
   if (typeof o == "number" || !Number.isNaN(+o))
     return +o;
   const a = (e = j.parseDate(o)) == null ? void 0 : e.v;
-  return V.isDefine(a) ? a : (t = j.parseDate(at(o).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : t.v;
+  return M.isDefine(a) ? a : (t = j.parseDate(it(o).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : t.v;
 };
 class sa extends G {
   constructor() {
     super(...arguments);
-    g(this, "id", T.DATE);
-    g(this, "title", "dataValidation.date.title");
-    g(this, "operators", [
+    m(this, "id", T.DATE);
+    m(this, "title", "dataValidation.date.title");
+    m(this, "order", 40);
+    m(this, "operators", [
       h.BETWEEN,
       h.EQUAL,
       h.GREATER_THAN,
@@ -786,15 +793,15 @@ class sa extends G {
       h.NOT_BETWEEN,
       h.NOT_EQUAL
     ]);
-    g(this, "scopes", ["sheet"]);
-    g(this, "_customFormulaService", this.injector.get(H));
-    g(this, "_lexerTreeBuilder", this.injector.get(Y));
+    m(this, "scopes", ["sheet"]);
+    m(this, "_customFormulaService", this.injector.get(H));
+    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 = C(String(n == null ? void 0 : n.v)) && C(String(l == null ? void 0 : l.v));
     return {
-      formula1: Ue(S(u) ? n == null ? void 0 : n.v : u),
-      formula2: Ue(S(d) ? l == null ? void 0 : l.v : d),
+      formula1: He(S(u) ? n == null ? void 0 : n.v : u),
+      formula2: He(S(d) ? l == null ? void 0 : l.v : d),
       isFormulaValid: c
     };
   }
@@ -803,16 +810,16 @@ class sa extends G {
     return typeof r == "number" && typeof t == "string" ? !0 : typeof t == "string" ? !!j.parseDate(t) : !1;
   }
   _validatorSingleFormula(e) {
-    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e) || !!(e && j.parseDate(e)));
+    return !M.isBlank(e) && (S(e) || !Number.isNaN(+e) || !!(e && j.parseDate(e)));
   }
   validatorFormula(e, t, r) {
     const i = e.operator;
     if (!i)
       return {
-        success: !1
+        success: !0
       };
     const s = this._validatorSingleFormula(e.formula1), n = this.localeService.t("dataValidation.validFail.date");
-    if (Ae.includes(i)) {
+    if (De.includes(i)) {
       const u = this._validatorSingleFormula(e.formula2);
       return {
         success: s && u,
@@ -834,12 +841,12 @@ class sa extends G {
       if (!Number.isNaN(+u))
         d = j.dateFromSerial(+u);
       else {
-        const m = (c = j.parseDate(u)) == null ? void 0 : c.v;
-        if (m == null)
+        const g = (c = j.parseDate(u)) == null ? void 0 : c.v;
+        if (g == null)
           return "";
-        d = j.dateFromSerial(m);
+        d = j.dateFromSerial(g);
       }
-      return at(`${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 it(`${d[0]}/${d[1]}/${d[2]} ${d[3]}:${d[4]}:${d[5]}`).format(n != null && n.showTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD");
     };
     return {
       formula1: S(i) ? i : l(`${i}`),
@@ -850,29 +857,29 @@ class sa extends G {
     const { value: i } = e;
     return {
       ...e,
-      value: Ue(i)
+      value: He(i)
     };
   }
   get operatorNames() {
-    return this.operators.map((e) => this.localeService.t(ra[e]));
+    return this.operators.map((e) => this.localeService.t(ia[e]));
   }
   generateRuleName(e) {
     var r, i;
     if (!e.operator)
-      return this.titleStr;
-    const t = this.localeService.t(ia[e.operator]).replace(le, (r = e.formula1) != null ? r : "").replace(ue, (i = e.formula2) != null ? i : "");
+      return this.localeService.t(at.NONE);
+    const t = this.localeService.t(at[e.operator]).replace(le, (r = e.formula1) != null ? r : "").replace(ue, (i = e.formula2) != null ? i : "");
     return `${this.titleStr} ${t}`;
   }
   generateRuleErrorMessage(e, t) {
     if (!e.operator)
       return this.titleStr;
-    const { transformedFormula1: r, transformedFormula2: i } = De(this._lexerTreeBuilder, e, t);
+    const { transformedFormula1: r, transformedFormula2: i } = be(this._lexerTreeBuilder, e, t);
     return `${this.localeService.t(oa[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
   }
 }
 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 ht = {
+const ye = {
   [h.BETWEEN]: "dataValidation.errorMsg.between",
   [h.EQUAL]: "dataValidation.errorMsg.equal",
   [h.GREATER_THAN]: "dataValidation.errorMsg.greaterThan",
@@ -880,20 +887,22 @@ const ht = {
   [h.LESS_THAN]: "dataValidation.errorMsg.lessThan",
   [h.LESS_THAN_OR_EQUAL]: "dataValidation.errorMsg.lessThanOrEqual",
   [h.NOT_BETWEEN]: "dataValidation.errorMsg.notBetween",
-  [h.NOT_EQUAL]: "dataValidation.errorMsg.notEqual"
+  [h.NOT_EQUAL]: "dataValidation.errorMsg.notEqual",
+  NONE: "dataValidation.errorMsg.legal"
 };
-function ye(o) {
+function Ee(o) {
   let a = o;
   return typeof o == "string" ? ((o.startsWith("¥") || o.startsWith("$")) && (a = o.slice(1)), +a) : +o;
 }
 class na extends G {
   constructor() {
     super(...arguments);
-    g(this, "_customFormulaService", this.injector.get(H));
-    g(this, "id", T.DECIMAL);
-    g(this, "_lexerTreeBuilder", this.injector.get(Y));
-    g(this, "title", "dataValidation.decimal.title");
-    g(this, "operators", [
+    m(this, "_customFormulaService", this.injector.get(H));
+    m(this, "id", T.DECIMAL);
+    m(this, "_lexerTreeBuilder", this.injector.get(Y));
+    m(this, "title", "dataValidation.decimal.title");
+    m(this, "order", 20);
+    m(this, "operators", [
       h.BETWEEN,
       h.EQUAL,
       h.GREATER_THAN,
@@ -903,20 +912,20 @@ class na extends G {
       h.NOT_BETWEEN,
       h.NOT_EQUAL
     ]);
-    g(this, "scopes", ["sheet"]);
+    m(this, "scopes", ["sheet"]);
   }
   _isFormulaOrNumber(e) {
-    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e));
+    return !M.isBlank(e) && (S(e) || !Number.isNaN(+e));
   }
   async isValidType(e, t, r) {
     const { value: i } = e;
-    return !Number.isNaN(ye(i));
+    return !Number.isNaN(Ee(i));
   }
   transform(e, t, r) {
     const { value: i } = e;
     return {
       ...e,
-      value: ye(i)
+      value: Ee(i)
     };
   }
   _parseNumber(e) {
@@ -934,9 +943,9 @@ class na extends G {
     const i = e.operator;
     if (!i)
       return {
-        success: !1
+        success: !0
       };
-    const s = V.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), l = Ae.includes(i), u = this.localeService.t("dataValidation.validFail.number");
+    const s = M.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), n = M.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), l = De.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: s && n,
       formula1: s ? void 0 : u,
@@ -948,12 +957,12 @@ class na extends G {
   }
   generateRuleErrorMessage(e, t) {
     if (!e.operator)
-      return this.titleStr;
-    const { transformedFormula1: r, transformedFormula2: i } = De(this._lexerTreeBuilder, e, t);
-    return `${this.localeService.t(ht[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
+      return this.localeService.t(ye.NONE).replace("{TYPE}", this.titleStr);
+    const { transformedFormula1: r, transformedFormula2: i } = be(this._lexerTreeBuilder, e, t);
+    return `${this.localeService.t(ye[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
   }
 }
-function He(o) {
+function Pe(o) {
   if (!o)
     return [];
   const a = /* @__PURE__ */ new Set();
@@ -980,36 +989,37 @@ const la = [
   "offset"
 ];
 function ua(o, a) {
-  if (!S(o) || dt(o.slice(1)))
+  if (!S(o) || ht(o.slice(1)))
     return !0;
   const t = a.sequenceNodesBuilder(o);
-  return t && t.some((r) => typeof r == "object" && r.nodeType === kt.FUNCTION && la.indexOf(r.token.toLowerCase()) > -1);
+  return t && t.some((r) => typeof r == "object" && r.nodeType === jt.FUNCTION && la.indexOf(r.token.toLowerCase()) > -1);
 }
 function da(o, a) {
   const { formula1: e = "", ranges: t } = o;
-  if (dt(e.slice(1))) {
-    const i = jt(e.slice(1));
-    if ((!i.sheetName || i.sheetName === a) && t.some((s) => I.intersects(s, i.range)))
+  if (ht(e.slice(1))) {
+    const i = Qt(e.slice(1));
+    if ((!i.sheetName || i.sheetName === a) && t.some((s) => A.intersects(s, i.range)))
       return !0;
   }
   return !1;
 }
-class mt extends G {
+class gt extends G {
   constructor() {
     super(...arguments);
-    g(this, "formulaService", this.injector.get(K));
-    g(this, "_lexer", this.injector.get(Y));
-    g(this, "_univerInstanceService", this.injector.get(w));
-    g(this, "offsetFormulaByRange", !1);
-    g(this, "id", T.LIST);
-    g(this, "title", "dataValidation.list.title");
-    g(this, "operators", []);
-    g(this, "scopes", ["sheet"]);
-    g(this, "skipDefaultFontRender", (e) => e.renderMode !== Be.TEXT);
+    m(this, "formulaService", this.injector.get(K));
+    m(this, "_lexer", this.injector.get(Y));
+    m(this, "_univerInstanceService", this.injector.get(O));
+    m(this, "order", 50);
+    m(this, "offsetFormulaByRange", !1);
+    m(this, "id", T.LIST);
+    m(this, "title", "dataValidation.list.title");
+    m(this, "operators", []);
+    m(this, "scopes", ["sheet"]);
+    m(this, "skipDefaultFontRender", (e) => e.renderMode !== Be.TEXT);
   }
   validatorFormula(e, t, r) {
     var u, d, c;
-    const i = !V.isBlank(e.formula1), s = ua((u = e.formula1) != null ? u : "", this._lexer), n = (c = (d = this._univerInstanceService.getUnit(t, N.UNIVER_SHEET)) == null ? void 0 : d.getSheetBySheetId(r)) == null ? void 0 : c.getName(), l = da(e, n != null ? n : "");
+    const i = !M.isBlank(e.formula1), s = ua((u = e.formula1) != null ? u : "", this._lexer), n = (c = (d = this._univerInstanceService.getUnit(t, N.UNIVER_SHEET)) == null ? void 0 : d.getSheetBySheetId(r)) == null ? void 0 : c.getName(), l = da(e, n != null ? n : "");
     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")
@@ -1017,7 +1027,7 @@ class mt extends G {
   }
   getExtraStyle(e, t, { style: r }) {
     var s;
-    const i = (s = r.tb !== ve.OVERFLOW ? r.tb : ve.CLIP) != null ? s : ve.WRAP;
+    const i = (s = r.tb !== Re.OVERFLOW ? r.tb : Re.CLIP) != null ? s : Re.WRAP;
     if (e.type === T.LIST && (e.renderMode === Be.ARROW || e.renderMode === Be.TEXT)) {
       const n = this.getListWithColorMap(e), l = `${t != null ? t : ""}`, u = n[l];
       if (u)
@@ -1046,8 +1056,8 @@ class mt extends G {
     };
   }
   async isValidType(e, t, r) {
-    var m, p;
-    const { value: i, unitId: s, subUnitId: n } = e, { formula1: l = "" } = r, u = await this.formulaService.getRuleFormulaResult(s, n, r.uid), d = S(l) ? He((p = (m = u == null ? void 0 : u[0]) == null ? void 0 : m.result) == null ? void 0 : p[0][0]) : fe(l);
+    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) ? Pe((p = (g = u == null ? void 0 : u[0]) == null ? void 0 : g.result) == null ? void 0 : p[0][0]) : fe(l);
     return this.parseCellValue(i).every((_) => d.includes(_));
   }
   generateRuleName() {
@@ -1057,22 +1067,22 @@ class mt extends G {
     return this.localeService.t("dataValidation.list.error");
   }
   getList(e, t, r) {
-    var m, p, _, R;
-    const { formula1: i = "" } = e, s = this.injector.get(w), n = (m = t ? s.getUniverSheetInstance(t) : void 0) != null ? m : s.getCurrentUnitForType(N.UNIVER_SHEET);
+    var g, p, _, v;
+    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();
     if (!l) return [];
     const u = n.getUnitId(), d = l.getSheetId(), c = this.formulaService.getRuleFormulaResultSync(u, d, e.uid);
-    return S(i) ? He((R = (_ = c == null ? void 0 : c[0]) == null ? void 0 : _.result) == null ? void 0 : R[0][0]) : fe(i);
+    return S(i) ? Pe((v = (_ = c == null ? void 0 : c[0]) == null ? void 0 : _.result) == null ? void 0 : v[0][0]) : fe(i);
   }
   async getListAsync(e, t, r) {
-    var m, p, _, R;
-    const { formula1: i = "" } = e, s = this.injector.get(w), n = (m = t ? s.getUniverSheetInstance(t) : void 0) != null ? m : s.getCurrentUnitForType(N.UNIVER_SHEET);
+    var g, p, _, v;
+    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();
     if (!l) return [];
     const u = n.getUnitId(), d = l.getSheetId(), c = await this.formulaService.getRuleFormulaResult(u, d, e.uid);
-    return S(i) ? He((R = (_ = c == null ? void 0 : c[0]) == null ? void 0 : _.result) == null ? void 0 : R[0][0]) : fe(i);
+    return S(i) ? Pe((v = (_ = c == null ? void 0 : c[0]) == null ? void 0 : _.result) == null ? void 0 : v[0][0]) : fe(i);
   }
   getListWithColor(e, t, r) {
     const i = this.getList(e, t, r), s = (e.formula2 || "").split(",");
@@ -1088,10 +1098,11 @@ class mt extends G {
 class ca extends G {
   constructor() {
     super(...arguments);
-    g(this, "id", T.TEXT_LENGTH);
-    g(this, "title", "dataValidation.textLength.title");
-    g(this, "_lexerTreeBuilder", this.injector.get(Y));
-    g(this, "operators", [
+    m(this, "id", T.TEXT_LENGTH);
+    m(this, "title", "dataValidation.textLength.title");
+    m(this, "_lexerTreeBuilder", this.injector.get(Y));
+    m(this, "order", 30);
+    m(this, "operators", [
       h.BETWEEN,
       h.EQUAL,
       h.GREATER_THAN,
@@ -1101,11 +1112,11 @@ class ca extends G {
       h.NOT_BETWEEN,
       h.NOT_EQUAL
     ]);
-    g(this, "scopes", ["sheet"]);
-    g(this, "_customFormulaService", this.injector.get(H));
+    m(this, "scopes", ["sheet"]);
+    m(this, "_customFormulaService", this.injector.get(H));
   }
   _isFormulaOrInt(e) {
-    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+    return !M.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
   }
   validatorFormula(e, t, r) {
     const i = e.operator;
@@ -1113,7 +1124,7 @@ class ca extends G {
       return {
         success: !1
       };
-    const s = V.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Ae.includes(i), u = this.localeService.t("dataValidation.validFail.number");
+    const s = M.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = M.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = De.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: s && n,
       formula1: s ? void 0 : u,
@@ -1147,29 +1158,29 @@ class ca extends G {
   generateRuleErrorMessage(e, t) {
     if (!e.operator)
       return this.titleStr;
-    const { transformedFormula1: r, transformedFormula2: i } = De(this._lexerTreeBuilder, e, t);
-    return `${this.localeService.t(At[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
+    const { transformedFormula1: r, transformedFormula2: i } = be(this._lexerTreeBuilder, e, t);
+    return `${this.localeService.t(Dt[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
   }
 }
-function gt(o) {
+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() : V.isBlank(o.v) : !0;
+  return o ? o.p ? !((t = (e = o.p.body) == null ? void 0 : e.dataStream) != null ? t : "").slice(0, -2).trim() : M.isBlank(o.v) : !0;
 }
-function be(o, a, e, t, r = "command", i = !0) {
-  const s = t.get(Y), n = t.get(q), l = [], u = [], d = t.get(F), c = t.get(w), m = Ye(c, { unitId: o, subUnitId: a });
-  if (!m)
+function Le(o, a, e, t, r = "command", i = !0) {
+  const s = t.get(Y), n = t.get(q), l = [], u = [], d = t.get(F), c = t.get(O), g = Xe(c, { unitId: o, subUnitId: a });
+  if (!g)
     return {
       redoMutations: l,
       undoMutations: u
     };
-  const { worksheet: p } = m, _ = new Se();
-  let R = !1;
-  function M(f, O) {
-    i && f.forEach((P) => {
-      b.foreach(P, (B, $) => {
-        const U = p.getCellRaw(B, $), J = ct(U);
-        (gt(U) || J === O) && !(U != null && U.p) && (R = !0, _.setValue(B, $, {
-          v: O,
+  const { worksheet: p } = g, _ = new Se();
+  let v = !1;
+  function V(f, w) {
+    i && f.forEach((W) => {
+      b.foreach(W, (x, $) => {
+        const B = p.getCellRaw(x, $), J = mt(B);
+        (_t(B) || J === w) && !(B != null && B.p) && (v = !0, _.setValue(x, $, {
+          v: w,
           p: null
         }));
       });
@@ -1179,7 +1190,7 @@ function be(o, a, e, t, r = "command", i = !0) {
     switch (f.type) {
       case "delete":
         l.push({
-          id: A.id,
+          id: I.id,
           params: {
             unitId: o,
             subUnitId: a,
@@ -1199,8 +1210,8 @@ function be(o, a, e, t, r = "command", i = !0) {
         break;
       case "update": {
         if (de(f.rule.type, n)) {
-          const P = f.oldRanges[0].startRow, B = f.oldRanges[0].startColumn, $ = f.newRanges[0].startRow, U = f.newRanges[0].startColumn, J = $ - P, ce = U - B, he = S(f.rule.formula1) ? s.moveFormulaRefOffset(f.rule.formula1, ce, J) : f.rule.formula1, me = S(f.rule.formula2) ? s.moveFormulaRefOffset(f.rule.formula2, ce, J) : f.rule.formula2;
-          he !== f.rule.formula1 || me !== f.rule.formula2 || !rt(f.newRanges, f.oldRanges) ? (l.push({
+          const W = f.oldRanges[0].startRow, x = f.oldRanges[0].startColumn, $ = f.newRanges[0].startRow, B = f.newRanges[0].startColumn, J = $ - W, ce = B - x, he = S(f.rule.formula1) ? s.moveFormulaRefOffset(f.rule.formula1, ce, J) : f.rule.formula1, me = S(f.rule.formula2) ? s.moveFormulaRefOffset(f.rule.formula2, ce, J) : f.rule.formula2;
+          he !== f.rule.formula1 || me !== f.rule.formula2 || !ot(f.newRanges, f.oldRanges) ? (l.push({
             id: E.id,
             params: {
               unitId: o,
@@ -1281,10 +1292,10 @@ function be(o, a, e, t, r = "command", i = !0) {
               source: r
             }
           });
-        const O = d.getRuleById(o, a, f.ruleId);
-        if (O && O.type === T.CHECKBOX) {
-          const B = d.getValidator(T.CHECKBOX).parseFormulaSync(O, o, a);
-          M(f.newRanges, B.formula2);
+        const w = d.getRuleById(o, a, f.ruleId);
+        if (w && w.type === T.CHECKBOX) {
+          const x = d.getValidator(T.CHECKBOX).parseFormulaSync(w, o, a);
+          V(f.newRanges, x.formula2);
         }
         break;
       }
@@ -1298,7 +1309,7 @@ function be(o, a, e, t, r = "command", i = !0) {
             source: r
           }
         }), u.unshift({
-          id: A.id,
+          id: I.id,
           params: {
             unitId: o,
             subUnitId: a,
@@ -1306,13 +1317,13 @@ function be(o, a, e, t, r = "command", i = !0) {
             source: r
           }
         }), f.rule.type === T.CHECKBOX) {
-          const P = d.getValidator(T.CHECKBOX).parseFormulaSync(f.rule, o, a);
-          M(f.rule.ranges, P.originFormula2);
+          const W = d.getValidator(T.CHECKBOX).parseFormulaSync(f.rule, o, a);
+          V(f.rule.ranges, W.originFormula2);
         }
         break;
       }
     }
-  }), R) {
+  }), v) {
     const f = {
       id: se.id,
       params: {
@@ -1320,11 +1331,11 @@ function be(o, a, e, t, r = "command", i = !0) {
         subUnitId: a,
         cellValue: _.getData()
       }
-    }, O = {
+    }, w = {
       id: se.id,
-      params: ot(t, f.params)
+      params: nt(t, f.params)
     };
-    l.push(f), u.push(O);
+    l.push(f), u.push(w);
   }
   return {
     redoMutations: l,
@@ -1337,17 +1348,17 @@ const ha = {
   handler(o, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, ranges: r, ruleId: i } = a, s = o.get(F), n = o.get(x), l = o.get(Z);
+    const { unitId: e, subUnitId: t, ranges: r, ruleId: i } = a, s = o.get(F), n = o.get(U), l = o.get(Z);
     if (!s.getRuleById(e, t, i))
       return !1;
     const d = s.getRuleObjectMatrix(e, t).clone();
     d.updateRange(i, r);
-    const c = d.diff(s.getRules(e, t)), { redoMutations: m, undoMutations: p } = be(e, t, c, o);
+    const c = d.diff(s.getRules(e, t)), { redoMutations: g, undoMutations: p } = Le(e, t, c, o);
     return l.pushUndoRedo({
       undoMutations: p,
-      redoMutations: m,
+      redoMutations: g,
       unitID: e
-    }), Ie(m, n), !0;
+    }), Ie(g, n), !0;
   }
 }, ma = {
   type: z.COMMAND,
@@ -1355,7 +1366,7 @@ const ha = {
   handler(o, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, rule: r } = a, i = o.get(F), s = o.get(x), n = o.get(Z), l = i.getRuleObjectMatrix(e, t).clone();
+    const { unitId: e, subUnitId: t, rule: r } = a, i = o.get(F), s = o.get(U), n = o.get(Z), l = i.getRuleObjectMatrix(e, t).clone();
     l.addRule(r);
     const u = l.diff(i.getRules(e, t)), d = i.getValidator(r.type), c = {
       unitId: e,
@@ -1364,12 +1375,12 @@ const ha = {
         ...r,
         ...d == null ? void 0 : d.normalizeFormula(r, e, t)
       }
-    }, { redoMutations: m, undoMutations: p } = be(e, t, u, o);
-    return m.push({
+    }, { redoMutations: g, undoMutations: p } = Le(e, t, u, o);
+    return g.push({
       id: L.id,
       params: c
     }), p.unshift({
-      id: A.id,
+      id: I.id,
       params: {
         unitId: e,
         subUnitId: t,
@@ -1377,9 +1388,9 @@ const ha = {
       }
     }), n.pushUndoRedo({
       unitID: e,
-      redoMutations: m,
+      redoMutations: g,
       undoMutations: p
-    }), Ie(m, s), !0;
+    }), Ie(g, s), !0;
   }
 }, ga = {
   type: z.COMMAND,
@@ -1388,14 +1399,14 @@ const ha = {
   handler(o, a) {
     if (!a)
       return !1;
-    const e = o.get(x), t = o.get(Z), r = o.get(F), i = o.get(q), { unitId: s, subUnitId: n, ruleId: l, setting: u } = a, d = i.getValidatorItem(u.type);
+    const e = o.get(U), t = o.get(Z), r = o.get(F), i = o.get(q), { unitId: s, subUnitId: n, ruleId: l, setting: u } = a, d = i.getValidatorItem(u.type);
     if (!d)
       return !1;
     const c = r.getRuleById(s, n, l);
     if (!c)
       return !1;
-    const m = { ...c, ...u };
-    if (!d.validatorFormula(m, s, n).success)
+    const g = { ...c, ...u };
+    if (!d.validatorFormula(g, s, n).success)
       return !1;
     const p = {
       unitId: s,
@@ -1405,41 +1416,41 @@ const ha = {
         type: y.SETTING,
         payload: {
           ...u,
-          ...d.normalizeFormula(m, s, n)
+          ...d.normalizeFormula(g, s, n)
         }
       }
     }, _ = [{
       id: E.id,
       params: p
-    }], R = {
+    }], v = {
       unitId: s,
       subUnitId: n,
       ruleId: l,
       payload: {
         type: y.SETTING,
-        payload: Dt(c)
+        payload: bt(c)
       }
-    }, M = [{
+    }, V = [{
       id: E.id,
-      params: R
+      params: v
     }];
     if (u.type === T.CHECKBOX) {
-      const O = c.ranges, P = o.get(w), B = Ye(P, { unitId: s, subUnitId: n });
-      if (B) {
-        const $ = new Se(), { worksheet: U } = B, { formula2: J = Me, formula1: ce = Ve } = c, { formula2: he = Me, formula1: me = Ve } = u;
-        let Le = !1;
-        if (O.forEach((ge) => {
+      const w = c.ranges, W = o.get(O), x = Xe(W, { unitId: s, subUnitId: n });
+      if (x) {
+        const $ = new Se(), { worksheet: B } = x, { formula2: J = Ve, formula1: ce = Me } = c, { formula2: he = Ve, formula1: me = Me } = u;
+        let Ue = !1;
+        if (w.forEach((ge) => {
           b.foreach(ge, (ae, xe) => {
-            const k = U.getCellRaw(ae, xe), Ke = ct(k);
-            (gt(k) || Ke === String(J)) && !(k != null && k.p) ? ($.setValue(ae, xe, {
+            const k = B.getCellRaw(ae, xe), ze = mt(k);
+            (_t(k) || ze === String(J)) && !(k != null && k.p) ? ($.setValue(ae, xe, {
               v: he,
               p: null
-            }), Le = !0) : Ke === String(ce) && !(k != null && k.p) && ($.setValue(ae, xe, {
+            }), Ue = !0) : ze === String(ce) && !(k != null && k.p) && ($.setValue(ae, xe, {
               v: me,
               p: null
-            }), Le = !0);
+            }), Ue = !0);
           });
-        }), Le) {
+        }), Ue) {
           const ge = {
             id: se.id,
             params: {
@@ -1449,16 +1460,16 @@ const ha = {
             }
           }, ae = {
             id: se.id,
-            params: ot(o, ge.params)
+            params: nt(o, ge.params)
           };
-          _.push(ge), M.push(ae);
+          _.push(ge), V.push(ae);
         }
       }
     }
     return Ie(_, e).result ? (t.pushUndoRedo({
       unitID: s,
       redoMutations: _,
-      undoMutations: M
+      undoMutations: V
     }), !0) : !1;
   }
 }, _a = {
@@ -1467,7 +1478,7 @@ const ha = {
   handler(o, a) {
     if (!a)
       return !1;
-    const e = o.get(x), t = o.get(Z), r = o.get(F), { unitId: i, subUnitId: s, ruleId: n, options: l } = a, u = r.getRuleById(i, s, n);
+    const e = o.get(U), t = o.get(Z), r = o.get(F), { unitId: i, subUnitId: s, ruleId: n, options: l } = a, u = r.getRuleById(i, s, n);
     if (!u)
       return !1;
     const d = {
@@ -1481,17 +1492,17 @@ const ha = {
     }, c = [{
       id: E.id,
       params: d
-    }], m = {
+    }], g = {
       unitId: i,
       subUnitId: s,
       ruleId: n,
       payload: {
         type: y.OPTIONS,
-        payload: bt(u)
+        payload: Lt(u)
       }
     }, p = [{
       id: E.id,
-      params: m
+      params: g
     }];
     return t.pushUndoRedo({
       unitID: i,
@@ -1505,16 +1516,16 @@ const ha = {
   handler(o, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, ranges: r } = a, i = o.get(x), s = o.get(w), n = Ye(s, { unitId: e, subUnitId: t }), l = o.get(F);
+    const { unitId: e, subUnitId: t, ranges: r } = a, i = o.get(U), s = o.get(O), n = Xe(s, { unitId: e, subUnitId: t }), l = o.get(F);
     if (!n) return !1;
     const u = o.get(Z), d = l.getRuleObjectMatrix(e, t).clone();
     d.removeRange(r);
-    const c = d.diff(l.getRules(e, t)), { redoMutations: m, undoMutations: p } = be(e, t, c, o);
+    const c = d.diff(l.getRules(e, t)), { redoMutations: g, undoMutations: p } = Le(e, t, c, o);
     return u.pushUndoRedo({
       unitID: e,
-      redoMutations: m,
+      redoMutations: g,
       undoMutations: p
-    }), Ie(m, i).result;
+    }), Ie(g, i).result;
   }
 }, fa = {
   type: z.COMMAND,
@@ -1522,12 +1533,12 @@ const ha = {
   handler(o, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t } = a, r = o.get(x), i = o.get(F), s = o.get(Z), n = [...i.getRules(e, t)], l = {
+    const { unitId: e, subUnitId: t } = a, r = o.get(U), i = o.get(F), s = o.get(Z), n = [...i.getRules(e, t)], l = {
       unitId: e,
       subUnitId: t,
       ruleId: n.map((c) => c.uid)
     }, u = [{
-      id: A.id,
+      id: I.id,
       params: l
     }], d = [{
       id: L.id,
@@ -1541,9 +1552,9 @@ const ha = {
       redoMutations: u,
       undoMutations: d,
       unitID: e
-    }), r.executeCommand(A.id, l), !0;
+    }), r.executeCommand(I.id, l), !0;
   }
-}, Ra = (o, a) => {
+}, 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);
@@ -1568,14 +1579,14 @@ const ha = {
       index: e.getRuleIndex(t, r, i)
     }
   }];
-}, va = {
+}, Ra = {
   type: z.COMMAND,
   id: "sheet.command.remove-data-validation-rule",
   handler(o, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, ruleId: r } = a, i = o.get(x), s = o.get(Z), n = o.get(F), l = [{
-      id: A.id,
+    const { unitId: e, subUnitId: t, ruleId: r } = a, i = o.get(U), s = o.get(Z), n = o.get(F), l = [{
+      id: I.id,
       params: a
     }], u = [{
       id: L.id,
@@ -1592,19 +1603,19 @@ const ha = {
       undoMutations: u,
       redoMutations: l,
       unitID: a.unitId
-    }), i.executeCommand(A.id, a), !0;
+    }), i.executeCommand(I.id, a), !0;
   }
-}, Sa = "sheets-data-validation.config", tt = {};
-var Va = Object.getOwnPropertyDescriptor, Ma = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Va(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+}, Sa = "sheets-data-validation.config", rt = {};
+var Ma = Object.getOwnPropertyDescriptor, Va = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Ma(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, We = (o, a) => (e, t) => a(e, t, o);
-let Ee = class extends W {
+let Te = class extends P {
   constructor(a, e, t) {
     super();
-    g(this, "_disposableMap", /* @__PURE__ */ new Map());
-    g(this, "registerRule", (a, e, t) => {
+    m(this, "_disposableMap", /* @__PURE__ */ new Map());
+    m(this, "registerRule", (a, e, t) => {
       de(t.type, this._validatorRegistryService) && this.register(a, e, t);
     });
     this._dataValidationModel = a, this._formulaRefRangeService = e, this._validatorRegistryService = t, this._initRefRange();
@@ -1627,7 +1638,7 @@ let Ee = class extends W {
             }
           }],
           redos: [{
-            id: A.id,
+            id: I.id,
             params: {
               unitId: a,
               subUnitId: e,
@@ -1636,7 +1647,7 @@ let Ee = class extends W {
             }
           }]
         };
-      const d = [], c = [], m = u[0];
+      const d = [], c = [], g = u[0];
       d.push({
         id: E.id,
         params: {
@@ -1646,9 +1657,9 @@ let Ee = class extends W {
           payload: {
             type: y.ALL,
             payload: {
-              ranges: m.ranges,
-              formula1: m.formulas[0],
-              formula2: m.formulas[1]
+              ranges: g.ranges,
+              formula1: g.formulas[0],
+              formula2: g.formulas[1]
             }
           },
           source: "patched"
@@ -1671,7 +1682,7 @@ let Ee = class extends W {
         }
       });
       for (let p = 1; p < u.length; p++) {
-        const _ = u[p], R = Mt();
+        const _ = u[p], v = yt();
         d.push({
           id: L.id,
           params: {
@@ -1679,7 +1690,7 @@ let Ee = class extends W {
             subUnitId: e,
             rule: {
               ...t,
-              uid: R,
+              uid: v,
               formula1: _.formulas[0],
               formula2: _.formulas[1],
               ranges: _.ranges
@@ -1687,11 +1698,11 @@ let Ee = class extends W {
             source: "patched"
           }
         }), c.push({
-          id: A.id,
+          id: I.id,
           params: {
             unitId: a,
             subUnitId: e,
-            ruleId: R,
+            ruleId: v,
             source: "patched"
           }
         });
@@ -1730,24 +1741,24 @@ let Ee = class extends W {
           }
         }
       })
-    ), this.disposeWithMe(Qe(() => {
+    ), this.disposeWithMe(qe(() => {
       this._disposableMap.forEach((e) => {
         e.dispose();
       }), this._disposableMap.clear();
     }));
   }
 };
-Ee = Ma([
-  We(0, v(F)),
-  We(1, v(ut)),
-  We(2, v(q))
-], Ee);
-var _t = /* @__PURE__ */ ((o) => (o[o.View = 0] = "View", o[o.Edit = 1] = "Edit", o[o.ManageCollaborator = 2] = "ManageCollaborator", o[o.Print = 3] = "Print", o[o.Duplicate = 4] = "Duplicate", o[o.Comment = 5] = "Comment", o[o.Copy = 6] = "Copy", o[o.Share = 7] = "Share", o[o.Export = 8] = "Export", o[o.MoveWorksheet = 9] = "MoveWorksheet", o[o.DeleteWorksheet = 10] = "DeleteWorksheet", o[o.HideWorksheet = 11] = "HideWorksheet", o[o.RenameWorksheet = 12] = "RenameWorksheet", o[o.CreateWorksheet = 13] = "CreateWorksheet", o[o.SetWorksheetStyle = 14] = "SetWorksheetStyle", o[o.EditWorksheetCell = 15] = "EditWorksheetCell", o[o.InsertHyperlink = 16] = "InsertHyperlink", o[o.Sort = 17] = "Sort", o[o.Filter = 18] = "Filter", o[o.PivotTable = 19] = "PivotTable", o[o.FloatImg = 20] = "FloatImg", o[o.History = 21] = "History", o[o.RwHgtClWdt = 22] = "RwHgtClWdt", o[o.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", o[o.ViewFilter = 24] = "ViewFilter", o[o.MoveSheet = 25] = "MoveSheet", o[o.DeleteSheet = 26] = "DeleteSheet", o[o.HideSheet = 27] = "HideSheet", o[o.CopySheet = 28] = "CopySheet", o[o.RenameSheet = 29] = "RenameSheet", o[o.CreateSheet = 30] = "CreateSheet", o[o.SelectProtectedCells = 31] = "SelectProtectedCells", o[o.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", o[o.SetCellStyle = 33] = "SetCellStyle", o[o.SetCellValue = 34] = "SetCellValue", o[o.SetRowStyle = 35] = "SetRowStyle", o[o.SetColumnStyle = 36] = "SetColumnStyle", o[o.InsertRow = 37] = "InsertRow", o[o.InsertColumn = 38] = "InsertColumn", o[o.DeleteRow = 39] = "DeleteRow", o[o.DeleteColumn = 40] = "DeleteColumn", o[o.EditExtraObject = 41] = "EditExtraObject", o[o.Delete = 42] = "Delete", o[o.RecoverHistory = 43] = "RecoverHistory", o[o.ViewHistory = 44] = "ViewHistory", o[o.CreatePermissionObject = 45] = "CreatePermissionObject", o[o.UNRECOGNIZED = -1] = "UNRECOGNIZED", o))(_t || {}), ya = Object.getOwnPropertyDescriptor, Ea = (o, a, e, t) => {
+Te = Va([
+  We(0, R(F)),
+  We(1, R(ct)),
+  We(2, R(q))
+], Te);
+var pt = /* @__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))(pt || {}), ya = Object.getOwnPropertyDescriptor, Ea = (o, a, e, t) => {
   for (var r = t > 1 ? void 0 : t ? ya(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
-}, Pe = (o, a) => (e, t) => a(e, t, o);
-let Te = class extends W {
+}, $e = (o, a) => (e, t) => a(e, t, o);
+let Fe = class extends P {
   constructor(o, a, e) {
     super(), this._univerInstanceService = o, this._permissionService = a, this._lexerTreeBuilder = e;
   }
@@ -1760,43 +1771,43 @@ let Te = class extends W {
       const i = a[r];
       if (typeof i == "string")
         continue;
-      const { token: s } = i, n = Qt(s), l = this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET);
+      const { token: s } = i, n = qt(s), l = this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET);
       let u = l.getActiveSheet();
       const d = 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 xt(d, R).id)) return !1;
+        const v = u == null ? void 0 : u.getSheetId();
+        if (!this._permissionService.getPermissionPoint(new xt(d, v).id)) return !1;
       }
       if (!u)
         return !1;
-      const { startRow: c, endRow: m, startColumn: p, endColumn: _ } = n.range;
-      for (let R = c; R <= m; R++)
-        for (let M = p; M <= _; M++) {
-          const f = (t = (e = u.getCell(R, M)) == null ? void 0 : e.selectionProtection) == null ? void 0 : t[0];
-          if ((f == null ? void 0 : f[_t.View]) === !1)
+      const { startRow: c, endRow: g, startColumn: p, endColumn: _ } = n.range;
+      for (let v = c; v <= g; v++)
+        for (let V = p; V <= _; V++) {
+          const f = (t = (e = u.getCell(v, V)) == null ? void 0 : e.selectionProtection) == null ? void 0 : t[0];
+          if ((f == null ? void 0 : f[pt.View]) === !1)
             return !1;
         }
     }
     return !0;
   }
 };
-Te = Ea([
-  Pe(0, w),
-  Pe(1, yt),
-  Pe(2, v(Y))
-], Te);
+Fe = Ea([
+  $e(0, O),
+  $e(1, Et),
+  $e(2, R(Y))
+], Fe);
 var Ta = Object.getOwnPropertyDescriptor, Fa = (o, a, e, t) => {
   for (var r = t > 1 ? void 0 : t ? Ta(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, ee = (o, a) => (e, t) => a(e, t, o);
-let Fe = class extends W {
+let Ne = class extends P {
   constructor(a, e, t, r, i, s) {
     super();
-    g(this, "_disposableMap", /* @__PURE__ */ new Map());
-    g(this, "registerRule", (a, e, t) => {
+    m(this, "_disposableMap", /* @__PURE__ */ new Map());
+    m(this, "registerRule", (a, e, t) => {
       de(t.type, this._validatorRegistryService) || (this.register(a, e, t), this.registerFormula(a, e, t));
     });
     this._dataValidationModel = a, this._injector = e, this._refRangeService = t, this._dataValidationFormulaService = r, this._formulaRefRangeService = i, this._validatorRegistryService = s, this._initRefRange();
@@ -1808,10 +1819,10 @@ let Fe = class extends W {
   registerFormula(a, e, t) {
     var u;
     const r = t.uid, i = this._getIdWithUnitId(a, e, r), s = (u = this._disposableMap.get(i)) != null ? u : /* @__PURE__ */ new Set(), n = (d, c) => {
-      const m = this._dataValidationModel.getRuleById(a, e, r);
-      if (!m)
+      const g = this._dataValidationModel.getRuleById(a, e, r);
+      if (!g)
         return { redos: [], undos: [] };
-      const p = m[d];
+      const p = g[d];
       if (!p || p === c)
         return { redos: [], undos: [] };
       const _ = {
@@ -1821,27 +1832,27 @@ let Fe = class extends W {
         payload: {
           type: y.SETTING,
           payload: {
-            type: m.type,
-            formula1: m.formula1,
-            formula2: m.formula2,
+            type: g.type,
+            formula1: g.formula1,
+            formula2: g.formula2,
             [d]: c
           }
         },
         source: "patched"
-      }, R = {
+      }, v = {
         unitId: a,
         subUnitId: e,
         ruleId: t.uid,
         payload: {
           type: y.SETTING,
           payload: {
-            type: m.type,
-            formula1: m.formula1,
-            formula2: m.formula2
+            type: g.type,
+            formula1: g.formula1,
+            formula2: g.formula2
           }
         },
         source: "patched"
-      }, M = [
+      }, V = [
         {
           id: E.id,
           params: _
@@ -1849,50 +1860,50 @@ let Fe = class extends W {
       ], f = [
         {
           id: E.id,
-          params: R
+          params: v
         }
       ];
-      return { redos: M, undos: f };
+      return { redos: V, undos: f };
     }, l = this._dataValidationFormulaService.getRuleFormulaInfo(a, e, r);
     if (l) {
       const [d, c] = l;
       if (d) {
-        const m = this._formulaRefRangeService.registerFormula(
+        const g = this._formulaRefRangeService.registerFormula(
           a,
           e,
           d.text,
           (p) => n("formula1", p)
         );
-        s.add(() => m.dispose());
+        s.add(() => g.dispose());
       }
       if (c) {
-        const m = this._formulaRefRangeService.registerFormula(
+        const g = this._formulaRefRangeService.registerFormula(
           a,
           e,
           c.text,
           (p) => n("formula2", p)
         );
-        s.add(() => m.dispose());
+        s.add(() => g.dispose());
       }
     }
   }
   register(a, e, t) {
     var l;
     const r = (u) => {
-      const d = [...t.ranges], m = d.map((_) => Ut(_, u)).filter((_) => !!_).flat();
-      if (rt(m, d))
+      const d = [...t.ranges], g = d.map((_) => Ht(_, u)).filter((_) => !!_).flat();
+      if (ot(g, d))
         return { redos: [], undos: [] };
-      if (m.length) {
+      if (g.length) {
         const _ = {
           unitId: a,
           subUnitId: e,
           ruleId: t.uid,
           payload: {
             type: y.RANGE,
-            payload: m
+            payload: g
           },
           source: "patched"
-        }, R = [{ id: E.id, params: _ }], M = [{
+        }, v = [{ id: E.id, params: _ }], V = [{
           id: E.id,
           params: {
             unitId: a,
@@ -1905,10 +1916,10 @@ let Fe = class extends W {
             source: "patched"
           }
         }];
-        return { redos: R, undos: M };
+        return { redos: v, undos: V };
       } else {
-        const _ = { unitId: a, subUnitId: e, ruleId: t.uid }, R = [{ id: A.id, params: _ }], M = Ra(this._injector, _);
-        return { redos: R, undos: M };
+        const _ = { unitId: a, subUnitId: e, ruleId: t.uid }, v = [{ id: I.id, params: _ }], V = va(this._injector, _);
+        return { redos: v, undos: V };
       }
     }, i = [];
     t.ranges.forEach((u) => {
@@ -1945,27 +1956,27 @@ let Fe = class extends W {
           }
         }
       })
-    ), this.disposeWithMe(Qe(() => {
+    ), this.disposeWithMe(qe(() => {
       this._disposableMap.forEach((e) => {
         e.forEach((t) => t());
       }), this._disposableMap.clear();
     }));
   }
 };
-Fe = Fa([
-  ee(0, v(F)),
-  ee(1, v(qe)),
-  ee(2, v(Bt)),
-  ee(3, v(K)),
-  ee(4, v(ut)),
-  ee(5, v(q))
-], Fe);
+Ne = Fa([
+  ee(0, R(F)),
+  ee(1, R(Ge)),
+  ee(2, R(Bt)),
+  ee(3, R(K)),
+  ee(4, R(ct)),
+  ee(5, R(q))
+], Ne);
 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;
-}, $e = (o, a) => (e, t) => a(e, t, o);
-let Ne = class extends W {
+}, ke = (o, a) => (e, t) => a(e, t, o);
+let Ce = class extends P {
   constructor(o, a, e) {
     super(), this._sheetInterceptorService = o, this._univerInstanceService = a, this._sheetDataValidationModel = e, this._initSheetChange();
   }
@@ -1974,7 +1985,7 @@ let Ne = class extends W {
       this._sheetInterceptorService.interceptCommand({
         getMutations: (o) => {
           var a;
-          if (o.id === Ht.id) {
+          if (o.id === Pt.id) {
             const e = o.params, t = e.unitId || this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET).getUnitId(), r = this._univerInstanceService.getUniverSheetInstance(t);
             if (!r)
               return { redos: [], undos: [] };
@@ -1997,7 +2008,7 @@ let Ne = class extends W {
             };
             return {
               redos: [{
-                id: A.id,
+                id: I.id,
                 params: l
               }],
               undos: [{
@@ -2012,19 +2023,20 @@ let Ne = class extends W {
     );
   }
 };
-Ne = Ca([
-  $e(0, v(st)),
-  $e(1, v(w)),
-  $e(2, v(F))
-], Ne);
-class wa extends G {
+Ce = Ca([
+  ke(0, R(lt)),
+  ke(1, R(O)),
+  ke(2, R(F))
+], Ce);
+class Oa extends G {
   constructor() {
     super(...arguments);
-    g(this, "id", T.ANY);
-    g(this, "title", "dataValidation.any.title");
-    g(this, "operators", []);
-    g(this, "scopes", ["sheet"]);
-    g(this, "offsetFormulaByRange", !1);
+    m(this, "id", T.ANY);
+    m(this, "title", "dataValidation.any.title");
+    m(this, "operators", []);
+    m(this, "scopes", ["sheet"]);
+    m(this, "order", 0);
+    m(this, "offsetFormulaByRange", !1);
   }
   async parseFormula(e, t, r) {
     return {
@@ -2045,19 +2057,20 @@ class wa extends G {
     return this.localeService.t("dataValidation.any.error");
   }
 }
-class Oa extends G {
+class wa extends G {
   constructor() {
     super(...arguments);
-    g(this, "id", T.CUSTOM);
-    g(this, "title", "dataValidation.custom.title");
-    g(this, "operators", []);
-    g(this, "scopes", ["sheet"]);
-    g(this, "_customFormulaService", this.injector.get(H));
-    g(this, "_lexerTreeBuilder", this.injector.get(Y));
+    m(this, "id", T.CUSTOM);
+    m(this, "title", "dataValidation.custom.title");
+    m(this, "operators", []);
+    m(this, "scopes", ["sheet"]);
+    m(this, "order", 60);
+    m(this, "_customFormulaService", this.injector.get(H));
+    m(this, "_lexerTreeBuilder", this.injector.get(Y));
   }
   validatorFormula(e, t, r) {
     var u;
-    const i = S(e.formula1), s = (u = e.formula1) != null ? u : "", l = this._lexerTreeBuilder.checkIfAddBracket(s) === 0 && s.startsWith(qt.EQUALS);
+    const i = S(e.formula1), s = (u = e.formula1) != null ? u : "", l = this._lexerTreeBuilder.checkIfAddBracket(s) === 0 && s.startsWith(Gt.EQUALS);
     return {
       success: i && l,
       formula1: i && l ? "" : this.localeService.t("dataValidation.validFail.formula")
@@ -2072,7 +2085,7 @@ class Oa extends G {
   }
   async isValidType(e, t, r) {
     const { column: i, row: s, unitId: n, subUnitId: l } = e, u = await this._customFormulaService.getCellFormulaValue(n, l, r.uid, s, i), d = u == null ? void 0 : u.v;
-    return C(String(d)) && V.isDefine(d) && d !== "" ? u.t === Et.BOOLEAN ? !!d : typeof d == "boolean" ? d : typeof d == "number" ? !!d : typeof d == "string" ? C(d) : !!d : !1;
+    return C(String(d)) && M.isDefine(d) && d !== "" ? u.t === Tt.BOOLEAN ? !!d : typeof d == "boolean" ? d : typeof d == "number" ? !!d : typeof d == "string" ? C(d) : !!d : !1;
   }
   generateRuleErrorMessage(e) {
     return this.localeService.t("dataValidation.custom.error");
@@ -2082,23 +2095,24 @@ class Oa extends G {
     return this.localeService.t("dataValidation.custom.ruleName").replace("{FORMULA1}", (t = e.formula1) != null ? t : "");
   }
 }
-class Ia extends mt {
+class Aa extends gt {
   constructor() {
     super(...arguments);
-    g(this, "id", T.LIST_MULTIPLE);
-    g(this, "title", "dataValidation.listMultiple.title");
-    g(this, "offsetFormulaByRange", !1);
-    g(this, "skipDefaultFontRender", () => !0);
+    m(this, "id", T.LIST_MULTIPLE);
+    m(this, "title", "dataValidation.listMultiple.title");
+    m(this, "offsetFormulaByRange", !1);
+    m(this, "skipDefaultFontRender", () => !0);
   }
 }
-class Aa extends G {
+class Ia extends G {
   constructor() {
     super(...arguments);
-    g(this, "_customFormulaService", this.injector.get(H));
-    g(this, "_lexerTreeBuilder", this.injector.get(Y));
-    g(this, "id", T.WHOLE);
-    g(this, "title", "dataValidation.whole.title");
-    g(this, "operators", [
+    m(this, "_customFormulaService", this.injector.get(H));
+    m(this, "_lexerTreeBuilder", this.injector.get(Y));
+    m(this, "id", T.WHOLE);
+    m(this, "title", "dataValidation.whole.title");
+    m(this, "order", 10);
+    m(this, "operators", [
       h.BETWEEN,
       h.EQUAL,
       h.GREATER_THAN,
@@ -2108,30 +2122,30 @@ class Aa extends G {
       h.NOT_BETWEEN,
       h.NOT_EQUAL
     ]);
-    g(this, "scopes", ["sheet"]);
+    m(this, "scopes", ["sheet"]);
   }
   _isFormulaOrInt(e) {
-    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+    return !M.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
   }
   async isValidType(e, t, r) {
-    const { value: i } = e, s = ye(i);
+    const { value: i } = e, s = Ee(i);
     return !Number.isNaN(s) && Number.isInteger(s);
   }
   transform(e, t, r) {
     const { value: i } = e;
     return {
       ...e,
-      value: ye(i)
+      value: Ee(i)
     };
   }
   _parseNumber(e) {
     return e == null ? Number.NaN : +e;
   }
   async parseFormula(e, t, r, i, s) {
-    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, s), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, s), { formula1: u, formula2: d } = e, c = S(u) ? n == null ? void 0 : n.v : u, m = S(d) ? l == null ? void 0 : l.v : d, p = C(`${c}`) && C(`${m}`);
+    const n = await this._customFormulaService.getCellFormulaValue(t, r, e.uid, i, s), l = await this._customFormulaService.getCellFormula2Value(t, r, e.uid, i, s), { formula1: u, formula2: d } = e, c = S(u) ? n == null ? void 0 : n.v : u, g = S(d) ? l == null ? void 0 : l.v : d, p = C(`${c}`) && C(`${g}`);
     return {
       formula1: this._parseNumber(c),
-      formula2: this._parseNumber(m),
+      formula2: this._parseNumber(g),
       isFormulaValid: p
     };
   }
@@ -2139,9 +2153,9 @@ class Aa extends G {
     const i = e.operator;
     if (!i)
       return {
-        success: !1
+        success: !0
       };
-    const s = V.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Ae.includes(i), u = this.localeService.t("dataValidation.validFail.number");
+    const s = M.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = M.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = De.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: s && n,
       formula1: s ? void 0 : u,
@@ -2153,9 +2167,9 @@ class Aa extends G {
   }
   generateRuleErrorMessage(e, t) {
     if (!e.operator)
-      return this.titleStr;
-    const { transformedFormula1: r, transformedFormula2: i } = De(this._lexerTreeBuilder, e, t);
-    return `${this.localeService.t(ht[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
+      return this.localeService.t(ye.NONE).replace("{TYPE}", this.titleStr);
+    const { transformedFormula1: r, transformedFormula2: i } = be(this._lexerTreeBuilder, e, t);
+    return `${this.localeService.t(ye[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
   }
 }
 var Da = Object.getOwnPropertyDescriptor, ba = (o, a, e, t) => {
@@ -2163,7 +2177,7 @@ var Da = Object.getOwnPropertyDescriptor, ba = (o, a, e, t) => {
     (s = o[i]) && (r = s(r) || r);
   return r;
 }, te = (o, a) => (e, t) => a(e, t, o);
-let Ce = class extends Tt {
+let Oe = class extends Ft {
   constructor(o, a, e, t, r, i) {
     super(), this._univerInstanceService = o, this._dataValidatorRegistryService = a, this._injector = e, this._selectionManagerService = t, this._sheetInterceptorService = r, this._sheetDataValidationModel = i, this._init();
   }
@@ -2172,18 +2186,18 @@ let Ce = class extends Tt {
   }
   _registerValidators() {
     [
-      wa,
+      Oa,
       na,
-      Aa,
+      Ia,
       ca,
       sa,
-      aa,
-      mt,
-      Ia,
-      Oa
+      ra,
+      gt,
+      Aa,
+      wa
     ].forEach((o) => {
       const a = this._injector.createInstance(o);
-      this.disposeWithMe(this._dataValidatorRegistryService.register(a)), this.disposeWithMe(Qe(() => this._injector.delete(o)));
+      this.disposeWithMe(this._dataValidatorRegistryService.register(a)), this.disposeWithMe(qe(() => this._injector.delete(o)));
     });
   }
   _initCommandInterceptor() {
@@ -2196,7 +2210,7 @@ let Ce = class extends Tt {
             throw new Error("No active sheet found");
           const i = r.getSheetId(), s = (a = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : a.map((c) => c.range), n = this._sheetDataValidationModel.getRuleObjectMatrix(t, i).clone();
           s && n.removeRange(s);
-          const l = n.diff(this._sheetDataValidationModel.getRules(t, i)), { redoMutations: u, undoMutations: d } = be(t, i, l, this._injector, "patched");
+          const l = n.diff(this._sheetDataValidationModel.getRules(t, i)), { redoMutations: u, undoMutations: d } = Le(t, i, l, this._injector, "patched");
           return {
             undos: d,
             redos: u
@@ -2210,20 +2224,20 @@ let Ce = class extends Tt {
     });
   }
 };
-Ce = ba([
-  te(0, w),
-  te(1, v(q)),
-  te(2, v(qe)),
-  te(3, v(nt)),
-  te(4, v(st)),
-  te(5, v(F))
-], Ce);
-var La = Object.getOwnPropertyDescriptor, xa = (o, a, e, t) => {
+Oe = ba([
+  te(0, O),
+  te(1, R(q)),
+  te(2, R(Ge)),
+  te(3, R(ut)),
+  te(4, R(lt)),
+  te(5, R(F))
+], Oe);
+var La = Object.getOwnPropertyDescriptor, Ua = (o, a, e, t) => {
   for (var r = t > 1 ? void 0 : t ? La(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
-}, Re = (o, a) => (e, t) => a(e, t, o);
-let we = class extends W {
+}, ve = (o, a) => (e, t) => a(e, t, o);
+let we = class extends P {
   constructor(o, a, e, t) {
     super(), this._univerInstanceService = o, this._sheetDataValidationModel = a, this._dataValidationCacheService = e, this._lifecycleService = t, this._initRecalculate();
   }
@@ -2244,11 +2258,11 @@ let we = class extends W {
         });
       });
     };
-    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Pt(() => this._lifecycleService.lifecycle$.pipe(Ze((a) => a === ze.Rendered)))).subscribe(o)), this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Ze(() => this._lifecycleService.stage >= ze.Rendered), Nt(20)).subscribe(o));
+    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe($t(() => this._lifecycleService.lifecycle$.pipe(Je((a) => a === Ze.Rendered)))).subscribe(o)), this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Je(() => this._lifecycleService.stage >= Ze.Rendered), Ct(20)).subscribe(o));
   }
   async _validatorByCell(o, a, e, t) {
     const r = o.getUnitId(), i = a.getSheetId();
-    if (!V.isDefine(e) || !V.isDefine(t))
+    if (!M.isDefine(e) || !M.isDefine(t))
       throw new Error(`row or col is not defined, row: ${e}, col: ${t}`);
     const s = this._sheetDataValidationModel.getRuleByLocation(r, i, e, t);
     return s ? new Promise((n) => {
@@ -2316,23 +2330,23 @@ let we = class extends W {
     return this.getDataValidations(o, a, e)[0];
   }
 };
-we = xa([
-  Re(0, w),
-  Re(1, v(F)),
-  Re(2, v(Q)),
-  Re(3, v(Ft))
+we = Ua([
+  ve(0, O),
+  ve(1, R(F)),
+  ve(2, R(Q)),
+  ve(3, R(Nt))
 ], we);
-var Ba = Object.defineProperty, Ua = Object.getOwnPropertyDescriptor, Ha = (o, a, e) => a in o ? Ba(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e, Wa = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Ua(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+var xa = Object.defineProperty, Ba = Object.getOwnPropertyDescriptor, Ha = (o, a, e) => a in o ? xa(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e, Pa = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Ba(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = s(r) || r);
   return r;
-}, ke = (o, a) => (e, t) => a(e, t, o), pt = (o, a, e) => Ha(o, typeof a != "symbol" ? a + "" : a, e);
-let Oe = class extends Ot {
-  constructor(o = tt, a, e, t) {
+}, je = (o, a) => (e, t) => a(e, t, o), ft = (o, a, e) => Ha(o, typeof a != "symbol" ? a + "" : a, e);
+let Ae = class extends At {
+  constructor(o = rt, a, e, t) {
     super(), this._config = o, this._injector = a, this._commandService = e, this._configService = t;
     const { ...r } = It(
       {},
-      tt,
+      rt,
       this._config
     );
     this._configService.setConfig(Sa, r);
@@ -2344,11 +2358,11 @@ let Oe = class extends Ot {
       [H],
       [we],
       [F],
+      [Oe],
+      [Fe],
       [Ce],
-      [Te],
       [Ne],
-      [Fe],
-      [Ee]
+      [Te]
     ].forEach((o) => {
       this._injector.add(o);
     }), [
@@ -2356,67 +2370,74 @@ let Oe = class extends Ot {
       ha,
       ga,
       _a,
-      va,
+      Ra,
       fa,
       pa
     ].forEach((o) => {
       this._commandService.registerCommand(o);
-    }), this._injector.get(Q), this._injector.get(we), this._injector.get(Ce), this._injector.get(Ee), this._injector.get(Fe);
+    }), this._injector.get(Q), this._injector.get(we), this._injector.get(Oe), this._injector.get(Te), this._injector.get(Ne);
   }
   onReady() {
-    this._injector.get(Ne);
+    this._injector.get(Ce);
   }
   onRendered() {
-    this._injector.get(Te);
+    this._injector.get(Fe);
   }
 };
-pt(Oe, "pluginName", Gt);
-pt(Oe, "type", N.UNIVER_SHEET);
-Oe = Wa([
-  Ct(Lt),
-  ke(1, v(qe)),
-  ke(2, x),
-  ke(3, wt)
-], Oe);
+ft(Ae, "pluginName", Yt);
+ft(Ae, "type", N.UNIVER_SHEET);
+Ae = Pa([
+  Ot(Ut),
+  je(1, R(Ge)),
+  je(2, U),
+  je(3, wt)
+], Ae);
 function Ka(o) {
-  const e = o.get(nt).getCurrentSelections().map((i) => i.range);
+  const e = o.get(ut).getCurrentSelections().map((i) => i.range);
   return {
-    uid: V.generateRandomId(6),
+    uid: M.generateRandomId(6),
     type: T.DECIMAL,
     operator: h.EQUAL,
     formula1: "100",
     ranges: e != null ? e : [{ startColumn: 0, endColumn: 0, startRow: 0, endRow: 0 }]
   };
 }
+const za = "data-validation.custom-formula-input", Za = "data-validation.formula-input", Ja = "data-validation.list-formula-input", er = "data-validation.checkbox-formula-input";
 export {
   ma as AddSheetDataValidationCommand,
-  Ve as CHECKBOX_FORMULA_1,
-  Me as CHECKBOX_FORMULA_2,
-  aa as CheckboxValidator,
+  Za as BASE_FORMULA_INPUT_NAME,
+  Me as CHECKBOX_FORMULA_1,
+  Ve as CHECKBOX_FORMULA_2,
+  er as CHECKBOX_FORMULA_INPUT_NAME,
+  za as CUSTOM_FORMULA_INPUT_NAME,
+  ra as CheckboxValidator,
   pa as ClearRangeDataValidationCommand,
-  Gt as DATA_VALIDATION_PLUGIN_NAME,
+  Yt as DATA_VALIDATION_PLUGIN_NAME,
   Q as DataValidationCacheService,
   H as DataValidationCustomFormulaService,
-  Te as DataValidationFormulaController,
+  Fe as DataValidationFormulaController,
   K as DataValidationFormulaService,
   sa as DateValidator,
-  Ia as ListMultipleValidator,
-  mt as ListValidator,
+  Ja as LIST_FORMULA_INPUT_NAME,
+  Aa as ListMultipleValidator,
+  gt as ListValidator,
   fa as RemoveSheetAllDataValidationCommand,
-  va as RemoveSheetDataValidationCommand,
+  Ra as RemoveSheetDataValidationCommand,
   F as SheetDataValidationModel,
   we as SheetsDataValidationValidatorService,
-  Oe as UniverSheetsDataValidationPlugin,
+  Ae as UniverSheetsDataValidationPlugin,
   _a as UpdateSheetDataValidationOptionsCommand,
   ha as UpdateSheetDataValidationRangeCommand,
   ga as UpdateSheetDataValidationSettingCommand,
   Ka as createDefaultNewRule,
   fe as deserializeListOptions,
+  Ee as getCellValueNumber,
   ne as getCellValueOrigin,
   Xa as getDataValidationCellValue,
-  be as getDataValidationDiffMutations,
+  Le as getDataValidationDiffMutations,
   _e as getFormulaCellData,
   oe as getFormulaResult,
+  be as getTransformedFormula,
   C as isLegalFormulaResult,
   Ya as serializeListOptions,
   pe as transformCheckboxValue