@univerjs/sheets-filter-ui 0.16.1 → 0.17.0

package/lib/index.js

@@ -1,17 +1,17 @@
-var ar = Object.defineProperty;
-var cr = (t, e, r) => e in t ? ar(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
-var v = (t, e, r) => cr(t, typeof e != "symbol" ? e + "" : e, r);
-import { BooleanNumber as ft, createIdentifier as wt, Inject as T, LocaleService as G, IUniverInstanceService as De, ILogService as ur, extractPureTextFromCell as hr, numfmt as Ye, Disposable as ue, Injector as re, Quantity as $t, Tools as be, ColorKit as pt, ICommandService as j, CommandType as Be, IContextService as We, ThemeService as Lt, RxDisposable as Mt, fromCallback as dr, VerticalAlign as Re, InterceptorEffectEnum as mr, UniverInstanceType as ie, DependentOn as xt, IConfigService as Ut, Plugin as it, merge as kt, Optional as fr, registerDependencies as pr, touchDependencies as vt } from "@univerjs/core";
-import { CustomFilterOperator as u, FilterBy as P, SetSheetsFilterCriteriaCommand as V, SheetsFilterService as X, SmartToggleSheetsFilterCommand as Fe, FILTER_MUTATIONS as vr, SetSheetsFilterRangeMutation as _r, SetSheetsFilterCriteriaMutation as gr, RemoveSheetsFilterMutation as Sr, ReCalcSheetsFilterMutation as Cr, UniverSheetsFilterPlugin as Ht, SheetsFilterSyncController as Tr, ReCalcSheetsFilterCommand as st, ClearSheetsFilterCriteriaCommand as nt, RemoveSheetFilterCommand as Er, SetSheetFilterRangeCommand as Fr } from "@univerjs/sheets-filter";
-import { IEditorBridgeService as _t, SetCellEditVisibleOperation as Nr, SheetSkeletonManagerService as Ir, ISheetSelectionRenderService as yr, SelectionControl as Or, attachSelectionWithCoord as br, getCoordByCell as Rr, SheetsRenderService as Dt, SheetsUIPart as Ar, getObservableWithExclusiveRange$ as Pr, getCurrentRangeDisable$ as wr, whenSheetEditorFocused as $r, SheetCanvasPopManagerService as Lr } from "@univerjs/sheets-ui";
-import { ILayoutService as Mr, useDependency as D, useObservable as L, IMessageService as Bt, useComponentsOfPart as xr, ComponentContainer as Ur, getMenuHiddenObservable as ot, MenuItemType as lt, RibbonDataGroup as kr, KeyCode as Hr, MetaKeys as gt, ComponentManager as Dr, IShortcutService as Br, IMenuManagerService as Wr } from "@univerjs/ui";
-import { COLOR_BLACK_RGB as St, Rect as Ct, Shape as Vr, IRenderManagerService as Wt } from "@univerjs/engine-render";
-import { RefRangeService as Qr, SheetPermissionCheckController as Gr, SheetsSelectionsService as jr, getSheetCommandTarget as Yr, WorksheetFilterPermission as pe, WorksheetViewPermission as ve, RangeProtectionPermissionViewPoint as _e, expandToContinuousRange as Zr, SheetInterceptorService as zr, SetRangeValuesMutation as Kr, INTERCEPTOR_POINT as qr } from "@univerjs/sheets";
-import { BehaviorSubject as Q, ReplaySubject as Xr, Subject as Jr, merge as ei, combineLatest as ti, throttleTime as Vt, startWith as Qt, map as le, shareReplay as ri, of as he, switchMap as at, filter as ii, takeUntil as si, distinctUntilChanged as ni } from "rxjs";
-import { IRPCChannelService as Gt, toModule as oi, fromModule as li } from "@univerjs/rpc";
-import { clsx as Ae, borderClassName as ct, Select as Tt, RadioGroup as ai, Radio as Et, Input as jt, Checkbox as ci, Tree as ui, Tooltip as hi, Switch as di, MessageType as Yt, Segmented as mi, Button as Ze } from "@univerjs/design";
-import { useRef as fi, createElement as de, forwardRef as Ne, useCallback as U, useMemo as ut } from "react";
-import { jsx as d, jsxs as y, Fragment as Ft } from "react/jsx-runtime";
+var cr = Object.defineProperty;
+var ur = (t, e, r) => e in t ? cr(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
+var v = (t, e, r) => ur(t, typeof e != "symbol" ? e + "" : e, r);
+import { BooleanNumber as _t, createIdentifier as Mt, Inject as T, LocaleService as G, IUniverInstanceService as Be, ILogService as hr, extractPureTextFromCell as dr, numfmt as Ke, Disposable as fe, Injector as re, Quantity as xt, Tools as Pe, ColorKit as gt, ICommandService as j, CommandType as We, IContextService as Ve, ThemeService as Ut, RxDisposable as kt, fromCallback as mr, VerticalAlign as we, InterceptorEffectEnum as fr, UniverInstanceType as ie, DependentOn as Ht, IConfigService as Dt, Plugin as ot, merge as Bt, Optional as pr, registerDependencies as vr, touchDependencies as St } from "@univerjs/core";
+import { CustomFilterOperator as u, FilterBy as P, SetSheetsFilterCriteriaCommand as V, SheetsFilterService as X, SmartToggleSheetsFilterCommand as Oe, FILTER_MUTATIONS as _r, SetSheetsFilterRangeMutation as gr, SetSheetsFilterCriteriaMutation as Sr, RemoveSheetsFilterMutation as Cr, ReCalcSheetsFilterMutation as Tr, UniverSheetsFilterPlugin as Wt, ReCalcSheetsFilterCommand as lt, ClearSheetsFilterCriteriaCommand as at, SheetsFilterSyncController as Er, RemoveSheetFilterCommand as Nr, SetSheetFilterRangeCommand as Fr } from "@univerjs/sheets-filter";
+import { IEditorBridgeService as Ct, SetCellEditVisibleOperation as Ir, SheetSkeletonManagerService as yr, ISheetSelectionRenderService as Or, SelectionControl as br, attachSelectionWithCoord as Rr, getCoordByCell as Ar, SheetsRenderService as Vt, getObservableWithExclusiveRange$ as Pr, getCurrentRangeDisable$ as wr, SheetsUIPart as $r, whenSheetEditorFocused as Lr, SheetCanvasPopManagerService as Mr } from "@univerjs/sheets-ui";
+import { ILayoutService as xr, getMenuHiddenObservable as ct, MenuItemType as ut, RibbonDataGroup as Ur, useDependency as D, useObservable as L, IMessageService as Qt, useComponentsOfPart as kr, ComponentContainer as Hr, KeyCode as Dr, MetaKeys as Tt, ComponentManager as Br, IShortcutService as Wr, IMenuManagerService as Vr } from "@univerjs/ui";
+import { COLOR_BLACK_RGB as Et, Rect as Nt, Shape as Qr, IRenderManagerService as Gt } from "@univerjs/engine-render";
+import { RefRangeService as Gr, SheetPermissionCheckController as jr, SheetsSelectionsService as Yr, getSheetCommandTarget as Zr, WorksheetFilterPermission as Se, WorksheetViewPermission as Ce, RangeProtectionPermissionViewPoint as Te, expandToContinuousRange as zr, SheetInterceptorService as Kr, SetRangeValuesMutation as qr, INTERCEPTOR_POINT as Xr } from "@univerjs/sheets";
+import { BehaviorSubject as Q, ReplaySubject as Jr, Subject as ei, merge as ti, combineLatest as ri, throttleTime as jt, startWith as Yt, map as ae, shareReplay as ii, of as pe, switchMap as ht, filter as si, takeUntil as ni, distinctUntilChanged as oi } from "rxjs";
+import { IRPCChannelService as Zt, toModule as li, fromModule as ai } from "@univerjs/rpc";
+import { clsx as $e, borderClassName as dt, Select as Ft, RadioGroup as ci, Radio as It, Input as zt, Checkbox as ui, Tree as hi, Tooltip as di, Switch as mi, MessageType as Kt, Segmented as fi, Button as qe } from "@univerjs/design";
+import { useRef as pi, createElement as ve, forwardRef as be, useCallback as U, useMemo as mt } from "react";
+import { jsx as d, jsxs as y, Fragment as yt } from "react/jsx-runtime";
 var b = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SECOND", t))(b || {}), g = /* @__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))(g || {}), f;
 ((t) => {
   t.NONE = {
@@ -304,7 +304,7 @@ var b = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
       const { val1: o, val2: l, operator1: c } = i, h = c === u.GREATER_THAN_OR_EQUAL;
       return {
         customFilters: {
-          and: ft.TRUE,
+          and: _t.TRUE,
           customFilters: [
             { val: h ? o : l, operator: u.GREATER_THAN_OR_EQUAL },
             { val: h ? l : o, operator: u.LESS_THAN_OR_EQUAL }
@@ -402,13 +402,13 @@ var b = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
         return S(m, c);
       if (_)
         return S(h, l);
-      const C = S(h, l), F = S(m, c), N = {
+      const C = S(h, l), N = S(m, c), F = {
         customFilters: [
           C.customFilters.customFilters[0],
-          F.customFilters.customFilters[0]
+          N.customFilters.customFilters[0]
         ]
       };
-      return o && (N.and = ft.TRUE), { customFilters: N };
+      return o && (F.and = _t.TRUE), { customFilters: F };
     },
     testMappingFilterColumn: (i) => {
       var c;
@@ -492,7 +492,7 @@ function x(t) {
     throw new Error("Neither operator1 and operator2 and both not set!");
   return e ? [e, s] : [r, n];
 }
-function Xe(t) {
+function tt(t) {
   const e = [], r = [];
   let s = 0, n = 0;
   function a(i) {
@@ -505,20 +505,20 @@ function Xe(t) {
     unchecked: n
   };
 }
-var pi = Object.getOwnPropertyDescriptor, vi = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? pi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+var vi = Object.getOwnPropertyDescriptor, _i = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? vi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
     (i = t[a]) && (n = i(n) || n);
   return n;
-}, ze = (t, e) => (r, s) => e(r, s, t);
-const ht = "sheets-filter.generate-filter-values.service", Pe = wt(ht);
-let Je = class extends ue {
+}, Xe = (t, e) => (r, s) => e(r, s, t);
+const ft = "sheets-filter.generate-filter-values.service", Le = Mt(ft);
+let rt = class extends fe {
   constructor(t, e, r) {
     super(), this._localeService = t, this._univerInstanceService = e, this._logService = r;
   }
   async getFilterValues(t) {
     var m;
     const { unitId: e, subUnitId: r, filteredOutRowsByOtherColumns: s, filterColumn: n, filters: a, blankChecked: i, iterateRange: o, alreadyChecked: l } = t, c = this._univerInstanceService.getUnit(e), h = (m = this._univerInstanceService.getUnit(e)) == null ? void 0 : m.getSheetBySheetId(r);
-    return !c || !h ? [] : (this._logService.debug("[SheetsGenerateFilterValuesService]", "getFilterValues for", { unitId: e, subUnitId: r }), Zt(
+    return !c || !h ? [] : (this._logService.debug("[SheetsGenerateFilterValuesService]", "getFilterValues for", { unitId: e, subUnitId: r }), qt(
       a,
       this._localeService,
       o,
@@ -531,42 +531,42 @@ let Je = class extends ue {
     ));
   }
 };
-Je = vi([
-  ze(0, T(G)),
-  ze(1, De),
-  ze(2, ur)
-], Je);
-function Zt(t, e, r, s, n, a, i, o, l) {
-  var F, N, R, O, A, w, Y, Z, se, M;
-  const c = /* @__PURE__ */ new Map(), h = /* @__PURE__ */ new Map(), m = "yyyy-mm-dd", S = "empty", p = !t && ((a == null ? void 0 : a.filterBy) === P.COLORS || (a == null ? void 0 : a.filterBy) === P.CONDITIONS) && ((F = a.filteredOutRows) == null ? void 0 : F.size);
+rt = _i([
+  Xe(0, T(G)),
+  Xe(1, Be),
+  Xe(2, hr)
+], rt);
+function qt(t, e, r, s, n, a, i, o, l) {
+  var N, F, R, O, A, w, Y, Z, se, M;
+  const c = /* @__PURE__ */ new Map(), h = /* @__PURE__ */ new Map(), m = "yyyy-mm-dd", S = "empty", p = !t && ((a == null ? void 0 : a.filterBy) === P.COLORS || (a == null ? void 0 : a.filterBy) === P.CONDITIONS) && ((N = a.filteredOutRows) == null ? void 0 : N.size);
   let _ = 0;
   for (const E of s.iterateByColumn(r, !1, !1)) {
-    const { row: Qe, rowSpan: Ie = 1 } = E;
+    const { row: Ye, rowSpan: Re = 1 } = E;
     let ne = 0;
-    for (; ne < Ie; ) {
-      const lr = Qe + ne;
-      if (n.has(lr)) {
+    for (; ne < Re; ) {
+      const ar = Ye + ne;
+      if (n.has(ar)) {
         ne++;
         continue;
       }
-      const J = E != null && E.value ? hr(E.value) : "";
+      const J = E != null && E.value ? dr(E.value) : "";
       if (!J) {
-        _ += 1, ne += Ie;
+        _ += 1, ne += Re;
         continue;
       }
-      const ye = (N = E.value) != null && N.v && !E.value.p ? (A = (O = l.get((R = E.value) == null ? void 0 : R.s)) == null ? void 0 : O.n) == null ? void 0 : A.pattern : "", dt = ye && Ye.getFormatInfo(ye).isDate;
-      let mt = !1;
-      if (dt) {
-        const { year: k, month: z, day: I } = Ye.getFormatDateInfo(ye);
-        mt = k || z || I;
+      const Ae = (F = E.value) != null && F.v && !E.value.p ? (A = (O = l.get((R = E.value) == null ? void 0 : R.s)) == null ? void 0 : O.n) == null ? void 0 : A.pattern : "", pt = Ae && Ke.getFormatInfo(Ae).isDate;
+      let vt = !1;
+      if (pt) {
+        const { year: k, month: z, day: I } = Ke.getFormatDateInfo(Ae);
+        vt = k || z || I;
       }
-      if (ye && dt && mt) {
+      if (Ae && pt && vt) {
         const k = (w = s.getCellRaw(E.row, E.col)) == null ? void 0 : w.v;
         if (!k) {
           ne++;
           continue;
         }
-        const z = Ye.format(m, Number(k)), [I, H, fe] = z.split("-").map(Number);
+        const z = Ke.format(m, Number(k)), [I, H, ge] = z.split("-").map(Number);
         let ee = c.get(`${I}`);
         ee || (ee = {
           title: `${I}`,
@@ -576,7 +576,7 @@ function Zt(t, e, r, s, n, a, i, o, l) {
           leaf: !1,
           checked: !1
         }, c.set(`${I}`, ee), h.set(`${I}`, [`${I}`]));
-        let W = (Y = ee.children) == null ? void 0 : Y.find((je) => je.key === `${I}-${H}`);
+        let W = (Y = ee.children) == null ? void 0 : Y.find((ze) => ze.key === `${I}-${H}`);
         W || (W = {
           title: e.t(`sheets-filter.date.${H}`),
           key: `${I}-${H}`,
@@ -585,15 +585,15 @@ function Zt(t, e, r, s, n, a, i, o, l) {
           leaf: !1,
           checked: !1
         }, (Z = ee.children) == null || Z.push(W), h.set(`${I}-${H}`, [`${I}`, `${I}-${H}`]));
-        const Ge = (se = W == null ? void 0 : W.children) == null ? void 0 : se.find((je) => je.key === `${I}-${H}-${fe}`);
-        Ge ? (Ge.originValues.add(J), Ge.count++, W.count++, ee.count++) : ((M = W.children) == null || M.push({
-          title: `${fe}`,
-          key: `${I}-${H}-${fe}`,
+        const Ze = (se = W == null ? void 0 : W.children) == null ? void 0 : se.find((ze) => ze.key === `${I}-${H}-${ge}`);
+        Ze ? (Ze.originValues.add(J), Ze.count++, W.count++, ee.count++) : ((M = W.children) == null || M.push({
+          title: `${ge}`,
+          key: `${I}-${H}-${ge}`,
           count: 1,
           originValues: /* @__PURE__ */ new Set([J]),
           leaf: !0,
           checked: p ? !1 : i.size ? i.has(J) : !o
-        }), W.count++, ee.count++, h.set(`${I}-${H}-${fe}`, [`${I}`, `${I}-${H}`, `${I}-${H}-${fe}`]));
+        }), W.count++, ee.count++, h.set(`${I}-${H}-${ge}`, [`${I}`, `${I}-${H}`, `${I}-${H}-${ge}`]));
       } else {
         const k = J;
         let z = c.get(k);
@@ -620,12 +620,12 @@ function Zt(t, e, r, s, n, a, i, o, l) {
     c.set("empty", E), h.set("empty", [S]);
   }
   return {
-    filterTreeItems: _i(Array.from(c.values())),
+    filterTreeItems: gi(Array.from(c.values())),
     filterTreeMapCache: h
   };
 }
-function _i(t) {
-  return Array.from(t).sort((e, r) => e.children && !r.children ? -1 : !e.children && r.children ? 1 : gi(e.title, r.title)).map((e) => (e.children && e.children.sort((r, s) => {
+function gi(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), a = Number.parseInt(s.key.split("-")[1], 10);
     return n - a;
   }).forEach((r) => {
@@ -635,30 +635,30 @@ function _i(t) {
     });
   }), e));
 }
-const Nt = (t) => !Number.isNaN(Number(t)) && !Number.isNaN(Number.parseFloat(t));
-function gi(t, e) {
-  const r = Nt(t), s = Nt(e);
+const Ot = (t) => !Number.isNaN(Number(t)) && !Number.isNaN(Number.parseFloat(t));
+function Si(t, e) {
+  const r = Ot(t), s = Ot(e);
   return r && s ? Number.parseFloat(t) - Number.parseFloat(e) : r && !s ? -1 : !r && s ? 1 : t.localeCompare(e);
 }
-function et(t, e) {
+function it(t, e) {
   for (const r of t) {
     if (r.key === e)
       return r;
     if (r.children) {
-      const s = et(r.children, e);
+      const s = it(r.children, e);
       if (s)
         return s;
     }
   }
   return null;
 }
-function zt(t) {
-  return t.leaf ? t.checked : t.children ? t.children.every((e) => zt(e)) : !0;
+function Xt(t) {
+  return t.leaf ? t.checked : t.children ? t.children.every((e) => Xt(e)) : !0;
 }
-function ge(t, e) {
-  t.leaf && (e !== void 0 ? t.checked = e : t.checked = !t.checked), t.children && t.children.forEach((r) => ge(r, e));
+function Ee(t, e) {
+  t.leaf && (e !== void 0 ? t.checked = e : t.checked = !t.checked), t.children && t.children.forEach((r) => Ee(r, e));
 }
-function Kt(t, e) {
+function Jt(t, e) {
   const r = [];
   return t.forEach((s) => {
     const n = s.originValues ? e.some(
@@ -671,7 +671,7 @@ function Kt(t, e) {
     if (n || a)
       r.push({ ...s });
     else if (s.children) {
-      const o = Kt(s.children, e);
+      const o = Jt(s.children, e);
       if (o.length > 0) {
         const l = o.reduce((c, h) => c + h.count, 0);
         r.push({ ...s, count: l, children: o });
@@ -679,18 +679,18 @@ function Kt(t, e) {
     }
   }), r;
 }
-var Si = Object.getOwnPropertyDescriptor, Ve = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? Si(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+var Ci = Object.getOwnPropertyDescriptor, Qe = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Ci(e, r) : e, a = t.length - 1, i; a >= 0; a--)
     (i = t[a]) && (n = i(n) || n);
   return n;
-}, Te = (t, e) => (r, s) => e(r, s, t);
-wt("sheets-filter-ui.sheets-filter-panel.service");
-let q = class extends ue {
+}, Ie = (t, e) => (r, s) => e(r, s, t);
+Mt("sheets-filter-ui.sheets-filter-panel.service");
+let q = class extends fe {
   constructor(e, r) {
     super();
     v(this, "_filterBy$", new Q(P.VALUES));
     v(this, "filterBy$", this._filterBy$.asObservable());
-    v(this, "_filterByModel$", new Xr(1));
+    v(this, "_filterByModel$", new Jr(1));
     v(this, "filterByModel$", this._filterByModel$.asObservable());
     v(this, "_filterByModel", null);
     v(this, "_hasCriteria$", new Q(!1));
@@ -785,7 +785,7 @@ let q = class extends ue {
     this._disposePreviousModel();
     const s = e.getRange();
     if (s.startRow === s.endRow) return !1;
-    const n = await $e.fromFilterColumn(
+    const n = await xe.fromFilterColumn(
       this._injector,
       e,
       r
@@ -796,7 +796,7 @@ let q = class extends ue {
     this._disposePreviousModel();
     const s = e.getRange();
     if (s.startRow === s.endRow) return !1;
-    const n = await Le.fromFilterColumn(
+    const n = await Ue.fromFilterColumn(
       this._injector,
       e,
       r
@@ -807,7 +807,7 @@ let q = class extends ue {
     this._disposePreviousModel();
     const s = e.getRange();
     if (s.startRow === s.endRow) return !1;
-    const n = we.fromFilterColumn(
+    const n = Me.fromFilterColumn(
       this._injector,
       e,
       r,
@@ -820,14 +820,14 @@ let q = class extends ue {
     (e = this._filterByModel) == null || e.dispose(), this.filterByModel = null;
   }
 };
-q = Ve([
-  Te(0, T(re)),
-  Te(1, T(Qr))
+q = Qe([
+  Ie(0, T(re)),
+  Ie(1, T(Gr))
 ], q);
-let we = class extends ue {
+let Me = class extends fe {
   constructor(e, r, s, n, a) {
     super();
-    v(this, "canApply$", he(!0));
+    v(this, "canApply$", pe(!0));
     v(this, "_conditionItem$");
     v(this, "conditionItem$");
     v(this, "_filterConditionFormParams$");
@@ -847,7 +847,7 @@ let we = class extends ue {
    */
   static fromFilterColumn(e, r, s, n) {
     const [a, i] = f.testMappingFilterColumn(n == null ? void 0 : n.getColumnData());
-    return e.createInstance(we, r, s, a, i);
+    return e.createInstance(Me, r, s, a, i);
   }
   get conditionItem() {
     return this._conditionItem$.getValue();
@@ -909,10 +909,10 @@ let we = class extends ue {
     this._filterConditionFormParams$.next(r);
   }
 };
-we = Ve([
-  Te(4, j)
-], we);
-let $e = class extends ue {
+Me = Qe([
+  Ie(4, j)
+], Me);
+let xe = class extends fe {
   constructor(e, r, s, n, a) {
     super();
     v(this, "_rawFilterItems$");
@@ -924,22 +924,22 @@ let $e = class extends ue {
     v(this, "_manuallyUpdateFilterItems$");
     v(this, "_searchString$");
     v(this, "searchString$");
-    this._filterModel = e, this.col = r, this._commandService = a, 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 Jr(), this.filterItems$ = ei(
-      ti([
+    this._filterModel = e, this.col = r, this._commandService = a, 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 ei(), this.filterItems$ = ti(
+      ri([
         this._searchString$.pipe(
-          Vt(500, void 0, { leading: !0, trailing: !0 }),
-          Qt(void 0)
+          jt(500, void 0, { leading: !0, trailing: !0 }),
+          Yt(void 0)
         ),
         this._rawFilterItems$
       ]).pipe(
-        le(([i, o]) => {
+        ae(([i, o]) => {
           if (!i) return o;
           const c = i.toLowerCase().split(/\s+/).filter((h) => !!h);
-          return Kt(o, c);
+          return Jt(o, c);
         })
       ),
       this._manuallyUpdateFilterItems$
-    ).pipe(ri(1)), this.canApply$ = this.filterItems$.pipe(le((i) => Xe(i).checked > 0)), this.disposeWithMe(this.filterItems$.subscribe((i) => this._filterItems = i));
+    ).pipe(ii(1)), this.canApply$ = this.filterItems$.pipe(ae((i) => tt(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
@@ -952,39 +952,39 @@ let $e = class extends ue {
    * @returns the model to control the panel's state
    */
   static async fromFilterColumn(e, r, s) {
-    const n = e.get(De), a = e.get(G), i = e.get(Pe, $t.OPTIONAL), { unitId: o, subUnitId: l } = r, c = n.getUniverSheetInstance(o);
+    const n = e.get(Be), a = e.get(G), i = e.get(Le, xt.OPTIONAL), { unitId: o, subUnitId: l } = 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(l);
     if (!h) throw new Error(`[ByValuesModel]: Worksheet not found for filter model with unitId: ${o} and subUnitId: ${l}!`);
-    const m = r.getRange(), S = s, p = r.getFilterColumn(s), _ = p == null ? void 0 : p.getColumnData().filters, C = new Set(_ == null ? void 0 : _.filters), F = !!(_ && _.blank), N = r.getFilteredOutRowsExceptCol(s), R = { ...m, startRow: m.startRow + 1, startColumn: S, endColumn: S };
+    const m = r.getRange(), S = s, p = r.getFilterColumn(s), _ = p == null ? void 0 : p.getColumnData().filters, C = new Set(_ == null ? void 0 : _.filters), N = !!(_ && _.blank), F = r.getFilteredOutRowsExceptCol(s), R = { ...m, startRow: m.startRow + 1, startColumn: S, endColumn: S };
     let O, A;
     if (i) {
       const w = await i.getFilterValues({
         unitId: o,
         subUnitId: l,
-        filteredOutRowsByOtherColumns: Array.from(N),
+        filteredOutRowsByOtherColumns: Array.from(F),
         filterColumn: p,
         filters: !!_,
-        blankChecked: F,
+        blankChecked: N,
         iterateRange: R,
         alreadyChecked: Array.from(C)
       });
       O = w.filterTreeItems, A = w.filterTreeMapCache;
     } else {
-      const w = Zt(
+      const w = qt(
         !!_,
         a,
         R,
         h,
-        N,
+        F,
         p,
         C,
-        F,
+        N,
         c.getStyles()
       );
       O = w.filterTreeItems, A = w.filterTreeMapCache;
     }
-    return e.createInstance($e, r, s, O, A);
+    return e.createInstance(xe, r, s, O, A);
   }
   get rawFilterItems() {
     return this._rawFilterItems$.getValue();
@@ -1005,24 +1005,24 @@ let $e = class extends ue {
     this._searchString$.next(e);
   }
   onCheckAllToggled(e) {
-    const r = be.deepClone(this._filterItems);
-    r.forEach((s) => ge(s, e)), this._manuallyUpdateFilterItems(r);
+    const r = Pe.deepClone(this._filterItems);
+    r.forEach((s) => Ee(s, e)), this._manuallyUpdateFilterItems(r);
   }
   /**
    * Toggle a filter item.
    */
   onFilterCheckToggled(e) {
-    const r = be.deepClone(this._filterItems), s = et(r, e.key);
+    const r = Pe.deepClone(this._filterItems), s = it(r, e.key);
     if (!s)
       return;
-    const n = zt(s);
-    ge(s, !n), this._manuallyUpdateFilterItems(r);
+    const n = Xt(s);
+    Ee(s, !n), this._manuallyUpdateFilterItems(r);
   }
   onFilterOnly(e) {
-    const r = be.deepClone(this._filterItems);
-    r.forEach((s) => ge(s, !1)), e.forEach((s) => {
-      const n = et(r, s);
-      n && ge(n, !0);
+    const r = Pe.deepClone(this._filterItems);
+    r.forEach((s) => Ee(s, !1)), e.forEach((s) => {
+      const n = it(r, s);
+      n && Ee(n, !0);
     }), this._manuallyUpdateFilterItems(r);
   }
   _manuallyUpdateFilterItems(e) {
@@ -1044,7 +1044,7 @@ let $e = class extends ue {
   async apply() {
     if (this._disposed)
       return !1;
-    const e = Xe(this._filterItems), { checked: r, checkedItems: s } = e, n = this.rawFilterItems;
+    const e = tt(this._filterItems), { checked: r, checkedItems: s } = e, n = this.rawFilterItems;
     let a = 0;
     for (const c of n)
       a += c.count;
@@ -1074,13 +1074,13 @@ let $e = class extends ue {
   }
   // #endregion
 };
-$e = Ve([
-  Te(4, j)
-], $e);
-let Le = class extends ue {
+xe = Qe([
+  Ie(4, j)
+], xe);
+let Ue = class extends fe {
   constructor(e, r, s, n, a) {
     super();
-    v(this, "canApply$", he(!0));
+    v(this, "canApply$", pe(!0));
     v(this, "_cellFillColors$");
     v(this, "cellFillColors$");
     v(this, "_cellTextColors$");
@@ -1099,28 +1099,28 @@ let Le = class extends ue {
    */
   static async fromFilterColumn(e, r, s) {
     var R, O, A;
-    const n = e.get(De), { unitId: a, subUnitId: i } = r, o = n.getUniverSheetInstance(a);
+    const n = e.get(Be), { unitId: a, subUnitId: i } = r, o = n.getUniverSheetInstance(a);
     if (!o) throw new Error(`[ByColorsModel]: Workbook not found for filter model with unitId: ${a}!`);
     const l = o == null ? void 0 : o.getSheetBySheetId(i);
     if (!l) throw new Error(`[ByColorsModel]: Worksheet not found for filter model with unitId: ${a} and subUnitId: ${i}!`);
-    const c = r.getRange(), h = s, m = (R = r.getFilterColumn(s)) == null ? void 0 : R.getColumnData().colorFilters, S = r.getFilteredOutRowsExceptCol(s), p = { ...c, startRow: c.startRow + 1, startColumn: h, endColumn: h }, _ = /* @__PURE__ */ new Map(), C = new Set((O = m == null ? void 0 : m.cellFillColors) != null ? O : []), F = /* @__PURE__ */ new Map(), N = new Set((A = m == null ? void 0 : m.cellTextColors) != null ? A : []);
+    const c = r.getRange(), h = s, m = (R = r.getFilterColumn(s)) == null ? void 0 : R.getColumnData().colorFilters, S = r.getFilteredOutRowsExceptCol(s), p = { ...c, startRow: c.startRow + 1, startColumn: h, endColumn: h }, _ = /* @__PURE__ */ new Map(), C = new Set((O = m == null ? void 0 : m.cellFillColors) != null ? O : []), N = /* @__PURE__ */ new Map(), F = new Set((A = m == null ? void 0 : m.cellTextColors) != null ? A : []);
     for (const w of l.iterateByColumn(p, !1, !0)) {
       const { row: Y, col: Z, value: se } = w;
       if (S.has(Y))
         continue;
       const M = l.getComposedCellStyleByCellData(Y, Z, se);
       if (M.bg && M.bg.rgb) {
-        const E = new pt(M.bg.rgb).toRgbString();
+        const E = new gt(M.bg.rgb).toRgbString();
         _.has(E) || _.set(E, { color: E, checked: C.has(E) });
       } else
         _.set("default-fill-color", { color: null, checked: C.has(null) });
       if (M.cl && M.cl.rgb) {
-        const E = new pt(M.cl.rgb).toRgbString();
-        F.has(E) || F.set(E, { color: E, checked: N.has(E) });
+        const E = new gt(M.cl.rgb).toRgbString();
+        N.has(E) || N.set(E, { color: E, checked: F.has(E) });
       } else
-        F.set("default-font-color", { color: St, checked: N.has(St) });
+        N.set("default-font-color", { color: Et, checked: F.has(Et) });
     }
-    return e.createInstance(Le, r, s, _, F);
+    return e.createInstance(Ue, r, s, _, N);
   }
   get cellFillColors() {
     return this._cellFillColors$.getValue();
@@ -1200,39 +1200,42 @@ let Le = class extends ue {
   }
   // #endregion
 };
-Le = Ve([
-  Te(4, j)
-], Le);
-const ae = "FILTER_PANEL_OPENED", Me = {
+Ue = Qe([
+  Ie(4, j)
+], Ue);
+const ce = "FILTER_PANEL_OPENED", ke = {
   id: "sheet.operation.open-filter-panel",
-  type: Be.OPERATION,
+  type: We.OPERATION,
   handler: (t, e) => {
-    const r = t.get(We), s = t.get(X), n = t.get(q), a = t.get(j), i = t.has(_t) ? t.get(_t) : null;
-    i != null && i.isVisible().visible && a.syncExecuteCommand(Nr.id, { visible: !1 });
+    const r = t.get(Ve), s = t.get(X), n = t.get(q), a = t.get(j), i = t.has(Ct) ? t.get(Ct) : null;
+    i != null && i.isVisible().visible && a.syncExecuteCommand(Ir.id, { visible: !1 });
     const { unitId: o, subUnitId: l, col: c } = e, h = s.getFilterModel(o, l);
-    return h ? (n.setupCol(h, c), r.getContextValue(ae) || r.setContextValue(ae, !0), !0) : !1;
+    return h ? (n.setupCol(h, c), r.getContextValue(ce) || r.setContextValue(ce, !0), !0) : !1;
   }
-}, Se = {
+}, Ne = {
   id: "sheet.operation.close-filter-panel",
-  type: Be.OPERATION,
+  type: We.OPERATION,
   handler: (t) => {
-    const e = t.get(We), r = t.get(q), s = t.get(Mr, $t.OPTIONAL);
-    return e.getContextValue(ae) ? (e.setContextValue(ae, !1), s == null || s.focus(), r.terminate()) : !1;
+    const e = t.get(Ve), r = t.get(q), s = t.get(xr, xt.OPTIONAL);
+    return e.getContextValue(ce) ? (e.setContextValue(ce, !1), s == null || s.focus(), r.terminate()) : !1;
   }
-}, qt = {
+}, er = {
   id: "sheet.operation.apply-filter",
-  type: Be.OPERATION,
+  type: We.OPERATION,
   handler: (t, e) => {
     const { filterBy: r } = e;
     return t.get(q).changeFilterBy(r);
   }
-}, Xt = "sheets-filter-ui.config", xe = {};
-var Ci = Object.getOwnPropertyDescriptor, Ti = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? Ci(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+}, Ti = "@univerjs/sheets-filter-ui", Ei = "0.17.0", ue = {
+  name: Ti,
+  version: Ei
+}, tr = "sheets-filter-ui.config", He = {};
+var Ni = Object.getOwnPropertyDescriptor, Fi = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Ni(e, r) : e, a = t.length - 1, i; a >= 0; a--)
     (i = t[a]) && (n = i(n) || n);
   return n;
 }, oe = (t, e) => (r, s) => e(r, s, t);
-let ce = class extends ue {
+let he = class extends fe {
   constructor(t, e, r, s, n, a) {
     super(), this._sheetsFilterService = t, this._localeService = e, this._commandService = r, this._sheetPermissionCheckPermission = s, this._injector = n, this._sheetsSelectionService = a, this._commandExecutedListener();
   }
@@ -1240,55 +1243,55 @@ let ce = class extends ue {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((t) => {
         var e, r, s;
-        if (t.id === Fe.id) {
-          const n = this._injector.get(De), a = Yr(n);
+        if (t.id === Oe.id) {
+          const n = this._injector.get(Be), a = Zr(n);
           if (!a) return;
           const { unitId: i, subUnitId: o, worksheet: l } = a, c = (e = this._sheetsFilterService.getFilterModel(i, o)) == null ? void 0 : e.getRange();
           let h;
           if (c)
             h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
-              rangeTypes: [_e],
-              worksheetTypes: [pe, ve]
+              rangeTypes: [Te],
+              worksheetTypes: [Se, Ce]
             }, [c], i, o);
           else {
             const m = (r = this._sheetsSelectionService.getCurrentLastSelection()) == null ? void 0 : r.range;
             if (m) {
               let S = { ...m };
-              S = m.startColumn === m.endColumn && m.startRow === m.endRow ? Zr(S, { left: !0, right: !0, up: !0, down: !0 }, l) : S, h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
-                rangeTypes: [_e],
-                worksheetTypes: [ve, pe]
+              S = m.startColumn === m.endColumn && m.startRow === m.endRow ? zr(S, { left: !0, right: !0, up: !0, down: !0 }, l) : S, h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
+                rangeTypes: [Te],
+                worksheetTypes: [Ce, Se]
               }, [S], i, o);
             } else
               h = this._sheetPermissionCheckPermission.permissionCheckWithoutRange({
-                rangeTypes: [_e],
-                worksheetTypes: [ve, pe]
+                rangeTypes: [Te],
+                worksheetTypes: [Ce, Se]
               });
           }
           h || this._sheetPermissionCheckPermission.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.filterErr"));
         }
-        if (t.id === Me.id) {
-          const n = t.params, { unitId: a, subUnitId: i } = n, o = (s = this._sheetsFilterService.getFilterModel(a, i)) == null ? void 0 : s.getRange(), l = be.deepClone(o);
+        if (t.id === ke.id) {
+          const n = t.params, { unitId: a, subUnitId: i } = n, o = (s = this._sheetsFilterService.getFilterModel(a, i)) == null ? void 0 : s.getRange(), l = Pe.deepClone(o);
           l && (l.startColumn = n.col, l.endColumn = n.col, this._sheetPermissionCheckPermission.permissionCheckWithRanges({
-            rangeTypes: [_e],
-            worksheetTypes: [pe, ve]
+            rangeTypes: [Te],
+            worksheetTypes: [Se, Ce]
           }, [l], a, i) || this._sheetPermissionCheckPermission.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.filterErr")));
         }
       })
     );
   }
 };
-ce = Ti([
+he = Fi([
   oe(0, T(X)),
   oe(1, T(G)),
   oe(2, j),
-  oe(3, T(Gr)),
+  oe(3, T(jr)),
   oe(4, T(re)),
-  oe(5, T(jr))
-], ce);
-const K = 16, Ei = 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 It {
+  oe(5, T(Yr))
+], he);
+const K = 16, Ii = 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 bt {
   static drawNoCriteria(e, r, s, n) {
-    e.save(), Ct.drawWith(e, {
+    e.save(), Nt.drawWith(e, {
       radius: 2,
       width: K,
       height: K,
@@ -1296,21 +1299,21 @@ class It {
     }), e.lineCap = "square", e.strokeStyle = s, e.scale(r / K, r / K), 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(), Ct.drawWith(e, {
+    e.save(), Nt.drawWith(e, {
       radius: 2,
       width: K,
       height: K,
       fill: n
-    }), e.scale(r / K, r / K), e.fillStyle = s, e.fill(Ei), e.restore();
+    }), e.scale(r / K, r / K), e.fillStyle = s, e.fill(Ii), e.restore();
   }
 }
-var Fi = Object.getOwnPropertyDescriptor, Ni = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? Fi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+var yi = Object.getOwnPropertyDescriptor, Oi = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? yi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
     (i = t[a]) && (n = i(n) || n);
   return n;
-}, Ke = (t, e) => (r, s) => e(r, s, t);
-const B = 16, Ce = 1;
-let tt = class extends Vr {
+}, Je = (t, e) => (r, s) => e(r, s, t);
+const B = 16, Fe = 1;
+let st = class extends Qr {
   constructor(e, r, s, n, a) {
     super(e, r);
     v(this, "_cellWidth", 0);
@@ -1331,14 +1334,14 @@ let tt = class extends Vr {
     const i = new Path2D();
     i.rect(n, a, s, r), e.clip(i);
     const { hasCriteria: o } = this._filterParams, l = this._themeService.getColorFromTheme("primary.600"), c = this._hovered ? this._themeService.getColorFromTheme("gray.50") : "rgba(255, 255, 255, 1.0)";
-    o ? It.drawHasCriteria(e, B, l, c) : It.drawNoCriteria(e, B, l, c), e.restore();
+    o ? bt.drawHasCriteria(e, B, l, c) : bt.drawNoCriteria(e, B, l, c), e.restore();
   }
   onPointerDown(e) {
     if (e.button === 2)
       return;
     const { col: r, unitId: s, subUnitId: n } = this._filterParams;
-    this._contextService.getContextValue(ae) || !this._commandService.hasCommand(Me.id) || setTimeout(() => {
-      this._commandService.executeCommand(Me.id, {
+    this._contextService.getContextValue(ce) || !this._commandService.hasCommand(ke.id) || setTimeout(() => {
+      this._commandService.executeCommand(ke.id, {
         unitId: s,
         subUnitId: n,
         col: r
@@ -1352,29 +1355,29 @@ let tt = class extends Vr {
     this._hovered = !1, this.makeDirty(!0);
   }
 };
-tt = Ni([
-  Ke(2, We),
-  Ke(3, j),
-  Ke(4, T(Lt))
-], tt);
-var Ii = Object.getOwnPropertyDescriptor, yi = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? Ii(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+st = Oi([
+  Je(2, Ve),
+  Je(3, j),
+  Je(4, T(Ut))
+], st);
+var bi = Object.getOwnPropertyDescriptor, Ri = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? bi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
     (i = t[a]) && (n = i(n) || n);
   return n;
 }, te = (t, e) => (r, s) => e(r, s, t);
-const Oi = 1e3, bi = 5e3;
-function Ri(t, e, r, s) {
+const Ai = 1e3, Pi = 5e3;
+function wi(t, e, r, s) {
   switch (s) {
-    case Re.TOP:
-      return t + Ce;
-    case Re.MIDDLE:
+    case we.TOP:
+      return t + Fe;
+    case we.MIDDLE:
       return t + Math.max(0, (r - B) / 2);
-    case Re.BOTTOM:
+    case we.BOTTOM:
     default:
-      return e - B - Ce;
+      return e - B - Fe;
   }
 }
-let rt = class extends Mt {
+let nt = class extends kt {
   constructor(e, r, s, n, a, i, o, l) {
     super();
     v(this, "_filterRangeShape", null);
@@ -1387,9 +1390,9 @@ let rt = class extends Mt {
   }
   _initRenderer() {
     this._sheetSkeletonManagerService.currentSkeleton$.pipe(
-      at((e) => {
+      ht((e) => {
         var o, l;
-        if (!e) return he(null);
+        if (!e) return pe(null);
         const { unit: r, unitId: s } = this._context, n = ((o = r.getActiveSheet()) == null ? void 0 : o.getSheetId()) || "", a = (l = this._sheetsFilterService.getFilterModel(s, n)) != null ? l : void 0, i = () => ({
           unitId: s,
           worksheetId: n,
@@ -1397,28 +1400,28 @@ let rt = class extends Mt {
           range: a == null ? void 0 : a.getRange(),
           skeleton: e.skeleton
         });
-        return dr(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(
-          ii(
+        return mr(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(
+          si(
             ([c]) => {
               var h;
-              return c.type === Be.MUTATION && ((h = c.params) == null ? void 0 : h.unitId) === r.getUnitId() && (vr.has(c.id) || c.id === Kr.id);
+              return c.type === We.MUTATION && ((h = c.params) == null ? void 0 : h.unitId) === r.getUnitId() && (_r.has(c.id) || c.id === qr.id);
             }
           ),
-          Vt(20, void 0, { leading: !1, trailing: !0 }),
-          le(i),
-          Qt(i())
+          jt(20, void 0, { leading: !1, trailing: !0 }),
+          ae(i),
+          Yt(i())
           // must trigger once
         );
       }),
-      si(this.dispose$)
+      ni(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: a } = r, i = this._filterRangeShape = new Or(
+    const { scene: s } = this._context, { rowHeaderWidth: n, columnHeaderHeight: a } = r, i = this._filterRangeShape = new br(
       s,
-      Oi,
+      Ai,
       this._themeService,
       {
         rowHeaderWidth: n,
@@ -1426,7 +1429,7 @@ let rt = class extends Mt {
         enableAutoFill: !1,
         highlightHeader: !1
       }
-    ), l = br({
+    ), l = Rr({
       range: e,
       primary: null,
       style: { fill: "rgba(0, 0, 0, 0.0)" }
@@ -1440,27 +1443,27 @@ let rt = class extends Mt {
     this._interceptCellContent(n, i, e.range);
     const { startColumn: h, endColumn: m, startRow: S } = r;
     for (let p = h; p <= m; p++) {
-      const _ = `sheets-filter-button-${p}`, C = Rr(S, p, l, a), F = c.getComposedCellStyle(S, p), N = (F == null ? void 0 : F.vt) || Re.BOTTOM, { startX: R, startY: O, endX: A, endY: w } = C, Y = A - R, Z = w - O;
-      if (Z <= Ce || Y <= Ce)
+      const _ = `sheets-filter-button-${p}`, C = Ar(S, p, l, a), N = c.getComposedCellStyle(S, p), F = (N == null ? void 0 : N.vt) || we.BOTTOM, { startX: R, startY: O, endX: A, endY: w } = C, Y = A - R, Z = w - O;
+      if (Z <= Fe || Y <= Fe)
         continue;
-      const se = !!s.getFilterColumn(p), M = A - B - Ce, E = Ri(O, w, Z, N), Qe = {
+      const se = !!s.getFilterColumn(p), M = A - B - Fe, E = wi(O, w, Z, F), Ye = {
         left: M,
         top: E,
         height: B,
         width: B,
-        zIndex: bi,
+        zIndex: Pi,
         cellHeight: Z,
         cellWidth: Y,
         filterParams: { unitId: n, subUnitId: i, col: p, hasCriteria: se }
-      }, Ie = this._injector.createInstance(tt, _, Qe);
-      this._filterButtonShapes.push(Ie);
+      }, Re = this._injector.createInstance(st, _, Ye);
+      this._filterButtonShapes.push(Re);
     }
     l.addObjects(this._filterButtonShapes), l.makeDirty();
   }
   _interceptCellContent(e, r, s) {
     const { startRow: n, startColumn: a, endColumn: i } = s;
-    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(qr.CELL_CONTENT, {
-      effect: mr.Style,
+    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(Xr.CELL_CONTENT, {
+      effect: fr.Style,
       handler: (o, l, c) => {
         const { row: h, col: m, unitId: S, subUnitId: p } = l;
         return S !== e || p !== r || h !== n || m < a || m > i || ((!o || o === l.rawData) && (o = { ...l.rawData }), o.fontRenderExtension = {
@@ -1476,76 +1479,77 @@ let rt = class extends Mt {
     (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 = [];
   }
 };
-rt = yi([
+nt = Ri([
   te(1, T(re)),
-  te(2, T(Ir)),
+  te(2, T(yr)),
   te(3, T(X)),
-  te(4, T(Lt)),
-  te(5, T(zr)),
+  te(4, T(Ut)),
+  te(5, T(Kr)),
   te(6, j),
-  te(7, yr)
-], rt);
-var Ai = Object.getOwnPropertyDescriptor, Pi = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? Ai(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+  te(7, Or)
+], nt);
+var $i = Object.getOwnPropertyDescriptor, Li = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? $i(e, r) : e, a = t.length - 1, i; a >= 0; a--)
     (i = t[a]) && (n = i(n) || n);
   return n;
-}, yt = (t, e) => (r, s) => e(r, s, t);
-let Ee = class extends Mt {
+}, Rt = (t, e) => (r, s) => e(r, s, t);
+let ye = class extends kt {
   constructor(t, e) {
     super(), this._renderManagerService = t, this._sheetsRenderService = e, [
-      _r,
       gr,
       Sr,
-      Cr
+      Cr,
+      Tr
     ].forEach((r) => this.disposeWithMe(this._sheetsRenderService.registerSkeletonChangingMutations(r.id))), this.disposeWithMe(this._renderManagerService.registerRenderModule(
       ie.UNIVER_SHEET,
-      [rt]
+      [nt]
     ));
   }
 };
-Ee = Pi([
-  yt(0, Wt),
-  yt(1, T(Dt))
-], Ee);
-var wi = Object.defineProperty, $i = Object.getOwnPropertyDescriptor, Li = (t, e, r) => e in t ? wi(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Mi = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? $i(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+ye = Li([
+  Rt(0, Gt),
+  Rt(1, T(Vt))
+], ye);
+var Mi = Object.defineProperty, xi = Object.getOwnPropertyDescriptor, Ui = (t, e, r) => e in t ? Mi(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, ki = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? xi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
     (i = t[a]) && (n = i(n) || n);
   return n;
-}, Ot = (t, e) => (r, s) => e(r, s, t), Jt = (t, e, r) => Li(t, typeof e != "symbol" ? e + "" : e, r);
-const xi = "SHEET_FILTER_UI_PLUGIN";
-let Ue = class extends it {
-  constructor(t = xe, e, r) {
+}, At = (t, e) => (r, s) => e(r, s, t), Ge = (t, e, r) => Ui(t, typeof e != "symbol" ? e + "" : e, r);
+let de = class extends ot {
+  constructor(t = He, e, r) {
     super(), this._config = t, this._injector = e, this._configService = r;
-    const { menu: s, ...n } = kt(
+    const { menu: s, ...n } = Bt(
       {},
-      xe,
+      He,
       this._config
     );
-    s && this._configService.setConfig("menu", s, { merge: !0 }), this._configService.setConfig(Xt, n);
+    s && this._configService.setConfig("menu", s, { merge: !0 }), this._configService.setConfig(tr, n);
   }
   onStarting() {
     [
-      [ce],
-      [Ee]
+      [he],
+      [ye]
     ].forEach((t) => this._injector.add(t));
   }
   onReady() {
-    this._injector.get(ce);
+    this._injector.get(he);
   }
   onRendered() {
-    this._injector.get(Ee);
+    this._injector.get(ye);
   }
 };
-Jt(Ue, "type", ie.UNIVER_SHEET);
-Jt(Ue, "pluginName", xi);
-Ue = Mi([
-  xt(Ht),
-  Ot(1, T(re)),
-  Ot(2, Ut)
-], Ue);
-function me({ ref: t, ...e }) {
-  const { icon: r, id: s, className: n, extend: a, ...i } = e, o = `univerjs-icon univerjs-icon-${s} ${n || ""}`.trim(), l = fi(`_${Hi()}`);
-  return er(r, `${s}`, {
+Ge(de, "type", ie.UNIVER_SHEET);
+Ge(de, "pluginName", "SHEET_FILTER_UI_PLUGIN");
+Ge(de, "packageName", ue.name);
+Ge(de, "version", ue.version);
+de = ki([
+  Ht(Wt),
+  At(1, T(re)),
+  At(2, Dt)
+], de);
+function _e({ ref: t, ...e }) {
+  const { icon: r, id: s, className: n, extend: a, ...i } = e, o = `univerjs-icon univerjs-icon-${s} ${n || ""}`.trim(), l = pi(`_${Bi()}`);
+  return rr(r, `${s}`, {
     defIds: r.defIds,
     idSuffix: l.current
   }, {
@@ -1554,14 +1558,14 @@ function me({ ref: t, ...e }) {
     ...i
   }, a);
 }
-function er(t, e, r, s, n) {
-  return de(t.tag, {
+function rr(t, e, r, s, n) {
+  return ve(t.tag, {
     key: e,
-    ...Ui(t, r, n),
+    ...Hi(t, r, n),
     ...s
-  }, (ki(t, r).children || []).map((a, i) => er(a, `${e}-${t.tag}-${i}`, r, void 0, n)));
+  }, (Di(t, r).children || []).map((a, i) => rr(a, `${e}-${t.tag}-${i}`, r, void 0, n)));
 }
-function Ui(t, e, r) {
+function Hi(t, e, r) {
   const s = { ...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(([a, i]) => {
     a === "mask" && typeof i == "string" && (s[a] = i.replace(/url\(#(.*)\)/, `url(#$1${e.idSuffix})`));
@@ -1571,7 +1575,7 @@ function Ui(t, e, r) {
     typeof i == "string" && (s[a] = i.replace(/url\(#(.*)\)/, `url(#$1${e.idSuffix})`));
   })), s;
 }
-function ki(t, e) {
+function Di(t, e) {
   var s;
   const { defIds: r } = e;
   return !r || r.length === 0 ? t : t.tag === "defs" && ((s = t.children) != null && s.length) ? {
@@ -1585,11 +1589,11 @@ function ki(t, e) {
     } : n)
   } : t;
 }
-function Hi() {
+function Bi() {
   return Math.random().toString(36).substring(2, 8);
 }
-me.displayName = "UniverIcon";
-const Di = {
+_e.displayName = "UniverIcon";
+const Wi = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -1611,15 +1615,15 @@ const Di = {
       d: "M15.3337 11.7261L15.4294 11.731C15.9035 11.779 16.2732 12.1798 16.2732 12.6665C16.2732 13.1532 15.9035 13.554 15.4294 13.602L15.3337 13.6069H4.66675C4.1476 13.6069 3.72632 13.1856 3.72632 12.6665C3.72632 12.1474 4.1476 11.7261 4.66675 11.7261H15.3337Z"
     }
   }]
-}, tr = Ne(function(e, r) {
-  return de(me, Object.assign({}, e, {
+}, ir = be(function(e, r) {
+  return ve(_e, Object.assign({}, e, {
     id: "a-icon",
     ref: r,
-    icon: Di
+    icon: Wi
   }));
 });
-tr.displayName = "AIcon";
-const Bi = {
+ir.displayName = "AIcon";
+const Vi = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -1641,15 +1645,15 @@ const Bi = {
       d: "M4.29492 4.13476C4.63911 3.79057 5.1845 3.76906 5.55371 4.07031L5.625 4.13476L16.0244 14.5352L16.0889 14.6064C16.3902 14.9757 16.3686 15.52 16.0244 15.8643C15.6573 16.2313 15.0624 16.2313 14.6953 15.8643L4.29492 5.46484L4.23047 5.39355C3.92922 5.02434 3.95073 4.47895 4.29492 4.13476Z"
     }
   }]
-}, rr = Ne(function(e, r) {
-  return de(me, Object.assign({}, e, {
+}, sr = be(function(e, r) {
+  return ve(_e, Object.assign({}, e, {
     id: "ban-icon",
     ref: r,
-    icon: Bi
+    icon: Vi
   }));
 });
-rr.displayName = "BanIcon";
-const Wi = {
+sr.displayName = "BanIcon";
+const Qi = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -1667,15 +1671,15 @@ const Wi = {
       clipRule: "evenodd"
     }
   }]
-}, ir = Ne(function(e, r) {
-  return de(me, Object.assign({}, e, {
+}, nr = be(function(e, r) {
+  return ve(_e, Object.assign({}, e, {
     id: "filter-icon",
     ref: r,
-    icon: Wi
+    icon: Qi
   }));
 });
-ir.displayName = "FilterIcon";
-const Vi = {
+nr.displayName = "FilterIcon";
+const Gi = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -1691,15 +1695,15 @@ const Vi = {
       d: "M8.00016 1.33203C6.68162 1.33203 5.39269 1.72302 4.29636 2.45557C3.20004 3.18811 2.34555 4.2293 1.84097 5.44747C1.33638 6.66565 1.20436 8.00609 1.4616 9.2993C1.71883 10.5925 2.35377 11.7804 3.28612 12.7127C4.21847 13.6451 5.40636 14.28 6.69956 14.5373C7.99277 14.7945 9.33321 14.6625 10.5514 14.1579C11.7696 13.6533 12.8108 12.7988 13.5433 11.7025C14.2758 10.6062 14.6668 9.31724 14.6668 7.9987C14.6649 6.23118 13.9619 4.53662 12.7121 3.2868C11.4622 2.03697 9.76768 1.33397 8.00016 1.33203ZM7.66683 3.9987C7.86461 3.9987 8.05795 4.05735 8.2224 4.16723C8.38685 4.27711 8.51502 4.43329 8.59071 4.61601C8.6664 4.79874 8.6862 4.99981 8.64762 5.19379C8.60903 5.38777 8.51379 5.56595 8.37394 5.7058C8.23409 5.84566 8.0559 5.9409 7.86192 5.97948C7.66794 6.01807 7.46687 5.99826 7.28415 5.92258C7.10142 5.84689 6.94524 5.71872 6.83536 5.55427C6.72548 5.38982 6.66683 5.19648 6.66683 4.9987C6.66683 4.73348 6.77219 4.47913 6.95972 4.29159C7.14726 4.10405 7.40162 3.9987 7.66683 3.9987ZM9.3335 11.332H6.66683C6.49002 11.332 6.32045 11.2618 6.19543 11.1368C6.0704 11.0117 6.00016 10.8422 6.00016 10.6654C6.00016 10.4886 6.0704 10.319 6.19543 10.194C6.32045 10.0689 6.49002 9.9987 6.66683 9.9987H7.3335V7.9987H6.66683C6.49002 7.9987 6.32045 7.92846 6.19543 7.80343C6.0704 7.67841 6.00016 7.50884 6.00016 7.33203C6.00016 7.15522 6.0704 6.98565 6.19543 6.86063C6.32045 6.7356 6.49002 6.66536 6.66683 6.66536H8.00016C8.17698 6.66536 8.34655 6.7356 8.47157 6.86063C8.59659 6.98565 8.66683 7.15522 8.66683 7.33203V9.9987H9.3335C9.51031 9.9987 9.67988 10.0689 9.8049 10.194C9.92993 10.319 10.0002 10.4886 10.0002 10.6654C10.0002 10.8422 9.92993 11.0117 9.8049 11.1368C9.67988 11.2618 9.51031 11.332 9.3335 11.332Z"
     }
   }]
-}, sr = Ne(function(e, r) {
-  return de(me, Object.assign({}, e, {
+}, or = be(function(e, r) {
+  return ve(_e, Object.assign({}, e, {
     id: "info-icon",
     ref: r,
-    icon: Vi
+    icon: Gi
   }));
 });
-sr.displayName = "InfoIcon";
-const Qi = {
+or.displayName = "InfoIcon";
+const ji = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -1717,15 +1721,78 @@ const Qi = {
       clipRule: "evenodd"
     }
   }]
-}, nr = Ne(function(e, r) {
-  return de(me, Object.assign({}, e, {
+}, lr = be(function(e, r) {
+  return ve(_e, Object.assign({}, e, {
     id: "success-icon",
     ref: r,
-    icon: Qi
+    icon: ji
   }));
 });
-nr.displayName = "SuccessIcon";
-function Gi(t) {
+lr.displayName = "SuccessIcon";
+function Yi(t) {
+  const e = t.get(X);
+  return {
+    id: Oe.id,
+    type: ut.BUTTON_SELECTOR,
+    icon: "FilterIcon",
+    tooltip: "sheets-filter.toolbar.smart-toggle-filter-tooltip",
+    hidden$: ct(t, ie.UNIVER_SHEET),
+    activated$: e.activeFilterModel$.pipe(ae((r) => !!r)),
+    disabled$: Pr(
+      t,
+      wr(
+        t,
+        {
+          worksheetTypes: [Se, Ce],
+          rangeTypes: [Te]
+        }
+      )
+    )
+  };
+}
+function Zi(t) {
+  const e = t.get(X);
+  return {
+    id: at.id,
+    type: ut.BUTTON,
+    title: "sheets-filter.toolbar.clear-filter-criteria",
+    hidden$: ct(t, ie.UNIVER_SHEET),
+    disabled$: e.activeFilterModel$.pipe(ht((r) => {
+      var s;
+      return (s = r == null ? void 0 : r.hasCriteria$.pipe(ae((n) => !n))) != null ? s : pe(!0);
+    }))
+  };
+}
+function zi(t) {
+  const e = t.get(X);
+  return {
+    id: lt.id,
+    type: ut.BUTTON,
+    title: "sheets-filter.toolbar.re-calc-filter-conditions",
+    hidden$: ct(t, ie.UNIVER_SHEET),
+    disabled$: e.activeFilterModel$.pipe(ht((r) => {
+      var s;
+      return (s = r == null ? void 0 : r.hasCriteria$.pipe(ae((n) => !n))) != null ? s : pe(!0);
+    }))
+  };
+}
+const Ki = {
+  [Ur.ORGANIZATION]: {
+    [Oe.id]: {
+      order: 2,
+      menuItemFactory: Yi,
+      [at.id]: {
+        order: 0,
+        menuItemFactory: Zi
+      },
+      [lt.id]: {
+        order: 1,
+        menuItemFactory: zi
+      }
+    }
+  }
+};
+function qi(t) {
   const { model: e } = t, r = D(G), s = L(e.cellFillColors$, [], !0), n = L(e.cellTextColors$, [], !0), a = U((o) => {
     e.onFilterCheckToggled(o);
   }, [e]), i = U((o) => {
@@ -1740,7 +1807,7 @@ function Gi(t) {
         "div",
         {
           "data-u-comp": "sheets-filter-panel",
-          className: Ae("univer-mt-2 univer-box-border univer-flex univer-h-[300px] univer-flex-grow univer-flex-col univer-gap-4 univer-overflow-auto univer-rounded-md univer-px-2 univer-py-2.5", ct),
+          className: $e("univer-mt-2 univer-box-border univer-flex univer-h-[300px] univer-flex-grow univer-flex-col univer-gap-4 univer-overflow-auto univer-rounded-md univer-px-2 univer-py-2.5", dt),
           children: [
             s.length > 1 && /* @__PURE__ */ y("div", { children: [
               /* @__PURE__ */ d(
@@ -1764,16 +1831,16 @@ function Gi(t) {
                           "button",
                           {
                             type: "button",
-                            className: Ae("univer-box-border univer-size-6 univer-cursor-pointer univer-rounded-full univer-border univer-border-solid univer-border-transparent univer-bg-gray-300 univer-transition-shadow hover:univer-ring-2 hover:univer-ring-offset-2 hover:univer-ring-offset-white"),
+                            className: $e("univer-box-border univer-size-6 univer-cursor-pointer univer-rounded-full univer-border univer-border-solid univer-border-transparent univer-bg-gray-300 univer-transition-shadow hover:univer-ring-2 hover:univer-ring-offset-2 hover:univer-ring-offset-white"),
                             style: { backgroundColor: o.color }
                           }
                         ) : /* @__PURE__ */ d(
-                          rr,
+                          sr,
                           {
                             className: "univer-size-6 univer-cursor-pointer univer-rounded-full hover:univer-ring-2 hover:univer-ring-offset-2 hover:univer-ring-offset-white"
                           }
                         ),
-                        o.checked && /* @__PURE__ */ d(bt, {})
+                        o.checked && /* @__PURE__ */ d(Pt, {})
                       ]
                     },
                     `sheets-filter-cell-fill-color-${l}`
@@ -1803,10 +1870,10 @@ function Gi(t) {
                           "div",
                           {
                             className: "univer-box-border univer-flex univer-size-full univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-full univer-border univer-border-solid univer-border-[rgba(13,13,13,0.06)] univer-p-0.5 hover:univer-ring-2 hover:univer-ring-offset-2 hover:univer-ring-offset-white dark:!univer-border-[rgba(255,255,255,0.06)]",
-                            children: /* @__PURE__ */ d(tr, { style: { color: o.color } })
+                            children: /* @__PURE__ */ d(ir, { style: { color: o.color } })
                           }
                         ),
-                        o.checked && /* @__PURE__ */ d(bt, {})
+                        o.checked && /* @__PURE__ */ d(Pt, {})
                       ]
                     },
                     `sheets-filter-cell-text-color-${l}`
@@ -1827,13 +1894,13 @@ function Gi(t) {
     }
   );
 }
-function bt() {
+function Pt() {
   return /* @__PURE__ */ d(
     "div",
     {
       className: "univer-absolute -univer-bottom-0.5 -univer-right-0.5 univer-flex univer-size-3 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-full univer-bg-white",
       children: /* @__PURE__ */ d(
-        nr,
+        lr,
         {
           className: "univer-size-full univer-font-bold univer-text-[#418F1F]"
         }
@@ -1841,37 +1908,37 @@ function bt() {
     }
   );
 }
-function ji(t) {
+function Xi(t) {
   var p, _;
   const { model: e } = t, r = D(G), s = L(e.conditionItem$, void 0), n = L(e.filterConditionFormParams$, void 0), a = n != null && n.and ? "AND" : "OR", i = U((C) => {
     e.onConditionFormChange({ and: C === "AND" });
-  }, [e]), o = Yi(r), l = U((C) => {
+  }, [e]), o = Ji(r), l = U((C) => {
     e.onPrimaryConditionChange(C);
-  }, [e]), c = Zi(r), h = U((C) => {
+  }, [e]), c = es(r), h = U((C) => {
     e.onConditionFormChange(C);
   }, [e]), m = r.t("sheets-filter.panel.input-values-placeholder");
-  function S(C, F, N) {
+  function S(C, N, F) {
     const R = f.getItemByOperator(C).numOfParameters === 1;
-    return /* @__PURE__ */ y(Ft, { children: [
-      N === "operator2" && /* @__PURE__ */ y(ai, { value: a, onChange: i, children: [
-        /* @__PURE__ */ d(Et, { value: "AND", children: r.t("sheets-filter.panel.and") }),
-        /* @__PURE__ */ d(Et, { value: "OR", children: r.t("sheets-filter.panel.or") })
+    return /* @__PURE__ */ y(yt, { children: [
+      F === "operator2" && /* @__PURE__ */ y(ci, { value: a, onChange: i, children: [
+        /* @__PURE__ */ d(It, { value: "AND", children: r.t("sheets-filter.panel.and") }),
+        /* @__PURE__ */ d(It, { value: "OR", children: r.t("sheets-filter.panel.or") })
       ] }),
       /* @__PURE__ */ d(
-        Tt,
+        Ft,
         {
           value: C,
           options: c,
-          onChange: (O) => h({ [N]: O })
+          onChange: (O) => h({ [F]: O })
         }
       ),
       R && /* @__PURE__ */ d("div", { children: /* @__PURE__ */ d(
-        jt,
+        zt,
         {
           className: "univer-mt-2",
-          value: F,
+          value: N,
           placeholder: m,
-          onChange: (O) => h({ [N === "operator1" ? "val1" : "val2"]: O })
+          onChange: (O) => h({ [F === "operator1" ? "val1" : "val2"]: O })
         }
       ) })
     ] });
@@ -1881,13 +1948,13 @@ function ji(t) {
     {
       "data-u-comp": "sheets-filter-panel-conditions-container",
       className: "univer-flex univer-h-full univer-min-h-[300px] univer-flex-col",
-      children: s && n && /* @__PURE__ */ y(Ft, { children: [
-        /* @__PURE__ */ d(Tt, { value: s.operator, options: o, onChange: l }),
+      children: s && n && /* @__PURE__ */ y(yt, { children: [
+        /* @__PURE__ */ d(Ft, { value: s.operator, options: o, onChange: l }),
         f.getItemByOperator(s.operator).numOfParameters !== 0 ? /* @__PURE__ */ y(
           "div",
           {
             "data-u-comp": "sheets-filter-panel-conditions-container-inner",
-            className: Ae("univer-mt-2 univer-flex-grow univer-overflow-hidden univer-rounded-md univer-p-2", ct),
+            className: $e("univer-mt-2 univer-flex-grow univer-overflow-hidden univer-rounded-md univer-p-2", dt),
             children: [
               s.numOfParameters >= 1 && S(n.operator1, (p = n.val1) != null ? p : "", "operator1"),
               s.numOfParameters >= 2 && S(n.operator2, (_ = n.val2) != null ? _ : "", "operator2"),
@@ -1910,9 +1977,9 @@ function ji(t) {
     }
   );
 }
-function Yi(t) {
+function Ji(t) {
   const e = t.getCurrentLocale();
-  return ut(() => [
+  return mt(() => [
     {
       options: [
         { label: t.t(f.NONE.label), value: f.NONE.operator }
@@ -1952,12 +2019,12 @@ function Yi(t) {
     }
   ], [e, t]);
 }
-function Zi(t) {
+function es(t) {
   const e = t.getCurrentLocale();
-  return ut(() => f.ALL_CONDITIONS.filter((r) => r.numOfParameters !== 2).map((r) => ({ label: t.t(r.label), value: r.operator })), [e, t]);
+  return mt(() => f.ALL_CONDITIONS.filter((r) => r.numOfParameters !== 2).map((r) => ({ label: t.t(r.label), value: r.operator })), [e, t]);
 }
-function zi(t) {
-  const { model: e } = t, r = D(G), s = L(e.searchString$, "", !0), n = L(e.filterItems$, void 0, !0), a = r.t("sheets-filter.panel.filter-only"), i = Xe(n), o = i.checked > 0 && i.unchecked === 0, l = i.checked > 0 && i.unchecked > 0, c = e.treeMapCache, h = U(() => {
+function ts(t) {
+  const { model: e } = t, r = D(G), s = L(e.searchString$, "", !0), n = L(e.filterItems$, void 0, !0), a = r.t("sheets-filter.panel.filter-only"), i = tt(n), o = i.checked > 0 && i.unchecked === 0, l = i.checked > 0 && i.unchecked > 0, c = e.treeMapCache, h = U(() => {
     e.onCheckAllToggled(!o);
   }, [e, o]), m = U((p) => {
     e.setSearchString(p);
@@ -1975,7 +2042,7 @@ function zi(t) {
       className: "univer-flex univer-h-full univer-min-h-[300px] univer-flex-col",
       children: [
         /* @__PURE__ */ d(
-          jt,
+          zt,
           {
             autoFocus: !0,
             value: s,
@@ -1987,7 +2054,7 @@ function zi(t) {
           "div",
           {
             "data-u-comp": "sheets-filter-panel",
-            className: Ae("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", ct),
+            className: $e("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", dt),
             children: [
               /* @__PURE__ */ d(
                 "div",
@@ -2001,7 +2068,7 @@ function zi(t) {
                       className: "univer-box-border univer-flex univer-h-7 univer-items-center univer-rounded-md univer-py-0 univer-pl-5 univer-pr-0.5 univer-text-sm",
                       children: [
                         /* @__PURE__ */ d(
-                          ci,
+                          ui,
                           {
                             indeterminate: l,
                             disabled: n.length === 0,
@@ -2031,7 +2098,7 @@ function zi(t) {
                 }
               ),
               /* @__PURE__ */ d("div", { "data-u-comp": "sheets-filter-panel-values-virtual", className: "univer-flex-grow", children: /* @__PURE__ */ d(
-                ui,
+                hi,
                 {
                   data: n,
                   defaultExpandAll: !1,
@@ -2068,8 +2135,8 @@ function zi(t) {
                             onClick: () => {
                               const _ = [];
                               p.children ? p.children.forEach((C) => {
-                                C.children ? C.children.forEach((F) => {
-                                  _.push(F.key);
+                                C.children ? C.children.forEach((N) => {
+                                  _.push(N.key);
                                 }) : _.push(C.key);
                               }) : _.push(p.key), e.onFilterOnly(_);
                             },
@@ -2088,10 +2155,10 @@ function zi(t) {
     }
   );
 }
-function Ki() {
-  const t = D(Tr);
+function rs() {
+  const t = D(Er);
   if (!L(t.visible$, void 0, !0)) return null;
-  const r = D(G), s = D(Bt), n = L(t.enabled$, void 0, !0);
+  const r = D(G), s = D(Qt), n = L(t.enabled$, void 0, !0);
   return /* @__PURE__ */ y(
     "div",
     {
@@ -2100,23 +2167,23 @@ function Ki() {
         /* @__PURE__ */ y("div", { className: "univer-flex univer-items-center univer-gap-1", children: [
           /* @__PURE__ */ d("span", { children: r.t("sheets-filter.sync.title") }),
           /* @__PURE__ */ d(
-            hi,
+            di,
             {
               title: n ? r.t("sheets-filter.sync.statusTips.off") : r.t("sheets-filter.sync.statusTips.on"),
               asChild: !0,
-              children: /* @__PURE__ */ d(sr, { className: "univer-block" })
+              children: /* @__PURE__ */ d(or, { className: "univer-block" })
             }
           )
         ] }),
         /* @__PURE__ */ d(
-          di,
+          mi,
           {
             defaultChecked: n,
             onChange: (a) => {
               const i = a ? r.t("sheets-filter.sync.switchTips.on") : r.t("sheets-filter.sync.switchTips.off");
               t.setEnabled(a), s.show({
                 content: i,
-                type: Yt.Success,
+                type: Kt.Success,
                 duration: 2e3
               });
             }
@@ -2126,17 +2193,17 @@ function Ki() {
     }
   );
 }
-function qi() {
-  var F;
-  const t = D(q), e = D(G), r = D(j), s = L(t.filterBy$, void 0, !0), n = L(t.filterByModel$, void 0, !1), a = L(() => (n == null ? void 0 : n.canApply$) || he(!1), void 0, !1, [n]), i = Xi(e), o = !L(t.hasCriteria$), l = U((N) => {
-    r.executeCommand(qt.id, { filterBy: N });
+function is() {
+  var N;
+  const t = D(q), e = D(G), r = D(j), s = L(t.filterBy$, void 0, !0), n = L(t.filterByModel$, void 0, !1), a = L(() => (n == null ? void 0 : n.canApply$) || pe(!1), void 0, !1, [n]), i = ss(e), o = !L(t.hasCriteria$), l = U((F) => {
+    r.executeCommand(er.id, { filterBy: F });
   }, [r]), c = U(async () => {
-    await (n == null ? void 0 : n.clear()), r.executeCommand(Se.id);
+    await (n == null ? void 0 : n.clear()), r.executeCommand(Ne.id);
   }, [n, r]), h = U(() => {
-    r.executeCommand(Se.id);
+    r.executeCommand(Ne.id);
   }, [r]), m = U(async () => {
-    await (n == null ? void 0 : n.apply()), r.executeCommand(Se.id);
-  }, [n, r]), p = (F = D(X).activeFilterModel) == null ? void 0 : F.getRange(), _ = t.col, C = xr(Ar.FILTER_PANEL_EMBED_POINT);
+    await (n == null ? void 0 : n.apply()), r.executeCommand(Ne.id);
+  }, [n, r]), p = (N = D(X).activeFilterModel) == null ? void 0 : N.getRange(), _ = t.col, C = kr($r.FILTER_PANEL_EMBED_POINT);
   return /* @__PURE__ */ y(
     "div",
     {
@@ -2144,18 +2211,18 @@ function qi() {
       className: "univer-box-border univer-flex univer-max-h-[500px] univer-w-[400px] 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__ */ d(
-          Ur,
+          Hr,
           {
             components: C,
             sharedProps: { range: p, colIndex: _, onClose: h }
           }
         ),
         /* @__PURE__ */ d("div", { className: "univer-mb-1 univer-flex-shrink-0 univer-flex-grow-0", children: /* @__PURE__ */ d(
-          mi,
+          fi,
           {
             value: s,
             items: i,
-            onChange: (N) => l(N)
+            onChange: (F) => l(F)
           }
         ) }),
         n ? /* @__PURE__ */ d(
@@ -2163,20 +2230,20 @@ function qi() {
           {
             "data-u-comp": "sheets-filter-panel-content",
             className: "univer-flex-shrink univer-flex-grow univer-pt-2",
-            children: s === P.VALUES ? /* @__PURE__ */ d(zi, { model: n }) : s === P.COLORS ? /* @__PURE__ */ d(Gi, { model: n }) : /* @__PURE__ */ d(ji, { model: n })
+            children: s === P.VALUES ? /* @__PURE__ */ d(ts, { model: n }) : s === P.COLORS ? /* @__PURE__ */ d(qi, { model: n }) : /* @__PURE__ */ d(Xi, { model: n })
           }
         ) : /* @__PURE__ */ d("div", { className: "univer-flex-1" }),
-        /* @__PURE__ */ d(Ki, {}),
+        /* @__PURE__ */ d(rs, {}),
         /* @__PURE__ */ y(
           "div",
           {
             "data-u-comp": "sheets-filter-panel-footer",
             className: "univer-mt-4 univer-inline-flex univer-flex-shrink-0 univer-flex-grow-0 univer-flex-nowrap univer-justify-between univer-overflow-hidden",
             children: [
-              /* @__PURE__ */ d(Ze, { variant: "link", onClick: c, disabled: o, children: e.t("sheets-filter.panel.clear-filter") }),
+              /* @__PURE__ */ d(qe, { variant: "link", onClick: c, disabled: o, children: e.t("sheets-filter.panel.clear-filter") }),
               /* @__PURE__ */ y("span", { className: "univer-flex univer-gap-2", children: [
-                /* @__PURE__ */ d(Ze, { variant: "default", onClick: h, children: e.t("sheets-filter.panel.cancel") }),
-                /* @__PURE__ */ d(Ze, { disabled: !a, variant: "primary", onClick: m, children: e.t("sheets-filter.panel.confirm") })
+                /* @__PURE__ */ d(qe, { variant: "default", onClick: h, children: e.t("sheets-filter.panel.cancel") }),
+                /* @__PURE__ */ d(qe, { disabled: !a, variant: "primary", onClick: m, children: e.t("sheets-filter.panel.confirm") })
               ] })
             ]
           }
@@ -2185,90 +2252,28 @@ function qi() {
     }
   );
 }
-function Xi(t) {
+function ss(t) {
   const e = t.getCurrentLocale();
-  return ut(() => [
+  return mt(() => [
     { label: t.t("sheets-filter.panel.by-values"), value: P.VALUES },
     { label: t.t("sheets-filter.panel.by-colors"), value: P.COLORS },
     { label: t.t("sheets-filter.panel.by-conditions"), value: P.CONDITIONS }
   ], [e, t]);
 }
-function Ji(t) {
-  const e = t.get(X);
-  return {
-    id: Fe.id,
-    type: lt.BUTTON_SELECTOR,
-    icon: "FilterIcon",
-    tooltip: "sheets-filter.toolbar.smart-toggle-filter-tooltip",
-    hidden$: ot(t, ie.UNIVER_SHEET),
-    activated$: e.activeFilterModel$.pipe(le((r) => !!r)),
-    disabled$: Pr(
-      t,
-      wr(
-        t,
-        {
-          worksheetTypes: [pe, ve],
-          rangeTypes: [_e]
-        }
-      )
-    )
-  };
-}
-function es(t) {
-  const e = t.get(X);
-  return {
-    id: nt.id,
-    type: lt.BUTTON,
-    title: "sheets-filter.toolbar.clear-filter-criteria",
-    hidden$: ot(t, ie.UNIVER_SHEET),
-    disabled$: e.activeFilterModel$.pipe(at((r) => {
-      var s;
-      return (s = r == null ? void 0 : r.hasCriteria$.pipe(le((n) => !n))) != null ? s : he(!0);
-    }))
-  };
-}
-function ts(t) {
-  const e = t.get(X);
-  return {
-    id: st.id,
-    type: lt.BUTTON,
-    title: "sheets-filter.toolbar.re-calc-filter-conditions",
-    hidden$: ot(t, ie.UNIVER_SHEET),
-    disabled$: e.activeFilterModel$.pipe(at((r) => {
-      var s;
-      return (s = r == null ? void 0 : r.hasCriteria$.pipe(le((n) => !n))) != null ? s : he(!0);
-    }))
-  };
-}
-const rs = {
-  [kr.ORGANIZATION]: {
-    [Fe.id]: {
-      order: 2,
-      menuItemFactory: Ji,
-      [nt.id]: {
-        order: 0,
-        menuItemFactory: es
-      },
-      [st.id]: {
-        order: 1,
-        menuItemFactory: ts
-      }
-    }
-  }
-}, is = {
-  id: Fe.id,
-  binding: Hr.L | gt.CTRL_COMMAND | gt.SHIFT,
+const ns = {
+  id: Oe.id,
+  binding: Dr.L | Tt.CTRL_COMMAND | Tt.SHIFT,
   description: "sheets-filter.shortcut.smart-toggle-filter",
-  preconditions: $r,
+  preconditions: Lr,
   group: "4_sheet-edit"
 };
-var ss = Object.getOwnPropertyDescriptor, ns = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? ss(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+var os = Object.getOwnPropertyDescriptor, ls = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? os(e, r) : e, a = t.length - 1, i; a >= 0; a--)
     (i = t[a]) && (n = i(n) || n);
   return n;
 }, $ = (t, e) => (r, s) => e(r, s, t);
-const Rt = "FILTER_PANEL_POPUP";
-let ke = class extends Ee {
+const wt = "FILTER_PANEL_POPUP";
+let De = class extends ye {
   constructor(e, r, s, n, a, i, o, l, c, h, m, S, p) {
     super(p, S);
     v(this, "_popupDisposable");
@@ -2279,42 +2284,42 @@ let ke = class extends Ee {
   }
   _initShortcuts() {
     [
-      is
+      ns
     ].forEach((e) => {
       this.disposeWithMe(this._shortcutService.registerShortcut(e));
     });
   }
   _initCommands() {
     [
-      Fe,
-      Er,
+      Oe,
+      Nr,
       Fr,
       V,
-      nt,
-      st,
-      qt,
-      Me,
-      Se
+      at,
+      lt,
+      er,
+      ke,
+      Ne
     ].forEach((e) => {
       this.disposeWithMe(this._commandService.registerCommand(e));
     });
   }
   _initMenuItems() {
-    this._menuManagerService.mergeMenu(rs);
+    this._menuManagerService.mergeMenu(Ki);
   }
   _initUI() {
     [
-      [Rt, qi],
-      ["FilterIcon", ir]
+      [wt, is],
+      ["FilterIcon", nr]
     ].forEach(([e, r]) => {
       this.disposeWithMe(
         this._componentManager.register(e, r)
       );
-    }), this.disposeWithMe(this._contextService.subscribeContextValue$(ae).pipe(ni()).subscribe((e) => {
+    }), this.disposeWithMe(this._contextService.subscribeContextValue$(ce).pipe(oi()).subscribe((e) => {
       e ? this._openFilterPopup() : this._closeFilterPopup();
     })), this.disposeWithMe(this._sheetsFilterService.errorMsg$.subscribe((e) => {
       e && this._messageService.show({
-        type: Yt.Error,
+        type: Kt.Error,
         content: this._localeService.t(e)
       });
     }));
@@ -2325,9 +2330,9 @@ let ke = class extends Ee {
       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: Rt,
+      componentKey: wt,
       direction: "horizontal",
-      onClickOutside: () => this._commandService.syncExecuteCommand(Se.id),
+      onClickOutside: () => this._commandService.syncExecuteCommand(Ne.id),
       offset: [5, 0]
     });
   }
@@ -2336,97 +2341,98 @@ let ke = class extends Ee {
     (e = this._popupDisposable) == null || e.dispose(), this._popupDisposable = null;
   }
 };
-ke = ns([
+De = ls([
   $(0, T(re)),
-  $(1, T(Dr)),
+  $(1, T(Br)),
   $(2, T(q)),
-  $(3, T(Lr)),
+  $(3, T(Mr)),
   $(4, T(X)),
   $(5, T(G)),
-  $(6, Br),
+  $(6, Wr),
   $(7, j),
-  $(8, Wr),
-  $(9, We),
-  $(10, Bt),
-  $(11, T(Dt)),
-  $(12, Wt)
-], ke);
-var os = Object.defineProperty, ls = Object.getOwnPropertyDescriptor, as = (t, e, r) => e in t ? os(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, cs = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? ls(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+  $(8, Vr),
+  $(9, Ve),
+  $(10, Qt),
+  $(11, T(Vt)),
+  $(12, Gt)
+], De);
+var as = Object.defineProperty, cs = Object.getOwnPropertyDescriptor, us = (t, e, r) => e in t ? as(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, hs = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? cs(e, r) : e, a = t.length - 1, i; a >= 0; a--)
     (i = t[a]) && (n = i(n) || n);
   return n;
-}, qe = (t, e) => (r, s) => e(r, s, t), or = (t, e, r) => as(t, typeof e != "symbol" ? e + "" : e, r);
-const us = "SHEET_FILTER_UI_PLUGIN";
-let He = class extends it {
-  constructor(t = xe, e, r, s) {
+}, et = (t, e) => (r, s) => e(r, s, t), je = (t, e, r) => us(t, typeof e != "symbol" ? e + "" : e, r);
+let me = class extends ot {
+  constructor(t = He, e, r, s) {
     super(), this._config = t, this._injector = e, this._configService = r, this._rpcChannelService = s;
-    const { menu: n, ...a } = kt(
+    const { menu: n, ...a } = Bt(
       {},
-      xe,
+      He,
       this._config
     );
-    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig(Xt, a);
+    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig(tr, a);
   }
   onStarting() {
-    pr(this._injector, [
+    vr(this._injector, [
       [q],
-      [ce],
-      [ke]
-    ]), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([Pe, {
-      useFactory: () => oi(
-        this._rpcChannelService.requestChannel(ht)
+      [he],
+      [De]
+    ]), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([Le, {
+      useFactory: () => li(
+        this._rpcChannelService.requestChannel(ft)
       )
     }]);
   }
   onReady() {
-    vt(this._injector, [
-      [ce]
+    St(this._injector, [
+      [he]
     ]);
   }
   onRendered() {
-    vt(this._injector, [
-      [ke]
+    St(this._injector, [
+      [De]
     ]);
   }
 };
-or(He, "type", ie.UNIVER_SHEET);
-or(He, "pluginName", us);
-He = cs([
-  xt(Ht),
-  qe(1, T(re)),
-  qe(2, Ut),
-  qe(3, fr(Gt))
-], He);
-var hs = Object.getOwnPropertyDescriptor, ds = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? hs(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+je(me, "type", ie.UNIVER_SHEET);
+je(me, "pluginName", "SHEET_FILTER_UI_PLUGIN");
+je(me, "packageName", ue.name);
+je(me, "version", ue.version);
+me = hs([
+  Ht(Wt),
+  et(1, T(re)),
+  et(2, Dt),
+  et(3, pr(Zt))
+], me);
+var ds = Object.getOwnPropertyDescriptor, ms = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? ds(e, r) : e, a = t.length - 1, i; a >= 0; a--)
     (i = t[a]) && (n = i(n) || n);
   return n;
-}, At = (t, e) => (r, s) => e(r, s, t), Oe;
-let Pt = (Oe = class extends it {
+}, $t = (t, e) => (r, s) => e(r, s, t), le;
+let Lt = (le = class extends ot {
   constructor(t, e, r) {
     super(), this._config = t, this._injector = e, this._rpcChannelService = r;
   }
   onStarting() {
     [
-      [Pe, { useClass: Je }]
+      [Le, { useClass: rt }]
     ].forEach((t) => this._injector.add(t));
   }
   onReady() {
     this._rpcChannelService.registerChannel(
-      ht,
-      li(this._injector.get(Pe))
+      ft,
+      ai(this._injector.get(Le))
     );
   }
-}, v(Oe, "type", ie.UNIVER_SHEET), v(Oe, "pluginName", "SHEET_FILTER_UI_WORKER_PLUGIN"), Oe);
-Pt = ds([
-  At(1, T(re)),
-  At(2, Gt)
-], Pt);
+}, v(le, "type", ie.UNIVER_SHEET), v(le, "pluginName", "SHEET_FILTER_UI_WORKER_PLUGIN"), v(le, "packageName", ue.name), v(le, "version", ue.version), le);
+Lt = ms([
+  $t(1, T(re)),
+  $t(2, Zt)
+], Lt);
 export {
-  qt as ChangeFilterByOperation,
-  Se as CloseFilterPanelOperation,
-  Me as OpenFilterPanelOperation,
-  Ue as UniverSheetsFilterMobileUIPlugin,
-  He as UniverSheetsFilterUIPlugin,
-  Pt as UniverSheetsFilterUIWorkerPlugin
+  er as ChangeFilterByOperation,
+  Ne as CloseFilterPanelOperation,
+  ke as OpenFilterPanelOperation,
+  de as UniverSheetsFilterMobileUIPlugin,
+  me as UniverSheetsFilterUIPlugin,
+  Lt as UniverSheetsFilterUIWorkerPlugin
 };