npm - @univerjs/sheets-data-validation-ui - Versions diffs - 0.5.3 → 0.5.4-nightly.202501131606 - Mend

@univerjs/sheets-data-validation-ui 0.5.3 → 0.5.4-nightly.202501131606

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/lib/cjs/index.js +2 -2
package/lib/es/index.js +618 -624
package/lib/types/controllers/dv-permission.controller.d.ts +3 -3
package/lib/umd/index.js +2 -2
package/package.json +17 -16
package/LICENSE +0 -176

package/lib/es/index.js CHANGED Viewed

@@ -1,18 +1,18 @@
 var ko = Object.defineProperty;
 var Wo = (e, t, o) => t in e ? ko(e, t, { enumerable: !0, configurable: !0, writable: !0, value: o }) : e[t] = o;
 var M = (e, t, o) => Wo(e, typeof t != "symbol" ? t + "" : t, o);
-import Zt, { useState as W, forwardRef as we, useRef as He, createElement as Re, useMemo as Ae, useEffect as Ce } from "react";
-import { Inject as b, LocaleService as J, Disposable as De, DataValidationErrorStyle as it, useDependency as L, ICommandService as Q, dayjs as qt, numfmt as Jt, CellValueType as Ho, UniverInstanceType as Y, toDisposable as Yo, IUniverInstanceService as ge, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Xo, DisposableCollection as zo, CommandType as Je, BuildTextUtils as Ko, DataValidationRenderMode as de, DataValidationType as z, IConfigService as hn, UndoCommand as Go, RedoCommand as Zo, isUnitRangesEqual as qo, debounce as Jo, shallowEqual as Mn, Injector as Ne, DataValidationStatus as rt, ObjectMatrix as _t, Range as Qo, Rectangle as St, queryObjectMatrix as Qt, Optional as ea, RxDisposable as pn, InterceptorEffectEnum as zn, sequenceExecute as Kn, bufferDebounceTime as ta, isFormulaString as Pe, Tools as en, ThemeService as na, VerticalAlign as ue, HorizontalAlign as Ye, DEFAULT_STYLES as le, WrapStrategy as Se, DocumentDataModel as oa, DEFAULT_EMPTY_DOCUMENT_VALUE as aa, BooleanNumber as Qe, Plugin as Gn, merge as Zn } from "@univerjs/core";
-import { Button as Fe, DatePanel as ia, Scrollbar as ra, FormLayout as Z, RadioGroup as mn, Radio as xe, Checkbox as Ot, Input as je, Select as tn, DraggableList as sa } from "@univerjs/design";
-import { DeviceInputEventType as nn, IRenderManagerService as Ve, fixLineWidthByScale as bn, Transform as la, CheckboxShape as da, CURSOR_TYPE as Xe, FontCache as ca, Shape as ua, Rect as qn, getFontStyleString as jt, getDocsSkeletonPageSize as et, DocumentViewModel as ha, DocumentSkeleton as pa, Documents as ma } from "@univerjs/engine-render";
-import { SheetInterceptorService as fn, AFTER_CELL_EDIT_ASYNC as fa, SetRangeValuesCommand as gn, SheetsSelectionsService as Jn, getSheetCommandTarget as Qn, WorkbookEditablePermission as Ct, RangeProtectionPermissionEditPoint as It, WorksheetEditPermission as wt, checkRangesEditablePermission as ga, WorksheetSetCellStylePermission as on, INTERCEPTOR_POINT as eo, InterceptCellContentPriority as to } from "@univerjs/sheets";
-import { SheetDataValidationModel as oe, getCellValueOrigin as ie, getDataValidationCellValue as va, deserializeListOptions as no, serializeListOptions as oo, UpdateSheetDataValidationRangeCommand as ao, UpdateSheetDataValidationSettingCommand as En, RemoveSheetDataValidationCommand as io, UpdateSheetDataValidationOptionsCommand as _a, createDefaultNewRule as ro, AddSheetDataValidationCommand as vn, RemoveSheetAllDataValidationCommand as Sa, DATA_VALIDATION_PLUGIN_NAME as so, getDataValidationDiffMutations as an, DataValidationCacheService as lo, DataValidationFormulaController as Ca, DataValidationFormulaService as Ia, getFormulaResult as Ft, isLegalFormulaResult as On, transformCheckboxValue as wa, CHECKBOX_FORMULA_1 as Ra, CHECKBOX_FORMULA_2 as Da } from "@univerjs/sheets-data-validation";
+import Zt, { useState as W, forwardRef as we, useRef as We, createElement as Re, useMemo as He, useEffect as Ce } from "react";
+import { Inject as b, LocaleService as J, Disposable as De, DataValidationErrorStyle as it, useDependency as L, ICommandService as Q, dayjs as qt, numfmt as Jt, CellValueType as Ho, UniverInstanceType as Y, toDisposable as Yo, IUniverInstanceService as ge, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Xo, DisposableCollection as zo, CommandType as Je, BuildTextUtils as Ko, DataValidationRenderMode as de, DataValidationType as z, IConfigService as pn, UndoCommand as Go, RedoCommand as Zo, isUnitRangesEqual as qo, debounce as Jo, shallowEqual as bn, Injector as Fe, DataValidationStatus as rt, ObjectMatrix as _t, Range as Qo, Rectangle as St, queryObjectMatrix as Qt, Optional as ea, RxDisposable as fn, InterceptorEffectEnum as Kn, sequenceExecute as Gn, bufferDebounceTime as ta, isFormulaString as Pe, Tools as en, ThemeService as na, VerticalAlign as ue, HorizontalAlign as Ye, DEFAULT_STYLES as le, WrapStrategy as Se, DocumentDataModel as oa, DEFAULT_EMPTY_DOCUMENT_VALUE as aa, BooleanNumber as Qe, Plugin as Zn, merge as qn } from "@univerjs/core";
+import { Button as je, DatePanel as ia, Scrollbar as ra, FormLayout as Z, RadioGroup as mn, Radio as Ae, Checkbox as Ot, Input as xe, Select as tn, DraggableList as sa } from "@univerjs/design";
+import { DeviceInputEventType as nn, IRenderManagerService as Ve, fixLineWidthByScale as En, Transform as la, CheckboxShape as da, CURSOR_TYPE as Xe, FontCache as ca, Shape as ua, Rect as Jn, getFontStyleString as jt, getDocsSkeletonPageSize as et, DocumentViewModel as ha, DocumentSkeleton as pa, Documents as fa } from "@univerjs/engine-render";
+import { SheetInterceptorService as gn, AFTER_CELL_EDIT_ASYNC as ma, SetRangeValuesCommand as vn, SheetsSelectionsService as Qn, getSheetCommandTarget as eo, SheetPermissionCheckController as to, WorkbookEditablePermission as Ct, RangeProtectionPermissionEditPoint as It, WorksheetEditPermission as wt, checkRangesEditablePermission as ga, WorksheetSetCellStylePermission as on, INTERCEPTOR_POINT as no, InterceptCellContentPriority as oo } from "@univerjs/sheets";
+import { SheetDataValidationModel as oe, getCellValueOrigin as ie, getDataValidationCellValue as va, deserializeListOptions as ao, serializeListOptions as io, UpdateSheetDataValidationRangeCommand as ro, UpdateSheetDataValidationSettingCommand as On, RemoveSheetDataValidationCommand as so, UpdateSheetDataValidationOptionsCommand as _a, createDefaultNewRule as lo, AddSheetDataValidationCommand as _n, RemoveSheetAllDataValidationCommand as Sa, DATA_VALIDATION_PLUGIN_NAME as co, getDataValidationDiffMutations as an, DataValidationCacheService as uo, DataValidationFormulaController as Ca, DataValidationFormulaService as Ia, getFormulaResult as Ft, isLegalFormulaResult as Ln, transformCheckboxValue as wa, CHECKBOX_FORMULA_1 as Ra, CHECKBOX_FORMULA_2 as Da } from "@univerjs/sheets-data-validation";
 import { getPatternType as Va } from "@univerjs/sheets-numfmt";
-import { SetCellEditVisibleOperation as co, SheetCanvasPopManagerService as ya, IEditorBridgeService as uo, SheetPermissionInterceptorBaseController as ho, IMarkSelectionService as Ma, HoverManagerService as ba, CellAlertManagerService as Ea, CellAlertType as Oa, IAutoFillService as La, APPLY_TYPE as tt, virtualizeDiscreteRanges as rn, getAutoFillRepeatRange as Pa, COPY_TYPE as Ln, rangeToDiscreteRange as Ta, PREDEFINED_HOOK_NAME as dt, getRepeatRange as Pn, ISheetClipboardService as Aa, getCurrentRangeDisable$ as xa, AutoHeightController as po, SheetSkeletonManagerService as Rt } from "@univerjs/sheets-ui";
-import { IDialogService as ja, KeyCode as sn, ISidebarService as mo, useObservable as Ue, ComponentManager as Lt, IZenZoneService as fo, RectPopup as Fa, useEvent as go, useSidebarClick as _n, MenuItemType as Sn, getMenuHiddenObservable as Na, RibbonStartGroup as Ua, IMenuManagerService as Ba } from "@univerjs/ui";
-import { DataValidatorRegistryService as ye, DataValidationModel as Pt, DataValidatorRegistryScope as $a, TWO_FORMULA_OPERATOR_COUNT as ka, getRuleOptions as Tn, getRuleSetting as An } from "@univerjs/data-validation";
+import { SetCellEditVisibleOperation as ho, SheetCanvasPopManagerService as ya, IEditorBridgeService as po, IMarkSelectionService as Ma, HoverManagerService as ba, CellAlertManagerService as Ea, CellAlertType as Oa, IAutoFillService as La, APPLY_TYPE as tt, virtualizeDiscreteRanges as rn, getAutoFillRepeatRange as Pa, COPY_TYPE as Pn, rangeToDiscreteRange as Ta, PREDEFINED_HOOK_NAME as dt, getRepeatRange as Tn, ISheetClipboardService as Aa, getCurrentRangeDisable$ as xa, AutoHeightController as fo, SheetSkeletonManagerService as Rt } from "@univerjs/sheets-ui";
+import { IDialogService as ja, KeyCode as sn, ISidebarService as mo, useObservable as Ne, ComponentManager as Lt, IZenZoneService as go, RectPopup as Fa, useEvent as ln, useSidebarClick as Sn, MenuItemType as Cn, getMenuHiddenObservable as Na, RibbonStartGroup as Ua, IMenuManagerService as Ba } from "@univerjs/ui";
+import { DataValidatorRegistryService as ye, DataValidationModel as Pt, DataValidatorRegistryScope as $a, TWO_FORMULA_OPERATOR_COUNT as ka, getRuleOptions as An, getRuleSetting as xn } from "@univerjs/data-validation";
 import { RichTextEditingMutation as Wa } from "@univerjs/docs";
-import { filter as Cn, BehaviorSubject as xn, distinctUntilChanged as Ha, Subject as Ya, debounceTime as In, bufferTime as vo } from "rxjs";
+import { filter as In, BehaviorSubject as jn, distinctUntilChanged as Ha, Subject as Ya, debounceTime as wn, bufferTime as vo } from "rxjs";
 import { deserializeRangeWithSheet as Xa, serializeRange as _o } from "@univerjs/engine-formula";
 import { RangeSelector as za, FormulaEditor as So } from "@univerjs/sheets-formula-ui";
 var Nt = { exports: {} }, nt = {};
@@ -25,23 +25,23 @@ var Nt = { exports: {} }, nt = {};
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-var jn;
+var Fn;
 function Ka() {
-  if (jn) return nt;
-  jn = 1;
+  if (Fn) return nt;
+  Fn = 1;
   var e = Zt, t = Symbol.for("react.element"), o = Symbol.for("react.fragment"), n = Object.prototype.hasOwnProperty, a = e.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, i = { key: !0, ref: !0, __self: !0, __source: !0 };
   function r(l, s, c) {
-    var u, p = {}, d = null, f = null;
-    c !== void 0 && (d = "" + c), s.key !== void 0 && (d = "" + s.key), s.ref !== void 0 && (f = s.ref);
+    var u, p = {}, d = null, g = null;
+    c !== void 0 && (d = "" + c), s.key !== void 0 && (d = "" + s.key), s.ref !== void 0 && (g = s.ref);
     for (u in s) n.call(s, u) && !i.hasOwnProperty(u) && (p[u] = s[u]);
     if (l && l.defaultProps) for (u in s = l.defaultProps, s) p[u] === void 0 && (p[u] = s[u]);
-    return { $$typeof: t, type: l, key: d, ref: f, props: p, _owner: a.current };
+    return { $$typeof: t, type: l, key: d, ref: g, props: p, _owner: a.current };
   }
   return nt.Fragment = o, nt.jsx = r, nt.jsxs = r, nt;
 }
-var Fn;
+var Nn;
 function Ga() {
-  return Fn || (Fn = 1, Nt.exports = Ka()), Nt.exports;
+  return Nn || (Nn = 1, Nt.exports = Ka()), Nt.exports;
 }
 var h = Ga(), Za = Object.defineProperty, qa = Object.getOwnPropertyDescriptor, Ja = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? qa(t, o) : t, i = e.length - 1, r; i >= 0; i--)
@@ -54,10 +54,10 @@ let st = class extends De {
   }
   _initEditorBridgeInterceptor() {
     this._sheetInterceptorService.writeCellInterceptor.intercept(
-      fa,
+      ma,
       {
         handler: async (e, t, o) => {
-          var _;
+          var C;
           const n = await e, { worksheet: a, row: i, col: r, unitId: l, subUnitId: s, workbook: c } = t, u = this._dataValidationModel.getRuleIdByLocation(l, s, i, r), p = u ? this._dataValidationModel.getRuleById(l, s, u) : void 0;
           if (!p || p.errorStyle !== it.STOP)
             return o(Promise.resolve(n));
@@ -65,7 +65,7 @@ let st = class extends De {
           if (!d || await d.validator(
             {
               value: ie(n),
-              interceptValue: ie((_ = t == null ? void 0 : t.origin) != null ? _ : n),
+              interceptValue: ie((C = t == null ? void 0 : t.origin) != null ? C : n),
               row: i,
               column: r,
               unitId: l,
@@ -77,7 +77,7 @@ let st = class extends De {
             p
           ))
             return o(Promise.resolve(n));
-          const m = a.getCellRaw(i, r);
+          const f = a.getCellRaw(i, r);
           return this._dialogService.open({
             width: 368,
             title: {
@@ -89,7 +89,7 @@ let st = class extends De {
             },
             footer: {
               title: Zt.createElement(
-                Fe,
+                je,
                 {
                   type: "primary",
                   onClick: () => this._dialogService.close("reject-input-dialog")
@@ -100,7 +100,7 @@ let st = class extends De {
             onClose: () => {
               this._dialogService.close("reject-input-dialog");
             }
-          }), o(Promise.resolve(m));
+          }), o(Promise.resolve(f));
         }
       }
     );
@@ -117,7 +117,7 @@ let st = class extends De {
       },
       footer: {
         title: Zt.createElement(
-          Fe,
+          je,
           {
             type: "primary",
             onClick: () => this._dialogService.close("reject-input-dialog")
@@ -132,13 +132,13 @@ let st = class extends De {
   }
 };
 st = Ja([
-  ot(0, b(fn)),
+  ot(0, b(gn)),
   ot(1, b(oe)),
   ot(2, b(ye)),
   ot(3, ja),
   ot(4, b(J))
 ], st);
-const Qa = "univer-dv-date-dropdown", ei = "univer-dv-date-dropdown-btns", Nn = {
+const Qa = "univer-dv-date-dropdown", ei = "univer-dv-date-dropdown-btns", Un = {
   dvDateDropdown: Qa,
   dvDateDropdownBtns: ei
 }, ti = (e) => {
@@ -151,20 +151,20 @@ const Qa = "univer-dv-date-dropdown", ei = "univer-dv-date-dropdown-btns", Nn =
     return t;
 };
 function ni(e) {
-  var v;
-  const { location: t, hideFn: o } = e, { worksheet: n, row: a, col: i, unitId: r, subUnitId: l, workbook: s } = t, c = L(Q), u = L(st), p = n.getCell(a, i), d = ie(n.getCellRaw(a, i)), f = ti(d), [m, _] = W(f), w = m && m.isValid() ? m : qt(), S = L(J), R = L(oe), I = R.getRuleByLocation(r, l, a, i);
+  var m;
+  const { location: t, hideFn: o } = e, { worksheet: n, row: a, col: i, unitId: r, subUnitId: l, workbook: s } = t, c = L(Q), u = L(st), p = n.getCell(a, i), d = ie(n.getCellRaw(a, i)), g = ti(d), [f, C] = W(g), R = f && f.isValid() ? f : qt(), v = L(J), w = L(oe), I = w.getRuleByLocation(r, l, a, i);
   if (!I)
     return null;
-  const V = R.getValidator(I.type);
+  const V = w.getValidator(I.type);
   if (!p || !V)
     return;
-  const C = !!((v = I.bizInfo) != null && v.showTime), g = async () => {
-    var x, j, F;
-    if (!w)
+  const _ = !!((m = I.bizInfo) != null && m.showTime), S = async () => {
+    var x, j, N;
+    if (!R)
       return;
-    const P = w.format(C ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00"), U = (x = Jt.parseDate(P)) == null ? void 0 : x.v, T = s.getStyles().getStyleByCell(p), E = (F = (j = T == null ? void 0 : T.n) == null ? void 0 : j.pattern) != null ? F : "", A = Va(E);
+    const P = R.format(_ ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00"), F = (x = Jt.parseDate(P)) == null ? void 0 : x.v, T = s.getStyles().getStyleByCell(p), E = (N = (j = T == null ? void 0 : T.n) == null ? void 0 : j.pattern) != null ? N : "", A = Va(E);
     I.errorStyle !== it.STOP || await V.validator({
-      value: U,
+      value: F,
       unitId: r,
       subUnitId: l,
       row: a,
@@ -173,12 +173,12 @@ function ni(e) {
       workbook: s,
       interceptValue: P.replace("Z", "").replace("T", " "),
       t: Ho.NUMBER
-    }, I) ? (o(), await c.executeCommand(co.id, {
+    }, I) ? (o(), await c.executeCommand(ho.id, {
       visible: !1,
       eventType: nn.Keyboard,
       unitId: r,
       keycode: sn.ESC
-    }), await c.executeCommand(gn.id, {
+    }), await c.executeCommand(vn.id, {
       unitId: r,
       subUnitId: l,
       range: {
@@ -188,36 +188,36 @@ function ni(e) {
         endRow: a
       },
       value: {
-        v: U,
+        v: F,
         t: 2,
         p: null,
         f: null,
         si: null,
         s: {
           n: {
-            pattern: C ? A === "datetime" ? E : "yyyy-MM-dd hh:mm:ss" : A === "date" ? E : "yyyy-MM-dd"
+            pattern: _ ? A === "datetime" ? E : "yyyy-MM-dd hh:mm:ss" : A === "date" ? E : "yyyy-MM-dd"
           }
         }
       }
     })) : u.showReject(V.getRuleFinalError(I, { row: a, col: i, unitId: r, subUnitId: l }));
   };
-  return /* @__PURE__ */ h.jsxs("div", { className: Nn.dvDateDropdown, children: [
+  return /* @__PURE__ */ h.jsxs("div", { className: Un.dvDateDropdown, children: [
     /* @__PURE__ */ h.jsx(
       ia,
       {
-        defaultValue: w,
-        pickerValue: w,
-        showTime: C || void 0,
+        defaultValue: R,
+        pickerValue: R,
+        showTime: _ || void 0,
         onSelect: async (y) => {
-          _(y);
+          C(y);
         },
         onPanelChange: (y) => {
-          _(y);
+          C(y);
         },
         disabledDate: (y) => !Jt.parseDate(y.format("YYYY-MM-DD"))
       }
     ),
-    /* @__PURE__ */ h.jsx("div", { className: Nn.dvDateDropdownBtns, children: /* @__PURE__ */ h.jsx(Fe, { size: "small", type: "primary", onClick: g, disabled: !w.isValid(), children: S.t("dataValidation.alert.ok") }) })
+    /* @__PURE__ */ h.jsx("div", { className: Un.dvDateDropdownBtns, children: /* @__PURE__ */ h.jsx(je, { size: "small", type: "primary", onClick: S, disabled: !R.isValid(), children: v.t("dataValidation.alert.ok") }) })
   ] });
 }
 var ce = function() {
@@ -236,7 +236,7 @@ var ce = function() {
       t.indexOf(n[a]) < 0 && Object.prototype.propertyIsEnumerable.call(e, n[a]) && (o[n[a]] = e[n[a]]);
   return o;
 }, Me = we(function(e, t) {
-  var o = e.icon, n = e.id, a = e.className, i = e.extend, r = oi(e, ["icon", "id", "className", "extend"]), l = "univerjs-icon univerjs-icon-".concat(n, " ").concat(a || "").trim(), s = He("_".concat(ri()));
+  var o = e.icon, n = e.id, a = e.className, i = e.extend, r = oi(e, ["icon", "id", "className", "extend"]), l = "univerjs-icon univerjs-icon-".concat(n, " ").concat(a || "").trim(), s = We("_".concat(ri()));
   return Co(o, "".concat(n), { defIds: o.defIds, idSuffix: s.current }, ce({ ref: t, className: l }, r), i);
 });
 function Co(e, t, o, n, a) {
@@ -279,14 +279,14 @@ var li = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 16", width: "1em"
   }));
 });
 wo.displayName = "DataValidationSingle";
-var di = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.3313 1.4667C5.3313 1.13533 5.59993.866699 5.9313.866699H10.069C10.4004.866699 10.669 1.13533 10.669 1.4667 10.669 1.79807 10.4004 2.0667 10.069 2.0667H5.9313C5.59993 2.0667 5.3313 1.79807 5.3313 1.4667zM1.09985 3.64443C1.09985 3.31306 1.36848 3.04443 1.69985 3.04443H14.2999C14.6312 3.04443 14.8999 3.31306 14.8999 3.64443 14.8999 3.9758 14.6312 4.24443 14.2999 4.24443H1.69985C1.36848 4.24443 1.09985 3.9758 1.09985 3.64443zM6.12398 8.30171C6.35829 8.0674 6.73819 8.0674 6.97251 8.30171L8.00007 9.32928 9.02764 8.30171C9.26195 8.0674 9.64185 8.0674 9.87617 8.30171 10.1105 8.53603 10.1105 8.91593 9.87617 9.15024L8.8486 10.1778 9.87617 11.2054C10.1105 11.4397 10.1105 11.8196 9.87617 12.0539 9.64185 12.2882 9.26195 12.2882 9.02764 12.0539L8.00007 11.0263 6.97251 12.0539C6.73819 12.2882 6.35829 12.2882 6.12398 12.0539 5.88966 11.8196 5.88966 11.4397 6.12398 11.2054L7.15154 10.1778 6.12398 9.15024C5.88966 8.91593 5.88966 8.53603 6.12398 8.30171z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M4.75332 5.22217C3.86966 5.22217 3.15332 5.93851 3.15332 6.82217V12.5331C3.15332 13.9691 4.31738 15.1332 5.75332 15.1332H10.2465C11.6825 15.1332 12.8465 13.9691 12.8465 12.5331V6.82217C12.8465 5.93851 12.1302 5.22217 11.2465 5.22217H4.75332ZM4.35332 6.82217C4.35332 6.60125 4.53241 6.42217 4.75332 6.42217H11.2465C11.4674 6.42217 11.6465 6.60125 11.6465 6.82217V12.5331C11.6465 13.3063 11.0197 13.9332 10.2465 13.9332H5.75332C4.98012 13.9332 4.35332 13.3063 4.35332 12.5331V6.82217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, wn = we(function(e, t) {
+var di = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.3313 1.4667C5.3313 1.13533 5.59993.866699 5.9313.866699H10.069C10.4004.866699 10.669 1.13533 10.669 1.4667 10.669 1.79807 10.4004 2.0667 10.069 2.0667H5.9313C5.59993 2.0667 5.3313 1.79807 5.3313 1.4667zM1.09985 3.64443C1.09985 3.31306 1.36848 3.04443 1.69985 3.04443H14.2999C14.6312 3.04443 14.8999 3.31306 14.8999 3.64443 14.8999 3.9758 14.6312 4.24443 14.2999 4.24443H1.69985C1.36848 4.24443 1.09985 3.9758 1.09985 3.64443zM6.12398 8.30171C6.35829 8.0674 6.73819 8.0674 6.97251 8.30171L8.00007 9.32928 9.02764 8.30171C9.26195 8.0674 9.64185 8.0674 9.87617 8.30171 10.1105 8.53603 10.1105 8.91593 9.87617 9.15024L8.8486 10.1778 9.87617 11.2054C10.1105 11.4397 10.1105 11.8196 9.87617 12.0539 9.64185 12.2882 9.26195 12.2882 9.02764 12.0539L8.00007 11.0263 6.97251 12.0539C6.73819 12.2882 6.35829 12.2882 6.12398 12.0539 5.88966 11.8196 5.88966 11.4397 6.12398 11.2054L7.15154 10.1778 6.12398 9.15024C5.88966 8.91593 5.88966 8.53603 6.12398 8.30171z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M4.75332 5.22217C3.86966 5.22217 3.15332 5.93851 3.15332 6.82217V12.5331C3.15332 13.9691 4.31738 15.1332 5.75332 15.1332H10.2465C11.6825 15.1332 12.8465 13.9691 12.8465 12.5331V6.82217C12.8465 5.93851 12.1302 5.22217 11.2465 5.22217H4.75332ZM4.35332 6.82217C4.35332 6.60125 4.53241 6.42217 4.75332 6.42217H11.2465C11.4674 6.42217 11.6465 6.60125 11.6465 6.82217V12.5331C11.6465 13.3063 11.0197 13.9332 10.2465 13.9332H5.75332C4.98012 13.9332 4.35332 13.3063 4.35332 12.5331V6.82217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Rn = we(function(e, t) {
   return Re(Me, Object.assign({}, e, {
     id: "delete-single",
     ref: t,
     icon: di
   }));
 });
-wn.displayName = "DeleteSingle";
+Rn.displayName = "DeleteSingle";
 var ci = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M8.6 1.99991C8.60001 1.66854 8.33138 1.39991 8.00001 1.3999C7.66864 1.3999 7.40001 1.66853 7.4 1.9999L7.39996 7.3999H1.9999C1.66853 7.3999 1.3999 7.66853 1.3999 7.9999C1.3999 8.33127 1.66853 8.5999 1.9999 8.5999H7.39995L7.3999 13.9999C7.3999 14.3313 7.66853 14.5999 7.9999 14.5999C8.33127 14.5999 8.5999 14.3313 8.5999 13.9999L8.59995 8.5999H13.9999C14.3313 8.5999 14.5999 8.33127 14.5999 7.9999C14.5999 7.66853 14.3313 7.3999 13.9999 7.3999H8.59996L8.6 1.99991Z" } }] }, Ro = we(function(e, t) {
   return Re(Me, Object.assign({}, e, {
     id: "increase-single",
@@ -319,22 +319,22 @@ var pi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em"
   }));
 });
 yo.displayName = "SequenceSingle";
-var mi = Object.defineProperty, fi = Object.getOwnPropertyDescriptor, gi = (e, t, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? fi(t, o) : t, i = e.length - 1, r; i >= 0; i--)
+var fi = Object.defineProperty, mi = Object.getOwnPropertyDescriptor, gi = (e, t, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? mi(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
-  return n && a && mi(t, o, a), a;
-}, Un = (e, t) => (o, n) => t(o, n, e);
-let me = class extends De {
+  return n && a && fi(t, o, a), a;
+}, Bn = (e, t) => (o, n) => t(o, n, e);
+let fe = class extends De {
   constructor(t, o) {
     super();
-    M(this, "_open$", new xn(!1));
+    M(this, "_open$", new jn(!1));
     M(this, "open$", this._open$.pipe(Ha()));
     M(this, "_activeRule");
-    M(this, "_activeRule$", new xn(void 0));
+    M(this, "_activeRule$", new jn(void 0));
     M(this, "activeRule$", this._activeRule$.asObservable());
     M(this, "_closeDisposable", null);
     this._univerInstanceService = t, this._sidebarService = o, this.disposeWithMe(
-      this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET).pipe(Cn((n) => !n)).subscribe(() => {
+      this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET).pipe(In((n) => !n)).subscribe(() => {
         this.close();
       })
     ), this.disposeWithMe(this._sidebarService.sidebarOptions$.subscribe((n) => {
@@ -369,12 +369,12 @@ let me = class extends De {
     this._activeRule = t, this._activeRule$.next(t);
   }
 };
-me = gi([
-  Un(0, ge),
-  Un(1, mo)
-], me);
+fe = gi([
+  Bn(0, ge),
+  Bn(1, mo)
+], fe);
 function vi() {
-  const e = L(Ie), t = Ue(e.activeDropdown$, e.activeDropdown), o = L(Lt);
+  const e = L(Ie), t = Ne(e.activeDropdown$, e.activeDropdown), o = L(Lt);
   if (!t)
     return null;
   const { location: n, componentKey: a } = t, i = o.get(a), r = `${n.unitId}-${n.subUnitId}-${n.row}-${n.col}`;
@@ -501,18 +501,18 @@ Ie = Ci([
   be(0, b(ya)),
   be(1, ge),
   be(2, b(ye)),
-  be(3, fo),
+  be(3, go),
   be(4, Ve),
   be(5, b(oe)),
-  be(6, b(Jn))
+  be(6, b(Qn))
 ], Ie);
-const Dt = "DataValidationPanel", Be = {
+const Dt = "DataValidationPanel", Ue = {
   id: "data-validation.operation.open-validation-panel",
   type: Je.OPERATION,
   handler(e, t) {
     if (!t)
       return !1;
-    const { ruleId: o, isAdd: n } = t, a = e.get(me), i = e.get(Pt), r = e.get(ge), l = e.get(mo), s = Qn(r);
+    const { ruleId: o, isAdd: n } = t, a = e.get(fe), i = e.get(Pt), r = e.get(ge), l = e.get(mo), s = eo(r);
     if (!s) return !1;
     const { unitId: c, subUnitId: u } = s, p = o ? i.getRuleById(c, u, o) : void 0;
     a.open(), a.setActiveRule(p && {
@@ -529,18 +529,18 @@ const Dt = "DataValidationPanel", Be = {
     });
     return a.setCloseDisposable(d), !0;
   }
-}, Rn = {
+}, Dn = {
   id: "data-validation.operation.close-validation-panel",
   type: Je.OPERATION,
   handler(e) {
-    return e.get(me).close(), !0;
+    return e.get(fe).close(), !0;
   }
 }, bo = {
   id: "data-validation.operation.toggle-validation-panel",
   type: Je.OPERATION,
   handler(e) {
-    const t = e.get(Q), o = e.get(me);
-    return o.open(), o.isOpen ? t.executeCommand(Rn.id) : t.executeCommand(Be.id), !0;
+    const t = e.get(Q), o = e.get(fe);
+    return o.open(), o.isOpen ? t.executeCommand(Dn.id) : t.executeCommand(Ue.id), !0;
   }
 }, Tt = {
   type: Je.OPERATION,
@@ -562,7 +562,7 @@ const Dt = "DataValidationPanel", Be = {
   handler(e, t) {
     return t ? (e.get(Ie).hideDropdown(), !0) : !1;
   }
-}, Te = "#ECECEC", Dn = "sheets-data-validation-ui.config", Vt = {}, Ii = "univer-dv-list-dropdown", wi = "univer-dv-list-dropdown-title", Ri = "univer-dv-list-dropdown-list", Di = "univer-dv-list-dropdown-list-container", Vi = "univer-dv-list-dropdown-selected-icon", yi = "univer-dv-list-dropdown-item-container", Mi = "univer-dv-list-dropdown-item", bi = "univer-dv-list-dropdown-split", Ei = "univer-dv-list-dropdown-edit", ve = {
+}, Te = "#ECECEC", Vn = "sheets-data-validation-ui.config", Vt = {}, Ii = "univer-dv-list-dropdown", wi = "univer-dv-list-dropdown-title", Ri = "univer-dv-list-dropdown-list", Di = "univer-dv-list-dropdown-list-container", Vi = "univer-dv-list-dropdown-selected-icon", yi = "univer-dv-list-dropdown-item-container", Mi = "univer-dv-list-dropdown-item", bi = "univer-dv-list-dropdown-split", Ei = "univer-dv-list-dropdown-edit", ve = {
   dvListDropdown: Ii,
   dvListDropdownTitle: wi,
   dvListDropdownList: Ri,
@@ -573,55 +573,54 @@ const Dt = "DataValidationPanel", Be = {
   dvListDropdownSplit: bi,
   dvListDropdownEdit: Ei
 }, Oi = (e) => {
-  var C, g;
-  const { value: t, onChange: o, multiple: n, options: a, title: i, onEdit: r, style: l, filter: s, location: c } = e, u = L(J), p = L(hn), d = s == null ? void 0 : s.toLowerCase(), { row: f, col: m, unitId: _, subUnitId: w } = c, S = a.filter((v) => d ? v.label.toLowerCase().includes(d) : !0), R = (g = (C = p.getConfig(Dn)) == null ? void 0 : C.showEditOnDropdown) != null ? g : !0, I = L(ho), V = Ae(() => I.permissionCheckWithRanges(
+  var _, S;
+  const { value: t, onChange: o, multiple: n, options: a, title: i, onEdit: r, style: l, filter: s, location: c } = e, u = L(J), p = L(pn), d = s == null ? void 0 : s.toLowerCase(), { row: g, col: f, unitId: C, subUnitId: R } = c, v = a.filter((m) => d ? m.label.toLowerCase().includes(d) : !0), w = (S = (_ = p.getConfig(Vn)) == null ? void 0 : _.showEditOnDropdown) != null ? S : !0, I = L(to), V = He(() => I.permissionCheckWithRanges(
     {
       workbookTypes: [Ct],
       rangeTypes: [It],
       worksheetTypes: [wt]
     },
-    [{ startColumn: m, startRow: f, endColumn: m, endRow: f }],
-    _,
-    w
-  ), [I, m, f, _, w]);
+    [{ startColumn: f, startRow: g, endColumn: f, endRow: g }],
+    C,
+    R
+  ), [I, f, g, C, R]);
   return /* @__PURE__ */ h.jsxs("div", { className: ve.dvListDropdown, style: l, children: [
     /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownTitle, children: i }),
-    /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownList, children: /* @__PURE__ */ h.jsx(ra, { children: /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownListContainer, children: S.map((v, y) => {
-      const P = t.indexOf(v.value) > -1, U = () => {
+    /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownList, children: /* @__PURE__ */ h.jsx(ra, { children: /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownListContainer, children: v.map((m, y) => {
+      const P = t.indexOf(m.value) > -1, F = () => {
         let E;
-        P ? E = new Set(t.filter((x) => x !== v.value)) : E = new Set(n ? [...t, v.value] : [v.value]);
+        P ? E = new Set(t.filter((x) => x !== m.value)) : E = new Set(n ? [...t, m.value] : [m.value]);
         const A = [];
         a.forEach((x) => {
           E.has(x.value) && A.push(x.value);
         }), o(A);
-      }, T = v.label.toLocaleLowerCase().indexOf(d);
-      return /* @__PURE__ */ h.jsxs("div", { className: ve.dvListDropdownItemContainer, onClick: U, children: [
-        /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownItem, style: { background: v.color || Te }, children: d && v.label.toLowerCase().includes(d) ? /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
-          /* @__PURE__ */ h.jsx("span", { children: v.label.substring(0, T) }),
-          /* @__PURE__ */ h.jsx("span", { style: { fontWeight: "bold" }, children: v.label.substring(T, T + d.length) }),
-          /* @__PURE__ */ h.jsx("span", { children: v.label.substring(T + d.length) })
-        ] }) : v.label }),
+      }, T = m.label.toLocaleLowerCase().indexOf(d);
+      return /* @__PURE__ */ h.jsxs("div", { className: ve.dvListDropdownItemContainer, onClick: F, children: [
+        /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownItem, style: { background: m.color || Te }, children: d && m.label.toLowerCase().includes(d) ? /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
+          /* @__PURE__ */ h.jsx("span", { children: m.label.substring(0, T) }),
+          /* @__PURE__ */ h.jsx("span", { style: { fontWeight: "bold" }, children: m.label.substring(T, T + d.length) }),
+          /* @__PURE__ */ h.jsx("span", { children: m.label.substring(T + d.length) })
+        ] }) : m.label }),
         /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownSelectedIcon, children: P ? /* @__PURE__ */ h.jsx(Io, {}) : null })
       ] }, y);
     }) }) }, s) }),
-    R && V ? /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
+    w && V ? /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
       /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownSplit }),
       /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownEdit, children: /* @__PURE__ */ h.jsx("a", { onClick: r, children: u.t("dataValidation.list.edit") }) })
     ] }) : null
   ] });
 };
 function Li(e) {
-  var j, F, H, X;
-  const { location: t, hideFn: o } = e, { worksheet: n, row: a, col: i, unitId: r, subUnitId: l } = t, s = L(Pt), [c, u] = W(""), p = L(Q), d = L(J), [f, m] = W(""), _ = L(uo), w = L(ge), S = Ae(() => s.ruleChange$.pipe(In(16)), []), R = L(oe);
-  Ue(S);
-  const I = Fa.useContext(), V = ((F = (j = I.current) == null ? void 0 : j.right) != null ? F : 0) - ((X = (H = I.current) == null ? void 0 : H.left) != null ? X : 0);
+  var j, N, H, X;
+  const { location: t, hideFn: o } = e, { worksheet: n, row: a, col: i, unitId: r, subUnitId: l } = t, s = L(Pt), [c, u] = W(""), p = L(Q), d = L(J), [g, f] = W(""), C = L(po), R = L(ge), v = He(() => s.ruleChange$.pipe(wn(16)), []), w = L(oe);
+  Ne(v);
+  const I = Fa.useContext(), V = ((N = (j = I.current) == null ? void 0 : j.right) != null ? N : 0) - ((X = (H = I.current) == null ? void 0 : H.left) != null ? X : 0);
   if (Ce(() => {
     const k = p.onCommandExecuted((K) => {
       var q, ee;
       if (K.id === Wa.id) {
-        const te = K.params, { unitId: re } = te, ae = w.getUnit(re, Y.UNIVER_DOC);
-        if (!ae)
-          return;
+        const te = K.params, { unitId: re } = te, ae = R.getUnit(re, Y.UNIVER_DOC);
+        if (!ae || !C.isVisible().visible) return;
         const se = Ko.transform.getPlainText((ee = (q = ae.getSnapshot().body) == null ? void 0 : q.dataStream) != null ? ee : "");
         u(se);
       }
@@ -629,22 +628,22 @@ function Li(e) {
     return () => {
       k.dispose();
     };
-  }, [p, w]), !n)
+  }, [p, C, R]), !n)
     return null;
-  const C = R.getRuleByLocation(r, l, a, i);
-  if (!C)
+  const _ = w.getRuleByLocation(r, l, a, i);
+  if (!_)
     return null;
-  const g = R.getValidator(C.type);
-  if (!g)
+  const S = w.getValidator(_.type);
+  if (!S)
     return null;
-  const v = n.getCell(a, i), y = (C == null ? void 0 : C.renderMode) === de.CUSTOM || (C == null ? void 0 : C.renderMode) === void 0;
-  if (!v || !C || !g || g.id.indexOf(z.LIST) !== 0)
+  const m = n.getCell(a, i), y = (_ == null ? void 0 : _.renderMode) === de.CUSTOM || (_ == null ? void 0 : _.renderMode) === void 0;
+  if (!m || !_ || !S || S.id.indexOf(z.LIST) !== 0)
     return;
-  const P = C.type === z.LIST_MULTIPLE, U = g.getListWithColor(C, r, l), T = f || va(n.getCellRaw(a, i)), E = no(T), A = () => {
-    p.executeCommand(Be.id, {
-      ruleId: C.uid
+  const P = _.type === z.LIST_MULTIPLE, F = S.getListWithColor(_, r, l), T = g || va(n.getCellRaw(a, i)), E = ao(T), A = () => {
+    p.executeCommand(Ue.id, {
+      ruleId: _.uid
     }), o();
-  }, x = U.map((k) => ({
+  }, x = F.map((k) => ({
     label: k.label,
     value: k.label,
     color: y || k.color ? k.color : "transparent"
@@ -657,7 +656,7 @@ function Li(e) {
       value: E,
       multiple: P,
       onChange: async (k) => {
-        const K = oo(k), q = {
+        const K = io(k), q = {
           unitId: r,
           subUnitId: l,
           range: {
@@ -673,17 +672,17 @@ function Li(e) {
             si: null
           }
         };
-        _.isVisible() && _.changeVisible({
+        C.isVisible() && C.changeVisible({
           visible: !1,
           keycode: sn.ESC,
           eventType: nn.Keyboard,
           unitId: r
-        }), m(K), P || o(), _.isVisible().visible && await p.executeCommand(co.id, {
+        }), f(K), P || o(), C.isVisible().visible && await p.executeCommand(ho.id, {
           visible: !1,
           eventType: nn.Keyboard,
           unitId: r,
           keycode: sn.ESC
-        }), p.executeCommand(gn.id, q);
+        }), p.executeCommand(vn.id, q);
       },
       options: x,
       onEdit: A,
@@ -716,8 +715,8 @@ function Ai(e) {
               value: `${(c = n.errorStyle) != null ? c : it.WARNING}`,
               onChange: (u) => a({ ...n, errorStyle: +u }),
               children: [
-                /* @__PURE__ */ h.jsx(xe, { value: `${it.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
-                /* @__PURE__ */ h.jsx(xe, { value: `${it.STOP}`, children: t.t("dataValidation.panel.rejectInput") })
+                /* @__PURE__ */ h.jsx(Ae, { value: `${it.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
+                /* @__PURE__ */ h.jsx(Ae, { value: `${it.STOP}`, children: t.t("dataValidation.panel.rejectInput") })
               ]
             }
           )
@@ -740,11 +739,11 @@ function Ai(e) {
           )
         }
       ),
-      n.showErrorMessage ? /* @__PURE__ */ h.jsx(Z, { children: /* @__PURE__ */ h.jsx(je, { value: n.error, onChange: (u) => a({ ...n, error: u }) }) }) : null
+      n.showErrorMessage ? /* @__PURE__ */ h.jsx(Z, { children: /* @__PURE__ */ h.jsx(xe, { value: n.error, onChange: (u) => a({ ...n, error: u }) }) }) : null
     ] })
   ] });
 }
-const xi = "univer-data-validation-detail", ji = "univer-data-validation-detail-form-item", Fi = "univer-data-validation-detail-buttons", Ni = "univer-data-validation-detail-button", $e = {
+const xi = "univer-data-validation-detail", ji = "univer-data-validation-detail-form-item", Fi = "univer-data-validation-detail-buttons", Ni = "univer-data-validation-detail-button", Be = {
   dataValidationDetail: xi,
   dataValidationDetailFormItem: ji,
   dataValidationDetailButtons: Fi,
@@ -762,7 +761,7 @@ function Bi(e, t, o) {
 }
 function $i() {
   var se;
-  const [e, t] = W(0), o = L(me), n = Ue(o.activeRule$, o.activeRule), { unitId: a, subUnitId: i, rule: r } = n || {}, l = r.uid, s = L(ye), c = L(ge), u = L(Lt), p = L(Q), d = L(Pt), f = L(J), [m, _] = W(r), w = s.getValidatorItem(m.type), [S, R] = W(!1), I = s.getValidatorsByScope($a.SHEET), [V, C] = W(() => m.ranges.map((O) => ({ unitId: "", sheetId: "", range: O }))), g = Ae(() => Ui(p), [p]), [v, y] = W(!1), P = He({}), [U, T] = W(!1), E = L(Jn);
+  const [e, t] = W(0), o = L(fe), n = Ne(o.activeRule$, o.activeRule), { unitId: a, subUnitId: i, rule: r } = n || {}, l = r.uid, s = L(ye), c = L(ge), u = L(Lt), p = L(Q), d = L(Pt), g = L(J), [f, C] = W(r), R = s.getValidatorItem(f.type), [v, w] = W(!1), I = s.getValidatorsByScope($a.SHEET), [V, _] = W(() => f.ranges.map((O) => ({ unitId: "", sheetId: "", range: O }))), S = He(() => Ui(p), [p]), [m, y] = W(!1), P = We({}), [F, T] = W(!1), E = L(Qn);
   if (Ce(() => () => {
     const O = E.getCurrentLastSelection();
     O && E.setSelections([O]);
@@ -770,14 +769,14 @@ function $i() {
     p.onCommandExecuted((O) => {
       (O.id === Go.id || O.id === Zo.id) && setTimeout(() => {
         const D = d.getRuleById(a, i, l);
-        t((N) => N + 1), D && (_(D), C(D.ranges.map((N) => ({ unitId: "", sheetId: "", range: N }))));
+        t((U) => U + 1), D && (C(D), _(D.ranges.map((U) => ({ unitId: "", sheetId: "", range: U }))));
       }, 20);
     });
-  }, [p, d, l, i, a]), !w)
+  }, [p, d, l, i, a]), !R)
     return null;
-  const A = w.operators, x = w.operatorNames, j = m.operator ? ka.includes(m.operator) : !1, F = () => {
-    !m.ranges.length || v || (w.validatorFormula(m, a, i).success ? o.setActiveRule(null) : R(!0));
-  }, H = go((O) => {
+  const A = R.operators, x = R.operatorNames, j = f.operator ? ka.includes(f.operator) : !1, N = () => {
+    !f.ranges.length || m || (R.validatorFormula(f, a, i).success ? o.setActiveRule(null) : w(!0));
+  }, H = ln((O) => {
     const D = O.split(",").filter(Boolean).map(Xa).map(($) => {
       const _e = $.sheetName;
       if (_e) {
@@ -791,25 +790,25 @@ function $i() {
     });
     if (qo(D, V))
       return;
-    C(D);
-    const N = D.filter(($) => (!$.unitId || $.unitId === a) && (!$.sheetId || $.sheetId === i)).map(($) => $.range);
-    if (_({
-      ...m,
-      ranges: N
-    }), N.length === 0)
+    _(D);
+    const U = D.filter(($) => (!$.unitId || $.unitId === a) && (!$.sheetId || $.sheetId === i)).map(($) => $.range);
+    if (C({
+      ...f,
+      ranges: U
+    }), U.length === 0)
       return;
     const B = {
       unitId: a,
       subUnitId: i,
       ruleId: l,
-      ranges: N
+      ranges: U
     };
-    g(ao.id, B);
+    S(ro.id, B);
   }), X = (O) => {
-    if (Mn(O, An(m)))
+    if (bn(O, xn(f)))
       return;
-    _({
-      ...m,
+    C({
+      ...f,
       ...O
     });
     const D = {
@@ -818,48 +817,48 @@ function $i() {
       ruleId: l,
       setting: O
     };
-    g(
-      En.id,
+    S(
+      On.id,
       D,
       void 0
     );
   }, k = async () => {
-    await p.executeCommand(io.id, {
+    await p.executeCommand(so.id, {
       ruleId: l,
       unitId: a,
       subUnitId: i
     }), o.setActiveRule(null);
   }, K = {
-    type: m.type,
-    operator: m.operator,
-    formula1: m.formula1,
-    formula2: m.formula2,
-    allowBlank: m.allowBlank
+    type: f.type,
+    operator: f.operator,
+    formula1: f.formula1,
+    formula2: f.formula2,
+    allowBlank: f.allowBlank
   }, q = (O) => {
     const D = s.getValidatorItem(O);
     if (!D)
       return;
-    const N = D.operators, B = d.getRuleById(a, i, l), $ = O === (B == null ? void 0 : B.type) || O.includes("list") && (B != null && B.type.includes("list")) ? {
+    const U = D.operators, B = d.getRuleById(a, i, l), $ = O === (B == null ? void 0 : B.type) || O.includes("list") && (B != null && B.type.includes("list")) ? {
       ...B,
       type: O
     } : {
-      ...m,
+      ...f,
       type: O,
-      operator: N[0],
+      operator: U[0],
       formula1: void 0,
       formula2: void 0
     };
-    _($), p.executeCommand(En.id, {
+    C($), p.executeCommand(On.id, {
       unitId: a,
       subUnitId: i,
-      ruleId: m.uid,
-      setting: An($)
+      ruleId: f.uid,
+      setting: xn($)
     });
-  }, ee = u.get(w.formulaInput), te = Ae(() => V.map((O) => _o(O.range)).join(","), []), re = Tn(m), ae = (O) => {
-    Mn(O, Tn(m)) || (_({
-      ...m,
+  }, ee = u.get(R.formulaInput), te = He(() => V.map((O) => _o(O.range)).join(","), []), re = An(f), ae = (O) => {
+    bn(O, An(f)) || (C({
+      ...f,
       ...O
-    }), g(
+    }), S(
       _a.id,
       {
         unitId: a,
@@ -869,16 +868,16 @@ function $i() {
       }
     ));
   };
-  return _n((O) => {
-    var N;
-    const D = (N = P.current) == null ? void 0 : N.handleOutClick;
+  return Sn((O) => {
+    var U;
+    const D = (U = P.current) == null ? void 0 : U.handleOutClick;
     D && D(O, () => T(!1));
-  }), /* @__PURE__ */ h.jsxs("div", { className: $e.dataValidationDetail, children: [
+  }), /* @__PURE__ */ h.jsxs("div", { className: Be.dataValidationDetail, children: [
     /* @__PURE__ */ h.jsx(
       Z,
       {
-        label: f.t("dataValidation.panel.range"),
-        error: !m.ranges.length || v ? f.t("dataValidation.panel.rangeError") : "",
+        label: g.t("dataValidation.panel.range"),
+        error: !f.ranges.length || m ? g.t("dataValidation.panel.rangeError") : "",
         children: /* @__PURE__ */ h.jsx(
           za,
           {
@@ -887,40 +886,40 @@ function $i() {
             initValue: te,
             onChange: H,
             onFocus: () => T(!0),
-            isFocus: U,
+            isFocus: F,
             actions: P.current,
             onVerify: (O) => y(!O)
           }
         )
       }
     ),
-    /* @__PURE__ */ h.jsx(Z, { label: f.t("dataValidation.panel.type"), children: /* @__PURE__ */ h.jsx(
+    /* @__PURE__ */ h.jsx(Z, { label: g.t("dataValidation.panel.type"), children: /* @__PURE__ */ h.jsx(
       tn,
       {
         options: I == null ? void 0 : I.map((O) => ({
-          label: f.t(O.title),
+          label: g.t(O.title),
           value: O.id
         })),
-        value: m.type,
+        value: f.type,
         onChange: q,
-        className: $e.dataValidationDetailFormItem
+        className: Be.dataValidationDetailFormItem
       }
     ) }),
-    A != null && A.length ? /* @__PURE__ */ h.jsx(Z, { label: f.t("dataValidation.panel.operator"), children: /* @__PURE__ */ h.jsx(
+    A != null && A.length ? /* @__PURE__ */ h.jsx(Z, { label: g.t("dataValidation.panel.operator"), children: /* @__PURE__ */ h.jsx(
       tn,
       {
         options: A.map((O, D) => ({
           value: `${O}`,
           label: x[D]
         })),
-        value: `${m.operator}`,
+        value: `${f.operator}`,
         onChange: (O) => {
           X({
             ...K,
             operator: O
           });
         },
-        className: $e.dataValidationDetailFormItem
+        className: Be.dataValidationDetailFormItem
       }
     ) }) : null,
     ee ? /* @__PURE__ */ h.jsx(
@@ -928,8 +927,8 @@ function $i() {
       {
         isTwoFormula: j,
         value: {
-          formula1: m.formula1,
-          formula2: m.formula2
+          formula1: f.formula1,
+          formula2: f.formula2
         },
         onChange: (O) => {
           X({
@@ -937,32 +936,32 @@ function $i() {
             ...O
           });
         },
-        showError: S,
-        validResult: w.validatorFormula(m, a, i),
+        showError: v,
+        validResult: R.validatorFormula(f, a, i),
         unitId: a,
         subUnitId: i,
         ruleId: l
       },
-      e + m.type
+      e + f.type
     ) : null,
     /* @__PURE__ */ h.jsx(Z, { children: /* @__PURE__ */ h.jsx(
       Ot,
       {
-        checked: (se = m.allowBlank) != null ? se : !0,
+        checked: (se = f.allowBlank) != null ? se : !0,
         onChange: () => {
           var O;
           return X({
             ...K,
-            allowBlank: !((O = m.allowBlank) == null || O)
+            allowBlank: !((O = f.allowBlank) == null || O)
           });
         },
-        children: f.t("dataValidation.panel.allowBlank")
+        children: g.t("dataValidation.panel.allowBlank")
       }
     ) }),
-    /* @__PURE__ */ h.jsx(Ai, { value: re, onChange: ae, extraComponent: w.optionsInput }),
-    /* @__PURE__ */ h.jsxs("div", { className: $e.dataValidationDetailButtons, children: [
-      /* @__PURE__ */ h.jsx(Fe, { className: $e.dataValidationDetailButton, onClick: k, children: f.t("dataValidation.panel.removeRule") }),
-      /* @__PURE__ */ h.jsx(Fe, { className: $e.dataValidationDetailButton, type: "primary", onClick: F, children: f.t("dataValidation.panel.done") })
+    /* @__PURE__ */ h.jsx(Ai, { value: re, onChange: ae, extraComponent: R.optionsInput }),
+    /* @__PURE__ */ h.jsxs("div", { className: Be.dataValidationDetailButtons, children: [
+      /* @__PURE__ */ h.jsx(je, { className: Be.dataValidationDetailButton, onClick: k, children: g.t("dataValidation.panel.removeRule") }),
+      /* @__PURE__ */ h.jsx(je, { className: Be.dataValidationDetailButton, type: "primary", onClick: N, children: g.t("dataValidation.panel.done") })
     ] })
   ] });
 }
@@ -972,17 +971,17 @@ const ki = "univer-data-validation-item-container", Wi = "univer-data-validation
   dataValidationItemContent: Hi,
   dataValidationItemIcon: Yi
 }, Xi = (e) => {
-  const { rule: t, onClick: o, unitId: n, subUnitId: a, disable: i } = e, r = L(ye), l = L(Q), s = L(Ma), c = r.getValidatorItem(t.type), u = He(), [p, d] = W(!1), f = (m) => {
-    l.executeCommand(io.id, {
+  const { rule: t, onClick: o, unitId: n, subUnitId: a, disable: i } = e, r = L(ye), l = L(Q), s = L(Ma), c = r.getValidatorItem(t.type), u = We(), [p, d] = W(!1), g = (f) => {
+    l.executeCommand(so.id, {
       ruleId: t.uid,
       unitId: n,
       subUnitId: a
-    }), m.stopPropagation();
+    }), f.stopPropagation();
   };
   return Ce(() => () => {
-    var m;
-    u.current && ((m = u.current) == null || m.forEach((_) => {
-      _ && s.removeShape(_);
+    var f;
+    u.current && ((f = u.current) == null || f.forEach((C) => {
+      C && s.removeShape(C);
     }));
   }, [s]), /* @__PURE__ */ h.jsxs(
     "div",
@@ -990,8 +989,8 @@ const ki = "univer-data-validation-item-container", Wi = "univer-data-validation
       className: ct.dataValidationItemContainer,
       onClick: o,
       onMouseEnter: () => {
-        i || (d(!0), u.current = t.ranges.map((m) => s.addShape({
-          range: m,
+        i || (d(!0), u.current = t.ranges.map((f) => s.addShape({
+          range: f,
           style: {
             // hasAutoFill: false,
             fill: "rgba(73, 184, 17, 0.05)",
@@ -1003,15 +1002,15 @@ const ki = "univer-data-validation-item-container", Wi = "univer-data-validation
         })));
       },
       onMouseLeave: () => {
-        var m;
-        d(!1), (m = u.current) == null || m.forEach((_) => {
-          _ && s.removeShape(_);
+        var f;
+        d(!1), (f = u.current) == null || f.forEach((C) => {
+          C && s.removeShape(C);
         }), u.current = void 0;
       },
       children: [
         /* @__PURE__ */ h.jsx("div", { className: ct.dataValidationItemTitle, children: c == null ? void 0 : c.generateRuleName(t) }),
-        /* @__PURE__ */ h.jsx("div", { className: ct.dataValidationItemContent, children: t.ranges.map((m) => _o(m)).join(",") }),
-        p ? /* @__PURE__ */ h.jsx("div", { className: ct.dataValidationItemIcon, onClick: f, children: /* @__PURE__ */ h.jsx(wn, {}) }) : null
+        /* @__PURE__ */ h.jsx("div", { className: ct.dataValidationItemContent, children: t.ranges.map((f) => _o(f)).join(",") }),
+        p ? /* @__PURE__ */ h.jsx("div", { className: ct.dataValidationItemIcon, onClick: g, children: /* @__PURE__ */ h.jsx(Rn, {}) }) : null
       ]
     }
   );
@@ -1021,7 +1020,7 @@ const ki = "univer-data-validation-item-container", Wi = "univer-data-validation
   dataValidationListButton: Gi
 };
 function Zi() {
-  const e = L(ge), t = Ue(
+  const e = L(ge), t = Ne(
     () => e.getCurrentTypeOfUnit$(Y.UNIVER_SHEET),
     void 0,
     void 0,
@@ -1030,38 +1029,38 @@ function Zi() {
   return t ? /* @__PURE__ */ h.jsx(qi, { workbook: t }) : null;
 }
 function qi(e) {
-  const t = L(oe), o = L(ge), n = L(Q), a = L(Ne), i = L(me), r = L(J), [l, s] = W([]), { workbook: c } = e, u = Ue(c.activeSheet$, void 0, !0), p = c.getUnitId(), d = u == null ? void 0 : u.getSheetId();
+  const t = L(oe), o = L(ge), n = L(Q), a = L(Fe), i = L(fe), r = L(J), [l, s] = W([]), { workbook: c } = e, u = Ne(c.activeSheet$, void 0, !0), p = c.getUnitId(), d = u == null ? void 0 : u.getSheetId();
   Ce(() => {
     s(t.getRules(p, d));
-    const R = t.ruleChange$.subscribe((I) => {
+    const w = t.ruleChange$.subscribe((I) => {
       I.unitId === p && I.subUnitId === d && s(t.getRules(p, d));
     });
     return () => {
-      R.unsubscribe();
+      w.unsubscribe();
     };
   }, [p, d, t]);
-  const f = async () => {
-    const R = ro(a), I = {
+  const g = async () => {
+    const w = lo(a), I = {
       unitId: p,
       subUnitId: d,
-      rule: R
+      rule: w
     };
-    await n.executeCommand(vn.id, I), i.setActiveRule({
+    await n.executeCommand(_n.id, I), i.setActiveRule({
       unitId: p,
       subUnitId: d,
-      rule: R
+      rule: w
     });
-  }, m = () => {
+  }, f = () => {
     n.executeCommand(Sa.id, {
       unitId: p,
       subUnitId: d
     });
-  }, w = ((R) => {
-    const I = o.getCurrentUnitForType(Y.UNIVER_SHEET), V = I.getActiveSheet(), C = I.getUnitId(), g = V.getSheetId();
-    return R.map((y) => ga(a, C, g, y.ranges) ? { ...y } : { ...y, disable: !0 });
-  })(l), S = w == null ? void 0 : w.some((R) => R.disable);
+  }, R = ((w) => {
+    const I = o.getCurrentUnitForType(Y.UNIVER_SHEET), V = I.getActiveSheet(), _ = I.getUnitId(), S = V.getSheetId();
+    return w.map((y) => ga(a, _, S, y.ranges) ? { ...y } : { ...y, disable: !0 });
+  })(l), v = R == null ? void 0 : R.some((w) => w.disable);
   return /* @__PURE__ */ h.jsxs("div", { className: ut.dataValidationList, children: [
-    w == null ? void 0 : w.map((R) => {
+    R == null ? void 0 : R.map((w) => {
       var I;
       return /* @__PURE__ */ h.jsx(
         Xi,
@@ -1069,39 +1068,39 @@ function qi(e) {
           unitId: p,
           subUnitId: d,
           onClick: () => {
-            R.disable || i.setActiveRule({
+            w.disable || i.setActiveRule({
               unitId: p,
               subUnitId: d,
-              rule: R
+              rule: w
             });
           },
-          rule: R,
-          disable: (I = R.disable) != null ? I : !1
+          rule: w,
+          disable: (I = w.disable) != null ? I : !1
         },
-        R.uid
+        w.uid
       );
     }),
     /* @__PURE__ */ h.jsxs("div", { className: ut.dataValidationListButtons, children: [
-      l.length && !S ? /* @__PURE__ */ h.jsx(Fe, { className: ut.dataValidationListButton, onClick: m, children: r.t("dataValidation.panel.removeAll") }) : null,
-      /* @__PURE__ */ h.jsx(Fe, { className: ut.dataValidationListButton, type: "primary", onClick: f, children: r.t("dataValidation.panel.add") })
+      l.length && !v ? /* @__PURE__ */ h.jsx(je, { className: ut.dataValidationListButton, onClick: f, children: r.t("dataValidation.panel.removeAll") }) : null,
+      /* @__PURE__ */ h.jsx(je, { className: ut.dataValidationListButton, type: "primary", onClick: g, children: r.t("dataValidation.panel.add") })
     ] })
   ] });
 }
 const Ji = () => {
-  const e = L(me), t = Ue(e.activeRule$, e.activeRule);
+  const e = L(fe), t = Ne(e.activeRule$, e.activeRule);
   return t ? /* @__PURE__ */ h.jsx($i, {}, t.rule.uid) : /* @__PURE__ */ h.jsx(Zi, {});
-}, Vn = "data-validation.list.dropdown", Oo = "data-validation.date.dropdown", At = {
+}, yn = "data-validation.list.dropdown", Oo = "data-validation.date.dropdown", At = {
   type: Je.COMMAND,
   id: "data-validation.command.addRuleAndOpen",
   handler(e) {
-    const t = e.get(ge), o = Qn(t);
+    const t = e.get(ge), o = eo(t);
     if (!o) return !1;
-    const { workbook: n, worksheet: a } = o, i = ro(e), r = e.get(Q), l = n.getUnitId(), s = a.getSheetId(), c = {
+    const { workbook: n, worksheet: a } = o, i = lo(e), r = e.get(Q), l = n.getUnitId(), s = a.getSheetId(), c = {
       rule: i,
       unitId: l,
       subUnitId: s
     };
-    return r.syncExecuteCommand(vn.id, c) ? (r.syncExecuteCommand(Be.id, {
+    return r.syncExecuteCommand(_n.id, c) ? (r.syncExecuteCommand(Ue.id, {
       ruleId: i.uid,
       isAdd: !0
     }), !0) : !1;
@@ -1111,7 +1110,7 @@ var Qi = Object.defineProperty, er = Object.getOwnPropertyDescriptor, tr = (e, t
   for (var a = n > 1 ? void 0 : n ? er(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && Qi(t, o, a), a;
-}, ke = (e, t) => (o, n) => t(o, n, e);
+}, $e = (e, t) => (o, n) => t(o, n, e);
 const Ee = "SHEET_DATA_VALIDATION_ALERT";
 let lt = class extends De {
   constructor(e, t, o, n, a, i) {
@@ -1121,7 +1120,7 @@ let lt = class extends De {
     this._initCellAlertPopup(), this._initZenService();
   }
   _initCellAlertPopup() {
-    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(In(100)).subscribe((e) => {
+    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(wn(100)).subscribe((e) => {
       var t;
       if (e) {
         const o = this._univerInstanceService.getUnit(e.location.unitId, Y.UNIVER_SHEET), n = o.getSheetBySheetId(e.location.subUnitId);
@@ -1164,12 +1163,12 @@ let lt = class extends De {
   }
 };
 lt = tr([
-  ke(0, b(ba)),
-  ke(1, b(Ea)),
-  ke(2, ge),
-  ke(3, b(J)),
-  ke(4, fo),
-  ke(5, b(oe))
+  $e(0, b(ba)),
+  $e(1, b(Ea)),
+  $e(2, ge),
+  $e(3, b(J)),
+  $e(4, go),
+  $e(5, b(oe))
 ], lt);
 var nr = Object.defineProperty, or = Object.getOwnPropertyDescriptor, ar = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? or(t, o) : t, i = e.length - 1, r; i >= 0; i--)
@@ -1183,21 +1182,21 @@ let ze = class extends De {
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
     const e = () => ({ redos: [], undos: [] }), t = (n, a) => {
-      const { source: i, target: r, unitId: l, subUnitId: s } = n, c = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = rn([i, r]), [p, d] = u.ranges, { mapFunc: f } = u, m = {
+      const { source: i, target: r, unitId: l, subUnitId: s } = n, c = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = rn([i, r]), [p, d] = u.ranges, { mapFunc: g } = u, f = {
         row: p.startRow,
         col: p.startColumn
-      }, _ = Pa(p, d), w = new _t(), S = /* @__PURE__ */ new Set();
-      _.forEach((g) => {
-        const v = g.repeatStartCell, y = g.relativeRange, P = {
+      }, C = Pa(p, d), R = new _t(), v = /* @__PURE__ */ new Set();
+      C.forEach((S) => {
+        const m = S.repeatStartCell, y = S.relativeRange, P = {
+          startRow: f.row,
+          startColumn: f.col,
+          endColumn: f.col,
+          endRow: f.row
+        }, F = {
           startRow: m.row,
           startColumn: m.col,
           endColumn: m.col,
           endRow: m.row
-        }, U = {
-          startRow: v.row,
-          startColumn: v.col,
-          endColumn: v.col,
-          endRow: v.row
         };
         Qo.foreach(y, (T, E) => {
           const A = St.getPositionRange(
@@ -1208,27 +1207,27 @@ let ze = class extends De {
               endRow: T
             },
             P
-          ), { row: x, col: j } = f(A.startRow, A.startColumn), F = this._sheetDataValidationModel.getRuleIdByLocation(l, s, x, j) || "", H = St.getPositionRange(
+          ), { row: x, col: j } = g(A.startRow, A.startColumn), N = this._sheetDataValidationModel.getRuleIdByLocation(l, s, x, j) || "", H = St.getPositionRange(
             {
               startRow: T,
               startColumn: E,
               endColumn: E,
               endRow: T
             },
-            U
-          ), { row: X, col: k } = f(H.startRow, H.startColumn);
-          w.setValue(X, k, F), S.add(F);
+            F
+          ), { row: X, col: k } = g(H.startRow, H.startColumn);
+          R.setValue(X, k, N), v.add(N);
         });
       });
-      const R = Array.from(S).map((g) => ({ id: g, ranges: Qt(w, (v) => v === g) }));
-      c.addRangeRules(R);
-      const I = c.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: V, undoMutations: C } = an(l, s, I, this._injector, "patched", a === tt.ONLY_FORMAT);
+      const w = Array.from(v).map((S) => ({ id: S, ranges: Qt(R, (m) => m === S) }));
+      c.addRangeRules(w);
+      const I = c.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: V, undoMutations: _ } = an(l, s, I, this._injector, "patched", a === tt.ONLY_FORMAT);
       return {
-        undos: C,
+        undos: _,
         redos: V
       };
     }, o = {
-      id: so,
+      id: co,
       onBeforeFillData: (n) => {
         const { source: a, unitId: i, subUnitId: r } = n;
         for (const l of a.rows)
@@ -1250,7 +1249,7 @@ let ze = class extends De {
 ze = ar([
   Bt(0, La),
   Bt(1, b(oe)),
-  Bt(2, b(Ne))
+  Bt(2, b(Fe))
 ], ze);
 var ir = Object.defineProperty, rr = Object.getOwnPropertyDescriptor, sr = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? rr(t, o) : t, i = e.length - 1, r; i >= 0; i--)
@@ -1265,10 +1264,10 @@ let Ke = class extends De {
   }
   _initCopyPaste() {
     this._sheetClipboardService.addClipboardHook({
-      id: so,
+      id: co,
       onBeforeCopy: (t, o, n) => this._collect(t, o, n),
       onPasteCells: (t, o, n, a) => {
-        const { copyType: i = Ln.COPY, pasteType: r } = a, { range: l } = t || {}, { range: s, unitId: c, subUnitId: u } = o;
+        const { copyType: i = Pn.COPY, pasteType: r } = a, { range: l } = t || {}, { range: s, unitId: c, subUnitId: u } = o;
         return this._generateMutations(s, { copyType: i, pasteType: r, copyRange: l, unitId: c, subUnitId: u });
       }
     });
@@ -1295,7 +1294,7 @@ let Ke = class extends De {
   _generateMutations(t, o) {
     if (!this._copyInfo)
       return { redos: [], undos: [] };
-    if (o.copyType === Ln.CUT)
+    if (o.copyType === Pn.CUT)
       return this._copyInfo = null, { redos: [], undos: [] };
     if (!this._copyInfo || !this._copyInfo.matrix.getSizeOf() || !o.copyRange)
       return { redos: [], undos: [] };
@@ -1304,74 +1303,72 @@ let Ke = class extends De {
       dt.SPECIAL_PASTE_VALUE,
       dt.SPECIAL_PASTE_FORMAT,
       dt.SPECIAL_PASTE_FORMULA
-    ].includes(
-      o.pasteType
-    ))
+    ].includes(o.pasteType))
       return { redos: [], undos: [] };
-    const { unitId: n, subUnitId: a } = this._copyInfo;
-    if (o.unitId !== n || a !== o.subUnitId) {
-      const i = this._sheetDataValidationModel.getRuleObjectMatrix(o.unitId, o.subUnitId).clone(), r = new _t(), l = /* @__PURE__ */ new Set(), { ranges: [s, c], mapFunc: u } = rn([o.copyRange, t]), p = Pn(s, c, !0), d = /* @__PURE__ */ new Map();
-      p.forEach(({ startRange: w }) => {
-        var S;
-        (S = this._copyInfo) == null || S.matrix.forValue((R, I, V) => {
-          const C = St.getPositionRange(
+    const { unitId: a, subUnitId: i } = this._copyInfo;
+    if (o.unitId !== a || i !== o.subUnitId) {
+      const r = this._sheetDataValidationModel.getRuleObjectMatrix(o.unitId, o.subUnitId).clone(), l = new _t(), s = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: p } = rn([o.copyRange, t]), d = Tn(c, u, !0), g = /* @__PURE__ */ new Map();
+      d.forEach(({ startRange: v }) => {
+        var w;
+        (w = this._copyInfo) == null || w.matrix.forValue((I, V, _) => {
+          const S = St.getPositionRange(
             {
-              startRow: R,
-              endRow: R,
-              startColumn: I,
-              endColumn: I
+              startRow: I,
+              endRow: I,
+              startColumn: V,
+              endColumn: V
             },
-            w
-          ), g = `${a}-${V}`, v = this._sheetDataValidationModel.getRuleById(n, a, V);
-          !this._sheetDataValidationModel.getRuleById(o.unitId, o.subUnitId, g) && v && d.set(g, { ...v, uid: g });
-          const { row: y, col: P } = u(C.startRow, C.startColumn);
-          l.add(g), r.setValue(y, P, g);
+            v
+          ), m = `${i}-${_}`, y = this._sheetDataValidationModel.getRuleById(a, i, _);
+          !this._sheetDataValidationModel.getRuleById(o.unitId, o.subUnitId, m) && y && g.set(m, { ...y, uid: m });
+          const { row: P, col: F } = p(S.startRow, S.startColumn);
+          s.add(m), l.setValue(P, F, m);
         });
       });
-      const f = Array.from(l).map((w) => ({ id: w, ranges: Qt(r, (S) => S === w) }));
-      i.addRangeRules(f);
-      const { redoMutations: m, undoMutations: _ } = an(
+      const f = Array.from(s).map((v) => ({ id: v, ranges: Qt(l, (w) => w === v) }));
+      r.addRangeRules(f);
+      const { redoMutations: C, undoMutations: R } = an(
         o.unitId,
         o.subUnitId,
-        i.diffWithAddition(this._sheetDataValidationModel.getRules(o.unitId, o.subUnitId), d.values()),
+        r.diffWithAddition(this._sheetDataValidationModel.getRules(o.unitId, o.subUnitId), g.values()),
         this._injector,
         "patched",
         !1
       );
       return {
-        redos: m,
-        undos: _
+        redos: C,
+        undos: R
       };
     } else {
-      const i = this._sheetDataValidationModel.getRuleObjectMatrix(n, a).clone(), r = new _t(), l = /* @__PURE__ */ new Set(), { ranges: [s, c], mapFunc: u } = rn([o.copyRange, t]);
-      Pn(s, c, !0).forEach(({ startRange: _ }) => {
-        var w;
-        (w = this._copyInfo) == null || w.matrix.forValue((S, R, I) => {
-          const V = St.getPositionRange(
+      const r = this._sheetDataValidationModel.getRuleObjectMatrix(a, i).clone(), l = new _t(), s = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: p } = rn([o.copyRange, t]);
+      Tn(c, u, !0).forEach(({ startRange: R }) => {
+        var v;
+        (v = this._copyInfo) == null || v.matrix.forValue((w, I, V) => {
+          const _ = St.getPositionRange(
             {
-              startRow: S,
-              endRow: S,
-              startColumn: R,
-              endColumn: R
+              startRow: w,
+              endRow: w,
+              startColumn: I,
+              endColumn: I
             },
-            _
-          ), { row: C, col: g } = u(V.startRow, V.startColumn);
-          r.setValue(C, g, I), l.add(I);
+            R
+          ), { row: S, col: m } = p(_.startRow, _.startColumn);
+          l.setValue(S, m, V), s.add(V);
         });
       });
-      const d = Array.from(l).map((_) => ({ id: _, ranges: Qt(r, (w) => w === _) }));
-      i.addRangeRules(d);
-      const { redoMutations: f, undoMutations: m } = an(
-        n,
+      const g = Array.from(s).map((R) => ({ id: R, ranges: Qt(l, (v) => v === R) }));
+      r.addRangeRules(g);
+      const { redoMutations: f, undoMutations: C } = an(
         a,
-        i.diff(this._sheetDataValidationModel.getRules(n, a)),
+        i,
+        r.diff(this._sheetDataValidationModel.getRules(a, i)),
         this._injector,
         "patched",
         !1
       );
       return {
         redos: f,
-        undos: m
+        undos: C
       };
     }
   }
@@ -1379,7 +1376,7 @@ let Ke = class extends De {
 Ke = sr([
   $t(0, Aa),
   $t(1, b(oe)),
-  $t(2, b(Ne))
+  $t(2, b(Fe))
 ], Ke);
 var lr = Object.defineProperty, dr = Object.getOwnPropertyDescriptor, cr = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? dr(t, o) : t, i = e.length - 1, r; i >= 0; i--)
@@ -1388,20 +1385,20 @@ var lr = Object.defineProperty, dr = Object.getOwnPropertyDescriptor, cr = (e, t
 }, kt = (e, t) => (o, n) => t(o, n, e);
 let Ge = class extends De {
   constructor(e, t, o) {
-    super(), this._localeService = e, this._commandService = t, this._sheetPermissionInterceptorBaseController = o, this._commandExecutedListener();
+    super(), this._localeService = e, this._commandService = t, this._sheetPermissionCheckController = o, this._commandExecutedListener();
   }
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((e) => {
-        e.id === vn.id && (this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
+        e.id === _n.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
           workbookTypes: [Ct],
           rangeTypes: [It],
           worksheetTypes: [wt, on]
-        }) || this._sheetPermissionInterceptorBaseController.haveNotPermissionHandle(this._localeService.t("permission.dialog.setStyleErr"))), e.id === ao.id && (this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
+        }) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr"))), e.id === ro.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
           workbookTypes: [Ct],
           rangeTypes: [It],
           worksheetTypes: [wt, on]
-        }, e.params.ranges) || this._sheetPermissionInterceptorBaseController.haveNotPermissionHandle(this._localeService.t("permission.dialog.setStyleErr")));
+        }, e.params.ranges) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr")));
       })
     );
   }
@@ -1409,13 +1406,13 @@ let Ge = class extends De {
 Ge = cr([
   kt(0, b(J)),
   kt(1, Q),
-  kt(2, b(ho))
+  kt(2, b(to))
 ], Ge);
 const Lo = "data-validation-single", Po = "sheet.menu.data-validation";
 function ur(e) {
   return {
     id: Po,
-    type: Sn.SUBITEMS,
+    type: Cn.SUBITEMS,
     icon: Lo,
     tooltip: "dataValidation.title",
     hidden$: Na(e, Y.UNIVER_SHEET),
@@ -1424,24 +1421,24 @@ function ur(e) {
 }
 function hr(e) {
   return {
-    id: Be.id,
+    id: Ue.id,
     title: "dataValidation.panel.title",
-    type: Sn.BUTTON
+    type: Cn.BUTTON
   };
 }
 function pr(e) {
   return {
     id: At.id,
     title: "dataValidation.panel.add",
-    type: Sn.BUTTON
+    type: Cn.BUTTON
   };
 }
-const mr = {
+const fr = {
   [Ua.FORMULAS_INSERT]: {
     [Po]: {
       order: 9,
       menuItemFactory: ur,
-      [Be.id]: {
+      [Ue.id]: {
         order: 0,
         menuItemFactory: hr
       },
@@ -1452,10 +1449,10 @@ const mr = {
     }
   }
 };
-var fr = Object.defineProperty, gr = Object.getOwnPropertyDescriptor, To = (e, t, o, n) => {
+var mr = Object.defineProperty, gr = Object.getOwnPropertyDescriptor, To = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? gr(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
-  return n && a && fr(t, o, a), a;
+  return n && a && mr(t, o, a), a;
 }, G = (e, t) => (o, n) => t(o, n, e);
 const Ao = {
   tr: {
@@ -1463,12 +1460,12 @@ const Ao = {
     color: "#fe4b4b"
   }
 };
-let Ze = class extends pn {
+let Ze = class extends fn {
   constructor(e, t, o, n, a, i, r, l, s, c, u) {
     super(), this._commandService = e, this._menuManagerService = t, this._renderManagerService = o, this._univerInstanceService = n, this._autoHeightController = a, this._dropdownManagerService = i, this._sheetDataValidationModel = r, this._dataValidatorRegistryService = l, this._sheetInterceptorService = s, this._dataValidationCacheService = c, this._editorBridgeService = u, this._initMenu(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
   }
   _initMenu() {
-    this._menuManagerService.mergeMenu(mr);
+    this._menuManagerService.mergeMenu(fr);
   }
   _initDropdown() {
     this._editorBridgeService && this.disposeWithMe(this._editorBridgeService.visible$.subscribe((e) => {
@@ -1517,31 +1514,31 @@ let Ze = class extends pn {
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        eo.CELL_CONTENT,
+        no.CELL_CONTENT,
         {
-          effect: zn.Style,
+          effect: Kn.Style,
           // must be after numfmt
-          priority: to.DATA_VALIDATION,
+          priority: oo.DATA_VALIDATION,
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: (e, t, o) => {
-            var S, R, I, V, C;
+            var v, w, I, V, _;
             const { row: n, col: a, unitId: i, subUnitId: r, workbook: l, worksheet: s } = t, c = this._sheetDataValidationModel.getRuleIdByLocation(i, r, n, a);
             if (!c)
               return o(e);
             const u = this._sheetDataValidationModel.getRuleById(i, r, c);
             if (!u)
               return o(e);
-            const p = (S = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? S : rt.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), f = t.rawData;
-            let m;
-            const _ = {
+            const p = (v = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? v : rt.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), g = t.rawData;
+            let f;
+            const C = {
               get value() {
-                var g;
-                return m !== void 0 || (m = (g = ie(f)) != null ? g : null), m;
+                var S;
+                return f !== void 0 || (f = (S = ie(g)) != null ? S : null), f;
               }
-            }, w = {
+            }, R = {
               get value() {
-                var g;
-                return `${(g = _.value) != null ? g : ""}`;
+                var S;
+                return `${(S = C.value) != null ? S : ""}`;
               }
             };
             return o({
@@ -1551,31 +1548,31 @@ let Ze = class extends pn {
                 ...p === rt.INVALID ? Ao : null
               },
               customRender: [
-                ...(R = e == null ? void 0 : e.customRender) != null ? R : [],
+                ...(w = e == null ? void 0 : e.customRender) != null ? w : [],
                 ...d != null && d.canvasRender ? [d.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                isSkip: ((I = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : I.isSkip) || ((V = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : V.call(d, u, _.value, t))
+                isSkip: ((I = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : I.isSkip) || ((V = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : V.call(d, u, C.value, t))
               },
               interceptorStyle: {
                 ...e == null ? void 0 : e.interceptorStyle,
-                ...d == null ? void 0 : d.getExtraStyle(u, w.value, {
+                ...d == null ? void 0 : d.getExtraStyle(u, R.value, {
                   get style() {
-                    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) || {};
+                    const S = l.getStyles();
+                    return (typeof (e == null ? void 0 : e.s) == "string" ? S.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
                   }
                 }, n, a)
               },
               interceptorAutoHeight: () => {
-                var P, U, T, E, A, x;
-                const g = (U = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(Rt).getWorksheetSkeleton(r)) == null ? void 0 : U.skeleton;
-                if (!g)
+                var P, F, T, E, A, x;
+                const S = (F = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(Rt).getWorksheetSkeleton(r)) == null ? void 0 : F.skeleton;
+                if (!S)
                   return;
-                const v = g.worksheet.getMergedCell(n, a), y = {
+                const m = S.worksheet.getMergedCell(n, a), y = {
                   data: e,
-                  style: g.getsStyles().getStyleByCell(e),
-                  primaryWithCoord: g.getCellWithCoordByIndex((T = v == null ? void 0 : v.startRow) != null ? T : n, (E = v == null ? void 0 : v.startColumn) != null ? E : a),
+                  style: S.getsStyles().getStyleByCell(e),
+                  primaryWithCoord: S.getCellWithCoordByIndex((T = m == null ? void 0 : m.startRow) != null ? T : n, (E = m == null ? void 0 : m.startColumn) != null ? E : a),
                   unitId: i,
                   subUnitId: r,
                   row: n,
@@ -1586,14 +1583,14 @@ let Ze = class extends pn {
                 return (x = (A = d == null ? void 0 : d.canvasRender) == null ? void 0 : A.calcCellAutoHeight) == null ? void 0 : x.call(A, y);
               },
               interceptorAutoWidth: () => {
-                var P, U, T, E, A, x;
-                const g = (U = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(Rt).getWorksheetSkeleton(r)) == null ? void 0 : U.skeleton;
-                if (!g)
+                var P, F, T, E, A, x;
+                const S = (F = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(Rt).getWorksheetSkeleton(r)) == null ? void 0 : F.skeleton;
+                if (!S)
                   return;
-                const v = g.worksheet.getMergedCell(n, a), y = {
+                const m = S.worksheet.getMergedCell(n, a), y = {
                   data: e,
-                  style: g.getsStyles().getStyleByCell(e),
-                  primaryWithCoord: g.getCellWithCoordByIndex((T = v == null ? void 0 : v.startRow) != null ? T : n, (E = v == null ? void 0 : v.startColumn) != null ? E : a),
+                  style: S.getsStyles().getStyleByCell(e),
+                  primaryWithCoord: S.getCellWithCoordByIndex((T = m == null ? void 0 : m.startRow) != null ? T : n, (E = m == null ? void 0 : m.startColumn) != null ? E : a),
                   unitId: i,
                   subUnitId: r,
                   row: n,
@@ -1603,7 +1600,7 @@ let Ze = class extends pn {
                 };
                 return (x = (A = d == null ? void 0 : d.canvasRender) == null ? void 0 : A.calcCellAutoWidth) == null ? void 0 : x.call(A, y);
               },
-              coverable: ((C = e == null ? void 0 : e.coverable) != null ? C : !0) && !(u.type === z.LIST || u.type === z.LIST_MULTIPLE)
+              coverable: ((_ = e == null ? void 0 : e.coverable) != null ? _ : !0) && !(u.type === z.LIST || u.type === z.LIST_MULTIPLE)
             });
           }
         }
@@ -1614,7 +1611,7 @@ let Ze = class extends pn {
     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
-      Cn((e) => e.source === "command"),
+      In((e) => e.source === "command"),
       vo(100)
     ).subscribe((e) => {
       if (e.length === 0)
@@ -1625,7 +1622,7 @@ let Ze = class extends pn {
         (o.rule.type === z.LIST_MULTIPLE || o.rule.type === z.LIST) && (n = o.rule) != null && n.ranges && t.push(...o.rule.ranges);
       }), t.length) {
         const o = this._autoHeightController.getUndoRedoParamsOfAutoHeight(t);
-        Kn(o.redos, this._commandService);
+        Gn(o.redos, this._commandService);
       }
     });
   }
@@ -1635,36 +1632,36 @@ Ze = To([
   G(1, Ba),
   G(2, Ve),
   G(3, ge),
-  G(4, b(po)),
+  G(4, b(fo)),
   G(5, b(Ie)),
   G(6, b(oe)),
   G(7, b(ye)),
-  G(8, b(fn)),
-  G(9, b(lo)),
-  G(10, ea(uo))
+  G(8, b(gn)),
+  G(9, b(uo)),
+  G(10, ea(po))
 ], Ze);
-let Bn = class extends pn {
+let $n = class extends fn {
   constructor(e, t, o, n, a, i, r) {
     super(), this._commandService = e, this._renderManagerService = t, this._autoHeightController = o, this._dataValidatorRegistryService = n, this._sheetInterceptorService = a, this._sheetDataValidationModel = i, this._dataValidationCacheService = r, this._initViewModelIntercept(), this._initAutoHeight();
   }
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        eo.CELL_CONTENT,
+        no.CELL_CONTENT,
         {
-          effect: zn.Style,
+          effect: Kn.Style,
           // must be after numfmt
-          priority: to.DATA_VALIDATION,
+          priority: oo.DATA_VALIDATION,
           // eslint-disable-next-line complexity
           handler: (e, t, o) => {
-            var w, S, R, I, V;
+            var R, v, w, I, V;
             const { row: n, col: a, unitId: i, subUnitId: r, workbook: l, worksheet: s } = t, c = this._sheetDataValidationModel.getRuleIdByLocation(i, r, n, a);
             if (!c)
               return o(e);
             const u = this._sheetDataValidationModel.getRuleById(i, r, c);
             if (!u)
               return o(e);
-            const p = (w = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? w : rt.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), f = s.getCellRaw(n, a), m = ie(f), _ = `${m != null ? m : ""}`;
+            const p = (R = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? R : rt.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), g = s.getCellRaw(n, a), f = ie(g), C = `${f != null ? f : ""}`;
             return o({
               ...e,
               markers: {
@@ -1672,31 +1669,31 @@ let Bn = class extends pn {
                 ...p === rt.INVALID ? Ao : null
               },
               customRender: [
-                ...(S = e == null ? void 0 : e.customRender) != null ? S : [],
+                ...(v = e == null ? void 0 : e.customRender) != null ? v : [],
                 ...d != null && d.canvasRender ? [d.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                isSkip: ((R = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : R.isSkip) || ((I = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : I.call(d, u, m, t))
+                isSkip: ((w = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : w.isSkip) || ((I = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : I.call(d, u, f, t))
               },
               interceptorStyle: {
                 ...e == null ? void 0 : e.interceptorStyle,
-                ...d == null ? void 0 : d.getExtraStyle(u, _, {
+                ...d == null ? void 0 : d.getExtraStyle(u, C, {
                   get style() {
-                    const C = l.getStyles();
-                    return (typeof (e == null ? void 0 : e.s) == "string" ? C.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
+                    const _ = l.getStyles();
+                    return (typeof (e == null ? void 0 : e.s) == "string" ? _.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
                   }
                 }, n, a)
               },
               interceptorAutoHeight: () => {
-                var y, P, U, T, E, A;
-                const C = (P = (y = this._renderManagerService.getRenderById(i)) == null ? void 0 : y.with(Rt).getWorksheetSkeleton(r)) == null ? void 0 : P.skeleton;
-                if (!C)
+                var y, P, F, T, E, A;
+                const _ = (P = (y = this._renderManagerService.getRenderById(i)) == null ? void 0 : y.with(Rt).getWorksheetSkeleton(r)) == null ? void 0 : P.skeleton;
+                if (!_)
                   return;
-                const g = C.worksheet.getMergedCell(n, a), v = {
+                const S = _.worksheet.getMergedCell(n, a), m = {
                   data: e,
-                  style: C.getsStyles().getStyleByCell(e),
-                  primaryWithCoord: C.getCellWithCoordByIndex((U = g == null ? void 0 : g.startRow) != null ? U : n, (T = g == null ? void 0 : g.startColumn) != null ? T : a),
+                  style: _.getsStyles().getStyleByCell(e),
+                  primaryWithCoord: _.getCellWithCoordByIndex((F = S == null ? void 0 : S.startRow) != null ? F : n, (T = S == null ? void 0 : S.startColumn) != null ? T : a),
                   unitId: i,
                   subUnitId: r,
                   row: n,
@@ -1704,7 +1701,7 @@ let Bn = class extends pn {
                   workbook: l,
                   worksheet: s
                 };
-                return (A = (E = d == null ? void 0 : d.canvasRender) == null ? void 0 : E.calcCellAutoHeight) == null ? void 0 : A.call(E, v);
+                return (A = (E = d == null ? void 0 : d.canvasRender) == null ? void 0 : E.calcCellAutoHeight) == null ? void 0 : A.call(E, m);
               },
               coverable: ((V = e == null ? void 0 : e.coverable) != null ? V : !0) && !(u.type === z.LIST || u.type === z.LIST_MULTIPLE)
             });
@@ -1715,7 +1712,7 @@ let Bn = class extends pn {
   }
   _initAutoHeight() {
     this._sheetDataValidationModel.ruleChange$.pipe(
-      Cn((e) => e.source === "command"),
+      In((e) => e.source === "command"),
       vo(16)
     ).subscribe((e) => {
       const t = [];
@@ -1724,25 +1721,25 @@ let Bn = class extends pn {
         (n = o.rule) != null && n.ranges && t.push(...o.rule.ranges);
       }), t.length) {
         const o = this._autoHeightController.getUndoRedoParamsOfAutoHeight(t);
-        Kn(o.redos, this._commandService);
+        Gn(o.redos, this._commandService);
       }
     });
   }
 };
-Bn = To([
+$n = To([
   G(0, Q),
   G(1, Ve),
-  G(2, b(po)),
+  G(2, b(fo)),
   G(3, b(ye)),
-  G(4, b(fn)),
+  G(4, b(gn)),
   G(5, b(oe)),
-  G(6, b(lo))
-], Bn);
+  G(6, b(uo))
+], $n);
 var vr = Object.defineProperty, _r = Object.getOwnPropertyDescriptor, Sr = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? _r(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && vr(t, o, a), a;
-}, $n = (e, t) => (o, n) => t(o, n, e);
+}, kn = (e, t) => (o, n) => t(o, n, e);
 let yt = class extends De {
   constructor(e, t, o) {
     super(), this._context = e, this._sheetDataValidationModel = t, this._sheetSkeletonManagerService = o, this._initSkeletonChange();
@@ -1764,8 +1761,8 @@ let yt = class extends De {
   }
 };
 yt = Sr([
-  $n(1, b(oe)),
-  $n(2, b(Rt))
+  kn(1, b(oe)),
+  kn(2, b(Rt))
 ], yt);
 const Cr = "univer-data-validation-formula", Ir = "univer-data-validation-formula-and", wr = "univer-data-validation-formula-list-item", Rr = "univer-data-validation-formula-list-item-icon", Dr = "univer-data-validation-formula-list-item-drag", Vr = "univer-data-validation-formula-list-add", yr = "univer-data-validation-formula-color-select", Mr = "univer-data-validation-formula-color-select-panel", br = "univer-data-validation-formula-color-item", ne = {
   dataValidationFormula: Cr,
@@ -1781,7 +1778,7 @@ const Cr = "univer-data-validation-formula", Ir = "univer-data-validation-formul
   const { isTwoFormula: t = !1, value: o, onChange: n, showError: a, validResult: i } = e, r = L(J), l = a ? i == null ? void 0 : i.formula1 : "", s = a ? i == null ? void 0 : i.formula2 : "";
   return t ? /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
     /* @__PURE__ */ h.jsx(Z, { error: l, children: /* @__PURE__ */ h.jsx(
-      je,
+      xe,
       {
         className: ne.dataValidationFormula,
         placeholder: r.t("dataValidation.panel.formulaPlaceholder"),
@@ -1796,7 +1793,7 @@ const Cr = "univer-data-validation-formula", Ir = "univer-data-validation-formul
     ) }),
     /* @__PURE__ */ h.jsx("div", { className: ne.dataValidationFormulaAnd, children: r.t("dataValidation.panel.formulaAnd") }),
     /* @__PURE__ */ h.jsx(Z, { error: s, children: /* @__PURE__ */ h.jsx(
-      je,
+      xe,
       {
         className: ne.dataValidationFormula,
         placeholder: r.t("dataValidation.panel.formulaPlaceholder"),
@@ -1810,7 +1807,7 @@ const Cr = "univer-data-validation-formula", Ir = "univer-data-validation-formul
       }
     ) })
   ] }) : /* @__PURE__ */ h.jsx(Z, { error: l, children: /* @__PURE__ */ h.jsx(
-    je,
+    xe,
     {
       className: ne.dataValidationFormula,
       placeholder: r.t("dataValidation.panel.formulaPlaceholder"),
@@ -1839,7 +1836,7 @@ function Or(e) {
       }
     ) }),
     s ? /* @__PURE__ */ h.jsx(Z, { label: i.t("dataValidation.checkbox.checked"), error: r, children: /* @__PURE__ */ h.jsx(
-      je,
+      xe,
       {
         className: ne.dataValidationFormula,
         placeholder: i.t("dataValidation.panel.valuePlaceholder"),
@@ -1853,7 +1850,7 @@ function Or(e) {
       }
     ) }) : null,
     s ? /* @__PURE__ */ h.jsx(Z, { label: i.t("dataValidation.checkbox.unchecked"), error: l, children: /* @__PURE__ */ h.jsx(
-      je,
+      xe,
       {
         className: ne.dataValidationFormula,
         placeholder: i.t("dataValidation.panel.valuePlaceholder"),
@@ -1870,23 +1867,23 @@ function Or(e) {
 }
 function Lr(e) {
   var p;
-  const { unitId: t, subUnitId: o, value: n, onChange: a, showError: i, validResult: r } = e, l = i ? r == null ? void 0 : r.formula1 : void 0, s = He({}), [c, u] = W(!1);
-  return _n((d) => {
-    var m;
-    const f = (m = s.current) == null ? void 0 : m.handleOutClick;
-    f && f(d, () => u(!1));
+  const { unitId: t, subUnitId: o, value: n, onChange: a, showError: i, validResult: r } = e, l = i ? r == null ? void 0 : r.formula1 : void 0, s = We({}), [c, u] = W(!1);
+  return Sn((d) => {
+    var f;
+    const g = (f = s.current) == null ? void 0 : f.handleOutClick;
+    g && g(d, () => u(!1));
   }), /* @__PURE__ */ h.jsx(
     So,
     {
-      initValue: (p = n == null ? void 0 : n.formula1) != null ? p : "",
+      initValue: (p = n == null ? void 0 : n.formula1) != null ? p : "=",
       unitId: t,
       subUnitId: o,
       isFocus: c,
       onChange: (d) => {
-        const f = (d != null ? d : "").trim();
-        f !== (n == null ? void 0 : n.formula1) && (a == null || a({
+        const g = (d != null ? d : "").trim();
+        g !== (n == null ? void 0 : n.formula1) && (a == null || a({
           ...n,
-          formula1: f
+          formula1: g
         }));
       },
       errorText: l,
@@ -1969,7 +1966,7 @@ const Tr = [
       ) })
     }
   );
-}, kn = (e) => {
+}, Wn = (e) => {
   const { item: t, commonProps: o, style: n } = e, { onItemChange: a, onItemDelete: i } = o;
   return /* @__PURE__ */ h.jsxs("div", { className: ne.dataValidationFormulaListItem, style: n, children: [
     t.isRef ? null : /* @__PURE__ */ h.jsx("div", { className: Pr(ne.dataValidationFormulaListItemDrag, "draggableHandle"), children: /* @__PURE__ */ h.jsx(yo, {}) }),
@@ -1983,7 +1980,7 @@ const Tr = [
       }
     ),
     /* @__PURE__ */ h.jsx(
-      je,
+      xe,
       {
         disabled: t.isRef,
         value: t.label,
@@ -1992,54 +1989,54 @@ const Tr = [
         }
       }
     ),
-    t.isRef ? null : /* @__PURE__ */ h.jsx("div", { className: ne.dataValidationFormulaListItemIcon, children: /* @__PURE__ */ h.jsx(wn, { onClick: () => i(t.id) }) })
+    t.isRef ? null : /* @__PURE__ */ h.jsx("div", { className: ne.dataValidationFormulaListItemIcon, children: /* @__PURE__ */ h.jsx(Rn, { onClick: () => i(t.id) }) })
   ] });
 };
 function xr(e) {
   const { value: t, onChange: o = () => {
-  }, unitId: n, subUnitId: a, validResult: i, showError: r, ruleId: l } = e, { formula1: s = "", formula2: c = "" } = t || {}, u = He(null), [p, d] = W(() => Pe(s) ? "1" : "0"), [f, m] = W(p === "1" ? s : "="), [_, w] = W(p === "1" ? s : "="), S = L(J), R = L(ye), I = L(Pt), V = L(Ca), [C, g] = W(() => c.split(",")), v = R.getValidatorItem(z.LIST), [y, P] = W([]), [U, T] = W(""), E = r ? i == null ? void 0 : i.formula1 : "", A = Ae(() => I.ruleChange$.pipe(In(16)), []), x = Ue(A), j = go(o);
+  }, unitId: n, subUnitId: a, validResult: i, showError: r, ruleId: l } = e, { formula1: s = "", formula2: c = "" } = t || {}, u = We(null), [p, d] = W(() => Pe(s) ? "1" : "0"), [g, f] = W(p === "1" ? s : "="), [C, R] = W(p === "1" ? s : "="), v = L(J), w = L(ye), I = L(Pt), V = L(Ca), [_, S] = W(() => c.split(",")), m = w.getValidatorItem(z.LIST), [y, P] = W([]), [F, T] = W(""), E = r ? i == null ? void 0 : i.formula1 : "", A = He(() => I.ruleChange$.pipe(wn(16)), []), x = Ne(A), j = ln(o);
   Ce(() => {
     (async () => {
       await new Promise((B) => {
         setTimeout(() => B(!0), 100);
       });
-      const D = I.getRuleById(n, a, l), N = D == null ? void 0 : D.formula1;
-      if (Pe(N) && v && D) {
-        const B = await v.getListAsync(D, n, a);
+      const D = I.getRuleById(n, a, l), U = D == null ? void 0 : D.formula1;
+      if (Pe(U) && m && D) {
+        const B = await m.getListAsync(D, n, a);
         P(B);
       }
     })();
-  }, [I, x, v, l, a, n]), Ce(() => {
-    Pe(s) && s !== _ && (m(s), w(_));
-  }, [_, s]);
-  const [F, H] = W(() => {
-    const D = p !== "1" ? no(s) : [], N = c.split(",");
+  }, [I, x, m, l, a, n]), Ce(() => {
+    Pe(s) && s !== C && (f(s), R(C));
+  }, [C, s]);
+  const [N, H] = W(() => {
+    const D = p !== "1" ? ao(s) : [], U = c.split(",");
     return D.map((B, $) => ({
       label: B,
-      color: N[$] || Te,
+      color: U[$] || Te,
       isRef: !1,
       id: en.generateRandomId(4)
     }));
-  }), X = (D, N, B) => {
-    const $ = F.find((_e) => _e.id === D);
-    $ && ($.label = N, $.color = B, H([...F]));
+  }), X = (D, U, B) => {
+    const $ = N.find((_e) => _e.id === D);
+    $ && ($.label = U, $.color = B, H([...N]));
   }, k = (D) => {
-    const N = F.findIndex((B) => B.id === D);
-    N !== -1 && (F.splice(N, 1), H([...F]));
-  }, K = c.split(","), q = Ae(() => y.map((D, N) => ({
+    const U = N.findIndex((B) => B.id === D);
+    U !== -1 && (N.splice(U, 1), H([...N]));
+  }, K = c.split(","), q = He(() => y.map((D, U) => ({
     label: D,
-    color: K[N] || Te,
-    id: `${N}`,
+    color: K[U] || Te,
+    id: `${U}`,
     isRef: !0
-  })), [K, y]), ee = (D, N, B) => {
-    const $ = [...C];
-    $[+D] = B, g($), j({
+  })), [K, y]), ee = (D, U, B) => {
+    const $ = [..._];
+    $[+D] = B, S($), j({
       formula1: s,
       formula2: $.join(",")
     });
   }, te = () => {
     H([
-      ...F,
+      ...N,
       {
         label: "",
         color: Te,
@@ -2051,59 +2048,56 @@ function xr(e) {
   Ce(() => {
     if (p === "1")
       return;
-    const D = /* @__PURE__ */ new Set(), N = [];
-    F.map((B) => ({
+    const D = /* @__PURE__ */ new Set(), U = [];
+    N.map((B) => ({
       labelList: B.label.split(","),
       item: B
     })).forEach(({ item: B, labelList: $ }) => {
       $.forEach((_e) => {
-        D.has(_e) || (D.add(_e), N.push({
+        D.has(_e) || (D.add(_e), U.push({
           label: _e,
           color: B.color
         }));
       });
     }), j({
-      formula1: oo(N.map((B) => B.label)),
-      formula2: N.map((B) => B.color === Te ? "" : B.color).join(",")
+      formula1: io(U.map((B) => B.label)),
+      formula2: U.map((B) => B.color === Te ? "" : B.color).join(",")
     });
-  }, [F, j, p, _, C]);
-  const re = Ae(
-    () => async (D) => {
-      if (!Pe(D)) {
-        j == null || j({
-          formula1: "",
-          formula2: c
-        });
-        return;
-      }
-      V.getFormulaRefCheck(D) ? (j == null || j({
-        formula1: Pe(D) ? D : "",
-        formula2: c
-      }), T("")) : (j == null || j({
+  }, [N, j, p, C, _]);
+  const re = ln(async (D) => {
+    if (!Pe(D)) {
+      j == null || j({
         formula1: "",
         formula2: c
-      }), m("="), T(S.t("dataValidation.validFail.formulaError")));
-    },
-    [c, j]
-  ), ae = He({}), [se, O] = W(!1);
-  return _n((D) => {
+      });
+      return;
+    }
+    V.getFormulaRefCheck(D) ? (j == null || j({
+      formula1: Pe(D) ? D : "",
+      formula2: c
+    }), T("")) : (j == null || j({
+      formula1: "",
+      formula2: c
+    }), f("="), T(v.t("dataValidation.validFail.formulaError")));
+  }), ae = We({}), [se, O] = W(!1);
+  return Sn((D) => {
     var B;
-    const N = (B = ae.current) == null ? void 0 : B.handleOutClick;
-    N && N(D, () => O(!1));
+    const U = (B = ae.current) == null ? void 0 : B.handleOutClick;
+    U && U(D, () => O(!1));
   }), /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
-    /* @__PURE__ */ h.jsx(Z, { label: S.t("dataValidation.list.options"), children: /* @__PURE__ */ h.jsxs(
+    /* @__PURE__ */ h.jsx(Z, { label: v.t("dataValidation.list.options"), children: /* @__PURE__ */ h.jsxs(
       mn,
       {
         value: p,
         onChange: (D) => {
-          d(D), m(_), D === "1" && j({
-            formula1: _ === "=" ? "" : _,
-            formula2: C.join(",")
+          d(D), f(C), D === "1" && j({
+            formula1: C === "=" ? "" : C,
+            formula2: _.join(",")
           });
         },
         children: [
-          /* @__PURE__ */ h.jsx(xe, { value: "0", children: S.t("dataValidation.list.customOptions") }),
-          /* @__PURE__ */ h.jsx(xe, { value: "1", children: S.t("dataValidation.list.refOptions") })
+          /* @__PURE__ */ h.jsx(Ae, { value: "0", children: v.t("dataValidation.list.customOptions") }),
+          /* @__PURE__ */ h.jsx(Ae, { value: "1", children: v.t("dataValidation.list.refOptions") })
         ]
       }
     ) }),
@@ -2111,32 +2105,32 @@ function xr(e) {
       /* @__PURE__ */ h.jsx(
         So,
         {
-          initValue: f,
+          initValue: g,
           unitId: n,
           subUnitId: a,
           isFocus: se,
           onChange: (D = "") => {
-            const N = (D != null ? D : "").trim();
-            w(N), re(N);
+            const U = (D != null ? D : "").trim();
+            R(U), re(U);
           },
-          errorText: E || U || void 0,
+          errorText: E || F || void 0,
           onFocus: () => O(!0),
           actions: ae.current,
           isSupportAcrossSheet: !0
         }
       ),
-      /* @__PURE__ */ h.jsx("div", { ref: u, style: { marginTop: "12px" }, children: q.map((D) => /* @__PURE__ */ h.jsx(kn, { item: D, commonProps: { onItemChange: ee }, style: { marginBottom: 12 } }, D.id)) })
+      /* @__PURE__ */ h.jsx("div", { ref: u, style: { marginTop: "12px" }, children: q.map((D) => /* @__PURE__ */ h.jsx(Wn, { item: D, commonProps: { onItemChange: ee }, style: { marginBottom: 12 } }, D.id)) })
     ] }) : /* @__PURE__ */ h.jsx(Z, { error: E, children: /* @__PURE__ */ h.jsxs("div", { ref: u, style: { marginTop: "-12px" }, children: [
       /* @__PURE__ */ h.jsx(
         sa,
         {
-          list: F,
+          list: N,
           onListChange: H,
           rowHeight: 32,
           margin: [0, 12],
           draggableHandle: ".draggableHandle",
           itemRender: (D) => /* @__PURE__ */ h.jsx(
-            kn,
+            Wn,
             {
               item: D,
               commonProps: {
@@ -2151,12 +2145,12 @@ function xr(e) {
       ),
       /* @__PURE__ */ h.jsxs("a", { className: ne.dataValidationFormulaListAdd, onClick: te, children: [
         /* @__PURE__ */ h.jsx(Ro, {}),
-        S.t("dataValidation.list.add")
+        v.t("dataValidation.list.add")
       ] })
     ] }) })
   ] });
 }
-const jo = "data-validation.custom-formula-input", xt = "data-validation.formula-input", yn = "data-validation.list-formula-input", Fo = "data-validation.checkbox-formula-input", jr = [
+const jo = "data-validation.custom-formula-input", xt = "data-validation.formula-input", Mn = "data-validation.list-formula-input", Fo = "data-validation.checkbox-formula-input", jr = [
   [
     jo,
     Lr
@@ -2166,7 +2160,7 @@ const jo = "data-validation.custom-formula-input", xt = "data-validation.formula
     Er
   ],
   [
-    yn,
+    Mn,
     xr
   ],
   [
@@ -2178,9 +2172,9 @@ function Mt(e) {
   var a;
   const { value: t, onChange: o } = e, n = L(J);
   return /* @__PURE__ */ h.jsx(Z, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ h.jsxs(mn, { value: `${(a = t.renderMode) != null ? a : de.CUSTOM}`, onChange: (i) => o({ ...t, renderMode: +i }), children: [
-    /* @__PURE__ */ h.jsx(xe, { value: `${de.CUSTOM}`, children: n.t("dataValidation.renderMode.chip") }),
-    /* @__PURE__ */ h.jsx(xe, { value: `${de.ARROW}`, children: n.t("dataValidation.renderMode.arrow") }),
-    /* @__PURE__ */ h.jsx(xe, { value: `${de.TEXT}`, children: n.t("dataValidation.renderMode.text") })
+    /* @__PURE__ */ h.jsx(Ae, { value: `${de.CUSTOM}`, children: n.t("dataValidation.renderMode.chip") }),
+    /* @__PURE__ */ h.jsx(Ae, { value: `${de.ARROW}`, children: n.t("dataValidation.renderMode.arrow") }),
+    /* @__PURE__ */ h.jsx(Ae, { value: `${de.TEXT}`, children: n.t("dataValidation.renderMode.text") })
   ] }) });
 }
 Mt.componentKey = Fr;
@@ -2212,7 +2206,7 @@ var Ur = Object.defineProperty, Br = Object.getOwnPropertyDescriptor, $r = (e, t
   return n && a && Ur(t, o, a), a;
 }, at = (e, t) => (o, n) => t(o, n, e);
 const ht = 6;
-let ln = class {
+let dn = class {
   constructor(e, t, o, n, a) {
     this._commandService = e, this._formulaService = t, this._themeService = o, this._renderManagerService = n, this._dataValidationModel = a;
   }
@@ -2260,10 +2254,10 @@ let ln = class {
     return ((o = t == null ? void 0 : t.fs) != null ? o : 10) * 1.6;
   }
   async _parseFormula(e, t, o) {
-    var c, u, p, d, f, m, _, w, S;
-    const { formula1: n = Ra, formula2: a = Da } = e, i = await this._formulaService.getRuleFormulaResult(t, o, e.uid), r = Ft((p = (u = (c = i == null ? void 0 : i[0]) == null ? void 0 : c.result) == null ? void 0 : u[0]) == null ? void 0 : p[0]), l = Ft((m = (f = (d = i == null ? void 0 : i[1]) == null ? void 0 : d.result) == null ? void 0 : f[0]) == null ? void 0 : m[0]), s = On(String(r)) && On(String(l));
+    var c, u, p, d, g, f, C, R, v;
+    const { formula1: n = Ra, formula2: a = Da } = e, i = await this._formulaService.getRuleFormulaResult(t, o, e.uid), r = Ft((p = (u = (c = i == null ? void 0 : i[0]) == null ? void 0 : c.result) == null ? void 0 : u[0]) == null ? void 0 : p[0]), l = Ft((f = (g = (d = i == null ? void 0 : i[1]) == null ? void 0 : d.result) == null ? void 0 : g[0]) == null ? void 0 : f[0]), s = Ln(String(r)) && Ln(String(l));
     return {
-      formula1: Pe(n) ? Ft((S = (w = (_ = i == null ? void 0 : i[0]) == null ? void 0 : _.result) == null ? void 0 : w[0]) == null ? void 0 : S[0]) : n,
+      formula1: Pe(n) ? Ft((v = (R = (C = i == null ? void 0 : i[0]) == null ? void 0 : C.result) == null ? void 0 : R[0]) == null ? void 0 : v[0]) : n,
       formula2: Pe(a) ? l : a,
       isFormulaValid: s
     };
@@ -2276,10 +2270,10 @@ let ln = class {
     const d = this._dataValidationModel.getValidator(p.type);
     if (!d)
       return;
-    const f = this._themeService.getCurrentTheme();
+    const g = this._themeService.getCurrentTheme();
     if (!((E = d.skipDefaultFontRender) != null && E.call(d, p, u, { unitId: a, subUnitId: i, row: l, column: s })))
       return;
-    const m = d.parseFormulaSync(p, a, i), { formula1: _ } = m, w = this._calc(c, o), { a: S, d: R } = e.getTransform(), I = bn(w.left, S), V = bn(w.top, R), C = la.create().composeMatrix({
+    const f = d.parseFormulaSync(p, a, i), { formula1: C } = f, R = this._calc(c, o), { a: v, d: w } = e.getTransform(), I = En(R.left, v), V = En(R.top, w), _ = la.create().composeMatrix({
       left: I,
       top: V,
       scaleX: 1,
@@ -2289,13 +2283,13 @@ let ln = class {
       skewY: 0,
       flipX: !1,
       flipY: !1
-    }), g = c.endX - c.startX, v = c.endY - c.startY;
-    e.save(), e.beginPath(), e.rect(c.startX, c.startY, g, v), e.clip();
-    const y = C.getMatrix();
+    }), S = c.endX - c.startX, m = c.endY - c.startY;
+    e.save(), e.beginPath(), e.rect(c.startX, c.startY, S, m), e.clip();
+    const y = _.getMatrix();
     e.transform(y[0], y[1], y[2], y[3], y[4], y[5]);
-    const P = ((A = o == null ? void 0 : o.fs) != null ? A : 10) * 1.6, U = String(u) === String(_), T = f.hyacinth500;
+    const P = ((A = o == null ? void 0 : o.fs) != null ? A : 10) * 1.6, F = String(u) === String(C), T = g.hyacinth500;
     da.drawWith(e, {
-      checked: U,
+      checked: F,
       width: P,
       height: P,
       fill: (j = (x = o == null ? void 0 : o.cl) == null ? void 0 : x.rgb) != null ? j : T
@@ -2306,16 +2300,16 @@ let ln = class {
     return s <= l && s >= r && c <= i && c >= a;
   }
   async onPointerDown(e, t) {
-    var m;
+    var f;
     if (t.button === 2)
       return;
     const { primaryWithCoord: o, unitId: n, subUnitId: a, worksheet: i, row: r, col: l } = e, s = ie(i.getCellRaw(r, l)), c = this._dataValidationModel.getRuleByLocation(n, a, r, l);
     if (!c)
       return;
     const u = this._dataValidationModel.getValidator(c.type);
-    if (!u || !((m = u.skipDefaultFontRender) != null && m.call(u, c, s, { unitId: n, subUnitId: a, row: r, column: l })))
+    if (!u || !((f = u.skipDefaultFontRender) != null && f.call(u, c, s, { unitId: n, subUnitId: a, row: r, column: l })))
       return;
-    const { formula1: p, formula2: d } = await this._parseFormula(c, n, a), f = {
+    const { formula1: p, formula2: d } = await this._parseFormula(c, n, a), g = {
       range: {
         startColumn: o.actualColumn,
         endColumn: o.actualColumn,
@@ -2328,8 +2322,8 @@ let ln = class {
       }
     };
     this._commandService.executeCommand(
-      gn.id,
-      f
+      vn.id,
+      g
     );
   }
   onPointerEnter(e, t) {
@@ -2341,39 +2335,39 @@ let ln = class {
     (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(Y.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(Xe.DEFAULT);
   }
 };
-ln = $r([
+dn = $r([
   at(0, Q),
   at(1, b(Ia)),
   at(2, b(na)),
   at(3, b(Ve)),
   at(4, b(oe))
-], ln);
+], dn);
 var kr = Object.defineProperty, Wr = Object.getOwnPropertyDescriptor, Hr = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? Wr(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && kr(t, o, a), a;
 }, Yr = (e, t) => (o, n) => t(o, n, e);
-let fe = class {
+let me = class {
   constructor(e) {
     M(this, "canvasRender", null);
     M(this, "dropdown");
     M(this, "optionsInput");
-    M(this, "formulaInput", yn);
+    M(this, "formulaInput", Mn);
     this.injector = e;
   }
 };
-fe = Hr([
-  Yr(0, b(Ne))
-], fe);
-class Xr extends fe {
+me = Hr([
+  Yr(0, b(Fe))
+], me);
+class Xr extends me {
   constructor() {
     super(...arguments);
     M(this, "id", z.CHECKBOX);
-    M(this, "canvasRender", this.injector.createInstance(ln));
+    M(this, "canvasRender", this.injector.createInstance(dn));
     M(this, "formulaInput", Fo);
   }
 }
-class zr extends fe {
+class zr extends me {
   constructor() {
     super(...arguments);
     M(this, "id", z.CUSTOM);
@@ -2381,7 +2375,7 @@ class zr extends fe {
   }
 }
 const Kr = "data-validation.formula-input";
-class Gr extends fe {
+class Gr extends me {
   constructor() {
     super(...arguments);
     M(this, "id", z.DATE);
@@ -2390,14 +2384,14 @@ class Gr extends fe {
     M(this, "dropdown", Oo);
   }
 }
-class Zr extends fe {
+class Zr extends me {
   constructor() {
     super(...arguments);
     M(this, "id", z.DECIMAL);
     M(this, "formulaInput", xt);
   }
 }
-const No = 4, qr = 0, Wt = 4, Uo = 4, dn = 6, Et = 6, Le = 14;
+const No = 4, qr = 0, Wt = 4, Uo = 4, cn = 6, Et = 6, Le = 14;
 function Jr(e, t) {
   const o = ca.getTextSize(e, t), n = o.width + No * 2, { ba: a, bd: i } = o, r = a + i;
   return {
@@ -2407,17 +2401,17 @@ function Jr(e, t) {
   };
 }
 function Ht(e, t, o, n) {
-  const a = Le + dn * 2, i = o - a, r = n - Et * 2, l = e.map((d) => ({
+  const a = Le + cn * 2, i = o - a, r = n - Et * 2, l = e.map((d) => ({
     layout: Jr(d, t),
     text: d
   }));
   let s;
   const c = [];
   l.forEach((d) => {
-    const { layout: f } = d, { width: m, height: _ } = f;
-    !s || s.width + m + Wt > i ? (s = {
-      width: m,
-      height: _,
+    const { layout: g } = d, { width: f, height: C } = g;
+    !s || s.width + f + Wt > i ? (s = {
+      width: f,
+      height: C,
       items: [{
         ...d,
         left: 0
@@ -2425,11 +2419,11 @@ function Ht(e, t, o, n) {
     }, c.push(s)) : (s.items.push({
       ...d,
       left: s.width + Wt
-    }), s.width = s.width + m + Wt);
+    }), s.width = s.width + f + Wt);
   });
   let u = 0, p = 0;
-  return c.forEach((d, f) => {
-    p = Math.max(p, d.width), f === c.length - 1 ? u += d.height : u += d.height + Uo;
+  return c.forEach((d, g) => {
+    p = Math.max(p, d.width), g === c.length - 1 ? u += d.height : u += d.height + Uo;
   }), {
     lines: c,
     totalHeight: u,
@@ -2443,7 +2437,7 @@ const Qr = 8;
 class es extends ua {
   static drawWith(t, o) {
     const { fontString: n, info: a, fill: i, color: r } = o, { layout: l, text: s } = a;
-    t.save(), qn.drawWith(t, {
+    t.save(), Jn.drawWith(t, {
       width: l.width,
       height: l.height,
       radius: Qr,
@@ -2457,7 +2451,7 @@ var ts = Object.defineProperty, ns = Object.getOwnPropertyDescriptor, os = (e, t
   return n && a && ts(t, o, a), a;
 }, Yt = (e, t) => (o, n) => t(o, n, e);
 const as = 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 {
+let un = class {
   constructor(e, t, o) {
     M(this, "zIndex");
     M(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
@@ -2486,38 +2480,38 @@ let cn = class {
   // eslint-disable-next-line max-lines-per-function
   drawWith(e, t, o, n) {
     var X, k;
-    const { primaryWithCoord: a, row: i, col: r, style: l, data: s, subUnitId: c } = t, u = a.isMergedMainCell ? a.mergeInfo : a, p = s == null ? void 0 : s.fontRenderExtension, { leftOffset: d = 0, rightOffset: f = 0, topOffset: m = 0, downOffset: _ = 0 } = p || {}, w = this._ensureMap(c), S = this._generateKey(i, r), R = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, i, r);
-    if (!R)
+    const { primaryWithCoord: a, row: i, col: r, style: l, data: s, subUnitId: c } = t, u = a.isMergedMainCell ? a.mergeInfo : a, p = s == null ? void 0 : s.fontRenderExtension, { leftOffset: d = 0, rightOffset: g = 0, topOffset: f = 0, downOffset: C = 0 } = p || {}, R = this._ensureMap(c), v = this._generateKey(i, r), w = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, i, r);
+    if (!w)
       return;
-    const I = this._dataValidationModel.getValidator(R.type);
+    const I = this._dataValidationModel.getValidator(w.type);
     if (!I)
       return;
     const V = {
       startX: u.startX + d,
-      endX: u.endX - f,
-      startY: u.startY + m,
-      endY: u.endY - _
-    }, C = V.endX - V.startX, g = V.endY - V.startY, { cl: v } = l || {}, y = (X = typeof v == "object" ? v == null ? void 0 : v.rgb : v) != null ? X : "#000", P = jt(l != null ? l : void 0), { vt: U, ht: T } = l || {}, E = U != null ? U : ue.MIDDLE, A = (k = ie(s)) != null ? k : "", x = I.parseCellValue(A), j = I.getListWithColorMap(R), F = Ht(x, P, C, g);
-    this._drawDownIcon(e, V, C, g, E), e.save(), e.translateWithPrecision(V.startX, V.startY), e.beginPath(), e.rect(0, 0, C - Le, g), e.clip(), e.translateWithPrecision(dn, Et);
+      endX: u.endX - g,
+      startY: u.startY + f,
+      endY: u.endY - C
+    }, _ = V.endX - V.startX, S = V.endY - V.startY, { cl: m } = l || {}, y = (X = typeof m == "object" ? m == null ? void 0 : m.rgb : m) != null ? X : "#000", P = jt(l != null ? l : void 0), { vt: F, ht: T } = l || {}, E = F != null ? F : ue.MIDDLE, A = (k = ie(s)) != null ? k : "", x = I.parseCellValue(A), j = I.getListWithColorMap(w), N = Ht(x, P, _, S);
+    this._drawDownIcon(e, V, _, S, E), e.save(), e.translateWithPrecision(V.startX, V.startY), e.beginPath(), e.rect(0, 0, _ - Le, S), e.clip(), e.translateWithPrecision(cn, Et);
     let H = 0;
     switch (E) {
       case ue.MIDDLE:
-        H = (F.contentHeight - F.totalHeight) / 2;
+        H = (N.contentHeight - N.totalHeight) / 2;
         break;
       case ue.BOTTOM:
-        H = F.contentHeight - F.totalHeight;
+        H = N.contentHeight - N.totalHeight;
         break;
     }
-    e.translateWithPrecision(0, H), F.lines.forEach((K, q) => {
+    e.translateWithPrecision(0, H), N.lines.forEach((K, q) => {
       e.save();
       const { width: ee, height: te, items: re } = K;
       let ae = 0;
       switch (T) {
         case Ye.RIGHT:
-          ae = F.contentWidth - ee;
+          ae = N.contentWidth - ee;
           break;
         case Ye.CENTER:
-          ae = (F.contentWidth - ee) / 2;
+          ae = (N.contentWidth - ee) / 2;
           break;
       }
       e.translate(ae, q * (te + Uo)), re.forEach((se) => {
@@ -2528,44 +2522,44 @@ let cn = class {
           fill: j[se.text]
         }), e.restore();
       }), e.restore();
-    }), e.restore(), w.set(S, {
+    }), e.restore(), R.set(v, {
       left: V.startX,
       top: V.startY,
-      width: F.contentWidth + dn + Le,
-      height: F.contentHeight + Et * 2
+      width: N.contentWidth + cn + Le,
+      height: N.contentHeight + Et * 2
     });
   }
   calcCellAutoHeight(e) {
-    var C;
+    var _;
     const { primaryWithCoord: t, style: o, data: n, row: a, col: i } = e, r = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: c = 0, downOffset: u = 0 } = r || {}, p = t.isMergedMainCell ? t.mergeInfo : t, d = {
       startX: p.startX + l,
       endX: p.endX - s,
       startY: p.startY + c,
       endY: p.endY - u
-    }, f = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, a, i);
-    if (!f)
+    }, g = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, a, i);
+    if (!g)
       return;
-    const m = this._dataValidationModel.getValidator(f.type);
-    if (!m)
+    const f = this._dataValidationModel.getValidator(g.type);
+    if (!f)
       return;
-    const _ = d.endX - d.startX, w = d.endY - d.startY, S = (C = ie(n)) != null ? C : "", R = m.parseCellValue(S), I = jt(o != null ? o : void 0);
-    return Ht(R, I, _, w).cellAutoHeight;
+    const C = d.endX - d.startX, R = d.endY - d.startY, v = (_ = ie(n)) != null ? _ : "", w = f.parseCellValue(v), I = jt(o != null ? o : void 0);
+    return Ht(w, I, C, R).cellAutoHeight;
   }
   calcCellAutoWidth(e) {
-    var C;
+    var _;
     const { primaryWithCoord: t, style: o, data: n, row: a, col: i } = e, r = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: c = 0, downOffset: u = 0 } = r || {}, p = t.isMergedMainCell ? t.mergeInfo : t, d = {
       startX: p.startX + l,
       endX: p.endX - s,
       startY: p.startY + c,
       endY: p.endY - u
-    }, f = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, a, i);
-    if (!f)
+    }, g = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, a, i);
+    if (!g)
       return;
-    const m = this._dataValidationModel.getValidator(f.type);
-    if (!m)
+    const f = this._dataValidationModel.getValidator(g.type);
+    if (!f)
       return;
-    const _ = d.endX - d.startX, w = d.endY - d.startY, S = (C = ie(n)) != null ? C : "", R = m.parseCellValue(S), I = jt(o != null ? o : void 0);
-    return Ht(R, I, _, w).calcAutoWidth;
+    const C = d.endX - d.startX, R = d.endY - d.startY, v = (_ = ie(n)) != null ? _ : "", w = f.parseCellValue(v), I = jt(o != null ? o : void 0);
+    return Ht(w, I, C, R).calcAutoWidth;
   }
   isHit(e, t) {
     const { primaryWithCoord: o } = t, n = o.isMergedMainCell ? o.mergeInfo : o, { endX: a } = n, { x: i } = e;
@@ -2591,17 +2585,17 @@ let cn = class {
     (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(Y.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(Xe.DEFAULT);
   }
 };
-cn = os([
+un = os([
   Yt(0, Q),
   Yt(1, b(Ve)),
   Yt(2, b(oe))
-], cn);
-class is extends fe {
+], un);
+class is extends me {
   constructor() {
     super(...arguments);
     M(this, "id", z.LIST_MULTIPLE);
-    M(this, "canvasRender", this.injector.createInstance(cn));
-    M(this, "dropdown", Vn);
+    M(this, "canvasRender", this.injector.createInstance(un));
+    M(this, "dropdown", yn);
   }
 }
 var rs = Object.defineProperty, ss = Object.getOwnPropertyDescriptor, ls = (e, t, o, n) => {
@@ -2609,7 +2603,7 @@ var rs = Object.defineProperty, ss = Object.getOwnPropertyDescriptor, ls = (e, t
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && rs(t, o, a), a;
 }, pt = (e, t) => (o, n) => t(o, n, e);
-const Oe = 4, mt = 4, he = 14, pe = 6, We = 4, Xt = 8, ds = "#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");
+const Oe = 4, ft = 4, he = 14, pe = 6, ke = 4, Xt = 8, ds = "#565656", Hn = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
 function cs(e, t) {
   const o = e.length;
   return {
@@ -2658,14 +2652,14 @@ function Bo(e, t, o) {
     docViewModel: i
   };
 }
-function ft(e, t, o) {
+function mt(e, t, o) {
   const {
     documentSkeleton: n,
     docModel: a,
     docViewModel: i
   } = Bo(e, t, o);
   return {
-    documents: new ma(`DOCUMENTS_${en.generateRandomId()}`, n, {
+    documents: new fa(`DOCUMENTS_${en.generateRandomId()}`, n, {
       pageMarginLeft: 0,
       pageMarginTop: 0
     }),
@@ -2674,9 +2668,9 @@ function ft(e, t, o) {
     docViewModel: i
   };
 }
-function Hn(e, t, o, n, a, i, r = !0) {
+function Yn(e, t, o, n, a, i, r = !0) {
   let l = 0;
-  const s = r ? We : 0;
+  const s = r ? ke : 0;
   switch (a) {
     case ue.BOTTOM:
       l = t - n - s;
@@ -2688,7 +2682,7 @@ function Hn(e, t, o, n, a, i, r = !0) {
       l = s;
       break;
   }
-  l = Math.max(We, l);
+  l = Math.max(ke, l);
   let c = 0;
   switch (i) {
     case Ye.CENTER:
@@ -2703,7 +2697,7 @@ function Hn(e, t, o, n, a, i, r = !0) {
     paddingTop: l
   };
 }
-let un = class {
+let hn = class {
   constructor(e, t, o, n) {
     M(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     M(this, "zIndex");
@@ -2721,16 +2715,16 @@ let un = class {
     let u;
     switch (i) {
       case ue.MIDDLE:
-        u = (n - mt) / 2;
+        u = (n - ft) / 2;
         break;
       case ue.BOTTOM:
-        u = n - s - a - We + (a / 2 - mt / 2);
+        u = n - s - a - ke + (a / 2 - ft / 2);
         break;
       default:
-        u = l + We + (a / 2 - mt / 2);
+        u = l + ke + (a / 2 - ft / 2);
         break;
     }
-    e.save(), e.translateWithPrecision(t.startX + c, t.startY + u), e.fillStyle = "#565656", e.fill(Wn), e.restore();
+    e.save(), e.translateWithPrecision(t.startX + c, t.startY + u), e.fillStyle = "#565656", e.fill(Hn), e.restore();
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   drawWith(e, t, o) {
@@ -2740,41 +2734,41 @@ let un = class {
     const p = this._dataValidationModel.getValidator(u.type);
     if (!p)
       return;
-    const d = l == null ? void 0 : l.fontRenderExtension, { leftOffset: f = 0, rightOffset: m = 0, topOffset: _ = 0, downOffset: w = 0 } = d || {};
+    const d = l == null ? void 0 : l.fontRenderExtension, { leftOffset: g = 0, rightOffset: f = 0, topOffset: C = 0, downOffset: R = 0 } = d || {};
     if (!u || !p || !p || p.id.indexOf(z.LIST) !== 0 || !p.skipDefaultFontRender(u))
       return;
-    const S = {
-      startX: c.startX + f,
-      endX: c.endX - m,
-      startY: c.startY + _,
-      endY: c.endY - w
-    }, R = S.endX - S.startX, I = S.endY - S.startY, V = this._ensureMap(s), C = this._generateKey(a, i), g = p.getListWithColor(u), v = ie(l), y = `${v != null ? v : ""}`, P = g.find((x) => x.label === y);
-    let { tb: U, vt: T, ht: E, pd: A } = r || {};
-    if (U = U != null ? U : Se.WRAP, T = T != null ? T : ue.BOTTOM, E = E != null ? E : le.ht, A = A != null ? A : le.pd, u.renderMode === de.ARROW) {
-      const { l: x = le.pd.l, t: j = le.pd.t, r: F = le.pd.r, b: H = le.pd.b } = A, X = R - x - F - he - 4, { documentSkeleton: k, documents: K, docModel: q } = ft(y, this._localeService, r);
-      U === Se.WRAP && q.updateDocumentDataPageSize(Math.max(X, 1)), k.calculate(), k.getActualSize();
-      const ee = et(k), { height: te, width: re } = ee, { paddingTop: ae, paddingLeft: se } = Hn(X, I - j - H, re, te, T, E, !0);
-      this._drawDownIcon(e, S, R, I, te, T, A), e.save(), e.translateWithPrecision(S.startX + x, S.startY + j), e.beginPath(), e.rect(0, 0, R - x - F, I - j - H), e.clip(), e.translateWithPrecision(0, ae), e.save(), e.translateWithPrecision(Oe, 0), e.beginPath(), e.rect(0, 0, X, te), e.clip(), K.render(e), e.translateWithPrecision(se, 0), e.restore(), e.restore(), V.set(C, {
-        left: S.endX + x + o.rowHeaderWidth - he,
-        top: S.startY + j + o.columnHeaderHeight,
+    const v = {
+      startX: c.startX + g,
+      endX: c.endX - f,
+      startY: c.startY + C,
+      endY: c.endY - R
+    }, w = v.endX - v.startX, I = v.endY - v.startY, V = this._ensureMap(s), _ = this._generateKey(a, i), S = p.getListWithColor(u), m = ie(l), y = `${m != null ? m : ""}`, P = S.find((x) => x.label === y);
+    let { tb: F, vt: T, ht: E, pd: A } = r || {};
+    if (F = F != null ? F : Se.WRAP, T = T != null ? T : ue.BOTTOM, E = E != null ? E : le.ht, A = A != null ? A : le.pd, u.renderMode === de.ARROW) {
+      const { l: x = le.pd.l, t: j = le.pd.t, r: N = le.pd.r, b: H = le.pd.b } = A, X = w - x - N - he - 4, { documentSkeleton: k, documents: K, docModel: q } = mt(y, this._localeService, r);
+      F === Se.WRAP && q.updateDocumentDataPageSize(Math.max(X, 1)), k.calculate(), k.getActualSize();
+      const ee = et(k), { height: te, width: re } = ee, { paddingTop: ae, paddingLeft: se } = Yn(X, I - j - H, re, te, T, E, !0);
+      this._drawDownIcon(e, v, w, I, te, T, A), e.save(), e.translateWithPrecision(v.startX + x, v.startY + j), e.beginPath(), e.rect(0, 0, w - x - N, I - j - H), e.clip(), e.translateWithPrecision(0, ae), e.save(), e.translateWithPrecision(Oe, 0), e.beginPath(), e.rect(0, 0, X, te), e.clip(), K.render(e), e.translateWithPrecision(se, 0), e.restore(), e.restore(), V.set(_, {
+        left: v.endX + x + o.rowHeaderWidth - he,
+        top: v.startY + j + o.columnHeaderHeight,
         width: he,
         height: I - j - H
       });
     } else {
-      e.save(), e.translateWithPrecision(S.startX, S.startY), e.beginPath(), e.rect(0, 0, R, I), e.clip();
-      const x = R - pe * 2 - Oe - he - 4, { documentSkeleton: j, documents: F, docModel: H } = ft(y, this._localeService, r);
-      U === Se.WRAP && H.updateDocumentDataPageSize(Math.max(x, 1)), j.calculate();
-      const X = et(j), { height: k, width: K } = X, { paddingTop: q, paddingLeft: ee } = Hn(x, I, K, k, T, E);
+      e.save(), e.translateWithPrecision(v.startX, v.startY), e.beginPath(), e.rect(0, 0, w, I), e.clip();
+      const x = w - pe * 2 - Oe - he - 4, { documentSkeleton: j, documents: N, docModel: H } = mt(y, this._localeService, r);
+      F === Se.WRAP && H.updateDocumentDataPageSize(Math.max(x, 1)), j.calculate();
+      const X = et(j), { height: k, width: K } = X, { paddingTop: q, paddingLeft: ee } = Yn(x, I, K, k, T, E);
       e.translateWithPrecision(pe, q);
-      const te = Math.max(R - pe * 2, 1), re = k;
-      qn.drawWith(e, {
+      const te = Math.max(w - pe * 2, 1), re = k;
+      Jn.drawWith(e, {
         width: te,
         height: re,
         fill: (P == null ? void 0 : P.color) || Te,
         radius: Xt
-      }), e.save(), e.translateWithPrecision(Oe, 0), e.beginPath(), e.rect(0, 0, x, k), e.clip(), e.translateWithPrecision(ee, 0), F.render(e), e.restore(), e.translateWithPrecision(x + Oe + 4, (k - mt) / 2), e.fillStyle = ds, e.fill(Wn), e.restore(), V.set(C, {
-        left: S.startX + pe + o.rowHeaderWidth,
-        top: S.startY + q + o.columnHeaderHeight,
+      }), e.save(), e.translateWithPrecision(Oe, 0), e.beginPath(), e.rect(0, 0, x, k), e.clip(), e.translateWithPrecision(ee, 0), N.render(e), e.restore(), e.translateWithPrecision(x + Oe + 4, (k - ft) / 2), e.fillStyle = ds, e.fill(Hn), e.restore(), V.set(_, {
+        left: v.startX + pe + o.rowHeaderWidth,
+        top: v.startY + q + o.columnHeaderHeight,
         width: te,
         height: re
       });
@@ -2784,62 +2778,62 @@ let un = class {
     const { primaryWithCoord: t, style: o, data: n, row: a, col: i } = e, r = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: p = 0 } = l || {}, d = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, a, i);
     if (!d || d.renderMode === de.TEXT)
       return;
-    const f = {
+    const g = {
       startX: r.startX + s,
       endX: r.endX - c,
       startY: r.startY + u,
       endY: r.endY - p
-    }, m = f.endX - f.startX, _ = ie(n), w = `${_ != null ? _ : ""}`;
-    let { tb: S, pd: R } = o || {};
-    const { t: I = le.pd.t, b: V = le.pd.b } = R != null ? R : {};
-    if (S = S != null ? S : Se.WRAP, d.renderMode === de.ARROW) {
-      const C = m - he, { documentSkeleton: g, docModel: v } = ft(w, this._localeService, o);
-      S === Se.WRAP && v.updateDocumentDataPageSize(Math.max(C, 1)), g.calculate(), g.getActualSize();
-      const y = et(g), { height: P } = y;
-      return P + I + V + We * 2;
+    }, f = g.endX - g.startX, C = ie(n), R = `${C != null ? C : ""}`;
+    let { tb: v, pd: w } = o || {};
+    const { t: I = le.pd.t, b: V = le.pd.b } = w != null ? w : {};
+    if (v = v != null ? v : Se.WRAP, d.renderMode === de.ARROW) {
+      const _ = f - he, { documentSkeleton: S, docModel: m } = mt(R, this._localeService, o);
+      v === Se.WRAP && m.updateDocumentDataPageSize(Math.max(_, 1)), S.calculate(), S.getActualSize();
+      const y = et(S), { height: P } = y;
+      return P + I + V + ke * 2;
     } else {
-      const C = m - pe * 2 - Oe - he, { documentSkeleton: g, docModel: v } = Bo(w, this._localeService, o);
-      S === Se.WRAP && v.updateDocumentDataPageSize(Math.max(C, 1)), g.calculate();
-      const y = et(g), {
+      const _ = f - pe * 2 - Oe - he, { documentSkeleton: S, docModel: m } = Bo(R, this._localeService, o);
+      v === Se.WRAP && m.updateDocumentDataPageSize(Math.max(_, 1)), S.calculate();
+      const y = et(S), {
         height: P
       } = y;
-      return P + We * 2;
+      return P + ke * 2;
     }
   }
   calcCellAutoWidth(e) {
     const { primaryWithCoord: t, style: o, data: n, row: a, col: i } = e, r = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: p = 0 } = l || {}, d = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, a, i);
     if (!d || d.renderMode === de.TEXT)
       return;
-    const f = {
+    const g = {
       startX: r.startX + s,
       endX: r.endX - c,
       startY: r.startY + u,
       endY: r.endY - p
-    }, m = f.endX - f.startX, _ = ie(n), w = `${_ != null ? _ : ""}`;
-    let { tb: S, pd: R } = o || {};
-    const { l: I = le.pd.l, r: V = le.pd.r } = R != null ? R : {};
-    S = S != null ? S : Se.WRAP;
-    let C = pe * 2 + he;
+    }, f = g.endX - g.startX, C = ie(n), R = `${C != null ? C : ""}`;
+    let { tb: v, pd: w } = o || {};
+    const { l: I = le.pd.l, r: V = le.pd.r } = w != null ? w : {};
+    v = v != null ? v : Se.WRAP;
+    let _ = pe * 2 + he;
     switch (d.renderMode) {
       case de.ARROW:
-        C = he + pe * 2 + V + I;
+        _ = he + pe * 2 + V + I;
         break;
       case de.CUSTOM:
-        C = he + pe * 2 + Oe * 2 + V + I + Xt / 2 + 1;
+        _ = he + pe * 2 + Oe * 2 + V + I + Xt / 2 + 1;
         break;
       // default is CUSTOM
       default:
-        C = he + pe * 2 + Oe * 2 + V + I + Xt / 2 + 1;
+        _ = he + pe * 2 + Oe * 2 + V + I + Xt / 2 + 1;
     }
-    const g = m - C, { documentSkeleton: v, docModel: y } = ft(w, this._localeService, o);
-    return S === Se.WRAP && y.updateDocumentDataPageSize(Math.max(g, 1)), v.calculate(), v.getActualSize(), et(v).width + C;
+    const S = f - _, { documentSkeleton: m, docModel: y } = mt(R, this._localeService, o);
+    return v === Se.WRAP && y.updateDocumentDataPageSize(Math.max(S, 1)), m.calculate(), m.getActualSize(), et(m).width + _;
   }
   isHit(e, t) {
     const { subUnitId: o, row: n, col: a } = t, r = this._ensureMap(o).get(this._generateKey(n, a)), l = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, n, a);
     if (!l || !r || l.renderMode === de.TEXT)
       return !1;
-    const { top: s, left: c, width: u, height: p } = r, { x: d, y: f } = e;
-    return d >= c && d <= c + u && f >= s && f <= s + p;
+    const { top: s, left: c, width: u, height: p } = r, { x: d, y: g } = e;
+    return d >= c && d <= c + u && g >= s && g <= s + p;
   }
   onPointerDown(e, t) {
     if (t.button === 2)
@@ -2861,42 +2855,42 @@ let un = class {
     (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(Y.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(Xe.DEFAULT);
   }
 };
-un = ls([
+hn = ls([
   pt(0, b(J)),
   pt(1, Q),
   pt(2, b(Ve)),
   pt(3, b(oe))
-], un);
-class us extends fe {
+], hn);
+class us extends me {
   constructor() {
     super(...arguments);
     M(this, "id", z.LIST);
-    M(this, "canvasRender", this.injector.createInstance(un));
-    M(this, "dropdown", Vn);
+    M(this, "canvasRender", this.injector.createInstance(hn));
+    M(this, "dropdown", yn);
     M(this, "optionsInput", Mt.componentKey);
-    M(this, "formulaInput", yn);
+    M(this, "formulaInput", Mn);
   }
 }
-class hs extends fe {
+class hs extends me {
   constructor() {
     super(...arguments);
     M(this, "id", z.TEXT_LENGTH);
     M(this, "formulaInput", xt);
   }
 }
-class ps extends fe {
+class ps extends me {
   constructor() {
     super(...arguments);
     M(this, "id", z.WHOLE);
     M(this, "formulaInput", xt);
   }
 }
-var ms = Object.defineProperty, fs = Object.getOwnPropertyDescriptor, gs = (e, t, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? fs(t, o) : t, i = e.length - 1, r; i >= 0; i--)
+var fs = Object.defineProperty, ms = Object.getOwnPropertyDescriptor, gs = (e, t, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? ms(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
-  return n && a && ms(t, o, a), a;
+  return n && a && fs(t, o, a), a;
 }, zt = (e, t) => (o, n) => t(o, n, e);
-let qe = class extends pn {
+let qe = class extends fn {
   constructor(e, t, o) {
     super(), this._injector = e, this._componentManger = t, this._dataValidatorRegistryService = o, this._initComponents(), this._registerValidatorViews();
   }
@@ -2905,7 +2899,7 @@ let qe = class extends pn {
       [Lo, wo],
       [Dt, Ji],
       [Mo, vi],
-      [Vn, Li],
+      [yn, Li],
       [Oo, ni],
       [Mt.componentKey, Mt],
       [bt.componentKey, bt],
@@ -2934,7 +2928,7 @@ let qe = class extends pn {
   }
 };
 qe = gs([
-  zt(0, b(Ne)),
+  zt(0, b(Fe)),
   zt(1, b(Lt)),
   zt(2, b(ye))
 ], qe);
@@ -2945,19 +2939,19 @@ var vs = Object.defineProperty, _s = Object.getOwnPropertyDescriptor, Ss = (e, t
 }, Kt = (e, t) => (o, n) => t(o, n, e);
 const Cs = "SHEET_DATA_VALIDATION_UI_PLUGIN";
 var gt;
-let Yn = (gt = class extends Gn {
+let Xn = (gt = class extends Zn {
   constructor(e = Vt, t, o, n) {
     super(), this._config = e, this._injector = t, this._commandService = o, this._configService = n;
-    const { menu: a, ...i } = Zn(
+    const { menu: a, ...i } = qn(
       {},
       Vt,
       this._config
     );
-    a && this._configService.setConfig("menu", a, { merge: !0 }), this._configService.setConfig(Dn, i);
+    a && this._configService.setConfig("menu", a, { merge: !0 }), this._configService.setConfig(Vn, i);
   }
   onStarting() {
     [
-      [me],
+      [fe],
       [Ie],
       [lt],
       [ze],
@@ -2972,8 +2966,8 @@ let Yn = (gt = class extends Gn {
       At,
       Tt,
       Eo,
-      Rn,
-      Be,
+      Dn,
+      Ue,
       bo
     ].forEach((e) => {
       this._commandService.registerCommand(e);
@@ -2992,11 +2986,11 @@ let Yn = (gt = class extends Gn {
     this._injector.get(ze);
   }
 }, M(gt, "pluginName", Cs), M(gt, "type", Y.UNIVER_SHEET), gt);
-Yn = Ss([
-  Kt(1, b(Ne)),
+Xn = Ss([
+  Kt(1, b(Fe)),
   Kt(2, Q),
-  Kt(3, hn)
-], Yn);
+  Kt(3, pn)
+], Xn);
 var Is = Object.defineProperty, ws = Object.getOwnPropertyDescriptor, Rs = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? ws(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
@@ -3004,19 +2998,19 @@ var Is = Object.defineProperty, ws = Object.getOwnPropertyDescriptor, Rs = (e, t
 }, Gt = (e, t) => (o, n) => t(o, n, e);
 const Ds = "SHEET_DATA_VALIDATION_UI_PLUGIN";
 var vt;
-let Xn = (vt = class extends Gn {
+let zn = (vt = class extends Zn {
   constructor(e = Vt, t, o, n) {
     super(), this._config = e, this._injector = t, this._commandService = o, this._configService = n;
-    const { menu: a, ...i } = Zn(
+    const { menu: a, ...i } = qn(
       {},
       Vt,
       this._config
     );
-    a && this._configService.setConfig("menu", a, { merge: !0 }), this._configService.setConfig(Dn, i);
+    a && this._configService.setConfig("menu", a, { merge: !0 }), this._configService.setConfig(Vn, i);
   }
   onStarting() {
     [
-      [me],
+      [fe],
       [Ie],
       [lt],
       [ze],
@@ -3030,8 +3024,8 @@ let Xn = (vt = class extends Gn {
       At,
       Tt,
       Eo,
-      Rn,
-      Be,
+      Dn,
+      Ue,
       bo
     ].forEach((e) => {
       this._commandService.registerCommand(e);
@@ -3050,14 +3044,14 @@ let Xn = (vt = class extends Gn {
     this._injector.get(ze);
   }
 }, M(vt, "pluginName", Ds), M(vt, "type", Y.UNIVER_SHEET), vt);
-Xn = Rs([
-  Gt(1, b(Ne)),
+zn = Rs([
+  Gt(1, b(Fe)),
   Gt(2, Q),
-  Gt(3, hn)
-], Xn);
+  Gt(3, pn)
+], zn);
 export {
   Oo as DATE_DROPDOWN_KEY,
-  Vn as LIST_DROPDOWN_KEY,
-  Xn as UniverSheetsDataValidationMobileUIPlugin,
-  Yn as UniverSheetsDataValidationUIPlugin
+  yn as LIST_DROPDOWN_KEY,
+  zn as UniverSheetsDataValidationMobileUIPlugin,
+  Xn as UniverSheetsDataValidationUIPlugin
 };