@univerjs/sheets-data-validation-ui 0.5.3 → 0.5.4

package/lib/es/index.js

@@ -3,13 +3,13 @@ var Wo = (e, t, o) => t in e ? ko(e, t, { enumerable: !0, configurable: !0, writ
 var M = (e, t, o) => Wo(e, typeof t != "symbol" ? t + "" : t, o);
 import Zt, { useState as W, forwardRef as we, useRef as He, createElement as Re, useMemo as Ae, useEffect as Ce } from "react";
 import { Inject as b, LocaleService as J, Disposable as De, DataValidationErrorStyle as it, useDependency as L, ICommandService as Q, dayjs as qt, numfmt as Jt, CellValueType as Ho, UniverInstanceType as Y, toDisposable as Yo, IUniverInstanceService as ge, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Xo, DisposableCollection as zo, CommandType as Je, BuildTextUtils as Ko, DataValidationRenderMode as de, DataValidationType as z, IConfigService as hn, UndoCommand as Go, RedoCommand as Zo, isUnitRangesEqual as qo, debounce as Jo, shallowEqual as Mn, Injector as Ne, DataValidationStatus as rt, ObjectMatrix as _t, Range as Qo, Rectangle as St, queryObjectMatrix as Qt, Optional as ea, RxDisposable as pn, InterceptorEffectEnum as zn, sequenceExecute as Kn, bufferDebounceTime as ta, isFormulaString as Pe, Tools as en, ThemeService as na, VerticalAlign as ue, HorizontalAlign as Ye, DEFAULT_STYLES as le, WrapStrategy as Se, DocumentDataModel as oa, DEFAULT_EMPTY_DOCUMENT_VALUE as aa, BooleanNumber as Qe, Plugin as Gn, merge as Zn } from "@univerjs/core";
-import { Button as Fe, DatePanel as ia, Scrollbar as ra, FormLayout as Z, RadioGroup as mn, Radio as xe, Checkbox as Ot, Input as je, Select as tn, DraggableList as sa } from "@univerjs/design";
-import { DeviceInputEventType as nn, IRenderManagerService as Ve, fixLineWidthByScale as bn, Transform as la, CheckboxShape as da, CURSOR_TYPE as Xe, FontCache as ca, Shape as ua, Rect as qn, getFontStyleString as jt, getDocsSkeletonPageSize as et, DocumentViewModel as ha, DocumentSkeleton as pa, Documents as ma } from "@univerjs/engine-render";
-import { SheetInterceptorService as fn, AFTER_CELL_EDIT_ASYNC as fa, SetRangeValuesCommand as gn, SheetsSelectionsService as Jn, getSheetCommandTarget as Qn, WorkbookEditablePermission as Ct, RangeProtectionPermissionEditPoint as It, WorksheetEditPermission as wt, checkRangesEditablePermission as ga, WorksheetSetCellStylePermission as on, INTERCEPTOR_POINT as eo, InterceptCellContentPriority as to } from "@univerjs/sheets";
-import { SheetDataValidationModel as oe, getCellValueOrigin as ie, getDataValidationCellValue as va, deserializeListOptions as no, serializeListOptions as oo, UpdateSheetDataValidationRangeCommand as ao, UpdateSheetDataValidationSettingCommand as En, RemoveSheetDataValidationCommand as io, UpdateSheetDataValidationOptionsCommand as _a, createDefaultNewRule as ro, AddSheetDataValidationCommand as vn, RemoveSheetAllDataValidationCommand as Sa, DATA_VALIDATION_PLUGIN_NAME as so, getDataValidationDiffMutations as an, DataValidationCacheService as lo, DataValidationFormulaController as Ca, DataValidationFormulaService as Ia, getFormulaResult as Ft, isLegalFormulaResult as On, transformCheckboxValue as wa, CHECKBOX_FORMULA_1 as Ra, CHECKBOX_FORMULA_2 as Da } from "@univerjs/sheets-data-validation";
+import { Button as Fe, DatePanel as ia, Scrollbar as ra, FormLayout as Z, RadioGroup as fn, Radio as xe, Checkbox as Ot, Input as je, Select as tn, DraggableList as sa } from "@univerjs/design";
+import { DeviceInputEventType as nn, IRenderManagerService as Ve, fixLineWidthByScale as bn, Transform as la, CheckboxShape as da, CURSOR_TYPE as Xe, FontCache as ca, Shape as ua, Rect as qn, getFontStyleString as jt, getDocsSkeletonPageSize as et, DocumentViewModel as ha, DocumentSkeleton as pa, Documents as fa } from "@univerjs/engine-render";
+import { SheetInterceptorService as mn, AFTER_CELL_EDIT_ASYNC as ma, SetRangeValuesCommand as gn, SheetsSelectionsService as Jn, getSheetCommandTarget as Qn, SheetPermissionCheckController as eo, WorkbookEditablePermission as Ct, RangeProtectionPermissionEditPoint as It, WorksheetEditPermission as wt, checkRangesEditablePermission as ga, WorksheetSetCellStylePermission as on, INTERCEPTOR_POINT as to, InterceptCellContentPriority as no } from "@univerjs/sheets";
+import { SheetDataValidationModel as oe, getCellValueOrigin as ie, getDataValidationCellValue as va, deserializeListOptions as oo, serializeListOptions as ao, UpdateSheetDataValidationRangeCommand as io, UpdateSheetDataValidationSettingCommand as En, RemoveSheetDataValidationCommand as ro, UpdateSheetDataValidationOptionsCommand as _a, createDefaultNewRule as so, AddSheetDataValidationCommand as vn, RemoveSheetAllDataValidationCommand as Sa, DATA_VALIDATION_PLUGIN_NAME as lo, getDataValidationDiffMutations as an, DataValidationCacheService as co, DataValidationFormulaController as Ca, DataValidationFormulaService as Ia, getFormulaResult as Ft, isLegalFormulaResult as On, transformCheckboxValue as wa, CHECKBOX_FORMULA_1 as Ra, CHECKBOX_FORMULA_2 as Da } from "@univerjs/sheets-data-validation";
 import { getPatternType as Va } from "@univerjs/sheets-numfmt";
-import { SetCellEditVisibleOperation as co, SheetCanvasPopManagerService as ya, IEditorBridgeService as uo, SheetPermissionInterceptorBaseController as ho, IMarkSelectionService as Ma, HoverManagerService as ba, CellAlertManagerService as Ea, CellAlertType as Oa, IAutoFillService as La, APPLY_TYPE as tt, virtualizeDiscreteRanges as rn, getAutoFillRepeatRange as Pa, COPY_TYPE as Ln, rangeToDiscreteRange as Ta, PREDEFINED_HOOK_NAME as dt, getRepeatRange as Pn, ISheetClipboardService as Aa, getCurrentRangeDisable$ as xa, AutoHeightController as po, SheetSkeletonManagerService as Rt } from "@univerjs/sheets-ui";
-import { IDialogService as ja, KeyCode as sn, ISidebarService as mo, useObservable as Ue, ComponentManager as Lt, IZenZoneService as fo, RectPopup as Fa, useEvent as go, useSidebarClick as _n, MenuItemType as Sn, getMenuHiddenObservable as Na, RibbonStartGroup as Ua, IMenuManagerService as Ba } from "@univerjs/ui";
+import { SetCellEditVisibleOperation as uo, SheetCanvasPopManagerService as ya, IEditorBridgeService as ho, IMarkSelectionService as Ma, HoverManagerService as ba, CellAlertManagerService as Ea, CellAlertType as Oa, IAutoFillService as La, APPLY_TYPE as tt, virtualizeDiscreteRanges as rn, getAutoFillRepeatRange as Pa, COPY_TYPE as Ln, rangeToDiscreteRange as Ta, PREDEFINED_HOOK_NAME as dt, getRepeatRange as Pn, ISheetClipboardService as Aa, getCurrentRangeDisable$ as xa, AutoHeightController as po, SheetSkeletonManagerService as Rt } from "@univerjs/sheets-ui";
+import { IDialogService as ja, KeyCode as sn, ISidebarService as fo, useObservable as Ue, ComponentManager as Lt, IZenZoneService as mo, RectPopup as Fa, useEvent as go, useSidebarClick as _n, MenuItemType as Sn, getMenuHiddenObservable as Na, RibbonStartGroup as Ua, IMenuManagerService as Ba } from "@univerjs/ui";
 import { DataValidatorRegistryService as ye, DataValidationModel as Pt, DataValidatorRegistryScope as $a, TWO_FORMULA_OPERATOR_COUNT as ka, getRuleOptions as Tn, getRuleSetting as An } from "@univerjs/data-validation";
 import { RichTextEditingMutation as Wa } from "@univerjs/docs";
 import { filter as Cn, BehaviorSubject as xn, distinctUntilChanged as Ha, Subject as Ya, debounceTime as In, bufferTime as vo } from "rxjs";
@@ -31,11 +31,11 @@ function Ka() {
   jn = 1;
   var e = Zt, t = Symbol.for("react.element"), o = Symbol.for("react.fragment"), n = Object.prototype.hasOwnProperty, a = e.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, i = { key: !0, ref: !0, __self: !0, __source: !0 };
   function r(l, s, c) {
-    var u, p = {}, d = null, f = null;
-    c !== void 0 && (d = "" + c), s.key !== void 0 && (d = "" + s.key), s.ref !== void 0 && (f = s.ref);
+    var u, p = {}, d = null, g = null;
+    c !== void 0 && (d = "" + c), s.key !== void 0 && (d = "" + s.key), s.ref !== void 0 && (g = s.ref);
     for (u in s) n.call(s, u) && !i.hasOwnProperty(u) && (p[u] = s[u]);
     if (l && l.defaultProps) for (u in s = l.defaultProps, s) p[u] === void 0 && (p[u] = s[u]);
-    return { $$typeof: t, type: l, key: d, ref: f, props: p, _owner: a.current };
+    return { $$typeof: t, type: l, key: d, ref: g, props: p, _owner: a.current };
   }
   return nt.Fragment = o, nt.jsx = r, nt.jsxs = r, nt;
 }
@@ -54,10 +54,10 @@ let st = class extends De {
   }
   _initEditorBridgeInterceptor() {
     this._sheetInterceptorService.writeCellInterceptor.intercept(
-      fa,
+      ma,
       {
         handler: async (e, t, o) => {
-          var _;
+          var I;
           const n = await e, { worksheet: a, row: i, col: r, unitId: l, subUnitId: s, workbook: c } = t, u = this._dataValidationModel.getRuleIdByLocation(l, s, i, r), p = u ? this._dataValidationModel.getRuleById(l, s, u) : void 0;
           if (!p || p.errorStyle !== it.STOP)
             return o(Promise.resolve(n));
@@ -65,7 +65,7 @@ let st = class extends De {
           if (!d || await d.validator(
             {
               value: ie(n),
-              interceptValue: ie((_ = t == null ? void 0 : t.origin) != null ? _ : n),
+              interceptValue: ie((I = t == null ? void 0 : t.origin) != null ? I : n),
               row: i,
               column: r,
               unitId: l,
@@ -77,7 +77,7 @@ let st = class extends De {
             p
           ))
             return o(Promise.resolve(n));
-          const m = a.getCellRaw(i, r);
+          const f = a.getCellRaw(i, r);
           return this._dialogService.open({
             width: 368,
             title: {
@@ -100,7 +100,7 @@ let st = class extends De {
             onClose: () => {
               this._dialogService.close("reject-input-dialog");
             }
-          }), o(Promise.resolve(m));
+          }), o(Promise.resolve(f));
         }
       }
     );
@@ -132,7 +132,7 @@ let st = class extends De {
   }
 };
 st = Ja([
-  ot(0, b(fn)),
+  ot(0, b(mn)),
   ot(1, b(oe)),
   ot(2, b(ye)),
   ot(3, ja),
@@ -151,20 +151,20 @@ const Qa = "univer-dv-date-dropdown", ei = "univer-dv-date-dropdown-btns", Nn =
     return t;
 };
 function ni(e) {
-  var v;
-  const { location: t, hideFn: o } = e, { worksheet: n, row: a, col: i, unitId: r, subUnitId: l, workbook: s } = t, c = L(Q), u = L(st), p = n.getCell(a, i), d = ie(n.getCellRaw(a, i)), f = ti(d), [m, _] = W(f), w = m && m.isValid() ? m : qt(), S = L(J), R = L(oe), I = R.getRuleByLocation(r, l, a, i);
-  if (!I)
+  var m;
+  const { location: t, hideFn: o } = e, { worksheet: n, row: a, col: i, unitId: r, subUnitId: l, workbook: s } = t, c = L(Q), u = L(st), p = n.getCell(a, i), d = ie(n.getCellRaw(a, i)), g = ti(d), [f, I] = W(g), R = f && f.isValid() ? f : qt(), v = L(J), w = L(oe), C = w.getRuleByLocation(r, l, a, i);
+  if (!C)
     return null;
-  const V = R.getValidator(I.type);
+  const V = w.getValidator(C.type);
   if (!p || !V)
     return;
-  const C = !!((v = I.bizInfo) != null && v.showTime), g = async () => {
-    var x, j, F;
-    if (!w)
+  const _ = !!((m = C.bizInfo) != null && m.showTime), S = async () => {
+    var x, j, N;
+    if (!R)
       return;
-    const P = w.format(C ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00"), U = (x = Jt.parseDate(P)) == null ? void 0 : x.v, T = s.getStyles().getStyleByCell(p), E = (F = (j = T == null ? void 0 : T.n) == null ? void 0 : j.pattern) != null ? F : "", A = Va(E);
-    I.errorStyle !== it.STOP || await V.validator({
-      value: U,
+    const P = R.format(_ ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00"), F = (x = Jt.parseDate(P)) == null ? void 0 : x.v, T = s.getStyles().getStyleByCell(p), E = (N = (j = T == null ? void 0 : T.n) == null ? void 0 : j.pattern) != null ? N : "", A = Va(E);
+    C.errorStyle !== it.STOP || await V.validator({
+      value: F,
       unitId: r,
       subUnitId: l,
       row: a,
@@ -173,7 +173,7 @@ function ni(e) {
       workbook: s,
       interceptValue: P.replace("Z", "").replace("T", " "),
       t: Ho.NUMBER
-    }, I) ? (o(), await c.executeCommand(co.id, {
+    }, C) ? (o(), await c.executeCommand(uo.id, {
       visible: !1,
       eventType: nn.Keyboard,
       unitId: r,
@@ -188,36 +188,36 @@ function ni(e) {
         endRow: a
       },
       value: {
-        v: U,
+        v: F,
         t: 2,
         p: null,
         f: null,
         si: null,
         s: {
           n: {
-            pattern: C ? A === "datetime" ? E : "yyyy-MM-dd hh:mm:ss" : A === "date" ? E : "yyyy-MM-dd"
+            pattern: _ ? A === "datetime" ? E : "yyyy-MM-dd hh:mm:ss" : A === "date" ? E : "yyyy-MM-dd"
           }
         }
       }
-    })) : u.showReject(V.getRuleFinalError(I, { row: a, col: i, unitId: r, subUnitId: l }));
+    })) : u.showReject(V.getRuleFinalError(C, { row: a, col: i, unitId: r, subUnitId: l }));
   };
   return /* @__PURE__ */ h.jsxs("div", { className: Nn.dvDateDropdown, children: [
     /* @__PURE__ */ h.jsx(
       ia,
       {
-        defaultValue: w,
-        pickerValue: w,
-        showTime: C || void 0,
+        defaultValue: R,
+        pickerValue: R,
+        showTime: _ || void 0,
         onSelect: async (y) => {
-          _(y);
+          I(y);
         },
         onPanelChange: (y) => {
-          _(y);
+          I(y);
         },
         disabledDate: (y) => !Jt.parseDate(y.format("YYYY-MM-DD"))
       }
     ),
-    /* @__PURE__ */ h.jsx("div", { className: Nn.dvDateDropdownBtns, children: /* @__PURE__ */ h.jsx(Fe, { size: "small", type: "primary", onClick: g, disabled: !w.isValid(), children: S.t("dataValidation.alert.ok") }) })
+    /* @__PURE__ */ h.jsx("div", { className: Nn.dvDateDropdownBtns, children: /* @__PURE__ */ h.jsx(Fe, { size: "small", type: "primary", onClick: S, disabled: !R.isValid(), children: v.t("dataValidation.alert.ok") }) })
   ] });
 }
 var ce = function() {
@@ -319,12 +319,12 @@ var pi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em"
   }));
 });
 yo.displayName = "SequenceSingle";
-var mi = Object.defineProperty, fi = Object.getOwnPropertyDescriptor, gi = (e, t, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? fi(t, o) : t, i = e.length - 1, r; i >= 0; i--)
+var fi = Object.defineProperty, mi = Object.getOwnPropertyDescriptor, gi = (e, t, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? mi(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
-  return n && a && mi(t, o, a), a;
+  return n && a && fi(t, o, a), a;
 }, Un = (e, t) => (o, n) => t(o, n, e);
-let me = class extends De {
+let fe = class extends De {
   constructor(t, o) {
     super();
     M(this, "_open$", new xn(!1));
@@ -369,10 +369,10 @@ let me = class extends De {
     this._activeRule = t, this._activeRule$.next(t);
   }
 };
-me = gi([
+fe = gi([
   Un(0, ge),
-  Un(1, mo)
-], me);
+  Un(1, fo)
+], fe);
 function vi() {
   const e = L(Ie), t = Ue(e.activeDropdown$, e.activeDropdown), o = L(Lt);
   if (!t)
@@ -501,7 +501,7 @@ Ie = Ci([
   be(0, b(ya)),
   be(1, ge),
   be(2, b(ye)),
-  be(3, fo),
+  be(3, mo),
   be(4, Ve),
   be(5, b(oe)),
   be(6, b(Jn))
@@ -512,7 +512,7 @@ const Dt = "DataValidationPanel", Be = {
   handler(e, t) {
     if (!t)
       return !1;
-    const { ruleId: o, isAdd: n } = t, a = e.get(me), i = e.get(Pt), r = e.get(ge), l = e.get(mo), s = Qn(r);
+    const { ruleId: o, isAdd: n } = t, a = e.get(fe), i = e.get(Pt), r = e.get(ge), l = e.get(fo), s = Qn(r);
     if (!s) return !1;
     const { unitId: c, subUnitId: u } = s, p = o ? i.getRuleById(c, u, o) : void 0;
     a.open(), a.setActiveRule(p && {
@@ -533,13 +533,13 @@ const Dt = "DataValidationPanel", Be = {
   id: "data-validation.operation.close-validation-panel",
   type: Je.OPERATION,
   handler(e) {
-    return e.get(me).close(), !0;
+    return e.get(fe).close(), !0;
   }
 }, bo = {
   id: "data-validation.operation.toggle-validation-panel",
   type: Je.OPERATION,
   handler(e) {
-    const t = e.get(Q), o = e.get(me);
+    const t = e.get(Q), o = e.get(fe);
     return o.open(), o.isOpen ? t.executeCommand(Rn.id) : t.executeCommand(Be.id), !0;
   }
 }, Tt = {
@@ -573,53 +573,53 @@ const Dt = "DataValidationPanel", Be = {
   dvListDropdownSplit: bi,
   dvListDropdownEdit: Ei
 }, Oi = (e) => {
-  var C, g;
-  const { value: t, onChange: o, multiple: n, options: a, title: i, onEdit: r, style: l, filter: s, location: c } = e, u = L(J), p = L(hn), d = s == null ? void 0 : s.toLowerCase(), { row: f, col: m, unitId: _, subUnitId: w } = c, S = a.filter((v) => d ? v.label.toLowerCase().includes(d) : !0), R = (g = (C = p.getConfig(Dn)) == null ? void 0 : C.showEditOnDropdown) != null ? g : !0, I = L(ho), V = Ae(() => I.permissionCheckWithRanges(
+  var _, S;
+  const { value: t, onChange: o, multiple: n, options: a, title: i, onEdit: r, style: l, filter: s, location: c } = e, u = L(J), p = L(hn), d = s == null ? void 0 : s.toLowerCase(), { row: g, col: f, unitId: I, subUnitId: R } = c, v = a.filter((m) => d ? m.label.toLowerCase().includes(d) : !0), w = (S = (_ = p.getConfig(Dn)) == null ? void 0 : _.showEditOnDropdown) != null ? S : !0, C = L(eo), V = Ae(() => C.permissionCheckWithRanges(
     {
       workbookTypes: [Ct],
       rangeTypes: [It],
       worksheetTypes: [wt]
     },
-    [{ startColumn: m, startRow: f, endColumn: m, endRow: f }],
-    _,
-    w
-  ), [I, m, f, _, w]);
+    [{ startColumn: f, startRow: g, endColumn: f, endRow: g }],
+    I,
+    R
+  ), [C, f, g, I, R]);
   return /* @__PURE__ */ h.jsxs("div", { className: ve.dvListDropdown, style: l, children: [
     /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownTitle, children: i }),
-    /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownList, children: /* @__PURE__ */ h.jsx(ra, { children: /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownListContainer, children: S.map((v, y) => {
-      const P = t.indexOf(v.value) > -1, U = () => {
+    /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownList, children: /* @__PURE__ */ h.jsx(ra, { children: /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownListContainer, children: v.map((m, y) => {
+      const P = t.indexOf(m.value) > -1, F = () => {
         let E;
-        P ? E = new Set(t.filter((x) => x !== v.value)) : E = new Set(n ? [...t, v.value] : [v.value]);
+        P ? E = new Set(t.filter((x) => x !== m.value)) : E = new Set(n ? [...t, m.value] : [m.value]);
         const A = [];
         a.forEach((x) => {
           E.has(x.value) && A.push(x.value);
         }), o(A);
-      }, T = v.label.toLocaleLowerCase().indexOf(d);
-      return /* @__PURE__ */ h.jsxs("div", { className: ve.dvListDropdownItemContainer, onClick: U, children: [
-        /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownItem, style: { background: v.color || Te }, children: d && v.label.toLowerCase().includes(d) ? /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
-          /* @__PURE__ */ h.jsx("span", { children: v.label.substring(0, T) }),
-          /* @__PURE__ */ h.jsx("span", { style: { fontWeight: "bold" }, children: v.label.substring(T, T + d.length) }),
-          /* @__PURE__ */ h.jsx("span", { children: v.label.substring(T + d.length) })
-        ] }) : v.label }),
+      }, T = m.label.toLocaleLowerCase().indexOf(d);
+      return /* @__PURE__ */ h.jsxs("div", { className: ve.dvListDropdownItemContainer, onClick: F, children: [
+        /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownItem, style: { background: m.color || Te }, children: d && m.label.toLowerCase().includes(d) ? /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
+          /* @__PURE__ */ h.jsx("span", { children: m.label.substring(0, T) }),
+          /* @__PURE__ */ h.jsx("span", { style: { fontWeight: "bold" }, children: m.label.substring(T, T + d.length) }),
+          /* @__PURE__ */ h.jsx("span", { children: m.label.substring(T + d.length) })
+        ] }) : m.label }),
         /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownSelectedIcon, children: P ? /* @__PURE__ */ h.jsx(Io, {}) : null })
       ] }, y);
     }) }) }, s) }),
-    R && V ? /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
+    w && V ? /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
       /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownSplit }),
       /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownEdit, children: /* @__PURE__ */ h.jsx("a", { onClick: r, children: u.t("dataValidation.list.edit") }) })
     ] }) : null
   ] });
 };
 function Li(e) {
-  var j, F, H, X;
-  const { location: t, hideFn: o } = e, { worksheet: n, row: a, col: i, unitId: r, subUnitId: l } = t, s = L(Pt), [c, u] = W(""), p = L(Q), d = L(J), [f, m] = W(""), _ = L(uo), w = L(ge), S = Ae(() => s.ruleChange$.pipe(In(16)), []), R = L(oe);
-  Ue(S);
-  const I = Fa.useContext(), V = ((F = (j = I.current) == null ? void 0 : j.right) != null ? F : 0) - ((X = (H = I.current) == null ? void 0 : H.left) != null ? X : 0);
+  var j, N, H, X;
+  const { location: t, hideFn: o } = e, { worksheet: n, row: a, col: i, unitId: r, subUnitId: l } = t, s = L(Pt), [c, u] = W(""), p = L(Q), d = L(J), [g, f] = W(""), I = L(ho), R = L(ge), v = Ae(() => s.ruleChange$.pipe(In(16)), []), w = L(oe);
+  Ue(v);
+  const C = Fa.useContext(), V = ((N = (j = C.current) == null ? void 0 : j.right) != null ? N : 0) - ((X = (H = C.current) == null ? void 0 : H.left) != null ? X : 0);
   if (Ce(() => {
     const k = p.onCommandExecuted((K) => {
       var q, ee;
       if (K.id === Wa.id) {
-        const te = K.params, { unitId: re } = te, ae = w.getUnit(re, Y.UNIVER_DOC);
+        const te = K.params, { unitId: re } = te, ae = R.getUnit(re, Y.UNIVER_DOC);
         if (!ae)
           return;
         const se = Ko.transform.getPlainText((ee = (q = ae.getSnapshot().body) == null ? void 0 : q.dataStream) != null ? ee : "");
@@ -629,22 +629,22 @@ function Li(e) {
     return () => {
       k.dispose();
     };
-  }, [p, w]), !n)
+  }, [p, R]), !n)
     return null;
-  const C = R.getRuleByLocation(r, l, a, i);
-  if (!C)
+  const _ = w.getRuleByLocation(r, l, a, i);
+  if (!_)
     return null;
-  const g = R.getValidator(C.type);
-  if (!g)
+  const S = w.getValidator(_.type);
+  if (!S)
     return null;
-  const v = n.getCell(a, i), y = (C == null ? void 0 : C.renderMode) === de.CUSTOM || (C == null ? void 0 : C.renderMode) === void 0;
-  if (!v || !C || !g || g.id.indexOf(z.LIST) !== 0)
+  const m = n.getCell(a, i), y = (_ == null ? void 0 : _.renderMode) === de.CUSTOM || (_ == null ? void 0 : _.renderMode) === void 0;
+  if (!m || !_ || !S || S.id.indexOf(z.LIST) !== 0)
     return;
-  const P = C.type === z.LIST_MULTIPLE, U = g.getListWithColor(C, r, l), T = f || va(n.getCellRaw(a, i)), E = no(T), A = () => {
+  const P = _.type === z.LIST_MULTIPLE, F = S.getListWithColor(_, r, l), T = g || va(n.getCellRaw(a, i)), E = oo(T), A = () => {
     p.executeCommand(Be.id, {
-      ruleId: C.uid
+      ruleId: _.uid
     }), o();
-  }, x = U.map((k) => ({
+  }, x = F.map((k) => ({
     label: k.label,
     value: k.label,
     color: y || k.color ? k.color : "transparent"
@@ -657,7 +657,7 @@ function Li(e) {
       value: E,
       multiple: P,
       onChange: async (k) => {
-        const K = oo(k), q = {
+        const K = ao(k), q = {
           unitId: r,
           subUnitId: l,
           range: {
@@ -673,12 +673,12 @@ function Li(e) {
             si: null
           }
         };
-        _.isVisible() && _.changeVisible({
+        I.isVisible() && I.changeVisible({
           visible: !1,
           keycode: sn.ESC,
           eventType: nn.Keyboard,
           unitId: r
-        }), m(K), P || o(), _.isVisible().visible && await p.executeCommand(co.id, {
+        }), f(K), P || o(), I.isVisible().visible && await p.executeCommand(uo.id, {
           visible: !1,
           eventType: nn.Keyboard,
           unitId: r,
@@ -711,7 +711,7 @@ function Ai(e) {
         {
           label: t.t("dataValidation.panel.invalid"),
           children: /* @__PURE__ */ h.jsxs(
-            mn,
+            fn,
             {
               value: `${(c = n.errorStyle) != null ? c : it.WARNING}`,
               onChange: (u) => a({ ...n, errorStyle: +u }),
@@ -762,7 +762,7 @@ function Bi(e, t, o) {
 }
 function $i() {
   var se;
-  const [e, t] = W(0), o = L(me), n = Ue(o.activeRule$, o.activeRule), { unitId: a, subUnitId: i, rule: r } = n || {}, l = r.uid, s = L(ye), c = L(ge), u = L(Lt), p = L(Q), d = L(Pt), f = L(J), [m, _] = W(r), w = s.getValidatorItem(m.type), [S, R] = W(!1), I = s.getValidatorsByScope($a.SHEET), [V, C] = W(() => m.ranges.map((O) => ({ unitId: "", sheetId: "", range: O }))), g = Ae(() => Ui(p), [p]), [v, y] = W(!1), P = He({}), [U, T] = W(!1), E = L(Jn);
+  const [e, t] = W(0), o = L(fe), n = Ue(o.activeRule$, o.activeRule), { unitId: a, subUnitId: i, rule: r } = n || {}, l = r.uid, s = L(ye), c = L(ge), u = L(Lt), p = L(Q), d = L(Pt), g = L(J), [f, I] = W(r), R = s.getValidatorItem(f.type), [v, w] = W(!1), C = s.getValidatorsByScope($a.SHEET), [V, _] = W(() => f.ranges.map((O) => ({ unitId: "", sheetId: "", range: O }))), S = Ae(() => Ui(p), [p]), [m, y] = W(!1), P = He({}), [F, T] = W(!1), E = L(Jn);
   if (Ce(() => () => {
     const O = E.getCurrentLastSelection();
     O && E.setSelections([O]);
@@ -770,13 +770,13 @@ function $i() {
     p.onCommandExecuted((O) => {
       (O.id === Go.id || O.id === Zo.id) && setTimeout(() => {
         const D = d.getRuleById(a, i, l);
-        t((N) => N + 1), D && (_(D), C(D.ranges.map((N) => ({ unitId: "", sheetId: "", range: N }))));
+        t((U) => U + 1), D && (I(D), _(D.ranges.map((U) => ({ unitId: "", sheetId: "", range: U }))));
       }, 20);
     });
-  }, [p, d, l, i, a]), !w)
+  }, [p, d, l, i, a]), !R)
     return null;
-  const A = w.operators, x = w.operatorNames, j = m.operator ? ka.includes(m.operator) : !1, F = () => {
-    !m.ranges.length || v || (w.validatorFormula(m, a, i).success ? o.setActiveRule(null) : R(!0));
+  const A = R.operators, x = R.operatorNames, j = f.operator ? ka.includes(f.operator) : !1, N = () => {
+    !f.ranges.length || m || (R.validatorFormula(f, a, i).success ? o.setActiveRule(null) : w(!0));
   }, H = go((O) => {
     const D = O.split(",").filter(Boolean).map(Xa).map(($) => {
       const _e = $.sheetName;
@@ -791,25 +791,25 @@ function $i() {
     });
     if (qo(D, V))
       return;
-    C(D);
-    const N = D.filter(($) => (!$.unitId || $.unitId === a) && (!$.sheetId || $.sheetId === i)).map(($) => $.range);
-    if (_({
-      ...m,
-      ranges: N
-    }), N.length === 0)
+    _(D);
+    const U = D.filter(($) => (!$.unitId || $.unitId === a) && (!$.sheetId || $.sheetId === i)).map(($) => $.range);
+    if (I({
+      ...f,
+      ranges: U
+    }), U.length === 0)
       return;
     const B = {
       unitId: a,
       subUnitId: i,
       ruleId: l,
-      ranges: N
+      ranges: U
     };
-    g(ao.id, B);
+    S(io.id, B);
   }), X = (O) => {
-    if (Mn(O, An(m)))
+    if (Mn(O, An(f)))
       return;
-    _({
-      ...m,
+    I({
+      ...f,
       ...O
     });
     const D = {
@@ -818,48 +818,48 @@ function $i() {
       ruleId: l,
       setting: O
     };
-    g(
+    S(
       En.id,
       D,
       void 0
     );
   }, k = async () => {
-    await p.executeCommand(io.id, {
+    await p.executeCommand(ro.id, {
       ruleId: l,
       unitId: a,
       subUnitId: i
     }), o.setActiveRule(null);
   }, K = {
-    type: m.type,
-    operator: m.operator,
-    formula1: m.formula1,
-    formula2: m.formula2,
-    allowBlank: m.allowBlank
+    type: f.type,
+    operator: f.operator,
+    formula1: f.formula1,
+    formula2: f.formula2,
+    allowBlank: f.allowBlank
   }, q = (O) => {
     const D = s.getValidatorItem(O);
     if (!D)
       return;
-    const N = D.operators, B = d.getRuleById(a, i, l), $ = O === (B == null ? void 0 : B.type) || O.includes("list") && (B != null && B.type.includes("list")) ? {
+    const U = D.operators, B = d.getRuleById(a, i, l), $ = O === (B == null ? void 0 : B.type) || O.includes("list") && (B != null && B.type.includes("list")) ? {
       ...B,
       type: O
     } : {
-      ...m,
+      ...f,
       type: O,
-      operator: N[0],
+      operator: U[0],
       formula1: void 0,
       formula2: void 0
     };
-    _($), p.executeCommand(En.id, {
+    I($), p.executeCommand(En.id, {
       unitId: a,
       subUnitId: i,
-      ruleId: m.uid,
+      ruleId: f.uid,
       setting: An($)
     });
-  }, ee = u.get(w.formulaInput), te = Ae(() => V.map((O) => _o(O.range)).join(","), []), re = Tn(m), ae = (O) => {
-    Mn(O, Tn(m)) || (_({
-      ...m,
+  }, ee = u.get(R.formulaInput), te = Ae(() => V.map((O) => _o(O.range)).join(","), []), re = Tn(f), ae = (O) => {
+    Mn(O, Tn(f)) || (I({
+      ...f,
       ...O
-    }), g(
+    }), S(
       _a.id,
       {
         unitId: a,
@@ -870,15 +870,15 @@ function $i() {
     ));
   };
   return _n((O) => {
-    var N;
-    const D = (N = P.current) == null ? void 0 : N.handleOutClick;
+    var U;
+    const D = (U = P.current) == null ? void 0 : U.handleOutClick;
     D && D(O, () => T(!1));
   }), /* @__PURE__ */ h.jsxs("div", { className: $e.dataValidationDetail, children: [
     /* @__PURE__ */ h.jsx(
       Z,
       {
-        label: f.t("dataValidation.panel.range"),
-        error: !m.ranges.length || v ? f.t("dataValidation.panel.rangeError") : "",
+        label: g.t("dataValidation.panel.range"),
+        error: !f.ranges.length || m ? g.t("dataValidation.panel.rangeError") : "",
         children: /* @__PURE__ */ h.jsx(
           za,
           {
@@ -887,33 +887,33 @@ function $i() {
             initValue: te,
             onChange: H,
             onFocus: () => T(!0),
-            isFocus: U,
+            isFocus: F,
             actions: P.current,
             onVerify: (O) => y(!O)
           }
         )
       }
     ),
-    /* @__PURE__ */ h.jsx(Z, { label: f.t("dataValidation.panel.type"), children: /* @__PURE__ */ h.jsx(
+    /* @__PURE__ */ h.jsx(Z, { label: g.t("dataValidation.panel.type"), children: /* @__PURE__ */ h.jsx(
       tn,
       {
-        options: I == null ? void 0 : I.map((O) => ({
-          label: f.t(O.title),
+        options: C == null ? void 0 : C.map((O) => ({
+          label: g.t(O.title),
           value: O.id
         })),
-        value: m.type,
+        value: f.type,
         onChange: q,
         className: $e.dataValidationDetailFormItem
       }
     ) }),
-    A != null && A.length ? /* @__PURE__ */ h.jsx(Z, { label: f.t("dataValidation.panel.operator"), children: /* @__PURE__ */ h.jsx(
+    A != null && A.length ? /* @__PURE__ */ h.jsx(Z, { label: g.t("dataValidation.panel.operator"), children: /* @__PURE__ */ h.jsx(
       tn,
       {
         options: A.map((O, D) => ({
           value: `${O}`,
           label: x[D]
         })),
-        value: `${m.operator}`,
+        value: `${f.operator}`,
         onChange: (O) => {
           X({
             ...K,
@@ -928,8 +928,8 @@ function $i() {
       {
         isTwoFormula: j,
         value: {
-          formula1: m.formula1,
-          formula2: m.formula2
+          formula1: f.formula1,
+          formula2: f.formula2
         },
         onChange: (O) => {
           X({
@@ -937,32 +937,32 @@ function $i() {
             ...O
           });
         },
-        showError: S,
-        validResult: w.validatorFormula(m, a, i),
+        showError: v,
+        validResult: R.validatorFormula(f, a, i),
         unitId: a,
         subUnitId: i,
         ruleId: l
       },
-      e + m.type
+      e + f.type
     ) : null,
     /* @__PURE__ */ h.jsx(Z, { children: /* @__PURE__ */ h.jsx(
       Ot,
       {
-        checked: (se = m.allowBlank) != null ? se : !0,
+        checked: (se = f.allowBlank) != null ? se : !0,
         onChange: () => {
           var O;
           return X({
             ...K,
-            allowBlank: !((O = m.allowBlank) == null || O)
+            allowBlank: !((O = f.allowBlank) == null || O)
           });
         },
-        children: f.t("dataValidation.panel.allowBlank")
+        children: g.t("dataValidation.panel.allowBlank")
       }
     ) }),
-    /* @__PURE__ */ h.jsx(Ai, { value: re, onChange: ae, extraComponent: w.optionsInput }),
+    /* @__PURE__ */ h.jsx(Ai, { value: re, onChange: ae, extraComponent: R.optionsInput }),
     /* @__PURE__ */ h.jsxs("div", { className: $e.dataValidationDetailButtons, children: [
-      /* @__PURE__ */ h.jsx(Fe, { className: $e.dataValidationDetailButton, onClick: k, children: f.t("dataValidation.panel.removeRule") }),
-      /* @__PURE__ */ h.jsx(Fe, { className: $e.dataValidationDetailButton, type: "primary", onClick: F, children: f.t("dataValidation.panel.done") })
+      /* @__PURE__ */ h.jsx(Fe, { className: $e.dataValidationDetailButton, onClick: k, children: g.t("dataValidation.panel.removeRule") }),
+      /* @__PURE__ */ h.jsx(Fe, { className: $e.dataValidationDetailButton, type: "primary", onClick: N, children: g.t("dataValidation.panel.done") })
     ] })
   ] });
 }
@@ -972,17 +972,17 @@ const ki = "univer-data-validation-item-container", Wi = "univer-data-validation
   dataValidationItemContent: Hi,
   dataValidationItemIcon: Yi
 }, Xi = (e) => {
-  const { rule: t, onClick: o, unitId: n, subUnitId: a, disable: i } = e, r = L(ye), l = L(Q), s = L(Ma), c = r.getValidatorItem(t.type), u = He(), [p, d] = W(!1), f = (m) => {
-    l.executeCommand(io.id, {
+  const { rule: t, onClick: o, unitId: n, subUnitId: a, disable: i } = e, r = L(ye), l = L(Q), s = L(Ma), c = r.getValidatorItem(t.type), u = He(), [p, d] = W(!1), g = (f) => {
+    l.executeCommand(ro.id, {
       ruleId: t.uid,
       unitId: n,
       subUnitId: a
-    }), m.stopPropagation();
+    }), f.stopPropagation();
   };
   return Ce(() => () => {
-    var m;
-    u.current && ((m = u.current) == null || m.forEach((_) => {
-      _ && s.removeShape(_);
+    var f;
+    u.current && ((f = u.current) == null || f.forEach((I) => {
+      I && s.removeShape(I);
     }));
   }, [s]), /* @__PURE__ */ h.jsxs(
     "div",
@@ -990,8 +990,8 @@ const ki = "univer-data-validation-item-container", Wi = "univer-data-validation
       className: ct.dataValidationItemContainer,
       onClick: o,
       onMouseEnter: () => {
-        i || (d(!0), u.current = t.ranges.map((m) => s.addShape({
-          range: m,
+        i || (d(!0), u.current = t.ranges.map((f) => s.addShape({
+          range: f,
           style: {
             // hasAutoFill: false,
             fill: "rgba(73, 184, 17, 0.05)",
@@ -1003,15 +1003,15 @@ const ki = "univer-data-validation-item-container", Wi = "univer-data-validation
         })));
       },
       onMouseLeave: () => {
-        var m;
-        d(!1), (m = u.current) == null || m.forEach((_) => {
-          _ && s.removeShape(_);
+        var f;
+        d(!1), (f = u.current) == null || f.forEach((I) => {
+          I && s.removeShape(I);
         }), u.current = void 0;
       },
       children: [
         /* @__PURE__ */ h.jsx("div", { className: ct.dataValidationItemTitle, children: c == null ? void 0 : c.generateRuleName(t) }),
-        /* @__PURE__ */ h.jsx("div", { className: ct.dataValidationItemContent, children: t.ranges.map((m) => _o(m)).join(",") }),
-        p ? /* @__PURE__ */ h.jsx("div", { className: ct.dataValidationItemIcon, onClick: f, children: /* @__PURE__ */ h.jsx(wn, {}) }) : null
+        /* @__PURE__ */ h.jsx("div", { className: ct.dataValidationItemContent, children: t.ranges.map((f) => _o(f)).join(",") }),
+        p ? /* @__PURE__ */ h.jsx("div", { className: ct.dataValidationItemIcon, onClick: g, children: /* @__PURE__ */ h.jsx(wn, {}) }) : null
       ]
     }
   );
@@ -1030,65 +1030,65 @@ function Zi() {
   return t ? /* @__PURE__ */ h.jsx(qi, { workbook: t }) : null;
 }
 function qi(e) {
-  const t = L(oe), o = L(ge), n = L(Q), a = L(Ne), i = L(me), r = L(J), [l, s] = W([]), { workbook: c } = e, u = Ue(c.activeSheet$, void 0, !0), p = c.getUnitId(), d = u == null ? void 0 : u.getSheetId();
+  const t = L(oe), o = L(ge), n = L(Q), a = L(Ne), i = L(fe), r = L(J), [l, s] = W([]), { workbook: c } = e, u = Ue(c.activeSheet$, void 0, !0), p = c.getUnitId(), d = u == null ? void 0 : u.getSheetId();
   Ce(() => {
     s(t.getRules(p, d));
-    const R = t.ruleChange$.subscribe((I) => {
-      I.unitId === p && I.subUnitId === d && s(t.getRules(p, d));
+    const w = t.ruleChange$.subscribe((C) => {
+      C.unitId === p && C.subUnitId === d && s(t.getRules(p, d));
     });
     return () => {
-      R.unsubscribe();
+      w.unsubscribe();
     };
   }, [p, d, t]);
-  const f = async () => {
-    const R = ro(a), I = {
+  const g = async () => {
+    const w = so(a), C = {
       unitId: p,
       subUnitId: d,
-      rule: R
+      rule: w
     };
-    await n.executeCommand(vn.id, I), i.setActiveRule({
+    await n.executeCommand(vn.id, C), i.setActiveRule({
       unitId: p,
       subUnitId: d,
-      rule: R
+      rule: w
     });
-  }, m = () => {
+  }, f = () => {
     n.executeCommand(Sa.id, {
       unitId: p,
       subUnitId: d
     });
-  }, w = ((R) => {
-    const I = o.getCurrentUnitForType(Y.UNIVER_SHEET), V = I.getActiveSheet(), C = I.getUnitId(), g = V.getSheetId();
-    return R.map((y) => ga(a, C, g, y.ranges) ? { ...y } : { ...y, disable: !0 });
-  })(l), S = w == null ? void 0 : w.some((R) => R.disable);
+  }, R = ((w) => {
+    const C = o.getCurrentUnitForType(Y.UNIVER_SHEET), V = C.getActiveSheet(), _ = C.getUnitId(), S = V.getSheetId();
+    return w.map((y) => ga(a, _, S, y.ranges) ? { ...y } : { ...y, disable: !0 });
+  })(l), v = R == null ? void 0 : R.some((w) => w.disable);
   return /* @__PURE__ */ h.jsxs("div", { className: ut.dataValidationList, children: [
-    w == null ? void 0 : w.map((R) => {
-      var I;
+    R == null ? void 0 : R.map((w) => {
+      var C;
       return /* @__PURE__ */ h.jsx(
         Xi,
         {
           unitId: p,
           subUnitId: d,
           onClick: () => {
-            R.disable || i.setActiveRule({
+            w.disable || i.setActiveRule({
               unitId: p,
               subUnitId: d,
-              rule: R
+              rule: w
             });
           },
-          rule: R,
-          disable: (I = R.disable) != null ? I : !1
+          rule: w,
+          disable: (C = w.disable) != null ? C : !1
         },
-        R.uid
+        w.uid
       );
     }),
     /* @__PURE__ */ h.jsxs("div", { className: ut.dataValidationListButtons, children: [
-      l.length && !S ? /* @__PURE__ */ h.jsx(Fe, { className: ut.dataValidationListButton, onClick: m, children: r.t("dataValidation.panel.removeAll") }) : null,
-      /* @__PURE__ */ h.jsx(Fe, { className: ut.dataValidationListButton, type: "primary", onClick: f, children: r.t("dataValidation.panel.add") })
+      l.length && !v ? /* @__PURE__ */ h.jsx(Fe, { className: ut.dataValidationListButton, onClick: f, children: r.t("dataValidation.panel.removeAll") }) : null,
+      /* @__PURE__ */ h.jsx(Fe, { className: ut.dataValidationListButton, type: "primary", onClick: g, children: r.t("dataValidation.panel.add") })
     ] })
   ] });
 }
 const Ji = () => {
-  const e = L(me), t = Ue(e.activeRule$, e.activeRule);
+  const e = L(fe), t = Ue(e.activeRule$, e.activeRule);
   return t ? /* @__PURE__ */ h.jsx($i, {}, t.rule.uid) : /* @__PURE__ */ h.jsx(Zi, {});
 }, Vn = "data-validation.list.dropdown", Oo = "data-validation.date.dropdown", At = {
   type: Je.COMMAND,
@@ -1096,7 +1096,7 @@ const Ji = () => {
   handler(e) {
     const t = e.get(ge), o = Qn(t);
     if (!o) return !1;
-    const { workbook: n, worksheet: a } = o, i = ro(e), r = e.get(Q), l = n.getUnitId(), s = a.getSheetId(), c = {
+    const { workbook: n, worksheet: a } = o, i = so(e), r = e.get(Q), l = n.getUnitId(), s = a.getSheetId(), c = {
       rule: i,
       unitId: l,
       subUnitId: s
@@ -1168,7 +1168,7 @@ lt = tr([
   ke(1, b(Ea)),
   ke(2, ge),
   ke(3, b(J)),
-  ke(4, fo),
+  ke(4, mo),
   ke(5, b(oe))
 ], lt);
 var nr = Object.defineProperty, or = Object.getOwnPropertyDescriptor, ar = (e, t, o, n) => {
@@ -1183,21 +1183,21 @@ let ze = class extends De {
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
     const e = () => ({ redos: [], undos: [] }), t = (n, a) => {
-      const { source: i, target: r, unitId: l, subUnitId: s } = n, c = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = rn([i, r]), [p, d] = u.ranges, { mapFunc: f } = u, m = {
+      const { source: i, target: r, unitId: l, subUnitId: s } = n, c = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = rn([i, r]), [p, d] = u.ranges, { mapFunc: g } = u, f = {
         row: p.startRow,
         col: p.startColumn
-      }, _ = Pa(p, d), w = new _t(), S = /* @__PURE__ */ new Set();
-      _.forEach((g) => {
-        const v = g.repeatStartCell, y = g.relativeRange, P = {
+      }, I = Pa(p, d), R = new _t(), v = /* @__PURE__ */ new Set();
+      I.forEach((S) => {
+        const m = S.repeatStartCell, y = S.relativeRange, P = {
+          startRow: f.row,
+          startColumn: f.col,
+          endColumn: f.col,
+          endRow: f.row
+        }, F = {
           startRow: m.row,
           startColumn: m.col,
           endColumn: m.col,
           endRow: m.row
-        }, U = {
-          startRow: v.row,
-          startColumn: v.col,
-          endColumn: v.col,
-          endRow: v.row
         };
         Qo.foreach(y, (T, E) => {
           const A = St.getPositionRange(
@@ -1208,27 +1208,27 @@ let ze = class extends De {
               endRow: T
             },
             P
-          ), { row: x, col: j } = f(A.startRow, A.startColumn), F = this._sheetDataValidationModel.getRuleIdByLocation(l, s, x, j) || "", H = St.getPositionRange(
+          ), { row: x, col: j } = g(A.startRow, A.startColumn), N = this._sheetDataValidationModel.getRuleIdByLocation(l, s, x, j) || "", H = St.getPositionRange(
             {
               startRow: T,
               startColumn: E,
               endColumn: E,
               endRow: T
             },
-            U
-          ), { row: X, col: k } = f(H.startRow, H.startColumn);
-          w.setValue(X, k, F), S.add(F);
+            F
+          ), { row: X, col: k } = g(H.startRow, H.startColumn);
+          R.setValue(X, k, N), v.add(N);
         });
       });
-      const R = Array.from(S).map((g) => ({ id: g, ranges: Qt(w, (v) => v === g) }));
-      c.addRangeRules(R);
-      const I = c.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: V, undoMutations: C } = an(l, s, I, this._injector, "patched", a === tt.ONLY_FORMAT);
+      const w = Array.from(v).map((S) => ({ id: S, ranges: Qt(R, (m) => m === S) }));
+      c.addRangeRules(w);
+      const C = c.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: V, undoMutations: _ } = an(l, s, C, this._injector, "patched", a === tt.ONLY_FORMAT);
       return {
-        undos: C,
+        undos: _,
         redos: V
       };
     }, o = {
-      id: so,
+      id: lo,
       onBeforeFillData: (n) => {
         const { source: a, unitId: i, subUnitId: r } = n;
         for (const l of a.rows)
@@ -1265,7 +1265,7 @@ let Ke = class extends De {
   }
   _initCopyPaste() {
     this._sheetClipboardService.addClipboardHook({
-      id: so,
+      id: lo,
       onBeforeCopy: (t, o, n) => this._collect(t, o, n),
       onPasteCells: (t, o, n, a) => {
         const { copyType: i = Ln.COPY, pasteType: r } = a, { range: l } = t || {}, { range: s, unitId: c, subUnitId: u } = o;
@@ -1304,74 +1304,72 @@ let Ke = class extends De {
       dt.SPECIAL_PASTE_VALUE,
       dt.SPECIAL_PASTE_FORMAT,
       dt.SPECIAL_PASTE_FORMULA
-    ].includes(
-      o.pasteType
-    ))
+    ].includes(o.pasteType))
       return { redos: [], undos: [] };
-    const { unitId: n, subUnitId: a } = this._copyInfo;
-    if (o.unitId !== n || a !== o.subUnitId) {
-      const i = this._sheetDataValidationModel.getRuleObjectMatrix(o.unitId, o.subUnitId).clone(), r = new _t(), l = /* @__PURE__ */ new Set(), { ranges: [s, c], mapFunc: u } = rn([o.copyRange, t]), p = Pn(s, c, !0), d = /* @__PURE__ */ new Map();
-      p.forEach(({ startRange: w }) => {
-        var S;
-        (S = this._copyInfo) == null || S.matrix.forValue((R, I, V) => {
-          const C = St.getPositionRange(
+    const { unitId: a, subUnitId: i } = this._copyInfo;
+    if (o.unitId !== a || i !== o.subUnitId) {
+      const r = this._sheetDataValidationModel.getRuleObjectMatrix(o.unitId, o.subUnitId).clone(), l = new _t(), s = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: p } = rn([o.copyRange, t]), d = Pn(c, u, !0), g = /* @__PURE__ */ new Map();
+      d.forEach(({ startRange: v }) => {
+        var w;
+        (w = this._copyInfo) == null || w.matrix.forValue((C, V, _) => {
+          const S = St.getPositionRange(
             {
-              startRow: R,
-              endRow: R,
-              startColumn: I,
-              endColumn: I
+              startRow: C,
+              endRow: C,
+              startColumn: V,
+              endColumn: V
             },
-            w
-          ), g = `${a}-${V}`, v = this._sheetDataValidationModel.getRuleById(n, a, V);
-          !this._sheetDataValidationModel.getRuleById(o.unitId, o.subUnitId, g) && v && d.set(g, { ...v, uid: g });
-          const { row: y, col: P } = u(C.startRow, C.startColumn);
-          l.add(g), r.setValue(y, P, g);
+            v
+          ), m = `${i}-${_}`, y = this._sheetDataValidationModel.getRuleById(a, i, _);
+          !this._sheetDataValidationModel.getRuleById(o.unitId, o.subUnitId, m) && y && g.set(m, { ...y, uid: m });
+          const { row: P, col: F } = p(S.startRow, S.startColumn);
+          s.add(m), l.setValue(P, F, m);
         });
       });
-      const f = Array.from(l).map((w) => ({ id: w, ranges: Qt(r, (S) => S === w) }));
-      i.addRangeRules(f);
-      const { redoMutations: m, undoMutations: _ } = an(
+      const f = Array.from(s).map((v) => ({ id: v, ranges: Qt(l, (w) => w === v) }));
+      r.addRangeRules(f);
+      const { redoMutations: I, undoMutations: R } = an(
         o.unitId,
         o.subUnitId,
-        i.diffWithAddition(this._sheetDataValidationModel.getRules(o.unitId, o.subUnitId), d.values()),
+        r.diffWithAddition(this._sheetDataValidationModel.getRules(o.unitId, o.subUnitId), g.values()),
         this._injector,
         "patched",
         !1
       );
       return {
-        redos: m,
-        undos: _
+        redos: I,
+        undos: R
       };
     } else {
-      const i = this._sheetDataValidationModel.getRuleObjectMatrix(n, a).clone(), r = new _t(), l = /* @__PURE__ */ new Set(), { ranges: [s, c], mapFunc: u } = rn([o.copyRange, t]);
-      Pn(s, c, !0).forEach(({ startRange: _ }) => {
-        var w;
-        (w = this._copyInfo) == null || w.matrix.forValue((S, R, I) => {
-          const V = St.getPositionRange(
+      const r = this._sheetDataValidationModel.getRuleObjectMatrix(a, i).clone(), l = new _t(), s = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: p } = rn([o.copyRange, t]);
+      Pn(c, u, !0).forEach(({ startRange: R }) => {
+        var v;
+        (v = this._copyInfo) == null || v.matrix.forValue((w, C, V) => {
+          const _ = St.getPositionRange(
             {
-              startRow: S,
-              endRow: S,
-              startColumn: R,
-              endColumn: R
+              startRow: w,
+              endRow: w,
+              startColumn: C,
+              endColumn: C
             },
-            _
-          ), { row: C, col: g } = u(V.startRow, V.startColumn);
-          r.setValue(C, g, I), l.add(I);
+            R
+          ), { row: S, col: m } = p(_.startRow, _.startColumn);
+          l.setValue(S, m, V), s.add(V);
         });
       });
-      const d = Array.from(l).map((_) => ({ id: _, ranges: Qt(r, (w) => w === _) }));
-      i.addRangeRules(d);
-      const { redoMutations: f, undoMutations: m } = an(
-        n,
+      const g = Array.from(s).map((R) => ({ id: R, ranges: Qt(l, (v) => v === R) }));
+      r.addRangeRules(g);
+      const { redoMutations: f, undoMutations: I } = an(
         a,
-        i.diff(this._sheetDataValidationModel.getRules(n, a)),
+        i,
+        r.diff(this._sheetDataValidationModel.getRules(a, i)),
         this._injector,
         "patched",
         !1
       );
       return {
         redos: f,
-        undos: m
+        undos: I
       };
     }
   }
@@ -1388,20 +1386,20 @@ var lr = Object.defineProperty, dr = Object.getOwnPropertyDescriptor, cr = (e, t
 }, kt = (e, t) => (o, n) => t(o, n, e);
 let Ge = class extends De {
   constructor(e, t, o) {
-    super(), this._localeService = e, this._commandService = t, this._sheetPermissionInterceptorBaseController = o, this._commandExecutedListener();
+    super(), this._localeService = e, this._commandService = t, this._sheetPermissionCheckController = o, this._commandExecutedListener();
   }
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((e) => {
-        e.id === vn.id && (this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
+        e.id === vn.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
           workbookTypes: [Ct],
           rangeTypes: [It],
           worksheetTypes: [wt, on]
-        }) || this._sheetPermissionInterceptorBaseController.haveNotPermissionHandle(this._localeService.t("permission.dialog.setStyleErr"))), e.id === ao.id && (this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
+        }) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr"))), e.id === io.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
           workbookTypes: [Ct],
           rangeTypes: [It],
           worksheetTypes: [wt, on]
-        }, e.params.ranges) || this._sheetPermissionInterceptorBaseController.haveNotPermissionHandle(this._localeService.t("permission.dialog.setStyleErr")));
+        }, e.params.ranges) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr")));
       })
     );
   }
@@ -1409,7 +1407,7 @@ let Ge = class extends De {
 Ge = cr([
   kt(0, b(J)),
   kt(1, Q),
-  kt(2, b(ho))
+  kt(2, b(eo))
 ], Ge);
 const Lo = "data-validation-single", Po = "sheet.menu.data-validation";
 function ur(e) {
@@ -1436,7 +1434,7 @@ function pr(e) {
     type: Sn.BUTTON
   };
 }
-const mr = {
+const fr = {
   [Ua.FORMULAS_INSERT]: {
     [Po]: {
       order: 9,
@@ -1452,10 +1450,10 @@ const mr = {
     }
   }
 };
-var fr = Object.defineProperty, gr = Object.getOwnPropertyDescriptor, To = (e, t, o, n) => {
+var mr = Object.defineProperty, gr = Object.getOwnPropertyDescriptor, To = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? gr(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
-  return n && a && fr(t, o, a), a;
+  return n && a && mr(t, o, a), a;
 }, G = (e, t) => (o, n) => t(o, n, e);
 const Ao = {
   tr: {
@@ -1468,7 +1466,7 @@ let Ze = class extends pn {
     super(), this._commandService = e, this._menuManagerService = t, this._renderManagerService = o, this._univerInstanceService = n, this._autoHeightController = a, this._dropdownManagerService = i, this._sheetDataValidationModel = r, this._dataValidatorRegistryService = l, this._sheetInterceptorService = s, this._dataValidationCacheService = c, this._editorBridgeService = u, this._initMenu(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
   }
   _initMenu() {
-    this._menuManagerService.mergeMenu(mr);
+    this._menuManagerService.mergeMenu(fr);
   }
   _initDropdown() {
     this._editorBridgeService && this.disposeWithMe(this._editorBridgeService.visible$.subscribe((e) => {
@@ -1517,31 +1515,31 @@ let Ze = class extends pn {
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        eo.CELL_CONTENT,
+        to.CELL_CONTENT,
         {
           effect: zn.Style,
           // must be after numfmt
-          priority: to.DATA_VALIDATION,
+          priority: no.DATA_VALIDATION,
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: (e, t, o) => {
-            var S, R, I, V, C;
+            var v, w, C, V, _;
             const { row: n, col: a, unitId: i, subUnitId: r, workbook: l, worksheet: s } = t, c = this._sheetDataValidationModel.getRuleIdByLocation(i, r, n, a);
             if (!c)
               return o(e);
             const u = this._sheetDataValidationModel.getRuleById(i, r, c);
             if (!u)
               return o(e);
-            const p = (S = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? S : rt.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), f = t.rawData;
-            let m;
-            const _ = {
+            const p = (v = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? v : rt.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), g = t.rawData;
+            let f;
+            const I = {
               get value() {
-                var g;
-                return m !== void 0 || (m = (g = ie(f)) != null ? g : null), m;
+                var S;
+                return f !== void 0 || (f = (S = ie(g)) != null ? S : null), f;
               }
-            }, w = {
+            }, R = {
               get value() {
-                var g;
-                return `${(g = _.value) != null ? g : ""}`;
+                var S;
+                return `${(S = I.value) != null ? S : ""}`;
               }
             };
             return o({
@@ -1551,31 +1549,31 @@ let Ze = class extends pn {
                 ...p === rt.INVALID ? Ao : null
               },
               customRender: [
-                ...(R = e == null ? void 0 : e.customRender) != null ? R : [],
+                ...(w = e == null ? void 0 : e.customRender) != null ? w : [],
                 ...d != null && d.canvasRender ? [d.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                isSkip: ((I = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : I.isSkip) || ((V = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : V.call(d, u, _.value, t))
+                isSkip: ((C = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : C.isSkip) || ((V = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : V.call(d, u, I.value, t))
               },
               interceptorStyle: {
                 ...e == null ? void 0 : e.interceptorStyle,
-                ...d == null ? void 0 : d.getExtraStyle(u, w.value, {
+                ...d == null ? void 0 : d.getExtraStyle(u, R.value, {
                   get style() {
-                    const g = l.getStyles();
-                    return (typeof (e == null ? void 0 : e.s) == "string" ? g.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
+                    const S = l.getStyles();
+                    return (typeof (e == null ? void 0 : e.s) == "string" ? S.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
                   }
                 }, n, a)
               },
               interceptorAutoHeight: () => {
-                var P, U, T, E, A, x;
-                const g = (U = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(Rt).getWorksheetSkeleton(r)) == null ? void 0 : U.skeleton;
-                if (!g)
+                var P, F, T, E, A, x;
+                const S = (F = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(Rt).getWorksheetSkeleton(r)) == null ? void 0 : F.skeleton;
+                if (!S)
                   return;
-                const v = g.worksheet.getMergedCell(n, a), y = {
+                const m = S.worksheet.getMergedCell(n, a), y = {
                   data: e,
-                  style: g.getsStyles().getStyleByCell(e),
-                  primaryWithCoord: g.getCellWithCoordByIndex((T = v == null ? void 0 : v.startRow) != null ? T : n, (E = v == null ? void 0 : v.startColumn) != null ? E : a),
+                  style: S.getsStyles().getStyleByCell(e),
+                  primaryWithCoord: S.getCellWithCoordByIndex((T = m == null ? void 0 : m.startRow) != null ? T : n, (E = m == null ? void 0 : m.startColumn) != null ? E : a),
                   unitId: i,
                   subUnitId: r,
                   row: n,
@@ -1586,14 +1584,14 @@ let Ze = class extends pn {
                 return (x = (A = d == null ? void 0 : d.canvasRender) == null ? void 0 : A.calcCellAutoHeight) == null ? void 0 : x.call(A, y);
               },
               interceptorAutoWidth: () => {
-                var P, U, T, E, A, x;
-                const g = (U = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(Rt).getWorksheetSkeleton(r)) == null ? void 0 : U.skeleton;
-                if (!g)
+                var P, F, T, E, A, x;
+                const S = (F = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(Rt).getWorksheetSkeleton(r)) == null ? void 0 : F.skeleton;
+                if (!S)
                   return;
-                const v = g.worksheet.getMergedCell(n, a), y = {
+                const m = S.worksheet.getMergedCell(n, a), y = {
                   data: e,
-                  style: g.getsStyles().getStyleByCell(e),
-                  primaryWithCoord: g.getCellWithCoordByIndex((T = v == null ? void 0 : v.startRow) != null ? T : n, (E = v == null ? void 0 : v.startColumn) != null ? E : a),
+                  style: S.getsStyles().getStyleByCell(e),
+                  primaryWithCoord: S.getCellWithCoordByIndex((T = m == null ? void 0 : m.startRow) != null ? T : n, (E = m == null ? void 0 : m.startColumn) != null ? E : a),
                   unitId: i,
                   subUnitId: r,
                   row: n,
@@ -1603,7 +1601,7 @@ let Ze = class extends pn {
                 };
                 return (x = (A = d == null ? void 0 : d.canvasRender) == null ? void 0 : A.calcCellAutoWidth) == null ? void 0 : x.call(A, y);
               },
-              coverable: ((C = e == null ? void 0 : e.coverable) != null ? C : !0) && !(u.type === z.LIST || u.type === z.LIST_MULTIPLE)
+              coverable: ((_ = e == null ? void 0 : e.coverable) != null ? _ : !0) && !(u.type === z.LIST || u.type === z.LIST_MULTIPLE)
             });
           }
         }
@@ -1639,9 +1637,9 @@ Ze = To([
   G(5, b(Ie)),
   G(6, b(oe)),
   G(7, b(ye)),
-  G(8, b(fn)),
-  G(9, b(lo)),
-  G(10, ea(uo))
+  G(8, b(mn)),
+  G(9, b(co)),
+  G(10, ea(ho))
 ], Ze);
 let Bn = class extends pn {
   constructor(e, t, o, n, a, i, r) {
@@ -1650,21 +1648,21 @@ let Bn = class extends pn {
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        eo.CELL_CONTENT,
+        to.CELL_CONTENT,
         {
           effect: zn.Style,
           // must be after numfmt
-          priority: to.DATA_VALIDATION,
+          priority: no.DATA_VALIDATION,
           // eslint-disable-next-line complexity
           handler: (e, t, o) => {
-            var w, S, R, I, V;
+            var R, v, w, C, V;
             const { row: n, col: a, unitId: i, subUnitId: r, workbook: l, worksheet: s } = t, c = this._sheetDataValidationModel.getRuleIdByLocation(i, r, n, a);
             if (!c)
               return o(e);
             const u = this._sheetDataValidationModel.getRuleById(i, r, c);
             if (!u)
               return o(e);
-            const p = (w = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? w : rt.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), f = s.getCellRaw(n, a), m = ie(f), _ = `${m != null ? m : ""}`;
+            const p = (R = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? R : rt.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), g = s.getCellRaw(n, a), f = ie(g), I = `${f != null ? f : ""}`;
             return o({
               ...e,
               markers: {
@@ -1672,31 +1670,31 @@ let Bn = class extends pn {
                 ...p === rt.INVALID ? Ao : null
               },
               customRender: [
-                ...(S = e == null ? void 0 : e.customRender) != null ? S : [],
+                ...(v = e == null ? void 0 : e.customRender) != null ? v : [],
                 ...d != null && d.canvasRender ? [d.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                isSkip: ((R = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : R.isSkip) || ((I = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : I.call(d, u, m, t))
+                isSkip: ((w = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : w.isSkip) || ((C = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : C.call(d, u, f, t))
               },
               interceptorStyle: {
                 ...e == null ? void 0 : e.interceptorStyle,
-                ...d == null ? void 0 : d.getExtraStyle(u, _, {
+                ...d == null ? void 0 : d.getExtraStyle(u, I, {
                   get style() {
-                    const C = l.getStyles();
-                    return (typeof (e == null ? void 0 : e.s) == "string" ? C.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
+                    const _ = l.getStyles();
+                    return (typeof (e == null ? void 0 : e.s) == "string" ? _.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
                   }
                 }, n, a)
               },
               interceptorAutoHeight: () => {
-                var y, P, U, T, E, A;
-                const C = (P = (y = this._renderManagerService.getRenderById(i)) == null ? void 0 : y.with(Rt).getWorksheetSkeleton(r)) == null ? void 0 : P.skeleton;
-                if (!C)
+                var y, P, F, T, E, A;
+                const _ = (P = (y = this._renderManagerService.getRenderById(i)) == null ? void 0 : y.with(Rt).getWorksheetSkeleton(r)) == null ? void 0 : P.skeleton;
+                if (!_)
                   return;
-                const g = C.worksheet.getMergedCell(n, a), v = {
+                const S = _.worksheet.getMergedCell(n, a), m = {
                   data: e,
-                  style: C.getsStyles().getStyleByCell(e),
-                  primaryWithCoord: C.getCellWithCoordByIndex((U = g == null ? void 0 : g.startRow) != null ? U : n, (T = g == null ? void 0 : g.startColumn) != null ? T : a),
+                  style: _.getsStyles().getStyleByCell(e),
+                  primaryWithCoord: _.getCellWithCoordByIndex((F = S == null ? void 0 : S.startRow) != null ? F : n, (T = S == null ? void 0 : S.startColumn) != null ? T : a),
                   unitId: i,
                   subUnitId: r,
                   row: n,
@@ -1704,7 +1702,7 @@ let Bn = class extends pn {
                   workbook: l,
                   worksheet: s
                 };
-                return (A = (E = d == null ? void 0 : d.canvasRender) == null ? void 0 : E.calcCellAutoHeight) == null ? void 0 : A.call(E, v);
+                return (A = (E = d == null ? void 0 : d.canvasRender) == null ? void 0 : E.calcCellAutoHeight) == null ? void 0 : A.call(E, m);
               },
               coverable: ((V = e == null ? void 0 : e.coverable) != null ? V : !0) && !(u.type === z.LIST || u.type === z.LIST_MULTIPLE)
             });
@@ -1734,9 +1732,9 @@ Bn = To([
   G(1, Ve),
   G(2, b(po)),
   G(3, b(ye)),
-  G(4, b(fn)),
+  G(4, b(mn)),
   G(5, b(oe)),
-  G(6, b(lo))
+  G(6, b(co))
 ], Bn);
 var vr = Object.defineProperty, _r = Object.getOwnPropertyDescriptor, Sr = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? _r(t, o) : t, i = e.length - 1, r; i >= 0; i--)
@@ -1872,9 +1870,9 @@ function Lr(e) {
   var p;
   const { unitId: t, subUnitId: o, value: n, onChange: a, showError: i, validResult: r } = e, l = i ? r == null ? void 0 : r.formula1 : void 0, s = He({}), [c, u] = W(!1);
   return _n((d) => {
-    var m;
-    const f = (m = s.current) == null ? void 0 : m.handleOutClick;
-    f && f(d, () => u(!1));
+    var f;
+    const g = (f = s.current) == null ? void 0 : f.handleOutClick;
+    g && g(d, () => u(!1));
   }), /* @__PURE__ */ h.jsx(
     So,
     {
@@ -1883,10 +1881,10 @@ function Lr(e) {
       subUnitId: o,
       isFocus: c,
       onChange: (d) => {
-        const f = (d != null ? d : "").trim();
-        f !== (n == null ? void 0 : n.formula1) && (a == null || a({
+        const g = (d != null ? d : "").trim();
+        g !== (n == null ? void 0 : n.formula1) && (a == null || a({
           ...n,
-          formula1: f
+          formula1: g
         }));
       },
       errorText: l,
@@ -1997,49 +1995,49 @@ const Tr = [
 };
 function xr(e) {
   const { value: t, onChange: o = () => {
-  }, unitId: n, subUnitId: a, validResult: i, showError: r, ruleId: l } = e, { formula1: s = "", formula2: c = "" } = t || {}, u = He(null), [p, d] = W(() => Pe(s) ? "1" : "0"), [f, m] = W(p === "1" ? s : "="), [_, w] = W(p === "1" ? s : "="), S = L(J), R = L(ye), I = L(Pt), V = L(Ca), [C, g] = W(() => c.split(",")), v = R.getValidatorItem(z.LIST), [y, P] = W([]), [U, T] = W(""), E = r ? i == null ? void 0 : i.formula1 : "", A = Ae(() => I.ruleChange$.pipe(In(16)), []), x = Ue(A), j = go(o);
+  }, unitId: n, subUnitId: a, validResult: i, showError: r, ruleId: l } = e, { formula1: s = "", formula2: c = "" } = t || {}, u = He(null), [p, d] = W(() => Pe(s) ? "1" : "0"), [g, f] = W(p === "1" ? s : "="), [I, R] = W(p === "1" ? s : "="), v = L(J), w = L(ye), C = L(Pt), V = L(Ca), [_, S] = W(() => c.split(",")), m = w.getValidatorItem(z.LIST), [y, P] = W([]), [F, T] = W(""), E = r ? i == null ? void 0 : i.formula1 : "", A = Ae(() => C.ruleChange$.pipe(In(16)), []), x = Ue(A), j = go(o);
   Ce(() => {
     (async () => {
       await new Promise((B) => {
         setTimeout(() => B(!0), 100);
       });
-      const D = I.getRuleById(n, a, l), N = D == null ? void 0 : D.formula1;
-      if (Pe(N) && v && D) {
-        const B = await v.getListAsync(D, n, a);
+      const D = C.getRuleById(n, a, l), U = D == null ? void 0 : D.formula1;
+      if (Pe(U) && m && D) {
+        const B = await m.getListAsync(D, n, a);
         P(B);
       }
     })();
-  }, [I, x, v, l, a, n]), Ce(() => {
-    Pe(s) && s !== _ && (m(s), w(_));
-  }, [_, s]);
-  const [F, H] = W(() => {
-    const D = p !== "1" ? no(s) : [], N = c.split(",");
+  }, [C, x, m, l, a, n]), Ce(() => {
+    Pe(s) && s !== I && (f(s), R(I));
+  }, [I, s]);
+  const [N, H] = W(() => {
+    const D = p !== "1" ? oo(s) : [], U = c.split(",");
     return D.map((B, $) => ({
       label: B,
-      color: N[$] || Te,
+      color: U[$] || Te,
       isRef: !1,
       id: en.generateRandomId(4)
     }));
-  }), X = (D, N, B) => {
-    const $ = F.find((_e) => _e.id === D);
-    $ && ($.label = N, $.color = B, H([...F]));
+  }), X = (D, U, B) => {
+    const $ = N.find((_e) => _e.id === D);
+    $ && ($.label = U, $.color = B, H([...N]));
   }, k = (D) => {
-    const N = F.findIndex((B) => B.id === D);
-    N !== -1 && (F.splice(N, 1), H([...F]));
-  }, K = c.split(","), q = Ae(() => y.map((D, N) => ({
+    const U = N.findIndex((B) => B.id === D);
+    U !== -1 && (N.splice(U, 1), H([...N]));
+  }, K = c.split(","), q = Ae(() => y.map((D, U) => ({
     label: D,
-    color: K[N] || Te,
-    id: `${N}`,
+    color: K[U] || Te,
+    id: `${U}`,
     isRef: !0
-  })), [K, y]), ee = (D, N, B) => {
-    const $ = [...C];
-    $[+D] = B, g($), j({
+  })), [K, y]), ee = (D, U, B) => {
+    const $ = [..._];
+    $[+D] = B, S($), j({
       formula1: s,
       formula2: $.join(",")
     });
   }, te = () => {
     H([
-      ...F,
+      ...N,
       {
         label: "",
         color: Te,
@@ -2051,22 +2049,22 @@ function xr(e) {
   Ce(() => {
     if (p === "1")
       return;
-    const D = /* @__PURE__ */ new Set(), N = [];
-    F.map((B) => ({
+    const D = /* @__PURE__ */ new Set(), U = [];
+    N.map((B) => ({
       labelList: B.label.split(","),
       item: B
     })).forEach(({ item: B, labelList: $ }) => {
       $.forEach((_e) => {
-        D.has(_e) || (D.add(_e), N.push({
+        D.has(_e) || (D.add(_e), U.push({
           label: _e,
           color: B.color
         }));
       });
     }), j({
-      formula1: oo(N.map((B) => B.label)),
-      formula2: N.map((B) => B.color === Te ? "" : B.color).join(",")
+      formula1: ao(U.map((B) => B.label)),
+      formula2: U.map((B) => B.color === Te ? "" : B.color).join(",")
     });
-  }, [F, j, p, _, C]);
+  }, [N, j, p, I, _]);
   const re = Ae(
     () => async (D) => {
       if (!Pe(D)) {
@@ -2082,28 +2080,28 @@ function xr(e) {
       }), T("")) : (j == null || j({
         formula1: "",
         formula2: c
-      }), m("="), T(S.t("dataValidation.validFail.formulaError")));
+      }), f("="), T(v.t("dataValidation.validFail.formulaError")));
     },
     [c, j]
   ), ae = He({}), [se, O] = W(!1);
   return _n((D) => {
     var B;
-    const N = (B = ae.current) == null ? void 0 : B.handleOutClick;
-    N && N(D, () => O(!1));
+    const U = (B = ae.current) == null ? void 0 : B.handleOutClick;
+    U && U(D, () => O(!1));
   }), /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
-    /* @__PURE__ */ h.jsx(Z, { label: S.t("dataValidation.list.options"), children: /* @__PURE__ */ h.jsxs(
-      mn,
+    /* @__PURE__ */ h.jsx(Z, { label: v.t("dataValidation.list.options"), children: /* @__PURE__ */ h.jsxs(
+      fn,
       {
         value: p,
         onChange: (D) => {
-          d(D), m(_), D === "1" && j({
-            formula1: _ === "=" ? "" : _,
-            formula2: C.join(",")
+          d(D), f(I), D === "1" && j({
+            formula1: I === "=" ? "" : I,
+            formula2: _.join(",")
           });
         },
         children: [
-          /* @__PURE__ */ h.jsx(xe, { value: "0", children: S.t("dataValidation.list.customOptions") }),
-          /* @__PURE__ */ h.jsx(xe, { value: "1", children: S.t("dataValidation.list.refOptions") })
+          /* @__PURE__ */ h.jsx(xe, { value: "0", children: v.t("dataValidation.list.customOptions") }),
+          /* @__PURE__ */ h.jsx(xe, { value: "1", children: v.t("dataValidation.list.refOptions") })
         ]
       }
     ) }),
@@ -2111,15 +2109,15 @@ function xr(e) {
       /* @__PURE__ */ h.jsx(
         So,
         {
-          initValue: f,
+          initValue: g,
           unitId: n,
           subUnitId: a,
           isFocus: se,
           onChange: (D = "") => {
-            const N = (D != null ? D : "").trim();
-            w(N), re(N);
+            const U = (D != null ? D : "").trim();
+            R(U), re(U);
           },
-          errorText: E || U || void 0,
+          errorText: E || F || void 0,
           onFocus: () => O(!0),
           actions: ae.current,
           isSupportAcrossSheet: !0
@@ -2130,7 +2128,7 @@ function xr(e) {
       /* @__PURE__ */ h.jsx(
         sa,
         {
-          list: F,
+          list: N,
           onListChange: H,
           rowHeight: 32,
           margin: [0, 12],
@@ -2151,7 +2149,7 @@ function xr(e) {
       ),
       /* @__PURE__ */ h.jsxs("a", { className: ne.dataValidationFormulaListAdd, onClick: te, children: [
         /* @__PURE__ */ h.jsx(Ro, {}),
-        S.t("dataValidation.list.add")
+        v.t("dataValidation.list.add")
       ] })
     ] }) })
   ] });
@@ -2177,7 +2175,7 @@ const jo = "data-validation.custom-formula-input", xt = "data-validation.formula
 function Mt(e) {
   var a;
   const { value: t, onChange: o } = e, n = L(J);
-  return /* @__PURE__ */ h.jsx(Z, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ h.jsxs(mn, { value: `${(a = t.renderMode) != null ? a : de.CUSTOM}`, onChange: (i) => o({ ...t, renderMode: +i }), children: [
+  return /* @__PURE__ */ h.jsx(Z, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ h.jsxs(fn, { value: `${(a = t.renderMode) != null ? a : de.CUSTOM}`, onChange: (i) => o({ ...t, renderMode: +i }), children: [
     /* @__PURE__ */ h.jsx(xe, { value: `${de.CUSTOM}`, children: n.t("dataValidation.renderMode.chip") }),
     /* @__PURE__ */ h.jsx(xe, { value: `${de.ARROW}`, children: n.t("dataValidation.renderMode.arrow") }),
     /* @__PURE__ */ h.jsx(xe, { value: `${de.TEXT}`, children: n.t("dataValidation.renderMode.text") })
@@ -2260,10 +2258,10 @@ let ln = class {
     return ((o = t == null ? void 0 : t.fs) != null ? o : 10) * 1.6;
   }
   async _parseFormula(e, t, o) {
-    var c, u, p, d, f, m, _, w, S;
-    const { formula1: n = Ra, formula2: a = Da } = e, i = await this._formulaService.getRuleFormulaResult(t, o, e.uid), r = Ft((p = (u = (c = i == null ? void 0 : i[0]) == null ? void 0 : c.result) == null ? void 0 : u[0]) == null ? void 0 : p[0]), l = Ft((m = (f = (d = i == null ? void 0 : i[1]) == null ? void 0 : d.result) == null ? void 0 : f[0]) == null ? void 0 : m[0]), s = On(String(r)) && On(String(l));
+    var c, u, p, d, g, f, I, R, v;
+    const { formula1: n = Ra, formula2: a = Da } = e, i = await this._formulaService.getRuleFormulaResult(t, o, e.uid), r = Ft((p = (u = (c = i == null ? void 0 : i[0]) == null ? void 0 : c.result) == null ? void 0 : u[0]) == null ? void 0 : p[0]), l = Ft((f = (g = (d = i == null ? void 0 : i[1]) == null ? void 0 : d.result) == null ? void 0 : g[0]) == null ? void 0 : f[0]), s = On(String(r)) && On(String(l));
     return {
-      formula1: Pe(n) ? Ft((S = (w = (_ = i == null ? void 0 : i[0]) == null ? void 0 : _.result) == null ? void 0 : w[0]) == null ? void 0 : S[0]) : n,
+      formula1: Pe(n) ? Ft((v = (R = (I = i == null ? void 0 : i[0]) == null ? void 0 : I.result) == null ? void 0 : R[0]) == null ? void 0 : v[0]) : n,
       formula2: Pe(a) ? l : a,
       isFormulaValid: s
     };
@@ -2276,11 +2274,11 @@ let ln = class {
     const d = this._dataValidationModel.getValidator(p.type);
     if (!d)
       return;
-    const f = this._themeService.getCurrentTheme();
+    const g = this._themeService.getCurrentTheme();
     if (!((E = d.skipDefaultFontRender) != null && E.call(d, p, u, { unitId: a, subUnitId: i, row: l, column: s })))
       return;
-    const m = d.parseFormulaSync(p, a, i), { formula1: _ } = m, w = this._calc(c, o), { a: S, d: R } = e.getTransform(), I = bn(w.left, S), V = bn(w.top, R), C = la.create().composeMatrix({
-      left: I,
+    const f = d.parseFormulaSync(p, a, i), { formula1: I } = f, R = this._calc(c, o), { a: v, d: w } = e.getTransform(), C = bn(R.left, v), V = bn(R.top, w), _ = la.create().composeMatrix({
+      left: C,
       top: V,
       scaleX: 1,
       scaleY: 1,
@@ -2289,13 +2287,13 @@ let ln = class {
       skewY: 0,
       flipX: !1,
       flipY: !1
-    }), g = c.endX - c.startX, v = c.endY - c.startY;
-    e.save(), e.beginPath(), e.rect(c.startX, c.startY, g, v), e.clip();
-    const y = C.getMatrix();
+    }), S = c.endX - c.startX, m = c.endY - c.startY;
+    e.save(), e.beginPath(), e.rect(c.startX, c.startY, S, m), e.clip();
+    const y = _.getMatrix();
     e.transform(y[0], y[1], y[2], y[3], y[4], y[5]);
-    const P = ((A = o == null ? void 0 : o.fs) != null ? A : 10) * 1.6, U = String(u) === String(_), T = f.hyacinth500;
+    const P = ((A = o == null ? void 0 : o.fs) != null ? A : 10) * 1.6, F = String(u) === String(I), T = g.hyacinth500;
     da.drawWith(e, {
-      checked: U,
+      checked: F,
       width: P,
       height: P,
       fill: (j = (x = o == null ? void 0 : o.cl) == null ? void 0 : x.rgb) != null ? j : T
@@ -2306,16 +2304,16 @@ let ln = class {
     return s <= l && s >= r && c <= i && c >= a;
   }
   async onPointerDown(e, t) {
-    var m;
+    var f;
     if (t.button === 2)
       return;
     const { primaryWithCoord: o, unitId: n, subUnitId: a, worksheet: i, row: r, col: l } = e, s = ie(i.getCellRaw(r, l)), c = this._dataValidationModel.getRuleByLocation(n, a, r, l);
     if (!c)
       return;
     const u = this._dataValidationModel.getValidator(c.type);
-    if (!u || !((m = u.skipDefaultFontRender) != null && m.call(u, c, s, { unitId: n, subUnitId: a, row: r, column: l })))
+    if (!u || !((f = u.skipDefaultFontRender) != null && f.call(u, c, s, { unitId: n, subUnitId: a, row: r, column: l })))
       return;
-    const { formula1: p, formula2: d } = await this._parseFormula(c, n, a), f = {
+    const { formula1: p, formula2: d } = await this._parseFormula(c, n, a), g = {
       range: {
         startColumn: o.actualColumn,
         endColumn: o.actualColumn,
@@ -2329,7 +2327,7 @@ let ln = class {
     };
     this._commandService.executeCommand(
       gn.id,
-      f
+      g
     );
   }
   onPointerEnter(e, t) {
@@ -2353,7 +2351,7 @@ var kr = Object.defineProperty, Wr = Object.getOwnPropertyDescriptor, Hr = (e, t
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && kr(t, o, a), a;
 }, Yr = (e, t) => (o, n) => t(o, n, e);
-let fe = class {
+let me = class {
   constructor(e) {
     M(this, "canvasRender", null);
     M(this, "dropdown");
@@ -2362,10 +2360,10 @@ let fe = class {
     this.injector = e;
   }
 };
-fe = Hr([
+me = Hr([
   Yr(0, b(Ne))
-], fe);
-class Xr extends fe {
+], me);
+class Xr extends me {
   constructor() {
     super(...arguments);
     M(this, "id", z.CHECKBOX);
@@ -2373,7 +2371,7 @@ class Xr extends fe {
     M(this, "formulaInput", Fo);
   }
 }
-class zr extends fe {
+class zr extends me {
   constructor() {
     super(...arguments);
     M(this, "id", z.CUSTOM);
@@ -2381,7 +2379,7 @@ class zr extends fe {
   }
 }
 const Kr = "data-validation.formula-input";
-class Gr extends fe {
+class Gr extends me {
   constructor() {
     super(...arguments);
     M(this, "id", z.DATE);
@@ -2390,7 +2388,7 @@ class Gr extends fe {
     M(this, "dropdown", Oo);
   }
 }
-class Zr extends fe {
+class Zr extends me {
   constructor() {
     super(...arguments);
     M(this, "id", z.DECIMAL);
@@ -2414,10 +2412,10 @@ function Ht(e, t, o, n) {
   let s;
   const c = [];
   l.forEach((d) => {
-    const { layout: f } = d, { width: m, height: _ } = f;
-    !s || s.width + m + Wt > i ? (s = {
-      width: m,
-      height: _,
+    const { layout: g } = d, { width: f, height: I } = g;
+    !s || s.width + f + Wt > i ? (s = {
+      width: f,
+      height: I,
       items: [{
         ...d,
         left: 0
@@ -2425,11 +2423,11 @@ function Ht(e, t, o, n) {
     }, c.push(s)) : (s.items.push({
       ...d,
       left: s.width + Wt
-    }), s.width = s.width + m + Wt);
+    }), s.width = s.width + f + Wt);
   });
   let u = 0, p = 0;
-  return c.forEach((d, f) => {
-    p = Math.max(p, d.width), f === c.length - 1 ? u += d.height : u += d.height + Uo;
+  return c.forEach((d, g) => {
+    p = Math.max(p, d.width), g === c.length - 1 ? u += d.height : u += d.height + Uo;
   }), {
     lines: c,
     totalHeight: u,
@@ -2486,38 +2484,38 @@ let cn = class {
   // eslint-disable-next-line max-lines-per-function
   drawWith(e, t, o, n) {
     var X, k;
-    const { primaryWithCoord: a, row: i, col: r, style: l, data: s, subUnitId: c } = t, u = a.isMergedMainCell ? a.mergeInfo : a, p = s == null ? void 0 : s.fontRenderExtension, { leftOffset: d = 0, rightOffset: f = 0, topOffset: m = 0, downOffset: _ = 0 } = p || {}, w = this._ensureMap(c), S = this._generateKey(i, r), R = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, i, r);
-    if (!R)
+    const { primaryWithCoord: a, row: i, col: r, style: l, data: s, subUnitId: c } = t, u = a.isMergedMainCell ? a.mergeInfo : a, p = s == null ? void 0 : s.fontRenderExtension, { leftOffset: d = 0, rightOffset: g = 0, topOffset: f = 0, downOffset: I = 0 } = p || {}, R = this._ensureMap(c), v = this._generateKey(i, r), w = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, i, r);
+    if (!w)
       return;
-    const I = this._dataValidationModel.getValidator(R.type);
-    if (!I)
+    const C = this._dataValidationModel.getValidator(w.type);
+    if (!C)
       return;
     const V = {
       startX: u.startX + d,
-      endX: u.endX - f,
-      startY: u.startY + m,
-      endY: u.endY - _
-    }, C = V.endX - V.startX, g = V.endY - V.startY, { cl: v } = l || {}, y = (X = typeof v == "object" ? v == null ? void 0 : v.rgb : v) != null ? X : "#000", P = jt(l != null ? l : void 0), { vt: U, ht: T } = l || {}, E = U != null ? U : ue.MIDDLE, A = (k = ie(s)) != null ? k : "", x = I.parseCellValue(A), j = I.getListWithColorMap(R), F = Ht(x, P, C, g);
-    this._drawDownIcon(e, V, C, g, E), e.save(), e.translateWithPrecision(V.startX, V.startY), e.beginPath(), e.rect(0, 0, C - Le, g), e.clip(), e.translateWithPrecision(dn, Et);
+      endX: u.endX - g,
+      startY: u.startY + f,
+      endY: u.endY - I
+    }, _ = V.endX - V.startX, S = V.endY - V.startY, { cl: m } = l || {}, y = (X = typeof m == "object" ? m == null ? void 0 : m.rgb : m) != null ? X : "#000", P = jt(l != null ? l : void 0), { vt: F, ht: T } = l || {}, E = F != null ? F : ue.MIDDLE, A = (k = ie(s)) != null ? k : "", x = C.parseCellValue(A), j = C.getListWithColorMap(w), N = Ht(x, P, _, S);
+    this._drawDownIcon(e, V, _, S, E), e.save(), e.translateWithPrecision(V.startX, V.startY), e.beginPath(), e.rect(0, 0, _ - Le, S), e.clip(), e.translateWithPrecision(dn, Et);
     let H = 0;
     switch (E) {
       case ue.MIDDLE:
-        H = (F.contentHeight - F.totalHeight) / 2;
+        H = (N.contentHeight - N.totalHeight) / 2;
         break;
       case ue.BOTTOM:
-        H = F.contentHeight - F.totalHeight;
+        H = N.contentHeight - N.totalHeight;
         break;
     }
-    e.translateWithPrecision(0, H), F.lines.forEach((K, q) => {
+    e.translateWithPrecision(0, H), N.lines.forEach((K, q) => {
       e.save();
       const { width: ee, height: te, items: re } = K;
       let ae = 0;
       switch (T) {
         case Ye.RIGHT:
-          ae = F.contentWidth - ee;
+          ae = N.contentWidth - ee;
           break;
         case Ye.CENTER:
-          ae = (F.contentWidth - ee) / 2;
+          ae = (N.contentWidth - ee) / 2;
           break;
       }
       e.translate(ae, q * (te + Uo)), re.forEach((se) => {
@@ -2528,44 +2526,44 @@ let cn = class {
           fill: j[se.text]
         }), e.restore();
       }), e.restore();
-    }), e.restore(), w.set(S, {
+    }), e.restore(), R.set(v, {
       left: V.startX,
       top: V.startY,
-      width: F.contentWidth + dn + Le,
-      height: F.contentHeight + Et * 2
+      width: N.contentWidth + dn + Le,
+      height: N.contentHeight + Et * 2
     });
   }
   calcCellAutoHeight(e) {
-    var C;
+    var _;
     const { primaryWithCoord: t, style: o, data: n, row: a, col: i } = e, r = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: c = 0, downOffset: u = 0 } = r || {}, p = t.isMergedMainCell ? t.mergeInfo : t, d = {
       startX: p.startX + l,
       endX: p.endX - s,
       startY: p.startY + c,
       endY: p.endY - u
-    }, f = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, a, i);
-    if (!f)
+    }, g = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, a, i);
+    if (!g)
       return;
-    const m = this._dataValidationModel.getValidator(f.type);
-    if (!m)
+    const f = this._dataValidationModel.getValidator(g.type);
+    if (!f)
       return;
-    const _ = d.endX - d.startX, w = d.endY - d.startY, S = (C = ie(n)) != null ? C : "", R = m.parseCellValue(S), I = jt(o != null ? o : void 0);
-    return Ht(R, I, _, w).cellAutoHeight;
+    const I = d.endX - d.startX, R = d.endY - d.startY, v = (_ = ie(n)) != null ? _ : "", w = f.parseCellValue(v), C = jt(o != null ? o : void 0);
+    return Ht(w, C, I, R).cellAutoHeight;
   }
   calcCellAutoWidth(e) {
-    var C;
+    var _;
     const { primaryWithCoord: t, style: o, data: n, row: a, col: i } = e, r = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: c = 0, downOffset: u = 0 } = r || {}, p = t.isMergedMainCell ? t.mergeInfo : t, d = {
       startX: p.startX + l,
       endX: p.endX - s,
       startY: p.startY + c,
       endY: p.endY - u
-    }, f = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, a, i);
-    if (!f)
+    }, g = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, a, i);
+    if (!g)
       return;
-    const m = this._dataValidationModel.getValidator(f.type);
-    if (!m)
+    const f = this._dataValidationModel.getValidator(g.type);
+    if (!f)
       return;
-    const _ = d.endX - d.startX, w = d.endY - d.startY, S = (C = ie(n)) != null ? C : "", R = m.parseCellValue(S), I = jt(o != null ? o : void 0);
-    return Ht(R, I, _, w).calcAutoWidth;
+    const I = d.endX - d.startX, R = d.endY - d.startY, v = (_ = ie(n)) != null ? _ : "", w = f.parseCellValue(v), C = jt(o != null ? o : void 0);
+    return Ht(w, C, I, R).calcAutoWidth;
   }
   isHit(e, t) {
     const { primaryWithCoord: o } = t, n = o.isMergedMainCell ? o.mergeInfo : o, { endX: a } = n, { x: i } = e;
@@ -2596,7 +2594,7 @@ cn = os([
   Yt(1, b(Ve)),
   Yt(2, b(oe))
 ], cn);
-class is extends fe {
+class is extends me {
   constructor() {
     super(...arguments);
     M(this, "id", z.LIST_MULTIPLE);
@@ -2609,7 +2607,7 @@ var rs = Object.defineProperty, ss = Object.getOwnPropertyDescriptor, ls = (e, t
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && rs(t, o, a), a;
 }, pt = (e, t) => (o, n) => t(o, n, e);
-const Oe = 4, mt = 4, he = 14, pe = 6, We = 4, Xt = 8, ds = "#565656", Wn = 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");
+const Oe = 4, ft = 4, he = 14, pe = 6, We = 4, Xt = 8, ds = "#565656", Wn = 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 cs(e, t) {
   const o = e.length;
   return {
@@ -2658,14 +2656,14 @@ function Bo(e, t, o) {
     docViewModel: i
   };
 }
-function ft(e, t, o) {
+function mt(e, t, o) {
   const {
     documentSkeleton: n,
     docModel: a,
     docViewModel: i
   } = Bo(e, t, o);
   return {
-    documents: new ma(`DOCUMENTS_${en.generateRandomId()}`, n, {
+    documents: new fa(`DOCUMENTS_${en.generateRandomId()}`, n, {
       pageMarginLeft: 0,
       pageMarginTop: 0
     }),
@@ -2721,13 +2719,13 @@ let un = class {
     let u;
     switch (i) {
       case ue.MIDDLE:
-        u = (n - mt) / 2;
+        u = (n - ft) / 2;
         break;
       case ue.BOTTOM:
-        u = n - s - a - We + (a / 2 - mt / 2);
+        u = n - s - a - We + (a / 2 - ft / 2);
         break;
       default:
-        u = l + We + (a / 2 - mt / 2);
+        u = l + We + (a / 2 - ft / 2);
         break;
     }
     e.save(), e.translateWithPrecision(t.startX + c, t.startY + u), e.fillStyle = "#565656", e.fill(Wn), e.restore();
@@ -2740,41 +2738,41 @@ let un = class {
     const p = this._dataValidationModel.getValidator(u.type);
     if (!p)
       return;
-    const d = l == null ? void 0 : l.fontRenderExtension, { leftOffset: f = 0, rightOffset: m = 0, topOffset: _ = 0, downOffset: w = 0 } = d || {};
+    const d = l == null ? void 0 : l.fontRenderExtension, { leftOffset: g = 0, rightOffset: f = 0, topOffset: I = 0, downOffset: R = 0 } = d || {};
     if (!u || !p || !p || p.id.indexOf(z.LIST) !== 0 || !p.skipDefaultFontRender(u))
       return;
-    const S = {
-      startX: c.startX + f,
-      endX: c.endX - m,
-      startY: c.startY + _,
-      endY: c.endY - w
-    }, R = S.endX - S.startX, I = S.endY - S.startY, V = this._ensureMap(s), C = this._generateKey(a, i), g = p.getListWithColor(u), v = ie(l), y = `${v != null ? v : ""}`, P = g.find((x) => x.label === y);
-    let { tb: U, vt: T, ht: E, pd: A } = r || {};
-    if (U = U != null ? U : Se.WRAP, T = T != null ? T : ue.BOTTOM, E = E != null ? E : le.ht, A = A != null ? A : le.pd, u.renderMode === de.ARROW) {
-      const { l: x = le.pd.l, t: j = le.pd.t, r: F = le.pd.r, b: H = le.pd.b } = A, X = R - x - F - he - 4, { documentSkeleton: k, documents: K, docModel: q } = ft(y, this._localeService, r);
-      U === Se.WRAP && q.updateDocumentDataPageSize(Math.max(X, 1)), k.calculate(), k.getActualSize();
-      const ee = et(k), { height: te, width: re } = ee, { paddingTop: ae, paddingLeft: se } = Hn(X, I - j - H, re, te, T, E, !0);
-      this._drawDownIcon(e, S, R, I, te, T, A), e.save(), e.translateWithPrecision(S.startX + x, S.startY + j), e.beginPath(), e.rect(0, 0, R - x - F, I - j - H), e.clip(), e.translateWithPrecision(0, ae), e.save(), e.translateWithPrecision(Oe, 0), e.beginPath(), e.rect(0, 0, X, te), e.clip(), K.render(e), e.translateWithPrecision(se, 0), e.restore(), e.restore(), V.set(C, {
-        left: S.endX + x + o.rowHeaderWidth - he,
-        top: S.startY + j + o.columnHeaderHeight,
+    const v = {
+      startX: c.startX + g,
+      endX: c.endX - f,
+      startY: c.startY + I,
+      endY: c.endY - R
+    }, w = v.endX - v.startX, C = v.endY - v.startY, V = this._ensureMap(s), _ = this._generateKey(a, i), S = p.getListWithColor(u), m = ie(l), y = `${m != null ? m : ""}`, P = S.find((x) => x.label === y);
+    let { tb: F, vt: T, ht: E, pd: A } = r || {};
+    if (F = F != null ? F : Se.WRAP, T = T != null ? T : ue.BOTTOM, E = E != null ? E : le.ht, A = A != null ? A : le.pd, u.renderMode === de.ARROW) {
+      const { l: x = le.pd.l, t: j = le.pd.t, r: N = le.pd.r, b: H = le.pd.b } = A, X = w - x - N - he - 4, { documentSkeleton: k, documents: K, docModel: q } = mt(y, this._localeService, r);
+      F === Se.WRAP && q.updateDocumentDataPageSize(Math.max(X, 1)), k.calculate(), k.getActualSize();
+      const ee = et(k), { height: te, width: re } = ee, { paddingTop: ae, paddingLeft: se } = Hn(X, C - j - H, re, te, T, E, !0);
+      this._drawDownIcon(e, v, w, C, te, T, A), e.save(), e.translateWithPrecision(v.startX + x, v.startY + j), e.beginPath(), e.rect(0, 0, w - x - N, C - j - H), e.clip(), e.translateWithPrecision(0, ae), e.save(), e.translateWithPrecision(Oe, 0), e.beginPath(), e.rect(0, 0, X, te), e.clip(), K.render(e), e.translateWithPrecision(se, 0), e.restore(), e.restore(), V.set(_, {
+        left: v.endX + x + o.rowHeaderWidth - he,
+        top: v.startY + j + o.columnHeaderHeight,
         width: he,
-        height: I - j - H
+        height: C - j - H
       });
     } else {
-      e.save(), e.translateWithPrecision(S.startX, S.startY), e.beginPath(), e.rect(0, 0, R, I), e.clip();
-      const x = R - pe * 2 - Oe - he - 4, { documentSkeleton: j, documents: F, docModel: H } = ft(y, this._localeService, r);
-      U === Se.WRAP && H.updateDocumentDataPageSize(Math.max(x, 1)), j.calculate();
-      const X = et(j), { height: k, width: K } = X, { paddingTop: q, paddingLeft: ee } = Hn(x, I, K, k, T, E);
+      e.save(), e.translateWithPrecision(v.startX, v.startY), e.beginPath(), e.rect(0, 0, w, C), e.clip();
+      const x = w - pe * 2 - Oe - he - 4, { documentSkeleton: j, documents: N, docModel: H } = mt(y, this._localeService, r);
+      F === Se.WRAP && H.updateDocumentDataPageSize(Math.max(x, 1)), j.calculate();
+      const X = et(j), { height: k, width: K } = X, { paddingTop: q, paddingLeft: ee } = Hn(x, C, K, k, T, E);
       e.translateWithPrecision(pe, q);
-      const te = Math.max(R - pe * 2, 1), re = k;
+      const te = Math.max(w - pe * 2, 1), re = k;
       qn.drawWith(e, {
         width: te,
         height: re,
         fill: (P == null ? void 0 : P.color) || Te,
         radius: Xt
-      }), e.save(), e.translateWithPrecision(Oe, 0), e.beginPath(), e.rect(0, 0, x, k), e.clip(), e.translateWithPrecision(ee, 0), F.render(e), e.restore(), e.translateWithPrecision(x + Oe + 4, (k - mt) / 2), e.fillStyle = ds, e.fill(Wn), e.restore(), V.set(C, {
-        left: S.startX + pe + o.rowHeaderWidth,
-        top: S.startY + q + o.columnHeaderHeight,
+      }), e.save(), e.translateWithPrecision(Oe, 0), e.beginPath(), e.rect(0, 0, x, k), e.clip(), e.translateWithPrecision(ee, 0), N.render(e), e.restore(), e.translateWithPrecision(x + Oe + 4, (k - ft) / 2), e.fillStyle = ds, e.fill(Wn), e.restore(), V.set(_, {
+        left: v.startX + pe + o.rowHeaderWidth,
+        top: v.startY + q + o.columnHeaderHeight,
         width: te,
         height: re
       });
@@ -2784,23 +2782,23 @@ let un = class {
     const { primaryWithCoord: t, style: o, data: n, row: a, col: i } = e, r = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: p = 0 } = l || {}, d = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, a, i);
     if (!d || d.renderMode === de.TEXT)
       return;
-    const f = {
+    const g = {
       startX: r.startX + s,
       endX: r.endX - c,
       startY: r.startY + u,
       endY: r.endY - p
-    }, m = f.endX - f.startX, _ = ie(n), w = `${_ != null ? _ : ""}`;
-    let { tb: S, pd: R } = o || {};
-    const { t: I = le.pd.t, b: V = le.pd.b } = R != null ? R : {};
-    if (S = S != null ? S : Se.WRAP, d.renderMode === de.ARROW) {
-      const C = m - he, { documentSkeleton: g, docModel: v } = ft(w, this._localeService, o);
-      S === Se.WRAP && v.updateDocumentDataPageSize(Math.max(C, 1)), g.calculate(), g.getActualSize();
-      const y = et(g), { height: P } = y;
-      return P + I + V + We * 2;
+    }, f = g.endX - g.startX, I = ie(n), R = `${I != null ? I : ""}`;
+    let { tb: v, pd: w } = o || {};
+    const { t: C = le.pd.t, b: V = le.pd.b } = w != null ? w : {};
+    if (v = v != null ? v : Se.WRAP, d.renderMode === de.ARROW) {
+      const _ = f - he, { documentSkeleton: S, docModel: m } = mt(R, this._localeService, o);
+      v === Se.WRAP && m.updateDocumentDataPageSize(Math.max(_, 1)), S.calculate(), S.getActualSize();
+      const y = et(S), { height: P } = y;
+      return P + C + V + We * 2;
     } else {
-      const C = m - pe * 2 - Oe - he, { documentSkeleton: g, docModel: v } = Bo(w, this._localeService, o);
-      S === Se.WRAP && v.updateDocumentDataPageSize(Math.max(C, 1)), g.calculate();
-      const y = et(g), {
+      const _ = f - pe * 2 - Oe - he, { documentSkeleton: S, docModel: m } = Bo(R, this._localeService, o);
+      v === Se.WRAP && m.updateDocumentDataPageSize(Math.max(_, 1)), S.calculate();
+      const y = et(S), {
         height: P
       } = y;
       return P + We * 2;
@@ -2810,36 +2808,36 @@ let un = class {
     const { primaryWithCoord: t, style: o, data: n, row: a, col: i } = e, r = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: p = 0 } = l || {}, d = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, a, i);
     if (!d || d.renderMode === de.TEXT)
       return;
-    const f = {
+    const g = {
       startX: r.startX + s,
       endX: r.endX - c,
       startY: r.startY + u,
       endY: r.endY - p
-    }, m = f.endX - f.startX, _ = ie(n), w = `${_ != null ? _ : ""}`;
-    let { tb: S, pd: R } = o || {};
-    const { l: I = le.pd.l, r: V = le.pd.r } = R != null ? R : {};
-    S = S != null ? S : Se.WRAP;
-    let C = pe * 2 + he;
+    }, f = g.endX - g.startX, I = ie(n), R = `${I != null ? I : ""}`;
+    let { tb: v, pd: w } = o || {};
+    const { l: C = le.pd.l, r: V = le.pd.r } = w != null ? w : {};
+    v = v != null ? v : Se.WRAP;
+    let _ = pe * 2 + he;
     switch (d.renderMode) {
       case de.ARROW:
-        C = he + pe * 2 + V + I;
+        _ = he + pe * 2 + V + C;
         break;
       case de.CUSTOM:
-        C = he + pe * 2 + Oe * 2 + V + I + Xt / 2 + 1;
+        _ = he + pe * 2 + Oe * 2 + V + C + Xt / 2 + 1;
         break;
       // default is CUSTOM
       default:
-        C = he + pe * 2 + Oe * 2 + V + I + Xt / 2 + 1;
+        _ = he + pe * 2 + Oe * 2 + V + C + Xt / 2 + 1;
     }
-    const g = m - C, { documentSkeleton: v, docModel: y } = ft(w, this._localeService, o);
-    return S === Se.WRAP && y.updateDocumentDataPageSize(Math.max(g, 1)), v.calculate(), v.getActualSize(), et(v).width + C;
+    const S = f - _, { documentSkeleton: m, docModel: y } = mt(R, this._localeService, o);
+    return v === Se.WRAP && y.updateDocumentDataPageSize(Math.max(S, 1)), m.calculate(), m.getActualSize(), et(m).width + _;
   }
   isHit(e, t) {
     const { subUnitId: o, row: n, col: a } = t, r = this._ensureMap(o).get(this._generateKey(n, a)), l = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, n, a);
     if (!l || !r || l.renderMode === de.TEXT)
       return !1;
-    const { top: s, left: c, width: u, height: p } = r, { x: d, y: f } = e;
-    return d >= c && d <= c + u && f >= s && f <= s + p;
+    const { top: s, left: c, width: u, height: p } = r, { x: d, y: g } = e;
+    return d >= c && d <= c + u && g >= s && g <= s + p;
   }
   onPointerDown(e, t) {
     if (t.button === 2)
@@ -2867,7 +2865,7 @@ un = ls([
   pt(2, b(Ve)),
   pt(3, b(oe))
 ], un);
-class us extends fe {
+class us extends me {
   constructor() {
     super(...arguments);
     M(this, "id", z.LIST);
@@ -2877,24 +2875,24 @@ class us extends fe {
     M(this, "formulaInput", yn);
   }
 }
-class hs extends fe {
+class hs extends me {
   constructor() {
     super(...arguments);
     M(this, "id", z.TEXT_LENGTH);
     M(this, "formulaInput", xt);
   }
 }
-class ps extends fe {
+class ps extends me {
   constructor() {
     super(...arguments);
     M(this, "id", z.WHOLE);
     M(this, "formulaInput", xt);
   }
 }
-var ms = Object.defineProperty, fs = Object.getOwnPropertyDescriptor, gs = (e, t, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? fs(t, o) : t, i = e.length - 1, r; i >= 0; i--)
+var fs = Object.defineProperty, ms = Object.getOwnPropertyDescriptor, gs = (e, t, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? ms(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
-  return n && a && ms(t, o, a), a;
+  return n && a && fs(t, o, a), a;
 }, zt = (e, t) => (o, n) => t(o, n, e);
 let qe = class extends pn {
   constructor(e, t, o) {
@@ -2957,7 +2955,7 @@ let Yn = (gt = class extends Gn {
   }
   onStarting() {
     [
-      [me],
+      [fe],
       [Ie],
       [lt],
       [ze],
@@ -3016,7 +3014,7 @@ let Xn = (vt = class extends Gn {
   }
   onStarting() {
     [
-      [me],
+      [fe],
       [Ie],
       [lt],
       [ze],