@univerjs/sheets-data-validation-ui 0.6.3-nightly.202503051607 → 0.6.4-nightly.202503101606

package/lib/es/index.js

@@ -2,63 +2,48 @@ 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 m, Fragment as Rt } from "react/jsx-runtime";
-import { Inject as b, LocaleService as Q, Disposable as Vt, DataValidationErrorStyle as le, ICommandService as tt, dayjs as qe, numfmt as Je, CellValueType as xo, UniverInstanceType as X, toDisposable as jo, IUniverInstanceService as st, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Yo, DisposableCollection as Xo, CommandType as ne, BuildTextUtils as zo, DataValidationRenderMode as ut, DataValidationType as K, IConfigService as mn, debounce as Ko, UndoCommand as Go, RedoCommand as Zo, isUnitRangesEqual as qo, shallowEqual as En, ThemeService as zn, ColorKit as Jo, Injector as Wt, DataValidationStatus as de, ObjectMatrix as Ie, Range as Qo, Rectangle as we, queryObjectMatrix as Qe, Optional as ta, RxDisposable as gn, InterceptorEffectEnum as Kn, sequenceExecute as Gn, bufferDebounceTime as ea, isFormulaString as kt, Tools as tn, VerticalAlign as pt, HorizontalAlign as zt, DEFAULT_STYLES as ct, WrapStrategy as It, DocumentDataModel as na, BooleanNumber as oe, DEFAULT_EMPTY_DOCUMENT_VALUE as oa, Plugin as Zn, merge as qn } from "@univerjs/core";
+import { Inject as b, LocaleService as Q, Disposable as Vt, DataValidationErrorStyle as de, DataValidationStatus as Kt, ICommandService as tt, dayjs as qe, numfmt as Je, CellValueType as xo, UniverInstanceType as X, toDisposable as jo, IUniverInstanceService as rt, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Yo, DisposableCollection as Xo, CommandType as ae, BuildTextUtils as zo, DataValidationRenderMode as ct, DataValidationType as K, IConfigService as mn, debounce as Ko, UndoCommand as Go, RedoCommand as Zo, isUnitRangesEqual as qo, shallowEqual as En, ThemeService as zn, ColorKit as Jo, Injector as Wt, ObjectMatrix as Ie, Range as Qo, Rectangle as we, queryObjectMatrix as Qe, Optional as ta, RxDisposable as gn, InterceptorEffectEnum as Kn, sequenceExecute as Gn, bufferDebounceTime as ea, isFormulaString as kt, Tools as tn, VerticalAlign as ht, HorizontalAlign as Gt, DEFAULT_STYLES as dt, WrapStrategy as It, DocumentDataModel as na, BooleanNumber as ie, DEFAULT_EMPTY_DOCUMENT_VALUE as oa, Plugin as Zn, merge as qn } from "@univerjs/core";
 import { Button as Bt, DatePanel as aa, Scrollbar as ia, FormLayout as q, RadioGroup as fn, Radio as Nt, Checkbox as Pe, Input as Ut, Select as en, DraggableList as ra, clsx as sa } from "@univerjs/design";
-import { DeviceInputEventType as nn, IRenderManagerService as yt, fixLineWidthByScale as bn, Transform as la, CheckboxShape as da, getCurrentTypeOfRenderer as Kt, CURSOR_TYPE as Gt, FontCache as ca, Shape as ua, Rect as Jn, getFontStyleString as Be, getDocsSkeletonPageSize as ae, Documents as ha, DocumentViewModel as pa, DocumentSkeleton as ma } from "@univerjs/engine-render";
-import { SheetInterceptorService as vn, AFTER_CELL_EDIT_ASYNC as ga, SetRangeValuesCommand as _n, SheetsSelectionsService as Qn, getSheetCommandTarget as to, SheetPermissionCheckController as eo, WorksheetEditPermission as Re, RangeProtectionPermissionEditPoint as De, WorkbookEditablePermission as Ve, checkRangesEditablePermission as fa, rangeToDiscreteRange as va, WorksheetSetCellStylePermission as on, INTERCEPTOR_POINT as no, InterceptCellContentPriority as oo } from "@univerjs/sheets";
-import { SheetDataValidationModel as at, getCellValueOrigin as rt, getDataValidationCellValue as _a, deserializeListOptions as ao, serializeListOptions as io, UpdateSheetDataValidationRangeCommand as ro, UpdateSheetDataValidationSettingCommand as On, UpdateSheetDataValidationOptionsCommand as Sa, RemoveSheetDataValidationCommand as so, RemoveSheetAllDataValidationCommand as Ca, createDefaultNewRule as lo, AddSheetDataValidationCommand as Sn, DATA_VALIDATION_PLUGIN_NAME as co, getDataValidationDiffMutations as an, DataValidationCacheService as uo, DataValidationFormulaController as Ia, DataValidationFormulaService as wa, CHECKBOX_FORMULA_2 as Ra, CHECKBOX_FORMULA_1 as Da, getFormulaResult as $e, isLegalFormulaResult as Ln, transformCheckboxValue as Va } from "@univerjs/sheets-data-validation";
-import { getPatternType as ya } from "@univerjs/sheets-numfmt";
-import { SetCellEditVisibleOperation as rn, SheetCanvasPopManagerService as Ma, IEditorBridgeService as ho, IMarkSelectionService as Ea, HoverManagerService as ba, CellAlertManagerService as Oa, CellAlertType as La, IAutoFillService as Ta, APPLY_TYPE as ie, virtualizeDiscreteRanges as sn, getAutoFillRepeatRange as Pa, ISheetClipboardService as Aa, COPY_TYPE as Tn, PREDEFINED_HOOK_NAME as he, getRepeatRange as Pn, getCurrentRangeDisable$ as ka, AutoHeightController as po, SheetSkeletonManagerService as ye } from "@univerjs/sheets-ui";
-import { IDialogService as Fa, useDependency as T, KeyCode as ln, ISidebarService as mo, useObservable as St, ComponentManager as Ae, IZenZoneService as go, RectPopup as Na, useEvent as dn, MenuItemType as Cn, getMenuHiddenObservable as Ua, RibbonStartGroup as Ba, IMenuManagerService as $a, useSidebarClick as fo } from "@univerjs/ui";
-import An, { useState as j, forwardRef as Mt, useRef as Zt, createElement as Et, useMemo as $t, useEffect as wt } from "react";
-import { DataValidatorRegistryService as bt, DataValidationModel as ke, DataValidatorRegistryScope as Wa, TWO_FORMULA_OPERATOR_COUNT as Ha, getRuleOptions as kn, getRuleSetting as Fn } from "@univerjs/data-validation";
-import { RichTextEditingMutation as xa } from "@univerjs/docs";
-import { filter as In, BehaviorSubject as Nn, distinctUntilChanged as ja, Subject as Ya, debounceTime as wn, of as Xa, bufferTime as vo } from "rxjs";
-import { deserializeRangeWithSheet as za, serializeRange as _o } from "@univerjs/engine-formula";
-import { RangeSelector as Ka, FormulaEditor as So } from "@univerjs/sheets-formula-ui";
-var Ga = Object.getOwnPropertyDescriptor, Za = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? Ga(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+import { DeviceInputEventType as nn, IRenderManagerService as yt, fixLineWidthByScale as bn, Transform as la, CheckboxShape as da, getCurrentTypeOfRenderer as Zt, CURSOR_TYPE as qt, FontCache as ca, Shape as ua, Rect as Jn, getFontStyleString as Be, getDocsSkeletonPageSize as re, Documents as ha, DocumentViewModel as pa, DocumentSkeleton as ma } from "@univerjs/engine-render";
+import { SheetInterceptorService as vn, VALIDATE_CELL as ga, SetRangeValuesCommand as _n, SheetsSelectionsService as Qn, getSheetCommandTarget as to, SheetPermissionCheckController as eo, WorksheetEditPermission as Re, RangeProtectionPermissionEditPoint as De, WorkbookEditablePermission as Ve, checkRangesEditablePermission as fa, rangeToDiscreteRange as va, WorksheetSetCellStylePermission as on, INTERCEPTOR_POINT as no, InterceptCellContentPriority as oo } from "@univerjs/sheets";
+import { SheetDataValidationModel as at, SheetsDataValidationValidatorService as _a, getCellValueOrigin as mt, getDataValidationCellValue as Sa, deserializeListOptions as ao, serializeListOptions as io, UpdateSheetDataValidationRangeCommand as ro, UpdateSheetDataValidationSettingCommand as On, UpdateSheetDataValidationOptionsCommand as Ca, RemoveSheetDataValidationCommand as so, RemoveSheetAllDataValidationCommand as Ia, createDefaultNewRule as lo, AddSheetDataValidationCommand as Sn, DATA_VALIDATION_PLUGIN_NAME as co, getDataValidationDiffMutations as an, DataValidationCacheService as uo, DataValidationFormulaController as wa, DataValidationFormulaService as Ra, CHECKBOX_FORMULA_2 as Da, CHECKBOX_FORMULA_1 as Va, getFormulaResult as $e, isLegalFormulaResult as Ln, transformCheckboxValue as ya } from "@univerjs/sheets-data-validation";
+import { getPatternType as Ma } from "@univerjs/sheets-numfmt";
+import { SetCellEditVisibleOperation as rn, SheetCanvasPopManagerService as Ea, IEditorBridgeService as ho, IMarkSelectionService as ba, HoverManagerService as Oa, CellAlertManagerService as La, CellAlertType as Ta, IAutoFillService as Pa, APPLY_TYPE as se, virtualizeDiscreteRanges as sn, getAutoFillRepeatRange as Aa, ISheetClipboardService as ka, COPY_TYPE as Tn, PREDEFINED_HOOK_NAME as he, getRepeatRange as Pn, getCurrentRangeDisable$ as Fa, AutoHeightController as po, SheetSkeletonManagerService as ye } from "@univerjs/sheets-ui";
+import { IDialogService as Na, useDependency as T, KeyCode as ln, ISidebarService as mo, useObservable as St, ComponentManager as Ae, IZenZoneService as go, RectPopup as Ua, useEvent as dn, MenuItemType as Cn, getMenuHiddenObservable as Ba, RibbonStartGroup as $a, IMenuManagerService as Wa, useSidebarClick as fo } from "@univerjs/ui";
+import An, { useState as j, forwardRef as Mt, useRef as Jt, createElement as Et, useMemo as $t, useEffect as wt } from "react";
+import { DataValidatorRegistryService as bt, DataValidationModel as ke, DataValidatorRegistryScope as Ha, TWO_FORMULA_OPERATOR_COUNT as xa, getRuleOptions as kn, getRuleSetting as Fn } from "@univerjs/data-validation";
+import { RichTextEditingMutation as ja } from "@univerjs/docs";
+import { filter as In, BehaviorSubject as Nn, distinctUntilChanged as Ya, Subject as Xa, debounceTime as wn, of as za, bufferTime as vo } from "rxjs";
+import { deserializeRangeWithSheet as Ka, serializeRange as _o } from "@univerjs/engine-formula";
+import { RangeSelector as Ga, FormulaEditor as So } from "@univerjs/sheets-formula-ui";
+var Za = Object.getOwnPropertyDescriptor, qa = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? Za(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
-}, re = (t, e) => (o, n) => e(o, n, t);
+}, xt = (t, e) => (o, n) => e(o, n, t);
 let ce = 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();
+  constructor(t, e, o, n, a, i) {
+    super(), this._sheetInterceptorService = t, this._dataValidationModel = e, this._dataValidatorRegistryService = o, this._dialogService = n, this._localeService = a, this._sheetsDataValidationValidatorService = i, this._initEditorBridgeInterceptor();
   }
   _initEditorBridgeInterceptor() {
     this._sheetInterceptorService.writeCellInterceptor.intercept(
       ga,
       {
         handler: async (t, e, o) => {
-          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 !== le.STOP)
-            return o(Promise.resolve(n));
-          const d = await this._dataValidatorRegistryService.getValidatorItem(h.type);
-          if (!d || await d.validator(
-            {
-              value: rt(n),
-              interceptValue: rt((R = e == null ? void 0 : e.origin) != null ? R : n),
-              row: i,
-              column: r,
-              unitId: s,
-              subUnitId: l,
-              worksheet: a,
-              workbook: c,
-              t: n == null ? void 0 : n.t
-            },
-            h
-          ))
-            return o(Promise.resolve(n));
-          const p = a.getCellRaw(i, r);
-          return this._dialogService.open({
+          const n = await t, { row: a, col: i, unitId: r, subUnitId: s } = e, l = this._dataValidationModel.getRuleIdByLocation(r, s, a, i), c = l ? this._dataValidationModel.getRuleById(r, s, l) : void 0;
+          if (n === !1)
+            return o(Promise.resolve(!1));
+          if (!c || c.errorStyle !== de.STOP)
+            return o(Promise.resolve(!0));
+          const u = this._dataValidatorRegistryService.getValidatorItem(c.type);
+          return !u || await this._sheetsDataValidationValidatorService.validatorCell(r, s, a, i) === Kt.VALID ? o(Promise.resolve(!0)) : (this._dialogService.open({
             width: 368,
             title: {
               title: this._localeService.t("dataValidation.alert.title")
             },
             id: "reject-input-dialog",
             children: {
-              title: d.getRuleFinalError(h, { row: i, col: r, unitId: s, subUnitId: l })
+              title: u.getRuleFinalError(c, { row: a, col: i, unitId: r, subUnitId: s })
             },
             footer: {
               title: An.createElement(
@@ -73,7 +58,7 @@ let ce = class extends Vt {
             onClose: () => {
               this._dialogService.close("reject-input-dialog");
             }
-          }), o(Promise.resolve(p));
+          }), o(Promise.resolve(!1)));
         }
       }
     );
@@ -104,17 +89,18 @@ let ce = class extends Vt {
     });
   }
 };
-ce = Za([
-  re(0, b(vn)),
-  re(1, b(at)),
-  re(2, b(bt)),
-  re(3, Fa),
-  re(4, b(Q))
+ce = qa([
+  xt(0, b(vn)),
+  xt(1, b(at)),
+  xt(2, b(bt)),
+  xt(3, Na),
+  xt(4, b(Q)),
+  xt(5, b(_a))
 ], ce);
-const qa = "univer-dv-date-dropdown", Ja = "univer-dv-date-dropdown-btns", Un = {
-  dvDateDropdown: qa,
-  dvDateDropdownBtns: Ja
-}, Qa = (t) => {
+const Ja = "univer-dv-date-dropdown", Qa = "univer-dv-date-dropdown-btns", Un = {
+  dvDateDropdown: Ja,
+  dvDateDropdownBtns: Qa
+}, ti = (t) => {
   if (t == null || typeof t == "boolean")
     return;
   if (typeof t == "number" || !Number.isNaN(+t))
@@ -123,20 +109,20 @@ const qa = "univer-dv-date-dropdown", Ja = "univer-dv-date-dropdown-btns", Un =
   if (e.isValid())
     return e;
 };
-function ti(t) {
+function ei(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(ce), h = n.getCell(a, i), d = rt(n.getCellRaw(a, i)), _ = Qa(d), [p, R] = j(_), w = p && p.isValid() ? p : qe(), g = T(Q), f = T(at), S = f.getRuleByLocation(r, s, a, i);
-  if (!S)
+  const { location: e, hideFn: o } = t, { worksheet: n, row: a, col: i, unitId: r, subUnitId: s, workbook: l } = e, c = T(tt), u = T(ce), h = n.getCell(a, i), d = mt(n.getCellRaw(a, i)), C = ti(d), [p, R] = j(C), w = p && p.isValid() ? p : qe(), g = T(Q), f = T(at), _ = f.getRuleByLocation(r, s, a, i);
+  if (!_)
     return null;
-  const V = f.getValidator(S.type);
+  const V = f.getValidator(_.type);
   if (!h || !V)
     return;
-  const C = !!((v = S.bizInfo) != null && v.showTime), I = async () => {
+  const S = !!((v = _.bizInfo) != null && v.showTime), I = async () => {
     var F, N, B;
     if (!w)
       return;
-    const P = w.format(C ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00"), U = (F = Je.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 = ya(L);
-    S.errorStyle !== le.STOP || await V.validator({
+    const P = w.format(S ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00"), U = (F = Je.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 = Ma(L);
+    _.errorStyle !== de.STOP || await V.validator({
       value: U,
       unitId: r,
       subUnitId: s,
@@ -146,7 +132,7 @@ function ti(t) {
       workbook: l,
       interceptValue: P.replace("Z", "").replace("T", " "),
       t: xo.NUMBER
-    }, S) ? (o(), await c.executeCommand(rn.id, {
+    }, _) ? (o(), await c.executeCommand(rn.id, {
       visible: !1,
       eventType: nn.Keyboard,
       unitId: r,
@@ -168,11 +154,11 @@ function ti(t) {
         si: null,
         s: {
           n: {
-            pattern: C ? A === "datetime" ? L : "yyyy-MM-dd hh:mm:ss" : A === "date" ? L : "yyyy-MM-dd"
+            pattern: S ? A === "datetime" ? L : "yyyy-MM-dd hh:mm:ss" : A === "date" ? L : "yyyy-MM-dd"
           }
         }
       }
-    })) : u.showReject(V.getRuleFinalError(S, { row: a, col: i, unitId: r, subUnitId: s }));
+    })) : u.showReject(V.getRuleFinalError(_, { row: a, col: i, unitId: r, subUnitId: s }));
   };
   return /* @__PURE__ */ Y("div", { className: Un.dvDateDropdown, children: [
     /* @__PURE__ */ m(
@@ -180,7 +166,7 @@ function ti(t) {
       {
         defaultValue: w,
         pickerValue: w,
-        showTime: C || void 0,
+        showTime: S || void 0,
         onSelect: async (y) => {
           R(y);
         },
@@ -193,15 +179,15 @@ function ti(t) {
     /* @__PURE__ */ m("div", { className: Un.dvDateDropdownBtns, children: /* @__PURE__ */ m(Bt, { size: "small", type: "primary", onClick: I, disabled: !w.isValid(), children: g.t("dataValidation.alert.ok") }) })
   ] });
 }
-var ht = function() {
-  return ht = Object.assign || function(t) {
+var ut = function() {
+  return ut = Object.assign || function(t) {
     for (var e, o = 1, n = arguments.length; o < n; o++) {
       e = arguments[o];
       for (var a in e) Object.prototype.hasOwnProperty.call(e, a) && (t[a] = e[a]);
     }
     return t;
-  }, ht.apply(this, arguments);
-}, ei = function(t, e) {
+  }, ut.apply(this, arguments);
+}, ni = 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")
@@ -209,16 +195,16 @@ var ht = function() {
       e.indexOf(n[a]) < 0 && Object.prototype.propertyIsEnumerable.call(t, n[a]) && (o[n[a]] = t[n[a]]);
   return o;
 }, Ot = Mt(function(t, e) {
-  var o = t.icon, n = t.id, a = t.className, i = t.extend, r = ei(t, ["icon", "id", "className", "extend"]), s = "univerjs-icon univerjs-icon-".concat(n, " ").concat(a || "").trim(), l = Zt("_".concat(ai()));
-  return Co(o, "".concat(n), { defIds: o.defIds, idSuffix: l.current }, ht({ ref: e, className: s }, r), i);
+  var o = t.icon, n = t.id, a = t.className, i = t.extend, r = ni(t, ["icon", "id", "className", "extend"]), s = "univerjs-icon univerjs-icon-".concat(n, " ").concat(a || "").trim(), l = Jt("_".concat(ii()));
+  return Co(o, "".concat(n), { defIds: o.defIds, idSuffix: l.current }, ut({ ref: e, className: s }, r), i);
 });
 function Co(t, e, o, n, a) {
-  return Et(t.tag, ht(ht({ key: e }, ni(t, o, a)), n), (oi(t, o).children || []).map(function(i, r) {
+  return Et(t.tag, ut(ut({ key: e }, oi(t, o, a)), n), (ai(t, o).children || []).map(function(i, r) {
     return Co(i, "".concat(e, "-").concat(t.tag, "-").concat(r), o, void 0, a);
   }));
 }
-function ni(t, e, o) {
-  var n = ht({}, t.attrs);
+function oi(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];
     r === "mask" && typeof s == "string" && (n[r] = s.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
@@ -229,74 +215,74 @@ function ni(t, e, o) {
     typeof s == "string" && (n[r] = s.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   })), n;
 }
-function oi(t, e) {
+function ai(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) ? ht(ht({}, t), { children: t.children.map(function(a) {
-    return typeof a.attrs.id == "string" && n && n.indexOf(a.attrs.id) > -1 ? ht(ht({}, a), { attrs: ht(ht({}, a.attrs), { id: a.attrs.id + e.idSuffix }) }) : a;
+  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 ai() {
+function ii() {
   return Math.random().toString(36).substring(2, 8);
 }
 Ot.displayName = "UniverIcon";
-var ii = { 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" } }] }, Io = Mt(function(t, e) {
+var ri = { 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" } }] }, Io = Mt(function(t, e) {
   return Et(Ot, Object.assign({}, t, {
     id: "check-mark-single",
     ref: e,
-    icon: ii
+    icon: ri
   }));
 });
 Io.displayName = "CheckMarkSingle";
-var ri = { 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" } }] }, wo = Mt(function(t, e) {
+var si = { 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" } }] }, wo = Mt(function(t, e) {
   return Et(Ot, Object.assign({}, t, {
     id: "data-validation-single",
     ref: e,
-    icon: ri
+    icon: si
   }));
 });
 wo.displayName = "DataValidationSingle";
-var si = { 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 = Mt(function(t, e) {
+var li = { 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 = Mt(function(t, e) {
   return Et(Ot, Object.assign({}, t, {
     id: "delete-single",
     ref: e,
-    icon: si
+    icon: li
   }));
 });
 Rn.displayName = "DeleteSingle";
-var li = { 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" } }] }, Ro = Mt(function(t, e) {
+var di = { 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" } }] }, Ro = Mt(function(t, e) {
   return Et(Ot, Object.assign({}, t, {
     id: "increase-single",
     ref: e,
-    icon: li
+    icon: di
   }));
 });
 Ro.displayName = "IncreaseSingle";
-var di = { 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" } }] }, Do = Mt(function(t, e) {
+var ci = { 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" } }] }, Do = Mt(function(t, e) {
   return Et(Ot, Object.assign({}, t, {
     id: "more-down-single",
     ref: e,
-    icon: di
+    icon: ci
   }));
 });
 Do.displayName = "MoreDownSingle";
-var ci = { 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" } }] }, Vo = Mt(function(t, e) {
+var ui = { 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" } }] }, Vo = Mt(function(t, e) {
   return Et(Ot, Object.assign({}, t, {
     id: "more-up-single",
     ref: e,
-    icon: ci
+    icon: ui
   }));
 });
 Vo.displayName = "MoreUpSingle";
-var ui = { 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" } }] }] }, yo = Mt(function(t, e) {
+var hi = { 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" } }] }] }, yo = Mt(function(t, e) {
   return Et(Ot, Object.assign({}, t, {
     id: "sequence-single",
     ref: e,
-    icon: ui
+    icon: hi
   }));
 });
 yo.displayName = "SequenceSingle";
-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--)
+var pi = Object.getOwnPropertyDescriptor, mi = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? pi(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);
@@ -304,7 +290,7 @@ let ft = class extends Vt {
   constructor(e, o) {
     super();
     E(this, "_open$", new Nn(!1));
-    E(this, "open$", this._open$.pipe(ja()));
+    E(this, "open$", this._open$.pipe(Ya()));
     E(this, "_activeRule");
     E(this, "_activeRule$", new Nn(void 0));
     E(this, "activeRule$", this._activeRule$.asObservable());
@@ -345,11 +331,11 @@ let ft = class extends Vt {
     this._activeRule = e, this._activeRule$.next(e);
   }
 };
-ft = pi([
-  Bn(0, st),
+ft = mi([
+  Bn(0, rt),
   Bn(1, mo)
 ], ft);
-function mi() {
+function gi() {
   const t = T(Dt), e = St(t.activeDropdown$, t.activeDropdown), o = T(Ae);
   if (!e)
     return null;
@@ -366,8 +352,8 @@ function mi() {
   ) : null;
 }
 const Mo = "sheet.ui.dropdown";
-var gi = Object.getOwnPropertyDescriptor, fi = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? gi(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+var fi = Object.getOwnPropertyDescriptor, vi = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? fi(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
 }, Lt = (t, e) => (o, n) => e(o, n, t);
@@ -375,7 +361,7 @@ let Dt = class extends Vt {
   constructor(e, o, n, a, i, r, s) {
     super();
     E(this, "_activeDropdown");
-    E(this, "_activeDropdown$", new Ya());
+    E(this, "_activeDropdown$", new Xa());
     E(this, "_currentPopup", null);
     E(this, "activeDropdown$", this._activeDropdown$.asObservable());
     E(this, "_zenVisible", !1);
@@ -470,9 +456,9 @@ let Dt = class extends Vt {
     });
   }
 };
-Dt = fi([
-  Lt(0, b(Ma)),
-  Lt(1, st),
+Dt = vi([
+  Lt(0, b(Ea)),
+  Lt(1, rt),
   Lt(2, b(bt)),
   Lt(3, go),
   Lt(4, yt),
@@ -481,11 +467,11 @@ Dt = fi([
 ], Dt);
 const Me = "DataValidationPanel", Ht = {
   id: "data-validation.operation.open-validation-panel",
-  type: ne.OPERATION,
+  type: ae.OPERATION,
   handler(t, e) {
     if (!e)
       return !1;
-    const { ruleId: o, isAdd: n } = e, a = t.get(ft), i = t.get(ke), r = t.get(st), s = t.get(mo), l = to(r);
+    const { ruleId: o, isAdd: n } = e, a = t.get(ft), i = t.get(ke), r = t.get(rt), s = t.get(mo), l = to(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 && {
@@ -504,19 +490,19 @@ const Me = "DataValidationPanel", Ht = {
   }
 }, Dn = {
   id: "data-validation.operation.close-validation-panel",
-  type: ne.OPERATION,
+  type: ae.OPERATION,
   handler(t) {
     return t.get(ft).close(), !0;
   }
 }, Eo = {
   id: "data-validation.operation.toggle-validation-panel",
-  type: ne.OPERATION,
+  type: ae.OPERATION,
   handler(t) {
     const e = t.get(tt), o = t.get(ft);
     return o.open(), o.isOpen ? e.executeCommand(Dn.id) : e.executeCommand(Ht.id), !0;
   }
 }, Fe = {
-  type: ne.OPERATION,
+  type: ae.OPERATION,
   id: "sheet.operation.show-data-validation-dropdown",
   handler(t, e) {
     if (!e)
@@ -530,33 +516,33 @@ const Me = "DataValidationPanel", Ht = {
     ), !0;
   }
 }, bo = {
-  type: ne.OPERATION,
+  type: ae.OPERATION,
   id: "sheet.operation.hide-data-validation-dropdown",
   handler(t, e) {
     return e ? (t.get(Dt).hideDropdown(), !0) : !1;
   }
-}, Ft = "#ECECEC", Vn = "sheets-data-validation-ui.config", Ee = {}, vi = "univer-dv-list-dropdown", _i = "univer-dv-list-dropdown-title", Si = "univer-dv-list-dropdown-list", Ci = "univer-dv-list-dropdown-list-container", Ii = "univer-dv-list-dropdown-selected-icon", wi = "univer-dv-list-dropdown-item-container", Ri = "univer-dv-list-dropdown-item", Di = "univer-dv-list-dropdown-split", Vi = "univer-dv-list-dropdown-edit", _t = {
-  dvListDropdown: vi,
-  dvListDropdownTitle: _i,
-  dvListDropdownList: Si,
-  dvListDropdownListContainer: Ci,
-  dvListDropdownSelectedIcon: Ii,
-  dvListDropdownItemContainer: wi,
-  dvListDropdownItem: Ri,
-  dvListDropdownSplit: Di,
-  dvListDropdownEdit: Vi
-}, yi = (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(mn), d = l == null ? void 0 : l.toLowerCase(), { row: _, col: p, unitId: R, subUnitId: w } = c, g = a.filter((v) => d ? v.label.toLowerCase().includes(d) : !0), f = (I = (C = h.getConfig(Vn)) == null ? void 0 : C.showEditOnDropdown) != null ? I : !0, S = T(eo), V = $t(() => S.permissionCheckWithRanges(
+}, Ft = "#ECECEC", Vn = "sheets-data-validation-ui.config", Ee = {}, _i = "univer-dv-list-dropdown", Si = "univer-dv-list-dropdown-title", Ci = "univer-dv-list-dropdown-list", Ii = "univer-dv-list-dropdown-list-container", wi = "univer-dv-list-dropdown-selected-icon", Ri = "univer-dv-list-dropdown-item-container", Di = "univer-dv-list-dropdown-item", Vi = "univer-dv-list-dropdown-split", yi = "univer-dv-list-dropdown-edit", _t = {
+  dvListDropdown: _i,
+  dvListDropdownTitle: Si,
+  dvListDropdownList: Ci,
+  dvListDropdownListContainer: Ii,
+  dvListDropdownSelectedIcon: wi,
+  dvListDropdownItemContainer: Ri,
+  dvListDropdownItem: Di,
+  dvListDropdownSplit: Vi,
+  dvListDropdownEdit: yi
+}, Mi = (t) => {
+  var S, 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(mn), d = l == null ? void 0 : l.toLowerCase(), { row: C, col: p, unitId: R, subUnitId: w } = c, g = a.filter((v) => d ? v.label.toLowerCase().includes(d) : !0), f = (I = (S = h.getConfig(Vn)) == null ? void 0 : S.showEditOnDropdown) != null ? I : !0, _ = T(eo), V = $t(() => _.permissionCheckWithRanges(
     {
       workbookTypes: [Ve],
       rangeTypes: [De],
       worksheetTypes: [Re]
     },
-    [{ startColumn: p, startRow: _, endColumn: p, endRow: _ }],
+    [{ startColumn: p, startRow: C, endColumn: p, endRow: C }],
     R,
     w
-  ), [S, p, _, R, w]);
+  ), [_, p, C, R, w]);
   return /* @__PURE__ */ Y("div", { className: _t.dvListDropdown, style: s, children: [
     /* @__PURE__ */ m("div", { className: _t.dvListDropdownTitle, children: i }),
     /* @__PURE__ */ m("div", { className: _t.dvListDropdownList, children: /* @__PURE__ */ m(ia, { children: /* @__PURE__ */ m("div", { className: _t.dvListDropdownListContainer, children: g.map((v, y) => {
@@ -583,19 +569,19 @@ const Me = "DataValidationPanel", Ht = {
     ] }) : null
   ] });
 };
-function Mi(t) {
+function Ei(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(ke), [c, u] = j(""), h = T(tt), d = T(Q), [_, p] = j(""), R = T(ho), w = T(st), g = $t(() => l.ruleChange$.pipe(wn(16)), []), f = T(at);
+  const { location: e, hideFn: o } = t, { worksheet: n, row: a, col: i, unitId: r, subUnitId: s } = e, l = T(ke), [c, u] = j(""), h = T(tt), d = T(Q), [C, p] = j(""), R = T(ho), w = T(rt), g = $t(() => l.ruleChange$.pipe(wn(16)), []), f = T(at);
   St(g);
-  const S = Na.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);
+  const _ = Ua.useContext(), V = ((B = (N = _.current) == null ? void 0 : N.right) != null ? B : 0) - ((z = (x = _.current) == null ? void 0 : x.left) != null ? z : 0);
   if (wt(() => {
     const H = h.onCommandExecuted((G) => {
       var J, et;
-      if (G.id === xa.id) {
-        const nt = G.params, { unitId: lt } = nt, it = w.getUnit(lt, X.UNIVER_DOC);
+      if (G.id === ja.id) {
+        const nt = G.params, { unitId: st } = nt, it = w.getUnit(st, X.UNIVER_DOC);
         if (!it || !R.isVisible().visible) return;
-        const dt = zo.transform.getPlainText((et = (J = it.getSnapshot().body) == null ? void 0 : J.dataStream) != null ? et : "");
-        u(dt);
+        const lt = zo.transform.getPlainText((et = (J = it.getSnapshot().body) == null ? void 0 : J.dataStream) != null ? et : "");
+        u(lt);
       }
     });
     return () => {
@@ -603,18 +589,18 @@ function Mi(t) {
     };
   }, [h, R, w]), !n)
     return null;
-  const C = f.getRuleByLocation(r, s, a, i);
-  if (!C)
+  const S = f.getRuleByLocation(r, s, a, i);
+  if (!S)
     return null;
-  const I = f.getValidator(C.type);
+  const I = f.getValidator(S.type);
   if (!I)
     return null;
-  const v = n.getCell(a, i), y = (C == null ? void 0 : C.renderMode) === ut.CUSTOM || (C == null ? void 0 : C.renderMode) === void 0;
-  if (!v || !C || !I || I.id.indexOf(K.LIST) !== 0)
+  const v = n.getCell(a, i), y = (S == null ? void 0 : S.renderMode) === ct.CUSTOM || (S == null ? void 0 : S.renderMode) === void 0;
+  if (!v || !S || !I || I.id.indexOf(K.LIST) !== 0)
     return;
-  const P = C.type === K.LIST_MULTIPLE, U = I.getListWithColor(C, r, s), O = _ || _a(n.getCellRaw(a, i)), L = ao(O), A = () => {
+  const P = S.type === K.LIST_MULTIPLE, U = I.getListWithColor(S, r, s), O = C || Sa(n.getCellRaw(a, i)), L = ao(O), A = () => {
     h.executeCommand(Ht.id, {
-      ruleId: C.uid
+      ruleId: S.uid
     }), o();
   }, F = U.map((H) => ({
     label: H.label,
@@ -622,7 +608,7 @@ function Mi(t) {
     color: y || H.color ? H.color : "transparent"
   }));
   return /* @__PURE__ */ m(
-    yi,
+    Mi,
     {
       style: { minWidth: V, maxWidth: Math.max(V, 200) },
       title: P ? d.t("dataValidation.listMultiple.dropdown") : d.t("dataValidation.list.dropdown"),
@@ -664,11 +650,11 @@ function Mi(t) {
     }
   );
 }
-const Ei = "univer-data-validation-options-button", bi = "univer-data-validation-options-button-icon", We = {
-  dataValidationOptionsButton: Ei,
-  dataValidationOptionsButtonIcon: bi
+const bi = "univer-data-validation-options-button", Oi = "univer-data-validation-options-button-icon", We = {
+  dataValidationOptionsButton: bi,
+  dataValidationOptionsButtonIcon: Oi
 };
-function Oi(t) {
+function Li(t) {
   var c;
   const e = T(Q), o = T(Ae), { value: n, onChange: a, extraComponent: i } = t, [r, s] = j(!1), l = i ? o.get(i) : null;
   return /* @__PURE__ */ Y(Rt, { children: [
@@ -685,11 +671,11 @@ function Oi(t) {
           children: /* @__PURE__ */ Y(
             fn,
             {
-              value: `${(c = n.errorStyle) != null ? c : le.WARNING}`,
+              value: `${(c = n.errorStyle) != null ? c : de.WARNING}`,
               onChange: (u) => a({ ...n, errorStyle: +u }),
               children: [
-                /* @__PURE__ */ m(Nt, { value: `${le.WARNING}`, children: e.t("dataValidation.panel.showWarning") }),
-                /* @__PURE__ */ m(Nt, { value: `${le.STOP}`, children: e.t("dataValidation.panel.rejectInput") })
+                /* @__PURE__ */ m(Nt, { value: `${de.WARNING}`, children: e.t("dataValidation.panel.showWarning") }),
+                /* @__PURE__ */ m(Nt, { value: `${de.STOP}`, children: e.t("dataValidation.panel.rejectInput") })
               ]
             }
           )
@@ -716,25 +702,25 @@ function Oi(t) {
     ] })
   ] });
 }
-const Li = "univer-data-validation-detail", Ti = "univer-data-validation-detail-form-item", Pi = "univer-data-validation-detail-buttons", Ai = "univer-data-validation-detail-button", xt = {
-  dataValidationDetail: Li,
-  dataValidationDetailFormItem: Ti,
-  dataValidationDetailButtons: Pi,
-  dataValidationDetailButton: Ai
-}, ki = (t) => Ko(
+const Ti = "univer-data-validation-detail", Pi = "univer-data-validation-detail-form-item", Ai = "univer-data-validation-detail-buttons", ki = "univer-data-validation-detail-button", jt = {
+  dataValidationDetail: Ti,
+  dataValidationDetailFormItem: Pi,
+  dataValidationDetailButtons: Ai,
+  dataValidationDetailButton: ki
+}, Fi = (t) => Ko(
   async (e, o, n, a) => {
     const i = await t.executeCommand(e, o, n);
     a == null || a(i);
   },
   1e3
 );
-function Fi(t, e, o) {
+function Ni(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 Ni() {
-  var dt;
-  const [t, e] = j(0), o = T(ft), n = St(o.activeRule$, o.activeRule), { unitId: a, subUnitId: i, rule: r } = n || {}, s = r.uid, l = T(bt), c = T(st), u = T(Ae), h = T(tt), d = T(ke), _ = T(Q), [p, R] = j(r), w = l.getValidatorItem(p.type), [g, f] = j(!1), S = l.getValidatorsByScope(Wa.SHEET), [V, C] = j(() => p.ranges.map((M) => ({ unitId: "", sheetId: "", range: M }))), I = $t(() => ki(h), [h]), [v, y] = j(!1), [P, U] = j(!1), O = Zt(null), L = T(Qn);
+function Ui() {
+  var lt;
+  const [t, e] = j(0), o = T(ft), n = St(o.activeRule$, o.activeRule), { unitId: a, subUnitId: i, rule: r } = n || {}, s = r.uid, l = T(bt), c = T(rt), u = T(Ae), h = T(tt), d = T(ke), C = T(Q), [p, R] = j(r), w = l.getValidatorItem(p.type), [g, f] = j(!1), _ = l.getValidatorsByScope(Ha.SHEET), [V, S] = j(() => p.ranges.map((M) => ({ unitId: "", sheetId: "", range: M }))), I = $t(() => Fi(h), [h]), [v, y] = j(!1), [P, U] = j(!1), O = Jt(null), L = T(Qn);
   if (wt(() => () => {
     const M = L.getCurrentLastSelection();
     M && L.setSelections([M]);
@@ -742,19 +728,19 @@ function Ni() {
     h.onCommandExecuted((M) => {
       (M.id === Go.id || M.id === Zo.id) && setTimeout(() => {
         const D = d.getRuleById(a, i, s);
-        e((k) => k + 1), D && (R(D), C(D.ranges.map((k) => ({ unitId: "", sheetId: "", range: k }))));
+        e((k) => k + 1), D && (R(D), S(D.ranges.map((k) => ({ unitId: "", sheetId: "", range: k }))));
       }, 20);
     });
   }, [h, d, s, i, a]), !w)
     return null;
-  const A = w.operators, F = w.operatorNames, N = p.operator ? Ha.includes(p.operator) : !1, B = () => {
+  const A = w.operators, F = w.operatorNames, N = p.operator ? xa.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 = dn((M) => {
-    const D = M.split(",").filter(Boolean).map(za).map((W) => {
+    const D = M.split(",").filter(Boolean).map(Ka).map((W) => {
       const Ct = W.sheetName;
       if (Ct) {
-        const $o = Fi(c, W.unitId, Ct);
+        const $o = Ni(c, W.unitId, Ct);
         return { ...W, sheetId: $o };
       }
       return {
@@ -764,7 +750,7 @@ function Ni() {
     });
     if (qo(D, V))
       return;
-    C(D);
+    S(D);
     const k = D.filter((W) => (!W.unitId || W.unitId === a) && (!W.sheetId || W.sheetId === i)).map((W) => W.range);
     if (R({
       ...p,
@@ -828,12 +814,12 @@ function Ni() {
       ruleId: p.uid,
       setting: Fn(W)
     });
-  }, et = u.get(w.formulaInput), nt = $t(() => V.map((M) => _o(M.range)).join(","), []), lt = kn(p), it = (M) => {
+  }, et = u.get(w.formulaInput), nt = $t(() => V.map((M) => _o(M.range)).join(","), []), st = kn(p), it = (M) => {
     En(M, kn(p)) || (R({
       ...p,
       ...M
     }), I(
-      Sa.id,
+      Ca.id,
       {
         unitId: a,
         subUnitId: i,
@@ -842,14 +828,14 @@ function Ni() {
       }
     ));
   };
-  return /* @__PURE__ */ Y("div", { className: xt.dataValidationDetail, children: [
+  return /* @__PURE__ */ Y("div", { className: jt.dataValidationDetail, children: [
     /* @__PURE__ */ m(
       q,
       {
-        label: _.t("dataValidation.panel.range"),
-        error: !p.ranges.length || v ? _.t("dataValidation.panel.rangeError") : "",
+        label: C.t("dataValidation.panel.range"),
+        error: !p.ranges.length || v ? C.t("dataValidation.panel.rangeError") : "",
         children: /* @__PURE__ */ m(
-          Ka,
+          Ga,
           {
             selectorRef: O,
             unitId: a,
@@ -868,19 +854,19 @@ function Ni() {
         )
       }
     ),
-    /* @__PURE__ */ m(q, { label: _.t("dataValidation.panel.type"), children: /* @__PURE__ */ m(
+    /* @__PURE__ */ m(q, { label: C.t("dataValidation.panel.type"), children: /* @__PURE__ */ m(
       en,
       {
-        options: S == null ? void 0 : S.map((M) => ({
-          label: _.t(M.title),
+        options: _ == null ? void 0 : _.map((M) => ({
+          label: C.t(M.title),
           value: M.id
         })),
         value: p.type,
         onChange: J,
-        className: xt.dataValidationDetailFormItem
+        className: jt.dataValidationDetailFormItem
       }
     ) }),
-    A != null && A.length ? /* @__PURE__ */ m(q, { label: _.t("dataValidation.panel.operator"), children: /* @__PURE__ */ m(
+    A != null && A.length ? /* @__PURE__ */ m(q, { label: C.t("dataValidation.panel.operator"), children: /* @__PURE__ */ m(
       en,
       {
         options: A.map((M, D) => ({
@@ -894,10 +880,10 @@ function Ni() {
             operator: M
           });
         },
-        className: xt.dataValidationDetailFormItem
+        className: jt.dataValidationDetailFormItem
       }
     ) }) : null,
-    et ? /* @__PURE__ */ m(
+    et ? /* @__PURE__ */ m(q, { children: /* @__PURE__ */ m(
       et,
       {
         isTwoFormula: N,
@@ -918,11 +904,11 @@ function Ni() {
         ruleId: s
       },
       t + p.type
-    ) : null,
+    ) }) : null,
     /* @__PURE__ */ m(q, { children: /* @__PURE__ */ m(
       Pe,
       {
-        checked: (dt = p.allowBlank) != null ? dt : !0,
+        checked: (lt = p.allowBlank) != null ? lt : !0,
         onChange: () => {
           var M;
           return z({
@@ -930,25 +916,25 @@ function Ni() {
             allowBlank: !((M = p.allowBlank) == null || M)
           });
         },
-        children: _.t("dataValidation.panel.allowBlank")
+        children: C.t("dataValidation.panel.allowBlank")
       }
     ) }),
-    /* @__PURE__ */ m(Oi, { value: lt, onChange: it, extraComponent: w.optionsInput }),
-    /* @__PURE__ */ Y("div", { className: xt.dataValidationDetailButtons, children: [
-      /* @__PURE__ */ m(Bt, { className: xt.dataValidationDetailButton, onClick: H, children: _.t("dataValidation.panel.removeRule") }),
-      /* @__PURE__ */ m(Bt, { className: xt.dataValidationDetailButton, type: "primary", onClick: B, children: _.t("dataValidation.panel.done") })
+    /* @__PURE__ */ m(Li, { value: st, onChange: it, extraComponent: w.optionsInput }),
+    /* @__PURE__ */ Y("div", { className: jt.dataValidationDetailButtons, children: [
+      /* @__PURE__ */ m(Bt, { className: jt.dataValidationDetailButton, onClick: H, children: C.t("dataValidation.panel.removeRule") }),
+      /* @__PURE__ */ m(Bt, { className: jt.dataValidationDetailButton, type: "primary", onClick: B, children: C.t("dataValidation.panel.done") })
     ] })
   ] });
 }
-const Ui = "univer-data-validation-item-container", Bi = "univer-data-validation-item-title", $i = "univer-data-validation-item-content", Wi = "univer-data-validation-item-icon", pe = {
-  dataValidationItemContainer: Ui,
-  dataValidationItemTitle: Bi,
-  dataValidationItemContent: $i,
-  dataValidationItemIcon: Wi
-}, Hi = (t) => {
-  const { rule: e, onClick: o, unitId: n, subUnitId: a, disable: i } = t, r = T(bt), s = T(tt), l = T(Ea), c = r.getValidatorItem(e.type), u = Zt(void 0), [h, d] = j(!1), _ = T(zn), p = St(_.currentTheme$), R = $t(() => {
-    var S;
-    const g = (S = p == null ? void 0 : p.loopColor2) != null ? S : "#49B811", f = new Jo(g).toRgb();
+const Bi = "univer-data-validation-item-container", $i = "univer-data-validation-item-title", Wi = "univer-data-validation-item-content", Hi = "univer-data-validation-item-icon", pe = {
+  dataValidationItemContainer: Bi,
+  dataValidationItemTitle: $i,
+  dataValidationItemContent: Wi,
+  dataValidationItemIcon: Hi
+}, xi = (t) => {
+  const { rule: e, onClick: o, unitId: n, subUnitId: a, disable: i } = t, r = T(bt), s = T(tt), l = T(ba), c = r.getValidatorItem(e.type), u = Jt(void 0), [h, d] = j(!1), C = T(zn), p = St(C.currentTheme$), R = $t(() => {
+    var _;
+    const g = (_ = p == null ? void 0 : p.loopColor2) != null ? _ : "#49B811", f = new Jo(g).toRgb();
     return {
       fill: `rgba(${f.r}, ${f.g}, ${f.b}, 0.1)`,
       stroke: g
@@ -990,47 +976,47 @@ const Ui = "univer-data-validation-item-container", Bi = "univer-data-validation
       ]
     }
   );
-}, xi = "univer-data-validation-list", ji = "univer-data-validation-list-buttons", Yi = "univer-data-validation-list-button", me = {
-  dataValidationList: xi,
-  dataValidationListButtons: ji,
-  dataValidationListButton: Yi
+}, ji = "univer-data-validation-list", Yi = "univer-data-validation-list-buttons", Xi = "univer-data-validation-list-button", me = {
+  dataValidationList: ji,
+  dataValidationListButtons: Yi,
+  dataValidationListButton: Xi
 };
-function Xi(t) {
-  const e = T(at), o = T(st), n = T(tt), a = T(Wt), i = T(ft), 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();
+function zi(t) {
+  const e = T(at), o = T(rt), n = T(tt), a = T(Wt), i = T(ft), 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 f = e.ruleChange$.subscribe((S) => {
-      S.unitId === h && S.subUnitId === d && l(e.getRules(h, d));
+    const f = e.ruleChange$.subscribe((_) => {
+      _.unitId === h && _.subUnitId === d && l(e.getRules(h, d));
     });
     return () => {
       f.unsubscribe();
     };
   }, [h, d, e]);
-  const _ = async () => {
-    const f = lo(a), S = {
+  const C = async () => {
+    const f = lo(a), _ = {
       unitId: h,
       subUnitId: d,
       rule: f
     };
-    await n.executeCommand(Sn.id, S), i.setActiveRule({
+    await n.executeCommand(Sn.id, _), i.setActiveRule({
       unitId: h,
       subUnitId: d,
       rule: f
     });
   }, p = () => {
-    n.executeCommand(Ca.id, {
+    n.executeCommand(Ia.id, {
       unitId: h,
       subUnitId: d
     });
   }, w = ((f) => {
-    const S = o.getCurrentUnitForType(X.UNIVER_SHEET), V = S.getActiveSheet(), C = S.getUnitId(), I = V.getSheetId();
-    return f.map((y) => fa(a, C, I, y.ranges) ? { ...y } : { ...y, disable: !0 });
+    const _ = o.getCurrentUnitForType(X.UNIVER_SHEET), V = _.getActiveSheet(), S = _.getUnitId(), I = V.getSheetId();
+    return f.map((y) => fa(a, S, I, y.ranges) ? { ...y } : { ...y, disable: !0 });
   })(s), g = w == null ? void 0 : w.some((f) => f.disable);
   return /* @__PURE__ */ Y("div", { className: me.dataValidationList, children: [
     w == null ? void 0 : w.map((f) => {
-      var S;
+      var _;
       return /* @__PURE__ */ m(
-        Hi,
+        xi,
         {
           unitId: h,
           subUnitId: d,
@@ -1042,33 +1028,33 @@ function Xi(t) {
             });
           },
           rule: f,
-          disable: (S = f.disable) != null ? S : !1
+          disable: (_ = f.disable) != null ? _ : !1
         },
         f.uid
       );
     }),
     /* @__PURE__ */ Y("div", { className: me.dataValidationListButtons, children: [
       s.length && !g ? /* @__PURE__ */ m(Bt, { className: me.dataValidationListButton, onClick: p, children: r.t("dataValidation.panel.removeAll") }) : null,
-      /* @__PURE__ */ m(Bt, { className: me.dataValidationListButton, type: "primary", onClick: _, children: r.t("dataValidation.panel.add") })
+      /* @__PURE__ */ m(Bt, { className: me.dataValidationListButton, type: "primary", onClick: C, children: r.t("dataValidation.panel.add") })
     ] })
   ] });
 }
-const zi = () => {
-  const t = T(ft), e = St(t.activeRule$, t.activeRule), o = T(st), n = St(
+const Ki = () => {
+  const t = T(ft), e = St(t.activeRule$, t.activeRule), o = T(rt), 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 : Xa(null);
+    return (i = n == null ? void 0 : n.activeSheet$) != null ? i : za(null);
   }, void 0, void 0, []);
-  return !n || !a ? null : e && e.subUnitId === a.getSheetId() ? /* @__PURE__ */ m(Ni, {}, e.rule.uid) : /* @__PURE__ */ m(Xi, { workbook: n });
+  return !n || !a ? null : e && e.subUnitId === a.getSheetId() ? /* @__PURE__ */ m(Ui, {}, e.rule.uid) : /* @__PURE__ */ m(zi, { workbook: n });
 }, yn = "data-validation.list.dropdown", Oo = "data-validation.date.dropdown", Ne = {
-  type: ne.COMMAND,
+  type: ae.COMMAND,
   id: "data-validation.command.addRuleAndOpen",
   handler(t) {
-    const e = t.get(st), o = to(e);
+    const e = t.get(rt), o = to(e);
     if (!o) return !1;
     const { workbook: n, worksheet: a } = o, i = lo(t), r = t.get(tt), s = n.getUnitId(), l = a.getSheetId(), c = {
       rule: i,
@@ -1081,11 +1067,11 @@ const zi = () => {
     }), !0) : !1;
   }
 };
-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;
-}, jt = (t, e) => (o, n) => e(o, n, t);
+}, Yt = (t, e) => (o, n) => e(o, n, t);
 const Tt = "SHEET_DATA_VALIDATION_ALERT";
 let ue = class extends Vt {
   constructor(t, e, o, n, a, i) {
@@ -1105,7 +1091,7 @@ let ue = class extends Vt {
           this._cellAlertManagerService.removeAlert(Tt);
           return;
         }
-        if (this._dataValidationModel.validator(a, { ...t.location, workbook: o, worksheet: n }) === de.INVALID) {
+        if (this._dataValidationModel.validator(a, { ...t.location, workbook: o, worksheet: n }) === Kt.INVALID) {
           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(Tt);
@@ -1117,7 +1103,7 @@ let ue = class extends Vt {
             return;
           }
           this._cellAlertManagerService.showAlert({
-            type: La.ERROR,
+            type: Ta.ERROR,
             title: this._localeService.t("dataValidation.error.title"),
             message: l == null ? void 0 : l.getRuleFinalError(a, t.location),
             location: t.location,
@@ -1137,30 +1123,30 @@ let ue = class extends Vt {
     }));
   }
 };
-ue = Gi([
-  jt(0, b(ba)),
-  jt(1, b(Oa)),
-  jt(2, st),
-  jt(3, b(Q)),
-  jt(4, go),
-  jt(5, b(at))
+ue = Zi([
+  Yt(0, b(Oa)),
+  Yt(1, b(La)),
+  Yt(2, rt),
+  Yt(3, b(Q)),
+  Yt(4, go),
+  Yt(5, b(at))
 ], ue);
-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;
 }, He = (t, e) => (o, n) => e(o, n, t);
-let qt = class extends Vt {
+let Qt = 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 = sn([i, r]), [h, d] = u.ranges, { mapFunc: _ } = u, p = {
+      const { source: i, target: r, unitId: s, subUnitId: l } = n, c = this._sheetDataValidationModel.getRuleObjectMatrix(s, l).clone(), u = sn([i, r]), [h, d] = u.ranges, { mapFunc: C } = u, p = {
         row: h.startRow,
         col: h.startColumn
-      }, R = Pa(h, d), w = new Ie(), g = /* @__PURE__ */ new Set();
+      }, R = Aa(h, d), w = new Ie(), g = /* @__PURE__ */ new Set();
       R.forEach((I) => {
         const v = I.repeatStartCell, y = I.relativeRange, P = {
           startRow: p.row,
@@ -1182,7 +1168,7 @@ let qt = class extends Vt {
               endRow: O
             },
             P
-          ), { row: F, col: N } = _(A.startRow, A.startColumn), B = this._sheetDataValidationModel.getRuleIdByLocation(s, l, F, N) || "", x = we.getPositionRange(
+          ), { row: F, col: N } = C(A.startRow, A.startColumn), B = this._sheetDataValidationModel.getRuleIdByLocation(s, l, F, N) || "", x = we.getPositionRange(
             {
               startRow: O,
               startColumn: L,
@@ -1190,15 +1176,15 @@ let qt = class extends Vt {
               endRow: O
             },
             U
-          ), { row: z, col: H } = _(x.startRow, x.startColumn);
+          ), { row: z, col: H } = C(x.startRow, x.startColumn);
           w.setValue(z, H, B), g.add(B);
         });
       });
       const f = Array.from(g).map((I) => ({ id: I, ranges: Qe(w, (v) => v === I) }));
       c.addRangeRules(f);
-      const S = c.diff(this._sheetDataValidationModel.getRules(s, l)), { redoMutations: V, undoMutations: C } = an(s, l, S, this._injector, "patched", a === ie.ONLY_FORMAT);
+      const _ = c.diff(this._sheetDataValidationModel.getRules(s, l)), { redoMutations: V, undoMutations: S } = an(s, l, _, this._injector, "patched", a === se.ONLY_FORMAT);
       return {
-        undos: C,
+        undos: S,
         redos: V
       };
     }, o = {
@@ -1209,29 +1195,29 @@ let qt = class extends Vt {
           for (const l of a.cols) {
             const c = this._sheetDataValidationModel.getRuleByLocation(i, r, s, l);
             if (c && c.type === K.CHECKBOX) {
-              this._autoFillService.setDisableApplyType(ie.SERIES, !0);
+              this._autoFillService.setDisableApplyType(se.SERIES, !0);
               return;
             }
           }
       },
-      onFillData: (n, a, i) => i === ie.COPY || i === ie.ONLY_FORMAT || i === ie.SERIES ? e(n, i) : t(),
+      onFillData: (n, a, i) => i === se.COPY || i === se.ONLY_FORMAT || i === se.SERIES ? e(n, i) : t(),
       onAfterFillData: () => {
       }
     };
     this.disposeWithMe(this._autoFillService.addHook(o));
   }
 };
-qt = qi([
-  He(0, Ta),
+Qt = Ji([
+  He(0, Pa),
   He(1, b(at)),
   He(2, b(Wt))
-], qt);
-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--)
+], Qt);
+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;
 }, xe = (t, e) => (o, n) => e(o, n, t);
-let Jt = class extends Vt {
+let te = class extends Vt {
   constructor(e, o, n) {
     super();
     E(this, "_copyInfo");
@@ -1282,20 +1268,20 @@ let Jt = class extends Vt {
       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 Ie(), l = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = sn([o.copyRange, e]), d = Pn(c, u, !0), _ = /* @__PURE__ */ new Map();
+      const r = this._sheetDataValidationModel.getRuleObjectMatrix(o.unitId, o.subUnitId).clone(), s = new Ie(), l = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = sn([o.copyRange, e]), d = Pn(c, u, !0), C = /* @__PURE__ */ new Map();
       d.forEach(({ startRange: g }) => {
         var f;
-        (f = this._copyInfo) == null || f.matrix.forValue((S, V, C) => {
+        (f = this._copyInfo) == null || f.matrix.forValue((_, V, S) => {
           const I = we.getPositionRange(
             {
-              startRow: S,
-              endRow: S,
+              startRow: _,
+              endRow: _,
               startColumn: V,
               endColumn: V
             },
             g
-          ), v = `${i}-${C}`, y = this._sheetDataValidationModel.getRuleById(a, i, C);
-          !this._sheetDataValidationModel.getRuleById(o.unitId, o.subUnitId, v) && y && _.set(v, { ...y, uid: v });
+          ), v = `${i}-${S}`, y = this._sheetDataValidationModel.getRuleById(a, i, S);
+          !this._sheetDataValidationModel.getRuleById(o.unitId, o.subUnitId, v) && y && C.set(v, { ...y, uid: v });
           const { row: P, col: U } = h(I.startRow, I.startColumn);
           l.add(v), s.setValue(P, U, v);
         });
@@ -1305,7 +1291,7 @@ let Jt = class extends Vt {
       const { redoMutations: R, undoMutations: w } = an(
         o.unitId,
         o.subUnitId,
-        r.diffWithAddition(this._sheetDataValidationModel.getRules(o.unitId, o.subUnitId), _.values()),
+        r.diffWithAddition(this._sheetDataValidationModel.getRules(o.unitId, o.subUnitId), C.values()),
         this._injector,
         "patched",
         !1
@@ -1318,21 +1304,21 @@ let Jt = class extends Vt {
       const r = this._sheetDataValidationModel.getRuleObjectMatrix(a, i).clone(), s = new Ie(), l = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = sn([o.copyRange, e]);
       Pn(c, u, !0).forEach(({ startRange: w }) => {
         var g;
-        (g = this._copyInfo) == null || g.matrix.forValue((f, S, V) => {
-          const C = we.getPositionRange(
+        (g = this._copyInfo) == null || g.matrix.forValue((f, _, V) => {
+          const S = we.getPositionRange(
             {
               startRow: f,
               endRow: f,
-              startColumn: S,
-              endColumn: S
+              startColumn: _,
+              endColumn: _
             },
             w
-          ), { row: I, col: v } = h(C.startRow, C.startColumn);
+          ), { row: I, col: v } = h(S.startRow, S.startColumn);
           s.setValue(I, v, V), l.add(V);
         });
       });
-      const _ = Array.from(l).map((w) => ({ id: w, ranges: Qe(s, (g) => g === w) }));
-      r.addRangeRules(_);
+      const C = Array.from(l).map((w) => ({ id: w, ranges: Qe(s, (g) => g === w) }));
+      r.addRangeRules(C);
       const { redoMutations: p, undoMutations: R } = an(
         a,
         i,
@@ -1348,17 +1334,17 @@ let Jt = class extends Vt {
     }
   }
 };
-Jt = Qi([
-  xe(0, Aa),
+te = tr([
+  xe(0, ka),
   xe(1, b(at)),
   xe(2, b(Wt))
-], Jt);
-var tr = Object.getOwnPropertyDescriptor, er = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? tr(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+], te);
+var er = Object.getOwnPropertyDescriptor, nr = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? er(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
 }, je = (t, e) => (o, n) => e(o, n, t);
-let Qt = class extends Vt {
+let ee = class extends Vt {
   constructor(t, e, o) {
     super(), this._localeService = t, this._commandService = e, this._sheetPermissionCheckController = o, this._commandExecutedListener();
   }
@@ -1378,54 +1364,54 @@ let Qt = class extends Vt {
     );
   }
 };
-Qt = er([
+ee = nr([
   je(0, b(Q)),
   je(1, tt),
   je(2, b(eo))
-], Qt);
+], ee);
 const Lo = "data-validation-single", To = "sheet.menu.data-validation";
-function nr(t) {
+function or(t) {
   return {
     id: To,
     type: Cn.SUBITEMS,
     icon: Lo,
     tooltip: "dataValidation.title",
-    hidden$: Ua(t, X.UNIVER_SHEET),
-    disabled$: ka(t, { workbookTypes: [Ve], worksheetTypes: [on, Re], rangeTypes: [De] })
+    hidden$: Ba(t, X.UNIVER_SHEET),
+    disabled$: Fa(t, { workbookTypes: [Ve], worksheetTypes: [on, Re], rangeTypes: [De] })
   };
 }
-function or(t) {
+function ar(t) {
   return {
     id: Ht.id,
     title: "dataValidation.panel.title",
     type: Cn.BUTTON
   };
 }
-function ar(t) {
+function ir(t) {
   return {
     id: Ne.id,
     title: "dataValidation.panel.add",
     type: Cn.BUTTON
   };
 }
-const ir = {
-  [Ba.FORMULAS_INSERT]: {
+const rr = {
+  [$a.FORMULAS_INSERT]: {
     [To]: {
       order: 9,
-      menuItemFactory: nr,
+      menuItemFactory: or,
       [Ht.id]: {
         order: 0,
-        menuItemFactory: or
+        menuItemFactory: ar
       },
       [Ne.id]: {
         order: 1,
-        menuItemFactory: ar
+        menuItemFactory: ir
       }
     }
   }
 };
-var rr = Object.getOwnPropertyDescriptor, Po = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? rr(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+var sr = Object.getOwnPropertyDescriptor, Po = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? sr(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);
@@ -1435,12 +1421,12 @@ const Ao = {
     color: "#fe4b4b"
   }
 };
-let te = class extends gn {
+let ne = 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(ir);
+    this._menuManagerService.mergeMenu(rr);
   }
   _initDropdown() {
     this._editorBridgeService && this.disposeWithMe(this._editorBridgeService.visible$.subscribe((t) => {
@@ -1496,19 +1482,19 @@ let te = class extends gn {
           priority: oo.DATA_VALIDATION,
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: (t, e, o) => {
-            var g, f, S, V, C;
+            var g, f, _, V, S;
             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 = (g = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? g : de.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), _ = e.rawData;
+            const h = (g = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? g : Kt.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), C = e.rawData;
             let p;
             const R = {
               get value() {
                 var I;
-                return p !== void 0 || (p = (I = rt(_)) != null ? I : null), p;
+                return p !== void 0 || (p = (I = mt(C)) != null ? I : null), p;
               }
             }, w = {
               get value() {
@@ -1520,7 +1506,7 @@ let te = class extends gn {
               ...t,
               markers: {
                 ...t == null ? void 0 : t.markers,
-                ...h === de.INVALID ? Ao : null
+                ...h === Kt.INVALID ? Ao : null
               },
               customRender: [
                 ...(f = t == null ? void 0 : t.customRender) != null ? f : [],
@@ -1528,7 +1514,7 @@ let te = class extends gn {
               ],
               fontRenderExtension: {
                 ...t == null ? void 0 : t.fontRenderExtension,
-                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))
+                isSkip: ((_ = t == null ? void 0 : t.fontRenderExtension) == null ? void 0 : _.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,
@@ -1575,7 +1561,7 @@ let te = class extends gn {
                 };
                 return (F = (A = d == null ? void 0 : d.canvasRender) == null ? void 0 : A.calcCellAutoWidth) == null ? void 0 : F.call(A, y);
               },
-              coverable: ((C = t == null ? void 0 : t.coverable) != null ? C : !0) && !(u.type === K.LIST || u.type === K.LIST_MULTIPLE)
+              coverable: ((S = t == null ? void 0 : t.coverable) != null ? S : !0) && !(u.type === K.LIST || u.type === K.LIST_MULTIPLE)
             });
           }
         }
@@ -1602,11 +1588,11 @@ let te = class extends gn {
     });
   }
 };
-te = Po([
+ne = Po([
   Z(0, tt),
-  Z(1, $a),
+  Z(1, Wa),
   Z(2, yt),
-  Z(3, st),
+  Z(3, rt),
   Z(4, b(po)),
   Z(5, b(Dt)),
   Z(6, b(at)),
@@ -1614,7 +1600,7 @@ te = Po([
   Z(8, b(vn)),
   Z(9, b(uo)),
   Z(10, ta(ho))
-], te);
+], ne);
 let $n = 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();
@@ -1629,19 +1615,19 @@ let $n = class extends gn {
           priority: oo.DATA_VALIDATION,
           // eslint-disable-next-line complexity
           handler: (t, e, o) => {
-            var w, g, f, S, V;
+            var w, g, f, _, 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 = (w = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? w : de.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), _ = l.getCellRaw(n, a), p = rt(_), R = `${p != null ? p : ""}`;
+            const h = (w = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? w : Kt.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), C = l.getCellRaw(n, a), p = mt(C), R = `${p != null ? p : ""}`;
             return o({
               ...t,
               markers: {
                 ...t == null ? void 0 : t.markers,
-                ...h === de.INVALID ? Ao : null
+                ...h === Kt.INVALID ? Ao : null
               },
               customRender: [
                 ...(g = t == null ? void 0 : t.customRender) != null ? g : [],
@@ -1649,26 +1635,26 @@ let $n = class extends gn {
               ],
               fontRenderExtension: {
                 ...t == null ? void 0 : t.fontRenderExtension,
-                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))
+                isSkip: ((f = t == null ? void 0 : t.fontRenderExtension) == null ? void 0 : f.isSkip) || ((_ = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : _.call(d, u, p, e))
               },
               interceptorStyle: {
                 ...t == null ? void 0 : t.interceptorStyle,
                 ...d == null ? void 0 : d.getExtraStyle(u, R, {
                   get style() {
-                    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) || {};
+                    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) || {};
                   }
                 }, n, a)
               },
               interceptorAutoHeight: () => {
                 var y, P, U, O, L, A;
-                const C = (P = (y = this._renderManagerService.getRenderById(i)) == null ? void 0 : y.with(ye).getSkeletonParam(r)) == null ? void 0 : P.skeleton;
-                if (!C)
+                const S = (P = (y = this._renderManagerService.getRenderById(i)) == null ? void 0 : y.with(ye).getSkeletonParam(r)) == null ? void 0 : P.skeleton;
+                if (!S)
                   return;
-                const I = C.worksheet.getMergedCell(n, a), v = {
+                const I = S.worksheet.getMergedCell(n, a), v = {
                   data: t,
-                  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),
+                  style: S.getStyles().getStyleByCell(t),
+                  primaryWithCoord: S.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,
@@ -1710,8 +1696,8 @@ $n = Po([
   Z(5, b(at)),
   Z(6, b(uo))
 ], $n);
-var sr = Object.getOwnPropertyDescriptor, lr = (t, e, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? sr(e, o) : e, i = t.length - 1, r; i >= 0; i--)
+var lr = Object.getOwnPropertyDescriptor, dr = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? lr(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);
@@ -1735,21 +1721,21 @@ let be = class extends Vt {
     this.disposeWithMe(this._sheetDataValidationModel.validStatusChange$.pipe(ea(16)).subscribe(t));
   }
 };
-be = lr([
+be = dr([
   Wn(1, b(at)),
   Wn(2, b(ye))
 ], be);
-const dr = "univer-data-validation-formula", cr = "univer-data-validation-formula-and", ur = "univer-data-validation-formula-list-item", hr = "univer-data-validation-formula-list-item-icon", pr = "univer-data-validation-formula-list-item-drag", mr = "univer-data-validation-formula-list-add", gr = "univer-data-validation-formula-color-select", fr = "univer-data-validation-formula-color-select-panel", vr = "univer-data-validation-formula-color-item", ot = {
-  dataValidationFormula: dr,
-  dataValidationFormulaAnd: cr,
-  dataValidationFormulaListItem: ur,
-  dataValidationFormulaListItemIcon: hr,
-  dataValidationFormulaListItemDrag: pr,
-  dataValidationFormulaListAdd: mr,
-  dataValidationFormulaColorSelect: gr,
-  dataValidationFormulaColorSelectPanel: fr,
-  dataValidationFormulaColorItem: vr
-}, _r = (t) => {
+const cr = "univer-data-validation-formula", ur = "univer-data-validation-formula-and", hr = "univer-data-validation-formula-list-item", pr = "univer-data-validation-formula-list-item-icon", mr = "univer-data-validation-formula-list-item-drag", gr = "univer-data-validation-formula-list-add", fr = "univer-data-validation-formula-color-select", vr = "univer-data-validation-formula-color-select-panel", _r = "univer-data-validation-formula-color-item", ot = {
+  dataValidationFormula: cr,
+  dataValidationFormulaAnd: ur,
+  dataValidationFormulaListItem: hr,
+  dataValidationFormulaListItemIcon: pr,
+  dataValidationFormulaListItemDrag: mr,
+  dataValidationFormulaListAdd: gr,
+  dataValidationFormulaColorSelect: fr,
+  dataValidationFormulaColorSelectPanel: vr,
+  dataValidationFormulaColorItem: _r
+}, Sr = (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__ */ m(q, { error: s, children: /* @__PURE__ */ m(
@@ -1793,7 +1779,7 @@ const dr = "univer-data-validation-formula", cr = "univer-data-validation-formul
     }
   ) });
 };
-function Sr(t) {
+function Cr(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__ */ m(q, { children: /* @__PURE__ */ m(
@@ -1840,13 +1826,13 @@ function Sr(t) {
     ) }) : null
   ] });
 }
-function Cr(t) {
+function Ir(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] = j(!1);
+  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 = Jt({}), [c, u] = j(!1);
   return fo((d) => {
     var p;
-    const _ = (p = l.current) == null ? void 0 : p.handleOutClick;
-    _ && _(d, () => u(!1));
+    const C = (p = l.current) == null ? void 0 : p.handleOutClick;
+    C && C(d, () => u(!1));
   }), /* @__PURE__ */ m(
     So,
     {
@@ -1855,10 +1841,10 @@ function Cr(t) {
       subUnitId: o,
       isFocus: c,
       onChange: (d) => {
-        const _ = (d != null ? d : "").trim();
-        _ !== (n == null ? void 0 : n.formula1) && (a == null || a({
+        const C = (d != null ? d : "").trim();
+        C !== (n == null ? void 0 : n.formula1) && (a == null || a({
           ...n,
-          formula1: _
+          formula1: C
         }));
       },
       errorText: s,
@@ -1868,7 +1854,7 @@ function Cr(t) {
     }
   );
 }
-const Ir = [
+const wr = [
   "#FFFFFF",
   "#FEE7E7",
   "#FEF0E6",
@@ -1893,7 +1879,7 @@ const Ir = [
   "#3A60F7",
   "#9E6DE3",
   "#F248A6"
-], wr = (t) => {
+], Rr = (t) => {
   const { value: e, onChange: o, disabled: n } = t, [a, i] = j(!1);
   return /* @__PURE__ */ m(
     en,
@@ -1913,7 +1899,7 @@ const Ir = [
           style: { background: r.value, marginTop: 5 }
         }
       ),
-      dropdownRender: () => /* @__PURE__ */ m("div", { className: ot.dataValidationFormulaColorSelectPanel, children: Ir.map(
+      dropdownRender: () => /* @__PURE__ */ m("div", { className: ot.dataValidationFormulaColorSelectPanel, children: wr.map(
         (r) => /* @__PURE__ */ m(
           "div",
           {
@@ -1933,7 +1919,7 @@ const Ir = [
   return /* @__PURE__ */ Y("div", { className: ot.dataValidationFormulaListItem, style: n, children: [
     e.isRef ? null : /* @__PURE__ */ m("div", { className: sa(ot.dataValidationFormulaListItemDrag, "draggableHandle"), children: /* @__PURE__ */ m(yo, {}) }),
     /* @__PURE__ */ m(
-      wr,
+      Rr,
       {
         value: e.color,
         onChange: (r) => {
@@ -1954,21 +1940,21 @@ const Ir = [
     e.isRef ? null : /* @__PURE__ */ m("div", { className: ot.dataValidationFormulaListItemIcon, children: /* @__PURE__ */ m(Rn, { onClick: () => i(e.id) }) })
   ] });
 };
-function Rr(t) {
+function Dr(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] = j(() => kt(l) ? "1" : "0"), [_, p] = j(h === "1" ? l : "="), [R, w] = j(h === "1" ? l : "="), g = T(Q), f = T(bt), S = T(ke), V = T(Ia), [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(wn(16)), []), F = St(A), N = dn(o);
+  }, unitId: n, subUnitId: a, validResult: i, showError: r, ruleId: s } = t, { formula1: l = "", formula2: c = "" } = e || {}, u = Jt(null), [h, d] = j(() => kt(l) ? "1" : "0"), [C, p] = j(h === "1" ? l : "="), [R, w] = j(h === "1" ? l : "="), g = T(Q), f = T(bt), _ = T(ke), V = T(wa), [S, 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(() => _.ruleChange$.pipe(wn(16)), []), F = St(A), N = dn(o);
   wt(() => {
     (async () => {
       await new Promise(($) => {
         setTimeout(() => $(!0), 100);
       });
-      const D = S.getRuleById(n, a, s), k = D == null ? void 0 : D.formula1;
+      const D = _.getRuleById(n, a, s), k = D == null ? void 0 : D.formula1;
       if (kt(k) && v && D) {
         const $ = await v.getListAsync(D, n, a);
         P($);
       }
     })();
-  }, [S, F, v, s, a, n]), wt(() => {
+  }, [_, F, v, s, a, n]), wt(() => {
     kt(l) && l !== R && (p(l), w(R));
   }, [R, l]);
   const [B, x] = j(() => {
@@ -1991,7 +1977,7 @@ function Rr(t) {
     id: `${k}`,
     isRef: !0
   })), [G, y]), et = (D, k, $) => {
-    const W = [...C];
+    const W = [...S];
     W[+D] = $, I(W), N({
       formula1: l,
       formula2: W.join(",")
@@ -2025,8 +2011,8 @@ function Rr(t) {
       formula1: io(k.map(($) => $.label)),
       formula2: k.map(($) => $.color === Ft ? "" : $.color).join(",")
     });
-  }, [B, N, h, R, C]);
-  const lt = dn(async (D) => {
+  }, [B, N, h, R, S]);
+  const st = dn(async (D) => {
     if (!kt(D)) {
       N == null || N({
         formula1: "",
@@ -2041,7 +2027,7 @@ function Rr(t) {
       formula1: "",
       formula2: c
     }), p("="), O(g.t("dataValidation.validFail.formulaError")));
-  }), it = Zt({}), [dt, M] = j(!1);
+  }), it = Jt({}), [lt, M] = j(!1);
   return fo((D) => {
     var $;
     const k = ($ = it.current) == null ? void 0 : $.handleOutClick;
@@ -2054,7 +2040,7 @@ function Rr(t) {
         onChange: (D) => {
           d(D), p(R), D === "1" && N({
             formula1: R === "=" ? "" : R,
-            formula2: C.join(",")
+            formula2: S.join(",")
           });
         },
         children: [
@@ -2067,13 +2053,13 @@ function Rr(t) {
       /* @__PURE__ */ m(
         So,
         {
-          initValue: _,
+          initValue: C,
           unitId: n,
           subUnitId: a,
-          isFocus: dt,
+          isFocus: lt,
           onChange: (D = "") => {
             const k = (D != null ? D : "").trim();
-            w(k), lt(k);
+            w(k), st(k);
           },
           errorText: L || U || void 0,
           onFocus: () => M(!0),
@@ -2112,35 +2098,35 @@ function Rr(t) {
     ] }) })
   ] });
 }
-const ko = "data-validation.custom-formula-input", Ue = "data-validation.formula-input", Mn = "data-validation.list-formula-input", Fo = "data-validation.checkbox-formula-input", Dr = [
+const ko = "data-validation.custom-formula-input", Ue = "data-validation.formula-input", Mn = "data-validation.list-formula-input", Fo = "data-validation.checkbox-formula-input", Vr = [
   [
     ko,
-    Cr
+    Ir
   ],
   [
     Ue,
-    _r
+    Sr
   ],
   [
     Mn,
-    Rr
+    Dr
   ],
   [
     Fo,
-    Sr
+    Cr
   ]
-], Vr = "LIST_RENDER_MODE_OPTION_INPUT";
+], yr = "LIST_RENDER_MODE_OPTION_INPUT";
 function Oe(t) {
   var a;
   const { value: e, onChange: o } = t, n = T(Q);
-  return /* @__PURE__ */ m(q, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ Y(fn, { value: `${(a = e.renderMode) != null ? a : ut.CUSTOM}`, onChange: (i) => o({ ...e, renderMode: +i }), children: [
-    /* @__PURE__ */ m(Nt, { value: `${ut.CUSTOM}`, children: n.t("dataValidation.renderMode.chip") }),
-    /* @__PURE__ */ m(Nt, { value: `${ut.ARROW}`, children: n.t("dataValidation.renderMode.arrow") }),
-    /* @__PURE__ */ m(Nt, { value: `${ut.TEXT}`, children: n.t("dataValidation.renderMode.text") })
+  return /* @__PURE__ */ m(q, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ Y(fn, { value: `${(a = e.renderMode) != null ? a : ct.CUSTOM}`, onChange: (i) => o({ ...e, renderMode: +i }), children: [
+    /* @__PURE__ */ m(Nt, { value: `${ct.CUSTOM}`, children: n.t("dataValidation.renderMode.chip") }),
+    /* @__PURE__ */ m(Nt, { value: `${ct.ARROW}`, children: n.t("dataValidation.renderMode.arrow") }),
+    /* @__PURE__ */ m(Nt, { value: `${ct.TEXT}`, children: n.t("dataValidation.renderMode.text") })
   ] }) });
 }
-Oe.componentKey = Vr;
-const yr = "DATE_SHOW_TIME_OPTION";
+Oe.componentKey = yr;
+const Mr = "DATE_SHOW_TIME_OPTION";
 function Le(t) {
   var a;
   const { value: e, onChange: o } = t, n = T(Q);
@@ -2161,12 +2147,12 @@ function Le(t) {
     }
   ) });
 }
-Le.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--)
+Le.componentKey = Mr;
+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--)
     (r = t[i]) && (a = r(a) || a);
   return a;
-}, Yt = (t, e) => (o, n) => e(o, n, t);
+}, Xt = (t, e) => (o, n) => e(o, n, t);
 const ge = 6;
 let cn = class {
   constructor(t, e, o, n, a, i) {
@@ -2177,10 +2163,10 @@ let cn = class {
     const { vt: o, ht: n } = e || {}, a = t.endX - t.startX - ge * 2, i = t.endY - t.startY, r = ((c = e == null ? void 0 : e.fs) != null ? c : 10) * 1.6;
     let s = 0, l = 0;
     switch (o) {
-      case pt.TOP:
+      case ht.TOP:
         l = 0;
         break;
-      case pt.BOTTOM:
+      case ht.BOTTOM:
         l = 0 + (i - r);
         break;
       default:
@@ -2188,10 +2174,10 @@ let cn = class {
         break;
     }
     switch (n) {
-      case zt.LEFT:
+      case Gt.LEFT:
         s = ge;
         break;
-      case zt.RIGHT:
+      case Gt.RIGHT:
         s = ge + (a - r);
         break;
       default:
@@ -2216,8 +2202,8 @@ let cn = class {
     return ((o = e == null ? void 0 : e.fs) != null ? o : 10) * 1.6;
   }
   async _parseFormula(t, e, o) {
-    var c, u, h, d, _, p, R, w, g;
-    const { formula1: n = Da, formula2: a = Ra } = t, i = await this._formulaService.getRuleFormulaResult(e, o, t.uid), r = $e((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 = $e((p = (_ = (d = i == null ? void 0 : i[1]) == null ? void 0 : d.result) == null ? void 0 : _[0]) == null ? void 0 : p[0]), l = Ln(String(r)) && Ln(String(s));
+    var c, u, h, d, C, p, R, w, g;
+    const { formula1: n = Va, formula2: a = Da } = t, i = await this._formulaService.getRuleFormulaResult(e, o, t.uid), r = $e((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 = $e((p = (C = (d = i == null ? void 0 : i[1]) == null ? void 0 : d.result) == null ? void 0 : C[0]) == null ? void 0 : p[0]), l = Ln(String(r)) && Ln(String(s));
     return {
       formula1: kt(n) ? $e((g = (w = (R = i == null ? void 0 : i[0]) == null ? void 0 : R.result) == null ? void 0 : w[0]) == null ? void 0 : g[0]) : n,
       formula2: kt(a) ? s : a,
@@ -2226,17 +2212,17 @@ let cn = class {
   }
   drawWith(t, e) {
     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);
+    const { style: o, primaryWithCoord: n, unitId: a, subUnitId: i, worksheet: r, row: s, col: l } = e, c = n.isMergedMainCell ? n.mergeInfo : n, u = mt(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 _ = this._themeService.getCurrentTheme();
+    const C = 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: R } = p, w = this._calc(c, o), { a: g, d: f } = t.getTransform(), S = bn(w.left, g), V = bn(w.top, f), C = la.create().composeMatrix({
-      left: S,
+    const p = d.parseFormulaSync(h, a, i), { formula1: R } = p, w = this._calc(c, o), { a: g, d: f } = t.getTransform(), _ = bn(w.left, g), V = bn(w.top, f), S = la.create().composeMatrix({
+      left: _,
       top: V,
       scaleX: 1,
       scaleY: 1,
@@ -2247,9 +2233,9 @@ let cn = class {
       flipY: !1
     }), 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();
+    const y = S.getMatrix();
     t.transform(y[0], y[1], y[2], y[3], y[4], y[5]);
-    const P = ((A = o == null ? void 0 : o.fs) != null ? A : 10) * 1.6, U = String(u) === String(R), O = _.hyacinth500;
+    const P = ((A = o == null ? void 0 : o.fs) != null ? A : 10) * 1.6, U = String(u) === String(R), O = C.hyacinth500;
     da.drawWith(t, {
       checked: U,
       width: P,
@@ -2265,13 +2251,13 @@ let cn = class {
     var p;
     if (e.button === 2)
       return;
-    const { primaryWithCoord: o, unitId: n, subUnitId: a, worksheet: i, row: r, col: s } = t, l = rt(i.getCellRaw(r, s)), c = this._dataValidationModel.getRuleByLocation(n, a, r, s);
+    const { primaryWithCoord: o, unitId: n, subUnitId: a, worksheet: i, row: r, col: s } = t, l = mt(i.getCellRaw(r, s)), c = this._dataValidationModel.getRuleByLocation(n, a, r, s);
     if (!c)
       return;
     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), _ = {
+    const { formula1: h, formula2: d } = await this._parseFormula(c, n, a), C = {
       range: {
         startColumn: o.actualColumn,
         endColumn: o.actualColumn,
@@ -2279,37 +2265,37 @@ let cn = class {
         endRow: o.actualRow
       },
       value: {
-        v: String(l) === Va(String(h)) ? d : h,
+        v: String(l) === ya(String(h)) ? d : h,
         p: null
       }
     };
     this._commandService.executeCommand(
       _n.id,
-      _
+      C
     );
   }
   onPointerEnter(t, e) {
     var o, n;
-    (n = (o = Kt(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : o.mainComponent) == null || n.setCursor(Gt.POINTER);
+    (n = (o = Zt(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : o.mainComponent) == null || n.setCursor(qt.POINTER);
   }
   onPointerLeave(t, e) {
     var o, n;
-    (n = (o = Kt(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : o.mainComponent) == null || n.setCursor(Gt.DEFAULT);
+    (n = (o = Zt(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : o.mainComponent) == null || n.setCursor(qt.DEFAULT);
   }
 };
-cn = Er([
-  Yt(0, tt),
-  Yt(1, st),
-  Yt(2, b(wa)),
-  Yt(3, b(zn)),
-  Yt(4, b(yt)),
-  Yt(5, b(at))
+cn = br([
+  Xt(0, tt),
+  Xt(1, rt),
+  Xt(2, b(Ra)),
+  Xt(3, b(zn)),
+  Xt(4, b(yt)),
+  Xt(5, b(at))
 ], cn);
-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--)
+var Or = Object.getOwnPropertyDescriptor, Lr = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? Or(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
-}, Lr = (t, e) => (o, n) => e(o, n, t);
+}, Tr = (t, e) => (o, n) => e(o, n, t);
 let vt = class {
   constructor(t) {
     E(this, "canvasRender", null);
@@ -2319,10 +2305,10 @@ let vt = class {
     this.injector = t;
   }
 };
-vt = Or([
-  Lr(0, b(Wt))
+vt = Lr([
+  Tr(0, b(Wt))
 ], vt);
-class Tr extends vt {
+class Pr extends vt {
   constructor() {
     super(...arguments);
     E(this, "id", K.CHECKBOX);
@@ -2330,48 +2316,48 @@ class Tr extends vt {
     E(this, "formulaInput", Fo);
   }
 }
-class Pr extends vt {
+class Ar extends vt {
   constructor() {
     super(...arguments);
     E(this, "id", K.CUSTOM);
     E(this, "formulaInput", ko);
   }
 }
-const Ar = "data-validation.formula-input";
-class kr extends vt {
+const kr = "data-validation.formula-input";
+class Fr extends vt {
   constructor() {
     super(...arguments);
     E(this, "id", K.DATE);
-    E(this, "formulaInput", Ar);
+    E(this, "formulaInput", kr);
     E(this, "optionsInput", Le.componentKey);
     E(this, "dropdown", Oo);
   }
 }
-class Fr extends vt {
+class Nr extends vt {
   constructor() {
     super(...arguments);
     E(this, "id", K.DECIMAL);
     E(this, "formulaInput", Ue);
   }
 }
-const No = 4, Nr = 0, Ye = 4, Uo = 4, un = 6, Te = 6, At = 14;
-function Ur(t, e) {
+const No = 4, Ur = 0, Ye = 4, Uo = 4, un = 6, Te = 6, At = 14;
+function Br(t, e) {
   const o = ca.getTextSize(t, e), n = o.width + No * 2, { ba: a, bd: i } = o, r = a + i;
   return {
     width: n,
-    height: r + Nr * 2,
+    height: r + Ur * 2,
     ba: a
   };
 }
 function Xe(t, e, o, n) {
   const a = At + un * 2, i = o - a, r = n - Te * 2, s = t.map((d) => ({
-    layout: Ur(d, e),
+    layout: Br(d, e),
     text: d
   }));
   let l;
   const c = [];
   s.forEach((d) => {
-    const { layout: _ } = d, { width: p, height: R } = _;
+    const { layout: C } = d, { width: p, height: R } = C;
     !l || l.width + p + Ye > i ? (l = {
       width: p,
       height: R,
@@ -2385,8 +2371,8 @@ function Xe(t, e, o, n) {
     }), l.width = l.width + p + Ye);
   });
   let u = 0, h = 0;
-  return c.forEach((d, _) => {
-    h = Math.max(h, d.width), _ === c.length - 1 ? u += d.height : u += d.height + Uo;
+  return c.forEach((d, C) => {
+    h = Math.max(h, d.width), C === c.length - 1 ? u += d.height : u += d.height + Uo;
   }), {
     lines: c,
     totalHeight: u,
@@ -2396,24 +2382,24 @@ function Xe(t, e, o, n) {
     calcAutoWidth: h + a
   };
 }
-const Br = 8;
-class $r extends ua {
+const $r = 8;
+class Wr extends ua {
   static drawWith(e, o) {
     const { fontString: n, info: a, fill: i, color: r } = o, { layout: s, text: l } = a;
     e.save(), Jn.drawWith(e, {
       width: s.width,
       height: s.height,
-      radius: Br,
+      radius: $r,
       fill: i || Ft
     }), e.translateWithPrecision(No, s.ba), e.font = n, e.fillStyle = r, e.fillText(l, 0, 0), e.restore();
   }
 }
-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--)
+var Hr = Object.getOwnPropertyDescriptor, xr = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? Hr(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
 }, fe = (t, e) => (o, n) => e(o, n, t);
-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");
+const jr = 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 hn = class {
   constructor(t, e, o, n) {
     E(this, "zIndex");
@@ -2431,58 +2417,58 @@ let hn = class {
     const i = o - At + 4;
     let r = 4;
     switch (a) {
-      case pt.MIDDLE:
+      case ht.MIDDLE:
         r = (n - At) / 2 + 4;
         break;
-      case pt.BOTTOM:
+      case ht.BOTTOM:
         r = n - At + 4;
         break;
     }
-    t.save(), t.translateWithPrecision(e.startX + i, e.startY + r), t.fillStyle = "#565656", t.fill(xr), t.restore();
+    t.save(), t.translateWithPrecision(e.startX + i, e.startY + r), t.fillStyle = "#565656", t.fill(jr), 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: _ = 0, topOffset: p = 0, downOffset: R = 0 } = h || {}, w = this._ensureMap(c), g = this._generateKey(i, r), f = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, r);
+    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: C = 0, topOffset: p = 0, downOffset: R = 0 } = h || {}, w = this._ensureMap(c), g = this._generateKey(i, r), f = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, r);
     if (!f)
       return;
-    const S = this._dataValidationModel.getValidator(f.type);
-    if (!S)
+    const _ = this._dataValidationModel.getValidator(f.type);
+    if (!_)
       return;
     const V = {
       startX: u.startX + d,
-      endX: u.endX - _,
+      endX: u.endX - C,
       startY: u.startY + p,
       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 = Be(s != null ? s : void 0), { vt: U, ht: O } = s || {}, L = U != null ? U : pt.MIDDLE, A = (H = rt(l)) != null ? H : "", F = S.parseCellValue(A), N = S.getListWithColorMap(f), B = Xe(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(un, Te);
+    }, S = 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 = Be(s != null ? s : void 0), { vt: U, ht: O } = s || {}, L = U != null ? U : ht.MIDDLE, A = (H = mt(l)) != null ? H : "", F = _.parseCellValue(A), N = _.getListWithColorMap(f), B = Xe(F, P, S, I);
+    this._drawDownIcon(t, V, S, I, L), t.save(), t.translateWithPrecision(V.startX, V.startY), t.beginPath(), t.rect(0, 0, S - At, I), t.clip(), t.translateWithPrecision(un, Te);
     let x = 0;
     switch (L) {
-      case pt.MIDDLE:
+      case ht.MIDDLE:
         x = (B.contentHeight - B.totalHeight) / 2;
         break;
-      case pt.BOTTOM:
+      case ht.BOTTOM:
         x = B.contentHeight - B.totalHeight;
         break;
     }
     t.translateWithPrecision(0, x), B.lines.forEach((G, J) => {
       t.save();
-      const { width: et, height: nt, items: lt } = G;
+      const { width: et, height: nt, items: st } = G;
       let it = 0;
       switch (O) {
-        case zt.RIGHT:
+        case Gt.RIGHT:
           it = B.contentWidth - et;
           break;
-        case zt.CENTER:
+        case Gt.CENTER:
           it = (B.contentWidth - et) / 2;
           break;
       }
-      t.translate(it, J * (nt + Uo)), lt.forEach((dt) => {
-        t.save(), t.translateWithPrecision(dt.left, 0), $r.drawWith(t, {
+      t.translate(it, J * (nt + Uo)), st.forEach((lt) => {
+        t.save(), t.translateWithPrecision(lt.left, 0), Wr.drawWith(t, {
           ...P,
-          info: dt,
+          info: lt,
           color: y,
-          fill: N[dt.text]
+          fill: N[lt.text]
         }), t.restore();
       }), t.restore();
     }), t.restore(), w.set(g, {
@@ -2493,36 +2479,36 @@ let hn = class {
     });
   }
   calcCellAutoHeight(t) {
-    var C;
+    var S;
     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
-    }, _ = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
-    if (!_)
+    }, C = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
+    if (!C)
       return;
-    const p = this._dataValidationModel.getValidator(_.type);
+    const p = this._dataValidationModel.getValidator(C.type);
     if (!p)
       return;
-    const R = d.endX - d.startX, w = d.endY - d.startY, g = (C = rt(n)) != null ? C : "", f = p.parseCellValue(g), S = Be(o != null ? o : void 0);
-    return Xe(f, S, R, w).cellAutoHeight;
+    const R = d.endX - d.startX, w = d.endY - d.startY, g = (S = mt(n)) != null ? S : "", f = p.parseCellValue(g), _ = Be(o != null ? o : void 0);
+    return Xe(f, _, R, w).cellAutoHeight;
   }
   calcCellAutoWidth(t) {
-    var C;
+    var S;
     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
-    }, _ = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
-    if (!_)
+    }, C = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
+    if (!C)
       return;
-    const p = this._dataValidationModel.getValidator(_.type);
+    const p = this._dataValidationModel.getValidator(C.type);
     if (!p)
       return;
-    const R = d.endX - d.startX, w = d.endY - d.startY, g = (C = rt(n)) != null ? C : "", f = p.parseCellValue(g), S = Be(o != null ? o : void 0);
-    return Xe(f, S, R, w).calcAutoWidth;
+    const R = d.endX - d.startX, w = d.endY - d.startY, g = (S = mt(n)) != null ? S : "", f = p.parseCellValue(g), _ = Be(o != null ? o : void 0);
+    return Xe(f, _, R, w).calcAutoWidth;
   }
   isHit(t, e) {
     const { primaryWithCoord: o } = e, n = o.isMergedMainCell ? o.mergeInfo : o, { endX: a } = n, { x: i } = t;
@@ -2541,20 +2527,20 @@ let hn = class {
   }
   onPointerEnter(t, e) {
     var o, n;
-    return (n = (o = Kt(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : o.mainComponent) == null ? void 0 : n.setCursor(Gt.POINTER);
+    return (n = (o = Zt(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : o.mainComponent) == null ? void 0 : n.setCursor(qt.POINTER);
   }
   onPointerLeave(t, e) {
     var o, n;
-    return (n = (o = Kt(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : o.mainComponent) == null ? void 0 : n.setCursor(Gt.DEFAULT);
+    return (n = (o = Zt(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : o.mainComponent) == null ? void 0 : n.setCursor(qt.DEFAULT);
   }
 };
-hn = Hr([
+hn = xr([
   fe(0, tt),
-  fe(1, st),
+  fe(1, rt),
   fe(2, b(yt)),
   fe(3, b(at))
 ], hn);
-class jr extends vt {
+class Yr extends vt {
   constructor() {
     super(...arguments);
     E(this, "id", K.LIST_MULTIPLE);
@@ -2562,13 +2548,13 @@ class jr extends vt {
     E(this, "dropdown", yn);
   }
 }
-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--)
+var Xr = Object.getOwnPropertyDescriptor, zr = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? Xr(e, o) : e, i = t.length - 1, r; i >= 0; i--)
     (r = t[i]) && (a = r(a) || a);
   return a;
-}, se = (t, e) => (o, n) => e(o, n, t);
-const Pt = 4, ve = 4, mt = 14, gt = 6, Xt = 4, ze = 8, zr = "#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 Kr(t, e) {
+}, le = (t, e) => (o, n) => e(o, n, t);
+const Pt = 4, ve = 4, pt = 14, gt = 6, zt = 4, ze = 8, Kr = "#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 Gr(t, e) {
   const o = t.length;
   return {
     id: "d",
@@ -2579,16 +2565,16 @@ function Kr(t, e) {
           ts: {
             fs: 11,
             ff: void 0,
-            it: oe.FALSE,
-            bl: oe.FALSE,
+            it: ie.FALSE,
+            bl: ie.FALSE,
             ul: {
-              s: oe.FALSE
+              s: ie.FALSE
             },
             st: {
-              s: oe.FALSE
+              s: ie.FALSE
             },
             ol: {
-              s: oe.FALSE
+              s: ie.FALSE
             },
             cl: void 0,
             ...e,
@@ -2609,7 +2595,7 @@ function Kr(t, e) {
   };
 }
 function Bo(t, e, o) {
-  const n = Kr(t, o), a = new na(n), i = new pa(a);
+  const n = Gr(t, o), a = new na(n), i = new pa(a);
   return {
     documentSkeleton: ma.create(i, e),
     docModel: a,
@@ -2634,25 +2620,25 @@ function _e(t, e, o) {
 }
 function jn(t, e, o, n, a, i, r = !0) {
   let s = 0;
-  const l = r ? Xt : 0;
+  const l = r ? zt : 0;
   switch (a) {
-    case pt.BOTTOM:
+    case ht.BOTTOM:
       s = e - n - l;
       break;
-    case pt.MIDDLE:
+    case ht.MIDDLE:
       s = (e - n) / 2;
       break;
     default:
       s = l;
       break;
   }
-  s = Math.max(Xt, s);
+  s = Math.max(zt, s);
   let c = 0;
   switch (i) {
-    case zt.CENTER:
+    case Gt.CENTER:
       c = (t - o) / 2;
       break;
-    case zt.RIGHT:
+    case Gt.RIGHT:
       c = t - o;
       break;
   }
@@ -2675,17 +2661,17 @@ let pn = class {
     return `${t}.${e}`;
   }
   _drawDownIcon(t, e, o, n, a, i, r) {
-    const { t: s = ct.pd.t, b: l = ct.pd.b } = r, c = o - mt;
+    const { t: s = dt.pd.t, b: l = dt.pd.b } = r, c = o - pt;
     let u;
     switch (i) {
-      case pt.MIDDLE:
+      case ht.MIDDLE:
         u = (n - ve) / 2;
         break;
-      case pt.BOTTOM:
-        u = n - l - a - Xt + (a / 2 - ve / 2);
+      case ht.BOTTOM:
+        u = n - l - a - zt + (a / 2 - ve / 2);
         break;
       default:
-        u = s + Xt + (a / 2 - ve / 2);
+        u = s + zt + (a / 2 - ve / 2);
         break;
     }
     t.save(), t.translateWithPrecision(e.startX + c, e.startY + u), t.fillStyle = "#565656", t.fill(xn), t.restore();
@@ -2698,106 +2684,106 @@ let pn = class {
     const h = this._dataValidationModel.getValidator(u.type);
     if (!h)
       return;
-    const d = s == null ? void 0 : s.fontRenderExtension, { leftOffset: _ = 0, rightOffset: p = 0, topOffset: R = 0, downOffset: w = 0 } = d || {};
+    const d = s == null ? void 0 : s.fontRenderExtension, { leftOffset: C = 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 g = {
-      startX: c.startX + _,
+      startX: c.startX + C,
       endX: c.endX - p,
       startY: c.startY + R,
       endY: c.endY - w
-    }, f = g.endX - g.startX, S = g.endY - g.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);
+    }, f = g.endX - g.startX, _ = g.endY - g.startY, V = this._ensureMap(l), S = this._generateKey(a, i), I = h.getListWithColor(u), v = mt(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 : pt.BOTTOM, L = L != null ? L : ct.ht, A = A != null ? A : ct.pd, u.renderMode === ut.ARROW) {
-      const { l: F = ct.pd.l, t: N = ct.pd.t, r: B = ct.pd.r, b: x = ct.pd.b } = A, z = f - F - B - mt - 4, { documentSkeleton: H, documents: G, docModel: J } = _e(y, this._localeService, 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 } = _e(y, this._localeService, r);
       U === It.WRAP && J.updateDocumentDataPageSize(Math.max(z, 1)), H.calculate(), H.getActualSize();
-      const et = ae(H), { height: nt, width: lt } = et, { paddingTop: it, paddingLeft: dt } = jn(z, S - N - x, lt, nt, O, L, !0);
-      this._drawDownIcon(t, g, f, S, nt, O, A), t.save(), t.translateWithPrecision(g.startX + F, g.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(dt, 0), t.restore(), t.restore(), V.set(C, {
-        left: g.endX + F + o.rowHeaderWidth - mt,
+      const et = re(H), { height: nt, width: st } = et, { paddingTop: it, paddingLeft: lt } = jn(z, _ - N - x, st, nt, O, L, !0);
+      this._drawDownIcon(t, g, f, _, nt, O, A), t.save(), t.translateWithPrecision(g.startX + F, g.startY + N), t.beginPath(), t.rect(0, 0, f - F - B, _ - 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(S, {
+        left: g.endX + F + o.rowHeaderWidth - pt,
         top: g.startY + N + o.columnHeaderHeight,
-        width: mt,
-        height: S - N - x
+        width: pt,
+        height: _ - N - x
       });
     } else {
-      t.save(), t.translateWithPrecision(g.startX, g.startY), t.beginPath(), t.rect(0, 0, f, S), t.clip();
-      const F = f - gt * 2 - Pt - mt - 4, { documentSkeleton: N, documents: B, docModel: x } = _e(y, this._localeService, r);
+      t.save(), t.translateWithPrecision(g.startX, g.startY), t.beginPath(), t.rect(0, 0, f, _), t.clip();
+      const F = f - gt * 2 - Pt - pt - 4, { documentSkeleton: N, documents: B, docModel: x } = _e(y, this._localeService, r);
       U === It.WRAP && x.updateDocumentDataPageSize(Math.max(F, 1)), N.calculate();
-      const z = ae(N), { height: H, width: G } = z, { paddingTop: J, paddingLeft: et } = jn(F, S, G, H, O, L);
+      const z = re(N), { height: H, width: G } = z, { paddingTop: J, paddingLeft: et } = jn(F, _, G, H, O, L);
       t.translateWithPrecision(gt, J);
-      const nt = Math.max(f - gt * 2, 1), lt = H;
+      const nt = Math.max(f - gt * 2, 1), st = H;
       Jn.drawWith(t, {
         width: nt,
-        height: lt,
+        height: st,
         fill: (P == null ? void 0 : P.color) || Ft,
         radius: ze
-      }), 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 - ve) / 2), t.fillStyle = zr, t.fill(xn), t.restore(), V.set(C, {
+      }), 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 - ve) / 2), t.fillStyle = Kr, t.fill(xn), t.restore(), V.set(S, {
         left: g.startX + gt + o.rowHeaderWidth,
         top: g.startY + J + o.columnHeaderHeight,
         width: nt,
-        height: lt
+        height: st
       });
     }
   }
   calcCellAutoHeight(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 === ut.TEXT)
+    if (!d || d.renderMode === ct.TEXT)
       return;
-    const _ = {
+    const C = {
       startX: r.startX + l,
       endX: r.endX - c,
       startY: r.startY + u,
       endY: r.endY - h
-    }, p = _.endX - _.startX, R = rt(n), w = `${R != null ? R : ""}`;
+    }, p = C.endX - C.startX, R = mt(n), w = `${R != null ? R : ""}`;
     let { tb: g, pd: f } = o || {};
-    const { t: S = ct.pd.t, b: V = ct.pd.b } = f != null ? f : {};
-    if (g = g != null ? g : It.WRAP, d.renderMode === ut.ARROW) {
-      const C = p - mt, { documentSkeleton: I, docModel: v } = _e(w, this._localeService, o);
-      g === It.WRAP && v.updateDocumentDataPageSize(Math.max(C, 1)), I.calculate(), I.getActualSize();
-      const y = ae(I), { height: P } = y;
-      return P + S + V + Xt * 2;
+    const { t: _ = dt.pd.t, b: V = dt.pd.b } = f != null ? f : {};
+    if (g = g != null ? g : It.WRAP, d.renderMode === ct.ARROW) {
+      const S = p - pt, { documentSkeleton: I, docModel: v } = _e(w, this._localeService, o);
+      g === It.WRAP && v.updateDocumentDataPageSize(Math.max(S, 1)), I.calculate(), I.getActualSize();
+      const y = re(I), { height: P } = y;
+      return P + _ + V + zt * 2;
     } else {
-      const C = p - gt * 2 - Pt - mt, { documentSkeleton: I, docModel: v } = Bo(w, this._localeService, o);
-      g === It.WRAP && v.updateDocumentDataPageSize(Math.max(C, 1)), I.calculate();
-      const y = ae(I), {
+      const S = p - gt * 2 - Pt - pt, { documentSkeleton: I, docModel: v } = Bo(w, this._localeService, o);
+      g === It.WRAP && v.updateDocumentDataPageSize(Math.max(S, 1)), I.calculate();
+      const y = re(I), {
         height: P
       } = y;
-      return P + Xt * 2;
+      return P + zt * 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 === ut.TEXT)
+    if (!d || d.renderMode === ct.TEXT)
       return;
-    const _ = {
+    const C = {
       startX: r.startX + l,
       endX: r.endX - c,
       startY: r.startY + u,
       endY: r.endY - h
-    }, p = _.endX - _.startX, R = rt(n), w = `${R != null ? R : ""}`;
+    }, p = C.endX - C.startX, R = mt(n), w = `${R != null ? R : ""}`;
     let { tb: g, pd: f } = o || {};
-    const { l: S = ct.pd.l, r: V = ct.pd.r } = f != null ? f : {};
+    const { l: _ = dt.pd.l, r: V = dt.pd.r } = f != null ? f : {};
     g = g != null ? g : It.WRAP;
-    let C = gt * 2 + mt;
+    let S = gt * 2 + pt;
     switch (d.renderMode) {
-      case ut.ARROW:
-        C = mt + gt * 2 + V + S;
+      case ct.ARROW:
+        S = pt + gt * 2 + V + _;
         break;
-      case ut.CUSTOM:
-        C = mt + gt * 2 + Pt * 2 + V + S + ze / 2 + 1;
+      case ct.CUSTOM:
+        S = pt + gt * 2 + Pt * 2 + V + _ + ze / 2 + 1;
         break;
       // default is CUSTOM
       default:
-        C = mt + gt * 2 + Pt * 2 + V + S + ze / 2 + 1;
+        S = pt + gt * 2 + Pt * 2 + V + _ + ze / 2 + 1;
     }
-    const I = p - C, { documentSkeleton: v, docModel: y } = _e(w, this._localeService, o);
-    return g === It.WRAP && y.updateDocumentDataPageSize(Math.max(I, 1)), v.calculate(), v.getActualSize(), ae(v).width + C;
+    const I = p - S, { documentSkeleton: v, docModel: y } = _e(w, this._localeService, o);
+    return g === It.WRAP && y.updateDocumentDataPageSize(Math.max(I, 1)), v.calculate(), v.getActualSize(), re(v).width + S;
   }
   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 === ut.TEXT)
+    if (!s || !r || s.renderMode === ct.TEXT)
       return !1;
-    const { top: l, left: c, width: u, height: h } = r, { x: d, y: _ } = t;
-    return d >= c && d <= c + u && _ >= l && _ <= l + h;
+    const { top: l, left: c, width: u, height: h } = r, { x: d, y: C } = t;
+    return d >= c && d <= c + u && C >= l && C <= l + h;
   }
   onPointerDown(t, e) {
     if (e.button === 2)
@@ -2812,21 +2798,21 @@ let pn = class {
   }
   onPointerEnter(t, e) {
     var o, n;
-    (n = (o = Kt(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : o.mainComponent) == null || n.setCursor(Gt.POINTER);
+    (n = (o = Zt(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : o.mainComponent) == null || n.setCursor(qt.POINTER);
   }
   onPointerLeave(t, e) {
     var o, n;
-    (n = (o = Kt(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : o.mainComponent) == null || n.setCursor(Gt.DEFAULT);
+    (n = (o = Zt(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : o.mainComponent) == null || n.setCursor(qt.DEFAULT);
   }
 };
-pn = Xr([
-  se(0, st),
-  se(1, b(Q)),
-  se(2, tt),
-  se(3, b(yt)),
-  se(4, b(at))
+pn = zr([
+  le(0, rt),
+  le(1, b(Q)),
+  le(2, tt),
+  le(3, b(yt)),
+  le(4, b(at))
 ], pn);
-class Gr extends vt {
+class Zr extends vt {
   constructor() {
     super(...arguments);
     E(this, "id", K.LIST);
@@ -2836,39 +2822,39 @@ class Gr extends vt {
     E(this, "formulaInput", Mn);
   }
 }
-class Zr extends vt {
+class qr extends vt {
   constructor() {
     super(...arguments);
     E(this, "id", K.TEXT_LENGTH);
     E(this, "formulaInput", Ue);
   }
 }
-class qr extends vt {
+class Jr extends vt {
   constructor() {
     super(...arguments);
     E(this, "id", K.WHOLE);
     E(this, "formulaInput", Ue);
   }
 }
-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--)
+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--)
     (r = t[i]) && (a = r(a) || a);
   return a;
 }, Ke = (t, e) => (o, n) => e(o, n, t);
-let ee = class extends gn {
+let oe = class extends gn {
   constructor(t, e, o) {
     super(), this._injector = t, this._componentManger = e, this._dataValidatorRegistryService = o, this._initComponents(), this._registerValidatorViews();
   }
   _initComponents() {
     [
       [Lo, wo],
-      [Me, zi],
-      [Mo, mi],
-      [yn, Mi],
-      [Oo, ti],
+      [Me, Ki],
+      [Mo, gi],
+      [yn, Ei],
+      [Oo, ei],
       [Oe.componentKey, Oe],
       [Le.componentKey, Le],
-      ...Dr
+      ...Vr
     ].forEach(([t, e]) => {
       this.disposeWithMe(this._componentManger.register(
         t,
@@ -2878,31 +2864,31 @@ let ee = class extends gn {
   }
   _registerValidatorViews() {
     [
-      Fr,
+      Nr,
+      Jr,
       qr,
+      Fr,
+      Pr,
       Zr,
-      kr,
-      Tr,
-      Gr,
-      jr,
-      Pr
+      Yr,
+      Ar
     ].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);
     });
   }
 };
-ee = Qr([
+oe = ts([
   Ke(0, b(Wt)),
   Ke(1, b(Ae)),
   Ke(2, b(bt))
-], ee);
-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--)
+], oe);
+var es = Object.getOwnPropertyDescriptor, ns = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? es(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 ns = "SHEET_DATA_VALIDATION_UI_PLUGIN";
+const os = "SHEET_DATA_VALIDATION_UI_PLUGIN";
 var Se;
 let Yn = (Se = class extends Zn {
   constructor(t = Ee, e, o, n) {
@@ -2919,12 +2905,12 @@ let Yn = (Se = class extends Zn {
       [ft],
       [Dt],
       [ue],
-      [qt],
-      [te],
       [Qt],
-      [Jt],
+      [ne],
+      [ee],
+      [te],
       [ce],
-      [ee]
+      [oe]
     ].forEach((t) => {
       this._injector.add(t);
     }), [
@@ -2939,29 +2925,29 @@ let Yn = (Se = class extends Zn {
     });
   }
   onReady() {
-    this._injector.get(Jt), this._injector.get(Qt), this._injector.get(ce), this._injector.get(ue), this._injector.get(yt).registerRenderModule(
+    this._injector.get(te), this._injector.get(ee), this._injector.get(ce), this._injector.get(ue), this._injector.get(yt).registerRenderModule(
       X.UNIVER_SHEET,
       [be]
     );
   }
   onRendered() {
-    this._injector.get(ee), this._injector.get(te);
+    this._injector.get(oe), this._injector.get(ne);
   }
   onSteady() {
-    this._injector.get(qt);
+    this._injector.get(Qt);
   }
-}, E(Se, "pluginName", ns), E(Se, "type", X.UNIVER_SHEET), Se);
-Yn = es([
+}, E(Se, "pluginName", os), E(Se, "type", X.UNIVER_SHEET), Se);
+Yn = ns([
   Ge(1, b(Wt)),
   Ge(2, tt),
   Ge(3, mn)
 ], Yn);
-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--)
+var as = Object.getOwnPropertyDescriptor, is = (t, e, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? as(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);
-const is = "SHEET_DATA_VALIDATION_UI_PLUGIN";
+const rs = "SHEET_DATA_VALIDATION_UI_PLUGIN";
 var Ce;
 let Xn = (Ce = class extends Zn {
   constructor(t = Ee, e, o, n) {
@@ -2978,11 +2964,11 @@ let Xn = (Ce = class extends Zn {
       [ft],
       [Dt],
       [ue],
-      [qt],
-      [te],
       [Qt],
-      [Jt],
-      [ee]
+      [ne],
+      [ee],
+      [te],
+      [oe]
     ].forEach((t) => {
       this._injector.add(t);
     }), [
@@ -2997,19 +2983,19 @@ let Xn = (Ce = class extends Zn {
     });
   }
   onReady() {
-    this._injector.get(Jt), this._injector.get(Qt), this._injector.get(yt).registerRenderModule(
+    this._injector.get(te), this._injector.get(ee), this._injector.get(yt).registerRenderModule(
       X.UNIVER_SHEET,
       [be]
     );
   }
   onRendered() {
-    this._injector.get(ee), this._injector.get(te);
+    this._injector.get(oe), this._injector.get(ne);
   }
   onSteady() {
-    this._injector.get(qt);
+    this._injector.get(Qt);
   }
-}, E(Ce, "pluginName", is), E(Ce, "type", X.UNIVER_SHEET), Ce);
-Xn = as([
+}, E(Ce, "pluginName", rs), E(Ce, "type", X.UNIVER_SHEET), Ce);
+Xn = is([
   Ze(1, b(Wt)),
   Ze(2, tt),
   Ze(3, mn)