@univerjs/sheets-data-validation-ui 0.6.10-nightly.202504171607 → 0.6.10-nightly.202504181606

package/lib/index.js

@@ -1,19 +1,19 @@
 var Nn = Object.defineProperty;
 var Un = (e, t, n) => t in e ? Nn(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
-var b = (e, t, n) => Un(e, typeof t != "symbol" ? t + "" : t, n);
-import { LocaleService as le, isFormulaString as Ee, DataValidationType as K, Tools as Qt, Inject as E, Injector as Re, Disposable as we, UniverInstanceType as x, toDisposable as Bn, IUniverInstanceService as de, DataValidationErrorStyle as ut, DataValidationStatus as Ye, ICommandService as Q, DataValidationRenderMode as ie, DisposableCollection as $n, dayjs as ya, numfmt as ja, CellValueType as Hn, CommandType as ot, ObjectMatrix as Mt, Range as Wn, Rectangle as Dt, queryObjectMatrix as ea, Optional as xn, RxDisposable as ma, InterceptorEffectEnum as Ya, sequenceExecute as Xa, bufferDebounceTime as jn, debounce as Yn, UndoCommand as Xn, RedoCommand as zn, isUnitRangesEqual as Kn, shallowEqual as Ma, ThemeService as za, ColorKit as Gn, VerticalAlign as se, HorizontalAlign as Xe, DEFAULT_STYLES as oe, WrapStrategy as Ie, DocumentDataModel as Zn, BooleanNumber as rt, DEFAULT_EMPTY_DOCUMENT_VALUE as qn, Plugin as Ka, merge as Ga, IConfigService as Za } from "@univerjs/core";
+var E = (e, t, n) => Un(e, typeof t != "symbol" ? t + "" : t, n);
+import { LocaleService as le, isFormulaString as be, DataValidationType as G, Tools as Qt, Inject as M, Injector as we, Disposable as Ve, UniverInstanceType as x, toDisposable as Bn, IUniverInstanceService as de, DataValidationErrorStyle as ct, DataValidationStatus as Xe, ICommandService as Q, DataValidationRenderMode as ie, DisposableCollection as $n, dayjs as ya, numfmt as ja, CellValueType as Hn, CommandType as ot, ObjectMatrix as Mt, Range as Wn, Rectangle as Dt, queryObjectMatrix as ea, Optional as xn, RxDisposable as ma, InterceptorEffectEnum as Ya, sequenceExecute as Xa, bufferDebounceTime as jn, debounce as Yn, UndoCommand as Xn, RedoCommand as zn, isUnitRangesEqual as Kn, shallowEqual as Ma, ThemeService as za, ColorKit as Gn, VerticalAlign as se, HorizontalAlign as ze, DEFAULT_STYLES as oe, WrapStrategy as Re, DocumentDataModel as Zn, BooleanNumber as it, DEFAULT_EMPTY_DOCUMENT_VALUE as qn, Plugin as Ka, merge as Ga, IConfigService as Za } from "@univerjs/core";
 import { DataValidationFormulaController as Jn, deserializeListOptions as Qn, serializeListOptions as qa, CUSTOM_FORMULA_INPUT_NAME as Ja, BASE_FORMULA_INPUT_NAME as Ft, LIST_FORMULA_INPUT_NAME as pa, CHECKBOX_FORMULA_INPUT_NAME as Qa, SheetDataValidationModel as te, SheetsDataValidationValidatorService as eo, getDataValidationCellValue as Bt, getCellValueOrigin as ee, createDefaultNewRule as en, AddSheetDataValidationCommand as ga, DATA_VALIDATION_PLUGIN_NAME as tn, getDataValidationDiffMutations as ta, UpdateSheetDataValidationRangeCommand as an, DataValidationCacheService as nn, UpdateSheetDataValidationSettingCommand as Da, UpdateSheetDataValidationOptionsCommand as to, RemoveSheetDataValidationCommand as on, RemoveSheetAllDataValidationCommand as ao, DataValidationFormulaService as no, CHECKBOX_FORMULA_2 as oo, CHECKBOX_FORMULA_1 as io, getFormulaResult as $t, isLegalFormulaResult as Ea, transformCheckboxValue as ro } from "@univerjs/sheets-data-validation";
-import { jsxs as Y, Fragment as ze, jsx as v } from "react/jsx-runtime";
-import { FormLayout as X, Input as be, Checkbox as kt, RadioGroup as fa, Radio as Oe, DraggableList as so, clsx as lo, Select as aa, Button as Ke } from "@univerjs/design";
-import { useDependency as U, useSidebarClick as rn, useObservable as Te, useEvent as na, ISidebarService as sn, IDialogService as co, IZenZoneService as ln, KeyCode as pt, MenuItemType as va, getMenuHiddenObservable as uo, RibbonStartGroup as ho, IMenuManagerService as mo, ComponentManager as _a } from "@univerjs/ui";
-import ba, { useState as W, useRef as Ge, forwardRef as Pe, createElement as Fe, useMemo as ht, useEffect as Ae } from "react";
+import { jsxs as z, Fragment as Ke, jsx as v } from "react/jsx-runtime";
+import { FormLayout as K, Input as Oe, Checkbox as kt, RadioGroup as fa, Radio as Te, DraggableList as so, clsx as lo, Select as aa, Button as Ge } from "@univerjs/design";
+import { useDependency as N, useSidebarClick as rn, useObservable as Ae, useEvent as na, ISidebarService as sn, IDialogService as co, IZenZoneService as ln, KeyCode as pt, MenuItemType as va, getMenuHiddenObservable as uo, RibbonStartGroup as ho, IMenuManagerService as mo, ComponentManager as _a } from "@univerjs/ui";
+import ba, { useState as W, useRef as mt, forwardRef as Fe, createElement as ke, useMemo as ut, useEffect as Le } from "react";
 import { FormulaEditor as dn, RangeSelector as po } from "@univerjs/sheets-formula-ui";
-import { DataValidatorRegistryService as Ve, DataValidationModel as Sa, DataValidatorDropdownType as he, DataValidatorRegistryScope as go, TWO_FORMULA_OPERATOR_COUNT as fo, getRuleOptions as Oa, getRuleSetting as Ta } from "@univerjs/data-validation";
+import { DataValidatorRegistryService as ye, DataValidationModel as Sa, DataValidatorDropdownType as me, DataValidatorRegistryScope as go, TWO_FORMULA_OPERATOR_COUNT as fo, getRuleOptions as Oa, getRuleSetting as Ta } from "@univerjs/data-validation";
 import { debounceTime as cn, filter as Ca, BehaviorSubject as Aa, distinctUntilChanged as vo, Subject as _o, bufferTime as un, of as So } from "rxjs";
-import { DeviceInputEventType as gt, IRenderManagerService as ke, fixLineWidthByScale as La, Transform as Co, CheckboxShape as Io, getCurrentTypeOfRenderer as Ze, CURSOR_TYPE as qe, FontCache as Ro, Shape as wo, Rect as hn, getFontStyleString as Ht, getDocsSkeletonPageSize as st, Documents as Vo, DocumentViewModel as yo, DocumentSkeleton as Mo } from "@univerjs/engine-render";
-import { SheetInterceptorService as Ia, VALIDATE_CELL as Do, SheetsSelectionsService as mn, SetRangeValuesCommand as ct, getSheetCommandTarget as pn, rangeToDiscreteRange as Eo, SheetPermissionCheckController as bo, WorksheetEditPermission as oa, WorksheetSetCellStylePermission as ia, RangeProtectionPermissionEditPoint as ra, WorkbookEditablePermission as sa, INTERCEPTOR_POINT as gn, InterceptCellContentPriority as fn, checkRangesEditablePermission as Oo } from "@univerjs/sheets";
+import { DeviceInputEventType as gt, IRenderManagerService as Ne, fixLineWidthByScale as La, Transform as Co, CheckboxShape as Io, getCurrentTypeOfRenderer as Ze, CURSOR_TYPE as qe, FontCache as Ro, Shape as wo, Rect as hn, getFontStyleString as Ht, getDocsSkeletonPageSize as rt, Documents as Vo, DocumentViewModel as yo, DocumentSkeleton as Mo } from "@univerjs/engine-render";
+import { SheetInterceptorService as Ia, VALIDATE_CELL as Do, SheetsSelectionsService as mn, SetRangeValuesCommand as dt, getSheetCommandTarget as pn, rangeToDiscreteRange as Eo, SheetPermissionCheckController as bo, WorksheetEditPermission as oa, WorksheetSetCellStylePermission as ia, RangeProtectionPermissionEditPoint as ra, WorkbookEditablePermission as sa, INTERCEPTOR_POINT as gn, InterceptCellContentPriority as fn, checkRangesEditablePermission as Oo } from "@univerjs/sheets";
 import { getPatternType as To } from "@univerjs/sheets-numfmt";
-import { ISheetCellDropdownManagerService as Ao, IEditorBridgeService as vn, SetCellEditVisibleOperation as ft, HoverManagerService as Lo, CellAlertManagerService as Po, CellAlertType as Fo, IAutoFillService as ko, APPLY_TYPE as lt, virtualizeDiscreteRanges as la, getAutoFillRepeatRange as No, ISheetClipboardService as Uo, COPY_TYPE as Pa, PREDEFINED_HOOK_NAME as vt, getRepeatRange as Fa, getCurrentRangeDisable$ as Bo, AutoHeightController as _n, SheetSkeletonManagerService as Et, IMarkSelectionService as $o } from "@univerjs/sheets-ui";
+import { ISheetCellDropdownManagerService as Ao, IEditorBridgeService as vn, SetCellEditVisibleOperation as ft, HoverManagerService as Lo, CellAlertManagerService as Po, CellAlertType as Fo, IAutoFillService as ko, APPLY_TYPE as st, virtualizeDiscreteRanges as la, getAutoFillRepeatRange as No, ISheetClipboardService as Uo, COPY_TYPE as Pa, PREDEFINED_HOOK_NAME as vt, getRepeatRange as Fa, getCurrentRangeDisable$ as Bo, AutoHeightController as _n, SheetSkeletonManagerService as Et, IMarkSelectionService as $o } from "@univerjs/sheets-ui";
 import { deserializeRangeWithSheet as Ho, serializeRange as Sn } from "@univerjs/engine-formula";
 const Wo = "univer-data-validation-formula", xo = "univer-data-validation-formula-and", jo = "univer-data-validation-formula-list-item", Yo = "univer-data-validation-formula-list-item-icon", Xo = "univer-data-validation-formula-list-item-drag", zo = "univer-data-validation-formula-list-add", Ko = "univer-data-validation-formula-color-select", Go = "univer-data-validation-formula-color-select-panel", Zo = "univer-data-validation-formula-color-item", J = {
   dataValidationFormula: Wo,
@@ -26,10 +26,10 @@ const Wo = "univer-data-validation-formula", xo = "univer-data-validation-formul
   dataValidationFormulaColorSelectPanel: Go,
   dataValidationFormulaColorItem: Zo
 }, qo = (e) => {
-  const { isTwoFormula: t = !1, value: n, onChange: a, showError: o, validResult: i } = e, r = U(le), l = o ? i == null ? void 0 : i.formula1 : "", s = o ? i == null ? void 0 : i.formula2 : "";
-  return t ? /* @__PURE__ */ Y(ze, { children: [
-    /* @__PURE__ */ v(X, { error: l, children: /* @__PURE__ */ v(
-      be,
+  const { isTwoFormula: t = !1, value: n, onChange: a, showError: o, validResult: i } = e, r = N(le), l = o ? i == null ? void 0 : i.formula1 : "", s = o ? i == null ? void 0 : i.formula2 : "";
+  return t ? /* @__PURE__ */ z(Ke, { children: [
+    /* @__PURE__ */ v(K, { error: l, children: /* @__PURE__ */ v(
+      Oe,
       {
         className: J.dataValidationFormula,
         placeholder: r.t("dataValidation.panel.formulaPlaceholder"),
@@ -43,8 +43,8 @@ const Wo = "univer-data-validation-formula", xo = "univer-data-validation-formul
       }
     ) }),
     /* @__PURE__ */ v("div", { className: J.dataValidationFormulaAnd, children: r.t("dataValidation.panel.formulaAnd") }),
-    /* @__PURE__ */ v(X, { error: s, children: /* @__PURE__ */ v(
-      be,
+    /* @__PURE__ */ v(K, { error: s, children: /* @__PURE__ */ v(
+      Oe,
       {
         className: J.dataValidationFormula,
         placeholder: r.t("dataValidation.panel.formulaPlaceholder"),
@@ -57,8 +57,8 @@ const Wo = "univer-data-validation-formula", xo = "univer-data-validation-formul
         }
       }
     ) })
-  ] }) : /* @__PURE__ */ v(X, { error: l, children: /* @__PURE__ */ v(
-    be,
+  ] }) : /* @__PURE__ */ v(K, { error: l, children: /* @__PURE__ */ v(
+    Oe,
     {
       className: J.dataValidationFormula,
       placeholder: r.t("dataValidation.panel.formulaPlaceholder"),
@@ -70,9 +70,9 @@ const Wo = "univer-data-validation-formula", xo = "univer-data-validation-formul
   ) });
 };
 function Jo(e) {
-  const { value: t, onChange: n, showError: a, validResult: o } = e, i = U(le), r = a ? o == null ? void 0 : o.formula1 : "", l = a ? o == null ? void 0 : o.formula2 : "", [s, d] = W(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
-  return /* @__PURE__ */ Y(ze, { children: [
-    /* @__PURE__ */ v(X, { children: /* @__PURE__ */ v(
+  const { value: t, onChange: n, showError: a, validResult: o } = e, i = N(le), r = a ? o == null ? void 0 : o.formula1 : "", l = a ? o == null ? void 0 : o.formula2 : "", [s, d] = W(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
+  return /* @__PURE__ */ z(Ke, { children: [
+    /* @__PURE__ */ v(K, { children: /* @__PURE__ */ v(
       kt,
       {
         checked: s,
@@ -86,8 +86,8 @@ function Jo(e) {
         children: i.t("dataValidation.checkbox.tips")
       }
     ) }),
-    s ? /* @__PURE__ */ v(X, { label: i.t("dataValidation.checkbox.checked"), error: r, children: /* @__PURE__ */ v(
-      be,
+    s ? /* @__PURE__ */ v(K, { label: i.t("dataValidation.checkbox.checked"), error: r, children: /* @__PURE__ */ v(
+      Oe,
       {
         className: J.dataValidationFormula,
         placeholder: i.t("dataValidation.panel.valuePlaceholder"),
@@ -100,8 +100,8 @@ function Jo(e) {
         }
       }
     ) }) : null,
-    s ? /* @__PURE__ */ v(X, { label: i.t("dataValidation.checkbox.unchecked"), error: l, children: /* @__PURE__ */ v(
-      be,
+    s ? /* @__PURE__ */ v(K, { label: i.t("dataValidation.checkbox.unchecked"), error: l, children: /* @__PURE__ */ v(
+      Oe,
       {
         className: J.dataValidationFormula,
         placeholder: i.t("dataValidation.panel.valuePlaceholder"),
@@ -117,15 +117,15 @@ function Jo(e) {
   ] });
 }
 function Qo(e) {
-  var h;
-  const { unitId: t, subUnitId: n, value: a, onChange: o, showError: i, validResult: r } = e, l = i ? r == null ? void 0 : r.formula1 : void 0, s = Ge(null), [d, u] = W(!1);
+  var p;
+  const { unitId: t, subUnitId: n, value: a, onChange: o, showError: i, validResult: r } = e, l = i ? r == null ? void 0 : r.formula1 : void 0, s = mt(null), [d, u] = W(!1);
   return rn((c) => {
-    var p;
-    ((p = s.current) == null ? void 0 : p.isClickOutSide(c)) && u(!1);
+    var h;
+    ((h = s.current) == null ? void 0 : h.isClickOutSide(c)) && u(!1);
   }), /* @__PURE__ */ v(
     dn,
     {
-      initValue: (h = a == null ? void 0 : a.formula1) != null ? h : "=",
+      initValue: (p = a == null ? void 0 : a.formula1) != null ? p : "=",
       unitId: t,
       subUnitId: n,
       isFocus: d,
@@ -158,12 +158,12 @@ var re = function() {
     for (var o = 0, a = Object.getOwnPropertySymbols(e); o < a.length; o++)
       t.indexOf(a[o]) < 0 && Object.prototype.propertyIsEnumerable.call(e, a[o]) && (n[a[o]] = e[a[o]]);
   return n;
-}, Ne = Pe(function(e, t) {
-  var n = e.icon, a = e.id, o = e.className, i = e.extend, r = ei(e, ["icon", "id", "className", "extend"]), l = "univerjs-icon univerjs-icon-".concat(a, " ").concat(o || "").trim(), s = Ge("_".concat(ni()));
+}, Ue = Fe(function(e, t) {
+  var n = e.icon, a = e.id, o = e.className, i = e.extend, r = ei(e, ["icon", "id", "className", "extend"]), l = "univerjs-icon univerjs-icon-".concat(a, " ").concat(o || "").trim(), s = mt("_".concat(ni()));
   return Cn(n, "".concat(a), { defIds: n.defIds, idSuffix: s.current }, re({ ref: t, className: l }, r), i);
 });
 function Cn(e, t, n, a, o) {
-  return Fe(e.tag, re(re({ key: t }, ti(e, n, o)), a), (ai(e, n).children || []).map(function(i, r) {
+  return ke(e.tag, re(re({ key: t }, ti(e, n, o)), a), (ai(e, n).children || []).map(function(i, r) {
     return Cn(i, "".concat(t, "-").concat(e.tag, "-").concat(r), n, void 0, o);
   }));
 }
@@ -188,56 +188,56 @@ function ai(e, t) {
 function ni() {
   return Math.random().toString(36).substring(2, 8);
 }
-Ne.displayName = "UniverIcon";
-var oi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M1.4917 3.07803C1.4917 2.19437 2.20804 1.47803 3.0917 1.47803H5.6917C6.57536 1.47803 7.2917 2.19437 7.2917 3.07803V5.67803C7.2917 6.56168 6.57535 7.27803 5.6917 7.27803H3.0917C2.20804 7.27803 1.4917 6.56168 1.4917 5.67803V3.07803ZM3.0917 2.67803C2.87078 2.67803 2.6917 2.85711 2.6917 3.07803V5.67803C2.6917 5.89894 2.87079 6.07803 3.0917 6.07803H5.6917C5.91261 6.07803 6.0917 5.89894 6.0917 5.67803V3.07803C6.0917 2.85711 5.91261 2.67803 5.6917 2.67803H3.0917Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M14.6175 2.45279C14.8518 2.68711 14.8518 3.06701 14.6175 3.30132L11.6151 6.30365C11.3957 6.52307 11.0451 6.53897 10.8067 6.34031L8.80915 4.67566C8.55458 4.46352 8.52019 4.08518 8.73233 3.83062 8.94447 3.57605 9.32281 3.54166 9.57737 3.7538L11.154 5.06767 13.769 2.45278C14.0033 2.21847 14.3832 2.21848 14.6175 2.45279zM14.1175 9.19746C14.3518 9.43178 14.3518 9.81168 14.1175 10.046L12.5418 11.6217 14.1175 13.1975C14.3518 13.4318 14.3518 13.8117 14.1175 14.046 13.8832 14.2803 13.5033 14.2803 13.269 14.046L11.6933 12.4703 10.1175 14.046C9.88321 14.2803 9.50331 14.2803 9.269 14.046 9.03468 13.8117 9.03468 13.4318 9.269 13.1975L10.8447 11.6217 9.269 10.046C9.03468 9.81168 9.03468 9.43178 9.269 9.19746 9.50331 8.96315 9.88321 8.96315 10.1175 9.19746L11.6933 10.7732 13.269 9.19746C13.5033 8.96315 13.8832 8.96315 14.1175 9.19746z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M3.0917 8.72168C2.20804 8.72168 1.4917 9.43802 1.4917 10.3217V12.9217C1.4917 13.8053 2.20804 14.5217 3.0917 14.5217H5.6917C6.57535 14.5217 7.2917 13.8053 7.2917 12.9217V10.3217C7.2917 9.43802 6.57536 8.72168 5.6917 8.72168H3.0917ZM2.6917 10.3217C2.6917 10.1008 2.87078 9.92168 3.0917 9.92168H5.6917C5.91261 9.92168 6.0917 10.1008 6.0917 10.3217V12.9217C6.0917 13.1426 5.91261 13.3217 5.6917 13.3217H3.0917C2.87079 13.3217 2.6917 13.1426 2.6917 12.9217V10.3217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, In = Pe(function(e, t) {
-  return Fe(Ne, Object.assign({}, e, {
+Ue.displayName = "UniverIcon";
+var oi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M1.4917 3.07803C1.4917 2.19437 2.20804 1.47803 3.0917 1.47803H5.6917C6.57536 1.47803 7.2917 2.19437 7.2917 3.07803V5.67803C7.2917 6.56168 6.57535 7.27803 5.6917 7.27803H3.0917C2.20804 7.27803 1.4917 6.56168 1.4917 5.67803V3.07803ZM3.0917 2.67803C2.87078 2.67803 2.6917 2.85711 2.6917 3.07803V5.67803C2.6917 5.89894 2.87079 6.07803 3.0917 6.07803H5.6917C5.91261 6.07803 6.0917 5.89894 6.0917 5.67803V3.07803C6.0917 2.85711 5.91261 2.67803 5.6917 2.67803H3.0917Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M14.6175 2.45279C14.8518 2.68711 14.8518 3.06701 14.6175 3.30132L11.6151 6.30365C11.3957 6.52307 11.0451 6.53897 10.8067 6.34031L8.80915 4.67566C8.55458 4.46352 8.52019 4.08518 8.73233 3.83062 8.94447 3.57605 9.32281 3.54166 9.57737 3.7538L11.154 5.06767 13.769 2.45278C14.0033 2.21847 14.3832 2.21848 14.6175 2.45279zM14.1175 9.19746C14.3518 9.43178 14.3518 9.81168 14.1175 10.046L12.5418 11.6217 14.1175 13.1975C14.3518 13.4318 14.3518 13.8117 14.1175 14.046 13.8832 14.2803 13.5033 14.2803 13.269 14.046L11.6933 12.4703 10.1175 14.046C9.88321 14.2803 9.50331 14.2803 9.269 14.046 9.03468 13.8117 9.03468 13.4318 9.269 13.1975L10.8447 11.6217 9.269 10.046C9.03468 9.81168 9.03468 9.43178 9.269 9.19746 9.50331 8.96315 9.88321 8.96315 10.1175 9.19746L11.6933 10.7732 13.269 9.19746C13.5033 8.96315 13.8832 8.96315 14.1175 9.19746z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M3.0917 8.72168C2.20804 8.72168 1.4917 9.43802 1.4917 10.3217V12.9217C1.4917 13.8053 2.20804 14.5217 3.0917 14.5217H5.6917C6.57535 14.5217 7.2917 13.8053 7.2917 12.9217V10.3217C7.2917 9.43802 6.57536 8.72168 5.6917 8.72168H3.0917ZM2.6917 10.3217C2.6917 10.1008 2.87078 9.92168 3.0917 9.92168H5.6917C5.91261 9.92168 6.0917 10.1008 6.0917 10.3217V12.9217C6.0917 13.1426 5.91261 13.3217 5.6917 13.3217H3.0917C2.87079 13.3217 2.6917 13.1426 2.6917 12.9217V10.3217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, In = Fe(function(e, t) {
+  return ke(Ue, Object.assign({}, e, {
     id: "data-validation-single",
     ref: t,
     icon: oi
   }));
 });
 In.displayName = "DataValidationSingle";
-var ii = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.3313 1.4667C5.3313 1.13533 5.59993.866699 5.9313.866699H10.069C10.4004.866699 10.669 1.13533 10.669 1.4667 10.669 1.79807 10.4004 2.0667 10.069 2.0667H5.9313C5.59993 2.0667 5.3313 1.79807 5.3313 1.4667zM1.09985 3.64443C1.09985 3.31306 1.36848 3.04443 1.69985 3.04443H14.2999C14.6312 3.04443 14.8999 3.31306 14.8999 3.64443 14.8999 3.9758 14.6312 4.24443 14.2999 4.24443H1.69985C1.36848 4.24443 1.09985 3.9758 1.09985 3.64443zM6.12398 8.30171C6.35829 8.0674 6.73819 8.0674 6.97251 8.30171L8.00007 9.32928 9.02764 8.30171C9.26195 8.0674 9.64185 8.0674 9.87617 8.30171 10.1105 8.53603 10.1105 8.91593 9.87617 9.15024L8.8486 10.1778 9.87617 11.2054C10.1105 11.4397 10.1105 11.8196 9.87617 12.0539 9.64185 12.2882 9.26195 12.2882 9.02764 12.0539L8.00007 11.0263 6.97251 12.0539C6.73819 12.2882 6.35829 12.2882 6.12398 12.0539 5.88966 11.8196 5.88966 11.4397 6.12398 11.2054L7.15154 10.1778 6.12398 9.15024C5.88966 8.91593 5.88966 8.53603 6.12398 8.30171z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M4.75332 5.22217C3.86966 5.22217 3.15332 5.93851 3.15332 6.82217V12.5331C3.15332 13.9691 4.31738 15.1332 5.75332 15.1332H10.2465C11.6825 15.1332 12.8465 13.9691 12.8465 12.5331V6.82217C12.8465 5.93851 12.1302 5.22217 11.2465 5.22217H4.75332ZM4.35332 6.82217C4.35332 6.60125 4.53241 6.42217 4.75332 6.42217H11.2465C11.4674 6.42217 11.6465 6.60125 11.6465 6.82217V12.5331C11.6465 13.3063 11.0197 13.9332 10.2465 13.9332H5.75332C4.98012 13.9332 4.35332 13.3063 4.35332 12.5331V6.82217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Ra = Pe(function(e, t) {
-  return Fe(Ne, Object.assign({}, e, {
+var ii = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.3313 1.4667C5.3313 1.13533 5.59993.866699 5.9313.866699H10.069C10.4004.866699 10.669 1.13533 10.669 1.4667 10.669 1.79807 10.4004 2.0667 10.069 2.0667H5.9313C5.59993 2.0667 5.3313 1.79807 5.3313 1.4667zM1.09985 3.64443C1.09985 3.31306 1.36848 3.04443 1.69985 3.04443H14.2999C14.6312 3.04443 14.8999 3.31306 14.8999 3.64443 14.8999 3.9758 14.6312 4.24443 14.2999 4.24443H1.69985C1.36848 4.24443 1.09985 3.9758 1.09985 3.64443zM6.12398 8.30171C6.35829 8.0674 6.73819 8.0674 6.97251 8.30171L8.00007 9.32928 9.02764 8.30171C9.26195 8.0674 9.64185 8.0674 9.87617 8.30171 10.1105 8.53603 10.1105 8.91593 9.87617 9.15024L8.8486 10.1778 9.87617 11.2054C10.1105 11.4397 10.1105 11.8196 9.87617 12.0539 9.64185 12.2882 9.26195 12.2882 9.02764 12.0539L8.00007 11.0263 6.97251 12.0539C6.73819 12.2882 6.35829 12.2882 6.12398 12.0539 5.88966 11.8196 5.88966 11.4397 6.12398 11.2054L7.15154 10.1778 6.12398 9.15024C5.88966 8.91593 5.88966 8.53603 6.12398 8.30171z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M4.75332 5.22217C3.86966 5.22217 3.15332 5.93851 3.15332 6.82217V12.5331C3.15332 13.9691 4.31738 15.1332 5.75332 15.1332H10.2465C11.6825 15.1332 12.8465 13.9691 12.8465 12.5331V6.82217C12.8465 5.93851 12.1302 5.22217 11.2465 5.22217H4.75332ZM4.35332 6.82217C4.35332 6.60125 4.53241 6.42217 4.75332 6.42217H11.2465C11.4674 6.42217 11.6465 6.60125 11.6465 6.82217V12.5331C11.6465 13.3063 11.0197 13.9332 10.2465 13.9332H5.75332C4.98012 13.9332 4.35332 13.3063 4.35332 12.5331V6.82217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Ra = Fe(function(e, t) {
+  return ke(Ue, Object.assign({}, e, {
     id: "delete-single",
     ref: t,
     icon: ii
   }));
 });
 Ra.displayName = "DeleteSingle";
-var ri = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M8.6 1.99991C8.60001 1.66854 8.33138 1.39991 8.00001 1.3999C7.66864 1.3999 7.40001 1.66853 7.4 1.9999L7.39996 7.3999H1.9999C1.66853 7.3999 1.3999 7.66853 1.3999 7.9999C1.3999 8.33127 1.66853 8.5999 1.9999 8.5999H7.39995L7.3999 13.9999C7.3999 14.3313 7.66853 14.5999 7.9999 14.5999C8.33127 14.5999 8.5999 14.3313 8.5999 13.9999L8.59995 8.5999H13.9999C14.3313 8.5999 14.5999 8.33127 14.5999 7.9999C14.5999 7.66853 14.3313 7.3999 13.9999 7.3999H8.59996L8.6 1.99991Z" } }] }, Rn = Pe(function(e, t) {
-  return Fe(Ne, Object.assign({}, e, {
+var ri = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M8.6 1.99991C8.60001 1.66854 8.33138 1.39991 8.00001 1.3999C7.66864 1.3999 7.40001 1.66853 7.4 1.9999L7.39996 7.3999H1.9999C1.66853 7.3999 1.3999 7.66853 1.3999 7.9999C1.3999 8.33127 1.66853 8.5999 1.9999 8.5999H7.39995L7.3999 13.9999C7.3999 14.3313 7.66853 14.5999 7.9999 14.5999C8.33127 14.5999 8.5999 14.3313 8.5999 13.9999L8.59995 8.5999H13.9999C14.3313 8.5999 14.5999 8.33127 14.5999 7.9999C14.5999 7.66853 14.3313 7.3999 13.9999 7.3999H8.59996L8.6 1.99991Z" } }] }, Rn = Fe(function(e, t) {
+  return ke(Ue, Object.assign({}, e, {
     id: "increase-single",
     ref: t,
     icon: ri
   }));
 });
 Rn.displayName = "IncreaseSingle";
-var si = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M11.3536 6.14645C11.5488 6.34171 11.5488 6.65829 11.3536 6.85355L8.35355 9.85355C8.15829 10.0488 7.84171 10.0488 7.64645 9.85355L4.64645 6.85355C4.45118 6.65829 4.45118 6.34171 4.64645 6.14645C4.84171 5.95118 5.15829 5.95118 5.35355 6.14645L8 8.79289L10.6464 6.14645C10.8417 5.95118 11.1583 5.95118 11.3536 6.14645Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, wn = Pe(function(e, t) {
-  return Fe(Ne, Object.assign({}, e, {
+var si = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M11.3536 6.14645C11.5488 6.34171 11.5488 6.65829 11.3536 6.85355L8.35355 9.85355C8.15829 10.0488 7.84171 10.0488 7.64645 9.85355L4.64645 6.85355C4.45118 6.65829 4.45118 6.34171 4.64645 6.14645C4.84171 5.95118 5.15829 5.95118 5.35355 6.14645L8 8.79289L10.6464 6.14645C10.8417 5.95118 11.1583 5.95118 11.3536 6.14645Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, wn = Fe(function(e, t) {
+  return ke(Ue, Object.assign({}, e, {
     id: "more-down-single",
     ref: t,
     icon: si
   }));
 });
 wn.displayName = "MoreDownSingle";
-var li = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M4.64645 9.85355C4.45118 9.65829 4.45118 9.34171 4.64645 9.14645L7.64645 6.14645C7.84171 5.95118 8.15829 5.95118 8.35355 6.14645L11.3536 9.14645C11.5488 9.34171 11.5488 9.65829 11.3536 9.85355C11.1583 10.0488 10.8417 10.0488 10.6464 9.85355L8 7.20711L5.35355 9.85355C5.15829 10.0488 4.84171 10.0488 4.64645 9.85355Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Vn = Pe(function(e, t) {
-  return Fe(Ne, Object.assign({}, e, {
+var li = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M4.64645 9.85355C4.45118 9.65829 4.45118 9.34171 4.64645 9.14645L7.64645 6.14645C7.84171 5.95118 8.15829 5.95118 8.35355 6.14645L11.3536 9.14645C11.5488 9.34171 11.5488 9.65829 11.3536 9.85355C11.1583 10.0488 10.8417 10.0488 10.6464 9.85355L8 7.20711L5.35355 9.85355C5.15829 10.0488 4.84171 10.0488 4.64645 9.85355Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Vn = Fe(function(e, t) {
+  return ke(Ue, Object.assign({}, e, {
     id: "more-up-single",
     ref: t,
     icon: li
   }));
 });
 Vn.displayName = "MoreUpSingle";
-var di = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "mask", attrs: { id: "mask0_622_8", style: { maskType: "alpha" }, width: 16, height: 16, x: 0, y: 0, maskUnits: "userSpaceOnUse" }, children: [{ tag: "path", attrs: { fill: "#D9D9D9", d: "M0 0H16V16H0z" } }] }, { tag: "g", attrs: { fill: "currentColor", mask: "url(#mask0_622_8)" }, children: [{ tag: "path", attrs: { d: "M6 5C6.55228 5 7 4.55228 7 4 7 3.44772 6.55228 3 6 3 5.44772 3 5 3.44772 5 4 5 4.55228 5.44772 5 6 5zM6 9C6.55228 9 7 8.55229 7 8 7 7.44772 6.55228 7 6 7 5.44772 7 5 7.44772 5 8 5 8.55229 5.44772 9 6 9zM7 12C7 12.5523 6.55228 13 6 13 5.44772 13 5 12.5523 5 12 5 11.4477 5.44772 11 6 11 6.55228 11 7 11.4477 7 12zM10 5C10.5523 5 11 4.55228 11 4 11 3.44772 10.5523 3 10 3 9.44771 3 9 3.44772 9 4 9 4.55228 9.44771 5 10 5zM11 8C11 8.55229 10.5523 9 10 9 9.44771 9 9 8.55229 9 8 9 7.44772 9.44771 7 10 7 10.5523 7 11 7.44772 11 8zM10 13C10.5523 13 11 12.5523 11 12 11 11.4477 10.5523 11 10 11 9.44771 11 9 11.4477 9 12 9 12.5523 9.44771 13 10 13z" } }] }] }, yn = Pe(function(e, t) {
-  return Fe(Ne, Object.assign({}, e, {
+var di = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "mask", attrs: { id: "mask0_622_8", style: { maskType: "alpha" }, width: 16, height: 16, x: 0, y: 0, maskUnits: "userSpaceOnUse" }, children: [{ tag: "path", attrs: { fill: "#D9D9D9", d: "M0 0H16V16H0z" } }] }, { tag: "g", attrs: { fill: "currentColor", mask: "url(#mask0_622_8)" }, children: [{ tag: "path", attrs: { d: "M6 5C6.55228 5 7 4.55228 7 4 7 3.44772 6.55228 3 6 3 5.44772 3 5 3.44772 5 4 5 4.55228 5.44772 5 6 5zM6 9C6.55228 9 7 8.55229 7 8 7 7.44772 6.55228 7 6 7 5.44772 7 5 7.44772 5 8 5 8.55229 5.44772 9 6 9zM7 12C7 12.5523 6.55228 13 6 13 5.44772 13 5 12.5523 5 12 5 11.4477 5.44772 11 6 11 6.55228 11 7 11.4477 7 12zM10 5C10.5523 5 11 4.55228 11 4 11 3.44772 10.5523 3 10 3 9.44771 3 9 3.44772 9 4 9 4.55228 9.44771 5 10 5zM11 8C11 8.55229 10.5523 9 10 9 9.44771 9 9 8.55229 9 8 9 7.44772 9.44771 7 10 7 10.5523 7 11 7.44772 11 8zM10 13C10.5523 13 11 12.5523 11 12 11 11.4477 10.5523 11 10 11 9.44771 11 9 11.4477 9 12 9 12.5523 9.44771 13 10 13z" } }] }] }, yn = Fe(function(e, t) {
+  return ke(Ue, Object.assign({}, e, {
     id: "sequence-single",
     ref: t,
     icon: di
   }));
 });
 yn.displayName = "SequenceSingle";
-const xe = "#ECECEC", ci = [
+const je = "#ECECEC", ci = [
   "#FFFFFF",
   "#FEE7E7",
   "#FEF0E6",
@@ -299,7 +299,7 @@ const xe = "#ECECEC", ci = [
   );
 }, ka = (e) => {
   const { item: t, commonProps: n, style: a } = e, { onItemChange: o, onItemDelete: i } = n;
-  return /* @__PURE__ */ Y("div", { className: J.dataValidationFormulaListItem, style: a, children: [
+  return /* @__PURE__ */ z("div", { className: J.dataValidationFormulaListItem, style: a, children: [
     t.isRef ? null : /* @__PURE__ */ v("div", { className: lo(J.dataValidationFormulaListItemDrag, "draggableHandle"), children: /* @__PURE__ */ v(yn, {}) }),
     /* @__PURE__ */ v(
       ui,
@@ -311,13 +311,14 @@ const xe = "#ECECEC", ci = [
       }
     ),
     /* @__PURE__ */ v(
-      be,
+      Oe,
       {
         disabled: t.isRef,
         value: t.label,
         onChange: (r) => {
           o(t.id, r, t.color);
-        }
+        },
+        inputStyle: { height: 28 }
       }
     ),
     t.isRef ? null : /* @__PURE__ */ v("div", { className: J.dataValidationFormulaListItemIcon, children: /* @__PURE__ */ v(Ra, { onClick: () => i(t.id) }) })
@@ -325,157 +326,165 @@ const xe = "#ECECEC", ci = [
 };
 function hi(e) {
   const { value: t, onChange: n = () => {
-  }, unitId: a, subUnitId: o, validResult: i, showError: r, ruleId: l } = e, { formula1: s = "", formula2: d = "" } = t || {}, u = Ge(null), [h, c] = W(() => Ee(s) ? "1" : "0"), [_, p] = W(h === "1" ? s : "="), [V, R] = W(h === "1" ? s : "="), m = U(le), g = U(Ve), f = U(Sa), M = U(Jn), [w, C] = W(() => d.split(",")), I = g.getValidatorItem(K.LIST), [y, L] = W([]), [F, A] = W(""), T = r ? i == null ? void 0 : i.formula1 : "", P = ht(() => f.ruleChange$.pipe(cn(16)), []), $ = Te(P), k = na(n);
-  Ae(() => {
+  }, unitId: a, subUnitId: o, validResult: i, showError: r, ruleId: l } = e, { formula1: s = "", formula2: d = "" } = t || {}, [u, p] = W(() => be(s) ? "1" : "0"), [c, _] = W(u === "1" ? s : "="), [h, D] = W(u === "1" ? s : "="), R = N(le), m = N(ye), g = N(Sa), S = N(Jn), [V, w] = W(() => d.split(",")), C = m.getValidatorItem(G.LIST), [I, y] = W([]), [P, k] = W(""), T = r ? i == null ? void 0 : i.formula1 : "", A = ut(() => g.ruleChange$.pipe(cn(16)), []), F = Ae(A), O = na(n);
+  Le(() => {
     (async () => {
-      await new Promise((D) => {
-        setTimeout(() => D(!0), 100);
+      await new Promise((f) => {
+        setTimeout(() => f(!0), 100);
       });
-      const O = f.getRuleById(a, o, l), S = O == null ? void 0 : O.formula1;
-      if (Ee(S) && I && O) {
-        const D = await I.getListAsync(O, a, o);
-        L(D);
+      const b = g.getRuleById(a, o, l), H = b == null ? void 0 : b.formula1;
+      if (be(H) && C && b) {
+        const f = await C.getListAsync(b, a, o);
+        y(f);
       }
     })();
-  }, [f, $, I, l, o, a]), Ae(() => {
-    Ee(s) && s !== V && (p(s), R(V));
-  }, [V, s]);
-  const [B, H] = W(() => {
-    const O = h !== "1" ? Qn(s) : [], S = d.split(",");
-    return O.map((D, N) => ({
-      label: D,
-      color: S[N] || xe,
+  }, [g, F, C, l, o, a]), Le(() => {
+    be(s) && s !== h && (_(s), D(h));
+  }, [h, s]);
+  const [U, B] = W(() => {
+    const b = u !== "1" ? Qn(s) : [], H = d.split(",");
+    return b.map((f, L) => ({
+      label: f,
+      color: H[L] || je,
       isRef: !1,
       id: Qt.generateRandomId(4)
     }));
-  }), G = (O, S, D) => {
-    const N = B.find((Z) => Z.id === O);
-    N && (N.label = S, N.color = D, H([...B]));
-  }, z = (O) => {
-    const S = B.findIndex((D) => D.id === O);
-    S !== -1 && (B.splice(S, 1), H([...B]));
-  }, ae = d.split(","), me = ht(() => y.map((O, S) => ({
-    label: O,
-    color: ae[S] || xe,
-    id: `${S}`,
+  }), j = (b, H, f) => {
+    const L = U.find(($) => $.id === b);
+    L && (L.label = H, L.color = f, B([...U]));
+  }, Z = (b) => {
+    const H = U.findIndex((f) => f.id === b);
+    H !== -1 && (U.splice(H, 1), B([...U]));
+  }, Y = d.split(","), ae = ut(() => I.map((b, H) => ({
+    label: b,
+    color: Y[H] || je,
+    id: `${H}`,
     isRef: !0
-  })), [ae, y]), ce = (O, S, D) => {
-    const N = [...w];
-    N[+O] = D, C(N), k({
+  })), [Y, I]), pe = (b, H, f) => {
+    const L = [...V];
+    L[+b] = f, w(L), O({
       formula1: s,
-      formula2: N.join(",")
+      formula2: L.join(",")
     });
-  }, ne = () => {
-    H([
-      ...B,
+  }, ce = () => {
+    B([
+      ...U,
       {
         label: "",
-        color: xe,
+        color: je,
         isRef: !1,
         id: Qt.generateRandomId(4)
       }
     ]);
   };
-  Ae(() => {
-    if (h === "1")
+  Le(() => {
+    if (u === "1")
       return;
-    const O = /* @__PURE__ */ new Set(), S = [];
-    B.map((D) => ({
-      labelList: D.label.split(","),
-      item: D
-    })).forEach(({ item: D, labelList: N }) => {
-      N.forEach((Z) => {
-        O.has(Z) || (O.add(Z), S.push({
-          label: Z,
-          color: D.color
+    const b = /* @__PURE__ */ new Set(), H = [];
+    U.map((f) => ({
+      labelList: f.label.split(","),
+      item: f
+    })).forEach(({ item: f, labelList: L }) => {
+      L.forEach(($) => {
+        b.has($) || (b.add($), H.push({
+          label: $,
+          color: f.color
         }));
       });
-    }), k({
-      formula1: qa(S.map((D) => D.label)),
-      formula2: S.map((D) => D.color === xe ? "" : D.color).join(",")
+    }), O({
+      formula1: qa(H.map((f) => f.label)),
+      formula2: H.map((f) => f.color === je ? "" : f.color).join(",")
     });
-  }, [B, k, h, V, w]);
-  const pe = na(async (O) => {
-    if (!Ee(O)) {
-      k == null || k({
+  }, [U, O, u, h, V]);
+  const ne = na(async (b) => {
+    if (!be(b)) {
+      O == null || O({
         formula1: "",
         formula2: d
       });
       return;
     }
-    M.getFormulaRefCheck(O) ? (k == null || k({
-      formula1: Ee(O) ? O : "",
+    S.getFormulaRefCheck(b) ? (O == null || O({
+      formula1: be(b) ? b : "",
       formula2: d
-    }), A("")) : (k == null || k({
+    }), k("")) : (O == null || O({
       formula1: "",
       formula2: d
-    }), p("="), A(m.t("dataValidation.validFail.formulaError")));
-  }), ge = Ge(null), [Ce, it] = W(!1);
-  return rn((O) => {
-    var D;
-    ((D = ge.current) == null ? void 0 : D.isClickOutSide(O)) && it(!1);
-  }), /* @__PURE__ */ Y(ze, { children: [
-    /* @__PURE__ */ v(X, { label: m.t("dataValidation.list.options"), children: /* @__PURE__ */ Y(
+    }), _("="), k(R.t("dataValidation.validFail.formulaError")));
+  }), ue = mt(null), [Ce, ge] = W(!1);
+  return rn((b) => {
+    var f;
+    ((f = ue.current) == null ? void 0 : f.isClickOutSide(b)) && ge(!1);
+  }), /* @__PURE__ */ z(Ke, { children: [
+    /* @__PURE__ */ v(K, { label: R.t("dataValidation.list.options"), children: /* @__PURE__ */ z(
       fa,
       {
-        value: h,
-        onChange: (O) => {
-          c(O), p(V), O === "1" && k({
-            formula1: V === "=" ? "" : V,
-            formula2: w.join(",")
+        value: u,
+        onChange: (b) => {
+          p(b), _(h), b === "1" && O({
+            formula1: h === "=" ? "" : h,
+            formula2: V.join(",")
           });
         },
         children: [
-          /* @__PURE__ */ v(Oe, { value: "0", children: m.t("dataValidation.list.customOptions") }),
-          /* @__PURE__ */ v(Oe, { value: "1", children: m.t("dataValidation.list.refOptions") })
+          /* @__PURE__ */ v(Te, { value: "0", children: R.t("dataValidation.list.customOptions") }),
+          /* @__PURE__ */ v(Te, { value: "1", children: R.t("dataValidation.list.refOptions") })
         ]
       }
     ) }),
-    h === "1" ? /* @__PURE__ */ Y(ze, { children: [
+    u === "1" ? /* @__PURE__ */ z(Ke, { children: [
       /* @__PURE__ */ v(
         dn,
         {
-          initValue: _,
+          initValue: c,
           unitId: a,
           subUnitId: o,
           isFocus: Ce,
-          onChange: (O = "") => {
-            const S = (O != null ? O : "").trim();
-            R(S), pe(S);
+          onChange: (b = "") => {
+            const H = (b != null ? b : "").trim();
+            D(H), ne(H);
           },
-          errorText: T || F || void 0,
-          onFocus: () => it(!0),
+          errorText: T || P || void 0,
+          onFocus: () => ge(!0),
           isSupportAcrossSheet: !0,
-          ref: ge
+          ref: ue
         }
       ),
-      /* @__PURE__ */ v("div", { ref: u, style: { marginTop: "12px" }, children: me.map((O) => /* @__PURE__ */ v(ka, { item: O, commonProps: { onItemChange: ce }, style: { marginBottom: 12 } }, O.id)) })
-    ] }) : /* @__PURE__ */ v(X, { error: T, children: /* @__PURE__ */ Y("div", { ref: u, style: { marginTop: "-12px" }, children: [
+      ae.length > 0 && /* @__PURE__ */ v("div", { style: { marginTop: "12px" }, children: ae.map((b) => /* @__PURE__ */ v(
+        ka,
+        {
+          item: b,
+          commonProps: { onItemChange: pe },
+          style: { marginBottom: 12 }
+        },
+        b.id
+      )) })
+    ] }) : /* @__PURE__ */ v(K, { error: T, children: /* @__PURE__ */ z("div", { style: { marginTop: "-12px" }, children: [
       /* @__PURE__ */ v(
         so,
         {
-          list: B,
-          onListChange: H,
-          rowHeight: 32,
+          list: U,
+          onListChange: B,
+          rowHeight: 28,
           margin: [0, 12],
           draggableHandle: ".draggableHandle",
-          itemRender: (O) => /* @__PURE__ */ v(
+          itemRender: (b) => /* @__PURE__ */ v(
             ka,
             {
-              item: O,
+              item: b,
               commonProps: {
-                onItemChange: G,
-                onItemDelete: z
+                onItemChange: j,
+                onItemDelete: Z
               }
             },
-            O.id
+            b.id
           ),
           idKey: "id"
         }
       ),
-      /* @__PURE__ */ Y("a", { className: J.dataValidationFormulaListAdd, onClick: ne, children: [
+      /* @__PURE__ */ z("a", { className: J.dataValidationFormulaListAdd, onClick: ce, children: [
         /* @__PURE__ */ v(Rn, {}),
-        m.t("dataValidation.list.add")
+        R.t("dataValidation.list.add")
       ] })
     ] }) })
   ] });
@@ -505,30 +514,30 @@ var pi = Object.getOwnPropertyDescriptor, gi = (e, t, n, a) => {
 }, fi = (e, t) => (n, a) => t(n, a, e);
 let _e = class {
   constructor(e) {
-    b(this, "canvasRender", null);
-    b(this, "dropdownType");
-    b(this, "optionsInput");
-    b(this, "formulaInput", pa);
+    E(this, "canvasRender", null);
+    E(this, "dropdownType");
+    E(this, "optionsInput");
+    E(this, "formulaInput", pa);
     this.injector = e;
   }
 };
 _e = gi([
-  fi(0, E(Re))
+  fi(0, M(we))
 ], _e);
 var vi = Object.getOwnPropertyDescriptor, _i = (e, t, n, a) => {
   for (var o = a > 1 ? void 0 : a ? vi(t, n) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (o = r(o) || o);
   return o;
 }, Na = (e, t) => (n, a) => t(n, a, e);
-let Se = class extends we {
+let Se = class extends Ve {
   constructor(t, n) {
     super();
-    b(this, "_open$", new Aa(!1));
-    b(this, "open$", this._open$.pipe(vo()));
-    b(this, "_activeRule");
-    b(this, "_activeRule$", new Aa(void 0));
-    b(this, "activeRule$", this._activeRule$.asObservable());
-    b(this, "_closeDisposable", null);
+    E(this, "_open$", new Aa(!1));
+    E(this, "open$", this._open$.pipe(vo()));
+    E(this, "_activeRule");
+    E(this, "_activeRule$", new Aa(void 0));
+    E(this, "activeRule$", this._activeRule$.asObservable());
+    E(this, "_closeDisposable", null);
     this._univerInstanceService = t, this._sidebarService = n, this.disposeWithMe(
       this._univerInstanceService.getCurrentTypeOfUnit$(x.UNIVER_SHEET).pipe(Ca((a) => !a)).subscribe(() => {
         this.close();
@@ -573,8 +582,8 @@ var Si = Object.getOwnPropertyDescriptor, Ci = (e, t, n, a) => {
   for (var o = a > 1 ? void 0 : a ? Si(t, n) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (o = r(o) || o);
   return o;
-}, Be = (e, t) => (n, a) => t(n, a, e);
-let Je = class extends we {
+}, $e = (e, t) => (n, a) => t(n, a, e);
+let Je = class extends Ve {
   constructor(e, t, n, a, o, i) {
     super(), this._sheetInterceptorService = e, this._dataValidationModel = t, this._dataValidatorRegistryService = n, this._dialogService = a, this._localeService = o, this._sheetsDataValidationValidatorService = i, this._initEditorBridgeInterceptor();
   }
@@ -586,10 +595,10 @@ let Je = class extends we {
           const a = await e, { row: o, col: i, unitId: r, subUnitId: l } = t, s = this._dataValidationModel.getRuleIdByLocation(r, l, o, i), d = s ? this._dataValidationModel.getRuleById(r, l, s) : void 0;
           if (a === !1)
             return n(Promise.resolve(!1));
-          if (!d || d.errorStyle !== ut.STOP)
+          if (!d || d.errorStyle !== ct.STOP)
             return n(Promise.resolve(!0));
           const u = this._dataValidatorRegistryService.getValidatorItem(d.type);
-          return !u || await this._sheetsDataValidationValidatorService.validatorCell(r, l, o, i) === Ye.VALID ? n(Promise.resolve(!0)) : (this._dialogService.open({
+          return !u || await this._sheetsDataValidationValidatorService.validatorCell(r, l, o, i) === Xe.VALID ? n(Promise.resolve(!0)) : (this._dialogService.open({
             width: 368,
             title: {
               title: this._localeService.t("dataValidation.alert.title")
@@ -600,7 +609,7 @@ let Je = class extends we {
             },
             footer: {
               title: ba.createElement(
-                Ke,
+                Ge,
                 {
                   variant: "primary",
                   onClick: () => this._dialogService.close("reject-input-dialog")
@@ -628,7 +637,7 @@ let Je = class extends we {
       },
       footer: {
         title: ba.createElement(
-          Ke,
+          Ge,
           {
             variant: "primary",
             onClick: () => this._dialogService.close("reject-input-dialog")
@@ -643,12 +652,12 @@ let Je = class extends we {
   }
 };
 Je = Ci([
-  Be(0, E(Ia)),
-  Be(1, E(te)),
-  Be(2, E(Ve)),
-  Be(3, co),
-  Be(4, E(le)),
-  Be(5, E(eo))
+  $e(0, M(Ia)),
+  $e(1, M(te)),
+  $e(2, M(ye)),
+  $e(3, co),
+  $e(4, M(le)),
+  $e(5, M(eo))
 ], Je);
 var Ii = Object.getOwnPropertyDescriptor, Ri = (e, t, n, a) => {
   for (var o = a > 1 ? void 0 : a ? Ii(t, n) : t, i = e.length - 1, r; i >= 0; i--)
@@ -677,14 +686,14 @@ function wi(e, t) {
       return "HH:mm:ss";
   }
 }
-let Le = class extends we {
+let Pe = class extends Ve {
   constructor(t, n, a, o, i, r, l, s, d, u) {
     super();
-    b(this, "_activeDropdown");
-    b(this, "_activeDropdown$", new _o());
-    b(this, "_currentPopup", null);
-    b(this, "activeDropdown$", this._activeDropdown$.asObservable());
-    b(this, "_zenVisible", !1);
+    E(this, "_activeDropdown");
+    E(this, "_activeDropdown$", new _o());
+    E(this, "_currentPopup", null);
+    E(this, "activeDropdown$", this._activeDropdown$.asObservable());
+    E(this, "_zenVisible", !1);
     this._univerInstanceService = t, this._dataValidatorRegistryService = n, this._zenZoneService = a, this._dataValidationModel = o, this._sheetsSelectionsService = i, this._cellDropdownManagerService = r, this._sheetDataValidationModel = l, this._commandService = s, this._editorBridgeService = d, this._injector = u, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
       this._activeDropdown$.complete();
     });
@@ -717,7 +726,7 @@ let Le = class extends we {
   }
   // eslint-disable-next-line max-lines-per-function
   showDropdown(t) {
-    var V, R;
+    var D, R;
     const { location: n } = t, { row: a, col: o, unitId: i, subUnitId: r, workbook: l, worksheet: s } = n;
     if (this._currentPopup && this._currentPopup.dispose(), this._zenVisible)
       return;
@@ -728,13 +737,13 @@ let Le = class extends we {
     const u = this._dataValidatorRegistryService.getValidatorItem(d.type);
     if (!(u != null && u.dropdownType))
       return;
-    let h;
+    let p;
     const c = async (m, g) => {
-      var F, A, T;
+      var k, T, A;
       if (!m)
         return !0;
-      const f = m, M = s.getCell(a, o), w = f.format(g === "date" ? "YYYY-MM-DD 00:00:00" : "YYYY-MM-DD HH:mm:ss"), C = (F = ja.parseDate(w)) == null ? void 0 : F.v, I = g === "time" ? C % 1 : C, y = l.getStyles().getStyleByCell(M), L = (T = (A = y == null ? void 0 : y.n) == null ? void 0 : A.pattern) != null ? T : "";
-      return d.errorStyle !== ut.STOP || await u.validator({
+      const S = m, V = s.getCell(a, o), w = S.format(g === "date" ? "YYYY-MM-DD 00:00:00" : "YYYY-MM-DD HH:mm:ss"), C = (k = ja.parseDate(w)) == null ? void 0 : k.v, I = g === "time" ? C % 1 : C, y = l.getStyles().getStyleByCell(V), P = (A = (T = y == null ? void 0 : y.n) == null ? void 0 : T.pattern) != null ? A : "";
+      return d.errorStyle !== ct.STOP || await u.validator({
         value: I,
         unitId: i,
         subUnitId: r,
@@ -749,7 +758,7 @@ let Le = class extends we {
         eventType: gt.Keyboard,
         unitId: i,
         keycode: pt.ESC
-      }), await this._commandService.executeCommand(ct.id, {
+      }), await this._commandService.executeCommand(dt.id, {
         unitId: i,
         subUnitId: r,
         range: {
@@ -766,7 +775,7 @@ let Le = class extends we {
           si: null,
           s: {
             n: {
-              pattern: wi(g, L)
+              pattern: wi(g, P)
             }
           }
         }
@@ -774,50 +783,50 @@ let Le = class extends we {
     };
     let _;
     switch (u.dropdownType) {
-      case he.DATE: {
-        const m = ee(s.getCellRaw(a, o)), g = Wt(m), f = !!((V = d.bizInfo) != null && V.showTime);
+      case me.DATE: {
+        const m = ee(s.getCellRaw(a, o)), g = Wt(m), S = !!((D = d.bizInfo) != null && D.showTime);
         _ = {
           location: n,
           type: "datepicker",
           props: {
-            showTime: f,
-            onChange: (M) => c(M, f ? "datetime" : "date"),
+            showTime: S,
+            onChange: (V) => c(V, S ? "datetime" : "date"),
             defaultValue: g,
             patternType: "date"
           }
         };
         break;
       }
-      case he.TIME: {
+      case me.TIME: {
         const m = ee(s.getCellRaw(a, o)), g = Wt(m);
         _ = {
           location: n,
           type: "datepicker",
           props: {
-            onChange: (f) => c(f, "time"),
+            onChange: (S) => c(S, "time"),
             defaultValue: g,
             patternType: "time"
           }
         };
         break;
       }
-      case he.DATETIME: {
+      case me.DATETIME: {
         const m = ee(s.getCellRaw(a, o)), g = Wt(m);
         _ = {
           location: n,
           type: "datepicker",
           props: {
-            onChange: (f) => c(f, "datetime"),
+            onChange: (S) => c(S, "datetime"),
             defaultValue: g,
             patternType: "datetime"
           }
         };
         break;
       }
-      case he.LIST:
-      case he.MULTIPLE_LIST: {
-        const m = u.dropdownType === he.MULTIPLE_LIST, g = async (y) => {
-          const L = qa(y), F = {
+      case me.LIST:
+      case me.MULTIPLE_LIST: {
+        const m = u.dropdownType === me.MULTIPLE_LIST, g = async (y) => {
+          const P = qa(y), k = {
             unitId: i,
             subUnitId: r,
             range: {
@@ -827,7 +836,7 @@ let Le = class extends we {
               endRow: a
             },
             value: {
-              v: L,
+              v: P,
               p: null,
               f: null,
               si: null
@@ -838,15 +847,15 @@ let Le = class extends we {
             eventType: gt.Keyboard,
             unitId: i,
             keycode: pt.ESC
-          }), this._commandService.executeCommand(ct.id, F), !m;
-        }, f = (d == null ? void 0 : d.renderMode) === ie.CUSTOM || (d == null ? void 0 : d.renderMode) === void 0, M = u.getListWithColor(d, i, r), w = Bt(s.getCellRaw(a, o)), C = () => {
-          this._commandService.executeCommand(Ue.id, {
+          }), this._commandService.executeCommand(dt.id, k), !m;
+        }, S = (d == null ? void 0 : d.renderMode) === ie.CUSTOM || (d == null ? void 0 : d.renderMode) === void 0, V = u.getListWithColor(d, i, r), w = Bt(s.getCellRaw(a, o)), C = () => {
+          this._commandService.executeCommand(Be.id, {
             ruleId: d.uid
-          }), h == null || h.dispose();
-        }, I = M.map((y) => ({
+          }), p == null || p.dispose();
+        }, I = V.map((y) => ({
           label: y.label,
           value: y.label,
-          color: f || y.color ? y.color : "transparent"
+          color: S || y.color ? y.color : "transparent"
         }));
         _ = {
           location: n,
@@ -861,12 +870,12 @@ let Le = class extends we {
         };
         break;
       }
-      case he.CASCADE: {
+      case me.CASCADE: {
         _ = {
           type: "cascader",
           props: {
             onChange: (g) => {
-              const f = {
+              const S = {
                 unitId: i,
                 subUnitId: r,
                 range: {
@@ -887,7 +896,7 @@ let Le = class extends we {
                 eventType: gt.Keyboard,
                 unitId: i,
                 keycode: pt.ESC
-              }), this._commandService.syncExecuteCommand(ct.id, f), !0;
+              }), this._commandService.syncExecuteCommand(dt.id, S), !0;
             },
             defaultValue: Bt(s.getCellRaw(a, o)).split("/"),
             options: JSON.parse((R = d.formula1) != null ? R : "[]")
@@ -896,12 +905,12 @@ let Le = class extends we {
         };
         break;
       }
-      case he.COLOR: {
+      case me.COLOR: {
         _ = {
           type: "color",
           props: {
             onChange: (g) => {
-              const f = {
+              const S = {
                 unitId: i,
                 subUnitId: r,
                 range: {
@@ -922,7 +931,7 @@ let Le = class extends we {
                 eventType: gt.Keyboard,
                 unitId: i,
                 keycode: pt.ESC
-              }), this._commandService.syncExecuteCommand(ct.id, f), !0;
+              }), this._commandService.syncExecuteCommand(dt.id, S), !0;
             },
             defaultValue: Bt(s.getCellRaw(a, o))
           },
@@ -933,15 +942,15 @@ let Le = class extends we {
       default:
         throw new Error("[DataValidationDropdownManagerService]: unknown type!");
     }
-    if (h = this._cellDropdownManagerService.showDropdown(_), !h)
+    if (p = this._cellDropdownManagerService.showDropdown(_), !p)
       throw new Error("[DataValidationDropdownManagerService]: cannot show dropdown!");
-    const p = new $n();
-    p.add(h), p.add({
+    const h = new $n();
+    h.add(p), h.add({
       dispose: () => {
         var m, g;
         (g = (m = this._activeDropdown) == null ? void 0 : m.onHide) == null || g.call(m);
       }
-    }), this._currentPopup = p;
+    }), this._currentPopup = h;
   }
   hideDropdown() {
     this._activeDropdown && (this._currentPopup && this._currentPopup.dispose(), this._currentPopup = null, this._activeDropdown = null, this._activeDropdown$.next(null));
@@ -974,19 +983,19 @@ let Le = class extends we {
     });
   }
 };
-Le = Ri([
+Pe = Ri([
   fe(0, de),
-  fe(1, E(Ve)),
+  fe(1, M(ye)),
   fe(2, ln),
-  fe(3, E(te)),
-  fe(4, E(mn)),
-  fe(5, E(Ao)),
-  fe(6, E(te)),
+  fe(3, M(te)),
+  fe(4, M(mn)),
+  fe(5, M(Ao)),
+  fe(6, M(te)),
   fe(7, Q),
   fe(8, vn),
-  fe(9, E(Re))
-], Le);
-const bt = "DataValidationPanel", Ue = {
+  fe(9, M(we))
+], Pe);
+const bt = "DataValidationPanel", Be = {
   id: "data-validation.operation.open-validation-panel",
   type: ot.OPERATION,
   handler(e, t) {
@@ -994,11 +1003,11 @@ const bt = "DataValidationPanel", Ue = {
       return !1;
     const { ruleId: n, isAdd: a } = t, o = e.get(Se), i = e.get(Sa), r = e.get(de), l = e.get(sn), s = pn(r);
     if (!s) return !1;
-    const { unitId: d, subUnitId: u } = s, h = n ? i.getRuleById(d, u, n) : void 0;
-    o.open(), o.setActiveRule(h && {
+    const { unitId: d, subUnitId: u } = s, p = n ? i.getRuleById(d, u, n) : void 0;
+    o.open(), o.setActiveRule(p && {
       unitId: d,
       subUnitId: u,
-      rule: h
+      rule: p
     });
     const c = l.open({
       id: bt,
@@ -1020,7 +1029,7 @@ const bt = "DataValidationPanel", Ue = {
   type: ot.OPERATION,
   handler(e) {
     const t = e.get(Q), n = e.get(Se);
-    return n.open(), n.isOpen ? t.executeCommand(wa.id) : t.executeCommand(Ue.id), !0;
+    return n.open(), n.isOpen ? t.executeCommand(wa.id) : t.executeCommand(Be.id), !0;
   }
 }, Nt = {
   type: ot.OPERATION,
@@ -1028,7 +1037,7 @@ const bt = "DataValidationPanel", Ue = {
   handler(e, t) {
     if (!t)
       return !1;
-    const n = e.get(Le), { unitId: a, subUnitId: o, row: i, column: r } = t, l = n.activeDropdown, s = l == null ? void 0 : l.location;
+    const n = e.get(Pe), { unitId: a, subUnitId: o, row: i, column: r } = t, l = n.activeDropdown, s = l == null ? void 0 : l.location;
     return s && s.unitId === a && s.subUnitId === o && s.row === i && s.col === r || n.showDataValidationDropdown(
       a,
       o,
@@ -1040,7 +1049,7 @@ const bt = "DataValidationPanel", Ue = {
   type: ot.OPERATION,
   id: "sheet.operation.hide-data-validation-dropdown",
   handler(e, t) {
-    return t ? (e.get(Le).hideDropdown(), !0) : !1;
+    return t ? (e.get(Pe).hideDropdown(), !0) : !1;
   }
 }, Ut = {
   type: ot.COMMAND,
@@ -1053,7 +1062,7 @@ const bt = "DataValidationPanel", Ue = {
       unitId: l,
       subUnitId: s
     };
-    return r.syncExecuteCommand(ga.id, d) ? (r.syncExecuteCommand(Ue.id, {
+    return r.syncExecuteCommand(ga.id, d) ? (r.syncExecuteCommand(Be.id, {
       ruleId: i.uid,
       isAdd: !0
     }), !0) : !1;
@@ -1063,9 +1072,9 @@ var Vi = Object.getOwnPropertyDescriptor, yi = (e, t, n, a) => {
   for (var o = a > 1 ? void 0 : a ? Vi(t, n) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (o = r(o) || o);
   return o;
-}, $e = (e, t) => (n, a) => t(n, a, e);
-const ye = "SHEET_DATA_VALIDATION_ALERT";
-let mt = class extends we {
+}, He = (e, t) => (n, a) => t(n, a, e);
+const Me = "SHEET_DATA_VALIDATION_ALERT";
+let ht = class extends Ve {
   constructor(e, t, n, a, o, i) {
     super(), this._hoverManagerService = e, this._cellAlertManagerService = t, this._univerInstanceService = n, this._localeService = a, this._zenZoneService = o, this._dataValidationModel = i, this._init();
   }
@@ -1080,18 +1089,18 @@ let mt = class extends we {
         if (!a) return;
         const o = this._dataValidationModel.getRuleByLocation(e.location.unitId, e.location.subUnitId, e.location.row, e.location.col);
         if (!o) {
-          this._cellAlertManagerService.removeAlert(ye);
+          this._cellAlertManagerService.removeAlert(Me);
           return;
         }
-        if (this._dataValidationModel.validator(o, { ...e.location, workbook: n, worksheet: a }) === Ye.INVALID) {
-          const r = this._cellAlertManagerService.currentAlert.get(ye), l = (t = r == null ? void 0 : r.alert) == null ? void 0 : t.location;
+        if (this._dataValidationModel.validator(o, { ...e.location, workbook: n, worksheet: a }) === Xe.INVALID) {
+          const r = this._cellAlertManagerService.currentAlert.get(Me), l = (t = r == null ? void 0 : r.alert) == null ? void 0 : t.location;
           if (l && l.row === e.location.row && l.col === e.location.col && l.subUnitId === e.location.subUnitId && l.unitId === e.location.unitId) {
-            this._cellAlertManagerService.removeAlert(ye);
+            this._cellAlertManagerService.removeAlert(Me);
             return;
           }
           const s = this._dataValidationModel.getValidator(o.type);
           if (!s) {
-            this._cellAlertManagerService.removeAlert(ye);
+            this._cellAlertManagerService.removeAlert(Me);
             return;
           }
           this._cellAlertManagerService.showAlert({
@@ -1101,83 +1110,83 @@ let mt = class extends we {
             location: e.location,
             width: 200,
             height: 74,
-            key: ye
+            key: Me
           });
           return;
         }
       }
-      this._cellAlertManagerService.removeAlert(ye);
+      this._cellAlertManagerService.removeAlert(Me);
     }));
   }
   _initZenService() {
     this.disposeWithMe(this._zenZoneService.visible$.subscribe((e) => {
-      e && this._cellAlertManagerService.removeAlert(ye);
+      e && this._cellAlertManagerService.removeAlert(Me);
     }));
   }
 };
-mt = yi([
-  $e(0, E(Lo)),
-  $e(1, E(Po)),
-  $e(2, de),
-  $e(3, E(le)),
-  $e(4, ln),
-  $e(5, E(te))
-], mt);
+ht = yi([
+  He(0, M(Lo)),
+  He(1, M(Po)),
+  He(2, de),
+  He(3, M(le)),
+  He(4, ln),
+  He(5, M(te))
+], ht);
 var Mi = Object.getOwnPropertyDescriptor, Di = (e, t, n, a) => {
   for (var o = a > 1 ? void 0 : a ? Mi(t, n) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (o = r(o) || o);
   return o;
 }, xt = (e, t) => (n, a) => t(n, a, e);
-let Qe = class extends we {
+let Qe = class extends Ve {
   constructor(e, t, n) {
     super(), this._autoFillService = e, this._sheetDataValidationModel = t, this._injector = n, this._initAutoFill();
   }
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
     const e = () => ({ redos: [], undos: [] }), t = (a, o) => {
-      const { source: i, target: r, unitId: l, subUnitId: s } = a, d = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = la([i, r]), [h, c] = u.ranges, { mapFunc: _ } = u, p = {
-        row: h.startRow,
-        col: h.startColumn
-      }, V = No(h, c), R = new Mt(), m = /* @__PURE__ */ new Set();
-      V.forEach((C) => {
-        const I = C.repeatStartCell, y = C.relativeRange, L = {
-          startRow: p.row,
-          startColumn: p.col,
-          endColumn: p.col,
-          endRow: p.row
-        }, F = {
+      const { source: i, target: r, unitId: l, subUnitId: s } = a, d = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = la([i, r]), [p, c] = u.ranges, { mapFunc: _ } = u, h = {
+        row: p.startRow,
+        col: p.startColumn
+      }, D = No(p, c), R = new Mt(), m = /* @__PURE__ */ new Set();
+      D.forEach((C) => {
+        const I = C.repeatStartCell, y = C.relativeRange, P = {
+          startRow: h.row,
+          startColumn: h.col,
+          endColumn: h.col,
+          endRow: h.row
+        }, k = {
           startRow: I.row,
           startColumn: I.col,
           endColumn: I.col,
           endRow: I.row
         };
-        Wn.foreach(y, (A, T) => {
-          const P = Dt.getPositionRange(
+        Wn.foreach(y, (T, A) => {
+          const F = Dt.getPositionRange(
             {
-              startRow: A,
-              startColumn: T,
-              endColumn: T,
-              endRow: A
+              startRow: T,
+              startColumn: A,
+              endColumn: A,
+              endRow: T
             },
-            L
-          ), { row: $, col: k } = _(P.startRow, P.startColumn), B = this._sheetDataValidationModel.getRuleIdByLocation(l, s, $, k) || "", H = Dt.getPositionRange(
+            P
+          ), { row: O, col: U } = _(F.startRow, F.startColumn), B = this._sheetDataValidationModel.getRuleIdByLocation(l, s, O, U) || "", j = Dt.getPositionRange(
             {
-              startRow: A,
-              startColumn: T,
-              endColumn: T,
-              endRow: A
+              startRow: T,
+              startColumn: A,
+              endColumn: A,
+              endRow: T
             },
-            F
-          ), { row: G, col: z } = _(H.startRow, H.startColumn);
-          R.setValue(G, z, B), m.add(B);
+            k
+          ), { row: Z, col: Y } = _(j.startRow, j.startColumn);
+          R.setValue(Z, Y, B), m.add(B);
         });
       });
       const g = Array.from(m).map((C) => ({ id: C, ranges: ea(R, (I) => I === C) }));
       d.addRangeRules(g);
-      const f = d.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: M, undoMutations: w } = ta(l, s, f, this._injector, "patched", o === lt.ONLY_FORMAT);
+      const S = d.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: V, undoMutations: w } = ta(l, s, S, this._injector, "patched", o === st.ONLY_FORMAT);
       return {
         undos: w,
-        redos: M
+        redos: V
       };
     }, n = {
       id: tn,
@@ -1186,13 +1195,13 @@ let Qe = class extends we {
         for (const l of o.rows)
           for (const s of o.cols) {
             const d = this._sheetDataValidationModel.getRuleByLocation(i, r, l, s);
-            if (d && d.type === K.CHECKBOX) {
-              this._autoFillService.setDisableApplyType(lt.SERIES, !0);
+            if (d && d.type === G.CHECKBOX) {
+              this._autoFillService.setDisableApplyType(st.SERIES, !0);
               return;
             }
           }
       },
-      onFillData: (a, o, i) => i === lt.COPY || i === lt.ONLY_FORMAT || i === lt.SERIES ? t(a, i) : e(),
+      onFillData: (a, o, i) => i === st.COPY || i === st.ONLY_FORMAT || i === st.SERIES ? t(a, i) : e(),
       onAfterFillData: () => {
       }
     };
@@ -1201,18 +1210,18 @@ let Qe = class extends we {
 };
 Qe = Di([
   xt(0, ko),
-  xt(1, E(te)),
-  xt(2, E(Re))
+  xt(1, M(te)),
+  xt(2, M(we))
 ], Qe);
 var Ei = Object.getOwnPropertyDescriptor, bi = (e, t, n, a) => {
   for (var o = a > 1 ? void 0 : a ? Ei(t, n) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (o = r(o) || o);
   return o;
 }, jt = (e, t) => (n, a) => t(n, a, e);
-let et = class extends we {
+let et = class extends Ve {
   constructor(t, n, a) {
     super();
-    b(this, "_copyInfo");
+    E(this, "_copyInfo");
     this._sheetClipboardService = t, this._sheetDataValidationModel = n, this._injector = a, this._initCopyPaste();
   }
   _initCopyPaste() {
@@ -1237,9 +1246,9 @@ let et = class extends we {
       return;
     const { rows: r, cols: l } = i;
     r.forEach((s, d) => {
-      l.forEach((u, h) => {
+      l.forEach((u, p) => {
         const c = this._sheetDataValidationModel.getRuleIdByLocation(t, n, s, u);
-        o.setValue(d, h, c != null ? c : "");
+        o.setValue(d, p, c != null ? c : "");
       });
     });
   }
@@ -1260,27 +1269,27 @@ let et = class extends we {
       return { redos: [], undos: [] };
     const { unitId: o, subUnitId: i } = this._copyInfo;
     if (n.unitId !== o || i !== n.subUnitId) {
-      const r = this._sheetDataValidationModel.getRuleObjectMatrix(n.unitId, n.subUnitId).clone(), l = new Mt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = la([n.copyRange, t]), c = Fa(d, u, !0), _ = /* @__PURE__ */ new Map();
+      const r = this._sheetDataValidationModel.getRuleObjectMatrix(n.unitId, n.subUnitId).clone(), l = new Mt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: p } = la([n.copyRange, t]), c = Fa(d, u, !0), _ = /* @__PURE__ */ new Map();
       c.forEach(({ startRange: m }) => {
         var g;
-        (g = this._copyInfo) == null || g.matrix.forValue((f, M, w) => {
+        (g = this._copyInfo) == null || g.matrix.forValue((S, V, w) => {
           const C = Dt.getPositionRange(
             {
-              startRow: f,
-              endRow: f,
-              startColumn: M,
-              endColumn: M
+              startRow: S,
+              endRow: S,
+              startColumn: V,
+              endColumn: V
             },
             m
           ), I = `${i}-${w}`, y = this._sheetDataValidationModel.getRuleById(o, i, w);
           !this._sheetDataValidationModel.getRuleById(n.unitId, n.subUnitId, I) && y && _.set(I, { ...y, uid: I });
-          const { row: L, col: F } = h(C.startRow, C.startColumn);
-          s.add(I), l.setValue(L, F, I);
+          const { row: P, col: k } = p(C.startRow, C.startColumn);
+          s.add(I), l.setValue(P, k, I);
         });
       });
-      const p = Array.from(s).map((m) => ({ id: m, ranges: ea(l, (g) => g === m) }));
-      r.addRangeRules(p);
-      const { redoMutations: V, undoMutations: R } = ta(
+      const h = Array.from(s).map((m) => ({ id: m, ranges: ea(l, (g) => g === m) }));
+      r.addRangeRules(h);
+      const { redoMutations: D, undoMutations: R } = ta(
         n.unitId,
         n.subUnitId,
         r.diffWithAddition(this._sheetDataValidationModel.getRules(n.unitId, n.subUnitId), _.values()),
@@ -1289,29 +1298,29 @@ let et = class extends we {
         !1
       );
       return {
-        redos: V,
+        redos: D,
         undos: R
       };
     } else {
-      const r = this._sheetDataValidationModel.getRuleObjectMatrix(o, i).clone(), l = new Mt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = la([n.copyRange, t]);
+      const r = this._sheetDataValidationModel.getRuleObjectMatrix(o, i).clone(), l = new Mt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: p } = la([n.copyRange, t]);
       Fa(d, u, !0).forEach(({ startRange: R }) => {
         var m;
-        (m = this._copyInfo) == null || m.matrix.forValue((g, f, M) => {
+        (m = this._copyInfo) == null || m.matrix.forValue((g, S, V) => {
           const w = Dt.getPositionRange(
             {
               startRow: g,
               endRow: g,
-              startColumn: f,
-              endColumn: f
+              startColumn: S,
+              endColumn: S
             },
             R
-          ), { row: C, col: I } = h(w.startRow, w.startColumn);
-          l.setValue(C, I, M), s.add(M);
+          ), { row: C, col: I } = p(w.startRow, w.startColumn);
+          l.setValue(C, I, V), s.add(V);
         });
       });
       const _ = Array.from(s).map((R) => ({ id: R, ranges: ea(l, (m) => m === R) }));
       r.addRangeRules(_);
-      const { redoMutations: p, undoMutations: V } = ta(
+      const { redoMutations: h, undoMutations: D } = ta(
         o,
         i,
         r.diff(this._sheetDataValidationModel.getRules(o, i)),
@@ -1320,23 +1329,23 @@ let et = class extends we {
         !1
       );
       return {
-        redos: p,
-        undos: V
+        redos: h,
+        undos: D
       };
     }
   }
 };
 et = bi([
   jt(0, Uo),
-  jt(1, E(te)),
-  jt(2, E(Re))
+  jt(1, M(te)),
+  jt(2, M(we))
 ], et);
 var Oi = Object.getOwnPropertyDescriptor, Ti = (e, t, n, a) => {
   for (var o = a > 1 ? void 0 : a ? Oi(t, n) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (o = r(o) || o);
   return o;
 }, Yt = (e, t) => (n, a) => t(n, a, e);
-let tt = class extends we {
+let tt = class extends Ve {
   constructor(e, t, n) {
     super(), this._localeService = e, this._commandService = t, this._sheetPermissionCheckController = n, this._commandExecutedListener();
   }
@@ -1357,9 +1366,9 @@ let tt = class extends we {
   }
 };
 tt = Ti([
-  Yt(0, E(le)),
+  Yt(0, M(le)),
   Yt(1, Q),
-  Yt(2, E(bo))
+  Yt(2, M(bo))
 ], tt);
 const bn = "data-validation-single", On = "sheet.menu.data-validation";
 function Ai(e) {
@@ -1374,7 +1383,7 @@ function Ai(e) {
 }
 function Li(e) {
   return {
-    id: Ue.id,
+    id: Be.id,
     title: "dataValidation.panel.title",
     type: va.BUTTON
   };
@@ -1391,7 +1400,7 @@ const Fi = {
     [On]: {
       order: 9,
       menuItemFactory: Ai,
-      [Ue.id]: {
+      [Be.id]: {
         order: 0,
         menuItemFactory: Li
       },
@@ -1406,7 +1415,7 @@ var ki = Object.getOwnPropertyDescriptor, Tn = (e, t, n, a) => {
   for (var o = a > 1 ? void 0 : a ? ki(t, n) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (o = r(o) || o);
   return o;
-}, j = (e, t) => (n, a) => t(n, a, e);
+}, X = (e, t) => (n, a) => t(n, a, e);
 const An = {
   tr: {
     size: 6,
@@ -1440,7 +1449,7 @@ let at = class extends ma {
           return;
         const u = l.getActiveSheet();
         if (!u) return;
-        const h = this._dropdownManagerService.activeDropdown, c = h == null ? void 0 : h.location;
+        const p = this._dropdownManagerService.activeDropdown, c = p == null ? void 0 : p.location;
         if (c && c.unitId === a && c.subUnitId === o && c.row === i && c.col === r)
           return;
         this._dropdownManagerService.showDropdown(
@@ -1471,31 +1480,31 @@ let at = class extends ma {
           priority: fn.DATA_VALIDATION,
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: (e, t, n) => {
-            var m, g, f, M, w;
+            var m, g, S, V, w;
             const { row: a, col: o, unitId: i, subUnitId: r, workbook: l, worksheet: s } = t, d = this._sheetDataValidationModel.getRuleIdByLocation(i, r, a, o);
             if (!d)
               return n(e);
             const u = this._sheetDataValidationModel.getRuleById(i, r, d);
             if (!u)
               return n(e);
-            const h = (m = this._dataValidationCacheService.getValue(i, r, a, o)) != null ? m : Ye.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), _ = t.rawData;
-            let p;
-            const V = {
+            const p = (m = this._dataValidationCacheService.getValue(i, r, a, o)) != null ? m : Xe.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), _ = t.rawData;
+            let h;
+            const D = {
               get value() {
                 var C;
-                return p !== void 0 || (p = (C = ee(_)) != null ? C : null), p;
+                return h !== void 0 || (h = (C = ee(_)) != null ? C : null), h;
               }
             }, R = {
               get value() {
                 var C;
-                return `${(C = V.value) != null ? C : ""}`;
+                return `${(C = D.value) != null ? C : ""}`;
               }
             };
             return n({
               ...e,
               markers: {
                 ...e == null ? void 0 : e.markers,
-                ...h === Ye.INVALID ? An : null
+                ...p === Xe.INVALID ? An : null
               },
               customRender: [
                 ...(g = e == null ? void 0 : e.customRender) != null ? g : [],
@@ -1503,7 +1512,7 @@ let at = class extends ma {
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                isSkip: ((f = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : f.isSkip) || ((M = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : M.call(c, u, V.value, t))
+                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, D.value, t))
               },
               interceptorStyle: {
                 ...e == null ? void 0 : e.interceptorStyle,
@@ -1515,14 +1524,14 @@ let at = class extends ma {
                 }, a, o)
               },
               interceptorAutoHeight: () => {
-                var L, F, A, T, P, $;
-                const C = (F = (L = this._renderManagerService.getRenderById(i)) == null ? void 0 : L.with(Et).getSkeletonParam(r)) == null ? void 0 : F.skeleton;
+                var P, k, T, A, F, O;
+                const C = (k = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(Et).getSkeletonParam(r)) == null ? void 0 : k.skeleton;
                 if (!C)
                   return;
                 const I = C.worksheet.getMergedCell(a, o), y = {
                   data: e,
                   style: C.getStyles().getStyleByCell(e),
-                  primaryWithCoord: C.getCellWithCoordByIndex((A = I == null ? void 0 : I.startRow) != null ? A : a, (T = I == null ? void 0 : I.startColumn) != null ? T : o),
+                  primaryWithCoord: C.getCellWithCoordByIndex((T = I == null ? void 0 : I.startRow) != null ? T : a, (A = I == null ? void 0 : I.startColumn) != null ? A : o),
                   unitId: i,
                   subUnitId: r,
                   row: a,
@@ -1530,17 +1539,17 @@ let at = class extends ma {
                   workbook: l,
                   worksheet: s
                 };
-                return ($ = (P = c == null ? void 0 : c.canvasRender) == null ? void 0 : P.calcCellAutoHeight) == null ? void 0 : $.call(P, y);
+                return (O = (F = c == null ? void 0 : c.canvasRender) == null ? void 0 : F.calcCellAutoHeight) == null ? void 0 : O.call(F, y);
               },
               interceptorAutoWidth: () => {
-                var L, F, A, T, P, $;
-                const C = (F = (L = this._renderManagerService.getRenderById(i)) == null ? void 0 : L.with(Et).getSkeletonParam(r)) == null ? void 0 : F.skeleton;
+                var P, k, T, A, F, O;
+                const C = (k = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(Et).getSkeletonParam(r)) == null ? void 0 : k.skeleton;
                 if (!C)
                   return;
                 const I = C.worksheet.getMergedCell(a, o), y = {
                   data: e,
                   style: C.getStyles().getStyleByCell(e),
-                  primaryWithCoord: C.getCellWithCoordByIndex((A = I == null ? void 0 : I.startRow) != null ? A : a, (T = I == null ? void 0 : I.startColumn) != null ? T : o),
+                  primaryWithCoord: C.getCellWithCoordByIndex((T = I == null ? void 0 : I.startRow) != null ? T : a, (A = I == null ? void 0 : I.startColumn) != null ? A : o),
                   unitId: i,
                   subUnitId: r,
                   row: a,
@@ -1548,9 +1557,9 @@ let at = class extends ma {
                   workbook: l,
                   worksheet: s
                 };
-                return ($ = (P = c == null ? void 0 : c.canvasRender) == null ? void 0 : P.calcCellAutoWidth) == null ? void 0 : $.call(P, y);
+                return (O = (F = c == null ? void 0 : c.canvasRender) == null ? void 0 : F.calcCellAutoWidth) == null ? void 0 : O.call(F, y);
               },
-              coverable: ((w = e == null ? void 0 : e.coverable) != null ? w : !0) && !(u.type === K.LIST || u.type === K.LIST_MULTIPLE)
+              coverable: ((w = e == null ? void 0 : e.coverable) != null ? w : !0) && !(u.type === G.LIST || u.type === G.LIST_MULTIPLE)
             });
           }
         }
@@ -1569,7 +1578,7 @@ let at = class extends ma {
       const t = [];
       if (e.forEach((n) => {
         var a;
-        (n.rule.type === K.LIST_MULTIPLE || n.rule.type === K.LIST) && (a = n.rule) != null && a.ranges && t.push(...n.rule.ranges);
+        (n.rule.type === G.LIST_MULTIPLE || n.rule.type === G.LIST) && (a = n.rule) != null && a.ranges && t.push(...n.rule.ranges);
       }), t.length) {
         const n = this._autoHeightController.getUndoRedoParamsOfAutoHeight(t);
         Xa(n.redos, this._commandService);
@@ -1578,17 +1587,17 @@ let at = class extends ma {
   }
 };
 at = Tn([
-  j(0, Q),
-  j(1, mo),
-  j(2, ke),
-  j(3, de),
-  j(4, E(_n)),
-  j(5, E(Le)),
-  j(6, E(te)),
-  j(7, E(Ve)),
-  j(8, E(Ia)),
-  j(9, E(nn)),
-  j(10, xn(vn))
+  X(0, Q),
+  X(1, mo),
+  X(2, Ne),
+  X(3, de),
+  X(4, M(_n)),
+  X(5, M(Pe)),
+  X(6, M(te)),
+  X(7, M(ye)),
+  X(8, M(Ia)),
+  X(9, M(nn)),
+  X(10, xn(vn))
 ], at);
 let Ua = class extends ma {
   constructor(e, t, n, a, o, i, r) {
@@ -1604,19 +1613,19 @@ let Ua = class extends ma {
           priority: fn.DATA_VALIDATION,
           // eslint-disable-next-line complexity
           handler: (e, t, n) => {
-            var R, m, g, f, M;
+            var R, m, g, S, V;
             const { row: a, col: o, unitId: i, subUnitId: r, workbook: l, worksheet: s } = t, d = this._sheetDataValidationModel.getRuleIdByLocation(i, r, a, o);
             if (!d)
               return n(e);
             const u = this._sheetDataValidationModel.getRuleById(i, r, d);
             if (!u)
               return n(e);
-            const h = (R = this._dataValidationCacheService.getValue(i, r, a, o)) != null ? R : Ye.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), _ = s.getCellRaw(a, o), p = ee(_), V = `${p != null ? p : ""}`;
+            const p = (R = this._dataValidationCacheService.getValue(i, r, a, o)) != null ? R : Xe.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), _ = s.getCellRaw(a, o), h = ee(_), D = `${h != null ? h : ""}`;
             return n({
               ...e,
               markers: {
                 ...e == null ? void 0 : e.markers,
-                ...h === Ye.INVALID ? An : null
+                ...p === Xe.INVALID ? An : null
               },
               customRender: [
                 ...(m = e == null ? void 0 : e.customRender) != null ? m : [],
@@ -1624,11 +1633,11 @@ let Ua = class extends ma {
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                isSkip: ((g = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : g.isSkip) || ((f = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : f.call(c, u, p, t))
+                isSkip: ((g = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : g.isSkip) || ((S = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : S.call(c, u, h, t))
               },
               interceptorStyle: {
                 ...e == null ? void 0 : e.interceptorStyle,
-                ...c == null ? void 0 : c.getExtraStyle(u, V, {
+                ...c == null ? void 0 : c.getExtraStyle(u, D, {
                   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) || {};
@@ -1636,14 +1645,14 @@ let Ua = class extends ma {
                 }, a, o)
               },
               interceptorAutoHeight: () => {
-                var y, L, F, A, T, P;
-                const w = (L = (y = this._renderManagerService.getRenderById(i)) == null ? void 0 : y.with(Et).getSkeletonParam(r)) == null ? void 0 : L.skeleton;
+                var y, P, k, T, A, F;
+                const w = (P = (y = this._renderManagerService.getRenderById(i)) == null ? void 0 : y.with(Et).getSkeletonParam(r)) == null ? void 0 : P.skeleton;
                 if (!w)
                   return;
                 const C = w.worksheet.getMergedCell(a, o), I = {
                   data: e,
                   style: w.getStyles().getStyleByCell(e),
-                  primaryWithCoord: w.getCellWithCoordByIndex((F = C == null ? void 0 : C.startRow) != null ? F : a, (A = C == null ? void 0 : C.startColumn) != null ? A : o),
+                  primaryWithCoord: w.getCellWithCoordByIndex((k = C == null ? void 0 : C.startRow) != null ? k : a, (T = C == null ? void 0 : C.startColumn) != null ? T : o),
                   unitId: i,
                   subUnitId: r,
                   row: a,
@@ -1651,9 +1660,9 @@ let Ua = class extends ma {
                   workbook: l,
                   worksheet: s
                 };
-                return (P = (T = c == null ? void 0 : c.canvasRender) == null ? void 0 : T.calcCellAutoHeight) == null ? void 0 : P.call(T, I);
+                return (F = (A = c == null ? void 0 : c.canvasRender) == null ? void 0 : A.calcCellAutoHeight) == null ? void 0 : F.call(A, I);
               },
-              coverable: ((M = e == null ? void 0 : e.coverable) != null ? M : !0) && !(u.type === K.LIST || u.type === K.LIST_MULTIPLE)
+              coverable: ((V = e == null ? void 0 : e.coverable) != null ? V : !0) && !(u.type === G.LIST || u.type === G.LIST_MULTIPLE)
             });
           }
         }
@@ -1677,20 +1686,20 @@ let Ua = class extends ma {
   }
 };
 Ua = Tn([
-  j(0, Q),
-  j(1, ke),
-  j(2, E(_n)),
-  j(3, E(Ve)),
-  j(4, E(Ia)),
-  j(5, E(te)),
-  j(6, E(nn))
+  X(0, Q),
+  X(1, Ne),
+  X(2, M(_n)),
+  X(3, M(ye)),
+  X(4, M(Ia)),
+  X(5, M(te)),
+  X(6, M(nn))
 ], Ua);
 var Ni = Object.getOwnPropertyDescriptor, Ui = (e, t, n, a) => {
   for (var o = a > 1 ? void 0 : a ? Ni(t, n) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (o = r(o) || o);
   return o;
 }, Ba = (e, t) => (n, a) => t(n, a, e);
-let Tt = class extends we {
+let Tt = class extends Ve {
   constructor(e, t, n) {
     super(), this._context = e, this._sheetDataValidationModel = t, this._sheetSkeletonManagerService = n, this._initSkeletonChange();
   }
@@ -1711,8 +1720,8 @@ let Tt = class extends we {
   }
 };
 Tt = Ui([
-  Ba(1, E(te)),
-  Ba(2, E(Et))
+  Ba(1, M(te)),
+  Ba(2, M(Et))
 ], Tt);
 const Bi = "univer-data-validation-options-button", $i = "univer-data-validation-options-button-icon", Xt = {
   dataValidationOptionsButton: Bi,
@@ -1720,33 +1729,33 @@ const Bi = "univer-data-validation-options-button", $i = "univer-data-validation
 };
 function Hi(e) {
   var d;
-  const t = U(le), n = U(_a), { value: a, onChange: o, extraComponent: i } = e, [r, l] = W(!1), s = i ? n.get(i) : null;
-  return /* @__PURE__ */ Y(ze, { children: [
-    /* @__PURE__ */ Y("div", { className: Xt.dataValidationOptionsButton, onClick: () => l(!r), children: [
+  const t = N(le), n = N(_a), { value: a, onChange: o, extraComponent: i } = e, [r, l] = W(!1), s = i ? n.get(i) : null;
+  return /* @__PURE__ */ z(Ke, { children: [
+    /* @__PURE__ */ z("div", { className: Xt.dataValidationOptionsButton, onClick: () => l(!r), children: [
       t.t("dataValidation.panel.options"),
       r ? /* @__PURE__ */ v(Vn, { className: Xt.dataValidationOptionsButtonIcon }) : /* @__PURE__ */ v(wn, { className: Xt.dataValidationOptionsButtonIcon })
     ] }),
-    r && /* @__PURE__ */ Y(ze, { children: [
+    r && /* @__PURE__ */ z(Ke, { children: [
       s ? /* @__PURE__ */ v(s, { value: a, onChange: o }) : null,
       /* @__PURE__ */ v(
-        X,
+        K,
         {
           label: t.t("dataValidation.panel.invalid"),
-          children: /* @__PURE__ */ Y(
+          children: /* @__PURE__ */ z(
             fa,
             {
-              value: `${(d = a.errorStyle) != null ? d : ut.WARNING}`,
+              value: `${(d = a.errorStyle) != null ? d : ct.WARNING}`,
               onChange: (u) => o({ ...a, errorStyle: +u }),
               children: [
-                /* @__PURE__ */ v(Oe, { value: `${ut.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
-                /* @__PURE__ */ v(Oe, { value: `${ut.STOP}`, children: t.t("dataValidation.panel.rejectInput") })
+                /* @__PURE__ */ v(Te, { value: `${ct.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
+                /* @__PURE__ */ v(Te, { value: `${ct.STOP}`, children: t.t("dataValidation.panel.rejectInput") })
               ]
             }
           )
         }
       ),
       /* @__PURE__ */ v(
-        X,
+        K,
         {
           label: t.t("dataValidation.panel.messageInfo"),
           children: /* @__PURE__ */ v(
@@ -1762,11 +1771,11 @@ function Hi(e) {
           )
         }
       ),
-      a.showErrorMessage ? /* @__PURE__ */ v(X, { children: /* @__PURE__ */ v(be, { value: a.error, onChange: (u) => o({ ...a, error: u }) }) }) : null
+      a.showErrorMessage ? /* @__PURE__ */ v(K, { children: /* @__PURE__ */ v(Oe, { value: a.error, onChange: (u) => o({ ...a, error: u }) }) }) : null
     ] })
   ] });
 }
-const Wi = "univer-data-validation-detail", xi = "univer-data-validation-detail-form-item", ji = "univer-data-validation-detail-buttons", Yi = "univer-data-validation-detail-button", He = {
+const Wi = "univer-data-validation-detail", xi = "univer-data-validation-detail-form-item", ji = "univer-data-validation-detail-buttons", Yi = "univer-data-validation-detail-button", We = {
   dataValidationDetail: Wi,
   dataValidationDetailFormItem: xi,
   dataValidationDetailButtons: ji,
@@ -1783,25 +1792,25 @@ function zi(e, t, n) {
   return t ? ((o = (a = e.getUnit(t)) == null ? void 0 : a.getSheetBySheetName(n)) == null ? void 0 : o.getSheetId()) || "" : ((r = (i = e.getCurrentUnitForType(x.UNIVER_SHEET)) == null ? void 0 : i.getSheetBySheetName(n)) == null ? void 0 : r.getSheetId()) || "";
 }
 function Ki() {
-  var it, O;
-  const [e, t] = W(0), n = U(Se), a = Te(n.activeRule$, n.activeRule), { unitId: o, subUnitId: i, rule: r } = a || {}, l = r.uid, s = U(Ve), d = U(de), u = U(_a), h = U(Q), c = U(Sa), _ = U(le), [p, V] = W(r), R = s.getValidatorItem(p.type), [m, g] = W(!1), f = s.getValidatorsByScope(go.SHEET), [M, w] = W(() => p.ranges.map((S) => ({ unitId: "", sheetId: "", range: S }))), C = ht(() => Xi(h), [h]), [I, y] = W(!1), [L, F] = W(!1), A = Ge(null), T = U(mn);
-  if (Ae(() => () => {
-    const S = T.getCurrentLastSelection();
-    S && T.setSelections([S]);
-  }, [T]), Ae(() => {
-    h.onCommandExecuted((S) => {
-      (S.id === Xn.id || S.id === zn.id) && setTimeout(() => {
-        const D = c.getRuleById(o, i, l);
-        t((N) => N + 1), D && (V(D), w(D.ranges.map((N) => ({ unitId: "", sheetId: "", range: N }))));
+  var b, H;
+  const [e, t] = W(0), n = N(Se), a = Ae(n.activeRule$, n.activeRule), { unitId: o, subUnitId: i, rule: r } = a || {}, l = r.uid, s = N(ye), d = N(de), u = N(_a), p = N(Q), c = N(Sa), _ = N(le), [h, D] = W(r), R = s.getValidatorItem(h.type), [m, g] = W(!1), S = s.getValidatorsByScope(go.SHEET), [V, w] = W(() => h.ranges.map((f) => ({ unitId: "", sheetId: "", range: f }))), C = ut(() => Xi(p), [p]), [I, y] = W(!1), [P, k] = W(!1), T = mt(null), A = N(mn);
+  if (Le(() => () => {
+    const f = A.getCurrentLastSelection();
+    f && A.setSelections([f]);
+  }, [A]), Le(() => {
+    p.onCommandExecuted((f) => {
+      (f.id === Xn.id || f.id === zn.id) && setTimeout(() => {
+        const L = c.getRuleById(o, i, l);
+        t(($) => $ + 1), L && (D(L), w(L.ranges.map(($) => ({ unitId: "", sheetId: "", range: $ }))));
       }, 20);
     });
-  }, [h, c, l, i, o]), !R)
+  }, [p, c, l, i, o]), !R)
     return null;
-  const P = R.operators, $ = R.operatorNames, k = p.operator ? fo.includes(p.operator) : !1, B = () => {
-    var S, D, N;
-    (D = (S = A.current) == null ? void 0 : S.editor) != null && D.isFocus() && H((N = A.current) == null ? void 0 : N.getValue()), !(!p.ranges.length || I) && (R.validatorFormula(p, o, i).success ? n.setActiveRule(null) : g(!0));
-  }, H = na((S) => {
-    const D = S.split(",").filter(Boolean).map(Ho).map((q) => {
+  const F = R.operators, O = R.operatorNames, U = h.operator ? fo.includes(h.operator) : !1, B = () => {
+    var f, L, $;
+    (L = (f = T.current) == null ? void 0 : f.editor) != null && L.isFocus() && j(($ = T.current) == null ? void 0 : $.getValue()), !(!h.ranges.length || I) && (R.validatorFormula(h, o, i).success ? n.setActiveRule(null) : g(!0));
+  }, j = na((f) => {
+    const L = f.split(",").filter(Boolean).map(Ho).map((q) => {
       const Va = q.sheetName;
       if (Va) {
         const kn = zi(d, q.unitId, Va);
@@ -1812,125 +1821,125 @@ function Ki() {
         sheetId: ""
       };
     });
-    if (Kn(D, M))
+    if (Kn(L, V))
       return;
-    w(D);
-    const N = D.filter((q) => (!q.unitId || q.unitId === o) && (!q.sheetId || q.sheetId === i)).map((q) => q.range);
-    if (V({
-      ...p,
-      ranges: N
-    }), N.length === 0)
+    w(L);
+    const $ = L.filter((q) => (!q.unitId || q.unitId === o) && (!q.sheetId || q.sheetId === i)).map((q) => q.range);
+    if (D({
+      ...h,
+      ranges: $
+    }), $.length === 0)
       return;
-    const Z = {
+    const Ie = {
       unitId: o,
       subUnitId: i,
       ruleId: l,
-      ranges: N
+      ranges: $
     };
-    C(an.id, Z);
-  }), G = (S) => {
-    if (Ma(S, Ta(p)))
+    C(an.id, Ie);
+  }), Z = (f) => {
+    if (Ma(f, Ta(h)))
       return;
-    V({
-      ...p,
-      ...S
+    D({
+      ...h,
+      ...f
     });
-    const D = {
+    const L = {
       unitId: o,
       subUnitId: i,
       ruleId: l,
-      setting: S
+      setting: f
     };
     C(
       Da.id,
-      D,
+      L,
       void 0
     );
-  }, z = async () => {
-    await h.executeCommand(on.id, {
+  }, Y = async () => {
+    await p.executeCommand(on.id, {
       ruleId: l,
       unitId: o,
       subUnitId: i
     }), n.setActiveRule(null);
   }, ae = {
-    type: p.type,
-    operator: p.operator,
-    formula1: p.formula1,
-    formula2: p.formula2,
-    allowBlank: p.allowBlank
-  }, me = (S) => {
-    const D = s.getValidatorItem(S);
-    if (!D)
+    type: h.type,
+    operator: h.operator,
+    formula1: h.formula1,
+    formula2: h.formula2,
+    allowBlank: h.allowBlank
+  }, pe = (f) => {
+    const L = s.getValidatorItem(f);
+    if (!L)
       return;
-    const N = D.operators, Z = c.getRuleById(o, i, l), q = S === (Z == null ? void 0 : Z.type) || S.includes("list") && (Z != null && Z.type.includes("list")) ? {
-      ...Z,
-      type: S
+    const $ = L.operators, Ie = c.getRuleById(o, i, l), q = f === (Ie == null ? void 0 : Ie.type) || f.includes("list") && (Ie != null && Ie.type.includes("list")) ? {
+      ...Ie,
+      type: f
     } : {
-      ...p,
-      type: S,
-      operator: N[0],
+      ...h,
+      type: f,
+      operator: $[0],
       formula1: void 0,
       formula2: void 0
     };
-    V(q), h.executeCommand(Da.id, {
+    D(q), p.executeCommand(Da.id, {
       unitId: o,
       subUnitId: i,
-      ruleId: p.uid,
+      ruleId: h.uid,
       setting: Ta(q)
     });
-  }, ce = u.get(R.formulaInput), ne = ht(() => M.map((S) => Sn(S.range)).join(","), []), pe = Oa(p), ge = (S) => {
-    Ma(S, Oa(p)) || (V({
-      ...p,
-      ...S
+  }, ce = u.get(R.formulaInput), ne = ut(() => V.map((f) => Sn(f.range)).join(","), []), ue = Oa(h), Ce = (f) => {
+    Ma(f, Oa(h)) || (D({
+      ...h,
+      ...f
     }), C(
       to.id,
       {
         unitId: o,
         subUnitId: i,
         ruleId: l,
-        options: S
+        options: f
       }
     ));
-  }, Ce = !p.operator;
-  return /* @__PURE__ */ Y("div", { className: He.dataValidationDetail, children: [
+  }, ge = F.length && !h.operator;
+  return /* @__PURE__ */ z("div", { className: We.dataValidationDetail, children: [
     /* @__PURE__ */ v(
-      X,
+      K,
       {
         label: _.t("dataValidation.panel.range"),
-        error: !p.ranges.length || I ? _.t("dataValidation.panel.rangeError") : "",
+        error: !h.ranges.length || I ? _.t("dataValidation.panel.rangeError") : "",
         children: /* @__PURE__ */ v(
           po,
           {
-            selectorRef: A,
+            selectorRef: T,
             unitId: o,
             subUnitId: i,
             initialValue: ne,
-            onChange: (S, D) => {
-              var N;
-              !L && ((N = A.current) != null && N.verify()) && H(D);
+            onChange: (f, L) => {
+              var $;
+              !P && (($ = T.current) != null && $.verify()) && j(L);
             },
-            onFocusChange: (S, D) => {
-              var N;
-              F(S), !S && D && ((N = A.current) != null && N.verify()) && H(D);
+            onFocusChange: (f, L) => {
+              var $;
+              k(f), !f && L && (($ = T.current) != null && $.verify()) && j(L);
             },
-            onVerify: (S) => y(!S)
+            onVerify: (f) => y(!f)
           }
         )
       }
     ),
-    /* @__PURE__ */ v(X, { label: _.t("dataValidation.panel.type"), children: /* @__PURE__ */ v(
+    /* @__PURE__ */ v(K, { label: _.t("dataValidation.panel.type"), children: /* @__PURE__ */ v(
       aa,
       {
-        options: (it = f == null ? void 0 : f.sort((S, D) => S.order - D.order)) == null ? void 0 : it.map((S) => ({
-          label: _.t(S.title),
-          value: S.id
+        options: (b = S == null ? void 0 : S.sort((f, L) => f.order - L.order)) == null ? void 0 : b.map((f) => ({
+          label: _.t(f.title),
+          value: f.id
         })),
-        value: p.type,
-        onChange: me,
-        className: He.dataValidationDetailFormItem
+        value: h.type,
+        onChange: pe,
+        className: We.dataValidationDetailFormItem
       }
     ) }),
-    P != null && P.length ? /* @__PURE__ */ v(X, { label: _.t("dataValidation.panel.operator"), children: /* @__PURE__ */ v(
+    F != null && F.length ? /* @__PURE__ */ v(K, { label: _.t("dataValidation.panel.operator"), children: /* @__PURE__ */ v(
       aa,
       {
         options: [
@@ -1938,61 +1947,61 @@ function Ki() {
             value: "",
             label: _.t("dataValidation.operators.legal")
           },
-          ...P.map((S, D) => ({
-            value: `${S}`,
-            label: $[D]
+          ...F.map((f, L) => ({
+            value: `${f}`,
+            label: O[L]
           }))
         ],
-        value: `${p.operator}`,
-        onChange: (S) => {
-          G({
+        value: `${h.operator}`,
+        onChange: (f) => {
+          Z({
             ...ae,
-            operator: S
+            operator: f
           });
         },
-        className: He.dataValidationDetailFormItem
+        className: We.dataValidationDetailFormItem
       }
     ) }) : null,
-    ce && !Ce ? /* @__PURE__ */ v(X, { children: /* @__PURE__ */ v(
+    ce && !ge ? /* @__PURE__ */ v(K, { children: /* @__PURE__ */ v(
       ce,
       {
-        isTwoFormula: k,
+        isTwoFormula: U,
         value: {
-          formula1: p.formula1,
-          formula2: p.formula2
+          formula1: h.formula1,
+          formula2: h.formula2
         },
-        onChange: (S) => {
-          G({
+        onChange: (f) => {
+          Z({
             ...ae,
-            ...S
+            ...f
           });
         },
         showError: m,
-        validResult: R.validatorFormula(p, o, i),
+        validResult: R.validatorFormula(h, o, i),
         unitId: o,
         subUnitId: i,
         ruleId: l
       },
-      e + p.type
+      e + h.type
     ) }) : null,
-    /* @__PURE__ */ v(X, { children: /* @__PURE__ */ v(
+    /* @__PURE__ */ v(K, { children: /* @__PURE__ */ v(
       kt,
       {
-        checked: (O = p.allowBlank) != null ? O : !0,
+        checked: (H = h.allowBlank) != null ? H : !0,
         onChange: () => {
-          var S;
-          return G({
+          var f;
+          return Z({
             ...ae,
-            allowBlank: !((S = p.allowBlank) == null || S)
+            allowBlank: !((f = h.allowBlank) == null || f)
           });
         },
         children: _.t("dataValidation.panel.allowBlank")
       }
     ) }),
-    /* @__PURE__ */ v(Hi, { value: pe, onChange: ge, extraComponent: R.optionsInput }),
-    /* @__PURE__ */ Y("div", { className: He.dataValidationDetailButtons, children: [
-      /* @__PURE__ */ v(Ke, { className: He.dataValidationDetailButton, onClick: z, children: _.t("dataValidation.panel.removeRule") }),
-      /* @__PURE__ */ v(Ke, { className: He.dataValidationDetailButton, variant: "primary", onClick: B, children: _.t("dataValidation.panel.done") })
+    /* @__PURE__ */ v(Hi, { value: ue, onChange: Ce, extraComponent: R.optionsInput }),
+    /* @__PURE__ */ z("div", { className: We.dataValidationDetailButtons, children: [
+      /* @__PURE__ */ v(Ge, { className: We.dataValidationDetailButton, onClick: Y, children: _.t("dataValidation.panel.removeRule") }),
+      /* @__PURE__ */ v(Ge, { className: We.dataValidationDetailButton, variant: "primary", onClick: B, children: _.t("dataValidation.panel.done") })
     ] })
   ] });
 }
@@ -2002,26 +2011,26 @@ const Gi = "univer-data-validation-item-container", Zi = "univer-data-validation
   dataValidationItemContent: qi,
   dataValidationItemIcon: Ji
 }, Qi = (e) => {
-  const { rule: t, onClick: n, unitId: a, subUnitId: o, disable: i } = e, r = U(Ve), l = U(Q), s = U($o), d = r.getValidatorItem(t.type), u = Ge(void 0), [h, c] = W(!1), _ = U(za), p = Te(_.currentTheme$), V = ht(() => {
-    var f;
-    const m = (f = p == null ? void 0 : p.loopColor2) != null ? f : "#49B811", g = new Gn(m).toRgb();
+  const { rule: t, onClick: n, unitId: a, subUnitId: o, disable: i } = e, r = N(ye), l = N(Q), s = N($o), d = r.getValidatorItem(t.type), u = mt(void 0), [p, c] = W(!1), _ = N(za), h = Ae(_.currentTheme$), D = ut(() => {
+    var S;
+    const m = (S = h == null ? void 0 : h.loopColor2) != null ? S : "#49B811", g = new Gn(m).toRgb();
     return {
       fill: `rgba(${g.r}, ${g.g}, ${g.b}, 0.1)`,
       stroke: m
     };
-  }, [p]), R = (m) => {
+  }, [h]), R = (m) => {
     l.executeCommand(on.id, {
       ruleId: t.uid,
       unitId: a,
       subUnitId: o
     }), m.stopPropagation();
   };
-  return Ae(() => () => {
+  return Le(() => () => {
     var m;
     u.current && ((m = u.current) == null || m.forEach((g) => {
       g && s.removeShape(g);
     }));
-  }, [s]), /* @__PURE__ */ Y(
+  }, [s]), /* @__PURE__ */ z(
     "div",
     {
       className: _t.dataValidationItemContainer,
@@ -2029,7 +2038,7 @@ const Gi = "univer-data-validation-item-container", Zi = "univer-data-validation
       onMouseEnter: () => {
         i || (c(!0), u.current = t.ranges.map((m) => s.addShape({
           range: m,
-          style: V,
+          style: D,
           primary: null
         })));
       },
@@ -2042,7 +2051,7 @@ const Gi = "univer-data-validation-item-container", Zi = "univer-data-validation
       children: [
         /* @__PURE__ */ v("div", { className: _t.dataValidationItemTitle, children: d == null ? void 0 : d.generateRuleName(t) }),
         /* @__PURE__ */ v("div", { className: _t.dataValidationItemContent, children: t.ranges.map((m) => Sn(m)).join(",") }),
-        h ? /* @__PURE__ */ v("div", { className: _t.dataValidationItemIcon, onClick: R, children: /* @__PURE__ */ v(Ra, {}) }) : null
+        p ? /* @__PURE__ */ v("div", { className: _t.dataValidationItemIcon, onClick: R, children: /* @__PURE__ */ v(Ra, {}) }) : null
       ]
     }
   );
@@ -2052,70 +2061,70 @@ const Gi = "univer-data-validation-item-container", Zi = "univer-data-validation
   dataValidationListButton: ar
 };
 function nr(e) {
-  const t = U(te), n = U(de), a = U(Q), o = U(Re), i = U(Se), r = U(le), [l, s] = W([]), { workbook: d } = e, u = Te(d.activeSheet$, void 0, !0), h = d.getUnitId(), c = u == null ? void 0 : u.getSheetId();
-  Ae(() => {
-    s(t.getRules(h, c));
-    const g = t.ruleChange$.subscribe((f) => {
-      f.unitId === h && f.subUnitId === c && s(t.getRules(h, c));
+  const t = N(te), n = N(de), a = N(Q), o = N(we), i = N(Se), r = N(le), [l, s] = W([]), { workbook: d } = e, u = Ae(d.activeSheet$, void 0, !0), p = d.getUnitId(), c = u == null ? void 0 : u.getSheetId();
+  Le(() => {
+    s(t.getRules(p, c));
+    const g = t.ruleChange$.subscribe((S) => {
+      S.unitId === p && S.subUnitId === c && s(t.getRules(p, c));
     });
     return () => {
       g.unsubscribe();
     };
-  }, [h, c, t]);
+  }, [p, c, t]);
   const _ = async () => {
-    const g = en(o), f = {
-      unitId: h,
+    const g = en(o), S = {
+      unitId: p,
       subUnitId: c,
       rule: g
     };
-    await a.executeCommand(ga.id, f), i.setActiveRule({
-      unitId: h,
+    await a.executeCommand(ga.id, S), i.setActiveRule({
+      unitId: p,
       subUnitId: c,
       rule: g
     });
-  }, p = () => {
+  }, h = () => {
     a.executeCommand(ao.id, {
-      unitId: h,
+      unitId: p,
       subUnitId: c
     });
   }, R = ((g) => {
-    const f = n.getCurrentUnitForType(x.UNIVER_SHEET), M = f.getActiveSheet(), w = f.getUnitId(), C = M.getSheetId();
+    const S = n.getCurrentUnitForType(x.UNIVER_SHEET), V = S.getActiveSheet(), w = S.getUnitId(), C = V.getSheetId();
     return g.map((y) => Oo(o, w, C, y.ranges) ? { ...y } : { ...y, disable: !0 });
   })(l), m = R == null ? void 0 : R.some((g) => g.disable);
-  return /* @__PURE__ */ Y("div", { className: St.dataValidationList, children: [
+  return /* @__PURE__ */ z("div", { className: St.dataValidationList, children: [
     R == null ? void 0 : R.map((g) => {
-      var f;
+      var S;
       return /* @__PURE__ */ v(
         Qi,
         {
-          unitId: h,
+          unitId: p,
           subUnitId: c,
           onClick: () => {
             g.disable || i.setActiveRule({
-              unitId: h,
+              unitId: p,
               subUnitId: c,
               rule: g
             });
           },
           rule: g,
-          disable: (f = g.disable) != null ? f : !1
+          disable: (S = g.disable) != null ? S : !1
         },
         g.uid
       );
     }),
-    /* @__PURE__ */ Y("div", { className: St.dataValidationListButtons, children: [
-      l.length && !m ? /* @__PURE__ */ v(Ke, { className: St.dataValidationListButton, onClick: p, children: r.t("dataValidation.panel.removeAll") }) : null,
-      /* @__PURE__ */ v(Ke, { className: St.dataValidationListButton, variant: "primary", onClick: _, children: r.t("dataValidation.panel.add") })
+    /* @__PURE__ */ z("div", { className: St.dataValidationListButtons, children: [
+      l.length && !m ? /* @__PURE__ */ v(Ge, { className: St.dataValidationListButton, onClick: h, children: r.t("dataValidation.panel.removeAll") }) : null,
+      /* @__PURE__ */ v(Ge, { className: St.dataValidationListButton, variant: "primary", onClick: _, children: r.t("dataValidation.panel.add") })
     ] })
   ] });
 }
 const or = () => {
-  const e = U(Se), t = Te(e.activeRule$, e.activeRule), n = U(de), a = Te(
+  const e = N(Se), t = Ae(e.activeRule$, e.activeRule), n = N(de), a = Ae(
     () => n.getCurrentTypeOfUnit$(x.UNIVER_SHEET),
     void 0,
     void 0,
     []
-  ), o = Te(() => {
+  ), o = Ae(() => {
     var i;
     return (i = a == null ? void 0 : a.activeSheet$) != null ? i : So(null);
   }, void 0, void 0, []);
@@ -2123,19 +2132,19 @@ const or = () => {
 }, ir = "LIST_RENDER_MODE_OPTION_INPUT";
 function At(e) {
   var o;
-  const { value: t, onChange: n } = e, a = U(le);
-  return /* @__PURE__ */ v(X, { label: a.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ Y(fa, { value: `${(o = t.renderMode) != null ? o : ie.CUSTOM}`, onChange: (i) => n({ ...t, renderMode: +i }), children: [
-    /* @__PURE__ */ v(Oe, { value: `${ie.CUSTOM}`, children: a.t("dataValidation.renderMode.chip") }),
-    /* @__PURE__ */ v(Oe, { value: `${ie.ARROW}`, children: a.t("dataValidation.renderMode.arrow") }),
-    /* @__PURE__ */ v(Oe, { value: `${ie.TEXT}`, children: a.t("dataValidation.renderMode.text") })
+  const { value: t, onChange: n } = e, a = N(le);
+  return /* @__PURE__ */ v(K, { label: a.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ z(fa, { value: `${(o = t.renderMode) != null ? o : ie.CUSTOM}`, onChange: (i) => n({ ...t, renderMode: +i }), children: [
+    /* @__PURE__ */ v(Te, { value: `${ie.CUSTOM}`, children: a.t("dataValidation.renderMode.chip") }),
+    /* @__PURE__ */ v(Te, { value: `${ie.ARROW}`, children: a.t("dataValidation.renderMode.arrow") }),
+    /* @__PURE__ */ v(Te, { value: `${ie.TEXT}`, children: a.t("dataValidation.renderMode.text") })
   ] }) });
 }
 At.componentKey = ir;
 const rr = "DATE_SHOW_TIME_OPTION";
 function Lt(e) {
   var o;
-  const { value: t, onChange: n } = e, a = U(le);
-  return /* @__PURE__ */ v(X, { children: /* @__PURE__ */ v(
+  const { value: t, onChange: n } = e, a = N(le);
+  return /* @__PURE__ */ v(K, { children: /* @__PURE__ */ v(
     kt,
     {
       checked: (o = t.bizInfo) == null ? void 0 : o.showTime,
@@ -2157,14 +2166,14 @@ var sr = Object.getOwnPropertyDescriptor, lr = (e, t, n, a) => {
   for (var o = a > 1 ? void 0 : a ? sr(t, n) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (o = r(o) || o);
   return o;
-}, We = (e, t) => (n, a) => t(n, a, e);
+}, xe = (e, t) => (n, a) => t(n, a, e);
 const Ct = 6;
 let da = class {
   constructor(e, t, n, a, o, i) {
     this._commandService = e, this._univerInstanceService = t, this._formulaService = n, this._themeService = a, this._renderManagerService = o, this._dataValidationModel = i;
   }
   _calc(e, t) {
-    var d, u, h;
+    var d, u, p;
     const { vt: n, ht: a } = t || {}, o = e.endX - e.startX - Ct * 2, i = e.endY - e.startY, r = ((d = t == null ? void 0 : t.fs) != null ? d : 10) * 1.6;
     let l = 0, s = 0;
     switch (n) {
@@ -2179,10 +2188,10 @@ let da = class {
         break;
     }
     switch (a) {
-      case Xe.LEFT:
+      case ze.LEFT:
         l = Ct;
         break;
-      case Xe.RIGHT:
+      case ze.RIGHT:
         l = Ct + (o - r);
         break;
       default:
@@ -2193,7 +2202,7 @@ let da = class {
       left: e.startX + l,
       top: e.startY + s,
       width: ((u = t == null ? void 0 : t.fs) != null ? u : 10) * 1.6,
-      height: ((h = t == null ? void 0 : t.fs) != null ? h : 10) * 1.6
+      height: ((p = t == null ? void 0 : t.fs) != null ? p : 10) * 1.6
     };
   }
   calcCellAutoHeight(e) {
@@ -2207,28 +2216,28 @@ let da = class {
     return ((n = t == null ? void 0 : t.fs) != null ? n : 10) * 1.6;
   }
   async _parseFormula(e, t, n) {
-    var d, u, h, c, _, p, V, R, m;
-    const { formula1: a = io, formula2: o = oo } = e, i = await this._formulaService.getRuleFormulaResult(t, n, e.uid), r = $t((h = (u = (d = i == null ? void 0 : i[0]) == null ? void 0 : d.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), l = $t((p = (_ = (c = i == null ? void 0 : i[1]) == null ? void 0 : c.result) == null ? void 0 : _[0]) == null ? void 0 : p[0]), s = Ea(String(r)) && Ea(String(l));
+    var d, u, p, c, _, h, D, R, m;
+    const { formula1: a = io, formula2: o = oo } = e, i = await this._formulaService.getRuleFormulaResult(t, n, e.uid), r = $t((p = (u = (d = i == null ? void 0 : i[0]) == null ? void 0 : d.result) == null ? void 0 : u[0]) == null ? void 0 : p[0]), l = $t((h = (_ = (c = i == null ? void 0 : i[1]) == null ? void 0 : c.result) == null ? void 0 : _[0]) == null ? void 0 : h[0]), s = Ea(String(r)) && Ea(String(l));
     return {
-      formula1: Ee(a) ? $t((m = (R = (V = i == null ? void 0 : i[0]) == null ? void 0 : V.result) == null ? void 0 : R[0]) == null ? void 0 : m[0]) : a,
-      formula2: Ee(o) ? l : o,
+      formula1: be(a) ? $t((m = (R = (D = i == null ? void 0 : i[0]) == null ? void 0 : D.result) == null ? void 0 : R[0]) == null ? void 0 : m[0]) : a,
+      formula2: be(o) ? l : o,
       isFormulaValid: s
     };
   }
   drawWith(e, t) {
-    var T, P, $, k;
-    const { style: n, primaryWithCoord: a, unitId: o, subUnitId: i, worksheet: r, row: l, col: s } = t, d = a.isMergedMainCell ? a.mergeInfo : a, u = ee(r.getCellRaw(l, s)), h = this._dataValidationModel.getRuleByLocation(o, i, l, s);
-    if (!h)
+    var A, F, O, U;
+    const { style: n, primaryWithCoord: a, unitId: o, subUnitId: i, worksheet: r, row: l, col: s } = t, d = a.isMergedMainCell ? a.mergeInfo : a, u = ee(r.getCellRaw(l, s)), p = this._dataValidationModel.getRuleByLocation(o, i, l, s);
+    if (!p)
       return;
-    const c = this._dataValidationModel.getValidator(h.type);
+    const c = this._dataValidationModel.getValidator(p.type);
     if (!c)
       return;
     const _ = this._themeService.getCurrentTheme();
-    if (!((T = c.skipDefaultFontRender) != null && T.call(c, h, u, { unitId: o, subUnitId: i, row: l, column: s })))
+    if (!((A = c.skipDefaultFontRender) != null && A.call(c, p, u, { unitId: o, subUnitId: i, row: l, column: s })))
       return;
-    const p = c.parseFormulaSync(h, o, i), { formula1: V } = p, R = this._calc(d, n), { a: m, d: g } = e.getTransform(), f = La(R.left, m), M = La(R.top, g), w = Co.create().composeMatrix({
-      left: f,
-      top: M,
+    const h = c.parseFormulaSync(p, o, i), { formula1: D } = h, R = this._calc(d, n), { a: m, d: g } = e.getTransform(), S = La(R.left, m), V = La(R.top, g), w = Co.create().composeMatrix({
+      left: S,
+      top: V,
       scaleX: 1,
       scaleY: 1,
       angle: 0,
@@ -2240,12 +2249,12 @@ let da = class {
     e.save(), e.beginPath(), e.rect(d.startX, d.startY, C, I), e.clip();
     const y = w.getMatrix();
     e.transform(y[0], y[1], y[2], y[3], y[4], y[5]);
-    const L = ((P = n == null ? void 0 : n.fs) != null ? P : 10) * 1.6, F = String(u) === String(V), A = _.hyacinth500;
+    const P = ((F = n == null ? void 0 : n.fs) != null ? F : 10) * 1.6, k = String(u) === String(D), T = _.hyacinth500;
     Io.drawWith(e, {
-      checked: F,
-      width: L,
-      height: L,
-      fill: (k = ($ = n == null ? void 0 : n.cl) == null ? void 0 : $.rgb) != null ? k : A
+      checked: k,
+      width: P,
+      height: P,
+      fill: (U = (O = n == null ? void 0 : n.cl) == null ? void 0 : O.rgb) != null ? U : T
     }), e.restore();
   }
   isHit(e, t) {
@@ -2253,16 +2262,16 @@ let da = class {
     return s <= l && s >= r && d <= i && d >= o;
   }
   async onPointerDown(e, t) {
-    var p;
+    var h;
     if (t.button === 2)
       return;
     const { primaryWithCoord: n, unitId: a, subUnitId: o, worksheet: i, row: r, col: l } = e, s = ee(i.getCellRaw(r, l)), d = this._dataValidationModel.getRuleByLocation(a, o, r, l);
     if (!d)
       return;
     const u = this._dataValidationModel.getValidator(d.type);
-    if (!u || !((p = u.skipDefaultFontRender) != null && p.call(u, d, s, { unitId: a, subUnitId: o, row: r, column: l })))
+    if (!u || !((h = u.skipDefaultFontRender) != null && h.call(u, d, s, { unitId: a, subUnitId: o, row: r, column: l })))
       return;
-    const { formula1: h, formula2: c } = await this._parseFormula(d, a, o), _ = {
+    const { formula1: p, formula2: c } = await this._parseFormula(d, a, o), _ = {
       range: {
         startColumn: n.actualColumn,
         endColumn: n.actualColumn,
@@ -2270,12 +2279,12 @@ let da = class {
         endRow: n.actualRow
       },
       value: {
-        v: String(s) === ro(String(h)) ? c : h,
+        v: String(s) === ro(String(p)) ? c : p,
         p: null
       }
     };
     this._commandService.executeCommand(
-      ct.id,
+      dt.id,
       _
     );
   }
@@ -2289,46 +2298,46 @@ let da = class {
   }
 };
 da = lr([
-  We(0, Q),
-  We(1, de),
-  We(2, E(no)),
-  We(3, E(za)),
-  We(4, E(ke)),
-  We(5, E(te))
+  xe(0, Q),
+  xe(1, de),
+  xe(2, M(no)),
+  xe(3, M(za)),
+  xe(4, M(Ne)),
+  xe(5, M(te))
 ], da);
 class dr extends _e {
   constructor() {
     super(...arguments);
-    b(this, "id", K.CHECKBOX);
-    b(this, "canvasRender", this.injector.createInstance(da));
-    b(this, "formulaInput", Qa);
+    E(this, "id", G.CHECKBOX);
+    E(this, "canvasRender", this.injector.createInstance(da));
+    E(this, "formulaInput", Qa);
   }
 }
 class cr extends _e {
   constructor() {
     super(...arguments);
-    b(this, "id", K.CUSTOM);
-    b(this, "formulaInput", Ja);
+    E(this, "id", G.CUSTOM);
+    E(this, "formulaInput", Ja);
   }
 }
 const ur = "data-validation.formula-input";
 class hr extends _e {
   constructor() {
     super(...arguments);
-    b(this, "id", K.DATE);
-    b(this, "formulaInput", ur);
-    b(this, "optionsInput", Lt.componentKey);
-    b(this, "dropdownType", he.DATE);
+    E(this, "id", G.DATE);
+    E(this, "formulaInput", ur);
+    E(this, "optionsInput", Lt.componentKey);
+    E(this, "dropdownType", me.DATE);
   }
 }
 class mr extends _e {
   constructor() {
     super(...arguments);
-    b(this, "id", K.DECIMAL);
-    b(this, "formulaInput", Ft);
+    E(this, "id", G.DECIMAL);
+    E(this, "formulaInput", Ft);
   }
 }
-const Ln = 4, pr = 0, zt = 4, Pn = 4, ca = 6, Pt = 6, De = 14;
+const Ln = 4, pr = 0, zt = 4, Pn = 4, ca = 6, Pt = 6, Ee = 14;
 function gr(e, t) {
   const n = Ro.getTextSize(e, t), a = n.width + Ln * 2, { ba: o, bd: i } = n, r = o + i;
   return {
@@ -2338,17 +2347,17 @@ function gr(e, t) {
   };
 }
 function Kt(e, t, n, a) {
-  const o = De + ca * 2, i = n - o, r = a - Pt * 2, l = e.map((c) => ({
+  const o = Ee + ca * 2, i = n - o, r = a - Pt * 2, l = e.map((c) => ({
     layout: gr(c, t),
     text: c
   }));
   let s;
   const d = [];
   l.forEach((c) => {
-    const { layout: _ } = c, { width: p, height: V } = _;
-    !s || s.width + p + zt > i ? (s = {
-      width: p,
-      height: V,
+    const { layout: _ } = c, { width: h, height: D } = _;
+    !s || s.width + h + zt > i ? (s = {
+      width: h,
+      height: D,
       items: [{
         ...c,
         left: 0
@@ -2356,18 +2365,18 @@ function Kt(e, t, n, a) {
     }, d.push(s)) : (s.items.push({
       ...c,
       left: s.width + zt
-    }), s.width = s.width + p + zt);
+    }), s.width = s.width + h + zt);
   });
-  let u = 0, h = 0;
+  let u = 0, p = 0;
   return d.forEach((c, _) => {
-    h = Math.max(h, c.width), _ === d.length - 1 ? u += c.height : u += c.height + Pn;
+    p = Math.max(p, c.width), _ === d.length - 1 ? u += c.height : u += c.height + Pn;
   }), {
     lines: d,
     totalHeight: u,
     contentWidth: i,
     contentHeight: r,
     cellAutoHeight: u + Pt * 2,
-    calcAutoWidth: h + o
+    calcAutoWidth: p + o
   };
 }
 const fr = 8;
@@ -2378,7 +2387,7 @@ class vr extends wo {
       width: l.width,
       height: l.height,
       radius: fr,
-      fill: i || xe
+      fill: i || je
     }), t.translateWithPrecision(Ln, l.ba), t.font = a, t.fillStyle = r, t.fillText(s, 0, 0), t.restore();
   }
 }
@@ -2390,8 +2399,8 @@ var _r = Object.getOwnPropertyDescriptor, Sr = (e, t, n, a) => {
 const Cr = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
 let ua = class {
   constructor(e, t, n, a) {
-    b(this, "zIndex");
-    b(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
+    E(this, "zIndex");
+    E(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     this._commandService = e, this._univerInstanceService = t, this._renderManagerService = n, this._dataValidationModel = a;
   }
   _ensureMap(e) {
@@ -2402,105 +2411,105 @@ let ua = class {
     return `${e}.${t}`;
   }
   _drawDownIcon(e, t, n, a, o) {
-    const i = n - De + 4;
+    const i = n - Ee + 4;
     let r = 4;
     switch (o) {
       case se.MIDDLE:
-        r = (a - De) / 2 + 4;
+        r = (a - Ee) / 2 + 4;
         break;
       case se.BOTTOM:
-        r = a - De + 4;
+        r = a - Ee + 4;
         break;
     }
     e.save(), e.translateWithPrecision(t.startX + i, t.startY + r), e.fillStyle = "#565656", e.fill(Cr), e.restore();
   }
   // eslint-disable-next-line max-lines-per-function
   drawWith(e, t, n, a) {
-    var G, z;
-    const { primaryWithCoord: o, row: i, col: r, style: l, data: s, subUnitId: d } = t, u = o.isMergedMainCell ? o.mergeInfo : o, h = s == null ? void 0 : s.fontRenderExtension, { leftOffset: c = 0, rightOffset: _ = 0, topOffset: p = 0, downOffset: V = 0 } = h || {}, R = this._ensureMap(d), m = this._generateKey(i, r), g = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, i, r);
+    var Z, Y;
+    const { primaryWithCoord: o, row: i, col: r, style: l, data: s, subUnitId: d } = t, u = o.isMergedMainCell ? o.mergeInfo : o, p = s == null ? void 0 : s.fontRenderExtension, { leftOffset: c = 0, rightOffset: _ = 0, topOffset: h = 0, downOffset: D = 0 } = p || {}, R = this._ensureMap(d), m = this._generateKey(i, r), g = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, i, r);
     if (!g)
       return;
-    const f = this._dataValidationModel.getValidator(g.type);
-    if (!f)
+    const S = this._dataValidationModel.getValidator(g.type);
+    if (!S)
       return;
-    const M = {
+    const V = {
       startX: u.startX + c,
       endX: u.endX - _,
-      startY: u.startY + p,
-      endY: u.endY - V
-    }, w = M.endX - M.startX, C = M.endY - M.startY, { cl: I } = l || {}, y = (G = typeof I == "object" ? I == null ? void 0 : I.rgb : I) != null ? G : "#000", L = Ht(l != null ? l : void 0), { vt: F, ht: A } = l || {}, T = F != null ? F : se.MIDDLE, P = (z = ee(s)) != null ? z : "", $ = f.parseCellValue(P), k = f.getListWithColorMap(g), B = Kt($, L, w, C);
-    this._drawDownIcon(e, M, w, C, T), e.save(), e.translateWithPrecision(M.startX, M.startY), e.beginPath(), e.rect(0, 0, w - De, C), e.clip(), e.translateWithPrecision(ca, Pt);
-    let H = 0;
-    switch (T) {
+      startY: u.startY + h,
+      endY: u.endY - D
+    }, w = V.endX - V.startX, C = V.endY - V.startY, { cl: I } = l || {}, y = (Z = typeof I == "object" ? I == null ? void 0 : I.rgb : I) != null ? Z : "#000", P = Ht(l != null ? l : void 0), { vt: k, ht: T } = l || {}, A = k != null ? k : se.MIDDLE, F = (Y = ee(s)) != null ? Y : "", O = S.parseCellValue(F), U = S.getListWithColorMap(g), B = Kt(O, P, w, C);
+    this._drawDownIcon(e, V, w, C, A), e.save(), e.translateWithPrecision(V.startX, V.startY), e.beginPath(), e.rect(0, 0, w - Ee, C), e.clip(), e.translateWithPrecision(ca, Pt);
+    let j = 0;
+    switch (A) {
       case se.MIDDLE:
-        H = (B.contentHeight - B.totalHeight) / 2;
+        j = (B.contentHeight - B.totalHeight) / 2;
         break;
       case se.BOTTOM:
-        H = B.contentHeight - B.totalHeight;
+        j = B.contentHeight - B.totalHeight;
         break;
     }
-    e.translateWithPrecision(0, H), B.lines.forEach((ae, me) => {
+    e.translateWithPrecision(0, j), B.lines.forEach((ae, pe) => {
       e.save();
-      const { width: ce, height: ne, items: pe } = ae;
-      let ge = 0;
-      switch (A) {
-        case Xe.RIGHT:
-          ge = B.contentWidth - ce;
+      const { width: ce, height: ne, items: ue } = ae;
+      let Ce = 0;
+      switch (T) {
+        case ze.RIGHT:
+          Ce = B.contentWidth - ce;
           break;
-        case Xe.CENTER:
-          ge = (B.contentWidth - ce) / 2;
+        case ze.CENTER:
+          Ce = (B.contentWidth - ce) / 2;
           break;
       }
-      e.translate(ge, me * (ne + Pn)), pe.forEach((Ce) => {
-        e.save(), e.translateWithPrecision(Ce.left, 0), vr.drawWith(e, {
-          ...L,
-          info: Ce,
+      e.translate(Ce, pe * (ne + Pn)), ue.forEach((ge) => {
+        e.save(), e.translateWithPrecision(ge.left, 0), vr.drawWith(e, {
+          ...P,
+          info: ge,
           color: y,
-          fill: k[Ce.text]
+          fill: U[ge.text]
         }), e.restore();
       }), e.restore();
     }), e.restore(), R.set(m, {
-      left: M.startX,
-      top: M.startY,
-      width: B.contentWidth + ca + De,
+      left: V.startX,
+      top: V.startY,
+      width: B.contentWidth + ca + Ee,
       height: B.contentHeight + Pt * 2
     });
   }
   calcCellAutoHeight(e) {
     var w;
-    const { primaryWithCoord: t, style: n, data: a, row: o, col: i } = e, r = a == null ? void 0 : a.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = r || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
-      startX: h.startX + l,
-      endX: h.endX - s,
-      startY: h.startY + d,
-      endY: h.endY - u
+    const { primaryWithCoord: t, style: n, data: a, row: o, col: i } = e, r = a == null ? void 0 : a.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = r || {}, p = t.isMergedMainCell ? t.mergeInfo : t, c = {
+      startX: p.startX + l,
+      endX: p.endX - s,
+      startY: p.startY + d,
+      endY: p.endY - u
     }, _ = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
     if (!_)
       return;
-    const p = this._dataValidationModel.getValidator(_.type);
-    if (!p)
+    const h = this._dataValidationModel.getValidator(_.type);
+    if (!h)
       return;
-    const V = c.endX - c.startX, R = c.endY - c.startY, m = (w = ee(a)) != null ? w : "", g = p.parseCellValue(m), f = Ht(n != null ? n : void 0);
-    return Kt(g, f, V, R).cellAutoHeight;
+    const D = c.endX - c.startX, R = c.endY - c.startY, m = (w = ee(a)) != null ? w : "", g = h.parseCellValue(m), S = Ht(n != null ? n : void 0);
+    return Kt(g, S, D, R).cellAutoHeight;
   }
   calcCellAutoWidth(e) {
     var w;
-    const { primaryWithCoord: t, style: n, data: a, row: o, col: i } = e, r = a == null ? void 0 : a.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = r || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
-      startX: h.startX + l,
-      endX: h.endX - s,
-      startY: h.startY + d,
-      endY: h.endY - u
+    const { primaryWithCoord: t, style: n, data: a, row: o, col: i } = e, r = a == null ? void 0 : a.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = r || {}, p = t.isMergedMainCell ? t.mergeInfo : t, c = {
+      startX: p.startX + l,
+      endX: p.endX - s,
+      startY: p.startY + d,
+      endY: p.endY - u
     }, _ = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
     if (!_)
       return;
-    const p = this._dataValidationModel.getValidator(_.type);
-    if (!p)
+    const h = this._dataValidationModel.getValidator(_.type);
+    if (!h)
       return;
-    const V = c.endX - c.startX, R = c.endY - c.startY, m = (w = ee(a)) != null ? w : "", g = p.parseCellValue(m), f = Ht(n != null ? n : void 0);
-    return Kt(g, f, V, R).calcAutoWidth;
+    const D = c.endX - c.startX, R = c.endY - c.startY, m = (w = ee(a)) != null ? w : "", g = h.parseCellValue(m), S = Ht(n != null ? n : void 0);
+    return Kt(g, S, D, R).calcAutoWidth;
   }
   isHit(e, t) {
     const { primaryWithCoord: n } = t, a = n.isMergedMainCell ? n.mergeInfo : n, { endX: o } = a, { x: i } = e;
-    return i >= o - De && i <= o;
+    return i >= o - Ee && i <= o;
   }
   onPointerDown(e, t) {
     if (t.button === 2)
@@ -2525,23 +2534,23 @@ let ua = class {
 ua = Sr([
   It(0, Q),
   It(1, de),
-  It(2, E(ke)),
-  It(3, E(te))
+  It(2, M(Ne)),
+  It(3, M(te))
 ], ua);
 class Ir extends _e {
   constructor() {
     super(...arguments);
-    b(this, "id", K.LIST_MULTIPLE);
-    b(this, "canvasRender", this.injector.createInstance(ua));
-    b(this, "dropdownType", he.MULTIPLE_LIST);
+    E(this, "id", G.LIST_MULTIPLE);
+    E(this, "canvasRender", this.injector.createInstance(ua));
+    E(this, "dropdownType", me.MULTIPLE_LIST);
   }
 }
 var Rr = Object.getOwnPropertyDescriptor, wr = (e, t, n, a) => {
   for (var o = a > 1 ? void 0 : a ? Rr(t, n) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (o = r(o) || o);
   return o;
-}, dt = (e, t) => (n, a) => t(n, a, e);
-const Me = 4, Rt = 4, ue = 14, ve = 6, je = 4, Gt = 8, Vr = "#565656", $a = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
+}, lt = (e, t) => (n, a) => t(n, a, e);
+const De = 4, Rt = 4, he = 14, ve = 6, Ye = 4, Gt = 8, Vr = "#565656", $a = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
 function yr(e, t) {
   const n = e.length;
   return {
@@ -2553,16 +2562,16 @@ function yr(e, t) {
           ts: {
             fs: 11,
             ff: void 0,
-            it: rt.FALSE,
-            bl: rt.FALSE,
+            it: it.FALSE,
+            bl: it.FALSE,
             ul: {
-              s: rt.FALSE
+              s: it.FALSE
             },
             st: {
-              s: rt.FALSE
+              s: it.FALSE
             },
             ol: {
-              s: rt.FALSE
+              s: it.FALSE
             },
             cl: void 0,
             ...t,
@@ -2608,7 +2617,7 @@ function wt(e, t, n) {
 }
 function Ha(e, t, n, a, o, i, r = !0) {
   let l = 0;
-  const s = r ? je : 0;
+  const s = r ? Ye : 0;
   switch (o) {
     case se.BOTTOM:
       l = t - a - s;
@@ -2620,13 +2629,13 @@ function Ha(e, t, n, a, o, i, r = !0) {
       l = s;
       break;
   }
-  l = Math.max(je, l);
+  l = Math.max(Ye, l);
   let d = 0;
   switch (i) {
-    case Xe.CENTER:
+    case ze.CENTER:
       d = (e - n) / 2;
       break;
-    case Xe.RIGHT:
+    case ze.RIGHT:
       d = e - n;
       break;
   }
@@ -2637,8 +2646,8 @@ function Ha(e, t, n, a, o, i, r = !0) {
 }
 let ha = class {
   constructor(e, t, n, a, o) {
-    b(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
-    b(this, "zIndex");
+    E(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
+    E(this, "zIndex");
     this._univerInstanceService = e, this._localeService = t, this._commandService = n, this._renderManagerService = a, this._dataValidationModel = o;
   }
   _ensureMap(e) {
@@ -2649,17 +2658,17 @@ let ha = class {
     return `${e}.${t}`;
   }
   _drawDownIcon(e, t, n, a, o, i, r) {
-    const { t: l = oe.pd.t, b: s = oe.pd.b } = r, d = n - ue;
+    const { t: l = oe.pd.t, b: s = oe.pd.b } = r, d = n - he;
     let u;
     switch (i) {
       case se.MIDDLE:
         u = (a - Rt) / 2;
         break;
       case se.BOTTOM:
-        u = a - s - o - je + (o / 2 - Rt / 2);
+        u = a - s - o - Ye + (o / 2 - Rt / 2);
         break;
       default:
-        u = l + je + (o / 2 - Rt / 2);
+        u = l + Ye + (o / 2 - Rt / 2);
         break;
     }
     e.save(), e.translateWithPrecision(t.startX + d, t.startY + u), e.fillStyle = "#565656", e.fill($a), e.restore();
@@ -2669,109 +2678,109 @@ let ha = class {
     const { primaryWithCoord: a, row: o, col: i, style: r, data: l, subUnitId: s } = t, d = a.isMergedMainCell ? a.mergeInfo : a, u = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, o, i);
     if (!u)
       return;
-    const h = this._dataValidationModel.getValidator(u.type);
-    if (!h)
+    const p = this._dataValidationModel.getValidator(u.type);
+    if (!p)
       return;
-    const c = l == null ? void 0 : l.fontRenderExtension, { leftOffset: _ = 0, rightOffset: p = 0, topOffset: V = 0, downOffset: R = 0 } = c || {};
-    if (!u || !h || !h || h.id.indexOf(K.LIST) !== 0 || !h.skipDefaultFontRender(u))
+    const c = l == null ? void 0 : l.fontRenderExtension, { leftOffset: _ = 0, rightOffset: h = 0, topOffset: D = 0, downOffset: R = 0 } = c || {};
+    if (!u || !p || !p || p.id.indexOf(G.LIST) !== 0 || !p.skipDefaultFontRender(u))
       return;
     const m = {
       startX: d.startX + _,
-      endX: d.endX - p,
-      startY: d.startY + V,
+      endX: d.endX - h,
+      startY: d.startY + D,
       endY: d.endY - R
-    }, g = m.endX - m.startX, f = m.endY - m.startY, M = this._ensureMap(s), w = this._generateKey(o, i), C = h.getListWithColor(u), I = ee(l), y = `${I != null ? I : ""}`, L = C.find(($) => $.label === y);
-    let { tb: F, vt: A, ht: T, pd: P } = r || {};
-    if (F = F != null ? F : Ie.WRAP, A = A != null ? A : se.BOTTOM, T = T != null ? T : oe.ht, P = P != null ? P : oe.pd, u.renderMode === ie.ARROW) {
-      const { l: $ = oe.pd.l, t: k = oe.pd.t, r: B = oe.pd.r, b: H = oe.pd.b } = P, G = g - $ - B - ue - 4, { documentSkeleton: z, documents: ae, docModel: me } = wt(y, this._localeService, r);
-      F === Ie.WRAP && me.updateDocumentDataPageSize(Math.max(G, 1)), z.calculate(), z.getActualSize();
-      const ce = st(z), { height: ne, width: pe } = ce, { paddingTop: ge, paddingLeft: Ce } = Ha(G, f - k - H, pe, ne, A, T, !0);
-      this._drawDownIcon(e, m, g, f, ne, A, P), e.save(), e.translateWithPrecision(m.startX + $, m.startY + k), e.beginPath(), e.rect(0, 0, g - $ - B, f - k - H), e.clip(), e.translateWithPrecision(0, ge), e.save(), e.translateWithPrecision(Me, 0), e.beginPath(), e.rect(0, 0, G, ne), e.clip(), ae.render(e), e.translateWithPrecision(Ce, 0), e.restore(), e.restore(), M.set(w, {
-        left: m.endX + $ + n.rowHeaderWidth - ue,
-        top: m.startY + k + n.columnHeaderHeight,
-        width: ue,
-        height: f - k - H
+    }, g = m.endX - m.startX, S = m.endY - m.startY, V = this._ensureMap(s), w = this._generateKey(o, i), C = p.getListWithColor(u), I = ee(l), y = `${I != null ? I : ""}`, P = C.find((O) => O.label === y);
+    let { tb: k, vt: T, ht: A, pd: F } = r || {};
+    if (k = k != null ? k : Re.WRAP, T = T != null ? T : se.BOTTOM, A = A != null ? A : oe.ht, F = F != null ? F : oe.pd, u.renderMode === ie.ARROW) {
+      const { l: O = oe.pd.l, t: U = oe.pd.t, r: B = oe.pd.r, b: j = oe.pd.b } = F, Z = g - O - B - he - 4, { documentSkeleton: Y, documents: ae, docModel: pe } = wt(y, this._localeService, r);
+      k === Re.WRAP && pe.updateDocumentDataPageSize(Math.max(Z, 1)), Y.calculate(), Y.getActualSize();
+      const ce = rt(Y), { height: ne, width: ue } = ce, { paddingTop: Ce, paddingLeft: ge } = Ha(Z, S - U - j, ue, ne, T, A, !0);
+      this._drawDownIcon(e, m, g, S, ne, T, F), e.save(), e.translateWithPrecision(m.startX + O, m.startY + U), e.beginPath(), e.rect(0, 0, g - O - B, S - U - j), e.clip(), e.translateWithPrecision(0, Ce), e.save(), e.translateWithPrecision(De, 0), e.beginPath(), e.rect(0, 0, Z, ne), e.clip(), ae.render(e), e.translateWithPrecision(ge, 0), e.restore(), e.restore(), V.set(w, {
+        left: m.endX + O + n.rowHeaderWidth - he,
+        top: m.startY + U + n.columnHeaderHeight,
+        width: he,
+        height: S - U - j
       });
     } else {
-      e.save(), e.translateWithPrecision(m.startX, m.startY), e.beginPath(), e.rect(0, 0, g, f), e.clip();
-      const $ = g - ve * 2 - Me - ue - 4, { documentSkeleton: k, documents: B, docModel: H } = wt(y, this._localeService, r);
-      F === Ie.WRAP && H.updateDocumentDataPageSize(Math.max($, 1)), k.calculate();
-      const G = st(k), { height: z, width: ae } = G, { paddingTop: me, paddingLeft: ce } = Ha($, f, ae, z, A, T);
-      e.translateWithPrecision(ve, me);
-      const ne = Math.max(g - ve * 2, 1), pe = z;
+      e.save(), e.translateWithPrecision(m.startX, m.startY), e.beginPath(), e.rect(0, 0, g, S), e.clip();
+      const O = g - ve * 2 - De - he - 4, { documentSkeleton: U, documents: B, docModel: j } = wt(y, this._localeService, r);
+      k === Re.WRAP && j.updateDocumentDataPageSize(Math.max(O, 1)), U.calculate();
+      const Z = rt(U), { height: Y, width: ae } = Z, { paddingTop: pe, paddingLeft: ce } = Ha(O, S, ae, Y, T, A);
+      e.translateWithPrecision(ve, pe);
+      const ne = Math.max(g - ve * 2, 1), ue = Y;
       hn.drawWith(e, {
         width: ne,
-        height: pe,
-        fill: (L == null ? void 0 : L.color) || xe,
+        height: ue,
+        fill: (P == null ? void 0 : P.color) || je,
         radius: Gt
-      }), e.save(), e.translateWithPrecision(Me, 0), e.beginPath(), e.rect(0, 0, $, z), e.clip(), e.translateWithPrecision(ce, 0), B.render(e), e.restore(), e.translateWithPrecision($ + Me + 4, (z - Rt) / 2), e.fillStyle = Vr, e.fill($a), e.restore(), M.set(w, {
+      }), e.save(), e.translateWithPrecision(De, 0), e.beginPath(), e.rect(0, 0, O, Y), e.clip(), e.translateWithPrecision(ce, 0), B.render(e), e.restore(), e.translateWithPrecision(O + De + 4, (Y - Rt) / 2), e.fillStyle = Vr, e.fill($a), e.restore(), V.set(w, {
         left: m.startX + ve + n.rowHeaderWidth,
-        top: m.startY + me + n.columnHeaderHeight,
+        top: m.startY + pe + n.columnHeaderHeight,
         width: ne,
-        height: pe
+        height: ue
       });
     }
   }
   calcCellAutoHeight(e) {
-    const { primaryWithCoord: t, style: n, data: a, row: o, col: i } = e, r = t.isMergedMainCell ? t.mergeInfo : t, l = a == null ? void 0 : a.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
+    const { primaryWithCoord: t, style: n, data: a, row: o, col: i } = e, r = t.isMergedMainCell ? t.mergeInfo : t, l = a == null ? void 0 : a.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: p = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
     if (!c || c.renderMode === ie.TEXT)
       return;
     const _ = {
       startX: r.startX + s,
       endX: r.endX - d,
       startY: r.startY + u,
-      endY: r.endY - h
-    }, p = _.endX - _.startX, V = ee(a), R = `${V != null ? V : ""}`;
+      endY: r.endY - p
+    }, h = _.endX - _.startX, D = ee(a), R = `${D != null ? D : ""}`;
     let { tb: m, pd: g } = n || {};
-    const { t: f = oe.pd.t, b: M = oe.pd.b } = g != null ? g : {};
-    if (m = m != null ? m : Ie.WRAP, c.renderMode === ie.ARROW) {
-      const w = p - ue, { documentSkeleton: C, docModel: I } = wt(R, this._localeService, n);
-      m === Ie.WRAP && I.updateDocumentDataPageSize(Math.max(w, 1)), C.calculate(), C.getActualSize();
-      const y = st(C), { height: L } = y;
-      return L + f + M + je * 2;
+    const { t: S = oe.pd.t, b: V = oe.pd.b } = g != null ? g : {};
+    if (m = m != null ? m : Re.WRAP, c.renderMode === ie.ARROW) {
+      const w = h - he, { documentSkeleton: C, docModel: I } = wt(R, this._localeService, n);
+      m === Re.WRAP && I.updateDocumentDataPageSize(Math.max(w, 1)), C.calculate(), C.getActualSize();
+      const y = rt(C), { height: P } = y;
+      return P + S + V + Ye * 2;
     } else {
-      const w = p - ve * 2 - Me - ue, { documentSkeleton: C, docModel: I } = Fn(R, this._localeService, n);
-      m === Ie.WRAP && I.updateDocumentDataPageSize(Math.max(w, 1)), C.calculate();
-      const y = st(C), {
-        height: L
+      const w = h - ve * 2 - De - he, { documentSkeleton: C, docModel: I } = Fn(R, this._localeService, n);
+      m === Re.WRAP && I.updateDocumentDataPageSize(Math.max(w, 1)), C.calculate();
+      const y = rt(C), {
+        height: P
       } = y;
-      return L + je * 2;
+      return P + Ye * 2;
     }
   }
   calcCellAutoWidth(e) {
-    const { primaryWithCoord: t, style: n, data: a, row: o, col: i } = e, r = t.isMergedMainCell ? t.mergeInfo : t, l = a == null ? void 0 : a.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
+    const { primaryWithCoord: t, style: n, data: a, row: o, col: i } = e, r = t.isMergedMainCell ? t.mergeInfo : t, l = a == null ? void 0 : a.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: p = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
     if (!c || c.renderMode === ie.TEXT)
       return;
     const _ = {
       startX: r.startX + s,
       endX: r.endX - d,
       startY: r.startY + u,
-      endY: r.endY - h
-    }, p = _.endX - _.startX, V = ee(a), R = `${V != null ? V : ""}`;
+      endY: r.endY - p
+    }, h = _.endX - _.startX, D = ee(a), R = `${D != null ? D : ""}`;
     let { tb: m, pd: g } = n || {};
-    const { l: f = oe.pd.l, r: M = oe.pd.r } = g != null ? g : {};
-    m = m != null ? m : Ie.WRAP;
-    let w = ve * 2 + ue;
+    const { l: S = oe.pd.l, r: V = oe.pd.r } = g != null ? g : {};
+    m = m != null ? m : Re.WRAP;
+    let w = ve * 2 + he;
     switch (c.renderMode) {
       case ie.ARROW:
-        w = ue + ve * 2 + M + f;
+        w = he + ve * 2 + V + S;
         break;
       case ie.CUSTOM:
-        w = ue + ve * 2 + Me * 2 + M + f + Gt / 2 + 1;
+        w = he + ve * 2 + De * 2 + V + S + Gt / 2 + 1;
         break;
       // default is CUSTOM
       default:
-        w = ue + ve * 2 + Me * 2 + M + f + Gt / 2 + 1;
+        w = he + ve * 2 + De * 2 + V + S + Gt / 2 + 1;
     }
-    const C = p - w, { documentSkeleton: I, docModel: y } = wt(R, this._localeService, n);
-    return m === Ie.WRAP && y.updateDocumentDataPageSize(Math.max(C, 1)), I.calculate(), I.getActualSize(), st(I).width + w;
+    const C = h - w, { documentSkeleton: I, docModel: y } = wt(R, this._localeService, n);
+    return m === Re.WRAP && y.updateDocumentDataPageSize(Math.max(C, 1)), I.calculate(), I.getActualSize(), rt(I).width + w;
   }
   isHit(e, t) {
     const { subUnitId: n, row: a, col: o } = t, r = this._ensureMap(n).get(this._generateKey(a, o)), l = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, o);
     if (!l || !r || l.renderMode === ie.TEXT)
       return !1;
-    const { top: s, left: d, width: u, height: h } = r, { x: c, y: _ } = e;
-    return c >= d && c <= d + u && _ >= s && _ <= s + h;
+    const { top: s, left: d, width: u, height: p } = r, { x: c, y: _ } = e;
+    return c >= d && c <= d + u && _ >= s && _ <= s + p;
   }
   onPointerDown(e, t) {
     if (t.button === 2)
@@ -2794,34 +2803,34 @@ let ha = class {
   }
 };
 ha = wr([
-  dt(0, de),
-  dt(1, E(le)),
-  dt(2, Q),
-  dt(3, E(ke)),
-  dt(4, E(te))
+  lt(0, de),
+  lt(1, M(le)),
+  lt(2, Q),
+  lt(3, M(Ne)),
+  lt(4, M(te))
 ], ha);
 class Mr extends _e {
   constructor() {
     super(...arguments);
-    b(this, "id", K.LIST);
-    b(this, "canvasRender", this.injector.createInstance(ha));
-    b(this, "dropdownType", he.LIST);
-    b(this, "optionsInput", At.componentKey);
-    b(this, "formulaInput", pa);
+    E(this, "id", G.LIST);
+    E(this, "canvasRender", this.injector.createInstance(ha));
+    E(this, "dropdownType", me.LIST);
+    E(this, "optionsInput", At.componentKey);
+    E(this, "formulaInput", pa);
   }
 }
 class Dr extends _e {
   constructor() {
     super(...arguments);
-    b(this, "id", K.TEXT_LENGTH);
-    b(this, "formulaInput", Ft);
+    E(this, "id", G.TEXT_LENGTH);
+    E(this, "formulaInput", Ft);
   }
 }
 class Er extends _e {
   constructor() {
     super(...arguments);
-    b(this, "id", K.WHOLE);
-    b(this, "formulaInput", Ft);
+    E(this, "id", G.WHOLE);
+    E(this, "formulaInput", Ft);
   }
 }
 var br = Object.getOwnPropertyDescriptor, Or = (e, t, n, a) => {
@@ -2864,9 +2873,9 @@ let nt = class extends ma {
   }
 };
 nt = Or([
-  Zt(0, E(Re)),
-  Zt(1, E(_a)),
-  Zt(2, E(Ve))
+  Zt(0, M(we)),
+  Zt(1, M(_a)),
+  Zt(2, M(ye))
 ], nt);
 var Tr = Object.getOwnPropertyDescriptor, Ar = (e, t, n, a) => {
   for (var o = a > 1 ? void 0 : a ? Tr(t, n) : t, i = e.length - 1, r; i >= 0; i--)
@@ -2888,8 +2897,8 @@ let Wa = (Vt = class extends Ka {
   onStarting() {
     [
       [Se],
-      [Le],
-      [mt],
+      [Pe],
+      [ht],
       [Qe],
       [at],
       [tt],
@@ -2903,14 +2912,14 @@ let Wa = (Vt = class extends Ka {
       Nt,
       Dn,
       wa,
-      Ue,
+      Be,
       Mn
     ].forEach((e) => {
       this._commandService.registerCommand(e);
     });
   }
   onReady() {
-    this._injector.get(et), this._injector.get(tt), this._injector.get(Je), this._injector.get(mt), this._injector.get(ke).registerRenderModule(
+    this._injector.get(et), this._injector.get(tt), this._injector.get(Je), this._injector.get(ht), this._injector.get(Ne).registerRenderModule(
       x.UNIVER_SHEET,
       [Tt]
     );
@@ -2921,9 +2930,9 @@ let Wa = (Vt = class extends Ka {
   onSteady() {
     this._injector.get(Qe);
   }
-}, b(Vt, "pluginName", Lr), b(Vt, "type", x.UNIVER_SHEET), Vt);
+}, E(Vt, "pluginName", Lr), E(Vt, "type", x.UNIVER_SHEET), Vt);
 Wa = Ar([
-  qt(1, E(Re)),
+  qt(1, M(we)),
   qt(2, Q),
   qt(3, Za)
 ], Wa);
@@ -2947,8 +2956,8 @@ let xa = (yt = class extends Ka {
   onStarting() {
     [
       [Se],
-      [Le],
-      [mt],
+      [Pe],
+      [ht],
       [Qe],
       [at],
       [tt],
@@ -2961,14 +2970,14 @@ let xa = (yt = class extends Ka {
       Nt,
       Dn,
       wa,
-      Ue,
+      Be,
       Mn
     ].forEach((e) => {
       this._commandService.registerCommand(e);
     });
   }
   onReady() {
-    this._injector.get(et), this._injector.get(tt), this._injector.get(ke).registerRenderModule(
+    this._injector.get(et), this._injector.get(tt), this._injector.get(Ne).registerRenderModule(
       x.UNIVER_SHEET,
       [Tt]
     );
@@ -2979,9 +2988,9 @@ let xa = (yt = class extends Ka {
   onSteady() {
     this._injector.get(Qe);
   }
-}, b(yt, "pluginName", kr), b(yt, "type", x.UNIVER_SHEET), yt);
+}, E(yt, "pluginName", kr), E(yt, "type", x.UNIVER_SHEET), yt);
 xa = Fr([
-  Jt(1, E(Re)),
+  Jt(1, M(we)),
   Jt(2, Q),
   Jt(3, Za)
 ], xa);