@univerjs/sheets-data-validation-ui 0.7.0-nightly.202505091607 → 0.7.0-nightly.202505111606

package/lib/es/index.js

@@ -1,33 +1,33 @@
 var Lr = Object.defineProperty;
 var kr = (e, t, r) => t in e ? Lr(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
 var E = (e, t, r) => kr(e, typeof t != "symbol" ? t + "" : t, r);
-import { LocaleService as se, isFormulaString as De, DataValidationType as G, Tools as Zt, Inject as b, Injector as we, Disposable as Re, UniverInstanceType as Y, toDisposable as Nr, IUniverInstanceService as le, DataValidationErrorStyle as lt, DataValidationStatus as je, ICommandService as J, IConfigService as cn, DataValidationRenderMode as ie, DisposableCollection as Ur, dayjs as Mn, numfmt as Yn, CellValueType as Fr, CommandType as nt, ObjectMatrix as Rt, Range as xr, Rectangle as yt, queryObjectMatrix as qt, Optional as $r, RxDisposable as un, InterceptorEffectEnum as Xn, sequenceExecute as zn, bufferDebounceTime as Br, debounce as Hr, UndoCommand as Wr, RedoCommand as jr, isUnitRangesEqual as Yr, shallowEqual as bn, ThemeService as Kn, ColorKit as Xr, VerticalAlign as ae, HorizontalAlign as Ye, DEFAULT_STYLES as re, WrapStrategy as Ie, DocumentDataModel as zr, BooleanNumber as rt, DEFAULT_EMPTY_DOCUMENT_VALUE as Kr, Plugin as Gn, merge as Zn } from "@univerjs/core";
-import { DataValidationFormulaController as Gr, deserializeListOptions as Zr, serializeListOptions as qn, CUSTOM_FORMULA_INPUT_NAME as Jn, BASE_FORMULA_INPUT_NAME as At, LIST_FORMULA_INPUT_NAME as hn, CHECKBOX_FORMULA_INPUT_NAME as Qn, SheetDataValidationModel as ee, SheetsDataValidationValidatorService as qr, getDataValidationCellValue as Ut, getCellValueOrigin as Q, createDefaultNewRule as er, AddSheetDataValidationCommand as pn, DATA_VALIDATION_PLUGIN_NAME as tr, getDataValidationDiffMutations as Jt, UpdateSheetDataValidationRangeCommand as nr, DataValidationCacheService as rr, UpdateSheetDataValidationSettingCommand as En, UpdateSheetDataValidationOptionsCommand as Jr, RemoveSheetDataValidationCommand as ir, RemoveSheetAllDataValidationCommand as Qr, DataValidationFormulaService as ei, CHECKBOX_FORMULA_2 as ti, CHECKBOX_FORMULA_1 as ni, getFormulaResult as Ft, isLegalFormulaResult as Dn, transformCheckboxValue as ri } from "@univerjs/sheets-data-validation";
-import { jsxs as W, Fragment as dt, jsx as _ } from "react/jsx-runtime";
-import { FormLayout as j, Input as Ve, Checkbox as Lt, clsx as Xe, borderClassName as Mt, RadioGroup as gn, Radio as Oe, DraggableList as ii, Dropdown as oi, Button as ze, Select as Vn } from "@univerjs/design";
-import { useDependency as U, useSidebarClick as or, useObservable as Te, useEvent as Qt, ISidebarService as ar, IDialogService as ai, IZenZoneService as sr, KeyCode as pt, MenuItemType as vn, getMenuHiddenObservable as si, RibbonStartGroup as li, IMenuManagerService as di, ComponentManager as mn } from "@univerjs/ui";
-import On, { useState as H, useRef as ht, forwardRef as Le, createElement as ke, useMemo as ct, useEffect as Pe } from "react";
-import { FormulaEditor as lr, RangeSelector as ci } from "@univerjs/sheets-formula-ui";
-import { DataValidatorRegistryService as ye, DataValidationModel as fn, DataValidatorDropdownType as pe, DataValidatorRegistryScope as ui, TWO_FORMULA_OPERATOR_COUNT as hi, getRuleOptions as Tn, getRuleSetting as Pn } from "@univerjs/data-validation";
-import { debounceTime as dr, filter as _n, BehaviorSubject as An, distinctUntilChanged as pi, Subject as gi, bufferTime as cr, of as vi } from "rxjs";
-import { DeviceInputEventType as gt, IRenderManagerService as Ne, fixLineWidthByScale as Ln, Transform as mi, CheckboxShape as fi, getCurrentTypeOfRenderer as Ke, CURSOR_TYPE as Ge, FontCache as _i, Shape as Si, Rect as ur, getFontStyleString as xt, getDocsSkeletonPageSize as it, Documents as Ci, DocumentViewModel as Ii, DocumentSkeleton as wi } from "@univerjs/engine-render";
-import { SheetInterceptorService as Sn, VALIDATE_CELL as Ri, SheetsSelectionsService as hr, SetRangeValuesCommand as st, getSheetCommandTarget as pr, rangeToDiscreteRange as yi, SheetPermissionCheckController as Mi, WorksheetEditPermission as en, WorksheetSetCellStylePermission as tn, RangeProtectionPermissionEditPoint as nn, WorkbookEditablePermission as rn, INTERCEPTOR_POINT as gr, InterceptCellContentPriority as vr, checkRangesEditablePermission as bi } from "@univerjs/sheets";
+import { LocaleService as se, isFormulaString as De, DataValidationType as G, Tools as Zt, Inject as b, Injector as we, Disposable as Re, UniverInstanceType as Y, toDisposable as Nr, IUniverInstanceService as le, DataValidationErrorStyle as lt, DataValidationStatus as je, ICommandService as J, IConfigService as dn, DataValidationRenderMode as ie, DisposableCollection as Ur, dayjs as Mn, numfmt as Yn, CellValueType as Fr, CommandType as nt, ObjectMatrix as Rt, Range as xr, Rectangle as yt, queryObjectMatrix as qt, Optional as $r, RxDisposable as un, InterceptorEffectEnum as Xn, sequenceExecute as zn, bufferDebounceTime as Br, debounce as Hr, UndoCommand as Wr, RedoCommand as jr, isUnitRangesEqual as Yr, shallowEqual as bn, ThemeService as Kn, ColorKit as Xr, VerticalAlign as ae, HorizontalAlign as Ye, DEFAULT_STYLES as re, WrapStrategy as Ie, DocumentDataModel as zr, BooleanNumber as rt, DEFAULT_EMPTY_DOCUMENT_VALUE as Kr, Plugin as Gn, merge as Zn } from "@univerjs/core";
+import { DataValidationFormulaController as Gr, deserializeListOptions as Zr, serializeListOptions as qn, CUSTOM_FORMULA_INPUT_NAME as Jn, BASE_FORMULA_INPUT_NAME as At, LIST_FORMULA_INPUT_NAME as hn, CHECKBOX_FORMULA_INPUT_NAME as Qn, SheetDataValidationModel as ee, SheetsDataValidationValidatorService as qr, getDataValidationCellValue as Ut, getCellValueOrigin as Q, createDefaultNewRule as er, AddSheetDataValidationCommand as gn, DATA_VALIDATION_PLUGIN_NAME as tr, getDataValidationDiffMutations as Jt, UpdateSheetDataValidationRangeCommand as nr, DataValidationCacheService as rr, UpdateSheetDataValidationSettingCommand as En, UpdateSheetDataValidationOptionsCommand as Jr, RemoveSheetDataValidationCommand as ir, RemoveSheetAllDataValidationCommand as Qr, DataValidationFormulaService as ei, CHECKBOX_FORMULA_2 as ti, CHECKBOX_FORMULA_1 as ni, getFormulaResult as Ft, isLegalFormulaResult as Dn, transformCheckboxValue as ri } from "@univerjs/sheets-data-validation";
+import { jsxs as W, Fragment as ct, jsx as _ } from "react/jsx-runtime";
+import { FormLayout as j, Input as Ve, Checkbox as Lt, clsx as Xe, borderClassName as Mt, RadioGroup as pn, Radio as Oe, DraggableList as ii, Dropdown as oi, Button as ze, Select as Vn } from "@univerjs/design";
+import { useDependency as U, useSidebarClick as or, useObservable as Te, useEvent as Qt, ISidebarService as ar, IDialogService as ai, IZenZoneService as sr, KeyCode as gt, MenuItemType as vn, getMenuHiddenObservable as si, RibbonStartGroup as li, IMenuManagerService as ci, ComponentManager as mn } from "@univerjs/ui";
+import On, { useState as H, useRef as ht, forwardRef as Le, createElement as ke, useMemo as dt, useEffect as Pe } from "react";
+import { FormulaEditor as lr, RangeSelector as di } from "@univerjs/sheets-formula-ui";
+import { DataValidatorRegistryService as ye, DataValidationModel as fn, DataValidatorDropdownType as ge, DataValidatorRegistryScope as ui, TWO_FORMULA_OPERATOR_COUNT as hi, getRuleOptions as Tn, getRuleSetting as Pn } from "@univerjs/data-validation";
+import { debounceTime as cr, filter as _n, BehaviorSubject as An, distinctUntilChanged as gi, Subject as pi, bufferTime as dr, of as vi } from "rxjs";
+import { DeviceInputEventType as pt, IRenderManagerService as Ne, fixLineWidthByScale as Ln, Transform as mi, CheckboxShape as fi, getCurrentTypeOfRenderer as Ke, CURSOR_TYPE as Ge, FontCache as _i, Shape as Si, Rect as ur, getFontStyleString as xt, getDocsSkeletonPageSize as it, Documents as Ci, DocumentViewModel as Ii, DocumentSkeleton as wi } from "@univerjs/engine-render";
+import { SheetInterceptorService as Sn, VALIDATE_CELL as Ri, SheetsSelectionsService as hr, SetRangeValuesCommand as st, getSheetCommandTarget as gr, rangeToDiscreteRange as yi, SheetPermissionCheckController as Mi, WorksheetEditPermission as en, WorksheetSetCellStylePermission as tn, RangeProtectionPermissionEditPoint as nn, WorkbookEditablePermission as rn, INTERCEPTOR_POINT as pr, InterceptCellContentPriority as vr, checkRangesEditablePermission as bi } from "@univerjs/sheets";
 import { getPatternType as Ei } from "@univerjs/sheets-numfmt";
 import { ISheetCellDropdownManagerService as Di, IEditorBridgeService as mr, SetCellEditVisibleOperation as vt, HoverManagerService as Vi, CellAlertManagerService as Oi, CellAlertType as Ti, IAutoFillService as Pi, APPLY_TYPE as ot, virtualizeDiscreteRanges as on, getAutoFillRepeatRange as Ai, ISheetClipboardService as Li, COPY_TYPE as kn, PREDEFINED_HOOK_NAME as mt, getRepeatRange as Nn, getCurrentRangeDisable$ as ki, AutoHeightController as fr, SheetSkeletonManagerService as bt, IMarkSelectionService as Ni } from "@univerjs/sheets-ui";
 import { deserializeRangeWithSheet as Ui, serializeRange as _r } from "@univerjs/engine-formula";
 const Fi = (e) => {
   const { isTwoFormula: t = !1, value: r, onChange: n, showError: i, validResult: o } = e, a = U(se), l = i ? o == null ? void 0 : o.formula1 : "", s = i ? o == null ? void 0 : o.formula2 : "";
-  return t ? /* @__PURE__ */ W(dt, { children: [
+  return t ? /* @__PURE__ */ W(ct, { children: [
     /* @__PURE__ */ _(j, { error: l, children: /* @__PURE__ */ _(
       Ve,
       {
         className: "univer-w-full",
         placeholder: a.t("dataValidation.panel.formulaPlaceholder"),
         value: r == null ? void 0 : r.formula1,
-        onChange: (d) => {
+        onChange: (c) => {
           n == null || n({
             ...r,
-            formula1: d
+            formula1: c
           });
         }
       }
@@ -39,10 +39,10 @@ const Fi = (e) => {
         className: "univer-w-full",
         placeholder: a.t("dataValidation.panel.formulaPlaceholder"),
         value: r == null ? void 0 : r.formula2,
-        onChange: (d) => {
+        onChange: (c) => {
           n == null || n({
             ...r,
-            formula2: d
+            formula2: c
           });
         }
       }
@@ -53,21 +53,21 @@ const Fi = (e) => {
       className: "univer-w-full",
       placeholder: a.t("dataValidation.panel.formulaPlaceholder"),
       value: r == null ? void 0 : r.formula1,
-      onChange: (d) => {
-        n == null || n({ formula1: d });
+      onChange: (c) => {
+        n == null || n({ formula1: c });
       }
     }
   ) });
 };
 function xi(e) {
-  const { value: t, onChange: r, showError: n, validResult: i } = e, o = U(se), a = n ? i == null ? void 0 : i.formula1 : "", l = n ? i == null ? void 0 : i.formula2 : "", [s, d] = H(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
-  return /* @__PURE__ */ W(dt, { children: [
+  const { value: t, onChange: r, showError: n, validResult: i } = e, o = U(se), a = n ? i == null ? void 0 : i.formula1 : "", l = n ? i == null ? void 0 : i.formula2 : "", [s, c] = H(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
+  return /* @__PURE__ */ W(ct, { children: [
     /* @__PURE__ */ _(j, { children: /* @__PURE__ */ _(
       Lt,
       {
         checked: s,
         onChange: (u) => {
-          u ? d(!0) : (d(!1), r == null || r({
+          u ? c(!0) : (c(!1), r == null || r({
             ...t,
             formula1: void 0,
             formula2: void 0
@@ -108,10 +108,10 @@ function xi(e) {
 }
 function $i(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 = ht(null), [d, u] = H(!1);
-  return or((c) => {
-    var p;
-    ((p = s.current) == null ? void 0 : p.isClickOutSide(c)) && u(!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 = ht(null), [c, u] = H(!1);
+  return or((d) => {
+    var g;
+    ((g = s.current) == null ? void 0 : g.isClickOutSide(d)) && u(!1);
   }), /* @__PURE__ */ _(j, { error: l, children: /* @__PURE__ */ _(
     lr,
     {
@@ -127,10 +127,10 @@ function $i(e) {
       initValue: (h = n == null ? void 0 : n.formula1) != null ? h : "=",
       unitId: t,
       subUnitId: r,
-      isFocus: d,
+      isFocus: c,
       isSupportAcrossSheet: !0,
-      onChange: (c) => {
-        const m = (c != null ? c : "").trim();
+      onChange: (d) => {
+        const m = (d != null ? d : "").trim();
         m !== (n == null ? void 0 : n.formula1) && (i == null || i({
           ...n,
           formula1: m
@@ -351,7 +351,7 @@ const He = "#ECECEC", qi = [
 };
 function Qi(e) {
   const { value: t, onChange: r = () => {
-  }, unitId: n, subUnitId: i, validResult: o, showError: a, ruleId: l } = e, { formula1: s = "", formula2: d = "" } = t || {}, [u, h] = H(() => De(s) ? "1" : "0"), [c, m] = H(u === "1" ? s : "="), [p, M] = H(u === "1" ? s : "="), y = U(se), g = U(ye), S = U(fn), v = U(Gr), [C, w] = H(() => d.split(",")), I = g.getValidatorItem(G.LIST), [R, T] = H([]), [N, D] = H(""), P = a ? o == null ? void 0 : o.formula1 : "", A = ct(() => S.ruleChange$.pipe(dr(16)), []), L = Te(A), V = Qt(r);
+  }, unitId: n, subUnitId: i, validResult: o, showError: a, ruleId: l } = e, { formula1: s = "", formula2: c = "" } = t || {}, [u, h] = H(() => De(s) ? "1" : "0"), [d, m] = H(u === "1" ? s : "="), [g, M] = H(u === "1" ? s : "="), y = U(se), p = U(ye), S = U(fn), v = U(Gr), [C, w] = H(() => c.split(",")), I = p.getValidatorItem(G.LIST), [R, T] = H([]), [N, D] = H(""), P = a ? o == null ? void 0 : o.formula1 : "", A = dt(() => S.ruleChange$.pipe(cr(16)), []), L = Te(A), V = Qt(r);
   Pe(() => {
     (async () => {
       await new Promise((f) => {
@@ -364,10 +364,10 @@ function Qi(e) {
       }
     })();
   }, [S, L, I, l, i, n]), Pe(() => {
-    De(s) && s !== p && (m(s), M(p));
-  }, [p, s]);
+    De(s) && s !== g && (m(s), M(g));
+  }, [g, s]);
   const [F, x] = H(() => {
-    const O = u !== "1" ? Zr(s) : [], B = d.split(",");
+    const O = u !== "1" ? Zr(s) : [], B = c.split(",");
     return O.map((f, k) => ({
       label: f,
       color: B[k] || He,
@@ -380,18 +380,18 @@ function Qi(e) {
   }, Z = (O) => {
     const B = F.findIndex((f) => f.id === O);
     B !== -1 && (F.splice(B, 1), x([...F]));
-  }, z = d.split(","), te = ct(() => R.map((O, B) => ({
+  }, z = c.split(","), te = dt(() => R.map((O, B) => ({
     label: O,
     color: z[B] || He,
     id: `${B}`,
     isRef: !0
-  })), [z, R]), ge = (O, B, f) => {
+  })), [z, R]), pe = (O, B, f) => {
     const k = [...C];
     k[+O] = f, w(k), V({
       formula1: s,
       formula2: k.join(",")
     });
-  }, de = () => {
+  }, ce = () => {
     x([
       ...F,
       {
@@ -420,34 +420,34 @@ function Qi(e) {
       formula1: qn(B.map((f) => f.label)),
       formula2: B.map((f) => f.color === He ? "" : f.color).join(",")
     });
-  }, [F, V, u, p, C]);
+  }, [F, V, u, g, C]);
   const ne = Qt(async (O) => {
     if (!De(O)) {
       V == null || V({
         formula1: "",
-        formula2: d
+        formula2: c
       });
       return;
     }
     v.getFormulaRefCheck(O) ? (V == null || V({
       formula1: De(O) ? O : "",
-      formula2: d
+      formula2: c
     }), D("")) : (V == null || V({
       formula1: "",
-      formula2: d
+      formula2: c
     }), m("="), D(y.t("dataValidation.validFail.formulaError")));
-  }), ce = ht(null), [Se, ve] = H(!1);
+  }), de = ht(null), [Se, ve] = H(!1);
   return or((O) => {
     var f;
-    ((f = ce.current) == null ? void 0 : f.isClickOutSide(O)) && ve(!1);
-  }), /* @__PURE__ */ W(dt, { children: [
+    ((f = de.current) == null ? void 0 : f.isClickOutSide(O)) && ve(!1);
+  }), /* @__PURE__ */ W(ct, { children: [
     /* @__PURE__ */ _(j, { label: y.t("dataValidation.list.options"), children: /* @__PURE__ */ W(
-      gn,
+      pn,
       {
         value: u,
         onChange: (O) => {
-          h(O), m(p), O === "1" && V({
-            formula1: p === "=" ? "" : p,
+          h(O), m(g), O === "1" && V({
+            formula1: g === "=" ? "" : g,
             formula2: C.join(",")
           });
         },
@@ -461,7 +461,7 @@ function Qi(e) {
       /* @__PURE__ */ _(
         lr,
         {
-          ref: ce,
+          ref: de,
           className: Xe(`
                               univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center
                               univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors
@@ -470,7 +470,7 @@ function Qi(e) {
                               dark:univer-bg-gray-700 dark:univer-text-white
                               hover:univer-border-primary-600
                             `, Mt),
-          initValue: c,
+          initValue: d,
           unitId: n,
           subUnitId: i,
           isFocus: Se,
@@ -486,7 +486,7 @@ function Qi(e) {
         Un,
         {
           item: O,
-          commonProps: { onItemChange: ge },
+          commonProps: { onItemChange: pe },
           style: { marginBottom: 12 }
         },
         O.id
@@ -522,7 +522,7 @@ function Qi(e) {
                                   univer-rounded univer-p-1 univer-px-2 univer-text-sm univer-text-primary
                                   hover:univer-bg-primary-600/5
                                 `,
-          onClick: de,
+          onClick: ce,
           children: [
             /* @__PURE__ */ _(Ir, { className: "univer-mr-1" }),
             y.t("dataValidation.list.add")
@@ -576,7 +576,7 @@ let _e = class extends Re {
   constructor(t, r) {
     super();
     E(this, "_open$", new An(!1));
-    E(this, "open$", this._open$.pipe(pi()));
+    E(this, "open$", this._open$.pipe(gi()));
     E(this, "_activeRule");
     E(this, "_activeRule$", new An(void 0));
     E(this, "activeRule$", this._activeRule$.asObservable());
@@ -636,12 +636,12 @@ let Ze = class extends Re {
       Ri,
       {
         handler: async (e, t, r) => {
-          const n = await e, { row: i, col: o, unitId: a, subUnitId: l } = t, s = this._dataValidationModel.getRuleIdByLocation(a, l, i, o), d = s ? this._dataValidationModel.getRuleById(a, l, s) : void 0;
+          const n = await e, { row: i, col: o, unitId: a, subUnitId: l } = t, s = this._dataValidationModel.getRuleIdByLocation(a, l, i, o), c = s ? this._dataValidationModel.getRuleById(a, l, s) : void 0;
           if (n === !1)
             return r(Promise.resolve(!1));
-          if (!d || d.errorStyle !== lt.STOP)
+          if (!c || c.errorStyle !== lt.STOP)
             return r(Promise.resolve(!0));
-          const u = this._dataValidatorRegistryService.getValidatorItem(d.type);
+          const u = this._dataValidatorRegistryService.getValidatorItem(c.type);
           return !u || await this._sheetsDataValidationValidatorService.validatorCell(a, l, i, o) === je.VALID ? r(Promise.resolve(!0)) : (this._dialogService.open({
             width: 368,
             title: {
@@ -649,7 +649,7 @@ let Ze = class extends Re {
             },
             id: "reject-input-dialog",
             children: {
-              title: u.getRuleFinalError(d, { row: i, col: o, unitId: a, subUnitId: l })
+              title: u.getRuleFinalError(c, { row: i, col: o, unitId: a, subUnitId: l })
             },
             footer: {
               title: On.createElement(
@@ -731,14 +731,14 @@ function uo(e, t) {
   }
 }
 let Ae = class extends Re {
-  constructor(t, r, n, i, o, a, l, s, d, u, h) {
+  constructor(t, r, n, i, o, a, l, s, c, u, h) {
     super();
     E(this, "_activeDropdown");
-    E(this, "_activeDropdown$", new gi());
+    E(this, "_activeDropdown$", new pi());
     E(this, "_currentPopup", null);
     E(this, "activeDropdown$", this._activeDropdown$.asObservable());
     E(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._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 = c, this._injector = u, this._configService = h, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
       this._activeDropdown$.complete();
     });
   }
@@ -770,24 +770,24 @@ let Ae = class extends Re {
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   showDropdown(t) {
-    var M, y, g, S;
+    var M, y, p, S;
     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;
     this._activeDropdown = t, this._activeDropdown$.next(this._activeDropdown);
-    const d = this._sheetDataValidationModel.getRuleByLocation(o, a, n, i);
-    if (!d)
+    const c = this._sheetDataValidationModel.getRuleByLocation(o, a, n, i);
+    if (!c)
       return;
-    const u = this._dataValidatorRegistryService.getValidatorItem(d.type);
+    const u = this._dataValidatorRegistryService.getValidatorItem(c.type);
     if (!(u != null && u.dropdownType))
       return;
     let h;
-    const c = async (v, C) => {
+    const d = async (v, C) => {
       var A, L, V;
       if (!v)
         return !0;
       const w = v, I = s.getCell(n, i), R = w.format(C === "date" ? "YYYY-MM-DD 00:00:00" : "YYYY-MM-DD HH:mm:ss"), T = (A = Yn.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 d.errorStyle !== lt.STOP || await u.validator({
+      return c.errorStyle !== lt.STOP || await u.validator({
         value: N,
         unitId: o,
         subUnitId: a,
@@ -797,11 +797,11 @@ let Ae = class extends Re {
         workbook: l,
         interceptValue: R.replace("Z", "").replace("T", " "),
         t: Fr.NUMBER
-      }, d) ? (await this._commandService.executeCommand(vt.id, {
+      }, c) ? (await this._commandService.executeCommand(vt.id, {
         visible: !1,
-        eventType: gt.Keyboard,
+        eventType: pt.Keyboard,
         unitId: o,
-        keycode: pt.ESC
+        keycode: gt.ESC
       }), await this._commandService.executeCommand(st.id, {
         unitId: o,
         subUnitId: a,
@@ -823,53 +823,53 @@ let Ae = class extends Re {
             }
           }
         }
-      }), !0) : (this._injector.has(Ze) && this._injector.get(Ze).showReject(u.getRuleFinalError(d, { row: n, col: i, unitId: o, subUnitId: a })), !1);
+      }), !0) : (this._injector.has(Ze) && this._injector.get(Ze).showReject(u.getRuleFinalError(c, { row: n, col: i, unitId: o, subUnitId: a })), !1);
     };
     let m;
     switch (u.dropdownType) {
-      case pe.DATE: {
-        const v = Q(s.getCellRaw(n, i)), C = $t(v), w = !!((M = d.bizInfo) != null && M.showTime);
+      case ge.DATE: {
+        const v = Q(s.getCellRaw(n, i)), C = $t(v), w = !!((M = c.bizInfo) != null && M.showTime);
         m = {
           location: r,
           type: "datepicker",
           props: {
             showTime: w,
-            onChange: (I) => c(I, w ? "datetime" : "date"),
+            onChange: (I) => d(I, w ? "datetime" : "date"),
             defaultValue: C,
             patternType: "date"
           }
         };
         break;
       }
-      case pe.TIME: {
+      case ge.TIME: {
         const v = Q(s.getCellRaw(n, i)), C = $t(v);
         m = {
           location: r,
           type: "datepicker",
           props: {
-            onChange: (w) => c(w, "time"),
+            onChange: (w) => d(w, "time"),
             defaultValue: C,
             patternType: "time"
           }
         };
         break;
       }
-      case pe.DATETIME: {
+      case ge.DATETIME: {
         const v = Q(s.getCellRaw(n, i)), C = $t(v);
         m = {
           location: r,
           type: "datepicker",
           props: {
-            onChange: (w) => c(w, "datetime"),
+            onChange: (w) => d(w, "datetime"),
             defaultValue: C,
             patternType: "datetime"
           }
         };
         break;
       }
-      case pe.LIST:
-      case pe.MULTIPLE_LIST: {
-        const v = u.dropdownType === pe.MULTIPLE_LIST, C = async (D) => {
+      case ge.LIST:
+      case ge.MULTIPLE_LIST: {
+        const v = u.dropdownType === ge.MULTIPLE_LIST, C = async (D) => {
           const P = qn(D), A = {
             unitId: o,
             subUnitId: a,
@@ -888,13 +888,13 @@ let Ae = class extends Re {
           };
           return this._editorBridgeService.isVisible().visible && await this._commandService.executeCommand(vt.id, {
             visible: !1,
-            eventType: gt.Keyboard,
+            eventType: pt.Keyboard,
             unitId: o,
-            keycode: pt.ESC
+            keycode: gt.ESC
           }), this._commandService.executeCommand(st.id, A), !v;
-        }, w = (d == null ? void 0 : d.renderMode) === ie.CUSTOM || (d == null ? void 0 : d.renderMode) === void 0, I = u.getListWithColor(d, o, a), R = Ut(s.getCellRaw(n, i)), T = () => {
+        }, w = (c == null ? void 0 : c.renderMode) === ie.CUSTOM || (c == null ? void 0 : c.renderMode) === void 0, I = u.getListWithColor(c, o, a), R = Ut(s.getCellRaw(n, i)), T = () => {
           this._commandService.executeCommand(Fe.id, {
-            ruleId: d.uid
+            ruleId: c.uid
           }), h == null || h.dispose();
         }, N = I.map((D) => ({
           label: D.label,
@@ -910,12 +910,12 @@ let Ae = class extends Re {
             onEdit: T,
             defaultValue: R,
             multiple: v,
-            showEdit: (g = (y = this._configService.getConfig(wn)) == null ? void 0 : y.showEditOnDropdown) != null ? g : !0
+            showEdit: (p = (y = this._configService.getConfig(wn)) == null ? void 0 : y.showEditOnDropdown) != null ? p : !0
           }
         };
         break;
       }
-      case pe.CASCADE: {
+      case ge.CASCADE: {
         m = {
           type: "cascader",
           props: {
@@ -938,19 +938,19 @@ let Ae = class extends Re {
               };
               return this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(vt.id, {
                 visible: !1,
-                eventType: gt.Keyboard,
+                eventType: pt.Keyboard,
                 unitId: o,
-                keycode: pt.ESC
+                keycode: gt.ESC
               }), this._commandService.syncExecuteCommand(st.id, w), !0;
             },
             defaultValue: Ut(s.getCellRaw(n, i)).split("/"),
-            options: JSON.parse((S = d.formula1) != null ? S : "[]")
+            options: JSON.parse((S = c.formula1) != null ? S : "[]")
           },
           location: r
         };
         break;
       }
-      case pe.COLOR: {
+      case ge.COLOR: {
         m = {
           type: "color",
           props: {
@@ -973,9 +973,9 @@ let Ae = class extends Re {
               };
               return this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(vt.id, {
                 visible: !1,
-                eventType: gt.Keyboard,
+                eventType: pt.Keyboard,
                 unitId: o,
-                keycode: pt.ESC
+                keycode: gt.ESC
               }), this._commandService.syncExecuteCommand(st.id, w), !0;
             },
             defaultValue: Ut(s.getCellRaw(n, i))
@@ -989,13 +989,13 @@ let Ae = class extends Re {
     }
     if (h = this._cellDropdownManagerService.showDropdown(m), !h)
       throw new Error("[DataValidationDropdownManagerService]: cannot show dropdown!");
-    const p = new Ur();
-    p.add(h), p.add({
+    const g = new Ur();
+    g.add(h), g.add({
       dispose: () => {
         var v, C;
         (C = (v = this._activeDropdown) == null ? void 0 : v.onHide) == null || C.call(v);
       }
-    }), this._currentPopup = p;
+    }), this._currentPopup = g;
   }
   hideDropdown() {
     this._activeDropdown && (this._currentPopup && this._currentPopup.dispose(), this._currentPopup = null, this._activeDropdown = null, this._activeDropdown$.next(null));
@@ -1010,8 +1010,8 @@ let Ae = class extends Re {
     const s = this._dataValidationModel.getRuleByLocation(a.getUnitId(), l.getSheetId(), n, i);
     if (!s)
       return;
-    const d = this._dataValidatorRegistryService.getValidatorItem(s.type);
-    if (!d || !d.dropdownType) {
+    const c = this._dataValidatorRegistryService.getValidatorItem(s.type);
+    if (!c || !c.dropdownType) {
       this.hideDropdown();
       return;
     }
@@ -1039,7 +1039,7 @@ Ae = co([
   ue(7, J),
   ue(8, mr),
   ue(9, b(we)),
-  ue(10, cn)
+  ue(10, dn)
 ], Ae);
 const Dt = "DataValidationPanel", Fe = {
   id: "data-validation.operation.open-validation-panel",
@@ -1047,22 +1047,22 @@ const Dt = "DataValidationPanel", Fe = {
   handler(e, t) {
     if (!t)
       return !1;
-    const { ruleId: r, isAdd: n } = t, i = e.get(_e), o = e.get(fn), a = e.get(le), l = e.get(ar), s = pr(a);
+    const { ruleId: r, isAdd: n } = t, i = e.get(_e), o = e.get(fn), a = e.get(le), l = e.get(ar), s = gr(a);
     if (!s) return !1;
-    const { unitId: d, subUnitId: u } = s, h = r ? o.getRuleById(d, u, r) : void 0;
+    const { unitId: c, subUnitId: u } = s, h = r ? o.getRuleById(c, u, r) : void 0;
     i.open(), i.setActiveRule(h && {
-      unitId: d,
+      unitId: c,
       subUnitId: u,
       rule: h
     });
-    const c = l.open({
+    const d = l.open({
       id: Dt,
       header: { title: n ? "dataValidation.panel.addTitle" : "dataValidation.panel.title" },
       children: { label: Dt },
       width: 312,
       onClose: () => i.close()
     });
-    return i.setCloseDisposable(c), !0;
+    return i.setCloseDisposable(d), !0;
   }
 }, Rn = {
   id: "data-validation.operation.close-validation-panel",
@@ -1101,20 +1101,20 @@ const Dt = "DataValidationPanel", Fe = {
   type: nt.COMMAND,
   id: "data-validation.command.addRuleAndOpen",
   handler(e) {
-    const t = e.get(le), r = pr(t);
+    const t = e.get(le), r = gr(t);
     if (!r) return !1;
-    const { workbook: n, worksheet: i } = r, o = er(e), a = e.get(J), l = n.getUnitId(), s = i.getSheetId(), d = {
+    const { workbook: n, worksheet: i } = r, o = er(e), a = e.get(J), l = n.getUnitId(), s = i.getSheetId(), c = {
       rule: o,
       unitId: l,
       subUnitId: s
     };
-    return a.syncExecuteCommand(pn.id, d) ? (a.syncExecuteCommand(Fe.id, {
+    return a.syncExecuteCommand(gn.id, c) ? (a.syncExecuteCommand(Fe.id, {
       ruleId: o.uid,
       isAdd: !0
     }), !0) : !1;
   }
 };
-var ho = Object.getOwnPropertyDescriptor, po = (e, t, r, n) => {
+var ho = Object.getOwnPropertyDescriptor, go = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? ho(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
@@ -1128,7 +1128,7 @@ let ut = class extends Re {
     this._initCellAlertPopup(), this._initZenService();
   }
   _initCellAlertPopup() {
-    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(dr(100)).subscribe((e) => {
+    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(cr(100)).subscribe((e) => {
       var t;
       if (e) {
         const r = this._univerInstanceService.getUnit(e.location.unitId, Y.UNIVER_SHEET), n = r.getSheetBySheetId(e.location.subUnitId);
@@ -1170,7 +1170,7 @@ let ut = class extends Re {
     }));
   }
 };
-ut = po([
+ut = go([
   $e(0, b(Vi)),
   $e(1, b(Oi)),
   $e(2, le),
@@ -1178,8 +1178,8 @@ ut = po([
   $e(4, sr),
   $e(5, b(ee))
 ], ut);
-var go = Object.getOwnPropertyDescriptor, vo = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? go(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+var po = Object.getOwnPropertyDescriptor, vo = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? po(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
 }, Bt = (e, t) => (r, n) => t(r, n, e);
@@ -1190,16 +1190,16 @@ let qe = class extends Re {
   // 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 = on([o, a]), [h, c] = u.ranges, { mapFunc: m } = u, p = {
+      const { source: o, target: a, unitId: l, subUnitId: s } = n, c = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = on([o, a]), [h, d] = u.ranges, { mapFunc: m } = u, g = {
         row: h.startRow,
         col: h.startColumn
-      }, M = Ai(h, c), y = new Rt(), g = /* @__PURE__ */ new Set();
+      }, M = Ai(h, d), y = new Rt(), p = /* @__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
+          startRow: g.row,
+          startColumn: g.col,
+          endColumn: g.col,
+          endRow: g.row
         }, D = {
           startRow: R.row,
           startColumn: R.col,
@@ -1224,12 +1224,12 @@ let qe = class extends Re {
             },
             D
           ), { row: Z, col: z } = m(X.startRow, X.startColumn);
-          y.setValue(Z, z, x), g.add(x);
+          y.setValue(Z, z, x), p.add(x);
         });
       });
-      const S = Array.from(g).map((I) => ({ id: I, ranges: qt(y, (R) => R === I) }));
-      d.addRangeRules(S);
-      const v = d.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: C, undoMutations: w } = Jt(l, s, v, this._injector, "patched", i === ot.ONLY_FORMAT);
+      const S = Array.from(p).map((I) => ({ id: I, ranges: qt(y, (R) => R === I) }));
+      c.addRangeRules(S);
+      const v = c.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: C, undoMutations: w } = Jt(l, s, v, this._injector, "patched", i === ot.ONLY_FORMAT);
       return {
         undos: w,
         redos: C
@@ -1240,8 +1240,8 @@ let qe = class extends Re {
         const { source: i, unitId: o, subUnitId: a } = n;
         for (const l of i.rows)
           for (const s of i.cols) {
-            const d = this._sheetDataValidationModel.getRuleByLocation(o, a, l, s);
-            if (d && d.type === G.CHECKBOX) {
+            const c = this._sheetDataValidationModel.getRuleByLocation(o, a, l, s);
+            if (c && c.type === G.CHECKBOX) {
               this._autoFillService.setDisableApplyType(ot.SERIES, !0);
               return;
             }
@@ -1275,8 +1275,8 @@ let Je = class extends Re {
       id: tr,
       onBeforeCopy: (t, r, n) => this._collect(t, r, n),
       onPasteCells: (t, r, n, i) => {
-        const { copyType: o = kn.COPY, pasteType: a } = i, { range: l } = t || {}, { range: s, unitId: d, subUnitId: u } = r;
-        return this._generateMutations(s, { copyType: o, pasteType: a, copyRange: l, unitId: d, subUnitId: u });
+        const { copyType: o = kn.COPY, pasteType: a } = i, { range: l } = t || {}, { range: s, unitId: c, subUnitId: u } = r;
+        return this._generateMutations(s, { copyType: o, pasteType: a, copyRange: l, unitId: c, subUnitId: u });
       }
     });
   }
@@ -1291,10 +1291,10 @@ let Je = class extends Re {
     if (!o)
       return;
     const { rows: a, cols: l } = o;
-    a.forEach((s, d) => {
+    a.forEach((s, c) => {
       l.forEach((u, h) => {
-        const c = this._sheetDataValidationModel.getRuleIdByLocation(t, r, s, u);
-        i.setValue(d, h, c != null ? c : "");
+        const d = this._sheetDataValidationModel.getRuleIdByLocation(t, r, s, u);
+        i.setValue(c, h, d != null ? d : "");
       });
     });
   }
@@ -1315,8 +1315,8 @@ let Je = class extends Re {
       return { redos: [], undos: [] };
     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 } = on([r.copyRange, t]), c = Nn(d, u, !0), m = /* @__PURE__ */ new Map();
-      c.forEach(({ startRange: g }) => {
+      const a = this._sheetDataValidationModel.getRuleObjectMatrix(r.unitId, r.subUnitId).clone(), l = new Rt(), s = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = on([r.copyRange, t]), d = Nn(c, u, !0), m = /* @__PURE__ */ new Map();
+      d.forEach(({ startRange: p }) => {
         var S;
         (S = this._copyInfo) == null || S.matrix.forValue((v, C, w) => {
           const I = yt.getPositionRange(
@@ -1326,15 +1326,15 @@ let Je = class extends Re {
               startColumn: C,
               endColumn: C
             },
-            g
+            p
           ), R = `${o}-${w}`, T = this._sheetDataValidationModel.getRuleById(i, o, w);
           !this._sheetDataValidationModel.getRuleById(r.unitId, r.subUnitId, R) && T && m.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: qt(l, (S) => S === g) }));
-      a.addRangeRules(p);
+      const g = Array.from(s).map((p) => ({ id: p, ranges: qt(l, (S) => S === p) }));
+      a.addRangeRules(g);
       const { redoMutations: M, undoMutations: y } = Jt(
         r.unitId,
         r.subUnitId,
@@ -1348,10 +1348,10 @@ let Je = class extends Re {
         undos: y
       };
     } else {
-      const a = this._sheetDataValidationModel.getRuleObjectMatrix(i, o).clone(), l = new Rt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = on([r.copyRange, t]);
-      Nn(d, u, !0).forEach(({ startRange: y }) => {
-        var g;
-        (g = this._copyInfo) == null || g.matrix.forValue((S, v, C) => {
+      const a = this._sheetDataValidationModel.getRuleObjectMatrix(i, o).clone(), l = new Rt(), s = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = on([r.copyRange, t]);
+      Nn(c, u, !0).forEach(({ startRange: y }) => {
+        var p;
+        (p = this._copyInfo) == null || p.matrix.forValue((S, v, C) => {
           const w = yt.getPositionRange(
             {
               startRow: S,
@@ -1364,9 +1364,9 @@ let Je = class extends Re {
           l.setValue(I, R, C), s.add(C);
         });
       });
-      const m = Array.from(s).map((y) => ({ id: y, ranges: qt(l, (g) => g === y) }));
+      const m = Array.from(s).map((y) => ({ id: y, ranges: qt(l, (p) => p === y) }));
       a.addRangeRules(m);
-      const { redoMutations: p, undoMutations: M } = Jt(
+      const { redoMutations: g, undoMutations: M } = Jt(
         i,
         o,
         a.diff(this._sheetDataValidationModel.getRules(i, o)),
@@ -1375,7 +1375,7 @@ let Je = class extends Re {
         !1
       );
       return {
-        redos: p,
+        redos: g,
         undos: M
       };
     }
@@ -1398,7 +1398,7 @@ let Qe = class extends Re {
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((e) => {
-        e.id === pn.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
+        e.id === gn.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
           workbookTypes: [rn],
           rangeTypes: [nn],
           worksheetTypes: [en, tn]
@@ -1469,8 +1469,8 @@ const Vr = {
   }
 };
 let et = class extends un {
-  constructor(e, t, r, n, i, o, a, l, s, d, u) {
-    super(), this._commandService = e, this._menuManagerService = t, this._renderManagerService = r, this._univerInstanceService = n, this._autoHeightController = i, this._dropdownManagerService = o, this._sheetDataValidationModel = a, this._dataValidatorRegistryService = l, this._sheetInterceptorService = s, this._dataValidationCacheService = d, this._editorBridgeService = u, this._initMenu(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
+  constructor(e, t, r, n, i, o, a, l, s, c, u) {
+    super(), this._commandService = e, this._menuManagerService = t, this._renderManagerService = r, this._univerInstanceService = n, this._autoHeightController = i, this._dropdownManagerService = o, this._sheetDataValidationModel = a, this._dataValidatorRegistryService = l, this._sheetInterceptorService = s, this._dataValidationCacheService = c, this._editorBridgeService = u, this._initMenu(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
   }
   _initMenu() {
     this._menuManagerService.mergeMenu(Ro);
@@ -1490,13 +1490,13 @@ let et = class extends un {
         const s = this._sheetDataValidationModel.getRuleByLocation(n, i, o, a);
         if (!s)
           return;
-        const d = this._dataValidatorRegistryService.getValidatorItem(s.type);
-        if (!(d != null && d.dropdownType))
+        const c = this._dataValidatorRegistryService.getValidatorItem(s.type);
+        if (!(c != null && c.dropdownType))
           return;
         const u = l.getActiveSheet();
         if (!u) return;
-        const h = this._dropdownManagerService.activeDropdown, c = h == null ? void 0 : h.location;
-        if (c && c.unitId === n && c.subUnitId === i && c.row === o && c.col === a)
+        const h = this._dropdownManagerService.activeDropdown, d = h == null ? void 0 : h.location;
+        if (d && d.unitId === n && d.subUnitId === i && d.row === o && d.col === a)
           return;
         this._dropdownManagerService.showDropdown(
           {
@@ -1519,26 +1519,26 @@ let et = class extends un {
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        gr.CELL_CONTENT,
+        pr.CELL_CONTENT,
         {
           effect: Xn.Style,
           // must be after numfmt
           priority: vr.DATA_VALIDATION,
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: (e, t, r) => {
-            var g, S, v, C, 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)
+            var p, S, v, C, w;
+            const { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = t, c = this._sheetDataValidationModel.getRuleIdByLocation(o, a, n, i);
+            if (!c)
               return r(e);
-            const u = this._sheetDataValidationModel.getRuleById(o, a, d);
+            const u = this._sheetDataValidationModel.getRuleById(o, a, c);
             if (!u)
               return r(e);
-            const h = (g = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? g : je.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = t.rawData;
-            let p;
+            const h = (p = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? p : je.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), m = t.rawData;
+            let g;
             const M = {
               get value() {
                 var I;
-                return p !== void 0 || (p = (I = Q(m)) != null ? I : null), p;
+                return g !== void 0 || (g = (I = Q(m)) != null ? I : null), g;
               }
             }, y = {
               get value() {
@@ -1554,15 +1554,15 @@ let et = class extends un {
               },
               customRender: [
                 ...(S = e == null ? void 0 : e.customRender) != null ? S : [],
-                ...c != null && c.canvasRender ? [c.canvasRender] : []
+                ...d != null && d.canvasRender ? [d.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                isSkip: ((v = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : v.isSkip) || ((C = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : C.call(c, u, M.value, t))
+                isSkip: ((v = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : v.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,
-                ...c == null ? void 0 : c.getExtraStyle(u, y.value, {
+                ...d == null ? void 0 : d.getExtraStyle(u, y.value, {
                   get style() {
                     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) || {};
@@ -1585,7 +1585,7 @@ let et = class extends un {
                   workbook: l,
                   worksheet: s
                 };
-                return (V = (L = c == null ? void 0 : c.canvasRender) == null ? void 0 : L.calcCellAutoHeight) == null ? void 0 : V.call(L, T);
+                return (V = (L = d == null ? void 0 : d.canvasRender) == null ? void 0 : L.calcCellAutoHeight) == null ? void 0 : V.call(L, T);
               },
               interceptorAutoWidth: () => {
                 var N, D, P, A, L, V;
@@ -1603,7 +1603,7 @@ let et = class extends un {
                   workbook: l,
                   worksheet: s
                 };
-                return (V = (L = c == null ? void 0 : c.canvasRender) == null ? void 0 : L.calcCellAutoWidth) == null ? void 0 : V.call(L, T);
+                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)
             });
@@ -1617,7 +1617,7 @@ let et = class extends un {
       // patched data-validation change don't need to re-calc row height
       // re-calc of row height will be triggered precisely by the origin command
       _n((e) => e.source === "command"),
-      cr(100)
+      dr(100)
     ).subscribe((e) => {
       if (e.length === 0)
         return;
@@ -1634,7 +1634,7 @@ let et = class extends un {
 };
 et = Dr([
   K(0, J),
-  K(1, di),
+  K(1, ci),
   K(2, Ne),
   K(3, le),
   K(4, b(fr)),
@@ -1652,21 +1652,21 @@ let xn = class extends un {
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        gr.CELL_CONTENT,
+        pr.CELL_CONTENT,
         {
           effect: Xn.Style,
           // must be after numfmt
           priority: vr.DATA_VALIDATION,
           // eslint-disable-next-line complexity
           handler: (e, t, r) => {
-            var y, g, S, v, C;
-            const { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = t, d = this._sheetDataValidationModel.getRuleIdByLocation(o, a, n, i);
-            if (!d)
+            var y, p, S, v, C;
+            const { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = t, c = this._sheetDataValidationModel.getRuleIdByLocation(o, a, n, i);
+            if (!c)
               return r(e);
-            const u = this._sheetDataValidationModel.getRuleById(o, a, d);
+            const u = this._sheetDataValidationModel.getRuleById(o, a, c);
             if (!u)
               return r(e);
-            const h = (y = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? y : je.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = s.getCellRaw(n, i), p = Q(m), M = `${p != null ? p : ""}`;
+            const h = (y = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? y : je.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), m = s.getCellRaw(n, i), g = Q(m), M = `${g != null ? g : ""}`;
             return r({
               ...e,
               markers: {
@@ -1674,16 +1674,16 @@ let xn = class extends un {
                 ...h === je.INVALID ? Vr : null
               },
               customRender: [
-                ...(g = e == null ? void 0 : e.customRender) != null ? g : [],
-                ...c != null && c.canvasRender ? [c.canvasRender] : []
+                ...(p = e == null ? void 0 : e.customRender) != null ? p : [],
+                ...d != null && d.canvasRender ? [d.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                isSkip: ((S = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : S.isSkip) || ((v = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : v.call(c, u, p, t))
+                isSkip: ((S = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : S.isSkip) || ((v = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : v.call(d, u, g, t))
               },
               interceptorStyle: {
                 ...e == null ? void 0 : e.interceptorStyle,
-                ...c == null ? void 0 : c.getExtraStyle(u, M, {
+                ...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) || {};
@@ -1706,7 +1706,7 @@ let xn = class extends un {
                   workbook: l,
                   worksheet: s
                 };
-                return (L = (A = c == null ? void 0 : c.canvasRender) == null ? void 0 : A.calcCellAutoHeight) == null ? void 0 : L.call(A, R);
+                return (L = (A = d == null ? void 0 : d.canvasRender) == null ? void 0 : A.calcCellAutoHeight) == null ? void 0 : L.call(A, R);
               },
               coverable: ((C = e == null ? void 0 : e.coverable) != null ? C : !0) && !(u.type === G.LIST || u.type === G.LIST_MULTIPLE)
             });
@@ -1718,7 +1718,7 @@ let xn = class extends un {
   _initAutoHeight() {
     this._sheetDataValidationModel.ruleChange$.pipe(
       _n((e) => e.source === "command"),
-      cr(16)
+      dr(16)
     ).subscribe((e) => {
       const t = [];
       if (e.forEach((r) => {
@@ -1770,14 +1770,15 @@ Vt = bo([
   $n(2, b(bt))
 ], Vt);
 function Eo(e) {
-  var d;
+  var c;
   const t = U(se), r = U(mn), { value: n, onChange: i, extraComponent: o } = e, [a, l] = H(!1), s = o ? r.get(o) : null;
-  return /* @__PURE__ */ W(dt, { children: [
+  return /* @__PURE__ */ W(ct, { children: [
     /* @__PURE__ */ W(
       "div",
       {
         className: `
                   univer-mb-3 univer-flex univer-cursor-pointer univer-items-center univer-text-sm univer-text-gray-900
+                  dark:univer-text-white
                 `,
         onClick: () => l(!a),
         children: [
@@ -1786,16 +1787,16 @@ function Eo(e) {
         ]
       }
     ),
-    a && /* @__PURE__ */ W(dt, { children: [
+    a && /* @__PURE__ */ W(ct, { children: [
       s ? /* @__PURE__ */ _(s, { value: n, onChange: i }) : null,
       /* @__PURE__ */ _(
         j,
         {
           label: t.t("dataValidation.panel.invalid"),
           children: /* @__PURE__ */ W(
-            gn,
+            pn,
             {
-              value: `${(d = n.errorStyle) != null ? d : lt.WARNING}`,
+              value: `${(c = n.errorStyle) != null ? c : lt.WARNING}`,
               onChange: (u) => i({ ...n, errorStyle: +u }),
               children: [
                 /* @__PURE__ */ _(Oe, { value: `${lt.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
@@ -1839,27 +1840,27 @@ function Vo(e, t, r) {
 }
 function Oo() {
   var O, B;
-  const [e, t] = H(0), r = U(_e), n = Te(r.activeRule$, r.activeRule), { unitId: i, subUnitId: o, rule: a } = n || {}, l = a.uid, s = U(ye), d = U(le), u = U(mn), h = U(J), c = U(fn), m = U(se), [p, M] = H(a), y = s.getValidatorItem(p.type), [g, S] = H(!1), v = s.getValidatorsByScope(ui.SHEET), [C, w] = H(() => p.ranges.map((f) => ({ unitId: "", sheetId: "", range: f }))), I = ct(() => Do(h), [h]), [R, T] = H(!1), [N, D] = H(!1), P = ht(null), A = U(hr);
+  const [e, t] = H(0), r = U(_e), n = Te(r.activeRule$, r.activeRule), { unitId: i, subUnitId: o, rule: a } = n || {}, l = a.uid, s = U(ye), c = U(le), u = U(mn), h = U(J), d = U(fn), m = U(se), [g, M] = H(a), y = s.getValidatorItem(g.type), [p, S] = H(!1), v = s.getValidatorsByScope(ui.SHEET), [C, w] = H(() => g.ranges.map((f) => ({ unitId: "", sheetId: "", range: f }))), I = dt(() => Do(h), [h]), [R, T] = H(!1), [N, D] = H(!1), P = ht(null), A = U(hr);
   if (Pe(() => () => {
     const f = A.getCurrentLastSelection();
     f && A.setSelections([f]);
   }, [A]), Pe(() => {
     h.onCommandExecuted((f) => {
       (f.id === Wr.id || f.id === jr.id) && setTimeout(() => {
-        const k = c.getRuleById(i, o, l);
+        const k = d.getRuleById(i, o, l);
         t(($) => $ + 1), k && (M(k), w(k.ranges.map(($) => ({ unitId: "", sheetId: "", range: $ }))));
       }, 20);
     });
-  }, [h, c, l, o, i]), !y)
+  }, [h, d, l, o, i]), !y)
     return null;
-  const L = y.operators, V = y.operatorNames, F = p.operator ? hi.includes(p.operator) : !1, x = () => {
+  const L = y.operators, V = y.operatorNames, F = g.operator ? hi.includes(g.operator) : !1, x = () => {
     var f, k, $;
-    (k = (f = P.current) == null ? void 0 : f.editor) != null && k.isFocus() && X(($ = P.current) == null ? void 0 : $.getValue()), !(!p.ranges.length || R) && (y.validatorFormula(p, i, o).success ? r.setActiveRule(null) : S(!0));
+    (k = (f = P.current) == null ? void 0 : f.editor) != null && k.isFocus() && X(($ = P.current) == null ? void 0 : $.getValue()), !(!g.ranges.length || R) && (y.validatorFormula(g, i, o).success ? r.setActiveRule(null) : S(!0));
   }, X = Qt((f) => {
     const k = f.split(",").filter(Boolean).map(Ui).map((q) => {
       const yn = q.sheetName;
       if (yn) {
-        const Ar = Vo(d, q.unitId, yn);
+        const Ar = Vo(c, q.unitId, yn);
         return { ...q, sheetId: Ar };
       }
       return {
@@ -1872,7 +1873,7 @@ function Oo() {
     w(k);
     const $ = k.filter((q) => (!q.unitId || q.unitId === i) && (!q.sheetId || q.sheetId === o)).map((q) => q.range);
     if (M({
-      ...p,
+      ...g,
       ranges: $
     }), $.length === 0)
       return;
@@ -1884,10 +1885,10 @@ function Oo() {
     };
     I(nr.id, Ce);
   }), Z = (f) => {
-    if (bn(f, Pn(p)))
+    if (bn(f, Pn(g)))
       return;
     M({
-      ...p,
+      ...g,
       ...f
     });
     const k = {
@@ -1908,20 +1909,20 @@ function Oo() {
       subUnitId: o
     }), r.setActiveRule(null);
   }, te = {
-    type: p.type,
-    operator: p.operator,
-    formula1: p.formula1,
-    formula2: p.formula2,
-    allowBlank: p.allowBlank
-  }, ge = (f) => {
+    type: g.type,
+    operator: g.operator,
+    formula1: g.formula1,
+    formula2: g.formula2,
+    allowBlank: g.allowBlank
+  }, pe = (f) => {
     const k = s.getValidatorItem(f);
     if (!k)
       return;
-    const $ = k.operators, Ce = c.getRuleById(i, o, l), q = f === (Ce == null ? void 0 : Ce.type) || f.includes("list") && (Ce != null && Ce.type.includes("list")) ? {
+    const $ = k.operators, Ce = d.getRuleById(i, o, l), q = f === (Ce == null ? void 0 : Ce.type) || f.includes("list") && (Ce != null && Ce.type.includes("list")) ? {
       ...Ce,
       type: f
     } : {
-      ...p,
+      ...g,
       type: f,
       operator: $[0],
       formula1: void 0,
@@ -1930,12 +1931,12 @@ function Oo() {
     M(q), h.executeCommand(En.id, {
       unitId: i,
       subUnitId: o,
-      ruleId: p.uid,
+      ruleId: g.uid,
       setting: Pn(q)
     });
-  }, de = u.get(y.formulaInput), ne = ct(() => C.map((f) => _r(f.range)).join(","), []), ce = Tn(p), Se = (f) => {
-    bn(f, Tn(p)) || (M({
-      ...p,
+  }, ce = u.get(y.formulaInput), ne = dt(() => C.map((f) => _r(f.range)).join(","), []), de = Tn(g), Se = (f) => {
+    bn(f, Tn(g)) || (M({
+      ...g,
       ...f
     }), I(
       Jr.id,
@@ -1946,15 +1947,15 @@ function Oo() {
         options: f
       }
     ));
-  }, ve = L.length && !p.operator;
+  }, ve = L.length && !g.operator;
   return /* @__PURE__ */ W("div", { className: "univer-py-4", children: [
     /* @__PURE__ */ _(
       j,
       {
         label: m.t("dataValidation.panel.range"),
-        error: !p.ranges.length || R ? m.t("dataValidation.panel.rangeError") : "",
+        error: !g.ranges.length || R ? m.t("dataValidation.panel.rangeError") : "",
         children: /* @__PURE__ */ _(
-          ci,
+          di,
           {
             selectorRef: P,
             unitId: i,
@@ -1977,19 +1978,19 @@ function Oo() {
       Vn,
       {
         className: "univer-w-full",
-        value: p.type,
+        value: g.type,
         options: (O = v == null ? void 0 : v.sort((f, k) => f.order - k.order)) == null ? void 0 : O.map((f) => ({
           label: m.t(f.title),
           value: f.id
         })),
-        onChange: ge
+        onChange: pe
       }
     ) }),
     L != null && L.length ? /* @__PURE__ */ _(j, { label: m.t("dataValidation.panel.operator"), children: /* @__PURE__ */ _(
       Vn,
       {
         className: "univer-w-full",
-        value: `${p.operator}`,
+        value: `${g.operator}`,
         options: [
           {
             value: "",
@@ -2008,13 +2009,13 @@ function Oo() {
         }
       }
     ) }) : null,
-    de && !ve ? /* @__PURE__ */ _(
-      de,
+    ce && !ve ? /* @__PURE__ */ _(
+      ce,
       {
         isTwoFormula: F,
         value: {
-          formula1: p.formula1,
-          formula2: p.formula2
+          formula1: g.formula1,
+          formula2: g.formula2
         },
         onChange: (f) => {
           Z({
@@ -2022,29 +2023,29 @@ function Oo() {
             ...f
           });
         },
-        showError: g,
-        validResult: y.validatorFormula(p, i, o),
+        showError: p,
+        validResult: y.validatorFormula(g, i, o),
         unitId: i,
         subUnitId: o,
         ruleId: l
       },
-      e + p.type
+      e + g.type
     ) : null,
     /* @__PURE__ */ _(j, { children: /* @__PURE__ */ _(
       Lt,
       {
-        checked: (B = p.allowBlank) != null ? B : !0,
+        checked: (B = g.allowBlank) != null ? B : !0,
         onChange: () => {
           var f;
           return Z({
             ...te,
-            allowBlank: !((f = p.allowBlank) == null || f)
+            allowBlank: !((f = g.allowBlank) == null || f)
           });
         },
         children: m.t("dataValidation.panel.allowBlank")
       }
     ) }),
-    /* @__PURE__ */ _(Eo, { value: ce, onChange: Se, extraComponent: y.optionsInput }),
+    /* @__PURE__ */ _(Eo, { value: de, onChange: Se, extraComponent: y.optionsInput }),
     /* @__PURE__ */ W("div", { className: "univer-mt-5 univer-flex univer-flex-row univer-justify-end", children: [
       /* @__PURE__ */ _(ze, { className: "univer-ml-3", onClick: z, children: m.t("dataValidation.panel.removeRule") }),
       /* @__PURE__ */ _(ze, { className: "univer-ml-3", variant: "primary", onClick: x, children: m.t("dataValidation.panel.done") })
@@ -2052,23 +2053,23 @@ function Oo() {
   ] });
 }
 const To = (e) => {
-  const { rule: t, onClick: r, unitId: n, subUnitId: i, disable: o } = e, a = U(ye), l = U(J), s = U(Ni), d = a.getValidatorItem(t.type), u = ht(void 0), [h, c] = H(!1), m = U(Kn), p = Te(m.currentTheme$), M = ct(() => {
+  const { rule: t, onClick: r, unitId: n, subUnitId: i, disable: o } = e, a = U(ye), l = U(J), s = U(Ni), c = a.getValidatorItem(t.type), u = ht(void 0), [h, d] = H(!1), m = U(Kn), g = Te(m.currentTheme$), M = dt(() => {
     var w;
-    const g = m.getColorFromTheme("primary.600"), S = m.getColorFromTheme("loop-color.2"), v = (w = m.getColorFromTheme(S)) != null ? w : g, C = new Xr(v).toRgb();
+    const p = m.getColorFromTheme("primary.600"), S = m.getColorFromTheme("loop-color.2"), v = (w = m.getColorFromTheme(S)) != null ? w : p, C = new Xr(v).toRgb();
     return {
       fill: `rgba(${C.r}, ${C.g}, ${C.b}, 0.1)`,
       stroke: v
     };
-  }, [p]), y = (g) => {
+  }, [g]), y = (p) => {
     l.executeCommand(ir.id, {
       ruleId: t.uid,
       unitId: n,
       subUnitId: i
-    }), g.stopPropagation();
+    }), p.stopPropagation();
   };
   return Pe(() => () => {
-    var g;
-    u.current && ((g = u.current) == null || g.forEach((S) => {
+    var p;
+    u.current && ((p = u.current) == null || p.forEach((S) => {
       S && s.removeShape(S);
     }));
   }, [s]), /* @__PURE__ */ W(
@@ -2087,15 +2088,15 @@ const To = (e) => {
       ),
       onClick: r,
       onMouseEnter: () => {
-        o || (c(!0), u.current = t.ranges.map((g) => s.addShape({
-          range: g,
+        o || (d(!0), u.current = t.ranges.map((p) => s.addShape({
+          range: p,
           style: M,
           primary: null
         })));
       },
       onMouseLeave: () => {
-        var g;
-        c(!1), (g = u.current) == null || g.forEach((S) => {
+        var p;
+        d(!1), (p = u.current) == null || p.forEach((S) => {
           S && s.removeShape(S);
         }), u.current = void 0;
       },
@@ -2104,19 +2105,17 @@ const To = (e) => {
           "div",
           {
             className: `
-                  univer-overflow-hidden univer-text-ellipsis univer-text-sm univer-font-medium univer-leading-[22px]
-                  univer-text-gray-900
+                  univer-truncate univer-text-sm univer-font-medium univer-leading-[22px] univer-text-gray-900
+                  dark:univer-text-white
                 `,
-            children: d == null ? void 0 : d.generateRuleName(t)
+            children: c == null ? void 0 : c.generateRuleName(t)
           }
         ),
         /* @__PURE__ */ _(
           "div",
           {
-            className: `
-                  univer-text-secondary univer-overflow-hidden univer-text-ellipsis univer-text-xs univer-leading-[18px]
-                `,
-            children: t.ranges.map((g) => _r(g)).join(",")
+            className: "univer-text-secondary univer-truncate univer-text-xs univer-leading-[18px]",
+            children: t.ranges.map((p) => _r(p)).join(",")
           }
         ),
         h ? /* @__PURE__ */ _(
@@ -2136,36 +2135,36 @@ const To = (e) => {
   );
 };
 function Po(e) {
-  const t = U(ee), r = U(le), n = U(J), i = U(we), o = U(_e), a = U(se), [l, s] = H([]), { workbook: d } = e, u = Te(d.activeSheet$, void 0, !0), h = d.getUnitId(), c = u == null ? void 0 : u.getSheetId();
+  const t = U(ee), r = U(le), n = U(J), i = U(we), o = 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, c));
+    s(t.getRules(h, d));
     const S = t.ruleChange$.subscribe((v) => {
-      v.unitId === h && v.subUnitId === c && s(t.getRules(h, c));
+      v.unitId === h && v.subUnitId === d && s(t.getRules(h, d));
     });
     return () => {
       S.unsubscribe();
     };
-  }, [h, c, t]);
+  }, [h, d, t]);
   const m = async () => {
     const S = er(i), v = {
       unitId: h,
-      subUnitId: c,
+      subUnitId: d,
       rule: S
     };
-    await n.executeCommand(pn.id, v), o.setActiveRule({
+    await n.executeCommand(gn.id, v), o.setActiveRule({
       unitId: h,
-      subUnitId: c,
+      subUnitId: d,
       rule: S
     });
-  }, p = () => {
+  }, g = () => {
     n.executeCommand(Qr.id, {
       unitId: h,
-      subUnitId: c
+      subUnitId: d
     });
   }, y = ((S) => {
     const v = r.getCurrentUnitForType(Y.UNIVER_SHEET), C = v.getActiveSheet(), w = v.getUnitId(), I = C.getSheetId();
     return S.map((T) => bi(i, w, I, T.ranges) ? { ...T } : { ...T, disable: !0 });
-  })(l), g = y == null ? void 0 : y.some((S) => S.disable);
+  })(l), p = y == null ? void 0 : y.some((S) => S.disable);
   return /* @__PURE__ */ W("div", { className: "univer-pb-4", children: [
     y == null ? void 0 : y.map((S) => {
       var v;
@@ -2173,11 +2172,11 @@ function Po(e) {
         To,
         {
           unitId: h,
-          subUnitId: c,
+          subUnitId: d,
           onClick: () => {
             S.disable || o.setActiveRule({
               unitId: h,
-              subUnitId: c,
+              subUnitId: d,
               rule: S
             });
           },
@@ -2188,7 +2187,7 @@ function Po(e) {
       );
     }),
     /* @__PURE__ */ W("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,
+      l.length && !p ? /* @__PURE__ */ _(ze, { onClick: g, children: a.t("dataValidation.panel.removeAll") }) : null,
       /* @__PURE__ */ _(ze, { variant: "primary", onClick: m, children: a.t("dataValidation.panel.add") })
     ] })
   ] });
@@ -2208,7 +2207,7 @@ const Ao = () => {
 function Ot(e) {
   var i;
   const { value: t, onChange: r } = e, n = U(se);
-  return /* @__PURE__ */ _(j, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ W(gn, { value: `${(i = t.renderMode) != null ? i : ie.CUSTOM}`, onChange: (o) => r({ ...t, renderMode: +o }), children: [
+  return /* @__PURE__ */ _(j, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ W(pn, { value: `${(i = t.renderMode) != null ? i : ie.CUSTOM}`, onChange: (o) => r({ ...t, renderMode: +o }), children: [
     /* @__PURE__ */ _(Oe, { value: `${ie.CUSTOM}`, children: n.t("dataValidation.renderMode.chip") }),
     /* @__PURE__ */ _(Oe, { value: `${ie.ARROW}`, children: n.t("dataValidation.renderMode.arrow") }),
     /* @__PURE__ */ _(Oe, { value: `${ie.TEXT}`, children: n.t("dataValidation.renderMode.text") })
@@ -2248,8 +2247,8 @@ let an = class {
     this._commandService = e, this._univerInstanceService = t, this._formulaService = r, this._themeService = n, this._renderManagerService = i, this._dataValidationModel = o;
   }
   _calc(e, t) {
-    var d, u, h;
-    const { vt: r, ht: n } = t || {}, i = e.endX - e.startX - ft * 2, o = e.endY - e.startY, a = ((d = t == null ? void 0 : t.fs) != null ? d : 10) * 1.6;
+    var c, u, h;
+    const { vt: r, ht: n } = t || {}, i = e.endX - e.startX - ft * 2, o = e.endY - e.startY, a = ((c = t == null ? void 0 : t.fs) != null ? c : 10) * 1.6;
     let l = 0, s = 0;
     switch (r) {
       case ae.TOP:
@@ -2291,23 +2290,23 @@ let an = 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, p, M, y, g;
-    const { formula1: n = ni, formula2: i = ti } = e, o = await this._formulaService.getRuleFormulaResult(t, r, e.uid), a = Ft((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 = Ft((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 = Dn(String(a)) && Dn(String(l));
+    var c, u, h, d, m, g, M, y, p;
+    const { formula1: n = ni, formula2: i = ti } = e, o = await this._formulaService.getRuleFormulaResult(t, r, e.uid), a = Ft((h = (u = (c = o == null ? void 0 : o[0]) == null ? void 0 : c.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), l = Ft((g = (m = (d = o == null ? void 0 : o[1]) == null ? void 0 : d.result) == null ? void 0 : m[0]) == null ? void 0 : g[0]), s = Dn(String(a)) && Dn(String(l));
     return {
-      formula1: De(n) ? Ft((g = (y = (M = o == null ? void 0 : o[0]) == null ? void 0 : M.result) == null ? void 0 : y[0]) == null ? void 0 : g[0]) : n,
+      formula1: De(n) ? Ft((p = (y = (M = o == null ? void 0 : o[0]) == null ? void 0 : M.result) == null ? void 0 : y[0]) == null ? void 0 : p[0]) : n,
       formula2: De(i) ? l : i,
       isFormulaValid: s
     };
   }
   drawWith(e, t) {
     var P, A, L, V;
-    const { style: r, primaryWithCoord: n, unitId: i, subUnitId: o, worksheet: a, row: l, col: s } = t, d = n.isMergedMainCell ? n.mergeInfo : n, u = Q(a.getCellRaw(l, s)), h = this._dataValidationModel.getRuleByLocation(i, o, l, s);
+    const { style: r, primaryWithCoord: n, unitId: i, subUnitId: o, worksheet: a, row: l, col: s } = t, c = n.isMergedMainCell ? n.mergeInfo : n, u = Q(a.getCellRaw(l, s)), h = this._dataValidationModel.getRuleByLocation(i, o, l, s);
     if (!h)
       return;
-    const c = this._dataValidationModel.getValidator(h.type);
-    if (!c || !((P = c.skipDefaultFontRender) != null && P.call(c, h, u, { unitId: i, subUnitId: o, row: l, column: s })))
+    const d = this._dataValidationModel.getValidator(h.type);
+    if (!d || !((P = d.skipDefaultFontRender) != null && P.call(d, h, u, { unitId: i, subUnitId: o, row: l, column: s })))
       return;
-    const m = c.parseFormulaSync(h, i, o), { formula1: p } = m, M = this._calc(d, r), { a: y, d: g } = e.getTransform(), S = Ln(M.left, y), v = Ln(M.top, g), C = mi.create().composeMatrix({
+    const m = d.parseFormulaSync(h, i, o), { formula1: g } = m, M = this._calc(c, r), { a: y, d: p } = e.getTransform(), S = Ln(M.left, y), v = Ln(M.top, p), C = mi.create().composeMatrix({
       left: S,
       top: v,
       scaleX: 1,
@@ -2317,11 +2316,11 @@ let an = class {
       skewY: 0,
       flipX: !1,
       flipY: !1
-    }), w = d.endX - d.startX, I = d.endY - d.startY;
-    e.save(), e.beginPath(), e.rect(d.startX, d.startY, w, I), e.clip();
+    }), 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");
+    const T = ((A = r == null ? void 0 : r.fs) != null ? A : 10) * 1.6, N = String(u) === String(g), D = this._themeService.getColorFromTheme("primary.600");
     fi.drawWith(e, {
       checked: N,
       width: T,
@@ -2330,20 +2329,20 @@ let an = class {
     }), e.restore();
   }
   isHit(e, t) {
-    const r = t.primaryWithCoord.isMergedMainCell ? t.primaryWithCoord.mergeInfo : t.primaryWithCoord, n = this._calc(r, t.style), i = n.top, o = n.top + n.height, a = n.left, l = n.left + n.width, { x: s, y: d } = e;
-    return s <= l && s >= a && d <= o && d >= i;
+    const r = t.primaryWithCoord.isMergedMainCell ? t.primaryWithCoord.mergeInfo : t.primaryWithCoord, n = this._calc(r, t.style), i = n.top, o = n.top + n.height, a = n.left, l = n.left + n.width, { x: s, y: c } = e;
+    return s <= l && s >= a && c <= o && c >= i;
   }
   async onPointerDown(e, t) {
-    var p;
+    var g;
     if (t.button === 2)
       return;
-    const { primaryWithCoord: r, unitId: n, subUnitId: i, worksheet: o, row: a, col: l } = e, s = Q(o.getCellRaw(a, l)), d = this._dataValidationModel.getRuleByLocation(n, i, a, l);
-    if (!d)
+    const { primaryWithCoord: r, unitId: n, subUnitId: i, worksheet: o, row: a, col: l } = e, s = Q(o.getCellRaw(a, l)), c = this._dataValidationModel.getRuleByLocation(n, i, a, l);
+    if (!c)
       return;
-    const u = this._dataValidationModel.getValidator(d.type);
-    if (!u || !((p = u.skipDefaultFontRender) != null && p.call(u, d, s, { unitId: n, subUnitId: i, row: a, column: l })))
+    const u = this._dataValidationModel.getValidator(c.type);
+    if (!u || !((g = u.skipDefaultFontRender) != null && g.call(u, c, s, { unitId: n, subUnitId: i, row: a, column: l })))
       return;
-    const { formula1: h, formula2: c } = await this._parseFormula(d, n, i), m = {
+    const { formula1: h, formula2: d } = await this._parseFormula(c, n, i), m = {
       range: {
         startColumn: r.actualColumn,
         endColumn: r.actualColumn,
@@ -2351,7 +2350,7 @@ let an = class {
         endRow: r.actualRow
       },
       value: {
-        v: String(s) === ri(String(h)) ? c : h,
+        v: String(s) === ri(String(h)) ? d : h,
         p: null
       }
     };
@@ -2399,7 +2398,7 @@ class Bo extends fe {
     E(this, "id", G.DATE);
     E(this, "formulaInput", $o);
     E(this, "optionsInput", Tt.componentKey);
-    E(this, "dropdownType", pe.DATE);
+    E(this, "dropdownType", ge.DATE);
   }
 }
 class Ho extends fe {
@@ -2419,31 +2418,31 @@ function jo(e, t) {
   };
 }
 function Yt(e, t, r, n) {
-  const i = Ee + sn * 2, o = r - i, a = n - Pt * 2, l = e.map((c) => ({
-    layout: jo(c, t),
-    text: c
+  const i = Ee + sn * 2, o = r - i, a = n - Pt * 2, l = e.map((d) => ({
+    layout: jo(d, t),
+    text: d
   }));
   let s;
-  const d = [];
-  l.forEach((c) => {
-    const { layout: m } = c, { width: p, height: M } = m;
-    !s || s.width + p + jt > o ? (s = {
-      width: p,
+  const c = [];
+  l.forEach((d) => {
+    const { layout: m } = d, { width: g, height: M } = m;
+    !s || s.width + g + jt > o ? (s = {
+      width: g,
       height: M,
       items: [{
-        ...c,
+        ...d,
         left: 0
       }]
-    }, d.push(s)) : (s.items.push({
-      ...c,
+    }, c.push(s)) : (s.items.push({
+      ...d,
       left: s.width + jt
-    }), s.width = s.width + p + jt);
+    }), s.width = s.width + g + jt);
   });
   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 + Tr;
+  return c.forEach((d, m) => {
+    h = Math.max(h, d.width), m === c.length - 1 ? u += d.height : u += d.height + Tr;
   }), {
-    lines: d,
+    lines: c,
     totalHeight: u,
     contentWidth: o,
     contentHeight: a,
@@ -2498,16 +2497,16 @@ let ln = class {
   // eslint-disable-next-line max-lines-per-function
   drawWith(e, t, r, n) {
     var Z, z;
-    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: M = 0 } = h || {}, y = this._ensureMap(d), g = this._generateKey(o, a), S = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, o, a);
+    const { primaryWithCoord: i, row: o, col: a, style: l, data: s, subUnitId: c } = t, u = i.isMergedMainCell ? i.mergeInfo : i, h = s == null ? void 0 : s.fontRenderExtension, { leftOffset: d = 0, rightOffset: m = 0, topOffset: g = 0, downOffset: M = 0 } = h || {}, y = this._ensureMap(c), p = this._generateKey(o, a), S = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, o, a);
     if (!S)
       return;
     const v = this._dataValidationModel.getValidator(S.type);
     if (!v)
       return;
     const C = {
-      startX: u.startX + c,
+      startX: u.startX + d,
       endX: u.endX - m,
-      startY: u.startY + p,
+      startY: u.startY + g,
       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 = xt(l != null ? l : void 0), { vt: D, ht: P } = l || {}, A = D != null ? D : ae.MIDDLE, L = (z = Q(s)) != null ? z : "", V = v.parseCellValue(L), F = v.getListWithColorMap(S), x = Yt(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(sn, Pt);
@@ -2520,19 +2519,19 @@ let ln = class {
         X = x.contentHeight - x.totalHeight;
         break;
     }
-    e.translateWithPrecision(0, X), x.lines.forEach((te, ge) => {
+    e.translateWithPrecision(0, X), x.lines.forEach((te, pe) => {
       e.save();
-      const { width: de, height: ne, items: ce } = te;
+      const { width: ce, height: ne, items: de } = te;
       let Se = 0;
       switch (P) {
         case Ye.RIGHT:
-          Se = x.contentWidth - de;
+          Se = x.contentWidth - ce;
           break;
         case Ye.CENTER:
-          Se = (x.contentWidth - de) / 2;
+          Se = (x.contentWidth - ce) / 2;
           break;
       }
-      e.translate(Se, ge * (ne + Tr)), ce.forEach((ve) => {
+      e.translate(Se, pe * (ne + Tr)), de.forEach((ve) => {
         e.save(), e.translateWithPrecision(ve.left, 0), Xo.drawWith(e, {
           ...N,
           info: ve,
@@ -2540,7 +2539,7 @@ let ln = class {
           fill: F[ve.text]
         }), e.restore();
       }), e.restore();
-    }), e.restore(), y.set(g, {
+    }), e.restore(), y.set(p, {
       left: C.startX,
       top: C.startY,
       width: x.contentWidth + sn + Ee,
@@ -2549,34 +2548,34 @@ let ln = class {
   }
   calcCellAutoHeight(e) {
     var w;
-    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: c = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, d = {
       startX: h.startX + l,
       endX: h.endX - s,
-      startY: h.startY + d,
+      startY: h.startY + c,
       endY: h.endY - u
     }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
     if (!m)
       return;
-    const p = this._dataValidationModel.getValidator(m.type);
-    if (!p)
+    const g = this._dataValidationModel.getValidator(m.type);
+    if (!g)
       return;
-    const M = c.endX - c.startX, y = c.endY - c.startY, g = (w = Q(n)) != null ? w : "", S = p.parseCellValue(g), v = xt(r != null ? r : void 0);
+    const M = d.endX - d.startX, y = d.endY - d.startY, p = (w = Q(n)) != null ? w : "", S = g.parseCellValue(p), v = xt(r != null ? r : void 0);
     return Yt(S, v, M, y).cellAutoHeight;
   }
   calcCellAutoWidth(e) {
     var w;
-    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: c = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, d = {
       startX: h.startX + l,
       endX: h.endX - s,
-      startY: h.startY + d,
+      startY: h.startY + c,
       endY: h.endY - u
     }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
     if (!m)
       return;
-    const p = this._dataValidationModel.getValidator(m.type);
-    if (!p)
+    const g = this._dataValidationModel.getValidator(m.type);
+    if (!g)
       return;
-    const M = c.endX - c.startX, y = c.endY - c.startY, g = (w = Q(n)) != null ? w : "", S = p.parseCellValue(g), v = xt(r != null ? r : void 0);
+    const M = d.endX - d.startX, y = d.endY - d.startY, p = (w = Q(n)) != null ? w : "", S = g.parseCellValue(p), v = xt(r != null ? r : void 0);
     return Yt(S, v, M, y).calcAutoWidth;
   }
   isHit(e, t) {
@@ -2614,7 +2613,7 @@ class Zo extends fe {
     super(...arguments);
     E(this, "id", G.LIST_MULTIPLE);
     E(this, "canvasRender", this.injector.createInstance(ln));
-    E(this, "dropdownType", pe.MULTIPLE_LIST);
+    E(this, "dropdownType", ge.MULTIPLE_LIST);
   }
 }
 var qo = Object.getOwnPropertyDescriptor, Jo = (e, t, r, n) => {
@@ -2702,21 +2701,21 @@ function Hn(e, t, r, n, i, o, a = !0) {
       break;
   }
   l = Math.max(We, l);
-  let d = 0;
+  let c = 0;
   switch (o) {
     case Ye.CENTER:
-      d = (e - r) / 2;
+      c = (e - r) / 2;
       break;
     case Ye.RIGHT:
-      d = e - r;
+      c = e - r;
       break;
   }
-  return d = Math.max(me, d), {
-    paddingLeft: d,
+  return c = Math.max(me, c), {
+    paddingLeft: c,
     paddingTop: l
   };
 }
-let dn = class {
+let cn = class {
   constructor(e, t, r, n, i) {
     E(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     E(this, "zIndex");
@@ -2730,7 +2729,7 @@ let dn = class {
     return `${e}.${t}`;
   }
   _drawDownIcon(e, t, r, n, i, o, a) {
-    const { t: l = re.pd.t, b: s = re.pd.b } = a, d = r - he;
+    const { t: l = re.pd.t, b: s = re.pd.b } = a, c = r - he;
     let u;
     switch (o) {
       case ae.MIDDLE:
@@ -2743,76 +2742,76 @@ let dn = class {
         u = l + We + (i / 2 - St / 2);
         break;
     }
-    e.save(), e.translateWithPrecision(t.startX + d, t.startY + u), e.fillStyle = "#565656", e.fill(Bn), e.restore();
+    e.save(), e.translateWithPrecision(t.startX + c, t.startY + u), e.fillStyle = "#565656", e.fill(Bn), e.restore();
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   drawWith(e, t, r) {
-    const { primaryWithCoord: n, row: i, col: o, style: a, data: l, subUnitId: s } = t, d = n.isMergedMainCell ? n.mergeInfo : n, u = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, i, o);
+    const { primaryWithCoord: n, row: i, col: o, style: a, data: l, subUnitId: s } = t, c = n.isMergedMainCell ? n.mergeInfo : n, u = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, i, o);
     if (!u)
       return;
     const h = this._dataValidationModel.getValidator(u.type);
     if (!h)
       return;
-    const c = l == null ? void 0 : l.fontRenderExtension, { leftOffset: m = 0, rightOffset: p = 0, topOffset: M = 0, downOffset: y = 0 } = c || {};
+    const d = l == null ? void 0 : l.fontRenderExtension, { leftOffset: m = 0, rightOffset: g = 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: d.startX + m,
-      endX: d.endX - p,
-      startY: d.startY + M,
-      endY: d.endY - y
-    }, S = g.endX - g.startX, v = g.endY - g.startY, C = this._ensureMap(s), w = this._generateKey(i, o), I = h.getListWithColor(u), R = Q(l), T = `${R != null ? R : ""}`, N = I.find((V) => V.label === T);
+    const p = {
+      startX: c.startX + m,
+      endX: c.endX - g,
+      startY: c.startY + M,
+      endY: c.endY - y
+    }, S = p.endX - p.startX, v = p.endY - p.startY, C = this._ensureMap(s), w = this._generateKey(i, o), 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 === ie.ARROW) {
-      const { l: V = re.pd.l, t: F = re.pd.t, r: x = re.pd.r, b: X = re.pd.b } = L, Z = S - V - x - he - 4, { documentSkeleton: z, documents: te, docModel: ge } = Ct(T, this._localeService, a);
-      D === Ie.WRAP && ge.updateDocumentDataPageSize(Math.max(Z, 1)), z.calculate(), z.getActualSize();
-      const de = it(z), { height: ne, width: ce } = de, { paddingTop: Se, paddingLeft: ve } = Hn(Z, v - F - X, ce, ne, P, A, !0);
-      this._drawDownIcon(e, g, S, v, ne, P, L), e.save(), e.translateWithPrecision(g.startX + V, g.startY + F), e.beginPath(), e.rect(0, 0, S - V - x, v - F - X), 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(ve, 0), e.restore(), e.restore(), C.set(w, {
-        left: g.endX + V + r.rowHeaderWidth - he,
-        top: g.startY + F + r.columnHeaderHeight,
+      const { l: V = re.pd.l, t: F = re.pd.t, r: x = re.pd.r, b: X = re.pd.b } = L, Z = S - V - x - he - 4, { documentSkeleton: z, documents: te, docModel: pe } = Ct(T, this._localeService, a);
+      D === Ie.WRAP && pe.updateDocumentDataPageSize(Math.max(Z, 1)), z.calculate(), z.getActualSize();
+      const ce = it(z), { height: ne, width: de } = ce, { paddingTop: Se, paddingLeft: ve } = Hn(Z, v - F - X, de, ne, P, A, !0);
+      this._drawDownIcon(e, p, S, v, ne, P, L), e.save(), e.translateWithPrecision(p.startX + V, p.startY + F), e.beginPath(), e.rect(0, 0, S - V - x, v - F - X), 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(ve, 0), e.restore(), e.restore(), C.set(w, {
+        left: p.endX + V + r.rowHeaderWidth - he,
+        top: p.startY + F + r.columnHeaderHeight,
         width: he,
         height: v - F - X
       });
     } else {
-      e.save(), e.translateWithPrecision(g.startX, g.startY), e.beginPath(), e.rect(0, 0, S, v), e.clip();
+      e.save(), e.translateWithPrecision(p.startX, p.startY), e.beginPath(), e.rect(0, 0, S, v), e.clip();
       const V = S - me * 2 - be - he - 4, { documentSkeleton: F, documents: x, docModel: X } = Ct(T, this._localeService, a);
       D === Ie.WRAP && X.updateDocumentDataPageSize(Math.max(V, 1)), F.calculate();
-      const Z = it(F), { height: z, width: te } = Z, { paddingTop: ge, paddingLeft: de } = Hn(V, v, te, z, P, A);
-      e.translateWithPrecision(me, ge);
-      const ne = Math.max(S - me * 2, 1), ce = z;
+      const Z = it(F), { height: z, width: te } = Z, { paddingTop: pe, paddingLeft: ce } = Hn(V, v, te, z, P, A);
+      e.translateWithPrecision(me, pe);
+      const ne = Math.max(S - me * 2, 1), de = z;
       ur.drawWith(e, {
         width: ne,
-        height: ce,
+        height: de,
         fill: (N == null ? void 0 : N.color) || He,
         radius: Xt
-      }), e.save(), e.translateWithPrecision(be, 0), e.beginPath(), e.rect(0, 0, V, z), e.clip(), e.translateWithPrecision(de, 0), x.render(e), e.restore(), e.translateWithPrecision(V + be + 4, (z - St) / 2), e.fillStyle = Qo, e.fill(Bn), e.restore(), C.set(w, {
-        left: g.startX + me + r.rowHeaderWidth,
-        top: g.startY + ge + r.columnHeaderHeight,
+      }), e.save(), e.translateWithPrecision(be, 0), e.beginPath(), e.rect(0, 0, V, z), e.clip(), e.translateWithPrecision(ce, 0), x.render(e), e.restore(), e.translateWithPrecision(V + be + 4, (z - St) / 2), e.fillStyle = Qo, e.fill(Bn), e.restore(), C.set(w, {
+        left: p.startX + me + r.rowHeaderWidth,
+        top: p.startY + pe + r.columnHeaderHeight,
         width: ne,
-        height: ce
+        height: de
       });
     }
   }
   calcCellAutoHeight(e) {
-    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
-    if (!c || c.renderMode === ie.TEXT)
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = 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, i, o);
+    if (!d || d.renderMode === ie.TEXT)
       return;
     const m = {
       startX: a.startX + s,
-      endX: a.endX - d,
+      endX: a.endX - c,
       startY: a.startY + u,
       endY: a.endY - h
-    }, p = m.endX - m.startX, M = Q(n), y = `${M != null ? M : ""}`;
-    let { tb: g, pd: S } = r || {};
+    }, g = m.endX - m.startX, M = Q(n), y = `${M != null ? M : ""}`;
+    let { tb: p, pd: S } = r || {};
     const { t: v = re.pd.t, b: C = re.pd.b } = S != null ? S : {};
-    if (g = g != null ? g : Ie.WRAP, c.renderMode === ie.ARROW) {
-      const w = p - he, { documentSkeleton: I, docModel: R } = Ct(y, this._localeService, r);
-      g === Ie.WRAP && R.updateDocumentDataPageSize(Math.max(w, 1)), I.calculate(), I.getActualSize();
+    if (p = p != null ? p : Ie.WRAP, d.renderMode === ie.ARROW) {
+      const w = g - he, { documentSkeleton: I, docModel: R } = Ct(y, this._localeService, r);
+      p === Ie.WRAP && R.updateDocumentDataPageSize(Math.max(w, 1)), I.calculate(), I.getActualSize();
       const T = it(I), { height: N } = T;
       return N + v + C + We * 2;
     } else {
-      const w = p - me * 2 - be - he, { documentSkeleton: I, docModel: R } = Pr(y, this._localeService, r);
-      g === Ie.WRAP && R.updateDocumentDataPageSize(Math.max(w, 1)), I.calculate();
+      const w = g - me * 2 - be - he, { documentSkeleton: I, docModel: R } = Pr(y, this._localeService, r);
+      p === Ie.WRAP && R.updateDocumentDataPageSize(Math.max(w, 1)), I.calculate();
       const T = it(I), {
         height: N
       } = T;
@@ -2820,20 +2819,20 @@ let dn = class {
     }
   }
   calcCellAutoWidth(e) {
-    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
-    if (!c || c.renderMode === ie.TEXT)
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = 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, i, o);
+    if (!d || d.renderMode === ie.TEXT)
       return;
     const m = {
       startX: a.startX + s,
-      endX: a.endX - d,
+      endX: a.endX - c,
       startY: a.startY + u,
       endY: a.endY - h
-    }, p = m.endX - m.startX, M = Q(n), y = `${M != null ? M : ""}`;
-    let { tb: g, pd: S } = r || {};
+    }, g = m.endX - m.startX, M = Q(n), y = `${M != null ? M : ""}`;
+    let { tb: p, pd: S } = r || {};
     const { l: v = re.pd.l, r: C = re.pd.r } = S != null ? S : {};
-    g = g != null ? g : Ie.WRAP;
+    p = p != null ? p : Ie.WRAP;
     let w = me * 2 + he;
-    switch (c.renderMode) {
+    switch (d.renderMode) {
       case ie.ARROW:
         w = he + me * 2 + C + v;
         break;
@@ -2844,15 +2843,15 @@ let dn = class {
       default:
         w = he + me * 2 + be * 2 + C + v + Xt / 2 + 1;
     }
-    const I = p - w, { documentSkeleton: R, docModel: T } = Ct(y, this._localeService, r);
-    return g === Ie.WRAP && T.updateDocumentDataPageSize(Math.max(I, 1)), R.calculate(), R.getActualSize(), it(R).width + w;
+    const I = g - w, { documentSkeleton: R, docModel: T } = Ct(y, this._localeService, r);
+    return p === Ie.WRAP && T.updateDocumentDataPageSize(Math.max(I, 1)), R.calculate(), R.getActualSize(), it(R).width + w;
   }
   isHit(e, t) {
     const { subUnitId: r, row: n, col: i } = t, a = this._ensureMap(r).get(this._generateKey(n, i)), l = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, n, i);
     if (!l || !a || l.renderMode === ie.TEXT)
       return !1;
-    const { top: s, left: d, width: u, height: h } = a, { x: c, y: m } = e;
-    return c >= d && c <= d + u && m >= s && m <= s + h;
+    const { top: s, left: c, width: u, height: h } = a, { x: d, y: m } = e;
+    return d >= c && d <= c + u && m >= s && m <= s + h;
   }
   onPointerDown(e, t) {
     if (t.button === 2)
@@ -2874,19 +2873,19 @@ let dn = class {
     (n = (r = Ke(Y.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(Ge.DEFAULT);
   }
 };
-dn = Jo([
+cn = Jo([
   at(0, le),
   at(1, b(se)),
   at(2, J),
   at(3, b(Ne)),
   at(4, b(ee))
-], dn);
+], cn);
 class ta extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.LIST);
-    E(this, "canvasRender", this.injector.createInstance(dn));
-    E(this, "dropdownType", pe.LIST);
+    E(this, "canvasRender", this.injector.createInstance(cn));
+    E(this, "dropdownType", ge.LIST);
     E(this, "optionsInput", Ot.componentKey);
     E(this, "formulaInput", hn);
   }
@@ -3006,10 +3005,10 @@ let Wn = (It = class extends Gn {
 Wn = sa([
   Kt(1, b(we)),
   Kt(2, J),
-  Kt(3, cn)
+  Kt(3, dn)
 ], Wn);
-var da = Object.getOwnPropertyDescriptor, ca = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? da(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+var ca = Object.getOwnPropertyDescriptor, da = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? ca(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
 }, Gt = (e, t) => (r, n) => t(r, n, e);
@@ -3061,10 +3060,10 @@ let jn = (wt = class extends Gn {
     this._injector.get(qe);
   }
 }, E(wt, "pluginName", ua), E(wt, "type", Y.UNIVER_SHEET), wt);
-jn = ca([
+jn = da([
   Gt(1, b(we)),
   Gt(2, J),
-  Gt(3, cn)
+  Gt(3, dn)
 ], jn);
 export {
   fe as BaseSheetDataValidatorView,