@univerjs/sheets-filter-ui 0.6.7 → 0.6.8

package/lib/es/index.js

@@ -1,19 +1,19 @@
-var Gt = Object.defineProperty;
-var jt = (t, e, r) => e in t ? Gt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
-var f = (t, e, r) => jt(t, typeof e != "symbol" ? e + "" : e, r);
-import { BooleanNumber as st, createIdentifier as _t, Inject as E, LocaleService as X, IUniverInstanceService as je, ILogService as Yt, extractPureTextFromCell as qt, numfmt as it, Disposable as pe, Injector as Z, Quantity as gt, Tools as Fe, ICommandService as Q, CommandType as Me, IContextService as $e, UniverInstanceType as z, ThemeService as vt, RxDisposable as St, fromCallback as Kt, InterceptorEffectEnum as Xt, DependentOn as Et, IConfigService as Tt, Optional as Zt, Plugin as Ye, merge as Ft } from "@univerjs/core";
-import { IRPCChannelService as Ct, toModule as zt, fromModule as Jt } from "@univerjs/rpc";
-import { CustomFilterOperator as u, SetSheetsFilterCriteriaCommand as se, SheetsFilterService as G, SmartToggleSheetsFilterCommand as fe, ReCalcSheetsFilterCommand as qe, ClearSheetsFilterCriteriaCommand as Ke, FILTER_MUTATIONS as er, SetSheetsFilterRangeMutation as tr, SetSheetsFilterCriteriaMutation as rr, RemoveSheetsFilterMutation as sr, ReCalcSheetsFilterMutation as ir, RemoveSheetFilterCommand as nr, SetSheetFilterRangeCommand as or, UniverSheetsFilterPlugin as Nt } from "@univerjs/sheets-filter";
-import { RefRangeService as ar, SheetPermissionCheckController as lr, SheetsSelectionsService as cr, getSheetCommandTarget as ur, WorksheetFilterPermission as le, WorksheetViewPermission as ce, RangeProtectionPermissionViewPoint as ue, expandToContinuousRange as hr, SheetInterceptorService as dr, SetRangeValuesMutation as mr, INTERCEPTOR_POINT as pr } from "@univerjs/sheets";
-import { ILayoutService as fr, useDependency as re, useObservable as W, useComponentsOfPart as _r, ComponentContainer as gr, getMenuHiddenObservable as Xe, MenuItemType as Ze, RibbonStartGroup as vr, KeyCode as Sr, MetaKeys as nt, ComponentManager as Er, IShortcutService as Tr, IMenuManagerService as Fr, IMessageService as Cr } from "@univerjs/ui";
-import { SetCellEditVisibleOperation as Nr, SheetsUIPart as Pr, getObservableWithExclusiveRange$ as yr, getCurrentRangeDisable$ as Or, SheetSkeletonManagerService as Ir, ISheetSelectionRenderService as Rr, SelectionControl as Ar, attachSelectionWithCoord as br, getCoordByCell as Lr, SheetsRenderService as Pt, whenSheetEditorFocused as Mr, SheetCanvasPopManagerService as $r } from "@univerjs/sheets-ui";
-import { BehaviorSubject as K, ReplaySubject as wr, Subject as Ur, merge as Hr, combineLatest as Dr, throttleTime as yt, startWith as Ot, map as ie, shareReplay as kr, of as _e, switchMap as ze, filter as Br, takeUntil as Vr, distinctUntilChanged as Wr } from "rxjs";
-import { Select as ot, RadioGroup as xr, Radio as at, Input as It, Checkbox as Qr, Tree as Gr, Segmented as jr, Button as He, MessageType as Yr } from "@univerjs/design";
-import { Rect as lt, Shape as qr, IRenderManagerService as Rt } from "@univerjs/engine-render";
+var jt = Object.defineProperty;
+var Yt = (t, e, r) => e in t ? jt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
+var f = (t, e, r) => Yt(t, typeof e != "symbol" ? e + "" : e, r);
+import { BooleanNumber as st, createIdentifier as gt, Inject as E, LocaleService as X, IUniverInstanceService as je, ILogService as qt, extractPureTextFromCell as Kt, numfmt as it, Disposable as pe, Injector as Z, Quantity as vt, Tools as Fe, ICommandService as Q, CommandType as Me, IContextService as $e, UniverInstanceType as z, ThemeService as St, RxDisposable as Et, fromCallback as Xt, InterceptorEffectEnum as Zt, DependentOn as Tt, IConfigService as Ft, Optional as zt, Plugin as Ye, merge as Ct } from "@univerjs/core";
+import { IRPCChannelService as Nt, toModule as Jt, fromModule as er } from "@univerjs/rpc";
+import { CustomFilterOperator as u, SetSheetsFilterCriteriaCommand as se, SheetsFilterService as G, SmartToggleSheetsFilterCommand as fe, ReCalcSheetsFilterCommand as qe, ClearSheetsFilterCriteriaCommand as Ke, FILTER_MUTATIONS as tr, SetSheetsFilterRangeMutation as rr, SetSheetsFilterCriteriaMutation as sr, RemoveSheetsFilterMutation as ir, ReCalcSheetsFilterMutation as nr, RemoveSheetFilterCommand as or, SetSheetFilterRangeCommand as ar, UniverSheetsFilterPlugin as Pt } from "@univerjs/sheets-filter";
+import { RefRangeService as lr, SheetPermissionCheckController as cr, SheetsSelectionsService as ur, getSheetCommandTarget as hr, WorksheetFilterPermission as le, WorksheetViewPermission as ce, RangeProtectionPermissionViewPoint as ue, expandToContinuousRange as mr, SheetInterceptorService as dr, SetRangeValuesMutation as pr, INTERCEPTOR_POINT as fr } from "@univerjs/sheets";
+import { ILayoutService as _r, useDependency as re, useObservable as W, useComponentsOfPart as gr, ComponentContainer as vr, getMenuHiddenObservable as Xe, MenuItemType as Ze, RibbonStartGroup as Sr, KeyCode as Er, MetaKeys as nt, ComponentManager as Tr, IShortcutService as Fr, IMenuManagerService as Cr, IMessageService as Nr } from "@univerjs/ui";
+import { SetCellEditVisibleOperation as Pr, SheetsUIPart as yr, getObservableWithExclusiveRange$ as Or, getCurrentRangeDisable$ as Ir, SheetSkeletonManagerService as Rr, ISheetSelectionRenderService as Ar, SelectionControl as br, attachSelectionWithCoord as Lr, getCoordByCell as Mr, SheetsRenderService as yt, whenSheetEditorFocused as $r, SheetCanvasPopManagerService as wr } from "@univerjs/sheets-ui";
+import { BehaviorSubject as K, ReplaySubject as Ur, Subject as Hr, merge as Dr, combineLatest as kr, throttleTime as Ot, startWith as It, map as ie, shareReplay as Br, of as _e, switchMap as ze, filter as Vr, takeUntil as Wr, distinctUntilChanged as xr } from "rxjs";
+import { Select as ot, RadioGroup as Qr, Radio as at, Input as Rt, Checkbox as Gr, Tree as jr, Segmented as Yr, Button as He, MessageType as qr } from "@univerjs/design";
+import { Rect as lt, Shape as Kr, IRenderManagerService as At } from "@univerjs/engine-render";
 import { jsx as S, jsxs as L, Fragment as ct } from "react/jsx-runtime";
-import { forwardRef as At, useRef as Kr, createElement as bt, useCallback as k, useMemo as Je } from "react";
-const Lt = "sheets-filter-ui.config", Ce = {};
-var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SECOND", t))(C || {}), _ = /* @__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;
+import { forwardRef as bt, useRef as Xr, createElement as Lt, useCallback as k, useMemo as Je } from "react";
+const Mt = "sheets-filter-ui.config", Ce = {};
+var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SECOND", t))(C || {}), _ = /* @__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))(_ || {}), m;
 ((t) => {
   t.NONE = {
     label: "sheets-filter.conditions.none",
@@ -390,20 +390,20 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     }),
     testMappingParams: () => !0,
     mapToFilterColumn: (s) => {
-      const { and: o, val1: a, val2: c, operator1: h, operator2: m } = s;
+      const { and: o, val1: a, val2: c, operator1: h, operator2: d } = s;
       function v(I, y) {
         for (const $ of t.ALL_CONDITIONS)
           if ($.operator === I)
             return $.mapToFilterColumn({ val1: y, operator1: I });
       }
-      const p = !h || h === t.NONE.operator, T = !m || m === t.NONE.operator;
+      const p = !h || h === t.NONE.operator, T = !d || d === t.NONE.operator;
       if (p && T)
         return t.NONE.mapToFilterColumn({});
       if (p)
-        return v(m, c);
+        return v(d, c);
       if (T)
         return v(h, a);
-      const g = v(h, a), N = v(m, c), F = {
+      const g = v(h, a), N = v(d, c), F = {
         customFilters: [
           g.customFilters.customFilters[0],
           N.customFilters.customFilters[0]
@@ -484,7 +484,7 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     return [t.NONE, {}];
   }
   t.testMappingFilterColumn = l;
-})(d || (d = {}));
+})(m || (m = {}));
 function M(t) {
   const { operator1: e, operator2: r, val1: i, val2: n } = t;
   if (e && r)
@@ -506,12 +506,12 @@ function Ve(t) {
     unchecked: n
   };
 }
-var Xr = Object.getOwnPropertyDescriptor, Zr = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? Xr(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+var Zr = Object.getOwnPropertyDescriptor, zr = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? Zr(e, r) : e, l = t.length - 1, s; l >= 0; l--)
     (s = t[l]) && (n = s(n) || n);
   return n;
 }, De = (t, e) => (r, i) => e(r, i, t);
-const et = "sheets-filter.generate-filter-values.service", Ne = _t(et), zr = ["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 et = "sheets-filter.generate-filter-values.service", Ne = gt(et), Jr = ["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 We = class extends pe {
   constructor(t, e, r) {
     super(), this._localeService = t, this._univerInstanceService = e, this._logService = r;
@@ -519,34 +519,34 @@ let We = class extends pe {
   async getFilterValues(t) {
     var h;
     const { unitId: e, subUnitId: r, filteredOutRowsByOtherColumns: i, filters: n, blankChecked: l, iterateRange: s, 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 }), Mt(n, this._localeService, s, c, new Set(i), new Set(o.map(String)), l, a.getStyles()));
+    return !a || !c ? [] : (this._logService.debug("[SheetsGenerateFilterValuesService]", "getFilterValues for", { unitId: e, subUnitId: r }), $t(n, this._localeService, s, c, new Set(i), new Set(o.map(String)), l, a.getStyles()));
   }
 };
-We = Zr([
+We = zr([
   De(0, E(X)),
   De(1, je),
-  De(2, Yt)
+  De(2, qt)
 ], We);
-function Mt(t, e, r, i, n, l, s, o) {
+function $t(t, e, r, i, n, l, s, o) {
   var g, N, F, I, y, $, w, ge, ve;
-  const a = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map(), h = "yyyy-mm-dd", m = new Set(zr), v = "empty";
+  const a = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map(), h = "yyyy-mm-dd", d = new Set(Jr), v = "empty";
   let p = 0;
   for (const R of i.iterateByColumn(r, !1, !1)) {
-    const { row: Wt, rowSpan: rt = 1 } = R;
+    const { row: xt, rowSpan: rt = 1 } = R;
     let J = 0;
     for (; J < rt; ) {
-      const xt = Wt + J;
-      if (n.has(xt)) {
+      const Qt = xt + J;
+      if (n.has(Qt)) {
         J++;
         continue;
       }
-      const j = R != null && R.value ? qt(R.value) : "";
+      const j = R != null && R.value ? Kt(R.value) : "";
       if (!j) {
         p += 1, J += rt;
         continue;
       }
-      const Se = (g = R.value) != null && g.v && !R.value.p ? (I = (F = o.get((N = R.value) == null ? void 0 : N.s)) == null ? void 0 : F.n) == null ? void 0 : I.pattern : "", Qt = Se && it.isDate(Se);
-      if (Se && Qt && m.has(Se)) {
+      const Se = (g = R.value) != null && g.v && !R.value.p ? (I = (F = o.get((N = R.value) == null ? void 0 : N.s)) == null ? void 0 : F.n) == null ? void 0 : I.pattern : "", Gt = Se && it.isDate(Se);
+      if (Se && Gt && d.has(Se)) {
         const B = (y = i.getCellRaw(R.row, R.col)) == null ? void 0 : y.v;
         if (!B) {
           J++;
@@ -606,12 +606,12 @@ function Mt(t, e, r, i, n, l, s, o) {
     a.set("empty", R), c.set("empty", [v]);
   }
   return {
-    filterTreeItems: Jr(Array.from(a.values())),
+    filterTreeItems: es(Array.from(a.values())),
     filterTreeMapCache: c
   };
 }
-function Jr(t) {
-  return Array.from(t).sort((e, r) => e.children && !r.children ? -1 : !e.children && r.children ? 1 : r.title.localeCompare(e.title)).map((e) => (e.children && e.children.sort((r, i) => {
+function es(t) {
+  return Array.from(t).sort((e, r) => e.children && !r.children ? -1 : !e.children && r.children ? 1 : ts(e.title, r.title)).map((e) => (e.children && e.children.sort((r, i) => {
     const n = Number.parseInt(r.key.split("-")[1], 10), l = Number.parseInt(i.key.split("-")[1], 10);
     return n - l;
   }).forEach((r) => {
@@ -621,6 +621,11 @@ function Jr(t) {
     });
   }), e));
 }
+const ut = (t) => !Number.isNaN(Number(t)) && !Number.isNaN(Number.parseFloat(t));
+function ts(t, e) {
+  const r = ut(t), i = ut(e);
+  return r && i ? Number.parseFloat(t) - Number.parseFloat(e) : r && !i ? -1 : !r && i ? 1 : t.localeCompare(e);
+}
 function xe(t, e) {
   for (const r of t) {
     if (r.key === e)
@@ -633,13 +638,13 @@ function xe(t, e) {
   }
   return null;
 }
-function $t(t) {
-  return t.leaf ? t.checked : t.children ? t.children.every((e) => $t(e)) : !0;
+function wt(t) {
+  return t.leaf ? t.checked : t.children ? t.children.every((e) => wt(e)) : !0;
 }
 function he(t, e) {
   t.leaf && (e !== void 0 ? t.checked = e : t.checked = !t.checked), t.children && t.children.forEach((r) => he(r, e));
 }
-function wt(t, e) {
+function Ut(t, e) {
   const r = [];
   return t.forEach((i) => {
     const n = i.originValues ? e.some(
@@ -652,7 +657,7 @@ function wt(t, e) {
     if (n || l)
       r.push({ ...i });
     else if (i.children) {
-      const o = wt(i.children, e);
+      const o = Ut(i.children, e);
       if (o.length > 0) {
         const a = o.reduce((c, h) => c + h.count, 0);
         r.push({ ...i, count: a, children: o });
@@ -660,12 +665,12 @@ function wt(t, e) {
     }
   }), r;
 }
-var es = Object.getOwnPropertyDescriptor, tt = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? es(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+var rs = Object.getOwnPropertyDescriptor, tt = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? rs(e, r) : e, l = t.length - 1, s; l >= 0; l--)
     (s = t[l]) && (n = s(n) || n);
   return n;
 }, Pe = (t, e) => (r, i) => e(r, i, t), ye = /* @__PURE__ */ ((t) => (t[t.VALUES = 0] = "VALUES", t[t.CONDITIONS = 1] = "CONDITIONS", t))(ye || {});
-_t("sheets-filter-ui.sheets-filter-panel.service");
+gt("sheets-filter-ui.sheets-filter-panel.service");
 let x = class extends pe {
   constructor(e, r) {
     super();
@@ -674,7 +679,7 @@ let x = class extends pe {
       /* VALUES */
     ));
     f(this, "filterBy$", this._filterBy$.asObservable());
-    f(this, "_filterByModel$", new wr(1));
+    f(this, "_filterByModel$", new Ur(1));
     f(this, "filterByModel$", this._filterByModel$.asObservable());
     f(this, "_filterByModel", null);
     f(this, "_hasCriteria$", new K(!1));
@@ -784,7 +789,7 @@ let x = class extends pe {
 };
 x = tt([
   Pe(0, E(Z)),
-  Pe(1, E(ar))
+  Pe(1, E(lr))
 ], x);
 let Oe = class extends pe {
   constructor(e, r, i, n, l) {
@@ -808,7 +813,7 @@ let Oe = class extends pe {
    * @returns the model to control the panel's state
    */
   static fromFilterColumn(e, r, i, n) {
-    const [l, s] = d.testMappingFilterColumn(n == null ? void 0 : n.getColumnData());
+    const [l, s] = m.testMappingFilterColumn(n == null ? void 0 : n.getColumnData());
     return e.createInstance(Oe, r, i, l, s);
   }
   get conditionItem() {
@@ -836,7 +841,7 @@ let Oe = class extends pe {
    */
   async apply() {
     if (this._disposed) return !1;
-    const e = d.mapToFilterColumn(this.conditionItem, this.filterConditionFormParams);
+    const e = m.mapToFilterColumn(this.conditionItem, this.filterConditionFormParams);
     return this._commandService.executeCommand(se.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
@@ -849,10 +854,10 @@ let Oe = class extends pe {
    * `IFilterConditionFormParams` and load default condition form params.
    */
   onPrimaryConditionChange(e) {
-    const r = d.ALL_CONDITIONS.find((i) => i.operator === e);
+    const r = m.ALL_CONDITIONS.find((i) => i.operator === e);
     if (!r)
       throw new Error(`[ByConditionsModel]: condition item not found for operator: ${e}!`);
-    this._conditionItem$.next(r), this._filterConditionFormParams$.next(d.getInitialFormParams(e));
+    this._conditionItem$.next(r), this._filterConditionFormParams$.next(m.getInitialFormParams(e));
   }
   /**
    * This method would be called when user changes the primary conditions, the input values or "AND" "OR" ratio.
@@ -865,7 +870,7 @@ let Oe = class extends pe {
   onConditionFormChange(e) {
     const r = { ...this.filterConditionFormParams, ...e };
     if (r.and !== !0 && delete r.and, typeof e.and < "u" || typeof e.operator1 < "u" || typeof e.operator2 < "u") {
-      const i = d.testMappingParams(r, this.conditionItem.numOfParameters);
+      const i = m.testMappingParams(r, this.conditionItem.numOfParameters);
       this._conditionItem$.next(i);
     }
     this._filterConditionFormParams$.next(r);
@@ -886,22 +891,22 @@ let Ie = class extends pe {
     f(this, "_manuallyUpdateFilterItems$");
     f(this, "_searchString$");
     f(this, "searchString$");
-    this._filterModel = e, this.col = r, this._commandService = l, this._treeMapCache = n, this._searchString$ = new K(""), this.searchString$ = this._searchString$.asObservable(), this._rawFilterItems$ = new K(i), this.rawFilterItems$ = this._rawFilterItems$.asObservable(), this._manuallyUpdateFilterItems$ = new Ur(), this.filterItems$ = Hr(
-      Dr([
+    this._filterModel = e, this.col = r, this._commandService = l, this._treeMapCache = n, this._searchString$ = new K(""), this.searchString$ = this._searchString$.asObservable(), this._rawFilterItems$ = new K(i), this.rawFilterItems$ = this._rawFilterItems$.asObservable(), this._manuallyUpdateFilterItems$ = new Hr(), this.filterItems$ = Dr(
+      kr([
         this._searchString$.pipe(
-          yt(500, void 0, { leading: !0, trailing: !0 }),
-          Ot(void 0)
+          Ot(500, void 0, { leading: !0, trailing: !0 }),
+          It(void 0)
         ),
         this._rawFilterItems$
       ]).pipe(
         ie(([s, o]) => {
           if (!s) return o;
           const c = s.toLowerCase().split(/\s+/).filter((h) => !!h);
-          return wt(o, c);
+          return Ut(o, c);
         })
       ),
       this._manuallyUpdateFilterItems$
-    ).pipe(kr(1)), this.canApply$ = this.filterItems$.pipe(ie((s) => Ve(s).checked > 0)), this.disposeWithMe(this.filterItems$.subscribe((s) => this._filterItems = s));
+    ).pipe(Br(1)), this.canApply$ = this.filterItems$.pipe(ie((s) => Ve(s).checked > 0)), this.disposeWithMe(this.filterItems$.subscribe((s) => this._filterItems = s));
   }
   /**
    * Create a model with targeting filter column. If there is not a filter column, the model would be created with
@@ -915,11 +920,11 @@ let Ie = class extends pe {
    */
   static async fromFilterColumn(e, r, i) {
     var $;
-    const n = e.get(je), l = e.get(X), s = e.get(Ne, gt.OPTIONAL), { unitId: o, subUnitId: a } = r, c = n.getUniverSheetInstance(o);
+    const n = e.get(je), l = e.get(X), s = e.get(Ne, vt.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}!`);
-    const m = r.getRange(), v = i, p = ($ = r.getFilterColumn(i)) == null ? void 0 : $.getColumnData().filters, T = new Set(p == null ? void 0 : p.filters), g = !!(p && p.blank), N = r.getFilteredOutRowsExceptCol(i), F = { ...m, startRow: m.startRow + 1, startColumn: v, endColumn: v };
+    const d = r.getRange(), v = i, p = ($ = r.getFilterColumn(i)) == null ? void 0 : $.getColumnData().filters, T = new Set(p == null ? void 0 : p.filters), g = !!(p && p.blank), N = r.getFilteredOutRowsExceptCol(i), F = { ...d, startRow: d.startRow + 1, startColumn: v, endColumn: v };
     let I, y;
     if (s) {
       const w = await s.getFilterValues({
@@ -933,7 +938,7 @@ let Ie = class extends pe {
       });
       I = w.filterTreeItems, y = w.filterTreeMapCache;
     } else {
-      const w = Mt(!!p, l, F, h, N, T, g, c.getStyles());
+      const w = $t(!!p, l, F, h, N, T, g, c.getStyles());
       I = w.filterTreeItems, y = w.filterTreeMapCache;
     }
     return e.createInstance(Ie, r, i, I, y);
@@ -967,7 +972,7 @@ let Ie = class extends pe {
     const r = Fe.deepClone(this._filterItems), i = xe(r, e.key);
     if (!i)
       return;
-    const n = $t(i);
+    const n = wt(i);
     he(i, !n), this._manuallyUpdateFilterItems(r);
   }
   onFilterOnly(e) {
@@ -1012,9 +1017,9 @@ let Ie = class extends pe {
       });
     {
       a.filters = {};
-      const c = i.filter((m) => m.key !== "empty");
+      const c = i.filter((d) => d.key !== "empty");
       c.length > 0 && (a.filters = {
-        filters: c.flatMap((m) => m.originValues ? Array.from(m.originValues) : [m.title])
+        filters: c.flatMap((d) => d.originValues ? Array.from(d.originValues) : [d.title])
       }), c.length !== i.length && (a.filters.blank = !0);
     }
     return this._commandService.executeCommand(se.id, {
@@ -1034,18 +1039,18 @@ const ne = "FILTER_PANEL_OPENED", Re = {
   type: Me.OPERATION,
   handler: (t, e) => {
     const r = t.get($e), i = t.get(G), n = t.get(x);
-    t.get(Q).syncExecuteCommand(Nr.id, { visible: !1 });
+    t.get(Q).syncExecuteCommand(Pr.id, { visible: !1 });
     const { unitId: s, subUnitId: o, col: a } = e, c = i.getFilterModel(s, o);
     return c ? (n.setupCol(c, a), r.getContextValue(ne) || r.setContextValue(ne, !0), !0) : !1;
   }
-}, de = {
+}, me = {
   id: "sheet.operation.close-filter-panel",
   type: Me.OPERATION,
   handler: (t) => {
-    const e = t.get($e), r = t.get(x), i = t.get(fr, gt.OPTIONAL);
+    const e = t.get($e), r = t.get(x), i = t.get(_r, vt.OPTIONAL);
     return e.getContextValue(ne) ? (e.setContextValue(ne, !1), i == null || i.focus(), r.terminate()) : !1;
   }
-}, Ut = {
+}, Ht = {
   id: "sheet.operation.apply-filter",
   type: Me.OPERATION,
   handler: (t, e) => {
@@ -1053,8 +1058,8 @@ const ne = "FILTER_PANEL_OPENED", Re = {
     return t.get(x).changeFilterBy(r);
   }
 };
-var ts = Object.getOwnPropertyDescriptor, rs = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? ts(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+var ss = Object.getOwnPropertyDescriptor, is = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? ss(e, r) : e, l = t.length - 1, s; l >= 0; l--)
     (s = t[l]) && (n = s(n) || n);
   return n;
 }, te = (t, e) => (r, i) => e(r, i, t);
@@ -1067,7 +1072,7 @@ let oe = class extends pe {
       this._commandService.beforeCommandExecuted((t) => {
         var e, r, i;
         if (t.id === fe.id) {
-          const n = this._injector.get(je), l = ur(n);
+          const n = this._injector.get(je), l = hr(n);
           if (!l) return;
           const { unitId: s, subUnitId: o, worksheet: a } = l, c = (e = this._sheetsFilterService.getFilterModel(s, o)) == null ? void 0 : e.getRange();
           let h;
@@ -1077,10 +1082,10 @@ let oe = class extends pe {
               worksheetTypes: [le, ce]
             }, [c]);
           else {
-            const m = (r = this._sheetsSelectionService.getCurrentLastSelection()) == null ? void 0 : r.range;
-            if (m) {
-              let v = { ...m };
-              v = m.startColumn === m.endColumn && m.startRow === m.endRow ? hr(v, { left: !0, right: !0, up: !0, down: !0 }, a) : v, h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
+            const d = (r = this._sheetsSelectionService.getCurrentLastSelection()) == null ? void 0 : r.range;
+            if (d) {
+              let v = { ...d };
+              v = d.startColumn === d.endColumn && d.startRow === d.endRow ? mr(v, { left: !0, right: !0, up: !0, down: !0 }, a) : v, h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
                 rangeTypes: [ue],
                 worksheetTypes: [ce, le]
               }, [v], s, o);
@@ -1103,13 +1108,13 @@ let oe = class extends pe {
     );
   }
 };
-oe = rs([
+oe = is([
   te(0, E(G)),
   te(1, E(X)),
   te(2, Q),
-  te(3, E(lr)),
+  te(3, E(cr)),
   te(4, E(Z)),
-  te(5, E(cr))
+  te(5, E(ur))
 ], oe);
 var b = function() {
   return b = Object.assign || function(t) {
@@ -1119,23 +1124,23 @@ var b = function() {
     }
     return t;
   }, b.apply(this, arguments);
-}, ss = function(t, e) {
+}, ns = function(t, e) {
   var r = {};
   for (var i in t) Object.prototype.hasOwnProperty.call(t, i) && e.indexOf(i) < 0 && (r[i] = t[i]);
   if (t != null && typeof Object.getOwnPropertySymbols == "function")
     for (var n = 0, i = Object.getOwnPropertySymbols(t); n < i.length; n++)
       e.indexOf(i[n]) < 0 && Object.prototype.propertyIsEnumerable.call(t, i[n]) && (r[i[n]] = t[i[n]]);
   return r;
-}, Ht = At(function(t, e) {
-  var r = t.icon, i = t.id, n = t.className, l = t.extend, s = ss(t, ["icon", "id", "className", "extend"]), o = "univerjs-icon univerjs-icon-".concat(i, " ").concat(n || "").trim(), a = Kr("_".concat(os()));
-  return Dt(r, "".concat(i), { defIds: r.defIds, idSuffix: a.current }, b({ ref: e, className: o }, s), l);
+}, Dt = bt(function(t, e) {
+  var r = t.icon, i = t.id, n = t.className, l = t.extend, s = ns(t, ["icon", "id", "className", "extend"]), o = "univerjs-icon univerjs-icon-".concat(i, " ").concat(n || "").trim(), a = Xr("_".concat(ls()));
+  return kt(r, "".concat(i), { defIds: r.defIds, idSuffix: a.current }, b({ ref: e, className: o }, s), l);
 });
-function Dt(t, e, r, i, n) {
-  return bt(t.tag, b(b({ key: e }, is(t, r, n)), i), (ns(t, r).children || []).map(function(l, s) {
-    return Dt(l, "".concat(e, "-").concat(t.tag, "-").concat(s), r, void 0, n);
+function kt(t, e, r, i, n) {
+  return Lt(t.tag, b(b({ key: e }, os(t, r, n)), i), (as(t, r).children || []).map(function(l, s) {
+    return kt(l, "".concat(e, "-").concat(t.tag, "-").concat(s), r, void 0, n);
   }));
 }
-function is(t, e, r) {
+function os(t, e, r) {
   var i = b({}, t.attrs);
   r != null && r.colorChannel1 && i.fill === "colorChannel1" && (i.fill = r.colorChannel1), t.tag === "mask" && i.id && (i.id = i.id + e.idSuffix), Object.entries(i).forEach(function(l) {
     var s = l[0], o = l[1];
@@ -1147,63 +1152,63 @@ function is(t, e, r) {
     typeof o == "string" && (i[s] = o.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   })), i;
 }
-function ns(t, e) {
+function as(t, e) {
   var r, i = e.defIds;
   return !i || i.length === 0 ? t : t.tag === "defs" && (!((r = t.children) === null || r === void 0) && r.length) ? b(b({}, t), { children: t.children.map(function(n) {
     return typeof n.attrs.id == "string" && i && i.indexOf(n.attrs.id) > -1 ? b(b({}, n), { attrs: b(b({}, n.attrs), { id: n.attrs.id + e.idSuffix }) }) : n;
   }) }) : t;
 }
-function os() {
+function ls() {
   return Math.random().toString(36).substring(2, 8);
 }
-Ht.displayName = "UniverIcon";
-var as = { tag: "svg", attrs: { 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" } }] }, kt = At(function(t, e) {
-  return bt(Ht, Object.assign({}, t, {
+Dt.displayName = "UniverIcon";
+var cs = { tag: "svg", attrs: { 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 = bt(function(t, e) {
+  return Lt(Dt, Object.assign({}, t, {
     id: "filter-single",
     ref: e,
-    icon: as
+    icon: cs
   }));
 });
-kt.displayName = "FilterSingle";
-const ls = "univer-sheets-filter-panel", cs = "univer-sheets-filter-panel-header", us = "univer-sheets-filter-panel-content", hs = "univer-sheets-filter-panel-values-container", ds = "univer-sheets-filter-panel-values-virtual", ms = "univer-sheets-filter-panel-values-item", ps = "univer-sheets-filter-panel-values-item-inner", fs = "univer-sheets-filter-panel-values-item-count", _s = "univer-sheets-filter-panel-values-item-text", gs = "univer-sheets-filter-panel-conditions-container", vs = "univer-sheets-filter-panel-conditions-container-inner", Ss = "univer-sheets-filter-panel-conditions-desc", Es = "univer-sheets-filter-panel-footer", Ts = "univer-sheets-filter-panel-footer-primary-buttons", O = {
-  sheetsFilterPanel: ls,
-  sheetsFilterPanelHeader: cs,
-  sheetsFilterPanelContent: us,
-  sheetsFilterPanelValuesContainer: hs,
-  sheetsFilterPanelValuesVirtual: ds,
-  sheetsFilterPanelValuesItem: ms,
-  sheetsFilterPanelValuesItemInner: ps,
-  sheetsFilterPanelValuesItemCount: fs,
-  sheetsFilterPanelValuesItemText: _s,
-  sheetsFilterPanelConditionsContainer: gs,
-  sheetsFilterPanelConditionsContainerInner: vs,
-  sheetsFilterPanelConditionsDesc: Ss,
-  sheetsFilterPanelFooter: Es,
-  sheetsFilterPanelFooterPrimaryButtons: Ts
+Bt.displayName = "FilterSingle";
+const us = "univer-sheets-filter-panel", hs = "univer-sheets-filter-panel-header", ms = "univer-sheets-filter-panel-content", ds = "univer-sheets-filter-panel-values-container", ps = "univer-sheets-filter-panel-values-virtual", fs = "univer-sheets-filter-panel-values-item", _s = "univer-sheets-filter-panel-values-item-inner", gs = "univer-sheets-filter-panel-values-item-count", vs = "univer-sheets-filter-panel-values-item-text", Ss = "univer-sheets-filter-panel-conditions-container", Es = "univer-sheets-filter-panel-conditions-container-inner", Ts = "univer-sheets-filter-panel-conditions-desc", Fs = "univer-sheets-filter-panel-footer", Cs = "univer-sheets-filter-panel-footer-primary-buttons", O = {
+  sheetsFilterPanel: us,
+  sheetsFilterPanelHeader: hs,
+  sheetsFilterPanelContent: ms,
+  sheetsFilterPanelValuesContainer: ds,
+  sheetsFilterPanelValuesVirtual: ps,
+  sheetsFilterPanelValuesItem: fs,
+  sheetsFilterPanelValuesItemInner: _s,
+  sheetsFilterPanelValuesItemCount: gs,
+  sheetsFilterPanelValuesItemText: vs,
+  sheetsFilterPanelConditionsContainer: Ss,
+  sheetsFilterPanelConditionsContainerInner: Es,
+  sheetsFilterPanelConditionsDesc: Ts,
+  sheetsFilterPanelFooter: Fs,
+  sheetsFilterPanelFooterPrimaryButtons: Cs
 };
-function Fs(t) {
+function Ns(t) {
   var p, T;
   const { model: e } = t, r = re(X), i = W(e.conditionItem$, void 0), n = W(e.filterConditionFormParams$, void 0), l = n != null && n.and ? "AND" : "OR", s = k((g) => {
     e.onConditionFormChange({ and: g === "AND" });
-  }, [e]), o = Cs(r), a = k((g) => {
+  }, [e]), o = Ps(r), a = k((g) => {
     e.onPrimaryConditionChange(g);
-  }, [e]), c = Ns(r), h = k((g) => {
+  }, [e]), c = ys(r), h = k((g) => {
     e.onConditionFormChange(g);
-  }, [e]), m = r.t("sheets-filter.panel.input-values-placeholder");
+  }, [e]), d = r.t("sheets-filter.panel.input-values-placeholder");
   function v(g, N, F) {
-    const I = d.getItemByOperator(g).numOfParameters === 1;
+    const I = m.getItemByOperator(g).numOfParameters === 1;
     return /* @__PURE__ */ L(ct, { children: [
-      F === "operator2" && /* @__PURE__ */ L(xr, { value: l, onChange: s, children: [
+      F === "operator2" && /* @__PURE__ */ L(Qr, { value: l, onChange: s, 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(ot, { value: g, options: c, onChange: (y) => h({ [F]: y }) }),
-      I && /* @__PURE__ */ S("div", { children: /* @__PURE__ */ S(It, { value: N, placeholder: m, onChange: (y) => h({ [F === "operator1" ? "val1" : "val2"]: y }) }) })
+      I && /* @__PURE__ */ S("div", { children: /* @__PURE__ */ S(Rt, { value: N, placeholder: d, onChange: (y) => h({ [F === "operator1" ? "val1" : "val2"]: y }) }) })
     ] });
   }
   return /* @__PURE__ */ S("div", { className: O.sheetsFilterPanelConditionsContainer, children: i && n && /* @__PURE__ */ L(ct, { children: [
     /* @__PURE__ */ S(ot, { value: i.operator, options: o, onChange: a }),
-    d.getItemByOperator(i.operator).numOfParameters !== 0 ? /* @__PURE__ */ L("div", { className: O.sheetsFilterPanelConditionsContainerInner, children: [
+    m.getItemByOperator(i.operator).numOfParameters !== 0 ? /* @__PURE__ */ L("div", { className: O.sheetsFilterPanelConditionsContainerInner, children: [
       i.numOfParameters >= 1 && v(n.operator1, (p = n.val1) != null ? p : "", "operator1"),
       i.numOfParameters >= 2 && v(n.operator2, (T = n.val2) != null ? T : "", "operator2"),
       /* @__PURE__ */ L("div", { className: O.sheetsFilterPanelConditionsDesc, children: [
@@ -1214,45 +1219,45 @@ function Fs(t) {
     ] }) : null
   ] }) });
 }
-function Cs(t) {
+function Ps(t) {
   const e = t.getCurrentLocale();
   return Je(
     () => [
       {
         options: [
-          { label: t.t(d.NONE.label), value: d.NONE.operator }
+          { label: t.t(m.NONE.label), value: m.NONE.operator }
         ]
       },
       {
         options: [
-          { label: t.t(d.EMPTY.label), value: d.EMPTY.operator },
-          { label: t.t(d.NOT_EMPTY.label), value: d.NOT_EMPTY.operator }
+          { label: t.t(m.EMPTY.label), value: m.EMPTY.operator },
+          { label: t.t(m.NOT_EMPTY.label), value: m.NOT_EMPTY.operator }
         ]
       },
       {
         options: [
-          { label: t.t(d.TEXT_CONTAINS.label), value: d.TEXT_CONTAINS.operator },
-          { label: t.t(d.DOES_NOT_CONTAIN.label), value: d.DOES_NOT_CONTAIN.operator },
-          { label: t.t(d.STARTS_WITH.label), value: d.STARTS_WITH.operator },
-          { label: t.t(d.ENDS_WITH.label), value: d.ENDS_WITH.operator },
-          { label: t.t(d.EQUALS.label), value: d.EQUALS.operator }
+          { label: t.t(m.TEXT_CONTAINS.label), value: m.TEXT_CONTAINS.operator },
+          { label: t.t(m.DOES_NOT_CONTAIN.label), value: m.DOES_NOT_CONTAIN.operator },
+          { label: t.t(m.STARTS_WITH.label), value: m.STARTS_WITH.operator },
+          { label: t.t(m.ENDS_WITH.label), value: m.ENDS_WITH.operator },
+          { label: t.t(m.EQUALS.label), value: m.EQUALS.operator }
         ]
       },
       {
         options: [
-          { label: t.t(d.GREATER_THAN.label), value: d.GREATER_THAN.operator },
-          { label: t.t(d.GREATER_THAN_OR_EQUAL.label), value: d.GREATER_THAN_OR_EQUAL.operator },
-          { label: t.t(d.LESS_THAN.label), value: d.LESS_THAN.operator },
-          { label: t.t(d.LESS_THAN_OR_EQUAL.label), value: d.LESS_THAN_OR_EQUAL.operator },
-          { label: t.t(d.EQUAL.label), value: d.EQUAL.operator },
-          { label: t.t(d.NOT_EQUAL.label), value: d.NOT_EQUAL.operator },
-          { label: t.t(d.BETWEEN.label), value: d.BETWEEN.operator },
-          { label: t.t(d.NOT_BETWEEN.label), value: d.NOT_BETWEEN.operator }
+          { label: t.t(m.GREATER_THAN.label), value: m.GREATER_THAN.operator },
+          { label: t.t(m.GREATER_THAN_OR_EQUAL.label), value: m.GREATER_THAN_OR_EQUAL.operator },
+          { label: t.t(m.LESS_THAN.label), value: m.LESS_THAN.operator },
+          { label: t.t(m.LESS_THAN_OR_EQUAL.label), value: m.LESS_THAN_OR_EQUAL.operator },
+          { label: t.t(m.EQUAL.label), value: m.EQUAL.operator },
+          { label: t.t(m.NOT_EQUAL.label), value: m.NOT_EQUAL.operator },
+          { label: t.t(m.BETWEEN.label), value: m.BETWEEN.operator },
+          { label: t.t(m.NOT_BETWEEN.label), value: m.NOT_BETWEEN.operator }
         ]
       },
       {
         options: [
-          { label: t.t(d.CUSTOM.label), value: d.CUSTOM.operator }
+          { label: t.t(m.CUSTOM.label), value: m.CUSTOM.operator }
         ]
       }
     ],
@@ -1260,18 +1265,18 @@ function Cs(t) {
     [e, t]
   );
 }
-function Ns(t) {
+function ys(t) {
   const e = t.getCurrentLocale();
   return Je(
-    () => d.ALL_CONDITIONS.filter((r) => r.numOfParameters !== 2).map((r) => ({ label: t.t(r.label), value: r.operator })),
+    () => m.ALL_CONDITIONS.filter((r) => r.numOfParameters !== 2).map((r) => ({ label: t.t(r.label), value: r.operator })),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [e, t]
   );
 }
-function Ps(t) {
+function Os(t) {
   const { model: e } = t, r = re(X), i = W(e.searchString$, "", !0), n = W(e.filterItems$, void 0, !0), l = r.t("sheets-filter.panel.filter-only"), s = Ve(n), o = s.checked > 0 && s.unchecked === 0, a = s.checked > 0 && s.unchecked > 0, c = e.treeMapCache, h = k(() => {
     e.onCheckAllToggled(!o);
-  }, [e, o]), m = k((p) => {
+  }, [e, o]), d = k((p) => {
     e.setSearchString(p);
   }, [e]);
   function v(p) {
@@ -1282,12 +1287,12 @@ function Ps(t) {
   }
   return /* @__PURE__ */ L("div", { className: O.sheetsFilterPanelValuesContainer, children: [
     /* @__PURE__ */ S(
-      It,
+      Rt,
       {
         autoFocus: !0,
         value: i,
         placeholder: r.t("sheets-filter.panel.search-placeholder"),
-        onChange: m
+        onChange: d
       }
     ),
     /* @__PURE__ */ L(
@@ -1300,7 +1305,7 @@ function Ps(t) {
         children: [
           /* @__PURE__ */ S("div", { className: O.sheetsFilterPanelValuesItem, children: /* @__PURE__ */ L("div", { className: O.sheetsFilterPanelValuesItemInner, children: [
             /* @__PURE__ */ S(
-              Qr,
+              Gr,
               {
                 indeterminate: a,
                 disabled: n.length === 0,
@@ -1312,7 +1317,7 @@ function Ps(t) {
             /* @__PURE__ */ S("span", { className: O.sheetsFilterPanelValuesItemCount, children: `(${s.checked}/${s.checked + s.unchecked})` })
           ] }) }),
           /* @__PURE__ */ S("div", { className: O.sheetsFilterPanelValuesVirtual, children: /* @__PURE__ */ S(
-            Gr,
+            jr,
             {
               data: n,
               defaultExpandAll: !1,
@@ -1340,7 +1345,9 @@ function Ps(t) {
                     /* @__PURE__ */ S(
                       "a",
                       {
-                        className: "univer-box-border univer-hidden univer-h-4 univer-px-1.5",
+                        className: `
+                                      univer-box-border univer-hidden univer-h-4 univer-whitespace-nowrap univer-px-1.5
+                                    `,
                         onClick: () => {
                           const T = [];
                           p.children ? p.children.forEach((g) => {
@@ -1362,51 +1369,51 @@ function Ps(t) {
     )
   ] });
 }
-function ys() {
+function Is() {
   var N;
-  const t = re(x), e = re(X), r = re(Q), i = W(t.filterBy$, void 0, !0), n = W(t.filterByModel$, void 0, !1), l = W(() => (n == null ? void 0 : n.canApply$) || _e(!1), void 0, !1, [n]), s = Os(e), o = !W(t.hasCriteria$), a = k((F) => {
-    r.executeCommand(Ut.id, { filterBy: F });
+  const t = re(x), e = re(X), r = re(Q), i = W(t.filterBy$, void 0, !0), n = W(t.filterByModel$, void 0, !1), l = W(() => (n == null ? void 0 : n.canApply$) || _e(!1), void 0, !1, [n]), s = Rs(e), o = !W(t.hasCriteria$), a = k((F) => {
+    r.executeCommand(Ht.id, { filterBy: F });
   }, [r]), c = k(async () => {
-    await (n == null ? void 0 : n.clear()), r.executeCommand(de.id);
+    await (n == null ? void 0 : n.clear()), r.executeCommand(me.id);
   }, [n, r]), h = k(() => {
-    r.executeCommand(de.id);
-  }, [r]), m = k(async () => {
-    await (n == null ? void 0 : n.apply()), r.executeCommand(de.id);
-  }, [n, r]), p = (N = re(G).activeFilterModel) == null ? void 0 : N.getRange(), T = t.col, g = _r(Pr.FILTER_PANEL_EMBED_POINT);
+    r.executeCommand(me.id);
+  }, [r]), d = k(async () => {
+    await (n == null ? void 0 : n.apply()), r.executeCommand(me.id);
+  }, [n, r]), p = (N = re(G).activeFilterModel) == null ? void 0 : N.getRange(), T = t.col, g = gr(yr.FILTER_PANEL_EMBED_POINT);
   return /* @__PURE__ */ L("div", { className: O.sheetsFilterPanel, children: [
     /* @__PURE__ */ S(
-      gr,
+      vr,
       {
         components: g,
         sharedProps: { range: p, colIndex: T, onClose: h }
       }
     ),
     /* @__PURE__ */ S("div", { className: O.sheetsFilterPanelHeader, children: /* @__PURE__ */ S(
-      jr,
+      Yr,
       {
         value: i,
         items: s,
         onChange: (F) => a(F)
       }
     ) }),
-    n ? /* @__PURE__ */ S("div", { className: O.sheetsFilterPanelContent, children: i === ye.VALUES ? /* @__PURE__ */ S(Ps, { model: n }) : /* @__PURE__ */ S(Fs, { model: n }) }) : /* @__PURE__ */ S("div", { style: { flex: 1 } }),
+    n ? /* @__PURE__ */ S("div", { className: O.sheetsFilterPanelContent, children: i === ye.VALUES ? /* @__PURE__ */ S(Os, { model: n }) : /* @__PURE__ */ S(Ns, { model: n }) }) : /* @__PURE__ */ S("div", { style: { flex: 1 } }),
     /* @__PURE__ */ L("div", { className: O.sheetsFilterPanelFooter, children: [
       /* @__PURE__ */ S(He, { type: "link", onClick: c, disabled: o, children: e.t("sheets-filter.panel.clear-filter") }),
       /* @__PURE__ */ L("span", { className: O.sheetsFilterPanelFooterPrimaryButtons, children: [
         /* @__PURE__ */ S(He, { type: "default", onClick: h, children: e.t("sheets-filter.panel.cancel") }),
-        /* @__PURE__ */ S(He, { disabled: !l, type: "primary", onClick: m, children: e.t("sheets-filter.panel.confirm") })
+        /* @__PURE__ */ S(He, { disabled: !l, type: "primary", onClick: d, children: e.t("sheets-filter.panel.confirm") })
       ] })
     ] })
   ] });
 }
-function Os(t) {
+function Rs(t) {
   const e = t.getCurrentLocale();
   return Je(() => [
     { 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 Is(t) {
+function As(t) {
   const e = t.get(G);
   return {
     id: fe.id,
@@ -1415,10 +1422,10 @@ function Is(t) {
     tooltip: "sheets-filter.toolbar.smart-toggle-filter-tooltip",
     hidden$: Xe(t, z.UNIVER_SHEET),
     activated$: e.activeFilterModel$.pipe(ie((r) => !!r)),
-    disabled$: yr(t, Or(t, { worksheetTypes: [le, ce], rangeTypes: [ue] }))
+    disabled$: Or(t, Ir(t, { worksheetTypes: [le, ce], rangeTypes: [ue] }))
   };
 }
-function Rs(t) {
+function bs(t) {
   const e = t.get(G);
   return {
     id: Ke.id,
@@ -1431,7 +1438,7 @@ function Rs(t) {
     }))
   };
 }
-function As(t) {
+function Ls(t) {
   const e = t.get(G);
   return {
     id: qe.id,
@@ -1444,23 +1451,23 @@ function As(t) {
     }))
   };
 }
-const bs = {
-  [vr.FORMULAS_INSERT]: {
+const Ms = {
+  [Sr.FORMULAS_INSERT]: {
     [fe.id]: {
       order: 10,
-      menuItemFactory: Is,
+      menuItemFactory: As,
       [Ke.id]: {
         order: 0,
-        menuItemFactory: Rs
+        menuItemFactory: bs
       },
       [qe.id]: {
         order: 1,
-        menuItemFactory: As
+        menuItemFactory: Ls
       }
     }
   }
-}, V = 16, Ls = 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 {
+}, V = 16, $s = 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, i, n) {
     e.save(), lt.drawWith(e, {
       radius: 2,
@@ -1475,16 +1482,16 @@ class ut {
       width: V,
       height: V,
       fill: n
-    }), e.scale(r / V, r / V), e.fillStyle = i, e.fill(Ls), e.restore();
+    }), e.scale(r / V, r / V), e.fillStyle = i, e.fill($s), e.restore();
   }
 }
-var Ms = Object.getOwnPropertyDescriptor, $s = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? Ms(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+var ws = Object.getOwnPropertyDescriptor, Us = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? ws(e, r) : e, l = t.length - 1, s; l >= 0; l--)
     (s = t[l]) && (n = s(n) || n);
   return n;
 }, ke = (t, e) => (r, i) => e(r, i, t);
 const D = 16, Ee = 1;
-let Qe = class extends qr {
+let Qe = class extends Kr {
   constructor(e, r, i, n, l) {
     super(e, r);
     f(this, "_cellWidth", 0);
@@ -1505,7 +1512,7 @@ let Qe = class extends qr {
     const s = new Path2D();
     s.rect(n, l, i, r), e.clip(s);
     const { hasCriteria: o } = this._filterParams, a = this._themeService.getCurrentTheme().primaryColor, c = this._hovered ? this._themeService.getCurrentTheme().grey50 : "rgba(255, 255, 255, 1.0)";
-    o ? ut.drawHasCriteria(e, D, a, c) : ut.drawNoCriteria(e, D, a, c), e.restore();
+    o ? ht.drawHasCriteria(e, D, a, c) : ht.drawNoCriteria(e, D, a, c), e.restore();
   }
   onPointerDown(e) {
     if (e.button === 2)
@@ -1526,18 +1533,18 @@ let Qe = class extends qr {
     this._hovered = !1, this.makeDirty(!0);
   }
 };
-Qe = $s([
+Qe = Us([
   ke(2, $e),
   ke(3, Q),
-  ke(4, E(vt))
+  ke(4, E(St))
 ], Qe);
-var ws = Object.getOwnPropertyDescriptor, Us = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? ws(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+var Hs = Object.getOwnPropertyDescriptor, Ds = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? Hs(e, r) : e, l = t.length - 1, s; l >= 0; l--)
     (s = t[l]) && (n = s(n) || n);
   return n;
 }, q = (t, e) => (r, i) => e(r, i, t);
-const Hs = 1e3, Ds = 5e3;
-let Ge = class extends St {
+const ks = 1e3, Bs = 5e3;
+let Ge = class extends Et {
   constructor(e, r, i, n, l, s, o, a) {
     super();
     f(this, "_filterRangeShape", null);
@@ -1560,28 +1567,28 @@ let Ge = class extends St {
           range: l == null ? void 0 : l.getRange(),
           skeleton: e.skeleton
         });
-        return Kt(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(
-          Br(
+        return Xt(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(
+          Vr(
             ([c]) => {
               var h;
-              return c.type === Me.MUTATION && ((h = c.params) == null ? void 0 : h.unitId) === r.getUnitId() && (er.has(c.id) || c.id === mr.id);
+              return c.type === Me.MUTATION && ((h = c.params) == null ? void 0 : h.unitId) === r.getUnitId() && (tr.has(c.id) || c.id === pr.id);
             }
           ),
-          yt(20, void 0, { leading: !1, trailing: !0 }),
+          Ot(20, void 0, { leading: !1, trailing: !0 }),
           ie(s),
-          Ot(s())
+          It(s())
           // must trigger once
         );
       }),
-      Vr(this.dispose$)
+      Wr(this.dispose$)
     ).subscribe((e) => {
       this._disposeRendering(), !(!e || !e.range) && (this._renderRange(e.range, e.skeleton), this._renderButtons(e));
     });
   }
   _renderRange(e, r) {
-    const { scene: i } = this._context, { rowHeaderWidth: n, columnHeaderHeight: l } = r, s = this._filterRangeShape = new Ar(
+    const { scene: i } = this._context, { rowHeaderWidth: n, columnHeaderHeight: l } = r, s = this._filterRangeShape = new br(
       i,
-      Hs,
+      ks,
       this._themeService,
       {
         rowHeaderWidth: n,
@@ -1589,7 +1596,7 @@ let Ge = class extends St {
         enableAutoFill: !1,
         highlightHeader: !1
       }
-    ), a = br({
+    ), a = Lr({
       range: e,
       primary: null,
       style: { fill: "rgba(0, 0, 0, 0.0)" }
@@ -1600,19 +1607,19 @@ let Ge = class extends St {
     const { range: r, filterModel: i, unitId: n, skeleton: l, worksheetId: s } = e, { scene: o } = this._context;
     this._interceptCellContent(n, s, e.range);
     const { startColumn: a, endColumn: c, startRow: h } = r;
-    for (let m = a; m <= c; m++) {
-      const v = `sheets-filter-button-${m}`, p = Lr(h, m, o, l), { startX: T, startY: g, endX: N, endY: F } = p, I = N - T, y = F - g;
+    for (let d = a; d <= c; d++) {
+      const v = `sheets-filter-button-${d}`, p = Mr(h, d, o, l), { startX: T, startY: g, endX: N, endY: F } = p, I = N - T, y = F - g;
       if (y <= Ee || I <= Ee)
         continue;
-      const $ = !!i.getFilterColumn(m), w = N - D - Ee, ge = F - D - Ee, ve = {
+      const $ = !!i.getFilterColumn(d), w = N - D - Ee, ge = F - D - Ee, ve = {
         left: w,
         top: ge,
         height: D,
         width: D,
-        zIndex: Ds,
+        zIndex: Bs,
         cellHeight: y,
         cellWidth: I,
-        filterParams: { unitId: n, subUnitId: s, col: m, hasCriteria: $ }
+        filterParams: { unitId: n, subUnitId: s, col: d, hasCriteria: $ }
       }, R = this._injector.createInstance(Qe, v, ve);
       this._filterButtonShapes.push(R);
     }
@@ -1620,11 +1627,11 @@ let Ge = class extends St {
   }
   _interceptCellContent(e, r, i) {
     const { startRow: n, startColumn: l, endColumn: s } = i;
-    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(pr.CELL_CONTENT, {
-      effect: Xt.Style,
+    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(fr.CELL_CONTENT, {
+      effect: Zt.Style,
       handler: (o, a, c) => {
-        const { row: h, col: m, unitId: v, subUnitId: p } = a;
-        return v !== e || p !== r || h !== n || m < l || m > s ? c(o) : c({
+        const { row: h, col: d, unitId: v, subUnitId: p } = a;
+        return v !== e || p !== r || h !== n || d < l || d > s ? c(o) : c({
           ...o,
           fontRenderExtension: {
             ...o == null ? void 0 : o.fontRenderExtension,
@@ -1640,62 +1647,62 @@ let Ge = class extends St {
     (e = this._filterRangeShape) == null || e.dispose(), this._filterButtonShapes.forEach((i) => i.dispose()), (r = this._buttonRenderDisposable) == null || r.dispose(), this._filterRangeShape = null, this._buttonRenderDisposable = null, this._filterButtonShapes = [];
   }
 };
-Ge = Us([
+Ge = Ds([
   q(1, E(Z)),
-  q(2, E(Ir)),
+  q(2, E(Rr)),
   q(3, E(G)),
-  q(4, E(vt)),
+  q(4, E(St)),
   q(5, E(dr)),
   q(6, Q),
-  q(7, Rr)
+  q(7, Ar)
 ], Ge);
-var ks = Object.getOwnPropertyDescriptor, Bs = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? ks(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+var Vs = Object.getOwnPropertyDescriptor, Ws = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? Vs(e, r) : e, l = t.length - 1, s; l >= 0; l--)
     (s = t[l]) && (n = s(n) || n);
   return n;
-}, ht = (t, e) => (r, i) => e(r, i, t);
-let me = class extends St {
+}, mt = (t, e) => (r, i) => e(r, i, t);
+let de = class extends Et {
   constructor(t, e) {
     super(), this._renderManagerService = t, this._sheetsRenderService = e, [
-      tr,
       rr,
       sr,
-      ir
+      ir,
+      nr
     ].forEach((r) => this.disposeWithMe(this._sheetsRenderService.registerSkeletonChangingMutations(r.id))), this.disposeWithMe(this._renderManagerService.registerRenderModule(
       z.UNIVER_SHEET,
       [Ge]
     ));
   }
 };
-me = Bs([
-  ht(0, Rt),
-  ht(1, E(Pt))
-], me);
-const Vs = {
+de = Ws([
+  mt(0, At),
+  mt(1, E(yt))
+], de);
+const xs = {
   id: fe.id,
-  binding: Sr.L | nt.CTRL_COMMAND | nt.SHIFT,
+  binding: Er.L | nt.CTRL_COMMAND | nt.SHIFT,
   description: "sheets-filter.shortcut.smart-toggle-filter",
-  preconditions: Mr,
+  preconditions: $r,
   group: "4_sheet-edit"
 };
-var Ws = Object.getOwnPropertyDescriptor, xs = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? Ws(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+var Qs = Object.getOwnPropertyDescriptor, Gs = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? Qs(e, r) : e, l = t.length - 1, s; l >= 0; l--)
     (s = t[l]) && (n = s(n) || n);
   return n;
 }, A = (t, e) => (r, i) => e(r, i, t);
 const dt = "FILTER_PANEL_POPUP";
-let Ae = class extends me {
-  constructor(e, r, i, n, l, s, o, a, c, h, m, v, p) {
+let Ae = class extends de {
+  constructor(e, r, i, n, l, s, o, a, c, h, d, v, p) {
     super(p, v);
     f(this, "_popupDisposable");
-    this._injector = e, this._componentManager = r, this._sheetsFilterPanelService = i, this._sheetCanvasPopupService = n, this._sheetsFilterService = l, this._localeService = s, this._shortcutService = o, this._commandService = a, this._menuManagerService = c, this._contextService = h, this._messageService = m, this._initCommands(), this._initShortcuts(), this._initMenuItems(), this._initUI();
+    this._injector = e, this._componentManager = r, this._sheetsFilterPanelService = i, this._sheetCanvasPopupService = n, this._sheetsFilterService = l, this._localeService = s, this._shortcutService = o, this._commandService = a, this._menuManagerService = c, this._contextService = h, this._messageService = d, this._initCommands(), this._initShortcuts(), this._initMenuItems(), this._initUI();
   }
   dispose() {
     super.dispose(), this._closeFilterPopup();
   }
   _initShortcuts() {
     [
-      Vs
+      xs
     ].forEach((e) => {
       this.disposeWithMe(this._shortcutService.registerShortcut(e));
     });
@@ -1703,27 +1710,27 @@ let Ae = class extends me {
   _initCommands() {
     [
       fe,
-      nr,
       or,
+      ar,
       se,
       Ke,
       qe,
-      Ut,
+      Ht,
       Re,
-      de
+      me
     ].forEach((e) => {
       this.disposeWithMe(this._commandService.registerCommand(e));
     });
   }
   _initMenuItems() {
-    this._menuManagerService.mergeMenu(bs);
+    this._menuManagerService.mergeMenu(Ms);
   }
   _initUI() {
-    this.disposeWithMe(this._componentManager.register(dt, ys)), this.disposeWithMe(this._componentManager.register("FilterSingle", kt)), this.disposeWithMe(this._contextService.subscribeContextValue$(ne).pipe(Wr()).subscribe((e) => {
+    this.disposeWithMe(this._componentManager.register(dt, Is)), this.disposeWithMe(this._componentManager.register("FilterSingle", Bt)), this.disposeWithMe(this._contextService.subscribeContextValue$(ne).pipe(xr()).subscribe((e) => {
       e ? this._openFilterPopup() : this._closeFilterPopup();
     })), this.disposeWithMe(this._sheetsFilterService.errorMsg$.subscribe((e) => {
       e && this._messageService.show({
-        type: Yr.Error,
+        type: qr.Error,
         content: this._localeService.t(e)
       });
     }));
@@ -1736,7 +1743,7 @@ let Ae = class extends me {
     this._popupDisposable = this._sheetCanvasPopupService.attachPopupToCell(n, i, {
       componentKey: dt,
       direction: "horizontal",
-      onClickOutside: () => this._commandService.syncExecuteCommand(de.id),
+      onClickOutside: () => this._commandService.syncExecuteCommand(me.id),
       offset: [5, 0]
     });
   }
@@ -1745,36 +1752,36 @@ let Ae = class extends me {
     (e = this._popupDisposable) == null || e.dispose(), this._popupDisposable = null;
   }
 };
-Ae = xs([
+Ae = Gs([
   A(0, E(Z)),
-  A(1, E(Er)),
+  A(1, E(Tr)),
   A(2, E(x)),
-  A(3, E($r)),
+  A(3, E(wr)),
   A(4, E(G)),
   A(5, E(X)),
-  A(6, Tr),
+  A(6, Fr),
   A(7, Q),
-  A(8, Fr),
+  A(8, Cr),
   A(9, $e),
-  A(10, Cr),
-  A(11, E(Pt)),
-  A(12, Rt)
+  A(10, Nr),
+  A(11, E(yt)),
+  A(12, At)
 ], Ae);
-var Qs = Object.defineProperty, Gs = Object.getOwnPropertyDescriptor, js = (t, e, r) => e in t ? Qs(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Ys = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? Gs(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+var js = Object.defineProperty, Ys = Object.getOwnPropertyDescriptor, qs = (t, e, r) => e in t ? js(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Ks = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? Ys(e, r) : e, l = t.length - 1, s; l >= 0; l--)
     (s = t[l]) && (n = s(n) || n);
   return n;
-}, Be = (t, e) => (r, i) => e(r, i, t), Bt = (t, e, r) => js(t, typeof e != "symbol" ? e + "" : e, r);
-const qs = "SHEET_FILTER_UI_PLUGIN";
+}, Be = (t, e) => (r, i) => e(r, i, t), Vt = (t, e, r) => qs(t, typeof e != "symbol" ? e + "" : e, r);
+const Xs = "SHEET_FILTER_UI_PLUGIN";
 let be = class extends Ye {
   constructor(t = Ce, e, r, i) {
     super(), this._config = t, this._injector = e, this._configService = r, this._rpcChannelService = i;
-    const { menu: n, ...l } = Ft(
+    const { menu: n, ...l } = Ct(
       {},
       Ce,
       this._config
     );
-    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig(Lt, l);
+    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig(Mt, l);
   }
   onStarting() {
     [
@@ -1782,7 +1789,7 @@ let be = class extends Ye {
       [oe],
       [Ae]
     ].forEach((t) => this._injector.add(t)), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([Ne, {
-      useFactory: () => zt(
+      useFactory: () => Jt(
         this._rpcChannelService.requestChannel(et)
       )
     }]);
@@ -1794,56 +1801,56 @@ let be = class extends Ye {
     this._injector.get(Ae);
   }
 };
-Bt(be, "type", z.UNIVER_SHEET);
-Bt(be, "pluginName", qs);
-be = Ys([
-  Et(Nt),
+Vt(be, "type", z.UNIVER_SHEET);
+Vt(be, "pluginName", Xs);
+be = Ks([
+  Tt(Pt),
   Be(1, E(Z)),
-  Be(2, Tt),
-  Be(3, Zt(Ct))
+  Be(2, Ft),
+  Be(3, zt(Nt))
 ], be);
-var Ks = Object.defineProperty, Xs = Object.getOwnPropertyDescriptor, Zs = (t, e, r) => e in t ? Ks(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, zs = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? Xs(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+var Zs = Object.defineProperty, zs = Object.getOwnPropertyDescriptor, Js = (t, e, r) => e in t ? Zs(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, ei = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? zs(e, r) : e, l = t.length - 1, s; l >= 0; l--)
     (s = t[l]) && (n = s(n) || n);
   return n;
-}, mt = (t, e) => (r, i) => e(r, i, t), Vt = (t, e, r) => Zs(t, typeof e != "symbol" ? e + "" : e, r);
-const Js = "SHEET_FILTER_UI_PLUGIN";
+}, pt = (t, e) => (r, i) => e(r, i, t), Wt = (t, e, r) => Js(t, typeof e != "symbol" ? e + "" : e, r);
+const ti = "SHEET_FILTER_UI_PLUGIN";
 let Le = class extends Ye {
   constructor(t = Ce, e, r) {
     super(), this._config = t, this._injector = e, this._configService = r;
-    const { menu: i, ...n } = Ft(
+    const { menu: i, ...n } = Ct(
       {},
       Ce,
       this._config
     );
-    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(Lt, n);
+    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(Mt, n);
   }
   onStarting() {
     [
       [oe],
-      [me]
+      [de]
     ].forEach((t) => this._injector.add(t));
   }
   onReady() {
     this._injector.get(oe);
   }
   onRendered() {
-    this._injector.get(me);
+    this._injector.get(de);
   }
 };
-Vt(Le, "type", z.UNIVER_SHEET);
-Vt(Le, "pluginName", Js);
-Le = zs([
-  Et(Nt),
-  mt(1, E(Z)),
-  mt(2, Tt)
+Wt(Le, "type", z.UNIVER_SHEET);
+Wt(Le, "pluginName", ti);
+Le = ei([
+  Tt(Pt),
+  pt(1, E(Z)),
+  pt(2, Ft)
 ], Le);
-var ei = Object.getOwnPropertyDescriptor, ti = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? ei(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+var ri = Object.getOwnPropertyDescriptor, si = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? ri(e, r) : e, l = t.length - 1, s; l >= 0; l--)
     (s = t[l]) && (n = s(n) || n);
   return n;
-}, pt = (t, e) => (r, i) => e(r, i, t), Te;
-let ft = (Te = class extends Ye {
+}, ft = (t, e) => (r, i) => e(r, i, t), Te;
+let _t = (Te = class extends Ye {
   constructor(t, e, r) {
     super(), this._config = t, this._injector = e, this._rpcChannelService = r;
   }
@@ -1855,19 +1862,19 @@ let ft = (Te = class extends Ye {
   onReady() {
     this._rpcChannelService.registerChannel(
       et,
-      Jt(this._injector.get(Ne))
+      er(this._injector.get(Ne))
     );
   }
 }, f(Te, "type", z.UNIVER_SHEET), f(Te, "pluginName", "SHEET_FILTER_UI_WORKER_PLUGIN"), Te);
-ft = ti([
-  pt(1, E(Z)),
-  pt(2, Ct)
-], ft);
+_t = si([
+  ft(1, E(Z)),
+  ft(2, Nt)
+], _t);
 export {
-  Ut as ChangeFilterByOperation,
-  de as CloseFilterPanelOperation,
+  Ht as ChangeFilterByOperation,
+  me as CloseFilterPanelOperation,
   Re as OpenFilterPanelOperation,
   Le as UniverSheetsFilterMobileUIPlugin,
   be as UniverSheetsFilterUIPlugin,
-  ft as UniverSheetsFilterUIWorkerPlugin
+  _t as UniverSheetsFilterUIWorkerPlugin
 };