@univerjs/sheets-data-validation-ui 0.8.0-nightly.202506041607 → 0.8.0

package/lib/index.js

@@ -1,20 +1,20 @@
 var Tr = Object.defineProperty;
 var Pr = (e, t, r) => t in e ? Tr(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
-var V = (e, t, r) => Pr(e, typeof t != "symbol" ? t + "" : t, r);
+var D = (e, t, r) => Pr(e, typeof t != "symbol" ? t + "" : t, r);
 import { LocaleService as ce, isFormulaString as Oe, DataValidationType as j, Tools as In, Inject as M, Injector as ye, Disposable as be, UniverInstanceType as X, toDisposable as Ar, IUniverInstanceService as ue, DataValidationErrorStyle as lt, DataValidationStatus as Ze, ICommandService as te, IConfigService as sn, DataValidationRenderMode as se, DisposableCollection as Lr, dayjs as Rn, numfmt as jn, CellValueType as kr, CommandType as rt, ObjectMatrix as Rt, Range as Nr, Rectangle as yt, queryObjectMatrix as Kt, Optional as Ur, RxDisposable as ln, InterceptorEffectEnum as Yn, sequenceExecute as Xn, bufferDebounceTime as Fr, debounce as xr, UndoCommand as Br, RedoCommand as Wr, isUnitRangesEqual as Hr, shallowEqual as yn, ThemeService as Zn, ColorKit as $r, VerticalAlign as de, HorizontalAlign as Re, DEFAULT_STYLES as ae, WrapStrategy as me, Plugin as Kn, merge as zn } from "@univerjs/core";
 import { DataValidationFormulaController as jr, deserializeListOptions as Yr, serializeListOptions as Gn, CUSTOM_FORMULA_INPUT_NAME as qn, BASE_FORMULA_INPUT_NAME as Pt, LIST_FORMULA_INPUT_NAME as dn, CHECKBOX_FORMULA_INPUT_NAME as Jn, SheetDataValidationModel as ie, SheetsDataValidationValidatorService as Xr, getDataValidationCellValue as Nt, getCellValueOrigin as re, createDefaultNewRule as Qn, AddSheetDataValidationCommand as cn, DATA_VALIDATION_PLUGIN_NAME as er, getDataValidationDiffMutations as zt, UpdateSheetDataValidationRangeCommand as tr, DataValidationCacheService as nr, UpdateSheetDataValidationSettingCommand as bn, UpdateSheetDataValidationOptionsCommand as Zr, RemoveSheetDataValidationCommand as rr, RemoveSheetAllDataValidationCommand as Kr, DataValidationFormulaService as zr, CHECKBOX_FORMULA_2 as Gr, CHECKBOX_FORMULA_1 as qr, getFormulaResult as Ut, isLegalFormulaResult as Mn, transformCheckboxValue as Jr } from "@univerjs/sheets-data-validation";
 import { jsxs as $, Fragment as dt, jsx as S } from "react/jsx-runtime";
 import { FormLayout as Y, Input as Pe, Checkbox as At, clsx as Ne, borderClassName as bt, RadioGroup as un, Radio as Ae, DraggableList as Qr, Dropdown as ei, Button as Ke, Select as En } from "@univerjs/design";
-import { useDependency as F, useSidebarClick as ir, useObservable as Le, useEvent as Gt, ISidebarService as or, IDialogService as ti, IZenZoneService as ar, KeyCode as pt, MenuItemType as hn, getMenuHiddenObservable as ni, RibbonDataGroup as ri, IMenuManagerService as ii, ComponentManager as gn } from "@univerjs/ui";
-import { useState as W, useRef as gt, forwardRef as Fe, createElement as Ie, useMemo as ct, useEffect as ke } from "react";
+import { useDependency as F, useSidebarClick as ir, useObservable as Le, useEvent as Gt, ISidebarService as or, IDialogService as ti, IZenZoneService as ar, KeyCode as gt, MenuItemType as hn, getMenuHiddenObservable as ni, RibbonDataGroup as ri, IMenuManagerService as ii, ComponentManager as pn } from "@univerjs/ui";
+import { useState as W, useRef as pt, forwardRef as Fe, createElement as Ie, useMemo as ct, useEffect as ke } from "react";
 import { FormulaEditor as sr, RangeSelector as oi } from "@univerjs/sheets-formula-ui";
-import { DataValidatorRegistryService as Me, DataValidationModel as pn, DataValidatorDropdownType as ve, DataValidatorRegistryScope as ai, TWO_FORMULA_OPERATOR_COUNT as si, getRuleOptions as Vn, getRuleSetting as Dn } from "@univerjs/data-validation";
+import { DataValidatorRegistryService as Me, DataValidationModel as gn, DataValidatorDropdownType as ve, DataValidatorRegistryScope as ai, TWO_FORMULA_OPERATOR_COUNT as si, getRuleOptions as Dn, getRuleSetting as Vn } from "@univerjs/data-validation";
 import { debounceTime as lr, filter as vn, BehaviorSubject as On, distinctUntilChanged as li, Subject as di, bufferTime as dr, of as ci } from "rxjs";
-import { DeviceInputEventType as vt, IRenderManagerService as xe, fixLineWidthByScale as Tn, Transform as ui, CheckboxShape as hi, getCurrentTypeOfRenderer as ze, CURSOR_TYPE as Ge, FontCache as gi, Shape as pi, Rect as cr, getFontStyleString as Te, DocSimpleSkeleton as it, Text as Pn } from "@univerjs/engine-render";
-import { SheetInterceptorService as fn, VALIDATE_CELL as vi, SheetsSelectionsService as ur, SetRangeValuesCommand as st, getSheetCommandTarget as hr, rangeToDiscreteRange as fi, SheetPermissionCheckController as mi, WorksheetEditPermission as qt, WorksheetSetCellStylePermission as Jt, RangeProtectionPermissionEditPoint as Qt, WorkbookEditablePermission as en, INTERCEPTOR_POINT as gr, InterceptCellContentPriority as pr, checkRangesEditablePermission as _i } from "@univerjs/sheets";
+import { DeviceInputEventType as vt, IRenderManagerService as xe, fixLineWidthByScale as Tn, Transform as ui, CheckboxShape as hi, getCurrentTypeOfRenderer as ze, CURSOR_TYPE as Ge, FontCache as pi, Shape as gi, Rect as cr, getFontStyleString as Te, DocSimpleSkeleton as it, Text as Pn } from "@univerjs/engine-render";
+import { SheetInterceptorService as fn, VALIDATE_CELL as vi, SheetsSelectionsService as ur, SetRangeValuesCommand as st, getSheetCommandTarget as hr, rangeToDiscreteRange as fi, SheetPermissionCheckController as mi, WorksheetEditPermission as qt, WorksheetSetCellStylePermission as Jt, RangeProtectionPermissionEditPoint as Qt, WorkbookEditablePermission as en, INTERCEPTOR_POINT as pr, InterceptCellContentPriority as gr, checkRangesEditablePermission as _i } from "@univerjs/sheets";
 import { getPatternType as Si } from "@univerjs/sheets-numfmt";
-import { ISheetCellDropdownManagerService as Ci, IEditorBridgeService as vr, SetCellEditVisibleOperation as ft, HoverManagerService as wi, CellAlertManagerService as Ii, CellAlertType as Ri, IAutoFillService as yi, APPLY_TYPE as ot, virtualizeDiscreteRanges as tn, getAutoFillRepeatRange as bi, ISheetClipboardService as Mi, COPY_TYPE as An, PREDEFINED_HOOK_NAME as mt, getRepeatRange as Ln, getCurrentRangeDisable$ as Ei, AutoHeightController as fr, SheetSkeletonManagerService as ut, IMarkSelectionService as Vi } from "@univerjs/sheets-ui";
-import { deserializeRangeWithSheet as Di, serializeRange as mr } from "@univerjs/engine-formula";
+import { ISheetCellDropdownManagerService as Ci, IEditorBridgeService as vr, SetCellEditVisibleOperation as ft, HoverManagerService as wi, CellAlertManagerService as Ii, CellAlertType as Ri, IAutoFillService as yi, APPLY_TYPE as ot, virtualizeDiscreteRanges as tn, getAutoFillRepeatRange as bi, ISheetClipboardService as Mi, COPY_TYPE as An, PREDEFINED_HOOK_NAME as mt, getRepeatRange as Ln, getCurrentRangeDisable$ as Ei, AutoHeightController as fr, SheetSkeletonManagerService as ut, IMarkSelectionService as Di } from "@univerjs/sheets-ui";
+import { deserializeRangeWithSheet as Vi, serializeRange as mr } from "@univerjs/engine-formula";
 const Oi = (e) => {
   const { isTwoFormula: t = !1, value: r, onChange: n, showError: i, validResult: o } = e, a = F(ce), l = i ? o == null ? void 0 : o.formula1 : "", s = i ? o == null ? void 0 : o.formula2 : "";
   return t ? /* @__PURE__ */ $(dt, { children: [
@@ -108,10 +108,10 @@ function Ti(e) {
 }
 function Pi(e) {
   var h;
-  const { unitId: t, subUnitId: r, value: n, onChange: i, showError: o, validResult: a } = e, l = o ? a == null ? void 0 : a.formula1 : void 0, s = gt(null), [d, u] = W(!1);
+  const { unitId: t, subUnitId: r, value: n, onChange: i, showError: o, validResult: a } = e, l = o ? a == null ? void 0 : a.formula1 : void 0, s = pt(null), [d, u] = W(!1);
   return ir((c) => {
-    var g;
-    ((g = s.current) == null ? void 0 : g.isClickOutSide(c)) && u(!1);
+    var p;
+    ((p = s.current) == null ? void 0 : p.isClickOutSide(c)) && u(!1);
   }), /* @__PURE__ */ S(Y, { error: l, children: /* @__PURE__ */ S(
     sr,
     {
@@ -149,7 +149,7 @@ var le = function() {
       t.indexOf(n[i]) < 0 && Object.prototype.propertyIsEnumerable.call(e, n[i]) && (r[n[i]] = e[n[i]]);
   return r;
 }, Be = Fe(function(e, t) {
-  var r = e.icon, n = e.id, i = e.className, o = e.extend, a = Ai(e, ["icon", "id", "className", "extend"]), l = "univerjs-icon univerjs-icon-".concat(n, " ").concat(i || "").trim(), s = gt("_".concat(Ni()));
+  var r = e.icon, n = e.id, i = e.className, o = e.extend, a = Ai(e, ["icon", "id", "className", "extend"]), l = "univerjs-icon univerjs-icon-".concat(n, " ").concat(i || "").trim(), s = pt("_".concat(Ni()));
   return _r(r, "".concat(n), { defIds: r.defIds, idSuffix: s.current }, le({ ref: t, className: l }, a), o);
 });
 function _r(e, t, r, n, i) {
@@ -332,43 +332,43 @@ const Ye = "#ECECEC", $i = [
 };
 function Yi(e) {
   const { value: t, onChange: r = () => {
-  }, unitId: n, subUnitId: i, validResult: o, showError: a, ruleId: l } = e, { formula1: s = "", formula2: d = "" } = t || {}, [u, h] = W(() => Oe(s) ? "1" : "0"), [c, m] = W(u === "1" ? s : "="), [g, b] = W(u === "1" ? s : "="), y = F(ce), p = F(Me), C = F(pn), v = F(jr), [I, w] = W(() => d.split(",")), _ = p.getValidatorItem(j.LIST), [R, L] = W([]), [N, E] = W(""), T = a ? o == null ? void 0 : o.formula1 : "", O = ct(() => C.ruleChange$.pipe(lr(16)), []), P = Le(O), k = Gt(r);
+  }, unitId: n, subUnitId: i, validResult: o, showError: a, ruleId: l } = e, { formula1: s = "", formula2: d = "" } = t || {}, [u, h] = W(() => Oe(s) ? "1" : "0"), [c, m] = W(u === "1" ? s : "="), [p, b] = W(u === "1" ? s : "="), y = F(ce), g = F(Me), C = F(gn), v = F(jr), [I, w] = W(() => d.split(",")), _ = g.getValidatorItem(j.LIST), [R, L] = W([]), [N, E] = W(""), T = a ? o == null ? void 0 : o.formula1 : "", O = ct(() => C.ruleChange$.pipe(lr(16)), []), P = Le(O), k = Gt(r);
   ke(() => {
     (async () => {
       await new Promise((f) => {
         setTimeout(() => f(!0), 100);
       });
-      const D = C.getRuleById(n, i, l), U = D == null ? void 0 : D.formula1;
-      if (Oe(U) && _ && D) {
-        const f = await _.getListAsync(D, n, i);
+      const V = C.getRuleById(n, i, l), U = V == null ? void 0 : V.formula1;
+      if (Oe(U) && _ && V) {
+        const f = await _.getListAsync(V, n, i);
         L(f);
       }
     })();
   }, [C, P, _, l, i, n]), ke(() => {
-    Oe(s) && s !== g && (m(s), b(g));
-  }, [g, s]);
+    Oe(s) && s !== p && (m(s), b(p));
+  }, [p, s]);
   const [H, B] = W(() => {
-    const D = u !== "1" ? Yr(s) : [], U = d.split(",");
-    return D.map((f, A) => ({
+    const V = u !== "1" ? Yr(s) : [], U = d.split(",");
+    return V.map((f, A) => ({
       label: f,
       color: U[A] || Ye,
       isRef: !1,
       id: In.generateRandomId(4)
     }));
-  }), J = (D, U, f) => {
-    const A = H.find((x) => x.id === D);
+  }), J = (V, U, f) => {
+    const A = H.find((x) => x.id === V);
     A && (A.label = U, A.color = f, B([...H]));
-  }, ne = (D) => {
-    const U = H.findIndex((f) => f.id === D);
+  }, ne = (V) => {
+    const U = H.findIndex((f) => f.id === V);
     U !== -1 && (H.splice(U, 1), B([...H]));
-  }, oe = d.split(","), he = ct(() => R.map((D, U) => ({
-    label: D,
+  }, oe = d.split(","), he = ct(() => R.map((V, U) => ({
+    label: V,
     color: oe[U] || Ye,
     id: `${U}`,
     isRef: !0
-  })), [oe, R]), z = (D, U, f) => {
+  })), [oe, R]), z = (V, U, f) => {
     const A = [...I];
-    A[+D] = f, w(A), k({
+    A[+V] = f, w(A), k({
       formula1: s,
       formula2: A.join(",")
     });
@@ -386,13 +386,13 @@ function Yi(e) {
   ke(() => {
     if (u === "1")
       return;
-    const D = /* @__PURE__ */ new Set(), U = [];
+    const V = /* @__PURE__ */ new Set(), U = [];
     H.map((f) => ({
       labelList: f.label.split(","),
       item: f
     })).forEach(({ item: f, labelList: A }) => {
       A.forEach((x) => {
-        D.has(x) || (D.add(x), U.push({
+        V.has(x) || (V.add(x), U.push({
           label: x,
           color: f.color
         }));
@@ -401,34 +401,34 @@ function Yi(e) {
       formula1: Gn(U.map((f) => f.label)),
       formula2: U.map((f) => f.color === Ye ? "" : f.color).join(",")
     });
-  }, [H, k, u, g, I]);
-  const fe = Gt(async (D) => {
-    if (!Oe(D)) {
+  }, [H, k, u, p, I]);
+  const fe = Gt(async (V) => {
+    if (!Oe(V)) {
       k == null || k({
         formula1: "",
         formula2: d
       });
       return;
     }
-    v.getFormulaRefCheck(D) ? (k == null || k({
-      formula1: Oe(D) ? D : "",
+    v.getFormulaRefCheck(V) ? (k == null || k({
+      formula1: Oe(V) ? V : "",
       formula2: d
     }), E("")) : (k == null || k({
       formula1: "",
       formula2: d
     }), m("="), E(y.t("dataValidation.validFail.formulaError")));
-  }), Q = gt(null), [q, G] = W(!1);
-  return ir((D) => {
+  }), Q = pt(null), [q, G] = W(!1);
+  return ir((V) => {
     var f;
-    ((f = Q.current) == null ? void 0 : f.isClickOutSide(D)) && G(!1);
+    ((f = Q.current) == null ? void 0 : f.isClickOutSide(V)) && G(!1);
   }), /* @__PURE__ */ $(dt, { children: [
     /* @__PURE__ */ S(Y, { label: y.t("dataValidation.list.options"), children: /* @__PURE__ */ $(
       un,
       {
         value: u,
-        onChange: (D) => {
-          h(D), m(g), D === "1" && k({
-            formula1: g === "=" ? "" : g,
+        onChange: (V) => {
+          h(V), m(p), V === "1" && k({
+            formula1: p === "=" ? "" : p,
             formula2: I.join(",")
           });
         },
@@ -450,20 +450,20 @@ function Yi(e) {
           isFocus: q,
           isSupportAcrossSheet: !0,
           onFocus: () => G(!0),
-          onChange: (D = "") => {
-            const U = (D != null ? D : "").trim();
+          onChange: (V = "") => {
+            const U = (V != null ? V : "").trim();
             b(U), fe(U);
           }
         }
       ),
-      he.length > 0 && /* @__PURE__ */ S("div", { className: "univer-mt-3", children: he.map((D) => /* @__PURE__ */ S(
+      he.length > 0 && /* @__PURE__ */ S("div", { className: "univer-mt-3", children: he.map((V) => /* @__PURE__ */ S(
         kn,
         {
           className: "univer-mb-3",
-          item: D,
+          item: V,
           commonProps: { onItemChange: z }
         },
-        D.id
+        V.id
       )) })
     ] }) : /* @__PURE__ */ S(Y, { error: T, children: /* @__PURE__ */ $("div", { className: "-univer-mt-3", children: [
       /* @__PURE__ */ S(
@@ -474,16 +474,16 @@ function Yi(e) {
           rowHeight: 28,
           margin: [0, 12],
           draggableHandle: ".draggableHandle",
-          itemRender: (D) => /* @__PURE__ */ S(
+          itemRender: (V) => /* @__PURE__ */ S(
             kn,
             {
-              item: D,
+              item: V,
               commonProps: {
                 onItemChange: J,
                 onItemDelete: ne
               }
             },
-            D.id
+            V.id
           ),
           idKey: "id"
         }
@@ -527,10 +527,10 @@ var Zi = Object.getOwnPropertyDescriptor, Ki = (e, t, r, n) => {
 }, zi = (e, t) => (r, n) => t(r, n, e);
 let Se = class {
   constructor(e) {
-    V(this, "canvasRender", null);
-    V(this, "dropdownType");
-    V(this, "optionsInput");
-    V(this, "formulaInput", dn);
+    D(this, "canvasRender", null);
+    D(this, "dropdownType");
+    D(this, "optionsInput");
+    D(this, "formulaInput", dn);
     this.injector = e;
   }
 };
@@ -545,12 +545,12 @@ var Gi = Object.getOwnPropertyDescriptor, qi = (e, t, r, n) => {
 let Ce = class extends be {
   constructor(t, r) {
     super();
-    V(this, "_open$", new On(!1));
-    V(this, "open$", this._open$.pipe(li()));
-    V(this, "_activeRule");
-    V(this, "_activeRule$", new On(void 0));
-    V(this, "activeRule$", this._activeRule$.asObservable());
-    V(this, "_closeDisposable", null);
+    D(this, "_open$", new On(!1));
+    D(this, "open$", this._open$.pipe(li()));
+    D(this, "_activeRule");
+    D(this, "_activeRule$", new On(void 0));
+    D(this, "activeRule$", this._activeRule$.asObservable());
+    D(this, "_closeDisposable", null);
     this._univerInstanceService = t, this._sidebarService = r, this.disposeWithMe(
       this._univerInstanceService.getCurrentTypeOfUnit$(X.UNIVER_SHEET).pipe(vn((n) => !n)).subscribe(() => {
         this.close();
@@ -677,7 +677,7 @@ var eo = Object.getOwnPropertyDescriptor, to = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? eo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, ge = (e, t) => (r, n) => t(r, n, e);
+}, pe = (e, t) => (r, n) => t(r, n, e);
 const Ft = (e) => {
   if (e == null || typeof e == "boolean")
     return;
@@ -703,11 +703,11 @@ function no(e, t) {
 let Ue = class extends be {
   constructor(t, r, n, i, o, a, l, s, d, u, h) {
     super();
-    V(this, "_activeDropdown");
-    V(this, "_activeDropdown$", new di());
-    V(this, "_currentPopup", null);
-    V(this, "activeDropdown$", this._activeDropdown$.asObservable());
-    V(this, "_zenVisible", !1);
+    D(this, "_activeDropdown");
+    D(this, "_activeDropdown$", new di());
+    D(this, "_currentPopup", null);
+    D(this, "activeDropdown$", this._activeDropdown$.asObservable());
+    D(this, "_zenVisible", !1);
     this._univerInstanceService = t, this._dataValidatorRegistryService = r, this._zenZoneService = n, this._dataValidationModel = i, this._sheetsSelectionsService = o, this._cellDropdownManagerService = a, this._sheetDataValidationModel = l, this._commandService = s, this._editorBridgeService = d, this._injector = u, this._configService = h, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
       this._activeDropdown$.complete();
     });
@@ -740,7 +740,7 @@ let Ue = class extends be {
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   showDropdown(t) {
-    var b, y, p, C;
+    var b, y, g, C;
     const { location: r } = t, { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = r;
     if (this._currentPopup && this._currentPopup.dispose(), this._zenVisible)
       return;
@@ -771,7 +771,7 @@ let Ue = class extends be {
         visible: !1,
         eventType: vt.Keyboard,
         unitId: o,
-        keycode: pt.ESC
+        keycode: gt.ESC
       }), await this._commandService.executeCommand(st.id, {
         unitId: o,
         subUnitId: a,
@@ -860,7 +860,7 @@ let Ue = class extends be {
             visible: !1,
             eventType: vt.Keyboard,
             unitId: o,
-            keycode: pt.ESC
+            keycode: gt.ESC
           }), this._commandService.executeCommand(st.id, O), !v;
         }, w = (d == null ? void 0 : d.renderMode) === se.CUSTOM || (d == null ? void 0 : d.renderMode) === void 0, _ = u.getListWithColor(d, o, a), R = Nt(s.getCellRaw(n, i)), L = () => {
           this._commandService.executeCommand(We.id, {
@@ -880,7 +880,7 @@ let Ue = class extends be {
             onEdit: L,
             defaultValue: R,
             multiple: v,
-            showEdit: (p = (y = this._configService.getConfig(Sn)) == null ? void 0 : y.showEditOnDropdown) != null ? p : !0
+            showEdit: (g = (y = this._configService.getConfig(Sn)) == null ? void 0 : y.showEditOnDropdown) != null ? g : !0
           }
         };
         break;
@@ -910,7 +910,7 @@ let Ue = class extends be {
                 visible: !1,
                 eventType: vt.Keyboard,
                 unitId: o,
-                keycode: pt.ESC
+                keycode: gt.ESC
               }), this._commandService.syncExecuteCommand(st.id, w), !0;
             },
             defaultValue: Nt(s.getCellRaw(n, i)).split("/"),
@@ -945,7 +945,7 @@ let Ue = class extends be {
                 visible: !1,
                 eventType: vt.Keyboard,
                 unitId: o,
-                keycode: pt.ESC
+                keycode: gt.ESC
               }), this._commandService.syncExecuteCommand(st.id, w), !0;
             },
             defaultValue: Nt(s.getCellRaw(n, i))
@@ -957,15 +957,20 @@ let Ue = class extends be {
       default:
         throw new Error("[DataValidationDropdownManagerService]: unknown type!");
     }
-    if (h = this._cellDropdownManagerService.showDropdown(m), !h)
+    if (h = this._cellDropdownManagerService.showDropdown({
+      ...m,
+      onHide: () => {
+        this._activeDropdown = null, this._activeDropdown$.next(null);
+      }
+    }), !h)
       throw new Error("[DataValidationDropdownManagerService]: cannot show dropdown!");
-    const g = new Lr();
-    g.add(h), g.add({
+    const p = new Lr();
+    p.add(h), p.add({
       dispose: () => {
         var v, I;
         (I = (v = this._activeDropdown) == null ? void 0 : v.onHide) == null || I.call(v);
       }
-    }), this._currentPopup = g;
+    }), this._currentPopup = p;
   }
   hideDropdown() {
     this._activeDropdown && (this._currentPopup && this._currentPopup.dispose(), this._currentPopup = null, this._activeDropdown = null, this._activeDropdown$.next(null));
@@ -999,17 +1004,17 @@ let Ue = class extends be {
   }
 };
 Ue = to([
-  ge(0, ue),
-  ge(1, M(Me)),
-  ge(2, ar),
-  ge(3, M(ie)),
-  ge(4, M(ur)),
-  ge(5, M(Ci)),
-  ge(6, M(ie)),
-  ge(7, te),
-  ge(8, vr),
-  ge(9, M(ye)),
-  ge(10, sn)
+  pe(0, ue),
+  pe(1, M(Me)),
+  pe(2, ar),
+  pe(3, M(ie)),
+  pe(4, M(ur)),
+  pe(5, M(Ci)),
+  pe(6, M(ie)),
+  pe(7, te),
+  pe(8, vr),
+  pe(9, M(ye)),
+  pe(10, sn)
 ], Ue);
 const Et = "DataValidationPanel", We = {
   id: "data-validation.operation.open-validation-panel",
@@ -1017,7 +1022,7 @@ const Et = "DataValidationPanel", We = {
   handler(e, t) {
     if (!t)
       return !1;
-    const { ruleId: r, isAdd: n } = t, i = e.get(Ce), o = e.get(pn), a = e.get(ue), l = e.get(or), s = hr(a);
+    const { ruleId: r, isAdd: n } = t, i = e.get(Ce), o = e.get(gn), a = e.get(ue), l = e.get(or), s = hr(a);
     if (!s) return !1;
     const { unitId: d, subUnitId: u } = s, h = r ? o.getRuleById(d, u, r) : void 0;
     i.open(), i.setActiveRule(h && {
@@ -1160,16 +1165,16 @@ let Je = class extends be {
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
     const e = () => ({ redos: [], undos: [] }), t = (n, i) => {
-      const { source: o, target: a, unitId: l, subUnitId: s } = n, d = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = tn([o, a]), [h, c] = u.ranges, { mapFunc: m } = u, g = {
+      const { source: o, target: a, unitId: l, subUnitId: s } = n, d = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = tn([o, a]), [h, c] = u.ranges, { mapFunc: m } = u, p = {
         row: h.startRow,
         col: h.startColumn
-      }, b = bi(h, c), y = new Rt(), p = /* @__PURE__ */ new Set();
+      }, b = bi(h, c), y = new Rt(), g = /* @__PURE__ */ new Set();
       b.forEach((_) => {
         const R = _.repeatStartCell, L = _.relativeRange, N = {
-          startRow: g.row,
-          startColumn: g.col,
-          endColumn: g.col,
-          endRow: g.row
+          startRow: p.row,
+          startColumn: p.col,
+          endColumn: p.col,
+          endRow: p.row
         }, E = {
           startRow: R.row,
           startColumn: R.col,
@@ -1194,10 +1199,10 @@ let Je = class extends be {
             },
             E
           ), { row: ne, col: oe } = m(J.startRow, J.startColumn);
-          y.setValue(ne, oe, B), p.add(B);
+          y.setValue(ne, oe, B), g.add(B);
         });
       });
-      const C = Array.from(p).map((_) => ({ id: _, ranges: Kt(y, (R) => R === _) }));
+      const C = Array.from(g).map((_) => ({ id: _, ranges: Kt(y, (R) => R === _) }));
       d.addRangeRules(C);
       const v = d.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: I, undoMutations: w } = zt(l, s, v, this._injector, "patched", i === ot.ONLY_FORMAT);
       return {
@@ -1237,7 +1242,7 @@ var so = Object.getOwnPropertyDescriptor, lo = (e, t, r, n) => {
 let Qe = class extends be {
   constructor(t, r, n) {
     super();
-    V(this, "_copyInfo");
+    D(this, "_copyInfo");
     this._sheetClipboardService = t, this._sheetDataValidationModel = r, this._injector = n, this._initCopyPaste();
   }
   _initCopyPaste() {
@@ -1286,7 +1291,7 @@ let Qe = class extends be {
     const { unitId: i, subUnitId: o } = this._copyInfo;
     if (r.unitId !== i || o !== r.subUnitId) {
       const a = this._sheetDataValidationModel.getRuleObjectMatrix(r.unitId, r.subUnitId).clone(), l = new Rt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = tn([r.copyRange, t]), c = Ln(d, u, !0), m = /* @__PURE__ */ new Map();
-      c.forEach(({ startRange: p }) => {
+      c.forEach(({ startRange: g }) => {
         var C;
         (C = this._copyInfo) == null || C.matrix.forValue((v, I, w) => {
           const _ = yt.getPositionRange(
@@ -1296,15 +1301,15 @@ let Qe = class extends be {
               startColumn: I,
               endColumn: I
             },
-            p
+            g
           ), R = `${o}-${w}`, L = this._sheetDataValidationModel.getRuleById(i, o, w);
           !this._sheetDataValidationModel.getRuleById(r.unitId, r.subUnitId, R) && L && m.set(R, { ...L, uid: R });
           const { row: N, col: E } = h(_.startRow, _.startColumn);
           s.add(R), l.setValue(N, E, R);
         });
       });
-      const g = Array.from(s).map((p) => ({ id: p, ranges: Kt(l, (C) => C === p) }));
-      a.addRangeRules(g);
+      const p = Array.from(s).map((g) => ({ id: g, ranges: Kt(l, (C) => C === g) }));
+      a.addRangeRules(p);
       const { redoMutations: b, undoMutations: y } = zt(
         r.unitId,
         r.subUnitId,
@@ -1320,8 +1325,8 @@ let Qe = class extends be {
     } else {
       const a = this._sheetDataValidationModel.getRuleObjectMatrix(i, o).clone(), l = new Rt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = tn([r.copyRange, t]);
       Ln(d, u, !0).forEach(({ startRange: y }) => {
-        var p;
-        (p = this._copyInfo) == null || p.matrix.forValue((C, v, I) => {
+        var g;
+        (g = this._copyInfo) == null || g.matrix.forValue((C, v, I) => {
           const w = yt.getPositionRange(
             {
               startRow: C,
@@ -1334,9 +1339,9 @@ let Qe = class extends be {
           l.setValue(_, R, I), s.add(I);
         });
       });
-      const m = Array.from(s).map((y) => ({ id: y, ranges: Kt(l, (p) => p === y) }));
+      const m = Array.from(s).map((y) => ({ id: y, ranges: Kt(l, (g) => g === y) }));
       a.addRangeRules(m);
-      const { redoMutations: g, undoMutations: b } = zt(
+      const { redoMutations: p, undoMutations: b } = zt(
         i,
         o,
         a.diff(this._sheetDataValidationModel.getRules(i, o)),
@@ -1345,7 +1350,7 @@ let Qe = class extends be {
         !1
       );
       return {
-        redos: g,
+        redos: p,
         undos: b
       };
     }
@@ -1397,14 +1402,14 @@ function ho(e) {
     disabled$: Ei(e, { workbookTypes: [en], worksheetTypes: [Jt, qt], rangeTypes: [Qt] })
   };
 }
-function go(e) {
+function po(e) {
   return {
     id: We.id,
     title: "dataValidation.panel.title",
     type: hn.BUTTON
   };
 }
-function po(e) {
+function go(e) {
   return {
     id: kt.id,
     title: "dataValidation.panel.add",
@@ -1418,11 +1423,11 @@ const vo = {
       menuItemFactory: ho,
       [We.id]: {
         order: 0,
-        menuItemFactory: go
+        menuItemFactory: po
       },
       [kt.id]: {
         order: 1,
-        menuItemFactory: po
+        menuItemFactory: go
       }
     }
   }
@@ -1489,26 +1494,26 @@ let tt = class extends ln {
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        gr.CELL_CONTENT,
+        pr.CELL_CONTENT,
         {
           effect: Yn.Style,
           // must be after numfmt
-          priority: pr.DATA_VALIDATION,
+          priority: gr.DATA_VALIDATION,
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: (e, t, r) => {
-            var p, C, v, I, w;
+            var g, C, v, I, w;
             const { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = t, d = this._sheetDataValidationModel.getRuleIdByLocation(o, a, n, i);
             if (!d)
               return r(e);
             const u = this._sheetDataValidationModel.getRuleById(o, a, d);
             if (!u)
               return r(e);
-            const h = (p = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? p : Ze.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = t.rawData;
-            let g;
+            const h = (g = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? g : Ze.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = t.rawData;
+            let p;
             const b = {
               get value() {
                 var _;
-                return g !== void 0 || (g = (_ = re(m)) != null ? _ : null), g;
+                return p !== void 0 || (p = (_ = re(m)) != null ? _ : null), p;
               }
             }, y = {
               get value() {
@@ -1614,30 +1619,30 @@ let Un = class extends ln {
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        gr.CELL_CONTENT,
+        pr.CELL_CONTENT,
         {
           effect: Yn.Style,
           // must be after numfmt
-          priority: pr.DATA_VALIDATION,
+          priority: gr.DATA_VALIDATION,
           // eslint-disable-next-line complexity, max-lines-per-function
           handler: (e, t, r) => {
-            var y, p, C, v, I;
+            var y, g, C, v, I;
             const { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = t, d = this._sheetDataValidationModel.getRuleIdByLocation(o, a, n, i);
             if (!d)
               return r(e);
             const u = this._sheetDataValidationModel.getRuleById(o, a, d);
             if (!u)
               return r(e);
-            const h = (y = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? y : Ze.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = s.getCellRaw(n, i), g = re(m), b = `${g != null ? g : ""}`;
+            const h = (y = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? y : Ze.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = s.getCellRaw(n, i), p = re(m), b = `${p != null ? p : ""}`;
             return (!e || e === t.rawData) && (e = { ...t.rawData }), e.markers = {
               ...e == null ? void 0 : e.markers,
               ...h === Ze.INVALID ? Er : null
             }, e.customRender = [
-              ...(p = e == null ? void 0 : e.customRender) != null ? p : [],
+              ...(g = e == null ? void 0 : e.customRender) != null ? g : [],
               ...c != null && c.canvasRender ? [c.canvasRender] : []
             ], e.fontRenderExtension = {
               ...e == null ? void 0 : e.fontRenderExtension,
-              isSkip: ((C = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : C.isSkip) || ((v = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : v.call(c, u, g, t))
+              isSkip: ((C = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : C.isSkip) || ((v = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : v.call(c, u, p, t))
             }, e.interceptorStyle = {
               ...e == null ? void 0 : e.interceptorStyle,
               ...c == null ? void 0 : c.getExtraStyle(u, b, {
@@ -1716,7 +1721,7 @@ var mo = Object.getOwnPropertyDescriptor, _o = (e, t, r, n) => {
     (a = e[o]) && (i = a(i) || i);
   return i;
 }, Fn = (e, t) => (r, n) => t(r, n, e);
-let Vt = class extends be {
+let Dt = class extends be {
   constructor(e, t, r) {
     super(), this._context = e, this._sheetDataValidationModel = t, this._sheetSkeletonManagerService = r, this._initSkeletonChange();
   }
@@ -1736,13 +1741,13 @@ let Vt = class extends be {
     this.disposeWithMe(this._sheetDataValidationModel.validStatusChange$.pipe(Fr(16)).subscribe(e));
   }
 };
-Vt = _o([
+Dt = _o([
   Fn(1, M(ie)),
   Fn(2, M(ut))
-], Vt);
+], Dt);
 function So(e) {
   var d;
-  const t = F(ce), r = F(gn), { value: n, onChange: i, extraComponent: o } = e, [a, l] = W(!1), s = o ? r.get(o) : null;
+  const t = F(ce), r = F(pn), { value: n, onChange: i, extraComponent: o } = e, [a, l] = W(!1), s = o ? r.get(o) : null;
   return /* @__PURE__ */ $(dt, { children: [
     /* @__PURE__ */ $(
       "div",
@@ -1807,8 +1812,8 @@ function wo(e, t, r) {
   return t ? ((i = (n = e.getUnit(t)) == null ? void 0 : n.getSheetBySheetName(r)) == null ? void 0 : i.getSheetId()) || "" : ((a = (o = e.getCurrentUnitForType(X.UNIVER_SHEET)) == null ? void 0 : o.getSheetBySheetName(r)) == null ? void 0 : a.getSheetId()) || "";
 }
 function Io() {
-  var D, U;
-  const [e, t] = W(0), r = F(Ce), n = Le(r.activeRule$, r.activeRule), { unitId: i, subUnitId: o, rule: a } = n || {}, l = a.uid, s = F(Me), d = F(ue), u = F(gn), h = F(te), c = F(pn), m = F(ce), [g, b] = W(a), y = s.getValidatorItem(g.type), [p, C] = W(!1), v = s.getValidatorsByScope(ai.SHEET), [I, w] = W(() => g.ranges.map((f) => ({ unitId: "", sheetId: "", range: f }))), _ = ct(() => Co(h), [h]), [R, L] = W(!1), [N, E] = W(!1), T = gt(null), O = F(ur);
+  var V, U;
+  const [e, t] = W(0), r = F(Ce), n = Le(r.activeRule$, r.activeRule), { unitId: i, subUnitId: o, rule: a } = n || {}, l = a.uid, s = F(Me), d = F(ue), u = F(pn), h = F(te), c = F(gn), m = F(ce), [p, b] = W(a), y = s.getValidatorItem(p.type), [g, C] = W(!1), v = s.getValidatorsByScope(ai.SHEET), [I, w] = W(() => p.ranges.map((f) => ({ unitId: "", sheetId: "", range: f }))), _ = ct(() => Co(h), [h]), [R, L] = W(!1), [N, E] = W(!1), T = pt(null), O = F(ur);
   if (ke(() => () => {
     const f = O.getCurrentLastSelection();
     f && O.setSelections([f]);
@@ -1821,11 +1826,11 @@ function Io() {
     });
   }, [h, c, l, o, i]), !y)
     return null;
-  const P = y.operators, k = y.operatorNames, H = g.operator ? si.includes(g.operator) : !1, B = () => {
+  const P = y.operators, k = y.operatorNames, H = p.operator ? si.includes(p.operator) : !1, B = () => {
     var f, A, x;
-    (A = (f = T.current) == null ? void 0 : f.editor) != null && A.isFocus() && J((x = T.current) == null ? void 0 : x.getValue()), !(!g.ranges.length || R) && (y.validatorFormula(g, i, o).success ? r.setActiveRule(null) : C(!0));
+    (A = (f = T.current) == null ? void 0 : f.editor) != null && A.isFocus() && J((x = T.current) == null ? void 0 : x.getValue()), !(!p.ranges.length || R) && (y.validatorFormula(p, i, o).success ? r.setActiveRule(null) : C(!0));
   }, J = Gt((f) => {
-    const A = f.split(",").filter(Boolean).map(Di).map((ee) => {
+    const A = f.split(",").filter(Boolean).map(Vi).map((ee) => {
       const wn = ee.sheetName;
       if (wn) {
         const Or = wo(d, ee.unitId, wn);
@@ -1841,7 +1846,7 @@ function Io() {
     w(A);
     const x = A.filter((ee) => (!ee.unitId || ee.unitId === i) && (!ee.sheetId || ee.sheetId === o)).map((ee) => ee.range);
     if (b({
-      ...g,
+      ...p,
       ranges: x
     }), x.length === 0)
       return;
@@ -1853,10 +1858,10 @@ function Io() {
     };
     _(tr.id, we);
   }), ne = (f) => {
-    if (yn(f, Dn(g)))
+    if (yn(f, Vn(p)))
       return;
     b({
-      ...g,
+      ...p,
       ...f
     });
     const A = {
@@ -1877,11 +1882,11 @@ function Io() {
       subUnitId: o
     }), r.setActiveRule(null);
   }, he = {
-    type: g.type,
-    operator: g.operator,
-    formula1: g.formula1,
-    formula2: g.formula2,
-    allowBlank: g.allowBlank
+    type: p.type,
+    operator: p.operator,
+    formula1: p.formula1,
+    formula2: p.formula2,
+    allowBlank: p.allowBlank
   }, z = (f) => {
     const A = s.getValidatorItem(f);
     if (!A)
@@ -1890,7 +1895,7 @@ function Io() {
       ...we,
       type: f
     } : {
-      ...g,
+      ...p,
       type: f,
       operator: x[0],
       formula1: void 0,
@@ -1899,12 +1904,12 @@ function Io() {
     b(ee), h.executeCommand(bn.id, {
       unitId: i,
       subUnitId: o,
-      ruleId: g.uid,
-      setting: Dn(ee)
+      ruleId: p.uid,
+      setting: Vn(ee)
     });
-  }, Z = u.get(y.formulaInput), fe = ct(() => I.map((f) => mr(f.range)).join(","), []), Q = Vn(g), q = (f) => {
-    yn(f, Vn(g)) || (b({
-      ...g,
+  }, Z = u.get(y.formulaInput), fe = ct(() => I.map((f) => mr(f.range)).join(","), []), Q = Dn(p), q = (f) => {
+    yn(f, Dn(p)) || (b({
+      ...p,
       ...f
     }), _(
       Zr.id,
@@ -1915,13 +1920,13 @@ function Io() {
         options: f
       }
     ));
-  }, G = P.length && !g.operator;
+  }, G = P.length && !p.operator;
   return /* @__PURE__ */ $("div", { "data-u-comp": "data-validation-detail", className: "univer-py-2", children: [
     /* @__PURE__ */ S(
       Y,
       {
         label: m.t("dataValidation.panel.range"),
-        error: !g.ranges.length || R ? m.t("dataValidation.panel.rangeError") : "",
+        error: !p.ranges.length || R ? m.t("dataValidation.panel.rangeError") : "",
         children: /* @__PURE__ */ S(
           oi,
           {
@@ -1946,8 +1951,8 @@ function Io() {
       En,
       {
         className: "univer-w-full",
-        value: g.type,
-        options: (D = v == null ? void 0 : v.sort((f, A) => f.order - A.order)) == null ? void 0 : D.map((f) => ({
+        value: p.type,
+        options: (V = v == null ? void 0 : v.sort((f, A) => f.order - A.order)) == null ? void 0 : V.map((f) => ({
           label: m.t(f.title),
           value: f.id
         })),
@@ -1958,7 +1963,7 @@ function Io() {
       En,
       {
         className: "univer-w-full",
-        value: `${g.operator}`,
+        value: `${p.operator}`,
         options: [
           {
             value: "",
@@ -1982,8 +1987,8 @@ function Io() {
       {
         isTwoFormula: H,
         value: {
-          formula1: g.formula1,
-          formula2: g.formula2
+          formula1: p.formula1,
+          formula2: p.formula2
         },
         onChange: (f) => {
           ne({
@@ -1991,23 +1996,23 @@ function Io() {
             ...f
           });
         },
-        showError: p,
-        validResult: y.validatorFormula(g, i, o),
+        showError: g,
+        validResult: y.validatorFormula(p, i, o),
         unitId: i,
         subUnitId: o,
         ruleId: l
       },
-      e + g.type
+      e + p.type
     ) : null,
     /* @__PURE__ */ S(Y, { children: /* @__PURE__ */ S(
       At,
       {
-        checked: (U = g.allowBlank) != null ? U : !0,
+        checked: (U = p.allowBlank) != null ? U : !0,
         onChange: () => {
           var f;
           return ne({
             ...he,
-            allowBlank: !((f = g.allowBlank) == null || f)
+            allowBlank: !((f = p.allowBlank) == null || f)
           });
         },
         children: m.t("dataValidation.panel.allowBlank")
@@ -2021,23 +2026,23 @@ function Io() {
   ] });
 }
 const Ro = (e) => {
-  const { rule: t, onClick: r, unitId: n, subUnitId: i, disable: o } = e, a = F(Me), l = F(te), s = F(Vi), d = a.getValidatorItem(t.type), u = gt(void 0), [h, c] = W(!1), m = F(Zn), g = Le(m.currentTheme$), b = ct(() => {
+  const { rule: t, onClick: r, unitId: n, subUnitId: i, disable: o } = e, a = F(Me), l = F(te), s = F(Di), d = a.getValidatorItem(t.type), u = pt(void 0), [h, c] = W(!1), m = F(Zn), p = Le(m.currentTheme$), b = ct(() => {
     var w;
-    const p = m.getColorFromTheme("primary.600"), C = m.getColorFromTheme("loop-color.2"), v = (w = m.getColorFromTheme(C)) != null ? w : p, I = new $r(v).toRgb();
+    const g = m.getColorFromTheme("primary.600"), C = m.getColorFromTheme("loop-color.2"), v = (w = m.getColorFromTheme(C)) != null ? w : g, I = new $r(v).toRgb();
     return {
       fill: `rgba(${I.r}, ${I.g}, ${I.b}, 0.1)`,
       stroke: v
     };
-  }, [g]), y = (p) => {
+  }, [p]), y = (g) => {
     l.executeCommand(rr.id, {
       ruleId: t.uid,
       unitId: n,
       subUnitId: i
-    }), p.stopPropagation();
+    }), g.stopPropagation();
   };
   return ke(() => () => {
-    var p;
-    u.current && ((p = u.current) == null || p.forEach((C) => {
+    var g;
+    u.current && ((g = u.current) == null || g.forEach((C) => {
       C && s.removeShape(C);
     }));
   }, [s]), /* @__PURE__ */ $(
@@ -2056,15 +2061,15 @@ const Ro = (e) => {
       ),
       onClick: r,
       onMouseEnter: () => {
-        o || (c(!0), u.current = t.ranges.map((p) => s.addShape({
-          range: p,
+        o || (c(!0), u.current = t.ranges.map((g) => s.addShape({
+          range: g,
           style: b,
           primary: null
         })));
       },
       onMouseLeave: () => {
-        var p;
-        c(!1), (p = u.current) == null || p.forEach((C) => {
+        var g;
+        c(!1), (g = u.current) == null || g.forEach((C) => {
           C && s.removeShape(C);
         }), u.current = void 0;
       },
@@ -2080,7 +2085,7 @@ const Ro = (e) => {
           "div",
           {
             className: "univer-text-secondary univer-truncate univer-text-xs univer-leading-[18px] dark:!univer-text-gray-300",
-            children: t.ranges.map((p) => mr(p)).join(",")
+            children: t.ranges.map((g) => mr(g)).join(",")
           }
         ),
         h ? /* @__PURE__ */ S(
@@ -2117,7 +2122,7 @@ function yo(e) {
       subUnitId: c,
       rule: C
     });
-  }, g = () => {
+  }, p = () => {
     n.executeCommand(Kr.id, {
       unitId: h,
       subUnitId: c
@@ -2125,7 +2130,7 @@ function yo(e) {
   }, y = ((C) => {
     const v = r.getCurrentUnitForType(X.UNIVER_SHEET), I = v.getActiveSheet(), w = v.getUnitId(), _ = I.getSheetId();
     return C.map((L) => _i(i, w, _, L.ranges) ? { ...L } : { ...L, disable: !0 });
-  })(l), p = y == null ? void 0 : y.some((C) => C.disable);
+  })(l), g = y == null ? void 0 : y.some((C) => C.disable);
   return /* @__PURE__ */ $("div", { className: "univer-pb-4", children: [
     y == null ? void 0 : y.map((C) => {
       var v;
@@ -2148,7 +2153,7 @@ function yo(e) {
       );
     }),
     /* @__PURE__ */ $("div", { className: "univer-mt-4 univer-flex univer-flex-row univer-justify-end univer-gap-2", children: [
-      l.length && !p ? /* @__PURE__ */ S(Ke, { onClick: g, children: a.t("dataValidation.panel.removeAll") }) : null,
+      l.length && !g ? /* @__PURE__ */ S(Ke, { onClick: p, children: a.t("dataValidation.panel.removeAll") }) : null,
       /* @__PURE__ */ S(Ke, { variant: "primary", onClick: m, children: a.t("dataValidation.panel.add") })
     ] })
   ] });
@@ -2165,7 +2170,7 @@ const bo = () => {
   }, void 0, void 0, []);
   return !n || !i ? null : t && t.subUnitId === i.getSheetId() ? /* @__PURE__ */ S(Io, {}, t.rule.uid) : /* @__PURE__ */ S(yo, { workbook: n });
 }, Mo = "LIST_RENDER_MODE_OPTION_INPUT";
-function Dt(e) {
+function Vt(e) {
   var i;
   const { value: t, onChange: r } = e, n = F(ce);
   return /* @__PURE__ */ S(Y, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ $(un, { value: `${(i = t.renderMode) != null ? i : se.CUSTOM}`, onChange: (o) => r({ ...t, renderMode: +o }), children: [
@@ -2174,7 +2179,7 @@ function Dt(e) {
     /* @__PURE__ */ S(Ae, { value: `${se.TEXT}`, children: n.t("dataValidation.renderMode.text") })
   ] }) });
 }
-Dt.componentKey = Mo;
+Vt.componentKey = Mo;
 const Eo = "DATE_SHOW_TIME_OPTION";
 function Ot(e) {
   var i;
@@ -2197,8 +2202,8 @@ function Ot(e) {
   ) });
 }
 Ot.componentKey = Eo;
-var Vo = Object.getOwnPropertyDescriptor, Do = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? Vo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+var Do = Object.getOwnPropertyDescriptor, Vo = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? Do(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
 }, je = (e, t) => (r, n) => t(r, n, e);
@@ -2251,10 +2256,10 @@ let nn = class {
     return ((r = t == null ? void 0 : t.fs) != null ? r : 10) * 1.6;
   }
   async _parseFormula(e, t, r) {
-    var d, u, h, c, m, g, b, y, p;
-    const { formula1: n = qr, formula2: i = Gr } = e, o = await this._formulaService.getRuleFormulaResult(t, r, e.uid), a = Ut((h = (u = (d = o == null ? void 0 : o[0]) == null ? void 0 : d.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), l = Ut((g = (m = (c = o == null ? void 0 : o[1]) == null ? void 0 : c.result) == null ? void 0 : m[0]) == null ? void 0 : g[0]), s = Mn(String(a)) && Mn(String(l));
+    var d, u, h, c, m, p, b, y, g;
+    const { formula1: n = qr, formula2: i = Gr } = e, o = await this._formulaService.getRuleFormulaResult(t, r, e.uid), a = Ut((h = (u = (d = o == null ? void 0 : o[0]) == null ? void 0 : d.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), l = Ut((p = (m = (c = o == null ? void 0 : o[1]) == null ? void 0 : c.result) == null ? void 0 : m[0]) == null ? void 0 : p[0]), s = Mn(String(a)) && Mn(String(l));
     return {
-      formula1: Oe(n) ? Ut((p = (y = (b = o == null ? void 0 : o[0]) == null ? void 0 : b.result) == null ? void 0 : y[0]) == null ? void 0 : p[0]) : n,
+      formula1: Oe(n) ? Ut((g = (y = (b = o == null ? void 0 : o[0]) == null ? void 0 : b.result) == null ? void 0 : y[0]) == null ? void 0 : g[0]) : n,
       formula2: Oe(i) ? l : i,
       isFormulaValid: s
     };
@@ -2267,7 +2272,7 @@ let nn = class {
     const c = this._dataValidationModel.getValidator(h.type);
     if (!c || !((T = c.skipDefaultFontRender) != null && T.call(c, h, u, { unitId: i, subUnitId: o, row: l, column: s })))
       return;
-    const m = c.parseFormulaSync(h, i, o), { formula1: g } = m, b = this._calc(d, r), { a: y, d: p } = e.getTransform(), C = Tn(b.left, y), v = Tn(b.top, p), I = ui.create().composeMatrix({
+    const m = c.parseFormulaSync(h, i, o), { formula1: p } = m, b = this._calc(d, r), { a: y, d: g } = e.getTransform(), C = Tn(b.left, y), v = Tn(b.top, g), I = ui.create().composeMatrix({
       left: C,
       top: v,
       scaleX: 1,
@@ -2281,7 +2286,7 @@ let nn = class {
     e.save(), e.beginPath(), e.rect(d.startX, d.startY, w, _), e.clip();
     const R = I.getMatrix();
     e.transform(R[0], R[1], R[2], R[3], R[4], R[5]);
-    const L = ((O = r == null ? void 0 : r.fs) != null ? O : 10) * 1.6, N = String(u) === String(g), E = this._themeService.getColorFromTheme("primary.600");
+    const L = ((O = r == null ? void 0 : r.fs) != null ? O : 10) * 1.6, N = String(u) === String(p), E = this._themeService.getColorFromTheme("primary.600");
     hi.drawWith(e, {
       checked: N,
       width: L,
@@ -2294,14 +2299,14 @@ let nn = class {
     return s <= l && s >= a && d <= o && d >= i;
   }
   async onPointerDown(e, t) {
-    var g;
+    var p;
     if (t.button === 2)
       return;
     const { primaryWithCoord: r, unitId: n, subUnitId: i, worksheet: o, row: a, col: l } = e, s = re(o.getCellRaw(a, l)), d = this._dataValidationModel.getRuleByLocation(n, i, a, l);
     if (!d)
       return;
     const u = this._dataValidationModel.getValidator(d.type);
-    if (!u || !((g = u.skipDefaultFontRender) != null && g.call(u, d, s, { unitId: n, subUnitId: i, row: a, column: l })))
+    if (!u || !((p = u.skipDefaultFontRender) != null && p.call(u, d, s, { unitId: n, subUnitId: i, row: a, column: l })))
       return;
     const { formula1: h, formula2: c } = await this._parseFormula(d, n, i), m = {
       range: {
@@ -2329,7 +2334,7 @@ let nn = class {
     (n = (r = ze(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(Ge.DEFAULT);
   }
 };
-nn = Do([
+nn = Vo([
   je(0, te),
   je(1, ue),
   je(2, M(zr)),
@@ -2340,38 +2345,38 @@ nn = Do([
 class Oo extends Se {
   constructor() {
     super(...arguments);
-    V(this, "id", j.CHECKBOX);
-    V(this, "canvasRender", this.injector.createInstance(nn));
-    V(this, "formulaInput", Jn);
+    D(this, "id", j.CHECKBOX);
+    D(this, "canvasRender", this.injector.createInstance(nn));
+    D(this, "formulaInput", Jn);
   }
 }
 class To extends Se {
   constructor() {
     super(...arguments);
-    V(this, "id", j.CUSTOM);
-    V(this, "formulaInput", qn);
+    D(this, "id", j.CUSTOM);
+    D(this, "formulaInput", qn);
   }
 }
 const Po = "data-validation.formula-input";
 class Ao extends Se {
   constructor() {
     super(...arguments);
-    V(this, "id", j.DATE);
-    V(this, "formulaInput", Po);
-    V(this, "optionsInput", Ot.componentKey);
-    V(this, "dropdownType", ve.DATE);
+    D(this, "id", j.DATE);
+    D(this, "formulaInput", Po);
+    D(this, "optionsInput", Ot.componentKey);
+    D(this, "dropdownType", ve.DATE);
   }
 }
 class Lo extends Se {
   constructor() {
     super(...arguments);
-    V(this, "id", j.DECIMAL);
-    V(this, "formulaInput", Pt);
+    D(this, "id", j.DECIMAL);
+    D(this, "formulaInput", Pt);
   }
 }
-const Vr = 4, ko = 0, Ht = 4, Dr = 4, rn = 6, Tt = 6, De = 14;
+const Dr = 4, ko = 0, Ht = 4, Vr = 4, rn = 6, Tt = 6, Ve = 14;
 function No(e, t) {
-  const r = gi.getTextSize(e, t), n = r.width + Vr * 2, { ba: i, bd: o } = r, a = i + o;
+  const r = pi.getTextSize(e, t), n = r.width + Dr * 2, { ba: i, bd: o } = r, a = i + o;
   return {
     width: n,
     height: a + ko * 2,
@@ -2379,16 +2384,16 @@ function No(e, t) {
   };
 }
 function $t(e, t, r, n) {
-  const i = De + rn * 2, o = r - i, a = n - Tt * 2, l = e.map((c) => ({
+  const i = Ve + rn * 2, o = r - i, a = n - Tt * 2, l = e.map((c) => ({
     layout: No(c, t),
     text: c
   }));
   let s;
   const d = [];
   l.forEach((c) => {
-    const { layout: m } = c, { width: g, height: b } = m;
-    !s || s.width + g + Ht > o ? (s = {
-      width: g,
+    const { layout: m } = c, { width: p, height: b } = m;
+    !s || s.width + p + Ht > o ? (s = {
+      width: p,
       height: b,
       items: [{
         ...c,
@@ -2397,11 +2402,11 @@ function $t(e, t, r, n) {
     }, d.push(s)) : (s.items.push({
       ...c,
       left: s.width + Ht
-    }), s.width = s.width + g + Ht);
+    }), s.width = s.width + p + Ht);
   });
   let u = 0, h = 0;
   return d.forEach((c, m) => {
-    h = Math.max(h, c.width), m === d.length - 1 ? u += c.height : u += c.height + Dr;
+    h = Math.max(h, c.width), m === d.length - 1 ? u += c.height : u += c.height + Vr;
   }), {
     lines: d,
     totalHeight: u,
@@ -2412,7 +2417,7 @@ function $t(e, t, r, n) {
   };
 }
 const Uo = 8;
-class Fo extends pi {
+class Fo extends gi {
   static drawWith(t, r) {
     const { fontString: n, info: i, fill: o, color: a } = r, { layout: l, text: s } = i;
     t.save(), cr.drawWith(t, {
@@ -2420,7 +2425,7 @@ class Fo extends pi {
       height: l.height,
       radius: Uo,
       fill: o || Ye
-    }), t.translateWithPrecision(Vr, l.ba), t.font = n, t.fillStyle = a, t.fillText(s, 0, 0), t.restore();
+    }), t.translateWithPrecision(Dr, l.ba), t.font = n, t.fillStyle = a, t.fillText(s, 0, 0), t.restore();
   }
 }
 var xo = Object.getOwnPropertyDescriptor, Bo = (e, t, r, n) => {
@@ -2431,8 +2436,8 @@ var xo = Object.getOwnPropertyDescriptor, Bo = (e, t, r, n) => {
 const Wo = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
 let on = class {
   constructor(e, t, r, n) {
-    V(this, "zIndex");
-    V(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
+    D(this, "zIndex");
+    D(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     this._commandService = e, this._univerInstanceService = t, this._renderManagerService = r, this._dataValidationModel = n;
   }
   _ensureMap(e) {
@@ -2443,14 +2448,14 @@ let on = class {
     return `${e}.${t}`;
   }
   _drawDownIcon(e, t, r, n, i) {
-    const o = r - De + 4;
+    const o = r - Ve + 4;
     let a = 4;
     switch (i) {
       case de.MIDDLE:
-        a = (n - De) / 2 + 4;
+        a = (n - Ve) / 2 + 4;
         break;
       case de.BOTTOM:
-        a = n - De + 4;
+        a = n - Ve + 4;
         break;
     }
     e.save(), e.translateWithPrecision(t.startX + o, t.startY + a), e.fillStyle = "#565656", e.fill(Wo), e.restore();
@@ -2458,7 +2463,7 @@ let on = class {
   // eslint-disable-next-line max-lines-per-function
   drawWith(e, t, r, n) {
     var ne, oe;
-    const { primaryWithCoord: i, row: o, col: a, style: l, data: s, subUnitId: d } = t, u = i.isMergedMainCell ? i.mergeInfo : i, h = s == null ? void 0 : s.fontRenderExtension, { leftOffset: c = 0, rightOffset: m = 0, topOffset: g = 0, downOffset: b = 0 } = h || {}, y = this._ensureMap(d), p = this._generateKey(o, a), C = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, o, a);
+    const { primaryWithCoord: i, row: o, col: a, style: l, data: s, subUnitId: d } = t, u = i.isMergedMainCell ? i.mergeInfo : i, h = s == null ? void 0 : s.fontRenderExtension, { leftOffset: c = 0, rightOffset: m = 0, topOffset: p = 0, downOffset: b = 0 } = h || {}, y = this._ensureMap(d), g = this._generateKey(o, a), C = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, o, a);
     if (!C)
       return;
     const v = this._dataValidationModel.getValidator(C.type);
@@ -2467,10 +2472,10 @@ let on = class {
     const I = {
       startX: u.startX + c,
       endX: u.endX - m,
-      startY: u.startY + g,
+      startY: u.startY + p,
       endY: u.endY - b
     }, w = I.endX - I.startX, _ = I.endY - I.startY, { cl: R } = l || {}, L = (ne = typeof R == "object" ? R == null ? void 0 : R.rgb : R) != null ? ne : "#000", N = Te(l != null ? l : void 0), { vt: E, ht: T } = l || {}, O = E != null ? E : de.MIDDLE, P = (oe = re(s)) != null ? oe : "", k = v.parseCellValue(P), H = v.getListWithColorMap(C), B = $t(k, N, w, _);
-    this._drawDownIcon(e, I, w, _, O), e.save(), e.translateWithPrecision(I.startX, I.startY), e.beginPath(), e.rect(0, 0, w - De, _), e.clip(), e.translateWithPrecision(rn, Tt);
+    this._drawDownIcon(e, I, w, _, O), e.save(), e.translateWithPrecision(I.startX, I.startY), e.beginPath(), e.rect(0, 0, w - Ve, _), e.clip(), e.translateWithPrecision(rn, Tt);
     let J = 0;
     switch (O) {
       case de.MIDDLE:
@@ -2492,7 +2497,7 @@ let on = class {
           q = (B.contentWidth - Z) / 2;
           break;
       }
-      e.translate(q, z * (fe + Dr)), Q.forEach((G) => {
+      e.translate(q, z * (fe + Vr)), Q.forEach((G) => {
         e.save(), e.translateWithPrecision(G.left, 0), Fo.drawWith(e, {
           ...N,
           info: G,
@@ -2500,10 +2505,10 @@ let on = class {
           fill: H[G.text]
         }), e.restore();
       }), e.restore();
-    }), e.restore(), y.set(p, {
+    }), e.restore(), y.set(g, {
       left: I.startX,
       top: I.startY,
-      width: B.contentWidth + rn + De,
+      width: B.contentWidth + rn + Ve,
       height: B.contentHeight + Tt * 2
     });
   }
@@ -2517,10 +2522,10 @@ let on = class {
     }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
     if (!m)
       return;
-    const g = this._dataValidationModel.getValidator(m.type);
-    if (!g)
+    const p = this._dataValidationModel.getValidator(m.type);
+    if (!p)
       return;
-    const b = c.endX - c.startX, y = c.endY - c.startY, p = (w = re(n)) != null ? w : "", C = g.parseCellValue(p), v = Te(r != null ? r : void 0);
+    const b = c.endX - c.startX, y = c.endY - c.startY, g = (w = re(n)) != null ? w : "", C = p.parseCellValue(g), v = Te(r != null ? r : void 0);
     return $t(C, v, b, y).cellAutoHeight;
   }
   calcCellAutoWidth(e) {
@@ -2533,15 +2538,15 @@ let on = class {
     }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
     if (!m)
       return;
-    const g = this._dataValidationModel.getValidator(m.type);
-    if (!g)
+    const p = this._dataValidationModel.getValidator(m.type);
+    if (!p)
       return;
-    const b = c.endX - c.startX, y = c.endY - c.startY, p = (w = re(n)) != null ? w : "", C = g.parseCellValue(p), v = Te(r != null ? r : void 0);
+    const b = c.endX - c.startX, y = c.endY - c.startY, g = (w = re(n)) != null ? w : "", C = p.parseCellValue(g), v = Te(r != null ? r : void 0);
     return $t(C, v, b, y).calcAutoWidth;
   }
   isHit(e, t) {
     const { primaryWithCoord: r } = t, n = r.isMergedMainCell ? r.mergeInfo : r, { endX: i } = n, { x: o } = e;
-    return o >= i - De && o <= i;
+    return o >= i - Ve && o <= i;
   }
   onPointerDown(e, t) {
     if (t.button === 2)
@@ -2572,9 +2577,9 @@ on = Bo([
 class Ho extends Se {
   constructor() {
     super(...arguments);
-    V(this, "id", j.LIST_MULTIPLE);
-    V(this, "canvasRender", this.injector.createInstance(on));
-    V(this, "dropdownType", ve.MULTIPLE_LIST);
+    D(this, "id", j.LIST_MULTIPLE);
+    D(this, "canvasRender", this.injector.createInstance(on));
+    D(this, "dropdownType", ve.MULTIPLE_LIST);
   }
 }
 var $o = Object.getOwnPropertyDescriptor, jo = (e, t, r, n) => {
@@ -2582,7 +2587,7 @@ var $o = Object.getOwnPropertyDescriptor, jo = (e, t, r, n) => {
     (a = e[o]) && (i = a(i) || i);
   return i;
 }, at = (e, t) => (r, n) => t(r, n, e);
-const Ve = 4, Ct = 4, pe = 14, xn = 1, _e = 6, Xe = 3, jt = 8, Yo = "#565656", Bn = 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 De = 4, Ct = 4, ge = 14, xn = 1, _e = 6, Xe = 3, jt = 8, Yo = "#565656", Bn = 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 Wn(e, t, r, n, i, o, a = !0) {
   let l = 0;
   const s = a ? Xe : 0;
@@ -2614,8 +2619,8 @@ function Wn(e, t, r, n, i, o, a = !0) {
 }
 let an = class {
   constructor(e, t, r, n, i) {
-    V(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
-    V(this, "zIndex");
+    D(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
+    D(this, "zIndex");
     this._univerInstanceService = e, this._localeService = t, this._commandService = r, this._renderManagerService = n, this._dataValidationModel = i;
   }
   _ensureMap(e) {
@@ -2626,7 +2631,7 @@ let an = class {
     return `${e}.${t}`;
   }
   _drawDownIcon(e, t, r, n, i, o, a) {
-    const { t: l = ae.pd.t, b: s = ae.pd.b } = a, d = r - pe;
+    const { t: l = ae.pd.t, b: s = ae.pd.b } = a, d = r - ge;
     let u;
     switch (o) {
       case de.MIDDLE:
@@ -2650,20 +2655,20 @@ let an = class {
     const h = this._dataValidationModel.getValidator(u.type);
     if (!h)
       return;
-    const c = l == null ? void 0 : l.fontRenderExtension, { leftOffset: m = 0, rightOffset: g = 0, topOffset: b = 0, downOffset: y = 0 } = c || {};
+    const c = l == null ? void 0 : l.fontRenderExtension, { leftOffset: m = 0, rightOffset: p = 0, topOffset: b = 0, downOffset: y = 0 } = c || {};
     if (!u || !h || !h || h.id.indexOf(j.LIST) !== 0 || !h.skipDefaultFontRender(u))
       return;
-    const p = {
+    const g = {
       startX: d.startX + m,
-      endX: d.endX - g,
+      endX: d.endX - p,
       startY: d.startY + b,
       endY: d.endY - y
-    }, C = p.endX - p.startX, v = p.endY - p.startY, I = this._ensureMap(s), w = this._generateKey(i, o), _ = h.getListWithColor(u), R = re(l), L = `${R != null ? R : ""}`, N = _.find((z) => z.label === L);
+    }, C = g.endX - g.startX, v = g.endY - g.startY, I = this._ensureMap(s), w = this._generateKey(i, o), _ = h.getListWithColor(u), R = re(l), L = `${R != null ? R : ""}`, N = _.find((z) => z.label === L);
     let { tb: E, vt: T, ht: O, pd: P } = a || {};
     E = E != null ? E : me.WRAP, T = T != null ? T : de.BOTTOM, O = O != null ? O : ae.ht, P = P != null ? P : ae.pd;
     const k = Te(a).fontCache;
     if (u.renderMode === se.ARROW) {
-      const { l: z = ae.pd.l, t: Z = ae.pd.t, r: fe = ae.pd.r, b: Q = ae.pd.b } = P, q = C - z - fe - pe - 4, G = new it(
+      const { l: z = ae.pd.l, t: Z = ae.pd.t, r: fe = ae.pd.r, b: Q = ae.pd.b } = P, q = C - z - fe - ge - 4, G = new it(
         L,
         k,
         E === me.WRAP,
@@ -2671,8 +2676,8 @@ let an = class {
         1 / 0
       );
       G.calculate();
-      const D = G.getTotalWidth(), U = G.getTotalHeight(), { paddingTop: f, paddingLeft: A } = Wn(q, v - Z - Q, D, U, T, O, !0);
-      this._drawDownIcon(e, p, C, v, U, T, P), e.save(), e.translateWithPrecision(p.startX + z, p.startY + Z), e.beginPath(), e.rect(0, 0, C - z - fe, v - Z - Q), e.clip(), e.translateWithPrecision(0, f), e.save(), e.translateWithPrecision(Ve, 0), e.beginPath(), e.rect(0, 0, q, U), e.clip(), Pn.drawWith(e, {
+      const V = G.getTotalWidth(), U = G.getTotalHeight(), { paddingTop: f, paddingLeft: A } = Wn(q, v - Z - Q, V, U, T, O, !0);
+      this._drawDownIcon(e, g, C, v, U, T, P), e.save(), e.translateWithPrecision(g.startX + z, g.startY + Z), e.beginPath(), e.rect(0, 0, C - z - fe, v - Z - Q), e.clip(), e.translateWithPrecision(0, f), e.save(), e.translateWithPrecision(De, 0), e.beginPath(), e.rect(0, 0, q, U), e.clip(), Pn.drawWith(e, {
         text: L,
         fontStyle: k,
         width: q,
@@ -2683,14 +2688,14 @@ let an = class {
         warp: E === me.WRAP,
         hAlign: Re.LEFT
       }, G), e.translateWithPrecision(A, 0), e.restore(), e.restore(), I.set(w, {
-        left: p.endX + z + r.rowHeaderWidth - pe,
-        top: p.startY + Z + r.columnHeaderHeight,
-        width: pe,
+        left: g.endX + z + r.rowHeaderWidth - ge,
+        top: g.startY + Z + r.columnHeaderHeight,
+        width: ge,
         height: v - Z - Q
       });
     } else {
-      e.save(), e.translateWithPrecision(p.startX, p.startY), e.beginPath(), e.rect(0, 0, C, v), e.clip();
-      const z = C - _e * 2 - Ve - pe - 4, Z = new it(
+      e.save(), e.translateWithPrecision(g.startX, g.startY), e.beginPath(), e.rect(0, 0, C, v), e.clip();
+      const z = C - _e * 2 - De - ge - 4, Z = new it(
         L,
         k,
         E === me.WRAP,
@@ -2698,13 +2703,13 @@ let an = class {
         1 / 0
       );
       Z.calculate();
-      const fe = Z.getTotalWidth(), Q = Z.getTotalHeight(), q = Q + xn * 2, G = Math.max(C - _e * 2, 1), { paddingTop: D, paddingLeft: U } = Wn(G, v, fe, q, T, O);
-      e.translateWithPrecision(_e, D), cr.drawWith(e, {
+      const fe = Z.getTotalWidth(), Q = Z.getTotalHeight(), q = Q + xn * 2, G = Math.max(C - _e * 2, 1), { paddingTop: V, paddingLeft: U } = Wn(G, v, fe, q, T, O);
+      e.translateWithPrecision(_e, V), cr.drawWith(e, {
         width: G,
         height: q,
         fill: (N == null ? void 0 : N.color) || Ye,
         radius: jt
-      }), e.save(), e.translateWithPrecision(Ve, xn), e.beginPath(), e.rect(0, 0, z, Q), e.clip(), e.translateWithPrecision(U, 0), Pn.drawWith(e, {
+      }), e.save(), e.translateWithPrecision(De, xn), e.beginPath(), e.rect(0, 0, z, Q), e.clip(), e.translateWithPrecision(U, 0), Pn.drawWith(e, {
         text: L,
         fontStyle: k,
         width: z,
@@ -2714,9 +2719,9 @@ let an = class {
         underline: !!((he = a == null ? void 0 : a.ul) != null && he.s),
         warp: E === me.WRAP,
         hAlign: Re.LEFT
-      }, Z), e.restore(), e.translateWithPrecision(z + Ve + 4, (Q - Ct) / 2), e.fillStyle = Yo, e.fill(Bn), e.restore(), I.set(w, {
-        left: p.startX + _e + r.rowHeaderWidth,
-        top: p.startY + D + r.columnHeaderHeight,
+      }, Z), e.restore(), e.translateWithPrecision(z + De + 4, (Q - Ct) / 2), e.fillStyle = Yo, e.fill(Bn), e.restore(), I.set(w, {
+        left: g.startX + _e + r.rowHeaderWidth,
+        top: g.startY + V + r.columnHeaderHeight,
         width: G,
         height: q
       });
@@ -2731,23 +2736,23 @@ let an = class {
       endX: a.endX - d,
       startY: a.startY + u,
       endY: a.endY - h
-    }, g = m.endX - m.startX, b = re(n), y = `${b != null ? b : ""}`;
-    let { tb: p, pd: C } = r || {};
+    }, p = m.endX - m.startX, b = re(n), y = `${b != null ? b : ""}`;
+    let { tb: g, pd: C } = r || {};
     const { t: v = ae.pd.t, b: I = ae.pd.b } = C != null ? C : {};
-    if (p = p != null ? p : me.WRAP, c.renderMode === se.ARROW) {
-      const w = g - pe, _ = new it(
+    if (g = g != null ? g : me.WRAP, c.renderMode === se.ARROW) {
+      const w = p - ge, _ = new it(
         y,
         Te(r).fontCache,
-        p === me.WRAP,
+        g === me.WRAP,
         w,
         1 / 0
       );
       return _.calculate(), _.getTotalHeight() + v + I + Xe * 2;
     } else {
-      const w = Math.max(g - _e * 2 - Ve - pe, 10), _ = new it(
+      const w = Math.max(p - _e * 2 - De - ge, 10), _ = new it(
         y,
         Te(r).fontCache,
-        p === me.WRAP,
+        g === me.WRAP,
         w,
         1 / 0
       );
@@ -2763,26 +2768,26 @@ let an = class {
       endX: a.endX - d,
       startY: a.startY + u,
       endY: a.endY - h
-    }, g = m.endX - m.startX, b = re(n), y = `${b != null ? b : ""}`;
-    let { tb: p, pd: C } = r || {};
+    }, p = m.endX - m.startX, b = re(n), y = `${b != null ? b : ""}`;
+    let { tb: g, pd: C } = r || {};
     const { l: v = ae.pd.l, r: I = ae.pd.r } = C != null ? C : {};
-    p = p != null ? p : me.WRAP;
-    let w = _e * 2 + pe;
+    g = g != null ? g : me.WRAP;
+    let w = _e * 2 + ge;
     switch (c.renderMode) {
       case se.ARROW:
-        w = pe + _e * 2 + I + v;
+        w = ge + _e * 2 + I + v;
         break;
       case se.CUSTOM:
-        w = pe + _e * 2 + Ve * 2 + I + v + jt / 2 + 1;
+        w = ge + _e * 2 + De * 2 + I + v + jt / 2 + 1;
         break;
       // default is CUSTOM
       default:
-        w = pe + _e * 2 + Ve * 2 + I + v + jt / 2 + 1;
+        w = ge + _e * 2 + De * 2 + I + v + jt / 2 + 1;
     }
-    const _ = g - w, R = new it(
+    const _ = p - w, R = new it(
       y,
       Te(r).fontCache,
-      p === me.WRAP,
+      g === me.WRAP,
       _,
       1 / 0
     );
@@ -2825,25 +2830,25 @@ an = jo([
 class Xo extends Se {
   constructor() {
     super(...arguments);
-    V(this, "id", j.LIST);
-    V(this, "canvasRender", this.injector.createInstance(an));
-    V(this, "dropdownType", ve.LIST);
-    V(this, "optionsInput", Dt.componentKey);
-    V(this, "formulaInput", dn);
+    D(this, "id", j.LIST);
+    D(this, "canvasRender", this.injector.createInstance(an));
+    D(this, "dropdownType", ve.LIST);
+    D(this, "optionsInput", Vt.componentKey);
+    D(this, "formulaInput", dn);
   }
 }
 class Zo extends Se {
   constructor() {
     super(...arguments);
-    V(this, "id", j.TEXT_LENGTH);
-    V(this, "formulaInput", Pt);
+    D(this, "id", j.TEXT_LENGTH);
+    D(this, "formulaInput", Pt);
   }
 }
 class Ko extends Se {
   constructor() {
     super(...arguments);
-    V(this, "id", j.WHOLE);
-    V(this, "formulaInput", Pt);
+    D(this, "id", j.WHOLE);
+    D(this, "formulaInput", Pt);
   }
 }
 var zo = Object.getOwnPropertyDescriptor, Go = (e, t, r, n) => {
@@ -2859,7 +2864,7 @@ let nt = class extends ln {
     [
       ["DataValidationIcon", Sr],
       [Et, bo],
-      [Dt.componentKey, Dt],
+      [Vt.componentKey, Vt],
       [Ot.componentKey, Ot],
       ...Xi
     ].forEach(([e, t]) => {
@@ -2887,7 +2892,7 @@ let nt = class extends ln {
 };
 nt = Go([
   Yt(0, M(ye)),
-  Yt(1, M(gn)),
+  Yt(1, M(pn)),
   Yt(2, M(Me))
 ], nt);
 var qo = Object.getOwnPropertyDescriptor, Jo = (e, t, r, n) => {
@@ -2934,7 +2939,7 @@ let Hn = (wt = class extends Kn {
   onReady() {
     this._injector.get(Qe), this._injector.get(et), this._injector.get(qe), this._injector.get(ht), this._injector.get(xe).registerRenderModule(
       X.UNIVER_SHEET,
-      [Vt]
+      [Dt]
     );
   }
   onRendered() {
@@ -2943,7 +2948,7 @@ let Hn = (wt = class extends Kn {
   onSteady() {
     this._injector.get(Je);
   }
-}, V(wt, "pluginName", Qo), V(wt, "type", X.UNIVER_SHEET), wt);
+}, D(wt, "pluginName", Qo), D(wt, "type", X.UNIVER_SHEET), wt);
 Hn = Jo([
   Xt(1, M(ye)),
   Xt(2, te),
@@ -2992,7 +2997,7 @@ let $n = (It = class extends Kn {
   onReady() {
     this._injector.get(Qe), this._injector.get(et), this._injector.get(xe).registerRenderModule(
       X.UNIVER_SHEET,
-      [Vt]
+      [Dt]
     );
   }
   onRendered() {
@@ -3001,7 +3006,7 @@ let $n = (It = class extends Kn {
   onSteady() {
     this._injector.get(Je);
   }
-}, V(It, "pluginName", na), V(It, "type", X.UNIVER_SHEET), It);
+}, D(It, "pluginName", na), D(It, "type", X.UNIVER_SHEET), It);
 $n = ta([
   Zt(1, M(ye)),
   Zt(2, te),