@univerjs/sheets-filter-ui 0.8.1 → 0.8.2-nightly.202506201607

package/lib/es/index.js

@@ -1,18 +1,18 @@
-var Yt = Object.defineProperty;
-var qt = (t, e, r) => e in t ? Yt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
-var f = (t, e, r) => qt(t, typeof e != "symbol" ? e + "" : e, r);
-import { BooleanNumber as rt, createIdentifier as _t, Inject as E, LocaleService as K, IUniverInstanceService as Ge, ILogService as Kt, extractPureTextFromCell as Xt, numfmt as it, Disposable as me, Injector as X, Quantity as vt, Tools as Te, ICommandService as Q, CommandType as Le, IContextService as we, UniverInstanceType as Z, ThemeService as gt, RxDisposable as St, fromCallback as Zt, InterceptorEffectEnum as zt, DependentOn as Et, IConfigService as Tt, Optional as Jt, Plugin as je, merge as Nt } from "@univerjs/core";
-import { IRPCChannelService as Ft, toModule as er, fromModule as tr } from "@univerjs/rpc";
-import { CustomFilterOperator as u, SetSheetsFilterCriteriaCommand as re, SheetsFilterService as V, SmartToggleSheetsFilterCommand as pe, ReCalcSheetsFilterCommand as Ye, ClearSheetsFilterCriteriaCommand as qe, FILTER_MUTATIONS as rr, SetSheetsFilterRangeMutation as ir, SetSheetsFilterCriteriaMutation as sr, RemoveSheetsFilterMutation as nr, ReCalcSheetsFilterMutation as or, RemoveSheetFilterCommand as ar, SetSheetFilterRangeCommand as lr, UniverSheetsFilterPlugin as Ct } from "@univerjs/sheets-filter";
-import { RefRangeService as cr, SheetPermissionCheckController as ur, SheetsSelectionsService as hr, getSheetCommandTarget as dr, WorksheetFilterPermission as ae, WorksheetViewPermission as le, RangeProtectionPermissionViewPoint as ce, expandToContinuousRange as mr, SheetInterceptorService as pr, SetRangeValuesMutation as fr, INTERCEPTOR_POINT as _r } from "@univerjs/sheets";
-import { ILayoutService as vr, useDependency as te, useObservable as B, useComponentsOfPart as gr, ComponentContainer as Sr, getMenuHiddenObservable as Ke, MenuItemType as Xe, RibbonDataGroup as Er, KeyCode as Tr, MetaKeys as st, ComponentManager as Nr, IShortcutService as Fr, IMenuManagerService as Cr, IMessageService as yr } from "@univerjs/ui";
-import { SetCellEditVisibleOperation as Or, SheetsUIPart as Rr, getObservableWithExclusiveRange$ as Ir, getCurrentRangeDisable$ as Ar, SheetSkeletonManagerService as Pr, ISheetSelectionRenderService as br, SelectionControl as Lr, attachSelectionWithCoord as wr, getCoordByCell as Mr, SheetsRenderService as yt, whenSheetEditorFocused as $r, SheetCanvasPopManagerService as Ur } from "@univerjs/sheets-ui";
-import { BehaviorSubject as q, ReplaySubject as Hr, Subject as Dr, merge as kr, combineLatest as xr, throttleTime as Ot, startWith as Rt, map as ie, shareReplay as Br, of as fe, switchMap as Ze, filter as Wr, takeUntil as Qr, distinctUntilChanged as Vr } from "rxjs";
-import { Select as nt, clsx as It, borderClassName as At, RadioGroup as Gr, Radio as ot, Input as Pt, Checkbox as jr, Tree as Yr, Segmented as qr, Button as Ue, MessageType as Kr } from "@univerjs/design";
-import { Rect as at, Shape as Xr, IRenderManagerService as bt } from "@univerjs/engine-render";
-import { jsx as S, jsxs as b, Fragment as lt } from "react/jsx-runtime";
-import { forwardRef as Lt, useRef as Zr, createElement as wt, useCallback as D, useMemo as ze } from "react";
-const Mt = "sheets-filter-ui.config", Ne = {};
+var qt = Object.defineProperty;
+var Kt = (t, e, r) => e in t ? qt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
+var f = (t, e, r) => Kt(t, typeof e != "symbol" ? e + "" : e, r);
+import { BooleanNumber as rt, createIdentifier as vt, Inject as E, LocaleService as K, IUniverInstanceService as Ge, ILogService as Xt, extractPureTextFromCell as Zt, numfmt as it, Disposable as me, Injector as X, Quantity as gt, Tools as Te, ICommandService as Q, CommandType as Le, IContextService as we, UniverInstanceType as Z, ThemeService as St, RxDisposable as Et, fromCallback as zt, InterceptorEffectEnum as Jt, DependentOn as Tt, IConfigService as Nt, Optional as er, Plugin as je, merge as Ft, registerDependencies as tr, touchDependencies as st } from "@univerjs/core";
+import { IRPCChannelService as Ct, toModule as rr, fromModule as ir } from "@univerjs/rpc";
+import { CustomFilterOperator as u, SetSheetsFilterCriteriaCommand as re, SheetsFilterService as V, SmartToggleSheetsFilterCommand as pe, ReCalcSheetsFilterCommand as Ye, ClearSheetsFilterCriteriaCommand as qe, FILTER_MUTATIONS as sr, SetSheetsFilterRangeMutation as nr, SetSheetsFilterCriteriaMutation as or, RemoveSheetsFilterMutation as ar, ReCalcSheetsFilterMutation as lr, RemoveSheetFilterCommand as cr, SetSheetFilterRangeCommand as ur, UniverSheetsFilterPlugin as yt } from "@univerjs/sheets-filter";
+import { RefRangeService as hr, SheetPermissionCheckController as dr, SheetsSelectionsService as mr, getSheetCommandTarget as pr, WorksheetFilterPermission as ae, WorksheetViewPermission as le, RangeProtectionPermissionViewPoint as ce, expandToContinuousRange as fr, SheetInterceptorService as _r, SetRangeValuesMutation as vr, INTERCEPTOR_POINT as gr } from "@univerjs/sheets";
+import { ILayoutService as Sr, useDependency as te, useObservable as B, useComponentsOfPart as Er, ComponentContainer as Tr, getMenuHiddenObservable as Ke, MenuItemType as Xe, RibbonDataGroup as Nr, KeyCode as Fr, MetaKeys as nt, ComponentManager as Cr, IShortcutService as yr, IMenuManagerService as Or, IMessageService as Rr } from "@univerjs/ui";
+import { SetCellEditVisibleOperation as Ir, SheetsUIPart as Ar, getObservableWithExclusiveRange$ as Pr, getCurrentRangeDisable$ as br, SheetSkeletonManagerService as Lr, ISheetSelectionRenderService as wr, SelectionControl as Mr, attachSelectionWithCoord as $r, getCoordByCell as Ur, SheetsRenderService as Ot, whenSheetEditorFocused as Hr, SheetCanvasPopManagerService as Dr } from "@univerjs/sheets-ui";
+import { BehaviorSubject as q, ReplaySubject as kr, Subject as xr, merge as Br, combineLatest as Wr, throttleTime as Rt, startWith as It, map as ie, shareReplay as Qr, of as fe, switchMap as Ze, filter as Vr, takeUntil as Gr, distinctUntilChanged as jr } from "rxjs";
+import { Select as ot, clsx as At, borderClassName as Pt, RadioGroup as Yr, Radio as at, Input as bt, Checkbox as qr, Tree as Kr, Segmented as Xr, Button as Ue, MessageType as Zr } from "@univerjs/design";
+import { Rect as lt, Shape as zr, IRenderManagerService as Lt } from "@univerjs/engine-render";
+import { jsx as S, jsxs as b, Fragment as ct } from "react/jsx-runtime";
+import { forwardRef as wt, useRef as Jr, createElement as Mt, useCallback as D, useMemo as ze } from "react";
+const $t = "sheets-filter-ui.config", Ne = {};
 var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SECOND", t))(F || {}), _ = /* @__PURE__ */ ((t) => (t.NONE = "none", t.STARTS_WITH = "startsWith", t.DOES_NOT_START_WITH = "doesNotStartWith", t.ENDS_WITH = "endsWith", t.DOES_NOT_END_WITH = "doesNotEndWith", t.CONTAINS = "contains", t.DOES_NOT_CONTAIN = "doesNotContain", t.EQUALS = "equals", t.NOT_EQUALS = "notEquals", t.EMPTY = "empty", t.NOT_EMPTY = "notEmpty", t.BETWEEN = "between", t.NOT_BETWEEN = "notBetween", t.CUSTOM = "custom", t))(_ || {}), d;
 ((t) => {
   t.NONE = {
@@ -506,12 +506,12 @@ function xe(t) {
     unchecked: n
   };
 }
-var zr = Object.getOwnPropertyDescriptor, Jr = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? zr(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+var ei = Object.getOwnPropertyDescriptor, ti = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? ei(e, r) : e, l = t.length - 1, i; l >= 0; l--)
     (i = t[l]) && (n = i(n) || n);
   return n;
 }, He = (t, e) => (r, s) => e(r, s, t);
-const Je = "sheets-filter.generate-filter-values.service", Fe = _t(Je), ei = ["yyyy-mm-dd", "yyyy-mm-dd;@", "yyyy/mm/dd;@", "yyyy/mm/dd hh:mm", "yyyy-m-d am/pm h:mm", "yyyy-MM-dd", "yyyy/MM/dd", "yyyy/mm/dd", 'yyyy"年"MM"月"dd"日"', "MM-dd", 'M"月"d"日"', "MM-dd A/P hh:mm"];
+const Je = "sheets-filter.generate-filter-values.service", Fe = vt(Je), ri = ["yyyy-mm-dd", "yyyy-mm-dd;@", "yyyy/mm/dd;@", "yyyy/mm/dd hh:mm", "yyyy-m-d am/pm h:mm", "yyyy-MM-dd", "yyyy/MM/dd", "yyyy/mm/dd", 'yyyy"年"MM"月"dd"日"', "MM-dd", 'M"月"d"日"', "MM-dd A/P hh:mm"];
 let Be = class extends me {
   constructor(t, e, r) {
     super(), this._localeService = t, this._univerInstanceService = e, this._logService = r;
@@ -519,34 +519,34 @@ let Be = class extends me {
   async getFilterValues(t) {
     var h;
     const { unitId: e, subUnitId: r, filteredOutRowsByOtherColumns: s, filters: n, blankChecked: l, iterateRange: i, alreadyChecked: o } = t, a = this._univerInstanceService.getUnit(e), c = (h = this._univerInstanceService.getUnit(e)) == null ? void 0 : h.getSheetBySheetId(r);
-    return !a || !c ? [] : (this._logService.debug("[SheetsGenerateFilterValuesService]", "getFilterValues for", { unitId: e, subUnitId: r }), $t(n, this._localeService, i, c, new Set(s), new Set(o.map(String)), l, a.getStyles()));
+    return !a || !c ? [] : (this._logService.debug("[SheetsGenerateFilterValuesService]", "getFilterValues for", { unitId: e, subUnitId: r }), Ut(n, this._localeService, i, c, new Set(s), new Set(o.map(String)), l, a.getStyles()));
   }
 };
-Be = Jr([
+Be = ti([
   He(0, E(K)),
   He(1, Ge),
-  He(2, Kt)
+  He(2, Xt)
 ], Be);
-function $t(t, e, r, s, n, l, i, o) {
+function Ut(t, e, r, s, n, l, i, o) {
   var v, C, N, R, O, w, M, _e, ve;
-  const a = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map(), h = "yyyy-mm-dd", m = new Set(ei), g = "empty";
+  const a = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map(), h = "yyyy-mm-dd", m = new Set(ri), g = "empty";
   let p = 0;
   for (const I of s.iterateByColumn(r, !1, !1)) {
-    const { row: Vt, rowSpan: tt = 1 } = I;
+    const { row: Gt, rowSpan: tt = 1 } = I;
     let z = 0;
     for (; z < tt; ) {
-      const Gt = Vt + z;
-      if (n.has(Gt)) {
+      const jt = Gt + z;
+      if (n.has(jt)) {
         z++;
         continue;
       }
-      const G = I != null && I.value ? Xt(I.value) : "";
+      const G = I != null && I.value ? Zt(I.value) : "";
       if (!G) {
         p += 1, z += tt;
         continue;
       }
-      const ge = (v = I.value) != null && v.v && !I.value.p ? (R = (N = o.get((C = I.value) == null ? void 0 : C.s)) == null ? void 0 : N.n) == null ? void 0 : R.pattern : "", jt = ge && it.getFormatInfo(ge).isDate;
-      if (ge && jt && m.has(ge)) {
+      const ge = (v = I.value) != null && v.v && !I.value.p ? (R = (N = o.get((C = I.value) == null ? void 0 : C.s)) == null ? void 0 : N.n) == null ? void 0 : R.pattern : "", Yt = ge && it.getFormatInfo(ge).isDate;
+      if (ge && Yt && m.has(ge)) {
         const k = (O = s.getCellRaw(I.row, I.col)) == null ? void 0 : O.v;
         if (!k) {
           z++;
@@ -606,12 +606,12 @@ function $t(t, e, r, s, n, l, i, o) {
     a.set("empty", I), c.set("empty", [g]);
   }
   return {
-    filterTreeItems: ti(Array.from(a.values())),
+    filterTreeItems: ii(Array.from(a.values())),
     filterTreeMapCache: c
   };
 }
-function ti(t) {
-  return Array.from(t).sort((e, r) => e.children && !r.children ? -1 : !e.children && r.children ? 1 : ri(e.title, r.title)).map((e) => (e.children && e.children.sort((r, s) => {
+function ii(t) {
+  return Array.from(t).sort((e, r) => e.children && !r.children ? -1 : !e.children && r.children ? 1 : si(e.title, r.title)).map((e) => (e.children && e.children.sort((r, s) => {
     const n = Number.parseInt(r.key.split("-")[1], 10), l = Number.parseInt(s.key.split("-")[1], 10);
     return n - l;
   }).forEach((r) => {
@@ -621,9 +621,9 @@ function ti(t) {
     });
   }), e));
 }
-const ct = (t) => !Number.isNaN(Number(t)) && !Number.isNaN(Number.parseFloat(t));
-function ri(t, e) {
-  const r = ct(t), s = ct(e);
+const ut = (t) => !Number.isNaN(Number(t)) && !Number.isNaN(Number.parseFloat(t));
+function si(t, e) {
+  const r = ut(t), s = ut(e);
   return r && s ? Number.parseFloat(t) - Number.parseFloat(e) : r && !s ? -1 : !r && s ? 1 : t.localeCompare(e);
 }
 function We(t, e) {
@@ -638,13 +638,13 @@ function We(t, e) {
   }
   return null;
 }
-function Ut(t) {
-  return t.leaf ? t.checked : t.children ? t.children.every((e) => Ut(e)) : !0;
+function Ht(t) {
+  return t.leaf ? t.checked : t.children ? t.children.every((e) => Ht(e)) : !0;
 }
 function ue(t, e) {
   t.leaf && (e !== void 0 ? t.checked = e : t.checked = !t.checked), t.children && t.children.forEach((r) => ue(r, e));
 }
-function Ht(t, e) {
+function Dt(t, e) {
   const r = [];
   return t.forEach((s) => {
     const n = s.originValues ? e.some(
@@ -657,7 +657,7 @@ function Ht(t, e) {
     if (n || l)
       r.push({ ...s });
     else if (s.children) {
-      const o = Ht(s.children, e);
+      const o = Dt(s.children, e);
       if (o.length > 0) {
         const a = o.reduce((c, h) => c + h.count, 0);
         r.push({ ...s, count: a, children: o });
@@ -665,12 +665,12 @@ function Ht(t, e) {
     }
   }), r;
 }
-var ii = Object.getOwnPropertyDescriptor, et = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? ii(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+var ni = Object.getOwnPropertyDescriptor, et = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? ni(e, r) : e, l = t.length - 1, i; l >= 0; l--)
     (i = t[l]) && (n = i(n) || n);
   return n;
 }, Ce = (t, e) => (r, s) => e(r, s, t), ye = /* @__PURE__ */ ((t) => (t[t.VALUES = 0] = "VALUES", t[t.CONDITIONS = 1] = "CONDITIONS", t))(ye || {});
-_t("sheets-filter-ui.sheets-filter-panel.service");
+vt("sheets-filter-ui.sheets-filter-panel.service");
 let W = class extends me {
   constructor(e, r) {
     super();
@@ -679,7 +679,7 @@ let W = class extends me {
       /* VALUES */
     ));
     f(this, "filterBy$", this._filterBy$.asObservable());
-    f(this, "_filterByModel$", new Hr(1));
+    f(this, "_filterByModel$", new kr(1));
     f(this, "filterByModel$", this._filterByModel$.asObservable());
     f(this, "_filterByModel", null);
     f(this, "_hasCriteria$", new q(!1));
@@ -789,7 +789,7 @@ let W = class extends me {
 };
 W = et([
   Ce(0, E(X)),
-  Ce(1, E(cr))
+  Ce(1, E(hr))
 ], W);
 let Oe = class extends me {
   constructor(e, r, s, n, l) {
@@ -891,22 +891,22 @@ let Re = class extends me {
     f(this, "_manuallyUpdateFilterItems$");
     f(this, "_searchString$");
     f(this, "searchString$");
-    this._filterModel = e, this.col = r, this._commandService = l, this._treeMapCache = n, this._searchString$ = new q(""), this.searchString$ = this._searchString$.asObservable(), this._rawFilterItems$ = new q(s), this.rawFilterItems$ = this._rawFilterItems$.asObservable(), this._manuallyUpdateFilterItems$ = new Dr(), this.filterItems$ = kr(
-      xr([
+    this._filterModel = e, this.col = r, this._commandService = l, this._treeMapCache = n, this._searchString$ = new q(""), this.searchString$ = this._searchString$.asObservable(), this._rawFilterItems$ = new q(s), this.rawFilterItems$ = this._rawFilterItems$.asObservable(), this._manuallyUpdateFilterItems$ = new xr(), this.filterItems$ = Br(
+      Wr([
         this._searchString$.pipe(
-          Ot(500, void 0, { leading: !0, trailing: !0 }),
-          Rt(void 0)
+          Rt(500, void 0, { leading: !0, trailing: !0 }),
+          It(void 0)
         ),
         this._rawFilterItems$
       ]).pipe(
         ie(([i, o]) => {
           if (!i) return o;
           const c = i.toLowerCase().split(/\s+/).filter((h) => !!h);
-          return Ht(o, c);
+          return Dt(o, c);
         })
       ),
       this._manuallyUpdateFilterItems$
-    ).pipe(Br(1)), this.canApply$ = this.filterItems$.pipe(ie((i) => xe(i).checked > 0)), this.disposeWithMe(this.filterItems$.subscribe((i) => this._filterItems = i));
+    ).pipe(Qr(1)), this.canApply$ = this.filterItems$.pipe(ie((i) => xe(i).checked > 0)), this.disposeWithMe(this.filterItems$.subscribe((i) => this._filterItems = i));
   }
   /**
    * Create a model with targeting filter column. If there is not a filter column, the model would be created with
@@ -920,7 +920,7 @@ let Re = class extends me {
    */
   static async fromFilterColumn(e, r, s) {
     var w;
-    const n = e.get(Ge), l = e.get(K), i = e.get(Fe, vt.OPTIONAL), { unitId: o, subUnitId: a } = r, c = n.getUniverSheetInstance(o);
+    const n = e.get(Ge), l = e.get(K), i = e.get(Fe, gt.OPTIONAL), { unitId: o, subUnitId: a } = r, c = n.getUniverSheetInstance(o);
     if (!c) throw new Error(`[ByValuesModel]: Workbook not found for filter model with unitId: ${o}!`);
     const h = c == null ? void 0 : c.getSheetBySheetId(a);
     if (!h) throw new Error(`[ByValuesModel]: Worksheet not found for filter model with unitId: ${o} and subUnitId: ${a}!`);
@@ -938,7 +938,7 @@ let Re = class extends me {
       });
       R = M.filterTreeItems, O = M.filterTreeMapCache;
     } else {
-      const M = $t(!!p, l, N, h, C, T, v, c.getStyles());
+      const M = Ut(!!p, l, N, h, C, T, v, c.getStyles());
       R = M.filterTreeItems, O = M.filterTreeMapCache;
     }
     return e.createInstance(Re, r, s, R, O);
@@ -972,7 +972,7 @@ let Re = class extends me {
     const r = Te.deepClone(this._filterItems), s = We(r, e.key);
     if (!s)
       return;
-    const n = Ut(s);
+    const n = Ht(s);
     ue(s, !n), this._manuallyUpdateFilterItems(r);
   }
   onFilterOnly(e) {
@@ -1039,7 +1039,7 @@ const se = "FILTER_PANEL_OPENED", Ie = {
   type: Le.OPERATION,
   handler: (t, e) => {
     const r = t.get(we), s = t.get(V), n = t.get(W);
-    t.get(Q).syncExecuteCommand(Or.id, { visible: !1 });
+    t.get(Q).syncExecuteCommand(Ir.id, { visible: !1 });
     const { unitId: i, subUnitId: o, col: a } = e, c = s.getFilterModel(i, o);
     return c ? (n.setupCol(c, a), r.getContextValue(se) || r.setContextValue(se, !0), !0) : !1;
   }
@@ -1047,10 +1047,10 @@ const se = "FILTER_PANEL_OPENED", Ie = {
   id: "sheet.operation.close-filter-panel",
   type: Le.OPERATION,
   handler: (t) => {
-    const e = t.get(we), r = t.get(W), s = t.get(vr, vt.OPTIONAL);
+    const e = t.get(we), r = t.get(W), s = t.get(Sr, gt.OPTIONAL);
     return e.getContextValue(se) ? (e.setContextValue(se, !1), s == null || s.focus(), r.terminate()) : !1;
   }
-}, Dt = {
+}, kt = {
   id: "sheet.operation.apply-filter",
   type: Le.OPERATION,
   handler: (t, e) => {
@@ -1058,8 +1058,8 @@ const se = "FILTER_PANEL_OPENED", Ie = {
     return t.get(W).changeFilterBy(r);
   }
 };
-var si = Object.getOwnPropertyDescriptor, ni = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? si(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+var oi = Object.getOwnPropertyDescriptor, ai = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? oi(e, r) : e, l = t.length - 1, i; l >= 0; l--)
     (i = t[l]) && (n = i(n) || n);
   return n;
 }, ee = (t, e) => (r, s) => e(r, s, t);
@@ -1072,7 +1072,7 @@ let ne = class extends me {
       this._commandService.beforeCommandExecuted((t) => {
         var e, r, s;
         if (t.id === pe.id) {
-          const n = this._injector.get(Ge), l = dr(n);
+          const n = this._injector.get(Ge), l = pr(n);
           if (!l) return;
           const { unitId: i, subUnitId: o, worksheet: a } = l, c = (e = this._sheetsFilterService.getFilterModel(i, o)) == null ? void 0 : e.getRange();
           let h;
@@ -1085,7 +1085,7 @@ let ne = class extends me {
             const m = (r = this._sheetsSelectionService.getCurrentLastSelection()) == null ? void 0 : r.range;
             if (m) {
               let g = { ...m };
-              g = m.startColumn === m.endColumn && m.startRow === m.endRow ? mr(g, { left: !0, right: !0, up: !0, down: !0 }, a) : g, h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
+              g = m.startColumn === m.endColumn && m.startRow === m.endRow ? fr(g, { left: !0, right: !0, up: !0, down: !0 }, a) : g, h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
                 rangeTypes: [ce],
                 worksheetTypes: [le, ae]
               }, [g], i, o);
@@ -1108,13 +1108,13 @@ let ne = class extends me {
     );
   }
 };
-ne = ni([
+ne = ai([
   ee(0, E(V)),
   ee(1, E(K)),
   ee(2, Q),
-  ee(3, E(ur)),
+  ee(3, E(dr)),
   ee(4, E(X)),
-  ee(5, E(hr))
+  ee(5, E(mr))
 ], ne);
 var P = function() {
   return P = Object.assign || function(t) {
@@ -1124,23 +1124,23 @@ var P = function() {
     }
     return t;
   }, P.apply(this, arguments);
-}, oi = function(t, e) {
+}, li = function(t, e) {
   var r = {};
   for (var s in t) Object.prototype.hasOwnProperty.call(t, s) && e.indexOf(s) < 0 && (r[s] = t[s]);
   if (t != null && typeof Object.getOwnPropertySymbols == "function")
     for (var n = 0, s = Object.getOwnPropertySymbols(t); n < s.length; n++)
       e.indexOf(s[n]) < 0 && Object.prototype.propertyIsEnumerable.call(t, s[n]) && (r[s[n]] = t[s[n]]);
   return r;
-}, kt = Lt(function(t, e) {
-  var r = t.icon, s = t.id, n = t.className, l = t.extend, i = oi(t, ["icon", "id", "className", "extend"]), o = "univerjs-icon univerjs-icon-".concat(s, " ").concat(n || "").trim(), a = Zr("_".concat(ci()));
-  return xt(r, "".concat(s), { defIds: r.defIds, idSuffix: a.current }, P({ ref: e, className: o }, i), l);
+}, xt = wt(function(t, e) {
+  var r = t.icon, s = t.id, n = t.className, l = t.extend, i = li(t, ["icon", "id", "className", "extend"]), o = "univerjs-icon univerjs-icon-".concat(s, " ").concat(n || "").trim(), a = Jr("_".concat(hi()));
+  return Bt(r, "".concat(s), { defIds: r.defIds, idSuffix: a.current }, P({ ref: e, className: o }, i), l);
 });
-function xt(t, e, r, s, n) {
-  return wt(t.tag, P(P({ key: e }, ai(t, r, n)), s), (li(t, r).children || []).map(function(l, i) {
-    return xt(l, "".concat(e, "-").concat(t.tag, "-").concat(i), r, void 0, n);
+function Bt(t, e, r, s, n) {
+  return Mt(t.tag, P(P({ key: e }, ci(t, r, n)), s), (ui(t, r).children || []).map(function(l, i) {
+    return Bt(l, "".concat(e, "-").concat(t.tag, "-").concat(i), r, void 0, n);
   }));
 }
-function ai(t, e, r) {
+function ci(t, e, r) {
   var s = P({}, t.attrs);
   r != null && r.colorChannel1 && s.fill === "colorChannel1" && (s.fill = r.colorChannel1), t.tag === "mask" && s.id && (s.id = s.id + e.idSuffix), Object.entries(s).forEach(function(l) {
     var i = l[0], o = l[1];
@@ -1152,42 +1152,42 @@ function ai(t, e, r) {
     typeof o == "string" && (s[i] = o.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   })), s;
 }
-function li(t, e) {
+function ui(t, e) {
   var r, s = e.defIds;
   return !s || s.length === 0 ? t : t.tag === "defs" && (!((r = t.children) === null || r === void 0) && r.length) ? P(P({}, t), { children: t.children.map(function(n) {
     return typeof n.attrs.id == "string" && s && s.includes(n.attrs.id) ? P(P({}, n), { attrs: P(P({}, n.attrs), { id: n.attrs.id + e.idSuffix }) }) : n;
   }) }) : t;
 }
-function ci() {
+function hi() {
   return Math.random().toString(36).substring(2, 8);
 }
-kt.displayName = "UniverIcon";
-var ui = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M3.32182 2.60967C2.98161 2.60967 2.79671 3.0074 3.01601 3.2675L6.85819 7.8246C6.94943 7.93282 6.99947 8.06981 6.99947 8.21136V12.7338C6.99947 12.898 7.0998 13.0455 7.2525 13.1058L8.73833 13.6928C9.00085 13.7965 9.28531 13.6031 9.28531 13.3208V8.21136C9.28531 8.06981 9.33535 7.93282 9.42659 7.8246L13.2688 3.2675C13.4881 3.0074 13.3032 2.60967 12.963 2.60967H3.32182ZM2.09858 4.04101C1.22139 3.0006 1.96097 1.40967 3.32182 1.40967H12.963C14.3238 1.40967 15.0634 3.0006 14.1862 4.04101L10.4853 8.43054V13.3208C10.4853 14.4498 9.34747 15.2237 8.29742 14.8089L6.81158 14.2219C6.20078 13.9806 5.79947 13.3905 5.79947 12.7338V8.43054L2.09858 4.04101Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Bt = Lt(function(t, e) {
-  return wt(kt, Object.assign({}, t, {
+xt.displayName = "UniverIcon";
+var di = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M3.32182 2.60967C2.98161 2.60967 2.79671 3.0074 3.01601 3.2675L6.85819 7.8246C6.94943 7.93282 6.99947 8.06981 6.99947 8.21136V12.7338C6.99947 12.898 7.0998 13.0455 7.2525 13.1058L8.73833 13.6928C9.00085 13.7965 9.28531 13.6031 9.28531 13.3208V8.21136C9.28531 8.06981 9.33535 7.93282 9.42659 7.8246L13.2688 3.2675C13.4881 3.0074 13.3032 2.60967 12.963 2.60967H3.32182ZM2.09858 4.04101C1.22139 3.0006 1.96097 1.40967 3.32182 1.40967H12.963C14.3238 1.40967 15.0634 3.0006 14.1862 4.04101L10.4853 8.43054V13.3208C10.4853 14.4498 9.34747 15.2237 8.29742 14.8089L6.81158 14.2219C6.20078 13.9806 5.79947 13.3905 5.79947 12.7338V8.43054L2.09858 4.04101Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Wt = wt(function(t, e) {
+  return Mt(xt, Object.assign({}, t, {
     id: "filter-icon",
     ref: e,
-    icon: ui
+    icon: di
   }));
 });
-Bt.displayName = "FilterIcon";
-function hi(t) {
+Wt.displayName = "FilterIcon";
+function mi(t) {
   var p, T;
   const { model: e } = t, r = te(K), s = B(e.conditionItem$, void 0), n = B(e.filterConditionFormParams$, void 0), l = n != null && n.and ? "AND" : "OR", i = D((v) => {
     e.onConditionFormChange({ and: v === "AND" });
-  }, [e]), o = di(r), a = D((v) => {
+  }, [e]), o = pi(r), a = D((v) => {
     e.onPrimaryConditionChange(v);
-  }, [e]), c = mi(r), h = D((v) => {
+  }, [e]), c = fi(r), h = D((v) => {
     e.onConditionFormChange(v);
   }, [e]), m = r.t("sheets-filter.panel.input-values-placeholder");
   function g(v, C, N) {
     const R = d.getItemByOperator(v).numOfParameters === 1;
-    return /* @__PURE__ */ b(lt, { children: [
-      N === "operator2" && /* @__PURE__ */ b(Gr, { value: l, onChange: i, children: [
-        /* @__PURE__ */ S(ot, { value: "AND", children: r.t("sheets-filter.panel.and") }),
-        /* @__PURE__ */ S(ot, { value: "OR", children: r.t("sheets-filter.panel.or") })
+    return /* @__PURE__ */ b(ct, { children: [
+      N === "operator2" && /* @__PURE__ */ b(Yr, { value: l, onChange: i, children: [
+        /* @__PURE__ */ S(at, { value: "AND", children: r.t("sheets-filter.panel.and") }),
+        /* @__PURE__ */ S(at, { value: "OR", children: r.t("sheets-filter.panel.or") })
       ] }),
       /* @__PURE__ */ S(
-        nt,
+        ot,
         {
           value: v,
           options: c,
@@ -1195,7 +1195,7 @@ function hi(t) {
         }
       ),
       R && /* @__PURE__ */ S("div", { children: /* @__PURE__ */ S(
-        Pt,
+        bt,
         {
           className: "univer-mt-2",
           value: C,
@@ -1210,13 +1210,13 @@ function hi(t) {
     {
       "data-u-comp": "sheets-filter-panel-conditions-container",
       className: "univer-flex univer-h-full univer-flex-col",
-      children: s && n && /* @__PURE__ */ b(lt, { children: [
-        /* @__PURE__ */ S(nt, { value: s.operator, options: o, onChange: a }),
+      children: s && n && /* @__PURE__ */ b(ct, { children: [
+        /* @__PURE__ */ S(ot, { value: s.operator, options: o, onChange: a }),
         d.getItemByOperator(s.operator).numOfParameters !== 0 ? /* @__PURE__ */ b(
           "div",
           {
             "data-u-comp": "sheets-filter-panel-conditions-container-inner",
-            className: It("univer-mt-2 univer-flex-grow univer-overflow-hidden univer-rounded-md univer-p-2", At),
+            className: At("univer-mt-2 univer-flex-grow univer-overflow-hidden univer-rounded-md univer-p-2", Pt),
             children: [
               s.numOfParameters >= 1 && g(n.operator1, (p = n.val1) != null ? p : "", "operator1"),
               s.numOfParameters >= 2 && g(n.operator2, (T = n.val2) != null ? T : "", "operator2"),
@@ -1239,7 +1239,7 @@ function hi(t) {
     }
   );
 }
-function di(t) {
+function pi(t) {
   const e = t.getCurrentLocale();
   return ze(() => [
     {
@@ -1281,11 +1281,11 @@ function di(t) {
     }
   ], [e, t]);
 }
-function mi(t) {
+function fi(t) {
   const e = t.getCurrentLocale();
   return ze(() => d.ALL_CONDITIONS.filter((r) => r.numOfParameters !== 2).map((r) => ({ label: t.t(r.label), value: r.operator })), [e, t]);
 }
-function pi(t) {
+function _i(t) {
   const { model: e } = t, r = te(K), s = B(e.searchString$, "", !0), n = B(e.filterItems$, void 0, !0), l = r.t("sheets-filter.panel.filter-only"), i = xe(n), o = i.checked > 0 && i.unchecked === 0, a = i.checked > 0 && i.unchecked > 0, c = e.treeMapCache, h = D(() => {
     e.onCheckAllToggled(!o);
   }, [e, o]), m = D((p) => {
@@ -1304,7 +1304,7 @@ function pi(t) {
       className: "univer-flex univer-h-full univer-flex-col",
       children: [
         /* @__PURE__ */ S(
-          Pt,
+          bt,
           {
             autoFocus: !0,
             value: s,
@@ -1316,7 +1316,7 @@ function pi(t) {
           "div",
           {
             "data-u-comp": "sheets-filter-panel",
-            className: It("univer-mt-2 univer-box-border univer-flex univer-flex-grow univer-flex-col univer-overflow-hidden univer-rounded-md univer-px-2 univer-py-2.5", At),
+            className: At("univer-mt-2 univer-box-border univer-flex univer-flex-grow univer-flex-col univer-overflow-hidden univer-rounded-md univer-px-2 univer-py-2.5", Pt),
             children: [
               /* @__PURE__ */ S(
                 "div",
@@ -1330,7 +1330,7 @@ function pi(t) {
                       className: "univer-box-border univer-flex univer-h-7 univer-items-center univer-rounded-md univer-pb-0 univer-pl-5 univer-pr-0.5 univer-pt-0 univer-text-sm",
                       children: [
                         /* @__PURE__ */ S(
-                          jr,
+                          qr,
                           {
                             indeterminate: a,
                             disabled: n.length === 0,
@@ -1360,7 +1360,7 @@ function pi(t) {
                 }
               ),
               /* @__PURE__ */ S("div", { "data-u-comp": "sheets-filter-panel-values-virtual", className: "univer-flex-grow", children: /* @__PURE__ */ S(
-                Yr,
+                Kr,
                 {
                   data: n,
                   defaultExpandAll: !1,
@@ -1418,17 +1418,17 @@ function pi(t) {
     }
   );
 }
-function fi() {
+function vi() {
   var C;
-  const t = te(W), e = te(K), r = te(Q), s = B(t.filterBy$, void 0, !0), n = B(t.filterByModel$, void 0, !1), l = B(() => (n == null ? void 0 : n.canApply$) || fe(!1), void 0, !1, [n]), i = _i(e), o = !B(t.hasCriteria$), a = D((N) => {
-    r.executeCommand(Dt.id, { filterBy: N });
+  const t = te(W), e = te(K), r = te(Q), s = B(t.filterBy$, void 0, !0), n = B(t.filterByModel$, void 0, !1), l = B(() => (n == null ? void 0 : n.canApply$) || fe(!1), void 0, !1, [n]), i = gi(e), o = !B(t.hasCriteria$), a = D((N) => {
+    r.executeCommand(kt.id, { filterBy: N });
   }, [r]), c = D(async () => {
     await (n == null ? void 0 : n.clear()), r.executeCommand(he.id);
   }, [n, r]), h = D(() => {
     r.executeCommand(he.id);
   }, [r]), m = D(async () => {
     await (n == null ? void 0 : n.apply()), r.executeCommand(he.id);
-  }, [n, r]), p = (C = te(V).activeFilterModel) == null ? void 0 : C.getRange(), T = t.col, v = gr(Rr.FILTER_PANEL_EMBED_POINT);
+  }, [n, r]), p = (C = te(V).activeFilterModel) == null ? void 0 : C.getRange(), T = t.col, v = Er(Ar.FILTER_PANEL_EMBED_POINT);
   return /* @__PURE__ */ b(
     "div",
     {
@@ -1436,14 +1436,14 @@ function fi() {
       className: "univer-box-border univer-flex univer-h-[442px] univer-w-[312px] univer-flex-col univer-rounded-lg univer-bg-white univer-p-4 univer-shadow-lg dark:!univer-border-gray-600 dark:!univer-bg-gray-700",
       children: [
         /* @__PURE__ */ S(
-          Sr,
+          Tr,
           {
             components: v,
             sharedProps: { range: p, colIndex: T, onClose: h }
           }
         ),
         /* @__PURE__ */ S("div", { className: "univer-mb-1 univer-flex-shrink-0 univer-flex-grow-0", children: /* @__PURE__ */ S(
-          qr,
+          Xr,
           {
             value: s,
             items: i,
@@ -1455,7 +1455,7 @@ function fi() {
           {
             "data-u-comp": "sheets-filter-panel-content",
             className: "univer-flex-shrink univer-flex-grow univer-pt-2",
-            children: s === ye.VALUES ? /* @__PURE__ */ S(pi, { model: n }) : /* @__PURE__ */ S(hi, { model: n })
+            children: s === ye.VALUES ? /* @__PURE__ */ S(_i, { model: n }) : /* @__PURE__ */ S(mi, { model: n })
           }
         ) : /* @__PURE__ */ S("div", { className: "univer-flex-1" }),
         /* @__PURE__ */ b(
@@ -1476,14 +1476,14 @@ function fi() {
     }
   );
 }
-function _i(t) {
+function gi(t) {
   const e = t.getCurrentLocale();
   return ze(() => [
     { label: t.t("sheets-filter.panel.by-values"), value: ye.VALUES },
     { label: t.t("sheets-filter.panel.by-conditions"), value: ye.CONDITIONS }
   ], [e, t]);
 }
-function vi(t) {
+function Si(t) {
   const e = t.get(V);
   return {
     id: pe.id,
@@ -1492,9 +1492,9 @@ function vi(t) {
     tooltip: "sheets-filter.toolbar.smart-toggle-filter-tooltip",
     hidden$: Ke(t, Z.UNIVER_SHEET),
     activated$: e.activeFilterModel$.pipe(ie((r) => !!r)),
-    disabled$: Ir(
+    disabled$: Pr(
       t,
-      Ar(
+      br(
         t,
         {
           worksheetTypes: [ae, le],
@@ -1504,7 +1504,7 @@ function vi(t) {
     )
   };
 }
-function gi(t) {
+function Ei(t) {
   const e = t.get(V);
   return {
     id: qe.id,
@@ -1517,7 +1517,7 @@ function gi(t) {
     }))
   };
 }
-function Si(t) {
+function Ti(t) {
   const e = t.get(V);
   return {
     id: Ye.id,
@@ -1530,25 +1530,25 @@ function Si(t) {
     }))
   };
 }
-const Ei = {
-  [Er.ORGANIZATION]: {
+const Ni = {
+  [Nr.ORGANIZATION]: {
     [pe.id]: {
       order: 2,
-      menuItemFactory: vi,
+      menuItemFactory: Si,
       [qe.id]: {
         order: 0,
-        menuItemFactory: gi
+        menuItemFactory: Ei
       },
       [Ye.id]: {
         order: 1,
-        menuItemFactory: Si
+        menuItemFactory: Ti
       }
     }
   }
-}, x = 16, Ti = new Path2D("M3.30363 3C2.79117 3 2.51457 3.60097 2.84788 3.99024L6.8 8.60593V12.5662C6.8 12.7184 6.8864 12.8575 7.02289 12.9249L8.76717 13.7863C8.96655 13.8847 9.2 13.7396 9.2 13.5173V8.60593L13.1521 3.99024C13.4854 3.60097 13.2088 3 12.6964 3H3.30363Z");
-class ut {
+}, x = 16, Fi = new Path2D("M3.30363 3C2.79117 3 2.51457 3.60097 2.84788 3.99024L6.8 8.60593V12.5662C6.8 12.7184 6.8864 12.8575 7.02289 12.9249L8.76717 13.7863C8.96655 13.8847 9.2 13.7396 9.2 13.5173V8.60593L13.1521 3.99024C13.4854 3.60097 13.2088 3 12.6964 3H3.30363Z");
+class ht {
   static drawNoCriteria(e, r, s, n) {
-    e.save(), at.drawWith(e, {
+    e.save(), lt.drawWith(e, {
       radius: 2,
       width: x,
       height: x,
@@ -1556,21 +1556,21 @@ class ut {
     }), e.lineCap = "square", e.strokeStyle = s, e.scale(r / x, r / x), e.beginPath(), e.lineWidth = 1, e.lineCap = "round", e.moveTo(3, 4), e.lineTo(13, 4), e.moveTo(4.5, 8), e.lineTo(11.5, 8), e.moveTo(6, 12), e.lineTo(10, 12), e.stroke(), e.restore();
   }
   static drawHasCriteria(e, r, s, n) {
-    e.save(), at.drawWith(e, {
+    e.save(), lt.drawWith(e, {
       radius: 2,
       width: x,
       height: x,
       fill: n
-    }), e.scale(r / x, r / x), e.fillStyle = s, e.fill(Ti), e.restore();
+    }), e.scale(r / x, r / x), e.fillStyle = s, e.fill(Fi), e.restore();
   }
 }
-var Ni = Object.getOwnPropertyDescriptor, Fi = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? Ni(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+var Ci = Object.getOwnPropertyDescriptor, yi = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Ci(e, r) : e, l = t.length - 1, i; l >= 0; l--)
     (i = t[l]) && (n = i(n) || n);
   return n;
 }, De = (t, e) => (r, s) => e(r, s, t);
 const H = 16, Se = 1;
-let Qe = class extends Xr {
+let Qe = class extends zr {
   constructor(e, r, s, n, l) {
     super(e, r);
     f(this, "_cellWidth", 0);
@@ -1591,7 +1591,7 @@ let Qe = class extends Xr {
     const i = new Path2D();
     i.rect(n, l, s, r), e.clip(i);
     const { hasCriteria: o } = this._filterParams, a = this._themeService.getColorFromTheme("primary.600"), c = this._hovered ? this._themeService.getColorFromTheme("gray.50") : "rgba(255, 255, 255, 1.0)";
-    o ? ut.drawHasCriteria(e, H, a, c) : ut.drawNoCriteria(e, H, a, c), e.restore();
+    o ? ht.drawHasCriteria(e, H, a, c) : ht.drawNoCriteria(e, H, a, c), e.restore();
   }
   onPointerDown(e) {
     if (e.button === 2)
@@ -1612,18 +1612,18 @@ let Qe = class extends Xr {
     this._hovered = !1, this.makeDirty(!0);
   }
 };
-Qe = Fi([
+Qe = yi([
   De(2, we),
   De(3, Q),
-  De(4, E(gt))
+  De(4, E(St))
 ], Qe);
-var Ci = Object.getOwnPropertyDescriptor, yi = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? Ci(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+var Oi = Object.getOwnPropertyDescriptor, Ri = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Oi(e, r) : e, l = t.length - 1, i; l >= 0; l--)
     (i = t[l]) && (n = i(n) || n);
   return n;
 }, Y = (t, e) => (r, s) => e(r, s, t);
-const Oi = 1e3, Ri = 5e3;
-let Ve = class extends St {
+const Ii = 1e3, Ai = 5e3;
+let Ve = class extends Et {
   constructor(e, r, s, n, l, i, o, a) {
     super();
     f(this, "_filterRangeShape", null);
@@ -1646,28 +1646,28 @@ let Ve = class extends St {
           range: l == null ? void 0 : l.getRange(),
           skeleton: e.skeleton
         });
-        return Zt(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(
-          Wr(
+        return zt(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(
+          Vr(
             ([c]) => {
               var h;
-              return c.type === Le.MUTATION && ((h = c.params) == null ? void 0 : h.unitId) === r.getUnitId() && (rr.has(c.id) || c.id === fr.id);
+              return c.type === Le.MUTATION && ((h = c.params) == null ? void 0 : h.unitId) === r.getUnitId() && (sr.has(c.id) || c.id === vr.id);
             }
           ),
-          Ot(20, void 0, { leading: !1, trailing: !0 }),
+          Rt(20, void 0, { leading: !1, trailing: !0 }),
           ie(i),
-          Rt(i())
+          It(i())
           // must trigger once
         );
       }),
-      Qr(this.dispose$)
+      Gr(this.dispose$)
     ).subscribe((e) => {
       this._disposeRendering(), !(!e || !e.range) && (this._renderRange(e.range, e.skeleton), this._renderButtons(e));
     });
   }
   _renderRange(e, r) {
-    const { scene: s } = this._context, { rowHeaderWidth: n, columnHeaderHeight: l } = r, i = this._filterRangeShape = new Lr(
+    const { scene: s } = this._context, { rowHeaderWidth: n, columnHeaderHeight: l } = r, i = this._filterRangeShape = new Mr(
       s,
-      Oi,
+      Ii,
       this._themeService,
       {
         rowHeaderWidth: n,
@@ -1675,7 +1675,7 @@ let Ve = class extends St {
         enableAutoFill: !1,
         highlightHeader: !1
       }
-    ), a = wr({
+    ), a = $r({
       range: e,
       primary: null,
       style: { fill: "rgba(0, 0, 0, 0.0)" }
@@ -1687,7 +1687,7 @@ let Ve = class extends St {
     this._interceptCellContent(n, i, e.range);
     const { startColumn: a, endColumn: c, startRow: h } = r;
     for (let m = a; m <= c; m++) {
-      const g = `sheets-filter-button-${m}`, p = Mr(h, m, o, l), { startX: T, startY: v, endX: C, endY: N } = p, R = C - T, O = N - v;
+      const g = `sheets-filter-button-${m}`, p = Ur(h, m, o, l), { startX: T, startY: v, endX: C, endY: N } = p, R = C - T, O = N - v;
       if (O <= Se || R <= Se)
         continue;
       const w = !!s.getFilterColumn(m), M = C - H - Se, _e = N - H - Se, ve = {
@@ -1695,7 +1695,7 @@ let Ve = class extends St {
         top: _e,
         height: H,
         width: H,
-        zIndex: Ri,
+        zIndex: Ai,
         cellHeight: O,
         cellWidth: R,
         filterParams: { unitId: n, subUnitId: i, col: m, hasCriteria: w }
@@ -1706,8 +1706,8 @@ let Ve = class extends St {
   }
   _interceptCellContent(e, r, s) {
     const { startRow: n, startColumn: l, endColumn: i } = s;
-    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(_r.CELL_CONTENT, {
-      effect: zt.Style,
+    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(gr.CELL_CONTENT, {
+      effect: Jt.Style,
       handler: (o, a, c) => {
         const { row: h, col: m, unitId: g, subUnitId: p } = a;
         return g !== e || p !== r || h !== n || m < l || m > i || ((!o || o === a.rawData) && (o = { ...a.rawData }), o.fontRenderExtension = {
@@ -1723,50 +1723,50 @@ let Ve = class extends St {
     (e = this._filterRangeShape) == null || e.dispose(), this._filterButtonShapes.forEach((s) => s.dispose()), (r = this._buttonRenderDisposable) == null || r.dispose(), this._filterRangeShape = null, this._buttonRenderDisposable = null, this._filterButtonShapes = [];
   }
 };
-Ve = yi([
+Ve = Ri([
   Y(1, E(X)),
-  Y(2, E(Pr)),
+  Y(2, E(Lr)),
   Y(3, E(V)),
-  Y(4, E(gt)),
-  Y(5, E(pr)),
+  Y(4, E(St)),
+  Y(5, E(_r)),
   Y(6, Q),
-  Y(7, br)
+  Y(7, wr)
 ], Ve);
-var Ii = Object.getOwnPropertyDescriptor, Ai = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? Ii(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+var Pi = Object.getOwnPropertyDescriptor, bi = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Pi(e, r) : e, l = t.length - 1, i; l >= 0; l--)
     (i = t[l]) && (n = i(n) || n);
   return n;
-}, ht = (t, e) => (r, s) => e(r, s, t);
-let de = class extends St {
+}, dt = (t, e) => (r, s) => e(r, s, t);
+let de = class extends Et {
   constructor(t, e) {
     super(), this._renderManagerService = t, this._sheetsRenderService = e, [
-      ir,
-      sr,
       nr,
-      or
+      or,
+      ar,
+      lr
     ].forEach((r) => this.disposeWithMe(this._sheetsRenderService.registerSkeletonChangingMutations(r.id))), this.disposeWithMe(this._renderManagerService.registerRenderModule(
       Z.UNIVER_SHEET,
       [Ve]
     ));
   }
 };
-de = Ai([
-  ht(0, bt),
-  ht(1, E(yt))
+de = bi([
+  dt(0, Lt),
+  dt(1, E(Ot))
 ], de);
-const Pi = {
+const Li = {
   id: pe.id,
-  binding: Tr.L | st.CTRL_COMMAND | st.SHIFT,
+  binding: Fr.L | nt.CTRL_COMMAND | nt.SHIFT,
   description: "sheets-filter.shortcut.smart-toggle-filter",
-  preconditions: $r,
+  preconditions: Hr,
   group: "4_sheet-edit"
 };
-var bi = Object.getOwnPropertyDescriptor, Li = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? bi(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+var wi = Object.getOwnPropertyDescriptor, Mi = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? wi(e, r) : e, l = t.length - 1, i; l >= 0; l--)
     (i = t[l]) && (n = i(n) || n);
   return n;
 }, A = (t, e) => (r, s) => e(r, s, t);
-const dt = "FILTER_PANEL_POPUP";
+const mt = "FILTER_PANEL_POPUP";
 let Ae = class extends de {
   constructor(e, r, s, n, l, i, o, a, c, h, m, g, p) {
     super(p, g);
@@ -1778,7 +1778,7 @@ let Ae = class extends de {
   }
   _initShortcuts() {
     [
-      Pi
+      Li
     ].forEach((e) => {
       this.disposeWithMe(this._shortcutService.registerShortcut(e));
     });
@@ -1786,12 +1786,12 @@ let Ae = class extends de {
   _initCommands() {
     [
       pe,
-      ar,
-      lr,
+      cr,
+      ur,
       re,
       qe,
       Ye,
-      Dt,
+      kt,
       Ie,
       he
     ].forEach((e) => {
@@ -1799,21 +1799,21 @@ let Ae = class extends de {
     });
   }
   _initMenuItems() {
-    this._menuManagerService.mergeMenu(Ei);
+    this._menuManagerService.mergeMenu(Ni);
   }
   _initUI() {
     [
-      [dt, fi],
-      ["FilterIcon", Bt]
+      [mt, vi],
+      ["FilterIcon", Wt]
     ].forEach(([e, r]) => {
       this.disposeWithMe(
         this._componentManager.register(e, r)
       );
-    }), this.disposeWithMe(this._contextService.subscribeContextValue$(se).pipe(Vr()).subscribe((e) => {
+    }), this.disposeWithMe(this._contextService.subscribeContextValue$(se).pipe(jr()).subscribe((e) => {
       e ? this._openFilterPopup() : this._closeFilterPopup();
     })), this.disposeWithMe(this._sheetsFilterService.errorMsg$.subscribe((e) => {
       e && this._messageService.show({
-        type: Kr.Error,
+        type: Zr.Error,
         content: this._localeService.t(e)
       });
     }));
@@ -1824,7 +1824,7 @@ let Ae = class extends de {
       throw new Error("[SheetsFilterUIController]: no filter model when opening filter popup!");
     const r = e.getRange(), s = this._sheetsFilterPanelService.col, { startRow: n } = r;
     this._popupDisposable = this._sheetCanvasPopupService.attachPopupToCell(n, s, {
-      componentKey: dt,
+      componentKey: mt,
       direction: "horizontal",
       onClickOutside: () => this._commandService.syncExecuteCommand(he.id),
       offset: [5, 0]
@@ -1835,78 +1835,82 @@ let Ae = class extends de {
     (e = this._popupDisposable) == null || e.dispose(), this._popupDisposable = null;
   }
 };
-Ae = Li([
+Ae = Mi([
   A(0, E(X)),
-  A(1, E(Nr)),
+  A(1, E(Cr)),
   A(2, E(W)),
-  A(3, E(Ur)),
+  A(3, E(Dr)),
   A(4, E(V)),
   A(5, E(K)),
-  A(6, Fr),
+  A(6, yr),
   A(7, Q),
-  A(8, Cr),
+  A(8, Or),
   A(9, we),
-  A(10, yr),
-  A(11, E(yt)),
-  A(12, bt)
+  A(10, Rr),
+  A(11, E(Ot)),
+  A(12, Lt)
 ], Ae);
-var wi = Object.defineProperty, Mi = Object.getOwnPropertyDescriptor, $i = (t, e, r) => e in t ? wi(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Ui = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? Mi(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+var $i = Object.defineProperty, Ui = Object.getOwnPropertyDescriptor, Hi = (t, e, r) => e in t ? $i(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Di = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Ui(e, r) : e, l = t.length - 1, i; l >= 0; l--)
     (i = t[l]) && (n = i(n) || n);
   return n;
-}, ke = (t, e) => (r, s) => e(r, s, t), Wt = (t, e, r) => $i(t, typeof e != "symbol" ? e + "" : e, r);
-const Hi = "SHEET_FILTER_UI_PLUGIN";
+}, ke = (t, e) => (r, s) => e(r, s, t), Qt = (t, e, r) => Hi(t, typeof e != "symbol" ? e + "" : e, r);
+const ki = "SHEET_FILTER_UI_PLUGIN";
 let Pe = class extends je {
   constructor(t = Ne, e, r, s) {
     super(), this._config = t, this._injector = e, this._configService = r, this._rpcChannelService = s;
-    const { menu: n, ...l } = Nt(
+    const { menu: n, ...l } = Ft(
       {},
       Ne,
       this._config
     );
-    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig(Mt, l);
+    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig($t, l);
   }
   onStarting() {
-    [
+    tr(this._injector, [
       [W],
       [ne],
       [Ae]
-    ].forEach((t) => this._injector.add(t)), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([Fe, {
-      useFactory: () => er(
+    ]), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([Fe, {
+      useFactory: () => rr(
         this._rpcChannelService.requestChannel(Je)
       )
     }]);
   }
   onReady() {
-    this._injector.get(ne);
+    st(this._injector, [
+      [ne]
+    ]);
   }
   onRendered() {
-    this._injector.get(Ae);
+    st(this._injector, [
+      [Ae]
+    ]);
   }
 };
-Wt(Pe, "type", Z.UNIVER_SHEET);
-Wt(Pe, "pluginName", Hi);
-Pe = Ui([
-  Et(Ct),
+Qt(Pe, "type", Z.UNIVER_SHEET);
+Qt(Pe, "pluginName", ki);
+Pe = Di([
+  Tt(yt),
   ke(1, E(X)),
-  ke(2, Tt),
-  ke(3, Jt(Ft))
+  ke(2, Nt),
+  ke(3, er(Ct))
 ], Pe);
-var Di = Object.defineProperty, ki = Object.getOwnPropertyDescriptor, xi = (t, e, r) => e in t ? Di(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Bi = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? ki(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+var xi = Object.defineProperty, Bi = Object.getOwnPropertyDescriptor, Wi = (t, e, r) => e in t ? xi(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Qi = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Bi(e, r) : e, l = t.length - 1, i; l >= 0; l--)
     (i = t[l]) && (n = i(n) || n);
   return n;
-}, mt = (t, e) => (r, s) => e(r, s, t), Qt = (t, e, r) => xi(t, typeof e != "symbol" ? e + "" : e, r);
-const Wi = "SHEET_FILTER_UI_PLUGIN";
+}, pt = (t, e) => (r, s) => e(r, s, t), Vt = (t, e, r) => Wi(t, typeof e != "symbol" ? e + "" : e, r);
+const Vi = "SHEET_FILTER_UI_PLUGIN";
 let be = class extends je {
   constructor(t = Ne, e, r) {
     super(), this._config = t, this._injector = e, this._configService = r;
-    const { menu: s, ...n } = Nt(
+    const { menu: s, ...n } = Ft(
       {},
       Ne,
       this._config
     );
-    s && this._configService.setConfig("menu", s, { merge: !0 }), this._configService.setConfig(Mt, n);
+    s && this._configService.setConfig("menu", s, { merge: !0 }), this._configService.setConfig($t, n);
   }
   onStarting() {
     [
@@ -1921,19 +1925,19 @@ let be = class extends je {
     this._injector.get(de);
   }
 };
-Qt(be, "type", Z.UNIVER_SHEET);
-Qt(be, "pluginName", Wi);
-be = Bi([
-  Et(Ct),
-  mt(1, E(X)),
-  mt(2, Tt)
+Vt(be, "type", Z.UNIVER_SHEET);
+Vt(be, "pluginName", Vi);
+be = Qi([
+  Tt(yt),
+  pt(1, E(X)),
+  pt(2, Nt)
 ], be);
-var Qi = Object.getOwnPropertyDescriptor, Vi = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? Qi(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+var Gi = Object.getOwnPropertyDescriptor, ji = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Gi(e, r) : e, l = t.length - 1, i; l >= 0; l--)
     (i = t[l]) && (n = i(n) || n);
   return n;
-}, pt = (t, e) => (r, s) => e(r, s, t), Ee;
-let ft = (Ee = class extends je {
+}, ft = (t, e) => (r, s) => e(r, s, t), Ee;
+let _t = (Ee = class extends je {
   constructor(t, e, r) {
     super(), this._config = t, this._injector = e, this._rpcChannelService = r;
   }
@@ -1945,19 +1949,19 @@ let ft = (Ee = class extends je {
   onReady() {
     this._rpcChannelService.registerChannel(
       Je,
-      tr(this._injector.get(Fe))
+      ir(this._injector.get(Fe))
     );
   }
 }, f(Ee, "type", Z.UNIVER_SHEET), f(Ee, "pluginName", "SHEET_FILTER_UI_WORKER_PLUGIN"), Ee);
-ft = Vi([
-  pt(1, E(X)),
-  pt(2, Ft)
-], ft);
+_t = ji([
+  ft(1, E(X)),
+  ft(2, Ct)
+], _t);
 export {
-  Dt as ChangeFilterByOperation,
+  kt as ChangeFilterByOperation,
   he as CloseFilterPanelOperation,
   Ie as OpenFilterPanelOperation,
   be as UniverSheetsFilterMobileUIPlugin,
   Pe as UniverSheetsFilterUIPlugin,
-  ft as UniverSheetsFilterUIWorkerPlugin
+  _t as UniverSheetsFilterUIWorkerPlugin
 };