@univerjs/sheets-data-validation 0.2.4 → 0.2.5

package/lib/es/index.js

@@ -1,21 +1,19 @@
-var vo = Object.defineProperty;
-var _o = (a, t, e) => t in a ? vo(a, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[t] = e;
-var S = (a, t, e) => _o(a, typeof t != "symbol" ? t + "" : t, e);
-import { DEFAULT_EMPTY_DOCUMENT_VALUE as hr, Disposable as ue, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as So, DisposableCollection as mr, IUniverInstanceService as J, UniverInstanceType as re, toDisposable as Oa, CommandType as Ie, ICommandService as ee, ObjectMatrix as Ye, Range as W, isFormulaString as A, ThemeService as Ro, VerticalAlign as me, HorizontalAlign as Be, createInternalEditorID as Na, LocaleService as ie, OnLifecycle as ve, LifecycleStages as _e, IPermissionService as Co, DataValidationType as H, Tools as X, DataValidationOperator as V, DataValidationErrorStyle as ct, UndoCommand as Vo, RedoCommand as Mo, isUnitRangesEqual as Io, isValidRange as wo, debounce as yo, shallowEqual as za, DataValidationRenderMode as le, WrapStrategy as se, DocumentDataModel as Do, BooleanNumber as st, Rectangle as Ue, IUndoRedoService as kt, sequenceExecuteAsync as fr, sequenceExecute as Ta, RxDisposable as Fa, DataValidationStatus as Ce, isRangesEqual as Eo, queryObjectMatrix as Zt, IResourceManagerService as bo, DependentOn as pr, Plugin as gr } from "@univerjs/core";
-import { ICommandService as Ql, LocaleService as Zl, Plugin as Jl } from "@univerjs/core";
-import { Inject as w, Injector as De, Optional as Oo } from "@wendellhu/redi";
-import { DataValidatorRegistryService as we, DataValidationModel as q, BaseDataValidator as Xe, DataValidatorRegistryScope as No, TWO_FORMULA_OPERATOR_COUNT as To, getRuleOptions as pa, getRuleSetting as ga, RemoveDataValidationCommand as vr, createDefaultNewRule as _r, RemoveAllDataValidationCommand as Fo, TextLengthErrorTitleMap as Lo, AddDataValidationMutation as va, RemoveDataValidationMutation as Ft, UpdateRuleType as fe, UpdateDataValidationMutation as pe, removeDataValidationUndoFactory as Po, DataValidationManager as Ao, AddDataValidationCommand as xo, UniverDataValidationPlugin as Sr } from "@univerjs/data-validation";
-import { getSheetCommandTarget as Yt, SetRangeValuesCommand as La, WorksheetViewPermission as jo, SetRangeValuesMutation as Lt, SetRangeValuesUndoMutationFactory as Rr, WorkbookEditablePermission as _a, WorksheetSetCellStylePermission as Sa, WorksheetEditPermission as Ra, RangeProtectionPermissionEditPoint as Ca, SheetInterceptorService as Pa, INTERCEPTOR_POINT as Cr, SheetsSelectionsService as $o, ClearSelectionAllCommand as Bo, RefRangeService as Uo, handleCommonDefaultRangeChangeWithEffectRefCommands as Ho, UniverSheetsPlugin as Vr } from "@univerjs/sheets";
-import { SheetCanvasPopManagerService as Wo, IMarkSelectionService as ko, IEditorBridgeService as Aa, getCurrentRangeDisable$ as Yo, AutoHeightController as Mr, SheetSkeletonManagerService as Pt, HoverManagerService as Xo, CellAlertManagerService as Go, CellAlertType as qo, IAutoFillService as zo, APPLY_TYPE as It, virtualizeDiscreteRanges as Va, getAutoFillRepeatRange as Ko, COPY_TYPE as Ka, rangeToDiscreteRange as Qo, PREDEFINED_HOOK_NAME as wt, getRepeatRange as Qa, ISheetClipboardService as Zo, SheetPermissionInterceptorBaseController as Jo, UniverSheetsUIPlugin as Ir } from "@univerjs/sheets-ui";
-import { useObservable as Ge, ComponentManager as Vt, IZenZoneService as en, ISidebarService as wr, TextEditor as yr, useEvent as Dr, RangeSelector as tn, KeyCode as an, IDialogService as rn, MenuItemType as xa, MenuPosition as on, MenuGroup as nn, getMenuHiddenObservable as sn, IMenuService as ln } from "@univerjs/ui";
-import { IRenderManagerService as ja, fixLineWidthByScale as Za, Transform as dn, Checkbox as cn, DeviceInputEventType as un, getDocsSkeletonPageSize as yt, Rect as Er, DocumentViewModel as hn, DocumentSkeleton as mn, Documents as fn, FontCache as pn, Shape as gn, getFontStyleString as Ja } from "@univerjs/engine-render";
-import { Subject as br, filter as vn, BehaviorSubject as er, distinctUntilChanged as _n, debounceTime as He, bufferTime as Or } from "rxjs";
-import Ma, { forwardRef as Ne, useRef as $a, createElement as Te, useState as te, useMemo as Je, useEffect as et } from "react";
-import { useDependency as j } from "@wendellhu/redi/react-bindings";
-import { RegisterOtherFormulaService as Nr, FormulaRefRangeService as Sn } from "@univerjs/sheets-formula";
-import { FormLayout as Z, Input as je, RadioGroup as Ba, Radio as $e, DraggableList as Rn, Select as Ia, Checkbox as Ua, Button as We, RectPopup as Cn, Scrollbar as Vn, DatePanel as Mn } from "@univerjs/design";
+var _o = Object.defineProperty;
+var So = (a, t, e) => t in a ? _o(a, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[t] = e;
+var R = (a, t, e) => So(a, typeof t != "symbol" ? t + "" : t, e);
+import { DEFAULT_EMPTY_DOCUMENT_VALUE as mr, useDependency as j, Inject as w, Disposable as ue, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Ro, DisposableCollection as fr, IUniverInstanceService as J, UniverInstanceType as re, toDisposable as Oa, CommandType as Ie, ICommandService as ee, ObjectMatrix as Ye, Range as W, isFormulaString as A, ThemeService as Co, VerticalAlign as me, HorizontalAlign as Be, createInternalEditorID as Na, LocaleService as ie, OnLifecycle as ve, LifecycleStages as _e, IPermissionService as Vo, DataValidationType as H, Tools as X, DataValidationOperator as V, DataValidationErrorStyle as dt, UndoCommand as Mo, RedoCommand as Io, isUnitRangesEqual as wo, isValidRange as yo, debounce as Do, shallowEqual as Ka, Injector as De, DataValidationRenderMode as le, WrapStrategy as se, DocumentDataModel as Eo, BooleanNumber as it, Rectangle as Ue, IUndoRedoService as kt, sequenceExecuteAsync as pr, sequenceExecute as Ta, Optional as bo, RxDisposable as Fa, DataValidationStatus as Ce, isRangesEqual as Oo, queryObjectMatrix as Zt, IResourceManagerService as No, DependentOn as gr, Plugin as vr } from "@univerjs/core";
+import { ICommandService as zl, LocaleService as Kl, Plugin as Ql } from "@univerjs/core";
+import { DataValidatorRegistryService as we, DataValidationModel as q, BaseDataValidator as Xe, DataValidatorRegistryScope as To, TWO_FORMULA_OPERATOR_COUNT as Fo, getRuleOptions as pa, getRuleSetting as ga, RemoveDataValidationCommand as _r, createDefaultNewRule as Sr, RemoveAllDataValidationCommand as Lo, TextLengthErrorTitleMap as Po, AddDataValidationMutation as va, RemoveDataValidationMutation as Ft, UpdateRuleType as fe, UpdateDataValidationMutation as pe, removeDataValidationUndoFactory as Ao, DataValidationManager as xo, AddDataValidationCommand as jo, UniverDataValidationPlugin as Rr } from "@univerjs/data-validation";
+import { getSheetCommandTarget as Yt, SetRangeValuesCommand as La, WorksheetViewPermission as $o, SetRangeValuesMutation as Lt, SetRangeValuesUndoMutationFactory as Cr, WorkbookEditablePermission as _a, WorksheetSetCellStylePermission as Sa, WorksheetEditPermission as Ra, RangeProtectionPermissionEditPoint as Ca, SheetInterceptorService as Pa, INTERCEPTOR_POINT as Vr, SheetsSelectionsService as Bo, ClearSelectionAllCommand as Uo, RefRangeService as Ho, handleCommonDefaultRangeChangeWithEffectRefCommands as Wo, UniverSheetsPlugin as Mr } from "@univerjs/sheets";
+import { SheetCanvasPopManagerService as ko, IMarkSelectionService as Yo, IEditorBridgeService as Aa, getCurrentRangeDisable$ as Xo, AutoHeightController as Ir, SheetSkeletonManagerService as Pt, HoverManagerService as Go, CellAlertManagerService as qo, CellAlertType as zo, IAutoFillService as Ko, APPLY_TYPE as It, virtualizeDiscreteRanges as Va, getAutoFillRepeatRange as Qo, COPY_TYPE as Qa, rangeToDiscreteRange as Zo, PREDEFINED_HOOK_NAME as wt, getRepeatRange as Za, ISheetClipboardService as Jo, SheetPermissionInterceptorBaseController as en, UniverSheetsUIPlugin as wr } from "@univerjs/sheets-ui";
+import { useObservable as Ge, ComponentManager as Vt, IZenZoneService as tn, ISidebarService as yr, TextEditor as Dr, useEvent as Er, RangeSelector as an, KeyCode as rn, IDialogService as on, MenuItemType as xa, MenuPosition as nn, MenuGroup as sn, getMenuHiddenObservable as ln, IMenuService as dn } from "@univerjs/ui";
+import { IRenderManagerService as ja, fixLineWidthByScale as Ja, Transform as cn, Checkbox as un, DeviceInputEventType as hn, getDocsSkeletonPageSize as yt, Rect as br, DocumentViewModel as mn, DocumentSkeleton as fn, Documents as pn, FontCache as gn, Shape as vn, getFontStyleString as er } from "@univerjs/engine-render";
+import { Subject as Or, filter as $a, BehaviorSubject as tr, distinctUntilChanged as _n, debounceTime as He, bufferTime as Nr } from "rxjs";
+import Ma, { forwardRef as Ne, useRef as Ba, createElement as Te, useState as te, useMemo as Je, useEffect as et } from "react";
+import { RegisterOtherFormulaService as Tr, FormulaRefRangeService as Sn } from "@univerjs/sheets-formula";
+import { FormLayout as Z, Input as je, RadioGroup as Ua, Radio as $e, DraggableList as Rn, Select as Ia, Checkbox as Ha, Button as We, RectPopup as Cn, Scrollbar as Vn, DatePanel as Mn } from "@univerjs/design";
 import In from "clsx";
-import { LexerTreeBuilder as Ha, deserializeRangeWithSheet as Tr, serializeRange as Fr, isReferenceString as Wa, sequenceNodeType as wn, isFormulaTransformable as yn, transformFormula as tr } from "@univerjs/engine-formula";
+import { LexerTreeBuilder as Wa, deserializeRangeWithSheet as Fr, serializeRange as Lr, isReferenceString as ka, sequenceNodeType as wn, isFormulaTransformable as yn, transformFormula as ar } from "@univerjs/engine-formula";
 import Ve from "dayjs";
 import { numfmt as Dn } from "@univerjs/engine-numfmt";
 function ae(a) {
@@ -26,11 +24,11 @@ function ae(a) {
     if (t == null)
       return "";
     const e = t.dataStream;
-    return e.substring(e.length - 2, e.length) === hr ? e.substring(0, e.length - 2) : e;
+    return e.substring(e.length - 2, e.length) === mr ? e.substring(0, e.length - 2) : e;
   }
   return a == null ? void 0 : a.v;
 }
-function Lr(a) {
+function Pr(a) {
   var t;
   return String((t = ae(a)) != null ? t : "");
 }
@@ -38,7 +36,7 @@ var En = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : t
 function bn(a) {
   return a && a.__esModule && Object.prototype.hasOwnProperty.call(a, "default") ? a.default : a;
 }
-var Pr = { exports: {} }, Xt = {};
+var Ar = { exports: {} }, Xt = {};
 /**
  * @license React
  * react-jsx-runtime.production.min.js
@@ -49,7 +47,7 @@ var Pr = { exports: {} }, Xt = {};
  * LICENSE file in the root directory of this source tree.
  */
 var On = Ma, Nn = Symbol.for("react.element"), Tn = Symbol.for("react.fragment"), Fn = Object.prototype.hasOwnProperty, Ln = On.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, Pn = { key: !0, ref: !0, __self: !0, __source: !0 };
-function Ar(a, t, e) {
+function xr(a, t, e) {
   var r, o = {}, n = null, i = null;
   e !== void 0 && (n = "" + e), t.key !== void 0 && (n = "" + t.key), t.ref !== void 0 && (i = t.ref);
   for (r in t) Fn.call(t, r) && !Pn.hasOwnProperty(r) && (o[r] = t[r]);
@@ -57,10 +55,10 @@ function Ar(a, t, e) {
   return { $$typeof: Nn, type: a, key: n, ref: i, props: o, _owner: Ln.current };
 }
 Xt.Fragment = Tn;
-Xt.jsx = Ar;
-Xt.jsxs = Ar;
-Pr.exports = Xt;
-var v = Pr.exports;
+Xt.jsx = xr;
+Xt.jsxs = xr;
+Ar.exports = Xt;
+var v = Ar.exports;
 function An() {
   const a = j(Oe), t = Ge(a.activeDropdown$, a.activeDropdown), e = j(Vt);
   if (!t)
@@ -80,7 +78,7 @@ function An() {
     i
   );
 }
-const xr = "sheet.ui.dropdown";
+const jr = "sheet.ui.dropdown";
 var xn = Object.defineProperty, jn = Object.getOwnPropertyDescriptor, $n = (a, t, e, r) => {
   for (var o = r > 1 ? void 0 : r ? jn(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
@@ -89,11 +87,11 @@ var xn = Object.defineProperty, jn = Object.getOwnPropertyDescriptor, $n = (a, t
 let Oe = class extends ue {
   constructor(t, e, r, o, n, i) {
     super();
-    S(this, "_activeDropdown");
-    S(this, "_activeDropdown$", new br());
-    S(this, "_currentPopup", null);
-    S(this, "activeDropdown$", this._activeDropdown$.asObservable());
-    S(this, "_zenVisible", !1);
+    R(this, "_activeDropdown");
+    R(this, "_activeDropdown$", new Or());
+    R(this, "_currentPopup", null);
+    R(this, "activeDropdown$", this._activeDropdown$.asObservable());
+    R(this, "_zenVisible", !1);
     this._canvasPopupManagerService = t, this._univerInstanceService = e, this._dataValidatorRegistryService = r, this._zenZoneService = o, this._renderManagerService = n, this._dataValidationModel = i, this._init(), this.disposeWithMe(() => {
       this._activeDropdown$.complete();
     });
@@ -111,11 +109,11 @@ let Oe = class extends ue {
     if (this._currentPopup && this._currentPopup.dispose(), this._zenVisible)
       return;
     this._activeDropdown = t, this._activeDropdown$.next(this._activeDropdown);
-    const i = this._renderManagerService.getRenderById(So), s = this._canvasPopupManagerService.attachPopupToCell(
+    const i = this._renderManagerService.getRenderById(Ro), s = this._canvasPopupManagerService.attachPopupToCell(
       o,
       n,
       {
-        componentKey: xr,
+        componentKey: jr,
         onClickOutside: () => {
           e && this.hideDropdown();
         },
@@ -125,7 +123,7 @@ let Oe = class extends ue {
     );
     if (!s)
       throw new Error("[DataValidationDropdownManagerService]: cannot show dropdown!");
-    const l = new mr();
+    const l = new fr();
     l.add(s), l.add({
       dispose: () => {
         var d, c;
@@ -166,10 +164,10 @@ let Oe = class extends ue {
   }
 };
 Oe = $n([
-  qe(0, w(Wo)),
+  qe(0, w(ko)),
   qe(1, J),
   qe(2, w(we)),
-  qe(3, en),
+  qe(3, tn),
   qe(4, ja),
   qe(5, w(q))
 ], Oe);
@@ -177,18 +175,18 @@ var Bn = Object.defineProperty, Un = Object.getOwnPropertyDescriptor, Hn = (a, t
   for (var o = r > 1 ? void 0 : r ? Un(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
   return r && o && Bn(t, e, o), o;
-}, ar = (a, t) => (e, r) => t(e, r, a);
+}, rr = (a, t) => (e, r) => t(e, r, a);
 let Me = class extends ue {
   constructor(t, e) {
     super();
-    S(this, "_open$", new er(!1));
-    S(this, "open$", this._open$.pipe(_n()));
-    S(this, "_activeRule");
-    S(this, "_activeRule$", new er(void 0));
-    S(this, "activeRule$", this._activeRule$.asObservable());
-    S(this, "_closeDisposable", null);
+    R(this, "_open$", new tr(!1));
+    R(this, "open$", this._open$.pipe(_n()));
+    R(this, "_activeRule");
+    R(this, "_activeRule$", new tr(void 0));
+    R(this, "activeRule$", this._activeRule$.asObservable());
+    R(this, "_closeDisposable", null);
     this._univerInstanceService = t, this._sidebarService = e, this.disposeWithMe(
-      this._univerInstanceService.getCurrentTypeOfUnit$(re.UNIVER_SHEET).pipe(vn((r) => !r)).subscribe(() => {
+      this._univerInstanceService.getCurrentTypeOfUnit$(re.UNIVER_SHEET).pipe($a((r) => !r)).subscribe(() => {
         this.close();
       })
     );
@@ -220,16 +218,16 @@ let Me = class extends ue {
   }
 };
 Me = Hn([
-  ar(0, J),
-  ar(1, wr)
+  rr(0, J),
+  rr(1, yr)
 ], Me);
-const jr = "DataValidationPanel", ot = {
+const $r = "DataValidationPanel", rt = {
   id: "data-validation.operation.open-validation-panel",
   type: Ie.OPERATION,
   handler(a, t) {
     if (!t)
       return !1;
-    const { ruleId: e, isAdd: r } = t, o = a.get(Me), n = a.get(q), i = a.get(J), s = a.get(wr), l = Yt(i);
+    const { ruleId: e, isAdd: r } = t, o = a.get(Me), n = a.get(q), i = a.get(J), s = a.get(yr), l = Yt(i);
     if (!l) return !1;
     const { unitId: d, subUnitId: c } = l, u = e ? n.getRuleById(d, c, e) : void 0;
     o.open(), o.setActiveRule(u && {
@@ -239,24 +237,24 @@ const jr = "DataValidationPanel", ot = {
     });
     const f = s.open({
       header: { title: r ? "dataValidation.panel.addTitle" : "dataValidation.panel.title" },
-      children: { label: jr },
+      children: { label: $r },
       width: 312,
       onClose: () => o.close()
     });
     return o.setCloseDisposable(f), !0;
   }
-}, ka = {
+}, Ya = {
   id: "data-validation.operation.close-validation-panel",
   type: Ie.OPERATION,
   handler(a) {
     return a.get(Me).close(), !0;
   }
-}, $r = {
+}, Br = {
   id: "data-validation.operation.toggle-validation-panel",
   type: Ie.OPERATION,
   handler(a) {
     const t = a.get(ee), e = a.get(Me);
-    return e.open(), e.isOpen ? t.executeCommand(ka.id) : t.executeCommand(ot.id), !0;
+    return e.open(), e.isOpen ? t.executeCommand(Ya.id) : t.executeCommand(rt.id), !0;
   }
 }, Gt = {
   type: Ie.OPERATION,
@@ -272,16 +270,16 @@ const jr = "DataValidationPanel", ot = {
       i
     ), !0;
   }
-}, Br = {
+}, Ur = {
   type: Ie.OPERATION,
   id: "sheet.operation.hide-data-validation-dropdown",
   handler(a, t) {
     return t ? (a.get(Oe).hideDropdown(), !0) : !1;
   }
 };
-class nt {
+class ot {
   constructor() {
-    S(this, "_cacheMatrix", /* @__PURE__ */ new Map());
+    R(this, "_cacheMatrix", /* @__PURE__ */ new Map());
   }
   _ensureCache(t, e) {
     let r = this._cacheMatrix.get(t);
@@ -351,7 +349,7 @@ var Wn = Object.defineProperty, kn = Object.getOwnPropertyDescriptor, Yn = (a, t
 let ce = class extends ue {
   constructor(t, e, r) {
     super();
-    S(this, "_formulaRuleMap", /* @__PURE__ */ new Map());
+    R(this, "_formulaRuleMap", /* @__PURE__ */ new Map());
     this._registerOtherFormulaService = t, this._dataValidationCacheService = e, this._dataValidationModel = r, this._initFormulaResultHandler();
   }
   _initFormulaResultHandler() {
@@ -448,8 +446,8 @@ let ce = class extends ue {
   }
 };
 ce = Yn([
-  Jt(0, w(Nr)),
-  Jt(1, w(nt)),
+  Jt(0, w(Tr)),
+  Jt(1, w(ot)),
   Jt(2, w(q))
 ], ce);
 function ge(a) {
@@ -520,7 +518,7 @@ let wa = class {
     const u = this._themeService.getCurrentTheme();
     if (!c.skipDefaultFontRender(d, l, { unitId: n, subUnitId: i }))
       return;
-    const f = c.parseFormulaSync(d, n, i), { formula1: p } = f, m = this._calc(s, e), { a: h, d: R } = a.getTransform(), g = Za(m.left, h), C = Za(m.top, R), _ = dn.create().composeMatrix({
+    const f = c.parseFormulaSync(d, n, i), { formula1: p } = f, h = this._calc(s, e), { a: m, d: S } = a.getTransform(), g = Ja(h.left, m), C = Ja(h.top, S), _ = cn.create().composeMatrix({
       left: g,
       top: C,
       scaleX: 1,
@@ -535,7 +533,7 @@ let wa = class {
     const D = _.getMatrix();
     a.transform(D[0], D[1], D[2], D[3], D[4], D[5]);
     const E = ((L = e == null ? void 0 : e.fs) != null ? L : 10) * 1.6, x = String(l) === String(p), T = u.hyacinth500;
-    cn.drawWith(a, {
+    un.drawWith(a, {
       checked: x,
       width: E,
       height: E,
@@ -574,13 +572,13 @@ let wa = class {
 wa = qn([
   ea(0, ee),
   ea(1, w(ce)),
-  ea(2, w(Ro))
+  ea(2, w(Co))
 ], wa);
 function zn(a) {
   var l;
   const { unitId: t, subUnitId: e, value: r, onChange: o, showError: n, validResult: i } = a, s = n ? i == null ? void 0 : i.formula1 : "";
   return /* @__PURE__ */ v.jsx(Z, { error: s, children: /* @__PURE__ */ v.jsx(
-    yr,
+    Dr,
     {
       value: (l = r == null ? void 0 : r.formula1) != null ? l : "",
       id: Na(`dataValidation-custom-formula-${t}-${e}`),
@@ -666,12 +664,12 @@ var he = function() {
       t.indexOf(r[o]) < 0 && Object.prototype.propertyIsEnumerable.call(a, r[o]) && (e[r[o]] = a[r[o]]);
   return e;
 }, Fe = Ne(function(a, t) {
-  var e = a.icon, r = a.id, o = a.className, n = a.extend, i = ii(a, ["icon", "id", "className", "extend"]), s = "univerjs-icon univerjs-icon-".concat(r, " ").concat(o || "").trim(), l = $a("_".concat(di()));
-  return Ur(e, "".concat(r), { defIds: e.defIds, idSuffix: l.current }, he({ ref: t, className: s }, i), n);
+  var e = a.icon, r = a.id, o = a.className, n = a.extend, i = ii(a, ["icon", "id", "className", "extend"]), s = "univerjs-icon univerjs-icon-".concat(r, " ").concat(o || "").trim(), l = Ba("_".concat(di()));
+  return Hr(e, "".concat(r), { defIds: e.defIds, idSuffix: l.current }, he({ ref: t, className: s }, i), n);
 });
-function Ur(a, t, e, r, o) {
+function Hr(a, t, e, r, o) {
   return Te(a.tag, he(he({ key: t }, si(a, e, o)), r), (li(a, e).children || []).map(function(n, i) {
-    return Ur(n, "".concat(t, "-").concat(a.tag, "-").concat(i), e, void 0, o);
+    return Hr(n, "".concat(t, "-").concat(a.tag, "-").concat(i), e, void 0, o);
   }));
 }
 function si(a, t, e) {
@@ -693,63 +691,63 @@ function di() {
   return Math.random().toString(36).substring(2, 8);
 }
 Fe.displayName = "UniverIcon";
-var ci = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M14.1544 3.75557C14.3887 3.98988 14.3887 4.36978 14.1544 4.6041L6.51409 12.2444C6.40157 12.3569 6.24896 12.4201 6.08983 12.4201C5.9307 12.4201 5.77808 12.3569 5.66556 12.2444L1.84541 8.42425C1.6111 8.18993 1.6111 7.81003 1.84541 7.57572C2.07973 7.34141 2.45963 7.34141 2.69394 7.57572L6.08983 10.9716L13.3059 3.75557C13.5402 3.52126 13.9201 3.52126 14.1544 3.75557Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Hr = Ne(function(a, t) {
+var ci = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M14.1544 3.75557C14.3887 3.98988 14.3887 4.36978 14.1544 4.6041L6.51409 12.2444C6.40157 12.3569 6.24896 12.4201 6.08983 12.4201C5.9307 12.4201 5.77808 12.3569 5.66556 12.2444L1.84541 8.42425C1.6111 8.18993 1.6111 7.81003 1.84541 7.57572C2.07973 7.34141 2.45963 7.34141 2.69394 7.57572L6.08983 10.9716L13.3059 3.75557C13.5402 3.52126 13.9201 3.52126 14.1544 3.75557Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Wr = Ne(function(a, t) {
   return Te(Fe, Object.assign({}, a, {
     id: "check-mark-single",
     ref: t,
     icon: ci
   }));
 });
-Hr.displayName = "CheckMarkSingle";
-var ui = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M1.4917 3.07803C1.4917 2.19437 2.20804 1.47803 3.0917 1.47803H5.6917C6.57536 1.47803 7.2917 2.19437 7.2917 3.07803V5.67803C7.2917 6.56168 6.57535 7.27803 5.6917 7.27803H3.0917C2.20804 7.27803 1.4917 6.56168 1.4917 5.67803V3.07803ZM3.0917 2.67803C2.87078 2.67803 2.6917 2.85711 2.6917 3.07803V5.67803C2.6917 5.89894 2.87079 6.07803 3.0917 6.07803H5.6917C5.91261 6.07803 6.0917 5.89894 6.0917 5.67803V3.07803C6.0917 2.85711 5.91261 2.67803 5.6917 2.67803H3.0917Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M14.6175 2.45279C14.8518 2.68711 14.8518 3.06701 14.6175 3.30132L11.6151 6.30365C11.3957 6.52307 11.0451 6.53897 10.8067 6.34031L8.80915 4.67566C8.55458 4.46352 8.52019 4.08518 8.73233 3.83062 8.94447 3.57605 9.32281 3.54166 9.57737 3.7538L11.154 5.06767 13.769 2.45278C14.0033 2.21847 14.3832 2.21848 14.6175 2.45279zM14.1175 9.19746C14.3518 9.43178 14.3518 9.81168 14.1175 10.046L12.5418 11.6217 14.1175 13.1975C14.3518 13.4318 14.3518 13.8117 14.1175 14.046 13.8832 14.2803 13.5033 14.2803 13.269 14.046L11.6933 12.4703 10.1175 14.046C9.88321 14.2803 9.50331 14.2803 9.269 14.046 9.03468 13.8117 9.03468 13.4318 9.269 13.1975L10.8447 11.6217 9.269 10.046C9.03468 9.81168 9.03468 9.43178 9.269 9.19746 9.50331 8.96315 9.88321 8.96315 10.1175 9.19746L11.6933 10.7732 13.269 9.19746C13.5033 8.96315 13.8832 8.96315 14.1175 9.19746z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M3.0917 8.72168C2.20804 8.72168 1.4917 9.43802 1.4917 10.3217V12.9217C1.4917 13.8053 2.20804 14.5217 3.0917 14.5217H5.6917C6.57535 14.5217 7.2917 13.8053 7.2917 12.9217V10.3217C7.2917 9.43802 6.57536 8.72168 5.6917 8.72168H3.0917ZM2.6917 10.3217C2.6917 10.1008 2.87078 9.92168 3.0917 9.92168H5.6917C5.91261 9.92168 6.0917 10.1008 6.0917 10.3217V12.9217C6.0917 13.1426 5.91261 13.3217 5.6917 13.3217H3.0917C2.87079 13.3217 2.6917 13.1426 2.6917 12.9217V10.3217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Wr = Ne(function(a, t) {
+Wr.displayName = "CheckMarkSingle";
+var ui = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M1.4917 3.07803C1.4917 2.19437 2.20804 1.47803 3.0917 1.47803H5.6917C6.57536 1.47803 7.2917 2.19437 7.2917 3.07803V5.67803C7.2917 6.56168 6.57535 7.27803 5.6917 7.27803H3.0917C2.20804 7.27803 1.4917 6.56168 1.4917 5.67803V3.07803ZM3.0917 2.67803C2.87078 2.67803 2.6917 2.85711 2.6917 3.07803V5.67803C2.6917 5.89894 2.87079 6.07803 3.0917 6.07803H5.6917C5.91261 6.07803 6.0917 5.89894 6.0917 5.67803V3.07803C6.0917 2.85711 5.91261 2.67803 5.6917 2.67803H3.0917Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M14.6175 2.45279C14.8518 2.68711 14.8518 3.06701 14.6175 3.30132L11.6151 6.30365C11.3957 6.52307 11.0451 6.53897 10.8067 6.34031L8.80915 4.67566C8.55458 4.46352 8.52019 4.08518 8.73233 3.83062 8.94447 3.57605 9.32281 3.54166 9.57737 3.7538L11.154 5.06767 13.769 2.45278C14.0033 2.21847 14.3832 2.21848 14.6175 2.45279zM14.1175 9.19746C14.3518 9.43178 14.3518 9.81168 14.1175 10.046L12.5418 11.6217 14.1175 13.1975C14.3518 13.4318 14.3518 13.8117 14.1175 14.046 13.8832 14.2803 13.5033 14.2803 13.269 14.046L11.6933 12.4703 10.1175 14.046C9.88321 14.2803 9.50331 14.2803 9.269 14.046 9.03468 13.8117 9.03468 13.4318 9.269 13.1975L10.8447 11.6217 9.269 10.046C9.03468 9.81168 9.03468 9.43178 9.269 9.19746 9.50331 8.96315 9.88321 8.96315 10.1175 9.19746L11.6933 10.7732 13.269 9.19746C13.5033 8.96315 13.8832 8.96315 14.1175 9.19746z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M3.0917 8.72168C2.20804 8.72168 1.4917 9.43802 1.4917 10.3217V12.9217C1.4917 13.8053 2.20804 14.5217 3.0917 14.5217H5.6917C6.57535 14.5217 7.2917 13.8053 7.2917 12.9217V10.3217C7.2917 9.43802 6.57536 8.72168 5.6917 8.72168H3.0917ZM2.6917 10.3217C2.6917 10.1008 2.87078 9.92168 3.0917 9.92168H5.6917C5.91261 9.92168 6.0917 10.1008 6.0917 10.3217V12.9217C6.0917 13.1426 5.91261 13.3217 5.6917 13.3217H3.0917C2.87079 13.3217 2.6917 13.1426 2.6917 12.9217V10.3217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, kr = Ne(function(a, t) {
   return Te(Fe, Object.assign({}, a, {
     id: "data-validation-single",
     ref: t,
     icon: ui
   }));
 });
-Wr.displayName = "DataValidationSingle";
-var hi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.3313 1.4667C5.3313 1.13533 5.59993.866699 5.9313.866699H10.069C10.4004.866699 10.669 1.13533 10.669 1.4667 10.669 1.79807 10.4004 2.0667 10.069 2.0667H5.9313C5.59993 2.0667 5.3313 1.79807 5.3313 1.4667zM1.09985 3.64443C1.09985 3.31306 1.36848 3.04443 1.69985 3.04443H14.2999C14.6312 3.04443 14.8999 3.31306 14.8999 3.64443 14.8999 3.9758 14.6312 4.24443 14.2999 4.24443H1.69985C1.36848 4.24443 1.09985 3.9758 1.09985 3.64443zM6.12398 8.30171C6.35829 8.0674 6.73819 8.0674 6.97251 8.30171L8.00007 9.32928 9.02764 8.30171C9.26195 8.0674 9.64185 8.0674 9.87617 8.30171 10.1105 8.53603 10.1105 8.91593 9.87617 9.15024L8.8486 10.1778 9.87617 11.2054C10.1105 11.4397 10.1105 11.8196 9.87617 12.0539 9.64185 12.2882 9.26195 12.2882 9.02764 12.0539L8.00007 11.0263 6.97251 12.0539C6.73819 12.2882 6.35829 12.2882 6.12398 12.0539 5.88966 11.8196 5.88966 11.4397 6.12398 11.2054L7.15154 10.1778 6.12398 9.15024C5.88966 8.91593 5.88966 8.53603 6.12398 8.30171z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M4.75332 5.22217C3.86966 5.22217 3.15332 5.93851 3.15332 6.82217V12.5331C3.15332 13.9691 4.31738 15.1332 5.75332 15.1332H10.2465C11.6825 15.1332 12.8465 13.9691 12.8465 12.5331V6.82217C12.8465 5.93851 12.1302 5.22217 11.2465 5.22217H4.75332ZM4.35332 6.82217C4.35332 6.60125 4.53241 6.42217 4.75332 6.42217H11.2465C11.4674 6.42217 11.6465 6.60125 11.6465 6.82217V12.5331C11.6465 13.3063 11.0197 13.9332 10.2465 13.9332H5.75332C4.98012 13.9332 4.35332 13.3063 4.35332 12.5331V6.82217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Ya = Ne(function(a, t) {
+kr.displayName = "DataValidationSingle";
+var hi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.3313 1.4667C5.3313 1.13533 5.59993.866699 5.9313.866699H10.069C10.4004.866699 10.669 1.13533 10.669 1.4667 10.669 1.79807 10.4004 2.0667 10.069 2.0667H5.9313C5.59993 2.0667 5.3313 1.79807 5.3313 1.4667zM1.09985 3.64443C1.09985 3.31306 1.36848 3.04443 1.69985 3.04443H14.2999C14.6312 3.04443 14.8999 3.31306 14.8999 3.64443 14.8999 3.9758 14.6312 4.24443 14.2999 4.24443H1.69985C1.36848 4.24443 1.09985 3.9758 1.09985 3.64443zM6.12398 8.30171C6.35829 8.0674 6.73819 8.0674 6.97251 8.30171L8.00007 9.32928 9.02764 8.30171C9.26195 8.0674 9.64185 8.0674 9.87617 8.30171 10.1105 8.53603 10.1105 8.91593 9.87617 9.15024L8.8486 10.1778 9.87617 11.2054C10.1105 11.4397 10.1105 11.8196 9.87617 12.0539 9.64185 12.2882 9.26195 12.2882 9.02764 12.0539L8.00007 11.0263 6.97251 12.0539C6.73819 12.2882 6.35829 12.2882 6.12398 12.0539 5.88966 11.8196 5.88966 11.4397 6.12398 11.2054L7.15154 10.1778 6.12398 9.15024C5.88966 8.91593 5.88966 8.53603 6.12398 8.30171z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M4.75332 5.22217C3.86966 5.22217 3.15332 5.93851 3.15332 6.82217V12.5331C3.15332 13.9691 4.31738 15.1332 5.75332 15.1332H10.2465C11.6825 15.1332 12.8465 13.9691 12.8465 12.5331V6.82217C12.8465 5.93851 12.1302 5.22217 11.2465 5.22217H4.75332ZM4.35332 6.82217C4.35332 6.60125 4.53241 6.42217 4.75332 6.42217H11.2465C11.4674 6.42217 11.6465 6.60125 11.6465 6.82217V12.5331C11.6465 13.3063 11.0197 13.9332 10.2465 13.9332H5.75332C4.98012 13.9332 4.35332 13.3063 4.35332 12.5331V6.82217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Xa = Ne(function(a, t) {
   return Te(Fe, Object.assign({}, a, {
     id: "delete-single",
     ref: t,
     icon: hi
   }));
 });
-Ya.displayName = "DeleteSingle";
-var mi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M8.6 1.99991C8.60001 1.66854 8.33138 1.39991 8.00001 1.3999C7.66864 1.3999 7.40001 1.66853 7.4 1.9999L7.39996 7.3999H1.9999C1.66853 7.3999 1.3999 7.66853 1.3999 7.9999C1.3999 8.33127 1.66853 8.5999 1.9999 8.5999H7.39995L7.3999 13.9999C7.3999 14.3313 7.66853 14.5999 7.9999 14.5999C8.33127 14.5999 8.5999 14.3313 8.5999 13.9999L8.59995 8.5999H13.9999C14.3313 8.5999 14.5999 8.33127 14.5999 7.9999C14.5999 7.66853 14.3313 7.3999 13.9999 7.3999H8.59996L8.6 1.99991Z" } }] }, kr = Ne(function(a, t) {
+Xa.displayName = "DeleteSingle";
+var mi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M8.6 1.99991C8.60001 1.66854 8.33138 1.39991 8.00001 1.3999C7.66864 1.3999 7.40001 1.66853 7.4 1.9999L7.39996 7.3999H1.9999C1.66853 7.3999 1.3999 7.66853 1.3999 7.9999C1.3999 8.33127 1.66853 8.5999 1.9999 8.5999H7.39995L7.3999 13.9999C7.3999 14.3313 7.66853 14.5999 7.9999 14.5999C8.33127 14.5999 8.5999 14.3313 8.5999 13.9999L8.59995 8.5999H13.9999C14.3313 8.5999 14.5999 8.33127 14.5999 7.9999C14.5999 7.66853 14.3313 7.3999 13.9999 7.3999H8.59996L8.6 1.99991Z" } }] }, Yr = Ne(function(a, t) {
   return Te(Fe, Object.assign({}, a, {
     id: "increase-single",
     ref: t,
     icon: mi
   }));
 });
-kr.displayName = "IncreaseSingle";
-var fi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M11.3536 6.14645C11.5488 6.34171 11.5488 6.65829 11.3536 6.85355L8.35355 9.85355C8.15829 10.0488 7.84171 10.0488 7.64645 9.85355L4.64645 6.85355C4.45118 6.65829 4.45118 6.34171 4.64645 6.14645C4.84171 5.95118 5.15829 5.95118 5.35355 6.14645L8 8.79289L10.6464 6.14645C10.8417 5.95118 11.1583 5.95118 11.3536 6.14645Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Yr = Ne(function(a, t) {
+Yr.displayName = "IncreaseSingle";
+var fi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M11.3536 6.14645C11.5488 6.34171 11.5488 6.65829 11.3536 6.85355L8.35355 9.85355C8.15829 10.0488 7.84171 10.0488 7.64645 9.85355L4.64645 6.85355C4.45118 6.65829 4.45118 6.34171 4.64645 6.14645C4.84171 5.95118 5.15829 5.95118 5.35355 6.14645L8 8.79289L10.6464 6.14645C10.8417 5.95118 11.1583 5.95118 11.3536 6.14645Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Xr = Ne(function(a, t) {
   return Te(Fe, Object.assign({}, a, {
     id: "more-down-single",
     ref: t,
     icon: fi
   }));
 });
-Yr.displayName = "MoreDownSingle";
-var pi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M4.64645 9.85355C4.45118 9.65829 4.45118 9.34171 4.64645 9.14645L7.64645 6.14645C7.84171 5.95118 8.15829 5.95118 8.35355 6.14645L11.3536 9.14645C11.5488 9.34171 11.5488 9.65829 11.3536 9.85355C11.1583 10.0488 10.8417 10.0488 10.6464 9.85355L8 7.20711L5.35355 9.85355C5.15829 10.0488 4.84171 10.0488 4.64645 9.85355Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Xr = Ne(function(a, t) {
+Xr.displayName = "MoreDownSingle";
+var pi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M4.64645 9.85355C4.45118 9.65829 4.45118 9.34171 4.64645 9.14645L7.64645 6.14645C7.84171 5.95118 8.15829 5.95118 8.35355 6.14645L11.3536 9.14645C11.5488 9.34171 11.5488 9.65829 11.3536 9.85355C11.1583 10.0488 10.8417 10.0488 10.6464 9.85355L8 7.20711L5.35355 9.85355C5.15829 10.0488 4.84171 10.0488 4.64645 9.85355Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Gr = Ne(function(a, t) {
   return Te(Fe, Object.assign({}, a, {
     id: "more-up-single",
     ref: t,
     icon: pi
   }));
 });
-Xr.displayName = "MoreUpSingle";
-var gi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "mask", attrs: { id: "mask0_622_8", style: { maskType: "alpha" }, width: 16, height: 16, x: 0, y: 0, maskUnits: "userSpaceOnUse" }, children: [{ tag: "path", attrs: { fill: "#D9D9D9", d: "M0 0H16V16H0z" } }] }, { tag: "g", attrs: { fill: "currentColor", mask: "url(#mask0_622_8)" }, children: [{ tag: "path", attrs: { d: "M6 5C6.55228 5 7 4.55228 7 4 7 3.44772 6.55228 3 6 3 5.44772 3 5 3.44772 5 4 5 4.55228 5.44772 5 6 5zM6 9C6.55228 9 7 8.55229 7 8 7 7.44772 6.55228 7 6 7 5.44772 7 5 7.44772 5 8 5 8.55229 5.44772 9 6 9zM7 12C7 12.5523 6.55228 13 6 13 5.44772 13 5 12.5523 5 12 5 11.4477 5.44772 11 6 11 6.55228 11 7 11.4477 7 12zM10 5C10.5523 5 11 4.55228 11 4 11 3.44772 10.5523 3 10 3 9.44771 3 9 3.44772 9 4 9 4.55228 9.44771 5 10 5zM11 8C11 8.55229 10.5523 9 10 9 9.44771 9 9 8.55229 9 8 9 7.44772 9.44771 7 10 7 10.5523 7 11 7.44772 11 8zM10 13C10.5523 13 11 12.5523 11 12 11 11.4477 10.5523 11 10 11 9.44771 11 9 11.4477 9 12 9 12.5523 9.44771 13 10 13z" } }] }] }, Gr = Ne(function(a, t) {
+Gr.displayName = "MoreUpSingle";
+var gi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "mask", attrs: { id: "mask0_622_8", style: { maskType: "alpha" }, width: 16, height: 16, x: 0, y: 0, maskUnits: "userSpaceOnUse" }, children: [{ tag: "path", attrs: { fill: "#D9D9D9", d: "M0 0H16V16H0z" } }] }, { tag: "g", attrs: { fill: "currentColor", mask: "url(#mask0_622_8)" }, children: [{ tag: "path", attrs: { d: "M6 5C6.55228 5 7 4.55228 7 4 7 3.44772 6.55228 3 6 3 5.44772 3 5 3.44772 5 4 5 4.55228 5.44772 5 6 5zM6 9C6.55228 9 7 8.55229 7 8 7 7.44772 6.55228 7 6 7 5.44772 7 5 7.44772 5 8 5 8.55229 5.44772 9 6 9zM7 12C7 12.5523 6.55228 13 6 13 5.44772 13 5 12.5523 5 12 5 11.4477 5.44772 11 6 11 6.55228 11 7 11.4477 7 12zM10 5C10.5523 5 11 4.55228 11 4 11 3.44772 10.5523 3 10 3 9.44771 3 9 3.44772 9 4 9 4.55228 9.44771 5 10 5zM11 8C11 8.55229 10.5523 9 10 9 9.44771 9 9 8.55229 9 8 9 7.44772 9.44771 7 10 7 10.5523 7 11 7.44772 11 8zM10 13C10.5523 13 11 12.5523 11 12 11 11.4477 10.5523 11 10 11 9.44771 11 9 11.4477 9 12 9 12.5523 9.44771 13 10 13z" } }] }] }, qr = Ne(function(a, t) {
   return Te(Fe, Object.assign({}, a, {
     id: "sequence-single",
     ref: t,
     icon: gi
   }));
 });
-Gr.displayName = "SequenceSingle";
-function qr(a) {
+qr.displayName = "SequenceSingle";
+function zr(a) {
   return a.filter(Boolean).join(",");
 }
 function Ze(a) {
@@ -778,21 +776,21 @@ let tt = class extends ue {
       const n = t[o];
       if (typeof n == "string")
         continue;
-      const { token: i } = n, s = Tr(i), l = this._univerInstanceService.getCurrentUnitForType(re.UNIVER_SHEET);
+      const { token: i } = n, s = Fr(i), l = this._univerInstanceService.getCurrentUnitForType(re.UNIVER_SHEET);
       let d = l.getActiveSheet();
       const c = l.getUnitId();
       if (s.sheetName) {
         if (d = l.getSheetBySheetName(s.sheetName), !d)
           return !1;
-        const h = d == null ? void 0 : d.getSheetId();
-        if (!this._permissionService.getPermissionPoint(new jo(c, h).id)) return !1;
+        const m = d == null ? void 0 : d.getSheetId();
+        if (!this._permissionService.getPermissionPoint(new $o(c, m).id)) return !1;
       }
       if (!d)
         return !1;
-      const { startRow: u, endRow: f, startColumn: p, endColumn: m } = s.range;
-      for (let h = u; h <= f; h++)
-        for (let R = p; R <= m; R++) {
-          const g = (r = (e = d.getCell(h, R)) == null ? void 0 : e.selectionProtection) == null ? void 0 : r[0];
+      const { startRow: u, endRow: f, startColumn: p, endColumn: h } = s.range;
+      for (let m = u; m <= f; m++)
+        for (let S = p; S <= h; S++) {
+          const g = (r = (e = d.getCell(m, S)) == null ? void 0 : e.selectionProtection) == null ? void 0 : r[0];
           if ((g == null ? void 0 : g[At.View]) === !1)
             return !1;
         }
@@ -803,8 +801,8 @@ let tt = class extends ue {
 tt = Ri([
   ve(_e.Rendered, tt),
   ta(0, J),
-  ta(1, Co),
-  ta(2, w(Ha))
+  ta(1, Vo),
+  ta(2, w(Wa))
 ], tt);
 const Ci = [
   "#FFFFFF",
@@ -865,10 +863,10 @@ const Ci = [
       ) })
     }
   );
-}, rr = (a) => {
+}, or = (a) => {
   const { item: t, commonProps: e, style: r } = a, { onItemChange: o, onItemDelete: n } = e;
   return /* @__PURE__ */ v.jsxs("div", { className: de.dataValidationFormulaListItem, style: r, children: [
-    t.isRef ? null : /* @__PURE__ */ v.jsx("div", { className: In(de.dataValidationFormulaListItemDrag, "draggableHandle"), children: /* @__PURE__ */ v.jsx(Gr, {}) }),
+    t.isRef ? null : /* @__PURE__ */ v.jsx("div", { className: In(de.dataValidationFormulaListItemDrag, "draggableHandle"), children: /* @__PURE__ */ v.jsx(qr, {}) }),
     /* @__PURE__ */ v.jsx(
       Vi,
       {
@@ -888,12 +886,12 @@ const Ci = [
         }
       }
     ),
-    t.isRef ? null : /* @__PURE__ */ v.jsx("div", { className: de.dataValidationFormulaListItemIcon, children: /* @__PURE__ */ v.jsx(Ya, { onClick: () => n(t.id) }) })
+    t.isRef ? null : /* @__PURE__ */ v.jsx("div", { className: de.dataValidationFormulaListItemIcon, children: /* @__PURE__ */ v.jsx(Xa, { onClick: () => n(t.id) }) })
   ] });
 };
 function Mi(a) {
   const { value: t, onChange: e = () => {
-  }, unitId: r, subUnitId: o, validResult: n, showError: i, ruleId: s } = a, { formula1: l = "", formula2: d = "" } = t || {}, c = $a(null), [u, f] = te(() => A(l) ? "1" : "0"), [p, m] = te(u === "1" ? l : "="), [h, R] = te(u === "1" ? l : "="), g = j(ie), C = j(we), _ = j(q), M = j(tt), [I, D] = te(() => d.split(",")), E = C.getValidatorItem(H.LIST), [x, T] = te([]), [O, F] = te(""), L = i ? n == null ? void 0 : n.formula1 : "", B = Je(() => _.ruleChange$.pipe(He(16)), []), U = Ge(B), b = Dr(e);
+  }, unitId: r, subUnitId: o, validResult: n, showError: i, ruleId: s } = a, { formula1: l = "", formula2: d = "" } = t || {}, c = Ba(null), [u, f] = te(() => A(l) ? "1" : "0"), [p, h] = te(u === "1" ? l : "="), [m, S] = te(u === "1" ? l : "="), g = j(ie), C = j(we), _ = j(q), M = j(tt), [I, D] = te(() => d.split(",")), E = C.getValidatorItem(H.LIST), [x, T] = te([]), [O, F] = te(""), L = i ? n == null ? void 0 : n.formula1 : "", B = Je(() => _.ruleChange$.pipe(He(16)), []), U = Ge(B), b = Er(e);
   et(() => {
     (async () => {
       await new Promise((Y) => {
@@ -906,8 +904,8 @@ function Mi(a) {
       }
     })();
   }, [_, U, E, s, o, r]), et(() => {
-    A(l) && l !== h && (m(l), R(h));
-  }, [h, l]);
+    A(l) && l !== m && (h(l), S(m));
+  }, [m, l]);
   const [$, z] = te(() => {
     const N = u !== "1" ? Ze(l) : [], K = d.split(",");
     return N.map((Y, ne) => ({
@@ -917,7 +915,7 @@ function Mi(a) {
       id: X.generateRandomId(4)
     }));
   }), k = (N, K, Y) => {
-    const ne = $.find((it) => it.id === N);
+    const ne = $.find((nt) => nt.id === N);
     ne && (ne.label = K, ne.color = Y, z([...$]));
   }, y = (N) => {
     const K = $.findIndex((Y) => Y.id === N);
@@ -952,17 +950,17 @@ function Mi(a) {
       labelList: Y.label.split(","),
       item: Y
     })).forEach(({ item: Y, labelList: ne }) => {
-      ne.forEach((it) => {
-        N.has(it) || (N.add(it), K.push({
-          label: it,
+      ne.forEach((nt) => {
+        N.has(nt) || (N.add(nt), K.push({
+          label: nt,
           color: Y.color
         }));
       });
     }), b({
-      formula1: qr(K.map((Y) => Y.label)),
+      formula1: zr(K.map((Y) => Y.label)),
       formula2: K.map((Y) => Y.color === xe ? "" : Y.color).join(",")
     });
-  }, [$, b, u, h, I]);
+  }, [$, b, u, m, I]);
   const Le = Je(
     () => async (N) => {
       if (!A(N)) {
@@ -978,18 +976,18 @@ function Mi(a) {
       }), F("")) : (b == null || b({
         formula1: "",
         formula2: d
-      }), m("="), F(g.t("dataValidation.validFail.formulaError")));
+      }), h("="), F(g.t("dataValidation.validFail.formulaError")));
     },
     [d, b]
   );
   return /* @__PURE__ */ v.jsxs(v.Fragment, { children: [
     /* @__PURE__ */ v.jsx(Z, { label: g.t("dataValidation.list.options"), children: /* @__PURE__ */ v.jsxs(
-      Ba,
+      Ua,
       {
         value: u,
         onChange: (N) => {
-          f(N), m(h), N === "1" && b({
-            formula1: h === "=" ? "" : h,
+          f(N), h(m), N === "1" && b({
+            formula1: m === "=" ? "" : m,
             formula2: I.join(",")
           });
         },
@@ -1001,7 +999,7 @@ function Mi(a) {
     ) }),
     u === "1" ? /* @__PURE__ */ v.jsxs(v.Fragment, { children: [
       /* @__PURE__ */ v.jsx(Z, { error: L || O, children: /* @__PURE__ */ v.jsx(
-        yr,
+        Dr,
         {
           id: Na(`list-ref-range-${r}-${o}`),
           value: p,
@@ -1010,11 +1008,11 @@ function Mi(a) {
           onlyInputFormula: !0,
           onChange: async (N) => {
             const K = N != null ? N : "";
-            R(K), Le(K);
+            S(K), Le(K);
           }
         }
       ) }),
-      /* @__PURE__ */ v.jsx(Z, { children: /* @__PURE__ */ v.jsx("div", { ref: c, children: oe.map((N) => /* @__PURE__ */ v.jsx(rr, { item: N, commonProps: { onItemChange: G }, style: { marginBottom: 12 } }, N.id)) }) })
+      /* @__PURE__ */ v.jsx(Z, { children: /* @__PURE__ */ v.jsx("div", { ref: c, children: oe.map((N) => /* @__PURE__ */ v.jsx(or, { item: N, commonProps: { onItemChange: G }, style: { marginBottom: 12 } }, N.id)) }) })
     ] }) : /* @__PURE__ */ v.jsx(Z, { error: L, children: /* @__PURE__ */ v.jsxs("div", { ref: c, style: { marginTop: "-12px" }, children: [
       /* @__PURE__ */ v.jsx(
         Rn,
@@ -1025,7 +1023,7 @@ function Mi(a) {
           margin: [0, 12],
           draggableHandle: ".draggableHandle",
           itemRender: (N) => /* @__PURE__ */ v.jsx(
-            rr,
+            or,
             {
               item: N,
               commonProps: {
@@ -1039,7 +1037,7 @@ function Mi(a) {
         }
       ),
       /* @__PURE__ */ v.jsxs("a", { className: de.dataValidationFormulaListAdd, onClick: Se, children: [
-        /* @__PURE__ */ v.jsx(kr, {}),
+        /* @__PURE__ */ v.jsx(Yr, {}),
         g.t("dataValidation.list.add")
       ] })
     ] }) })
@@ -1049,7 +1047,7 @@ function Ii(a) {
   const { value: t, onChange: e, showError: r, validResult: o } = a, n = j(ie), i = r ? o == null ? void 0 : o.formula1 : "", s = r ? o == null ? void 0 : o.formula2 : "", [l, d] = te(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
   return /* @__PURE__ */ v.jsxs(v.Fragment, { children: [
     /* @__PURE__ */ v.jsx(Z, { children: /* @__PURE__ */ v.jsx(
-      Ua,
+      Ha,
       {
         checked: l,
         onChange: (c) => {
@@ -1092,9 +1090,9 @@ function Ii(a) {
     ) }) : null
   ] });
 }
-const zr = "data-validation.custom-formula-input", Mt = "data-validation.formula-input", Kr = "data-validation.list-formula-input", Qr = "data-validation.checkbox-formula-input", wi = [
+const Kr = "data-validation.custom-formula-input", Mt = "data-validation.formula-input", Qr = "data-validation.list-formula-input", Zr = "data-validation.checkbox-formula-input", wi = [
   [
-    zr,
+    Kr,
     zn
   ],
   [
@@ -1102,27 +1100,27 @@ const zr = "data-validation.custom-formula-input", Mt = "data-validation.formula
     ni
   ],
   [
-    Kr,
+    Qr,
     Mi
   ],
   [
-    Qr,
+    Zr,
     Ii
   ]
 ], St = 1, Rt = 0;
-function or(a, t) {
+function nr(a, t) {
   return X.isBlank(a) ? t.t("dataValidation.validFail.value") : A(a) ? t.t("dataValidation.validFail.primitive") : "";
 }
 class yi extends Xe {
   constructor() {
     super(...arguments);
-    S(this, "id", H.CHECKBOX);
-    S(this, "title", "dataValidation.checkbox.title");
-    S(this, "operators", []);
-    S(this, "scopes", ["sheet"]);
-    S(this, "formulaInput", Qr);
-    S(this, "canvasRender", this.injector.createInstance(wa));
-    S(this, "_formulaService", this.injector.get(ce));
+    R(this, "id", H.CHECKBOX);
+    R(this, "title", "dataValidation.checkbox.title");
+    R(this, "operators", []);
+    R(this, "scopes", ["sheet"]);
+    R(this, "formulaInput", Zr);
+    R(this, "canvasRender", this.injector.createInstance(wa));
+    R(this, "_formulaService", this.injector.get(ce));
   }
   skipDefaultFontRender(e, r, o) {
     const { formula1: n, formula2: i } = this.parseFormulaSync(e, o.unitId, o.subUnitId), s = `${r != null ? r : ""}`;
@@ -1140,7 +1138,7 @@ class yi extends Xe {
         formula1: this.localeService.t("dataValidation.validFail.checkboxEqual"),
         formula2: this.localeService.t("dataValidation.validFail.checkboxEqual")
       };
-    const l = or(n, this.localeService), d = or(i, this.localeService);
+    const l = nr(n, this.localeService), d = nr(i, this.localeService);
     return {
       success: !l && !d,
       formula1: l,
@@ -1178,7 +1176,7 @@ const zt = [
 function Di(a) {
   return new Date((a - 25569) * 86400).getTime();
 }
-const Zr = (a) => a / 86400 + 25569, Ei = "univer-data-validation-options-button", bi = "univer-data-validation-options-button-icon", aa = {
+const Jr = (a) => a / 86400 + 25569, Ei = "univer-data-validation-options-button", bi = "univer-data-validation-options-button-icon", aa = {
   dataValidationOptionsButton: Ei,
   dataValidationOptionsButtonIcon: bi
 };
@@ -1188,7 +1186,7 @@ function Oi(a) {
   return /* @__PURE__ */ v.jsxs(v.Fragment, { children: [
     /* @__PURE__ */ v.jsxs("div", { className: aa.dataValidationOptionsButton, onClick: () => s(!i), children: [
       t.t("dataValidation.panel.options"),
-      i ? /* @__PURE__ */ v.jsx(Xr, { className: aa.dataValidationOptionsButtonIcon }) : /* @__PURE__ */ v.jsx(Yr, { className: aa.dataValidationOptionsButtonIcon })
+      i ? /* @__PURE__ */ v.jsx(Gr, { className: aa.dataValidationOptionsButtonIcon }) : /* @__PURE__ */ v.jsx(Xr, { className: aa.dataValidationOptionsButtonIcon })
     ] }),
     i && /* @__PURE__ */ v.jsxs(v.Fragment, { children: [
       l ? /* @__PURE__ */ v.jsx(l, { value: r, onChange: o }) : null,
@@ -1197,13 +1195,13 @@ function Oi(a) {
         {
           label: t.t("dataValidation.panel.invalid"),
           children: /* @__PURE__ */ v.jsxs(
-            Ba,
+            Ua,
             {
-              value: `${(d = r.errorStyle) != null ? d : ct.WARNING}`,
+              value: `${(d = r.errorStyle) != null ? d : dt.WARNING}`,
               onChange: (c) => o({ ...r, errorStyle: +c }),
               children: [
-                /* @__PURE__ */ v.jsx($e, { value: `${ct.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
-                /* @__PURE__ */ v.jsx($e, { value: `${ct.STOP}`, children: t.t("dataValidation.panel.rejectInput") })
+                /* @__PURE__ */ v.jsx($e, { value: `${dt.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
+                /* @__PURE__ */ v.jsx($e, { value: `${dt.STOP}`, children: t.t("dataValidation.panel.rejectInput") })
               ]
             }
           )
@@ -1214,7 +1212,7 @@ function Oi(a) {
         {
           label: t.t("dataValidation.panel.messageInfo"),
           children: /* @__PURE__ */ v.jsx(
-            Ua,
+            Ha,
             {
               checked: r.showInputMessage,
               onChange: () => o({
@@ -1234,7 +1232,7 @@ const Ni = "univer-data-validation-detail-form-item", Ti = "univer-data-validati
   dataValidationDetailFormItem: Ni,
   dataValidationDetailButtons: Ti,
   dataValidationDetailButton: Fi
-}, Li = (a) => yo(
+}, Li = (a) => Do(
   async (t, e, r, o) => {
     const n = await a.executeCommand(t, e, r);
     o == null || o(n);
@@ -1242,24 +1240,24 @@ const Ni = "univer-data-validation-detail-form-item", Ti = "univer-data-validati
   275
 );
 function Pi() {
-  const [a, t] = te(0), e = j(Me), r = Ge(e.activeRule$, e.activeRule), { unitId: o, subUnitId: n, rule: i } = r || {}, s = i.uid, l = j(we), d = j(Vt), c = j(ee), u = j(q), f = j(ie), [p, m] = te(i), h = l.getValidatorItem(p.type), [R, g] = te(!1), C = l.getValidatorsByScope(No.SHEET), [_, M] = te(() => p.ranges.map((y) => ({ unitId: "", sheetId: "", range: y }))), I = Je(() => Li(c), [c]);
+  const [a, t] = te(0), e = j(Me), r = Ge(e.activeRule$, e.activeRule), { unitId: o, subUnitId: n, rule: i } = r || {}, s = i.uid, l = j(we), d = j(Vt), c = j(ee), u = j(q), f = j(ie), [p, h] = te(i), m = l.getValidatorItem(p.type), [S, g] = te(!1), C = l.getValidatorsByScope(To.SHEET), [_, M] = te(() => p.ranges.map((y) => ({ unitId: "", sheetId: "", range: y }))), I = Je(() => Li(c), [c]);
   if (et(() => {
     c.onCommandExecuted((y) => {
-      (y.id === Vo.id || y.id === Mo.id) && setTimeout(() => {
+      (y.id === Mo.id || y.id === Io.id) && setTimeout(() => {
         const P = u.getRuleById(o, n, s);
-        t((oe) => oe + 1), P && (m(P), M(P.ranges.map((oe) => ({ unitId: "", sheetId: "", range: oe }))));
+        t((oe) => oe + 1), P && (h(P), M(P.ranges.map((oe) => ({ unitId: "", sheetId: "", range: oe }))));
       }, 20);
     });
-  }, [c, u, s, n, o]), !h)
+  }, [c, u, s, n, o]), !m)
     return null;
-  const D = h.operators, E = h.operatorNames, x = p.operator ? To.includes(p.operator) : !1, T = () => {
-    h.validatorFormula(p, o, n).success ? e.setActiveRule(null) : g(!0);
-  }, O = Dr((y) => {
-    if (Io(y, _))
+  const D = m.operators, E = m.operatorNames, x = p.operator ? Fo.includes(p.operator) : !1, T = () => {
+    m.validatorFormula(p, o, n).success ? e.setActiveRule(null) : g(!0);
+  }, O = Er((y) => {
+    if (wo(y, _))
       return;
     M(y);
     const P = y.filter((G) => (!G.unitId || G.unitId === o) && (!G.sheetId || G.sheetId === n)).map((G) => G.range);
-    if (m({
+    if (h({
       ...p,
       ranges: P
     }), P.length === 0)
@@ -1272,9 +1270,9 @@ function Pi() {
     };
     I(Kt.id, oe);
   }), F = (y) => {
-    if (za(y, ga(p)))
+    if (Ka(y, ga(p)))
       return;
-    m({
+    h({
       ...p,
       ...y
     });
@@ -1290,7 +1288,7 @@ function Pi() {
       void 0
     );
   }, L = async () => {
-    await c.executeCommand(vr.id, {
+    await c.executeCommand(_r.id, {
       ruleId: s,
       unitId: o,
       subUnitId: n
@@ -1315,18 +1313,18 @@ function Pi() {
       formula1: void 0,
       formula2: void 0
     };
-    m(Se), c.executeCommand(Da.id, {
+    h(Se), c.executeCommand(Da.id, {
       unitId: o,
       subUnitId: n,
       ruleId: p.uid,
       setting: ga(Se)
     });
-  }, b = d.get(h.formulaInput), $ = Je(() => _.map((y) => Fr(y.range)).join(","), []), z = pa(p), k = (y) => {
-    za(y, pa(p)) || (m({
+  }, b = d.get(m.formulaInput), $ = Je(() => _.map((y) => Lr(y.range)).join(","), []), z = pa(p), k = (y) => {
+    Ka(y, pa(p)) || (h({
       ...p,
       ...y
     }), I(
-      no.id,
+      io.id,
       {
         unitId: o,
         subUnitId: n,
@@ -1337,7 +1335,7 @@ function Pi() {
   };
   return /* @__PURE__ */ v.jsxs("div", { children: [
     /* @__PURE__ */ v.jsx(Z, { label: f.t("dataValidation.panel.range"), children: /* @__PURE__ */ v.jsx(
-      tn,
+      an,
       {
         className: ze.dataValidationDetailFormItem,
         value: $,
@@ -1345,7 +1343,7 @@ function Pi() {
         openForSheetUnitId: o,
         openForSheetSubUnitId: n,
         onChange: (y) => {
-          y.some((P) => !wo(P.range) || P.range.endColumn < P.range.startColumn || P.range.endRow < P.range.startRow) || O(y);
+          y.some((P) => !yo(P.range) || P.range.endColumn < P.range.startColumn || P.range.endRow < P.range.startRow) || O(y);
         }
       },
       a
@@ -1393,15 +1391,15 @@ function Pi() {
             ...y
           });
         },
-        showError: R,
-        validResult: h.validatorFormula(p, o, n),
+        showError: S,
+        validResult: m.validatorFormula(p, o, n),
         unitId: o,
         subUnitId: n,
         ruleId: s
       },
       a + p.type
     ) : null,
-    /* @__PURE__ */ v.jsx(Oi, { value: z, onChange: k, extraComponent: h.optionsInput }),
+    /* @__PURE__ */ v.jsx(Oi, { value: z, onChange: k, extraComponent: m.optionsInput }),
     /* @__PURE__ */ v.jsxs("div", { className: ze.dataValidationDetailButtons, children: [
       /* @__PURE__ */ v.jsx(We, { className: ze.dataValidationDetailButton, onClick: L, children: f.t("dataValidation.panel.removeRule") }),
       /* @__PURE__ */ v.jsx(We, { className: ze.dataValidationDetailButton, type: "primary", onClick: T, children: f.t("dataValidation.panel.done") })
@@ -1414,17 +1412,17 @@ const Ai = "univer-data-validation-item-container", xi = "univer-data-validation
   dataValidationItemContent: ji,
   dataValidationItemIcon: $i
 }, Bi = (a) => {
-  const { rule: t, onClick: e, unitId: r, subUnitId: o, disable: n } = a, i = j(we), s = j(ee), l = j(ko), d = i.getValidatorItem(t.type), c = $a(), [u, f] = te(!1), p = (m) => {
-    s.executeCommand(vr.id, {
+  const { rule: t, onClick: e, unitId: r, subUnitId: o, disable: n } = a, i = j(we), s = j(ee), l = j(Yo), d = i.getValidatorItem(t.type), c = Ba(), [u, f] = te(!1), p = (h) => {
+    s.executeCommand(_r.id, {
       ruleId: t.uid,
       unitId: r,
       subUnitId: o
-    }), m.stopPropagation();
+    }), h.stopPropagation();
   };
   return et(() => () => {
-    var m;
-    c.current && ((m = c.current) == null || m.forEach((h) => {
-      h && l.removeShape(h);
+    var h;
+    c.current && ((h = c.current) == null || h.forEach((m) => {
+      m && l.removeShape(m);
     }));
   }, [l]), /* @__PURE__ */ v.jsxs(
     "div",
@@ -1432,8 +1430,8 @@ const Ai = "univer-data-validation-item-container", xi = "univer-data-validation
       className: Et.dataValidationItemContainer,
       onClick: e,
       onMouseEnter: () => {
-        n || (f(!0), c.current = t.ranges.map((m) => l.addShape({
-          range: m,
+        n || (f(!0), c.current = t.ranges.map((h) => l.addShape({
+          range: h,
           style: {
             hasAutoFill: !1,
             fill: "rgba(73, 184, 17, 0.05)",
@@ -1442,27 +1440,27 @@ const Ai = "univer-data-validation-item-container", xi = "univer-data-validation
             widgets: {}
           },
           primary: {
-            startColumn: m.startColumn,
-            endColumn: m.endColumn,
-            startRow: m.startRow,
-            endRow: m.endRow,
-            actualRow: m.startRow,
-            actualColumn: m.startColumn,
+            startColumn: h.startColumn,
+            endColumn: h.endColumn,
+            startRow: h.startRow,
+            endRow: h.endRow,
+            actualRow: h.startRow,
+            actualColumn: h.startColumn,
             isMerged: !1,
             isMergedMainCell: !1
           }
         })));
       },
       onMouseLeave: () => {
-        var m;
-        f(!1), (m = c.current) == null || m.forEach((h) => {
-          h && l.removeShape(h);
+        var h;
+        f(!1), (h = c.current) == null || h.forEach((m) => {
+          m && l.removeShape(m);
         }), c.current = void 0;
       },
       children: [
         /* @__PURE__ */ v.jsx("div", { className: Et.dataValidationItemTitle, children: d == null ? void 0 : d.generateRuleName(t) }),
-        /* @__PURE__ */ v.jsx("div", { className: Et.dataValidationItemContent, children: t.ranges.map((m) => Fr(m)).join(",") }),
-        u ? /* @__PURE__ */ v.jsx("div", { className: Et.dataValidationItemIcon, onClick: p, children: /* @__PURE__ */ v.jsx(Ya, {}) }) : null
+        /* @__PURE__ */ v.jsx("div", { className: Et.dataValidationItemContent, children: t.ranges.map((h) => Lr(h)).join(",") }),
+        u ? /* @__PURE__ */ v.jsx("div", { className: Et.dataValidationItemIcon, onClick: p, children: /* @__PURE__ */ v.jsx(Xa, {}) }) : null
       ]
     }
   );
@@ -1490,8 +1488,8 @@ function ki(a) {
       _.unsubscribe();
     };
   }, [p]);
-  const m = async () => {
-    const _ = _r(o), M = {
+  const h = async () => {
+    const _ = Sr(o), M = {
       unitId: u,
       subUnitId: f,
       rule: _
@@ -1501,8 +1499,8 @@ function ki(a) {
       subUnitId: f,
       rule: _
     });
-  }, h = () => {
-    r.executeCommand(Fo.id, {
+  }, m = () => {
+    r.executeCommand(Lo.id, {
       unitId: u,
       subUnitId: f
     });
@@ -1545,8 +1543,8 @@ function ki(a) {
       );
     }),
     /* @__PURE__ */ v.jsxs("div", { className: ra.dataValidationListButtons, children: [
-      s.length && !C ? /* @__PURE__ */ v.jsx(We, { className: ra.dataValidationListButton, onClick: h, children: i.t("dataValidation.panel.removeAll") }) : null,
-      /* @__PURE__ */ v.jsx(We, { className: ra.dataValidationListButton, type: "primary", onClick: m, children: i.t("dataValidation.panel.add") })
+      s.length && !C ? /* @__PURE__ */ v.jsx(We, { className: ra.dataValidationListButton, onClick: m, children: i.t("dataValidation.panel.removeAll") }) : null,
+      /* @__PURE__ */ v.jsx(We, { className: ra.dataValidationListButton, type: "primary", onClick: h, children: i.t("dataValidation.panel.add") })
     ] })
   ] });
 }
@@ -1570,15 +1568,15 @@ const Yi = () => {
     /* @__PURE__ */ v.jsx("div", { className: ye.dvListDropdownList, children: /* @__PURE__ */ v.jsx(Vn, { children: /* @__PURE__ */ v.jsx("div", { className: ye.dvListDropdownListContainer, children: o.map((l, d) => {
       const c = t.indexOf(l.value) > -1, u = () => {
         let f;
-        c ? f = new Set(t.filter((m) => m !== l.value)) : f = new Set(r ? [...t, l.value] : [l.value]);
+        c ? f = new Set(t.filter((h) => h !== l.value)) : f = new Set(r ? [...t, l.value] : [l.value]);
         const p = [];
-        o.forEach((m) => {
-          f.has(m.value) && p.push(m.value);
+        o.forEach((h) => {
+          f.has(h.value) && p.push(h.value);
         }), e(p);
       };
       return /* @__PURE__ */ v.jsxs("div", { className: ye.dvListDropdownItemContainer, onClick: u, children: [
         /* @__PURE__ */ v.jsx("div", { className: ye.dvListDropdownItem, style: { background: l.color || xe }, children: l.label }),
-        /* @__PURE__ */ v.jsx("div", { className: ye.dvListDropdownSelectedIcon, children: c ? /* @__PURE__ */ v.jsx(Hr, {}) : null })
+        /* @__PURE__ */ v.jsx("div", { className: ye.dvListDropdownSelectedIcon, children: c ? /* @__PURE__ */ v.jsx(Wr, {}) : null })
       ] }, d);
     }) }) }) }),
     /* @__PURE__ */ v.jsx("div", { className: ye.dvListDropdownSplit }),
@@ -1587,28 +1585,28 @@ const Yi = () => {
 };
 function as(a) {
   var O, F;
-  const { location: t, hideFn: e } = a, { worksheet: r, row: o, col: n, unitId: i, subUnitId: s } = t, l = j(q), d = j(ee), c = j(ie), [u, f] = te(""), p = j(Aa), m = Je(() => l.ruleChange$.pipe(He(16)), []);
-  Ge(m);
-  const h = Cn.useContext(), R = h.right - h.left;
+  const { location: t, hideFn: e } = a, { worksheet: r, row: o, col: n, unitId: i, subUnitId: s } = t, l = j(q), d = j(ee), c = j(ie), [u, f] = te(""), p = j(Aa), h = Je(() => l.ruleChange$.pipe(He(16)), []);
+  Ge(h);
+  const m = Cn.useContext(), S = m.right - m.left;
   if (!r)
     return null;
   const g = r.getCell(o, n), C = (O = g == null ? void 0 : g.dataValidation) == null ? void 0 : O.rule, _ = (F = g == null ? void 0 : g.dataValidation) == null ? void 0 : F.validator, M = (C == null ? void 0 : C.renderMode) === le.CUSTOM || (C == null ? void 0 : C.renderMode) === void 0;
   if (!g || !C || !_)
     return;
   const I = C.type === H.LIST_MULTIPLE, D = _.getListWithColor(C, i, s), E = u || vi(g), x = Ze(E), T = () => {
-    d.executeCommand(ot.id, {
+    d.executeCommand(rt.id, {
       ruleId: C.uid
     }), e();
   };
   return /* @__PURE__ */ v.jsx(
     ts,
     {
-      style: { minWidth: R, maxWidth: Math.max(R, 200) },
+      style: { minWidth: S, maxWidth: Math.max(S, 200) },
       title: I ? c.t("dataValidation.listMultiple.dropdown") : c.t("dataValidation.list.dropdown"),
       value: x,
       multiple: I,
       onChange: (L) => {
-        const B = qr(L), U = {
+        const B = zr(L), U = {
           unitId: i,
           subUnitId: s,
           range: {
@@ -1629,8 +1627,8 @@ function as(a) {
         };
         p.isVisible() && p.changeVisible({
           visible: !1,
-          keycode: an.ESC,
-          eventType: un.Keyboard,
+          keycode: rn.ESC,
+          eventType: hn.Keyboard,
           unitId: i
         }), d.executeCommand(La.id, U), f(B), I || e();
       },
@@ -1643,7 +1641,7 @@ function as(a) {
     }
   );
 }
-var Jr = { exports: {} };
+var eo = { exports: {} };
 (function(a, t) {
   (function(e, r) {
     a.exports = r();
@@ -1651,52 +1649,52 @@ var Jr = { exports: {} };
     var e = "minute", r = /[+-]\d\d(?::?\d\d)?/g, o = /([+-]|\d\d)/g;
     return function(n, i, s) {
       var l = i.prototype;
-      s.utc = function(h) {
-        var R = { date: h, utc: !0, args: arguments };
-        return new i(R);
-      }, l.utc = function(h) {
-        var R = s(this.toDate(), { locale: this.$L, utc: !0 });
-        return h ? R.add(this.utcOffset(), e) : R;
+      s.utc = function(m) {
+        var S = { date: m, utc: !0, args: arguments };
+        return new i(S);
+      }, l.utc = function(m) {
+        var S = s(this.toDate(), { locale: this.$L, utc: !0 });
+        return m ? S.add(this.utcOffset(), e) : S;
       }, l.local = function() {
         return s(this.toDate(), { locale: this.$L, utc: !1 });
       };
       var d = l.parse;
-      l.parse = function(h) {
-        h.utc && (this.$u = !0), this.$utils().u(h.$offset) || (this.$offset = h.$offset), d.call(this, h);
+      l.parse = function(m) {
+        m.utc && (this.$u = !0), this.$utils().u(m.$offset) || (this.$offset = m.$offset), d.call(this, m);
       };
       var c = l.init;
       l.init = function() {
         if (this.$u) {
-          var h = this.$d;
-          this.$y = h.getUTCFullYear(), this.$M = h.getUTCMonth(), this.$D = h.getUTCDate(), this.$W = h.getUTCDay(), this.$H = h.getUTCHours(), this.$m = h.getUTCMinutes(), this.$s = h.getUTCSeconds(), this.$ms = h.getUTCMilliseconds();
+          var m = this.$d;
+          this.$y = m.getUTCFullYear(), this.$M = m.getUTCMonth(), this.$D = m.getUTCDate(), this.$W = m.getUTCDay(), this.$H = m.getUTCHours(), this.$m = m.getUTCMinutes(), this.$s = m.getUTCSeconds(), this.$ms = m.getUTCMilliseconds();
         } else c.call(this);
       };
       var u = l.utcOffset;
-      l.utcOffset = function(h, R) {
+      l.utcOffset = function(m, S) {
         var g = this.$utils().u;
-        if (g(h)) return this.$u ? 0 : g(this.$offset) ? u.call(this) : this.$offset;
-        if (typeof h == "string" && (h = function(I) {
+        if (g(m)) return this.$u ? 0 : g(this.$offset) ? u.call(this) : this.$offset;
+        if (typeof m == "string" && (m = function(I) {
           I === void 0 && (I = "");
           var D = I.match(r);
           if (!D) return null;
           var E = ("" + D[0]).match(o) || ["-", 0, 0], x = E[0], T = 60 * +E[1] + +E[2];
           return T === 0 ? 0 : x === "+" ? T : -T;
-        }(h), h === null)) return this;
-        var C = Math.abs(h) <= 16 ? 60 * h : h, _ = this;
-        if (R) return _.$offset = C, _.$u = h === 0, _;
-        if (h !== 0) {
+        }(m), m === null)) return this;
+        var C = Math.abs(m) <= 16 ? 60 * m : m, _ = this;
+        if (S) return _.$offset = C, _.$u = m === 0, _;
+        if (m !== 0) {
           var M = this.$u ? this.toDate().getTimezoneOffset() : -1 * this.utcOffset();
           (_ = this.local().add(C + M, e)).$offset = C, _.$x.$localOffset = M;
         } else _ = this.utc();
         return _;
       };
       var f = l.format;
-      l.format = function(h) {
-        var R = h || (this.$u ? "YYYY-MM-DDTHH:mm:ss[Z]" : "");
-        return f.call(this, R);
+      l.format = function(m) {
+        var S = m || (this.$u ? "YYYY-MM-DDTHH:mm:ss[Z]" : "");
+        return f.call(this, S);
       }, l.valueOf = function() {
-        var h = this.$utils().u(this.$offset) ? 0 : this.$offset + (this.$x.$localOffset || this.$d.getTimezoneOffset());
-        return this.$d.valueOf() - 6e4 * h;
+        var m = this.$utils().u(this.$offset) ? 0 : this.$offset + (this.$x.$localOffset || this.$d.getTimezoneOffset());
+        return this.$d.valueOf() - 6e4 * m;
       }, l.isUTC = function() {
         return !!this.$u;
       }, l.toISOString = function() {
@@ -1705,26 +1703,26 @@ var Jr = { exports: {} };
         return this.toDate().toUTCString();
       };
       var p = l.toDate;
-      l.toDate = function(h) {
-        return h === "s" && this.$offset ? s(this.format("YYYY-MM-DD HH:mm:ss:SSS")).toDate() : p.call(this);
+      l.toDate = function(m) {
+        return m === "s" && this.$offset ? s(this.format("YYYY-MM-DD HH:mm:ss:SSS")).toDate() : p.call(this);
       };
-      var m = l.diff;
-      l.diff = function(h, R, g) {
-        if (h && this.$u === h.$u) return m.call(this, h, R, g);
-        var C = this.local(), _ = s(h).local();
-        return m.call(C, _, R, g);
+      var h = l.diff;
+      l.diff = function(m, S, g) {
+        if (m && this.$u === m.$u) return h.call(this, m, S, g);
+        var C = this.local(), _ = s(m).local();
+        return h.call(C, _, S, g);
       };
     };
   });
-})(Jr);
-var rs = Jr.exports;
+})(eo);
+var rs = eo.exports;
 const os = /* @__PURE__ */ bn(rs);
 var ns = Object.defineProperty, is = Object.getOwnPropertyDescriptor, ss = (a, t, e, r) => {
   for (var o = r > 1 ? void 0 : r ? is(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
   return r && o && ns(t, e, o), o;
-}, lt = (a, t) => (e, r) => t(e, r, a);
-let ut = class extends ue {
+}, st = (a, t) => (e, r) => t(e, r, a);
+let ct = class extends ue {
   constructor(a, t, e, r, o) {
     super(), this._editorBridgeService = a, this._dataValidationModel = t, this._dataValidatorRegistryService = e, this._dialogService = r, this._localeService = o, this._initEditorBridgeInterceptor();
   }
@@ -1734,7 +1732,7 @@ let ut = class extends ue {
       {
         handler: async (a, t, e) => {
           const r = await a, { worksheet: o, row: n, col: i, unitId: s, subUnitId: l } = t, d = this._dataValidationModel.ensureManager(s, l), c = d.getRuleIdByLocation(n, i), u = c ? d.getRuleById(c) : void 0;
-          if (!u || u.errorStyle !== ct.STOP)
+          if (!u || u.errorStyle !== dt.STOP)
             return e(Promise.resolve(r));
           const f = await this._dataValidatorRegistryService.getValidatorItem(u.type);
           if (!f || await f.validator(
@@ -1748,7 +1746,7 @@ let ut = class extends ue {
             u
           ))
             return e(Promise.resolve(r));
-          const m = o.getCellRaw(n, i);
+          const h = o.getCellRaw(n, i);
           return this._dialogService.open({
             width: 368,
             title: {
@@ -1771,7 +1769,7 @@ let ut = class extends ue {
             onClose: () => {
               this._dialogService.close("reject-input-dialog");
             }
-          }), e(Promise.resolve(m));
+          }), e(Promise.resolve(h));
         }
       }
     );
@@ -1802,15 +1800,15 @@ let ut = class extends ue {
     });
   }
 };
-ut = ss([
-  ve(_e.Ready, ut),
-  lt(0, Aa),
-  lt(1, w(q)),
-  lt(2, w(we)),
-  lt(3, rn),
-  lt(4, w(ie))
-], ut);
-const ls = "univer-dv-date-dropdown", ds = "univer-dv-date-dropdown-btns", nr = {
+ct = ss([
+  ve(_e.Ready, ct),
+  st(0, Aa),
+  st(1, w(q)),
+  st(2, w(we)),
+  st(3, on),
+  st(4, w(ie))
+], ct);
+const ls = "univer-dv-date-dropdown", ds = "univer-dv-date-dropdown-btns", ir = {
   dvDateDropdown: ls,
   dvDateDropdownBtns: ds
 };
@@ -1828,14 +1826,14 @@ const cs = (a) => {
 };
 function us(a) {
   var M, I, D;
-  const { location: t, hideFn: e } = a, { worksheet: r, row: o, col: n, unitId: i, subUnitId: s } = t, l = j(ee), d = j(ut), c = r.getCell(o, n), u = (M = c == null ? void 0 : c.dataValidation) == null ? void 0 : M.rule, f = (I = c == null ? void 0 : c.dataValidation) == null ? void 0 : I.validator, p = ae(c), m = cs(p), [h, R] = te(m), g = !!((D = u == null ? void 0 : u.bizInfo) != null && D.showTime), C = h && h.isValid() ? h : Ve();
+  const { location: t, hideFn: e } = a, { worksheet: r, row: o, col: n, unitId: i, subUnitId: s } = t, l = j(ee), d = j(ct), c = r.getCell(o, n), u = (M = c == null ? void 0 : c.dataValidation) == null ? void 0 : M.rule, f = (I = c == null ? void 0 : c.dataValidation) == null ? void 0 : I.validator, p = ae(c), h = cs(p), [m, S] = te(h), g = !!((D = u == null ? void 0 : u.bizInfo) != null && D.showTime), C = m && m.isValid() ? m : Ve();
   if (!c || !u || !f)
     return;
   const _ = async () => {
-    if (!h)
+    if (!m)
       return;
-    const x = `${h.format(g ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00").split(" ").join("T")}Z`, T = Zr(Ve(x).unix());
-    u.errorStyle !== ct.STOP || await f.validator({
+    const x = `${m.format(g ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00").split(" ").join("T")}Z`, T = Jr(Ve(x).unix());
+    u.errorStyle !== dt.STOP || await f.validator({
       value: T,
       unitId: i,
       subUnitId: s,
@@ -1864,25 +1862,25 @@ function us(a) {
       }
     }), e()) : d.showReject(f.getRuleFinalError(u));
   };
-  return /* @__PURE__ */ v.jsxs("div", { className: nr.dvDateDropdown, children: [
+  return /* @__PURE__ */ v.jsxs("div", { className: ir.dvDateDropdown, children: [
     /* @__PURE__ */ v.jsx(
       Mn,
       {
-        defaultValue: h,
-        pickerValue: h != null ? h : C,
+        defaultValue: m,
+        pickerValue: m != null ? m : C,
         showTime: g || void 0,
         onSelect: async (E) => {
-          R(E);
+          S(E);
         },
         onPanelChange: (E) => {
-          R(E);
+          S(E);
         }
       }
     ),
-    /* @__PURE__ */ v.jsx("div", { className: nr.dvDateDropdownBtns, children: /* @__PURE__ */ v.jsx(We, { size: "small", type: "primary", onClick: _, disabled: !h, children: "确定" }) })
+    /* @__PURE__ */ v.jsx("div", { className: ir.dvDateDropdownBtns, children: /* @__PURE__ */ v.jsx(We, { size: "small", type: "primary", onClick: _, disabled: !m, children: "确定" }) })
   ] });
 }
-const eo = "data-validation.list.dropdown", to = "data-validation.date.dropdown", hs = {
+const to = "data-validation.list.dropdown", ao = "data-validation.date.dropdown", hs = {
   [V.BETWEEN]: "dataValidation.date.operators.between",
   [V.EQUAL]: "dataValidation.date.operators.equal",
   [V.GREATER_THAN]: "dataValidation.date.operators.greaterThan",
@@ -1916,7 +1914,7 @@ function xt(a) {
   var o;
   const { value: t, onChange: e } = a, r = j(ie);
   return /* @__PURE__ */ v.jsx(Z, { children: /* @__PURE__ */ v.jsx(
-    Ua,
+    Ha,
     {
       checked: (o = t.bizInfo) == null ? void 0 : o.showTime,
       onChange: (n) => {
@@ -1933,20 +1931,20 @@ function xt(a) {
   ) });
 }
 xt.componentKey = ps;
-const ir = "{FORMULA1}", sr = "{FORMULA2}", dt = (a) => {
+const sr = "{FORMULA1}", lr = "{FORMULA2}", lt = (a) => {
   if (a == null || typeof a == "boolean")
     return;
   if (typeof a == "number" || !Number.isNaN(+a))
     return +a;
   const t = `${Ve(a).format("YYYY-MM-DD HH:mm:ss").split(" ").join("T")}Z`;
-  return Zr(Ve(t).unix());
+  return Jr(Ve(t).unix());
 };
 class gs extends Xe {
   constructor() {
     super(...arguments);
-    S(this, "id", H.DATE);
-    S(this, "title", "dataValidation.date.title");
-    S(this, "operators", [
+    R(this, "id", H.DATE);
+    R(this, "title", "dataValidation.date.title");
+    R(this, "operators", [
       V.BETWEEN,
       V.EQUAL,
       V.GREATER_THAN,
@@ -1956,26 +1954,26 @@ class gs extends Xe {
       V.NOT_BETWEEN,
       V.NOT_EQUAL
     ]);
-    S(this, "scopes", ["sheet"]);
-    S(this, "formulaInput", Mt);
-    S(this, "optionsInput", xt.componentKey);
-    S(this, "dropdown", to);
-    S(this, "_formulaService", this.injector.get(ce));
+    R(this, "scopes", ["sheet"]);
+    R(this, "formulaInput", Mt);
+    R(this, "optionsInput", xt.componentKey);
+    R(this, "dropdown", ao);
+    R(this, "_formulaService", this.injector.get(ce));
   }
   async parseFormula(e, r, o) {
     var l, d;
     const n = await this._formulaService.getRuleFormulaResult(r, o, e.uid), { formula1: i, formula2: s } = e;
     return {
-      formula1: dt(A(i) ? ge((l = n == null ? void 0 : n[0]) == null ? void 0 : l.result) : i),
-      formula2: dt(A(s) ? ge((d = n == null ? void 0 : n[1]) == null ? void 0 : d.result) : s)
+      formula1: lt(A(i) ? ge((l = n == null ? void 0 : n[0]) == null ? void 0 : l.result) : i),
+      formula2: lt(A(s) ? ge((d = n == null ? void 0 : n[1]) == null ? void 0 : d.result) : s)
     };
   }
   parseFormulaSync(e, r, o) {
     var l, d;
     const n = this._formulaService.getRuleFormulaResultSync(r, o, e.uid), { formula1: i, formula2: s } = e;
     return {
-      formula1: dt(A(i) ? ge((l = n == null ? void 0 : n[0]) == null ? void 0 : l.result) : i),
-      formula2: dt(A(s) ? ge((d = n == null ? void 0 : n[1]) == null ? void 0 : d.result) : s)
+      formula1: lt(A(i) ? ge((l = n == null ? void 0 : n[0]) == null ? void 0 : l.result) : i),
+      formula2: lt(A(s) ? ge((d = n == null ? void 0 : n[1]) == null ? void 0 : d.result) : s)
     };
   }
   async isValidType(e) {
@@ -2009,7 +2007,7 @@ class gs extends Xe {
     const { value: n } = e;
     return {
       ...e,
-      value: dt(n)
+      value: lt(n)
     };
   }
   async validatorIsEqual(e, r, o) {
@@ -2057,41 +2055,41 @@ class gs extends Xe {
     var o, n;
     if (!e.operator)
       return this.titleStr;
-    const r = this.localeService.t(ms[e.operator]).replace(ir, (o = e.formula1) != null ? o : "").replace(sr, (n = e.formula2) != null ? n : "");
+    const r = this.localeService.t(ms[e.operator]).replace(sr, (o = e.formula1) != null ? o : "").replace(lr, (n = e.formula2) != null ? n : "");
     return `${this.titleStr} ${r}`;
   }
   generateRuleErrorMessage(e) {
     var o, n;
-    return e.operator ? `${this.localeService.t(fs[e.operator]).replace(ir, (o = e.formula1) != null ? o : "").replace(sr, (n = e.formula2) != null ? n : "")}` : this.titleStr;
+    return e.operator ? `${this.localeService.t(fs[e.operator]).replace(sr, (o = e.formula1) != null ? o : "").replace(lr, (n = e.formula2) != null ? n : "")}` : this.titleStr;
   }
 }
 var vs = Object.defineProperty, _s = Object.getOwnPropertyDescriptor, Ss = (a, t, e, r) => {
   for (var o = r > 1 ? void 0 : r ? _s(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
   return r && o && vs(t, e, o), o;
-}, lr = (a, t) => (e, r) => t(e, r, a);
-const Ke = 4, Rs = 6, Re = 14, Pe = 6, be = 4, Cs = "#565656", dr = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
+}, dr = (a, t) => (e, r) => t(e, r, a);
+const Ke = 4, Rs = 6, Re = 14, Pe = 6, be = 4, Cs = "#565656", cr = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
 function Vs(a, t) {
   const e = a.length;
   return {
     id: "d",
     body: {
-      dataStream: `${a}${hr}`,
+      dataStream: `${a}${mr}`,
       textRuns: [
         {
           ts: {
             fs: 11,
             ff: void 0,
-            it: st.FALSE,
-            bl: st.FALSE,
+            it: it.FALSE,
+            bl: it.FALSE,
             ul: {
-              s: st.FALSE
+              s: it.FALSE
             },
             st: {
-              s: st.FALSE
+              s: it.FALSE
             },
             ol: {
-              s: st.FALSE
+              s: it.FALSE
             },
             cl: void 0,
             ...t,
@@ -2111,10 +2109,10 @@ function Vs(a, t) {
     }
   };
 }
-function ao(a, t, e) {
-  const r = Vs(a, e), o = new Do(r), n = new hn(o);
+function ro(a, t, e) {
+  const r = Vs(a, e), o = new Eo(r), n = new mn(o);
   return {
-    documentSkeleton: mn.create(n, t),
+    documentSkeleton: fn.create(n, t),
     docModel: o,
     docViewModel: n
   };
@@ -2124,9 +2122,9 @@ function oa(a, t, e) {
     documentSkeleton: r,
     docModel: o,
     docViewModel: n
-  } = ao(a, t, e);
+  } = ro(a, t, e);
   return {
-    documents: new fn(`DOCUMENTS_${X.generateRandomId()}`, r, {
+    documents: new pn(`DOCUMENTS_${X.generateRandomId()}`, r, {
       pageMarginLeft: 0,
       pageMarginTop: 0
     }),
@@ -2135,7 +2133,7 @@ function oa(a, t, e) {
     docViewModel: n
   };
 }
-function cr(a, t, e, r, o, n) {
+function ur(a, t, e, r, o, n) {
   let i = 0;
   switch (o) {
     case me.BOTTOM:
@@ -2165,10 +2163,10 @@ function cr(a, t, e, r, o, n) {
 var fa;
 let ya = (fa = class {
   constructor(a, t) {
-    S(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
-    S(this, "zIndex");
-    S(this, "onPointerEnter");
-    S(this, "onPointerLeave");
+    R(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
+    R(this, "zIndex");
+    R(this, "onPointerEnter");
+    R(this, "onPointerLeave");
     this._localeService = a, this._commandService = t;
   }
   _ensureMap(a) {
@@ -2189,26 +2187,26 @@ let ya = (fa = class {
         i = r - Re - 1;
         break;
     }
-    a.save(), a.translateWithPrecision(t.startX + n, t.startY + i), a.fillStyle = "#565656", a.fill(dr), a.restore();
+    a.save(), a.translateWithPrecision(t.startX + n, t.startY + i), a.fillStyle = "#565656", a.fill(cr), a.restore();
   }
   // eslint-disable-next-line max-lines-per-function
   drawWith(a, t, e) {
     var B, U;
-    const { primaryWithCoord: r, row: o, col: n, style: i, data: s, subUnitId: l } = t, d = r.isMergedMainCell ? r.mergeInfo : r, c = (B = s.dataValidation) == null ? void 0 : B.rule, u = (U = s.dataValidation) == null ? void 0 : U.validator, f = s.fontRenderExtension, { leftOffset: p = 0, rightOffset: m = 0, topOffset: h = 0, downOffset: R = 0 } = f || {};
+    const { primaryWithCoord: r, row: o, col: n, style: i, data: s, subUnitId: l } = t, d = r.isMergedMainCell ? r.mergeInfo : r, c = (B = s.dataValidation) == null ? void 0 : B.rule, u = (U = s.dataValidation) == null ? void 0 : U.validator, f = s.fontRenderExtension, { leftOffset: p = 0, rightOffset: h = 0, topOffset: m = 0, downOffset: S = 0 } = f || {};
     if (!c || !u || !u.skipDefaultFontRender(c))
       return;
     const g = {
       startX: d.startX + p,
-      endX: d.endX - m,
-      startY: d.startY + h,
-      endY: d.endY - R
+      endX: d.endX - h,
+      startY: d.startY + m,
+      endY: d.endY - S
     }, C = g.endX - g.startX, _ = g.endY - g.startY, M = this._ensureMap(l), I = this._generateKey(o, n), D = u.getListWithColor(c), E = ae(s), x = `${E != null ? E : ""}`, T = D.find((b) => b.label === x);
     let { tb: O, vt: F, ht: L } = i || {};
     if (O = O != null ? O : se.WRAP, F = F != null ? F : me.BOTTOM, L = L != null ? L : Be.LEFT, c.renderMode === le.ARROW) {
       this._drawDownIcon(a, g, C, _, F), a.save(), a.translateWithPrecision(g.startX, g.startY), a.beginPath(), a.rect(0, 0, C, _), a.clip();
       const b = C - Re, { documentSkeleton: $, documents: z, docModel: k } = oa(x, this._localeService, i);
       O === se.WRAP && k.updateDocumentDataPageSize(Math.max(b, 1)), $.calculate(), $.getActualSize();
-      const y = yt($), { height: P, width: oe } = y, { paddingTop: G, paddingLeft: Se } = cr(b, _, oe, P, F, L);
+      const y = yt($), { height: P, width: oe } = y, { paddingTop: G, paddingLeft: Se } = ur(b, _, oe, P, F, L);
       a.translate(0, G), a.save(), a.translateWithPrecision(Ke, 0), a.beginPath(), a.rect(0, 0, b, P), a.clip(), z.render(a), a.translateWithPrecision(Se, 0), a.restore(), a.restore(), M.set(I, {
         left: g.endX + e.rowHeaderWidth - Re,
         top: g.startY + e.columnHeaderHeight,
@@ -2219,15 +2217,15 @@ let ya = (fa = class {
       a.save(), a.translateWithPrecision(g.startX, g.startY), a.beginPath(), a.rect(0, 0, C, _), a.clip();
       const b = C - Pe * 2 - Ke - Re, { documentSkeleton: $, documents: z, docModel: k } = oa(x, this._localeService, i);
       O === se.WRAP && k.updateDocumentDataPageSize(Math.max(b, 1)), $.calculate();
-      const y = yt($), { height: P, width: oe } = y, { paddingTop: G, paddingLeft: Se } = cr(b, _, oe, P, F, L);
+      const y = yt($), { height: P, width: oe } = y, { paddingTop: G, paddingLeft: Se } = ur(b, _, oe, P, F, L);
       a.translate(Pe, G);
       const Le = Math.max(C - Pe * 2, 1), N = P;
-      Er.drawWith(a, {
+      br.drawWith(a, {
         width: Le,
         height: N,
         fill: (T == null ? void 0 : T.color) || xe,
         radius: 8
-      }), a.save(), a.translateWithPrecision(Ke, 0), a.beginPath(), a.rect(0, 0, b, P), a.clip(), a.translateWithPrecision(Se, 0), z.render(a), a.restore(), a.translate(b + Ke + 4, (P - Rs) / 2), a.fillStyle = Cs, a.fill(dr), a.restore(), M.set(I, {
+      }), a.save(), a.translateWithPrecision(Ke, 0), a.beginPath(), a.rect(0, 0, b, P), a.clip(), a.translateWithPrecision(Se, 0), z.render(a), a.restore(), a.translate(b + Ke + 4, (P - Rs) / 2), a.fillStyle = Cs, a.fill(cr), a.restore(), M.set(I, {
         left: g.startX + Pe + e.rowHeaderWidth,
         top: g.startY + G + e.columnHeaderHeight,
         width: Le,
@@ -2236,8 +2234,8 @@ let ya = (fa = class {
     }
   }
   calcCellAutoHeight(a) {
-    var R;
-    const { primaryWithCoord: t, style: e, data: r } = a, o = t.isMergedMainCell ? t.mergeInfo : t, n = r.fontRenderExtension, { leftOffset: i = 0, rightOffset: s = 0, topOffset: l = 0, downOffset: d = 0 } = n || {}, c = (R = r.dataValidation) == null ? void 0 : R.rule;
+    var S;
+    const { primaryWithCoord: t, style: e, data: r } = a, o = t.isMergedMainCell ? t.mergeInfo : t, n = r.fontRenderExtension, { leftOffset: i = 0, rightOffset: s = 0, topOffset: l = 0, downOffset: d = 0 } = n || {}, c = (S = r.dataValidation) == null ? void 0 : S.rule;
     if (!c || c.renderMode === le.TEXT)
       return;
     const u = {
@@ -2245,16 +2243,16 @@ let ya = (fa = class {
       endX: o.endX - s,
       startY: o.startY + l,
       endY: o.endY - d
-    }, f = u.endX - u.startX, p = ae(r), m = `${p != null ? p : ""}`;
-    let { tb: h } = e || {};
-    if (h = h != null ? h : se.WRAP, c.renderMode === le.ARROW) {
-      const g = f - Re, { documentSkeleton: C, docModel: _ } = oa(m, this._localeService, e);
-      h === se.WRAP && _.updateDocumentDataPageSize(Math.max(g, 1)), C.calculate(), C.getActualSize();
+    }, f = u.endX - u.startX, p = ae(r), h = `${p != null ? p : ""}`;
+    let { tb: m } = e || {};
+    if (m = m != null ? m : se.WRAP, c.renderMode === le.ARROW) {
+      const g = f - Re, { documentSkeleton: C, docModel: _ } = oa(h, this._localeService, e);
+      m === se.WRAP && _.updateDocumentDataPageSize(Math.max(g, 1)), C.calculate(), C.getActualSize();
       const M = yt(C), { height: I } = M;
       return I;
     } else {
-      const g = f - Pe * 2 - Ke - Re, { documentSkeleton: C, docModel: _ } = ao(m, this._localeService, e);
-      h === se.WRAP && _.updateDocumentDataPageSize(Math.max(g, 1)), C.calculate();
+      const g = f - Pe * 2 - Ke - Re, { documentSkeleton: C, docModel: _ } = ro(h, this._localeService, e);
+      m === se.WRAP && _.updateDocumentDataPageSize(Math.max(g, 1)), C.calculate();
       const M = yt(C), {
         height: I
       } = M;
@@ -2265,8 +2263,8 @@ let ya = (fa = class {
     const { data: e, subUnitId: r, row: o, col: n } = t, s = this._ensureMap(r).get(this._generateKey(o, n)), l = e.dataValidation;
     if (!l || !s || l.rule.renderMode === le.TEXT)
       return !1;
-    const { top: d, left: c, width: u, height: f } = s, { x: p, y: m } = a;
-    return p >= c && p <= c + u && m >= d && m <= d + f;
+    const { top: d, left: c, width: u, height: f } = s, { x: p, y: h } = a;
+    return p >= c && p <= c + u && h >= d && h <= d + f;
   }
   onPointerDown(a, t) {
     if (t.button === 2)
@@ -2279,21 +2277,21 @@ let ya = (fa = class {
     };
     this._commandService.executeCommand(Gt.id, i);
   }
-}, S(fa, "padding", {
+}, R(fa, "padding", {
   l: Pe + Ke,
   r: Re + Pe,
   t: be,
   b: be
 }), fa);
 ya = Ss([
-  lr(0, w(ie)),
-  lr(1, ee)
+  dr(0, w(ie)),
+  dr(1, ee)
 ], ya);
 const Ms = "LIST_RENDER_MODE_OPTION_INPUT";
 function jt(a) {
   var o;
   const { value: t, onChange: e } = a, r = j(ie);
-  return /* @__PURE__ */ v.jsx(Z, { label: r.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ v.jsxs(Ba, { value: `${(o = t.renderMode) != null ? o : le.CUSTOM}`, onChange: (n) => e({ ...t, renderMode: +n }), children: [
+  return /* @__PURE__ */ v.jsx(Z, { label: r.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ v.jsxs(Ua, { value: `${(o = t.renderMode) != null ? o : le.CUSTOM}`, onChange: (n) => e({ ...t, renderMode: +n }), children: [
     /* @__PURE__ */ v.jsx($e, { value: `${le.CUSTOM}`, children: r.t("dataValidation.renderMode.chip") }),
     /* @__PURE__ */ v.jsx($e, { value: `${le.ARROW}`, children: r.t("dataValidation.renderMode.arrow") }),
     /* @__PURE__ */ v.jsx($e, { value: `${le.TEXT}`, children: r.t("dataValidation.renderMode.text") })
@@ -2327,34 +2325,34 @@ const Is = [
   "offset"
 ];
 function ws(a, t) {
-  if (!A(a) || Wa(a.slice(1)))
+  if (!A(a) || ka(a.slice(1)))
     return !0;
   const r = t.sequenceNodesBuilder(a);
   return r && r.some((o) => typeof o == "object" && o.nodeType === wn.FUNCTION && Is.indexOf(o.token.toLowerCase()) > -1);
 }
 function ys(a, t) {
   const { formula1: e = "", ranges: r } = a;
-  if (Wa(e.slice(1))) {
-    const n = Tr(e.slice(1));
+  if (ka(e.slice(1))) {
+    const n = Fr(e.slice(1));
     if ((!n.sheetName || n.sheetName === t) && r.some((i) => Ue.intersects(i, n.range)))
       return !0;
   }
   return !1;
 }
-class ro extends Xe {
+class oo extends Xe {
   constructor() {
     super(...arguments);
-    S(this, "formulaService", this.injector.get(ce));
-    S(this, "_lexer", this.injector.get(Ha));
-    S(this, "_univerInstanceService", this.injector.get(J));
-    S(this, "id", H.LIST);
-    S(this, "title", "dataValidation.list.title");
-    S(this, "operators", []);
-    S(this, "scopes", ["sheet"]);
-    S(this, "formulaInput", Kr);
-    S(this, "canvasRender", this.injector.createInstance(ya));
-    S(this, "dropdown", eo);
-    S(this, "optionsInput", jt.componentKey);
+    R(this, "formulaService", this.injector.get(ce));
+    R(this, "_lexer", this.injector.get(Wa));
+    R(this, "_univerInstanceService", this.injector.get(J));
+    R(this, "id", H.LIST);
+    R(this, "title", "dataValidation.list.title");
+    R(this, "operators", []);
+    R(this, "scopes", ["sheet"]);
+    R(this, "formulaInput", Qr);
+    R(this, "canvasRender", this.injector.createInstance(ya));
+    R(this, "dropdown", to);
+    R(this, "optionsInput", jt.componentKey);
   }
   skipDefaultFontRender(e) {
     return e.renderMode !== le.TEXT;
@@ -2390,22 +2388,22 @@ class ro extends Xe {
     return this.localeService.t("dataValidation.list.error");
   }
   getList(e, r, o) {
-    var f, p, m;
+    var f, p, h;
     const { formula1: n = "" } = e, i = this.injector.get(J), s = (f = r ? i.getUniverSheetInstance(r) : void 0) != null ? f : i.getCurrentUnitForType(re.UNIVER_SHEET);
     if (!s) return [];
     const l = (p = o ? s.getSheetBySheetId(o) : void 0) != null ? p : s.getActiveSheet();
     if (!l) return [];
     const d = s.getUnitId(), c = l.getSheetId(), u = this.formulaService.getRuleFormulaResultSync(d, c, e.uid);
-    return A(n) ? na((m = u == null ? void 0 : u[0]) == null ? void 0 : m.result) : Ze(n);
+    return A(n) ? na((h = u == null ? void 0 : u[0]) == null ? void 0 : h.result) : Ze(n);
   }
   async getListAsync(e, r, o) {
-    var f, p, m;
+    var f, p, h;
     const { formula1: n = "" } = e, i = this.injector.get(J), s = (f = r ? i.getUniverSheetInstance(r) : void 0) != null ? f : i.getCurrentUnitForType(re.UNIVER_SHEET);
     if (!s) return [];
     const l = (p = o ? s.getSheetBySheetId(o) : void 0) != null ? p : s.getActiveSheet();
     if (!l) return [];
     const d = s.getUnitId(), c = l.getSheetId(), u = await this.formulaService.getRuleFormulaResult(d, c, e.uid);
-    return A(n) ? na((m = u == null ? void 0 : u[0]) == null ? void 0 : m.result) : Ze(n);
+    return A(n) ? na((h = u == null ? void 0 : u[0]) == null ? void 0 : h.result) : Ze(n);
   }
   getListWithColor(e, r, o) {
     const n = this.getList(e, r, o), i = (e.formula2 || "").split(",");
@@ -2425,10 +2423,10 @@ function $t(a) {
 class Ds extends Xe {
   constructor() {
     super(...arguments);
-    S(this, "_formulaService", this.injector.get(ce));
-    S(this, "id", H.DECIMAL);
-    S(this, "title", "dataValidation.decimal.title");
-    S(this, "operators", [
+    R(this, "_formulaService", this.injector.get(ce));
+    R(this, "id", H.DECIMAL);
+    R(this, "title", "dataValidation.decimal.title");
+    R(this, "operators", [
       V.BETWEEN,
       V.EQUAL,
       V.GREATER_THAN,
@@ -2438,9 +2436,9 @@ class Ds extends Xe {
       V.NOT_BETWEEN,
       V.NOT_EQUAL
     ]);
-    S(this, "scopes", ["sheet"]);
-    S(this, "formulaInput", Mt);
-    S(this, "dropDownInput");
+    R(this, "scopes", ["sheet"]);
+    R(this, "formulaInput", Mt);
+    R(this, "dropDownInput");
   }
   _isFormulaOrNumber(e) {
     return !X.isBlank(e) && (A(e) || !Number.isNaN(+e));
@@ -2460,11 +2458,11 @@ class Ds extends Xe {
     return e == null ? Number.NaN : +e;
   }
   async parseFormula(e, r, o) {
-    var d, c, u, f, p, m, h, R;
+    var d, c, u, f, p, h, m, S;
     const n = await this._formulaService.getRuleFormulaResult(r, o, e.uid), { formula1: i, formula2: s } = e;
     return {
       formula1: this._parseNumber(A(i) ? (f = (u = (c = (d = n == null ? void 0 : n[0]) == null ? void 0 : d.result) == null ? void 0 : c[0]) == null ? void 0 : u[0]) == null ? void 0 : f.v : i),
-      formula2: this._parseNumber(A(s) ? (R = (h = (m = (p = n == null ? void 0 : n[1]) == null ? void 0 : p.result) == null ? void 0 : m[0]) == null ? void 0 : h[0]) == null ? void 0 : R.v : s)
+      formula2: this._parseNumber(A(s) ? (S = (m = (h = (p = n == null ? void 0 : n[1]) == null ? void 0 : p.result) == null ? void 0 : h[0]) == null ? void 0 : m[0]) == null ? void 0 : S.v : s)
     };
   }
   validatorFormula(e, r, o) {
@@ -2526,9 +2524,9 @@ const Es = "{FORMULA1}", bs = "{FORMULA2}";
 class Os extends Xe {
   constructor() {
     super(...arguments);
-    S(this, "id", H.TEXT_LENGTH);
-    S(this, "title", "dataValidation.textLength.title");
-    S(this, "operators", [
+    R(this, "id", H.TEXT_LENGTH);
+    R(this, "title", "dataValidation.textLength.title");
+    R(this, "operators", [
       V.BETWEEN,
       V.EQUAL,
       V.GREATER_THAN,
@@ -2538,9 +2536,9 @@ class Os extends Xe {
       V.NOT_BETWEEN,
       V.NOT_EQUAL
     ]);
-    S(this, "scopes", ["sheet"]);
-    S(this, "formulaInput", Mt);
-    S(this, "_formulaService", this.injector.get(ce));
+    R(this, "scopes", ["sheet"]);
+    R(this, "formulaInput", Mt);
+    R(this, "_formulaService", this.injector.get(ce));
   }
   _isFormulaOrInt(e) {
     return !X.isBlank(e) && (A(e) || !Number.isNaN(+e) && Number.isInteger(+e));
@@ -2568,11 +2566,11 @@ class Os extends Xe {
     return !Number.isNaN(e);
   }
   async parseFormula(e, r, o) {
-    var l, d, c, u, f, p, m, h;
+    var l, d, c, u, f, p, h, m;
     const n = await this._formulaService.getRuleFormulaResult(r, o, e.uid), { formula1: i, formula2: s } = e;
     return {
       formula1: this._parseNumber(A(i) ? (u = (c = (d = (l = n == null ? void 0 : n[0]) == null ? void 0 : l.result) == null ? void 0 : d[0]) == null ? void 0 : c[0]) == null ? void 0 : u.v : i),
-      formula2: this._parseNumber(A(s) ? (h = (m = (p = (f = n == null ? void 0 : n[1]) == null ? void 0 : f.result) == null ? void 0 : p[0]) == null ? void 0 : m[0]) == null ? void 0 : h.v : s)
+      formula2: this._parseNumber(A(s) ? (m = (h = (p = (f = n == null ? void 0 : n[1]) == null ? void 0 : f.result) == null ? void 0 : p[0]) == null ? void 0 : h[0]) == null ? void 0 : m.v : s)
     };
   }
   transform(e, r, o) {
@@ -2625,120 +2623,126 @@ class Os extends Xe {
   }
   generateRuleErrorMessage(e) {
     var o, n;
-    return e.operator ? `${this.localeService.t(Lo[e.operator]).replace(Es, (o = e.formula1) != null ? o : "").replace(bs, (n = e.formula2) != null ? n : "")}` : this.titleStr;
+    return e.operator ? `${this.localeService.t(Po[e.operator]).replace(Es, (o = e.formula1) != null ? o : "").replace(bs, (n = e.formula2) != null ? n : "")}` : this.titleStr;
   }
 }
-function oo(a) {
+function no(a) {
   var e, r;
   return a ? a.p ? !((r = (e = a.p.body) == null ? void 0 : e.dataStream) != null ? r : "").slice(0, -2).trim() : X.isBlank(a.v) : !0;
 }
-function rt(a, t, e, r) {
-  const o = [], n = [], s = r.get(q).ensureManager(a, t), l = r.get(J), d = Yt(l, { unitId: a, subUnitId: t });
-  if (!d)
+function at(a, t, e, r, o = "command") {
+  const n = [], i = [], l = r.get(q).ensureManager(a, t), d = r.get(J), c = Yt(d, { unitId: a, subUnitId: t });
+  if (!c)
     return {
-      redoMutations: o,
-      undoMutations: n
+      redoMutations: n,
+      undoMutations: i
     };
-  const { worksheet: c } = d, u = new Ye();
-  function f(h, R) {
-    h.forEach((g) => {
-      W.foreach(g, (C, _) => {
-        const M = c.getCellRaw(C, _), I = Lr(M);
-        (oo(M) || I === R) && u.setValue(C, _, {
-          v: R,
+  const { worksheet: u } = c, f = new Ye();
+  function p(S, g) {
+    S.forEach((C) => {
+      W.foreach(C, (_, M) => {
+        const I = u.getCellRaw(_, M), D = Pr(I);
+        (no(I) || D === g) && f.setValue(_, M, {
+          v: g,
           p: null
         });
       });
     });
   }
-  e.forEach((h) => {
-    switch (h.type) {
+  e.forEach((S) => {
+    switch (S.type) {
       case "delete":
-        o.push({
+        n.push({
           id: Ft.id,
           params: {
             unitId: a,
             subUnitId: t,
-            ruleId: h.rule.uid
+            ruleId: S.rule.uid,
+            source: o
           }
-        }), n.unshift({
+        }), i.unshift({
           id: va.id,
           params: {
             unitId: a,
             subUnitId: t,
-            rule: h.rule,
-            index: h.index
+            rule: S.rule,
+            index: S.index,
+            source: o
           }
         });
         break;
       case "update": {
-        o.push({
+        n.push({
           id: pe.id,
           params: {
             unitId: a,
             subUnitId: t,
-            ruleId: h.ruleId,
+            ruleId: S.ruleId,
             payload: {
               type: fe.RANGE,
-              payload: h.newRanges
-            }
+              payload: S.newRanges
+            },
+            source: o
           }
-        }), n.unshift({
+        }), i.unshift({
           id: pe.id,
           params: {
             unitId: a,
             subUnitId: t,
-            ruleId: h.ruleId,
+            ruleId: S.ruleId,
             payload: {
               type: fe.RANGE,
-              payload: h.oldRanges
-            }
+              payload: S.oldRanges
+            },
+            source: o
           }
         });
-        const R = s.getRuleById(h.ruleId);
-        if (R && R.type === H.CHECKBOX) {
-          const C = s.getValidator(H.CHECKBOX).parseFormulaSync(R, a, t);
-          f(h.newRanges, C.formula2);
+        const g = l.getRuleById(S.ruleId);
+        if (g && g.type === H.CHECKBOX) {
+          const _ = l.getValidator(H.CHECKBOX).parseFormulaSync(g, a, t);
+          p(S.newRanges, _.formula2);
         }
         break;
       }
       case "add": {
-        if (o.push({
+        if (n.push({
           id: va.id,
           params: {
             unitId: a,
             subUnitId: t,
-            rule: h.rule
+            rule: S.rule,
+            source: o
           }
-        }), n.unshift({
+        }), i.unshift({
           id: Ft.id,
           params: {
             unitId: a,
             subUnitId: t,
-            ruleId: h.rule.uid
+            ruleId: S.rule.uid,
+            source: o
           }
-        }), h.rule.type === H.CHECKBOX) {
-          const g = s.getValidator(H.CHECKBOX).parseFormulaSync(h.rule, a, t);
-          f(h.rule.ranges, g.formula2);
+        }), S.rule.type === H.CHECKBOX) {
+          const C = l.getValidator(H.CHECKBOX).parseFormulaSync(S.rule, a, t);
+          p(S.rule.ranges, C.formula2);
         }
         break;
       }
     }
   });
-  const p = {
+  const h = {
     id: Lt.id,
     params: {
       unitId: a,
       subUnitId: t,
-      cellValue: u.getData()
+      cellValue: f.getData()
     }
   }, m = {
     id: Lt.id,
-    params: Rr(r, p.params)
+    params: Cr(r, h.params)
   };
-  return o.push(p), n.push(m), {
-    redoMutations: o,
-    undoMutations: n
+  return n.push(h), i.push(m), {
+    redoMutations: n,
+    undoMutations: i
   };
 }
 const Kt = {
@@ -2752,12 +2756,12 @@ const Kt = {
       return !1;
     const u = c.ranges, f = d.getRuleObjectMatrix().clone();
     f.updateRange(n, u, o);
-    const p = f.diff(d.getDataValidations()), { redoMutations: m, undoMutations: h } = rt(e, r, p, a);
+    const p = f.diff(d.getDataValidations()), { redoMutations: h, undoMutations: m } = at(e, r, p, a);
     return l.pushUndoRedo({
-      undoMutations: h,
-      redoMutations: m,
+      undoMutations: m,
+      redoMutations: h,
       unitID: e
-    }), await fr(m, s), !0;
+    }), await pr(h, s), !0;
   }
 }, Qt = {
   type: Ie.COMMAND,
@@ -2771,7 +2775,7 @@ const Kt = {
       unitId: e,
       subUnitId: r,
       rule: o
-    }, { redoMutations: f, undoMutations: p } = rt(e, r, c, a);
+    }, { redoMutations: f, undoMutations: p } = at(e, r, c, a);
     return f.push({
       id: va.id,
       params: u
@@ -2786,20 +2790,20 @@ const Kt = {
       unitID: e,
       redoMutations: f,
       undoMutations: p
-    }), await fr(f, i), !0;
+    }), await pr(f, i), !0;
   }
-}, Xa = {
+}, Ga = {
   type: Ie.COMMAND,
   id: "data-validation.command.addRuleAndOpen",
   async handler(a) {
     const t = a.get(J), e = Yt(t);
     if (!e) return !1;
-    const { workbook: r, worksheet: o } = e, n = _r(a), i = a.get(ee), s = r.getUnitId(), l = o.getSheetId(), d = {
+    const { workbook: r, worksheet: o } = e, n = Sr(a), i = a.get(ee), s = r.getUnitId(), l = o.getSheetId(), d = {
       rule: n,
       unitId: s,
       subUnitId: l
     };
-    return await i.executeCommand(Qt.id, d) ? (i.executeCommand(ot.id, {
+    return await i.executeCommand(Qt.id, d) ? (i.executeCommand(rt.id, {
       ruleId: n.uid,
       isAdd: !0
     }), !0) : !1;
@@ -2828,7 +2832,7 @@ const Kt = {
     }, p = [{
       id: pe.id,
       params: f
-    }], m = {
+    }], h = {
       unitId: i,
       subUnitId: s,
       ruleId: l,
@@ -2836,9 +2840,9 @@ const Kt = {
         type: fe.SETTING,
         payload: ga(u)
       }
-    }, h = [{
+    }, m = [{
       id: pe.id,
-      params: m
+      params: h
     }];
     if (d.type === H.CHECKBOX) {
       const g = u.ranges, C = a.get(J), _ = Yt(C, { unitId: i, subUnitId: s });
@@ -2846,8 +2850,8 @@ const Kt = {
         const M = new Ye(), { worksheet: I } = _, { formula2: D = Rt, formula1: E = St } = u, { formula2: x = Rt, formula1: T = St } = d;
         g.forEach((L) => {
           W.foreach(L, (B, U) => {
-            const b = I.getCellRaw(B, U), $ = Lr(b);
-            oo(b) || $ === String(D) ? M.setValue(B, U, {
+            const b = I.getCellRaw(B, U), $ = Pr(b);
+            no(b) || $ === String(D) ? M.setValue(B, U, {
               v: x,
               p: null
             }) : $ === String(E) && M.setValue(B, U, {
@@ -2865,18 +2869,18 @@ const Kt = {
           }
         }, F = {
           id: Lt.id,
-          params: Rr(a, O.params)
+          params: Cr(a, O.params)
         };
-        p.push(O), h.push(F);
+        p.push(O), m.push(F);
       }
     }
     return Ta(p, e).result ? (r.pushUndoRedo({
       unitID: i,
       redoMutations: p,
-      undoMutations: h
+      undoMutations: m
     }), !0) : !1;
   }
-}, no = {
+}, io = {
   type: Ie.COMMAND,
   id: "sheets.command.update-data-validation-options",
   handler(a, t) {
@@ -2914,47 +2918,47 @@ const Kt = {
       undoMutations: p
     }), e.executeCommand(pe.id, c), !0;
   }
-}, io = "data-validation-single", Ga = "sheet.menu.data-validation";
+}, so = "data-validation-single", qa = "sheet.menu.data-validation";
 function Ns(a) {
   return {
-    id: Ga,
+    id: qa,
     type: xa.SUBITEMS,
-    positions: [on.TOOLBAR_START],
-    group: nn.TOOLBAR_FORMULAS_INSERT,
-    icon: io,
+    positions: [nn.TOOLBAR_START],
+    group: sn.TOOLBAR_FORMULAS_INSERT,
+    icon: so,
     tooltip: "dataValidation.title",
-    hidden$: sn(a, re.UNIVER_SHEET),
-    disabled$: Yo(a, { workbookTypes: [_a], worksheetTypes: [Sa, Ra], rangeTypes: [Ca] })
+    hidden$: ln(a, re.UNIVER_SHEET),
+    disabled$: Xo(a, { workbookTypes: [_a], worksheetTypes: [Sa, Ra], rangeTypes: [Ca] })
   };
 }
 function Ts(a) {
   return {
-    id: ot.id,
+    id: rt.id,
     title: "dataValidation.panel.title",
     type: xa.BUTTON,
-    positions: [Ga]
+    positions: [qa]
   };
 }
 function Fs(a) {
   return {
-    id: Xa.id,
+    id: Ga.id,
     title: "dataValidation.panel.add",
     type: xa.BUTTON,
-    positions: [Ga]
+    positions: [qa]
   };
 }
-var Ls = Object.defineProperty, Ps = Object.getOwnPropertyDescriptor, so = (a, t, e, r) => {
+var Ls = Object.defineProperty, Ps = Object.getOwnPropertyDescriptor, lo = (a, t, e, r) => {
   for (var o = r > 1 ? void 0 : r ? Ps(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
   return r && o && Ls(t, e, o), o;
 }, Q = (a, t) => (e, r) => t(e, r, a);
-const lo = {}, co = {
+const co = {}, uo = {
   tr: {
     size: 6,
     color: "#fe4b4b"
   }
 };
-let ht = class extends Fa {
+let ut = class extends Fa {
   constructor(a, t, e, r, o, n, i, s, l, d, c, u, f) {
     super(), this._config = a, this._commandService = t, this._menuService = e, this._renderManagerService = r, this._univerInstanceService = o, this._autoHeightController = n, this._componentManager = i, this._dropdownManagerService = s, this._dataValidationModel = l, this._dataValidatorRegistryService = d, this._injector = c, this._sheetInterceptorService = u, this._editorBridgeService = f, this._initMenu(), this._initSkeletonChange(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
   }
@@ -3027,7 +3031,7 @@ let ht = class extends Fa {
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        Cr.CELL_CONTENT,
+        Vr.CELL_CONTENT,
         {
           priority: 200,
           // eslint-disable-next-line max-lines-per-function, complexity
@@ -3042,23 +3046,23 @@ let ht = class extends Fa {
             const u = t.workbook.getStyles(), f = (typeof (a == null ? void 0 : a.s) == "string" ? u.get(a == null ? void 0 : a.s) : a == null ? void 0 : a.s) || {}, p = d.getRuleIdByLocation(r, o);
             if (!p)
               return e(a);
-            const m = d.getRuleById(p);
-            if (!m)
+            const h = d.getRuleById(p);
+            if (!h)
               return e(a);
-            const h = l.getCellRaw(t.row, t.col), R = this._dataValidationModel.validator(ae(h), m, t), g = this._dataValidatorRegistryService.getValidatorItem(m.type), C = ae(a);
+            const m = l.getCellRaw(t.row, t.col), S = this._dataValidationModel.validator(ae(m), h, t), g = this._dataValidatorRegistryService.getValidatorItem(h.type), C = ae(a);
             let _ = {};
-            if ((m.type === H.LIST || m.type === H.LIST_MULTIPLE) && (_ = {
+            if ((h.type === H.LIST || h.type === H.LIST_MULTIPLE) && (_ = {
               interceptorStyle: {
                 ...a == null ? void 0 : a.interceptorStyle,
                 tb: (D = f.tb !== se.OVERFLOW ? f.tb : se.CLIP) != null ? D : se.WRAP
               }
-            }), m.type === H.CHECKBOX && (_ = {
+            }), h.type === H.CHECKBOX && (_ = {
               interceptorStyle: {
                 ...a == null ? void 0 : a.interceptorStyle,
                 tb: se.CLIP
               }
-            }), m.type === H.LIST && (m.renderMode === le.ARROW || m.renderMode === le.TEXT)) {
-              const O = g.getListWithColorMap(m), F = `${(E = ae(a)) != null ? E : ""}`, L = O[F];
+            }), h.type === H.LIST && (h.renderMode === le.ARROW || h.renderMode === le.TEXT)) {
+              const O = g.getListWithColorMap(h), F = `${(E = ae(a)) != null ? E : ""}`, L = O[F];
               L && (_ = {
                 ..._,
                 interceptorStyle: {
@@ -3074,13 +3078,13 @@ let ht = class extends Fa {
               ..._,
               dataValidation: {
                 ruleId: p,
-                validStatus: R,
-                rule: m,
+                validStatus: S,
+                rule: h,
                 validator: g
               },
               markers: {
                 ...a == null ? void 0 : a.markers,
-                ...R === Ce.INVALID ? co : null
+                ...S === Ce.INVALID ? uo : null
               },
               customRender: [
                 ...(x = a == null ? void 0 : a.customRender) != null ? x : [],
@@ -3090,7 +3094,7 @@ let ht = class extends Fa {
               fontRenderExtension: {
                 // @ts-ignore
                 ...a == null ? void 0 : a.fontRenderExtension,
-                isSkip: g == null ? void 0 : g.skipDefaultFontRender(m, C, t)
+                isSkip: g == null ? void 0 : g.skipDefaultFontRender(h, C, t)
               },
               interceptorStyle: {
                 ...a == null ? void 0 : a.interceptorStyle,
@@ -3106,8 +3110,8 @@ let ht = class extends Fa {
                     ...a,
                     dataValidation: {
                       ruleId: p,
-                      validStatus: R,
-                      rule: m,
+                      validStatus: S,
+                      rule: h,
                       validator: g
                     }
                   },
@@ -3122,7 +3126,7 @@ let ht = class extends Fa {
                 };
                 return (b = (U = g == null ? void 0 : g.canvasRender) == null ? void 0 : U.calcCellAutoHeight) == null ? void 0 : b.call(U, F);
               },
-              coverable: ((T = a == null ? void 0 : a.coverable) != null ? T : !0) && !(m.type === H.LIST || m.type === H.LIST_MULTIPLE)
+              coverable: ((T = a == null ? void 0 : a.coverable) != null ? T : !0) && !(h.type === H.LIST || h.type === H.LIST_MULTIPLE)
             });
           }
         }
@@ -3130,7 +3134,12 @@ let ht = class extends Fa {
     );
   }
   _initAutoHeight() {
-    this._dataValidationModel.ruleChange$.pipe(Or(16)).subscribe((a) => {
+    this._dataValidationModel.ruleChange$.pipe(
+      // patched data-validation change don't need to re-calc row height
+      // re-calc of row height will be triggered precisely by the origin command
+      $a((a) => a.source === "command"),
+      Nr(16)
+    ).subscribe((a) => {
       const t = [];
       if (a.forEach((e) => {
         var r;
@@ -3142,22 +3151,22 @@ let ht = class extends Fa {
     });
   }
 };
-ht = so([
-  ve(_e.Rendered, ht),
+ut = lo([
+  ve(_e.Rendered, ut),
   Q(1, ee),
-  Q(2, ln),
+  Q(2, dn),
   Q(3, ja),
   Q(4, J),
-  Q(5, w(Mr)),
+  Q(5, w(Ir)),
   Q(6, w(Vt)),
   Q(7, w(Oe)),
   Q(8, w(q)),
   Q(9, w(we)),
   Q(10, w(De)),
   Q(11, w(Pa)),
-  Q(12, Oo(Aa))
-], ht);
-let mt = class extends Fa {
+  Q(12, bo(Aa))
+], ut);
+let ht = class extends Fa {
   constructor(a, t, e, r, o, n, i, s) {
     super(), this._config = a, this._commandService = t, this._renderManagerService = e, this._univerInstanceService = r, this._autoHeightController = o, this._dataValidationModel = n, this._dataValidatorRegistryService = i, this._sheetInterceptorService = s, this._initSkeletonChange(), this._initViewModelIntercept(), this._initAutoHeight();
   }
@@ -3177,7 +3186,7 @@ let mt = class extends Fa {
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        Cr.CELL_CONTENT,
+        Vr.CELL_CONTENT,
         {
           priority: 200,
           // eslint-disable-next-line max-lines-per-function
@@ -3192,23 +3201,23 @@ let mt = class extends Fa {
             const u = t.workbook.getStyles(), f = (typeof (a == null ? void 0 : a.s) == "string" ? u.get(a == null ? void 0 : a.s) : a == null ? void 0 : a.s) || {}, p = d.getRuleIdByLocation(r, o);
             if (!p)
               return e(a);
-            const m = d.getRuleById(p);
-            if (!m)
+            const h = d.getRuleById(p);
+            if (!h)
               return e(a);
-            const h = t.worksheet.getCellRaw(t.row, t.col), R = this._dataValidationModel.validator(ae(h), m, t), g = this._dataValidatorRegistryService.getValidatorItem(m.type), C = ae(a);
+            const m = t.worksheet.getCellRaw(t.row, t.col), S = this._dataValidationModel.validator(ae(m), h, t), g = this._dataValidatorRegistryService.getValidatorItem(h.type), C = ae(a);
             let _ = {};
-            if ((m.type === H.LIST || m.type === H.LIST_MULTIPLE) && (_ = {
+            if ((h.type === H.LIST || h.type === H.LIST_MULTIPLE) && (_ = {
               interceptorStyle: {
                 ...a == null ? void 0 : a.interceptorStyle,
                 tb: (D = f.tb !== se.OVERFLOW ? f.tb : se.CLIP) != null ? D : se.WRAP
               }
-            }), m.type === H.CHECKBOX && (_ = {
+            }), h.type === H.CHECKBOX && (_ = {
               interceptorStyle: {
                 ...a == null ? void 0 : a.interceptorStyle,
                 tb: se.CLIP
               }
-            }), m.type === H.LIST && (m.renderMode === le.ARROW || m.renderMode === le.TEXT)) {
-              const T = g.getListWithColorMap(m), O = `${(E = ae(a)) != null ? E : ""}`, F = T[O];
+            }), h.type === H.LIST && (h.renderMode === le.ARROW || h.renderMode === le.TEXT)) {
+              const T = g.getListWithColorMap(h), O = `${(E = ae(a)) != null ? E : ""}`, F = T[O];
               F && (_ = {
                 ..._,
                 interceptorStyle: {
@@ -3224,13 +3233,13 @@ let mt = class extends Fa {
               ..._,
               dataValidation: {
                 ruleId: p,
-                validStatus: R,
-                rule: m,
+                validStatus: S,
+                rule: h,
                 validator: g
               },
               markers: {
                 ...a == null ? void 0 : a.markers,
-                ...R === Ce.INVALID ? co : null
+                ...S === Ce.INVALID ? uo : null
               },
               customRender: [
                 ...(x = a == null ? void 0 : a.customRender) != null ? x : [],
@@ -3240,7 +3249,7 @@ let mt = class extends Fa {
               fontRenderExtension: {
                 // @ts-ignore
                 ...a == null ? void 0 : a.fontRenderExtension,
-                isSkip: g == null ? void 0 : g.skipDefaultFontRender(m, C, t)
+                isSkip: g == null ? void 0 : g.skipDefaultFontRender(h, C, t)
               },
               interceptorStyle: {
                 ...a == null ? void 0 : a.interceptorStyle,
@@ -3256,8 +3265,8 @@ let mt = class extends Fa {
                     ...a,
                     dataValidation: {
                       ruleId: p,
-                      validStatus: R,
-                      rule: m,
+                      validStatus: S,
+                      rule: h,
                       validator: g
                     }
                   },
@@ -3279,7 +3288,10 @@ let mt = class extends Fa {
     );
   }
   _initAutoHeight() {
-    this._dataValidationModel.ruleChange$.pipe(Or(16)).subscribe((a) => {
+    this._dataValidationModel.ruleChange$.pipe(
+      $a((a) => a.source === "command"),
+      Nr(16)
+    ).subscribe((a) => {
       const t = [];
       if (a.forEach((e) => {
         var r;
@@ -3291,16 +3303,16 @@ let mt = class extends Fa {
     });
   }
 };
-mt = so([
-  ve(_e.Rendered, mt),
+ht = lo([
+  ve(_e.Rendered, ht),
   Q(1, ee),
   Q(2, ja),
   Q(3, J),
-  Q(4, w(Mr)),
+  Q(4, w(Ir)),
   Q(5, w(q)),
   Q(6, w(we)),
   Q(7, w(Pa))
-], mt);
+], ht);
 var As = Object.defineProperty, xs = Object.getOwnPropertyDescriptor, js = (a, t, e, r) => {
   for (var o = r > 1 ? void 0 : r ? xs(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
@@ -3309,9 +3321,9 @@ var As = Object.defineProperty, xs = Object.getOwnPropertyDescriptor, js = (a, t
 let Ct = class extends ue {
   constructor(t) {
     super();
-    S(this, "_currentManager");
-    S(this, "_currentManager$", new br());
-    S(this, "currentManager$", this._currentManager$.asObservable());
+    R(this, "_currentManager");
+    R(this, "_currentManager$", new Or());
+    R(this, "currentManager$", this._currentManager$.asObservable());
     this._dataValidationModel = t, this.disposeWithMe(() => {
       this._currentManager$.complete();
     });
@@ -3348,15 +3360,15 @@ var Bs = Object.defineProperty, Us = Object.getOwnPropertyDescriptor, Hs = (a, t
 let ke = class extends ue {
   constructor(t, e, r, o) {
     super();
-    S(this, "_formulaMap", /* @__PURE__ */ new Map());
+    R(this, "_formulaMap", /* @__PURE__ */ new Map());
     /**
      * Map of origin formula of rule
      */
-    S(this, "_ruleFormulaMap", /* @__PURE__ */ new Map());
+    R(this, "_ruleFormulaMap", /* @__PURE__ */ new Map());
     /**
      * reflect of formulaId to cell, only store transformable formula
      */
-    S(this, "_formulaCellMap", /* @__PURE__ */ new Map());
+    R(this, "_formulaCellMap", /* @__PURE__ */ new Map());
     this._registerOtherFormulaService = t, this._lexerTreeBuilder = e, this._dataValidationModel = r, this._dataValidationCacheService = o, this._initFormulaResultHandler();
   }
   _initFormulaResultHandler() {
@@ -3366,8 +3378,8 @@ let ke = class extends ue {
         for (const o in r) {
           const n = r[o], { formulaCellMap: i, ruleFormulaMap: s } = this._ensureMaps(e, o), l = this._dataValidationModel.ensureManager(e, o);
           n.forEach((d) => {
-            var p, m;
-            const c = s.get((p = d.extra) == null ? void 0 : p.ruleId), u = i.get(d.formulaId), f = l.getRuleById((m = d.extra) == null ? void 0 : m.ruleId);
+            var p, h;
+            const c = s.get((p = d.extra) == null ? void 0 : p.ruleId), u = i.get(d.formulaId), f = l.getRuleById((h = d.extra) == null ? void 0 : h.ruleId);
             f && c && !c.isTransformable && this._dataValidationCacheService.markRangeDirty(e, o, f.ranges), u && this._dataValidationCacheService.markCellDirty(e, o, u.row, u.column);
           });
         }
@@ -3393,8 +3405,8 @@ let ke = class extends ue {
       W.foreach(c, (u, f) => {
         const p = o.getValue(u, f);
         if (p && p.ruleId === r) {
-          const { formulaId: m } = p;
-          o.realDeleteValue(u, f), l.add(m), n.delete(m);
+          const { formulaId: h } = p;
+          o.realDeleteValue(u, f), l.add(h), n.delete(h);
         }
       });
     }), this._registerOtherFormulaService.deleteFormula(t, e, Array.from(l.values())));
@@ -3409,24 +3421,24 @@ let ke = class extends ue {
     ), c = n[0].startRow, u = n[0].startColumn;
     let f;
     d ? n.forEach((p) => {
-      W.foreach(p, (m, h) => {
-        const R = tr(
+      W.foreach(p, (h, m) => {
+        const S = ar(
           this._lexerTreeBuilder,
           o,
           c,
           u,
-          m,
-          h
-        ), g = this._registerFormula(t, e, r, R);
-        i.setValue(m, h, {
+          h,
+          m
+        ), g = this._registerFormula(t, e, r, S);
+        i.setValue(h, m, {
           formulaId: g,
           // formulaText: relativeFormula,
           ruleId: r
-        }), l.set(g, { row: m, column: h });
+        }), l.set(g, { row: h, column: m });
       });
     }) : (f = this._registerFormula(t, e, r, o), n.forEach((p) => {
-      W.foreach(p, (m, h) => {
-        i.setValue(m, h, {
+      W.foreach(p, (h, m) => {
+        i.setValue(h, m, {
           formulaId: f,
           // formulaText: formula,
           ruleId: r
@@ -3448,20 +3460,20 @@ let ke = class extends ue {
     const { formulaMap: i, ruleFormulaMap: s, formulaCellMap: l } = this._ensureMaps(t, e), d = s.get(r);
     if (!d)
       return;
-    const { formula: c, originCol: u, originRow: f, isTransformable: p, formulaId: m } = d, h = /* @__PURE__ */ new Set();
-    o.forEach((R) => {
-      W.foreach(R, (g, C) => {
+    const { formula: c, originCol: u, originRow: f, isTransformable: p, formulaId: h } = d, m = /* @__PURE__ */ new Set();
+    o.forEach((S) => {
+      W.foreach(S, (g, C) => {
         const _ = i.getValue(g, C);
         _ && _.ruleId === r && (_.temp = !0);
       });
-    }), n.forEach((R) => {
-      W.foreach(R, (g, C) => {
+    }), n.forEach((S) => {
+      W.foreach(S, (g, C) => {
         var M;
         const _ = (M = i.getValue(g, C)) != null ? M : {};
         if (_.ruleId !== r) {
           const I = s.get(_.ruleId);
-          if (I != null && I.isTransformable && h.add(_.formulaId), p) {
-            const D = tr(this._lexerTreeBuilder, c, f, u, g, C), E = this._registerFormula(t, e, r, D);
+          if (I != null && I.isTransformable && m.add(_.formulaId), p) {
+            const D = ar(this._lexerTreeBuilder, c, f, u, g, C), E = this._registerFormula(t, e, r, D);
             i.setValue(g, C, {
               // formulaText: relativeText,
               ruleId: r,
@@ -3471,19 +3483,19 @@ let ke = class extends ue {
             i.setValue(g, C, {
               // formulaText: formula,
               ruleId: r,
-              formulaId: m
+              formulaId: h
             });
         } else
           _.temp = !1;
       });
-    }), o.forEach((R) => {
-      W.foreach(R, (g, C) => {
+    }), o.forEach((S) => {
+      W.foreach(S, (g, C) => {
         const _ = i.getValue(g, C);
-        _ && _.ruleId === r && _.temp === !0 && (i.realDeleteValue(g, C), p && h.add(_.formulaId));
+        _ && _.ruleId === r && _.temp === !0 && (i.realDeleteValue(g, C), p && m.add(_.formulaId));
       });
-    }), h.forEach((R) => {
-      l.delete(R);
-    }), this._registerOtherFormulaService.deleteFormula(t, e, Array.from(h.values()));
+    }), m.forEach((S) => {
+      l.delete(S);
+    }), this._registerOtherFormulaService.deleteFormula(t, e, Array.from(m.values()));
   }
   updateRuleFormula(t, e, r, o, n) {
     const { ruleFormulaMap: i } = this._ensureMaps(t, e), s = i.get(r);
@@ -3499,20 +3511,20 @@ let ke = class extends ue {
   }
 };
 ke = Hs([
-  bt(0, w(Nr)),
-  bt(1, w(Ha)),
+  bt(0, w(Tr)),
+  bt(1, w(Wa)),
   bt(2, w(q)),
-  bt(3, w(nt))
+  bt(3, w(ot))
 ], ke);
 class Ws extends Xe {
   constructor() {
     super(...arguments);
-    S(this, "id", H.CUSTOM);
-    S(this, "title", "dataValidation.custom.title");
-    S(this, "operators", []);
-    S(this, "scopes", ["sheet"]);
-    S(this, "formulaInput", zr);
-    S(this, "_customFormulaService", this.injector.get(ke));
+    R(this, "id", H.CUSTOM);
+    R(this, "title", "dataValidation.custom.title");
+    R(this, "operators", []);
+    R(this, "scopes", ["sheet"]);
+    R(this, "formulaInput", Kr);
+    R(this, "_customFormulaService", this.injector.get(ke));
   }
   validatorFormula(e, r, o) {
     const n = A(e.formula1);
@@ -3538,10 +3550,10 @@ class Ws extends Xe {
 class ks extends Xe {
   constructor() {
     super(...arguments);
-    S(this, "_formulaService", this.injector.get(ce));
-    S(this, "id", H.WHOLE);
-    S(this, "title", "dataValidation.whole.title");
-    S(this, "operators", [
+    R(this, "_formulaService", this.injector.get(ce));
+    R(this, "id", H.WHOLE);
+    R(this, "title", "dataValidation.whole.title");
+    R(this, "operators", [
       V.BETWEEN,
       V.EQUAL,
       V.GREATER_THAN,
@@ -3551,9 +3563,9 @@ class ks extends Xe {
       V.NOT_BETWEEN,
       V.NOT_EQUAL
     ]);
-    S(this, "scopes", ["sheet"]);
-    S(this, "formulaInput", Mt);
-    S(this, "dropDownInput");
+    R(this, "scopes", ["sheet"]);
+    R(this, "formulaInput", Mt);
+    R(this, "dropDownInput");
   }
   _isFormulaOrInt(e) {
     return !X.isBlank(e) && (A(e) || !Number.isNaN(+e) && Number.isInteger(+e));
@@ -3573,11 +3585,11 @@ class ks extends Xe {
     return e == null ? Number.NaN : +e;
   }
   async parseFormula(e, r, o) {
-    var d, c, u, f, p, m, h, R;
+    var d, c, u, f, p, h, m, S;
     const n = await this._formulaService.getRuleFormulaResult(r, o, e.uid), { formula1: i, formula2: s } = e;
     return {
       formula1: this._parseNumber(A(i) ? (f = (u = (c = (d = n == null ? void 0 : n[0]) == null ? void 0 : d.result) == null ? void 0 : c[0]) == null ? void 0 : u[0]) == null ? void 0 : f.v : i),
-      formula2: this._parseNumber(A(s) ? (R = (h = (m = (p = n == null ? void 0 : n[1]) == null ? void 0 : p.result) == null ? void 0 : m[0]) == null ? void 0 : h[0]) == null ? void 0 : R.v : s)
+      formula2: this._parseNumber(A(s) ? (S = (m = (h = (p = n == null ? void 0 : n[1]) == null ? void 0 : p.result) == null ? void 0 : h[0]) == null ? void 0 : m[0]) == null ? void 0 : S.v : s)
     };
   }
   validatorFormula(e, r, o) {
@@ -3635,16 +3647,16 @@ class ks extends Xe {
     return Number.isNaN(n) ? !0 : e.value <= n;
   }
 }
-const uo = 4, Ys = 0, ia = 4, ho = 4, Ea = 6, Bt = 6, Ae = 14;
+const ho = 4, Ys = 0, ia = 4, mo = 4, Ea = 6, Bt = 6, Ae = 14;
 function Xs(a, t) {
-  const e = pn.getTextSize(a, t), r = e.width + uo * 2, { ba: o, bd: n } = e, i = o + n;
+  const e = gn.getTextSize(a, t), r = e.width + ho * 2, { ba: o, bd: n } = e, i = o + n;
   return {
     width: r,
     height: i + Ys * 2,
     ba: o
   };
 }
-function ur(a, t, e, r) {
+function hr(a, t, e, r) {
   const o = e - Ae - Ea, n = r - Bt * 2, i = a.map((c) => ({
     layout: Xs(c, t),
     text: c
@@ -3667,7 +3679,7 @@ function ur(a, t, e, r) {
   });
   let d = 0;
   return l.forEach((c, u) => {
-    u === l.length - 1 ? d += c.height : d += c.height + ho;
+    u === l.length - 1 ? d += c.height : d += c.height + mo;
   }), {
     lines: l,
     totalHeight: d,
@@ -3677,15 +3689,15 @@ function ur(a, t, e, r) {
   };
 }
 const Gs = 8;
-class qs extends gn {
+class qs extends vn {
   static drawWith(t, e) {
     const { fontFamily: r, fontString: o, fontSize: n, info: i, fill: s, color: l } = e, { layout: d, text: c } = i;
-    t.save(), Er.drawWith(t, {
+    t.save(), br.drawWith(t, {
       width: d.width,
       height: d.height,
       radius: Gs,
       fill: s || xe
-    }), t.translateWithPrecision(uo, d.ba), t.font = o, t.fillStyle = l, t.fillText(c, 0, 0), t.restore();
+    }), t.translateWithPrecision(ho, d.ba), t.font = o, t.fillStyle = l, t.fillText(c, 0, 0), t.restore();
   }
 }
 var zs = Object.defineProperty, Ks = Object.getOwnPropertyDescriptor, Qs = (a, t, e, r) => {
@@ -3696,8 +3708,8 @@ var zs = Object.defineProperty, Ks = Object.getOwnPropertyDescriptor, Qs = (a, t
 const Js = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
 let ba = class {
   constructor(a) {
-    S(this, "zIndex");
-    S(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
+    R(this, "zIndex");
+    R(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     this._commandService = a;
   }
   _ensureMap(a) {
@@ -3723,15 +3735,15 @@ let ba = class {
   // eslint-disable-next-line max-lines-per-function
   drawWith(a, t, e, r) {
     var P, oe;
-    const { primaryWithCoord: o, row: n, col: i, style: s, data: l, subUnitId: d } = t, c = o.isMergedMainCell ? o.mergeInfo : o, u = l.fontRenderExtension, { leftOffset: f = 0, rightOffset: p = 0, topOffset: m = 0, downOffset: h = 0 } = u || {}, R = l.dataValidation, g = this._ensureMap(d), C = this._generateKey(n, i);
-    if (!R)
+    const { primaryWithCoord: o, row: n, col: i, style: s, data: l, subUnitId: d } = t, c = o.isMergedMainCell ? o.mergeInfo : o, u = l.fontRenderExtension, { leftOffset: f = 0, rightOffset: p = 0, topOffset: h = 0, downOffset: m = 0 } = u || {}, S = l.dataValidation, g = this._ensureMap(d), C = this._generateKey(n, i);
+    if (!S)
       return;
     const _ = {
       startX: c.startX + f,
       endX: c.endX - p,
-      startY: c.startY + m,
-      endY: c.endY - h
-    }, M = _.endX - _.startX, I = _.endY - _.startY, { cl: D } = s || {}, E = (P = typeof D == "object" ? D == null ? void 0 : D.rgb : D) != null ? P : "#000", x = Ja(s != null ? s : void 0), { rule: T, validator: O } = R, F = O, { vt: L, ht: B } = s || {}, U = L != null ? L : me.MIDDLE, b = (oe = ae(l)) != null ? oe : "", $ = F.parseCellValue(b), z = F.getListWithColorMap(T), k = ur($, x, M, I);
+      startY: c.startY + h,
+      endY: c.endY - m
+    }, M = _.endX - _.startX, I = _.endY - _.startY, { cl: D } = s || {}, E = (P = typeof D == "object" ? D == null ? void 0 : D.rgb : D) != null ? P : "#000", x = er(s != null ? s : void 0), { rule: T, validator: O } = S, F = O, { vt: L, ht: B } = s || {}, U = L != null ? L : me.MIDDLE, b = (oe = ae(l)) != null ? oe : "", $ = F.parseCellValue(b), z = F.getListWithColorMap(T), k = hr($, x, M, I);
     this._drawDownIcon(a, _, M, I, U), a.save(), a.translateWithPrecision(_.startX, _.startY), a.beginPath(), a.rect(0, 0, M - Ae, I), a.clip(), a.translateWithPrecision(Ea, Bt);
     let y = 0;
     switch (U) {
@@ -3754,7 +3766,7 @@ let ba = class {
           Y = (k.contentWidth - Le) / 2;
           break;
       }
-      a.translate(Y, Se * (N + ho)), K.forEach((ne) => {
+      a.translate(Y, Se * (N + mo)), K.forEach((ne) => {
         a.save(), a.translateWithPrecision(ne.left, 0), qs.drawWith(a, {
           ...x,
           info: ne,
@@ -3779,8 +3791,8 @@ let ba = class {
     }, u = r.dataValidation;
     if (!u)
       return;
-    const f = c.endX - c.startX, p = c.endY - c.startY, m = (M = ae(r)) != null ? M : "", { validator: h } = u, g = h.parseCellValue(m), C = Ja(e != null ? e : void 0);
-    return ur(g, C, f, p).cellAutoHeight;
+    const f = c.endX - c.startX, p = c.endY - c.startY, h = (M = ae(r)) != null ? M : "", { validator: m } = u, g = m.parseCellValue(h), C = er(e != null ? e : void 0);
+    return hr(g, C, f, p).cellAutoHeight;
   }
   isHit(a, t) {
     const { primaryWithCoord: e } = t, r = e.isMergedMainCell ? e.mergeInfo : e, { endX: o } = r, { x: n } = a;
@@ -3801,12 +3813,12 @@ let ba = class {
 ba = Qs([
   Zs(0, ee)
 ], ba);
-class el extends ro {
+class el extends oo {
   constructor() {
     super(...arguments);
-    S(this, "id", H.LIST_MULTIPLE);
-    S(this, "title", "dataValidation.listMultiple.title");
-    S(this, "canvasRender", this.injector.createInstance(ba));
+    R(this, "id", H.LIST_MULTIPLE);
+    R(this, "title", "dataValidation.listMultiple.title");
+    R(this, "canvasRender", this.injector.createInstance(ba));
   }
   skipDefaultFontRender() {
     return !0;
@@ -3817,7 +3829,7 @@ var tl = Object.defineProperty, al = Object.getOwnPropertyDescriptor, rl = (a, t
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
   return r && o && tl(t, e, o), o;
 }, Ee = (a, t) => (e, r) => t(e, r, a);
-let ft = class extends Fa {
+let mt = class extends Fa {
   constructor(a, t, e, r, o, n, i, s) {
     super(), this._univerInstanceService = a, this._sheetDataValidationService = t, this._dataValidatorRegistryService = e, this._injector = r, this._componentManger = o, this._selectionManagerService = n, this._sheetInterceptorService = i, this._dataValidationModel = s, this._init();
   }
@@ -3831,7 +3843,7 @@ let ft = class extends Fa {
       Os,
       gs,
       yi,
-      ro,
+      oo,
       el,
       Ws
     ].forEach((a) => {
@@ -3846,7 +3858,7 @@ let ft = class extends Fa {
     });
   }
   _initInstanceChange() {
-    const a = new mr();
+    const a = new fr();
     this.disposeWithMe(this._univerInstanceService.getCurrentTypeOfUnit$(re.UNIVER_SHEET).subscribe((t) => {
       if (a.dispose(), !t)
         return;
@@ -3865,13 +3877,13 @@ let ft = class extends Fa {
     this._sheetInterceptorService.interceptCommand({
       getMutations: (a) => {
         var t;
-        if (a.id === Bo.id) {
+        if (a.id === Uo.id) {
           const e = this._univerInstanceService.getCurrentUnitForType(re.UNIVER_SHEET), r = e.getUnitId(), o = e.getActiveSheet();
           if (!o)
             throw new Error("No active sheet found");
           const n = o.getSheetId(), i = (t = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : t.map((f) => f.range), s = this._dataValidationModel.ensureManager(r, n), l = s.getRuleObjectMatrix().clone();
           i && l.removeRange(i);
-          const d = l.diff(s.getDataValidations()), { redoMutations: c, undoMutations: u } = rt(r, n, d, this._injector);
+          const d = l.diff(s.getDataValidations()), { redoMutations: c, undoMutations: u } = at(r, n, d, this._injector, "patched");
           return {
             undos: u,
             redos: c
@@ -3886,11 +3898,11 @@ let ft = class extends Fa {
   }
   _initComponents() {
     [
-      [io, Wr],
-      [jr, Yi],
-      [xr, An],
-      [eo, as],
-      [to, us],
+      [so, kr],
+      [$r, Yi],
+      [jr, An],
+      [to, as],
+      [ao, us],
       [jt.componentKey, jt],
       [xt.componentKey, xt],
       ...wi
@@ -3902,24 +3914,24 @@ let ft = class extends Fa {
     });
   }
 };
-ft = rl([
-  ve(_e.Rendered, ft),
+mt = rl([
+  ve(_e.Rendered, mt),
   Ee(0, J),
   Ee(1, w(Ct)),
   Ee(2, w(we)),
   Ee(3, w(De)),
   Ee(4, w(Vt)),
-  Ee(5, w($o)),
+  Ee(5, w(Bo)),
   Ee(6, w(Pa)),
   Ee(7, w(q))
-], ft);
+], mt);
 var ol = Object.defineProperty, nl = Object.getOwnPropertyDescriptor, il = (a, t, e, r) => {
   for (var o = r > 1 ? void 0 : r ? nl(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
   return r && o && ol(t, e, o), o;
 }, Ot = (a, t) => (e, r) => t(e, r, a);
 const sa = "SHEET_DATA_VALIDATION_ALERT";
-let pt = class extends ue {
+let ft = class extends ue {
   constructor(a, t, e, r) {
     super(), this._hoverManagerService = a, this._cellAlertManagerService = t, this._univerInstanceService = e, this._localeService = r, this._init();
   }
@@ -3941,7 +3953,7 @@ let pt = class extends ue {
           if (!l)
             return;
           this._cellAlertManagerService.showAlert({
-            type: qo.ERROR,
+            type: zo.ERROR,
             title: this._localeService.t("dataValidation.error.title"),
             message: l == null ? void 0 : l.getRuleFinalError(d),
             location: a.location,
@@ -3956,23 +3968,23 @@ let pt = class extends ue {
     }));
   }
 };
-pt = il([
-  ve(_e.Rendered, pt),
-  Ot(0, w(Xo)),
-  Ot(1, w(Go)),
+ft = il([
+  ve(_e.Rendered, ft),
+  Ot(0, w(Go)),
+  Ot(1, w(qo)),
   Ot(2, J),
   Ot(3, w(ie))
-], pt);
+], ft);
 var sl = Object.defineProperty, ll = Object.getOwnPropertyDescriptor, dl = (a, t, e, r) => {
   for (var o = r > 1 ? void 0 : r ? ll(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
   return r && o && sl(t, e, o), o;
 }, Qe = (a, t) => (e, r) => t(e, r, a);
-let at = class extends ue {
+let pt = class extends ue {
   constructor(t, e, r, o, n, i) {
     super();
-    S(this, "_disposableMap", /* @__PURE__ */ new Map());
-    S(this, "registerRule", (t, e, r) => {
+    R(this, "_disposableMap", /* @__PURE__ */ new Map());
+    R(this, "registerRule", (t, e, r) => {
       this.register(t, e, r), this.registerFormula(t, e, r);
     });
     this._dataValidationModel = t, this._injector = e, this._refRangeService = r, this._dataValidationCustomFormulaService = o, this._dataValidationFormulaService = n, this._formulaRefRangeService = i, this._initRefRange();
@@ -4003,7 +4015,7 @@ let at = class extends ue {
             [d]: c
           }
         }
-      }, m = {
+      }, h = {
         unitId: t,
         subUnitId: e,
         ruleId: r.uid,
@@ -4015,18 +4027,18 @@ let at = class extends ue {
             formula2: u.formula2
           }
         }
-      }, h = [
+      }, m = [
         {
           id: pe.id,
           params: p
         }
-      ], R = [
+      ], S = [
         {
           id: pe.id,
-          params: m
+          params: h
         }
       ];
-      return { redos: h, undos: R };
+      return { redos: m, undos: S };
     };
     if (r.type === H.CUSTOM) {
       const d = this._dataValidationCustomFormulaService.getRuleFormulaInfo(t, e, o);
@@ -4062,19 +4074,20 @@ let at = class extends ue {
   register(t, e, r) {
     var l;
     const o = (d) => {
-      const c = [...r.ranges], f = c.map((m) => Ho(m, d)).filter((m) => !!m).flat();
-      if (Eo(f, c))
+      const c = [...r.ranges], f = c.map((h) => Wo(h, d)).filter((h) => !!h).flat();
+      if (Oo(f, c))
         return { redos: [], undos: [] };
       if (f.length) {
-        const m = {
+        const h = {
           unitId: t,
           subUnitId: e,
           ruleId: r.uid,
           payload: {
             type: fe.RANGE,
             payload: f
-          }
-        }, h = [{ id: pe.id, params: m }], R = [{
+          },
+          source: "patched"
+        }, m = [{ id: pe.id, params: h }], S = [{
           id: pe.id,
           params: {
             unitId: t,
@@ -4083,13 +4096,14 @@ let at = class extends ue {
             payload: {
               type: fe.RANGE,
               payload: c
-            }
+            },
+            source: "patched"
           }
         }];
-        return { redos: h, undos: R };
+        return { redos: m, undos: S };
       } else {
-        const m = { unitId: t, subUnitId: e, ruleId: r.uid }, h = [{ id: Ft.id, params: m }], R = Po(this._injector, m);
-        return { redos: h, undos: R };
+        const h = { unitId: t, subUnitId: e, ruleId: r.uid }, m = [{ id: Ft.id, params: h }], S = Ao(this._injector, h);
+        return { redos: m, undos: S };
       }
     }, n = [];
     r.ranges.forEach((d) => {
@@ -4128,15 +4142,15 @@ let at = class extends ue {
     }));
   }
 };
-at = dl([
-  ve(_e.Ready, at),
+pt = dl([
+  ve(_e.Ready, pt),
   Qe(0, w(q)),
   Qe(1, w(De)),
-  Qe(2, w(Uo)),
+  Qe(2, w(Ho)),
   Qe(3, w(ke)),
   Qe(4, w(ce)),
   Qe(5, w(Sn))
-], at);
+], pt);
 var cl = Object.defineProperty, ul = Object.getOwnPropertyDescriptor, hl = (a, t, e, r) => {
   for (var o = r > 1 ? void 0 : r ? ul(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
@@ -4149,16 +4163,16 @@ let Tt = class extends ue {
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
     const a = () => ({ redos: [], undos: [] }), t = (o) => {
-      const { source: n, target: i, unitId: s, subUnitId: l } = o, d = this._dataValidationModel.ensureManager(s, l), c = d.getRuleObjectMatrix().clone(), u = Va([n, i]), [f, p] = u.ranges, { mapFunc: m } = u, h = {
+      const { source: n, target: i, unitId: s, subUnitId: l } = o, d = this._dataValidationModel.ensureManager(s, l), c = d.getRuleObjectMatrix().clone(), u = Va([n, i]), [f, p] = u.ranges, { mapFunc: h } = u, m = {
         row: f.startRow,
         col: f.startColumn
       };
-      Ko(f, p).forEach((M) => {
+      Qo(f, p).forEach((M) => {
         const I = M.repeatStartCell, D = M.relativeRange, E = {
-          startRow: h.row,
-          startColumn: h.col,
-          endColumn: h.col,
-          endRow: h.row
+          startRow: m.row,
+          startColumn: m.col,
+          endColumn: m.col,
+          endRow: m.row
         }, x = {
           startRow: I.row,
           startColumn: I.col,
@@ -4174,7 +4188,7 @@ let Tt = class extends ue {
               endRow: T
             },
             E
-          ), { row: L, col: B } = m(F.startRow, F.startColumn), U = d.getRuleIdByLocation(L, B);
+          ), { row: L, col: B } = h(F.startRow, F.startColumn), U = d.getRuleIdByLocation(L, B);
           if (U) {
             const b = Ue.getPositionRange(
               {
@@ -4184,12 +4198,12 @@ let Tt = class extends ue {
                 endRow: T
               },
               x
-            ), { row: $, col: z } = m(b.startRow, b.startColumn);
+            ), { row: $, col: z } = h(b.startRow, b.startColumn);
             c.setValue($, z, U);
           }
         });
       });
-      const g = c.diff(d.getDataValidations()), { redoMutations: C, undoMutations: _ } = rt(s, l, g, this._injector);
+      const g = c.diff(d.getDataValidations()), { redoMutations: C, undoMutations: _ } = at(s, l, g, this._injector, "patched");
       return {
         undos: _,
         redos: C
@@ -4218,7 +4232,7 @@ let Tt = class extends ue {
 };
 Tt = hl([
   ve(_e.Ready, Tt),
-  la(0, zo),
+  la(0, Ko),
   la(1, w(q)),
   la(2, w(De))
 ], Tt);
@@ -4230,7 +4244,7 @@ var ml = Object.defineProperty, fl = Object.getOwnPropertyDescriptor, pl = (a, t
 let gt = class extends ue {
   constructor(t, e, r) {
     super();
-    S(this, "_copyInfo");
+    R(this, "_copyInfo");
     this._sheetClipboardService = t, this._dataValidationModel = e, this._injector = r, this._initCopyPaste();
   }
   _initCopyPaste() {
@@ -4238,7 +4252,7 @@ let gt = class extends ue {
       id: qt,
       onBeforeCopy: (t, e, r) => this._collect(t, e, r),
       onPasteCells: (t, e, r, o) => {
-        const { copyType: n = Ka.COPY, pasteType: i } = o, { range: s } = t || {}, { range: l, unitId: d, subUnitId: c } = e;
+        const { copyType: n = Qa.COPY, pasteType: i } = o, { range: s } = t || {}, { range: l, unitId: d, subUnitId: c } = e;
         return this._generateMutations(l, { copyType: n, pasteType: i, copyRange: s, unitId: d, subUnitId: c });
       }
     });
@@ -4252,14 +4266,14 @@ let gt = class extends ue {
     };
     const n = this._dataValidationModel.ensureManager(t, e), i = {
       get: this._injector.get.bind(this._injector)
-    }, s = Qo(r, i, t, e);
+    }, s = Zo(r, i, t, e);
     if (!s)
       return;
     const { rows: l, cols: d } = s;
     l.forEach((c, u) => {
       d.forEach((f, p) => {
-        const m = n.getRuleIdByLocation(c, f);
-        o.setValue(u, p, m != null ? m : "");
+        const h = n.getRuleIdByLocation(c, f);
+        o.setValue(u, p, h != null ? h : "");
       });
     });
   }
@@ -4267,7 +4281,7 @@ let gt = class extends ue {
   _generateMutations(t, e) {
     if (!this._copyInfo)
       return { redos: [], undos: [] };
-    if (e.copyType === Ka.CUT)
+    if (e.copyType === Qa.CUT)
       return this._copyInfo = null, { redos: [], undos: [] };
     if (!this._copyInfo || !this._copyInfo.matrix.getSizeOf() || !e.copyRange)
       return { redos: [], undos: [] };
@@ -4282,10 +4296,10 @@ let gt = class extends ue {
       return { redos: [], undos: [] };
     const { unitId: r, subUnitId: o } = this._copyInfo;
     if (e.unitId !== r || o !== e.subUnitId) {
-      const n = this._dataValidationModel.ensureManager(r, o), i = this._dataValidationModel.ensureManager(e.unitId, e.subUnitId), s = i.getRuleObjectMatrix().clone(), { ranges: [l, d], mapFunc: c } = Va([e.copyRange, t]), u = Qa(l, d, !0), f = /* @__PURE__ */ new Map();
-      u.forEach(({ startRange: h }) => {
-        var R;
-        (R = this._copyInfo) == null || R.matrix.forValue((g, C, _) => {
+      const n = this._dataValidationModel.ensureManager(r, o), i = this._dataValidationModel.ensureManager(e.unitId, e.subUnitId), s = i.getRuleObjectMatrix().clone(), { ranges: [l, d], mapFunc: c } = Va([e.copyRange, t]), u = Za(l, d, !0), f = /* @__PURE__ */ new Map();
+      u.forEach(({ startRange: m }) => {
+        var S;
+        (S = this._copyInfo) == null || S.matrix.forValue((g, C, _) => {
           const M = Ue.getPositionRange(
             {
               startRow: g,
@@ -4293,45 +4307,47 @@ let gt = class extends ue {
               startColumn: C,
               endColumn: C
             },
-            h
+            m
           ), I = `${o}-${_}`, D = n.getRuleById(_);
           !i.getRuleById(I) && D && f.set(I, { ...D, uid: I });
           const { row: E, col: x } = c(M.startRow, M.startColumn);
           s.setValue(E, x, I);
         });
       });
-      const { redoMutations: p, undoMutations: m } = rt(
+      const { redoMutations: p, undoMutations: h } = at(
         e.unitId,
         e.subUnitId,
         s.diffWithAddition(i.getDataValidations(), f.values()),
-        this._injector
+        this._injector,
+        "patched"
       );
       return {
         redos: p,
-        undos: m
+        undos: h
       };
     } else {
       const n = this._dataValidationModel.ensureManager(r, o), i = n.getRuleObjectMatrix().clone(), { ranges: [s, l], mapFunc: d } = Va([e.copyRange, t]);
-      Qa(s, l, !0).forEach(({ startRange: p }) => {
-        var m;
-        (m = this._copyInfo) == null || m.matrix.forValue((h, R, g) => {
+      Za(s, l, !0).forEach(({ startRange: p }) => {
+        var h;
+        (h = this._copyInfo) == null || h.matrix.forValue((m, S, g) => {
           const C = Ue.getPositionRange(
             {
-              startRow: h,
-              endRow: h,
-              startColumn: R,
-              endColumn: R
+              startRow: m,
+              endRow: m,
+              startColumn: S,
+              endColumn: S
             },
             p
           ), { row: _, col: M } = d(C.startRow, C.startColumn);
           i.setValue(_, M, g);
         });
       });
-      const { redoMutations: u, undoMutations: f } = rt(
+      const { redoMutations: u, undoMutations: f } = at(
         r,
         o,
         i.diff(n.getDataValidations()),
-        this._injector
+        this._injector,
+        "patched"
       );
       return {
         redos: u,
@@ -4342,13 +4358,13 @@ let gt = class extends ue {
 };
 gt = pl([
   ve(_e.Ready, gt),
-  da(0, Zo),
+  da(0, Jo),
   da(1, w(q)),
   da(2, w(De))
 ], gt);
-class qa {
+class za {
   constructor(t, e) {
-    S(this, "value");
+    R(this, "value");
     this._worksheet = e, this.value = t;
   }
   addRule(t) {
@@ -4436,7 +4452,7 @@ class qa {
     }), r;
   }
   clone() {
-    return new qa(new Ye(this.value.clone()), this._worksheet);
+    return new za(new Ye(this.value.clone()), this._worksheet);
   }
   getValue(t, e) {
     return this.value.getValue(t, e);
@@ -4445,36 +4461,26 @@ class qa {
     return this.value.setValue(t, e, r);
   }
 }
-class gl extends Ao {
-  constructor(e, r, o, n) {
-    super(e, r, o);
+class gl extends xo {
+  constructor(e, r, o) {
+    super(e, r);
     /**
      * save cell's ruleId
      */
-    S(this, "_ruleMatrix");
-    S(this, "_dataValidatorRegistryService");
-    S(this, "_dataValidationCacheService");
-    S(this, "_dataValidationFormulaService");
-    S(this, "_dataValidationCustomFormulaService");
-    S(this, "_cache");
-    S(this, "_dataValidationRefRangeController");
-    this._injector = n, this._dataValidatorRegistryService = this._injector.get(we), this._dataValidationCacheService = this._injector.get(nt), this._dataValidationFormulaService = this._injector.get(ce), this._dataValidationCustomFormulaService = this._injector.get(ke), this._dataValidationRefRangeController = this._injector.get(at), this._cache = this._dataValidationCacheService.ensureCache(e, r);
-    const s = this._injector.get(J).getUnit(e, re.UNIVER_SHEET).getSheetBySheetId(r), l = new Ye();
-    o == null || o.forEach((d) => {
-      const c = d.uid;
-      d.ranges.forEach((u) => {
-        W.foreach(u, (f, p) => {
-          l.setValue(f, p, c);
-        });
-      });
-    }), o == null || o.forEach((d) => {
-      this._dataValidationRefRangeController.register(e, r, d);
-    }), this._ruleMatrix = new qa(l, s);
+    R(this, "_ruleMatrix");
+    R(this, "_dataValidatorRegistryService");
+    R(this, "_dataValidationCacheService");
+    R(this, "_dataValidationFormulaService");
+    R(this, "_dataValidationCustomFormulaService");
+    R(this, "_cache");
+    this._injector = o, this._dataValidatorRegistryService = this._injector.get(we), this._dataValidationCacheService = this._injector.get(ot), this._dataValidationFormulaService = this._injector.get(ce), this._dataValidationCustomFormulaService = this._injector.get(ke), this._cache = this._dataValidationCacheService.ensureCache(e, r);
+    const i = this._injector.get(J).getUnit(e, re.UNIVER_SHEET).getSheetBySheetId(r), s = new Ye();
+    this._ruleMatrix = new za(s, i);
   }
   _addRuleSideEffect(e) {
     var n;
     const { unitId: r, subUnitId: o } = this;
-    (e.type === H.LIST || e.type === H.LIST_MULTIPLE) && Wa((n = e.formula1) != null ? n : "") && (e.formula1 = `=${e.formula1}`), this._ruleMatrix.addRule(e), this._dataValidationCacheService.addRule(r, o, e), this._dataValidationFormulaService.addRule(r, o, e.uid, e.formula1, e.formula2), this._dataValidationCustomFormulaService.addRule(r, o, e);
+    (e.type === H.LIST || e.type === H.LIST_MULTIPLE) && ka((n = e.formula1) != null ? n : "") && (e.formula1 = `=${e.formula1}`), this._ruleMatrix.addRule(e), this._dataValidationCacheService.addRule(r, o, e), this._dataValidationFormulaService.addRule(r, o, e.uid, e.formula1, e.formula2), this._dataValidationCustomFormulaService.addRule(r, o, e);
   }
   addRule(e, r) {
     (Array.isArray(e) ? e : [e]).forEach((n) => {
@@ -4511,12 +4517,12 @@ class gl extends Ao {
         status: Ce.VALIDATING,
         ruleId: c
       }), u.validator({ value: e, unitId: l, subUnitId: d, row: s, column: i }, r).then((p) => {
-        const m = p ? Ce.VALID : Ce.INVALID;
+        const h = p ? Ce.VALID : Ce.INVALID;
         this._cache.setValue(s, i, {
           value: e,
-          status: m,
+          status: h,
           ruleId: c
-        }), n(m, !0);
+        }), n(h, !0);
       }), Ce.VALIDATING) : (n(f.status, !1), f.status);
     } else
       return n(Ce.VALID, !1), Ce.VALID;
@@ -4545,7 +4551,6 @@ let vt = class extends ue {
     return new gl(
       a,
       t,
-      [],
       this._injector
     );
   }
@@ -4555,7 +4560,7 @@ let vt = class extends ue {
 };
 vt = Sl([
   ve(_e.Starting, vt),
-  Nt(0, bo),
+  Nt(0, No),
   Nt(1, J),
   Nt(2, w(q)),
   Nt(3, w(De))
@@ -4572,7 +4577,7 @@ let _t = class extends ue {
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((a) => {
-        a.id === xo.id && (this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
+        a.id === jo.id && (this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
           workbookTypes: [_a],
           rangeTypes: [Ca],
           worksheetTypes: [Ra, Sa]
@@ -4589,7 +4594,7 @@ _t = Vl([
   ve(_e.Ready, _t),
   ca(0, w(ie)),
   ca(1, ee),
-  ca(2, w(Jo))
+  ca(2, w(en))
 ], _t);
 var Ml = Object.defineProperty, Il = Object.getOwnPropertyDescriptor, wl = (a, t, e, r) => {
   for (var o = r > 1 ? void 0 : r ? Il(t, e) : t, n = a.length - 1, i; n >= 0; n--)
@@ -4631,98 +4636,98 @@ let Ut = class {
 Ut = wl([
   ua(0, J),
   ua(1, w(q)),
-  ua(2, w(nt))
+  ua(2, w(ot))
 ], Ut);
-var mo = Object.defineProperty, yl = Object.getOwnPropertyDescriptor, Dl = (a, t, e) => t in a ? mo(a, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[t] = e, El = (a, t, e, r) => {
+var fo = Object.defineProperty, yl = Object.getOwnPropertyDescriptor, Dl = (a, t, e) => t in a ? fo(a, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[t] = e, El = (a, t, e, r) => {
   for (var o = r > 1 ? void 0 : r ? yl(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && mo(t, e, o), o;
-}, ha = (a, t) => (e, r) => t(e, r, a), fo = (a, t, e) => Dl(a, typeof t != "symbol" ? t + "" : t, e);
-let Ht = class extends gr {
+  return r && o && fo(t, e, o), o;
+}, ha = (a, t) => (e, r) => t(e, r, a), po = (a, t, e) => Dl(a, typeof t != "symbol" ? t + "" : t, e);
+let Ht = class extends vr {
   constructor(a = {}, t, e, r) {
-    super(), this._config = a, this._injector = t, this._commandService = e, this._localeService = r, this._config = X.deepMerge({}, lo, this._config);
+    super(), this._config = a, this._injector = t, this._commandService = e, this._localeService = r, this._config = X.deepMerge({}, co, this._config);
   }
   onStarting(a) {
     [
       [Me],
       [Ct],
-      [nt],
+      [ot],
       [ce],
       [ke],
       [Oe],
       [Ut],
       // controller
       [vt],
-      [ft],
+      [mt],
       [
-        ht,
+        ut,
         {
-          useFactory: () => this._injector.createInstance(ht, this._config)
+          useFactory: () => this._injector.createInstance(ut, this._config)
         }
       ],
+      [ft],
       [pt],
-      [at],
       [_t],
       [Tt],
       [gt],
       [tt],
-      [ut]
+      [ct]
     ].forEach((t) => {
       a.add(t);
     }), [
       Qt,
-      Xa,
+      Ga,
       Kt,
       Da,
-      no,
+      io,
       // operation
       Gt,
-      Br,
-      ka,
-      ot,
-      $r
+      Ur,
+      Ya,
+      rt,
+      Br
     ].forEach((t) => {
       this._commandService.registerCommand(t);
     });
   }
 };
-fo(Ht, "pluginName", qt);
-fo(Ht, "type", re.UNIVER_SHEET);
+po(Ht, "pluginName", qt);
+po(Ht, "type", re.UNIVER_SHEET);
 Ht = El([
-  pr(Sr, Vr, Ir),
+  gr(Rr, Mr, wr),
   ha(1, w(De)),
   ha(2, ee),
   ha(3, w(ie))
 ], Ht);
-var po = Object.defineProperty, bl = Object.getOwnPropertyDescriptor, Ol = (a, t, e) => t in a ? po(a, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[t] = e, Nl = (a, t, e, r) => {
+var go = Object.defineProperty, bl = Object.getOwnPropertyDescriptor, Ol = (a, t, e) => t in a ? go(a, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[t] = e, Nl = (a, t, e, r) => {
   for (var o = r > 1 ? void 0 : r ? bl(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && po(t, e, o), o;
-}, ma = (a, t) => (e, r) => t(e, r, a), go = (a, t, e) => Ol(a, typeof t != "symbol" ? t + "" : t, e);
-let Wt = class extends gr {
+  return r && o && go(t, e, o), o;
+}, ma = (a, t) => (e, r) => t(e, r, a), vo = (a, t, e) => Ol(a, typeof t != "symbol" ? t + "" : t, e);
+let Wt = class extends vr {
   constructor(a = {}, t, e, r) {
-    super(), this._config = a, this._injector = t, this._commandService = e, this._localeService = r, this._config = X.deepMerge({}, lo, this._config);
+    super(), this._config = a, this._injector = t, this._commandService = e, this._localeService = r, this._config = X.deepMerge({}, co, this._config);
   }
   onStarting(a) {
     [
       [Me],
       [Ct],
-      [nt],
+      [ot],
       [ce],
       [ke],
       [Oe],
       [Ut],
       // controller
       [vt],
-      [ft],
+      [mt],
       [
-        mt,
+        ht,
         {
-          useFactory: () => this._injector.createInstance(mt, this._config)
+          useFactory: () => this._injector.createInstance(ht, this._config)
         }
       ],
+      [ft],
       [pt],
-      [at],
       [_t],
       [gt],
       [tt]
@@ -4730,52 +4735,52 @@ let Wt = class extends gr {
       a.add(t);
     }), [
       Qt,
-      Xa,
+      Ga,
       Kt,
       // operation
       Gt,
-      Br,
-      ka,
-      ot,
-      $r
+      Ur,
+      Ya,
+      rt,
+      Br
     ].forEach((t) => {
       this._commandService.registerCommand(t);
     });
   }
 };
-go(Wt, "pluginName", qt);
-go(Wt, "type", re.UNIVER_SHEET);
+vo(Wt, "pluginName", qt);
+vo(Wt, "type", re.UNIVER_SHEET);
 Wt = Nl([
-  pr(Sr, Vr, Ir),
+  gr(Rr, Mr, wr),
   ma(1, w(De)),
   ma(2, ee),
   ma(3, w(ie))
 ], Wt);
 export {
-  Xa as AddSheetDataValidationAndOpenCommand,
+  Ga as AddSheetDataValidationAndOpenCommand,
   Qt as AddSheetDataValidationCommand,
-  ka as CloseValidationPanelOperation,
+  Ya as CloseValidationPanelOperation,
   qt as DATA_VALIDATION_PLUGIN_NAME,
-  pt as DataValidationAlertController,
+  ft as DataValidationAlertController,
   Tt as DataValidationAutoFillController,
-  nt as DataValidationCacheService,
-  ft as DataValidationController,
+  ot as DataValidationCacheService,
+  mt as DataValidationController,
   gt as DataValidationCopyPasteController,
   ke as DataValidationCustomFormulaService,
   tt as DataValidationFormulaController,
   ce as DataValidationFormulaService,
-  at as DataValidationRefRangeController,
-  ut as DataValidationRejectInputController,
-  Br as HideDataValidationDropdown,
-  Ql as ICommandService,
-  Zl as LocaleService,
-  ot as OpenValidationPanelOperation,
-  Jl as Plugin,
+  pt as DataValidationRefRangeController,
+  ct as DataValidationRejectInputController,
+  Ur as HideDataValidationDropdown,
+  zl as ICommandService,
+  Kl as LocaleService,
+  rt as OpenValidationPanelOperation,
+  Ql as Plugin,
   Ct as SheetDataValidationService,
-  ht as SheetsDataValidationRenderController,
+  ut as SheetsDataValidationRenderController,
   Ut as SheetsDataValidationValidatorService,
   Gt as ShowDataValidationDropdown,
-  $r as ToggleValidationPanelOperation,
+  Br as ToggleValidationPanelOperation,
   Wt as UniverSheetsDataValidationMobilePlugin,
   Ht as UniverSheetsDataValidationPlugin,
   Kt as UpdateSheetDataValidationRangeCommand