@univerjs/sheets-data-validation-ui 0.6.10-nightly.202504131606 → 0.6.10-nightly.202504151606

package/lib/index.js

@@ -2,16 +2,16 @@ var Wo = Object.defineProperty;
 var Ho = (t, e, o) => e in t ? Wo(t, e, { enumerable: !0, configurable: !0, writable: !0, value: o }) : t[e] = o;
 var E = (t, e, o) => Ho(t, typeof e != "symbol" ? e + "" : e, o);
 import { jsxs as Y, jsx as m, Fragment as Rt } from "react/jsx-runtime";
-import { Inject as b, LocaleService as Q, Disposable as Vt, DataValidationErrorStyle as de, DataValidationStatus as Kt, ICommandService as tt, dayjs as qe, numfmt as Je, CellValueType as xo, UniverInstanceType as X, toDisposable as jo, IUniverInstanceService as rt, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Yo, DisposableCollection as Xo, CommandType as ae, BuildTextUtils as zo, DataValidationRenderMode as ct, DataValidationType as K, IConfigService as mn, debounce as Ko, UndoCommand as Go, RedoCommand as Zo, isUnitRangesEqual as qo, shallowEqual as En, ThemeService as zn, ColorKit as Jo, Injector as Wt, ObjectMatrix as Ie, Range as Qo, Rectangle as we, queryObjectMatrix as Qe, Optional as ta, RxDisposable as gn, InterceptorEffectEnum as Kn, sequenceExecute as Gn, bufferDebounceTime as ea, isFormulaString as kt, Tools as tn, VerticalAlign as ht, HorizontalAlign as Gt, DEFAULT_STYLES as dt, WrapStrategy as It, DocumentDataModel as na, BooleanNumber as ie, DEFAULT_EMPTY_DOCUMENT_VALUE as oa, Plugin as Zn, merge as qn } from "@univerjs/core";
+import { Inject as b, LocaleService as Q, Disposable as Vt, DataValidationErrorStyle as de, DataValidationStatus as Kt, ICommandService as tt, dayjs as qe, numfmt as Je, CellValueType as xo, UniverInstanceType as X, toDisposable as jo, IUniverInstanceService as rt, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Yo, DisposableCollection as Xo, CommandType as ae, BuildTextUtils as zo, DataValidationRenderMode as ct, DataValidationType as K, IConfigService as mn, debounce as Ko, UndoCommand as Go, RedoCommand as Zo, isUnitRangesEqual as qo, shallowEqual as En, ThemeService as zn, ColorKit as Jo, Injector as Wt, ObjectMatrix as Ie, Range as Qo, Rectangle as we, queryObjectMatrix as Qe, Optional as ta, RxDisposable as gn, InterceptorEffectEnum as Kn, sequenceExecute as Gn, bufferDebounceTime as ea, isFormulaString as Ft, Tools as tn, VerticalAlign as ht, HorizontalAlign as Gt, DEFAULT_STYLES as dt, WrapStrategy as It, DocumentDataModel as na, BooleanNumber as ie, DEFAULT_EMPTY_DOCUMENT_VALUE as oa, Plugin as Zn, merge as qn } from "@univerjs/core";
 import { Button as Bt, DatePanel as aa, Scrollbar as ia, FormLayout as q, RadioGroup as fn, Radio as Nt, Checkbox as Pe, Input as Ut, Select as en, DraggableList as ra, clsx as sa } from "@univerjs/design";
 import { DeviceInputEventType as nn, IRenderManagerService as yt, fixLineWidthByScale as bn, Transform as la, CheckboxShape as da, getCurrentTypeOfRenderer as Zt, CURSOR_TYPE as qt, FontCache as ca, Shape as ua, Rect as Jn, getFontStyleString as Be, getDocsSkeletonPageSize as re, Documents as ha, DocumentViewModel as pa, DocumentSkeleton as ma } from "@univerjs/engine-render";
 import { SheetInterceptorService as vn, VALIDATE_CELL as ga, SetRangeValuesCommand as _n, SheetsSelectionsService as Qn, getSheetCommandTarget as to, SheetPermissionCheckController as eo, WorksheetEditPermission as Re, RangeProtectionPermissionEditPoint as De, WorkbookEditablePermission as Ve, checkRangesEditablePermission as fa, rangeToDiscreteRange as va, WorksheetSetCellStylePermission as on, INTERCEPTOR_POINT as no, InterceptCellContentPriority as oo } from "@univerjs/sheets";
 import { SheetDataValidationModel as at, SheetsDataValidationValidatorService as _a, getCellValueOrigin as mt, getDataValidationCellValue as Sa, deserializeListOptions as ao, serializeListOptions as io, UpdateSheetDataValidationRangeCommand as ro, UpdateSheetDataValidationSettingCommand as On, UpdateSheetDataValidationOptionsCommand as Ca, RemoveSheetDataValidationCommand as so, RemoveSheetAllDataValidationCommand as Ia, createDefaultNewRule as lo, AddSheetDataValidationCommand as Sn, DATA_VALIDATION_PLUGIN_NAME as co, getDataValidationDiffMutations as an, DataValidationCacheService as uo, DataValidationFormulaController as wa, DataValidationFormulaService as Ra, CHECKBOX_FORMULA_2 as Da, CHECKBOX_FORMULA_1 as Va, getFormulaResult as $e, isLegalFormulaResult as Ln, transformCheckboxValue as ya } from "@univerjs/sheets-data-validation";
 import { getPatternType as Ma } from "@univerjs/sheets-numfmt";
-import { SetCellEditVisibleOperation as rn, SheetCanvasPopManagerService as Ea, IEditorBridgeService as ho, IMarkSelectionService as ba, HoverManagerService as Oa, CellAlertManagerService as La, CellAlertType as Ta, IAutoFillService as Pa, APPLY_TYPE as se, virtualizeDiscreteRanges as sn, getAutoFillRepeatRange as Aa, ISheetClipboardService as ka, COPY_TYPE as Tn, PREDEFINED_HOOK_NAME as he, getRepeatRange as Pn, getCurrentRangeDisable$ as Fa, AutoHeightController as po, SheetSkeletonManagerService as ye } from "@univerjs/sheets-ui";
+import { SetCellEditVisibleOperation as rn, SheetCanvasPopManagerService as Ea, IEditorBridgeService as ho, IMarkSelectionService as ba, HoverManagerService as Oa, CellAlertManagerService as La, CellAlertType as Ta, IAutoFillService as Pa, APPLY_TYPE as se, virtualizeDiscreteRanges as sn, getAutoFillRepeatRange as Aa, ISheetClipboardService as Fa, COPY_TYPE as Tn, PREDEFINED_HOOK_NAME as he, getRepeatRange as Pn, getCurrentRangeDisable$ as ka, AutoHeightController as po, SheetSkeletonManagerService as ye } from "@univerjs/sheets-ui";
 import { IDialogService as Na, useDependency as T, KeyCode as ln, ISidebarService as mo, useObservable as St, ComponentManager as Ae, IZenZoneService as go, RectPopup as Ua, useEvent as dn, MenuItemType as Cn, getMenuHiddenObservable as Ba, RibbonStartGroup as $a, IMenuManagerService as Wa, useSidebarClick as fo } from "@univerjs/ui";
 import An, { useState as j, forwardRef as Mt, useRef as Jt, createElement as Et, useMemo as $t, useEffect as wt } from "react";
-import { DataValidatorRegistryService as bt, DataValidationModel as ke, DataValidatorRegistryScope as Ha, TWO_FORMULA_OPERATOR_COUNT as xa, getRuleOptions as kn, getRuleSetting as Fn } from "@univerjs/data-validation";
+import { DataValidatorRegistryService as bt, DataValidationModel as Fe, DataValidatorRegistryScope as Ha, TWO_FORMULA_OPERATOR_COUNT as xa, getRuleOptions as Fn, getRuleSetting as kn } from "@univerjs/data-validation";
 import { RichTextEditingMutation as ja } from "@univerjs/docs";
 import { filter as In, BehaviorSubject as Nn, distinctUntilChanged as Ya, Subject as Xa, debounceTime as wn, of as za, bufferTime as vo } from "rxjs";
 import { deserializeRangeWithSheet as Ka, serializeRange as _o } from "@univerjs/engine-formula";
@@ -111,17 +111,17 @@ const Ja = "univer-dv-date-dropdown", Qa = "univer-dv-date-dropdown-btns", Un =
 };
 function ei(t) {
   var v;
-  const { location: e, hideFn: o } = t, { worksheet: n, row: a, col: i, unitId: r, subUnitId: s, workbook: l } = e, c = T(tt), u = T(ce), h = n.getCell(a, i), d = mt(n.getCellRaw(a, i)), C = ti(d), [p, R] = j(C), w = p && p.isValid() ? p : qe(), g = T(Q), f = T(at), _ = f.getRuleByLocation(r, s, a, i);
+  const { location: e, hideFn: o } = t, { worksheet: n, row: a, col: i, unitId: r, subUnitId: s, workbook: l } = e, c = T(tt), u = T(ce), h = n.getCell(a, i), d = mt(n.getCellRaw(a, i)), I = ti(d), [p, R] = j(I), w = p && p.isValid() ? p : qe(), g = T(Q), f = T(at), _ = f.getRuleByLocation(r, s, a, i);
   if (!_)
     return null;
   const V = f.getValidator(_.type);
   if (!h || !V)
     return;
-  const S = !!((v = _.bizInfo) != null && v.showTime), I = async () => {
-    var F, N, B;
+  const S = !!((v = _.bizInfo) != null && v.showTime), C = async () => {
+    var k, N, B;
     if (!w)
       return;
-    const P = w.format(S ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00"), U = (F = Je.parseDate(P)) == null ? void 0 : F.v, O = l.getStyles().getStyleByCell(h), L = (B = (N = O == null ? void 0 : O.n) == null ? void 0 : N.pattern) != null ? B : "", A = Ma(L);
+    const P = w.format(S ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00"), U = (k = Je.parseDate(P)) == null ? void 0 : k.v, O = l.getStyles().getStyleByCell(h), L = (B = (N = O == null ? void 0 : O.n) == null ? void 0 : N.pattern) != null ? B : "", A = Ma(L);
     _.errorStyle !== de.STOP || await V.validator({
       value: U,
       unitId: r,
@@ -176,7 +176,7 @@ function ei(t) {
         disabledDate: (y) => !Je.parseDate(y.format("YYYY-MM-DD"))
       }
     ),
-    /* @__PURE__ */ m("div", { className: Un.dvDateDropdownBtns, children: /* @__PURE__ */ m(Bt, { size: "small", type: "primary", onClick: I, disabled: !w.isValid(), children: g.t("dataValidation.alert.ok") }) })
+    /* @__PURE__ */ m("div", { className: Un.dvDateDropdownBtns, children: /* @__PURE__ */ m(Bt, { size: "small", type: "primary", onClick: C, disabled: !w.isValid(), children: g.t("dataValidation.alert.ok") }) })
   ] });
 }
 var ut = function() {
@@ -471,7 +471,7 @@ const Me = "DataValidationPanel", Ht = {
   handler(t, e) {
     if (!e)
       return !1;
-    const { ruleId: o, isAdd: n } = e, a = t.get(ft), i = t.get(ke), r = t.get(rt), s = t.get(mo), l = to(r);
+    const { ruleId: o, isAdd: n } = e, a = t.get(ft), i = t.get(Fe), r = t.get(rt), s = t.get(mo), l = to(r);
     if (!l) return !1;
     const { unitId: c, subUnitId: u } = l, h = o ? i.getRuleById(c, u, o) : void 0;
     a.open(), a.setActiveRule(h && {
@@ -501,7 +501,7 @@ const Me = "DataValidationPanel", Ht = {
     const e = t.get(tt), o = t.get(ft);
     return o.open(), o.isOpen ? e.executeCommand(Dn.id) : e.executeCommand(Ht.id), !0;
   }
-}, Fe = {
+}, ke = {
   type: ae.OPERATION,
   id: "sheet.operation.show-data-validation-dropdown",
   handler(t, e) {
@@ -521,7 +521,7 @@ const Me = "DataValidationPanel", Ht = {
   handler(t, e) {
     return e ? (t.get(Dt).hideDropdown(), !0) : !1;
   }
-}, Ft = "#ECECEC", Vn = "sheets-data-validation-ui.config", Ee = {}, _i = "univer-dv-list-dropdown", Si = "univer-dv-list-dropdown-title", Ci = "univer-dv-list-dropdown-list", Ii = "univer-dv-list-dropdown-list-container", wi = "univer-dv-list-dropdown-selected-icon", Ri = "univer-dv-list-dropdown-item-container", Di = "univer-dv-list-dropdown-item", Vi = "univer-dv-list-dropdown-split", yi = "univer-dv-list-dropdown-edit", _t = {
+}, kt = "#ECECEC", Vn = "sheets-data-validation-ui.config", Ee = {}, _i = "univer-dv-list-dropdown", Si = "univer-dv-list-dropdown-title", Ci = "univer-dv-list-dropdown-list", Ii = "univer-dv-list-dropdown-list-container", wi = "univer-dv-list-dropdown-selected-icon", Ri = "univer-dv-list-dropdown-item-container", Di = "univer-dv-list-dropdown-item", Vi = "univer-dv-list-dropdown-split", yi = "univer-dv-list-dropdown-edit", _t = {
   dvListDropdown: _i,
   dvListDropdownTitle: Si,
   dvListDropdownList: Ci,
@@ -532,30 +532,30 @@ const Me = "DataValidationPanel", Ht = {
   dvListDropdownSplit: Vi,
   dvListDropdownEdit: yi
 }, Mi = (t) => {
-  var S, I;
-  const { value: e, onChange: o, multiple: n, options: a, title: i, onEdit: r, style: s, filter: l, location: c } = t, u = T(Q), h = T(mn), d = l == null ? void 0 : l.toLowerCase(), { row: C, col: p, unitId: R, subUnitId: w } = c, g = a.filter((v) => d ? v.label.toLowerCase().includes(d) : !0), f = (I = (S = h.getConfig(Vn)) == null ? void 0 : S.showEditOnDropdown) != null ? I : !0, _ = T(eo), V = $t(() => _.permissionCheckWithRanges(
+  var S, C;
+  const { value: e, onChange: o, multiple: n, options: a, title: i, onEdit: r, style: s, filter: l, location: c } = t, u = T(Q), h = T(mn), d = l == null ? void 0 : l.toLowerCase(), { row: I, col: p, unitId: R, subUnitId: w } = c, g = a.filter((v) => d ? v.label.toLowerCase().includes(d) : !0), f = (C = (S = h.getConfig(Vn)) == null ? void 0 : S.showEditOnDropdown) != null ? C : !0, _ = T(eo), V = $t(() => _.permissionCheckWithRanges(
     {
       workbookTypes: [Ve],
       rangeTypes: [De],
       worksheetTypes: [Re]
     },
-    [{ startColumn: p, startRow: C, endColumn: p, endRow: C }],
+    [{ startColumn: p, startRow: I, endColumn: p, endRow: I }],
     R,
     w
-  ), [_, p, C, R, w]);
+  ), [_, p, I, R, w]);
   return /* @__PURE__ */ Y("div", { className: _t.dvListDropdown, style: s, children: [
     /* @__PURE__ */ m("div", { className: _t.dvListDropdownTitle, children: i }),
     /* @__PURE__ */ m("div", { className: _t.dvListDropdownList, children: /* @__PURE__ */ m(ia, { children: /* @__PURE__ */ m("div", { className: _t.dvListDropdownListContainer, children: g.map((v, y) => {
       const P = e.indexOf(v.value) > -1, U = () => {
         let L;
-        P ? L = new Set(e.filter((F) => F !== v.value)) : L = new Set(n ? [...e, v.value] : [v.value]);
+        P ? L = new Set(e.filter((k) => k !== v.value)) : L = new Set(n ? [...e, v.value] : [v.value]);
         const A = [];
-        a.forEach((F) => {
-          L.has(F.value) && A.push(F.value);
+        a.forEach((k) => {
+          L.has(k.value) && A.push(k.value);
         }), o(A);
       }, O = v.label.toLocaleLowerCase().indexOf(d);
       return /* @__PURE__ */ Y("div", { className: _t.dvListDropdownItemContainer, onClick: U, children: [
-        /* @__PURE__ */ m("div", { className: _t.dvListDropdownItem, style: { background: v.color || Ft }, children: d && v.label.toLowerCase().includes(d) ? /* @__PURE__ */ Y(Rt, { children: [
+        /* @__PURE__ */ m("div", { className: _t.dvListDropdownItem, style: { background: v.color || kt }, children: d && v.label.toLowerCase().includes(d) ? /* @__PURE__ */ Y(Rt, { children: [
           /* @__PURE__ */ m("span", { children: v.label.substring(0, O) }),
           /* @__PURE__ */ m("span", { style: { fontWeight: "bold" }, children: v.label.substring(O, O + d.length) }),
           /* @__PURE__ */ m("span", { children: v.label.substring(O + d.length) })
@@ -571,7 +571,7 @@ const Me = "DataValidationPanel", Ht = {
 };
 function Ei(t) {
   var N, B, x, z;
-  const { location: e, hideFn: o } = t, { worksheet: n, row: a, col: i, unitId: r, subUnitId: s } = e, l = T(ke), [c, u] = j(""), h = T(tt), d = T(Q), [C, p] = j(""), R = T(ho), w = T(rt), g = $t(() => l.ruleChange$.pipe(wn(16)), []), f = T(at);
+  const { location: e, hideFn: o } = t, { worksheet: n, row: a, col: i, unitId: r, subUnitId: s } = e, l = T(Fe), [c, u] = j(""), h = T(tt), d = T(Q), [I, p] = j(""), R = T(ho), w = T(rt), g = $t(() => l.ruleChange$.pipe(wn(16)), []), f = T(at);
   St(g);
   const _ = Ua.useContext(), V = ((B = (N = _.current) == null ? void 0 : N.right) != null ? B : 0) - ((z = (x = _.current) == null ? void 0 : x.left) != null ? z : 0);
   if (wt(() => {
@@ -592,17 +592,17 @@ function Ei(t) {
   const S = f.getRuleByLocation(r, s, a, i);
   if (!S)
     return null;
-  const I = f.getValidator(S.type);
-  if (!I)
+  const C = f.getValidator(S.type);
+  if (!C)
     return null;
   const v = n.getCell(a, i), y = (S == null ? void 0 : S.renderMode) === ct.CUSTOM || (S == null ? void 0 : S.renderMode) === void 0;
-  if (!v || !S || !I || I.id.indexOf(K.LIST) !== 0)
+  if (!v || !S || !C || C.id.indexOf(K.LIST) !== 0)
     return;
-  const P = S.type === K.LIST_MULTIPLE, U = I.getListWithColor(S, r, s), O = C || Sa(n.getCellRaw(a, i)), L = ao(O), A = () => {
+  const P = S.type === K.LIST_MULTIPLE, U = C.getListWithColor(S, r, s), O = I || Sa(n.getCellRaw(a, i)), L = ao(O), A = () => {
     h.executeCommand(Ht.id, {
       ruleId: S.uid
     }), o();
-  }, F = U.map((H) => ({
+  }, k = U.map((H) => ({
     label: H.label,
     value: H.label,
     color: y || H.color ? H.color : "transparent"
@@ -643,7 +643,7 @@ function Ei(t) {
           keycode: ln.ESC
         }), h.executeCommand(_n.id, J);
       },
-      options: F,
+      options: k,
       onEdit: A,
       filter: c,
       location: e
@@ -702,12 +702,12 @@ function Li(t) {
     ] })
   ] });
 }
-const Ti = "univer-data-validation-detail", Pi = "univer-data-validation-detail-form-item", Ai = "univer-data-validation-detail-buttons", ki = "univer-data-validation-detail-button", jt = {
+const Ti = "univer-data-validation-detail", Pi = "univer-data-validation-detail-form-item", Ai = "univer-data-validation-detail-buttons", Fi = "univer-data-validation-detail-button", jt = {
   dataValidationDetail: Ti,
   dataValidationDetailFormItem: Pi,
   dataValidationDetailButtons: Ai,
-  dataValidationDetailButton: ki
-}, Fi = (t) => Ko(
+  dataValidationDetailButton: Fi
+}, ki = (t) => Ko(
   async (e, o, n, a) => {
     const i = await t.executeCommand(e, o, n);
     a == null || a(i);
@@ -720,7 +720,7 @@ function Ni(t, e, o) {
 }
 function Ui() {
   var lt;
-  const [t, e] = j(0), o = T(ft), n = St(o.activeRule$, o.activeRule), { unitId: a, subUnitId: i, rule: r } = n || {}, s = r.uid, l = T(bt), c = T(rt), u = T(Ae), h = T(tt), d = T(ke), C = T(Q), [p, R] = j(r), w = l.getValidatorItem(p.type), [g, f] = j(!1), _ = l.getValidatorsByScope(Ha.SHEET), [V, S] = j(() => p.ranges.map((M) => ({ unitId: "", sheetId: "", range: M }))), I = $t(() => Fi(h), [h]), [v, y] = j(!1), [P, U] = j(!1), O = Jt(null), L = T(Qn);
+  const [t, e] = j(0), o = T(ft), n = St(o.activeRule$, o.activeRule), { unitId: a, subUnitId: i, rule: r } = n || {}, s = r.uid, l = T(bt), c = T(rt), u = T(Ae), h = T(tt), d = T(Fe), I = T(Q), [p, R] = j(r), w = l.getValidatorItem(p.type), [g, f] = j(!1), _ = l.getValidatorsByScope(Ha.SHEET), [V, S] = j(() => p.ranges.map((M) => ({ unitId: "", sheetId: "", range: M }))), C = $t(() => ki(h), [h]), [v, y] = j(!1), [P, U] = j(!1), O = Jt(null), L = T(Qn);
   if (wt(() => () => {
     const M = L.getCurrentLastSelection();
     M && L.setSelections([M]);
@@ -728,14 +728,14 @@ function Ui() {
     h.onCommandExecuted((M) => {
       (M.id === Go.id || M.id === Zo.id) && setTimeout(() => {
         const D = d.getRuleById(a, i, s);
-        e((k) => k + 1), D && (R(D), S(D.ranges.map((k) => ({ unitId: "", sheetId: "", range: k }))));
+        e((F) => F + 1), D && (R(D), S(D.ranges.map((F) => ({ unitId: "", sheetId: "", range: F }))));
       }, 20);
     });
   }, [h, d, s, i, a]), !w)
     return null;
-  const A = w.operators, F = w.operatorNames, N = p.operator ? xa.includes(p.operator) : !1, B = () => {
-    var M, D, k;
-    (D = (M = O.current) == null ? void 0 : M.editor) != null && D.isFocus() && x((k = O.current) == null ? void 0 : k.getValue()), !(!p.ranges.length || v) && (w.validatorFormula(p, a, i).success ? o.setActiveRule(null) : f(!0));
+  const A = w.operators, k = w.operatorNames, N = p.operator ? xa.includes(p.operator) : !1, B = () => {
+    var M, D, F;
+    (D = (M = O.current) == null ? void 0 : M.editor) != null && D.isFocus() && x((F = O.current) == null ? void 0 : F.getValue()), !(!p.ranges.length || v) && (w.validatorFormula(p, a, i).success ? o.setActiveRule(null) : f(!0));
   }, x = dn((M) => {
     const D = M.split(",").filter(Boolean).map(Ka).map((W) => {
       const Ct = W.sheetName;
@@ -751,21 +751,21 @@ function Ui() {
     if (qo(D, V))
       return;
     S(D);
-    const k = D.filter((W) => (!W.unitId || W.unitId === a) && (!W.sheetId || W.sheetId === i)).map((W) => W.range);
+    const F = D.filter((W) => (!W.unitId || W.unitId === a) && (!W.sheetId || W.sheetId === i)).map((W) => W.range);
     if (R({
       ...p,
-      ranges: k
-    }), k.length === 0)
+      ranges: F
+    }), F.length === 0)
       return;
     const $ = {
       unitId: a,
       subUnitId: i,
       ruleId: s,
-      ranges: k
+      ranges: F
     };
-    I(ro.id, $);
+    C(ro.id, $);
   }), z = (M) => {
-    if (En(M, Fn(p)))
+    if (En(M, kn(p)))
       return;
     R({
       ...p,
@@ -777,7 +777,7 @@ function Ui() {
       ruleId: s,
       setting: M
     };
-    I(
+    C(
       On.id,
       D,
       void 0
@@ -798,13 +798,13 @@ function Ui() {
     const D = l.getValidatorItem(M);
     if (!D)
       return;
-    const k = D.operators, $ = d.getRuleById(a, i, s), W = M === ($ == null ? void 0 : $.type) || M.includes("list") && ($ != null && $.type.includes("list")) ? {
+    const F = D.operators, $ = d.getRuleById(a, i, s), W = M === ($ == null ? void 0 : $.type) || M.includes("list") && ($ != null && $.type.includes("list")) ? {
       ...$,
       type: M
     } : {
       ...p,
       type: M,
-      operator: k[0],
+      operator: F[0],
       formula1: void 0,
       formula2: void 0
     };
@@ -812,13 +812,13 @@ function Ui() {
       unitId: a,
       subUnitId: i,
       ruleId: p.uid,
-      setting: Fn(W)
+      setting: kn(W)
     });
-  }, et = u.get(w.formulaInput), nt = $t(() => V.map((M) => _o(M.range)).join(","), []), st = kn(p), it = (M) => {
-    En(M, kn(p)) || (R({
+  }, et = u.get(w.formulaInput), nt = $t(() => V.map((M) => _o(M.range)).join(","), []), st = Fn(p), it = (M) => {
+    En(M, Fn(p)) || (R({
       ...p,
       ...M
-    }), I(
+    }), C(
       Ca.id,
       {
         unitId: a,
@@ -832,8 +832,8 @@ function Ui() {
     /* @__PURE__ */ m(
       q,
       {
-        label: C.t("dataValidation.panel.range"),
-        error: !p.ranges.length || v ? C.t("dataValidation.panel.rangeError") : "",
+        label: I.t("dataValidation.panel.range"),
+        error: !p.ranges.length || v ? I.t("dataValidation.panel.rangeError") : "",
         children: /* @__PURE__ */ m(
           Ga,
           {
@@ -842,23 +842,23 @@ function Ui() {
             subUnitId: i,
             initialValue: nt,
             onChange: (M, D) => {
-              var k;
-              !P && ((k = O.current) != null && k.verify()) && x(D);
+              var F;
+              !P && ((F = O.current) != null && F.verify()) && x(D);
             },
             onFocusChange: (M, D) => {
-              var k;
-              U(M), !M && D && ((k = O.current) != null && k.verify()) && x(D);
+              var F;
+              U(M), !M && D && ((F = O.current) != null && F.verify()) && x(D);
             },
             onVerify: (M) => y(!M)
           }
         )
       }
     ),
-    /* @__PURE__ */ m(q, { label: C.t("dataValidation.panel.type"), children: /* @__PURE__ */ m(
+    /* @__PURE__ */ m(q, { label: I.t("dataValidation.panel.type"), children: /* @__PURE__ */ m(
       en,
       {
         options: _ == null ? void 0 : _.map((M) => ({
-          label: C.t(M.title),
+          label: I.t(M.title),
           value: M.id
         })),
         value: p.type,
@@ -866,12 +866,12 @@ function Ui() {
         className: jt.dataValidationDetailFormItem
       }
     ) }),
-    A != null && A.length ? /* @__PURE__ */ m(q, { label: C.t("dataValidation.panel.operator"), children: /* @__PURE__ */ m(
+    A != null && A.length ? /* @__PURE__ */ m(q, { label: I.t("dataValidation.panel.operator"), children: /* @__PURE__ */ m(
       en,
       {
         options: A.map((M, D) => ({
           value: `${M}`,
-          label: F[D]
+          label: k[D]
         })),
         value: `${p.operator}`,
         onChange: (M) => {
@@ -916,13 +916,13 @@ function Ui() {
             allowBlank: !((M = p.allowBlank) == null || M)
           });
         },
-        children: C.t("dataValidation.panel.allowBlank")
+        children: I.t("dataValidation.panel.allowBlank")
       }
     ) }),
     /* @__PURE__ */ m(Li, { value: st, onChange: it, extraComponent: w.optionsInput }),
     /* @__PURE__ */ Y("div", { className: jt.dataValidationDetailButtons, children: [
-      /* @__PURE__ */ m(Bt, { className: jt.dataValidationDetailButton, onClick: H, children: C.t("dataValidation.panel.removeRule") }),
-      /* @__PURE__ */ m(Bt, { className: jt.dataValidationDetailButton, type: "primary", onClick: B, children: C.t("dataValidation.panel.done") })
+      /* @__PURE__ */ m(Bt, { className: jt.dataValidationDetailButton, onClick: H, children: I.t("dataValidation.panel.removeRule") }),
+      /* @__PURE__ */ m(Bt, { className: jt.dataValidationDetailButton, type: "primary", onClick: B, children: I.t("dataValidation.panel.done") })
     ] })
   ] });
 }
@@ -932,7 +932,7 @@ const Bi = "univer-data-validation-item-container", $i = "univer-data-validation
   dataValidationItemContent: Wi,
   dataValidationItemIcon: Hi
 }, xi = (t) => {
-  const { rule: e, onClick: o, unitId: n, subUnitId: a, disable: i } = t, r = T(bt), s = T(tt), l = T(ba), c = r.getValidatorItem(e.type), u = Jt(void 0), [h, d] = j(!1), C = T(zn), p = St(C.currentTheme$), R = $t(() => {
+  const { rule: e, onClick: o, unitId: n, subUnitId: a, disable: i } = t, r = T(bt), s = T(tt), l = T(ba), c = r.getValidatorItem(e.type), u = Jt(void 0), [h, d] = j(!1), I = T(zn), p = St(I.currentTheme$), R = $t(() => {
     var _;
     const g = (_ = p == null ? void 0 : p.loopColor2) != null ? _ : "#49B811", f = new Jo(g).toRgb();
     return {
@@ -992,7 +992,7 @@ function zi(t) {
       f.unsubscribe();
     };
   }, [h, d, e]);
-  const C = async () => {
+  const I = async () => {
     const f = lo(a), _ = {
       unitId: h,
       subUnitId: d,
@@ -1009,8 +1009,8 @@ function zi(t) {
       subUnitId: d
     });
   }, w = ((f) => {
-    const _ = o.getCurrentUnitForType(X.UNIVER_SHEET), V = _.getActiveSheet(), S = _.getUnitId(), I = V.getSheetId();
-    return f.map((y) => fa(a, S, I, y.ranges) ? { ...y } : { ...y, disable: !0 });
+    const _ = o.getCurrentUnitForType(X.UNIVER_SHEET), V = _.getActiveSheet(), S = _.getUnitId(), C = V.getSheetId();
+    return f.map((y) => fa(a, S, C, y.ranges) ? { ...y } : { ...y, disable: !0 });
   })(s), g = w == null ? void 0 : w.some((f) => f.disable);
   return /* @__PURE__ */ Y("div", { className: me.dataValidationList, children: [
     w == null ? void 0 : w.map((f) => {
@@ -1035,7 +1035,7 @@ function zi(t) {
     }),
     /* @__PURE__ */ Y("div", { className: me.dataValidationListButtons, children: [
       s.length && !g ? /* @__PURE__ */ m(Bt, { className: me.dataValidationListButton, onClick: p, children: r.t("dataValidation.panel.removeAll") }) : null,
-      /* @__PURE__ */ m(Bt, { className: me.dataValidationListButton, type: "primary", onClick: C, children: r.t("dataValidation.panel.add") })
+      /* @__PURE__ */ m(Bt, { className: me.dataValidationListButton, type: "primary", onClick: I, children: r.t("dataValidation.panel.add") })
     ] })
   ] });
 }
@@ -1143,12 +1143,12 @@ let Qt = class extends Vt {
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
     const t = () => ({ redos: [], undos: [] }), e = (n, a) => {
-      const { source: i, target: r, unitId: s, subUnitId: l } = n, c = this._sheetDataValidationModel.getRuleObjectMatrix(s, l).clone(), u = sn([i, r]), [h, d] = u.ranges, { mapFunc: C } = u, p = {
+      const { source: i, target: r, unitId: s, subUnitId: l } = n, c = this._sheetDataValidationModel.getRuleObjectMatrix(s, l).clone(), u = sn([i, r]), [h, d] = u.ranges, { mapFunc: I } = u, p = {
         row: h.startRow,
         col: h.startColumn
       }, R = Aa(h, d), w = new Ie(), g = /* @__PURE__ */ new Set();
-      R.forEach((I) => {
-        const v = I.repeatStartCell, y = I.relativeRange, P = {
+      R.forEach((C) => {
+        const v = C.repeatStartCell, y = C.relativeRange, P = {
           startRow: p.row,
           startColumn: p.col,
           endColumn: p.col,
@@ -1168,7 +1168,7 @@ let Qt = class extends Vt {
               endRow: O
             },
             P
-          ), { row: F, col: N } = C(A.startRow, A.startColumn), B = this._sheetDataValidationModel.getRuleIdByLocation(s, l, F, N) || "", x = we.getPositionRange(
+          ), { row: k, col: N } = I(A.startRow, A.startColumn), B = this._sheetDataValidationModel.getRuleIdByLocation(s, l, k, N) || "", x = we.getPositionRange(
             {
               startRow: O,
               startColumn: L,
@@ -1176,11 +1176,11 @@ let Qt = class extends Vt {
               endRow: O
             },
             U
-          ), { row: z, col: H } = C(x.startRow, x.startColumn);
+          ), { row: z, col: H } = I(x.startRow, x.startColumn);
           w.setValue(z, H, B), g.add(B);
         });
       });
-      const f = Array.from(g).map((I) => ({ id: I, ranges: Qe(w, (v) => v === I) }));
+      const f = Array.from(g).map((C) => ({ id: C, ranges: Qe(w, (v) => v === C) }));
       c.addRangeRules(f);
       const _ = c.diff(this._sheetDataValidationModel.getRules(s, l)), { redoMutations: V, undoMutations: S } = an(s, l, _, this._injector, "patched", a === se.ONLY_FORMAT);
       return {
@@ -1268,11 +1268,11 @@ let te = class extends Vt {
       return { redos: [], undos: [] };
     const { unitId: a, subUnitId: i } = this._copyInfo;
     if (o.unitId !== a || i !== o.subUnitId) {
-      const r = this._sheetDataValidationModel.getRuleObjectMatrix(o.unitId, o.subUnitId).clone(), s = new Ie(), l = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = sn([o.copyRange, e]), d = Pn(c, u, !0), C = /* @__PURE__ */ new Map();
+      const r = this._sheetDataValidationModel.getRuleObjectMatrix(o.unitId, o.subUnitId).clone(), s = new Ie(), l = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = sn([o.copyRange, e]), d = Pn(c, u, !0), I = /* @__PURE__ */ new Map();
       d.forEach(({ startRange: g }) => {
         var f;
         (f = this._copyInfo) == null || f.matrix.forValue((_, V, S) => {
-          const I = we.getPositionRange(
+          const C = we.getPositionRange(
             {
               startRow: _,
               endRow: _,
@@ -1281,8 +1281,8 @@ let te = class extends Vt {
             },
             g
           ), v = `${i}-${S}`, y = this._sheetDataValidationModel.getRuleById(a, i, S);
-          !this._sheetDataValidationModel.getRuleById(o.unitId, o.subUnitId, v) && y && C.set(v, { ...y, uid: v });
-          const { row: P, col: U } = h(I.startRow, I.startColumn);
+          !this._sheetDataValidationModel.getRuleById(o.unitId, o.subUnitId, v) && y && I.set(v, { ...y, uid: v });
+          const { row: P, col: U } = h(C.startRow, C.startColumn);
           l.add(v), s.setValue(P, U, v);
         });
       });
@@ -1291,7 +1291,7 @@ let te = class extends Vt {
       const { redoMutations: R, undoMutations: w } = an(
         o.unitId,
         o.subUnitId,
-        r.diffWithAddition(this._sheetDataValidationModel.getRules(o.unitId, o.subUnitId), C.values()),
+        r.diffWithAddition(this._sheetDataValidationModel.getRules(o.unitId, o.subUnitId), I.values()),
         this._injector,
         "patched",
         !1
@@ -1313,12 +1313,12 @@ let te = class extends Vt {
               endColumn: _
             },
             w
-          ), { row: I, col: v } = h(S.startRow, S.startColumn);
-          s.setValue(I, v, V), l.add(V);
+          ), { row: C, col: v } = h(S.startRow, S.startColumn);
+          s.setValue(C, v, V), l.add(V);
         });
       });
-      const C = Array.from(l).map((w) => ({ id: w, ranges: Qe(s, (g) => g === w) }));
-      r.addRangeRules(C);
+      const I = Array.from(l).map((w) => ({ id: w, ranges: Qe(s, (g) => g === w) }));
+      r.addRangeRules(I);
       const { redoMutations: p, undoMutations: R } = an(
         a,
         i,
@@ -1335,7 +1335,7 @@ let te = class extends Vt {
   }
 };
 te = tr([
-  xe(0, ka),
+  xe(0, Fa),
   xe(1, b(at)),
   xe(2, b(Wt))
 ], te);
@@ -1377,7 +1377,7 @@ function or(t) {
     icon: Lo,
     tooltip: "dataValidation.title",
     hidden$: Ba(t, X.UNIVER_SHEET),
-    disabled$: Fa(t, { workbookTypes: [Ve], worksheetTypes: [on, Re], rangeTypes: [De] })
+    disabled$: ka(t, { workbookTypes: [Ve], worksheetTypes: [on, Re], rangeTypes: [De] })
   };
 }
 function ar(t) {
@@ -1489,17 +1489,17 @@ let ne = class extends gn {
             const u = this._sheetDataValidationModel.getRuleById(i, r, c);
             if (!u)
               return o(t);
-            const h = (g = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? g : Kt.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), C = e.rawData;
+            const h = (g = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? g : Kt.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), I = e.rawData;
             let p;
             const R = {
               get value() {
-                var I;
-                return p !== void 0 || (p = (I = mt(C)) != null ? I : null), p;
+                var C;
+                return p !== void 0 || (p = (C = mt(I)) != null ? C : null), p;
               }
             }, w = {
               get value() {
-                var I;
-                return `${(I = R.value) != null ? I : ""}`;
+                var C;
+                return `${(C = R.value) != null ? C : ""}`;
               }
             };
             return o({
@@ -1520,20 +1520,20 @@ let ne = class extends gn {
                 ...t == null ? void 0 : t.interceptorStyle,
                 ...d == null ? void 0 : d.getExtraStyle(u, w.value, {
                   get style() {
-                    const I = s.getStyles();
-                    return (typeof (t == null ? void 0 : t.s) == "string" ? I.get(t == null ? void 0 : t.s) : t == null ? void 0 : t.s) || {};
+                    const C = s.getStyles();
+                    return (typeof (t == null ? void 0 : t.s) == "string" ? C.get(t == null ? void 0 : t.s) : t == null ? void 0 : t.s) || {};
                   }
                 }, n, a)
               },
               interceptorAutoHeight: () => {
-                var P, U, O, L, A, F;
-                const I = (U = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(ye).getSkeletonParam(r)) == null ? void 0 : U.skeleton;
-                if (!I)
+                var P, U, O, L, A, k;
+                const C = (U = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(ye).getSkeletonParam(r)) == null ? void 0 : U.skeleton;
+                if (!C)
                   return;
-                const v = I.worksheet.getMergedCell(n, a), y = {
+                const v = C.worksheet.getMergedCell(n, a), y = {
                   data: t,
-                  style: I.getStyles().getStyleByCell(t),
-                  primaryWithCoord: I.getCellWithCoordByIndex((O = v == null ? void 0 : v.startRow) != null ? O : n, (L = v == null ? void 0 : v.startColumn) != null ? L : a),
+                  style: C.getStyles().getStyleByCell(t),
+                  primaryWithCoord: C.getCellWithCoordByIndex((O = v == null ? void 0 : v.startRow) != null ? O : n, (L = v == null ? void 0 : v.startColumn) != null ? L : a),
                   unitId: i,
                   subUnitId: r,
                   row: n,
@@ -1541,17 +1541,17 @@ let ne = class extends gn {
                   workbook: s,
                   worksheet: l
                 };
-                return (F = (A = d == null ? void 0 : d.canvasRender) == null ? void 0 : A.calcCellAutoHeight) == null ? void 0 : F.call(A, y);
+                return (k = (A = d == null ? void 0 : d.canvasRender) == null ? void 0 : A.calcCellAutoHeight) == null ? void 0 : k.call(A, y);
               },
               interceptorAutoWidth: () => {
-                var P, U, O, L, A, F;
-                const I = (U = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(ye).getSkeletonParam(r)) == null ? void 0 : U.skeleton;
-                if (!I)
+                var P, U, O, L, A, k;
+                const C = (U = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(ye).getSkeletonParam(r)) == null ? void 0 : U.skeleton;
+                if (!C)
                   return;
-                const v = I.worksheet.getMergedCell(n, a), y = {
+                const v = C.worksheet.getMergedCell(n, a), y = {
                   data: t,
-                  style: I.getStyles().getStyleByCell(t),
-                  primaryWithCoord: I.getCellWithCoordByIndex((O = v == null ? void 0 : v.startRow) != null ? O : n, (L = v == null ? void 0 : v.startColumn) != null ? L : a),
+                  style: C.getStyles().getStyleByCell(t),
+                  primaryWithCoord: C.getCellWithCoordByIndex((O = v == null ? void 0 : v.startRow) != null ? O : n, (L = v == null ? void 0 : v.startColumn) != null ? L : a),
                   unitId: i,
                   subUnitId: r,
                   row: n,
@@ -1559,7 +1559,7 @@ let ne = class extends gn {
                   workbook: s,
                   worksheet: l
                 };
-                return (F = (A = d == null ? void 0 : d.canvasRender) == null ? void 0 : A.calcCellAutoWidth) == null ? void 0 : F.call(A, y);
+                return (k = (A = d == null ? void 0 : d.canvasRender) == null ? void 0 : A.calcCellAutoWidth) == null ? void 0 : k.call(A, y);
               },
               coverable: ((S = t == null ? void 0 : t.coverable) != null ? S : !0) && !(u.type === K.LIST || u.type === K.LIST_MULTIPLE)
             });
@@ -1622,7 +1622,7 @@ let $n = class extends gn {
             const u = this._sheetDataValidationModel.getRuleById(i, r, c);
             if (!u)
               return o(t);
-            const h = (w = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? w : Kt.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), C = l.getCellRaw(n, a), p = mt(C), R = `${p != null ? p : ""}`;
+            const h = (w = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? w : Kt.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), I = l.getCellRaw(n, a), p = mt(I), R = `${p != null ? p : ""}`;
             return o({
               ...t,
               markers: {
@@ -1651,10 +1651,10 @@ let $n = class extends gn {
                 const S = (P = (y = this._renderManagerService.getRenderById(i)) == null ? void 0 : y.with(ye).getSkeletonParam(r)) == null ? void 0 : P.skeleton;
                 if (!S)
                   return;
-                const I = S.worksheet.getMergedCell(n, a), v = {
+                const C = S.worksheet.getMergedCell(n, a), v = {
                   data: t,
                   style: S.getStyles().getStyleByCell(t),
-                  primaryWithCoord: S.getCellWithCoordByIndex((U = I == null ? void 0 : I.startRow) != null ? U : n, (O = I == null ? void 0 : I.startColumn) != null ? O : a),
+                  primaryWithCoord: S.getCellWithCoordByIndex((U = C == null ? void 0 : C.startRow) != null ? U : n, (O = C == null ? void 0 : C.startColumn) != null ? O : a),
                   unitId: i,
                   subUnitId: r,
                   row: n,
@@ -1828,11 +1828,10 @@ function Cr(t) {
 }
 function Ir(t) {
   var h;
-  const { unitId: e, subUnitId: o, value: n, onChange: a, showError: i, validResult: r } = t, s = i ? r == null ? void 0 : r.formula1 : void 0, l = Jt({}), [c, u] = j(!1);
+  const { unitId: e, subUnitId: o, value: n, onChange: a, showError: i, validResult: r } = t, s = i ? r == null ? void 0 : r.formula1 : void 0, l = Jt(null), [c, u] = j(!1);
   return fo((d) => {
     var p;
-    const C = (p = l.current) == null ? void 0 : p.handleOutClick;
-    C && C(d, () => u(!1));
+    ((p = l.current) == null ? void 0 : p.isClickOutSide(d)) && u(!1);
   }), /* @__PURE__ */ m(
     So,
     {
@@ -1841,16 +1840,16 @@ function Ir(t) {
       subUnitId: o,
       isFocus: c,
       onChange: (d) => {
-        const C = (d != null ? d : "").trim();
-        C !== (n == null ? void 0 : n.formula1) && (a == null || a({
+        const I = (d != null ? d : "").trim();
+        I !== (n == null ? void 0 : n.formula1) && (a == null || a({
           ...n,
-          formula1: C
+          formula1: I
         }));
       },
       errorText: s,
       onFocus: () => u(!0),
-      actions: l.current,
-      isSupportAcrossSheet: !0
+      isSupportAcrossSheet: !0,
+      ref: l
     }
   );
 }
@@ -1942,43 +1941,43 @@ const wr = [
 };
 function Dr(t) {
   const { value: e, onChange: o = () => {
-  }, unitId: n, subUnitId: a, validResult: i, showError: r, ruleId: s } = t, { formula1: l = "", formula2: c = "" } = e || {}, u = Jt(null), [h, d] = j(() => kt(l) ? "1" : "0"), [C, p] = j(h === "1" ? l : "="), [R, w] = j(h === "1" ? l : "="), g = T(Q), f = T(bt), _ = T(ke), V = T(wa), [S, I] = j(() => c.split(",")), v = f.getValidatorItem(K.LIST), [y, P] = j([]), [U, O] = j(""), L = r ? i == null ? void 0 : i.formula1 : "", A = $t(() => _.ruleChange$.pipe(wn(16)), []), F = St(A), N = dn(o);
+  }, unitId: n, subUnitId: a, validResult: i, showError: r, ruleId: s } = t, { formula1: l = "", formula2: c = "" } = e || {}, u = Jt(null), [h, d] = j(() => Ft(l) ? "1" : "0"), [I, p] = j(h === "1" ? l : "="), [R, w] = j(h === "1" ? l : "="), g = T(Q), f = T(bt), _ = T(Fe), V = T(wa), [S, C] = j(() => c.split(",")), v = f.getValidatorItem(K.LIST), [y, P] = j([]), [U, O] = j(""), L = r ? i == null ? void 0 : i.formula1 : "", A = $t(() => _.ruleChange$.pipe(wn(16)), []), k = St(A), N = dn(o);
   wt(() => {
     (async () => {
       await new Promise(($) => {
         setTimeout(() => $(!0), 100);
       });
-      const D = _.getRuleById(n, a, s), k = D == null ? void 0 : D.formula1;
-      if (kt(k) && v && D) {
+      const D = _.getRuleById(n, a, s), F = D == null ? void 0 : D.formula1;
+      if (Ft(F) && v && D) {
         const $ = await v.getListAsync(D, n, a);
         P($);
       }
     })();
-  }, [_, F, v, s, a, n]), wt(() => {
-    kt(l) && l !== R && (p(l), w(R));
+  }, [_, k, v, s, a, n]), wt(() => {
+    Ft(l) && l !== R && (p(l), w(R));
   }, [R, l]);
   const [B, x] = j(() => {
-    const D = h !== "1" ? ao(l) : [], k = c.split(",");
+    const D = h !== "1" ? ao(l) : [], F = c.split(",");
     return D.map(($, W) => ({
       label: $,
-      color: k[W] || Ft,
+      color: F[W] || kt,
       isRef: !1,
       id: tn.generateRandomId(4)
     }));
-  }), z = (D, k, $) => {
+  }), z = (D, F, $) => {
     const W = B.find((Ct) => Ct.id === D);
-    W && (W.label = k, W.color = $, x([...B]));
+    W && (W.label = F, W.color = $, x([...B]));
   }, H = (D) => {
-    const k = B.findIndex(($) => $.id === D);
-    k !== -1 && (B.splice(k, 1), x([...B]));
-  }, G = c.split(","), J = $t(() => y.map((D, k) => ({
+    const F = B.findIndex(($) => $.id === D);
+    F !== -1 && (B.splice(F, 1), x([...B]));
+  }, G = c.split(","), J = $t(() => y.map((D, F) => ({
     label: D,
-    color: G[k] || Ft,
-    id: `${k}`,
+    color: G[F] || kt,
+    id: `${F}`,
     isRef: !0
-  })), [G, y]), et = (D, k, $) => {
+  })), [G, y]), et = (D, F, $) => {
     const W = [...S];
-    W[+D] = $, I(W), N({
+    W[+D] = $, C(W), N({
       formula1: l,
       formula2: W.join(",")
     });
@@ -1987,7 +1986,7 @@ function Dr(t) {
       ...B,
       {
         label: "",
-        color: Ft,
+        color: kt,
         isRef: !1,
         id: tn.generateRandomId(4)
       }
@@ -1996,24 +1995,24 @@ function Dr(t) {
   wt(() => {
     if (h === "1")
       return;
-    const D = /* @__PURE__ */ new Set(), k = [];
+    const D = /* @__PURE__ */ new Set(), F = [];
     B.map(($) => ({
       labelList: $.label.split(","),
       item: $
     })).forEach(({ item: $, labelList: W }) => {
       W.forEach((Ct) => {
-        D.has(Ct) || (D.add(Ct), k.push({
+        D.has(Ct) || (D.add(Ct), F.push({
           label: Ct,
           color: $.color
         }));
       });
     }), N({
-      formula1: io(k.map(($) => $.label)),
-      formula2: k.map(($) => $.color === Ft ? "" : $.color).join(",")
+      formula1: io(F.map(($) => $.label)),
+      formula2: F.map(($) => $.color === kt ? "" : $.color).join(",")
     });
   }, [B, N, h, R, S]);
   const st = dn(async (D) => {
-    if (!kt(D)) {
+    if (!Ft(D)) {
       N == null || N({
         formula1: "",
         formula2: c
@@ -2021,17 +2020,16 @@ function Dr(t) {
       return;
     }
     V.getFormulaRefCheck(D) ? (N == null || N({
-      formula1: kt(D) ? D : "",
+      formula1: Ft(D) ? D : "",
       formula2: c
     }), O("")) : (N == null || N({
       formula1: "",
       formula2: c
     }), p("="), O(g.t("dataValidation.validFail.formulaError")));
-  }), it = Jt({}), [lt, M] = j(!1);
+  }), it = Jt(null), [lt, M] = j(!1);
   return fo((D) => {
     var $;
-    const k = ($ = it.current) == null ? void 0 : $.handleOutClick;
-    k && k(D, () => M(!1));
+    (($ = it.current) == null ? void 0 : $.isClickOutSide(D)) && M(!1);
   }), /* @__PURE__ */ Y(Rt, { children: [
     /* @__PURE__ */ m(q, { label: g.t("dataValidation.list.options"), children: /* @__PURE__ */ Y(
       fn,
@@ -2053,18 +2051,18 @@ function Dr(t) {
       /* @__PURE__ */ m(
         So,
         {
-          initValue: C,
+          initValue: I,
           unitId: n,
           subUnitId: a,
           isFocus: lt,
           onChange: (D = "") => {
-            const k = (D != null ? D : "").trim();
-            w(k), st(k);
+            const F = (D != null ? D : "").trim();
+            w(F), st(F);
           },
           errorText: L || U || void 0,
           onFocus: () => M(!0),
-          actions: it.current,
-          isSupportAcrossSheet: !0
+          isSupportAcrossSheet: !0,
+          ref: it
         }
       ),
       /* @__PURE__ */ m("div", { ref: u, style: { marginTop: "12px" }, children: J.map((D) => /* @__PURE__ */ m(Hn, { item: D, commonProps: { onItemChange: et }, style: { marginBottom: 12 } }, D.id)) })
@@ -2098,9 +2096,9 @@ function Dr(t) {
     ] }) })
   ] });
 }
-const ko = "data-validation.custom-formula-input", Ue = "data-validation.formula-input", Mn = "data-validation.list-formula-input", Fo = "data-validation.checkbox-formula-input", Vr = [
+const Fo = "data-validation.custom-formula-input", Ue = "data-validation.formula-input", Mn = "data-validation.list-formula-input", ko = "data-validation.checkbox-formula-input", Vr = [
   [
-    ko,
+    Fo,
     Ir
   ],
   [
@@ -2112,7 +2110,7 @@ const ko = "data-validation.custom-formula-input", Ue = "data-validation.formula
     Dr
   ],
   [
-    Fo,
+    ko,
     Cr
   ]
 ], yr = "LIST_RENDER_MODE_OPTION_INPUT";
@@ -2202,23 +2200,23 @@ let cn = class {
     return ((o = e == null ? void 0 : e.fs) != null ? o : 10) * 1.6;
   }
   async _parseFormula(t, e, o) {
-    var c, u, h, d, C, p, R, w, g;
-    const { formula1: n = Va, formula2: a = Da } = t, i = await this._formulaService.getRuleFormulaResult(e, o, t.uid), r = $e((h = (u = (c = i == null ? void 0 : i[0]) == null ? void 0 : c.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), s = $e((p = (C = (d = i == null ? void 0 : i[1]) == null ? void 0 : d.result) == null ? void 0 : C[0]) == null ? void 0 : p[0]), l = Ln(String(r)) && Ln(String(s));
+    var c, u, h, d, I, p, R, w, g;
+    const { formula1: n = Va, formula2: a = Da } = t, i = await this._formulaService.getRuleFormulaResult(e, o, t.uid), r = $e((h = (u = (c = i == null ? void 0 : i[0]) == null ? void 0 : c.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), s = $e((p = (I = (d = i == null ? void 0 : i[1]) == null ? void 0 : d.result) == null ? void 0 : I[0]) == null ? void 0 : p[0]), l = Ln(String(r)) && Ln(String(s));
     return {
-      formula1: kt(n) ? $e((g = (w = (R = i == null ? void 0 : i[0]) == null ? void 0 : R.result) == null ? void 0 : w[0]) == null ? void 0 : g[0]) : n,
-      formula2: kt(a) ? s : a,
+      formula1: Ft(n) ? $e((g = (w = (R = i == null ? void 0 : i[0]) == null ? void 0 : R.result) == null ? void 0 : w[0]) == null ? void 0 : g[0]) : n,
+      formula2: Ft(a) ? s : a,
       isFormulaValid: l
     };
   }
   drawWith(t, e) {
-    var L, A, F, N;
+    var L, A, k, N;
     const { style: o, primaryWithCoord: n, unitId: a, subUnitId: i, worksheet: r, row: s, col: l } = e, c = n.isMergedMainCell ? n.mergeInfo : n, u = mt(r.getCellRaw(s, l)), h = this._dataValidationModel.getRuleByLocation(a, i, s, l);
     if (!h)
       return;
     const d = this._dataValidationModel.getValidator(h.type);
     if (!d)
       return;
-    const C = this._themeService.getCurrentTheme();
+    const I = this._themeService.getCurrentTheme();
     if (!((L = d.skipDefaultFontRender) != null && L.call(d, h, u, { unitId: a, subUnitId: i, row: s, column: l })))
       return;
     const p = d.parseFormulaSync(h, a, i), { formula1: R } = p, w = this._calc(c, o), { a: g, d: f } = t.getTransform(), _ = bn(w.left, g), V = bn(w.top, f), S = la.create().composeMatrix({
@@ -2231,16 +2229,16 @@ let cn = class {
       skewY: 0,
       flipX: !1,
       flipY: !1
-    }), I = c.endX - c.startX, v = c.endY - c.startY;
-    t.save(), t.beginPath(), t.rect(c.startX, c.startY, I, v), t.clip();
+    }), C = c.endX - c.startX, v = c.endY - c.startY;
+    t.save(), t.beginPath(), t.rect(c.startX, c.startY, C, v), t.clip();
     const y = S.getMatrix();
     t.transform(y[0], y[1], y[2], y[3], y[4], y[5]);
-    const P = ((A = o == null ? void 0 : o.fs) != null ? A : 10) * 1.6, U = String(u) === String(R), O = C.hyacinth500;
+    const P = ((A = o == null ? void 0 : o.fs) != null ? A : 10) * 1.6, U = String(u) === String(R), O = I.hyacinth500;
     da.drawWith(t, {
       checked: U,
       width: P,
       height: P,
-      fill: (N = (F = o == null ? void 0 : o.cl) == null ? void 0 : F.rgb) != null ? N : O
+      fill: (N = (k = o == null ? void 0 : o.cl) == null ? void 0 : k.rgb) != null ? N : O
     }), t.restore();
   }
   isHit(t, e) {
@@ -2257,7 +2255,7 @@ let cn = class {
     const u = this._dataValidationModel.getValidator(c.type);
     if (!u || !((p = u.skipDefaultFontRender) != null && p.call(u, c, l, { unitId: n, subUnitId: a, row: r, column: s })))
       return;
-    const { formula1: h, formula2: d } = await this._parseFormula(c, n, a), C = {
+    const { formula1: h, formula2: d } = await this._parseFormula(c, n, a), I = {
       range: {
         startColumn: o.actualColumn,
         endColumn: o.actualColumn,
@@ -2271,7 +2269,7 @@ let cn = class {
     };
     this._commandService.executeCommand(
       _n.id,
-      C
+      I
     );
   }
   onPointerEnter(t, e) {
@@ -2313,22 +2311,22 @@ class Pr extends vt {
     super(...arguments);
     E(this, "id", K.CHECKBOX);
     E(this, "canvasRender", this.injector.createInstance(cn));
-    E(this, "formulaInput", Fo);
+    E(this, "formulaInput", ko);
   }
 }
 class Ar extends vt {
   constructor() {
     super(...arguments);
     E(this, "id", K.CUSTOM);
-    E(this, "formulaInput", ko);
+    E(this, "formulaInput", Fo);
   }
 }
-const kr = "data-validation.formula-input";
-class Fr extends vt {
+const Fr = "data-validation.formula-input";
+class kr extends vt {
   constructor() {
     super(...arguments);
     E(this, "id", K.DATE);
-    E(this, "formulaInput", kr);
+    E(this, "formulaInput", Fr);
     E(this, "optionsInput", Le.componentKey);
     E(this, "dropdown", Oo);
   }
@@ -2357,7 +2355,7 @@ function Xe(t, e, o, n) {
   let l;
   const c = [];
   s.forEach((d) => {
-    const { layout: C } = d, { width: p, height: R } = C;
+    const { layout: I } = d, { width: p, height: R } = I;
     !l || l.width + p + Ye > i ? (l = {
       width: p,
       height: R,
@@ -2371,8 +2369,8 @@ function Xe(t, e, o, n) {
     }), l.width = l.width + p + Ye);
   });
   let u = 0, h = 0;
-  return c.forEach((d, C) => {
-    h = Math.max(h, d.width), C === c.length - 1 ? u += d.height : u += d.height + Uo;
+  return c.forEach((d, I) => {
+    h = Math.max(h, d.width), I === c.length - 1 ? u += d.height : u += d.height + Uo;
   }), {
     lines: c,
     totalHeight: u,
@@ -2390,7 +2388,7 @@ class Wr extends ua {
       width: s.width,
       height: s.height,
       radius: $r,
-      fill: i || Ft
+      fill: i || kt
     }), e.translateWithPrecision(No, s.ba), e.font = n, e.fillStyle = r, e.fillText(l, 0, 0), e.restore();
   }
 }
@@ -2429,7 +2427,7 @@ let hn = class {
   // eslint-disable-next-line max-lines-per-function
   drawWith(t, e, o, n) {
     var z, H;
-    const { primaryWithCoord: a, row: i, col: r, style: s, data: l, subUnitId: c } = e, u = a.isMergedMainCell ? a.mergeInfo : a, h = l == null ? void 0 : l.fontRenderExtension, { leftOffset: d = 0, rightOffset: C = 0, topOffset: p = 0, downOffset: R = 0 } = h || {}, w = this._ensureMap(c), g = this._generateKey(i, r), f = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, r);
+    const { primaryWithCoord: a, row: i, col: r, style: s, data: l, subUnitId: c } = e, u = a.isMergedMainCell ? a.mergeInfo : a, h = l == null ? void 0 : l.fontRenderExtension, { leftOffset: d = 0, rightOffset: I = 0, topOffset: p = 0, downOffset: R = 0 } = h || {}, w = this._ensureMap(c), g = this._generateKey(i, r), f = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, r);
     if (!f)
       return;
     const _ = this._dataValidationModel.getValidator(f.type);
@@ -2437,11 +2435,11 @@ let hn = class {
       return;
     const V = {
       startX: u.startX + d,
-      endX: u.endX - C,
+      endX: u.endX - I,
       startY: u.startY + p,
       endY: u.endY - R
-    }, S = V.endX - V.startX, I = V.endY - V.startY, { cl: v } = s || {}, y = (z = typeof v == "object" ? v == null ? void 0 : v.rgb : v) != null ? z : "#000", P = Be(s != null ? s : void 0), { vt: U, ht: O } = s || {}, L = U != null ? U : ht.MIDDLE, A = (H = mt(l)) != null ? H : "", F = _.parseCellValue(A), N = _.getListWithColorMap(f), B = Xe(F, P, S, I);
-    this._drawDownIcon(t, V, S, I, L), t.save(), t.translateWithPrecision(V.startX, V.startY), t.beginPath(), t.rect(0, 0, S - At, I), t.clip(), t.translateWithPrecision(un, Te);
+    }, S = V.endX - V.startX, C = V.endY - V.startY, { cl: v } = s || {}, y = (z = typeof v == "object" ? v == null ? void 0 : v.rgb : v) != null ? z : "#000", P = Be(s != null ? s : void 0), { vt: U, ht: O } = s || {}, L = U != null ? U : ht.MIDDLE, A = (H = mt(l)) != null ? H : "", k = _.parseCellValue(A), N = _.getListWithColorMap(f), B = Xe(k, P, S, C);
+    this._drawDownIcon(t, V, S, C, L), t.save(), t.translateWithPrecision(V.startX, V.startY), t.beginPath(), t.rect(0, 0, S - At, C), t.clip(), t.translateWithPrecision(un, Te);
     let x = 0;
     switch (L) {
       case ht.MIDDLE:
@@ -2485,10 +2483,10 @@ let hn = class {
       endX: h.endX - l,
       startY: h.startY + c,
       endY: h.endY - u
-    }, C = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
-    if (!C)
+    }, I = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
+    if (!I)
       return;
-    const p = this._dataValidationModel.getValidator(C.type);
+    const p = this._dataValidationModel.getValidator(I.type);
     if (!p)
       return;
     const R = d.endX - d.startX, w = d.endY - d.startY, g = (S = mt(n)) != null ? S : "", f = p.parseCellValue(g), _ = Be(o != null ? o : void 0);
@@ -2501,10 +2499,10 @@ let hn = class {
       endX: h.endX - l,
       startY: h.startY + c,
       endY: h.endY - u
-    }, C = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
-    if (!C)
+    }, I = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
+    if (!I)
       return;
-    const p = this._dataValidationModel.getValidator(C.type);
+    const p = this._dataValidationModel.getValidator(I.type);
     if (!p)
       return;
     const R = d.endX - d.startX, w = d.endY - d.startY, g = (S = mt(n)) != null ? S : "", f = p.parseCellValue(g), _ = Be(o != null ? o : void 0);
@@ -2523,7 +2521,7 @@ let hn = class {
       row: a,
       column: i
     };
-    this._commandService.executeCommand(Fe.id, r);
+    this._commandService.executeCommand(ke.id, r);
   }
   onPointerEnter(t, e) {
     var o, n;
@@ -2684,39 +2682,39 @@ let pn = class {
     const h = this._dataValidationModel.getValidator(u.type);
     if (!h)
       return;
-    const d = s == null ? void 0 : s.fontRenderExtension, { leftOffset: C = 0, rightOffset: p = 0, topOffset: R = 0, downOffset: w = 0 } = d || {};
+    const d = s == null ? void 0 : s.fontRenderExtension, { leftOffset: I = 0, rightOffset: p = 0, topOffset: R = 0, downOffset: w = 0 } = d || {};
     if (!u || !h || !h || h.id.indexOf(K.LIST) !== 0 || !h.skipDefaultFontRender(u))
       return;
     const g = {
-      startX: c.startX + C,
+      startX: c.startX + I,
       endX: c.endX - p,
       startY: c.startY + R,
       endY: c.endY - w
-    }, f = g.endX - g.startX, _ = g.endY - g.startY, V = this._ensureMap(l), S = this._generateKey(a, i), I = h.getListWithColor(u), v = mt(s), y = `${v != null ? v : ""}`, P = I.find((F) => F.label === y);
+    }, f = g.endX - g.startX, _ = g.endY - g.startY, V = this._ensureMap(l), S = this._generateKey(a, i), C = h.getListWithColor(u), v = mt(s), y = `${v != null ? v : ""}`, P = C.find((k) => k.label === y);
     let { tb: U, vt: O, ht: L, pd: A } = r || {};
     if (U = U != null ? U : It.WRAP, O = O != null ? O : ht.BOTTOM, L = L != null ? L : dt.ht, A = A != null ? A : dt.pd, u.renderMode === ct.ARROW) {
-      const { l: F = dt.pd.l, t: N = dt.pd.t, r: B = dt.pd.r, b: x = dt.pd.b } = A, z = f - F - B - pt - 4, { documentSkeleton: H, documents: G, docModel: J } = _e(y, this._localeService, r);
+      const { l: k = dt.pd.l, t: N = dt.pd.t, r: B = dt.pd.r, b: x = dt.pd.b } = A, z = f - k - B - pt - 4, { documentSkeleton: H, documents: G, docModel: J } = _e(y, this._localeService, r);
       U === It.WRAP && J.updateDocumentDataPageSize(Math.max(z, 1)), H.calculate(), H.getActualSize();
       const et = re(H), { height: nt, width: st } = et, { paddingTop: it, paddingLeft: lt } = jn(z, _ - N - x, st, nt, O, L, !0);
-      this._drawDownIcon(t, g, f, _, nt, O, A), t.save(), t.translateWithPrecision(g.startX + F, g.startY + N), t.beginPath(), t.rect(0, 0, f - F - B, _ - N - x), t.clip(), t.translateWithPrecision(0, it), t.save(), t.translateWithPrecision(Pt, 0), t.beginPath(), t.rect(0, 0, z, nt), t.clip(), G.render(t), t.translateWithPrecision(lt, 0), t.restore(), t.restore(), V.set(S, {
-        left: g.endX + F + o.rowHeaderWidth - pt,
+      this._drawDownIcon(t, g, f, _, nt, O, A), t.save(), t.translateWithPrecision(g.startX + k, g.startY + N), t.beginPath(), t.rect(0, 0, f - k - B, _ - N - x), t.clip(), t.translateWithPrecision(0, it), t.save(), t.translateWithPrecision(Pt, 0), t.beginPath(), t.rect(0, 0, z, nt), t.clip(), G.render(t), t.translateWithPrecision(lt, 0), t.restore(), t.restore(), V.set(S, {
+        left: g.endX + k + o.rowHeaderWidth - pt,
         top: g.startY + N + o.columnHeaderHeight,
         width: pt,
         height: _ - N - x
       });
     } else {
       t.save(), t.translateWithPrecision(g.startX, g.startY), t.beginPath(), t.rect(0, 0, f, _), t.clip();
-      const F = f - gt * 2 - Pt - pt - 4, { documentSkeleton: N, documents: B, docModel: x } = _e(y, this._localeService, r);
-      U === It.WRAP && x.updateDocumentDataPageSize(Math.max(F, 1)), N.calculate();
-      const z = re(N), { height: H, width: G } = z, { paddingTop: J, paddingLeft: et } = jn(F, _, G, H, O, L);
+      const k = f - gt * 2 - Pt - pt - 4, { documentSkeleton: N, documents: B, docModel: x } = _e(y, this._localeService, r);
+      U === It.WRAP && x.updateDocumentDataPageSize(Math.max(k, 1)), N.calculate();
+      const z = re(N), { height: H, width: G } = z, { paddingTop: J, paddingLeft: et } = jn(k, _, G, H, O, L);
       t.translateWithPrecision(gt, J);
       const nt = Math.max(f - gt * 2, 1), st = H;
       Jn.drawWith(t, {
         width: nt,
         height: st,
-        fill: (P == null ? void 0 : P.color) || Ft,
+        fill: (P == null ? void 0 : P.color) || kt,
         radius: ze
-      }), t.save(), t.translateWithPrecision(Pt, 0), t.beginPath(), t.rect(0, 0, F, H), t.clip(), t.translateWithPrecision(et, 0), B.render(t), t.restore(), t.translateWithPrecision(F + Pt + 4, (H - ve) / 2), t.fillStyle = Kr, t.fill(xn), t.restore(), V.set(S, {
+      }), t.save(), t.translateWithPrecision(Pt, 0), t.beginPath(), t.rect(0, 0, k, H), t.clip(), t.translateWithPrecision(et, 0), B.render(t), t.restore(), t.translateWithPrecision(k + Pt + 4, (H - ve) / 2), t.fillStyle = Kr, t.fill(xn), t.restore(), V.set(S, {
         left: g.startX + gt + o.rowHeaderWidth,
         top: g.startY + J + o.columnHeaderHeight,
         width: nt,
@@ -2728,23 +2726,23 @@ let pn = class {
     const { primaryWithCoord: e, style: o, data: n, row: a, col: i } = t, r = e.isMergedMainCell ? e.mergeInfo : e, s = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: h = 0 } = s || {}, d = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
     if (!d || d.renderMode === ct.TEXT)
       return;
-    const C = {
+    const I = {
       startX: r.startX + l,
       endX: r.endX - c,
       startY: r.startY + u,
       endY: r.endY - h
-    }, p = C.endX - C.startX, R = mt(n), w = `${R != null ? R : ""}`;
+    }, p = I.endX - I.startX, R = mt(n), w = `${R != null ? R : ""}`;
     let { tb: g, pd: f } = o || {};
     const { t: _ = dt.pd.t, b: V = dt.pd.b } = f != null ? f : {};
     if (g = g != null ? g : It.WRAP, d.renderMode === ct.ARROW) {
-      const S = p - pt, { documentSkeleton: I, docModel: v } = _e(w, this._localeService, o);
-      g === It.WRAP && v.updateDocumentDataPageSize(Math.max(S, 1)), I.calculate(), I.getActualSize();
-      const y = re(I), { height: P } = y;
+      const S = p - pt, { documentSkeleton: C, docModel: v } = _e(w, this._localeService, o);
+      g === It.WRAP && v.updateDocumentDataPageSize(Math.max(S, 1)), C.calculate(), C.getActualSize();
+      const y = re(C), { height: P } = y;
       return P + _ + V + zt * 2;
     } else {
-      const S = p - gt * 2 - Pt - pt, { documentSkeleton: I, docModel: v } = Bo(w, this._localeService, o);
-      g === It.WRAP && v.updateDocumentDataPageSize(Math.max(S, 1)), I.calculate();
-      const y = re(I), {
+      const S = p - gt * 2 - Pt - pt, { documentSkeleton: C, docModel: v } = Bo(w, this._localeService, o);
+      g === It.WRAP && v.updateDocumentDataPageSize(Math.max(S, 1)), C.calculate();
+      const y = re(C), {
         height: P
       } = y;
       return P + zt * 2;
@@ -2754,12 +2752,12 @@ let pn = class {
     const { primaryWithCoord: e, style: o, data: n, row: a, col: i } = t, r = e.isMergedMainCell ? e.mergeInfo : e, s = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: h = 0 } = s || {}, d = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
     if (!d || d.renderMode === ct.TEXT)
       return;
-    const C = {
+    const I = {
       startX: r.startX + l,
       endX: r.endX - c,
       startY: r.startY + u,
       endY: r.endY - h
-    }, p = C.endX - C.startX, R = mt(n), w = `${R != null ? R : ""}`;
+    }, p = I.endX - I.startX, R = mt(n), w = `${R != null ? R : ""}`;
     let { tb: g, pd: f } = o || {};
     const { l: _ = dt.pd.l, r: V = dt.pd.r } = f != null ? f : {};
     g = g != null ? g : It.WRAP;
@@ -2775,15 +2773,15 @@ let pn = class {
       default:
         S = pt + gt * 2 + Pt * 2 + V + _ + ze / 2 + 1;
     }
-    const I = p - S, { documentSkeleton: v, docModel: y } = _e(w, this._localeService, o);
-    return g === It.WRAP && y.updateDocumentDataPageSize(Math.max(I, 1)), v.calculate(), v.getActualSize(), re(v).width + S;
+    const C = p - S, { documentSkeleton: v, docModel: y } = _e(w, this._localeService, o);
+    return g === It.WRAP && y.updateDocumentDataPageSize(Math.max(C, 1)), v.calculate(), v.getActualSize(), re(v).width + S;
   }
   isHit(t, e) {
     const { subUnitId: o, row: n, col: a } = e, r = this._ensureMap(o).get(this._generateKey(n, a)), s = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, n, a);
     if (!s || !r || s.renderMode === ct.TEXT)
       return !1;
-    const { top: l, left: c, width: u, height: h } = r, { x: d, y: C } = t;
-    return d >= c && d <= c + u && C >= l && C <= l + h;
+    const { top: l, left: c, width: u, height: h } = r, { x: d, y: I } = t;
+    return d >= c && d <= c + u && I >= l && I <= l + h;
   }
   onPointerDown(t, e) {
     if (e.button === 2)
@@ -2794,7 +2792,7 @@ let pn = class {
       row: a,
       column: i
     };
-    this._commandService.executeCommand(Fe.id, r);
+    this._commandService.executeCommand(ke.id, r);
   }
   onPointerEnter(t, e) {
     var o, n;
@@ -2867,7 +2865,7 @@ let oe = class extends gn {
       Nr,
       Jr,
       qr,
-      Fr,
+      kr,
       Pr,
       Zr,
       Yr,
@@ -2915,7 +2913,7 @@ let Yn = (Se = class extends Zn {
       this._injector.add(t);
     }), [
       Ne,
-      Fe,
+      ke,
       bo,
       Dn,
       Ht,
@@ -2973,7 +2971,7 @@ let Xn = (Ce = class extends Zn {
       this._injector.add(t);
     }), [
       Ne,
-      Fe,
+      ke,
       bo,
       Dn,
       Ht,