@univerjs/sheets-data-validation-ui 0.7.0-nightly.202505041606 → 0.7.0-nightly.202505061607

package/lib/index.js

@@ -1,9 +1,9 @@
 var Ar = Object.defineProperty;
 var Lr = (e, t, r) => t in e ? Ar(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
 var E = (e, t, r) => Lr(e, typeof t != "symbol" ? t + "" : t, r);
-import { LocaleService as se, isFormulaString as De, DataValidationType as G, Tools as Kt, Inject as M, Injector as we, Disposable as Re, UniverInstanceType as W, toDisposable as kr, IUniverInstanceService as le, DataValidationErrorStyle as lt, DataValidationStatus as je, ICommandService as J, IConfigService as ln, DataValidationRenderMode as oe, DisposableCollection as Nr, dayjs as wn, numfmt as Hn, CellValueType as Ur, CommandType as nt, ObjectMatrix as wt, Range as Fr, Rectangle as Rt, queryObjectMatrix as Gt, Optional as xr, RxDisposable as cn, InterceptorEffectEnum as Wn, sequenceExecute as jn, bufferDebounceTime as $r, debounce as Br, UndoCommand as Hr, RedoCommand as Wr, isUnitRangesEqual as jr, shallowEqual as Rn, ThemeService as Yn, ColorKit as Yr, VerticalAlign as ae, HorizontalAlign as Ye, DEFAULT_STYLES as re, WrapStrategy as Ie, DocumentDataModel as Xr, BooleanNumber as rt, DEFAULT_EMPTY_DOCUMENT_VALUE as zr, Plugin as Xn, merge as zn } from "@univerjs/core";
+import { LocaleService as se, isFormulaString as De, DataValidationType as G, Tools as Kt, Inject as b, Injector as we, Disposable as Re, UniverInstanceType as W, toDisposable as kr, IUniverInstanceService as le, DataValidationErrorStyle as lt, DataValidationStatus as je, ICommandService as J, IConfigService as ln, DataValidationRenderMode as oe, DisposableCollection as Nr, dayjs as wn, numfmt as Hn, CellValueType as Ur, CommandType as nt, ObjectMatrix as wt, Range as Fr, Rectangle as Rt, queryObjectMatrix as Gt, Optional as xr, RxDisposable as cn, InterceptorEffectEnum as Wn, sequenceExecute as jn, bufferDebounceTime as $r, debounce as Br, UndoCommand as Hr, RedoCommand as Wr, isUnitRangesEqual as jr, shallowEqual as Rn, ThemeService as Yn, ColorKit as Yr, VerticalAlign as ae, HorizontalAlign as Ye, DEFAULT_STYLES as re, WrapStrategy as Ie, DocumentDataModel as Xr, BooleanNumber as rt, DEFAULT_EMPTY_DOCUMENT_VALUE as zr, Plugin as Xn, merge as zn } from "@univerjs/core";
 import { DataValidationFormulaController as Kr, deserializeListOptions as Gr, serializeListOptions as Kn, CUSTOM_FORMULA_INPUT_NAME as Gn, BASE_FORMULA_INPUT_NAME as Tt, LIST_FORMULA_INPUT_NAME as dn, CHECKBOX_FORMULA_INPUT_NAME as Zn, SheetDataValidationModel as ee, SheetsDataValidationValidatorService as Zr, getDataValidationCellValue as kt, getCellValueOrigin as Q, createDefaultNewRule as qn, AddSheetDataValidationCommand as un, DATA_VALIDATION_PLUGIN_NAME as Jn, getDataValidationDiffMutations as Zt, UpdateSheetDataValidationRangeCommand as Qn, DataValidationCacheService as er, UpdateSheetDataValidationSettingCommand as yn, UpdateSheetDataValidationOptionsCommand as qr, RemoveSheetDataValidationCommand as tr, RemoveSheetAllDataValidationCommand as Jr, DataValidationFormulaService as Qr, CHECKBOX_FORMULA_2 as eo, CHECKBOX_FORMULA_1 as to, getFormulaResult as Nt, isLegalFormulaResult as Mn, transformCheckboxValue as no } from "@univerjs/sheets-data-validation";
-import { jsxs as z, Fragment as Xe, jsx as _ } from "react/jsx-runtime";
+import { jsxs as z, Fragment as Xe, jsx as S } from "react/jsx-runtime";
 import { FormLayout as K, Input as Ve, Checkbox as Pt, RadioGroup as hn, Radio as Oe, DraggableList as ro, clsx as nr, LegacySelect as oo, Button as ze, Select as bn } from "@univerjs/design";
 import { useDependency as U, useSidebarClick as rr, useObservable as Te, useEvent as qt, ISidebarService as or, IDialogService as io, IZenZoneService as ir, KeyCode as ht, MenuItemType as pn, getMenuHiddenObservable as ao, RibbonStartGroup as so, IMenuManagerService as lo, ComponentManager as gn } from "@univerjs/ui";
 import En, { useState as H, useRef as ut, forwardRef as Le, createElement as ke, useMemo as ct, useEffect as Pe } from "react";
@@ -18,7 +18,7 @@ import { deserializeRangeWithSheet as Uo, serializeRange as fr } from "@univerjs
 const Fo = (e) => {
   const { isTwoFormula: t = !1, value: r, onChange: n, showError: o, validResult: i } = e, a = U(se), l = o ? i == null ? void 0 : i.formula1 : "", s = o ? i == null ? void 0 : i.formula2 : "";
   return t ? /* @__PURE__ */ z(Xe, { children: [
-    /* @__PURE__ */ _(K, { error: l, children: /* @__PURE__ */ _(
+    /* @__PURE__ */ S(K, { error: l, children: /* @__PURE__ */ S(
       Ve,
       {
         className: "univer-w-full",
@@ -32,8 +32,8 @@ const Fo = (e) => {
         }
       }
     ) }),
-    /* @__PURE__ */ _("div", { className: "-univer-mt-2 univer-mb-1 univer-text-sm univer-text-gray-400", children: a.t("dataValidation.panel.formulaAnd") }),
-    /* @__PURE__ */ _(K, { error: s, children: /* @__PURE__ */ _(
+    /* @__PURE__ */ S("div", { className: "-univer-mt-2 univer-mb-1 univer-text-sm univer-text-gray-400", children: a.t("dataValidation.panel.formulaAnd") }),
+    /* @__PURE__ */ S(K, { error: s, children: /* @__PURE__ */ S(
       Ve,
       {
         className: "univer-w-full",
@@ -47,7 +47,7 @@ const Fo = (e) => {
         }
       }
     ) })
-  ] }) : /* @__PURE__ */ _(K, { error: l, children: /* @__PURE__ */ _(
+  ] }) : /* @__PURE__ */ S(K, { error: l, children: /* @__PURE__ */ S(
     Ve,
     {
       className: "univer-w-full",
@@ -62,7 +62,7 @@ const Fo = (e) => {
 function xo(e) {
   const { value: t, onChange: r, showError: n, validResult: o } = e, i = U(se), a = n ? o == null ? void 0 : o.formula1 : "", l = n ? o == null ? void 0 : o.formula2 : "", [s, c] = H(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
   return /* @__PURE__ */ z(Xe, { children: [
-    /* @__PURE__ */ _(K, { children: /* @__PURE__ */ _(
+    /* @__PURE__ */ S(K, { children: /* @__PURE__ */ S(
       Pt,
       {
         checked: s,
@@ -76,7 +76,7 @@ function xo(e) {
         children: i.t("dataValidation.checkbox.tips")
       }
     ) }),
-    s ? /* @__PURE__ */ _(K, { label: i.t("dataValidation.checkbox.checked"), error: a, children: /* @__PURE__ */ _(
+    s ? /* @__PURE__ */ S(K, { label: i.t("dataValidation.checkbox.checked"), error: a, children: /* @__PURE__ */ S(
       Ve,
       {
         className: "univer-w-full",
@@ -90,7 +90,7 @@ function xo(e) {
         }
       }
     ) }) : null,
-    s ? /* @__PURE__ */ _(K, { label: i.t("dataValidation.checkbox.unchecked"), error: l, children: /* @__PURE__ */ _(
+    s ? /* @__PURE__ */ S(K, { label: i.t("dataValidation.checkbox.unchecked"), error: l, children: /* @__PURE__ */ S(
       Ve,
       {
         className: "univer-w-full",
@@ -112,7 +112,7 @@ function $o(e) {
   return rr((d) => {
     var p;
     ((p = s.current) == null ? void 0 : p.isClickOutSide(d)) && u(!1);
-  }), /* @__PURE__ */ _(
+  }), /* @__PURE__ */ S(
     ar,
     {
       initValue: (h = n == null ? void 0 : n.formula1) != null ? h : "=",
@@ -120,10 +120,10 @@ function $o(e) {
       subUnitId: r,
       isFocus: c,
       onChange: (d) => {
-        const S = (d != null ? d : "").trim();
-        S !== (n == null ? void 0 : n.formula1) && (o == null || o({
+        const f = (d != null ? d : "").trim();
+        f !== (n == null ? void 0 : n.formula1) && (o == null || o({
           ...n,
-          formula1: S
+          formula1: f
         }));
       },
       errorText: l,
@@ -254,7 +254,7 @@ const He = "#ECECEC", qo = [
   "#F248A6"
 ], Jo = (e) => {
   const { value: t, onChange: r, disabled: n } = e, [o, i] = H(!1);
-  return /* @__PURE__ */ _(
+  return /* @__PURE__ */ S(
     oo,
     {
       disabled: n,
@@ -265,7 +265,7 @@ const He = "#ECECEC", qo = [
       className: "univer-ml-1 univer-mr-2 univer-w-[92px]",
       value: t,
       onChange: r,
-      labelRender: (a) => /* @__PURE__ */ _(
+      labelRender: (a) => /* @__PURE__ */ S(
         "div",
         {
           className: `
@@ -275,7 +275,7 @@ const He = "#ECECEC", qo = [
           style: { background: a.value, marginTop: 5 }
         }
       ),
-      dropdownRender: () => /* @__PURE__ */ _(
+      dropdownRender: () => /* @__PURE__ */ S(
         "div",
         {
           className: `
@@ -283,7 +283,7 @@ const He = "#ECECEC", qo = [
                           univer-justify-between univer-p-3 univer-pl-3
                         `,
           children: qo.map(
-            (a) => /* @__PURE__ */ _(
+            (a) => /* @__PURE__ */ S(
               "div",
               {
                 onClick: () => {
@@ -306,8 +306,8 @@ const He = "#ECECEC", qo = [
 }, Ln = (e) => {
   const { item: t, commonProps: r, style: n } = e, { onItemChange: o, onItemDelete: i } = r;
   return /* @__PURE__ */ z("div", { className: "univer-flex univer-items-center univer-pb-0.5", style: n, children: [
-    t.isRef ? null : /* @__PURE__ */ _("div", { className: nr("univer-cursor-move", "draggableHandle"), children: /* @__PURE__ */ _(wr, {}) }),
-    /* @__PURE__ */ _(
+    t.isRef ? null : /* @__PURE__ */ S("div", { className: nr("univer-cursor-move", "draggableHandle"), children: /* @__PURE__ */ S(wr, {}) }),
+    /* @__PURE__ */ S(
       Jo,
       {
         value: t.color,
@@ -316,7 +316,7 @@ const He = "#ECECEC", qo = [
         }
       }
     ),
-    /* @__PURE__ */ _(
+    /* @__PURE__ */ S(
       Ve,
       {
         disabled: t.isRef,
@@ -327,59 +327,59 @@ const He = "#ECECEC", qo = [
         inputStyle: { height: 28 }
       }
     ),
-    t.isRef ? null : /* @__PURE__ */ _(
+    t.isRef ? null : /* @__PURE__ */ S(
       "div",
       {
         className: `
                           univer-ml-1 univer-cursor-pointer univer-rounded univer-text-base
                           hover:univer-bg-gray-200
                         `,
-        children: /* @__PURE__ */ _(_n, { onClick: () => i(t.id) })
+        children: /* @__PURE__ */ S(_n, { onClick: () => i(t.id) })
       }
     )
   ] });
 };
 function Qo(e) {
   const { value: t, onChange: r = () => {
-  }, unitId: n, subUnitId: o, validResult: i, showError: a, ruleId: l } = e, { formula1: s = "", formula2: c = "" } = t || {}, [u, h] = H(() => De(s) ? "1" : "0"), [d, S] = H(u === "1" ? s : "="), [p, b] = H(u === "1" ? s : "="), y = U(se), g = U(ye), f = U(mn), m = U(Kr), [I, w] = H(() => c.split(",")), C = g.getValidatorItem(G.LIST), [R, D] = H([]), [k, V] = H(""), A = a ? i == null ? void 0 : i.formula1 : "", P = ct(() => f.ruleChange$.pipe(sr(16)), []), L = Te(P), O = qt(r);
+  }, unitId: n, subUnitId: o, validResult: i, showError: a, ruleId: l } = e, { formula1: s = "", formula2: c = "" } = t || {}, [u, h] = H(() => De(s) ? "1" : "0"), [d, f] = H(u === "1" ? s : "="), [p, M] = H(u === "1" ? s : "="), y = U(se), g = U(ye), _ = U(mn), m = U(Kr), [C, w] = H(() => c.split(",")), I = g.getValidatorItem(G.LIST), [R, T] = H([]), [N, D] = H(""), P = a ? i == null ? void 0 : i.formula1 : "", A = ct(() => _.ruleChange$.pipe(sr(16)), []), L = Te(A), V = qt(r);
   Pe(() => {
     (async () => {
       await new Promise((v) => {
         setTimeout(() => v(!0), 100);
       });
-      const T = f.getRuleById(n, o, l), B = T == null ? void 0 : T.formula1;
-      if (De(B) && C && T) {
-        const v = await C.getListAsync(T, n, o);
-        D(v);
+      const O = _.getRuleById(n, o, l), B = O == null ? void 0 : O.formula1;
+      if (De(B) && I && O) {
+        const v = await I.getListAsync(O, n, o);
+        T(v);
       }
     })();
-  }, [f, L, C, l, o, n]), Pe(() => {
-    De(s) && s !== p && (S(s), b(p));
+  }, [_, L, I, l, o, n]), Pe(() => {
+    De(s) && s !== p && (f(s), M(p));
   }, [p, s]);
   const [F, x] = H(() => {
-    const T = u !== "1" ? Gr(s) : [], B = c.split(",");
-    return T.map((v, N) => ({
+    const O = u !== "1" ? Gr(s) : [], B = c.split(",");
+    return O.map((v, k) => ({
       label: v,
-      color: B[N] || He,
+      color: B[k] || He,
       isRef: !1,
       id: Kt.generateRandomId(4)
     }));
-  }), j = (T, B, v) => {
-    const N = F.find(($) => $.id === T);
-    N && (N.label = B, N.color = v, x([...F]));
-  }, Z = (T) => {
-    const B = F.findIndex((v) => v.id === T);
+  }), j = (O, B, v) => {
+    const k = F.find(($) => $.id === O);
+    k && (k.label = B, k.color = v, x([...F]));
+  }, Z = (O) => {
+    const B = F.findIndex((v) => v.id === O);
     B !== -1 && (F.splice(B, 1), x([...F]));
-  }, Y = c.split(","), te = ct(() => R.map((T, B) => ({
-    label: T,
+  }, Y = c.split(","), te = ct(() => R.map((O, B) => ({
+    label: O,
     color: Y[B] || He,
     id: `${B}`,
     isRef: !0
-  })), [Y, R]), ge = (T, B, v) => {
-    const N = [...I];
-    N[+T] = v, w(N), O({
+  })), [Y, R]), ge = (O, B, v) => {
+    const k = [...C];
+    k[+O] = v, w(k), V({
       formula1: s,
-      formula2: N.join(",")
+      formula2: k.join(",")
     });
   }, ce = () => {
     x([
@@ -395,87 +395,87 @@ function Qo(e) {
   Pe(() => {
     if (u === "1")
       return;
-    const T = /* @__PURE__ */ new Set(), B = [];
+    const O = /* @__PURE__ */ new Set(), B = [];
     F.map((v) => ({
       labelList: v.label.split(","),
       item: v
-    })).forEach(({ item: v, labelList: N }) => {
-      N.forEach(($) => {
-        T.has($) || (T.add($), B.push({
+    })).forEach(({ item: v, labelList: k }) => {
+      k.forEach(($) => {
+        O.has($) || (O.add($), B.push({
           label: $,
           color: v.color
         }));
       });
-    }), O({
+    }), V({
       formula1: Kn(B.map((v) => v.label)),
       formula2: B.map((v) => v.color === He ? "" : v.color).join(",")
     });
-  }, [F, O, u, p, I]);
-  const ne = qt(async (T) => {
-    if (!De(T)) {
-      O == null || O({
+  }, [F, V, u, p, C]);
+  const ne = qt(async (O) => {
+    if (!De(O)) {
+      V == null || V({
         formula1: "",
         formula2: c
       });
       return;
     }
-    m.getFormulaRefCheck(T) ? (O == null || O({
-      formula1: De(T) ? T : "",
+    m.getFormulaRefCheck(O) ? (V == null || V({
+      formula1: De(O) ? O : "",
       formula2: c
-    }), V("")) : (O == null || O({
+    }), D("")) : (V == null || V({
       formula1: "",
       formula2: c
-    }), S("="), V(y.t("dataValidation.validFail.formulaError")));
+    }), f("="), D(y.t("dataValidation.validFail.formulaError")));
   }), de = ut(null), [Se, me] = H(!1);
-  return rr((T) => {
+  return rr((O) => {
     var v;
-    ((v = de.current) == null ? void 0 : v.isClickOutSide(T)) && me(!1);
+    ((v = de.current) == null ? void 0 : v.isClickOutSide(O)) && me(!1);
   }), /* @__PURE__ */ z(Xe, { children: [
-    /* @__PURE__ */ _(K, { label: y.t("dataValidation.list.options"), children: /* @__PURE__ */ z(
+    /* @__PURE__ */ S(K, { label: y.t("dataValidation.list.options"), children: /* @__PURE__ */ z(
       hn,
       {
         value: u,
-        onChange: (T) => {
-          h(T), S(p), T === "1" && O({
+        onChange: (O) => {
+          h(O), f(p), O === "1" && V({
             formula1: p === "=" ? "" : p,
-            formula2: I.join(",")
+            formula2: C.join(",")
           });
         },
         children: [
-          /* @__PURE__ */ _(Oe, { value: "0", children: y.t("dataValidation.list.customOptions") }),
-          /* @__PURE__ */ _(Oe, { value: "1", children: y.t("dataValidation.list.refOptions") })
+          /* @__PURE__ */ S(Oe, { value: "0", children: y.t("dataValidation.list.customOptions") }),
+          /* @__PURE__ */ S(Oe, { value: "1", children: y.t("dataValidation.list.refOptions") })
         ]
       }
     ) }),
     u === "1" ? /* @__PURE__ */ z(Xe, { children: [
-      /* @__PURE__ */ _(
+      /* @__PURE__ */ S(
         ar,
         {
           initValue: d,
           unitId: n,
           subUnitId: o,
           isFocus: Se,
-          onChange: (T = "") => {
-            const B = (T != null ? T : "").trim();
-            b(B), ne(B);
+          onChange: (O = "") => {
+            const B = (O != null ? O : "").trim();
+            M(B), ne(B);
           },
-          errorText: A || k || void 0,
+          errorText: P || N || void 0,
           onFocus: () => me(!0),
           isSupportAcrossSheet: !0,
           ref: de
         }
       ),
-      te.length > 0 && /* @__PURE__ */ _("div", { style: { marginTop: "12px" }, children: te.map((T) => /* @__PURE__ */ _(
+      te.length > 0 && /* @__PURE__ */ S("div", { style: { marginTop: "12px" }, children: te.map((O) => /* @__PURE__ */ S(
         Ln,
         {
-          item: T,
+          item: O,
           commonProps: { onItemChange: ge },
           style: { marginBottom: 12 }
         },
-        T.id
+        O.id
       )) })
-    ] }) : /* @__PURE__ */ _(K, { error: A, children: /* @__PURE__ */ z("div", { style: { marginTop: "-12px" }, children: [
-      /* @__PURE__ */ _(
+    ] }) : /* @__PURE__ */ S(K, { error: P, children: /* @__PURE__ */ z("div", { style: { marginTop: "-12px" }, children: [
+      /* @__PURE__ */ S(
         ro,
         {
           list: F,
@@ -483,16 +483,16 @@ function Qo(e) {
           rowHeight: 28,
           margin: [0, 12],
           draggableHandle: ".draggableHandle",
-          itemRender: (T) => /* @__PURE__ */ _(
+          itemRender: (O) => /* @__PURE__ */ S(
             Ln,
             {
-              item: T,
+              item: O,
               commonProps: {
                 onItemChange: j,
                 onItemDelete: Z
               }
             },
-            T.id
+            O.id
           ),
           idKey: "id"
         }
@@ -507,7 +507,7 @@ function Qo(e) {
                                 `,
           onClick: ce,
           children: [
-            /* @__PURE__ */ _(Sr, { className: "univer-mr-1" }),
+            /* @__PURE__ */ S(Sr, { className: "univer-mr-1" }),
             y.t("dataValidation.list.add")
           ]
         }
@@ -548,7 +548,7 @@ let ve = class {
   }
 };
 ve = ni([
-  ri(0, M(we))
+  ri(0, b(we))
 ], ve);
 var oi = Object.getOwnPropertyDescriptor, ii = (e, t, r, n) => {
   for (var o = n > 1 ? void 0 : n ? oi(t, r) : t, i = e.length - 1, a; i >= 0; i--)
@@ -679,12 +679,12 @@ let Ze = class extends Re {
   }
 };
 Ze = si([
-  xe(0, M(vn)),
-  xe(1, M(ee)),
-  xe(2, M(ye)),
+  xe(0, b(vn)),
+  xe(1, b(ee)),
+  xe(2, b(ye)),
   xe(3, io),
-  xe(4, M(se)),
-  xe(5, M(Zr))
+  xe(4, b(se)),
+  xe(5, b(Zr))
 ], Ze);
 var li = Object.getOwnPropertyDescriptor, ci = (e, t, r, n) => {
   for (var o = n > 1 ? void 0 : n ? li(t, r) : t, i = e.length - 1, a; i >= 0; i--)
@@ -753,7 +753,7 @@ let Ae = class extends Re {
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   showDropdown(t) {
-    var b, y, g, f;
+    var M, y, g, _;
     const { location: r } = t, { row: n, col: o, unitId: i, subUnitId: a, workbook: l, worksheet: s } = r;
     if (this._currentPopup && this._currentPopup.dispose(), this._zenVisible)
       return;
@@ -765,13 +765,13 @@ let Ae = class extends Re {
     if (!(u != null && u.dropdownType))
       return;
     let h;
-    const d = async (m, I) => {
-      var P, L, O;
+    const d = async (m, C) => {
+      var A, L, V;
       if (!m)
         return !0;
-      const w = m, C = s.getCell(n, o), R = w.format(I === "date" ? "YYYY-MM-DD 00:00:00" : "YYYY-MM-DD HH:mm:ss"), D = (P = Hn.parseDate(R)) == null ? void 0 : P.v, k = I === "time" ? D % 1 : D, V = l.getStyles().getStyleByCell(C), A = (O = (L = V == null ? void 0 : V.n) == null ? void 0 : L.pattern) != null ? O : "";
+      const w = m, I = s.getCell(n, o), R = w.format(C === "date" ? "YYYY-MM-DD 00:00:00" : "YYYY-MM-DD HH:mm:ss"), T = (A = Hn.parseDate(R)) == null ? void 0 : A.v, N = C === "time" ? T % 1 : T, D = l.getStyles().getStyleByCell(I), P = (V = (L = D == null ? void 0 : D.n) == null ? void 0 : L.pattern) != null ? V : "";
       return c.errorStyle !== lt.STOP || await u.validator({
-        value: k,
+        value: N,
         unitId: i,
         subUnitId: a,
         row: n,
@@ -795,56 +795,56 @@ let Ae = class extends Re {
           endRow: n
         },
         value: {
-          v: k,
+          v: N,
           t: 2,
           p: null,
           f: null,
           si: null,
           s: {
             n: {
-              pattern: di(I, A)
+              pattern: di(C, P)
             }
           }
         }
       }), !0) : (this._injector.has(Ze) && this._injector.get(Ze).showReject(u.getRuleFinalError(c, { row: n, col: o, unitId: i, subUnitId: a })), !1);
     };
-    let S;
+    let f;
     switch (u.dropdownType) {
       case pe.DATE: {
-        const m = Q(s.getCellRaw(n, o)), I = Ft(m), w = !!((b = c.bizInfo) != null && b.showTime);
-        S = {
+        const m = Q(s.getCellRaw(n, o)), C = Ft(m), w = !!((M = c.bizInfo) != null && M.showTime);
+        f = {
           location: r,
           type: "datepicker",
           props: {
             showTime: w,
-            onChange: (C) => d(C, w ? "datetime" : "date"),
-            defaultValue: I,
+            onChange: (I) => d(I, w ? "datetime" : "date"),
+            defaultValue: C,
             patternType: "date"
           }
         };
         break;
       }
       case pe.TIME: {
-        const m = Q(s.getCellRaw(n, o)), I = Ft(m);
-        S = {
+        const m = Q(s.getCellRaw(n, o)), C = Ft(m);
+        f = {
           location: r,
           type: "datepicker",
           props: {
             onChange: (w) => d(w, "time"),
-            defaultValue: I,
+            defaultValue: C,
             patternType: "time"
           }
         };
         break;
       }
       case pe.DATETIME: {
-        const m = Q(s.getCellRaw(n, o)), I = Ft(m);
-        S = {
+        const m = Q(s.getCellRaw(n, o)), C = Ft(m);
+        f = {
           location: r,
           type: "datepicker",
           props: {
             onChange: (w) => d(w, "datetime"),
-            defaultValue: I,
+            defaultValue: C,
             patternType: "datetime"
           }
         };
@@ -852,8 +852,8 @@ let Ae = class extends Re {
       }
       case pe.LIST:
       case pe.MULTIPLE_LIST: {
-        const m = u.dropdownType === pe.MULTIPLE_LIST, I = async (V) => {
-          const A = Kn(V), P = {
+        const m = u.dropdownType === pe.MULTIPLE_LIST, C = async (D) => {
+          const P = Kn(D), A = {
             unitId: i,
             subUnitId: a,
             range: {
@@ -863,7 +863,7 @@ let Ae = class extends Re {
               endRow: n
             },
             value: {
-              v: A,
+              v: P,
               p: null,
               f: null,
               si: null
@@ -874,23 +874,23 @@ let Ae = class extends Re {
             eventType: pt.Keyboard,
             unitId: i,
             keycode: ht.ESC
-          }), this._commandService.executeCommand(st.id, P), !m;
-        }, w = (c == null ? void 0 : c.renderMode) === oe.CUSTOM || (c == null ? void 0 : c.renderMode) === void 0, C = u.getListWithColor(c, i, a), R = kt(s.getCellRaw(n, o)), D = () => {
+          }), this._commandService.executeCommand(st.id, A), !m;
+        }, w = (c == null ? void 0 : c.renderMode) === oe.CUSTOM || (c == null ? void 0 : c.renderMode) === void 0, I = u.getListWithColor(c, i, a), R = kt(s.getCellRaw(n, o)), T = () => {
           this._commandService.executeCommand(Fe.id, {
             ruleId: c.uid
           }), h == null || h.dispose();
-        }, k = C.map((V) => ({
-          label: V.label,
-          value: V.label,
-          color: w || V.color ? V.color : "transparent"
+        }, N = I.map((D) => ({
+          label: D.label,
+          value: D.label,
+          color: w || D.color ? D.color : "transparent"
         }));
-        S = {
+        f = {
           location: r,
           type: "list",
           props: {
-            onChange: (V) => I(V),
-            options: k,
-            onEdit: D,
+            onChange: (D) => C(D),
+            options: N,
+            onEdit: T,
             defaultValue: R,
             multiple: m,
             showEdit: (g = (y = this._configService.getConfig(Sn)) == null ? void 0 : y.showEditOnDropdown) != null ? g : !0
@@ -899,10 +899,10 @@ let Ae = class extends Re {
         break;
       }
       case pe.CASCADE: {
-        S = {
+        f = {
           type: "cascader",
           props: {
-            onChange: (I) => {
+            onChange: (C) => {
               const w = {
                 unitId: i,
                 subUnitId: a,
@@ -913,7 +913,7 @@ let Ae = class extends Re {
                   endRow: n
                 },
                 value: {
-                  v: I.join("/"),
+                  v: C.join("/"),
                   p: null,
                   f: null,
                   si: null
@@ -927,17 +927,17 @@ let Ae = class extends Re {
               }), this._commandService.syncExecuteCommand(st.id, w), !0;
             },
             defaultValue: kt(s.getCellRaw(n, o)).split("/"),
-            options: JSON.parse((f = c.formula1) != null ? f : "[]")
+            options: JSON.parse((_ = c.formula1) != null ? _ : "[]")
           },
           location: r
         };
         break;
       }
       case pe.COLOR: {
-        S = {
+        f = {
           type: "color",
           props: {
-            onChange: (I) => {
+            onChange: (C) => {
               const w = {
                 unitId: i,
                 subUnitId: a,
@@ -948,7 +948,7 @@ let Ae = class extends Re {
                   endRow: n
                 },
                 value: {
-                  v: I,
+                  v: C,
                   p: null,
                   f: null,
                   si: null
@@ -970,13 +970,13 @@ let Ae = class extends Re {
       default:
         throw new Error("[DataValidationDropdownManagerService]: unknown type!");
     }
-    if (h = this._cellDropdownManagerService.showDropdown(S), !h)
+    if (h = this._cellDropdownManagerService.showDropdown(f), !h)
       throw new Error("[DataValidationDropdownManagerService]: cannot show dropdown!");
     const p = new Nr();
     p.add(h), p.add({
       dispose: () => {
-        var m, I;
-        (I = (m = this._activeDropdown) == null ? void 0 : m.onHide) == null || I.call(m);
+        var m, C;
+        (C = (m = this._activeDropdown) == null ? void 0 : m.onHide) == null || C.call(m);
       }
     }), this._currentPopup = p;
   }
@@ -1013,15 +1013,15 @@ let Ae = class extends Re {
 };
 Ae = ci([
   ue(0, le),
-  ue(1, M(ye)),
+  ue(1, b(ye)),
   ue(2, ir),
-  ue(3, M(ee)),
-  ue(4, M(dr)),
-  ue(5, M(Do)),
-  ue(6, M(ee)),
+  ue(3, b(ee)),
+  ue(4, b(dr)),
+  ue(5, b(Do)),
+  ue(6, b(ee)),
   ue(7, J),
   ue(8, gr),
-  ue(9, M(we)),
+  ue(9, b(we)),
   ue(10, ln)
 ], Ae);
 const bt = "DataValidationPanel", Fe = {
@@ -1154,12 +1154,12 @@ let dt = class extends Re {
   }
 };
 dt = hi([
-  $e(0, M(Vo)),
-  $e(1, M(Oo)),
+  $e(0, b(Vo)),
+  $e(1, b(Oo)),
   $e(2, le),
-  $e(3, M(se)),
+  $e(3, b(se)),
   $e(4, ir),
-  $e(5, M(ee))
+  $e(5, b(ee))
 ], dt);
 var pi = Object.getOwnPropertyDescriptor, gi = (e, t, r, n) => {
   for (var o = n > 1 ? void 0 : n ? pi(t, r) : t, i = e.length - 1, a; i >= 0; i--)
@@ -1173,49 +1173,49 @@ let qe = class extends Re {
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
     const e = () => ({ redos: [], undos: [] }), t = (n, o) => {
-      const { source: i, target: a, unitId: l, subUnitId: s } = n, c = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = nn([i, a]), [h, d] = u.ranges, { mapFunc: S } = u, p = {
+      const { source: i, target: a, unitId: l, subUnitId: s } = n, c = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = nn([i, a]), [h, d] = u.ranges, { mapFunc: f } = u, p = {
         row: h.startRow,
         col: h.startColumn
-      }, b = Ao(h, d), y = new wt(), g = /* @__PURE__ */ new Set();
-      b.forEach((C) => {
-        const R = C.repeatStartCell, D = C.relativeRange, k = {
+      }, M = Ao(h, d), y = new wt(), g = /* @__PURE__ */ new Set();
+      M.forEach((I) => {
+        const R = I.repeatStartCell, T = I.relativeRange, N = {
           startRow: p.row,
           startColumn: p.col,
           endColumn: p.col,
           endRow: p.row
-        }, V = {
+        }, D = {
           startRow: R.row,
           startColumn: R.col,
           endColumn: R.col,
           endRow: R.row
         };
-        Fr.foreach(D, (A, P) => {
+        Fr.foreach(T, (P, A) => {
           const L = Rt.getPositionRange(
             {
-              startRow: A,
-              startColumn: P,
-              endColumn: P,
-              endRow: A
+              startRow: P,
+              startColumn: A,
+              endColumn: A,
+              endRow: P
             },
-            k
-          ), { row: O, col: F } = S(L.startRow, L.startColumn), x = this._sheetDataValidationModel.getRuleIdByLocation(l, s, O, F) || "", j = Rt.getPositionRange(
+            N
+          ), { row: V, col: F } = f(L.startRow, L.startColumn), x = this._sheetDataValidationModel.getRuleIdByLocation(l, s, V, F) || "", j = Rt.getPositionRange(
             {
-              startRow: A,
-              startColumn: P,
-              endColumn: P,
-              endRow: A
+              startRow: P,
+              startColumn: A,
+              endColumn: A,
+              endRow: P
             },
-            V
-          ), { row: Z, col: Y } = S(j.startRow, j.startColumn);
+            D
+          ), { row: Z, col: Y } = f(j.startRow, j.startColumn);
           y.setValue(Z, Y, x), g.add(x);
         });
       });
-      const f = Array.from(g).map((C) => ({ id: C, ranges: Gt(y, (R) => R === C) }));
-      c.addRangeRules(f);
-      const m = c.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: I, undoMutations: w } = Zt(l, s, m, this._injector, "patched", o === it.ONLY_FORMAT);
+      const _ = Array.from(g).map((I) => ({ id: I, ranges: Gt(y, (R) => R === I) }));
+      c.addRangeRules(_);
+      const m = c.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: C, undoMutations: w } = Zt(l, s, m, this._injector, "patched", o === it.ONLY_FORMAT);
       return {
         undos: w,
-        redos: I
+        redos: C
       };
     }, r = {
       id: Jn,
@@ -1239,8 +1239,8 @@ let qe = class extends Re {
 };
 qe = gi([
   xt(0, Po),
-  xt(1, M(ee)),
-  xt(2, M(we))
+  xt(1, b(ee)),
+  xt(2, b(we))
 ], qe);
 var mi = Object.getOwnPropertyDescriptor, fi = (e, t, r, n) => {
   for (var o = n > 1 ? void 0 : n ? mi(t, r) : t, i = e.length - 1, a; i >= 0; i--)
@@ -1298,58 +1298,58 @@ let Je = class extends Re {
       return { redos: [], undos: [] };
     const { unitId: o, subUnitId: i } = this._copyInfo;
     if (r.unitId !== o || i !== r.subUnitId) {
-      const a = this._sheetDataValidationModel.getRuleObjectMatrix(r.unitId, r.subUnitId).clone(), l = new wt(), s = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = nn([r.copyRange, t]), d = An(c, u, !0), S = /* @__PURE__ */ new Map();
+      const a = this._sheetDataValidationModel.getRuleObjectMatrix(r.unitId, r.subUnitId).clone(), l = new wt(), s = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = nn([r.copyRange, t]), d = An(c, u, !0), f = /* @__PURE__ */ new Map();
       d.forEach(({ startRange: g }) => {
-        var f;
-        (f = this._copyInfo) == null || f.matrix.forValue((m, I, w) => {
-          const C = Rt.getPositionRange(
+        var _;
+        (_ = this._copyInfo) == null || _.matrix.forValue((m, C, w) => {
+          const I = Rt.getPositionRange(
             {
               startRow: m,
               endRow: m,
-              startColumn: I,
-              endColumn: I
+              startColumn: C,
+              endColumn: C
             },
             g
-          ), R = `${i}-${w}`, D = this._sheetDataValidationModel.getRuleById(o, i, w);
-          !this._sheetDataValidationModel.getRuleById(r.unitId, r.subUnitId, R) && D && S.set(R, { ...D, uid: R });
-          const { row: k, col: V } = h(C.startRow, C.startColumn);
-          s.add(R), l.setValue(k, V, R);
+          ), R = `${i}-${w}`, T = this._sheetDataValidationModel.getRuleById(o, i, w);
+          !this._sheetDataValidationModel.getRuleById(r.unitId, r.subUnitId, R) && T && f.set(R, { ...T, uid: R });
+          const { row: N, col: D } = h(I.startRow, I.startColumn);
+          s.add(R), l.setValue(N, D, R);
         });
       });
-      const p = Array.from(s).map((g) => ({ id: g, ranges: Gt(l, (f) => f === g) }));
+      const p = Array.from(s).map((g) => ({ id: g, ranges: Gt(l, (_) => _ === g) }));
       a.addRangeRules(p);
-      const { redoMutations: b, undoMutations: y } = Zt(
+      const { redoMutations: M, undoMutations: y } = Zt(
         r.unitId,
         r.subUnitId,
-        a.diffWithAddition(this._sheetDataValidationModel.getRules(r.unitId, r.subUnitId), S.values()),
+        a.diffWithAddition(this._sheetDataValidationModel.getRules(r.unitId, r.subUnitId), f.values()),
         this._injector,
         "patched",
         !1
       );
       return {
-        redos: b,
+        redos: M,
         undos: y
       };
     } else {
       const a = this._sheetDataValidationModel.getRuleObjectMatrix(o, i).clone(), l = new wt(), s = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = nn([r.copyRange, t]);
       An(c, u, !0).forEach(({ startRange: y }) => {
         var g;
-        (g = this._copyInfo) == null || g.matrix.forValue((f, m, I) => {
+        (g = this._copyInfo) == null || g.matrix.forValue((_, m, C) => {
           const w = Rt.getPositionRange(
             {
-              startRow: f,
-              endRow: f,
+              startRow: _,
+              endRow: _,
               startColumn: m,
               endColumn: m
             },
             y
-          ), { row: C, col: R } = h(w.startRow, w.startColumn);
-          l.setValue(C, R, I), s.add(I);
+          ), { row: I, col: R } = h(w.startRow, w.startColumn);
+          l.setValue(I, R, C), s.add(C);
         });
       });
-      const S = Array.from(s).map((y) => ({ id: y, ranges: Gt(l, (g) => g === y) }));
-      a.addRangeRules(S);
-      const { redoMutations: p, undoMutations: b } = Zt(
+      const f = Array.from(s).map((y) => ({ id: y, ranges: Gt(l, (g) => g === y) }));
+      a.addRangeRules(f);
+      const { redoMutations: p, undoMutations: M } = Zt(
         o,
         i,
         a.diff(this._sheetDataValidationModel.getRules(o, i)),
@@ -1359,15 +1359,15 @@ let Je = class extends Re {
       );
       return {
         redos: p,
-        undos: b
+        undos: M
       };
     }
   }
 };
 Je = fi([
   $t(0, Lo),
-  $t(1, M(ee)),
-  $t(2, M(we))
+  $t(1, b(ee)),
+  $t(2, b(we))
 ], Je);
 var vi = Object.getOwnPropertyDescriptor, _i = (e, t, r, n) => {
   for (var o = n > 1 ? void 0 : n ? vi(t, r) : t, i = e.length - 1, a; i >= 0; i--)
@@ -1395,9 +1395,9 @@ let Qe = class extends Re {
   }
 };
 Qe = _i([
-  Bt(0, M(se)),
+  Bt(0, b(se)),
   Bt(1, J),
-  Bt(2, M(Mo))
+  Bt(2, b(Mo))
 ], Qe);
 const Mr = "data-validation-single", br = "sheet.menu.data-validation";
 function Si(e) {
@@ -1509,24 +1509,24 @@ let et = class extends cn {
           priority: pr.DATA_VALIDATION,
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: (e, t, r) => {
-            var g, f, m, I, w;
+            var g, _, m, C, w;
             const { row: n, col: o, unitId: i, subUnitId: a, workbook: l, worksheet: s } = t, c = this._sheetDataValidationModel.getRuleIdByLocation(i, a, n, o);
             if (!c)
               return r(e);
             const u = this._sheetDataValidationModel.getRuleById(i, a, c);
             if (!u)
               return r(e);
-            const h = (g = this._dataValidationCacheService.getValue(i, a, n, o)) != null ? g : je.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), S = t.rawData;
+            const h = (g = this._dataValidationCacheService.getValue(i, a, n, o)) != null ? g : je.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), f = t.rawData;
             let p;
-            const b = {
+            const M = {
               get value() {
-                var C;
-                return p !== void 0 || (p = (C = Q(S)) != null ? C : null), p;
+                var I;
+                return p !== void 0 || (p = (I = Q(f)) != null ? I : null), p;
               }
             }, y = {
               get value() {
-                var C;
-                return `${(C = b.value) != null ? C : ""}`;
+                var I;
+                return `${(I = M.value) != null ? I : ""}`;
               }
             };
             return r({
@@ -1536,31 +1536,31 @@ let et = class extends cn {
                 ...h === je.INVALID ? Dr : null
               },
               customRender: [
-                ...(f = e == null ? void 0 : e.customRender) != null ? f : [],
+                ...(_ = e == null ? void 0 : e.customRender) != null ? _ : [],
                 ...d != null && d.canvasRender ? [d.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                isSkip: ((m = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : m.isSkip) || ((I = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : I.call(d, u, b.value, t))
+                isSkip: ((m = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : m.isSkip) || ((C = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : C.call(d, u, M.value, t))
               },
               interceptorStyle: {
                 ...e == null ? void 0 : e.interceptorStyle,
                 ...d == null ? void 0 : d.getExtraStyle(u, y.value, {
                   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 I = l.getStyles();
+                    return (typeof (e == null ? void 0 : e.s) == "string" ? I.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
                   }
                 }, n, o)
               },
               interceptorAutoHeight: () => {
-                var k, V, A, P, L, O;
-                const C = (V = (k = this._renderManagerService.getRenderById(i)) == null ? void 0 : k.with(yt).getSkeletonParam(a)) == null ? void 0 : V.skeleton;
-                if (!C)
+                var N, D, P, A, L, V;
+                const I = (D = (N = this._renderManagerService.getRenderById(i)) == null ? void 0 : N.with(yt).getSkeletonParam(a)) == null ? void 0 : D.skeleton;
+                if (!I)
                   return;
-                const R = C.worksheet.getMergedCell(n, o), D = {
+                const R = I.worksheet.getMergedCell(n, o), T = {
                   data: e,
-                  style: C.getStyles().getStyleByCell(e),
-                  primaryWithCoord: C.getCellWithCoordByIndex((A = R == null ? void 0 : R.startRow) != null ? A : n, (P = R == null ? void 0 : R.startColumn) != null ? P : o),
+                  style: I.getStyles().getStyleByCell(e),
+                  primaryWithCoord: I.getCellWithCoordByIndex((P = R == null ? void 0 : R.startRow) != null ? P : n, (A = R == null ? void 0 : R.startColumn) != null ? A : o),
                   unitId: i,
                   subUnitId: a,
                   row: n,
@@ -1568,17 +1568,17 @@ let et = class extends cn {
                   workbook: l,
                   worksheet: s
                 };
-                return (O = (L = d == null ? void 0 : d.canvasRender) == null ? void 0 : L.calcCellAutoHeight) == null ? void 0 : O.call(L, D);
+                return (V = (L = d == null ? void 0 : d.canvasRender) == null ? void 0 : L.calcCellAutoHeight) == null ? void 0 : V.call(L, T);
               },
               interceptorAutoWidth: () => {
-                var k, V, A, P, L, O;
-                const C = (V = (k = this._renderManagerService.getRenderById(i)) == null ? void 0 : k.with(yt).getSkeletonParam(a)) == null ? void 0 : V.skeleton;
-                if (!C)
+                var N, D, P, A, L, V;
+                const I = (D = (N = this._renderManagerService.getRenderById(i)) == null ? void 0 : N.with(yt).getSkeletonParam(a)) == null ? void 0 : D.skeleton;
+                if (!I)
                   return;
-                const R = C.worksheet.getMergedCell(n, o), D = {
+                const R = I.worksheet.getMergedCell(n, o), T = {
                   data: e,
-                  style: C.getStyles().getStyleByCell(e),
-                  primaryWithCoord: C.getCellWithCoordByIndex((A = R == null ? void 0 : R.startRow) != null ? A : n, (P = R == null ? void 0 : R.startColumn) != null ? P : o),
+                  style: I.getStyles().getStyleByCell(e),
+                  primaryWithCoord: I.getCellWithCoordByIndex((P = R == null ? void 0 : R.startRow) != null ? P : n, (A = R == null ? void 0 : R.startColumn) != null ? A : o),
                   unitId: i,
                   subUnitId: a,
                   row: n,
@@ -1586,7 +1586,7 @@ let et = class extends cn {
                   workbook: l,
                   worksheet: s
                 };
-                return (O = (L = d == null ? void 0 : d.canvasRender) == null ? void 0 : L.calcCellAutoWidth) == null ? void 0 : O.call(L, D);
+                return (V = (L = d == null ? void 0 : d.canvasRender) == null ? void 0 : L.calcCellAutoWidth) == null ? void 0 : V.call(L, T);
               },
               coverable: ((w = e == null ? void 0 : e.coverable) != null ? w : !0) && !(u.type === G.LIST || u.type === G.LIST_MULTIPLE)
             });
@@ -1620,12 +1620,12 @@ et = Er([
   X(1, lo),
   X(2, Ne),
   X(3, le),
-  X(4, M(mr)),
-  X(5, M(Ae)),
-  X(6, M(ee)),
-  X(7, M(ye)),
-  X(8, M(vn)),
-  X(9, M(er)),
+  X(4, b(mr)),
+  X(5, b(Ae)),
+  X(6, b(ee)),
+  X(7, b(ye)),
+  X(8, b(vn)),
+  X(9, b(er)),
   X(10, xr(gr))
 ], et);
 let Nn = class extends cn {
@@ -1642,14 +1642,14 @@ let Nn = class extends cn {
           priority: pr.DATA_VALIDATION,
           // eslint-disable-next-line complexity
           handler: (e, t, r) => {
-            var y, g, f, m, I;
+            var y, g, _, m, C;
             const { row: n, col: o, unitId: i, subUnitId: a, workbook: l, worksheet: s } = t, c = this._sheetDataValidationModel.getRuleIdByLocation(i, a, n, o);
             if (!c)
               return r(e);
             const u = this._sheetDataValidationModel.getRuleById(i, a, c);
             if (!u)
               return r(e);
-            const h = (y = this._dataValidationCacheService.getValue(i, a, n, o)) != null ? y : je.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), S = s.getCellRaw(n, o), p = Q(S), b = `${p != null ? p : ""}`;
+            const h = (y = this._dataValidationCacheService.getValue(i, a, n, o)) != null ? y : je.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), f = s.getCellRaw(n, o), p = Q(f), M = `${p != null ? p : ""}`;
             return r({
               ...e,
               markers: {
@@ -1662,11 +1662,11 @@ let Nn = class extends cn {
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                isSkip: ((f = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : f.isSkip) || ((m = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : m.call(d, u, p, t))
+                isSkip: ((_ = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : _.isSkip) || ((m = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : m.call(d, u, p, t))
               },
               interceptorStyle: {
                 ...e == null ? void 0 : e.interceptorStyle,
-                ...d == null ? void 0 : d.getExtraStyle(u, b, {
+                ...d == null ? void 0 : d.getExtraStyle(u, M, {
                   get style() {
                     const w = l.getStyles();
                     return (typeof (e == null ? void 0 : e.s) == "string" ? w.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
@@ -1674,14 +1674,14 @@ let Nn = class extends cn {
                 }, n, o)
               },
               interceptorAutoHeight: () => {
-                var D, k, V, A, P, L;
-                const w = (k = (D = this._renderManagerService.getRenderById(i)) == null ? void 0 : D.with(yt).getSkeletonParam(a)) == null ? void 0 : k.skeleton;
+                var T, N, D, P, A, L;
+                const w = (N = (T = this._renderManagerService.getRenderById(i)) == null ? void 0 : T.with(yt).getSkeletonParam(a)) == null ? void 0 : N.skeleton;
                 if (!w)
                   return;
-                const C = w.worksheet.getMergedCell(n, o), R = {
+                const I = w.worksheet.getMergedCell(n, o), R = {
                   data: e,
                   style: w.getStyles().getStyleByCell(e),
-                  primaryWithCoord: w.getCellWithCoordByIndex((V = C == null ? void 0 : C.startRow) != null ? V : n, (A = C == null ? void 0 : C.startColumn) != null ? A : o),
+                  primaryWithCoord: w.getCellWithCoordByIndex((D = I == null ? void 0 : I.startRow) != null ? D : n, (P = I == null ? void 0 : I.startColumn) != null ? P : o),
                   unitId: i,
                   subUnitId: a,
                   row: n,
@@ -1689,9 +1689,9 @@ let Nn = class extends cn {
                   workbook: l,
                   worksheet: s
                 };
-                return (L = (P = d == null ? void 0 : d.canvasRender) == null ? void 0 : P.calcCellAutoHeight) == null ? void 0 : L.call(P, R);
+                return (L = (A = d == null ? void 0 : d.canvasRender) == null ? void 0 : A.calcCellAutoHeight) == null ? void 0 : L.call(A, R);
               },
-              coverable: ((I = e == null ? void 0 : e.coverable) != null ? I : !0) && !(u.type === G.LIST || u.type === G.LIST_MULTIPLE)
+              coverable: ((C = e == null ? void 0 : e.coverable) != null ? C : !0) && !(u.type === G.LIST || u.type === G.LIST_MULTIPLE)
             });
           }
         }
@@ -1717,11 +1717,11 @@ let Nn = class extends cn {
 Nn = Er([
   X(0, J),
   X(1, Ne),
-  X(2, M(mr)),
-  X(3, M(ye)),
-  X(4, M(vn)),
-  X(5, M(ee)),
-  X(6, M(er))
+  X(2, b(mr)),
+  X(3, b(ye)),
+  X(4, b(vn)),
+  X(5, b(ee)),
+  X(6, b(er))
 ], Nn);
 var yi = Object.getOwnPropertyDescriptor, Mi = (e, t, r, n) => {
   for (var o = n > 1 ? void 0 : n ? yi(t, r) : t, i = e.length - 1, a; i >= 0; i--)
@@ -1749,8 +1749,8 @@ let Et = class extends Re {
   }
 };
 Et = Mi([
-  Un(1, M(ee)),
-  Un(2, M(yt))
+  Un(1, b(ee)),
+  Un(2, b(yt))
 ], Et);
 function bi(e) {
   var c;
@@ -1765,13 +1765,13 @@ function bi(e) {
         onClick: () => l(!a),
         children: [
           t.t("dataValidation.panel.options"),
-          a ? /* @__PURE__ */ _(Ir, { className: "univer-ml-1 univer-text-[8px]" }) : /* @__PURE__ */ _(Cr, { className: "univer-ml-1 univer-text-[8px]" })
+          a ? /* @__PURE__ */ S(Ir, { className: "univer-ml-1 univer-text-[8px]" }) : /* @__PURE__ */ S(Cr, { className: "univer-ml-1 univer-text-[8px]" })
         ]
       }
     ),
     a && /* @__PURE__ */ z(Xe, { children: [
-      s ? /* @__PURE__ */ _(s, { value: n, onChange: o }) : null,
-      /* @__PURE__ */ _(
+      s ? /* @__PURE__ */ S(s, { value: n, onChange: o }) : null,
+      /* @__PURE__ */ S(
         K,
         {
           label: t.t("dataValidation.panel.invalid"),
@@ -1781,18 +1781,18 @@ function bi(e) {
               value: `${(c = n.errorStyle) != null ? c : lt.WARNING}`,
               onChange: (u) => o({ ...n, errorStyle: +u }),
               children: [
-                /* @__PURE__ */ _(Oe, { value: `${lt.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
-                /* @__PURE__ */ _(Oe, { value: `${lt.STOP}`, children: t.t("dataValidation.panel.rejectInput") })
+                /* @__PURE__ */ S(Oe, { value: `${lt.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
+                /* @__PURE__ */ S(Oe, { value: `${lt.STOP}`, children: t.t("dataValidation.panel.rejectInput") })
               ]
             }
           )
         }
       ),
-      /* @__PURE__ */ _(
+      /* @__PURE__ */ S(
         K,
         {
           label: t.t("dataValidation.panel.messageInfo"),
-          children: /* @__PURE__ */ _(
+          children: /* @__PURE__ */ S(
             Pt,
             {
               checked: n.showErrorMessage,
@@ -1805,7 +1805,7 @@ function bi(e) {
           )
         }
       ),
-      n.showErrorMessage ? /* @__PURE__ */ _(K, { children: /* @__PURE__ */ _(Ve, { value: n.error, onChange: (u) => o({ ...n, error: u }) }) }) : null
+      n.showErrorMessage ? /* @__PURE__ */ S(K, { children: /* @__PURE__ */ S(Ve, { value: n.error, onChange: (u) => o({ ...n, error: u }) }) }) : null
     ] })
   ] });
 }
@@ -1821,25 +1821,25 @@ function Di(e, t, r) {
   return t ? ((o = (n = e.getUnit(t)) == null ? void 0 : n.getSheetBySheetName(r)) == null ? void 0 : o.getSheetId()) || "" : ((a = (i = e.getCurrentUnitForType(W.UNIVER_SHEET)) == null ? void 0 : i.getSheetBySheetName(r)) == null ? void 0 : a.getSheetId()) || "";
 }
 function Vi() {
-  var T, B;
-  const [e, t] = H(0), r = U(_e), n = Te(r.activeRule$, r.activeRule), { unitId: o, subUnitId: i, rule: a } = n || {}, l = a.uid, s = U(ye), c = U(le), u = U(gn), h = U(J), d = U(mn), S = U(se), [p, b] = H(a), y = s.getValidatorItem(p.type), [g, f] = H(!1), m = s.getValidatorsByScope(uo.SHEET), [I, w] = H(() => p.ranges.map((v) => ({ unitId: "", sheetId: "", range: v }))), C = ct(() => Ei(h), [h]), [R, D] = H(!1), [k, V] = H(!1), A = ut(null), P = U(dr);
+  var O, B;
+  const [e, t] = H(0), r = U(_e), n = Te(r.activeRule$, r.activeRule), { unitId: o, subUnitId: i, rule: a } = n || {}, l = a.uid, s = U(ye), c = U(le), u = U(gn), h = U(J), d = U(mn), f = U(se), [p, M] = H(a), y = s.getValidatorItem(p.type), [g, _] = H(!1), m = s.getValidatorsByScope(uo.SHEET), [C, w] = H(() => p.ranges.map((v) => ({ unitId: "", sheetId: "", range: v }))), I = ct(() => Ei(h), [h]), [R, T] = H(!1), [N, D] = H(!1), P = ut(null), A = U(dr);
   if (Pe(() => () => {
-    const v = P.getCurrentLastSelection();
-    v && P.setSelections([v]);
-  }, [P]), Pe(() => {
+    const v = A.getCurrentLastSelection();
+    v && A.setSelections([v]);
+  }, [A]), Pe(() => {
     h.onCommandExecuted((v) => {
       (v.id === Hr.id || v.id === Wr.id) && setTimeout(() => {
-        const N = d.getRuleById(o, i, l);
-        t(($) => $ + 1), N && (b(N), w(N.ranges.map(($) => ({ unitId: "", sheetId: "", range: $ }))));
+        const k = d.getRuleById(o, i, l);
+        t(($) => $ + 1), k && (M(k), w(k.ranges.map(($) => ({ unitId: "", sheetId: "", range: $ }))));
       }, 20);
     });
   }, [h, d, l, i, o]), !y)
     return null;
-  const L = y.operators, O = y.operatorNames, F = p.operator ? ho.includes(p.operator) : !1, x = () => {
-    var v, N, $;
-    (N = (v = A.current) == null ? void 0 : v.editor) != null && N.isFocus() && j(($ = A.current) == null ? void 0 : $.getValue()), !(!p.ranges.length || R) && (y.validatorFormula(p, o, i).success ? r.setActiveRule(null) : f(!0));
+  const L = y.operators, V = y.operatorNames, F = p.operator ? ho.includes(p.operator) : !1, x = () => {
+    var v, k, $;
+    (k = (v = P.current) == null ? void 0 : v.editor) != null && k.isFocus() && j(($ = P.current) == null ? void 0 : $.getValue()), !(!p.ranges.length || R) && (y.validatorFormula(p, o, i).success ? r.setActiveRule(null) : _(!0));
   }, j = qt((v) => {
-    const N = v.split(",").filter(Boolean).map(Uo).map((q) => {
+    const k = v.split(",").filter(Boolean).map(Uo).map((q) => {
       const In = q.sheetName;
       if (In) {
         const Pr = Di(c, q.unitId, In);
@@ -1850,11 +1850,11 @@ function Vi() {
         sheetId: ""
       };
     });
-    if (jr(N, I))
+    if (jr(k, C))
       return;
-    w(N);
-    const $ = N.filter((q) => (!q.unitId || q.unitId === o) && (!q.sheetId || q.sheetId === i)).map((q) => q.range);
-    if (b({
+    w(k);
+    const $ = k.filter((q) => (!q.unitId || q.unitId === o) && (!q.sheetId || q.sheetId === i)).map((q) => q.range);
+    if (M({
       ...p,
       ranges: $
     }), $.length === 0)
@@ -1865,23 +1865,23 @@ function Vi() {
       ruleId: l,
       ranges: $
     };
-    C(Qn.id, Ce);
+    I(Qn.id, Ce);
   }), Z = (v) => {
     if (Rn(v, Vn(p)))
       return;
-    b({
+    M({
       ...p,
       ...v
     });
-    const N = {
+    const k = {
       unitId: o,
       subUnitId: i,
       ruleId: l,
       setting: v
     };
-    C(
+    I(
       yn.id,
-      N,
+      k,
       void 0
     );
   }, Y = async () => {
@@ -1897,10 +1897,10 @@ function Vi() {
     formula2: p.formula2,
     allowBlank: p.allowBlank
   }, ge = (v) => {
-    const N = s.getValidatorItem(v);
-    if (!N)
+    const k = s.getValidatorItem(v);
+    if (!k)
       return;
-    const $ = N.operators, Ce = d.getRuleById(o, i, l), q = v === (Ce == null ? void 0 : Ce.type) || v.includes("list") && (Ce != null && Ce.type.includes("list")) ? {
+    const $ = k.operators, Ce = d.getRuleById(o, i, l), q = v === (Ce == null ? void 0 : Ce.type) || v.includes("list") && (Ce != null && Ce.type.includes("list")) ? {
       ...Ce,
       type: v
     } : {
@@ -1910,17 +1910,17 @@ function Vi() {
       formula1: void 0,
       formula2: void 0
     };
-    b(q), h.executeCommand(yn.id, {
+    M(q), h.executeCommand(yn.id, {
       unitId: o,
       subUnitId: i,
       ruleId: p.uid,
       setting: Vn(q)
     });
-  }, ce = u.get(y.formulaInput), ne = ct(() => I.map((v) => fr(v.range)).join(","), []), de = Dn(p), Se = (v) => {
-    Rn(v, Dn(p)) || (b({
+  }, ce = u.get(y.formulaInput), ne = ct(() => C.map((v) => fr(v.range)).join(","), []), de = Dn(p), Se = (v) => {
+    Rn(v, Dn(p)) || (M({
       ...p,
       ...v
-    }), C(
+    }), I(
       qr.id,
       {
         unitId: o,
@@ -1931,44 +1931,44 @@ function Vi() {
     ));
   }, me = L.length && !p.operator;
   return /* @__PURE__ */ z("div", { className: "univer-py-4", children: [
-    /* @__PURE__ */ _(
+    /* @__PURE__ */ S(
       K,
       {
-        label: S.t("dataValidation.panel.range"),
-        error: !p.ranges.length || R ? S.t("dataValidation.panel.rangeError") : "",
-        children: /* @__PURE__ */ _(
+        label: f.t("dataValidation.panel.range"),
+        error: !p.ranges.length || R ? f.t("dataValidation.panel.rangeError") : "",
+        children: /* @__PURE__ */ S(
           co,
           {
-            selectorRef: A,
+            selectorRef: P,
             unitId: o,
             subUnitId: i,
             initialValue: ne,
-            onChange: (v, N) => {
+            onChange: (v, k) => {
               var $;
-              !k && (($ = A.current) != null && $.verify()) && j(N);
+              !N && (($ = P.current) != null && $.verify()) && j(k);
             },
-            onFocusChange: (v, N) => {
+            onFocusChange: (v, k) => {
               var $;
-              V(v), !v && N && (($ = A.current) != null && $.verify()) && j(N);
+              D(v), !v && k && (($ = P.current) != null && $.verify()) && j(k);
             },
-            onVerify: (v) => D(!v)
+            onVerify: (v) => T(!v)
           }
         )
       }
     ),
-    /* @__PURE__ */ _(K, { label: S.t("dataValidation.panel.type"), children: /* @__PURE__ */ _(
+    /* @__PURE__ */ S(K, { label: f.t("dataValidation.panel.type"), children: /* @__PURE__ */ S(
       bn,
       {
         className: "univer-w-full",
         value: p.type,
-        options: (T = m == null ? void 0 : m.sort((v, N) => v.order - N.order)) == null ? void 0 : T.map((v) => ({
-          label: S.t(v.title),
+        options: (O = m == null ? void 0 : m.sort((v, k) => v.order - k.order)) == null ? void 0 : O.map((v) => ({
+          label: f.t(v.title),
           value: v.id
         })),
         onChange: ge
       }
     ) }),
-    L != null && L.length ? /* @__PURE__ */ _(K, { label: S.t("dataValidation.panel.operator"), children: /* @__PURE__ */ _(
+    L != null && L.length ? /* @__PURE__ */ S(K, { label: f.t("dataValidation.panel.operator"), children: /* @__PURE__ */ S(
       bn,
       {
         className: "univer-w-full",
@@ -1976,11 +1976,11 @@ function Vi() {
         options: [
           {
             value: "",
-            label: S.t("dataValidation.operators.legal")
+            label: f.t("dataValidation.operators.legal")
           },
-          ...L.map((v, N) => ({
+          ...L.map((v, k) => ({
             value: `${v}`,
-            label: O[N]
+            label: V[k]
           }))
         ],
         onChange: (v) => {
@@ -1991,7 +1991,7 @@ function Vi() {
         }
       }
     ) }) : null,
-    ce && !me ? /* @__PURE__ */ _(K, { children: /* @__PURE__ */ _(
+    ce && !me ? /* @__PURE__ */ S(K, { children: /* @__PURE__ */ S(
       ce,
       {
         isTwoFormula: F,
@@ -2013,7 +2013,7 @@ function Vi() {
       },
       e + p.type
     ) }) : null,
-    /* @__PURE__ */ _(K, { children: /* @__PURE__ */ _(
+    /* @__PURE__ */ S(K, { children: /* @__PURE__ */ S(
       Pt,
       {
         checked: (B = p.allowBlank) != null ? B : !0,
@@ -2024,23 +2024,23 @@ function Vi() {
             allowBlank: !((v = p.allowBlank) == null || v)
           });
         },
-        children: S.t("dataValidation.panel.allowBlank")
+        children: f.t("dataValidation.panel.allowBlank")
       }
     ) }),
-    /* @__PURE__ */ _(bi, { value: de, onChange: Se, extraComponent: y.optionsInput }),
+    /* @__PURE__ */ S(bi, { value: de, onChange: Se, extraComponent: y.optionsInput }),
     /* @__PURE__ */ z("div", { className: "univer-mt-5 univer-flex univer-flex-row univer-justify-end", children: [
-      /* @__PURE__ */ _(ze, { className: "univer-ml-3", onClick: Y, children: S.t("dataValidation.panel.removeRule") }),
-      /* @__PURE__ */ _(ze, { className: "univer-ml-3", variant: "primary", onClick: x, children: S.t("dataValidation.panel.done") })
+      /* @__PURE__ */ S(ze, { className: "univer-ml-3", onClick: Y, children: f.t("dataValidation.panel.removeRule") }),
+      /* @__PURE__ */ S(ze, { className: "univer-ml-3", variant: "primary", onClick: x, children: f.t("dataValidation.panel.done") })
     ] })
   ] });
 }
 const Oi = (e) => {
-  const { rule: t, onClick: r, unitId: n, subUnitId: o, disable: i } = e, a = U(ye), l = U(J), s = U(No), c = a.getValidatorItem(t.type), u = ut(void 0), [h, d] = H(!1), S = U(Yn), p = Te(S.currentTheme$), b = ct(() => {
-    var m;
-    const g = (m = p == null ? void 0 : p.loopColor2) != null ? m : "#49B811", f = new Yr(g).toRgb();
+  const { rule: t, onClick: r, unitId: n, subUnitId: o, disable: i } = e, a = U(ye), l = U(J), s = U(No), c = a.getValidatorItem(t.type), u = ut(void 0), [h, d] = H(!1), f = U(Yn), p = Te(f.currentTheme$), M = ct(() => {
+    var w;
+    const g = f.getColorFromTheme("primary.600"), _ = f.getColorFromTheme("loop-color.2"), m = (w = f.getColorFromTheme(_)) != null ? w : g, C = new Yr(m).toRgb();
     return {
-      fill: `rgba(${f.r}, ${f.g}, ${f.b}, 0.1)`,
-      stroke: g
+      fill: `rgba(${C.r}, ${C.g}, ${C.b}, 0.1)`,
+      stroke: m
     };
   }, [p]), y = (g) => {
     l.executeCommand(tr.id, {
@@ -2051,8 +2051,8 @@ const Oi = (e) => {
   };
   return Pe(() => () => {
     var g;
-    u.current && ((g = u.current) == null || g.forEach((f) => {
-      f && s.removeShape(f);
+    u.current && ((g = u.current) == null || g.forEach((_) => {
+      _ && s.removeShape(_);
     }));
   }, [s]), /* @__PURE__ */ z(
     "div",
@@ -2072,18 +2072,18 @@ const Oi = (e) => {
       onMouseEnter: () => {
         i || (d(!0), u.current = t.ranges.map((g) => s.addShape({
           range: g,
-          style: b,
+          style: M,
           primary: null
         })));
       },
       onMouseLeave: () => {
         var g;
-        d(!1), (g = u.current) == null || g.forEach((f) => {
-          f && s.removeShape(f);
+        d(!1), (g = u.current) == null || g.forEach((_) => {
+          _ && s.removeShape(_);
         }), u.current = void 0;
       },
       children: [
-        /* @__PURE__ */ _(
+        /* @__PURE__ */ S(
           "div",
           {
             className: `
@@ -2093,7 +2093,7 @@ const Oi = (e) => {
             children: c == null ? void 0 : c.generateRuleName(t)
           }
         ),
-        /* @__PURE__ */ _(
+        /* @__PURE__ */ S(
           "div",
           {
             className: `
@@ -2102,7 +2102,7 @@ const Oi = (e) => {
             children: t.ranges.map((g) => fr(g)).join(",")
           }
         ),
-        h ? /* @__PURE__ */ _(
+        h ? /* @__PURE__ */ S(
           "div",
           {
             className: `
@@ -2111,7 +2111,7 @@ const Oi = (e) => {
                           hover:univer-bg-gray-200
                         `,
             onClick: y,
-            children: /* @__PURE__ */ _(_n, {})
+            children: /* @__PURE__ */ S(_n, {})
           }
         ) : null
       ]
@@ -2122,57 +2122,57 @@ function Ti(e) {
   const t = U(ee), r = U(le), n = U(J), o = U(we), i = U(_e), a = U(se), [l, s] = H([]), { workbook: c } = e, u = Te(c.activeSheet$, void 0, !0), h = c.getUnitId(), d = u == null ? void 0 : u.getSheetId();
   Pe(() => {
     s(t.getRules(h, d));
-    const f = t.ruleChange$.subscribe((m) => {
+    const _ = t.ruleChange$.subscribe((m) => {
       m.unitId === h && m.subUnitId === d && s(t.getRules(h, d));
     });
     return () => {
-      f.unsubscribe();
+      _.unsubscribe();
     };
   }, [h, d, t]);
-  const S = async () => {
-    const f = qn(o), m = {
+  const f = async () => {
+    const _ = qn(o), m = {
       unitId: h,
       subUnitId: d,
-      rule: f
+      rule: _
     };
     await n.executeCommand(un.id, m), i.setActiveRule({
       unitId: h,
       subUnitId: d,
-      rule: f
+      rule: _
     });
   }, p = () => {
     n.executeCommand(Jr.id, {
       unitId: h,
       subUnitId: d
     });
-  }, y = ((f) => {
-    const m = r.getCurrentUnitForType(W.UNIVER_SHEET), I = m.getActiveSheet(), w = m.getUnitId(), C = I.getSheetId();
-    return f.map((D) => bo(o, w, C, D.ranges) ? { ...D } : { ...D, disable: !0 });
-  })(l), g = y == null ? void 0 : y.some((f) => f.disable);
+  }, y = ((_) => {
+    const m = r.getCurrentUnitForType(W.UNIVER_SHEET), C = m.getActiveSheet(), w = m.getUnitId(), I = C.getSheetId();
+    return _.map((T) => bo(o, w, I, T.ranges) ? { ...T } : { ...T, disable: !0 });
+  })(l), g = y == null ? void 0 : y.some((_) => _.disable);
   return /* @__PURE__ */ z("div", { className: "univer-pb-4", children: [
-    y == null ? void 0 : y.map((f) => {
+    y == null ? void 0 : y.map((_) => {
       var m;
-      return /* @__PURE__ */ _(
+      return /* @__PURE__ */ S(
         Oi,
         {
           unitId: h,
           subUnitId: d,
           onClick: () => {
-            f.disable || i.setActiveRule({
+            _.disable || i.setActiveRule({
               unitId: h,
               subUnitId: d,
-              rule: f
+              rule: _
             });
           },
-          rule: f,
-          disable: (m = f.disable) != null ? m : !1
+          rule: _,
+          disable: (m = _.disable) != null ? m : !1
         },
-        f.uid
+        _.uid
       );
     }),
     /* @__PURE__ */ z("div", { className: "univer-mt-4 univer-flex univer-flex-row univer-justify-end univer-gap-2", children: [
-      l.length && !g ? /* @__PURE__ */ _(ze, { onClick: p, children: a.t("dataValidation.panel.removeAll") }) : null,
-      /* @__PURE__ */ _(ze, { variant: "primary", onClick: S, children: a.t("dataValidation.panel.add") })
+      l.length && !g ? /* @__PURE__ */ S(ze, { onClick: p, children: a.t("dataValidation.panel.removeAll") }) : null,
+      /* @__PURE__ */ S(ze, { variant: "primary", onClick: f, children: a.t("dataValidation.panel.add") })
     ] })
   ] });
 }
@@ -2186,15 +2186,15 @@ const Pi = () => {
     var i;
     return (i = n == null ? void 0 : n.activeSheet$) != null ? i : mo(null);
   }, void 0, void 0, []);
-  return !n || !o ? null : t && t.subUnitId === o.getSheetId() ? /* @__PURE__ */ _(Vi, {}, t.rule.uid) : /* @__PURE__ */ _(Ti, { workbook: n });
+  return !n || !o ? null : t && t.subUnitId === o.getSheetId() ? /* @__PURE__ */ S(Vi, {}, t.rule.uid) : /* @__PURE__ */ S(Ti, { workbook: n });
 }, Ai = "LIST_RENDER_MODE_OPTION_INPUT";
 function Dt(e) {
   var o;
   const { value: t, onChange: r } = e, n = U(se);
-  return /* @__PURE__ */ _(K, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ z(hn, { value: `${(o = t.renderMode) != null ? o : oe.CUSTOM}`, onChange: (i) => r({ ...t, renderMode: +i }), children: [
-    /* @__PURE__ */ _(Oe, { value: `${oe.CUSTOM}`, children: n.t("dataValidation.renderMode.chip") }),
-    /* @__PURE__ */ _(Oe, { value: `${oe.ARROW}`, children: n.t("dataValidation.renderMode.arrow") }),
-    /* @__PURE__ */ _(Oe, { value: `${oe.TEXT}`, children: n.t("dataValidation.renderMode.text") })
+  return /* @__PURE__ */ S(K, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ z(hn, { value: `${(o = t.renderMode) != null ? o : oe.CUSTOM}`, onChange: (i) => r({ ...t, renderMode: +i }), children: [
+    /* @__PURE__ */ S(Oe, { value: `${oe.CUSTOM}`, children: n.t("dataValidation.renderMode.chip") }),
+    /* @__PURE__ */ S(Oe, { value: `${oe.ARROW}`, children: n.t("dataValidation.renderMode.arrow") }),
+    /* @__PURE__ */ S(Oe, { value: `${oe.TEXT}`, children: n.t("dataValidation.renderMode.text") })
   ] }) });
 }
 Dt.componentKey = Ai;
@@ -2202,7 +2202,7 @@ const Li = "DATE_SHOW_TIME_OPTION";
 function Vt(e) {
   var o;
   const { value: t, onChange: r } = e, n = U(se);
-  return /* @__PURE__ */ _(K, { children: /* @__PURE__ */ _(
+  return /* @__PURE__ */ S(K, { children: /* @__PURE__ */ S(
     Pt,
     {
       checked: (o = t.bizInfo) == null ? void 0 : o.showTime,
@@ -2274,28 +2274,25 @@ let rn = class {
     return ((r = t == null ? void 0 : t.fs) != null ? r : 10) * 1.6;
   }
   async _parseFormula(e, t, r) {
-    var c, u, h, d, S, p, b, y, g;
-    const { formula1: n = to, formula2: o = eo } = e, i = await this._formulaService.getRuleFormulaResult(t, r, e.uid), a = Nt((h = (u = (c = i == null ? void 0 : i[0]) == null ? void 0 : c.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), l = Nt((p = (S = (d = i == null ? void 0 : i[1]) == null ? void 0 : d.result) == null ? void 0 : S[0]) == null ? void 0 : p[0]), s = Mn(String(a)) && Mn(String(l));
+    var c, u, h, d, f, p, M, y, g;
+    const { formula1: n = to, formula2: o = eo } = e, i = await this._formulaService.getRuleFormulaResult(t, r, e.uid), a = Nt((h = (u = (c = i == null ? void 0 : i[0]) == null ? void 0 : c.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), l = Nt((p = (f = (d = i == null ? void 0 : i[1]) == null ? void 0 : d.result) == null ? void 0 : f[0]) == null ? void 0 : p[0]), s = Mn(String(a)) && Mn(String(l));
     return {
-      formula1: De(n) ? Nt((g = (y = (b = i == null ? void 0 : i[0]) == null ? void 0 : b.result) == null ? void 0 : y[0]) == null ? void 0 : g[0]) : n,
+      formula1: De(n) ? Nt((g = (y = (M = i == null ? void 0 : i[0]) == null ? void 0 : M.result) == null ? void 0 : y[0]) == null ? void 0 : g[0]) : n,
       formula2: De(o) ? l : o,
       isFormulaValid: s
     };
   }
   drawWith(e, t) {
-    var P, L, O, F;
+    var P, A, L, V;
     const { style: r, primaryWithCoord: n, unitId: o, subUnitId: i, worksheet: a, row: l, col: s } = t, c = n.isMergedMainCell ? n.mergeInfo : n, u = Q(a.getCellRaw(l, s)), h = this._dataValidationModel.getRuleByLocation(o, i, l, s);
     if (!h)
       return;
     const d = this._dataValidationModel.getValidator(h.type);
-    if (!d)
-      return;
-    const S = this._themeService.getCurrentTheme();
-    if (!((P = d.skipDefaultFontRender) != null && P.call(d, h, u, { unitId: o, subUnitId: i, row: l, column: s })))
+    if (!d || !((P = d.skipDefaultFontRender) != null && P.call(d, h, u, { unitId: o, subUnitId: i, row: l, column: s })))
       return;
-    const p = d.parseFormulaSync(h, o, i), { formula1: b } = p, y = this._calc(c, r), { a: g, d: f } = e.getTransform(), m = Tn(y.left, g), I = Tn(y.top, f), w = fo.create().composeMatrix({
-      left: m,
-      top: I,
+    const f = d.parseFormulaSync(h, o, i), { formula1: p } = f, M = this._calc(c, r), { a: y, d: g } = e.getTransform(), _ = Tn(M.left, y), m = Tn(M.top, g), C = fo.create().composeMatrix({
+      left: _,
+      top: m,
       scaleX: 1,
       scaleY: 1,
       angle: 0,
@@ -2303,16 +2300,16 @@ let rn = class {
       skewY: 0,
       flipX: !1,
       flipY: !1
-    }), C = c.endX - c.startX, R = c.endY - c.startY;
-    e.save(), e.beginPath(), e.rect(c.startX, c.startY, C, R), e.clip();
-    const D = w.getMatrix();
-    e.transform(D[0], D[1], D[2], D[3], D[4], D[5]);
-    const k = ((L = r == null ? void 0 : r.fs) != null ? L : 10) * 1.6, V = String(u) === String(b), A = S.hyacinth500;
+    }), w = c.endX - c.startX, I = c.endY - c.startY;
+    e.save(), e.beginPath(), e.rect(c.startX, c.startY, w, I), e.clip();
+    const R = C.getMatrix();
+    e.transform(R[0], R[1], R[2], R[3], R[4], R[5]);
+    const T = ((A = r == null ? void 0 : r.fs) != null ? A : 10) * 1.6, N = String(u) === String(p), D = this._themeService.getColorFromTheme("primary.600");
     vo.drawWith(e, {
-      checked: V,
-      width: k,
-      height: k,
-      fill: (F = (O = r == null ? void 0 : r.cl) == null ? void 0 : O.rgb) != null ? F : A
+      checked: N,
+      width: T,
+      height: T,
+      fill: (V = (L = r == null ? void 0 : r.cl) == null ? void 0 : L.rgb) != null ? V : D
     }), e.restore();
   }
   isHit(e, t) {
@@ -2329,7 +2326,7 @@ let rn = class {
     const u = this._dataValidationModel.getValidator(c.type);
     if (!u || !((p = u.skipDefaultFontRender) != null && p.call(u, c, s, { unitId: n, subUnitId: o, row: a, column: l })))
       return;
-    const { formula1: h, formula2: d } = await this._parseFormula(c, n, o), S = {
+    const { formula1: h, formula2: d } = await this._parseFormula(c, n, o), f = {
       range: {
         startColumn: r.actualColumn,
         endColumn: r.actualColumn,
@@ -2343,7 +2340,7 @@ let rn = class {
     };
     this._commandService.executeCommand(
       st.id,
-      S
+      f
     );
   }
   onPointerEnter(e, t) {
@@ -2358,10 +2355,10 @@ let rn = class {
 rn = Ni([
   Be(0, J),
   Be(1, le),
-  Be(2, M(Qr)),
-  Be(3, M(Yn)),
-  Be(4, M(Ne)),
-  Be(5, M(ee))
+  Be(2, b(Qr)),
+  Be(3, b(Yn)),
+  Be(4, b(Ne)),
+  Be(5, b(ee))
 ], rn);
 class Ui extends ve {
   constructor() {
@@ -2412,10 +2409,10 @@ function Wt(e, t, r, n) {
   let s;
   const c = [];
   l.forEach((d) => {
-    const { layout: S } = d, { width: p, height: b } = S;
+    const { layout: f } = d, { width: p, height: M } = f;
     !s || s.width + p + Ht > i ? (s = {
       width: p,
-      height: b,
+      height: M,
       items: [{
         ...d,
         left: 0
@@ -2426,8 +2423,8 @@ function Wt(e, t, r, n) {
     }), s.width = s.width + p + Ht);
   });
   let u = 0, h = 0;
-  return c.forEach((d, S) => {
-    h = Math.max(h, d.width), S === c.length - 1 ? u += d.height : u += d.height + Or;
+  return c.forEach((d, f) => {
+    h = Math.max(h, d.width), f === c.length - 1 ? u += d.height : u += d.height + Or;
   }), {
     lines: c,
     totalHeight: u,
@@ -2484,21 +2481,21 @@ let an = class {
   // eslint-disable-next-line max-lines-per-function
   drawWith(e, t, r, n) {
     var Z, Y;
-    const { primaryWithCoord: o, row: i, col: a, style: l, data: s, subUnitId: c } = t, u = o.isMergedMainCell ? o.mergeInfo : o, h = s == null ? void 0 : s.fontRenderExtension, { leftOffset: d = 0, rightOffset: S = 0, topOffset: p = 0, downOffset: b = 0 } = h || {}, y = this._ensureMap(c), g = this._generateKey(i, a), f = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, i, a);
-    if (!f)
+    const { primaryWithCoord: o, row: i, col: a, style: l, data: s, subUnitId: c } = t, u = o.isMergedMainCell ? o.mergeInfo : o, h = s == null ? void 0 : s.fontRenderExtension, { leftOffset: d = 0, rightOffset: f = 0, topOffset: p = 0, downOffset: M = 0 } = h || {}, y = this._ensureMap(c), g = this._generateKey(i, a), _ = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, i, a);
+    if (!_)
       return;
-    const m = this._dataValidationModel.getValidator(f.type);
+    const m = this._dataValidationModel.getValidator(_.type);
     if (!m)
       return;
-    const I = {
+    const C = {
       startX: u.startX + d,
-      endX: u.endX - S,
+      endX: u.endX - f,
       startY: u.startY + p,
-      endY: u.endY - b
-    }, w = I.endX - I.startX, C = I.endY - I.startY, { cl: R } = l || {}, D = (Z = typeof R == "object" ? R == null ? void 0 : R.rgb : R) != null ? Z : "#000", k = Ut(l != null ? l : void 0), { vt: V, ht: A } = l || {}, P = V != null ? V : ae.MIDDLE, L = (Y = Q(s)) != null ? Y : "", O = m.parseCellValue(L), F = m.getListWithColorMap(f), x = Wt(O, k, w, C);
-    this._drawDownIcon(e, I, w, C, P), e.save(), e.translateWithPrecision(I.startX, I.startY), e.beginPath(), e.rect(0, 0, w - Ee, C), e.clip(), e.translateWithPrecision(on, Ot);
+      endY: u.endY - M
+    }, w = C.endX - C.startX, I = C.endY - C.startY, { cl: R } = l || {}, T = (Z = typeof R == "object" ? R == null ? void 0 : R.rgb : R) != null ? Z : "#000", N = Ut(l != null ? l : void 0), { vt: D, ht: P } = l || {}, A = D != null ? D : ae.MIDDLE, L = (Y = Q(s)) != null ? Y : "", V = m.parseCellValue(L), F = m.getListWithColorMap(_), x = Wt(V, N, w, I);
+    this._drawDownIcon(e, C, w, I, A), e.save(), e.translateWithPrecision(C.startX, C.startY), e.beginPath(), e.rect(0, 0, w - Ee, I), e.clip(), e.translateWithPrecision(on, Ot);
     let j = 0;
-    switch (P) {
+    switch (A) {
       case ae.MIDDLE:
         j = (x.contentHeight - x.totalHeight) / 2;
         break;
@@ -2510,7 +2507,7 @@ let an = class {
       e.save();
       const { width: ce, height: ne, items: de } = te;
       let Se = 0;
-      switch (A) {
+      switch (P) {
         case Ye.RIGHT:
           Se = x.contentWidth - ce;
           break;
@@ -2520,15 +2517,15 @@ let an = class {
       }
       e.translate(Se, ge * (ne + Or)), de.forEach((me) => {
         e.save(), e.translateWithPrecision(me.left, 0), Yi.drawWith(e, {
-          ...k,
+          ...N,
           info: me,
-          color: D,
+          color: T,
           fill: F[me.text]
         }), e.restore();
       }), e.restore();
     }), e.restore(), y.set(g, {
-      left: I.startX,
-      top: I.startY,
+      left: C.startX,
+      top: C.startY,
       width: x.contentWidth + on + Ee,
       height: x.contentHeight + Ot * 2
     });
@@ -2540,14 +2537,14 @@ let an = class {
       endX: h.endX - s,
       startY: h.startY + c,
       endY: h.endY - u
-    }, S = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
-    if (!S)
+    }, f = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
+    if (!f)
       return;
-    const p = this._dataValidationModel.getValidator(S.type);
+    const p = this._dataValidationModel.getValidator(f.type);
     if (!p)
       return;
-    const b = d.endX - d.startX, y = d.endY - d.startY, g = (w = Q(n)) != null ? w : "", f = p.parseCellValue(g), m = Ut(r != null ? r : void 0);
-    return Wt(f, m, b, y).cellAutoHeight;
+    const M = d.endX - d.startX, y = d.endY - d.startY, g = (w = Q(n)) != null ? w : "", _ = p.parseCellValue(g), m = Ut(r != null ? r : void 0);
+    return Wt(_, m, M, y).cellAutoHeight;
   }
   calcCellAutoWidth(e) {
     var w;
@@ -2556,14 +2553,14 @@ let an = class {
       endX: h.endX - s,
       startY: h.startY + c,
       endY: h.endY - u
-    }, S = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
-    if (!S)
+    }, f = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
+    if (!f)
       return;
-    const p = this._dataValidationModel.getValidator(S.type);
+    const p = this._dataValidationModel.getValidator(f.type);
     if (!p)
       return;
-    const b = d.endX - d.startX, y = d.endY - d.startY, g = (w = Q(n)) != null ? w : "", f = p.parseCellValue(g), m = Ut(r != null ? r : void 0);
-    return Wt(f, m, b, y).calcAutoWidth;
+    const M = d.endX - d.startX, y = d.endY - d.startY, g = (w = Q(n)) != null ? w : "", _ = p.parseCellValue(g), m = Ut(r != null ? r : void 0);
+    return Wt(_, m, M, y).calcAutoWidth;
   }
   isHit(e, t) {
     const { primaryWithCoord: r } = t, n = r.isMergedMainCell ? r.mergeInfo : r, { endX: o } = n, { x: i } = e;
@@ -2592,8 +2589,8 @@ let an = class {
 an = zi([
   vt(0, J),
   vt(1, le),
-  vt(2, M(Ne)),
-  vt(3, M(ee))
+  vt(2, b(Ne)),
+  vt(3, b(ee))
 ], an);
 class Gi extends ve {
   constructor() {
@@ -2739,39 +2736,39 @@ let sn = class {
     const h = this._dataValidationModel.getValidator(u.type);
     if (!h)
       return;
-    const d = l == null ? void 0 : l.fontRenderExtension, { leftOffset: S = 0, rightOffset: p = 0, topOffset: b = 0, downOffset: y = 0 } = d || {};
+    const d = l == null ? void 0 : l.fontRenderExtension, { leftOffset: f = 0, rightOffset: p = 0, topOffset: M = 0, downOffset: y = 0 } = d || {};
     if (!u || !h || !h || h.id.indexOf(G.LIST) !== 0 || !h.skipDefaultFontRender(u))
       return;
     const g = {
-      startX: c.startX + S,
+      startX: c.startX + f,
       endX: c.endX - p,
-      startY: c.startY + b,
+      startY: c.startY + M,
       endY: c.endY - y
-    }, f = g.endX - g.startX, m = g.endY - g.startY, I = this._ensureMap(s), w = this._generateKey(o, i), C = h.getListWithColor(u), R = Q(l), D = `${R != null ? R : ""}`, k = C.find((O) => O.label === D);
-    let { tb: V, vt: A, ht: P, pd: L } = a || {};
-    if (V = V != null ? V : Ie.WRAP, A = A != null ? A : ae.BOTTOM, P = P != null ? P : re.ht, L = L != null ? L : re.pd, u.renderMode === oe.ARROW) {
-      const { l: O = re.pd.l, t: F = re.pd.t, r: x = re.pd.r, b: j = re.pd.b } = L, Z = f - O - x - he - 4, { documentSkeleton: Y, documents: te, docModel: ge } = St(D, this._localeService, a);
-      V === Ie.WRAP && ge.updateDocumentDataPageSize(Math.max(Z, 1)), Y.calculate(), Y.getActualSize();
-      const ce = ot(Y), { height: ne, width: de } = ce, { paddingTop: Se, paddingLeft: me } = xn(Z, m - F - j, de, ne, A, P, !0);
-      this._drawDownIcon(e, g, f, m, ne, A, L), e.save(), e.translateWithPrecision(g.startX + O, g.startY + F), e.beginPath(), e.rect(0, 0, f - O - x, m - F - j), e.clip(), e.translateWithPrecision(0, Se), e.save(), e.translateWithPrecision(be, 0), e.beginPath(), e.rect(0, 0, Z, ne), e.clip(), te.render(e), e.translateWithPrecision(me, 0), e.restore(), e.restore(), I.set(w, {
-        left: g.endX + O + r.rowHeaderWidth - he,
+    }, _ = g.endX - g.startX, m = g.endY - g.startY, C = this._ensureMap(s), w = this._generateKey(o, i), I = h.getListWithColor(u), R = Q(l), T = `${R != null ? R : ""}`, N = I.find((V) => V.label === T);
+    let { tb: D, vt: P, ht: A, pd: L } = a || {};
+    if (D = D != null ? D : Ie.WRAP, P = P != null ? P : ae.BOTTOM, A = A != null ? A : re.ht, L = L != null ? L : re.pd, u.renderMode === oe.ARROW) {
+      const { l: V = re.pd.l, t: F = re.pd.t, r: x = re.pd.r, b: j = re.pd.b } = L, Z = _ - V - x - he - 4, { documentSkeleton: Y, documents: te, docModel: ge } = St(T, this._localeService, a);
+      D === Ie.WRAP && ge.updateDocumentDataPageSize(Math.max(Z, 1)), Y.calculate(), Y.getActualSize();
+      const ce = ot(Y), { height: ne, width: de } = ce, { paddingTop: Se, paddingLeft: me } = xn(Z, m - F - j, de, ne, P, A, !0);
+      this._drawDownIcon(e, g, _, m, ne, P, L), e.save(), e.translateWithPrecision(g.startX + V, g.startY + F), e.beginPath(), e.rect(0, 0, _ - V - x, m - F - j), e.clip(), e.translateWithPrecision(0, Se), e.save(), e.translateWithPrecision(be, 0), e.beginPath(), e.rect(0, 0, Z, ne), e.clip(), te.render(e), e.translateWithPrecision(me, 0), e.restore(), e.restore(), C.set(w, {
+        left: g.endX + V + r.rowHeaderWidth - he,
         top: g.startY + F + r.columnHeaderHeight,
         width: he,
         height: m - F - j
       });
     } else {
-      e.save(), e.translateWithPrecision(g.startX, g.startY), e.beginPath(), e.rect(0, 0, f, m), e.clip();
-      const O = f - fe * 2 - be - he - 4, { documentSkeleton: F, documents: x, docModel: j } = St(D, this._localeService, a);
-      V === Ie.WRAP && j.updateDocumentDataPageSize(Math.max(O, 1)), F.calculate();
-      const Z = ot(F), { height: Y, width: te } = Z, { paddingTop: ge, paddingLeft: ce } = xn(O, m, te, Y, A, P);
+      e.save(), e.translateWithPrecision(g.startX, g.startY), e.beginPath(), e.rect(0, 0, _, m), e.clip();
+      const V = _ - fe * 2 - be - he - 4, { documentSkeleton: F, documents: x, docModel: j } = St(T, this._localeService, a);
+      D === Ie.WRAP && j.updateDocumentDataPageSize(Math.max(V, 1)), F.calculate();
+      const Z = ot(F), { height: Y, width: te } = Z, { paddingTop: ge, paddingLeft: ce } = xn(V, m, te, Y, P, A);
       e.translateWithPrecision(fe, ge);
-      const ne = Math.max(f - fe * 2, 1), de = Y;
+      const ne = Math.max(_ - fe * 2, 1), de = Y;
       cr.drawWith(e, {
         width: ne,
         height: de,
-        fill: (k == null ? void 0 : k.color) || He,
+        fill: (N == null ? void 0 : N.color) || He,
         radius: jt
-      }), e.save(), e.translateWithPrecision(be, 0), e.beginPath(), e.rect(0, 0, O, Y), e.clip(), e.translateWithPrecision(ce, 0), x.render(e), e.restore(), e.translateWithPrecision(O + be + 4, (Y - _t) / 2), e.fillStyle = Ji, e.fill(Fn), e.restore(), I.set(w, {
+      }), e.save(), e.translateWithPrecision(be, 0), e.beginPath(), e.rect(0, 0, V, Y), e.clip(), e.translateWithPrecision(ce, 0), x.render(e), e.restore(), e.translateWithPrecision(V + be + 4, (Y - _t) / 2), e.fillStyle = Ji, e.fill(Fn), e.restore(), C.set(w, {
         left: g.startX + fe + r.rowHeaderWidth,
         top: g.startY + ge + r.columnHeaderHeight,
         width: ne,
@@ -2783,62 +2780,62 @@ let sn = class {
     const { primaryWithCoord: t, style: r, data: n, row: o, col: i } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, d = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
     if (!d || d.renderMode === oe.TEXT)
       return;
-    const S = {
+    const f = {
       startX: a.startX + s,
       endX: a.endX - c,
       startY: a.startY + u,
       endY: a.endY - h
-    }, p = S.endX - S.startX, b = Q(n), y = `${b != null ? b : ""}`;
-    let { tb: g, pd: f } = r || {};
-    const { t: m = re.pd.t, b: I = re.pd.b } = f != null ? f : {};
+    }, p = f.endX - f.startX, M = Q(n), y = `${M != null ? M : ""}`;
+    let { tb: g, pd: _ } = r || {};
+    const { t: m = re.pd.t, b: C = re.pd.b } = _ != null ? _ : {};
     if (g = g != null ? g : Ie.WRAP, d.renderMode === oe.ARROW) {
-      const w = p - he, { documentSkeleton: C, docModel: R } = St(y, this._localeService, r);
-      g === Ie.WRAP && R.updateDocumentDataPageSize(Math.max(w, 1)), C.calculate(), C.getActualSize();
-      const D = ot(C), { height: k } = D;
-      return k + m + I + We * 2;
+      const w = p - he, { documentSkeleton: I, docModel: R } = St(y, this._localeService, r);
+      g === Ie.WRAP && R.updateDocumentDataPageSize(Math.max(w, 1)), I.calculate(), I.getActualSize();
+      const T = ot(I), { height: N } = T;
+      return N + m + C + We * 2;
     } else {
-      const w = p - fe * 2 - be - he, { documentSkeleton: C, docModel: R } = Tr(y, this._localeService, r);
-      g === Ie.WRAP && R.updateDocumentDataPageSize(Math.max(w, 1)), C.calculate();
-      const D = ot(C), {
-        height: k
-      } = D;
-      return k + We * 2;
+      const w = p - fe * 2 - be - he, { documentSkeleton: I, docModel: R } = Tr(y, this._localeService, r);
+      g === Ie.WRAP && R.updateDocumentDataPageSize(Math.max(w, 1)), I.calculate();
+      const T = ot(I), {
+        height: N
+      } = T;
+      return N + We * 2;
     }
   }
   calcCellAutoWidth(e) {
     const { primaryWithCoord: t, style: r, data: n, row: o, col: i } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, d = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
     if (!d || d.renderMode === oe.TEXT)
       return;
-    const S = {
+    const f = {
       startX: a.startX + s,
       endX: a.endX - c,
       startY: a.startY + u,
       endY: a.endY - h
-    }, p = S.endX - S.startX, b = Q(n), y = `${b != null ? b : ""}`;
-    let { tb: g, pd: f } = r || {};
-    const { l: m = re.pd.l, r: I = re.pd.r } = f != null ? f : {};
+    }, p = f.endX - f.startX, M = Q(n), y = `${M != null ? M : ""}`;
+    let { tb: g, pd: _ } = r || {};
+    const { l: m = re.pd.l, r: C = re.pd.r } = _ != null ? _ : {};
     g = g != null ? g : Ie.WRAP;
     let w = fe * 2 + he;
     switch (d.renderMode) {
       case oe.ARROW:
-        w = he + fe * 2 + I + m;
+        w = he + fe * 2 + C + m;
         break;
       case oe.CUSTOM:
-        w = he + fe * 2 + be * 2 + I + m + jt / 2 + 1;
+        w = he + fe * 2 + be * 2 + C + m + jt / 2 + 1;
         break;
       // default is CUSTOM
       default:
-        w = he + fe * 2 + be * 2 + I + m + jt / 2 + 1;
+        w = he + fe * 2 + be * 2 + C + m + jt / 2 + 1;
     }
-    const C = p - w, { documentSkeleton: R, docModel: D } = St(y, this._localeService, r);
-    return g === Ie.WRAP && D.updateDocumentDataPageSize(Math.max(C, 1)), R.calculate(), R.getActualSize(), ot(R).width + w;
+    const I = p - w, { documentSkeleton: R, docModel: T } = St(y, this._localeService, r);
+    return g === Ie.WRAP && T.updateDocumentDataPageSize(Math.max(I, 1)), R.calculate(), R.getActualSize(), ot(R).width + w;
   }
   isHit(e, t) {
     const { subUnitId: r, row: n, col: o } = t, a = this._ensureMap(r).get(this._generateKey(n, o)), l = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, n, o);
     if (!l || !a || l.renderMode === oe.TEXT)
       return !1;
-    const { top: s, left: c, width: u, height: h } = a, { x: d, y: S } = e;
-    return d >= c && d <= c + u && S >= s && S <= s + h;
+    const { top: s, left: c, width: u, height: h } = a, { x: d, y: f } = e;
+    return d >= c && d <= c + u && f >= s && f <= s + h;
   }
   onPointerDown(e, t) {
     if (t.button === 2)
@@ -2862,10 +2859,10 @@ let sn = class {
 };
 sn = qi([
   at(0, le),
-  at(1, M(se)),
+  at(1, b(se)),
   at(2, J),
-  at(3, M(Ne)),
-  at(4, M(ee))
+  at(3, b(Ne)),
+  at(4, b(ee))
 ], sn);
 class ea extends ve {
   constructor() {
@@ -2931,9 +2928,9 @@ let tt = class extends cn {
   }
 };
 tt = oa([
-  Yt(0, M(we)),
-  Yt(1, M(gn)),
-  Yt(2, M(ye))
+  Yt(0, b(we)),
+  Yt(1, b(gn)),
+  Yt(2, b(ye))
 ], tt);
 var ia = Object.getOwnPropertyDescriptor, aa = (e, t, r, n) => {
   for (var o = n > 1 ? void 0 : n ? ia(t, r) : t, i = e.length - 1, a; i >= 0; i--)
@@ -2990,7 +2987,7 @@ let $n = (Ct = class extends Xn {
   }
 }, E(Ct, "pluginName", sa), E(Ct, "type", W.UNIVER_SHEET), Ct);
 $n = aa([
-  Xt(1, M(we)),
+  Xt(1, b(we)),
   Xt(2, J),
   Xt(3, ln)
 ], $n);
@@ -3048,7 +3045,7 @@ let Bn = (It = class extends Xn {
   }
 }, E(It, "pluginName", da), E(It, "type", W.UNIVER_SHEET), It);
 Bn = ca([
-  zt(1, M(we)),
+  zt(1, b(we)),
   zt(2, J),
   zt(3, ln)
 ], Bn);