@univerjs/sheets-data-validation-ui 0.15.4 → 0.15.5

package/lib/es/index.js

@@ -1,40 +1,42 @@
-var Tr = Object.defineProperty;
-var Or = (e, t, n) => t in e ? Tr(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
-var V = (e, t, n) => Or(e, typeof t != "symbol" ? t + "" : t, n);
-import { Disposable as Re, UniverInstanceType as Z, toDisposable as Ar, IUniverInstanceService as le, Inject as D, LocaleService as de, DataValidationErrorStyle as st, DataValidationStatus as Ye, ICommandService as te, Injector as ye, IConfigService as dn, DataValidationRenderMode as ae, DisposableCollection as Pr, dayjs as Nt, numfmt as Wn, CellValueType as Lr, CommandType as tt, DataValidationType as Y, ObjectMatrix as wt, Range as kr, Rectangle as It, queryObjectMatrix as Gt, Optional as Nr, RxDisposable as cn, InterceptorEffectEnum as Hn, sequenceExecute as jn, bufferDebounceTime as Ur, debounce as Fr, UndoCommand as $r, RedoCommand as xr, isUnitRangesEqual as Br, shallowEqual as Rn, ThemeService as Yn, ColorKit as Wr, isFormulaString as De, generateRandomId as yn, VerticalAlign as se, HorizontalAlign as Ie, DEFAULT_STYLES as ee, WrapStrategy as ve, Plugin as Xn, merge as Zn, DependentOn as Hr } from "@univerjs/core";
-import { DeviceInputEventType as pt, IRenderManagerService as Ue, fixLineWidthByScale as Mn, Transform as jr, CheckboxShape as Yr, getCurrentTypeOfRenderer as Xe, CURSOR_TYPE as Ze, FontCache as Xr, Shape as Zr, Rect as zn, getFontStyleString as Ve, DocSimpleSkeleton as rt, Text as bn } from "@univerjs/engine-render";
-import { SheetInterceptorService as un, VALIDATE_CELL as zr, SheetsSelectionsService as Kn, SetRangeValuesCommand as at, getSheetCommandTarget as Gn, rangeToDiscreteRange as Kr, SheetPermissionCheckController as Gr, WorksheetEditPermission as qt, WorksheetSetCellStylePermission as Jt, RangeProtectionPermissionEditPoint as Qt, WorkbookEditablePermission as en, INTERCEPTOR_POINT as qn, InterceptCellContentPriority as Jn, checkRangesEditablePermission as qr } from "@univerjs/sheets";
-import { SheetDataValidationModel as oe, SheetsDataValidationValidatorService as Jr, getDataValidationCellValue as Ut, getCellValueOrigin as re, serializeListOptions as Qn, createDefaultNewRule as er, AddSheetDataValidationCommand as hn, DATA_VALIDATION_PLUGIN_NAME as tr, getDataValidationDiffMutations as tn, UpdateSheetDataValidationRangeCommand as nr, DataValidationCacheService as rr, UpdateSheetDataValidationSettingCommand as En, UpdateSheetDataValidationOptionsCommand as Qr, RemoveSheetDataValidationCommand as or, RemoveSheetAllDataValidationCommand as eo, DataValidationFormulaController as to, deserializeListOptions as no, CUSTOM_FORMULA_INPUT_NAME as ir, BASE_FORMULA_INPUT_NAME as At, LIST_FORMULA_INPUT_NAME as pn, CHECKBOX_FORMULA_INPUT_NAME as ar, DataValidationFormulaService as ro, CHECKBOX_FORMULA_2 as oo, CHECKBOX_FORMULA_1 as io, getFormulaResult as Ft, isLegalFormulaResult as Dn, transformCheckboxValue as ao, UniverSheetsDataValidationPlugin as so } from "@univerjs/sheets-data-validation";
-import { DataValidatorRegistryService as Me, DataValidatorDropdownType as pe, DataValidationModel as gn, DataValidatorRegistryScope as lo, TWO_FORMULA_OPERATOR_COUNT as co, getRuleOptions as Vn, getRuleSetting as Tn } from "@univerjs/data-validation";
-import { ISidebarService as sr, IDialogService as uo, IZenZoneService as lr, KeyCode as gt, MenuItemType as vn, getMenuHiddenObservable as ho, RibbonDataGroup as po, IMenuManagerService as go, useDependency as F, ComponentManager as mn, useObservable as Oe, useEvent as nn, useSidebarClick as dr } from "@univerjs/ui";
-import { filter as fn, BehaviorSubject as On, distinctUntilChanged as vo, Subject as mo, debounceTime as cr, bufferTime as ur, of as fo } from "rxjs";
-import { getPatternType as _o } from "@univerjs/sheets-numfmt";
-import { ISheetCellDropdownManagerService as Co, IEditorBridgeService as hr, SetCellEditVisibleOperation as vt, HoverManagerService as So, CellAlertManagerService as wo, CellAlertType as Io, IAutoFillService as Ro, APPLY_TYPE as ot, virtualizeDiscreteRanges as rn, getAutoFillRepeatRange as yo, ISheetClipboardService as Mo, COPY_TYPE as An, PREDEFINED_HOOK_NAME_PASTE as mt, getRepeatRange as Pn, getCurrentRangeDisable$ as bo, AutoHeightController as pr, SheetSkeletonManagerService as lt, IMarkSelectionService as Eo } from "@univerjs/sheets-ui";
-import { Button as ze, FormLayout as X, RadioGroup as _n, Radio as Ae, Checkbox as Pt, Input as Pe, Select as Ln, clsx as ke, borderClassName as Rt, DraggableList as Do, Dropdown as Vo } from "@univerjs/design";
-import { createElement as we, useRef as ht, forwardRef as nt, useState as W, useMemo as dt, useEffect as Le } from "react";
-import { jsxs as j, Fragment as ct, jsx as C } from "react/jsx-runtime";
-import { deserializeRangeWithSheet as To, serializeRange as gr } from "@univerjs/engine-formula";
-import { RangeSelector as Oo, FormulaEditor as vr } from "@univerjs/sheets-formula-ui";
-var Ao = Object.getOwnPropertyDescriptor, Po = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Ao(t, n) : t, i = e.length - 1, a; i >= 0; i--)
+var Lr = Object.defineProperty;
+var kr = (e, t, n) => t in e ? Lr(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
+var V = (e, t, n) => kr(e, typeof t != "symbol" ? t + "" : t, n);
+import { Disposable as De, UniverInstanceType as H, toDisposable as Nr, IUniverInstanceService as pe, Inject as E, LocaleService as ge, DataValidationErrorStyle as ct, DataValidationStatus as ze, ICommandService as oe, Injector as Ve, IConfigService as hn, DataValidationRenderMode as ue, DisposableCollection as Ur, dayjs as $t, numfmt as Yn, CellValueType as Fr, CommandType as ot, DataValidationType as X, ObjectMatrix as yt, Range as $r, Rectangle as Mt, queryObjectMatrix as Qt, Optional as xr, RxDisposable as pn, InterceptorEffectEnum as Xn, sequenceExecute as Zn, bufferDebounceTime as Br, debounce as Wr, UndoCommand as Hr, RedoCommand as jr, isUnitRangesEqual as Yr, shallowEqual as bn, ThemeService as zn, ColorKit as Xr, isFormulaString as Pe, generateRandomId as En, VerticalAlign as he, HorizontalAlign as Ee, DEFAULT_STYLES as re, WrapStrategy as Se, Plugin as Kn, merge as Gn, DependentOn as Zr } from "@univerjs/core";
+import { DeviceInputEventType as mt, IRenderManagerService as xe, fixLineWidthByScale as Dn, Transform as zr, CheckboxShape as Kr, getCurrentTypeOfRenderer as Ke, CURSOR_TYPE as Ge, FontCache as Gr, Shape as qr, Rect as qn, getFontStyleString as Le, DocSimpleSkeleton as at, Text as Vn } from "@univerjs/engine-render";
+import { SheetInterceptorService as gn, VALIDATE_CELL as Jr, SheetsSelectionsService as Jn, SetRangeValuesCommand as dt, getSheetCommandTarget as Qn, IAutoFillService as Qr, AUTO_FILL_APPLY_TYPE as st, AutoFillTools as eo, rangeToDiscreteRange as to, SheetPermissionCheckController as no, WorksheetEditPermission as en, WorksheetSetCellStylePermission as tn, RangeProtectionPermissionEditPoint as nn, WorkbookEditablePermission as rn, INTERCEPTOR_POINT as er, InterceptCellContentPriority as tr, SetWorksheetActiveOperation as ro, checkRangesEditablePermission as oo } from "@univerjs/sheets";
+import { SheetDataValidationModel as ae, SheetsDataValidationValidatorService as io, getDataValidationCellValue as xt, getCellValueOrigin as ie, serializeListOptions as nr, createDefaultNewRule as rr, AddSheetDataValidationCommand as vn, DATA_VALIDATION_PLUGIN_NAME as or, getDataValidationDiffMutations as on, UpdateSheetDataValidationRangeCommand as ir, DataValidationCacheService as ar, UpdateSheetDataValidationSettingCommand as Tn, UpdateSheetDataValidationOptionsCommand as ao, RemoveSheetDataValidationCommand as sr, RemoveSheetAllDataValidationCommand as so, DataValidationFormulaController as lo, deserializeListOptions as co, CUSTOM_FORMULA_INPUT_NAME as lr, BASE_FORMULA_INPUT_NAME as kt, LIST_FORMULA_INPUT_NAME as mn, CHECKBOX_FORMULA_INPUT_NAME as dr, DataValidationFormulaService as uo, CHECKBOX_FORMULA_2 as ho, CHECKBOX_FORMULA_1 as po, getFormulaResult as Bt, isLegalFormulaResult as On, transformCheckboxValue as go, UniverSheetsDataValidationPlugin as vo } from "@univerjs/sheets-data-validation";
+import { DataValidatorRegistryService as Te, DataValidatorDropdownType as fe, DataValidationModel as fn, DataValidatorRegistryScope as mo, TWO_FORMULA_OPERATOR_COUNT as fo, getRuleOptions as An, getRuleSetting as Pn } from "@univerjs/data-validation";
+import { ISidebarService as cr, IDialogService as _o, IZenZoneService as ur, KeyCode as ft, MenuItemType as _n, getMenuHiddenObservable as So, RibbonDataGroup as Co, IMenuManagerService as Io, useDependency as F, ComponentManager as Sn, useObservable as Re, useEvent as an, useSidebarClick as hr } from "@univerjs/ui";
+import { filter as Cn, BehaviorSubject as Ln, distinctUntilChanged as wo, Subject as Ro, debounceTime as pr, bufferTime as gr, of as vr } from "rxjs";
+import { getPatternType as yo } from "@univerjs/sheets-numfmt";
+import { ISheetCellDropdownManagerService as Mo, IEditorBridgeService as mr, SetCellEditVisibleOperation as _t, HoverManagerService as bo, CellAlertManagerService as Eo, CellAlertType as Do, virtualizeDiscreteRanges as sn, ISheetClipboardService as Vo, COPY_TYPE as kn, PREDEFINED_HOOK_NAME_PASTE as St, getRepeatRange as Nn, getCurrentRangeDisable$ as To, AutoHeightController as fr, SheetSkeletonManagerService as ut, IMarkSelectionService as Oo } from "@univerjs/sheets-ui";
+import { Button as qe, FormLayout as Z, RadioGroup as In, Radio as Ne, Checkbox as Nt, Input as Ue, Select as Un, clsx as Fe, borderClassName as bt, DraggableList as Ao, Dropdown as Po } from "@univerjs/design";
+import { createElement as ye, useRef as vt, forwardRef as it, useState as W, useMemo as ht, useEffect as be } from "react";
+import { jsxs as Y, Fragment as pt, jsx as S } from "react/jsx-runtime";
+import { deserializeRangeWithSheet as Lo, serializeRange as _r } from "@univerjs/engine-formula";
+import { RangeSelector as ko, FormulaEditor as Sr } from "@univerjs/sheets-formula-ui";
+var No = Object.getOwnPropertyDescriptor, Uo = (e, t, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? No(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, kn = (e, t) => (n, r) => t(n, r, e);
-let me = class extends Re {
+}, Fn = (e, t) => (n, r) => t(n, r, e);
+let _e = class extends De {
   constructor(t, n) {
     super();
-    V(this, "_open$", new On(!1));
-    V(this, "open$", this._open$.pipe(vo()));
+    V(this, "_open$", new Ln(!1));
+    V(this, "open$", this._open$.pipe(wo()));
     V(this, "_activeRule");
-    V(this, "_activeRule$", new On(void 0));
+    V(this, "_activeRule$", new Ln(void 0));
     V(this, "activeRule$", this._activeRule$.asObservable());
     V(this, "_closeDisposable", null);
+    // Record the worksheet to which the rule using the range selector belongs, so that the rule list is not switched when making cross-sheet selections
+    V(this, "_focusFormulaEditorActiveRuleSubUnitId", null);
     this._univerInstanceService = t, this._sidebarService = n, this.disposeWithMe(
-      this._univerInstanceService.getCurrentTypeOfUnit$(Z.UNIVER_SHEET).pipe(fn((r) => !r)).subscribe(() => {
+      this._univerInstanceService.getCurrentTypeOfUnit$(H.UNIVER_SHEET).pipe(Cn((r) => !r)).subscribe(() => {
         this.close();
       })
     ), this.disposeWithMe(this._sidebarService.sidebarOptions$.subscribe((r) => {
-      r.id === bt && (r.visible || setTimeout(() => {
+      r.id === Vt && (r.visible || setTimeout(() => {
         this._sidebarService.sidebarOptions$.next({ visible: !1 });
       }));
     }));
@@ -57,40 +59,46 @@ let me = class extends Re {
     this._open$.next(!1), (t = this._closeDisposable) == null || t.dispose();
   }
   setCloseDisposable(t) {
-    this._closeDisposable = Ar(() => {
+    this._closeDisposable = Nr(() => {
       t.dispose(), this._closeDisposable = null;
     });
   }
   setActiveRule(t) {
     this._activeRule = t, this._activeRule$.next(t);
   }
+  setFocusFormulaEditorActiveRuleSubUnitId(t) {
+    this._focusFormulaEditorActiveRuleSubUnitId = t;
+  }
+  getFocusFormulaEditorActiveRuleSubUnitId() {
+    return this._focusFormulaEditorActiveRuleSubUnitId;
+  }
 };
-me = Po([
-  kn(0, le),
-  kn(1, sr)
-], me);
-const Te = "#ECECEC", yt = "sheets-data-validation-ui.config", Mt = {};
-var Lo = Object.getOwnPropertyDescriptor, ko = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Lo(t, n) : t, i = e.length - 1, a; i >= 0; i--)
+_e = Uo([
+  Fn(0, pe),
+  Fn(1, cr)
+], _e);
+const ke = "#ECECEC", Et = "sheets-data-validation-ui.config", Dt = {};
+var Fo = Object.getOwnPropertyDescriptor, $o = (e, t, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Fo(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, xe = (e, t) => (n, r) => t(n, r, e);
-let Ke = class extends Re {
+}, He = (e, t) => (n, r) => t(n, r, e);
+let Je = class extends De {
   constructor(e, t, n, r, o, i) {
     super(), this._sheetInterceptorService = e, this._dataValidationModel = t, this._dataValidatorRegistryService = n, this._dialogService = r, this._localeService = o, this._sheetsDataValidationValidatorService = i, this._initEditorBridgeInterceptor();
   }
   _initEditorBridgeInterceptor() {
     this.disposeWithMe(this._sheetInterceptorService.writeCellInterceptor.intercept(
-      zr,
+      Jr,
       {
         handler: async (e, t, n) => {
           const r = await e, { row: o, col: i, unitId: a, subUnitId: l } = t, s = this._dataValidationModel.getRuleIdByLocation(a, l, o, i), d = s ? this._dataValidationModel.getRuleById(a, l, s) : void 0;
           if (r === !1)
             return n(Promise.resolve(!1));
-          if (!d || d.errorStyle !== st.STOP)
+          if (!d || d.errorStyle !== ct.STOP)
             return n(Promise.resolve(!0));
           const u = this._dataValidatorRegistryService.getValidatorItem(d.type);
-          return !u || await this._sheetsDataValidationValidatorService.validatorCell(a, l, o, i) === Ye.VALID ? n(Promise.resolve(!0)) : (this._dialogService.open({
+          return !u || await this._sheetsDataValidationValidatorService.validatorCell(a, l, o, i) === ze.VALID ? n(Promise.resolve(!0)) : (this._dialogService.open({
             width: 368,
             title: {
               title: this._localeService.t("dataValidation.alert.title")
@@ -100,8 +108,8 @@ let Ke = class extends Re {
               title: u.getRuleFinalError(d, { row: o, col: i, unitId: a, subUnitId: l })
             },
             footer: {
-              title: we(
-                ze,
+              title: ye(
+                qe,
                 {
                   variant: "primary",
                   onClick: () => this._dialogService.close("reject-input-dialog")
@@ -128,8 +136,8 @@ let Ke = class extends Re {
         title: e
       },
       footer: {
-        title: we(
-          ze,
+        title: ye(
+          qe,
           {
             variant: "primary",
             onClick: () => this._dialogService.close("reject-input-dialog")
@@ -143,31 +151,31 @@ let Ke = class extends Re {
     });
   }
 };
-Ke = ko([
-  xe(0, D(un)),
-  xe(1, D(oe)),
-  xe(2, D(Me)),
-  xe(3, uo),
-  xe(4, D(de)),
-  xe(5, D(Jr))
-], Ke);
-var No = Object.getOwnPropertyDescriptor, Uo = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? No(t, n) : t, i = e.length - 1, a; i >= 0; i--)
+Je = $o([
+  He(0, E(gn)),
+  He(1, E(ae)),
+  He(2, E(Te)),
+  He(3, _o),
+  He(4, E(ge)),
+  He(5, E(io))
+], Je);
+var xo = Object.getOwnPropertyDescriptor, Bo = (e, t, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? xo(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, ue = (e, t) => (n, r) => t(n, r, e);
-const $t = (e) => {
+}, ve = (e, t) => (n, r) => t(n, r, e);
+const Wt = (e) => {
   if (e == null || typeof e == "boolean")
     return;
-  if (e === "") return Nt();
+  if (e === "") return $t();
   if (typeof e == "number" || !Number.isNaN(+e))
-    return Nt(Wn.format("yyyy-MM-dd HH:mm:ss", Number(e)));
-  const t = Nt(e);
+    return $t(Yn.format("yyyy-MM-dd HH:mm:ss", Number(e)));
+  const t = $t(e);
   if (t.isValid())
     return t;
 };
-function Fo(e, t) {
-  const n = _o(t);
+function Wo(e, t) {
+  const n = yo(t);
   if (e === n)
     return t;
   switch (e) {
@@ -179,15 +187,15 @@ function Fo(e, t) {
       return "HH:mm:ss";
   }
 }
-let Ne = class extends Re {
-  constructor(t, n, r, o, i, a, l, s, d, u, g) {
+let $e = class extends De {
+  constructor(t, n, r, o, i, a, l, s, d, u, h) {
     super();
     V(this, "_activeDropdown");
-    V(this, "_activeDropdown$", new mo());
+    V(this, "_activeDropdown$", new Ro());
     V(this, "_currentPopup", null);
     V(this, "activeDropdown$", this._activeDropdown$.asObservable());
     V(this, "_zenVisible", !1);
-    this._univerInstanceService = t, this._dataValidatorRegistryService = n, this._zenZoneService = r, this._dataValidationModel = o, this._sheetsSelectionsService = i, this._cellDropdownManagerService = a, this._sheetDataValidationModel = l, this._commandService = s, this._editorBridgeService = d, this._injector = u, this._configService = g, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
+    this._univerInstanceService = t, this._dataValidatorRegistryService = n, this._zenZoneService = r, this._dataValidationModel = o, this._sheetsSelectionsService = i, this._cellDropdownManagerService = a, this._sheetDataValidationModel = l, this._commandService = s, this._editorBridgeService = d, this._injector = u, this._configService = h, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
       this._activeDropdown$.complete();
     });
   }
@@ -200,7 +208,7 @@ let Ne = class extends Re {
     }));
   }
   _getDropdownByCell(t, n, r, o) {
-    const i = t ? this._univerInstanceService.getUnit(t, Z.UNIVER_SHEET) : this._univerInstanceService.getCurrentUnitForType(Z.UNIVER_SHEET);
+    const i = t ? this._univerInstanceService.getUnit(t, H.UNIVER_SHEET) : this._univerInstanceService.getCurrentUnitForType(H.UNIVER_SHEET);
     if (!i)
       return;
     const a = n ? i.getSheetBySheetId(n) : i.getActiveSheet();
@@ -219,7 +227,7 @@ let Ne = class extends Re {
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   showDropdown(t) {
-    var E, R, w, S, I, b;
+    var D, v, C, f, w, b;
     const { location: n } = t, { row: r, col: o, unitId: i, subUnitId: a, workbook: l, worksheet: s } = n;
     if (this._currentPopup && this._currentPopup.dispose(), this._zenVisible)
       return;
@@ -230,13 +238,13 @@ let Ne = class extends Re {
     const u = this._dataValidatorRegistryService.getValidatorItem(d.type);
     if (!(u != null && u.dropdownType))
       return;
-    let g;
-    const c = async (v, p) => {
-      var A, x, H;
-      if (!v)
+    let h;
+    const c = async (g, p) => {
+      var U, k, x;
+      if (!g)
         return !0;
-      const _ = v, P = s.getCell(r, o), k = _.format(p === "date" ? "YYYY-MM-DD 00:00:00" : "YYYY-MM-DD HH:mm:ss"), U = (A = Wn.parseDate(k)) == null ? void 0 : A.v, L = p === "time" ? U % 1 : U, y = l.getStyles().getStyleByCell(P), T = (H = (x = y == null ? void 0 : y.n) == null ? void 0 : x.pattern) != null ? H : "";
-      return d.errorStyle !== st.STOP || await u.validator({
+      const _ = g, T = s.getCell(r, o), A = _.format(p === "date" ? "YYYY-MM-DD 00:00:00" : "YYYY-MM-DD HH:mm:ss"), P = (U = Yn.parseDate(A)) == null ? void 0 : U.v, L = p === "time" ? P % 1 : P, y = l.getStyles().getStyleByCell(T), O = (x = (k = y == null ? void 0 : y.n) == null ? void 0 : k.pattern) != null ? x : "";
+      return d.errorStyle !== ct.STOP || await u.validator({
         value: L,
         unitId: i,
         subUnitId: a,
@@ -244,9 +252,9 @@ let Ne = class extends Re {
         column: o,
         worksheet: s,
         workbook: l,
-        interceptValue: k.replace("Z", "").replace("T", " "),
-        t: Lr.NUMBER
-      }, d) ? (await this._commandService.executeCommand(at.id, {
+        interceptValue: A.replace("Z", "").replace("T", " "),
+        t: Fr.NUMBER
+      }, d) ? (await this._commandService.executeCommand(dt.id, {
         unitId: i,
         subUnitId: a,
         range: {
@@ -263,35 +271,35 @@ let Ne = class extends Re {
           si: null,
           s: {
             n: {
-              pattern: Fo(p, T)
+              pattern: Wo(p, O)
             }
           }
         }
-      }), await this._commandService.executeCommand(vt.id, {
+      }), await this._commandService.executeCommand(_t.id, {
         visible: !1,
-        eventType: pt.Keyboard,
+        eventType: mt.Keyboard,
         unitId: i,
-        keycode: gt.ESC
-      }), !0) : (this._injector.has(Ke) && this._injector.get(Ke).showReject(u.getRuleFinalError(d, { row: r, col: o, unitId: i, subUnitId: a })), !1);
+        keycode: ft.ESC
+      }), !0) : (this._injector.has(Je) && this._injector.get(Je).showReject(u.getRuleFinalError(d, { row: r, col: o, unitId: i, subUnitId: a })), !1);
     };
     let m;
     switch (u.dropdownType) {
-      case pe.DATE: {
-        const v = re(s.getCellRaw(r, o)), p = $t(v), _ = !!((E = d.bizInfo) != null && E.showTime);
+      case fe.DATE: {
+        const g = ie(s.getCellRaw(r, o)), p = Wt(g), _ = !!((D = d.bizInfo) != null && D.showTime);
         m = {
           location: n,
           type: "datepicker",
           props: {
             showTime: _,
-            onChange: (P) => c(P, _ ? "datetime" : "date"),
+            onChange: (T) => c(T, _ ? "datetime" : "date"),
             defaultValue: p,
             patternType: "date"
           }
         };
         break;
       }
-      case pe.TIME: {
-        const v = re(s.getCellRaw(r, o)), p = $t(v);
+      case fe.TIME: {
+        const g = ie(s.getCellRaw(r, o)), p = Wt(g);
         m = {
           location: n,
           type: "datepicker",
@@ -303,8 +311,8 @@ let Ne = class extends Re {
         };
         break;
       }
-      case pe.DATETIME: {
-        const v = re(s.getCellRaw(r, o)), p = $t(v);
+      case fe.DATETIME: {
+        const g = ie(s.getCellRaw(r, o)), p = Wt(g);
         m = {
           location: n,
           type: "datepicker",
@@ -316,10 +324,10 @@ let Ne = class extends Re {
         };
         break;
       }
-      case pe.LIST:
-      case pe.MULTIPLE_LIST: {
-        const v = u.dropdownType === pe.MULTIPLE_LIST, p = async (y) => {
-          const T = Qn(y), A = {
+      case fe.LIST:
+      case fe.MULTIPLE_LIST: {
+        const g = u.dropdownType === fe.MULTIPLE_LIST, p = async (y) => {
+          const O = nr(y), U = {
             unitId: i,
             subUnitId: a,
             range: {
@@ -329,26 +337,26 @@ let Ne = class extends Re {
               endRow: r
             },
             value: {
-              v: T,
+              v: O,
               p: null,
               f: null,
               si: null
             }
           };
-          return this._commandService.executeCommand(at.id, A), this._editorBridgeService.isVisible().visible && await this._commandService.executeCommand(vt.id, {
+          return this._commandService.executeCommand(dt.id, U), this._editorBridgeService.isVisible().visible && await this._commandService.executeCommand(_t.id, {
             visible: !1,
-            eventType: pt.Keyboard,
+            eventType: mt.Keyboard,
             unitId: i,
-            keycode: gt.ESC
-          }), !v;
-        }, _ = (d == null ? void 0 : d.renderMode) === ae.CUSTOM || (d == null ? void 0 : d.renderMode) === void 0, P = u.getListWithColor(d, i, a), k = Ut(s.getCellRaw(r, o)), U = () => {
-          this._commandService.executeCommand(Fe.id, {
+            keycode: ft.ESC
+          }), !g;
+        }, _ = (d == null ? void 0 : d.renderMode) === ue.CUSTOM || (d == null ? void 0 : d.renderMode) === void 0, T = u.getListWithColor(d, i, a), A = xt(s.getCellRaw(r, o)), P = () => {
+          this._commandService.executeCommand(Be.id, {
             ruleId: d.uid
-          }), g == null || g.dispose();
-        }, L = P.map((y) => ({
+          }), h == null || h.dispose();
+        }, L = T.map((y) => ({
           label: y.label,
           value: y.label,
-          color: _ || y.color ? y.color || Te : "transparent"
+          color: _ || y.color ? y.color || ke : "transparent"
         }));
         m = {
           location: n,
@@ -356,16 +364,16 @@ let Ne = class extends Re {
           props: {
             onChange: (y) => p(y),
             options: L,
-            onEdit: U,
-            defaultValue: k,
-            multiple: v,
-            showEdit: (w = (R = this._configService.getConfig(yt)) == null ? void 0 : R.showEditOnDropdown) != null ? w : !0,
-            showSearch: (I = (S = this._configService.getConfig(yt)) == null ? void 0 : S.showSearchOnDropdown) != null ? I : !0
+            onEdit: P,
+            defaultValue: A,
+            multiple: g,
+            showEdit: (C = (v = this._configService.getConfig(Et)) == null ? void 0 : v.showEditOnDropdown) != null ? C : !0,
+            showSearch: (w = (f = this._configService.getConfig(Et)) == null ? void 0 : f.showSearchOnDropdown) != null ? w : !0
           }
         };
         break;
       }
-      case pe.CASCADE: {
+      case fe.CASCADE: {
         m = {
           type: "cascader",
           props: {
@@ -386,21 +394,21 @@ let Ne = class extends Re {
                   si: null
                 }
               };
-              return this._commandService.syncExecuteCommand(at.id, _), this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(vt.id, {
+              return this._commandService.syncExecuteCommand(dt.id, _), this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(_t.id, {
                 visible: !1,
-                eventType: pt.Keyboard,
+                eventType: mt.Keyboard,
                 unitId: i,
-                keycode: gt.ESC
+                keycode: ft.ESC
               }), !0;
             },
-            defaultValue: Ut(s.getCellRaw(r, o)).split("/"),
+            defaultValue: xt(s.getCellRaw(r, o)).split("/"),
             options: JSON.parse((b = d.formula1) != null ? b : "[]")
           },
           location: n
         };
         break;
       }
-      case pe.COLOR: {
+      case fe.COLOR: {
         m = {
           type: "color",
           props: {
@@ -421,14 +429,14 @@ let Ne = class extends Re {
                   si: null
                 }
               };
-              return this._commandService.syncExecuteCommand(at.id, _), this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(vt.id, {
+              return this._commandService.syncExecuteCommand(dt.id, _), this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(_t.id, {
                 visible: !1,
-                eventType: pt.Keyboard,
+                eventType: mt.Keyboard,
                 unitId: i,
-                keycode: gt.ESC
+                keycode: ft.ESC
               }), !0;
             },
-            defaultValue: Ut(s.getCellRaw(r, o))
+            defaultValue: xt(s.getCellRaw(r, o))
           },
           location: n
         };
@@ -437,26 +445,26 @@ let Ne = class extends Re {
       default:
         throw new Error("[DataValidationDropdownManagerService]: unknown type!");
     }
-    if (g = this._cellDropdownManagerService.showDropdown({
+    if (h = this._cellDropdownManagerService.showDropdown({
       ...m,
       onHide: () => {
         this._activeDropdown = null, this._activeDropdown$.next(null);
       }
-    }), !g)
+    }), !h)
       throw new Error("[DataValidationDropdownManagerService]: cannot show dropdown!");
-    const h = new Pr();
-    h.add(g), h.add({
+    const I = new Ur();
+    I.add(h), I.add({
       dispose: () => {
-        var v, p;
-        (p = (v = this._activeDropdown) == null ? void 0 : v.onHide) == null || p.call(v);
+        var g, p;
+        (p = (g = this._activeDropdown) == null ? void 0 : g.onHide) == null || p.call(g);
       }
-    }), this._currentPopup = h;
+    }), this._currentPopup = I;
   }
   hideDropdown() {
     this._activeDropdown && (this._currentPopup && this._currentPopup.dispose(), this._currentPopup = null, this._activeDropdown = null, this._activeDropdown$.next(null));
   }
   showDataValidationDropdown(t, n, r, o, i) {
-    const a = this._univerInstanceService.getUnit(t, Z.UNIVER_SHEET);
+    const a = this._univerInstanceService.getUnit(t, H.UNIVER_SHEET);
     if (!a)
       return;
     const l = a.getSheetBySheetId(n);
@@ -483,62 +491,62 @@ let Ne = class extends Re {
     });
   }
 };
-Ne = Uo([
-  ue(0, le),
-  ue(1, D(Me)),
-  ue(2, lr),
-  ue(3, D(oe)),
-  ue(4, D(Kn)),
-  ue(5, D(Co)),
-  ue(6, D(oe)),
-  ue(7, te),
-  ue(8, hr),
-  ue(9, D(ye)),
-  ue(10, dn)
-], Ne);
-const bt = "DataValidationPanel", Fe = {
+$e = Bo([
+  ve(0, pe),
+  ve(1, E(Te)),
+  ve(2, ur),
+  ve(3, E(ae)),
+  ve(4, E(Jn)),
+  ve(5, E(Mo)),
+  ve(6, E(ae)),
+  ve(7, oe),
+  ve(8, mr),
+  ve(9, E(Ve)),
+  ve(10, hn)
+], $e);
+const Vt = "DataValidationPanel", Be = {
   id: "data-validation.operation.open-validation-panel",
-  type: tt.OPERATION,
+  type: ot.OPERATION,
   handler(e, t) {
     if (!t)
       return !1;
-    const { ruleId: n, isAdd: r } = t, o = e.get(me), i = e.get(gn), a = e.get(le), l = e.get(sr), s = Gn(a);
+    const { ruleId: n, isAdd: r } = t, o = e.get(_e), i = e.get(fn), a = e.get(pe), l = e.get(cr), s = Qn(a);
     if (!s) return !1;
-    const { unitId: d, subUnitId: u } = s, g = n ? i.getRuleById(d, u, n) : void 0;
-    o.open(), o.setActiveRule(g && {
+    const { unitId: d, subUnitId: u } = s, h = n ? i.getRuleById(d, u, n) : void 0;
+    o.open(), o.setActiveRule(h && {
       unitId: d,
       subUnitId: u,
-      rule: g
+      rule: h
     });
     const c = l.open({
-      id: bt,
+      id: Vt,
       header: { title: r ? "dataValidation.panel.addTitle" : "dataValidation.panel.title" },
-      children: { label: bt },
+      children: { label: Vt },
       width: 312,
       onClose: () => o.close()
     });
     return o.setCloseDisposable(c), !0;
   }
-}, Cn = {
+}, wn = {
   id: "data-validation.operation.close-validation-panel",
-  type: tt.OPERATION,
+  type: ot.OPERATION,
   handler(e) {
-    return e.get(me).close(), !0;
+    return e.get(_e).close(), !0;
   }
-}, mr = {
+}, Cr = {
   id: "data-validation.operation.toggle-validation-panel",
-  type: tt.OPERATION,
+  type: ot.OPERATION,
   handler(e) {
-    const t = e.get(te), n = e.get(me);
-    return n.open(), n.isOpen ? t.executeCommand(Cn.id) : t.executeCommand(Fe.id), !0;
+    const t = e.get(oe), n = e.get(_e);
+    return n.open(), n.isOpen ? t.executeCommand(wn.id) : t.executeCommand(Be.id), !0;
   }
-}, Lt = {
-  type: tt.OPERATION,
+}, Ut = {
+  type: ot.OPERATION,
   id: "sheet.operation.show-data-validation-dropdown",
   handler(e, t) {
     if (!t)
       return !1;
-    const n = e.get(Ne), { unitId: r, subUnitId: o, row: i, column: a } = t, l = n.activeDropdown, s = l == null ? void 0 : l.location;
+    const n = e.get($e), { unitId: r, subUnitId: o, row: i, column: a } = t, l = n.activeDropdown, s = l == null ? void 0 : l.location;
     return s && s.unitId === r && s.subUnitId === o && s.row === i && s.col === a || n.showDataValidationDropdown(
       r,
       o,
@@ -546,36 +554,36 @@ const bt = "DataValidationPanel", Fe = {
       a
     ), !0;
   }
-}, fr = {
-  type: tt.OPERATION,
+}, Ir = {
+  type: ot.OPERATION,
   id: "sheet.operation.hide-data-validation-dropdown",
   handler(e, t) {
-    return t ? (e.get(Ne).hideDropdown(), !0) : !1;
+    return t ? (e.get($e).hideDropdown(), !0) : !1;
   }
-}, kt = {
-  type: tt.COMMAND,
+}, Ft = {
+  type: ot.COMMAND,
   id: "data-validation.command.addRuleAndOpen",
   handler(e) {
-    const t = e.get(le), n = Gn(t);
+    const t = e.get(pe), n = Qn(t);
     if (!n) return !1;
-    const { workbook: r, worksheet: o } = n, i = er(e), a = e.get(te), l = r.getUnitId(), s = o.getSheetId(), d = {
+    const { workbook: r, worksheet: o } = n, i = rr(e), a = e.get(oe), l = r.getUnitId(), s = o.getSheetId(), d = {
       rule: i,
       unitId: l,
       subUnitId: s
     };
-    return a.syncExecuteCommand(hn.id, d) ? (a.syncExecuteCommand(Fe.id, {
+    return a.syncExecuteCommand(vn.id, d) ? (a.syncExecuteCommand(Be.id, {
       ruleId: i.uid,
       isAdd: !0
     }), !0) : !1;
   }
 };
-var $o = Object.getOwnPropertyDescriptor, xo = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? $o(t, n) : t, i = e.length - 1, a; i >= 0; i--)
+var Ho = Object.getOwnPropertyDescriptor, jo = (e, t, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Ho(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, Be = (e, t) => (n, r) => t(n, r, e);
-const be = "SHEET_DATA_VALIDATION_ALERT";
-let ut = class extends Re {
+}, je = (e, t) => (n, r) => t(n, r, e);
+const Oe = "SHEET_DATA_VALIDATION_ALERT";
+let gt = class extends De {
   constructor(e, t, n, r, o, i) {
     super(), this._hoverManagerService = e, this._cellAlertManagerService = t, this._univerInstanceService = n, this._localeService = r, this._zenZoneService = o, this._dataValidationModel = i, this._init();
   }
@@ -583,143 +591,143 @@ let ut = class extends Re {
     this._initCellAlertPopup(), this._initZenService();
   }
   _initCellAlertPopup() {
-    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(cr(100)).subscribe((e) => {
+    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(pr(100)).subscribe((e) => {
       var t;
       if (e) {
-        const n = this._univerInstanceService.getUnit(e.location.unitId, Z.UNIVER_SHEET), r = n.getSheetBySheetId(e.location.subUnitId);
+        const n = this._univerInstanceService.getUnit(e.location.unitId, H.UNIVER_SHEET), r = n.getSheetBySheetId(e.location.subUnitId);
         if (!r) return;
         const o = this._dataValidationModel.getRuleByLocation(e.location.unitId, e.location.subUnitId, e.location.row, e.location.col);
         if (!o) {
-          this._cellAlertManagerService.removeAlert(be);
+          this._cellAlertManagerService.removeAlert(Oe);
           return;
         }
-        if (this._dataValidationModel.validator(o, { ...e.location, workbook: n, worksheet: r }) === Ye.INVALID) {
-          const a = this._cellAlertManagerService.currentAlert.get(be), l = (t = a == null ? void 0 : a.alert) == null ? void 0 : t.location;
+        if (this._dataValidationModel.validator(o, { ...e.location, workbook: n, worksheet: r }) === ze.INVALID) {
+          const a = this._cellAlertManagerService.currentAlert.get(Oe), l = (t = a == null ? void 0 : a.alert) == null ? void 0 : t.location;
           if (l && l.row === e.location.row && l.col === e.location.col && l.subUnitId === e.location.subUnitId && l.unitId === e.location.unitId) {
-            this._cellAlertManagerService.removeAlert(be);
+            this._cellAlertManagerService.removeAlert(Oe);
             return;
           }
           const s = this._dataValidationModel.getValidator(o.type);
           if (!s) {
-            this._cellAlertManagerService.removeAlert(be);
+            this._cellAlertManagerService.removeAlert(Oe);
             return;
           }
           this._cellAlertManagerService.showAlert({
-            type: Io.ERROR,
+            type: Do.ERROR,
             title: this._localeService.t("dataValidation.error.title"),
             message: s == null ? void 0 : s.getRuleFinalError(o, e.location),
             location: e.location,
             width: 200,
             height: 74,
-            key: be
+            key: Oe
           });
           return;
         }
       }
-      this._cellAlertManagerService.removeAlert(be);
+      this._cellAlertManagerService.removeAlert(Oe);
     }));
   }
   _initZenService() {
     this.disposeWithMe(this._zenZoneService.visible$.subscribe((e) => {
-      e && this._cellAlertManagerService.removeAlert(be);
+      e && this._cellAlertManagerService.removeAlert(Oe);
     }));
   }
 };
-ut = xo([
-  Be(0, D(So)),
-  Be(1, D(wo)),
-  Be(2, le),
-  Be(3, D(de)),
-  Be(4, lr),
-  Be(5, D(oe))
-], ut);
-var Bo = Object.getOwnPropertyDescriptor, Wo = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Bo(t, n) : t, i = e.length - 1, a; i >= 0; i--)
+gt = jo([
+  je(0, E(bo)),
+  je(1, E(Eo)),
+  je(2, pe),
+  je(3, E(ge)),
+  je(4, ur),
+  je(5, E(ae))
+], gt);
+var Yo = Object.getOwnPropertyDescriptor, Xo = (e, t, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Yo(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, xt = (e, t) => (n, r) => t(n, r, e);
-let Ge = class extends Re {
+}, Ht = (e, t) => (n, r) => t(n, r, e);
+let Qe = class extends De {
   constructor(e, t, n) {
     super(), this._autoFillService = e, this._sheetDataValidationModel = t, this._injector = n, this._initAutoFill();
   }
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
     const e = () => ({ redos: [], undos: [] }), t = (r, o) => {
-      const { source: i, target: a, unitId: l, subUnitId: s } = r, d = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = rn([i, a]), [g, c] = u.ranges, { mapFunc: m } = u, h = {
-        row: g.startRow,
-        col: g.startColumn
-      }, E = yo(g, c), R = new wt(), w = /* @__PURE__ */ new Set();
-      E.forEach((p) => {
-        const _ = p.repeatStartCell, P = p.relativeRange, k = {
-          startRow: h.row,
-          startColumn: h.col,
-          endColumn: h.col,
-          endRow: h.row
-        }, U = {
+      const { source: i, target: a, unitId: l, subUnitId: s } = r, d = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = sn([i, a]), [h, c] = u.ranges, { mapFunc: m } = u, I = {
+        row: h.startRow,
+        col: h.startColumn
+      }, D = eo.getAutoFillRepeatRange(h, c), v = new yt(), C = /* @__PURE__ */ new Set();
+      D.forEach((p) => {
+        const _ = p.repeatStartCell, T = p.relativeRange, A = {
+          startRow: I.row,
+          startColumn: I.col,
+          endColumn: I.col,
+          endRow: I.row
+        }, P = {
           startRow: _.row,
           startColumn: _.col,
           endColumn: _.col,
           endRow: _.row
         };
-        kr.foreach(P, (L, y) => {
-          const T = It.getPositionRange(
+        $r.foreach(T, (L, y) => {
+          const O = Mt.getPositionRange(
             {
               startRow: L,
               startColumn: y,
               endColumn: y,
               endRow: L
             },
-            k
-          ), { row: A, col: x } = m(T.startRow, T.startColumn), H = this._sheetDataValidationModel.getRuleIdByLocation(l, s, A, x) || "", q = It.getPositionRange(
+            A
+          ), { row: U, col: k } = m(O.startRow, O.startColumn), x = this._sheetDataValidationModel.getRuleIdByLocation(l, s, U, k) || "", te = Mt.getPositionRange(
             {
               startRow: L,
               startColumn: y,
               endColumn: y,
               endRow: L
             },
-            U
-          ), { row: B, col: ne } = m(q.startRow, q.startColumn);
-          R.setValue(B, ne, H), w.add(H);
+            P
+          ), { row: j, col: se } = m(te.startRow, te.startColumn);
+          v.setValue(j, se, x), C.add(x);
         });
       });
-      const S = Array.from(w).map((p) => ({ id: p, ranges: Gt(R, (_) => _ === p) }));
-      d.addRangeRules(S);
-      const I = d.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: b, undoMutations: v } = tn(l, s, I, this._injector, "patched", o === ot.ONLY_FORMAT);
+      const f = Array.from(C).map((p) => ({ id: p, ranges: Qt(v, (_) => _ === p) }));
+      d.addRangeRules(f);
+      const w = d.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: b, undoMutations: g } = on(l, s, w, this._injector, "patched", o === st.ONLY_FORMAT);
       return {
-        undos: v,
+        undos: g,
         redos: b
       };
     }, n = {
-      id: tr,
+      id: or,
       onBeforeFillData: (r) => {
         const { source: o, unitId: i, subUnitId: a } = r;
         for (const l of o.rows)
           for (const s of o.cols) {
             const d = this._sheetDataValidationModel.getRuleByLocation(i, a, l, s);
-            if (d && d.type === Y.CHECKBOX) {
-              this._autoFillService.setDisableApplyType(ot.SERIES, !0);
+            if (d && d.type === X.CHECKBOX) {
+              this._autoFillService.setDisableApplyType(st.SERIES, !0);
               return;
             }
           }
       },
-      onFillData: (r, o, i) => i === ot.COPY || i === ot.ONLY_FORMAT || i === ot.SERIES ? t(r, i) : e(),
+      onFillData: (r, o, i) => i === st.COPY || i === st.ONLY_FORMAT || i === st.SERIES ? t(r, i) : e(),
       onAfterFillData: () => {
       }
     };
     this.disposeWithMe(this._autoFillService.addHook(n));
   }
 };
-Ge = Wo([
-  xt(0, Ro),
-  xt(1, D(oe)),
-  xt(2, D(ye))
-], Ge);
-var Ho = Object.getOwnPropertyDescriptor, jo = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Ho(t, n) : t, i = e.length - 1, a; i >= 0; i--)
+Qe = Xo([
+  Ht(0, Qr),
+  Ht(1, E(ae)),
+  Ht(2, E(Ve))
+], Qe);
+var Zo = Object.getOwnPropertyDescriptor, zo = (e, t, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Zo(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, Bt = (e, t) => (n, r) => t(n, r, e);
-let qe = class extends Re {
+}, jt = (e, t) => (n, r) => t(n, r, e);
+let et = class extends De {
   constructor(t, n, r) {
     super();
     V(this, "_copyInfo");
@@ -727,29 +735,29 @@ let qe = class extends Re {
   }
   _initCopyPaste() {
     this._sheetClipboardService.addClipboardHook({
-      id: tr,
+      id: or,
       onBeforeCopy: (t, n, r) => this._collect(t, n, r),
       onPasteCells: (t, n, r, o) => {
-        const { copyType: i = An.COPY, pasteType: a } = o, { range: l } = t || {}, { range: s, unitId: d, subUnitId: u } = n;
+        const { copyType: i = kn.COPY, pasteType: a } = o, { range: l } = t || {}, { range: s, unitId: d, subUnitId: u } = n;
         return this._generateMutations(s, { copyType: i, pasteType: a, copyRange: l, unitId: d, subUnitId: u });
       }
     });
   }
   _collect(t, n, r) {
-    const o = new wt();
+    const o = new yt();
     this._copyInfo = {
       unitId: t,
       subUnitId: n,
       matrix: o
     };
-    const i = this._injector.invoke((s) => Kr(r, s, t, n));
+    const i = this._injector.invoke((s) => to(r, s, t, n));
     if (!i)
       return;
     const { rows: a, cols: l } = i;
     a.forEach((s, d) => {
-      l.forEach((u, g) => {
+      l.forEach((u, h) => {
         const c = this._sheetDataValidationModel.getRuleIdByLocation(t, n, s, u);
-        o.setValue(d, g, c != null ? c : "");
+        o.setValue(d, h, c != null ? c : "");
       });
     });
   }
@@ -757,40 +765,40 @@ let qe = class extends Re {
   _generateMutations(t, n) {
     if (!this._copyInfo)
       return { redos: [], undos: [] };
-    if (n.copyType === An.CUT)
+    if (n.copyType === kn.CUT)
       return this._copyInfo = null, { redos: [], undos: [] };
     if (!this._copyInfo || !this._copyInfo.matrix.getSizeOf() || !n.copyRange)
       return { redos: [], undos: [] };
     if ([
-      mt.SPECIAL_PASTE_COL_WIDTH,
-      mt.SPECIAL_PASTE_VALUE,
-      mt.SPECIAL_PASTE_FORMAT,
-      mt.SPECIAL_PASTE_FORMULA
+      St.SPECIAL_PASTE_COL_WIDTH,
+      St.SPECIAL_PASTE_VALUE,
+      St.SPECIAL_PASTE_FORMAT,
+      St.SPECIAL_PASTE_FORMULA
     ].includes(n.pasteType))
       return { redos: [], undos: [] };
     const { unitId: o, subUnitId: i } = this._copyInfo;
     if (n.unitId !== o || i !== n.subUnitId) {
-      const a = this._sheetDataValidationModel.getRuleObjectMatrix(n.unitId, n.subUnitId).clone(), l = new wt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: g } = rn([n.copyRange, t]), c = Pn(d, u, !0), m = /* @__PURE__ */ new Map();
-      c.forEach(({ startRange: w }) => {
-        var S;
-        (S = this._copyInfo) == null || S.matrix.forValue((I, b, v) => {
-          const p = It.getPositionRange(
+      const a = this._sheetDataValidationModel.getRuleObjectMatrix(n.unitId, n.subUnitId).clone(), l = new yt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = sn([n.copyRange, t]), c = Nn(d, u, !0), m = /* @__PURE__ */ new Map();
+      c.forEach(({ startRange: C }) => {
+        var f;
+        (f = this._copyInfo) == null || f.matrix.forValue((w, b, g) => {
+          const p = Mt.getPositionRange(
             {
-              startRow: I,
-              endRow: I,
+              startRow: w,
+              endRow: w,
               startColumn: b,
               endColumn: b
             },
-            w
-          ), _ = `${i}-${v}`, P = this._sheetDataValidationModel.getRuleById(o, i, v);
-          !this._sheetDataValidationModel.getRuleById(n.unitId, n.subUnitId, _) && P && m.set(_, { ...P, uid: _ });
-          const { row: k, col: U } = g(p.startRow, p.startColumn);
-          s.add(_), l.setValue(k, U, _);
+            C
+          ), _ = `${i}-${g}`, T = this._sheetDataValidationModel.getRuleById(o, i, g);
+          !this._sheetDataValidationModel.getRuleById(n.unitId, n.subUnitId, _) && T && m.set(_, { ...T, uid: _ });
+          const { row: A, col: P } = h(p.startRow, p.startColumn);
+          s.add(_), l.setValue(A, P, _);
         });
       });
-      const h = Array.from(s).map((w) => ({ id: w, ranges: Gt(l, (S) => S === w) }));
-      a.addRangeRules(h);
-      const { redoMutations: E, undoMutations: R } = tn(
+      const I = Array.from(s).map((C) => ({ id: C, ranges: Qt(l, (f) => f === C) }));
+      a.addRangeRules(I);
+      const { redoMutations: D, undoMutations: v } = on(
         n.unitId,
         n.subUnitId,
         a.diffWithAddition(this._sheetDataValidationModel.getRules(n.unitId, n.subUnitId), m.values()),
@@ -799,29 +807,29 @@ let qe = class extends Re {
         !1
       );
       return {
-        redos: E,
-        undos: R
+        redos: D,
+        undos: v
       };
     } else {
-      const a = this._sheetDataValidationModel.getRuleObjectMatrix(o, i).clone(), l = new wt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: g } = rn([n.copyRange, t]);
-      Pn(d, u, !0).forEach(({ startRange: R }) => {
-        var w;
-        (w = this._copyInfo) == null || w.matrix.forValue((S, I, b) => {
-          const v = It.getPositionRange(
+      const a = this._sheetDataValidationModel.getRuleObjectMatrix(o, i).clone(), l = new yt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = sn([n.copyRange, t]);
+      Nn(d, u, !0).forEach(({ startRange: v }) => {
+        var C;
+        (C = this._copyInfo) == null || C.matrix.forValue((f, w, b) => {
+          const g = Mt.getPositionRange(
             {
-              startRow: S,
-              endRow: S,
-              startColumn: I,
-              endColumn: I
+              startRow: f,
+              endRow: f,
+              startColumn: w,
+              endColumn: w
             },
-            R
-          ), { row: p, col: _ } = g(v.startRow, v.startColumn);
+            v
+          ), { row: p, col: _ } = h(g.startRow, g.startColumn);
           l.setValue(p, _, b), s.add(b);
         });
       });
-      const m = Array.from(s).map((R) => ({ id: R, ranges: Gt(l, (w) => w === R) }));
+      const m = Array.from(s).map((v) => ({ id: v, ranges: Qt(l, (C) => C === v) }));
       a.addRangeRules(m);
-      const { redoMutations: h, undoMutations: E } = tn(
+      const { redoMutations: I, undoMutations: D } = on(
         o,
         i,
         a.diff(this._sheetDataValidationModel.getRules(o, i)),
@@ -830,112 +838,112 @@ let qe = class extends Re {
         !1
       );
       return {
-        redos: h,
-        undos: E
+        redos: I,
+        undos: D
       };
     }
   }
 };
-qe = jo([
-  Bt(0, Mo),
-  Bt(1, D(oe)),
-  Bt(2, D(ye))
-], qe);
-var Yo = Object.getOwnPropertyDescriptor, Xo = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Yo(t, n) : t, i = e.length - 1, a; i >= 0; i--)
+et = zo([
+  jt(0, Vo),
+  jt(1, E(ae)),
+  jt(2, E(Ve))
+], et);
+var Ko = Object.getOwnPropertyDescriptor, Go = (e, t, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Ko(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, Wt = (e, t) => (n, r) => t(n, r, e);
-let Je = class extends Re {
+}, Yt = (e, t) => (n, r) => t(n, r, e);
+let tt = class extends De {
   constructor(e, t, n) {
     super(), this._localeService = e, this._commandService = t, this._sheetPermissionCheckController = n, this._commandExecutedListener();
   }
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((e) => {
-        if (e.id === hn.id) {
+        if (e.id === vn.id) {
           const { unitId: t, subUnitId: n, rule: { ranges: r } } = e.params;
           this._sheetPermissionCheckController.permissionCheckWithRanges({
-            workbookTypes: [en],
-            rangeTypes: [Qt],
-            worksheetTypes: [qt, Jt]
+            workbookTypes: [rn],
+            rangeTypes: [nn],
+            worksheetTypes: [en, tn]
           }, r, t, n) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr"));
         }
-        if (e.id === nr.id) {
+        if (e.id === ir.id) {
           const { unitId: t, subUnitId: n, ranges: r } = e.params;
           this._sheetPermissionCheckController.permissionCheckWithRanges({
-            workbookTypes: [en],
-            rangeTypes: [Qt],
-            worksheetTypes: [qt, Jt]
+            workbookTypes: [rn],
+            rangeTypes: [nn],
+            worksheetTypes: [en, tn]
           }, r, t, n) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr"));
         }
       })
     );
   }
 };
-Je = Xo([
-  Wt(0, D(de)),
-  Wt(1, te),
-  Wt(2, D(Gr))
-], Je);
-const _r = "sheet.menu.data-validation";
-function Zo(e) {
+tt = Go([
+  Yt(0, E(ge)),
+  Yt(1, oe),
+  Yt(2, E(no))
+], tt);
+const wr = "sheet.menu.data-validation";
+function qo(e) {
   return {
-    id: _r,
-    type: vn.SUBITEMS,
+    id: wr,
+    type: _n.SUBITEMS,
     icon: "DataValidationIcon",
     tooltip: "dataValidation.title",
-    hidden$: ho(e, Z.UNIVER_SHEET),
-    disabled$: bo(e, { workbookTypes: [en], worksheetTypes: [Jt, qt], rangeTypes: [Qt] })
+    hidden$: So(e, H.UNIVER_SHEET),
+    disabled$: To(e, { workbookTypes: [rn], worksheetTypes: [tn, en], rangeTypes: [nn] })
   };
 }
-function zo(e) {
+function Jo(e) {
   return {
-    id: Fe.id,
+    id: Be.id,
     title: "dataValidation.panel.title",
-    type: vn.BUTTON
+    type: _n.BUTTON
   };
 }
-function Ko(e) {
+function Qo(e) {
   return {
-    id: kt.id,
+    id: Ft.id,
     title: "dataValidation.panel.add",
-    type: vn.BUTTON
+    type: _n.BUTTON
   };
 }
-const Go = {
-  [po.RULES]: {
-    [_r]: {
+const ei = {
+  [Co.RULES]: {
+    [wr]: {
       order: 0,
-      menuItemFactory: Zo,
-      [Fe.id]: {
+      menuItemFactory: qo,
+      [Be.id]: {
         order: 0,
-        menuItemFactory: zo
+        menuItemFactory: Jo
       },
-      [kt.id]: {
+      [Ft.id]: {
         order: 1,
-        menuItemFactory: Ko
+        menuItemFactory: Qo
       }
     }
   }
 };
-var qo = Object.getOwnPropertyDescriptor, Cr = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? qo(t, n) : t, i = e.length - 1, a; i >= 0; i--)
+var ti = Object.getOwnPropertyDescriptor, Rr = (e, t, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? ti(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
 }, K = (e, t) => (n, r) => t(n, r, e);
-const Sr = {
+const yr = {
   tr: {
     size: 6,
     color: "#fe4b4b"
   }
 };
-let Qe = class extends cn {
+let nt = class extends pn {
   constructor(e, t, n, r, o, i, a, l, s, d, u) {
     super(), this._commandService = e, this._menuManagerService = t, this._renderManagerService = n, this._univerInstanceService = r, this._autoHeightController = o, this._dropdownManagerService = i, this._sheetDataValidationModel = a, this._dataValidatorRegistryService = l, this._sheetInterceptorService = s, this._dataValidationCacheService = d, this._editorBridgeService = u, this._initMenu(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
   }
   _initMenu() {
-    this._menuManagerService.mergeMenu(Go);
+    this._menuManagerService.mergeMenu(ei);
   }
   _initDropdown() {
     this._editorBridgeService && this.disposeWithMe(this._editorBridgeService.visible$.subscribe((e) => {
@@ -957,7 +965,7 @@ let Qe = class extends cn {
           return;
         const u = l.getActiveSheet();
         if (!u) return;
-        const g = this._dropdownManagerService.activeDropdown, c = g == null ? void 0 : g.location;
+        const h = this._dropdownManagerService.activeDropdown, c = h == null ? void 0 : h.location;
         if (c && c.unitId === r && c.subUnitId === o && c.row === i && c.col === a)
           return;
         this._dropdownManagerService.showDropdown(
@@ -981,56 +989,56 @@ let Qe = class extends cn {
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        qn.CELL_CONTENT,
+        er.CELL_CONTENT,
         {
-          effect: Hn.Style,
+          effect: Xn.Style,
           // must be after numfmt
-          priority: Jn.DATA_VALIDATION,
+          priority: tr.DATA_VALIDATION,
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: (e, t, n) => {
-            var w, S, I, b, v;
+            var C, f, w, b, g;
             const { row: r, col: o, unitId: i, subUnitId: a, workbook: l, worksheet: s } = t, d = this._sheetDataValidationModel.getRuleIdByLocation(i, a, r, o);
             if (!d)
               return n(e);
             const u = this._sheetDataValidationModel.getRuleById(i, a, d);
             if (!u)
               return n(e);
-            const g = (w = this._dataValidationCacheService.getValue(i, a, r, o)) != null ? w : Ye.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = t.rawData;
-            let h;
-            const E = {
+            const h = (C = this._dataValidationCacheService.getValue(i, a, r, o)) != null ? C : ze.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = t.rawData;
+            let I;
+            const D = {
               get value() {
                 var p;
-                return h !== void 0 || (h = (p = re(m)) != null ? p : null), h;
+                return I !== void 0 || (I = (p = ie(m)) != null ? p : null), I;
               }
-            }, R = {
+            }, v = {
               get value() {
                 var p;
-                return `${(p = E.value) != null ? p : ""}`;
+                return `${(p = D.value) != null ? p : ""}`;
               }
             };
             return (!e || e === t.rawData) && (e = { ...t.rawData }), e.markers = {
               ...e == null ? void 0 : e.markers,
-              ...g === Ye.INVALID ? Sr : null
+              ...h === ze.INVALID ? yr : null
             }, e.customRender = [
-              ...(S = e == null ? void 0 : e.customRender) != null ? S : [],
+              ...(f = e == null ? void 0 : e.customRender) != null ? f : [],
               ...c != null && c.canvasRender ? [c.canvasRender] : []
             ], e.fontRenderExtension = {
               ...e == null ? void 0 : e.fontRenderExtension,
-              isSkip: ((I = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : I.isSkip) || ((b = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : b.call(c, u, E.value, t))
+              isSkip: ((w = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : w.isSkip) || ((b = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : b.call(c, u, D.value, t))
             }, e.interceptorStyle = {
               ...e == null ? void 0 : e.interceptorStyle,
-              ...c == null ? void 0 : c.getExtraStyle(u, R.value, {
+              ...c == null ? void 0 : c.getExtraStyle(u, v.value, {
                 get style() {
                   const p = l.getStyles();
                   return (typeof (e == null ? void 0 : e.s) == "string" ? p.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
                 }
               }, r, o)
             }, e.interceptorAutoHeight = () => {
-              var k, U, L, y, T, A;
-              const p = (U = (k = this._renderManagerService.getRenderById(i)) == null ? void 0 : k.with(lt).getSkeletonParam(a)) == null ? void 0 : U.skeleton;
+              var A, P, L, y, O, U;
+              const p = (P = (A = this._renderManagerService.getRenderById(i)) == null ? void 0 : A.with(ut).getSkeletonParam(a)) == null ? void 0 : P.skeleton;
               if (!p)
                 return;
-              const _ = p.worksheet.getMergedCell(r, o), P = {
+              const _ = p.worksheet.getMergedCell(r, o), T = {
                 data: e,
                 style: p.getStyles().getStyleByCell(e),
                 primaryWithCoord: p.getCellWithCoordByIndex((L = _ == null ? void 0 : _.startRow) != null ? L : r, (y = _ == null ? void 0 : _.startColumn) != null ? y : o),
@@ -1041,13 +1049,13 @@ let Qe = class extends cn {
                 workbook: l,
                 worksheet: s
               };
-              return (A = (T = c == null ? void 0 : c.canvasRender) == null ? void 0 : T.calcCellAutoHeight) == null ? void 0 : A.call(T, P);
+              return (U = (O = c == null ? void 0 : c.canvasRender) == null ? void 0 : O.calcCellAutoHeight) == null ? void 0 : U.call(O, T);
             }, e.interceptorAutoWidth = () => {
-              var k, U, L, y, T, A;
-              const p = (U = (k = this._renderManagerService.getRenderById(i)) == null ? void 0 : k.with(lt).getSkeletonParam(a)) == null ? void 0 : U.skeleton;
+              var A, P, L, y, O, U;
+              const p = (P = (A = this._renderManagerService.getRenderById(i)) == null ? void 0 : A.with(ut).getSkeletonParam(a)) == null ? void 0 : P.skeleton;
               if (!p)
                 return;
-              const _ = p.worksheet.getMergedCell(r, o), P = {
+              const _ = p.worksheet.getMergedCell(r, o), T = {
                 data: e,
                 style: p.getStyles().getStyleByCell(e),
                 primaryWithCoord: p.getCellWithCoordByIndex((L = _ == null ? void 0 : _.startRow) != null ? L : r, (y = _ == null ? void 0 : _.startColumn) != null ? y : o),
@@ -1058,8 +1066,8 @@ let Qe = class extends cn {
                 workbook: l,
                 worksheet: s
               };
-              return (A = (T = c == null ? void 0 : c.canvasRender) == null ? void 0 : T.calcCellAutoWidth) == null ? void 0 : A.call(T, P);
-            }, e.coverable = ((v = e == null ? void 0 : e.coverable) != null ? v : !0) && !(u.type === Y.LIST || u.type === Y.LIST_MULTIPLE), n(e);
+              return (U = (O = c == null ? void 0 : c.canvasRender) == null ? void 0 : O.calcCellAutoWidth) == null ? void 0 : U.call(O, T);
+            }, e.coverable = ((g = e == null ? void 0 : e.coverable) != null ? g : !0) && !(u.type === X.LIST || u.type === X.LIST_MULTIPLE), n(e);
           }
         }
       )
@@ -1069,36 +1077,36 @@ let Qe = class extends cn {
     this._sheetDataValidationModel.ruleChange$.pipe(
       // patched data-validation change don't need to re-calc row height
       // re-calc of row height will be triggered precisely by the origin command
-      fn((e) => e.source === "command"),
-      ur(100)
+      Cn((e) => e.source === "command"),
+      gr(100)
     ).subscribe((e) => {
       if (e.length === 0)
         return;
       const t = [];
       if (e.forEach((n) => {
         var r;
-        (n.rule.type === Y.LIST_MULTIPLE || n.rule.type === Y.LIST) && (r = n.rule) != null && r.ranges && t.push(...n.rule.ranges);
+        (n.rule.type === X.LIST_MULTIPLE || n.rule.type === X.LIST) && (r = n.rule) != null && r.ranges && t.push(...n.rule.ranges);
       }), t.length) {
         const n = this._autoHeightController.getUndoRedoParamsOfAutoHeight(t);
-        jn(n.redos, this._commandService);
+        Zn(n.redos, this._commandService);
       }
     });
   }
 };
-Qe = Cr([
-  K(0, te),
-  K(1, go),
-  K(2, Ue),
-  K(3, le),
-  K(4, D(pr)),
-  K(5, D(Ne)),
-  K(6, D(oe)),
-  K(7, D(Me)),
-  K(8, D(un)),
-  K(9, D(rr)),
-  K(10, Nr(hr))
-], Qe);
-let Nn = class extends cn {
+nt = Rr([
+  K(0, oe),
+  K(1, Io),
+  K(2, xe),
+  K(3, pe),
+  K(4, E(fr)),
+  K(5, E($e)),
+  K(6, E(ae)),
+  K(7, E(Te)),
+  K(8, E(gn)),
+  K(9, E(ar)),
+  K(10, xr(mr))
+], nt);
+let $n = class extends pn {
   constructor(e, t, n, r, o, i, a) {
     super(), this._commandService = e, this._renderManagerService = t, this._autoHeightController = n, this._dataValidatorRegistryService = r, this._sheetInterceptorService = o, this._sheetDataValidationModel = i, this._dataValidationCacheService = a, this._initViewModelIntercept(), this._initAutoHeight();
   }
@@ -1106,47 +1114,47 @@ let Nn = class extends cn {
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        qn.CELL_CONTENT,
+        er.CELL_CONTENT,
         {
-          effect: Hn.Style,
+          effect: Xn.Style,
           // must be after numfmt
-          priority: Jn.DATA_VALIDATION,
+          priority: tr.DATA_VALIDATION,
           // eslint-disable-next-line complexity, max-lines-per-function
           handler: (e, t, n) => {
-            var R, w, S, I, b;
+            var v, C, f, w, b;
             const { row: r, col: o, unitId: i, subUnitId: a, workbook: l, worksheet: s } = t, d = this._sheetDataValidationModel.getRuleIdByLocation(i, a, r, o);
             if (!d)
               return n(e);
             const u = this._sheetDataValidationModel.getRuleById(i, a, d);
             if (!u)
               return n(e);
-            const g = (R = this._dataValidationCacheService.getValue(i, a, r, o)) != null ? R : Ye.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = s.getCellRaw(r, o), h = re(m), E = `${h != null ? h : ""}`;
+            const h = (v = this._dataValidationCacheService.getValue(i, a, r, o)) != null ? v : ze.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = s.getCellRaw(r, o), I = ie(m), D = `${I != null ? I : ""}`;
             return (!e || e === t.rawData) && (e = { ...t.rawData }), e.markers = {
               ...e == null ? void 0 : e.markers,
-              ...g === Ye.INVALID ? Sr : null
+              ...h === ze.INVALID ? yr : null
             }, e.customRender = [
-              ...(w = e == null ? void 0 : e.customRender) != null ? w : [],
+              ...(C = e == null ? void 0 : e.customRender) != null ? C : [],
               ...c != null && c.canvasRender ? [c.canvasRender] : []
             ], e.fontRenderExtension = {
               ...e == null ? void 0 : e.fontRenderExtension,
-              isSkip: ((S = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : S.isSkip) || ((I = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : I.call(c, u, h, t))
+              isSkip: ((f = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : f.isSkip) || ((w = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : w.call(c, u, I, t))
             }, e.interceptorStyle = {
               ...e == null ? void 0 : e.interceptorStyle,
-              ...c == null ? void 0 : c.getExtraStyle(u, E, {
+              ...c == null ? void 0 : c.getExtraStyle(u, D, {
                 get style() {
-                  const v = l.getStyles();
-                  return (typeof (e == null ? void 0 : e.s) == "string" ? v.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
+                  const g = l.getStyles();
+                  return (typeof (e == null ? void 0 : e.s) == "string" ? g.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
                 }
               }, r, o)
             }, e.interceptorAutoHeight = () => {
-              var P, k, U, L, y, T;
-              const v = (k = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(lt).getSkeletonParam(a)) == null ? void 0 : k.skeleton;
-              if (!v)
+              var T, A, P, L, y, O;
+              const g = (A = (T = this._renderManagerService.getRenderById(i)) == null ? void 0 : T.with(ut).getSkeletonParam(a)) == null ? void 0 : A.skeleton;
+              if (!g)
                 return;
-              const p = v.worksheet.getMergedCell(r, o), _ = {
+              const p = g.worksheet.getMergedCell(r, o), _ = {
                 data: e,
-                style: v.getStyles().getStyleByCell(e),
-                primaryWithCoord: v.getCellWithCoordByIndex((U = p == null ? void 0 : p.startRow) != null ? U : r, (L = p == null ? void 0 : p.startColumn) != null ? L : o),
+                style: g.getStyles().getStyleByCell(e),
+                primaryWithCoord: g.getCellWithCoordByIndex((P = p == null ? void 0 : p.startRow) != null ? P : r, (L = p == null ? void 0 : p.startColumn) != null ? L : o),
                 unitId: i,
                 subUnitId: a,
                 row: r,
@@ -1154,16 +1162,16 @@ let Nn = class extends cn {
                 workbook: l,
                 worksheet: s
               };
-              return (T = (y = c == null ? void 0 : c.canvasRender) == null ? void 0 : y.calcCellAutoHeight) == null ? void 0 : T.call(y, _);
+              return (O = (y = c == null ? void 0 : c.canvasRender) == null ? void 0 : y.calcCellAutoHeight) == null ? void 0 : O.call(y, _);
             }, e.interceptorAutoWidth = () => {
-              var P, k, U, L, y, T;
-              const v = (k = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(lt).getSkeletonParam(a)) == null ? void 0 : k.skeleton;
-              if (!v)
+              var T, A, P, L, y, O;
+              const g = (A = (T = this._renderManagerService.getRenderById(i)) == null ? void 0 : T.with(ut).getSkeletonParam(a)) == null ? void 0 : A.skeleton;
+              if (!g)
                 return;
-              const p = v.worksheet.getMergedCell(r, o), _ = {
+              const p = g.worksheet.getMergedCell(r, o), _ = {
                 data: e,
-                style: v.getStyles().getStyleByCell(e),
-                primaryWithCoord: v.getCellWithCoordByIndex((U = p == null ? void 0 : p.startRow) != null ? U : r, (L = p == null ? void 0 : p.startColumn) != null ? L : o),
+                style: g.getStyles().getStyleByCell(e),
+                primaryWithCoord: g.getCellWithCoordByIndex((P = p == null ? void 0 : p.startRow) != null ? P : r, (L = p == null ? void 0 : p.startColumn) != null ? L : o),
                 unitId: i,
                 subUnitId: a,
                 row: r,
@@ -1171,8 +1179,8 @@ let Nn = class extends cn {
                 workbook: l,
                 worksheet: s
               };
-              return (T = (y = c == null ? void 0 : c.canvasRender) == null ? void 0 : y.calcCellAutoWidth) == null ? void 0 : T.call(y, _);
-            }, e.coverable = ((b = e == null ? void 0 : e.coverable) != null ? b : !0) && !(u.type === Y.LIST || u.type === Y.LIST_MULTIPLE), n(e);
+              return (O = (y = c == null ? void 0 : c.canvasRender) == null ? void 0 : y.calcCellAutoWidth) == null ? void 0 : O.call(y, _);
+            }, e.coverable = ((b = e == null ? void 0 : e.coverable) != null ? b : !0) && !(u.type === X.LIST || u.type === X.LIST_MULTIPLE), n(e);
           }
         }
       )
@@ -1180,35 +1188,35 @@ let Nn = class extends cn {
   }
   _initAutoHeight() {
     this._sheetDataValidationModel.ruleChange$.pipe(
-      fn((e) => e.source === "command"),
-      ur(16)
+      Cn((e) => e.source === "command"),
+      gr(16)
     ).subscribe((e) => {
       const t = [];
       if (e.forEach((n) => {
         var r;
-        (n.rule.type === Y.LIST_MULTIPLE || n.rule.type === Y.LIST) && (r = n.rule) != null && r.ranges && t.push(...n.rule.ranges);
+        (n.rule.type === X.LIST_MULTIPLE || n.rule.type === X.LIST) && (r = n.rule) != null && r.ranges && t.push(...n.rule.ranges);
       }), t.length) {
         const n = this._autoHeightController.getUndoRedoParamsOfAutoHeight(t);
-        jn(n.redos, this._commandService);
+        Zn(n.redos, this._commandService);
       }
     });
   }
 };
-Nn = Cr([
-  K(0, te),
-  K(1, Ue),
-  K(2, D(pr)),
-  K(3, D(Me)),
-  K(4, D(un)),
-  K(5, D(oe)),
-  K(6, D(rr))
-], Nn);
-var Jo = Object.getOwnPropertyDescriptor, Qo = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Jo(t, n) : t, i = e.length - 1, a; i >= 0; i--)
+$n = Rr([
+  K(0, oe),
+  K(1, xe),
+  K(2, E(fr)),
+  K(3, E(Te)),
+  K(4, E(gn)),
+  K(5, E(ae)),
+  K(6, E(ar))
+], $n);
+var ni = Object.getOwnPropertyDescriptor, ri = (e, t, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? ni(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, Un = (e, t) => (n, r) => t(n, r, e);
-let Et = class extends Re {
+}, xn = (e, t) => (n, r) => t(n, r, e);
+let Tt = class extends De {
   constructor(e, t, n) {
     super(), this._context = e, this._sheetDataValidationModel = t, this._sheetSkeletonManagerService = n, this._initSkeletonChange();
   }
@@ -1225,16 +1233,16 @@ let Et = class extends Re {
         (i = this._sheetSkeletonManagerService.getSkeletonParam(o)) == null || i.skeleton.makeDirty(!0);
       }), (r = this._context.mainComponent) == null || r.makeForceDirty();
     };
-    this.disposeWithMe(this._sheetDataValidationModel.validStatusChange$.pipe(Ur(16)).subscribe(e));
+    this.disposeWithMe(this._sheetDataValidationModel.validStatusChange$.pipe(Br(16)).subscribe(e));
   }
 };
-Et = Qo([
-  Un(1, D(oe)),
-  Un(2, D(lt))
-], Et);
-function $e({ ref: e, ...t }) {
-  const { icon: n, id: r, className: o, extend: i, ...a } = t, l = `univerjs-icon univerjs-icon-${r} ${o || ""}`.trim(), s = ht(`_${ni()}`);
-  return wr(n, `${r}`, {
+Tt = ri([
+  xn(1, E(ae)),
+  xn(2, E(ut))
+], Tt);
+function We({ ref: e, ...t }) {
+  const { icon: n, id: r, className: o, extend: i, ...a } = t, l = `univerjs-icon univerjs-icon-${r} ${o || ""}`.trim(), s = vt(`_${ai()}`);
+  return Mr(n, `${r}`, {
     defIds: n.defIds,
     idSuffix: s.current
   }, {
@@ -1243,14 +1251,14 @@ function $e({ ref: e, ...t }) {
     ...a
   }, i);
 }
-function wr(e, t, n, r, o) {
-  return we(e.tag, {
+function Mr(e, t, n, r, o) {
+  return ye(e.tag, {
     key: t,
-    ...ei(e, n, o),
+    ...oi(e, n, o),
     ...r
-  }, (ti(e, n).children || []).map((i, a) => wr(i, `${t}-${e.tag}-${a}`, n, void 0, o)));
+  }, (ii(e, n).children || []).map((i, a) => Mr(i, `${t}-${e.tag}-${a}`, n, void 0, o)));
 }
-function ei(e, t, n) {
+function oi(e, t, n) {
   const r = { ...e.attrs };
   n != null && n.colorChannel1 && r.fill === "colorChannel1" && (r.fill = n.colorChannel1), e.tag === "mask" && r.id && (r.id = r.id + t.idSuffix), Object.entries(r).forEach(([i, a]) => {
     i === "mask" && typeof a == "string" && (r[i] = a.replace(/url\(#(.*)\)/, `url(#$1${t.idSuffix})`));
@@ -1260,7 +1268,7 @@ function ei(e, t, n) {
     typeof a == "string" && (r[i] = a.replace(/url\(#(.*)\)/, `url(#$1${t.idSuffix})`));
   })), r;
 }
-function ti(e, t) {
+function ii(e, t) {
   var r;
   const { defIds: n } = t;
   return !n || n.length === 0 ? e : e.tag === "defs" && ((r = e.children) != null && r.length) ? {
@@ -1274,11 +1282,11 @@ function ti(e, t) {
     } : o)
   } : e;
 }
-function ni() {
+function ai() {
   return Math.random().toString(36).substring(2, 8);
 }
-$e.displayName = "UniverIcon";
-const ri = {
+We.displayName = "UniverIcon";
+const si = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -1321,15 +1329,15 @@ const ri = {
       }
     }
   ]
-}, Ir = nt(function(t, n) {
-  return we($e, Object.assign({}, t, {
+}, br = it(function(t, n) {
+  return ye(We, Object.assign({}, t, {
     id: "data-validation-icon",
     ref: n,
-    icon: ri
+    icon: si
   }));
 });
-Ir.displayName = "DataValidationIcon";
-const oi = {
+br.displayName = "DataValidationIcon";
+const li = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -1370,15 +1378,15 @@ const oi = {
       }
     }
   ]
-}, Sn = nt(function(t, n) {
-  return we($e, Object.assign({}, t, {
+}, Rn = it(function(t, n) {
+  return ye(We, Object.assign({}, t, {
     id: "delete-icon",
     ref: n,
-    icon: oi
+    icon: li
   }));
 });
-Sn.displayName = "DeleteIcon";
-const ii = {
+Rn.displayName = "DeleteIcon";
+const di = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -1394,15 +1402,15 @@ const ii = {
       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"
     }
   }]
-}, Rr = nt(function(t, n) {
-  return we($e, Object.assign({}, t, {
+}, Er = it(function(t, n) {
+  return ye(We, Object.assign({}, t, {
     id: "increase-icon",
     ref: n,
-    icon: ii
+    icon: di
   }));
 });
-Rr.displayName = "IncreaseIcon";
-const ai = {
+Er.displayName = "IncreaseIcon";
+const ci = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -1420,15 +1428,15 @@ const ai = {
       clipRule: "evenodd"
     }
   }]
-}, wn = nt(function(t, n) {
-  return we($e, Object.assign({}, t, {
+}, yn = it(function(t, n) {
+  return ye(We, Object.assign({}, t, {
     id: "more-down-icon",
     ref: n,
-    icon: ai
+    icon: ci
   }));
 });
-wn.displayName = "MoreDownIcon";
-const si = {
+yn.displayName = "MoreDownIcon";
+const ui = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -1446,15 +1454,15 @@ const si = {
       clipRule: "evenodd"
     }
   }]
-}, yr = nt(function(t, n) {
-  return we($e, Object.assign({}, t, {
+}, Dr = it(function(t, n) {
+  return ye(We, Object.assign({}, t, {
     id: "more-up-icon",
     ref: n,
-    icon: si
+    icon: ui
   }));
 });
-yr.displayName = "MoreUpIcon";
-const li = {
+Dr.displayName = "MoreUpIcon";
+const hi = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -1507,54 +1515,54 @@ const li = {
       }
     }
   ]
-}, Mr = nt(function(t, n) {
-  return we($e, Object.assign({}, t, {
+}, Vr = it(function(t, n) {
+  return ye(We, Object.assign({}, t, {
     id: "sequence-icon",
     ref: n,
-    icon: li
+    icon: hi
   }));
 });
-Mr.displayName = "SequenceIcon";
-function di(e) {
+Vr.displayName = "SequenceIcon";
+function pi(e) {
   var d;
-  const t = F(de), n = F(mn), { value: r, onChange: o, extraComponent: i } = e, [a, l] = W(!1), s = i ? n.get(i) : null;
-  return /* @__PURE__ */ j(ct, { children: [
-    /* @__PURE__ */ j(
+  const t = F(ge), n = F(Sn), { value: r, onChange: o, extraComponent: i } = e, [a, l] = W(!1), s = i ? n.get(i) : null;
+  return /* @__PURE__ */ Y(pt, { children: [
+    /* @__PURE__ */ Y(
       "div",
       {
         className: "univer-mb-3 univer-flex univer-cursor-pointer univer-items-center univer-text-sm univer-text-gray-900 dark:!univer-text-white",
         onClick: () => l(!a),
         children: [
           t.t("dataValidation.panel.options"),
-          a ? /* @__PURE__ */ C(yr, { className: "univer-ml-1" }) : /* @__PURE__ */ C(wn, { className: "univer-ml-1" })
+          a ? /* @__PURE__ */ S(Dr, { className: "univer-ml-1" }) : /* @__PURE__ */ S(yn, { className: "univer-ml-1" })
         ]
       }
     ),
-    a && /* @__PURE__ */ j(ct, { children: [
-      s ? /* @__PURE__ */ C(s, { value: r, onChange: o }) : null,
-      /* @__PURE__ */ C(
-        X,
+    a && /* @__PURE__ */ Y(pt, { children: [
+      s ? /* @__PURE__ */ S(s, { value: r, onChange: o }) : null,
+      /* @__PURE__ */ S(
+        Z,
         {
           label: t.t("dataValidation.panel.invalid"),
-          children: /* @__PURE__ */ j(
-            _n,
+          children: /* @__PURE__ */ Y(
+            In,
             {
-              value: `${(d = r.errorStyle) != null ? d : st.WARNING}`,
+              value: `${(d = r.errorStyle) != null ? d : ct.WARNING}`,
               onChange: (u) => o({ ...r, errorStyle: +u }),
               children: [
-                /* @__PURE__ */ C(Ae, { value: `${st.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
-                /* @__PURE__ */ C(Ae, { value: `${st.STOP}`, children: t.t("dataValidation.panel.rejectInput") })
+                /* @__PURE__ */ S(Ne, { value: `${ct.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
+                /* @__PURE__ */ S(Ne, { value: `${ct.STOP}`, children: t.t("dataValidation.panel.rejectInput") })
               ]
             }
           )
         }
       ),
-      /* @__PURE__ */ C(
-        X,
+      /* @__PURE__ */ S(
+        Z,
         {
           label: t.t("dataValidation.panel.messageInfo"),
-          children: /* @__PURE__ */ C(
-            Pt,
+          children: /* @__PURE__ */ S(
+            Nt,
             {
               checked: r.showErrorMessage,
               onChange: () => o({
@@ -1566,259 +1574,272 @@ function di(e) {
           )
         }
       ),
-      r.showErrorMessage ? /* @__PURE__ */ C(X, { children: /* @__PURE__ */ C(Pe, { value: r.error, onChange: (u) => o({ ...r, error: u }) }) }) : null
+      r.showErrorMessage ? /* @__PURE__ */ S(Z, { children: /* @__PURE__ */ S(Ue, { value: r.error, onChange: (u) => o({ ...r, error: u }) }) }) : null
     ] })
   ] });
 }
-const ci = (e) => Fr(
+const gi = (e) => Wr(
   async (t, n, r, o) => {
     const i = await e.executeCommand(t, n, r);
     o == null || o(i);
   },
   1e3
 );
-function ui(e, t, n) {
+function vi(e, t, n) {
   var r, o, i, a;
-  return t ? ((o = (r = e.getUnit(t)) == null ? void 0 : r.getSheetBySheetName(n)) == null ? void 0 : o.getSheetId()) || "" : ((a = (i = e.getCurrentUnitForType(Z.UNIVER_SHEET)) == null ? void 0 : i.getSheetBySheetName(n)) == null ? void 0 : a.getSheetId()) || "";
+  return t ? ((o = (r = e.getUnit(t)) == null ? void 0 : r.getSheetBySheetName(n)) == null ? void 0 : o.getSheetId()) || "" : ((a = (i = e.getCurrentUnitForType(H.UNIVER_SHEET)) == null ? void 0 : i.getSheetBySheetName(n)) == null ? void 0 : a.getSheetId()) || "";
 }
-function hi() {
-  var M, N;
-  const [e, t] = W(0), n = F(me), r = Oe(n.activeRule$, n.activeRule), { unitId: o, subUnitId: i, rule: a } = r || {}, l = a.uid, s = F(Me), d = F(le), u = F(mn), g = F(te), c = F(gn), m = F(de), [h, E] = W(a), R = s.getValidatorItem(h.type), [w, S] = W(!1), I = s.getValidatorsByScope(lo.SHEET), [b, v] = W(() => h.ranges.map((f) => ({ unitId: "", sheetId: "", range: f }))), p = dt(() => ci(g), [g]), [_, P] = W(!1), [k, U] = W(!1), L = ht(null), y = F(Kn);
-  if (Le(() => () => {
-    const f = y.getCurrentLastSelection();
-    f && y.setSelections([f]);
-  }, [y]), Le(() => {
-    g.onCommandExecuted((f) => {
-      (f.id === $r.id || f.id === xr.id) && setTimeout(() => {
-        const O = c.getRuleById(o, i, l);
-        t(($) => $ + 1), O && (E(O), v(O.ranges.map(($) => ({ unitId: "", sheetId: "", range: $ }))));
+function mi() {
+  var N, J;
+  const [e, t] = W(0), n = F(_e), r = Re(n.activeRule$, n.activeRule), { unitId: o, subUnitId: i, rule: a } = r || {}, l = a.uid, s = F(Te), d = F(pe), u = F(Sn), h = F(oe), c = F(fn), m = F(ge), I = Re(
+    () => d.getCurrentTypeOfUnit$(H.UNIVER_SHEET),
+    void 0,
+    void 0,
+    []
+  ), D = Re(() => {
+    var R;
+    return (R = I == null ? void 0 : I.activeSheet$) != null ? R : vr(null);
+  }, void 0, void 0, []), [v, C] = W(a), f = s.getValidatorItem(v.type), [w, b] = W(!1), g = s.getValidatorsByScope(mo.SHEET), [p, _] = W(() => v.ranges.map((R) => ({ unitId: "", sheetId: "", range: R }))), T = ht(() => gi(h), [h]), [A, P] = W(!1), [L, y] = W(!1), O = vt(null), U = F(Jn);
+  if (be(() => () => {
+    const R = U.getCurrentLastSelection();
+    R && U.setSelections([R]);
+  }, [U]), be(() => {
+    h.onCommandExecuted((R) => {
+      (R.id === Hr.id || R.id === jr.id) && setTimeout(() => {
+        const B = c.getRuleById(o, i, l);
+        t((z) => z + 1), B && (C(B), _(B.ranges.map((z) => ({ unitId: "", sheetId: "", range: z }))));
       }, 20);
     });
-  }, [g, c, l, i, o]), !R)
+  }, [h, c, l, i, o]), !f)
     return null;
-  const T = R.operators, A = R.operatorNames, x = h.operator ? co.includes(h.operator) : !1, H = () => {
-    var f, O, $;
-    (O = (f = L.current) == null ? void 0 : f.editor) != null && O.isFocus() && q(($ = L.current) == null ? void 0 : $.getValue()), !(!h.ranges.length || _) && (R.validatorFormula(h, o, i).success ? n.setActiveRule(null) : S(!0));
-  }, q = nn((f) => {
-    const O = f.split(",").filter(Boolean).map(To).map((Q) => {
-      const In = Q.sheetName;
-      if (In) {
-        const Vr = ui(d, Q.unitId, In);
-        return { ...Q, sheetId: Vr };
+  const k = f.operators, x = f.operatorNames, te = v.operator ? fo.includes(v.operator) : !1, j = () => {
+    (D == null ? void 0 : D.getSheetId()) !== i && h.syncExecuteCommand(ro.id, {
+      unitId: o,
+      subUnitId: i
+    });
+  }, se = () => {
+    var R, B, z;
+    (B = (R = O.current) == null ? void 0 : R.editor) != null && B.isFocus() && le((z = O.current) == null ? void 0 : z.getValue()), !(!v.ranges.length || A) && (f.validatorFormula(v, o, i).success ? n.setActiveRule(null) : b(!0), j());
+  }, le = an((R) => {
+    const B = R.split(",").filter(Boolean).map(Lo).map((ne) => {
+      const Mn = ne.sheetName;
+      if (Mn) {
+        const Pr = vi(d, ne.unitId, Mn);
+        return { ...ne, sheetId: Pr };
       }
       return {
-        ...Q,
+        ...ne,
         sheetId: ""
       };
     });
-    if (Br(O, b))
+    if (Yr(B, p))
       return;
-    v(O);
-    const $ = O.filter((Q) => (!Q.unitId || Q.unitId === o) && (!Q.sheetId || Q.sheetId === i)).map((Q) => Q.range);
-    if (E({
-      ...h,
-      ranges: $
-    }), $.length === 0)
+    _(B);
+    const z = B.filter((ne) => (!ne.unitId || ne.unitId === o) && (!ne.sheetId || ne.sheetId === i)).map((ne) => ne.range);
+    if (C({
+      ...v,
+      ranges: z
+    }), z.length === 0)
       return;
-    const ce = {
+    const Ie = {
       unitId: o,
       subUnitId: i,
       ruleId: l,
-      ranges: $
+      ranges: z
     };
-    p(nr.id, ce);
-  }), B = (f) => {
-    if (Rn(f, Tn(h)))
+    T(ir.id, Ie);
+  }), de = (R) => {
+    if (bn(R, Pn(v)))
       return;
-    E({
-      ...h,
-      ...f
+    C({
+      ...v,
+      ...R
     });
-    const O = {
+    const B = {
       unitId: o,
       subUnitId: i,
       ruleId: l,
-      setting: f
+      setting: R
     };
-    p(
-      En.id,
-      O,
+    T(
+      Tn.id,
+      B,
       void 0
     );
-  }, ne = async () => {
-    await g.executeCommand(or.id, {
+  }, Me = async () => {
+    await h.executeCommand(sr.id, {
       ruleId: l,
       unitId: o,
       subUnitId: i
-    }), n.setActiveRule(null);
-  }, ie = {
-    type: h.type,
-    operator: h.operator,
-    formula1: h.formula1,
-    formula2: h.formula2,
-    allowBlank: h.allowBlank
-  }, _e = (f) => {
-    const O = s.getValidatorItem(f);
-    if (!O)
+    }), n.setActiveRule(null), j();
+  }, Q = {
+    type: v.type,
+    operator: v.operator,
+    formula1: v.formula1,
+    formula2: v.formula2,
+    allowBlank: v.allowBlank
+  }, G = (R) => {
+    const B = s.getValidatorItem(R);
+    if (!B)
       return;
-    const $ = O.operators, ce = c.getRuleById(o, i, l), Q = f === (ce == null ? void 0 : ce.type) || f.includes("list") && (ce != null && ce.type.includes("list")) ? {
-      ...ce,
-      type: f
+    const z = B.operators, Ie = c.getRuleById(o, i, l), ne = R === (Ie == null ? void 0 : Ie.type) || R.includes("list") && (Ie != null && Ie.type.includes("list")) ? {
+      ...Ie,
+      type: R
     } : {
-      ...h,
-      type: f,
-      operator: $[0],
+      ...v,
+      type: R,
+      operator: z[0],
       formula1: void 0,
       formula2: void 0
     };
-    E(Q), g.executeCommand(En.id, {
+    C(ne), h.executeCommand(Tn.id, {
       unitId: o,
       subUnitId: i,
-      ruleId: h.uid,
-      setting: Tn(Q)
+      ruleId: v.uid,
+      setting: Pn(ne)
     });
-  }, Ce = u.get(R.formulaInput), J = dt(() => b.map((f) => gr(f.range)).join(","), []), z = Vn(h), ge = (f) => {
-    Rn(f, Vn(h)) || (E({
-      ...h,
-      ...f
-    }), p(
-      Qr.id,
+  }, ce = u.get(f.formulaInput), ee = ht(() => p.map((R) => _r(R.range)).join(","), []), q = An(v), M = (R) => {
+    bn(R, An(v)) || (C({
+      ...v,
+      ...R
+    }), T(
+      ao.id,
       {
         unitId: o,
         subUnitId: i,
         ruleId: l,
-        options: f
+        options: R
       }
     ));
-  }, G = T.length && !h.operator;
-  return /* @__PURE__ */ j("div", { "data-u-comp": "data-validation-detail", className: "univer-py-2", children: [
-    /* @__PURE__ */ C(
-      X,
+  }, $ = k.length && !v.operator;
+  return /* @__PURE__ */ Y("div", { "data-u-comp": "data-validation-detail", className: "univer-py-2", children: [
+    /* @__PURE__ */ S(
+      Z,
       {
         label: m.t("dataValidation.panel.range"),
-        error: !h.ranges.length || _ ? m.t("dataValidation.panel.rangeError") : "",
-        children: /* @__PURE__ */ C(
-          Oo,
+        error: !v.ranges.length || A ? m.t("dataValidation.panel.rangeError") : "",
+        children: /* @__PURE__ */ S(
+          ko,
           {
-            selectorRef: L,
+            selectorRef: O,
             unitId: o,
             subUnitId: i,
-            initialValue: J,
-            onChange: (f, O) => {
-              var $;
-              !k && (($ = L.current) != null && $.verify()) && q(O);
+            initialValue: ee,
+            onChange: (R, B) => {
+              var z;
+              !L && ((z = O.current) != null && z.verify()) && le(B);
             },
-            onFocusChange: (f, O) => {
-              var $;
-              U(f), !f && O && (($ = L.current) != null && $.verify()) && q(O);
+            onFocusChange: (R, B) => {
+              var z;
+              y(R), !R && B && ((z = O.current) != null && z.verify()) && le(B);
             },
-            onVerify: (f) => P(!f)
+            onVerify: (R) => P(!R)
           }
         )
       }
     ),
-    /* @__PURE__ */ C(X, { label: m.t("dataValidation.panel.type"), children: /* @__PURE__ */ C(
-      Ln,
+    /* @__PURE__ */ S(Z, { label: m.t("dataValidation.panel.type"), children: /* @__PURE__ */ S(
+      Un,
       {
         className: "univer-w-full",
-        value: h.type,
-        options: (M = I == null ? void 0 : I.sort((f, O) => f.order - O.order)) == null ? void 0 : M.map((f) => ({
-          label: m.t(f.title),
-          value: f.id
+        value: v.type,
+        options: (N = g == null ? void 0 : g.sort((R, B) => R.order - B.order)) == null ? void 0 : N.map((R) => ({
+          label: m.t(R.title),
+          value: R.id
         })),
-        onChange: _e
+        onChange: G
       }
     ) }),
-    T != null && T.length ? /* @__PURE__ */ C(X, { label: m.t("dataValidation.panel.operator"), children: /* @__PURE__ */ C(
-      Ln,
+    k != null && k.length ? /* @__PURE__ */ S(Z, { label: m.t("dataValidation.panel.operator"), children: /* @__PURE__ */ S(
+      Un,
       {
         className: "univer-w-full",
-        value: `${h.operator}`,
+        value: `${v.operator}`,
         options: [
           {
             value: "",
             label: m.t("dataValidation.operators.legal")
           },
-          ...T.map((f, O) => ({
-            value: `${f}`,
-            label: A[O]
+          ...k.map((R, B) => ({
+            value: `${R}`,
+            label: x[B]
           }))
         ],
-        onChange: (f) => {
-          B({
-            ...ie,
-            operator: f
+        onChange: (R) => {
+          de({
+            ...Q,
+            operator: R
           });
         }
       }
     ) }) : null,
-    Ce && !G ? /* @__PURE__ */ C(
-      Ce,
+    ce && !$ ? /* @__PURE__ */ S(
+      ce,
       {
-        isTwoFormula: x,
+        isTwoFormula: te,
         value: {
-          formula1: h.formula1,
-          formula2: h.formula2
+          formula1: v.formula1,
+          formula2: v.formula2
         },
-        onChange: (f) => {
-          B({
-            ...ie,
-            ...f
+        onChange: (R) => {
+          de({
+            ...Q,
+            ...R
           });
         },
         showError: w,
-        validResult: R.validatorFormula(h, o, i),
+        validResult: f.validatorFormula(v, o, i),
         unitId: o,
         subUnitId: i,
         ruleId: l
       },
-      e + h.type
+      e + v.type
     ) : null,
-    /* @__PURE__ */ C(X, { children: /* @__PURE__ */ C(
-      Pt,
+    /* @__PURE__ */ S(Z, { children: /* @__PURE__ */ S(
+      Nt,
       {
-        checked: (N = h.allowBlank) != null ? N : !0,
+        checked: (J = v.allowBlank) != null ? J : !0,
         onChange: () => {
-          var f;
-          return B({
-            ...ie,
-            allowBlank: !((f = h.allowBlank) == null || f)
+          var R;
+          return de({
+            ...Q,
+            allowBlank: !((R = v.allowBlank) == null || R)
           });
         },
         children: m.t("dataValidation.panel.allowBlank")
       }
     ) }),
-    /* @__PURE__ */ C(di, { value: z, onChange: ge, extraComponent: R.optionsInput }),
-    /* @__PURE__ */ j("div", { className: "univer-mt-5 univer-flex univer-flex-row univer-justify-end", children: [
-      /* @__PURE__ */ C(ze, { className: "univer-ml-3", onClick: ne, children: m.t("dataValidation.panel.removeRule") }),
-      /* @__PURE__ */ C(ze, { className: "univer-ml-3", variant: "primary", onClick: H, children: m.t("dataValidation.panel.done") })
+    /* @__PURE__ */ S(pi, { value: q, onChange: M, extraComponent: f.optionsInput }),
+    /* @__PURE__ */ Y("div", { className: "univer-mt-5 univer-flex univer-flex-row univer-justify-end", children: [
+      /* @__PURE__ */ S(qe, { className: "univer-ml-3", onClick: Me, children: m.t("dataValidation.panel.removeRule") }),
+      /* @__PURE__ */ S(qe, { className: "univer-ml-3", variant: "primary", onClick: se, children: m.t("dataValidation.panel.done") })
     ] })
   ] });
 }
-const pi = (e) => {
-  const { rule: t, onClick: n, unitId: r, subUnitId: o, disable: i } = e, a = F(Me), l = F(te), s = F(Eo), d = a.getValidatorItem(t.type), u = ht(void 0), [g, c] = W(!1), m = F(Yn), h = Oe(m.currentTheme$), E = dt(() => {
-    var v;
-    const w = m.getColorFromTheme("primary.600"), S = m.getColorFromTheme("loop-color.2"), I = (v = m.getColorFromTheme(S)) != null ? v : w, b = new Wr(I).toRgb();
+const fi = (e) => {
+  const { rule: t, onClick: n, unitId: r, subUnitId: o, disable: i } = e, a = F(Te), l = F(oe), s = F(Oo), d = a.getValidatorItem(t.type), u = vt(void 0), [h, c] = W(!1), m = F(zn), I = Re(m.currentTheme$), D = ht(() => {
+    var g;
+    const C = m.getColorFromTheme("primary.600"), f = m.getColorFromTheme("loop-color.2"), w = (g = m.getColorFromTheme(f)) != null ? g : C, b = new Xr(w).toRgb();
     return {
       fill: `rgba(${b.r}, ${b.g}, ${b.b}, 0.1)`,
-      stroke: I
+      stroke: w
     };
-  }, [h]), R = (w) => {
-    l.executeCommand(or.id, {
+  }, [I]), v = (C) => {
+    l.executeCommand(sr.id, {
       ruleId: t.uid,
       unitId: r,
       subUnitId: o
-    }), w.stopPropagation();
+    }), C.stopPropagation();
   };
-  return Le(() => () => {
-    var w;
-    u.current && ((w = u.current) == null || w.forEach((S) => {
-      S && s.removeShape(S);
+  return be(() => () => {
+    var C;
+    u.current && ((C = u.current) == null || C.forEach((f) => {
+      f && s.removeShape(f);
     }));
-  }, [s]), /* @__PURE__ */ j(
+  }, [s]), /* @__PURE__ */ Y(
     "div",
     {
-      className: ke(
+      className: Fe(
         `
                   univer-bg-secondary univer-relative univer--mx-2 univer-box-border univer-flex univer-w-[287px]
                   univer-cursor-pointer univer-flex-col univer-justify-between univer-overflow-hidden univer-rounded-md
@@ -1831,119 +1852,119 @@ const pi = (e) => {
       ),
       onClick: n,
       onMouseEnter: () => {
-        i || (c(!0), u.current = t.ranges.map((w) => s.addShape({
-          range: w,
-          style: E,
+        i || (c(!0), u.current = t.ranges.map((C) => s.addShape({
+          range: C,
+          style: D,
           primary: null
         })));
       },
       onMouseLeave: () => {
-        var w;
-        c(!1), (w = u.current) == null || w.forEach((S) => {
-          S && s.removeShape(S);
+        var C;
+        c(!1), (C = u.current) == null || C.forEach((f) => {
+          f && s.removeShape(f);
         }), u.current = void 0;
       },
       children: [
-        /* @__PURE__ */ C(
+        /* @__PURE__ */ S(
           "div",
           {
             className: "univer-truncate univer-text-sm univer-font-medium univer-leading-[22px] univer-text-gray-900 dark:!univer-text-white",
             children: d == null ? void 0 : d.generateRuleName(t)
           }
         ),
-        /* @__PURE__ */ C(
+        /* @__PURE__ */ S(
           "div",
           {
             className: "univer-text-secondary univer-truncate univer-text-xs univer-leading-[18px] dark:!univer-text-gray-300",
-            children: t.ranges.map((w) => gr(w)).join(",")
+            children: t.ranges.map((C) => _r(C)).join(",")
           }
         ),
-        g ? /* @__PURE__ */ C(
+        h ? /* @__PURE__ */ S(
           "div",
           {
             className: "univer-absolute univer-right-2 univer-top-[19px] univer-flex univer-size-5 univer-items-center univer-justify-center univer-rounded hover:univer-bg-gray-200 dark:!univer-text-gray-300 dark:hover:!univer-bg-gray-700",
-            onClick: R,
-            children: /* @__PURE__ */ C(Sn, {})
+            onClick: v,
+            children: /* @__PURE__ */ S(Rn, {})
           }
         ) : null
       ]
     }
   );
 };
-function gi(e) {
-  const t = F(oe), n = F(le), r = F(te), o = F(ye), i = F(me), a = F(de), [l, s] = W([]), { workbook: d } = e, u = Oe(d.activeSheet$, void 0, !0), g = d.getUnitId(), c = u == null ? void 0 : u.getSheetId();
-  Le(() => {
-    s(t.getRules(g, c));
-    const S = t.ruleChange$.subscribe((I) => {
-      I.unitId === g && I.subUnitId === c && s(t.getRules(g, c));
+function _i(e) {
+  const t = F(ae), n = F(pe), r = F(oe), o = F(Ve), i = F(_e), a = F(ge), [l, s] = W([]), { workbook: d } = e, u = Re(d.activeSheet$, void 0, !0), h = d.getUnitId(), c = u == null ? void 0 : u.getSheetId();
+  be(() => {
+    s(t.getRules(h, c));
+    const f = t.ruleChange$.subscribe((w) => {
+      w.unitId === h && w.subUnitId === c && s(t.getRules(h, c));
     });
     return () => {
-      S.unsubscribe();
+      f.unsubscribe();
     };
-  }, [g, c, t]);
+  }, [h, c, t]);
   const m = async () => {
-    const S = er(o), I = {
-      unitId: g,
+    const f = rr(o), w = {
+      unitId: h,
       subUnitId: c,
-      rule: S
+      rule: f
     };
-    await r.executeCommand(hn.id, I), i.setActiveRule({
-      unitId: g,
+    await r.executeCommand(vn.id, w), i.setActiveRule({
+      unitId: h,
       subUnitId: c,
-      rule: S
+      rule: f
     });
-  }, h = () => {
-    r.executeCommand(eo.id, {
-      unitId: g,
+  }, I = () => {
+    r.executeCommand(so.id, {
+      unitId: h,
       subUnitId: c
     });
-  }, R = ((S) => {
-    const I = n.getCurrentUnitForType(Z.UNIVER_SHEET), b = I.getActiveSheet(), v = I.getUnitId(), p = b.getSheetId();
-    return S.map((P) => qr(o, v, p, P.ranges) ? { ...P } : { ...P, disable: !0 });
-  })(l), w = R == null ? void 0 : R.some((S) => S.disable);
-  return /* @__PURE__ */ j("div", { className: "univer-pb-4", children: [
-    R == null ? void 0 : R.map((S) => {
-      var I;
-      return /* @__PURE__ */ C(
-        pi,
+  }, v = ((f) => {
+    const w = n.getCurrentUnitForType(H.UNIVER_SHEET), b = w.getActiveSheet(), g = w.getUnitId(), p = b.getSheetId();
+    return f.map((T) => oo(o, g, p, T.ranges) ? { ...T } : { ...T, disable: !0 });
+  })(l), C = v == null ? void 0 : v.some((f) => f.disable);
+  return /* @__PURE__ */ Y("div", { className: "univer-pb-4", children: [
+    v == null ? void 0 : v.map((f) => {
+      var w;
+      return /* @__PURE__ */ S(
+        fi,
         {
-          unitId: g,
+          unitId: h,
           subUnitId: c,
           onClick: () => {
-            S.disable || i.setActiveRule({
-              unitId: g,
+            f.disable || i.setActiveRule({
+              unitId: h,
               subUnitId: c,
-              rule: S
+              rule: f
             });
           },
-          rule: S,
-          disable: (I = S.disable) != null ? I : !1
+          rule: f,
+          disable: (w = f.disable) != null ? w : !1
         },
-        S.uid
+        f.uid
       );
     }),
-    /* @__PURE__ */ j("div", { className: "univer-mt-4 univer-flex univer-flex-row univer-justify-end univer-gap-2", children: [
-      l.length && !w ? /* @__PURE__ */ C(ze, { onClick: h, children: a.t("dataValidation.panel.removeAll") }) : null,
-      /* @__PURE__ */ C(ze, { variant: "primary", onClick: m, children: a.t("dataValidation.panel.add") })
+    /* @__PURE__ */ Y("div", { className: "univer-mt-4 univer-flex univer-flex-row univer-justify-end univer-gap-2", children: [
+      l.length && !C ? /* @__PURE__ */ S(qe, { onClick: I, children: a.t("dataValidation.panel.removeAll") }) : null,
+      /* @__PURE__ */ S(qe, { variant: "primary", onClick: m, children: a.t("dataValidation.panel.add") })
     ] })
   ] });
 }
-const vi = () => {
-  const e = F(me), t = Oe(e.activeRule$, e.activeRule), n = F(le), r = Oe(
-    () => n.getCurrentTypeOfUnit$(Z.UNIVER_SHEET),
+const Si = () => {
+  const e = F(_e), t = Re(e.activeRule$, e.activeRule), n = F(pe), r = Re(
+    () => n.getCurrentTypeOfUnit$(H.UNIVER_SHEET),
     void 0,
     void 0,
     []
-  ), o = Oe(() => {
+  ), o = Re(() => {
     var i;
-    return (i = r == null ? void 0 : r.activeSheet$) != null ? i : fo(null);
+    return (i = r == null ? void 0 : r.activeSheet$) != null ? i : vr(null);
   }, void 0, void 0, []);
-  return !r || !o ? null : t && t.subUnitId === o.getSheetId() ? /* @__PURE__ */ C(hi, {}, t.rule.uid) : /* @__PURE__ */ C(gi, { workbook: r });
-}, mi = (e) => {
-  const { isTwoFormula: t = !1, value: n, onChange: r, showError: o, validResult: i } = e, a = F(de), l = o ? i == null ? void 0 : i.formula1 : "", s = o ? i == null ? void 0 : i.formula2 : "";
-  return t ? /* @__PURE__ */ j(ct, { children: [
-    /* @__PURE__ */ C(X, { error: l, children: /* @__PURE__ */ C(
-      Pe,
+  return !r || !o ? null : t && (t.subUnitId === o.getSheetId() || t.subUnitId === e.getFocusFormulaEditorActiveRuleSubUnitId()) ? /* @__PURE__ */ S(mi, {}, t.rule.uid) : /* @__PURE__ */ S(_i, { workbook: r });
+}, Ci = (e) => {
+  const { isTwoFormula: t = !1, value: n, onChange: r, showError: o, validResult: i } = e, a = F(ge), l = o ? i == null ? void 0 : i.formula1 : "", s = o ? i == null ? void 0 : i.formula2 : "";
+  return t ? /* @__PURE__ */ Y(pt, { children: [
+    /* @__PURE__ */ S(Z, { error: l, children: /* @__PURE__ */ S(
+      Ue,
       {
         className: "univer-w-full",
         placeholder: a.t("dataValidation.panel.formulaPlaceholder"),
@@ -1956,9 +1977,9 @@ const vi = () => {
         }
       }
     ) }),
-    /* @__PURE__ */ C("div", { className: "-univer-mt-2 univer-mb-1 univer-text-sm univer-text-gray-400", children: a.t("dataValidation.panel.formulaAnd") }),
-    /* @__PURE__ */ C(X, { error: s, children: /* @__PURE__ */ C(
-      Pe,
+    /* @__PURE__ */ S("div", { className: "-univer-mt-2 univer-mb-1 univer-text-sm univer-text-gray-400", children: a.t("dataValidation.panel.formulaAnd") }),
+    /* @__PURE__ */ S(Z, { error: s, children: /* @__PURE__ */ S(
+      Ue,
       {
         className: "univer-w-full",
         placeholder: a.t("dataValidation.panel.formulaPlaceholder"),
@@ -1971,8 +1992,8 @@ const vi = () => {
         }
       }
     ) })
-  ] }) : /* @__PURE__ */ C(X, { error: l, children: /* @__PURE__ */ C(
-    Pe,
+  ] }) : /* @__PURE__ */ S(Z, { error: l, children: /* @__PURE__ */ S(
+    Ue,
     {
       className: "univer-w-full",
       placeholder: a.t("dataValidation.panel.formulaPlaceholder"),
@@ -1983,11 +2004,11 @@ const vi = () => {
     }
   ) });
 };
-function fi(e) {
-  const { value: t, onChange: n, showError: r, validResult: o } = e, i = F(de), a = r ? o == null ? void 0 : o.formula1 : "", l = r ? o == null ? void 0 : o.formula2 : "", [s, d] = W(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
-  return /* @__PURE__ */ j(ct, { children: [
-    /* @__PURE__ */ C(X, { children: /* @__PURE__ */ C(
-      Pt,
+function Ii(e) {
+  const { value: t, onChange: n, showError: r, validResult: o } = e, i = F(ge), a = r ? o == null ? void 0 : o.formula1 : "", l = r ? o == null ? void 0 : o.formula2 : "", [s, d] = W(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
+  return /* @__PURE__ */ Y(pt, { children: [
+    /* @__PURE__ */ S(Z, { children: /* @__PURE__ */ S(
+      Nt,
       {
         checked: s,
         onChange: (u) => {
@@ -2000,8 +2021,8 @@ function fi(e) {
         children: i.t("dataValidation.checkbox.tips")
       }
     ) }),
-    s ? /* @__PURE__ */ C(X, { label: i.t("dataValidation.checkbox.checked"), error: a, children: /* @__PURE__ */ C(
-      Pe,
+    s ? /* @__PURE__ */ S(Z, { label: i.t("dataValidation.checkbox.checked"), error: a, children: /* @__PURE__ */ S(
+      Ue,
       {
         className: "univer-w-full",
         placeholder: i.t("dataValidation.panel.valuePlaceholder"),
@@ -2014,8 +2035,8 @@ function fi(e) {
         }
       }
     ) }) : null,
-    s ? /* @__PURE__ */ C(X, { label: i.t("dataValidation.checkbox.unchecked"), error: l, children: /* @__PURE__ */ C(
-      Pe,
+    s ? /* @__PURE__ */ S(Z, { label: i.t("dataValidation.checkbox.unchecked"), error: l, children: /* @__PURE__ */ S(
+      Ue,
       {
         className: "univer-w-full",
         placeholder: i.t("dataValidation.panel.valuePlaceholder"),
@@ -2030,18 +2051,18 @@ function fi(e) {
     ) }) : null
   ] });
 }
-function _i(e) {
-  var g;
-  const { unitId: t, subUnitId: n, value: r, onChange: o, showError: i, validResult: a } = e, l = i ? a == null ? void 0 : a.formula1 : void 0, s = ht(null), [d, u] = W(!1);
-  return dr((c) => {
-    var h;
-    (h = s.current) != null && h.isClickOutSide(c) && u(!1);
-  }), /* @__PURE__ */ C(X, { error: l, children: /* @__PURE__ */ C(
-    vr,
+function wi(e) {
+  var h;
+  const { unitId: t, subUnitId: n, value: r, onChange: o, showError: i, validResult: a } = e, l = i ? a == null ? void 0 : a.formula1 : void 0, s = vt(null), [d, u] = W(!1);
+  return hr((c) => {
+    var I;
+    (I = s.current) != null && I.isClickOutSide(c) && u(!1);
+  }), /* @__PURE__ */ S(Z, { error: l, children: /* @__PURE__ */ S(
+    Sr,
     {
       ref: s,
-      className: ke("univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors hover:univer-border-primary-600 dark:!univer-bg-gray-700 dark:!univer-text-white [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent", Rt),
-      initValue: (g = r == null ? void 0 : r.formula1) != null ? g : "=",
+      className: Fe("univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors hover:univer-border-primary-600 dark:!univer-bg-gray-700 dark:!univer-text-white [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent", bt),
+      initValue: (h = r == null ? void 0 : r.formula1) != null ? h : "=",
       unitId: t,
       subUnitId: n,
       isFocus: d,
@@ -2057,7 +2078,7 @@ function _i(e) {
     }
   ) });
 }
-const Ci = [
+const Ri = [
   "#FFFFFF",
   "#FEE7E7",
   "#FEF0E6",
@@ -2082,24 +2103,24 @@ const Ci = [
   "#3A60F7",
   "#9E6DE3",
   "#F248A6"
-], Si = (e) => {
+], yi = (e) => {
   const { value: t, onChange: n, disabled: r } = e, [o, i] = W(!1);
-  return /* @__PURE__ */ C(
-    Vo,
+  return /* @__PURE__ */ S(
+    Po,
     {
       align: "start",
       disabled: r,
       open: o,
       onOpenChange: i,
-      overlay: /* @__PURE__ */ C(
+      overlay: /* @__PURE__ */ S(
         "div",
         {
           className: "univer-box-border univer-grid univer-w-fit univer-grid-cols-6 univer-flex-wrap univer-gap-2 univer-p-1.5",
-          children: Ci.map(
-            (a) => /* @__PURE__ */ C(
+          children: Ri.map(
+            (a) => /* @__PURE__ */ S(
               "div",
               {
-                className: ke("univer-box-border univer-size-4 univer-cursor-pointer univer-rounded", Rt),
+                className: Fe("univer-box-border univer-size-4 univer-cursor-pointer univer-rounded", bt),
                 style: { background: a },
                 onClick: () => {
                   n(a), i(!1);
@@ -2110,30 +2131,30 @@ const Ci = [
           )
         }
       ),
-      children: /* @__PURE__ */ j(
+      children: /* @__PURE__ */ Y(
         "div",
         {
-          className: ke("univer-box-border univer-inline-flex univer-h-8 univer-w-16 univer-cursor-pointer univer-items-center univer-justify-between univer-gap-2 univer-rounded-lg univer-bg-white univer-px-2.5 univer-transition-colors univer-duration-200 hover:univer-border-primary-600 dark:!univer-bg-gray-700 dark:!univer-text-white", Rt),
+          className: Fe("univer-box-border univer-inline-flex univer-h-8 univer-w-16 univer-cursor-pointer univer-items-center univer-justify-between univer-gap-2 univer-rounded-lg univer-bg-white univer-px-2.5 univer-transition-colors univer-duration-200 hover:univer-border-primary-600 dark:!univer-bg-gray-700 dark:!univer-text-white", bt),
           children: [
-            /* @__PURE__ */ C(
+            /* @__PURE__ */ S(
               "div",
               {
                 className: "univer-box-border univer-size-4 univer-rounded univer-text-base",
                 style: { background: t }
               }
             ),
-            /* @__PURE__ */ C(wn, {})
+            /* @__PURE__ */ S(yn, {})
           ]
         }
       )
     }
   );
-}, Fn = (e) => {
+}, Bn = (e) => {
   const { item: t, commonProps: n, className: r } = e, { onItemChange: o, onItemDelete: i } = n;
-  return /* @__PURE__ */ j("div", { className: ke("univer-flex univer-items-center univer-gap-2", r), children: [
-    !t.isRef && /* @__PURE__ */ C("div", { className: ke("univer-cursor-move", "draggableHandle"), children: /* @__PURE__ */ C(Mr, {}) }),
-    /* @__PURE__ */ C(
-      Si,
+  return /* @__PURE__ */ Y("div", { className: Fe("univer-flex univer-items-center univer-gap-2", r), children: [
+    !t.isRef && /* @__PURE__ */ S("div", { className: Fe("univer-cursor-move", "draggableHandle"), children: /* @__PURE__ */ S(Vr, {}) }),
+    /* @__PURE__ */ S(
+      yi,
       {
         value: t.color,
         onChange: (a) => {
@@ -2141,8 +2162,8 @@ const Ci = [
         }
       }
     ),
-    /* @__PURE__ */ C(
-      Pe,
+    /* @__PURE__ */ S(
+      Ue,
       {
         disabled: t.isRef,
         value: t.label,
@@ -2151,166 +2172,168 @@ const Ci = [
         }
       }
     ),
-    t.isRef ? null : /* @__PURE__ */ C(
+    t.isRef ? null : /* @__PURE__ */ S(
       "div",
       {
         className: "univer-ml-1 univer-cursor-pointer univer-rounded univer-text-base hover:univer-bg-gray-200",
-        children: /* @__PURE__ */ C(Sn, { onClick: () => i(t.id) })
+        children: /* @__PURE__ */ S(Rn, { onClick: () => i(t.id) })
       }
     )
   ] });
 };
-function wi(e) {
+function Mi(e) {
   const { value: t, onChange: n = () => {
-  }, unitId: r, subUnitId: o, validResult: i, showError: a, ruleId: l } = e, { formula1: s = "", formula2: d = "" } = t || {}, [u, g] = W(() => De(s) ? "1" : "0"), [c, m] = W(u === "1" ? s : "="), [h, E] = W(u === "1" ? s : "="), R = F(de), w = F(Me), S = F(gn), I = F(to), [b, v] = W(() => d.split(",")), p = w.getValidatorItem(Y.LIST), [_, P] = W([]), [k, U] = W(""), L = a ? i == null ? void 0 : i.formula1 : "", y = dt(() => S.ruleChange$.pipe(cr(16)), []), T = Oe(y), A = nn(n);
-  Le(() => {
+  }, unitId: r, subUnitId: o, validResult: i, showError: a, ruleId: l } = e, { formula1: s = "", formula2: d = "" } = t || {}, [u, h] = W(() => Pe(s) ? "1" : "0"), [c, m] = W(u === "1" ? s : "="), [I, D] = W(u === "1" ? s : "="), v = F(ge), C = F(Te), f = F(fn), w = F(lo), b = F(_e), [g, p] = W(() => d.split(",")), _ = C.getValidatorItem(X.LIST), [T, A] = W([]), [P, L] = W(""), y = a ? i == null ? void 0 : i.formula1 : "", O = ht(() => f.ruleChange$.pipe(pr(16)), []), U = Re(O), k = an(n);
+  be(() => {
     (async () => {
-      await new Promise((f) => {
-        setTimeout(() => f(!0), 100);
+      await new Promise((N) => {
+        setTimeout(() => N(!0), 100);
       });
-      const M = S.getRuleById(r, o, l), N = M == null ? void 0 : M.formula1;
-      if (De(N) && p && M) {
-        const f = await p.getListAsync(M, r, o);
-        P(f);
+      const M = f.getRuleById(r, o, l), $ = M == null ? void 0 : M.formula1;
+      if (Pe($) && _ && M) {
+        const N = await _.getListAsync(M, r, o);
+        A(N);
       }
     })();
-  }, [S, T, p, l, o, r]), Le(() => {
-    De(s) && s !== h && (m(s), E(h));
-  }, [h, s]);
-  const [x, H] = W(() => {
-    const M = u !== "1" ? no(s) : [], N = d.split(",");
-    return M.map((f, O) => ({
-      label: f,
-      color: N[O] || Te,
+  }, [f, U, _, l, o, r]), be(() => {
+    Pe(s) && s !== I && (m(s), D(I));
+  }, [I, s]);
+  const [x, te] = W(() => {
+    const M = u !== "1" ? co(s) : [], $ = d.split(",");
+    return M.map((N, J) => ({
+      label: N,
+      color: $[J] || ke,
       isRef: !1,
-      id: yn(4)
+      id: En(4)
     }));
-  }), q = (M, N, f) => {
-    const O = x.find(($) => $.id === M);
-    O && (O.label = N, O.color = f, H([...x]));
-  }, B = (M) => {
-    const N = x.findIndex((f) => f.id === M);
-    N !== -1 && (x.splice(N, 1), H([...x]));
-  }, ne = d.split(","), ie = dt(() => _.map((M, N) => ({
+  }), j = (M, $, N) => {
+    const J = x.find((R) => R.id === M);
+    J && (J.label = $, J.color = N, te([...x]));
+  }, se = (M) => {
+    const $ = x.findIndex((N) => N.id === M);
+    $ !== -1 && (x.splice($, 1), te([...x]));
+  }, le = d.split(","), de = ht(() => T.map((M, $) => ({
     label: M,
-    color: ne[N] || Te,
-    id: `${N}`,
+    color: le[$] || ke,
+    id: `${$}`,
     isRef: !0
-  })), [ne, _]), _e = (M, N, f) => {
-    const O = [...b];
-    O[+M] = f, v(O), A({
+  })), [le, T]), Me = (M, $, N) => {
+    const J = [...g];
+    J[+M] = N, p(J), k({
       formula1: s,
-      formula2: O.join(",")
+      formula2: J.join(",")
     });
-  }, Ce = () => {
-    H([
+  }, Q = () => {
+    te([
       ...x,
       {
         label: "",
-        color: Te,
+        color: ke,
         isRef: !1,
-        id: yn(4)
+        id: En(4)
       }
     ]);
   };
-  Le(() => {
+  be(() => {
     if (u === "1")
       return;
-    const M = /* @__PURE__ */ new Set(), N = [];
-    x.map((f) => ({
-      labelList: f.label.split(","),
-      item: f
-    })).forEach(({ item: f, labelList: O }) => {
-      O.forEach(($) => {
-        M.has($) || (M.add($), N.push({
-          label: $,
-          color: f.color
+    const M = /* @__PURE__ */ new Set(), $ = [];
+    x.map((N) => ({
+      labelList: N.label.split(","),
+      item: N
+    })).forEach(({ item: N, labelList: J }) => {
+      J.forEach((R) => {
+        M.has(R) || (M.add(R), $.push({
+          label: R,
+          color: N.color
         }));
       });
-    }), A({
-      formula1: Qn(N.map((f) => f.label)),
-      formula2: N.map((f) => f.color === Te ? "" : f.color).join(",")
+    }), k({
+      formula1: nr($.map((N) => N.label)),
+      formula2: $.map((N) => N.color === ke ? "" : N.color).join(",")
     });
-  }, [x, A, u, h, b]);
-  const J = nn(async (M) => {
-    if (!De(M)) {
-      A == null || A({
+  }, [x, k, u, I, g]);
+  const G = an(async (M) => {
+    if (!Pe(M)) {
+      k == null || k({
         formula1: "",
         formula2: d
       });
       return;
     }
-    I.getFormulaRefCheck(M) ? (A == null || A({
-      formula1: De(M) ? M : "",
+    w.getFormulaRefCheck(M) ? (k == null || k({
+      formula1: Pe(M) ? M : "",
       formula2: d
-    }), U("")) : (A == null || A({
+    }), L("")) : (k == null || k({
       formula1: "",
       formula2: d
-    }), m("="), U(R.t("dataValidation.validFail.formulaError")));
-  }), z = ht(null), [ge, G] = W(!1);
-  return dr((M) => {
-    var f;
-    (f = z.current) != null && f.isClickOutSide(M) && G(!1);
-  }), /* @__PURE__ */ j(ct, { children: [
-    /* @__PURE__ */ C(X, { label: R.t("dataValidation.list.options"), children: /* @__PURE__ */ j(
-      _n,
+    }), m("="), L(v.t("dataValidation.validFail.formulaError")));
+  }), ce = vt(null), [ee, q] = W(!1);
+  return hr((M) => {
+    var N;
+    (N = ce.current) != null && N.isClickOutSide(M) && q(!1);
+  }), be(() => {
+    ee ? b.setFocusFormulaEditorActiveRuleSubUnitId(o) : b.setFocusFormulaEditorActiveRuleSubUnitId(null);
+  }, [ee, o, b]), /* @__PURE__ */ Y(pt, { children: [
+    /* @__PURE__ */ S(Z, { label: v.t("dataValidation.list.options"), children: /* @__PURE__ */ Y(
+      In,
       {
         value: u,
         onChange: (M) => {
-          g(M), m(h), M === "1" && A({
-            formula1: h === "=" ? "" : h,
-            formula2: b.join(",")
+          h(M), m(I), M === "1" && k({
+            formula1: I === "=" ? "" : I,
+            formula2: g.join(",")
           });
         },
         children: [
-          /* @__PURE__ */ C(Ae, { value: "0", children: R.t("dataValidation.list.customOptions") }),
-          /* @__PURE__ */ C(Ae, { value: "1", children: R.t("dataValidation.list.refOptions") })
+          /* @__PURE__ */ S(Ne, { value: "0", children: v.t("dataValidation.list.customOptions") }),
+          /* @__PURE__ */ S(Ne, { value: "1", children: v.t("dataValidation.list.refOptions") })
         ]
       }
     ) }),
-    u === "1" ? /* @__PURE__ */ j(X, { error: L || k || void 0, children: [
-      /* @__PURE__ */ C(
-        vr,
+    u === "1" ? /* @__PURE__ */ Y(Z, { error: y || P || void 0, children: [
+      /* @__PURE__ */ S(
+        Sr,
         {
-          ref: z,
-          className: ke("univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors hover:univer-border-primary-600 dark:!univer-bg-gray-700 dark:!univer-text-white [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent", Rt),
+          ref: ce,
+          className: Fe("univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors hover:univer-border-primary-600 dark:!univer-bg-gray-700 dark:!univer-text-white [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent", bt),
           initValue: c,
           unitId: r,
           subUnitId: o,
-          isFocus: ge,
+          isFocus: ee,
           isSupportAcrossSheet: !0,
-          onFocus: () => G(!0),
+          onFocus: () => q(!0),
           onChange: (M = "") => {
-            const N = (M != null ? M : "").trim();
-            E(N), J(N);
+            const $ = (M != null ? M : "").trim();
+            D($), G($);
           }
         }
       ),
-      ie.length > 0 && /* @__PURE__ */ C("div", { className: "univer-mt-3", children: ie.map((M) => /* @__PURE__ */ C(
-        Fn,
+      de.length > 0 && /* @__PURE__ */ S("div", { className: "univer-mt-3", children: de.map((M) => /* @__PURE__ */ S(
+        Bn,
         {
           className: "univer-mb-3",
           item: M,
-          commonProps: { onItemChange: _e }
+          commonProps: { onItemChange: Me }
         },
         M.id
       )) })
-    ] }) : /* @__PURE__ */ C(X, { error: L, children: /* @__PURE__ */ j("div", { className: "-univer-mt-3", children: [
-      /* @__PURE__ */ C(
-        Do,
+    ] }) : /* @__PURE__ */ S(Z, { error: y, children: /* @__PURE__ */ Y("div", { className: "-univer-mt-3", children: [
+      /* @__PURE__ */ S(
+        Ao,
         {
           list: x,
-          onListChange: H,
+          onListChange: te,
           rowHeight: 28,
           margin: [0, 12],
           draggableHandle: ".draggableHandle",
-          itemRender: (M) => /* @__PURE__ */ C(
-            Fn,
+          itemRender: (M) => /* @__PURE__ */ S(
+            Bn,
             {
               item: M,
               commonProps: {
-                onItemChange: q,
-                onItemDelete: B
+                onItemChange: j,
+                onItemDelete: se
               }
             },
             M.id
@@ -2318,54 +2341,54 @@ function wi(e) {
           idKey: "id"
         }
       ),
-      /* @__PURE__ */ j(
+      /* @__PURE__ */ Y(
         "a",
         {
           className: "univer-text-primary univer-flex univer-w-fit univer-cursor-pointer univer-flex-row univer-items-center univer-rounded univer-p-1 univer-px-2 univer-text-sm hover:univer-bg-primary-50 dark:hover:!univer-bg-gray-800",
-          onClick: Ce,
+          onClick: Q,
           children: [
-            /* @__PURE__ */ C(Rr, { className: "univer-mr-1" }),
-            R.t("dataValidation.list.add")
+            /* @__PURE__ */ S(Er, { className: "univer-mr-1" }),
+            v.t("dataValidation.list.add")
           ]
         }
       )
     ] }) })
   ] });
 }
-const Ii = [
+const bi = [
   [
-    ir,
-    _i
+    lr,
+    wi
   ],
   [
-    At,
-    mi
+    kt,
+    Ci
   ],
   [
-    pn,
-    wi
+    mn,
+    Mi
   ],
   [
-    ar,
-    fi
+    dr,
+    Ii
   ]
-], Ri = "LIST_RENDER_MODE_OPTION_INPUT";
-function Dt(e) {
+], Ei = "LIST_RENDER_MODE_OPTION_INPUT";
+function Ot(e) {
   var o;
-  const { value: t, onChange: n } = e, r = F(de);
-  return /* @__PURE__ */ C(X, { label: r.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ j(_n, { value: `${(o = t.renderMode) != null ? o : ae.CUSTOM}`, onChange: (i) => n({ ...t, renderMode: +i }), children: [
-    /* @__PURE__ */ C(Ae, { value: `${ae.CUSTOM}`, children: r.t("dataValidation.renderMode.chip") }),
-    /* @__PURE__ */ C(Ae, { value: `${ae.ARROW}`, children: r.t("dataValidation.renderMode.arrow") }),
-    /* @__PURE__ */ C(Ae, { value: `${ae.TEXT}`, children: r.t("dataValidation.renderMode.text") })
+  const { value: t, onChange: n } = e, r = F(ge);
+  return /* @__PURE__ */ S(Z, { label: r.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ Y(In, { value: `${(o = t.renderMode) != null ? o : ue.CUSTOM}`, onChange: (i) => n({ ...t, renderMode: +i }), children: [
+    /* @__PURE__ */ S(Ne, { value: `${ue.CUSTOM}`, children: r.t("dataValidation.renderMode.chip") }),
+    /* @__PURE__ */ S(Ne, { value: `${ue.ARROW}`, children: r.t("dataValidation.renderMode.arrow") }),
+    /* @__PURE__ */ S(Ne, { value: `${ue.TEXT}`, children: r.t("dataValidation.renderMode.text") })
   ] }) });
 }
-Dt.componentKey = Ri;
-const yi = "DATE_SHOW_TIME_OPTION";
-function Vt(e) {
+Ot.componentKey = Ei;
+const Di = "DATE_SHOW_TIME_OPTION";
+function At(e) {
   var o;
-  const { value: t, onChange: n } = e, r = F(de);
-  return /* @__PURE__ */ C(X, { children: /* @__PURE__ */ C(
-    Pt,
+  const { value: t, onChange: n } = e, r = F(ge);
+  return /* @__PURE__ */ S(Z, { children: /* @__PURE__ */ S(
+    Nt,
     {
       checked: (o = t.bizInfo) == null ? void 0 : o.showTime,
       onChange: (i) => {
@@ -2381,26 +2404,26 @@ function Vt(e) {
     }
   ) });
 }
-Vt.componentKey = yi;
-var Mi = Object.getOwnPropertyDescriptor, bi = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Mi(t, n) : t, i = e.length - 1, a; i >= 0; i--)
+At.componentKey = Di;
+var Vi = Object.getOwnPropertyDescriptor, Ti = (e, t, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Vi(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, We = (e, t) => (n, r) => t(n, r, e);
-const ft = 6;
-let on = class {
+}, Ye = (e, t) => (n, r) => t(n, r, e);
+const Ct = 6;
+let ln = class {
   constructor(e, t, n, r, o, i) {
     this._commandService = e, this._univerInstanceService = t, this._formulaService = n, this._themeService = r, this._renderManagerService = o, this._dataValidationModel = i;
   }
   _calc(e, t) {
-    var d, u, g;
-    const { vt: n, ht: r } = t || {}, o = e.endX - e.startX - ft * 2, i = e.endY - e.startY, a = ((d = t == null ? void 0 : t.fs) != null ? d : 10) * 1.6;
+    var d, u, h;
+    const { vt: n, ht: r } = t || {}, o = e.endX - e.startX - Ct * 2, i = e.endY - e.startY, a = ((d = t == null ? void 0 : t.fs) != null ? d : 10) * 1.6;
     let l = 0, s = 0;
     switch (n) {
-      case se.TOP:
+      case he.TOP:
         s = 0;
         break;
-      case se.BOTTOM:
+      case he.BOTTOM:
         s = 0 + (i - a);
         break;
       default:
@@ -2408,21 +2431,21 @@ let on = class {
         break;
     }
     switch (r) {
-      case Ie.LEFT:
-        l = ft;
+      case Ee.LEFT:
+        l = Ct;
         break;
-      case Ie.RIGHT:
-        l = ft + (o - a);
+      case Ee.RIGHT:
+        l = Ct + (o - a);
         break;
       default:
-        l = ft + (o - a) / 2;
+        l = Ct + (o - a) / 2;
         break;
     }
     return {
       left: e.startX + l,
       top: e.startY + s,
       width: ((u = t == null ? void 0 : t.fs) != null ? u : 10) * 1.6,
-      height: ((g = t == null ? void 0 : t.fs) != null ? g : 10) * 1.6
+      height: ((h = t == null ? void 0 : t.fs) != null ? h : 10) * 1.6
     };
   }
   calcCellAutoHeight(e) {
@@ -2436,25 +2459,25 @@ let on = class {
     return ((n = t == null ? void 0 : t.fs) != null ? n : 10) * 1.6;
   }
   async _parseFormula(e, t, n) {
-    var d, u, g, c, m, h, E, R, w;
-    const { formula1: r = io, formula2: o = oo } = e, i = await this._formulaService.getRuleFormulaResult(t, n, e.uid), a = Ft((g = (u = (d = i == null ? void 0 : i[0]) == null ? void 0 : d.result) == null ? void 0 : u[0]) == null ? void 0 : g[0]), l = Ft((h = (m = (c = i == null ? void 0 : i[1]) == null ? void 0 : c.result) == null ? void 0 : m[0]) == null ? void 0 : h[0]), s = Dn(String(a)) && Dn(String(l));
+    var d, u, h, c, m, I, D, v, C;
+    const { formula1: r = po, formula2: o = ho } = e, i = await this._formulaService.getRuleFormulaResult(t, n, e.uid), a = Bt((h = (u = (d = i == null ? void 0 : i[0]) == null ? void 0 : d.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), l = Bt((I = (m = (c = i == null ? void 0 : i[1]) == null ? void 0 : c.result) == null ? void 0 : m[0]) == null ? void 0 : I[0]), s = On(String(a)) && On(String(l));
     return {
-      formula1: De(r) ? Ft((w = (R = (E = i == null ? void 0 : i[0]) == null ? void 0 : E.result) == null ? void 0 : R[0]) == null ? void 0 : w[0]) : r,
-      formula2: De(o) ? l : o,
+      formula1: Pe(r) ? Bt((C = (v = (D = i == null ? void 0 : i[0]) == null ? void 0 : D.result) == null ? void 0 : v[0]) == null ? void 0 : C[0]) : r,
+      formula2: Pe(o) ? l : o,
       isFormulaValid: s
     };
   }
   drawWith(e, t) {
-    var L, y, T, A;
-    const { style: n, primaryWithCoord: r, unitId: o, subUnitId: i, worksheet: a, row: l, col: s } = t, d = r.isMergedMainCell ? r.mergeInfo : r, u = re(a.getCellRaw(l, s)), g = this._dataValidationModel.getRuleByLocation(o, i, l, s);
-    if (!g)
+    var L, y, O, U;
+    const { style: n, primaryWithCoord: r, unitId: o, subUnitId: i, worksheet: a, row: l, col: s } = t, d = r.isMergedMainCell ? r.mergeInfo : r, u = ie(a.getCellRaw(l, s)), h = this._dataValidationModel.getRuleByLocation(o, i, l, s);
+    if (!h)
       return;
-    const c = this._dataValidationModel.getValidator(g.type);
-    if (!c || !((L = c.skipDefaultFontRender) != null && L.call(c, g, u, { unitId: o, subUnitId: i, row: l, column: s })))
+    const c = this._dataValidationModel.getValidator(h.type);
+    if (!c || !((L = c.skipDefaultFontRender) != null && L.call(c, h, u, { unitId: o, subUnitId: i, row: l, column: s })))
       return;
-    const m = c.parseFormulaSync(g, o, i), { formula1: h } = m, E = this._calc(d, n), { a: R, d: w } = e.getTransform(), S = Mn(E.left, R), I = Mn(E.top, w), b = jr.create().composeMatrix({
-      left: S,
-      top: I,
+    const m = c.parseFormulaSync(h, o, i), { formula1: I } = m, D = this._calc(d, n), { a: v, d: C } = e.getTransform(), f = Dn(D.left, v), w = Dn(D.top, C), b = zr.create().composeMatrix({
+      left: f,
+      top: w,
       scaleX: 1,
       scaleY: 1,
       angle: 0,
@@ -2462,16 +2485,16 @@ let on = class {
       skewY: 0,
       flipX: !1,
       flipY: !1
-    }), v = d.endX - d.startX, p = d.endY - d.startY;
-    e.save(), e.beginPath(), e.rect(d.startX, d.startY, v, p), e.clip();
+    }), g = d.endX - d.startX, p = d.endY - d.startY;
+    e.save(), e.beginPath(), e.rect(d.startX, d.startY, g, p), e.clip();
     const _ = b.getMatrix();
     e.transform(_[0], _[1], _[2], _[3], _[4], _[5]);
-    const P = ((y = n == null ? void 0 : n.fs) != null ? y : 10) * 1.6, k = String(u) === String(h), U = this._themeService.getColorFromTheme("primary.600");
-    Yr.drawWith(e, {
-      checked: k,
-      width: P,
-      height: P,
-      fill: (A = (T = n == null ? void 0 : n.cl) == null ? void 0 : T.rgb) != null ? A : U
+    const T = ((y = n == null ? void 0 : n.fs) != null ? y : 10) * 1.6, A = String(u) === String(I), P = this._themeService.getColorFromTheme("primary.600");
+    Kr.drawWith(e, {
+      checked: A,
+      width: T,
+      height: T,
+      fill: (U = (O = n == null ? void 0 : n.cl) == null ? void 0 : O.rgb) != null ? U : P
     }), e.restore();
   }
   isHit(e, t) {
@@ -2479,16 +2502,16 @@ let on = class {
     return s <= l && s >= a && d <= i && d >= o;
   }
   async onPointerDown(e, t) {
-    var h;
+    var I;
     if (t.button === 2)
       return;
-    const { primaryWithCoord: n, unitId: r, subUnitId: o, worksheet: i, row: a, col: l } = e, s = re(i.getCellRaw(a, l)), d = this._dataValidationModel.getRuleByLocation(r, o, a, l);
+    const { primaryWithCoord: n, unitId: r, subUnitId: o, worksheet: i, row: a, col: l } = e, s = ie(i.getCellRaw(a, l)), d = this._dataValidationModel.getRuleByLocation(r, o, a, l);
     if (!d)
       return;
     const u = this._dataValidationModel.getValidator(d.type);
-    if (!u || !((h = u.skipDefaultFontRender) != null && h.call(u, d, s, { unitId: r, subUnitId: o, row: a, column: l })))
+    if (!u || !((I = u.skipDefaultFontRender) != null && I.call(u, d, s, { unitId: r, subUnitId: o, row: a, column: l })))
       return;
-    const { formula1: g, formula2: c } = await this._parseFormula(d, r, o), m = {
+    const { formula1: h, formula2: c } = await this._parseFormula(d, r, o), m = {
       range: {
         startColumn: n.actualColumn,
         endColumn: n.actualColumn,
@@ -2496,142 +2519,142 @@ let on = class {
         endRow: n.actualRow
       },
       value: {
-        v: String(s) === ao(String(g)) ? c : g,
+        v: String(s) === go(String(h)) ? c : h,
         p: null
       }
     };
     this._commandService.executeCommand(
-      at.id,
+      dt.id,
       m
     );
   }
   onPointerEnter(e, t) {
     var n, r;
-    (r = (n = Xe(Z.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ze.POINTER);
+    (r = (n = Ke(H.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ge.POINTER);
   }
   onPointerLeave(e, t) {
     var n, r;
-    (r = (n = Xe(Z.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ze.DEFAULT);
+    (r = (n = Ke(H.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ge.DEFAULT);
   }
 };
-on = bi([
-  We(0, te),
-  We(1, le),
-  We(2, D(ro)),
-  We(3, D(Yn)),
-  We(4, D(Ue)),
-  We(5, D(oe))
-], on);
-var Ei = Object.getOwnPropertyDescriptor, Di = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Ei(t, n) : t, i = e.length - 1, a; i >= 0; i--)
+ln = Ti([
+  Ye(0, oe),
+  Ye(1, pe),
+  Ye(2, E(uo)),
+  Ye(3, E(zn)),
+  Ye(4, E(xe)),
+  Ye(5, E(ae))
+], ln);
+var Oi = Object.getOwnPropertyDescriptor, Ai = (e, t, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Oi(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, Vi = (e, t) => (n, r) => t(n, r, e);
-let fe = class {
+}, Pi = (e, t) => (n, r) => t(n, r, e);
+let Ce = class {
   constructor(e) {
     V(this, "canvasRender", null);
     V(this, "dropdownType");
     V(this, "optionsInput");
-    V(this, "formulaInput", pn);
+    V(this, "formulaInput", mn);
     this.injector = e;
   }
 };
-fe = Di([
-  Vi(0, D(ye))
-], fe);
-class Ti extends fe {
+Ce = Ai([
+  Pi(0, E(Ve))
+], Ce);
+class Li extends Ce {
   constructor() {
     super(...arguments);
-    V(this, "id", Y.CHECKBOX);
-    V(this, "canvasRender", this.injector.createInstance(on));
-    V(this, "formulaInput", ar);
+    V(this, "id", X.CHECKBOX);
+    V(this, "canvasRender", this.injector.createInstance(ln));
+    V(this, "formulaInput", dr);
   }
 }
-class Oi extends fe {
+class ki extends Ce {
   constructor() {
     super(...arguments);
-    V(this, "id", Y.CUSTOM);
-    V(this, "formulaInput", ir);
+    V(this, "id", X.CUSTOM);
+    V(this, "formulaInput", lr);
   }
 }
-const Ai = "data-validation.formula-input";
-class Pi extends fe {
+const Ni = "data-validation.formula-input";
+class Ui extends Ce {
   constructor() {
     super(...arguments);
-    V(this, "id", Y.DATE);
-    V(this, "formulaInput", Ai);
-    V(this, "optionsInput", Vt.componentKey);
-    V(this, "dropdownType", pe.DATE);
+    V(this, "id", X.DATE);
+    V(this, "formulaInput", Ni);
+    V(this, "optionsInput", At.componentKey);
+    V(this, "dropdownType", fe.DATE);
   }
 }
-class Li extends fe {
+class Fi extends Ce {
   constructor() {
     super(...arguments);
-    V(this, "id", Y.DECIMAL);
-    V(this, "formulaInput", At);
+    V(this, "id", X.DECIMAL);
+    V(this, "formulaInput", kt);
   }
 }
-const br = 4, ki = 0, Ht = 4, Er = 4, an = 6, Tt = 6, Ee = 14;
-function Ni(e, t) {
-  const n = Xr.getTextSize(e, t), r = n.width + br * 2, { ba: o, bd: i } = n, a = o + i;
+const Tr = 4, $i = 0, Xt = 4, Or = 4, dn = 6, Pt = 6, Ae = 14;
+function xi(e, t) {
+  const n = Gr.getTextSize(e, t), r = n.width + Tr * 2, { ba: o, bd: i } = n, a = o + i;
   return {
     width: r,
-    height: a + ki * 2,
+    height: a + $i * 2,
     ba: o
   };
 }
-function jt(e, t, n, r) {
-  const o = Ee + an * 2, i = n - o, a = r - Tt * 2, l = e.map((c) => ({
-    layout: Ni(c, t),
+function Zt(e, t, n, r) {
+  const o = Ae + dn * 2, i = n - o, a = r - Pt * 2, l = e.map((c) => ({
+    layout: xi(c, t),
     text: c
   }));
   let s;
   const d = [];
   l.forEach((c) => {
-    const { layout: m } = c, { width: h, height: E } = m;
-    !s || s.width + h + Ht > i ? (s = {
-      width: h,
-      height: E,
+    const { layout: m } = c, { width: I, height: D } = m;
+    !s || s.width + I + Xt > i ? (s = {
+      width: I,
+      height: D,
       items: [{
         ...c,
         left: 0
       }]
     }, d.push(s)) : (s.items.push({
       ...c,
-      left: s.width + Ht
-    }), s.width = s.width + h + Ht);
+      left: s.width + Xt
+    }), s.width = s.width + I + Xt);
   });
-  let u = 0, g = 0;
+  let u = 0, h = 0;
   return d.forEach((c, m) => {
-    g = Math.max(g, c.width), m === d.length - 1 ? u += c.height : u += c.height + Er;
+    h = Math.max(h, c.width), m === d.length - 1 ? u += c.height : u += c.height + Or;
   }), {
     lines: d,
     totalHeight: u,
     contentWidth: i,
     contentHeight: a,
-    cellAutoHeight: u + Tt * 2,
-    calcAutoWidth: g + o
+    cellAutoHeight: u + Pt * 2,
+    calcAutoWidth: h + o
   };
 }
-const Ui = 8;
-class Fi extends Zr {
+const Bi = 8;
+class Wi extends qr {
   static drawWith(t, n) {
     const { fontString: r, info: o, fill: i, color: a } = n, { layout: l, text: s } = o;
-    t.save(), zn.drawWith(t, {
+    t.save(), qn.drawWith(t, {
       width: l.width,
       height: l.height,
-      radius: Ui,
-      fill: i || Te
-    }), t.translateWithPrecision(br, l.ba), t.font = r, t.fillStyle = a, t.fillText(s, 0, 0), t.restore();
+      radius: Bi,
+      fill: i || ke
+    }), t.translateWithPrecision(Tr, l.ba), t.font = r, t.fillStyle = a, t.fillText(s, 0, 0), t.restore();
   }
 }
-var $i = Object.getOwnPropertyDescriptor, xi = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? $i(t, n) : t, i = e.length - 1, a; i >= 0; i--)
+var Hi = Object.getOwnPropertyDescriptor, ji = (e, t, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Hi(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, _t = (e, t) => (n, r) => t(n, r, e);
-const Bi = 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 sn = class {
+}, It = (e, t) => (n, r) => t(n, r, e);
+const Yi = 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 cn = class {
   constructor(e, t, n, r) {
     V(this, "zIndex");
     V(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
@@ -2645,105 +2668,105 @@ let sn = class {
     return `${e}.${t}`;
   }
   _drawDownIcon(e, t, n, r, o) {
-    const i = n - Ee + 4;
+    const i = n - Ae + 4;
     let a = 4;
     switch (o) {
-      case se.MIDDLE:
-        a = (r - Ee) / 2 + 4;
+      case he.MIDDLE:
+        a = (r - Ae) / 2 + 4;
         break;
-      case se.BOTTOM:
-        a = r - Ee + 4;
+      case he.BOTTOM:
+        a = r - Ae + 4;
         break;
     }
-    e.save(), e.translateWithPrecision(t.startX + i, t.startY + a), e.fillStyle = "#565656", e.fill(Bi), e.restore();
+    e.save(), e.translateWithPrecision(t.startX + i, t.startY + a), e.fillStyle = "#565656", e.fill(Yi), e.restore();
   }
   // eslint-disable-next-line max-lines-per-function
   drawWith(e, t, n, r) {
-    var ie, _e;
-    const { primaryWithCoord: o, row: i, col: a, style: l, data: s, subUnitId: d } = t, u = o.isMergedMainCell ? o.mergeInfo : o, g = s == null ? void 0 : s.fontRenderExtension, { leftOffset: c = 0, rightOffset: m = 0, topOffset: h = 0, downOffset: E = 0 } = g || {}, R = this._ensureMap(d), w = this._generateKey(i, a), S = o.isMergedMainCell ? o.mergeInfo.startRow : i, I = o.isMergedMainCell ? o.mergeInfo.startColumn : a, b = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, S, I);
+    var le, de;
+    const { primaryWithCoord: o, row: i, col: a, style: l, data: s, subUnitId: d } = t, u = o.isMergedMainCell ? o.mergeInfo : o, h = s == null ? void 0 : s.fontRenderExtension, { leftOffset: c = 0, rightOffset: m = 0, topOffset: I = 0, downOffset: D = 0 } = h || {}, v = this._ensureMap(d), C = this._generateKey(i, a), f = o.isMergedMainCell ? o.mergeInfo.startRow : i, w = o.isMergedMainCell ? o.mergeInfo.startColumn : a, b = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, f, w);
     if (!b)
       return;
-    const v = this._dataValidationModel.getValidator(b.type);
-    if (!v)
+    const g = this._dataValidationModel.getValidator(b.type);
+    if (!g)
       return;
     const p = {
       startX: u.startX + c,
       endX: u.endX - m,
-      startY: u.startY + h,
-      endY: u.endY - E
-    }, _ = p.endX - p.startX, P = p.endY - p.startY, { cl: k } = l || {}, U = (ie = typeof k == "object" ? k == null ? void 0 : k.rgb : k) != null ? ie : "#000", L = Ve(l != null ? l : void 0), { vt: y, ht: T } = l || {}, A = y != null ? y : se.MIDDLE, x = (_e = re(s)) != null ? _e : "", H = v.parseCellValue(x), q = v.getListWithColorMap(b), B = jt(H, L, _, P);
-    this._drawDownIcon(e, p, _, P, A), e.save(), e.translateWithPrecision(p.startX, p.startY), e.beginPath(), e.rect(0, 0, _ - Ee, P), e.clip(), e.translateWithPrecision(an, Tt);
-    let ne = 0;
-    switch (A) {
-      case se.MIDDLE:
-        ne = (B.contentHeight - B.totalHeight) / 2;
+      startY: u.startY + I,
+      endY: u.endY - D
+    }, _ = p.endX - p.startX, T = p.endY - p.startY, { cl: A } = l || {}, P = (le = typeof A == "object" ? A == null ? void 0 : A.rgb : A) != null ? le : "#000", L = Le(l != null ? l : void 0), { vt: y, ht: O } = l || {}, U = y != null ? y : he.MIDDLE, k = (de = ie(s)) != null ? de : "", x = g.parseCellValue(k), te = g.getListWithColorMap(b), j = Zt(x, L, _, T);
+    this._drawDownIcon(e, p, _, T, U), e.save(), e.translateWithPrecision(p.startX, p.startY), e.beginPath(), e.rect(0, 0, _ - Ae, T), e.clip(), e.translateWithPrecision(dn, Pt);
+    let se = 0;
+    switch (U) {
+      case he.MIDDLE:
+        se = (j.contentHeight - j.totalHeight) / 2;
         break;
-      case se.BOTTOM:
-        ne = B.contentHeight - B.totalHeight;
+      case he.BOTTOM:
+        se = j.contentHeight - j.totalHeight;
         break;
     }
-    e.translateWithPrecision(0, ne), B.lines.forEach((Ce, J) => {
+    e.translateWithPrecision(0, se), j.lines.forEach((Me, Q) => {
       e.save();
-      const { width: z, height: ge, items: G } = Ce;
-      let M = 0;
-      switch (T) {
-        case Ie.RIGHT:
-          M = B.contentWidth - z;
+      const { width: G, height: ce, items: ee } = Me;
+      let q = 0;
+      switch (O) {
+        case Ee.RIGHT:
+          q = j.contentWidth - G;
           break;
-        case Ie.CENTER:
-          M = (B.contentWidth - z) / 2;
+        case Ee.CENTER:
+          q = (j.contentWidth - G) / 2;
           break;
       }
-      e.translate(M, J * (ge + Er)), G.forEach((N) => {
-        e.save(), e.translateWithPrecision(N.left, 0), Fi.drawWith(e, {
+      e.translate(q, Q * (ce + Or)), ee.forEach((M) => {
+        e.save(), e.translateWithPrecision(M.left, 0), Wi.drawWith(e, {
           ...L,
-          info: N,
-          color: U,
-          fill: q[N.text]
+          info: M,
+          color: P,
+          fill: te[M.text]
         }), e.restore();
       }), e.restore();
-    }), e.restore(), R.set(w, {
+    }), e.restore(), v.set(C, {
       left: p.startX,
       top: p.startY,
-      width: B.contentWidth + an + Ee,
-      height: B.contentHeight + Tt * 2
+      width: j.contentWidth + dn + Ae,
+      height: j.contentHeight + Pt * 2
     });
   }
   calcCellAutoHeight(e) {
-    var v;
-    const { primaryWithCoord: t, style: n, data: r, row: o, col: i } = e, a = r == null ? void 0 : r.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, g = t.isMergedMainCell ? t.mergeInfo : t, c = {
-      startX: g.startX + l,
-      endX: g.endX - s,
-      startY: g.startY + d,
-      endY: g.endY - u
+    var g;
+    const { primaryWithCoord: t, style: n, data: r, row: o, col: i } = e, a = r == null ? void 0 : r.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
+      startX: h.startX + l,
+      endX: h.endX - s,
+      startY: h.startY + d,
+      endY: h.endY - u
     }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
     if (!m)
       return;
-    const h = this._dataValidationModel.getValidator(m.type);
-    if (!h)
+    const I = this._dataValidationModel.getValidator(m.type);
+    if (!I)
       return;
-    const E = c.endX - c.startX, R = c.endY - c.startY, w = (v = re(r)) != null ? v : "", S = h.parseCellValue(w), I = Ve(n != null ? n : void 0);
-    return jt(S, I, E, R).cellAutoHeight;
+    const D = c.endX - c.startX, v = c.endY - c.startY, C = (g = ie(r)) != null ? g : "", f = I.parseCellValue(C), w = Le(n != null ? n : void 0);
+    return Zt(f, w, D, v).cellAutoHeight;
   }
   calcCellAutoWidth(e) {
-    var v;
-    const { primaryWithCoord: t, style: n, data: r, row: o, col: i } = e, a = r == null ? void 0 : r.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, g = t.isMergedMainCell ? t.mergeInfo : t, c = {
-      startX: g.startX + l,
-      endX: g.endX - s,
-      startY: g.startY + d,
-      endY: g.endY - u
+    var g;
+    const { primaryWithCoord: t, style: n, data: r, row: o, col: i } = e, a = r == null ? void 0 : r.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
+      startX: h.startX + l,
+      endX: h.endX - s,
+      startY: h.startY + d,
+      endY: h.endY - u
     }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
     if (!m)
       return;
-    const h = this._dataValidationModel.getValidator(m.type);
-    if (!h)
+    const I = this._dataValidationModel.getValidator(m.type);
+    if (!I)
       return;
-    const E = c.endX - c.startX, R = c.endY - c.startY, w = (v = re(r)) != null ? v : "", S = h.parseCellValue(w), I = Ve(n != null ? n : void 0);
-    return jt(S, I, E, R).calcAutoWidth;
+    const D = c.endX - c.startX, v = c.endY - c.startY, C = (g = ie(r)) != null ? g : "", f = I.parseCellValue(C), w = Le(n != null ? n : void 0);
+    return Zt(f, w, D, v).calcAutoWidth;
   }
   isHit(e, t) {
     const { primaryWithCoord: n } = t, r = n.isMergedMainCell ? n.mergeInfo : n, { endX: o } = r, { x: i } = e;
-    return i >= o - Ee && i <= o;
+    return i >= o - Ae && i <= o;
   }
   onPointerDown(e, t) {
     if (t.button === 2)
@@ -2754,67 +2777,67 @@ let sn = class {
       row: o,
       column: i
     };
-    this._commandService.executeCommand(Lt.id, a);
+    this._commandService.executeCommand(Ut.id, a);
   }
   onPointerEnter(e, t) {
     var n, r;
-    return (r = (n = Xe(Z.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null ? void 0 : r.setCursor(Ze.POINTER);
+    return (r = (n = Ke(H.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null ? void 0 : r.setCursor(Ge.POINTER);
   }
   onPointerLeave(e, t) {
     var n, r;
-    return (r = (n = Xe(Z.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null ? void 0 : r.setCursor(Ze.DEFAULT);
+    return (r = (n = Ke(H.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null ? void 0 : r.setCursor(Ge.DEFAULT);
   }
 };
-sn = xi([
-  _t(0, te),
-  _t(1, le),
-  _t(2, D(Ue)),
-  _t(3, D(oe))
-], sn);
-class Wi extends fe {
+cn = ji([
+  It(0, oe),
+  It(1, pe),
+  It(2, E(xe)),
+  It(3, E(ae))
+], cn);
+class Xi extends Ce {
   constructor() {
     super(...arguments);
-    V(this, "id", Y.LIST_MULTIPLE);
-    V(this, "canvasRender", this.injector.createInstance(sn));
-    V(this, "dropdownType", pe.MULTIPLE_LIST);
+    V(this, "id", X.LIST_MULTIPLE);
+    V(this, "canvasRender", this.injector.createInstance(cn));
+    V(this, "dropdownType", fe.MULTIPLE_LIST);
   }
 }
-var Hi = Object.getOwnPropertyDescriptor, ji = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Hi(t, n) : t, i = e.length - 1, a; i >= 0; i--)
+var Zi = Object.getOwnPropertyDescriptor, zi = (e, t, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Zi(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, it = (e, t) => (n, r) => t(n, r, e);
-const He = 4, Ct = 4, he = 14, Yt = 1, Se = 6, je = 3, Xt = 8, Yi = "#565656", $n = 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 xn(e, t, n, r, o, i, a = !0) {
+}, lt = (e, t) => (n, r) => t(n, r, e);
+const Xe = 4, wt = 4, me = 14, zt = 1, we = 6, Ze = 3, Kt = 8, Ki = "#565656", Wn = 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 Hn(e, t, n, r, o, i, a = !0) {
   let l = 0;
-  const s = a ? je : 0;
+  const s = a ? Ze : 0;
   switch (o) {
-    case se.BOTTOM:
+    case he.BOTTOM:
       l = t - r - s;
       break;
-    case se.MIDDLE:
+    case he.MIDDLE:
       l = (t - r) / 2;
       break;
     default:
       l = s;
       break;
   }
-  l = Math.max(je, l);
+  l = Math.max(Ze, l);
   let d = 0;
   switch (i) {
-    case Ie.CENTER:
+    case Ee.CENTER:
       d = (e - n) / 2;
       break;
-    case Ie.RIGHT:
+    case Ee.RIGHT:
       d = e - n;
       break;
   }
-  return d = Math.max(Se, d), {
+  return d = Math.max(we, d), {
     paddingLeft: d,
     paddingTop: l
   };
 }
-let ln = class {
+let un = class {
   constructor(e, t, n, r, o) {
     V(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     V(this, "zIndex");
@@ -2828,174 +2851,174 @@ let ln = class {
     return `${e}.${t}`;
   }
   _drawDownIcon(e, t, n, r, o, i, a) {
-    const { t: l = ee.pd.t, b: s = ee.pd.b } = a, d = n - he;
+    const { t: l = re.pd.t, b: s = re.pd.b } = a, d = n - me;
     let u;
     switch (i) {
-      case se.MIDDLE:
-        u = (r - Ct) / 2;
+      case he.MIDDLE:
+        u = (r - wt) / 2;
         break;
-      case se.BOTTOM:
-        u = r - s - o - je + (o / 2 - Ct / 2);
+      case he.BOTTOM:
+        u = r - s - o - Ze + (o / 2 - wt / 2);
         break;
       default:
-        u = l + je + (o / 2 - Ct / 2);
+        u = l + Ze + (o / 2 - wt / 2);
         break;
     }
-    e.save(), e.translateWithPrecision(t.startX + d, t.startY + u), e.fillStyle = "#565656", e.fill($n), e.restore();
+    e.save(), e.translateWithPrecision(t.startX + d, t.startY + u), e.fillStyle = "#565656", e.fill(Wn), e.restore();
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   drawWith(e, t, n) {
-    var q, B, ne, ie, _e, Ce;
-    const { primaryWithCoord: r, row: o, col: i, style: a, data: l, subUnitId: s } = t, d = r.isMergedMainCell ? r.mergeInfo : r, u = r.isMergedMainCell ? r.mergeInfo.startRow : o, g = r.isMergedMainCell ? r.mergeInfo.startColumn : i, c = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, u, g);
+    var te, j, se, le, de, Me;
+    const { primaryWithCoord: r, row: o, col: i, style: a, data: l, subUnitId: s } = t, d = r.isMergedMainCell ? r.mergeInfo : r, u = r.isMergedMainCell ? r.mergeInfo.startRow : o, h = r.isMergedMainCell ? r.mergeInfo.startColumn : i, c = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, u, h);
     if (!c)
       return;
     const m = this._dataValidationModel.getValidator(c.type);
     if (!m)
       return;
-    const h = l == null ? void 0 : l.fontRenderExtension, { leftOffset: E = 0, rightOffset: R = 0, topOffset: w = 0, downOffset: S = 0 } = h || {};
-    if (!c || !m || !m || m.id.indexOf(Y.LIST) !== 0 || !m.skipDefaultFontRender(c))
+    const I = l == null ? void 0 : l.fontRenderExtension, { leftOffset: D = 0, rightOffset: v = 0, topOffset: C = 0, downOffset: f = 0 } = I || {};
+    if (!c || !m || !m || m.id.indexOf(X.LIST) !== 0 || !m.skipDefaultFontRender(c))
       return;
-    const I = {
-      startX: d.startX + E,
-      endX: d.endX - R,
-      startY: d.startY + w,
-      endY: d.endY - S
-    }, b = I.endX - I.startX, v = I.endY - I.startY, p = this._ensureMap(s), _ = this._generateKey(o, i), P = m.getListWithColorMap(c), k = re(l), U = `${k != null ? k : ""}`, L = P[U];
-    let { tb: y, vt: T, ht: A, pd: x } = a || {};
-    y = y != null ? y : ve.WRAP, T = T != null ? T : se.BOTTOM, A = A != null ? A : ee.ht, x = x != null ? x : ee.pd;
-    const H = Ve(a).fontCache;
-    if (c.renderMode === ae.ARROW) {
-      const { l: J = ee.pd.l, t: z = ee.pd.t, r: ge = ee.pd.r, b: G = ee.pd.b } = x, M = b - J - ge - he - 4, N = new rt(
-        U,
-        H,
-        y === ve.WRAP,
-        M,
+    const w = {
+      startX: d.startX + D,
+      endX: d.endX - v,
+      startY: d.startY + C,
+      endY: d.endY - f
+    }, b = w.endX - w.startX, g = w.endY - w.startY, p = this._ensureMap(s), _ = this._generateKey(o, i), T = m.getListWithColorMap(c), A = ie(l), P = `${A != null ? A : ""}`, L = T[P];
+    let { tb: y, vt: O, ht: U, pd: k } = a || {};
+    y = y != null ? y : Se.WRAP, O = O != null ? O : he.BOTTOM, U = U != null ? U : re.ht, k = k != null ? k : re.pd;
+    const x = Le(a).fontCache;
+    if (c.renderMode === ue.ARROW) {
+      const { l: Q = re.pd.l, t: G = re.pd.t, r: ce = re.pd.r, b: ee = re.pd.b } = k, q = b - Q - ce - me - 4, M = new at(
+        P,
+        x,
+        y === Se.WRAP,
+        q,
         1 / 0
       );
-      N.calculate();
-      const f = N.getTotalWidth(), O = N.getTotalHeight(), { paddingTop: $, paddingLeft: ce } = xn(M, v - z - G, f, O, T, A, !0);
-      this._drawDownIcon(e, I, b, v, O, T, x), e.save(), e.translateWithPrecision(I.startX + J, I.startY + z), e.beginPath(), e.rect(0, 0, b - J - ge, v - z - G), e.clip(), e.translateWithPrecision(0, $), e.save(), e.translateWithPrecision(ce, 0), e.beginPath(), e.rect(0, 0, M, O), e.clip(), bn.drawWith(e, {
-        text: U,
-        fontStyle: H,
-        width: M,
-        height: O,
-        color: (q = a == null ? void 0 : a.cl) == null ? void 0 : q.rgb,
-        strokeLine: !!((B = a == null ? void 0 : a.st) != null && B.s),
-        underline: !!((ne = a == null ? void 0 : a.ul) != null && ne.s),
-        warp: y === ve.WRAP,
-        hAlign: Ie.LEFT
-      }, N), e.restore(), e.restore(), p.set(_, {
-        left: I.endX - he + n.rowHeaderWidth,
-        top: I.startY + z + n.columnHeaderHeight,
-        width: he,
-        height: v - z - G
+      M.calculate();
+      const $ = M.getTotalWidth(), N = M.getTotalHeight(), { paddingTop: J, paddingLeft: R } = Hn(q, g - G - ee, $, N, O, U, !0);
+      this._drawDownIcon(e, w, b, g, N, O, k), e.save(), e.translateWithPrecision(w.startX + Q, w.startY + G), e.beginPath(), e.rect(0, 0, b - Q - ce, g - G - ee), e.clip(), e.translateWithPrecision(0, J), e.save(), e.translateWithPrecision(R, 0), e.beginPath(), e.rect(0, 0, q, N), e.clip(), Vn.drawWith(e, {
+        text: P,
+        fontStyle: x,
+        width: q,
+        height: N,
+        color: (te = a == null ? void 0 : a.cl) == null ? void 0 : te.rgb,
+        strokeLine: !!((j = a == null ? void 0 : a.st) != null && j.s),
+        underline: !!((se = a == null ? void 0 : a.ul) != null && se.s),
+        warp: y === Se.WRAP,
+        hAlign: Ee.LEFT
+      }, M), e.restore(), e.restore(), p.set(_, {
+        left: w.endX - me + n.rowHeaderWidth,
+        top: w.startY + G + n.columnHeaderHeight,
+        width: me,
+        height: g - G - ee
       });
     } else {
-      e.save(), e.translateWithPrecision(I.startX, I.startY), e.beginPath(), e.rect(0, 0, b, v), e.clip();
-      const J = b - Se * 2 - He - he - 4, z = new rt(
-        U,
-        H,
-        y === ve.WRAP,
-        J,
+      e.save(), e.translateWithPrecision(w.startX, w.startY), e.beginPath(), e.rect(0, 0, b, g), e.clip();
+      const Q = b - we * 2 - Xe - me - 4, G = new at(
+        P,
+        x,
+        y === Se.WRAP,
+        Q,
         1 / 0
       );
-      z.calculate();
-      const ge = z.getTotalWidth(), G = z.getTotalHeight(), M = G + Yt * 2, N = Math.max(b - Se * 2, 1), { paddingTop: f } = xn(N, v, ge, M, T, A);
-      e.translateWithPrecision(Se, f), zn.drawWith(e, {
-        width: N,
-        height: M,
-        fill: L || Te,
-        radius: Xt
-      }), e.save(), e.translateWithPrecision(He, Yt), e.beginPath(), e.rect(0, 0, J, G), e.clip(), bn.drawWith(e, {
-        text: U,
-        fontStyle: H,
-        width: J,
-        height: G,
-        color: (ie = a == null ? void 0 : a.cl) == null ? void 0 : ie.rgb,
-        strokeLine: !!((_e = a == null ? void 0 : a.st) != null && _e.s),
-        underline: !!((Ce = a == null ? void 0 : a.ul) != null && Ce.s),
-        warp: y === ve.WRAP,
-        hAlign: Ie.LEFT
-      }, z), e.restore(), e.translateWithPrecision(J + He + 4, (G - Ct) / 2), e.fillStyle = Yi, e.fill($n), e.restore(), p.set(_, {
-        left: I.startX + Se + n.rowHeaderWidth,
-        top: I.startY + f + n.columnHeaderHeight,
-        width: N,
-        height: M
+      G.calculate();
+      const ce = G.getTotalWidth(), ee = G.getTotalHeight(), q = ee + zt * 2, M = Math.max(b - we * 2, 1), { paddingTop: $ } = Hn(M, g, ce, q, O, U);
+      e.translateWithPrecision(we, $), qn.drawWith(e, {
+        width: M,
+        height: q,
+        fill: L || ke,
+        radius: Kt
+      }), e.save(), e.translateWithPrecision(Xe, zt), e.beginPath(), e.rect(0, 0, Q, ee), e.clip(), Vn.drawWith(e, {
+        text: P,
+        fontStyle: x,
+        width: Q,
+        height: ee,
+        color: (le = a == null ? void 0 : a.cl) == null ? void 0 : le.rgb,
+        strokeLine: !!((de = a == null ? void 0 : a.st) != null && de.s),
+        underline: !!((Me = a == null ? void 0 : a.ul) != null && Me.s),
+        warp: y === Se.WRAP,
+        hAlign: Ee.LEFT
+      }, G), e.restore(), e.translateWithPrecision(Q + Xe + 4, (ee - wt) / 2), e.fillStyle = Ki, e.fill(Wn), e.restore(), p.set(_, {
+        left: w.startX + we + n.rowHeaderWidth,
+        top: w.startY + $ + n.columnHeaderHeight,
+        width: M,
+        height: q
       });
     }
   }
   calcCellAutoHeight(e) {
-    const { primaryWithCoord: t, style: n, data: r, row: o, col: i } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = r == null ? void 0 : r.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: g = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
-    if (!c || c.renderMode === ae.TEXT)
+    const { primaryWithCoord: t, style: n, data: r, row: o, col: i } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = r == null ? void 0 : r.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
+    if (!c || c.renderMode === ue.TEXT)
       return;
     const m = {
       startX: a.startX + s,
       endX: a.endX - d,
       startY: a.startY + u,
-      endY: a.endY - g
-    }, h = m.endX - m.startX, E = re(r), R = `${E != null ? E : ""}`;
-    let { tb: w, pd: S } = n || {};
-    const { t: I = ee.pd.t, b = ee.pd.b } = S != null ? S : {};
-    if (w = w != null ? w : ve.WRAP, c.renderMode === ae.ARROW) {
-      const { l: v = ee.pd.l, r: p = ee.pd.r } = S != null ? S : {}, _ = h - v - p - he - 4, P = new rt(
-        R,
-        Ve(n).fontCache,
-        w === ve.WRAP,
+      endY: a.endY - h
+    }, I = m.endX - m.startX, D = ie(r), v = `${D != null ? D : ""}`;
+    let { tb: C, pd: f } = n || {};
+    const { t: w = re.pd.t, b = re.pd.b } = f != null ? f : {};
+    if (C = C != null ? C : Se.WRAP, c.renderMode === ue.ARROW) {
+      const { l: g = re.pd.l, r: p = re.pd.r } = f != null ? f : {}, _ = I - g - p - me - 4, T = new at(
+        v,
+        Le(n).fontCache,
+        C === Se.WRAP,
         _,
         1 / 0
       );
-      return P.calculate(), P.getTotalHeight() + I + b + je * 2;
+      return T.calculate(), T.getTotalHeight() + w + b + Ze * 2;
     } else {
-      const v = Math.max(h - Se * 2 - He - he - 4, 10), p = new rt(
-        R,
-        Ve(n).fontCache,
-        w === ve.WRAP,
+      const g = Math.max(I - we * 2 - Xe - me - 4, 10), p = new at(
         v,
+        Le(n).fontCache,
+        C === Se.WRAP,
+        g,
         1 / 0
       );
-      return p.calculate(), p.getTotalHeight() + je * 2 + Yt * 2;
+      return p.calculate(), p.getTotalHeight() + Ze * 2 + zt * 2;
     }
   }
   calcCellAutoWidth(e) {
-    const { primaryWithCoord: t, style: n, data: r, row: o, col: i } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = r == null ? void 0 : r.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: g = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
-    if (!c || c.renderMode === ae.TEXT)
+    const { primaryWithCoord: t, style: n, data: r, row: o, col: i } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = r == null ? void 0 : r.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
+    if (!c || c.renderMode === ue.TEXT)
       return;
     const m = {
       startX: a.startX + s,
       endX: a.endX - d,
       startY: a.startY + u,
-      endY: a.endY - g
-    }, h = m.endX - m.startX, E = re(r), R = `${E != null ? E : ""}`;
-    let { tb: w, pd: S } = n || {};
-    const { l: I = ee.pd.l, r: b = ee.pd.r } = S != null ? S : {};
-    w = w != null ? w : ve.WRAP;
-    let v = Se * 2 + he;
+      endY: a.endY - h
+    }, I = m.endX - m.startX, D = ie(r), v = `${D != null ? D : ""}`;
+    let { tb: C, pd: f } = n || {};
+    const { l: w = re.pd.l, r: b = re.pd.r } = f != null ? f : {};
+    C = C != null ? C : Se.WRAP;
+    let g = we * 2 + me;
     switch (c.renderMode) {
-      case ae.ARROW:
-        v = he + 4 + b + I;
+      case ue.ARROW:
+        g = me + 4 + b + w;
         break;
-      case ae.CUSTOM:
-        v = he + Se * 2 + He * 2 + b + I + Xt / 2 + 1;
+      case ue.CUSTOM:
+        g = me + we * 2 + Xe * 2 + b + w + Kt / 2 + 1;
         break;
       // default is CUSTOM
       default:
-        v = he + Se * 2 + He * 2 + b + I + Xt / 2 + 1;
+        g = me + we * 2 + Xe * 2 + b + w + Kt / 2 + 1;
     }
-    const p = h - v, _ = new rt(
-      R,
-      Ve(n).fontCache,
-      w === ve.WRAP,
+    const p = I - g, _ = new at(
+      v,
+      Le(n).fontCache,
+      C === Se.WRAP,
       p,
       1 / 0
     );
-    return _.calculate(), _.getTotalWidth() + v;
+    return _.calculate(), _.getTotalWidth() + g;
   }
   isHit(e, t) {
     const { subUnitId: n, row: r, col: o } = t, a = this._ensureMap(n).get(this._generateKey(r, o)), l = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, r, o);
-    if (!l || !a || l.renderMode === ae.TEXT)
+    if (!l || !a || l.renderMode === ue.TEXT)
       return !1;
-    const { top: s, left: d, width: u, height: g } = a, { x: c, y: m } = e;
-    return c >= d && c <= d + u && m >= s && m <= s + g;
+    const { top: s, left: d, width: u, height: h } = a, { x: c, y: m } = e;
+    return c >= d && c <= d + u && m >= s && m <= s + h;
   }
   onPointerDown(e, t) {
     if (t.button === 2)
@@ -3006,64 +3029,64 @@ let ln = class {
       row: o,
       column: i
     };
-    this._commandService.executeCommand(Lt.id, a);
+    this._commandService.executeCommand(Ut.id, a);
   }
   onPointerEnter(e, t) {
     var n, r;
-    (r = (n = Xe(Z.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ze.POINTER);
+    (r = (n = Ke(H.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ge.POINTER);
   }
   onPointerLeave(e, t) {
     var n, r;
-    (r = (n = Xe(Z.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ze.DEFAULT);
+    (r = (n = Ke(H.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ge.DEFAULT);
   }
 };
-ln = ji([
-  it(0, le),
-  it(1, D(de)),
-  it(2, te),
-  it(3, D(Ue)),
-  it(4, D(oe))
-], ln);
-class Xi extends fe {
+un = zi([
+  lt(0, pe),
+  lt(1, E(ge)),
+  lt(2, oe),
+  lt(3, E(xe)),
+  lt(4, E(ae))
+], un);
+class Gi extends Ce {
   constructor() {
     super(...arguments);
-    V(this, "id", Y.LIST);
-    V(this, "canvasRender", this.injector.createInstance(ln));
-    V(this, "dropdownType", pe.LIST);
-    V(this, "optionsInput", Dt.componentKey);
-    V(this, "formulaInput", pn);
+    V(this, "id", X.LIST);
+    V(this, "canvasRender", this.injector.createInstance(un));
+    V(this, "dropdownType", fe.LIST);
+    V(this, "optionsInput", Ot.componentKey);
+    V(this, "formulaInput", mn);
   }
 }
-class Zi extends fe {
+class qi extends Ce {
   constructor() {
     super(...arguments);
-    V(this, "id", Y.TEXT_LENGTH);
-    V(this, "formulaInput", At);
+    V(this, "id", X.TEXT_LENGTH);
+    V(this, "formulaInput", kt);
   }
 }
-class zi extends fe {
+class Ji extends Ce {
   constructor() {
     super(...arguments);
-    V(this, "id", Y.WHOLE);
-    V(this, "formulaInput", At);
+    V(this, "id", X.WHOLE);
+    V(this, "formulaInput", kt);
   }
 }
-var Ki = Object.getOwnPropertyDescriptor, Gi = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Ki(t, n) : t, i = e.length - 1, a; i >= 0; i--)
+var Qi = Object.getOwnPropertyDescriptor, ea = (e, t, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Qi(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, Zt = (e, t) => (n, r) => t(n, r, e);
-let et = class extends cn {
+}, Gt = (e, t) => (n, r) => t(n, r, e);
+let rt = class extends pn {
   constructor(e, t, n) {
     super(), this._injector = e, this._componentManger = t, this._dataValidatorRegistryService = n, this._initComponents(), this._registerValidatorViews();
   }
   _initComponents() {
     [
-      ["DataValidationIcon", Ir],
-      [bt, vi],
-      [Dt.componentKey, Dt],
-      [Vt.componentKey, Vt],
-      ...Ii
+      ["DataValidationIcon", br],
+      [Vt, Si],
+      [Ot.componentKey, Ot],
+      [At.componentKey, At],
+      ...bi
     ].forEach(([e, t]) => {
       this.disposeWithMe(this._componentManger.register(
         e,
@@ -3073,146 +3096,146 @@ let et = class extends cn {
   }
   _registerValidatorViews() {
     [
+      Fi,
+      Ji,
+      qi,
+      Ui,
       Li,
-      zi,
-      Zi,
-      Pi,
-      Ti,
+      Gi,
       Xi,
-      Wi,
-      Oi
+      ki
     ].forEach((e) => {
       const t = this._injector.createInstance(e), n = this._dataValidatorRegistryService.getValidatorItem(t.id);
       n && (n.formulaInput = t.formulaInput, n.canvasRender = t.canvasRender, n.dropdownType = t.dropdownType, n.optionsInput = t.optionsInput);
     });
   }
 };
-et = Gi([
-  Zt(0, D(ye)),
-  Zt(1, D(mn)),
-  Zt(2, D(Me))
-], et);
-var qi = Object.getOwnPropertyDescriptor, Ji = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? qi(t, n) : t, i = e.length - 1, a; i >= 0; i--)
+rt = ea([
+  Gt(0, E(Ve)),
+  Gt(1, E(Sn)),
+  Gt(2, E(Te))
+], rt);
+var ta = Object.getOwnPropertyDescriptor, na = (e, t, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? ta(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, zt = (e, t) => (n, r) => t(n, r, e);
-const Qi = "SHEET_DATA_VALIDATION_UI_PLUGIN";
-var St;
-let Bn = (St = class extends Xn {
-  constructor(e = Mt, t, n, r) {
+}, qt = (e, t) => (n, r) => t(n, r, e);
+const ra = "SHEET_DATA_VALIDATION_UI_PLUGIN";
+var Rt;
+let jn = (Rt = class extends Kn {
+  constructor(e = Dt, t, n, r) {
     super(), this._config = e, this._injector = t, this._commandService = n, this._configService = r;
-    const { menu: o, ...i } = Zn(
+    const { menu: o, ...i } = Gn(
       {},
-      Mt,
+      Dt,
       this._config
     );
-    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(yt, i);
+    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(Et, i);
   }
   onStarting() {
     [
-      [me],
-      [Ne],
-      [ut],
-      [Ge],
+      [_e],
+      [$e],
+      [gt],
       [Qe],
-      [Je],
-      [qe],
-      [et]
+      [nt],
+      [tt],
+      [et],
+      [rt]
     ].forEach((e) => {
       this._injector.add(e);
     }), [
-      kt,
-      Lt,
-      fr,
-      Cn,
-      Fe,
-      mr
+      Ft,
+      Ut,
+      Ir,
+      wn,
+      Be,
+      Cr
     ].forEach((e) => {
       this._commandService.registerCommand(e);
     });
   }
   onReady() {
-    this._injector.get(qe), this._injector.get(Je), this._injector.get(Ue).registerRenderModule(
-      Z.UNIVER_SHEET,
-      [Et]
+    this._injector.get(et), this._injector.get(tt), this._injector.get(xe).registerRenderModule(
+      H.UNIVER_SHEET,
+      [Tt]
     );
   }
   onRendered() {
-    this._injector.get(et), this._injector.get(Qe);
+    this._injector.get(rt), this._injector.get(nt);
   }
   onSteady() {
-    this._injector.get(Ge);
-  }
-}, V(St, "pluginName", Qi), V(St, "type", Z.UNIVER_SHEET), St);
-Bn = Ji([
-  zt(1, D(ye)),
-  zt(2, te),
-  zt(3, dn)
-], Bn);
-var ea = Object.defineProperty, ta = Object.getOwnPropertyDescriptor, na = (e, t, n) => t in e ? ea(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, ra = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? ta(t, n) : t, i = e.length - 1, a; i >= 0; i--)
+    this._injector.get(Qe);
+  }
+}, V(Rt, "pluginName", ra), V(Rt, "type", H.UNIVER_SHEET), Rt);
+jn = na([
+  qt(1, E(Ve)),
+  qt(2, oe),
+  qt(3, hn)
+], jn);
+var oa = Object.defineProperty, ia = Object.getOwnPropertyDescriptor, aa = (e, t, n) => t in e ? oa(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, sa = (e, t, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? ia(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, Kt = (e, t) => (n, r) => t(n, r, e), Dr = (e, t, n) => na(e, typeof t != "symbol" ? t + "" : t, n);
-const oa = "SHEET_DATA_VALIDATION_UI_PLUGIN";
-let Ot = class extends Xn {
-  constructor(e = Mt, t, n, r) {
+}, Jt = (e, t) => (n, r) => t(n, r, e), Ar = (e, t, n) => aa(e, typeof t != "symbol" ? t + "" : t, n);
+const la = "SHEET_DATA_VALIDATION_UI_PLUGIN";
+let Lt = class extends Kn {
+  constructor(e = Dt, t, n, r) {
     super(), this._config = e, this._injector = t, this._commandService = n, this._configService = r;
-    const { menu: o, ...i } = Zn(
+    const { menu: o, ...i } = Gn(
       {},
-      Mt,
+      Dt,
       this._config
     );
-    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(yt, i);
+    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(Et, i);
   }
   onStarting() {
     [
-      [me],
-      [Ne],
-      [ut],
-      [Ge],
+      [_e],
+      [$e],
+      [gt],
       [Qe],
+      [nt],
+      [tt],
+      [et],
       [Je],
-      [qe],
-      [Ke],
-      [et]
+      [rt]
     ].forEach((e) => {
       this._injector.add(e);
     }), [
-      kt,
-      Lt,
-      fr,
-      Cn,
-      Fe,
-      mr
+      Ft,
+      Ut,
+      Ir,
+      wn,
+      Be,
+      Cr
     ].forEach((e) => {
       this._commandService.registerCommand(e);
     });
   }
   onReady() {
-    this._injector.get(qe), this._injector.get(Je), this._injector.get(Ke), this._injector.get(ut), this._injector.get(Ue).registerRenderModule(
-      Z.UNIVER_SHEET,
-      [Et]
+    this._injector.get(et), this._injector.get(tt), this._injector.get(Je), this._injector.get(gt), this._injector.get(xe).registerRenderModule(
+      H.UNIVER_SHEET,
+      [Tt]
     );
   }
   onRendered() {
-    this._injector.get(et), this._injector.get(Qe);
+    this._injector.get(rt), this._injector.get(nt);
   }
   onSteady() {
-    this._injector.get(Ge);
+    this._injector.get(Qe);
   }
 };
-Dr(Ot, "pluginName", oa);
-Dr(Ot, "type", Z.UNIVER_SHEET);
-Ot = ra([
-  Hr(so),
-  Kt(1, D(ye)),
-  Kt(2, te),
-  Kt(3, dn)
-], Ot);
+Ar(Lt, "pluginName", la);
+Ar(Lt, "type", H.UNIVER_SHEET);
+Lt = sa([
+  Zr(vo),
+  Jt(1, E(Ve)),
+  Jt(2, oe),
+  Jt(3, hn)
+], Lt);
 export {
-  fe as BaseSheetDataValidatorView,
-  Bn as UniverSheetsDataValidationMobileUIPlugin,
-  Ot as UniverSheetsDataValidationUIPlugin
+  Ce as BaseSheetDataValidatorView,
+  jn as UniverSheetsDataValidationMobileUIPlugin,
+  Lt as UniverSheetsDataValidationUIPlugin
 };