@univerjs/sheets-data-validation 0.5.1 → 0.5.2

package/lib/es/index.js

@@ -1,32 +1,32 @@
 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 g = (o, a, e) => Rt(o, typeof a != "symbol" ? a + "" : a, e);
-import { Inject as R, ICommandService as x, IUniverInstanceService as O, Disposable as P, ObjectMatrix as fe, UniverInstanceType as N, Range as b, isFormulaString as S, DataValidationType as T, getOriginCellValue as St, RBush as Vt, debounce as Mt, Rectangle as A, Tools as V, DataValidationStatus as D, WrapStrategy as pe, DataValidationOperator as h, numfmt as W, dayjs as et, DataValidationRenderMode as be, CommandType as Y, IUndoRedoService as X, sequenceExecute as Ce, isRangesEqual as tt, generateRandomId as yt, toDisposable as We, IPermissionService as Et, Injector as je, CellValueType as Tt, RxDisposable as Ft, LifecycleService as Nt, LifecycleStages as Ke, bufferDebounceTime as Ct, DependentOn as Ot, Plugin as wt, IConfigService as It } from "@univerjs/core";
-import { DataValidationModel as Qe, DataValidatorRegistryService as Q, UpdateRuleType as y, BaseDataValidator as q, TextLengthErrorTitleMap as At, AddDataValidationMutation as L, RemoveDataValidationMutation as I, UpdateDataValidationMutation as E, getRuleSetting as Dt, getRuleOptions as bt, UniverDataValidationPlugin as Lt } from "@univerjs/data-validation";
-import { SetRangeValuesMutation as ie, RemoveSheetMutation as at, getSheetCommandTarget as qe, SetRangeValuesUndoMutationFactory as rt, WorksheetViewPermission as xt, RefRangeService as Bt, handleCommonDefaultRangeChangeWithEffectRefCommands as Ut, SheetInterceptorService as it, RemoveSheetCommand as Pt, SheetsSelectionsService as ot, ClearSelectionAllCommand as $t } from "@univerjs/sheets";
-import { Subject as He, bufferWhen as Ht, filter as ze } from "rxjs";
-import { RegisterOtherFormulaService as st, FormulaRefRangeService as nt } from "@univerjs/sheets-formula";
-import { ERROR_TYPE_SET as Wt, LexerTreeBuilder as K, isReferenceString as lt, sequenceNodeType as jt, deserializeRangeWithSheet as Qt, deserializeRangeWithSheetWithCache as qt } from "@univerjs/engine-formula";
-const Gt = "SHEET_DATA_VALIDATION_PLUGIN";
-var kt = Object.defineProperty, 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--)
+import { Inject as R, ICommandService as x, IUniverInstanceService as O, Disposable as $, ObjectMatrix as Se, UniverInstanceType as N, Range as b, isFormulaString as S, DataValidationType as T, getOriginCellValue as St, RBush as Vt, debounce as Mt, Rectangle as I, Tools as V, DataValidationStatus as D, WrapStrategy as Re, DataValidationOperator as h, numfmt as Q, dayjs as at, DataValidationRenderMode as Be, CommandType as K, IUndoRedoService as z, sequenceExecute as Ie, isRangesEqual as rt, 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, Plugin as wt, merge as It, IConfigService as At } from "@univerjs/core";
+import { DataValidationModel as ke, DataValidatorRegistryService as G, UpdateRuleType as y, BaseDataValidator as k, TextLengthErrorTitleMap as Dt, AddDataValidationMutation as L, RemoveDataValidationMutation as A, UpdateDataValidationMutation as E, getRuleSetting as bt, getRuleOptions as Lt, UniverDataValidationPlugin as xt } from "@univerjs/data-validation";
+import { SetRangeValuesMutation as se, RemoveSheetMutation as it, getSheetCommandTarget as Ye, SetRangeValuesUndoMutationFactory as ot, WorksheetViewPermission as Bt, RefRangeService as Ut, handleCommonDefaultRangeChangeWithEffectRefCommands as Pt, SheetInterceptorService as st, RemoveSheetCommand as $t, SheetsSelectionsService as nt, ClearSelectionAllCommand as Ht } from "@univerjs/sheets";
+import { Subject as Qe, bufferWhen as Wt, filter as Ze } from "rxjs";
+import { RegisterOtherFormulaService as lt, FormulaRefRangeService as ut } from "@univerjs/sheets-formula";
+import { ERROR_TYPE_SET as jt, LexerTreeBuilder as Z, isReferenceString as dt, sequenceNodeType as Qt, deserializeRangeWithSheet as qt, deserializeRangeWithSheetWithCache as Gt } from "@univerjs/engine-formula";
+const kt = "SHEET_DATA_VALIDATION_PLUGIN";
+var Yt = Object.defineProperty, 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 = (t ? s(a, e, r) : s(r)) || r);
-  return t && r && kt(a, e, r), r;
-}, Ze = (o, a) => (e, t) => a(e, t, o);
-let j = class extends P {
+  return t && r && Yt(a, e, r), r;
+}, Je = (o, a) => (e, t) => a(e, t, o);
+let q = class extends $ {
   constructor(a, e) {
     super();
     g(this, "_cacheMatrix", /* @__PURE__ */ new Map());
-    g(this, "_dirtyRanges$", new He());
+    g(this, "_dirtyRanges$", new Qe());
     g(this, "dirtyRanges$", this._dirtyRanges$.asObservable());
     this._commandService = a, this._univerInstanceService = e, this._initDirtyRanges(), this._initSheetRemove();
   }
   _initDirtyRanges() {
     this.disposeWithMe(this._commandService.onCommandExecuted((a) => {
-      if (a.id === ie.id) {
+      if (a.id === se.id) {
         const { cellValue: e, unitId: t, subUnitId: r } = a.params;
         if (e) {
-          const i = new fe(e).getDataRange();
+          const i = new Se(e).getDataRange();
           if (i.endRow === -1) return;
           this.markRangeDirty(t, r, [i]);
         }
@@ -36,7 +36,7 @@ let j = class extends P {
   _initSheetRemove() {
     this.disposeWithMe(this._commandService.onCommandExecuted((a) => {
       var e;
-      if (a.id === at.id) {
+      if (a.id === it.id) {
         const { unitId: t, subUnitId: r } = a.params;
         (e = this._cacheMatrix.get(t)) == null || e.delete(r);
       }
@@ -48,7 +48,7 @@ let j = class extends P {
     let t = this._cacheMatrix.get(a);
     t || (t = /* @__PURE__ */ new Map(), this._cacheMatrix.set(a, t));
     let r = t.get(e);
-    return r || (r = new fe(), t.set(e, r)), r;
+    return r || (r = new Se(), t.set(e, r)), r;
   }
   ensureCache(a, e) {
     return this._ensureCache(a, e);
@@ -79,32 +79,32 @@ let j = class extends P {
     return this._ensureCache(a, e).getValue(t, r);
   }
 };
-j = Xt([
-  Ze(0, R(x)),
-  Ze(1, R(O))
-], j);
-function re(o) {
+q = Kt([
+  Je(0, R(x)),
+  Je(1, R(O))
+], q);
+function oe(o) {
   var a, e;
   return (e = (a = o == null ? void 0 : o[0]) == null ? void 0 : a[0]) == null ? void 0 : e.v;
 }
-function he(o) {
+function _e(o) {
   var a;
   return (a = o == null ? void 0 : o[0]) == null ? void 0 : a[0];
 }
 function C(o) {
-  return !Wt.has(o);
+  return !jt.has(o);
 }
-function le(o, a) {
+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.defineProperty, zt = Object.getOwnPropertyDescriptor, Zt = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? zt(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+var zt = Object.defineProperty, Zt = Object.getOwnPropertyDescriptor, Jt = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Zt(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
-  return t && r && Kt(a, e, r), r;
-}, te = (o, a) => (e, t) => a(e, t, o);
-let U = class extends P {
+  return t && r && zt(a, e, r), r;
+}, re = (o, a) => (e, t) => a(e, t, o);
+let P = class extends $ {
   constructor(a, e, t, r, i) {
     super();
     /**
@@ -172,7 +172,7 @@ let U = class extends P {
     }
   }
   addRule(a, e, t) {
-    if (le(t.type, this._validatorRegistryService)) {
+    if (de(t.type, this._validatorRegistryService)) {
       const { ranges: r, formula1: i, formula2: s, uid: n } = t;
       this._addFormulaByRange(a, e, n, i, s, r);
     }
@@ -183,7 +183,7 @@ let U = class extends P {
     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 he((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
+    return _e((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
   }
   async getCellFormula2Value(a, e, t, r, i) {
     var p, _;
@@ -191,7 +191,7 @@ let U = class extends P {
     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 he((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
+    return _e((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
   }
   getCellFormulaValueSync(a, e, t, r, i) {
     var p, _;
@@ -199,7 +199,7 @@ let U = class extends P {
     if (!n)
       return;
     const l = this._registerOtherFormulaService.getFormulaValueSync(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, m = i - d;
-    return he((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
+    return _e((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
   }
   getCellFormula2ValueSync(a, e, t, r, i) {
     var p, _;
@@ -207,26 +207,26 @@ let U = class extends P {
     if (!n)
       return;
     const l = this._registerOtherFormulaService.getFormulaValueSync(a, e, n.formulaId), { originRow: u, originCol: d } = n, c = r - u, m = i - d;
-    return he((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
+    return _e((_ = (p = l == null ? void 0 : l.result) == null ? void 0 : p[c]) == null ? void 0 : _[m]);
   }
   getRuleFormulaInfo(a, e, t) {
     const { ruleFormulaMap: r } = this._ensureMaps(a, e);
     return r.get(t);
   }
 };
-U = Zt([
-  te(0, O),
-  te(1, R(st)),
-  te(2, R(Qe)),
-  te(3, R(j)),
-  te(4, R(Q))
-], U);
-var Jt = Object.defineProperty, 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--)
+P = Jt([
+  re(0, O),
+  re(1, R(lt)),
+  re(2, R(ke)),
+  re(3, R(q)),
+  re(4, R(G))
+], P);
+var ea = Object.defineProperty, 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 = (t ? s(a, e, r) : s(r)) || r);
-  return t && r && Jt(a, e, r), r;
-}, ae = (o, a) => (e, t) => a(e, t, o);
-let k = class extends P {
+  return t && r && ea(a, e, r), r;
+}, ie = (o, a) => (e, t) => a(e, t, o);
+let X = class extends $ {
   constructor(a, e, t, r, i) {
     super();
     g(this, "_formulaRuleMap", /* @__PURE__ */ new Map());
@@ -261,7 +261,7 @@ let k = class extends P {
     return this._registerOtherFormulaService.registerFormulaWithRange(a, e, t, i, { ruleId: r });
   }
   addRule(a, e, t) {
-    if (!le(t.type, this._validatorRegistryService) && t.type !== T.CHECKBOX) {
+    if (!de(t.type, this._validatorRegistryService) && t.type !== T.CHECKBOX) {
       const { formula1: r, formula2: i, uid: s } = t, n = S(r), l = S(i);
       if (!n && !l)
         return;
@@ -306,21 +306,21 @@ let k = class extends P {
     return this._ensureRuleFormulaMap(a, e).get(t);
   }
 };
-k = ta([
-  ae(0, O),
-  ae(1, R(st)),
-  ae(2, R(j)),
-  ae(3, R(Qe)),
-  ae(4, R(Q))
-], k);
-function oe(o) {
+X = aa([
+  ie(0, O),
+  ie(1, R(lt)),
+  ie(2, R(q)),
+  ie(3, R(ke)),
+  ie(4, R(G))
+], X);
+function ne(o) {
   return St(o);
 }
-function ut(o) {
+function ct(o) {
   var a;
-  return String((a = oe(o)) != null ? a : "");
+  return String((a = ne(o)) != null ? a : "");
 }
-class Ge {
+class Xe {
   constructor(a, e, t, r, i = !1) {
     g(this, "_map");
     g(this, "_tree", new Vt());
@@ -352,9 +352,9 @@ class Ge {
   _addRule(a, e) {
     if (!this._worksheet)
       return;
-    const t = e.map((r) => b.transformRange(r, this._worksheet));
+    const t = I.mergeRanges(e.map((r) => b.transformRange(r, this._worksheet)));
     this._map.forEach((r, i) => {
-      const s = A.subtractMulti(r, t);
+      const s = I.subtractMulti(r, t);
       s.length === 0 ? this._map.delete(i) : this._map.set(i, s);
     }), this._dirty = !0, this._map.set(a, t), this._debonceBuildTree();
   }
@@ -366,7 +366,7 @@ class Ge {
       return;
     const e = a.map((t) => b.transformRange(t, this._worksheet));
     this._map.forEach((t, r) => {
-      const i = A.subtractMulti(t, e);
+      const i = I.subtractMulti(t, e);
       i.length === 0 ? this._map.delete(r) : this._map.set(r, i);
     }), this._dirty = !0, this._debonceBuildTree();
   }
@@ -384,10 +384,10 @@ class Ge {
       if (!t.length)
         return;
       let r = this._map.get(e);
-      r ? (this._map.set(e, A.mergeRanges([...r, ...t])), r = this._map.get(e)) : (r = t, this._map.set(e, r)), this._map.forEach((i, s) => {
+      r ? (this._map.set(e, I.mergeRanges([...r, ...t])), r = this._map.get(e)) : (r = t, this._map.set(e, r)), this._map.forEach((i, s) => {
         if (s === e)
           return;
-        const n = A.subtractMulti(i, t);
+        const n = I.subtractMulti(i, t);
         n.length === 0 ? this._map.delete(s) : this._map.set(s, n);
       });
     }), this._dirty = !0, this._debonceBuildTree();
@@ -398,11 +398,11 @@ class Ge {
     return a.forEach((r, i) => {
       var l;
       const s = (l = this._map.get(r.uid)) != null ? l : [], n = r.ranges;
-      s.length !== 0 && (s.length !== n.length || s.some((u, d) => !A.equals(u, n[d]))) && e.push({
+      s.length !== 0 && (s.length !== n.length || s.some((u, d) => !I.equals(u, n[d]))) && e.push({
         type: "update",
         ruleId: r.uid,
         oldRanges: n,
-        newRanges: A.sort(s),
+        newRanges: I.sort(s),
         rule: r
       }), s.length === 0 && (e.push({
         type: "delete",
@@ -417,11 +417,11 @@ class Ge {
     return a.forEach((i, s) => {
       var u;
       const n = (u = this._map.get(i.uid)) != null ? u : [], l = i.ranges;
-      n.length !== 0 && (n.length !== l.length || n.some((d, c) => !A.equals(d, l[c]))) && t.push({
+      n.length !== 0 && (n.length !== l.length || n.some((d, c) => !I.equals(d, l[c]))) && t.push({
         type: "update",
         ruleId: i.uid,
         oldRanges: l,
-        newRanges: A.sort(n),
+        newRanges: I.sort(n),
         rule: i
       }), n.length === 0 && (t.push({
         type: "delete",
@@ -435,13 +435,13 @@ class Ge {
         type: "add",
         rule: {
           ...i,
-          ranges: A.sort(s)
+          ranges: I.sort(s)
         }
       });
     }), t;
   }
   clone() {
-    return new Ge(
+    return new Xe(
       new Map(V.deepClone(Array.from(this._map.entries()))),
       this._unitId,
       this._subUnitId,
@@ -461,17 +461,17 @@ class Ge {
     return t.length > 0 ? t[0].ruleId : void 0;
   }
 }
-var aa = Object.defineProperty, ra = Object.getOwnPropertyDescriptor, ia = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? ra(a, e) : a, i = o.length - 1, s; i >= 0; i--)
+var ra = Object.defineProperty, ia = Object.getOwnPropertyDescriptor, oa = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? ia(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
-  return t && r && aa(a, e, r), r;
-}, G = (o, a) => (e, t) => a(e, t, o);
-let F = class extends P {
+  return t && r && ra(a, e, r), r;
+}, Y = (o, a) => (e, t) => a(e, t, o);
+let F = class extends $ {
   constructor(a, e, t, r, i, s, n) {
     super();
     g(this, "_ruleMatrixMap", /* @__PURE__ */ new Map());
-    g(this, "_validStatusChange$", new He());
-    g(this, "_ruleChange$", new He());
+    g(this, "_validStatusChange$", new Qe());
+    g(this, "_ruleChange$", new Qe());
     g(this, "ruleChange$", this._ruleChange$.asObservable());
     g(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(() => {
@@ -485,7 +485,7 @@ let F = class extends P {
       })
     ), this.disposeWithMe(
       this._commandService.onCommandExecuted((a) => {
-        if (a.id === at.id) {
+        if (a.id === it.id) {
           const { unitId: e, subUnitId: t } = a.params, r = this._ruleMatrixMap.get(e);
           r && r.delete(t);
         }
@@ -525,7 +525,7 @@ let F = class extends P {
     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 Ge(/* @__PURE__ */ new Map(), a, e, this._univerInstanceService), t.set(e, r)), r;
+    return r || (r = new Xe(/* @__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);
@@ -566,7 +566,7 @@ let F = class extends P {
         row: i,
         col: r
       });
-    }, d = l.getCellValueOnly(i, r), c = this.getValidator(a.type), m = l.getCellRaw(i, r), p = oe(m);
+    }, d = l.getCellValueOnly(i, r), c = this.getValidator(a.type), m = l.getCellRaw(i, r), p = ne(m);
     if (c) {
       const _ = this._dataValidationCacheService.ensureCache(s, n), v = _.getValue(i, r);
       return v == null ? (_.setValue(i, r, D.VALIDATING), c.validator(
@@ -578,7 +578,7 @@ let F = class extends P {
           column: r,
           worksheet: e.worksheet,
           workbook: e.workbook,
-          interceptValue: oe(d),
+          interceptValue: ne(d),
           t: m == null ? void 0 : m.t
         },
         a
@@ -616,21 +616,21 @@ let F = class extends P {
     return this._dataValidationModel.getAll();
   }
 };
-F = ia([
-  G(0, R(Qe)),
-  G(1, O),
-  G(2, R(Q)),
-  G(3, R(j)),
-  G(4, R(k)),
-  G(5, R(U)),
-  G(6, x)
+F = oa([
+  Y(0, R(ke)),
+  Y(1, O),
+  Y(2, R(G)),
+  Y(3, R(q)),
+  Y(4, R(X)),
+  Y(5, R(P)),
+  Y(6, x)
 ], F);
-const ve = 1, Re = 0;
-function Je(o, a) {
+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 = (o) => V.isDefine(o) && String(o).toLowerCase() === "true" ? "1" : String(o).toLowerCase() === "false" ? "0" : o;
-class oa extends q {
+const pe = (o) => V.isDefine(o) && String(o).toLowerCase() === "true" ? "1" : String(o).toLowerCase() === "false" ? "0" : o;
+class sa extends k {
   constructor() {
     super(...arguments);
     g(this, "id", T.CHECKBOX);
@@ -638,7 +638,7 @@ class oa extends q {
     g(this, "operators", []);
     g(this, "scopes", ["sheet"]);
     g(this, "offsetFormulaByRange", !1);
-    g(this, "_formulaService", this.injector.get(k));
+    g(this, "_formulaService", this.injector.get(X));
     g(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}`;
@@ -656,7 +656,7 @@ class oa extends q {
         formula1: this.localeService.t("dataValidation.validFail.checkboxEqual"),
         formula2: this.localeService.t("dataValidation.validFail.checkboxEqual")
       };
-    const l = Je(i, this.localeService), u = Je(s, this.localeService);
+    const l = et(i, this.localeService), u = et(s, this.localeService);
     return {
       success: !l && !u,
       formula1: l,
@@ -665,10 +665,10 @@ class oa extends q {
   }
   async parseFormula(e, t, r) {
     var c, m, p, _;
-    const { formula1: i = ve, formula2: s = Re } = e, n = await this._formulaService.getRuleFormulaResult(t, r, e.uid), l = S(i) ? re((m = (c = n == null ? void 0 : n[0]) == null ? void 0 : c.result) == null ? void 0 : m[0][0]) : i, u = S(s) ? re((_ = (p = n == null ? void 0 : n[1]) == null ? void 0 : p.result) == null ? void 0 : _[0][0]) : s, d = C(String(l)) && C(String(u));
+    const { formula1: i = Ve, formula2: s = Me } = e, n = await this._formulaService.getRuleFormulaResult(t, r, e.uid), l = S(i) ? oe((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));
     return {
-      formula1: me(l),
-      formula2: me(u),
+      formula1: pe(l),
+      formula2: pe(u),
       originFormula1: l,
       originFormula2: u,
       isFormulaValid: d
@@ -676,15 +676,15 @@ class oa extends q {
   }
   getExtraStyle(e, t) {
     return {
-      tb: pe.CLIP
+      tb: Re.CLIP
     };
   }
   parseFormulaSync(e, t, r) {
     var c, m, p, _;
-    const { formula1: i = ve, formula2: s = Re } = e, n = this._formulaService.getRuleFormulaResultSync(t, r, e.uid), l = S(i) ? re((m = (c = n == null ? void 0 : n[0]) == null ? void 0 : c.result) == null ? void 0 : m[0][0]) : i, u = S(s) ? re((_ = (p = n == null ? void 0 : n[1]) == null ? void 0 : p.result) == null ? void 0 : _[0][0]) : s, d = C(String(l)) && C(String(u));
+    const { formula1: i = Ve, formula2: s = Me } = e, n = this._formulaService.getRuleFormulaResultSync(t, r, e.uid), l = S(i) ? oe((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));
     return {
-      formula1: me(l),
-      formula2: me(u),
+      formula1: pe(l),
+      formula2: pe(u),
       originFormula1: l,
       originFormula2: u,
       isFormulaValid: d
@@ -698,7 +698,7 @@ class oa extends q {
     return this.localeService.t("dataValidation.checkbox.error");
   }
 }
-const sa = {
+const na = {
   [h.BETWEEN]: "dataValidation.date.operators.between",
   [h.EQUAL]: "dataValidation.date.operators.equal",
   [h.GREATER_THAN]: "dataValidation.date.operators.greaterThan",
@@ -709,7 +709,7 @@ const sa = {
   [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 na = {
+const la = {
   [h.BETWEEN]: "dataValidation.date.ruleName.between",
   [h.EQUAL]: "dataValidation.date.ruleName.equal",
   [h.GREATER_THAN]: "dataValidation.date.ruleName.greaterThan",
@@ -718,7 +718,7 @@ const na = {
   [h.LESS_THAN_OR_EQUAL]: "dataValidation.date.ruleName.lessThanOrEqual",
   [h.NOT_BETWEEN]: "dataValidation.date.ruleName.notBetween",
   [h.NOT_EQUAL]: "dataValidation.date.ruleName.notEqual"
-}, la = {
+}, ua = {
   [h.BETWEEN]: "dataValidation.date.errorMsg.between",
   [h.EQUAL]: "dataValidation.date.errorMsg.equal",
   [h.GREATER_THAN]: "dataValidation.date.errorMsg.greaterThan",
@@ -727,37 +727,37 @@ const na = {
   [h.LESS_THAN_OR_EQUAL]: "dataValidation.date.errorMsg.lessThanOrEqual",
   [h.NOT_BETWEEN]: "dataValidation.date.errorMsg.notBetween",
   [h.NOT_EQUAL]: "dataValidation.date.errorMsg.notEqual"
-}, Oe = [
+}, Ae = [
   h.BETWEEN,
   h.NOT_BETWEEN
-], se = "{FORMULA1}", ne = "{FORMULA2}";
+], le = "{FORMULA1}", ue = "{FORMULA2}";
 function rr(o) {
   return o.filter(Boolean).join(",");
 }
-function ge(o) {
+function fe(o) {
   return o.split(",").filter(Boolean);
 }
 function ir(o) {
-  const a = oe(o);
+  const a = ne(o);
   return a == null ? "" : a.toString();
 }
-function we(o, a, e) {
+function De(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 Le = (o) => {
+const Ue = (o) => {
   var e, t;
   if (o == null || typeof o == "boolean")
     return;
   if (typeof o == "number" || !Number.isNaN(+o))
     return +o;
-  const a = (e = W.parseDate(o)) == null ? void 0 : e.v;
-  return V.isDefine(a) ? a : (t = W.parseDate(et(o).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : t.v;
+  const a = (e = Q.parseDate(o)) == null ? void 0 : e.v;
+  return V.isDefine(a) ? a : (t = Q.parseDate(at(o).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : t.v;
 };
-class ua extends q {
+class da extends k {
   constructor() {
     super(...arguments);
     g(this, "id", T.DATE);
@@ -773,23 +773,23 @@ class ua extends q {
       h.NOT_EQUAL
     ]);
     g(this, "scopes", ["sheet"]);
-    g(this, "_customFormulaService", this.injector.get(U));
-    g(this, "_lexerTreeBuilder", this.injector.get(K));
+    g(this, "_customFormulaService", this.injector.get(P));
+    g(this, "_lexerTreeBuilder", this.injector.get(Z));
   }
   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: Le(S(u) ? n == null ? void 0 : n.v : u),
-      formula2: Le(S(d) ? l == null ? void 0 : l.v : d),
+      formula1: Ue(S(u) ? n == null ? void 0 : n.v : u),
+      formula2: Ue(S(d) ? l == null ? void 0 : l.v : d),
       isFormulaValid: c
     };
   }
   async isValidType(e) {
     const { interceptValue: t, value: r } = e;
-    return typeof r == "number" && typeof t == "string" ? !0 : typeof t == "string" ? !!W.parseDate(t) : !1;
+    return typeof r == "number" && typeof t == "string" ? !0 : typeof t == "string" ? !!Q.parseDate(t) : !1;
   }
   _validatorSingleFormula(e) {
-    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e) || !!(e && W.parseDate(e)));
+    return !V.isBlank(e) && (S(e) || !Number.isNaN(+e) || !!(e && Q.parseDate(e)));
   }
   validatorFormula(e, t, r) {
     const i = e.operator;
@@ -798,7 +798,7 @@ class ua extends q {
         success: !1
       };
     const s = this._validatorSingleFormula(e.formula1), n = this.localeService.t("dataValidation.validFail.date");
-    if (Oe.includes(i)) {
+    if (Ae.includes(i)) {
       const u = this._validatorSingleFormula(e.formula2);
       return {
         success: s && u,
@@ -818,14 +818,14 @@ class ua extends q {
         return u;
       let d;
       if (!Number.isNaN(+u))
-        d = W.dateFromSerial(+u);
+        d = Q.dateFromSerial(+u);
       else {
-        const m = (c = W.parseDate(u)) == null ? void 0 : c.v;
+        const m = (c = Q.parseDate(u)) == null ? void 0 : c.v;
         if (m == null)
           return "";
-        d = W.dateFromSerial(m);
+        d = Q.dateFromSerial(m);
       }
-      return et(`${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 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 {
       formula1: S(i) ? i : l(`${i}`),
@@ -836,29 +836,29 @@ class ua extends q {
     const { value: i } = e;
     return {
       ...e,
-      value: Le(i)
+      value: Ue(i)
     };
   }
   get operatorNames() {
-    return this.operators.map((e) => this.localeService.t(sa[e]));
+    return this.operators.map((e) => this.localeService.t(na[e]));
   }
   generateRuleName(e) {
     var r, i;
     if (!e.operator)
       return this.titleStr;
-    const t = this.localeService.t(na[e.operator]).replace(se, (r = e.formula1) != null ? r : "").replace(ne, (i = e.formula2) != null ? i : "");
+    const t = this.localeService.t(la[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 } = we(this._lexerTreeBuilder, e, t);
-    return `${this.localeService.t(la[e.operator]).replace(se, r != null ? r : "").replace(ne, i != null ? i : "")}`;
+    const { transformedFormula1: r, transformedFormula2: i } = De(this._lexerTreeBuilder, e, t);
+    return `${this.localeService.t(ua[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 dt = {
+const ht = {
   [h.BETWEEN]: "dataValidation.errorMsg.between",
   [h.EQUAL]: "dataValidation.errorMsg.equal",
   [h.GREATER_THAN]: "dataValidation.errorMsg.greaterThan",
@@ -868,16 +868,16 @@ const dt = {
   [h.NOT_BETWEEN]: "dataValidation.errorMsg.notBetween",
   [h.NOT_EQUAL]: "dataValidation.errorMsg.notEqual"
 };
-function Se(o) {
+function ye(o) {
   let a = o;
   return typeof o == "string" ? ((o.startsWith("¥") || o.startsWith("$")) && (a = o.slice(1)), +a) : +o;
 }
-class da extends q {
+class ca extends k {
   constructor() {
     super(...arguments);
-    g(this, "_customFormulaService", this.injector.get(U));
+    g(this, "_customFormulaService", this.injector.get(P));
     g(this, "id", T.DECIMAL);
-    g(this, "_lexerTreeBuilder", this.injector.get(K));
+    g(this, "_lexerTreeBuilder", this.injector.get(Z));
     g(this, "title", "dataValidation.decimal.title");
     g(this, "operators", [
       h.BETWEEN,
@@ -896,13 +896,13 @@ class da extends q {
   }
   async isValidType(e, t, r) {
     const { value: i } = e;
-    return !Number.isNaN(Se(i));
+    return !Number.isNaN(ye(i));
   }
   transform(e, t, r) {
     const { value: i } = e;
     return {
       ...e,
-      value: Se(i)
+      value: ye(i)
     };
   }
   _parseNumber(e) {
@@ -922,7 +922,7 @@ class da extends q {
       return {
         success: !1
       };
-    const s = V.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), l = Oe.includes(i), u = this.localeService.t("dataValidation.validFail.number");
+    const s = V.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), l = Ae.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: s && n,
       formula1: s ? void 0 : u,
@@ -935,11 +935,11 @@ class da extends q {
   generateRuleErrorMessage(e, t) {
     if (!e.operator)
       return this.titleStr;
-    const { transformedFormula1: r, transformedFormula2: i } = we(this._lexerTreeBuilder, e, t);
-    return `${this.localeService.t(dt[e.operator]).replace(se, r != null ? r : "").replace(ne, i != null ? i : "")}`;
+    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 : "")}`;
   }
 }
-function xe(o) {
+function Pe(o) {
   if (!o)
     return [];
   const a = /* @__PURE__ */ new Set();
@@ -947,10 +947,10 @@ function xe(o) {
     (e) => {
       e.forEach((t) => {
         var i, s;
-        const r = oe(t);
+        const r = ne(t);
         if (r != null) {
           if (typeof r != "string" && typeof (t == null ? void 0 : t.s) == "object" && ((s = (i = t.s) == null ? void 0 : i.n) != null && s.pattern)) {
-            a.add(W.format(t.s.n.pattern, r, { throws: !1 }));
+            a.add(Q.format(t.s.n.pattern, r, { throws: !1 }));
             return;
           }
           C(r.toString()) && a.add(r.toString());
@@ -959,43 +959,43 @@ function xe(o) {
     }
   ), [...a];
 }
-const ca = [
+const ha = [
   "if",
   "indirect",
   "choose",
   "offset"
 ];
-function ha(o, a) {
-  if (!S(o) || lt(o.slice(1)))
+function ma(o, a) {
+  if (!S(o) || dt(o.slice(1)))
     return !0;
   const t = a.sequenceNodesBuilder(o);
-  return t && t.some((r) => typeof r == "object" && r.nodeType === jt.FUNCTION && ca.indexOf(r.token.toLowerCase()) > -1);
+  return t && t.some((r) => typeof r == "object" && r.nodeType === Qt.FUNCTION && ha.indexOf(r.token.toLowerCase()) > -1);
 }
-function ma(o, a) {
+function ga(o, a) {
   const { formula1: e = "", ranges: t } = o;
-  if (lt(e.slice(1))) {
-    const i = Qt(e.slice(1));
-    if ((!i.sheetName || i.sheetName === a) && t.some((s) => A.intersects(s, i.range)))
+  if (dt(e.slice(1))) {
+    const i = qt(e.slice(1));
+    if ((!i.sheetName || i.sheetName === a) && t.some((s) => I.intersects(s, i.range)))
       return !0;
   }
   return !1;
 }
-class ct extends q {
+class mt extends k {
   constructor() {
     super(...arguments);
-    g(this, "formulaService", this.injector.get(k));
-    g(this, "_lexer", this.injector.get(K));
+    g(this, "formulaService", this.injector.get(X));
+    g(this, "_lexer", this.injector.get(Z));
     g(this, "_univerInstanceService", this.injector.get(O));
     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);
+    g(this, "skipDefaultFontRender", (e) => e.renderMode !== Be.TEXT);
   }
   validatorFormula(e, t, r) {
     var u, d, c;
-    const i = !V.isBlank(e.formula1), s = ha((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 = ma(e, n != null ? n : "");
+    const i = !V.isBlank(e.formula1), s = ma((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 = ga(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")
@@ -1003,8 +1003,8 @@ class ct extends q {
   }
   getExtraStyle(e, t, { style: r }) {
     var s;
-    const i = (s = r.tb !== pe.OVERFLOW ? r.tb : pe.CLIP) != null ? s : pe.WRAP;
-    if (e.type === T.LIST && (e.renderMode === be.ARROW || e.renderMode === be.TEXT)) {
+    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)
         return {
@@ -1020,11 +1020,11 @@ class ct extends q {
   }
   parseCellValue(e) {
     const t = e.toString();
-    return ge(t);
+    return fe(t);
   }
   async parseFormula(e, t, r) {
     var l, u;
-    const i = await this.formulaService.getRuleFormulaResult(t, r, e.uid), s = re((u = (l = i == null ? void 0 : i[0]) == null ? void 0 : l.result) == null ? void 0 : u[0][0]);
+    const i = await this.formulaService.getRuleFormulaResult(t, r, e.uid), s = oe((u = (l = i == null ? void 0 : i[0]) == null ? void 0 : l.result) == null ? void 0 : u[0][0]);
     return {
       formula1: void 0,
       formula2: void 0,
@@ -1033,7 +1033,7 @@ class ct extends q {
   }
   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) ? xe((p = (m = u == null ? void 0 : u[0]) == null ? void 0 : m.result) == null ? void 0 : p[0][0]) : ge(l);
+    const { value: i, unitId: s, subUnitId: n } = e, { formula1: l = "" } = r, u = await this.formulaService.getRuleFormulaResult(s, n, r.uid), d = S(l) ? Pe((p = (m = u == null ? void 0 : u[0]) == null ? void 0 : m.result) == null ? void 0 : p[0][0]) : fe(l);
     return this.parseCellValue(i).every((_) => d.includes(_));
   }
   generateRuleName() {
@@ -1049,7 +1049,7 @@ class ct extends q {
     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) ? xe((v = (_ = c == null ? void 0 : c[0]) == null ? void 0 : _.result) == null ? void 0 : v[0][0]) : ge(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, _, v;
@@ -1058,7 +1058,7 @@ class ct extends q {
     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) ? xe((v = (_ = c == null ? void 0 : c[0]) == null ? void 0 : _.result) == null ? void 0 : v[0][0]) : ge(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(",");
@@ -1071,12 +1071,12 @@ class ct extends q {
     }), s;
   }
 }
-class ga extends q {
+class _a extends k {
   constructor() {
     super(...arguments);
     g(this, "id", T.TEXT_LENGTH);
     g(this, "title", "dataValidation.textLength.title");
-    g(this, "_lexerTreeBuilder", this.injector.get(K));
+    g(this, "_lexerTreeBuilder", this.injector.get(Z));
     g(this, "operators", [
       h.BETWEEN,
       h.EQUAL,
@@ -1088,7 +1088,7 @@ class ga extends q {
       h.NOT_EQUAL
     ]);
     g(this, "scopes", ["sheet"]);
-    g(this, "_customFormulaService", this.injector.get(U));
+    g(this, "_customFormulaService", this.injector.get(P));
   }
   _isFormulaOrInt(e) {
     return !V.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
@@ -1099,7 +1099,7 @@ class ga extends q {
       return {
         success: !1
       };
-    const s = V.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Oe.includes(i), u = this.localeService.t("dataValidation.validFail.number");
+    const s = V.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Ae.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: s && n,
       formula1: s ? void 0 : u,
@@ -1133,28 +1133,28 @@ class ga extends q {
   generateRuleErrorMessage(e, t) {
     if (!e.operator)
       return this.titleStr;
-    const { transformedFormula1: r, transformedFormula2: i } = we(this._lexerTreeBuilder, e, t);
-    return `${this.localeService.t(At[e.operator]).replace(se, r != null ? r : "").replace(ne, i != null ? i : "")}`;
+    const { transformedFormula1: r, transformedFormula2: i } = De(this._lexerTreeBuilder, e, t);
+    return `${this.localeService.t(Dt[e.operator]).replace(le, r != null ? r : "").replace(ue, i != null ? i : "")}`;
   }
 }
-function ht(o) {
+function gt(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;
 }
-function Ie(o, a, e, t, r = "command", i = !0) {
-  const s = t.get(K), n = t.get(Q), l = [], u = [], d = t.get(F), c = t.get(O), m = qe(c, { unitId: o, subUnitId: a });
+function be(o, a, e, t, r = "command", i = !0) {
+  const s = t.get(Z), n = t.get(G), l = [], u = [], d = t.get(F), c = t.get(O), m = Ye(c, { unitId: o, subUnitId: a });
   if (!m)
     return {
       redoMutations: l,
       undoMutations: u
     };
-  const { worksheet: p } = m, _ = new fe();
+  const { worksheet: p } = m, _ = new Se();
   let v = !1;
   function M(f, w) {
-    i && f.forEach(($) => {
-      b.foreach($, (B, H) => {
-        const z = p.getCellRaw(B, H), Z = ut(z);
-        (ht(z) || Z === w) && (v = !0, _.setValue(B, H, {
+    i && f.forEach((H) => {
+      b.foreach(H, (B, W) => {
+        const U = p.getCellRaw(B, W), J = ct(U);
+        (gt(U) || J === w) && !(U != null && U.p) && (v = !0, _.setValue(B, W, {
           v: w,
           p: null
         }));
@@ -1165,7 +1165,7 @@ function Ie(o, a, e, t, r = "command", i = !0) {
     switch (f.type) {
       case "delete":
         l.push({
-          id: I.id,
+          id: A.id,
           params: {
             unitId: o,
             subUnitId: a,
@@ -1184,9 +1184,9 @@ function Ie(o, a, e, t, r = "command", i = !0) {
         });
         break;
       case "update": {
-        if (le(f.rule.type, n)) {
-          const $ = f.oldRanges[0].startRow, B = f.oldRanges[0].startColumn, H = f.newRanges[0].startRow, z = f.newRanges[0].startColumn, Z = H - $, ue = z - B, de = S(f.rule.formula1) ? s.moveFormulaRefOffset(f.rule.formula1, ue, Z) : f.rule.formula1, ce = S(f.rule.formula2) ? s.moveFormulaRefOffset(f.rule.formula2, ue, Z) : f.rule.formula2;
-          de !== f.rule.formula1 || ce !== f.rule.formula2 || !tt(f.newRanges, f.oldRanges) ? (l.push({
+        if (de(f.rule.type, n)) {
+          const H = f.oldRanges[0].startRow, B = f.oldRanges[0].startColumn, W = f.newRanges[0].startRow, U = f.newRanges[0].startColumn, J = W - H, 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({
             id: E.id,
             params: {
               unitId: o,
@@ -1195,8 +1195,8 @@ function Ie(o, a, e, t, r = "command", i = !0) {
               payload: {
                 type: y.ALL,
                 payload: {
-                  formula1: de,
-                  formula2: ce,
+                  formula1: he,
+                  formula2: me,
                   ranges: f.newRanges
                 }
               }
@@ -1284,7 +1284,7 @@ function Ie(o, a, e, t, r = "command", i = !0) {
             source: r
           }
         }), u.unshift({
-          id: I.id,
+          id: A.id,
           params: {
             unitId: o,
             subUnitId: a,
@@ -1292,23 +1292,23 @@ function Ie(o, a, e, t, r = "command", i = !0) {
             source: r
           }
         }), f.rule.type === T.CHECKBOX) {
-          const $ = d.getValidator(T.CHECKBOX).parseFormulaSync(f.rule, o, a);
-          M(f.rule.ranges, $.originFormula2);
+          const H = d.getValidator(T.CHECKBOX).parseFormulaSync(f.rule, o, a);
+          M(f.rule.ranges, H.originFormula2);
         }
         break;
       }
     }
   }), v) {
     const f = {
-      id: ie.id,
+      id: se.id,
       params: {
         unitId: o,
         subUnitId: a,
         cellValue: _.getData()
       }
     }, w = {
-      id: ie.id,
-      params: rt(t, f.params)
+      id: se.id,
+      params: ot(t, f.params)
     };
     l.push(f), u.push(w);
   }
@@ -1317,31 +1317,31 @@ function Ie(o, a, e, t, r = "command", i = !0) {
     undoMutations: u
   };
 }
-const _a = {
-  type: Y.COMMAND,
+const pa = {
+  type: K.COMMAND,
   id: "sheet.command.updateDataValidationRuleRange",
   handler(o, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, ranges: r, ruleId: i } = a, s = o.get(F), n = o.get(x), l = o.get(X);
+    const { unitId: e, subUnitId: t, ranges: r, ruleId: i } = a, s = o.get(F), n = o.get(x), 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 } = Ie(e, t, c, o);
+    const c = d.diff(s.getRules(e, t)), { redoMutations: m, undoMutations: p } = be(e, t, c, o);
     return l.pushUndoRedo({
       undoMutations: p,
       redoMutations: m,
       unitID: e
-    }), Ce(m, n), !0;
+    }), Ie(m, n), !0;
   }
-}, pa = {
-  type: Y.COMMAND,
+}, fa = {
+  type: K.COMMAND,
   id: "sheet.command.addDataValidation",
   handler(o, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, rule: r } = a, i = o.get(F), s = o.get(x), n = o.get(X), l = i.getRuleObjectMatrix(e, t).clone();
+    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();
     l.addRule(r);
     const u = l.diff(i.getRules(e, t)), d = i.getValidator(r.type), c = {
       unitId: e,
@@ -1350,12 +1350,12 @@ const _a = {
         ...r,
         ...d == null ? void 0 : d.normalizeFormula(r, e, t)
       }
-    }, { redoMutations: m, undoMutations: p } = Ie(e, t, u, o);
+    }, { redoMutations: m, undoMutations: p } = be(e, t, u, o);
     return m.push({
       id: L.id,
       params: c
     }), p.unshift({
-      id: I.id,
+      id: A.id,
       params: {
         unitId: e,
         subUnitId: t,
@@ -1365,16 +1365,16 @@ const _a = {
       unitID: e,
       redoMutations: m,
       undoMutations: p
-    }), Ce(m, s), !0;
+    }), Ie(m, s), !0;
   }
-}, fa = {
-  type: Y.COMMAND,
+}, va = {
+  type: K.COMMAND,
   id: "sheets.command.update-data-validation-setting",
   // eslint-disable-next-line max-lines-per-function
   handler(o, a) {
     if (!a)
       return !1;
-    const e = o.get(x), t = o.get(X), 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(x), t = o.get(z), r = o.get(F), i = o.get(G), { 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);
@@ -1403,55 +1403,57 @@ const _a = {
       ruleId: l,
       payload: {
         type: y.SETTING,
-        payload: Dt(c)
+        payload: bt(c)
       }
     }, M = [{
       id: E.id,
       params: v
     }];
     if (u.type === T.CHECKBOX) {
-      const w = c.ranges, $ = o.get(O), B = qe($, { unitId: s, subUnitId: n });
+      const w = c.ranges, H = o.get(O), B = Ye(H, { unitId: s, subUnitId: n });
       if (B) {
-        const H = new fe(), { worksheet: z } = B, { formula2: Z = Re, formula1: ue = ve } = c, { formula2: de = Re, formula1: ce = ve } = u;
-        w.forEach((ft) => {
-          b.foreach(ft, (Ae, De) => {
-            const Ye = z.getCellRaw(Ae, De), Xe = ut(Ye);
-            ht(Ye) || Xe === String(Z) ? H.setValue(Ae, De, {
-              v: de,
+        const W = new Se(), { worksheet: U } = B, { formula2: J = Me, formula1: ce = Ve } = c, { formula2: he = Me, formula1: me = Ve } = u;
+        let Le = !1;
+        if (w.forEach((ge) => {
+          b.foreach(ge, (ae, xe) => {
+            const j = U.getCellRaw(ae, xe), Ke = ct(j);
+            (gt(j) || Ke === String(J)) && !(j != null && j.p) ? (W.setValue(ae, xe, {
+              v: he,
               p: null
-            }) : Xe === String(ue) && H.setValue(Ae, De, {
-              v: ce,
+            }), Le = !0) : Ke === String(ce) && !(j != null && j.p) && (W.setValue(ae, xe, {
+              v: me,
               p: null
-            });
+            }), Le = !0);
           });
-        });
-        const ke = {
-          id: ie.id,
-          params: {
-            unitId: s,
-            subUnitId: n,
-            cellValue: H.getData()
-          }
-        }, pt = {
-          id: ie.id,
-          params: rt(o, ke.params)
-        };
-        _.push(ke), M.push(pt);
+        }), Le) {
+          const ge = {
+            id: se.id,
+            params: {
+              unitId: s,
+              subUnitId: n,
+              cellValue: W.getData()
+            }
+          }, ae = {
+            id: se.id,
+            params: ot(o, ge.params)
+          };
+          _.push(ge), M.push(ae);
+        }
       }
     }
-    return Ce(_, e).result ? (t.pushUndoRedo({
+    return Ie(_, e).result ? (t.pushUndoRedo({
       unitID: s,
       redoMutations: _,
       undoMutations: M
     }), !0) : !1;
   }
-}, va = {
-  type: Y.COMMAND,
+}, Ra = {
+  type: K.COMMAND,
   id: "sheets.command.update-data-validation-options",
   handler(o, a) {
     if (!a)
       return !1;
-    const e = o.get(x), t = o.get(X), r = o.get(F), { unitId: i, subUnitId: s, ruleId: n, options: l } = a, u = r.getRuleById(i, s, n);
+    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);
     if (!u)
       return !1;
     const d = {
@@ -1471,7 +1473,7 @@ const _a = {
       ruleId: n,
       payload: {
         type: y.OPTIONS,
-        payload: bt(u)
+        payload: Lt(u)
       }
     }, p = [{
       id: E.id,
@@ -1483,35 +1485,35 @@ const _a = {
       undoMutations: p
     }), e.executeCommand(E.id, d), !0;
   }
-}, Ra = {
-  type: Y.COMMAND,
+}, Sa = {
+  type: K.COMMAND,
   id: "sheets.command.clear-range-data-validation",
   handler(o, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, ranges: r } = a, i = o.get(x), s = o.get(O), n = qe(s, { unitId: e, subUnitId: t }), l = o.get(F);
+    const { unitId: e, subUnitId: t, ranges: r } = a, i = o.get(x), s = o.get(O), n = Ye(s, { unitId: e, subUnitId: t }), l = o.get(F);
     if (!n) return !1;
-    const u = o.get(X), d = l.getRuleObjectMatrix(e, t).clone();
+    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 } = Ie(e, t, c, o);
+    const c = d.diff(l.getRules(e, t)), { redoMutations: m, undoMutations: p } = be(e, t, c, o);
     return u.pushUndoRedo({
       unitID: e,
       redoMutations: m,
       undoMutations: p
-    }), Ce(m, i).result;
+    }), Ie(m, i).result;
   }
-}, Sa = {
-  type: Y.COMMAND,
+}, Va = {
+  type: K.COMMAND,
   id: "sheet.command.remove-all-data-validation",
   handler(o, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t } = a, r = o.get(x), i = o.get(F), s = o.get(X), n = [...i.getRules(e, t)], l = {
+    const { unitId: e, subUnitId: t } = a, r = o.get(x), 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: I.id,
+      id: A.id,
       params: l
     }], d = [{
       id: L.id,
@@ -1525,9 +1527,9 @@ const _a = {
       redoMutations: u,
       undoMutations: d,
       unitID: e
-    }), r.executeCommand(I.id, l), !0;
+    }), r.executeCommand(A.id, l), !0;
   }
-}, Va = (o, a) => {
+}, Ma = (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);
@@ -1552,14 +1554,14 @@ const _a = {
       index: e.getRuleIndex(t, r, i)
     }
   }];
-}, Ma = {
-  type: Y.COMMAND,
+}, ya = {
+  type: K.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(X), n = o.get(F), l = [{
-      id: I.id,
+    const { unitId: e, subUnitId: t, ruleId: r } = a, i = o.get(x), s = o.get(z), n = o.get(F), l = [{
+      id: A.id,
       params: a
     }], u = [{
       id: L.id,
@@ -1576,20 +1578,20 @@ const _a = {
       undoMutations: u,
       redoMutations: l,
       unitID: a.unitId
-    }), i.executeCommand(I.id, a), !0;
+    }), i.executeCommand(A.id, a), !0;
   }
-}, ya = "sheets-data-validation.config", Ea = {};
+}, Ea = "sheets-data-validation.config", tt = {};
 var Ta = Object.defineProperty, Fa = Object.getOwnPropertyDescriptor, Na = (o, a, e, t) => {
   for (var r = t > 1 ? void 0 : t ? Fa(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
   return t && r && Ta(a, e, r), r;
-}, Be = (o, a) => (e, t) => a(e, t, o);
-let Ve = class extends P {
+}, $e = (o, a) => (e, t) => a(e, t, o);
+let Ee = class extends $ {
   constructor(a, e, t) {
     super();
     g(this, "_disposableMap", /* @__PURE__ */ new Map());
     g(this, "registerRule", (a, e, t) => {
-      le(t.type, this._validatorRegistryService) && this.register(a, e, t);
+      de(t.type, this._validatorRegistryService) && this.register(a, e, t);
     });
     this._dataValidationModel = a, this._formulaRefRangeService = e, this._validatorRegistryService = t, this._initRefRange();
   }
@@ -1606,15 +1608,17 @@ let Ve = class extends P {
             params: {
               unitId: a,
               subUnitId: e,
-              rule: t
+              rule: t,
+              source: "patched"
             }
           }],
           redos: [{
-            id: I.id,
+            id: A.id,
             params: {
               unitId: a,
               subUnitId: e,
-              ruleId: t.uid
+              ruleId: t.uid,
+              source: "patched"
             }
           }]
         };
@@ -1632,7 +1636,8 @@ let Ve = class extends P {
               formula1: m.formulas[0],
               formula2: m.formulas[1]
             }
-          }
+          },
+          source: "patched"
         }
       }), c.push({
         id: E.id,
@@ -1647,7 +1652,8 @@ let Ve = class extends P {
               formula1: i,
               formula2: s
             }
-          }
+          },
+          source: "patched"
         }
       });
       for (let p = 1; p < u.length; p++) {
@@ -1663,14 +1669,16 @@ let Ve = class extends P {
               formula1: _.formulas[0],
               formula2: _.formulas[1],
               ranges: _.ranges
-            }
+            },
+            source: "patched"
           }
         }), c.push({
-          id: I.id,
+          id: A.id,
           params: {
             unitId: a,
             subUnitId: e,
-            ruleId: v
+            ruleId: v,
+            source: "patched"
           }
         });
       }
@@ -1708,24 +1716,24 @@ let Ve = class extends P {
           }
         }
       })
-    ), this.disposeWithMe(We(() => {
+    ), this.disposeWithMe(qe(() => {
       this._disposableMap.forEach((e) => {
         e.dispose();
       }), this._disposableMap.clear();
     }));
   }
 };
-Ve = Na([
-  Be(0, R(F)),
-  Be(1, R(nt)),
-  Be(2, R(Q))
-], Ve);
-var mt = /* @__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))(mt || {}), Ca = Object.defineProperty, Oa = Object.getOwnPropertyDescriptor, wa = (o, a, e, t) => {
+Ee = Na([
+  $e(0, R(F)),
+  $e(1, R(ut)),
+  $e(2, R(G))
+], 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 || {}), Ca = Object.defineProperty, Oa = Object.getOwnPropertyDescriptor, wa = (o, a, e, t) => {
   for (var r = t > 1 ? void 0 : t ? Oa(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
   return t && r && Ca(a, e, r), r;
-}, Ue = (o, a) => (e, t) => a(e, t, o);
-let Me = class extends P {
+}, He = (o, a) => (e, t) => a(e, t, o);
+let Te = class extends $ {
   constructor(o, a, e) {
     super(), this._univerInstanceService = o, this._permissionService = a, this._lexerTreeBuilder = e;
   }
@@ -1738,14 +1746,14 @@ let Me = class extends P {
       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 = Gt(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 v = u == null ? void 0 : u.getSheetId();
-        if (!this._permissionService.getPermissionPoint(new xt(d, v).id)) return !1;
+        if (!this._permissionService.getPermissionPoint(new Bt(d, v).id)) return !1;
       }
       if (!u)
         return !1;
@@ -1753,35 +1761,36 @@ let Me = class extends P {
       for (let v = c; v <= m; v++)
         for (let M = p; M <= _; M++) {
           const f = (t = (e = u.getCell(v, M)) == null ? void 0 : e.selectionProtection) == null ? void 0 : t[0];
-          if ((f == null ? void 0 : f[mt.View]) === !1)
+          if ((f == null ? void 0 : f[_t.View]) === !1)
             return !1;
         }
     }
     return !0;
   }
 };
-Me = wa([
-  Ue(0, O),
-  Ue(1, Et),
-  Ue(2, R(K))
-], Me);
+Te = wa([
+  He(0, O),
+  He(1, Et),
+  He(2, R(Z))
+], Te);
 var Ia = Object.defineProperty, Aa = Object.getOwnPropertyDescriptor, Da = (o, a, e, t) => {
   for (var r = t > 1 ? void 0 : t ? Aa(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
   return t && r && Ia(a, e, r), r;
-}, J = (o, a) => (e, t) => a(e, t, o);
-let ye = class extends P {
+}, ee = (o, a) => (e, t) => a(e, t, o);
+let Fe = class extends $ {
   constructor(a, e, t, r, i, s) {
     super();
     g(this, "_disposableMap", /* @__PURE__ */ new Map());
     g(this, "registerRule", (a, e, t) => {
-      le(t.type, this._validatorRegistryService) || (this.register(a, e, t), this.registerFormula(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();
   }
   _getIdWithUnitId(a, e, t) {
     return `${a}_${e}_${t}`;
   }
+  // eslint-disable-next-line max-lines-per-function
   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) => {
@@ -1803,7 +1812,8 @@ let ye = class extends P {
             formula2: m.formula2,
             [d]: c
           }
-        }
+        },
+        source: "patched"
       }, v = {
         unitId: a,
         subUnitId: e,
@@ -1815,7 +1825,8 @@ let ye = class extends P {
             formula1: m.formula1,
             formula2: m.formula2
           }
-        }
+        },
+        source: "patched"
       }, M = [
         {
           id: E.id,
@@ -1854,8 +1865,8 @@ let ye = class extends P {
   register(a, e, t) {
     var l;
     const r = (u) => {
-      const d = [...t.ranges], m = d.map((_) => Ut(_, u)).filter((_) => !!_).flat();
-      if (tt(m, d))
+      const d = [...t.ranges], m = d.map((_) => Pt(_, u)).filter((_) => !!_).flat();
+      if (rt(m, d))
         return { redos: [], undos: [] };
       if (m.length) {
         const _ = {
@@ -1882,7 +1893,7 @@ let ye = class extends P {
         }];
         return { redos: v, undos: M };
       } else {
-        const _ = { unitId: a, subUnitId: e, ruleId: t.uid }, v = [{ id: I.id, params: _ }], M = Va(this._injector, _);
+        const _ = { unitId: a, subUnitId: e, ruleId: t.uid }, v = [{ id: A.id, params: _ }], M = Ma(this._injector, _);
         return { redos: v, undos: M };
       }
     }, i = [];
@@ -1920,27 +1931,27 @@ let ye = class extends P {
           }
         }
       })
-    ), this.disposeWithMe(We(() => {
+    ), this.disposeWithMe(qe(() => {
       this._disposableMap.forEach((e) => {
         e.forEach((t) => t());
       }), this._disposableMap.clear();
     }));
   }
 };
-ye = Da([
-  J(0, R(F)),
-  J(1, R(je)),
-  J(2, R(Bt)),
-  J(3, R(k)),
-  J(4, R(nt)),
-  J(5, R(Q))
-], ye);
+Fe = Da([
+  ee(0, R(F)),
+  ee(1, R(Ge)),
+  ee(2, R(Ut)),
+  ee(3, R(X)),
+  ee(4, R(ut)),
+  ee(5, R(G))
+], Fe);
 var ba = Object.defineProperty, La = Object.getOwnPropertyDescriptor, xa = (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 = (t ? s(a, e, r) : s(r)) || r);
   return t && r && ba(a, e, r), r;
-}, Pe = (o, a) => (e, t) => a(e, t, o);
-let Ee = class extends P {
+}, We = (o, a) => (e, t) => a(e, t, o);
+let Ne = class extends $ {
   constructor(o, a, e) {
     super(), this._sheetInterceptorService = o, this._univerInstanceService = a, this._sheetDataValidationModel = e, this._initSheetChange();
   }
@@ -1949,7 +1960,7 @@ let Ee = class extends P {
       this._sheetInterceptorService.interceptCommand({
         getMutations: (o) => {
           var a;
-          if (o.id === Pt.id) {
+          if (o.id === $t.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: [] };
@@ -1972,7 +1983,7 @@ let Ee = class extends P {
             };
             return {
               redos: [{
-                id: I.id,
+                id: A.id,
                 params: l
               }],
               undos: [{
@@ -1987,12 +1998,12 @@ let Ee = class extends P {
     );
   }
 };
-Ee = xa([
-  Pe(0, R(it)),
-  Pe(1, R(O)),
-  Pe(2, R(F))
-], Ee);
-class Ba extends q {
+Ne = xa([
+  We(0, R(st)),
+  We(1, R(O)),
+  We(2, R(F))
+], Ne);
+class Ba extends k {
   constructor() {
     super(...arguments);
     g(this, "id", T.ANY);
@@ -2020,14 +2031,14 @@ class Ba extends q {
     return this.localeService.t("dataValidation.any.error");
   }
 }
-class Ua extends q {
+class Ua extends k {
   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(U));
+    g(this, "_customFormulaService", this.injector.get(P));
   }
   validatorFormula(e, t, r) {
     const i = S(e.formula1);
@@ -2055,7 +2066,7 @@ class Ua extends q {
     return this.localeService.t("dataValidation.custom.ruleName").replace("{FORMULA1}", (t = e.formula1) != null ? t : "");
   }
 }
-class Pa extends ct {
+class Pa extends mt {
   constructor() {
     super(...arguments);
     g(this, "id", T.LIST_MULTIPLE);
@@ -2064,11 +2075,11 @@ class Pa extends ct {
     g(this, "skipDefaultFontRender", () => !0);
   }
 }
-class $a extends q {
+class $a extends k {
   constructor() {
     super(...arguments);
-    g(this, "_customFormulaService", this.injector.get(U));
-    g(this, "_lexerTreeBuilder", this.injector.get(K));
+    g(this, "_customFormulaService", this.injector.get(P));
+    g(this, "_lexerTreeBuilder", this.injector.get(Z));
     g(this, "id", T.WHOLE);
     g(this, "title", "dataValidation.whole.title");
     g(this, "operators", [
@@ -2087,14 +2098,14 @@ class $a extends q {
     return !V.isBlank(e) && (S(e) || !Number.isNaN(+e) && Number.isInteger(+e));
   }
   async isValidType(e, t, r) {
-    const { value: i } = e, s = Se(i);
+    const { value: i } = e, s = ye(i);
     return !Number.isNaN(s) && Number.isInteger(s);
   }
   transform(e, t, r) {
     const { value: i } = e;
     return {
       ...e,
-      value: Se(i)
+      value: ye(i)
     };
   }
   _parseNumber(e) {
@@ -2114,7 +2125,7 @@ class $a extends q {
       return {
         success: !1
       };
-    const s = V.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Oe.includes(i), u = this.localeService.t("dataValidation.validFail.number");
+    const s = V.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = V.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Ae.includes(i), u = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: s && n,
       formula1: s ? void 0 : u,
@@ -2127,16 +2138,16 @@ class $a extends q {
   generateRuleErrorMessage(e, t) {
     if (!e.operator)
       return this.titleStr;
-    const { transformedFormula1: r, transformedFormula2: i } = we(this._lexerTreeBuilder, e, t);
-    return `${this.localeService.t(dt[e.operator]).replace(se, r != null ? r : "").replace(ne, i != null ? i : "")}`;
+    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 : "")}`;
   }
 }
 var Ha = Object.defineProperty, Wa = Object.getOwnPropertyDescriptor, ja = (o, a, e, t) => {
   for (var r = t > 1 ? void 0 : t ? Wa(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
   return t && r && Ha(a, e, r), r;
-}, ee = (o, a) => (e, t) => a(e, t, o);
-let Te = class extends Ft {
+}, te = (o, a) => (e, t) => a(e, t, o);
+let Ce = 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();
   }
@@ -2146,30 +2157,30 @@ let Te = class extends Ft {
   _registerValidators() {
     [
       Ba,
-      da,
+      ca,
       $a,
-      ga,
-      ua,
-      oa,
-      ct,
+      _a,
+      da,
+      sa,
+      mt,
       Pa,
       Ua
     ].forEach((o) => {
       const a = this._injector.createInstance(o);
-      this.disposeWithMe(this._dataValidatorRegistryService.register(a)), this.disposeWithMe(We(() => this._injector.delete(o)));
+      this.disposeWithMe(this._dataValidatorRegistryService.register(a)), this.disposeWithMe(qe(() => this._injector.delete(o)));
     });
   }
   _initCommandInterceptor() {
     this._sheetInterceptorService.interceptCommand({
       getMutations: (o) => {
         var a;
-        if (o.id === $t.id) {
+        if (o.id === Ht.id) {
           const e = this._univerInstanceService.getCurrentUnitForType(N.UNIVER_SHEET), t = e.getUnitId(), r = e.getActiveSheet();
           if (!r)
             throw new Error("No active sheet found");
           const i = r.getSheetId(), s = (a = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : a.map((c) => c.range), n = this._sheetDataValidationModel.getRuleObjectMatrix(t, i).clone();
           s && n.removeRange(s);
-          const l = n.diff(this._sheetDataValidationModel.getRules(t, i)), { redoMutations: u, undoMutations: d } = Ie(t, i, l, this._injector, "patched");
+          const l = n.diff(this._sheetDataValidationModel.getRules(t, i)), { redoMutations: u, undoMutations: d } = be(t, i, l, this._injector, "patched");
           return {
             undos: d,
             redos: u
@@ -2183,20 +2194,20 @@ let Te = class extends Ft {
     });
   }
 };
-Te = ja([
-  ee(0, O),
-  ee(1, R(Q)),
-  ee(2, R(je)),
-  ee(3, R(ot)),
-  ee(4, R(it)),
-  ee(5, R(F))
-], Te);
+Ce = ja([
+  te(0, O),
+  te(1, R(G)),
+  te(2, R(Ge)),
+  te(3, R(nt)),
+  te(4, R(st)),
+  te(5, R(F))
+], Ce);
 var Qa = Object.defineProperty, qa = Object.getOwnPropertyDescriptor, Ga = (o, a, e, t) => {
   for (var r = t > 1 ? void 0 : t ? qa(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
   return t && r && Qa(a, e, r), r;
-}, _e = (o, a) => (e, t) => a(e, t, o);
-let Fe = class extends P {
+}, ve = (o, a) => (e, t) => a(e, t, o);
+let Oe = class extends $ {
   constructor(o, a, e, t) {
     super(), this._univerInstanceService = o, this._sheetDataValidationModel = a, this._dataValidationCacheService = e, this._lifecycleService = t, this._initRecalculate();
   }
@@ -2217,7 +2228,7 @@ let Fe = class extends P {
         });
       });
     };
-    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Ht(() => this._lifecycleService.lifecycle$.pipe(ze((a) => a === Ke.Rendered)))).subscribe(o)), this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(ze(() => this._lifecycleService.stage >= Ke.Rendered), Ct(20)).subscribe(o));
+    this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Wt(() => this._lifecycleService.lifecycle$.pipe(Ze((a) => a === ze.Rendered)))).subscribe(o)), this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.pipe(Ze(() => this._lifecycleService.stage >= ze.Rendered), Ct(20)).subscribe(o));
   }
   async _validatorByCell(o, a, e, t) {
     const r = o.getUnitId(), i = a.getSheetId();
@@ -2289,66 +2300,70 @@ let Fe = class extends P {
     return this.getDataValidations(o, a, e)[0];
   }
 };
-Fe = Ga([
-  _e(0, O),
-  _e(1, R(F)),
-  _e(2, R(j)),
-  _e(3, R(Nt))
-], Fe);
-var gt = Object.defineProperty, ka = Object.getOwnPropertyDescriptor, Ya = (o, a, e) => a in o ? gt(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e, Xa = (o, a, e, t) => {
+Oe = Ga([
+  ve(0, O),
+  ve(1, R(F)),
+  ve(2, R(q)),
+  ve(3, R(Nt))
+], Oe);
+var pt = Object.defineProperty, ka = Object.getOwnPropertyDescriptor, Ya = (o, a, e) => a in o ? pt(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e, Xa = (o, a, e, t) => {
   for (var r = t > 1 ? void 0 : t ? ka(a, e) : a, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = (t ? s(a, e, r) : s(r)) || r);
-  return t && r && gt(a, e, r), r;
-}, $e = (o, a) => (e, t) => a(e, t, o), _t = (o, a, e) => Ya(o, typeof a != "symbol" ? a + "" : a, e);
-let Ne = class extends wt {
-  constructor(o = Ea, a, e, t) {
+  return t && r && pt(a, e, r), r;
+}, je = (o, a) => (e, t) => a(e, t, o), ft = (o, a, e) => Ya(o, typeof a != "symbol" ? a + "" : a, e);
+let we = class extends wt {
+  constructor(o = tt, a, e, t) {
     super(), this._config = o, this._injector = a, this._commandService = e, this._configService = t;
-    const { ...r } = this._config;
-    this._configService.setConfig(ya, r);
+    const { ...r } = It(
+      {},
+      tt,
+      this._config
+    );
+    this._configService.setConfig(Ea, r);
   }
   onStarting() {
     [
-      [j],
-      [k],
-      [U],
-      [Fe],
+      [q],
+      [X],
+      [P],
+      [Oe],
       [F],
+      [Ce],
       [Te],
-      [Me],
-      [Ee],
-      [ye],
-      [Ve]
+      [Ne],
+      [Fe],
+      [Ee]
     ].forEach((o) => {
       this._injector.add(o);
     }), [
-      pa,
-      _a,
       fa,
+      pa,
       va,
-      Ma,
-      Sa,
-      Ra
+      Ra,
+      ya,
+      Va,
+      Sa
     ].forEach((o) => {
       this._commandService.registerCommand(o);
-    }), this._injector.get(j), this._injector.get(Fe), this._injector.get(Ve), this._injector.get(ye);
+    }), this._injector.get(q), this._injector.get(Oe), this._injector.get(Ee), this._injector.get(Fe);
   }
   onReady() {
-    this._injector.get(Ee);
+    this._injector.get(Ne);
   }
   onRendered() {
-    this._injector.get(Te), this._injector.get(Me);
+    this._injector.get(Ce), this._injector.get(Te);
   }
 };
-_t(Ne, "pluginName", Gt);
-_t(Ne, "type", N.UNIVER_SHEET);
-Ne = Xa([
-  Ot(Lt),
-  $e(1, R(je)),
-  $e(2, x),
-  $e(3, It)
-], Ne);
+ft(we, "pluginName", kt);
+ft(we, "type", N.UNIVER_SHEET);
+we = Xa([
+  Ot(xt),
+  je(1, R(Ge)),
+  je(2, x),
+  je(3, At)
+], we);
 function or(o) {
-  const e = o.get(ot).getCurrentSelections().map((i) => i.range);
+  const e = o.get(nt).getCurrentSelections().map((i) => i.range);
   return {
     uid: V.generateRandomId(6),
     type: T.DECIMAL,
@@ -2358,35 +2373,35 @@ function or(o) {
   };
 }
 export {
-  pa as AddSheetDataValidationCommand,
-  ve as CHECKBOX_FORMULA_1,
-  Re as CHECKBOX_FORMULA_2,
-  oa as CheckboxValidator,
-  Ra as ClearRangeDataValidationCommand,
-  Gt as DATA_VALIDATION_PLUGIN_NAME,
-  j as DataValidationCacheService,
-  U as DataValidationCustomFormulaService,
-  Me as DataValidationFormulaController,
-  k as DataValidationFormulaService,
-  ua as DateValidator,
+  fa as AddSheetDataValidationCommand,
+  Ve as CHECKBOX_FORMULA_1,
+  Me as CHECKBOX_FORMULA_2,
+  sa as CheckboxValidator,
+  Sa as ClearRangeDataValidationCommand,
+  kt as DATA_VALIDATION_PLUGIN_NAME,
+  q as DataValidationCacheService,
+  P as DataValidationCustomFormulaService,
+  Te as DataValidationFormulaController,
+  X as DataValidationFormulaService,
+  da as DateValidator,
   Pa as ListMultipleValidator,
-  ct as ListValidator,
-  Sa as RemoveSheetAllDataValidationCommand,
-  Ma as RemoveSheetDataValidationCommand,
+  mt as ListValidator,
+  Va as RemoveSheetAllDataValidationCommand,
+  ya as RemoveSheetDataValidationCommand,
   F as SheetDataValidationModel,
-  Fe as SheetsDataValidationValidatorService,
-  Ne as UniverSheetsDataValidationPlugin,
-  va as UpdateSheetDataValidationOptionsCommand,
-  _a as UpdateSheetDataValidationRangeCommand,
-  fa as UpdateSheetDataValidationSettingCommand,
+  Oe as SheetsDataValidationValidatorService,
+  we as UniverSheetsDataValidationPlugin,
+  Ra as UpdateSheetDataValidationOptionsCommand,
+  pa as UpdateSheetDataValidationRangeCommand,
+  va as UpdateSheetDataValidationSettingCommand,
   or as createDefaultNewRule,
-  ge as deserializeListOptions,
-  oe as getCellValueOrigin,
+  fe as deserializeListOptions,
+  ne as getCellValueOrigin,
   ir as getDataValidationCellValue,
-  Ie as getDataValidationDiffMutations,
-  he as getFormulaCellData,
-  re as getFormulaResult,
+  be as getDataValidationDiffMutations,
+  _e as getFormulaCellData,
+  oe as getFormulaResult,
   C as isLegalFormulaResult,
   rr as serializeListOptions,
-  me as transformCheckboxValue
+  pe as transformCheckboxValue
 };