@univerjs/sheets-data-validation-ui 0.6.1-nightly.202502231605 → 0.6.1-nightly.202502251606

package/lib/es/index.js

@@ -1,36 +1,36 @@
-var $o = Object.defineProperty;
-var Wo = (t, e, o) => e in t ? $o(t, e, { enumerable: !0, configurable: !0, writable: !0, value: o }) : t[e] = o;
-var M = (t, e, o) => Wo(t, typeof e != "symbol" ? e + "" : e, o);
-import { jsxs as j, jsx as m, Fragment as wt } from "react/jsx-runtime";
-import { Inject as E, LocaleService as Q, Disposable as Dt, DataValidationErrorStyle as re, ICommandService as tt, dayjs as Ze, numfmt as qe, CellValueType as Ho, UniverInstanceType as X, toDisposable as xo, IUniverInstanceService as vt, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as jo, DisposableCollection as Yo, CommandType as te, BuildTextUtils as Xo, DataValidationRenderMode as ct, DataValidationType as K, IConfigService as pn, debounce as zo, UndoCommand as Ko, RedoCommand as Go, isUnitRangesEqual as Zo, shallowEqual as En, Injector as Bt, DataValidationStatus as se, ObjectMatrix as Se, Range as qo, Rectangle as Ce, queryObjectMatrix as Je, Optional as Jo, RxDisposable as mn, InterceptorEffectEnum as zn, sequenceExecute as Kn, bufferDebounceTime as Qo, isFormulaString as At, Tools as Qe, ThemeService as ta, VerticalAlign as ht, HorizontalAlign as Yt, DEFAULT_STYLES as dt, WrapStrategy as Ct, DocumentDataModel as ea, BooleanNumber as ee, DEFAULT_EMPTY_DOCUMENT_VALUE as na, Plugin as Gn, merge as Zn } from "@univerjs/core";
-import { Button as Ut, DatePanel as oa, Scrollbar as aa, FormLayout as q, RadioGroup as gn, Radio as Ft, Checkbox as Le, Input as Nt, Select as tn, DraggableList as ia } from "@univerjs/design";
-import { DeviceInputEventType as en, IRenderManagerService as Vt, fixLineWidthByScale as bn, Transform as ra, CheckboxShape as sa, CURSOR_TYPE as Xt, FontCache as la, Shape as da, Rect as qn, getFontStyleString as Ne, getDocsSkeletonPageSize as ne, Documents as ca, DocumentViewModel as ua, DocumentSkeleton as ha } from "@univerjs/engine-render";
-import { SheetInterceptorService as fn, AFTER_CELL_EDIT_ASYNC as pa, SetRangeValuesCommand as vn, SheetsSelectionsService as Jn, getSheetCommandTarget as Qn, SheetPermissionCheckController as to, WorksheetEditPermission as Ie, RangeProtectionPermissionEditPoint as we, WorkbookEditablePermission as Re, checkRangesEditablePermission as ma, WorksheetSetCellStylePermission as nn, INTERCEPTOR_POINT as eo, InterceptCellContentPriority as no } from "@univerjs/sheets";
-import { SheetDataValidationModel as at, getCellValueOrigin as rt, getDataValidationCellValue as ga, deserializeListOptions as oo, serializeListOptions as ao, UpdateSheetDataValidationRangeCommand as io, UpdateSheetDataValidationSettingCommand as On, UpdateSheetDataValidationOptionsCommand as fa, RemoveSheetDataValidationCommand as ro, RemoveSheetAllDataValidationCommand as va, createDefaultNewRule as so, AddSheetDataValidationCommand as _n, DATA_VALIDATION_PLUGIN_NAME as lo, getDataValidationDiffMutations as on, DataValidationCacheService as co, DataValidationFormulaController as _a, DataValidationFormulaService as Sa, CHECKBOX_FORMULA_2 as Ca, CHECKBOX_FORMULA_1 as Ia, getFormulaResult as Ue, isLegalFormulaResult as Ln, transformCheckboxValue as wa } from "@univerjs/sheets-data-validation";
-import { getPatternType as Ra } from "@univerjs/sheets-numfmt";
-import { SetCellEditVisibleOperation as an, SheetCanvasPopManagerService as Da, IEditorBridgeService as uo, IMarkSelectionService as Va, HoverManagerService as ya, CellAlertManagerService as Ma, CellAlertType as Ea, IAutoFillService as ba, APPLY_TYPE as oe, virtualizeDiscreteRanges as rn, getAutoFillRepeatRange as Oa, ISheetClipboardService as La, COPY_TYPE as Tn, rangeToDiscreteRange as Ta, PREDEFINED_HOOK_NAME as ce, getRepeatRange as Pn, getCurrentRangeDisable$ as Pa, AutoHeightController as ho, SheetSkeletonManagerService as De } from "@univerjs/sheets-ui";
-import { IDialogService as Aa, useDependency as L, KeyCode as sn, ISidebarService as po, useObservable as $t, ComponentManager as Te, IZenZoneService as mo, RectPopup as ka, useEvent as ln, useSidebarClick as Sn, MenuItemType as Cn, getMenuHiddenObservable as Fa, RibbonStartGroup as Na, IMenuManagerService as Ua } from "@univerjs/ui";
-import An, { useState as x, forwardRef as yt, useRef as zt, createElement as Mt, useMemo as Kt, useEffect as It } from "react";
-import { DataValidatorRegistryService as Et, DataValidationModel as Pe, DataValidatorRegistryScope as Ba, TWO_FORMULA_OPERATOR_COUNT as $a, getRuleOptions as kn, getRuleSetting as Fn } from "@univerjs/data-validation";
-import { RichTextEditingMutation as Wa } from "@univerjs/docs";
-import { filter as In, BehaviorSubject as Nn, distinctUntilChanged as Ha, Subject as xa, debounceTime as wn, bufferTime as go } from "rxjs";
-import { deserializeRangeWithSheet as ja, serializeRange as fo } from "@univerjs/engine-formula";
-import { RangeSelector as Ya, FormulaEditor as vo } from "@univerjs/sheets-formula-ui";
-var Xa = Object.getOwnPropertyDescriptor, za = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? Xa(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+var Wo = Object.defineProperty;
+var Ho = (t, e, o) => e in t ? Wo(t, e, { enumerable: !0, configurable: !0, writable: !0, value: o }) : t[e] = o;
+var E = (t, e, o) => Ho(t, typeof e != "symbol" ? e + "" : e, o);
+import { jsxs as Y, jsx as g, Fragment as Rt } from "react/jsx-runtime";
+import { Inject as b, LocaleService as Q, Disposable as Vt, DataValidationErrorStyle as re, ICommandService as tt, dayjs as Ze, numfmt as qe, CellValueType as xo, UniverInstanceType as X, toDisposable as jo, IUniverInstanceService as vt, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Yo, DisposableCollection as Xo, CommandType as te, BuildTextUtils as zo, DataValidationRenderMode as ct, DataValidationType as K, IConfigService as pn, debounce as Ko, UndoCommand as Go, RedoCommand as Zo, isUnitRangesEqual as qo, shallowEqual as Mn, ThemeService as Xn, ColorKit as Jo, Injector as Wt, DataValidationStatus as se, ObjectMatrix as Se, Range as Qo, Rectangle as Ce, queryObjectMatrix as Je, Optional as ta, RxDisposable as gn, InterceptorEffectEnum as zn, sequenceExecute as Kn, bufferDebounceTime as ea, isFormulaString as kt, Tools as Qe, VerticalAlign as ht, HorizontalAlign as Xt, DEFAULT_STYLES as dt, WrapStrategy as It, DocumentDataModel as na, BooleanNumber as ee, DEFAULT_EMPTY_DOCUMENT_VALUE as oa, Plugin as Gn, merge as Zn } from "@univerjs/core";
+import { Button as Bt, DatePanel as aa, Scrollbar as ia, FormLayout as q, RadioGroup as mn, Radio as Nt, Checkbox as Le, Input as Ut, Select as tn, DraggableList as ra } from "@univerjs/design";
+import { DeviceInputEventType as en, IRenderManagerService as yt, fixLineWidthByScale as En, Transform as sa, CheckboxShape as la, CURSOR_TYPE as zt, FontCache as da, Shape as ca, Rect as qn, getFontStyleString as Ne, getDocsSkeletonPageSize as ne, Documents as ua, DocumentViewModel as ha, DocumentSkeleton as pa } from "@univerjs/engine-render";
+import { SheetInterceptorService as fn, AFTER_CELL_EDIT_ASYNC as ga, SetRangeValuesCommand as vn, SheetsSelectionsService as Jn, getSheetCommandTarget as Qn, SheetPermissionCheckController as to, WorksheetEditPermission as Ie, RangeProtectionPermissionEditPoint as we, WorkbookEditablePermission as Re, checkRangesEditablePermission as ma, rangeToDiscreteRange as fa, WorksheetSetCellStylePermission as nn, INTERCEPTOR_POINT as eo, InterceptCellContentPriority as no } from "@univerjs/sheets";
+import { SheetDataValidationModel as at, getCellValueOrigin as rt, getDataValidationCellValue as va, deserializeListOptions as oo, serializeListOptions as ao, UpdateSheetDataValidationRangeCommand as io, UpdateSheetDataValidationSettingCommand as bn, UpdateSheetDataValidationOptionsCommand as _a, RemoveSheetDataValidationCommand as ro, RemoveSheetAllDataValidationCommand as Sa, createDefaultNewRule as so, AddSheetDataValidationCommand as _n, DATA_VALIDATION_PLUGIN_NAME as lo, getDataValidationDiffMutations as on, DataValidationCacheService as co, DataValidationFormulaController as Ca, DataValidationFormulaService as Ia, CHECKBOX_FORMULA_2 as wa, CHECKBOX_FORMULA_1 as Ra, getFormulaResult as Ue, isLegalFormulaResult as On, transformCheckboxValue as Da } from "@univerjs/sheets-data-validation";
+import { getPatternType as Va } from "@univerjs/sheets-numfmt";
+import { SetCellEditVisibleOperation as an, SheetCanvasPopManagerService as ya, IEditorBridgeService as uo, IMarkSelectionService as Ma, HoverManagerService as Ea, CellAlertManagerService as ba, CellAlertType as Oa, IAutoFillService as La, APPLY_TYPE as oe, virtualizeDiscreteRanges as rn, getAutoFillRepeatRange as Ta, ISheetClipboardService as Pa, COPY_TYPE as Ln, PREDEFINED_HOOK_NAME as ce, getRepeatRange as Tn, getCurrentRangeDisable$ as Aa, AutoHeightController as ho, SheetSkeletonManagerService as De } from "@univerjs/sheets-ui";
+import { IDialogService as ka, useDependency as T, KeyCode as sn, ISidebarService as po, useObservable as St, ComponentManager as Te, IZenZoneService as go, RectPopup as Fa, useEvent as ln, MenuItemType as Sn, getMenuHiddenObservable as Na, RibbonStartGroup as Ua, IMenuManagerService as Ba, useSidebarClick as mo } from "@univerjs/ui";
+import Pn, { useState as j, forwardRef as Mt, useRef as Kt, createElement as Et, useMemo as $t, useEffect as wt } from "react";
+import { DataValidatorRegistryService as bt, DataValidationModel as Pe, DataValidatorRegistryScope as $a, TWO_FORMULA_OPERATOR_COUNT as Wa, getRuleOptions as An, getRuleSetting as kn } from "@univerjs/data-validation";
+import { RichTextEditingMutation as Ha } from "@univerjs/docs";
+import { filter as Cn, BehaviorSubject as Fn, distinctUntilChanged as xa, Subject as ja, debounceTime as In, of as Ya, bufferTime as fo } from "rxjs";
+import { deserializeRangeWithSheet as Xa, serializeRange as vo } from "@univerjs/engine-formula";
+import { RangeSelector as za, FormulaEditor as _o } from "@univerjs/sheets-formula-ui";
+var Ka = Object.getOwnPropertyDescriptor, Ga = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? Ka(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
 }, ae = (t, e) => (o, n) => e(o, n, t);
-let le = class extends Dt {
+let le = class extends Vt {
   constructor(t, e, o, n, a) {
     super(), this._sheetInterceptorService = t, this._dataValidationModel = e, this._dataValidatorRegistryService = o, this._dialogService = n, this._localeService = a, this._initEditorBridgeInterceptor();
   }
   _initEditorBridgeInterceptor() {
     this._sheetInterceptorService.writeCellInterceptor.intercept(
-      pa,
+      ga,
       {
         handler: async (t, e, o) => {
-          var C;
+          var R;
           const n = await t, { worksheet: a, row: i, col: r, unitId: s, subUnitId: l, workbook: c } = e, u = this._dataValidationModel.getRuleIdByLocation(s, l, i, r), h = u ? this._dataValidationModel.getRuleById(s, l, u) : void 0;
           if (!h || h.errorStyle !== re.STOP)
             return o(Promise.resolve(n));
@@ -38,7 +38,7 @@ let le = class extends Dt {
           if (!d || await d.validator(
             {
               value: rt(n),
-              interceptValue: rt((C = e == null ? void 0 : e.origin) != null ? C : n),
+              interceptValue: rt((R = e == null ? void 0 : e.origin) != null ? R : n),
               row: i,
               column: r,
               unitId: s,
@@ -61,8 +61,8 @@ let le = class extends Dt {
               title: d.getRuleFinalError(h, { row: i, col: r, unitId: s, subUnitId: l })
             },
             footer: {
-              title: An.createElement(
-                Ut,
+              title: Pn.createElement(
+                Bt,
                 {
                   type: "primary",
                   onClick: () => this._dialogService.close("reject-input-dialog")
@@ -89,8 +89,8 @@ let le = class extends Dt {
         title: t
       },
       footer: {
-        title: An.createElement(
-          Ut,
+        title: Pn.createElement(
+          Bt,
           {
             type: "primary",
             onClick: () => this._dialogService.close("reject-input-dialog")
@@ -104,17 +104,17 @@ let le = class extends Dt {
     });
   }
 };
-le = za([
-  ae(0, E(fn)),
-  ae(1, E(at)),
-  ae(2, E(Et)),
-  ae(3, Aa),
-  ae(4, E(Q))
+le = Ga([
+  ae(0, b(fn)),
+  ae(1, b(at)),
+  ae(2, b(bt)),
+  ae(3, ka),
+  ae(4, b(Q))
 ], le);
-const Ka = "univer-dv-date-dropdown", Ga = "univer-dv-date-dropdown-btns", Un = {
-  dvDateDropdown: Ka,
-  dvDateDropdownBtns: Ga
-}, Za = (t) => {
+const Za = "univer-dv-date-dropdown", qa = "univer-dv-date-dropdown-btns", Nn = {
+  dvDateDropdown: Za,
+  dvDateDropdownBtns: qa
+}, Ja = (t) => {
   if (t == null || typeof t == "boolean")
     return;
   if (typeof t == "number" || !Number.isNaN(+t))
@@ -123,30 +123,30 @@ const Ka = "univer-dv-date-dropdown", Ga = "univer-dv-date-dropdown-btns", Un =
   if (e.isValid())
     return e;
 };
-function qa(t) {
-  var g;
-  const { location: e, hideFn: o } = t, { worksheet: n, row: a, col: i, unitId: r, subUnitId: s, workbook: l } = e, c = L(tt), u = L(le), h = n.getCell(a, i), d = rt(n.getCellRaw(a, i)), v = Za(d), [p, C] = x(v), R = p && p.isValid() ? p : Ze(), f = L(Q), w = L(at), I = w.getRuleByLocation(r, s, a, i);
-  if (!I)
+function Qa(t) {
+  var v;
+  const { location: e, hideFn: o } = t, { worksheet: n, row: a, col: i, unitId: r, subUnitId: s, workbook: l } = e, c = T(tt), u = T(le), h = n.getCell(a, i), d = rt(n.getCellRaw(a, i)), _ = Ja(d), [p, R] = j(_), w = p && p.isValid() ? p : Ze(), m = T(Q), f = T(at), S = f.getRuleByLocation(r, s, a, i);
+  if (!S)
     return null;
-  const V = w.getValidator(I.type);
+  const V = f.getValidator(S.type);
   if (!h || !V)
     return;
-  const _ = !!((g = I.bizInfo) != null && g.showTime), S = async () => {
-    var k, F, U;
-    if (!R)
+  const C = !!((v = S.bizInfo) != null && v.showTime), I = async () => {
+    var F, N, B;
+    if (!w)
       return;
-    const T = R.format(_ ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00"), N = (k = qe.parseDate(T)) == null ? void 0 : k.v, P = l.getStyles().getStyleByCell(h), b = (U = (F = P == null ? void 0 : P.n) == null ? void 0 : F.pattern) != null ? U : "", A = Ra(b);
-    I.errorStyle !== re.STOP || await V.validator({
-      value: N,
+    const P = w.format(C ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00"), U = (F = qe.parseDate(P)) == null ? void 0 : F.v, O = l.getStyles().getStyleByCell(h), L = (B = (N = O == null ? void 0 : O.n) == null ? void 0 : N.pattern) != null ? B : "", A = Va(L);
+    S.errorStyle !== re.STOP || await V.validator({
+      value: U,
       unitId: r,
       subUnitId: s,
       row: a,
       column: i,
       worksheet: n,
       workbook: l,
-      interceptValue: T.replace("Z", "").replace("T", " "),
-      t: Ho.NUMBER
-    }, I) ? (o(), await c.executeCommand(an.id, {
+      interceptValue: P.replace("Z", "").replace("T", " "),
+      t: xo.NUMBER
+    }, S) ? (o(), await c.executeCommand(an.id, {
       visible: !1,
       eventType: en.Keyboard,
       unitId: r,
@@ -161,36 +161,36 @@ function qa(t) {
         endRow: a
       },
       value: {
-        v: N,
+        v: U,
         t: 2,
         p: null,
         f: null,
         si: null,
         s: {
           n: {
-            pattern: _ ? A === "datetime" ? b : "yyyy-MM-dd hh:mm:ss" : A === "date" ? b : "yyyy-MM-dd"
+            pattern: C ? A === "datetime" ? L : "yyyy-MM-dd hh:mm:ss" : A === "date" ? L : "yyyy-MM-dd"
           }
         }
       }
-    })) : u.showReject(V.getRuleFinalError(I, { row: a, col: i, unitId: r, subUnitId: s }));
+    })) : u.showReject(V.getRuleFinalError(S, { row: a, col: i, unitId: r, subUnitId: s }));
   };
-  return /* @__PURE__ */ j("div", { className: Un.dvDateDropdown, children: [
-    /* @__PURE__ */ m(
-      oa,
+  return /* @__PURE__ */ Y("div", { className: Nn.dvDateDropdown, children: [
+    /* @__PURE__ */ g(
+      aa,
       {
-        defaultValue: R,
-        pickerValue: R,
-        showTime: _ || void 0,
+        defaultValue: w,
+        pickerValue: w,
+        showTime: C || void 0,
         onSelect: async (y) => {
-          C(y);
+          R(y);
         },
         onPanelChange: (y) => {
-          C(y);
+          R(y);
         },
         disabledDate: (y) => !qe.parseDate(y.format("YYYY-MM-DD"))
       }
     ),
-    /* @__PURE__ */ m("div", { className: Un.dvDateDropdownBtns, children: /* @__PURE__ */ m(Ut, { size: "small", type: "primary", onClick: S, disabled: !R.isValid(), children: f.t("dataValidation.alert.ok") }) })
+    /* @__PURE__ */ g("div", { className: Nn.dvDateDropdownBtns, children: /* @__PURE__ */ g(Bt, { size: "small", type: "primary", onClick: I, disabled: !w.isValid(), children: m.t("dataValidation.alert.ok") }) })
   ] });
 }
 var ut = function() {
@@ -201,23 +201,23 @@ var ut = function() {
     }
     return t;
   }, ut.apply(this, arguments);
-}, Ja = function(t, e) {
+}, ti = function(t, e) {
   var o = {};
   for (var n in t) Object.prototype.hasOwnProperty.call(t, n) && e.indexOf(n) < 0 && (o[n] = t[n]);
   if (t != null && typeof Object.getOwnPropertySymbols == "function")
     for (var a = 0, n = Object.getOwnPropertySymbols(t); a < n.length; a++)
       e.indexOf(n[a]) < 0 && Object.prototype.propertyIsEnumerable.call(t, n[a]) && (o[n[a]] = t[n[a]]);
   return o;
-}, bt = yt(function(t, e) {
-  var o = t.icon, n = t.id, a = t.className, i = t.extend, r = Ja(t, ["icon", "id", "className", "extend"]), s = "univerjs-icon univerjs-icon-".concat(n, " ").concat(a || "").trim(), l = zt("_".concat(ei()));
-  return _o(o, "".concat(n), { defIds: o.defIds, idSuffix: l.current }, ut({ ref: e, className: s }, r), i);
+}, Ot = Mt(function(t, e) {
+  var o = t.icon, n = t.id, a = t.className, i = t.extend, r = ti(t, ["icon", "id", "className", "extend"]), s = "univerjs-icon univerjs-icon-".concat(n, " ").concat(a || "").trim(), l = Kt("_".concat(oi()));
+  return So(o, "".concat(n), { defIds: o.defIds, idSuffix: l.current }, ut({ ref: e, className: s }, r), i);
 });
-function _o(t, e, o, n, a) {
-  return Mt(t.tag, ut(ut({ key: e }, Qa(t, o, a)), n), (ti(t, o).children || []).map(function(i, r) {
-    return _o(i, "".concat(e, "-").concat(t.tag, "-").concat(r), o, void 0, a);
+function So(t, e, o, n, a) {
+  return Et(t.tag, ut(ut({ key: e }, ei(t, o, a)), n), (ni(t, o).children || []).map(function(i, r) {
+    return So(i, "".concat(e, "-").concat(t.tag, "-").concat(r), o, void 0, a);
   }));
 }
-function Qa(t, e, o) {
+function ei(t, e, o) {
   var n = ut({}, t.attrs);
   o != null && o.colorChannel1 && n.fill === "colorChannel1" && (n.fill = o.colorChannel1), t.tag === "mask" && n.id && (n.id = n.id + e.idSuffix), Object.entries(n).forEach(function(i) {
     var r = i[0], s = i[1];
@@ -229,88 +229,88 @@ function Qa(t, e, o) {
     typeof s == "string" && (n[r] = s.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   })), n;
 }
-function ti(t, e) {
+function ni(t, e) {
   var o, n = e.defIds;
   return !n || n.length === 0 ? t : t.tag === "defs" && (!((o = t.children) === null || o === void 0) && o.length) ? ut(ut({}, t), { children: t.children.map(function(a) {
     return typeof a.attrs.id == "string" && n && n.indexOf(a.attrs.id) > -1 ? ut(ut({}, a), { attrs: ut(ut({}, a.attrs), { id: a.attrs.id + e.idSuffix }) }) : a;
   }) }) : t;
 }
-function ei() {
+function oi() {
   return Math.random().toString(36).substring(2, 8);
 }
-bt.displayName = "UniverIcon";
-var ni = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M14.1544 3.75557C14.3887 3.98988 14.3887 4.36978 14.1544 4.6041L6.51409 12.2444C6.40157 12.3569 6.24896 12.4201 6.08983 12.4201C5.9307 12.4201 5.77808 12.3569 5.66556 12.2444L1.84541 8.42425C1.6111 8.18993 1.6111 7.81003 1.84541 7.57572C2.07973 7.34141 2.45963 7.34141 2.69394 7.57572L6.08983 10.9716L13.3059 3.75557C13.5402 3.52126 13.9201 3.52126 14.1544 3.75557Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, So = yt(function(t, e) {
-  return Mt(bt, Object.assign({}, t, {
+Ot.displayName = "UniverIcon";
+var ai = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M14.1544 3.75557C14.3887 3.98988 14.3887 4.36978 14.1544 4.6041L6.51409 12.2444C6.40157 12.3569 6.24896 12.4201 6.08983 12.4201C5.9307 12.4201 5.77808 12.3569 5.66556 12.2444L1.84541 8.42425C1.6111 8.18993 1.6111 7.81003 1.84541 7.57572C2.07973 7.34141 2.45963 7.34141 2.69394 7.57572L6.08983 10.9716L13.3059 3.75557C13.5402 3.52126 13.9201 3.52126 14.1544 3.75557Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Co = Mt(function(t, e) {
+  return Et(Ot, Object.assign({}, t, {
     id: "check-mark-single",
     ref: e,
-    icon: ni
+    icon: ai
   }));
 });
-So.displayName = "CheckMarkSingle";
-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" } }] }, Co = yt(function(t, e) {
-  return Mt(bt, Object.assign({}, t, {
+Co.displayName = "CheckMarkSingle";
+var ii = { 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" } }] }, Io = Mt(function(t, e) {
+  return Et(Ot, Object.assign({}, t, {
     id: "data-validation-single",
     ref: e,
-    icon: oi
+    icon: ii
   }));
 });
-Co.displayName = "DataValidationSingle";
-var ai = { 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" } }] }, Rn = yt(function(t, e) {
-  return Mt(bt, Object.assign({}, t, {
+Io.displayName = "DataValidationSingle";
+var ri = { 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" } }] }, wn = Mt(function(t, e) {
+  return Et(Ot, Object.assign({}, t, {
     id: "delete-single",
     ref: e,
-    icon: ai
+    icon: ri
   }));
 });
-Rn.displayName = "DeleteSingle";
-var ii = { 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" } }] }, Io = yt(function(t, e) {
-  return Mt(bt, Object.assign({}, t, {
+wn.displayName = "DeleteSingle";
+var si = { 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" } }] }, wo = Mt(function(t, e) {
+  return Et(Ot, Object.assign({}, t, {
     id: "increase-single",
     ref: e,
-    icon: ii
+    icon: si
   }));
 });
-Io.displayName = "IncreaseSingle";
-var ri = { 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" } }] }, wo = yt(function(t, e) {
-  return Mt(bt, Object.assign({}, t, {
+wo.displayName = "IncreaseSingle";
+var li = { 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" } }] }, Ro = Mt(function(t, e) {
+  return Et(Ot, Object.assign({}, t, {
     id: "more-down-single",
     ref: e,
-    icon: ri
+    icon: li
   }));
 });
-wo.displayName = "MoreDownSingle";
-var si = { 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" } }] }, Ro = yt(function(t, e) {
-  return Mt(bt, Object.assign({}, t, {
+Ro.displayName = "MoreDownSingle";
+var di = { 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" } }] }, Do = Mt(function(t, e) {
+  return Et(Ot, Object.assign({}, t, {
     id: "more-up-single",
     ref: e,
-    icon: si
+    icon: di
   }));
 });
-Ro.displayName = "MoreUpSingle";
-var li = { 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" } }] }] }, Do = yt(function(t, e) {
-  return Mt(bt, Object.assign({}, t, {
+Do.displayName = "MoreUpSingle";
+var ci = { 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" } }] }] }, Vo = Mt(function(t, e) {
+  return Et(Ot, Object.assign({}, t, {
     id: "sequence-single",
     ref: e,
-    icon: li
+    icon: ci
   }));
 });
-Do.displayName = "SequenceSingle";
-var di = Object.getOwnPropertyDescriptor, ci = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? di(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+Vo.displayName = "SequenceSingle";
+var ui = Object.getOwnPropertyDescriptor, hi = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? ui(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
-}, Bn = (t, e) => (o, n) => e(o, n, t);
-let gt = class extends Dt {
+}, Un = (t, e) => (o, n) => e(o, n, t);
+let mt = class extends Vt {
   constructor(e, o) {
     super();
-    M(this, "_open$", new Nn(!1));
-    M(this, "open$", this._open$.pipe(Ha()));
-    M(this, "_activeRule");
-    M(this, "_activeRule$", new Nn(void 0));
-    M(this, "activeRule$", this._activeRule$.asObservable());
-    M(this, "_closeDisposable", null);
+    E(this, "_open$", new Fn(!1));
+    E(this, "open$", this._open$.pipe(xa()));
+    E(this, "_activeRule");
+    E(this, "_activeRule$", new Fn(void 0));
+    E(this, "activeRule$", this._activeRule$.asObservable());
+    E(this, "_closeDisposable", null);
     this._univerInstanceService = e, this._sidebarService = o, this.disposeWithMe(
-      this._univerInstanceService.getCurrentTypeOfUnit$(X.UNIVER_SHEET).pipe(In((n) => !n)).subscribe(() => {
+      this._univerInstanceService.getCurrentTypeOfUnit$(X.UNIVER_SHEET).pipe(Cn((n) => !n)).subscribe(() => {
         this.close();
       })
     ), this.disposeWithMe(this._sidebarService.sidebarOptions$.subscribe((n) => {
@@ -337,7 +337,7 @@ let gt = class extends Dt {
     this._open$.next(!1), (e = this._closeDisposable) == null || e.dispose();
   }
   setCloseDisposable(e) {
-    this._closeDisposable = xo(() => {
+    this._closeDisposable = jo(() => {
       e.dispose(), this._closeDisposable = null;
     });
   }
@@ -345,16 +345,16 @@ let gt = class extends Dt {
     this._activeRule = e, this._activeRule$.next(e);
   }
 };
-gt = ci([
-  Bn(0, vt),
-  Bn(1, po)
-], gt);
-function ui() {
-  const t = L(Rt), e = $t(t.activeDropdown$, t.activeDropdown), o = L(Te);
+mt = hi([
+  Un(0, vt),
+  Un(1, po)
+], mt);
+function pi() {
+  const t = T(Dt), e = St(t.activeDropdown$, t.activeDropdown), o = T(Te);
   if (!e)
     return null;
   const { location: n, componentKey: a } = e, i = o.get(a), r = `${n.unitId}-${n.subUnitId}-${n.row}-${n.col}`;
-  return i ? /* @__PURE__ */ m(
+  return i ? /* @__PURE__ */ g(
     i,
     {
       location: n,
@@ -365,20 +365,20 @@ function ui() {
     r
   ) : null;
 }
-const Vo = "sheet.ui.dropdown";
-var hi = Object.getOwnPropertyDescriptor, pi = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? hi(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+const yo = "sheet.ui.dropdown";
+var gi = Object.getOwnPropertyDescriptor, mi = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? gi(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
-}, Ot = (t, e) => (o, n) => e(o, n, t);
-let Rt = class extends Dt {
+}, Lt = (t, e) => (o, n) => e(o, n, t);
+let Dt = class extends Vt {
   constructor(e, o, n, a, i, r, s) {
     super();
-    M(this, "_activeDropdown");
-    M(this, "_activeDropdown$", new xa());
-    M(this, "_currentPopup", null);
-    M(this, "activeDropdown$", this._activeDropdown$.asObservable());
-    M(this, "_zenVisible", !1);
+    E(this, "_activeDropdown");
+    E(this, "_activeDropdown$", new ja());
+    E(this, "_currentPopup", null);
+    E(this, "activeDropdown$", this._activeDropdown$.asObservable());
+    E(this, "_zenVisible", !1);
     this._canvasPopupManagerService = e, this._univerInstanceService = o, this._dataValidatorRegistryService = n, this._zenZoneService = a, this._renderManagerService = i, this._dataValidationModel = r, this._sheetsSelectionsService = s, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
       this._activeDropdown$.complete();
     });
@@ -414,11 +414,11 @@ let Rt = class extends Dt {
     if (this._currentPopup && this._currentPopup.dispose(), this._zenVisible)
       return;
     this._activeDropdown = e, this._activeDropdown$.next(this._activeDropdown);
-    const l = this._renderManagerService.getRenderById(jo), c = this._canvasPopupManagerService.attachPopupToCell(
+    const l = this._renderManagerService.getRenderById(Yo), c = this._canvasPopupManagerService.attachPopupToCell(
       a,
       i,
       {
-        componentKey: Vo,
+        componentKey: yo,
         onClickOutside: () => {
           o && this.hideDropdown();
         },
@@ -430,7 +430,7 @@ let Rt = class extends Dt {
     );
     if (!c)
       throw new Error("[DataValidationDropdownManagerService]: cannot show dropdown!");
-    const u = new Yo();
+    const u = new Xo();
     u.add(c), u.add({
       dispose: () => {
         var h, d;
@@ -470,22 +470,22 @@ let Rt = class extends Dt {
     });
   }
 };
-Rt = pi([
-  Ot(0, E(Da)),
-  Ot(1, vt),
-  Ot(2, E(Et)),
-  Ot(3, mo),
-  Ot(4, Vt),
-  Ot(5, E(at)),
-  Ot(6, E(Jn))
-], Rt);
-const Ve = "DataValidationPanel", Wt = {
+Dt = mi([
+  Lt(0, b(ya)),
+  Lt(1, vt),
+  Lt(2, b(bt)),
+  Lt(3, go),
+  Lt(4, yt),
+  Lt(5, b(at)),
+  Lt(6, b(Jn))
+], Dt);
+const Ve = "DataValidationPanel", Ht = {
   id: "data-validation.operation.open-validation-panel",
   type: te.OPERATION,
   handler(t, e) {
     if (!e)
       return !1;
-    const { ruleId: o, isAdd: n } = e, a = t.get(gt), i = t.get(Pe), r = t.get(vt), s = t.get(po), l = Qn(r);
+    const { ruleId: o, isAdd: n } = e, a = t.get(mt), i = t.get(Pe), r = t.get(vt), s = t.get(po), l = Qn(r);
     if (!l) return !1;
     const { unitId: c, subUnitId: u } = l, h = o ? i.getRuleById(c, u, o) : void 0;
     a.open(), a.setActiveRule(h && {
@@ -502,18 +502,18 @@ const Ve = "DataValidationPanel", Wt = {
     });
     return a.setCloseDisposable(d), !0;
   }
-}, Dn = {
+}, Rn = {
   id: "data-validation.operation.close-validation-panel",
   type: te.OPERATION,
   handler(t) {
-    return t.get(gt).close(), !0;
+    return t.get(mt).close(), !0;
   }
-}, yo = {
+}, Mo = {
   id: "data-validation.operation.toggle-validation-panel",
   type: te.OPERATION,
   handler(t) {
-    const e = t.get(tt), o = t.get(gt);
-    return o.open(), o.isOpen ? e.executeCommand(Dn.id) : e.executeCommand(Wt.id), !0;
+    const e = t.get(tt), o = t.get(mt);
+    return o.open(), o.isOpen ? e.executeCommand(Rn.id) : e.executeCommand(Ht.id), !0;
   }
 }, Ae = {
   type: te.OPERATION,
@@ -521,7 +521,7 @@ const Ve = "DataValidationPanel", Wt = {
   handler(t, e) {
     if (!e)
       return !1;
-    const o = t.get(Rt), { unitId: n, subUnitId: a, row: i, column: r } = e, s = o.activeDropdown, l = s == null ? void 0 : s.location;
+    const o = t.get(Dt), { unitId: n, subUnitId: a, row: i, column: r } = e, s = o.activeDropdown, l = s == null ? void 0 : s.location;
     return l && l.unitId === n && l.subUnitId === a && l.row === i && l.col === r || o.showDataValidationDropdown(
       n,
       a,
@@ -529,105 +529,105 @@ const Ve = "DataValidationPanel", Wt = {
       r
     ), !0;
   }
-}, Mo = {
+}, Eo = {
   type: te.OPERATION,
   id: "sheet.operation.hide-data-validation-dropdown",
   handler(t, e) {
-    return e ? (t.get(Rt).hideDropdown(), !0) : !1;
-  }
-}, kt = "#ECECEC", Vn = "sheets-data-validation-ui.config", ye = {}, mi = "univer-dv-list-dropdown", gi = "univer-dv-list-dropdown-title", fi = "univer-dv-list-dropdown-list", vi = "univer-dv-list-dropdown-list-container", _i = "univer-dv-list-dropdown-selected-icon", Si = "univer-dv-list-dropdown-item-container", Ci = "univer-dv-list-dropdown-item", Ii = "univer-dv-list-dropdown-split", wi = "univer-dv-list-dropdown-edit", _t = {
-  dvListDropdown: mi,
-  dvListDropdownTitle: gi,
-  dvListDropdownList: fi,
-  dvListDropdownListContainer: vi,
-  dvListDropdownSelectedIcon: _i,
-  dvListDropdownItemContainer: Si,
-  dvListDropdownItem: Ci,
-  dvListDropdownSplit: Ii,
-  dvListDropdownEdit: wi
-}, Ri = (t) => {
-  var _, S;
-  const { value: e, onChange: o, multiple: n, options: a, title: i, onEdit: r, style: s, filter: l, location: c } = t, u = L(Q), h = L(pn), d = l == null ? void 0 : l.toLowerCase(), { row: v, col: p, unitId: C, subUnitId: R } = c, f = a.filter((g) => d ? g.label.toLowerCase().includes(d) : !0), w = (S = (_ = h.getConfig(Vn)) == null ? void 0 : _.showEditOnDropdown) != null ? S : !0, I = L(to), V = Kt(() => I.permissionCheckWithRanges(
+    return e ? (t.get(Dt).hideDropdown(), !0) : !1;
+  }
+}, Ft = "#ECECEC", Dn = "sheets-data-validation-ui.config", ye = {}, fi = "univer-dv-list-dropdown", vi = "univer-dv-list-dropdown-title", _i = "univer-dv-list-dropdown-list", Si = "univer-dv-list-dropdown-list-container", Ci = "univer-dv-list-dropdown-selected-icon", Ii = "univer-dv-list-dropdown-item-container", wi = "univer-dv-list-dropdown-item", Ri = "univer-dv-list-dropdown-split", Di = "univer-dv-list-dropdown-edit", _t = {
+  dvListDropdown: fi,
+  dvListDropdownTitle: vi,
+  dvListDropdownList: _i,
+  dvListDropdownListContainer: Si,
+  dvListDropdownSelectedIcon: Ci,
+  dvListDropdownItemContainer: Ii,
+  dvListDropdownItem: wi,
+  dvListDropdownSplit: Ri,
+  dvListDropdownEdit: Di
+}, Vi = (t) => {
+  var C, I;
+  const { value: e, onChange: o, multiple: n, options: a, title: i, onEdit: r, style: s, filter: l, location: c } = t, u = T(Q), h = T(pn), d = l == null ? void 0 : l.toLowerCase(), { row: _, col: p, unitId: R, subUnitId: w } = c, m = a.filter((v) => d ? v.label.toLowerCase().includes(d) : !0), f = (I = (C = h.getConfig(Dn)) == null ? void 0 : C.showEditOnDropdown) != null ? I : !0, S = T(to), V = $t(() => S.permissionCheckWithRanges(
     {
       workbookTypes: [Re],
       rangeTypes: [we],
       worksheetTypes: [Ie]
     },
-    [{ startColumn: p, startRow: v, endColumn: p, endRow: v }],
-    C,
-    R
-  ), [I, p, v, C, R]);
-  return /* @__PURE__ */ j("div", { className: _t.dvListDropdown, style: s, children: [
-    /* @__PURE__ */ m("div", { className: _t.dvListDropdownTitle, children: i }),
-    /* @__PURE__ */ m("div", { className: _t.dvListDropdownList, children: /* @__PURE__ */ m(aa, { children: /* @__PURE__ */ m("div", { className: _t.dvListDropdownListContainer, children: f.map((g, y) => {
-      const T = e.indexOf(g.value) > -1, N = () => {
-        let b;
-        T ? b = new Set(e.filter((k) => k !== g.value)) : b = new Set(n ? [...e, g.value] : [g.value]);
+    [{ startColumn: p, startRow: _, endColumn: p, endRow: _ }],
+    R,
+    w
+  ), [S, p, _, R, w]);
+  return /* @__PURE__ */ Y("div", { className: _t.dvListDropdown, style: s, children: [
+    /* @__PURE__ */ g("div", { className: _t.dvListDropdownTitle, children: i }),
+    /* @__PURE__ */ g("div", { className: _t.dvListDropdownList, children: /* @__PURE__ */ g(ia, { children: /* @__PURE__ */ g("div", { className: _t.dvListDropdownListContainer, children: m.map((v, y) => {
+      const P = e.indexOf(v.value) > -1, U = () => {
+        let L;
+        P ? L = new Set(e.filter((F) => F !== v.value)) : L = new Set(n ? [...e, v.value] : [v.value]);
         const A = [];
-        a.forEach((k) => {
-          b.has(k.value) && A.push(k.value);
+        a.forEach((F) => {
+          L.has(F.value) && A.push(F.value);
         }), o(A);
-      }, P = g.label.toLocaleLowerCase().indexOf(d);
-      return /* @__PURE__ */ j("div", { className: _t.dvListDropdownItemContainer, onClick: N, children: [
-        /* @__PURE__ */ m("div", { className: _t.dvListDropdownItem, style: { background: g.color || kt }, children: d && g.label.toLowerCase().includes(d) ? /* @__PURE__ */ j(wt, { children: [
-          /* @__PURE__ */ m("span", { children: g.label.substring(0, P) }),
-          /* @__PURE__ */ m("span", { style: { fontWeight: "bold" }, children: g.label.substring(P, P + d.length) }),
-          /* @__PURE__ */ m("span", { children: g.label.substring(P + d.length) })
-        ] }) : g.label }),
-        /* @__PURE__ */ m("div", { className: _t.dvListDropdownSelectedIcon, children: T ? /* @__PURE__ */ m(So, {}) : null })
+      }, O = v.label.toLocaleLowerCase().indexOf(d);
+      return /* @__PURE__ */ Y("div", { className: _t.dvListDropdownItemContainer, onClick: U, children: [
+        /* @__PURE__ */ g("div", { className: _t.dvListDropdownItem, style: { background: v.color || Ft }, children: d && v.label.toLowerCase().includes(d) ? /* @__PURE__ */ Y(Rt, { children: [
+          /* @__PURE__ */ g("span", { children: v.label.substring(0, O) }),
+          /* @__PURE__ */ g("span", { style: { fontWeight: "bold" }, children: v.label.substring(O, O + d.length) }),
+          /* @__PURE__ */ g("span", { children: v.label.substring(O + d.length) })
+        ] }) : v.label }),
+        /* @__PURE__ */ g("div", { className: _t.dvListDropdownSelectedIcon, children: P ? /* @__PURE__ */ g(Co, {}) : null })
       ] }, y);
     }) }) }, l) }),
-    w && V ? /* @__PURE__ */ j(wt, { children: [
-      /* @__PURE__ */ m("div", { className: _t.dvListDropdownSplit }),
-      /* @__PURE__ */ m("div", { className: _t.dvListDropdownEdit, children: /* @__PURE__ */ m("a", { onClick: r, children: u.t("dataValidation.list.edit") }) })
+    f && V ? /* @__PURE__ */ Y(Rt, { children: [
+      /* @__PURE__ */ g("div", { className: _t.dvListDropdownSplit }),
+      /* @__PURE__ */ g("div", { className: _t.dvListDropdownEdit, children: /* @__PURE__ */ g("a", { onClick: r, children: u.t("dataValidation.list.edit") }) })
     ] }) : null
   ] });
 };
-function Di(t) {
-  var F, U, Y, z;
-  const { location: e, hideFn: o } = t, { worksheet: n, row: a, col: i, unitId: r, subUnitId: s } = e, l = L(Pe), [c, u] = x(""), h = L(tt), d = L(Q), [v, p] = x(""), C = L(uo), R = L(vt), f = Kt(() => l.ruleChange$.pipe(wn(16)), []), w = L(at);
-  $t(f);
-  const I = ka.useContext(), V = ((U = (F = I.current) == null ? void 0 : F.right) != null ? U : 0) - ((z = (Y = I.current) == null ? void 0 : Y.left) != null ? z : 0);
-  if (It(() => {
+function yi(t) {
+  var N, B, x, z;
+  const { location: e, hideFn: o } = t, { worksheet: n, row: a, col: i, unitId: r, subUnitId: s } = e, l = T(Pe), [c, u] = j(""), h = T(tt), d = T(Q), [_, p] = j(""), R = T(uo), w = T(vt), m = $t(() => l.ruleChange$.pipe(In(16)), []), f = T(at);
+  St(m);
+  const S = Fa.useContext(), V = ((B = (N = S.current) == null ? void 0 : N.right) != null ? B : 0) - ((z = (x = S.current) == null ? void 0 : x.left) != null ? z : 0);
+  if (wt(() => {
     const H = h.onCommandExecuted((G) => {
       var J, et;
-      if (G.id === Wa.id) {
-        const nt = G.params, { unitId: st } = nt, it = R.getUnit(st, X.UNIVER_DOC);
-        if (!it || !C.isVisible().visible) return;
-        const lt = Xo.transform.getPlainText((et = (J = it.getSnapshot().body) == null ? void 0 : J.dataStream) != null ? et : "");
+      if (G.id === Ha.id) {
+        const nt = G.params, { unitId: st } = nt, it = w.getUnit(st, X.UNIVER_DOC);
+        if (!it || !R.isVisible().visible) return;
+        const lt = zo.transform.getPlainText((et = (J = it.getSnapshot().body) == null ? void 0 : J.dataStream) != null ? et : "");
         u(lt);
       }
     });
     return () => {
       H.dispose();
     };
-  }, [h, C, R]), !n)
+  }, [h, R, w]), !n)
     return null;
-  const _ = w.getRuleByLocation(r, s, a, i);
-  if (!_)
+  const C = f.getRuleByLocation(r, s, a, i);
+  if (!C)
     return null;
-  const S = w.getValidator(_.type);
-  if (!S)
+  const I = f.getValidator(C.type);
+  if (!I)
     return null;
-  const g = n.getCell(a, i), y = (_ == null ? void 0 : _.renderMode) === ct.CUSTOM || (_ == null ? void 0 : _.renderMode) === void 0;
-  if (!g || !_ || !S || S.id.indexOf(K.LIST) !== 0)
+  const v = n.getCell(a, i), y = (C == null ? void 0 : C.renderMode) === ct.CUSTOM || (C == null ? void 0 : C.renderMode) === void 0;
+  if (!v || !C || !I || I.id.indexOf(K.LIST) !== 0)
     return;
-  const T = _.type === K.LIST_MULTIPLE, N = S.getListWithColor(_, r, s), P = v || ga(n.getCellRaw(a, i)), b = oo(P), A = () => {
-    h.executeCommand(Wt.id, {
-      ruleId: _.uid
+  const P = C.type === K.LIST_MULTIPLE, U = I.getListWithColor(C, r, s), O = _ || va(n.getCellRaw(a, i)), L = oo(O), A = () => {
+    h.executeCommand(Ht.id, {
+      ruleId: C.uid
     }), o();
-  }, k = N.map((H) => ({
+  }, F = U.map((H) => ({
     label: H.label,
     value: H.label,
     color: y || H.color ? H.color : "transparent"
   }));
-  return /* @__PURE__ */ m(
-    Ri,
+  return /* @__PURE__ */ g(
+    Vi,
     {
       style: { minWidth: V, maxWidth: Math.max(V, 200) },
-      title: T ? d.t("dataValidation.listMultiple.dropdown") : d.t("dataValidation.list.dropdown"),
-      value: b,
-      multiple: T,
+      title: P ? d.t("dataValidation.listMultiple.dropdown") : d.t("dataValidation.list.dropdown"),
+      value: L,
+      multiple: P,
       onChange: async (H) => {
         const G = ao(H), J = {
           unitId: r,
@@ -645,61 +645,61 @@ function Di(t) {
             si: null
           }
         };
-        C.isVisible() && h.executeCommand(an.id, {
+        R.isVisible() && h.executeCommand(an.id, {
           visible: !1,
           eventType: en.Keyboard,
           unitId: r,
           keycode: sn.ESC
-        }), p(G), T || o(), C.isVisible().visible && await h.executeCommand(an.id, {
+        }), p(G), P || o(), R.isVisible().visible && await h.executeCommand(an.id, {
           visible: !1,
           eventType: en.Keyboard,
           unitId: r,
           keycode: sn.ESC
         }), h.executeCommand(vn.id, J);
       },
-      options: k,
+      options: F,
       onEdit: A,
       filter: c,
       location: e
     }
   );
 }
-const Vi = "univer-data-validation-options-button", yi = "univer-data-validation-options-button-icon", Be = {
-  dataValidationOptionsButton: Vi,
-  dataValidationOptionsButtonIcon: yi
+const Mi = "univer-data-validation-options-button", Ei = "univer-data-validation-options-button-icon", Be = {
+  dataValidationOptionsButton: Mi,
+  dataValidationOptionsButtonIcon: Ei
 };
-function Mi(t) {
+function bi(t) {
   var c;
-  const e = L(Q), o = L(Te), { value: n, onChange: a, extraComponent: i } = t, [r, s] = x(!1), l = i ? o.get(i) : null;
-  return /* @__PURE__ */ j(wt, { children: [
-    /* @__PURE__ */ j("div", { className: Be.dataValidationOptionsButton, onClick: () => s(!r), children: [
+  const e = T(Q), o = T(Te), { value: n, onChange: a, extraComponent: i } = t, [r, s] = j(!1), l = i ? o.get(i) : null;
+  return /* @__PURE__ */ Y(Rt, { children: [
+    /* @__PURE__ */ Y("div", { className: Be.dataValidationOptionsButton, onClick: () => s(!r), children: [
       e.t("dataValidation.panel.options"),
-      r ? /* @__PURE__ */ m(Ro, { className: Be.dataValidationOptionsButtonIcon }) : /* @__PURE__ */ m(wo, { className: Be.dataValidationOptionsButtonIcon })
+      r ? /* @__PURE__ */ g(Do, { className: Be.dataValidationOptionsButtonIcon }) : /* @__PURE__ */ g(Ro, { className: Be.dataValidationOptionsButtonIcon })
     ] }),
-    r && /* @__PURE__ */ j(wt, { children: [
-      l ? /* @__PURE__ */ m(l, { value: n, onChange: a }) : null,
-      /* @__PURE__ */ m(
+    r && /* @__PURE__ */ Y(Rt, { children: [
+      l ? /* @__PURE__ */ g(l, { value: n, onChange: a }) : null,
+      /* @__PURE__ */ g(
         q,
         {
           label: e.t("dataValidation.panel.invalid"),
-          children: /* @__PURE__ */ j(
-            gn,
+          children: /* @__PURE__ */ Y(
+            mn,
             {
               value: `${(c = n.errorStyle) != null ? c : re.WARNING}`,
               onChange: (u) => a({ ...n, errorStyle: +u }),
               children: [
-                /* @__PURE__ */ m(Ft, { value: `${re.WARNING}`, children: e.t("dataValidation.panel.showWarning") }),
-                /* @__PURE__ */ m(Ft, { value: `${re.STOP}`, children: e.t("dataValidation.panel.rejectInput") })
+                /* @__PURE__ */ g(Nt, { value: `${re.WARNING}`, children: e.t("dataValidation.panel.showWarning") }),
+                /* @__PURE__ */ g(Nt, { value: `${re.STOP}`, children: e.t("dataValidation.panel.rejectInput") })
               ]
             }
           )
         }
       ),
-      /* @__PURE__ */ m(
+      /* @__PURE__ */ g(
         q,
         {
           label: e.t("dataValidation.panel.messageInfo"),
-          children: /* @__PURE__ */ m(
+          children: /* @__PURE__ */ g(
             Le,
             {
               checked: n.showErrorMessage,
@@ -712,86 +712,87 @@ function Mi(t) {
           )
         }
       ),
-      n.showErrorMessage ? /* @__PURE__ */ m(q, { children: /* @__PURE__ */ m(Nt, { value: n.error, onChange: (u) => a({ ...n, error: u }) }) }) : null
+      n.showErrorMessage ? /* @__PURE__ */ g(q, { children: /* @__PURE__ */ g(Ut, { value: n.error, onChange: (u) => a({ ...n, error: u }) }) }) : null
     ] })
   ] });
 }
-const Ei = "univer-data-validation-detail", bi = "univer-data-validation-detail-form-item", Oi = "univer-data-validation-detail-buttons", Li = "univer-data-validation-detail-button", Ht = {
-  dataValidationDetail: Ei,
-  dataValidationDetailFormItem: bi,
-  dataValidationDetailButtons: Oi,
-  dataValidationDetailButton: Li
-}, Ti = (t) => zo(
+const Oi = "univer-data-validation-detail", Li = "univer-data-validation-detail-form-item", Ti = "univer-data-validation-detail-buttons", Pi = "univer-data-validation-detail-button", xt = {
+  dataValidationDetail: Oi,
+  dataValidationDetailFormItem: Li,
+  dataValidationDetailButtons: Ti,
+  dataValidationDetailButton: Pi
+}, Ai = (t) => Ko(
   async (e, o, n, a) => {
     const i = await t.executeCommand(e, o, n);
     a == null || a(i);
   },
   1e3
 );
-function Pi(t, e, o) {
+function ki(t, e, o) {
   var n, a, i, r;
   return e ? ((a = (n = t.getUnit(e)) == null ? void 0 : n.getSheetBySheetName(o)) == null ? void 0 : a.getSheetId()) || "" : ((r = (i = t.getCurrentUnitForType(X.UNIVER_SHEET)) == null ? void 0 : i.getSheetBySheetName(o)) == null ? void 0 : r.getSheetId()) || "";
 }
-function Ai() {
+function Fi() {
   var lt;
-  const [t, e] = x(0), o = L(gt), n = $t(o.activeRule$, o.activeRule), { unitId: a, subUnitId: i, rule: r } = n || {}, s = r.uid, l = L(Et), c = L(vt), u = L(Te), h = L(tt), d = L(Pe), v = L(Q), [p, C] = x(r), R = l.getValidatorItem(p.type), [f, w] = x(!1), I = l.getValidatorsByScope(Ba.SHEET), [V, _] = x(() => p.ranges.map((O) => ({ unitId: "", sheetId: "", range: O }))), S = Kt(() => Ti(h), [h]), [g, y] = x(!1), T = zt({}), [N, P] = x(!1), b = L(Jn);
-  if (It(() => () => {
-    const O = b.getCurrentLastSelection();
-    O && b.setSelections([O]);
-  }, [b]), It(() => {
-    h.onCommandExecuted((O) => {
-      (O.id === Ko.id || O.id === Go.id) && setTimeout(() => {
+  const [t, e] = j(0), o = T(mt), n = St(o.activeRule$, o.activeRule), { unitId: a, subUnitId: i, rule: r } = n || {}, s = r.uid, l = T(bt), c = T(vt), u = T(Te), h = T(tt), d = T(Pe), _ = T(Q), [p, R] = j(r), w = l.getValidatorItem(p.type), [m, f] = j(!1), S = l.getValidatorsByScope($a.SHEET), [V, C] = j(() => p.ranges.map((M) => ({ unitId: "", sheetId: "", range: M }))), I = $t(() => Ai(h), [h]), [v, y] = j(!1), [P, U] = j(!1), O = Kt(null), L = T(Jn);
+  if (wt(() => () => {
+    const M = L.getCurrentLastSelection();
+    M && L.setSelections([M]);
+  }, [L]), wt(() => {
+    h.onCommandExecuted((M) => {
+      (M.id === Go.id || M.id === Zo.id) && setTimeout(() => {
         const D = d.getRuleById(a, i, s);
-        e((B) => B + 1), D && (C(D), _(D.ranges.map((B) => ({ unitId: "", sheetId: "", range: B }))));
+        e((k) => k + 1), D && (R(D), C(D.ranges.map((k) => ({ unitId: "", sheetId: "", range: k }))));
       }, 20);
     });
-  }, [h, d, s, i, a]), !R)
+  }, [h, d, s, i, a]), !w)
     return null;
-  const A = R.operators, k = R.operatorNames, F = p.operator ? $a.includes(p.operator) : !1, U = () => {
-    !p.ranges.length || g || (R.validatorFormula(p, a, i).success ? o.setActiveRule(null) : w(!0));
-  }, Y = ln((O) => {
-    const D = O.split(",").filter(Boolean).map(ja).map((W) => {
-      const St = W.sheetName;
-      if (St) {
-        const Bo = Pi(c, W.unitId, St);
-        return { ...W, sheetId: Bo };
+  const A = w.operators, F = w.operatorNames, N = p.operator ? Wa.includes(p.operator) : !1, B = () => {
+    var M, D, k;
+    (D = (M = O.current) == null ? void 0 : M.editor) != null && D.isFocus() && x((k = O.current) == null ? void 0 : k.getValue()), !(!p.ranges.length || v) && (w.validatorFormula(p, a, i).success ? o.setActiveRule(null) : f(!0));
+  }, x = ln((M) => {
+    const D = M.split(",").filter(Boolean).map(Xa).map((W) => {
+      const Ct = W.sheetName;
+      if (Ct) {
+        const $o = ki(c, W.unitId, Ct);
+        return { ...W, sheetId: $o };
       }
       return {
         ...W,
         sheetId: ""
       };
     });
-    if (Zo(D, V))
+    if (qo(D, V))
       return;
-    _(D);
-    const B = D.filter((W) => (!W.unitId || W.unitId === a) && (!W.sheetId || W.sheetId === i)).map((W) => W.range);
-    if (C({
+    C(D);
+    const k = D.filter((W) => (!W.unitId || W.unitId === a) && (!W.sheetId || W.sheetId === i)).map((W) => W.range);
+    if (R({
       ...p,
-      ranges: B
-    }), B.length === 0)
+      ranges: k
+    }), k.length === 0)
       return;
     const $ = {
       unitId: a,
       subUnitId: i,
       ruleId: s,
-      ranges: B
+      ranges: k
     };
-    S(io.id, $);
-  }), z = (O) => {
-    if (En(O, Fn(p)))
+    I(io.id, $);
+  }), z = (M) => {
+    if (Mn(M, kn(p)))
       return;
-    C({
+    R({
       ...p,
-      ...O
+      ...M
     });
     const D = {
       unitId: a,
       subUnitId: i,
       ruleId: s,
-      setting: O
+      setting: M
     };
-    S(
-      On.id,
+    I(
+      bn.id,
       D,
       void 0
     );
@@ -807,262 +808,263 @@ function Ai() {
     formula1: p.formula1,
     formula2: p.formula2,
     allowBlank: p.allowBlank
-  }, J = (O) => {
-    const D = l.getValidatorItem(O);
+  }, J = (M) => {
+    const D = l.getValidatorItem(M);
     if (!D)
       return;
-    const B = D.operators, $ = d.getRuleById(a, i, s), W = O === ($ == null ? void 0 : $.type) || O.includes("list") && ($ != null && $.type.includes("list")) ? {
+    const k = D.operators, $ = d.getRuleById(a, i, s), W = M === ($ == null ? void 0 : $.type) || M.includes("list") && ($ != null && $.type.includes("list")) ? {
       ...$,
-      type: O
+      type: M
     } : {
       ...p,
-      type: O,
-      operator: B[0],
+      type: M,
+      operator: k[0],
       formula1: void 0,
       formula2: void 0
     };
-    C(W), h.executeCommand(On.id, {
+    R(W), h.executeCommand(bn.id, {
       unitId: a,
       subUnitId: i,
       ruleId: p.uid,
-      setting: Fn(W)
+      setting: kn(W)
     });
-  }, et = u.get(R.formulaInput), nt = Kt(() => V.map((O) => fo(O.range)).join(","), []), st = kn(p), it = (O) => {
-    En(O, kn(p)) || (C({
+  }, et = u.get(w.formulaInput), nt = $t(() => V.map((M) => vo(M.range)).join(","), []), st = An(p), it = (M) => {
+    Mn(M, An(p)) || (R({
       ...p,
-      ...O
-    }), S(
-      fa.id,
+      ...M
+    }), I(
+      _a.id,
       {
         unitId: a,
         subUnitId: i,
         ruleId: s,
-        options: O
+        options: M
       }
     ));
   };
-  return Sn((O) => {
-    var B;
-    const D = (B = T.current) == null ? void 0 : B.handleOutClick;
-    D && D(O, () => P(!1));
-  }), /* @__PURE__ */ j("div", { className: Ht.dataValidationDetail, children: [
-    /* @__PURE__ */ m(
+  return /* @__PURE__ */ Y("div", { className: xt.dataValidationDetail, children: [
+    /* @__PURE__ */ g(
       q,
       {
-        label: v.t("dataValidation.panel.range"),
-        error: !p.ranges.length || g ? v.t("dataValidation.panel.rangeError") : "",
-        children: /* @__PURE__ */ m(
-          Ya,
+        label: _.t("dataValidation.panel.range"),
+        error: !p.ranges.length || v ? _.t("dataValidation.panel.rangeError") : "",
+        children: /* @__PURE__ */ g(
+          za,
           {
+            selectorRef: O,
             unitId: a,
             subUnitId: i,
-            initValue: nt,
-            onChange: Y,
-            onFocus: () => P(!0),
-            isFocus: N,
-            actions: T.current,
-            onVerify: (O) => y(!O)
+            initialValue: nt,
+            onChange: (M, D) => {
+              var k;
+              !P && ((k = O.current) != null && k.verify()) && x(D);
+            },
+            onFocusChange: (M, D) => {
+              var k;
+              U(M), !M && D && ((k = O.current) != null && k.verify()) && x(D);
+            },
+            onVerify: (M) => y(!M)
           }
         )
       }
     ),
-    /* @__PURE__ */ m(q, { label: v.t("dataValidation.panel.type"), children: /* @__PURE__ */ m(
+    /* @__PURE__ */ g(q, { label: _.t("dataValidation.panel.type"), children: /* @__PURE__ */ g(
       tn,
       {
-        options: I == null ? void 0 : I.map((O) => ({
-          label: v.t(O.title),
-          value: O.id
+        options: S == null ? void 0 : S.map((M) => ({
+          label: _.t(M.title),
+          value: M.id
         })),
         value: p.type,
         onChange: J,
-        className: Ht.dataValidationDetailFormItem
+        className: xt.dataValidationDetailFormItem
       }
     ) }),
-    A != null && A.length ? /* @__PURE__ */ m(q, { label: v.t("dataValidation.panel.operator"), children: /* @__PURE__ */ m(
+    A != null && A.length ? /* @__PURE__ */ g(q, { label: _.t("dataValidation.panel.operator"), children: /* @__PURE__ */ g(
       tn,
       {
-        options: A.map((O, D) => ({
-          value: `${O}`,
-          label: k[D]
+        options: A.map((M, D) => ({
+          value: `${M}`,
+          label: F[D]
         })),
         value: `${p.operator}`,
-        onChange: (O) => {
+        onChange: (M) => {
           z({
             ...G,
-            operator: O
+            operator: M
           });
         },
-        className: Ht.dataValidationDetailFormItem
+        className: xt.dataValidationDetailFormItem
       }
     ) }) : null,
-    et ? /* @__PURE__ */ m(
+    et ? /* @__PURE__ */ g(
       et,
       {
-        isTwoFormula: F,
+        isTwoFormula: N,
         value: {
           formula1: p.formula1,
           formula2: p.formula2
         },
-        onChange: (O) => {
+        onChange: (M) => {
           z({
             ...G,
-            ...O
+            ...M
           });
         },
-        showError: f,
-        validResult: R.validatorFormula(p, a, i),
+        showError: m,
+        validResult: w.validatorFormula(p, a, i),
         unitId: a,
         subUnitId: i,
         ruleId: s
       },
       t + p.type
     ) : null,
-    /* @__PURE__ */ m(q, { children: /* @__PURE__ */ m(
+    /* @__PURE__ */ g(q, { children: /* @__PURE__ */ g(
       Le,
       {
         checked: (lt = p.allowBlank) != null ? lt : !0,
         onChange: () => {
-          var O;
+          var M;
           return z({
             ...G,
-            allowBlank: !((O = p.allowBlank) == null || O)
+            allowBlank: !((M = p.allowBlank) == null || M)
           });
         },
-        children: v.t("dataValidation.panel.allowBlank")
+        children: _.t("dataValidation.panel.allowBlank")
       }
     ) }),
-    /* @__PURE__ */ m(Mi, { value: st, onChange: it, extraComponent: R.optionsInput }),
-    /* @__PURE__ */ j("div", { className: Ht.dataValidationDetailButtons, children: [
-      /* @__PURE__ */ m(Ut, { className: Ht.dataValidationDetailButton, onClick: H, children: v.t("dataValidation.panel.removeRule") }),
-      /* @__PURE__ */ m(Ut, { className: Ht.dataValidationDetailButton, type: "primary", onClick: U, children: v.t("dataValidation.panel.done") })
+    /* @__PURE__ */ g(bi, { value: st, onChange: it, extraComponent: w.optionsInput }),
+    /* @__PURE__ */ Y("div", { className: xt.dataValidationDetailButtons, children: [
+      /* @__PURE__ */ g(Bt, { className: xt.dataValidationDetailButton, onClick: H, children: _.t("dataValidation.panel.removeRule") }),
+      /* @__PURE__ */ g(Bt, { className: xt.dataValidationDetailButton, type: "primary", onClick: B, children: _.t("dataValidation.panel.done") })
     ] })
   ] });
 }
-const ki = "univer-data-validation-item-container", Fi = "univer-data-validation-item-title", Ni = "univer-data-validation-item-content", Ui = "univer-data-validation-item-icon", ue = {
-  dataValidationItemContainer: ki,
-  dataValidationItemTitle: Fi,
-  dataValidationItemContent: Ni,
-  dataValidationItemIcon: Ui
-}, Bi = (t) => {
-  const { rule: e, onClick: o, unitId: n, subUnitId: a, disable: i } = t, r = L(Et), s = L(tt), l = L(Va), c = r.getValidatorItem(e.type), u = zt(void 0), [h, d] = x(!1), v = (p) => {
+const Ni = "univer-data-validation-item-container", Ui = "univer-data-validation-item-title", Bi = "univer-data-validation-item-content", $i = "univer-data-validation-item-icon", ue = {
+  dataValidationItemContainer: Ni,
+  dataValidationItemTitle: Ui,
+  dataValidationItemContent: Bi,
+  dataValidationItemIcon: $i
+}, Wi = (t) => {
+  const { rule: e, onClick: o, unitId: n, subUnitId: a, disable: i } = t, r = T(bt), s = T(tt), l = T(Ma), c = r.getValidatorItem(e.type), u = Kt(void 0), [h, d] = j(!1), _ = T(Xn), p = St(_.currentTheme$), R = $t(() => {
+    var S;
+    const m = (S = p == null ? void 0 : p.loopColor2) != null ? S : "#49B811", f = new Jo(m).toRgb();
+    return {
+      fill: `rgba(${f.r}, ${f.g}, ${f.b}, 0.1)`,
+      stroke: m
+    };
+  }, [p]), w = (m) => {
     s.executeCommand(ro.id, {
       ruleId: e.uid,
       unitId: n,
       subUnitId: a
-    }), p.stopPropagation();
+    }), m.stopPropagation();
   };
-  return It(() => () => {
-    var p;
-    u.current && ((p = u.current) == null || p.forEach((C) => {
-      C && l.removeShape(C);
+  return wt(() => () => {
+    var m;
+    u.current && ((m = u.current) == null || m.forEach((f) => {
+      f && l.removeShape(f);
     }));
-  }, [l]), /* @__PURE__ */ j(
+  }, [l]), /* @__PURE__ */ Y(
     "div",
     {
       className: ue.dataValidationItemContainer,
       onClick: o,
       onMouseEnter: () => {
-        i || (d(!0), u.current = e.ranges.map((p) => l.addShape({
-          range: p,
-          style: {
-            // hasAutoFill: false,
-            fill: "rgba(73, 184, 17, 0.05)",
-            strokeWidth: 1,
-            stroke: "#49B811",
-            widgets: {}
-          },
+        i || (d(!0), u.current = e.ranges.map((m) => l.addShape({
+          range: m,
+          style: R,
           primary: null
         })));
       },
       onMouseLeave: () => {
-        var p;
-        d(!1), (p = u.current) == null || p.forEach((C) => {
-          C && l.removeShape(C);
+        var m;
+        d(!1), (m = u.current) == null || m.forEach((f) => {
+          f && l.removeShape(f);
         }), u.current = void 0;
       },
       children: [
-        /* @__PURE__ */ m("div", { className: ue.dataValidationItemTitle, children: c == null ? void 0 : c.generateRuleName(e) }),
-        /* @__PURE__ */ m("div", { className: ue.dataValidationItemContent, children: e.ranges.map((p) => fo(p)).join(",") }),
-        h ? /* @__PURE__ */ m("div", { className: ue.dataValidationItemIcon, onClick: v, children: /* @__PURE__ */ m(Rn, {}) }) : null
+        /* @__PURE__ */ g("div", { className: ue.dataValidationItemTitle, children: c == null ? void 0 : c.generateRuleName(e) }),
+        /* @__PURE__ */ g("div", { className: ue.dataValidationItemContent, children: e.ranges.map((m) => vo(m)).join(",") }),
+        h ? /* @__PURE__ */ g("div", { className: ue.dataValidationItemIcon, onClick: w, children: /* @__PURE__ */ g(wn, {}) }) : null
       ]
     }
   );
-}, $i = "univer-data-validation-list", Wi = "univer-data-validation-list-buttons", Hi = "univer-data-validation-list-button", he = {
-  dataValidationList: $i,
-  dataValidationListButtons: Wi,
-  dataValidationListButton: Hi
+}, Hi = "univer-data-validation-list", xi = "univer-data-validation-list-buttons", ji = "univer-data-validation-list-button", he = {
+  dataValidationList: Hi,
+  dataValidationListButtons: xi,
+  dataValidationListButton: ji
 };
-function xi() {
-  const t = L(vt), e = $t(
-    () => t.getCurrentTypeOfUnit$(X.UNIVER_SHEET),
-    void 0,
-    void 0,
-    []
-  );
-  return e ? /* @__PURE__ */ m(ji, { workbook: e }) : null;
-}
-function ji(t) {
-  const e = L(at), o = L(vt), n = L(tt), a = L(Bt), i = L(gt), r = L(Q), [s, l] = x([]), { workbook: c } = t, u = $t(c.activeSheet$, void 0, !0), h = c.getUnitId(), d = u == null ? void 0 : u.getSheetId();
-  It(() => {
+function Yi(t) {
+  const e = T(at), o = T(vt), n = T(tt), a = T(Wt), i = T(mt), r = T(Q), [s, l] = j([]), { workbook: c } = t, u = St(c.activeSheet$, void 0, !0), h = c.getUnitId(), d = u == null ? void 0 : u.getSheetId();
+  wt(() => {
     l(e.getRules(h, d));
-    const w = e.ruleChange$.subscribe((I) => {
-      I.unitId === h && I.subUnitId === d && l(e.getRules(h, d));
+    const f = e.ruleChange$.subscribe((S) => {
+      S.unitId === h && S.subUnitId === d && l(e.getRules(h, d));
     });
     return () => {
-      w.unsubscribe();
+      f.unsubscribe();
     };
   }, [h, d, e]);
-  const v = async () => {
-    const w = so(a), I = {
+  const _ = async () => {
+    const f = so(a), S = {
       unitId: h,
       subUnitId: d,
-      rule: w
+      rule: f
     };
-    await n.executeCommand(_n.id, I), i.setActiveRule({
+    await n.executeCommand(_n.id, S), i.setActiveRule({
       unitId: h,
       subUnitId: d,
-      rule: w
+      rule: f
     });
   }, p = () => {
-    n.executeCommand(va.id, {
+    n.executeCommand(Sa.id, {
       unitId: h,
       subUnitId: d
     });
-  }, R = ((w) => {
-    const I = o.getCurrentUnitForType(X.UNIVER_SHEET), V = I.getActiveSheet(), _ = I.getUnitId(), S = V.getSheetId();
-    return w.map((y) => ma(a, _, S, y.ranges) ? { ...y } : { ...y, disable: !0 });
-  })(s), f = R == null ? void 0 : R.some((w) => w.disable);
-  return /* @__PURE__ */ j("div", { className: he.dataValidationList, children: [
-    R == null ? void 0 : R.map((w) => {
-      var I;
-      return /* @__PURE__ */ m(
-        Bi,
+  }, w = ((f) => {
+    const S = o.getCurrentUnitForType(X.UNIVER_SHEET), V = S.getActiveSheet(), C = S.getUnitId(), I = V.getSheetId();
+    return f.map((y) => ma(a, C, I, y.ranges) ? { ...y } : { ...y, disable: !0 });
+  })(s), m = w == null ? void 0 : w.some((f) => f.disable);
+  return /* @__PURE__ */ Y("div", { className: he.dataValidationList, children: [
+    w == null ? void 0 : w.map((f) => {
+      var S;
+      return /* @__PURE__ */ g(
+        Wi,
         {
           unitId: h,
           subUnitId: d,
           onClick: () => {
-            w.disable || i.setActiveRule({
+            f.disable || i.setActiveRule({
               unitId: h,
               subUnitId: d,
-              rule: w
+              rule: f
             });
           },
-          rule: w,
-          disable: (I = w.disable) != null ? I : !1
+          rule: f,
+          disable: (S = f.disable) != null ? S : !1
         },
-        w.uid
+        f.uid
       );
     }),
-    /* @__PURE__ */ j("div", { className: he.dataValidationListButtons, children: [
-      s.length && !f ? /* @__PURE__ */ m(Ut, { className: he.dataValidationListButton, onClick: p, children: r.t("dataValidation.panel.removeAll") }) : null,
-      /* @__PURE__ */ m(Ut, { className: he.dataValidationListButton, type: "primary", onClick: v, children: r.t("dataValidation.panel.add") })
+    /* @__PURE__ */ Y("div", { className: he.dataValidationListButtons, children: [
+      s.length && !m ? /* @__PURE__ */ g(Bt, { className: he.dataValidationListButton, onClick: p, children: r.t("dataValidation.panel.removeAll") }) : null,
+      /* @__PURE__ */ g(Bt, { className: he.dataValidationListButton, type: "primary", onClick: _, children: r.t("dataValidation.panel.add") })
     ] })
   ] });
 }
-const Yi = () => {
-  const t = L(gt), e = $t(t.activeRule$, t.activeRule);
-  return e ? /* @__PURE__ */ m(Ai, {}, e.rule.uid) : /* @__PURE__ */ m(xi, {});
-}, yn = "data-validation.list.dropdown", Eo = "data-validation.date.dropdown", ke = {
+const Xi = () => {
+  const t = T(mt), e = St(t.activeRule$, t.activeRule), o = T(vt), n = St(
+    () => o.getCurrentTypeOfUnit$(X.UNIVER_SHEET),
+    void 0,
+    void 0,
+    []
+  ), a = St(() => {
+    var i;
+    return (i = n == null ? void 0 : n.activeSheet$) != null ? i : Ya(null);
+  }, void 0, void 0, []);
+  return !n || !a ? null : e && e.subUnitId === a.getSheetId() ? /* @__PURE__ */ g(Fi, {}, e.rule.uid) : /* @__PURE__ */ g(Yi, { workbook: n });
+}, Vn = "data-validation.list.dropdown", bo = "data-validation.date.dropdown", ke = {
   type: te.COMMAND,
   id: "data-validation.command.addRuleAndOpen",
   handler(t) {
@@ -1073,19 +1075,19 @@ const Yi = () => {
       unitId: s,
       subUnitId: l
     };
-    return r.syncExecuteCommand(_n.id, c) ? (r.syncExecuteCommand(Wt.id, {
+    return r.syncExecuteCommand(_n.id, c) ? (r.syncExecuteCommand(Ht.id, {
       ruleId: i.uid,
       isAdd: !0
     }), !0) : !1;
   }
 };
-var Xi = Object.getOwnPropertyDescriptor, zi = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? Xi(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+var zi = Object.getOwnPropertyDescriptor, Ki = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? zi(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
-}, xt = (t, e) => (o, n) => e(o, n, t);
-const Lt = "SHEET_DATA_VALIDATION_ALERT";
-let de = class extends Dt {
+}, jt = (t, e) => (o, n) => e(o, n, t);
+const Tt = "SHEET_DATA_VALIDATION_ALERT";
+let de = class extends Vt {
   constructor(t, e, o, n, a, i) {
     super(), this._hoverManagerService = t, this._cellAlertManagerService = e, this._univerInstanceService = o, this._localeService = n, this._zenZoneService = a, this._dataValidationModel = i, this._init();
   }
@@ -1093,110 +1095,110 @@ let de = class extends Dt {
     this._initCellAlertPopup(), this._initZenService();
   }
   _initCellAlertPopup() {
-    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(wn(100)).subscribe((t) => {
+    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(In(100)).subscribe((t) => {
       var e;
       if (t) {
         const o = this._univerInstanceService.getUnit(t.location.unitId, X.UNIVER_SHEET), n = o.getSheetBySheetId(t.location.subUnitId);
         if (!n) return;
         const a = this._dataValidationModel.getRuleByLocation(t.location.unitId, t.location.subUnitId, t.location.row, t.location.col);
         if (!a) {
-          this._cellAlertManagerService.removeAlert(Lt);
+          this._cellAlertManagerService.removeAlert(Tt);
           return;
         }
         if (this._dataValidationModel.validator(a, { ...t.location, workbook: o, worksheet: n }) === se.INVALID) {
-          const r = this._cellAlertManagerService.currentAlert.get(Lt), s = (e = r == null ? void 0 : r.alert) == null ? void 0 : e.location;
+          const r = this._cellAlertManagerService.currentAlert.get(Tt), s = (e = r == null ? void 0 : r.alert) == null ? void 0 : e.location;
           if (s && s.row === t.location.row && s.col === t.location.col && s.subUnitId === t.location.subUnitId && s.unitId === t.location.unitId) {
-            this._cellAlertManagerService.removeAlert(Lt);
+            this._cellAlertManagerService.removeAlert(Tt);
             return;
           }
           const l = this._dataValidationModel.getValidator(a.type);
           if (!l) {
-            this._cellAlertManagerService.removeAlert(Lt);
+            this._cellAlertManagerService.removeAlert(Tt);
             return;
           }
           this._cellAlertManagerService.showAlert({
-            type: Ea.ERROR,
+            type: Oa.ERROR,
             title: this._localeService.t("dataValidation.error.title"),
             message: l == null ? void 0 : l.getRuleFinalError(a, t.location),
             location: t.location,
             width: 200,
             height: 74,
-            key: Lt
+            key: Tt
           });
           return;
         }
       }
-      this._cellAlertManagerService.removeAlert(Lt);
+      this._cellAlertManagerService.removeAlert(Tt);
     }));
   }
   _initZenService() {
     this.disposeWithMe(this._zenZoneService.visible$.subscribe((t) => {
-      t && this._cellAlertManagerService.removeAlert(Lt);
+      t && this._cellAlertManagerService.removeAlert(Tt);
     }));
   }
 };
-de = zi([
-  xt(0, E(ya)),
-  xt(1, E(Ma)),
-  xt(2, vt),
-  xt(3, E(Q)),
-  xt(4, mo),
-  xt(5, E(at))
+de = Ki([
+  jt(0, b(Ea)),
+  jt(1, b(ba)),
+  jt(2, vt),
+  jt(3, b(Q)),
+  jt(4, go),
+  jt(5, b(at))
 ], de);
-var Ki = Object.getOwnPropertyDescriptor, Gi = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? Ki(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+var Gi = Object.getOwnPropertyDescriptor, Zi = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? Gi(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
 }, $e = (t, e) => (o, n) => e(o, n, t);
-let Gt = class extends Dt {
+let Gt = class extends Vt {
   constructor(t, e, o) {
     super(), this._autoFillService = t, this._sheetDataValidationModel = e, this._injector = o, this._initAutoFill();
   }
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
     const t = () => ({ redos: [], undos: [] }), e = (n, a) => {
-      const { source: i, target: r, unitId: s, subUnitId: l } = n, c = this._sheetDataValidationModel.getRuleObjectMatrix(s, l).clone(), u = rn([i, r]), [h, d] = u.ranges, { mapFunc: v } = u, p = {
+      const { source: i, target: r, unitId: s, subUnitId: l } = n, c = this._sheetDataValidationModel.getRuleObjectMatrix(s, l).clone(), u = rn([i, r]), [h, d] = u.ranges, { mapFunc: _ } = u, p = {
         row: h.startRow,
         col: h.startColumn
-      }, C = Oa(h, d), R = new Se(), f = /* @__PURE__ */ new Set();
-      C.forEach((S) => {
-        const g = S.repeatStartCell, y = S.relativeRange, T = {
+      }, R = Ta(h, d), w = new Se(), m = /* @__PURE__ */ new Set();
+      R.forEach((I) => {
+        const v = I.repeatStartCell, y = I.relativeRange, P = {
           startRow: p.row,
           startColumn: p.col,
           endColumn: p.col,
           endRow: p.row
-        }, N = {
-          startRow: g.row,
-          startColumn: g.col,
-          endColumn: g.col,
-          endRow: g.row
+        }, U = {
+          startRow: v.row,
+          startColumn: v.col,
+          endColumn: v.col,
+          endRow: v.row
         };
-        qo.foreach(y, (P, b) => {
+        Qo.foreach(y, (O, L) => {
           const A = Ce.getPositionRange(
             {
-              startRow: P,
-              startColumn: b,
-              endColumn: b,
-              endRow: P
+              startRow: O,
+              startColumn: L,
+              endColumn: L,
+              endRow: O
             },
-            T
-          ), { row: k, col: F } = v(A.startRow, A.startColumn), U = this._sheetDataValidationModel.getRuleIdByLocation(s, l, k, F) || "", Y = Ce.getPositionRange(
+            P
+          ), { row: F, col: N } = _(A.startRow, A.startColumn), B = this._sheetDataValidationModel.getRuleIdByLocation(s, l, F, N) || "", x = Ce.getPositionRange(
             {
-              startRow: P,
-              startColumn: b,
-              endColumn: b,
-              endRow: P
+              startRow: O,
+              startColumn: L,
+              endColumn: L,
+              endRow: O
             },
-            N
-          ), { row: z, col: H } = v(Y.startRow, Y.startColumn);
-          R.setValue(z, H, U), f.add(U);
+            U
+          ), { row: z, col: H } = _(x.startRow, x.startColumn);
+          w.setValue(z, H, B), m.add(B);
         });
       });
-      const w = Array.from(f).map((S) => ({ id: S, ranges: Je(R, (g) => g === S) }));
-      c.addRangeRules(w);
-      const I = c.diff(this._sheetDataValidationModel.getRules(s, l)), { redoMutations: V, undoMutations: _ } = on(s, l, I, this._injector, "patched", a === oe.ONLY_FORMAT);
+      const f = Array.from(m).map((I) => ({ id: I, ranges: Je(w, (v) => v === I) }));
+      c.addRangeRules(f);
+      const S = c.diff(this._sheetDataValidationModel.getRules(s, l)), { redoMutations: V, undoMutations: C } = on(s, l, S, this._injector, "patched", a === oe.ONLY_FORMAT);
       return {
-        undos: _,
+        undos: C,
         redos: V
       };
     }, o = {
@@ -1219,20 +1221,20 @@ let Gt = class extends Dt {
     this.disposeWithMe(this._autoFillService.addHook(o));
   }
 };
-Gt = Gi([
-  $e(0, ba),
-  $e(1, E(at)),
-  $e(2, E(Bt))
+Gt = Zi([
+  $e(0, La),
+  $e(1, b(at)),
+  $e(2, b(Wt))
 ], Gt);
-var Zi = Object.getOwnPropertyDescriptor, qi = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? Zi(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+var qi = Object.getOwnPropertyDescriptor, Ji = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? qi(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
 }, We = (t, e) => (o, n) => e(o, n, t);
-let Zt = class extends Dt {
+let Zt = class extends Vt {
   constructor(e, o, n) {
     super();
-    M(this, "_copyInfo");
+    E(this, "_copyInfo");
     this._sheetClipboardService = e, this._sheetDataValidationModel = o, this._injector = n, this._initCopyPaste();
   }
   _initCopyPaste() {
@@ -1240,7 +1242,7 @@ let Zt = class extends Dt {
       id: lo,
       onBeforeCopy: (e, o, n) => this._collect(e, o, n),
       onPasteCells: (e, o, n, a) => {
-        const { copyType: i = Tn.COPY, pasteType: r } = a, { range: s } = e || {}, { range: l, unitId: c, subUnitId: u } = o;
+        const { copyType: i = Ln.COPY, pasteType: r } = a, { range: s } = e || {}, { range: l, unitId: c, subUnitId: u } = o;
         return this._generateMutations(l, { copyType: i, pasteType: r, copyRange: s, unitId: c, subUnitId: u });
       }
     });
@@ -1252,7 +1254,7 @@ let Zt = class extends Dt {
       subUnitId: o,
       matrix: a
     };
-    const i = this._injector.invoke((l) => Ta(n, l, e, o));
+    const i = this._injector.invoke((l) => fa(n, l, e, o));
     if (!i)
       return;
     const { rows: r, cols: s } = i;
@@ -1267,7 +1269,7 @@ let Zt = class extends Dt {
   _generateMutations(e, o) {
     if (!this._copyInfo)
       return { redos: [], undos: [] };
-    if (o.copyType === Tn.CUT)
+    if (o.copyType === Ln.CUT)
       return this._copyInfo = null, { redos: [], undos: [] };
     if (!this._copyInfo || !this._copyInfo.matrix.getSizeOf() || !o.copyRange)
       return { redos: [], undos: [] };
@@ -1280,58 +1282,58 @@ let Zt = class extends Dt {
       return { redos: [], undos: [] };
     const { unitId: a, subUnitId: i } = this._copyInfo;
     if (o.unitId !== a || i !== o.subUnitId) {
-      const r = this._sheetDataValidationModel.getRuleObjectMatrix(o.unitId, o.subUnitId).clone(), s = new Se(), l = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = rn([o.copyRange, e]), d = Pn(c, u, !0), v = /* @__PURE__ */ new Map();
-      d.forEach(({ startRange: f }) => {
-        var w;
-        (w = this._copyInfo) == null || w.matrix.forValue((I, V, _) => {
-          const S = Ce.getPositionRange(
+      const r = this._sheetDataValidationModel.getRuleObjectMatrix(o.unitId, o.subUnitId).clone(), s = new Se(), l = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = rn([o.copyRange, e]), d = Tn(c, u, !0), _ = /* @__PURE__ */ new Map();
+      d.forEach(({ startRange: m }) => {
+        var f;
+        (f = this._copyInfo) == null || f.matrix.forValue((S, V, C) => {
+          const I = Ce.getPositionRange(
             {
-              startRow: I,
-              endRow: I,
+              startRow: S,
+              endRow: S,
               startColumn: V,
               endColumn: V
             },
-            f
-          ), g = `${i}-${_}`, y = this._sheetDataValidationModel.getRuleById(a, i, _);
-          !this._sheetDataValidationModel.getRuleById(o.unitId, o.subUnitId, g) && y && v.set(g, { ...y, uid: g });
-          const { row: T, col: N } = h(S.startRow, S.startColumn);
-          l.add(g), s.setValue(T, N, g);
+            m
+          ), v = `${i}-${C}`, y = this._sheetDataValidationModel.getRuleById(a, i, C);
+          !this._sheetDataValidationModel.getRuleById(o.unitId, o.subUnitId, v) && y && _.set(v, { ...y, uid: v });
+          const { row: P, col: U } = h(I.startRow, I.startColumn);
+          l.add(v), s.setValue(P, U, v);
         });
       });
-      const p = Array.from(l).map((f) => ({ id: f, ranges: Je(s, (w) => w === f) }));
+      const p = Array.from(l).map((m) => ({ id: m, ranges: Je(s, (f) => f === m) }));
       r.addRangeRules(p);
-      const { redoMutations: C, undoMutations: R } = on(
+      const { redoMutations: R, undoMutations: w } = on(
         o.unitId,
         o.subUnitId,
-        r.diffWithAddition(this._sheetDataValidationModel.getRules(o.unitId, o.subUnitId), v.values()),
+        r.diffWithAddition(this._sheetDataValidationModel.getRules(o.unitId, o.subUnitId), _.values()),
         this._injector,
         "patched",
         !1
       );
       return {
-        redos: C,
-        undos: R
+        redos: R,
+        undos: w
       };
     } else {
       const r = this._sheetDataValidationModel.getRuleObjectMatrix(a, i).clone(), s = new Se(), l = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = rn([o.copyRange, e]);
-      Pn(c, u, !0).forEach(({ startRange: R }) => {
-        var f;
-        (f = this._copyInfo) == null || f.matrix.forValue((w, I, V) => {
-          const _ = Ce.getPositionRange(
+      Tn(c, u, !0).forEach(({ startRange: w }) => {
+        var m;
+        (m = this._copyInfo) == null || m.matrix.forValue((f, S, V) => {
+          const C = Ce.getPositionRange(
             {
-              startRow: w,
-              endRow: w,
-              startColumn: I,
-              endColumn: I
+              startRow: f,
+              endRow: f,
+              startColumn: S,
+              endColumn: S
             },
-            R
-          ), { row: S, col: g } = h(_.startRow, _.startColumn);
-          s.setValue(S, g, V), l.add(V);
+            w
+          ), { row: I, col: v } = h(C.startRow, C.startColumn);
+          s.setValue(I, v, V), l.add(V);
         });
       });
-      const v = Array.from(l).map((R) => ({ id: R, ranges: Je(s, (f) => f === R) }));
-      r.addRangeRules(v);
-      const { redoMutations: p, undoMutations: C } = on(
+      const _ = Array.from(l).map((w) => ({ id: w, ranges: Je(s, (m) => m === w) }));
+      r.addRangeRules(_);
+      const { redoMutations: p, undoMutations: R } = on(
         a,
         i,
         r.diff(this._sheetDataValidationModel.getRules(a, i)),
@@ -1341,22 +1343,22 @@ let Zt = class extends Dt {
       );
       return {
         redos: p,
-        undos: C
+        undos: R
       };
     }
   }
 };
-Zt = qi([
-  We(0, La),
-  We(1, E(at)),
-  We(2, E(Bt))
+Zt = Ji([
+  We(0, Pa),
+  We(1, b(at)),
+  We(2, b(Wt))
 ], Zt);
-var Ji = Object.getOwnPropertyDescriptor, Qi = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? Ji(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+var Qi = Object.getOwnPropertyDescriptor, tr = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? Qi(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
 }, He = (t, e) => (o, n) => e(o, n, t);
-let qt = class extends Dt {
+let qt = class extends Vt {
   constructor(t, e, o) {
     super(), this._localeService = t, this._commandService = e, this._sheetPermissionCheckController = o, this._commandExecutedListener();
   }
@@ -1376,69 +1378,69 @@ let qt = class extends Dt {
     );
   }
 };
-qt = Qi([
-  He(0, E(Q)),
+qt = tr([
+  He(0, b(Q)),
   He(1, tt),
-  He(2, E(to))
+  He(2, b(to))
 ], qt);
-const bo = "data-validation-single", Oo = "sheet.menu.data-validation";
-function tr(t) {
+const Oo = "data-validation-single", Lo = "sheet.menu.data-validation";
+function er(t) {
   return {
-    id: Oo,
-    type: Cn.SUBITEMS,
-    icon: bo,
+    id: Lo,
+    type: Sn.SUBITEMS,
+    icon: Oo,
     tooltip: "dataValidation.title",
-    hidden$: Fa(t, X.UNIVER_SHEET),
-    disabled$: Pa(t, { workbookTypes: [Re], worksheetTypes: [nn, Ie], rangeTypes: [we] })
+    hidden$: Na(t, X.UNIVER_SHEET),
+    disabled$: Aa(t, { workbookTypes: [Re], worksheetTypes: [nn, Ie], rangeTypes: [we] })
   };
 }
-function er(t) {
+function nr(t) {
   return {
-    id: Wt.id,
+    id: Ht.id,
     title: "dataValidation.panel.title",
-    type: Cn.BUTTON
+    type: Sn.BUTTON
   };
 }
-function nr(t) {
+function or(t) {
   return {
     id: ke.id,
     title: "dataValidation.panel.add",
-    type: Cn.BUTTON
+    type: Sn.BUTTON
   };
 }
-const or = {
-  [Na.FORMULAS_INSERT]: {
-    [Oo]: {
+const ar = {
+  [Ua.FORMULAS_INSERT]: {
+    [Lo]: {
       order: 9,
-      menuItemFactory: tr,
-      [Wt.id]: {
+      menuItemFactory: er,
+      [Ht.id]: {
         order: 0,
-        menuItemFactory: er
+        menuItemFactory: nr
       },
       [ke.id]: {
         order: 1,
-        menuItemFactory: nr
+        menuItemFactory: or
       }
     }
   }
 };
-var ar = Object.getOwnPropertyDescriptor, Lo = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? ar(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+var ir = Object.getOwnPropertyDescriptor, To = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? ir(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
 }, Z = (t, e) => (o, n) => e(o, n, t);
-const To = {
+const Po = {
   tr: {
     size: 6,
     color: "#fe4b4b"
   }
 };
-let Jt = class extends mn {
+let Jt = class extends gn {
   constructor(t, e, o, n, a, i, r, s, l, c, u) {
     super(), this._commandService = t, this._menuManagerService = e, this._renderManagerService = o, this._univerInstanceService = n, this._autoHeightController = a, this._dropdownManagerService = i, this._sheetDataValidationModel = r, this._dataValidatorRegistryService = s, this._sheetInterceptorService = l, this._dataValidationCacheService = c, this._editorBridgeService = u, this._initMenu(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
   }
   _initMenu() {
-    this._menuManagerService.mergeMenu(or);
+    this._menuManagerService.mergeMenu(ar);
   }
   _initDropdown() {
     this._editorBridgeService && this.disposeWithMe(this._editorBridgeService.visible$.subscribe((t) => {
@@ -1494,58 +1496,58 @@ let Jt = class extends mn {
           priority: no.DATA_VALIDATION,
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: (t, e, o) => {
-            var f, w, I, V, _;
+            var m, f, S, V, C;
             const { row: n, col: a, unitId: i, subUnitId: r, workbook: s, worksheet: l } = e, c = this._sheetDataValidationModel.getRuleIdByLocation(i, r, n, a);
             if (!c)
               return o(t);
             const u = this._sheetDataValidationModel.getRuleById(i, r, c);
             if (!u)
               return o(t);
-            const h = (f = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? f : se.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), v = e.rawData;
+            const h = (m = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? m : se.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), _ = e.rawData;
             let p;
-            const C = {
+            const R = {
               get value() {
-                var S;
-                return p !== void 0 || (p = (S = rt(v)) != null ? S : null), p;
+                var I;
+                return p !== void 0 || (p = (I = rt(_)) != null ? I : null), p;
               }
-            }, R = {
+            }, w = {
               get value() {
-                var S;
-                return `${(S = C.value) != null ? S : ""}`;
+                var I;
+                return `${(I = R.value) != null ? I : ""}`;
               }
             };
             return o({
               ...t,
               markers: {
                 ...t == null ? void 0 : t.markers,
-                ...h === se.INVALID ? To : null
+                ...h === se.INVALID ? Po : null
               },
               customRender: [
-                ...(w = t == null ? void 0 : t.customRender) != null ? w : [],
+                ...(f = t == null ? void 0 : t.customRender) != null ? f : [],
                 ...d != null && d.canvasRender ? [d.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...t == null ? void 0 : t.fontRenderExtension,
-                isSkip: ((I = t == null ? void 0 : t.fontRenderExtension) == null ? void 0 : I.isSkip) || ((V = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : V.call(d, u, C.value, e))
+                isSkip: ((S = t == null ? void 0 : t.fontRenderExtension) == null ? void 0 : S.isSkip) || ((V = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : V.call(d, u, R.value, e))
               },
               interceptorStyle: {
                 ...t == null ? void 0 : t.interceptorStyle,
-                ...d == null ? void 0 : d.getExtraStyle(u, R.value, {
+                ...d == null ? void 0 : d.getExtraStyle(u, w.value, {
                   get style() {
-                    const S = s.getStyles();
-                    return (typeof (t == null ? void 0 : t.s) == "string" ? S.get(t == null ? void 0 : t.s) : t == null ? void 0 : t.s) || {};
+                    const I = s.getStyles();
+                    return (typeof (t == null ? void 0 : t.s) == "string" ? I.get(t == null ? void 0 : t.s) : t == null ? void 0 : t.s) || {};
                   }
                 }, n, a)
               },
               interceptorAutoHeight: () => {
-                var T, N, P, b, A, k;
-                const S = (N = (T = this._renderManagerService.getRenderById(i)) == null ? void 0 : T.with(De).getSkeletonParam(r)) == null ? void 0 : N.skeleton;
-                if (!S)
+                var P, U, O, L, A, F;
+                const I = (U = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(De).getSkeletonParam(r)) == null ? void 0 : U.skeleton;
+                if (!I)
                   return;
-                const g = S.worksheet.getMergedCell(n, a), y = {
+                const v = I.worksheet.getMergedCell(n, a), y = {
                   data: t,
-                  style: S.getStyles().getStyleByCell(t),
-                  primaryWithCoord: S.getCellWithCoordByIndex((P = g == null ? void 0 : g.startRow) != null ? P : n, (b = g == null ? void 0 : g.startColumn) != null ? b : a),
+                  style: I.getStyles().getStyleByCell(t),
+                  primaryWithCoord: I.getCellWithCoordByIndex((O = v == null ? void 0 : v.startRow) != null ? O : n, (L = v == null ? void 0 : v.startColumn) != null ? L : a),
                   unitId: i,
                   subUnitId: r,
                   row: n,
@@ -1553,17 +1555,17 @@ let Jt = class extends mn {
                   workbook: s,
                   worksheet: l
                 };
-                return (k = (A = d == null ? void 0 : d.canvasRender) == null ? void 0 : A.calcCellAutoHeight) == null ? void 0 : k.call(A, y);
+                return (F = (A = d == null ? void 0 : d.canvasRender) == null ? void 0 : A.calcCellAutoHeight) == null ? void 0 : F.call(A, y);
               },
               interceptorAutoWidth: () => {
-                var T, N, P, b, A, k;
-                const S = (N = (T = this._renderManagerService.getRenderById(i)) == null ? void 0 : T.with(De).getSkeletonParam(r)) == null ? void 0 : N.skeleton;
-                if (!S)
+                var P, U, O, L, A, F;
+                const I = (U = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(De).getSkeletonParam(r)) == null ? void 0 : U.skeleton;
+                if (!I)
                   return;
-                const g = S.worksheet.getMergedCell(n, a), y = {
+                const v = I.worksheet.getMergedCell(n, a), y = {
                   data: t,
-                  style: S.getStyles().getStyleByCell(t),
-                  primaryWithCoord: S.getCellWithCoordByIndex((P = g == null ? void 0 : g.startRow) != null ? P : n, (b = g == null ? void 0 : g.startColumn) != null ? b : a),
+                  style: I.getStyles().getStyleByCell(t),
+                  primaryWithCoord: I.getCellWithCoordByIndex((O = v == null ? void 0 : v.startRow) != null ? O : n, (L = v == null ? void 0 : v.startColumn) != null ? L : a),
                   unitId: i,
                   subUnitId: r,
                   row: n,
@@ -1571,9 +1573,9 @@ let Jt = class extends mn {
                   workbook: s,
                   worksheet: l
                 };
-                return (k = (A = d == null ? void 0 : d.canvasRender) == null ? void 0 : A.calcCellAutoWidth) == null ? void 0 : k.call(A, y);
+                return (F = (A = d == null ? void 0 : d.canvasRender) == null ? void 0 : A.calcCellAutoWidth) == null ? void 0 : F.call(A, y);
               },
-              coverable: ((_ = t == null ? void 0 : t.coverable) != null ? _ : !0) && !(u.type === K.LIST || u.type === K.LIST_MULTIPLE)
+              coverable: ((C = t == null ? void 0 : t.coverable) != null ? C : !0) && !(u.type === K.LIST || u.type === K.LIST_MULTIPLE)
             });
           }
         }
@@ -1584,8 +1586,8 @@ let Jt = class extends mn {
     this._sheetDataValidationModel.ruleChange$.pipe(
       // patched data-validation change don't need to re-calc row height
       // re-calc of row height will be triggered precisely by the origin command
-      In((t) => t.source === "command"),
-      go(100)
+      Cn((t) => t.source === "command"),
+      fo(100)
     ).subscribe((t) => {
       if (t.length === 0)
         return;
@@ -1600,20 +1602,20 @@ let Jt = class extends mn {
     });
   }
 };
-Jt = Lo([
+Jt = To([
   Z(0, tt),
-  Z(1, Ua),
-  Z(2, Vt),
+  Z(1, Ba),
+  Z(2, yt),
   Z(3, vt),
-  Z(4, E(ho)),
-  Z(5, E(Rt)),
-  Z(6, E(at)),
-  Z(7, E(Et)),
-  Z(8, E(fn)),
-  Z(9, E(co)),
-  Z(10, Jo(uo))
+  Z(4, b(ho)),
+  Z(5, b(Dt)),
+  Z(6, b(at)),
+  Z(7, b(bt)),
+  Z(8, b(fn)),
+  Z(9, b(co)),
+  Z(10, ta(uo))
 ], Jt);
-let $n = class extends mn {
+let Bn = class extends gn {
   constructor(t, e, o, n, a, i, r) {
     super(), this._commandService = t, this._renderManagerService = e, this._autoHeightController = o, this._dataValidatorRegistryService = n, this._sheetInterceptorService = a, this._sheetDataValidationModel = i, this._dataValidationCacheService = r, this._initViewModelIntercept(), this._initAutoHeight();
   }
@@ -1627,46 +1629,46 @@ let $n = class extends mn {
           priority: no.DATA_VALIDATION,
           // eslint-disable-next-line complexity
           handler: (t, e, o) => {
-            var R, f, w, I, V;
+            var w, m, f, S, V;
             const { row: n, col: a, unitId: i, subUnitId: r, workbook: s, worksheet: l } = e, c = this._sheetDataValidationModel.getRuleIdByLocation(i, r, n, a);
             if (!c)
               return o(t);
             const u = this._sheetDataValidationModel.getRuleById(i, r, c);
             if (!u)
               return o(t);
-            const h = (R = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? R : se.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), v = l.getCellRaw(n, a), p = rt(v), C = `${p != null ? p : ""}`;
+            const h = (w = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? w : se.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), _ = l.getCellRaw(n, a), p = rt(_), R = `${p != null ? p : ""}`;
             return o({
               ...t,
               markers: {
                 ...t == null ? void 0 : t.markers,
-                ...h === se.INVALID ? To : null
+                ...h === se.INVALID ? Po : null
               },
               customRender: [
-                ...(f = t == null ? void 0 : t.customRender) != null ? f : [],
+                ...(m = t == null ? void 0 : t.customRender) != null ? m : [],
                 ...d != null && d.canvasRender ? [d.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...t == null ? void 0 : t.fontRenderExtension,
-                isSkip: ((w = t == null ? void 0 : t.fontRenderExtension) == null ? void 0 : w.isSkip) || ((I = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : I.call(d, u, p, e))
+                isSkip: ((f = t == null ? void 0 : t.fontRenderExtension) == null ? void 0 : f.isSkip) || ((S = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : S.call(d, u, p, e))
               },
               interceptorStyle: {
                 ...t == null ? void 0 : t.interceptorStyle,
-                ...d == null ? void 0 : d.getExtraStyle(u, C, {
+                ...d == null ? void 0 : d.getExtraStyle(u, R, {
                   get style() {
-                    const _ = s.getStyles();
-                    return (typeof (t == null ? void 0 : t.s) == "string" ? _.get(t == null ? void 0 : t.s) : t == null ? void 0 : t.s) || {};
+                    const C = s.getStyles();
+                    return (typeof (t == null ? void 0 : t.s) == "string" ? C.get(t == null ? void 0 : t.s) : t == null ? void 0 : t.s) || {};
                   }
                 }, n, a)
               },
               interceptorAutoHeight: () => {
-                var y, T, N, P, b, A;
-                const _ = (T = (y = this._renderManagerService.getRenderById(i)) == null ? void 0 : y.with(De).getSkeletonParam(r)) == null ? void 0 : T.skeleton;
-                if (!_)
+                var y, P, U, O, L, A;
+                const C = (P = (y = this._renderManagerService.getRenderById(i)) == null ? void 0 : y.with(De).getSkeletonParam(r)) == null ? void 0 : P.skeleton;
+                if (!C)
                   return;
-                const S = _.worksheet.getMergedCell(n, a), g = {
+                const I = C.worksheet.getMergedCell(n, a), v = {
                   data: t,
-                  style: _.getStyles().getStyleByCell(t),
-                  primaryWithCoord: _.getCellWithCoordByIndex((N = S == null ? void 0 : S.startRow) != null ? N : n, (P = S == null ? void 0 : S.startColumn) != null ? P : a),
+                  style: C.getStyles().getStyleByCell(t),
+                  primaryWithCoord: C.getCellWithCoordByIndex((U = I == null ? void 0 : I.startRow) != null ? U : n, (O = I == null ? void 0 : I.startColumn) != null ? O : a),
                   unitId: i,
                   subUnitId: r,
                   row: n,
@@ -1674,7 +1676,7 @@ let $n = class extends mn {
                   workbook: s,
                   worksheet: l
                 };
-                return (A = (b = d == null ? void 0 : d.canvasRender) == null ? void 0 : b.calcCellAutoHeight) == null ? void 0 : A.call(b, g);
+                return (A = (L = d == null ? void 0 : d.canvasRender) == null ? void 0 : L.calcCellAutoHeight) == null ? void 0 : A.call(L, v);
               },
               coverable: ((V = t == null ? void 0 : t.coverable) != null ? V : !0) && !(u.type === K.LIST || u.type === K.LIST_MULTIPLE)
             });
@@ -1685,8 +1687,8 @@ let $n = class extends mn {
   }
   _initAutoHeight() {
     this._sheetDataValidationModel.ruleChange$.pipe(
-      In((t) => t.source === "command"),
-      go(16)
+      Cn((t) => t.source === "command"),
+      fo(16)
     ).subscribe((t) => {
       const e = [];
       if (t.forEach((o) => {
@@ -1699,21 +1701,21 @@ let $n = class extends mn {
     });
   }
 };
-$n = Lo([
+Bn = To([
   Z(0, tt),
-  Z(1, Vt),
-  Z(2, E(ho)),
-  Z(3, E(Et)),
-  Z(4, E(fn)),
-  Z(5, E(at)),
-  Z(6, E(co))
-], $n);
-var ir = Object.getOwnPropertyDescriptor, rr = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? ir(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+  Z(1, yt),
+  Z(2, b(ho)),
+  Z(3, b(bt)),
+  Z(4, b(fn)),
+  Z(5, b(at)),
+  Z(6, b(co))
+], Bn);
+var rr = Object.getOwnPropertyDescriptor, sr = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? rr(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
-}, Wn = (t, e) => (o, n) => e(o, n, t);
-let Me = class extends Dt {
+}, $n = (t, e) => (o, n) => e(o, n, t);
+let Me = class extends Vt {
   constructor(t, e, o) {
     super(), this._context = t, this._sheetDataValidationModel = e, this._sheetSkeletonManagerService = o, this._initSkeletonChange();
   }
@@ -1730,28 +1732,28 @@ let Me = class extends Dt {
         (i = this._sheetSkeletonManagerService.getSkeletonParam(a)) == null || i.skeleton.makeDirty(!0);
       }), (n = this._context.mainComponent) == null || n.makeForceDirty();
     };
-    this.disposeWithMe(this._sheetDataValidationModel.validStatusChange$.pipe(Qo(16)).subscribe(t));
+    this.disposeWithMe(this._sheetDataValidationModel.validStatusChange$.pipe(ea(16)).subscribe(t));
   }
 };
-Me = rr([
-  Wn(1, E(at)),
-  Wn(2, E(De))
+Me = sr([
+  $n(1, b(at)),
+  $n(2, b(De))
 ], Me);
-const sr = "univer-data-validation-formula", lr = "univer-data-validation-formula-and", dr = "univer-data-validation-formula-list-item", cr = "univer-data-validation-formula-list-item-icon", ur = "univer-data-validation-formula-list-item-drag", hr = "univer-data-validation-formula-list-add", pr = "univer-data-validation-formula-color-select", mr = "univer-data-validation-formula-color-select-panel", gr = "univer-data-validation-formula-color-item", ot = {
-  dataValidationFormula: sr,
-  dataValidationFormulaAnd: lr,
-  dataValidationFormulaListItem: dr,
-  dataValidationFormulaListItemIcon: cr,
-  dataValidationFormulaListItemDrag: ur,
-  dataValidationFormulaListAdd: hr,
-  dataValidationFormulaColorSelect: pr,
+const lr = "univer-data-validation-formula", dr = "univer-data-validation-formula-and", cr = "univer-data-validation-formula-list-item", ur = "univer-data-validation-formula-list-item-icon", hr = "univer-data-validation-formula-list-item-drag", pr = "univer-data-validation-formula-list-add", gr = "univer-data-validation-formula-color-select", mr = "univer-data-validation-formula-color-select-panel", fr = "univer-data-validation-formula-color-item", ot = {
+  dataValidationFormula: lr,
+  dataValidationFormulaAnd: dr,
+  dataValidationFormulaListItem: cr,
+  dataValidationFormulaListItemIcon: ur,
+  dataValidationFormulaListItemDrag: hr,
+  dataValidationFormulaListAdd: pr,
+  dataValidationFormulaColorSelect: gr,
   dataValidationFormulaColorSelectPanel: mr,
-  dataValidationFormulaColorItem: gr
-}, fr = (t) => {
-  const { isTwoFormula: e = !1, value: o, onChange: n, showError: a, validResult: i } = t, r = L(Q), s = a ? i == null ? void 0 : i.formula1 : "", l = a ? i == null ? void 0 : i.formula2 : "";
-  return e ? /* @__PURE__ */ j(wt, { children: [
-    /* @__PURE__ */ m(q, { error: s, children: /* @__PURE__ */ m(
-      Nt,
+  dataValidationFormulaColorItem: fr
+}, vr = (t) => {
+  const { isTwoFormula: e = !1, value: o, onChange: n, showError: a, validResult: i } = t, r = T(Q), s = a ? i == null ? void 0 : i.formula1 : "", l = a ? i == null ? void 0 : i.formula2 : "";
+  return e ? /* @__PURE__ */ Y(Rt, { children: [
+    /* @__PURE__ */ g(q, { error: s, children: /* @__PURE__ */ g(
+      Ut,
       {
         className: ot.dataValidationFormula,
         placeholder: r.t("dataValidation.panel.formulaPlaceholder"),
@@ -1764,9 +1766,9 @@ const sr = "univer-data-validation-formula", lr = "univer-data-validation-formul
         }
       }
     ) }),
-    /* @__PURE__ */ m("div", { className: ot.dataValidationFormulaAnd, children: r.t("dataValidation.panel.formulaAnd") }),
-    /* @__PURE__ */ m(q, { error: l, children: /* @__PURE__ */ m(
-      Nt,
+    /* @__PURE__ */ g("div", { className: ot.dataValidationFormulaAnd, children: r.t("dataValidation.panel.formulaAnd") }),
+    /* @__PURE__ */ g(q, { error: l, children: /* @__PURE__ */ g(
+      Ut,
       {
         className: ot.dataValidationFormula,
         placeholder: r.t("dataValidation.panel.formulaPlaceholder"),
@@ -1779,8 +1781,8 @@ const sr = "univer-data-validation-formula", lr = "univer-data-validation-formul
         }
       }
     ) })
-  ] }) : /* @__PURE__ */ m(q, { error: s, children: /* @__PURE__ */ m(
-    Nt,
+  ] }) : /* @__PURE__ */ g(q, { error: s, children: /* @__PURE__ */ g(
+    Ut,
     {
       className: ot.dataValidationFormula,
       placeholder: r.t("dataValidation.panel.formulaPlaceholder"),
@@ -1791,10 +1793,10 @@ const sr = "univer-data-validation-formula", lr = "univer-data-validation-formul
     }
   ) });
 };
-function vr(t) {
-  const { value: e, onChange: o, showError: n, validResult: a } = t, i = L(Q), r = n ? a == null ? void 0 : a.formula1 : "", s = n ? a == null ? void 0 : a.formula2 : "", [l, c] = x(!((e == null ? void 0 : e.formula1) === void 0 && (e == null ? void 0 : e.formula2) === void 0));
-  return /* @__PURE__ */ j(wt, { children: [
-    /* @__PURE__ */ m(q, { children: /* @__PURE__ */ m(
+function _r(t) {
+  const { value: e, onChange: o, showError: n, validResult: a } = t, i = T(Q), r = n ? a == null ? void 0 : a.formula1 : "", s = n ? a == null ? void 0 : a.formula2 : "", [l, c] = j(!((e == null ? void 0 : e.formula1) === void 0 && (e == null ? void 0 : e.formula2) === void 0));
+  return /* @__PURE__ */ Y(Rt, { children: [
+    /* @__PURE__ */ g(q, { children: /* @__PURE__ */ g(
       Le,
       {
         checked: l,
@@ -1808,8 +1810,8 @@ function vr(t) {
         children: i.t("dataValidation.checkbox.tips")
       }
     ) }),
-    l ? /* @__PURE__ */ m(q, { label: i.t("dataValidation.checkbox.checked"), error: r, children: /* @__PURE__ */ m(
-      Nt,
+    l ? /* @__PURE__ */ g(q, { label: i.t("dataValidation.checkbox.checked"), error: r, children: /* @__PURE__ */ g(
+      Ut,
       {
         className: ot.dataValidationFormula,
         placeholder: i.t("dataValidation.panel.valuePlaceholder"),
@@ -1822,8 +1824,8 @@ function vr(t) {
         }
       }
     ) }) : null,
-    l ? /* @__PURE__ */ m(q, { label: i.t("dataValidation.checkbox.unchecked"), error: s, children: /* @__PURE__ */ m(
-      Nt,
+    l ? /* @__PURE__ */ g(q, { label: i.t("dataValidation.checkbox.unchecked"), error: s, children: /* @__PURE__ */ g(
+      Ut,
       {
         className: ot.dataValidationFormula,
         placeholder: i.t("dataValidation.panel.valuePlaceholder"),
@@ -1838,25 +1840,25 @@ function vr(t) {
     ) }) : null
   ] });
 }
-function _r(t) {
+function Sr(t) {
   var h;
-  const { unitId: e, subUnitId: o, value: n, onChange: a, showError: i, validResult: r } = t, s = i ? r == null ? void 0 : r.formula1 : void 0, l = zt({}), [c, u] = x(!1);
-  return Sn((d) => {
+  const { unitId: e, subUnitId: o, value: n, onChange: a, showError: i, validResult: r } = t, s = i ? r == null ? void 0 : r.formula1 : void 0, l = Kt({}), [c, u] = j(!1);
+  return mo((d) => {
     var p;
-    const v = (p = l.current) == null ? void 0 : p.handleOutClick;
-    v && v(d, () => u(!1));
-  }), /* @__PURE__ */ m(
-    vo,
+    const _ = (p = l.current) == null ? void 0 : p.handleOutClick;
+    _ && _(d, () => u(!1));
+  }), /* @__PURE__ */ g(
+    _o,
     {
       initValue: (h = n == null ? void 0 : n.formula1) != null ? h : "=",
       unitId: e,
       subUnitId: o,
       isFocus: c,
       onChange: (d) => {
-        const v = (d != null ? d : "").trim();
-        v !== (n == null ? void 0 : n.formula1) && (a == null || a({
+        const _ = (d != null ? d : "").trim();
+        _ !== (n == null ? void 0 : n.formula1) && (a == null || a({
           ...n,
-          formula1: v
+          formula1: _
         }));
       },
       errorText: s,
@@ -1866,20 +1868,20 @@ function _r(t) {
     }
   );
 }
-function Po(t) {
+function Ao(t) {
   var e, o, n = "";
   if (typeof t == "string" || typeof t == "number") n += t;
   else if (typeof t == "object") if (Array.isArray(t)) {
     var a = t.length;
-    for (e = 0; e < a; e++) t[e] && (o = Po(t[e])) && (n && (n += " "), n += o);
+    for (e = 0; e < a; e++) t[e] && (o = Ao(t[e])) && (n && (n += " "), n += o);
   } else for (o in t) t[o] && (n && (n += " "), n += o);
   return n;
 }
-function Sr() {
-  for (var t, e, o = 0, n = "", a = arguments.length; o < a; o++) (t = arguments[o]) && (e = Po(t)) && (n && (n += " "), n += e);
+function Cr() {
+  for (var t, e, o = 0, n = "", a = arguments.length; o < a; o++) (t = arguments[o]) && (e = Ao(t)) && (n && (n += " "), n += e);
   return n;
 }
-const Cr = [
+const Ir = [
   "#FFFFFF",
   "#FEE7E7",
   "#FEF0E6",
@@ -1904,9 +1906,9 @@ const Cr = [
   "#3A60F7",
   "#9E6DE3",
   "#F248A6"
-], Ir = (t) => {
-  const { value: e, onChange: o, disabled: n } = t, [a, i] = x(!1);
-  return /* @__PURE__ */ m(
+], wr = (t) => {
+  const { value: e, onChange: o, disabled: n } = t, [a, i] = j(!1);
+  return /* @__PURE__ */ g(
     tn,
     {
       disabled: n,
@@ -1917,15 +1919,15 @@ const Cr = [
       className: ot.dataValidationFormulaColorSelect,
       value: e,
       onChange: o,
-      labelRender: (r) => /* @__PURE__ */ m(
+      labelRender: (r) => /* @__PURE__ */ g(
         "div",
         {
           className: ot.dataValidationFormulaColorItem,
           style: { background: r.value, marginTop: 5 }
         }
       ),
-      dropdownRender: () => /* @__PURE__ */ m("div", { className: ot.dataValidationFormulaColorSelectPanel, children: Cr.map(
-        (r) => /* @__PURE__ */ m(
+      dropdownRender: () => /* @__PURE__ */ g("div", { className: ot.dataValidationFormulaColorSelectPanel, children: Ir.map(
+        (r) => /* @__PURE__ */ g(
           "div",
           {
             onClick: () => {
@@ -1939,12 +1941,12 @@ const Cr = [
       ) })
     }
   );
-}, Hn = (t) => {
+}, Wn = (t) => {
   const { item: e, commonProps: o, style: n } = t, { onItemChange: a, onItemDelete: i } = o;
-  return /* @__PURE__ */ j("div", { className: ot.dataValidationFormulaListItem, style: n, children: [
-    e.isRef ? null : /* @__PURE__ */ m("div", { className: Sr(ot.dataValidationFormulaListItemDrag, "draggableHandle"), children: /* @__PURE__ */ m(Do, {}) }),
-    /* @__PURE__ */ m(
-      Ir,
+  return /* @__PURE__ */ Y("div", { className: ot.dataValidationFormulaListItem, style: n, children: [
+    e.isRef ? null : /* @__PURE__ */ g("div", { className: Cr(ot.dataValidationFormulaListItemDrag, "draggableHandle"), children: /* @__PURE__ */ g(Vo, {}) }),
+    /* @__PURE__ */ g(
+      wr,
       {
         value: e.color,
         onChange: (r) => {
@@ -1952,8 +1954,8 @@ const Cr = [
         }
       }
     ),
-    /* @__PURE__ */ m(
-      Nt,
+    /* @__PURE__ */ g(
+      Ut,
       {
         disabled: e.isRef,
         value: e.label,
@@ -1962,148 +1964,148 @@ const Cr = [
         }
       }
     ),
-    e.isRef ? null : /* @__PURE__ */ m("div", { className: ot.dataValidationFormulaListItemIcon, children: /* @__PURE__ */ m(Rn, { onClick: () => i(e.id) }) })
+    e.isRef ? null : /* @__PURE__ */ g("div", { className: ot.dataValidationFormulaListItemIcon, children: /* @__PURE__ */ g(wn, { onClick: () => i(e.id) }) })
   ] });
 };
-function wr(t) {
+function Rr(t) {
   const { value: e, onChange: o = () => {
-  }, unitId: n, subUnitId: a, validResult: i, showError: r, ruleId: s } = t, { formula1: l = "", formula2: c = "" } = e || {}, u = zt(null), [h, d] = x(() => At(l) ? "1" : "0"), [v, p] = x(h === "1" ? l : "="), [C, R] = x(h === "1" ? l : "="), f = L(Q), w = L(Et), I = L(Pe), V = L(_a), [_, S] = x(() => c.split(",")), g = w.getValidatorItem(K.LIST), [y, T] = x([]), [N, P] = x(""), b = r ? i == null ? void 0 : i.formula1 : "", A = Kt(() => I.ruleChange$.pipe(wn(16)), []), k = $t(A), F = ln(o);
-  It(() => {
+  }, unitId: n, subUnitId: a, validResult: i, showError: r, ruleId: s } = t, { formula1: l = "", formula2: c = "" } = e || {}, u = Kt(null), [h, d] = j(() => kt(l) ? "1" : "0"), [_, p] = j(h === "1" ? l : "="), [R, w] = j(h === "1" ? l : "="), m = T(Q), f = T(bt), S = T(Pe), V = T(Ca), [C, I] = j(() => c.split(",")), v = f.getValidatorItem(K.LIST), [y, P] = j([]), [U, O] = j(""), L = r ? i == null ? void 0 : i.formula1 : "", A = $t(() => S.ruleChange$.pipe(In(16)), []), F = St(A), N = ln(o);
+  wt(() => {
     (async () => {
       await new Promise(($) => {
         setTimeout(() => $(!0), 100);
       });
-      const D = I.getRuleById(n, a, s), B = D == null ? void 0 : D.formula1;
-      if (At(B) && g && D) {
-        const $ = await g.getListAsync(D, n, a);
-        T($);
+      const D = S.getRuleById(n, a, s), k = D == null ? void 0 : D.formula1;
+      if (kt(k) && v && D) {
+        const $ = await v.getListAsync(D, n, a);
+        P($);
       }
     })();
-  }, [I, k, g, s, a, n]), It(() => {
-    At(l) && l !== C && (p(l), R(C));
-  }, [C, l]);
-  const [U, Y] = x(() => {
-    const D = h !== "1" ? oo(l) : [], B = c.split(",");
+  }, [S, F, v, s, a, n]), wt(() => {
+    kt(l) && l !== R && (p(l), w(R));
+  }, [R, l]);
+  const [B, x] = j(() => {
+    const D = h !== "1" ? oo(l) : [], k = c.split(",");
     return D.map(($, W) => ({
       label: $,
-      color: B[W] || kt,
+      color: k[W] || Ft,
       isRef: !1,
       id: Qe.generateRandomId(4)
     }));
-  }), z = (D, B, $) => {
-    const W = U.find((St) => St.id === D);
-    W && (W.label = B, W.color = $, Y([...U]));
+  }), z = (D, k, $) => {
+    const W = B.find((Ct) => Ct.id === D);
+    W && (W.label = k, W.color = $, x([...B]));
   }, H = (D) => {
-    const B = U.findIndex(($) => $.id === D);
-    B !== -1 && (U.splice(B, 1), Y([...U]));
-  }, G = c.split(","), J = Kt(() => y.map((D, B) => ({
+    const k = B.findIndex(($) => $.id === D);
+    k !== -1 && (B.splice(k, 1), x([...B]));
+  }, G = c.split(","), J = $t(() => y.map((D, k) => ({
     label: D,
-    color: G[B] || kt,
-    id: `${B}`,
+    color: G[k] || Ft,
+    id: `${k}`,
     isRef: !0
-  })), [G, y]), et = (D, B, $) => {
-    const W = [..._];
-    W[+D] = $, S(W), F({
+  })), [G, y]), et = (D, k, $) => {
+    const W = [...C];
+    W[+D] = $, I(W), N({
       formula1: l,
       formula2: W.join(",")
     });
   }, nt = () => {
-    Y([
-      ...U,
+    x([
+      ...B,
       {
         label: "",
-        color: kt,
+        color: Ft,
         isRef: !1,
         id: Qe.generateRandomId(4)
       }
     ]);
   };
-  It(() => {
+  wt(() => {
     if (h === "1")
       return;
-    const D = /* @__PURE__ */ new Set(), B = [];
-    U.map(($) => ({
+    const D = /* @__PURE__ */ new Set(), k = [];
+    B.map(($) => ({
       labelList: $.label.split(","),
       item: $
     })).forEach(({ item: $, labelList: W }) => {
-      W.forEach((St) => {
-        D.has(St) || (D.add(St), B.push({
-          label: St,
+      W.forEach((Ct) => {
+        D.has(Ct) || (D.add(Ct), k.push({
+          label: Ct,
           color: $.color
         }));
       });
-    }), F({
-      formula1: ao(B.map(($) => $.label)),
-      formula2: B.map(($) => $.color === kt ? "" : $.color).join(",")
+    }), N({
+      formula1: ao(k.map(($) => $.label)),
+      formula2: k.map(($) => $.color === Ft ? "" : $.color).join(",")
     });
-  }, [U, F, h, C, _]);
+  }, [B, N, h, R, C]);
   const st = ln(async (D) => {
-    if (!At(D)) {
-      F == null || F({
+    if (!kt(D)) {
+      N == null || N({
         formula1: "",
         formula2: c
       });
       return;
     }
-    V.getFormulaRefCheck(D) ? (F == null || F({
-      formula1: At(D) ? D : "",
+    V.getFormulaRefCheck(D) ? (N == null || N({
+      formula1: kt(D) ? D : "",
       formula2: c
-    }), P("")) : (F == null || F({
+    }), O("")) : (N == null || N({
       formula1: "",
       formula2: c
-    }), p("="), P(f.t("dataValidation.validFail.formulaError")));
-  }), it = zt({}), [lt, O] = x(!1);
-  return Sn((D) => {
+    }), p("="), O(m.t("dataValidation.validFail.formulaError")));
+  }), it = Kt({}), [lt, M] = j(!1);
+  return mo((D) => {
     var $;
-    const B = ($ = it.current) == null ? void 0 : $.handleOutClick;
-    B && B(D, () => O(!1));
-  }), /* @__PURE__ */ j(wt, { children: [
-    /* @__PURE__ */ m(q, { label: f.t("dataValidation.list.options"), children: /* @__PURE__ */ j(
-      gn,
+    const k = ($ = it.current) == null ? void 0 : $.handleOutClick;
+    k && k(D, () => M(!1));
+  }), /* @__PURE__ */ Y(Rt, { children: [
+    /* @__PURE__ */ g(q, { label: m.t("dataValidation.list.options"), children: /* @__PURE__ */ Y(
+      mn,
       {
         value: h,
         onChange: (D) => {
-          d(D), p(C), D === "1" && F({
-            formula1: C === "=" ? "" : C,
-            formula2: _.join(",")
+          d(D), p(R), D === "1" && N({
+            formula1: R === "=" ? "" : R,
+            formula2: C.join(",")
           });
         },
         children: [
-          /* @__PURE__ */ m(Ft, { value: "0", children: f.t("dataValidation.list.customOptions") }),
-          /* @__PURE__ */ m(Ft, { value: "1", children: f.t("dataValidation.list.refOptions") })
+          /* @__PURE__ */ g(Nt, { value: "0", children: m.t("dataValidation.list.customOptions") }),
+          /* @__PURE__ */ g(Nt, { value: "1", children: m.t("dataValidation.list.refOptions") })
         ]
       }
     ) }),
-    h === "1" ? /* @__PURE__ */ j(wt, { children: [
-      /* @__PURE__ */ m(
-        vo,
+    h === "1" ? /* @__PURE__ */ Y(Rt, { children: [
+      /* @__PURE__ */ g(
+        _o,
         {
-          initValue: v,
+          initValue: _,
           unitId: n,
           subUnitId: a,
           isFocus: lt,
           onChange: (D = "") => {
-            const B = (D != null ? D : "").trim();
-            R(B), st(B);
+            const k = (D != null ? D : "").trim();
+            w(k), st(k);
           },
-          errorText: b || N || void 0,
-          onFocus: () => O(!0),
+          errorText: L || U || void 0,
+          onFocus: () => M(!0),
           actions: it.current,
           isSupportAcrossSheet: !0
         }
       ),
-      /* @__PURE__ */ m("div", { ref: u, style: { marginTop: "12px" }, children: J.map((D) => /* @__PURE__ */ m(Hn, { item: D, commonProps: { onItemChange: et }, style: { marginBottom: 12 } }, D.id)) })
-    ] }) : /* @__PURE__ */ m(q, { error: b, children: /* @__PURE__ */ j("div", { ref: u, style: { marginTop: "-12px" }, children: [
-      /* @__PURE__ */ m(
-        ia,
+      /* @__PURE__ */ g("div", { ref: u, style: { marginTop: "12px" }, children: J.map((D) => /* @__PURE__ */ g(Wn, { item: D, commonProps: { onItemChange: et }, style: { marginBottom: 12 } }, D.id)) })
+    ] }) : /* @__PURE__ */ g(q, { error: L, children: /* @__PURE__ */ Y("div", { ref: u, style: { marginTop: "-12px" }, children: [
+      /* @__PURE__ */ g(
+        ra,
         {
-          list: U,
-          onListChange: Y,
+          list: B,
+          onListChange: x,
           rowHeight: 32,
           margin: [0, 12],
           draggableHandle: ".draggableHandle",
-          itemRender: (D) => /* @__PURE__ */ m(
-            Hn,
+          itemRender: (D) => /* @__PURE__ */ g(
+            Wn,
             {
               item: D,
               commonProps: {
@@ -2116,46 +2118,46 @@ function wr(t) {
           idKey: "id"
         }
       ),
-      /* @__PURE__ */ j("a", { className: ot.dataValidationFormulaListAdd, onClick: nt, children: [
-        /* @__PURE__ */ m(Io, {}),
-        f.t("dataValidation.list.add")
+      /* @__PURE__ */ Y("a", { className: ot.dataValidationFormulaListAdd, onClick: nt, children: [
+        /* @__PURE__ */ g(wo, {}),
+        m.t("dataValidation.list.add")
       ] })
     ] }) })
   ] });
 }
-const Ao = "data-validation.custom-formula-input", Fe = "data-validation.formula-input", Mn = "data-validation.list-formula-input", ko = "data-validation.checkbox-formula-input", Rr = [
+const ko = "data-validation.custom-formula-input", Fe = "data-validation.formula-input", yn = "data-validation.list-formula-input", Fo = "data-validation.checkbox-formula-input", Dr = [
   [
-    Ao,
-    _r
+    ko,
+    Sr
   ],
   [
     Fe,
-    fr
+    vr
   ],
   [
-    Mn,
-    wr
+    yn,
+    Rr
   ],
   [
-    ko,
-    vr
+    Fo,
+    _r
   ]
-], Dr = "LIST_RENDER_MODE_OPTION_INPUT";
+], Vr = "LIST_RENDER_MODE_OPTION_INPUT";
 function Ee(t) {
   var a;
-  const { value: e, onChange: o } = t, n = L(Q);
-  return /* @__PURE__ */ m(q, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ j(gn, { value: `${(a = e.renderMode) != null ? a : ct.CUSTOM}`, onChange: (i) => o({ ...e, renderMode: +i }), children: [
-    /* @__PURE__ */ m(Ft, { value: `${ct.CUSTOM}`, children: n.t("dataValidation.renderMode.chip") }),
-    /* @__PURE__ */ m(Ft, { value: `${ct.ARROW}`, children: n.t("dataValidation.renderMode.arrow") }),
-    /* @__PURE__ */ m(Ft, { value: `${ct.TEXT}`, children: n.t("dataValidation.renderMode.text") })
+  const { value: e, onChange: o } = t, n = T(Q);
+  return /* @__PURE__ */ g(q, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ Y(mn, { value: `${(a = e.renderMode) != null ? a : ct.CUSTOM}`, onChange: (i) => o({ ...e, renderMode: +i }), children: [
+    /* @__PURE__ */ g(Nt, { value: `${ct.CUSTOM}`, children: n.t("dataValidation.renderMode.chip") }),
+    /* @__PURE__ */ g(Nt, { value: `${ct.ARROW}`, children: n.t("dataValidation.renderMode.arrow") }),
+    /* @__PURE__ */ g(Nt, { value: `${ct.TEXT}`, children: n.t("dataValidation.renderMode.text") })
   ] }) });
 }
-Ee.componentKey = Dr;
-const Vr = "DATE_SHOW_TIME_OPTION";
+Ee.componentKey = Vr;
+const yr = "DATE_SHOW_TIME_OPTION";
 function be(t) {
   var a;
-  const { value: e, onChange: o } = t, n = L(Q);
-  return /* @__PURE__ */ m(q, { children: /* @__PURE__ */ m(
+  const { value: e, onChange: o } = t, n = T(Q);
+  return /* @__PURE__ */ g(q, { children: /* @__PURE__ */ g(
     Le,
     {
       checked: (a = e.bizInfo) == null ? void 0 : a.showTime,
@@ -2172,9 +2174,9 @@ function be(t) {
     }
   ) });
 }
-be.componentKey = Vr;
-var yr = Object.getOwnPropertyDescriptor, Mr = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? yr(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+be.componentKey = yr;
+var Mr = Object.getOwnPropertyDescriptor, Er = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? Mr(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
 }, ie = (t, e) => (o, n) => e(o, n, t);
@@ -2199,10 +2201,10 @@ let dn = class {
         break;
     }
     switch (n) {
-      case Yt.LEFT:
+      case Xt.LEFT:
         s = pe;
         break;
-      case Yt.RIGHT:
+      case Xt.RIGHT:
         s = pe + (a - r);
         break;
       default:
@@ -2227,27 +2229,27 @@ let dn = class {
     return ((o = e == null ? void 0 : e.fs) != null ? o : 10) * 1.6;
   }
   async _parseFormula(t, e, o) {
-    var c, u, h, d, v, p, C, R, f;
-    const { formula1: n = Ia, formula2: a = Ca } = t, i = await this._formulaService.getRuleFormulaResult(e, o, t.uid), r = Ue((h = (u = (c = i == null ? void 0 : i[0]) == null ? void 0 : c.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), s = Ue((p = (v = (d = i == null ? void 0 : i[1]) == null ? void 0 : d.result) == null ? void 0 : v[0]) == null ? void 0 : p[0]), l = Ln(String(r)) && Ln(String(s));
+    var c, u, h, d, _, p, R, w, m;
+    const { formula1: n = Ra, formula2: a = wa } = t, i = await this._formulaService.getRuleFormulaResult(e, o, t.uid), r = Ue((h = (u = (c = i == null ? void 0 : i[0]) == null ? void 0 : c.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), s = Ue((p = (_ = (d = i == null ? void 0 : i[1]) == null ? void 0 : d.result) == null ? void 0 : _[0]) == null ? void 0 : p[0]), l = On(String(r)) && On(String(s));
     return {
-      formula1: At(n) ? Ue((f = (R = (C = i == null ? void 0 : i[0]) == null ? void 0 : C.result) == null ? void 0 : R[0]) == null ? void 0 : f[0]) : n,
-      formula2: At(a) ? s : a,
+      formula1: kt(n) ? Ue((m = (w = (R = i == null ? void 0 : i[0]) == null ? void 0 : R.result) == null ? void 0 : w[0]) == null ? void 0 : m[0]) : n,
+      formula2: kt(a) ? s : a,
       isFormulaValid: l
     };
   }
   drawWith(t, e) {
-    var b, A, k, F;
+    var L, A, F, N;
     const { style: o, primaryWithCoord: n, unitId: a, subUnitId: i, worksheet: r, row: s, col: l } = e, c = n.isMergedMainCell ? n.mergeInfo : n, u = rt(r.getCellRaw(s, l)), h = this._dataValidationModel.getRuleByLocation(a, i, s, l);
     if (!h)
       return;
     const d = this._dataValidationModel.getValidator(h.type);
     if (!d)
       return;
-    const v = this._themeService.getCurrentTheme();
-    if (!((b = d.skipDefaultFontRender) != null && b.call(d, h, u, { unitId: a, subUnitId: i, row: s, column: l })))
+    const _ = this._themeService.getCurrentTheme();
+    if (!((L = d.skipDefaultFontRender) != null && L.call(d, h, u, { unitId: a, subUnitId: i, row: s, column: l })))
       return;
-    const p = d.parseFormulaSync(h, a, i), { formula1: C } = p, R = this._calc(c, o), { a: f, d: w } = t.getTransform(), I = bn(R.left, f), V = bn(R.top, w), _ = ra.create().composeMatrix({
-      left: I,
+    const p = d.parseFormulaSync(h, a, i), { formula1: R } = p, w = this._calc(c, o), { a: m, d: f } = t.getTransform(), S = En(w.left, m), V = En(w.top, f), C = sa.create().composeMatrix({
+      left: S,
       top: V,
       scaleX: 1,
       scaleY: 1,
@@ -2256,16 +2258,16 @@ let dn = class {
       skewY: 0,
       flipX: !1,
       flipY: !1
-    }), S = c.endX - c.startX, g = c.endY - c.startY;
-    t.save(), t.beginPath(), t.rect(c.startX, c.startY, S, g), t.clip();
-    const y = _.getMatrix();
+    }), I = c.endX - c.startX, v = c.endY - c.startY;
+    t.save(), t.beginPath(), t.rect(c.startX, c.startY, I, v), t.clip();
+    const y = C.getMatrix();
     t.transform(y[0], y[1], y[2], y[3], y[4], y[5]);
-    const T = ((A = o == null ? void 0 : o.fs) != null ? A : 10) * 1.6, N = String(u) === String(C), P = v.hyacinth500;
-    sa.drawWith(t, {
-      checked: N,
-      width: T,
-      height: T,
-      fill: (F = (k = o == null ? void 0 : o.cl) == null ? void 0 : k.rgb) != null ? F : P
+    const P = ((A = o == null ? void 0 : o.fs) != null ? A : 10) * 1.6, U = String(u) === String(R), O = _.hyacinth500;
+    la.drawWith(t, {
+      checked: U,
+      width: P,
+      height: P,
+      fill: (N = (F = o == null ? void 0 : o.cl) == null ? void 0 : F.rgb) != null ? N : O
     }), t.restore();
   }
   isHit(t, e) {
@@ -2282,7 +2284,7 @@ let dn = class {
     const u = this._dataValidationModel.getValidator(c.type);
     if (!u || !((p = u.skipDefaultFontRender) != null && p.call(u, c, l, { unitId: n, subUnitId: a, row: r, column: s })))
       return;
-    const { formula1: h, formula2: d } = await this._parseFormula(c, n, a), v = {
+    const { formula1: h, formula2: d } = await this._parseFormula(c, n, a), _ = {
       range: {
         startColumn: o.actualColumn,
         endColumn: o.actualColumn,
@@ -2290,101 +2292,101 @@ let dn = class {
         endRow: o.actualRow
       },
       value: {
-        v: String(l) === wa(String(h)) ? d : h,
+        v: String(l) === Da(String(h)) ? d : h,
         p: null
       }
     };
     this._commandService.executeCommand(
       vn.id,
-      v
+      _
     );
   }
   onPointerEnter(t, e) {
     var o, n;
-    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(X.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(Xt.POINTER);
+    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(X.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(zt.POINTER);
   }
   onPointerLeave(t, e) {
     var o, n;
-    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(X.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(Xt.DEFAULT);
+    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(X.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(zt.DEFAULT);
   }
 };
-dn = Mr([
+dn = Er([
   ie(0, tt),
-  ie(1, E(Sa)),
-  ie(2, E(ta)),
-  ie(3, E(Vt)),
-  ie(4, E(at))
+  ie(1, b(Ia)),
+  ie(2, b(Xn)),
+  ie(3, b(yt)),
+  ie(4, b(at))
 ], dn);
-var Er = Object.getOwnPropertyDescriptor, br = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? Er(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+var br = Object.getOwnPropertyDescriptor, Or = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? br(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
-}, Or = (t, e) => (o, n) => e(o, n, t);
+}, Lr = (t, e) => (o, n) => e(o, n, t);
 let ft = class {
   constructor(t) {
-    M(this, "canvasRender", null);
-    M(this, "dropdown");
-    M(this, "optionsInput");
-    M(this, "formulaInput", Mn);
+    E(this, "canvasRender", null);
+    E(this, "dropdown");
+    E(this, "optionsInput");
+    E(this, "formulaInput", yn);
     this.injector = t;
   }
 };
-ft = br([
-  Or(0, E(Bt))
+ft = Or([
+  Lr(0, b(Wt))
 ], ft);
-class Lr extends ft {
+class Tr extends ft {
   constructor() {
     super(...arguments);
-    M(this, "id", K.CHECKBOX);
-    M(this, "canvasRender", this.injector.createInstance(dn));
-    M(this, "formulaInput", ko);
+    E(this, "id", K.CHECKBOX);
+    E(this, "canvasRender", this.injector.createInstance(dn));
+    E(this, "formulaInput", Fo);
   }
 }
-class Tr extends ft {
+class Pr extends ft {
   constructor() {
     super(...arguments);
-    M(this, "id", K.CUSTOM);
-    M(this, "formulaInput", Ao);
+    E(this, "id", K.CUSTOM);
+    E(this, "formulaInput", ko);
   }
 }
-const Pr = "data-validation.formula-input";
-class Ar extends ft {
+const Ar = "data-validation.formula-input";
+class kr extends ft {
   constructor() {
     super(...arguments);
-    M(this, "id", K.DATE);
-    M(this, "formulaInput", Pr);
-    M(this, "optionsInput", be.componentKey);
-    M(this, "dropdown", Eo);
+    E(this, "id", K.DATE);
+    E(this, "formulaInput", Ar);
+    E(this, "optionsInput", be.componentKey);
+    E(this, "dropdown", bo);
   }
 }
-class kr extends ft {
+class Fr extends ft {
   constructor() {
     super(...arguments);
-    M(this, "id", K.DECIMAL);
-    M(this, "formulaInput", Fe);
+    E(this, "id", K.DECIMAL);
+    E(this, "formulaInput", Fe);
   }
 }
-const Fo = 4, Fr = 0, xe = 4, No = 4, cn = 6, Oe = 6, Pt = 14;
-function Nr(t, e) {
-  const o = la.getTextSize(t, e), n = o.width + Fo * 2, { ba: a, bd: i } = o, r = a + i;
+const No = 4, Nr = 0, xe = 4, Uo = 4, cn = 6, Oe = 6, At = 14;
+function Ur(t, e) {
+  const o = da.getTextSize(t, e), n = o.width + No * 2, { ba: a, bd: i } = o, r = a + i;
   return {
     width: n,
-    height: r + Fr * 2,
+    height: r + Nr * 2,
     ba: a
   };
 }
 function je(t, e, o, n) {
-  const a = Pt + cn * 2, i = o - a, r = n - Oe * 2, s = t.map((d) => ({
-    layout: Nr(d, e),
+  const a = At + cn * 2, i = o - a, r = n - Oe * 2, s = t.map((d) => ({
+    layout: Ur(d, e),
     text: d
   }));
   let l;
   const c = [];
   s.forEach((d) => {
-    const { layout: v } = d, { width: p, height: C } = v;
+    const { layout: _ } = d, { width: p, height: R } = _;
     !l || l.width + p + xe > i ? (l = {
       width: p,
-      height: C,
+      height: R,
       items: [{
         ...d,
         left: 0
@@ -2395,8 +2397,8 @@ function je(t, e, o, n) {
     }), l.width = l.width + p + xe);
   });
   let u = 0, h = 0;
-  return c.forEach((d, v) => {
-    h = Math.max(h, d.width), v === c.length - 1 ? u += d.height : u += d.height + No;
+  return c.forEach((d, _) => {
+    h = Math.max(h, d.width), _ === c.length - 1 ? u += d.height : u += d.height + Uo;
   }), {
     lines: c,
     totalHeight: u,
@@ -2406,28 +2408,28 @@ function je(t, e, o, n) {
     calcAutoWidth: h + a
   };
 }
-const Ur = 8;
-class Br extends da {
+const Br = 8;
+class $r extends ca {
   static drawWith(e, o) {
     const { fontString: n, info: a, fill: i, color: r } = o, { layout: s, text: l } = a;
     e.save(), qn.drawWith(e, {
       width: s.width,
       height: s.height,
-      radius: Ur,
-      fill: i || kt
-    }), e.translateWithPrecision(Fo, s.ba), e.font = n, e.fillStyle = r, e.fillText(l, 0, 0), e.restore();
+      radius: Br,
+      fill: i || Ft
+    }), e.translateWithPrecision(No, s.ba), e.font = n, e.fillStyle = r, e.fillText(l, 0, 0), e.restore();
   }
 }
-var $r = Object.getOwnPropertyDescriptor, Wr = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? $r(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+var Wr = Object.getOwnPropertyDescriptor, Hr = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? Wr(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
 }, Ye = (t, e) => (o, n) => e(o, n, t);
-const Hr = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
+const xr = 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 un = class {
   constructor(t, e, o) {
-    M(this, "zIndex");
-    M(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
+    E(this, "zIndex");
+    E(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     this._commandService = t, this._renderManagerService = e, this._dataValidationModel = o;
   }
   _ensureMap(t) {
@@ -2438,105 +2440,105 @@ let un = class {
     return `${t}.${e}`;
   }
   _drawDownIcon(t, e, o, n, a) {
-    const i = o - Pt + 4;
+    const i = o - At + 4;
     let r = 4;
     switch (a) {
       case ht.MIDDLE:
-        r = (n - Pt) / 2 + 4;
+        r = (n - At) / 2 + 4;
         break;
       case ht.BOTTOM:
-        r = n - Pt + 4;
+        r = n - At + 4;
         break;
     }
-    t.save(), t.translateWithPrecision(e.startX + i, e.startY + r), t.fillStyle = "#565656", t.fill(Hr), t.restore();
+    t.save(), t.translateWithPrecision(e.startX + i, e.startY + r), t.fillStyle = "#565656", t.fill(xr), t.restore();
   }
   // eslint-disable-next-line max-lines-per-function
   drawWith(t, e, o, n) {
     var z, H;
-    const { primaryWithCoord: a, row: i, col: r, style: s, data: l, subUnitId: c } = e, u = a.isMergedMainCell ? a.mergeInfo : a, h = l == null ? void 0 : l.fontRenderExtension, { leftOffset: d = 0, rightOffset: v = 0, topOffset: p = 0, downOffset: C = 0 } = h || {}, R = this._ensureMap(c), f = this._generateKey(i, r), w = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, r);
-    if (!w)
+    const { primaryWithCoord: a, row: i, col: r, style: s, data: l, subUnitId: c } = e, u = a.isMergedMainCell ? a.mergeInfo : a, h = l == null ? void 0 : l.fontRenderExtension, { leftOffset: d = 0, rightOffset: _ = 0, topOffset: p = 0, downOffset: R = 0 } = h || {}, w = this._ensureMap(c), m = this._generateKey(i, r), f = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, r);
+    if (!f)
       return;
-    const I = this._dataValidationModel.getValidator(w.type);
-    if (!I)
+    const S = this._dataValidationModel.getValidator(f.type);
+    if (!S)
       return;
     const V = {
       startX: u.startX + d,
-      endX: u.endX - v,
+      endX: u.endX - _,
       startY: u.startY + p,
-      endY: u.endY - C
-    }, _ = V.endX - V.startX, S = V.endY - V.startY, { cl: g } = s || {}, y = (z = typeof g == "object" ? g == null ? void 0 : g.rgb : g) != null ? z : "#000", T = Ne(s != null ? s : void 0), { vt: N, ht: P } = s || {}, b = N != null ? N : ht.MIDDLE, A = (H = rt(l)) != null ? H : "", k = I.parseCellValue(A), F = I.getListWithColorMap(w), U = je(k, T, _, S);
-    this._drawDownIcon(t, V, _, S, b), t.save(), t.translateWithPrecision(V.startX, V.startY), t.beginPath(), t.rect(0, 0, _ - Pt, S), t.clip(), t.translateWithPrecision(cn, Oe);
-    let Y = 0;
-    switch (b) {
+      endY: u.endY - R
+    }, C = V.endX - V.startX, I = V.endY - V.startY, { cl: v } = s || {}, y = (z = typeof v == "object" ? v == null ? void 0 : v.rgb : v) != null ? z : "#000", P = Ne(s != null ? s : void 0), { vt: U, ht: O } = s || {}, L = U != null ? U : ht.MIDDLE, A = (H = rt(l)) != null ? H : "", F = S.parseCellValue(A), N = S.getListWithColorMap(f), B = je(F, P, C, I);
+    this._drawDownIcon(t, V, C, I, L), t.save(), t.translateWithPrecision(V.startX, V.startY), t.beginPath(), t.rect(0, 0, C - At, I), t.clip(), t.translateWithPrecision(cn, Oe);
+    let x = 0;
+    switch (L) {
       case ht.MIDDLE:
-        Y = (U.contentHeight - U.totalHeight) / 2;
+        x = (B.contentHeight - B.totalHeight) / 2;
         break;
       case ht.BOTTOM:
-        Y = U.contentHeight - U.totalHeight;
+        x = B.contentHeight - B.totalHeight;
         break;
     }
-    t.translateWithPrecision(0, Y), U.lines.forEach((G, J) => {
+    t.translateWithPrecision(0, x), B.lines.forEach((G, J) => {
       t.save();
       const { width: et, height: nt, items: st } = G;
       let it = 0;
-      switch (P) {
-        case Yt.RIGHT:
-          it = U.contentWidth - et;
+      switch (O) {
+        case Xt.RIGHT:
+          it = B.contentWidth - et;
           break;
-        case Yt.CENTER:
-          it = (U.contentWidth - et) / 2;
+        case Xt.CENTER:
+          it = (B.contentWidth - et) / 2;
           break;
       }
-      t.translate(it, J * (nt + No)), st.forEach((lt) => {
-        t.save(), t.translateWithPrecision(lt.left, 0), Br.drawWith(t, {
-          ...T,
+      t.translate(it, J * (nt + Uo)), st.forEach((lt) => {
+        t.save(), t.translateWithPrecision(lt.left, 0), $r.drawWith(t, {
+          ...P,
           info: lt,
           color: y,
-          fill: F[lt.text]
+          fill: N[lt.text]
         }), t.restore();
       }), t.restore();
-    }), t.restore(), R.set(f, {
+    }), t.restore(), w.set(m, {
       left: V.startX,
       top: V.startY,
-      width: U.contentWidth + cn + Pt,
-      height: U.contentHeight + Oe * 2
+      width: B.contentWidth + cn + At,
+      height: B.contentHeight + Oe * 2
     });
   }
   calcCellAutoHeight(t) {
-    var _;
+    var C;
     const { primaryWithCoord: e, style: o, data: n, row: a, col: i } = t, r = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: l = 0, topOffset: c = 0, downOffset: u = 0 } = r || {}, h = e.isMergedMainCell ? e.mergeInfo : e, d = {
       startX: h.startX + s,
       endX: h.endX - l,
       startY: h.startY + c,
       endY: h.endY - u
-    }, v = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
-    if (!v)
+    }, _ = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
+    if (!_)
       return;
-    const p = this._dataValidationModel.getValidator(v.type);
+    const p = this._dataValidationModel.getValidator(_.type);
     if (!p)
       return;
-    const C = d.endX - d.startX, R = d.endY - d.startY, f = (_ = rt(n)) != null ? _ : "", w = p.parseCellValue(f), I = Ne(o != null ? o : void 0);
-    return je(w, I, C, R).cellAutoHeight;
+    const R = d.endX - d.startX, w = d.endY - d.startY, m = (C = rt(n)) != null ? C : "", f = p.parseCellValue(m), S = Ne(o != null ? o : void 0);
+    return je(f, S, R, w).cellAutoHeight;
   }
   calcCellAutoWidth(t) {
-    var _;
+    var C;
     const { primaryWithCoord: e, style: o, data: n, row: a, col: i } = t, r = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: l = 0, topOffset: c = 0, downOffset: u = 0 } = r || {}, h = e.isMergedMainCell ? e.mergeInfo : e, d = {
       startX: h.startX + s,
       endX: h.endX - l,
       startY: h.startY + c,
       endY: h.endY - u
-    }, v = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
-    if (!v)
+    }, _ = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
+    if (!_)
       return;
-    const p = this._dataValidationModel.getValidator(v.type);
+    const p = this._dataValidationModel.getValidator(_.type);
     if (!p)
       return;
-    const C = d.endX - d.startX, R = d.endY - d.startY, f = (_ = rt(n)) != null ? _ : "", w = p.parseCellValue(f), I = Ne(o != null ? o : void 0);
-    return je(w, I, C, R).calcAutoWidth;
+    const R = d.endX - d.startX, w = d.endY - d.startY, m = (C = rt(n)) != null ? C : "", f = p.parseCellValue(m), S = Ne(o != null ? o : void 0);
+    return je(f, S, R, w).calcAutoWidth;
   }
   isHit(t, e) {
     const { primaryWithCoord: o } = e, n = o.isMergedMainCell ? o.mergeInfo : o, { endX: a } = n, { x: i } = t;
-    return i >= a - Pt && i <= a;
+    return i >= a - At && i <= a;
   }
   onPointerDown(t, e) {
     if (e.button === 2)
@@ -2551,38 +2553,38 @@ let un = class {
   }
   onPointerEnter(t, e) {
     var o, n;
-    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(X.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(Xt.POINTER);
+    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(X.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(zt.POINTER);
   }
   onPointerLeave(t, e) {
     var o, n;
-    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(X.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(Xt.DEFAULT);
+    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(X.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(zt.DEFAULT);
   }
 };
-un = Wr([
+un = Hr([
   Ye(0, tt),
-  Ye(1, E(Vt)),
-  Ye(2, E(at))
+  Ye(1, b(yt)),
+  Ye(2, b(at))
 ], un);
-class xr extends ft {
+class jr extends ft {
   constructor() {
     super(...arguments);
-    M(this, "id", K.LIST_MULTIPLE);
-    M(this, "canvasRender", this.injector.createInstance(un));
-    M(this, "dropdown", yn);
+    E(this, "id", K.LIST_MULTIPLE);
+    E(this, "canvasRender", this.injector.createInstance(un));
+    E(this, "dropdown", Vn);
   }
 }
-var jr = Object.getOwnPropertyDescriptor, Yr = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? jr(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+var Yr = Object.getOwnPropertyDescriptor, Xr = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? Yr(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
-}, me = (t, e) => (o, n) => e(o, n, t);
-const Tt = 4, ge = 4, pt = 14, mt = 6, jt = 4, Xe = 8, Xr = "#565656", xn = 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 zr(t, e) {
+}, ge = (t, e) => (o, n) => e(o, n, t);
+const Pt = 4, me = 4, pt = 14, gt = 6, Yt = 4, Xe = 8, zr = "#565656", Hn = 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 Kr(t, e) {
   const o = t.length;
   return {
     id: "d",
     body: {
-      dataStream: `${t}${na}`,
+      dataStream: `${t}${oa}`,
       textRuns: [
         {
           ts: {
@@ -2617,10 +2619,10 @@ function zr(t, e) {
     }
   };
 }
-function Uo(t, e, o) {
-  const n = zr(t, o), a = new ea(n), i = new ua(a);
+function Bo(t, e, o) {
+  const n = Kr(t, o), a = new na(n), i = new ha(a);
   return {
-    documentSkeleton: ha.create(i, e),
+    documentSkeleton: pa.create(i, e),
     docModel: a,
     docViewModel: i
   };
@@ -2630,9 +2632,9 @@ function fe(t, e, o) {
     documentSkeleton: n,
     docModel: a,
     docViewModel: i
-  } = Uo(t, e, o);
+  } = Bo(t, e, o);
   return {
-    documents: new ca(`DOCUMENTS_${Qe.generateRandomId()}`, n, {
+    documents: new ua(`DOCUMENTS_${Qe.generateRandomId()}`, n, {
       pageMarginLeft: 0,
       pageMarginTop: 0
     }),
@@ -2641,9 +2643,9 @@ function fe(t, e, o) {
     docViewModel: i
   };
 }
-function jn(t, e, o, n, a, i, r = !0) {
+function xn(t, e, o, n, a, i, r = !0) {
   let s = 0;
-  const l = r ? jt : 0;
+  const l = r ? Yt : 0;
   switch (a) {
     case ht.BOTTOM:
       s = e - n - l;
@@ -2655,25 +2657,25 @@ function jn(t, e, o, n, a, i, r = !0) {
       s = l;
       break;
   }
-  s = Math.max(jt, s);
+  s = Math.max(Yt, s);
   let c = 0;
   switch (i) {
-    case Yt.CENTER:
+    case Xt.CENTER:
       c = (t - o) / 2;
       break;
-    case Yt.RIGHT:
+    case Xt.RIGHT:
       c = t - o;
       break;
   }
-  return c = Math.max(mt, c), {
+  return c = Math.max(gt, c), {
     paddingLeft: c,
     paddingTop: s
   };
 }
 let hn = class {
   constructor(t, e, o, n) {
-    M(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
-    M(this, "zIndex");
+    E(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
+    E(this, "zIndex");
     this._localeService = t, this._commandService = e, this._renderManagerService = o, this._dataValidationModel = n;
   }
   _ensureMap(t) {
@@ -2688,16 +2690,16 @@ let hn = class {
     let u;
     switch (i) {
       case ht.MIDDLE:
-        u = (n - ge) / 2;
+        u = (n - me) / 2;
         break;
       case ht.BOTTOM:
-        u = n - l - a - jt + (a / 2 - ge / 2);
+        u = n - l - a - Yt + (a / 2 - me / 2);
         break;
       default:
-        u = s + jt + (a / 2 - ge / 2);
+        u = s + Yt + (a / 2 - me / 2);
         break;
     }
-    t.save(), t.translateWithPrecision(e.startX + c, e.startY + u), t.fillStyle = "#565656", t.fill(xn), t.restore();
+    t.save(), t.translateWithPrecision(e.startX + c, e.startY + u), t.fillStyle = "#565656", t.fill(Hn), t.restore();
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   drawWith(t, e, o) {
@@ -2707,41 +2709,41 @@ let hn = class {
     const h = this._dataValidationModel.getValidator(u.type);
     if (!h)
       return;
-    const d = s == null ? void 0 : s.fontRenderExtension, { leftOffset: v = 0, rightOffset: p = 0, topOffset: C = 0, downOffset: R = 0 } = d || {};
+    const d = s == null ? void 0 : s.fontRenderExtension, { leftOffset: _ = 0, rightOffset: p = 0, topOffset: R = 0, downOffset: w = 0 } = d || {};
     if (!u || !h || !h || h.id.indexOf(K.LIST) !== 0 || !h.skipDefaultFontRender(u))
       return;
-    const f = {
-      startX: c.startX + v,
+    const m = {
+      startX: c.startX + _,
       endX: c.endX - p,
-      startY: c.startY + C,
-      endY: c.endY - R
-    }, w = f.endX - f.startX, I = f.endY - f.startY, V = this._ensureMap(l), _ = this._generateKey(a, i), S = h.getListWithColor(u), g = rt(s), y = `${g != null ? g : ""}`, T = S.find((k) => k.label === y);
-    let { tb: N, vt: P, ht: b, pd: A } = r || {};
-    if (N = N != null ? N : Ct.WRAP, P = P != null ? P : ht.BOTTOM, b = b != null ? b : dt.ht, A = A != null ? A : dt.pd, u.renderMode === ct.ARROW) {
-      const { l: k = dt.pd.l, t: F = dt.pd.t, r: U = dt.pd.r, b: Y = dt.pd.b } = A, z = w - k - U - pt - 4, { documentSkeleton: H, documents: G, docModel: J } = fe(y, this._localeService, r);
-      N === Ct.WRAP && J.updateDocumentDataPageSize(Math.max(z, 1)), H.calculate(), H.getActualSize();
-      const et = ne(H), { height: nt, width: st } = et, { paddingTop: it, paddingLeft: lt } = jn(z, I - F - Y, st, nt, P, b, !0);
-      this._drawDownIcon(t, f, w, I, nt, P, A), t.save(), t.translateWithPrecision(f.startX + k, f.startY + F), t.beginPath(), t.rect(0, 0, w - k - U, I - F - Y), t.clip(), t.translateWithPrecision(0, it), t.save(), t.translateWithPrecision(Tt, 0), t.beginPath(), t.rect(0, 0, z, nt), t.clip(), G.render(t), t.translateWithPrecision(lt, 0), t.restore(), t.restore(), V.set(_, {
-        left: f.endX + k + o.rowHeaderWidth - pt,
-        top: f.startY + F + o.columnHeaderHeight,
+      startY: c.startY + R,
+      endY: c.endY - w
+    }, f = m.endX - m.startX, S = m.endY - m.startY, V = this._ensureMap(l), C = this._generateKey(a, i), I = h.getListWithColor(u), v = rt(s), y = `${v != null ? v : ""}`, P = I.find((F) => F.label === y);
+    let { tb: U, vt: O, ht: L, pd: A } = r || {};
+    if (U = U != null ? U : It.WRAP, O = O != null ? O : ht.BOTTOM, L = L != null ? L : dt.ht, A = A != null ? A : dt.pd, u.renderMode === ct.ARROW) {
+      const { l: F = dt.pd.l, t: N = dt.pd.t, r: B = dt.pd.r, b: x = dt.pd.b } = A, z = f - F - B - pt - 4, { documentSkeleton: H, documents: G, docModel: J } = fe(y, this._localeService, r);
+      U === It.WRAP && J.updateDocumentDataPageSize(Math.max(z, 1)), H.calculate(), H.getActualSize();
+      const et = ne(H), { height: nt, width: st } = et, { paddingTop: it, paddingLeft: lt } = xn(z, S - N - x, st, nt, O, L, !0);
+      this._drawDownIcon(t, m, f, S, nt, O, A), t.save(), t.translateWithPrecision(m.startX + F, m.startY + N), t.beginPath(), t.rect(0, 0, f - F - B, S - N - x), t.clip(), t.translateWithPrecision(0, it), t.save(), t.translateWithPrecision(Pt, 0), t.beginPath(), t.rect(0, 0, z, nt), t.clip(), G.render(t), t.translateWithPrecision(lt, 0), t.restore(), t.restore(), V.set(C, {
+        left: m.endX + F + o.rowHeaderWidth - pt,
+        top: m.startY + N + o.columnHeaderHeight,
         width: pt,
-        height: I - F - Y
+        height: S - N - x
       });
     } else {
-      t.save(), t.translateWithPrecision(f.startX, f.startY), t.beginPath(), t.rect(0, 0, w, I), t.clip();
-      const k = w - mt * 2 - Tt - pt - 4, { documentSkeleton: F, documents: U, docModel: Y } = fe(y, this._localeService, r);
-      N === Ct.WRAP && Y.updateDocumentDataPageSize(Math.max(k, 1)), F.calculate();
-      const z = ne(F), { height: H, width: G } = z, { paddingTop: J, paddingLeft: et } = jn(k, I, G, H, P, b);
-      t.translateWithPrecision(mt, J);
-      const nt = Math.max(w - mt * 2, 1), st = H;
+      t.save(), t.translateWithPrecision(m.startX, m.startY), t.beginPath(), t.rect(0, 0, f, S), t.clip();
+      const F = f - gt * 2 - Pt - pt - 4, { documentSkeleton: N, documents: B, docModel: x } = fe(y, this._localeService, r);
+      U === It.WRAP && x.updateDocumentDataPageSize(Math.max(F, 1)), N.calculate();
+      const z = ne(N), { height: H, width: G } = z, { paddingTop: J, paddingLeft: et } = xn(F, S, G, H, O, L);
+      t.translateWithPrecision(gt, J);
+      const nt = Math.max(f - gt * 2, 1), st = H;
       qn.drawWith(t, {
         width: nt,
         height: st,
-        fill: (T == null ? void 0 : T.color) || kt,
+        fill: (P == null ? void 0 : P.color) || Ft,
         radius: Xe
-      }), t.save(), t.translateWithPrecision(Tt, 0), t.beginPath(), t.rect(0, 0, k, H), t.clip(), t.translateWithPrecision(et, 0), U.render(t), t.restore(), t.translateWithPrecision(k + Tt + 4, (H - ge) / 2), t.fillStyle = Xr, t.fill(xn), t.restore(), V.set(_, {
-        left: f.startX + mt + o.rowHeaderWidth,
-        top: f.startY + J + o.columnHeaderHeight,
+      }), t.save(), t.translateWithPrecision(Pt, 0), t.beginPath(), t.rect(0, 0, F, H), t.clip(), t.translateWithPrecision(et, 0), B.render(t), t.restore(), t.translateWithPrecision(F + Pt + 4, (H - me) / 2), t.fillStyle = zr, t.fill(Hn), t.restore(), V.set(C, {
+        left: m.startX + gt + o.rowHeaderWidth,
+        top: m.startY + J + o.columnHeaderHeight,
         width: nt,
         height: st
       });
@@ -2751,62 +2753,62 @@ let hn = class {
     const { primaryWithCoord: e, style: o, data: n, row: a, col: i } = t, r = e.isMergedMainCell ? e.mergeInfo : e, s = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: h = 0 } = s || {}, d = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
     if (!d || d.renderMode === ct.TEXT)
       return;
-    const v = {
+    const _ = {
       startX: r.startX + l,
       endX: r.endX - c,
       startY: r.startY + u,
       endY: r.endY - h
-    }, p = v.endX - v.startX, C = rt(n), R = `${C != null ? C : ""}`;
-    let { tb: f, pd: w } = o || {};
-    const { t: I = dt.pd.t, b: V = dt.pd.b } = w != null ? w : {};
-    if (f = f != null ? f : Ct.WRAP, d.renderMode === ct.ARROW) {
-      const _ = p - pt, { documentSkeleton: S, docModel: g } = fe(R, this._localeService, o);
-      f === Ct.WRAP && g.updateDocumentDataPageSize(Math.max(_, 1)), S.calculate(), S.getActualSize();
-      const y = ne(S), { height: T } = y;
-      return T + I + V + jt * 2;
+    }, p = _.endX - _.startX, R = rt(n), w = `${R != null ? R : ""}`;
+    let { tb: m, pd: f } = o || {};
+    const { t: S = dt.pd.t, b: V = dt.pd.b } = f != null ? f : {};
+    if (m = m != null ? m : It.WRAP, d.renderMode === ct.ARROW) {
+      const C = p - pt, { documentSkeleton: I, docModel: v } = fe(w, this._localeService, o);
+      m === It.WRAP && v.updateDocumentDataPageSize(Math.max(C, 1)), I.calculate(), I.getActualSize();
+      const y = ne(I), { height: P } = y;
+      return P + S + V + Yt * 2;
     } else {
-      const _ = p - mt * 2 - Tt - pt, { documentSkeleton: S, docModel: g } = Uo(R, this._localeService, o);
-      f === Ct.WRAP && g.updateDocumentDataPageSize(Math.max(_, 1)), S.calculate();
-      const y = ne(S), {
-        height: T
+      const C = p - gt * 2 - Pt - pt, { documentSkeleton: I, docModel: v } = Bo(w, this._localeService, o);
+      m === It.WRAP && v.updateDocumentDataPageSize(Math.max(C, 1)), I.calculate();
+      const y = ne(I), {
+        height: P
       } = y;
-      return T + jt * 2;
+      return P + Yt * 2;
     }
   }
   calcCellAutoWidth(t) {
     const { primaryWithCoord: e, style: o, data: n, row: a, col: i } = t, r = e.isMergedMainCell ? e.mergeInfo : e, s = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: h = 0 } = s || {}, d = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
     if (!d || d.renderMode === ct.TEXT)
       return;
-    const v = {
+    const _ = {
       startX: r.startX + l,
       endX: r.endX - c,
       startY: r.startY + u,
       endY: r.endY - h
-    }, p = v.endX - v.startX, C = rt(n), R = `${C != null ? C : ""}`;
-    let { tb: f, pd: w } = o || {};
-    const { l: I = dt.pd.l, r: V = dt.pd.r } = w != null ? w : {};
-    f = f != null ? f : Ct.WRAP;
-    let _ = mt * 2 + pt;
+    }, p = _.endX - _.startX, R = rt(n), w = `${R != null ? R : ""}`;
+    let { tb: m, pd: f } = o || {};
+    const { l: S = dt.pd.l, r: V = dt.pd.r } = f != null ? f : {};
+    m = m != null ? m : It.WRAP;
+    let C = gt * 2 + pt;
     switch (d.renderMode) {
       case ct.ARROW:
-        _ = pt + mt * 2 + V + I;
+        C = pt + gt * 2 + V + S;
         break;
       case ct.CUSTOM:
-        _ = pt + mt * 2 + Tt * 2 + V + I + Xe / 2 + 1;
+        C = pt + gt * 2 + Pt * 2 + V + S + Xe / 2 + 1;
         break;
       // default is CUSTOM
       default:
-        _ = pt + mt * 2 + Tt * 2 + V + I + Xe / 2 + 1;
+        C = pt + gt * 2 + Pt * 2 + V + S + Xe / 2 + 1;
     }
-    const S = p - _, { documentSkeleton: g, docModel: y } = fe(R, this._localeService, o);
-    return f === Ct.WRAP && y.updateDocumentDataPageSize(Math.max(S, 1)), g.calculate(), g.getActualSize(), ne(g).width + _;
+    const I = p - C, { documentSkeleton: v, docModel: y } = fe(w, this._localeService, o);
+    return m === It.WRAP && y.updateDocumentDataPageSize(Math.max(I, 1)), v.calculate(), v.getActualSize(), ne(v).width + C;
   }
   isHit(t, e) {
     const { subUnitId: o, row: n, col: a } = e, r = this._ensureMap(o).get(this._generateKey(n, a)), s = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, n, a);
     if (!s || !r || s.renderMode === ct.TEXT)
       return !1;
-    const { top: l, left: c, width: u, height: h } = r, { x: d, y: v } = t;
-    return d >= c && d <= c + u && v >= l && v <= l + h;
+    const { top: l, left: c, width: u, height: h } = r, { x: d, y: _ } = t;
+    return d >= c && d <= c + u && _ >= l && _ <= l + h;
   }
   onPointerDown(t, e) {
     if (e.button === 2)
@@ -2821,62 +2823,62 @@ let hn = class {
   }
   onPointerEnter(t, e) {
     var o, n;
-    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(X.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(Xt.POINTER);
+    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(X.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(zt.POINTER);
   }
   onPointerLeave(t, e) {
     var o, n;
-    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(X.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(Xt.DEFAULT);
+    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(X.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(zt.DEFAULT);
   }
 };
-hn = Yr([
-  me(0, E(Q)),
-  me(1, tt),
-  me(2, E(Vt)),
-  me(3, E(at))
+hn = Xr([
+  ge(0, b(Q)),
+  ge(1, tt),
+  ge(2, b(yt)),
+  ge(3, b(at))
 ], hn);
-class Kr extends ft {
+class Gr extends ft {
   constructor() {
     super(...arguments);
-    M(this, "id", K.LIST);
-    M(this, "canvasRender", this.injector.createInstance(hn));
-    M(this, "dropdown", yn);
-    M(this, "optionsInput", Ee.componentKey);
-    M(this, "formulaInput", Mn);
+    E(this, "id", K.LIST);
+    E(this, "canvasRender", this.injector.createInstance(hn));
+    E(this, "dropdown", Vn);
+    E(this, "optionsInput", Ee.componentKey);
+    E(this, "formulaInput", yn);
   }
 }
-class Gr extends ft {
+class Zr extends ft {
   constructor() {
     super(...arguments);
-    M(this, "id", K.TEXT_LENGTH);
-    M(this, "formulaInput", Fe);
+    E(this, "id", K.TEXT_LENGTH);
+    E(this, "formulaInput", Fe);
   }
 }
-class Zr extends ft {
+class qr extends ft {
   constructor() {
     super(...arguments);
-    M(this, "id", K.WHOLE);
-    M(this, "formulaInput", Fe);
+    E(this, "id", K.WHOLE);
+    E(this, "formulaInput", Fe);
   }
 }
-var qr = Object.getOwnPropertyDescriptor, Jr = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? qr(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+var Jr = Object.getOwnPropertyDescriptor, Qr = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? Jr(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
 }, ze = (t, e) => (o, n) => e(o, n, t);
-let Qt = class extends mn {
+let Qt = class extends gn {
   constructor(t, e, o) {
     super(), this._injector = t, this._componentManger = e, this._dataValidatorRegistryService = o, this._initComponents(), this._registerValidatorViews();
   }
   _initComponents() {
     [
-      [bo, Co],
-      [Ve, Yi],
-      [Vo, ui],
-      [yn, Di],
-      [Eo, qa],
+      [Oo, Io],
+      [Ve, Xi],
+      [yo, pi],
+      [Vn, yi],
+      [bo, Qa],
       [Ee.componentKey, Ee],
       [be.componentKey, be],
-      ...Rr
+      ...Dr
     ].forEach(([t, e]) => {
       this.disposeWithMe(this._componentManger.register(
         t,
@@ -2886,33 +2888,33 @@ let Qt = class extends mn {
   }
   _registerValidatorViews() {
     [
-      kr,
+      Fr,
+      qr,
       Zr,
+      kr,
+      Tr,
       Gr,
-      Ar,
-      Lr,
-      Kr,
-      xr,
-      Tr
+      jr,
+      Pr
     ].forEach((t) => {
       const e = this._injector.createInstance(t), o = this._dataValidatorRegistryService.getValidatorItem(e.id);
       o && (o.formulaInput = e.formulaInput, o.canvasRender = e.canvasRender, o.dropdown = e.dropdown, o.optionsInput = e.optionsInput);
     });
   }
 };
-Qt = Jr([
-  ze(0, E(Bt)),
-  ze(1, E(Te)),
-  ze(2, E(Et))
+Qt = Qr([
+  ze(0, b(Wt)),
+  ze(1, b(Te)),
+  ze(2, b(bt))
 ], Qt);
-var Qr = Object.getOwnPropertyDescriptor, ts = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? Qr(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+var ts = Object.getOwnPropertyDescriptor, es = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? ts(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
 }, Ke = (t, e) => (o, n) => e(o, n, t);
-const es = "SHEET_DATA_VALIDATION_UI_PLUGIN";
+const ns = "SHEET_DATA_VALIDATION_UI_PLUGIN";
 var ve;
-let Yn = (ve = class extends Gn {
+let jn = (ve = class extends Gn {
   constructor(t = ye, e, o, n) {
     super(), this._config = t, this._injector = e, this._commandService = o, this._configService = n;
     const { menu: a, ...i } = Zn(
@@ -2920,12 +2922,12 @@ let Yn = (ve = class extends Gn {
       ye,
       this._config
     );
-    a && this._configService.setConfig("menu", a, { merge: !0 }), this._configService.setConfig(Vn, i);
+    a && this._configService.setConfig("menu", a, { merge: !0 }), this._configService.setConfig(Dn, i);
   }
   onStarting() {
     [
-      [gt],
-      [Rt],
+      [mt],
+      [Dt],
       [de],
       [Gt],
       [Jt],
@@ -2938,16 +2940,16 @@ let Yn = (ve = class extends Gn {
     }), [
       ke,
       Ae,
-      Mo,
-      Dn,
-      Wt,
-      yo
+      Eo,
+      Rn,
+      Ht,
+      Mo
     ].forEach((t) => {
       this._commandService.registerCommand(t);
     });
   }
   onReady() {
-    this._injector.get(Zt), this._injector.get(qt), this._injector.get(le), this._injector.get(de), this._injector.get(Vt).registerRenderModule(
+    this._injector.get(Zt), this._injector.get(qt), this._injector.get(le), this._injector.get(de), this._injector.get(yt).registerRenderModule(
       X.UNIVER_SHEET,
       [Me]
     );
@@ -2958,20 +2960,20 @@ let Yn = (ve = class extends Gn {
   onSteady() {
     this._injector.get(Gt);
   }
-}, M(ve, "pluginName", es), M(ve, "type", X.UNIVER_SHEET), ve);
-Yn = ts([
-  Ke(1, E(Bt)),
+}, E(ve, "pluginName", ns), E(ve, "type", X.UNIVER_SHEET), ve);
+jn = es([
+  Ke(1, b(Wt)),
   Ke(2, tt),
   Ke(3, pn)
-], Yn);
-var ns = Object.getOwnPropertyDescriptor, os = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? ns(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+], jn);
+var os = Object.getOwnPropertyDescriptor, as = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? os(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
 }, Ge = (t, e) => (o, n) => e(o, n, t);
-const as = "SHEET_DATA_VALIDATION_UI_PLUGIN";
+const is = "SHEET_DATA_VALIDATION_UI_PLUGIN";
 var _e;
-let Xn = (_e = class extends Gn {
+let Yn = (_e = class extends Gn {
   constructor(t = ye, e, o, n) {
     super(), this._config = t, this._injector = e, this._commandService = o, this._configService = n;
     const { menu: a, ...i } = Zn(
@@ -2979,12 +2981,12 @@ let Xn = (_e = class extends Gn {
       ye,
       this._config
     );
-    a && this._configService.setConfig("menu", a, { merge: !0 }), this._configService.setConfig(Vn, i);
+    a && this._configService.setConfig("menu", a, { merge: !0 }), this._configService.setConfig(Dn, i);
   }
   onStarting() {
     [
-      [gt],
-      [Rt],
+      [mt],
+      [Dt],
       [de],
       [Gt],
       [Jt],
@@ -2996,16 +2998,16 @@ let Xn = (_e = class extends Gn {
     }), [
       ke,
       Ae,
-      Mo,
-      Dn,
-      Wt,
-      yo
+      Eo,
+      Rn,
+      Ht,
+      Mo
     ].forEach((t) => {
       this._commandService.registerCommand(t);
     });
   }
   onReady() {
-    this._injector.get(Zt), this._injector.get(qt), this._injector.get(Vt).registerRenderModule(
+    this._injector.get(Zt), this._injector.get(qt), this._injector.get(yt).registerRenderModule(
       X.UNIVER_SHEET,
       [Me]
     );
@@ -3016,15 +3018,15 @@ let Xn = (_e = class extends Gn {
   onSteady() {
     this._injector.get(Gt);
   }
-}, M(_e, "pluginName", as), M(_e, "type", X.UNIVER_SHEET), _e);
-Xn = os([
-  Ge(1, E(Bt)),
+}, E(_e, "pluginName", is), E(_e, "type", X.UNIVER_SHEET), _e);
+Yn = as([
+  Ge(1, b(Wt)),
   Ge(2, tt),
   Ge(3, pn)
-], Xn);
+], Yn);
 export {
-  Eo as DATE_DROPDOWN_KEY,
-  yn as LIST_DROPDOWN_KEY,
-  Xn as UniverSheetsDataValidationMobileUIPlugin,
-  Yn as UniverSheetsDataValidationUIPlugin
+  bo as DATE_DROPDOWN_KEY,
+  Vn as LIST_DROPDOWN_KEY,
+  Yn as UniverSheetsDataValidationMobileUIPlugin,
+  jn as UniverSheetsDataValidationUIPlugin
 };