@univerjs/sheets-filter-ui 0.15.3 → 0.15.4

package/lib/es/index.js

@@ -1,18 +1,18 @@
 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 mt, createIdentifier as Pt, 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 fr, UniverInstanceType as ie, DependentOn as xt, IConfigService as Ut, Plugin as it, merge as kt, Optional as mr, registerDependencies as pr, touchDependencies as vt } from "@univerjs/core";
-import { CustomFilterOperator as u, FilterBy as w, SetSheetsFilterCriteriaCommand as V, SheetsFilterService as z, 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 wr, getCurrentRangeDisable$ as Pr, whenSheetEditorFocused as $r, SheetCanvasPopManagerService as Lr } from "@univerjs/sheets-ui";
+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 Kr, SetRangeValuesMutation as qr, INTERCEPTOR_POINT as Xr } from "@univerjs/sheets";
-import { BehaviorSubject as Q, ReplaySubject as zr, 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 { 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 fi, Button as Ze } from "@univerjs/design";
-import { useRef as mi, createElement as de, forwardRef as Ne, useCallback as U, useMemo as ut } from "react";
+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 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 || {}), m;
+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 = {
     label: "sheets-filter.conditions.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: mt.TRUE,
+          and: ft.TRUE,
           customFilters: [
             { val: h ? o : l, operator: u.GREATER_THAN_OR_EQUAL },
             { val: h ? l : o, operator: u.LESS_THAN_OR_EQUAL }
@@ -389,26 +389,26 @@ var b = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     }),
     testMappingParams: () => !0,
     mapToFilterColumn: (i) => {
-      const { and: o, val1: l, val2: c, operator1: h, operator2: f } = i;
+      const { and: o, val1: l, val2: c, operator1: h, operator2: m } = i;
       function S(R, O) {
         for (const A of t.ALL_CONDITIONS)
           if (A.operator === R)
             return A.mapToFilterColumn({ val1: O, operator1: R });
       }
-      const p = !h || h === t.NONE.operator, _ = !f || f === t.NONE.operator;
+      const p = !h || h === t.NONE.operator, _ = !m || m === t.NONE.operator;
       if (p && _)
         return t.NONE.mapToFilterColumn({});
       if (p)
-        return S(f, c);
+        return S(m, c);
       if (_)
         return S(h, l);
-      const C = S(h, l), F = S(f, c), N = {
+      const C = S(h, l), F = S(m, c), N = {
         customFilters: [
           C.customFilters.customFilters[0],
           F.customFilters.customFilters[0]
         ]
       };
-      return o && (N.and = mt.TRUE), { customFilters: N };
+      return o && (N.and = ft.TRUE), { customFilters: N };
     },
     testMappingFilterColumn: (i) => {
       var c;
@@ -483,7 +483,7 @@ var b = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     return [t.NONE, {}];
   }
   t.testMappingFilterColumn = a;
-})(m || (m = {}));
+})(f || (f = {}));
 function x(t) {
   const { operator1: e, operator2: r, val1: s, val2: n } = t;
   if (e && r)
@@ -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 ze(t) {
+function Xe(t) {
   const e = [], r = [];
   let s = 0, n = 0;
   function a(i) {
@@ -509,15 +509,15 @@ 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--)
     (i = t[a]) && (n = i(n) || n);
   return n;
-}, Ke = (t, e) => (r, s) => e(r, s, t);
-const ht = "sheets-filter.generate-filter-values.service", we = Pt(ht);
+}, 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 {
   constructor(t, e, r) {
     super(), this._localeService = t, this._univerInstanceService = e, this._logService = r;
   }
   async getFilterValues(t) {
-    var f;
-    const { unitId: e, subUnitId: r, filteredOutRowsByOtherColumns: s, filterColumn: n, filters: a, blankChecked: i, iterateRange: o, alreadyChecked: l } = t, c = this._univerInstanceService.getUnit(e), h = (f = this._univerInstanceService.getUnit(e)) == null ? void 0 : f.getSheetBySheetId(r);
+    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(
       a,
       this._localeService,
@@ -532,13 +532,13 @@ let Je = class extends ue {
   }
 };
 Je = vi([
-  Ke(0, T(G)),
-  Ke(1, De),
-  Ke(2, ur)
+  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, P, Y, Z, se, M;
-  const c = /* @__PURE__ */ new Map(), h = /* @__PURE__ */ new Map(), f = "yyyy-mm-dd", S = "empty", p = !t && ((a == null ? void 0 : a.filterBy) === w.COLORS || (a == null ? void 0 : a.filterBy) === w.CONDITIONS) && ((F = a.filteredOutRows) == null ? void 0 : F.size);
+  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);
   let _ = 0;
   for (const E of s.iterateByColumn(r, !1, !1)) {
     const { row: Qe, rowSpan: Ie = 1 } = E;
@@ -555,18 +555,18 @@ function Zt(t, e, r, s, n, a, i, o, l) {
         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 ft = !1;
+      let mt = !1;
       if (dt) {
-        const { year: k, month: K, day: I } = Ye.getFormatDateInfo(ye);
-        ft = k || K || I;
+        const { year: k, month: z, day: I } = Ye.getFormatDateInfo(ye);
+        mt = k || z || I;
       }
-      if (ye && dt && ft) {
-        const k = (P = s.getCellRaw(E.row, E.col)) == null ? void 0 : P.v;
+      if (ye && dt && mt) {
+        const k = (w = s.getCellRaw(E.row, E.col)) == null ? void 0 : w.v;
         if (!k) {
           ne++;
           continue;
         }
-        const K = Ye.format(f, Number(k)), [I, H, me] = K.split("-").map(Number);
+        const z = Ye.format(m, Number(k)), [I, H, fe] = z.split("-").map(Number);
         let ee = c.get(`${I}`);
         ee || (ee = {
           title: `${I}`,
@@ -585,25 +585,25 @@ 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}-${me}`);
+        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: `${me}`,
-          key: `${I}-${H}-${me}`,
+          title: `${fe}`,
+          key: `${I}-${H}-${fe}`,
           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}-${me}`, [`${I}`, `${I}-${H}`, `${I}-${H}-${me}`]));
+        }), W.count++, ee.count++, h.set(`${I}-${H}-${fe}`, [`${I}`, `${I}-${H}`, `${I}-${H}-${fe}`]));
       } else {
         const k = J;
-        let K = c.get(k);
-        K ? K.count++ : (K = {
+        let z = c.get(k);
+        z ? z.count++ : (z = {
           title: J,
           leaf: !0,
           checked: p ? !1 : i.size ? i.has(J) : !o,
           key: k,
           count: 1
-        }, c.set(k, K), h.set(k, [k]));
+        }, c.set(k, z), h.set(k, [k]));
       }
       ne++;
     }
@@ -652,13 +652,13 @@ function et(t, e) {
   }
   return null;
 }
-function Kt(t) {
-  return t.leaf ? t.checked : t.children ? t.children.every((e) => Kt(e)) : !0;
+function zt(t) {
+  return t.leaf ? t.checked : t.children ? t.children.every((e) => zt(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 qt(t, e) {
+function Kt(t, e) {
   const r = [];
   return t.forEach((s) => {
     const n = s.originValues ? e.some(
@@ -671,7 +671,7 @@ function qt(t, e) {
     if (n || a)
       r.push({ ...s });
     else if (s.children) {
-      const o = qt(s.children, e);
+      const o = Kt(s.children, e);
       if (o.length > 0) {
         const l = o.reduce((c, h) => c + h.count, 0);
         r.push({ ...s, count: l, children: o });
@@ -684,13 +684,13 @@ var Si = Object.getOwnPropertyDescriptor, Ve = (t, e, r, s) => {
     (i = t[a]) && (n = i(n) || n);
   return n;
 }, Te = (t, e) => (r, s) => e(r, s, t);
-Pt("sheets-filter-ui.sheets-filter-panel.service");
-let X = class extends ue {
+wt("sheets-filter-ui.sheets-filter-panel.service");
+let q = class extends ue {
   constructor(e, r) {
     super();
-    v(this, "_filterBy$", new Q(w.VALUES));
+    v(this, "_filterBy$", new Q(P.VALUES));
     v(this, "filterBy$", this._filterBy$.asObservable());
-    v(this, "_filterByModel$", new zr(1));
+    v(this, "_filterByModel$", new Xr(1));
     v(this, "filterByModel$", this._filterByModel$.asObservable());
     v(this, "_filterByModel", null);
     v(this, "_hasCriteria$", new Q(!1));
@@ -745,13 +745,13 @@ let X = class extends ue {
     if (!this._filterModel || this.col === -1)
       return !1;
     switch (e) {
-      case w.VALUES:
+      case P.VALUES:
         this._setupByValues(this._filterModel, this.col);
         break;
-      case w.COLORS:
+      case P.COLORS:
         this._setupByColors(this._filterModel, this.col);
         break;
-      case w.CONDITIONS:
+      case P.CONDITIONS:
         this._setupByConditions(this._filterModel, this.col);
         break;
     }
@@ -790,7 +790,7 @@ let X = class extends ue {
       e,
       r
     );
-    return this.filterByModel = n, this._filterBy$.next(w.VALUES), this._listenToFilterHeaderChange(e, r), !0;
+    return this.filterByModel = n, this._filterBy$.next(P.VALUES), this._listenToFilterHeaderChange(e, r), !0;
   }
   async _setupByColors(e, r) {
     this._disposePreviousModel();
@@ -801,30 +801,30 @@ let X = class extends ue {
       e,
       r
     );
-    return this.filterByModel = n, this._filterBy$.next(w.COLORS), this._listenToFilterHeaderChange(e, r), !0;
+    return this.filterByModel = n, this._filterBy$.next(P.COLORS), this._listenToFilterHeaderChange(e, r), !0;
   }
   _setupByConditions(e, r) {
     this._disposePreviousModel();
     const s = e.getRange();
     if (s.startRow === s.endRow) return !1;
-    const n = Pe.fromFilterColumn(
+    const n = we.fromFilterColumn(
       this._injector,
       e,
       r,
       e.getFilterColumn(r)
     );
-    return this.filterByModel = n, this._filterBy$.next(w.CONDITIONS), this._listenToFilterHeaderChange(e, r), !0;
+    return this.filterByModel = n, this._filterBy$.next(P.CONDITIONS), this._listenToFilterHeaderChange(e, r), !0;
   }
   _disposePreviousModel() {
     var e;
     (e = this._filterByModel) == null || e.dispose(), this.filterByModel = null;
   }
 };
-X = Ve([
+q = Ve([
   Te(0, T(re)),
   Te(1, T(Qr))
-], X);
-let Pe = class extends ue {
+], q);
+let we = class extends ue {
   constructor(e, r, s, n, a) {
     super();
     v(this, "canApply$", he(!0));
@@ -846,8 +846,8 @@ let Pe = class extends ue {
    * @returns the model to control the panel's state
    */
   static fromFilterColumn(e, r, s, n) {
-    const [a, i] = m.testMappingFilterColumn(n == null ? void 0 : n.getColumnData());
-    return e.createInstance(Pe, r, s, a, i);
+    const [a, i] = f.testMappingFilterColumn(n == null ? void 0 : n.getColumnData());
+    return e.createInstance(we, r, s, a, i);
   }
   get conditionItem() {
     return this._conditionItem$.getValue();
@@ -874,7 +874,7 @@ let Pe = class extends ue {
    */
   async apply() {
     if (this._disposed) return !1;
-    const e = m.mapToFilterColumn(this.conditionItem, this.filterConditionFormParams);
+    const e = f.mapToFilterColumn(this.conditionItem, this.filterConditionFormParams);
     return this._commandService.executeCommand(V.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
@@ -887,10 +887,10 @@ let Pe = class extends ue {
    * `IFilterConditionFormParams` and load default condition form params.
    */
   onPrimaryConditionChange(e) {
-    const r = m.ALL_CONDITIONS.find((s) => s.operator === e);
+    const r = f.ALL_CONDITIONS.find((s) => s.operator === e);
     if (!r)
       throw new Error(`[ByConditionsModel]: condition item not found for operator: ${e}!`);
-    this._conditionItem$.next(r), this._filterConditionFormParams$.next(m.getInitialFormParams(e));
+    this._conditionItem$.next(r), this._filterConditionFormParams$.next(f.getInitialFormParams(e));
   }
   /**
    * This method would be called when user changes the primary conditions, the input values or "AND" "OR" ratio.
@@ -903,15 +903,15 @@ let Pe = class extends ue {
   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 s = m.testMappingParams(r, this.conditionItem.numOfParameters);
+      const s = f.testMappingParams(r, this.conditionItem.numOfParameters);
       this._conditionItem$.next(s);
     }
     this._filterConditionFormParams$.next(r);
   }
 };
-Pe = Ve([
+we = Ve([
   Te(4, j)
-], Pe);
+], we);
 let $e = class extends ue {
   constructor(e, r, s, n, a) {
     super();
@@ -935,11 +935,11 @@ let $e = class extends ue {
         le(([i, o]) => {
           if (!i) return o;
           const c = i.toLowerCase().split(/\s+/).filter((h) => !!h);
-          return qt(o, c);
+          return Kt(o, c);
         })
       ),
       this._manuallyUpdateFilterItems$
-    ).pipe(ri(1)), this.canApply$ = this.filterItems$.pipe(le((i) => ze(i).checked > 0)), this.disposeWithMe(this.filterItems$.subscribe((i) => this._filterItems = i));
+    ).pipe(ri(1)), this.canApply$ = this.filterItems$.pipe(le((i) => Xe(i).checked > 0)), this.disposeWithMe(this.filterItems$.subscribe((i) => this._filterItems = i));
   }
   /**
    * Create a model with targeting filter column. If there is not a filter column, the model would be created with
@@ -952,14 +952,14 @@ 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(we, $t.OPTIONAL), { unitId: o, subUnitId: l } = r, c = n.getUniverSheetInstance(o);
+    const n = e.get(De), a = e.get(G), i = e.get(Pe, $t.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 f = 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 = { ...f, startRow: f.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), F = !!(_ && _.blank), N = r.getFilteredOutRowsExceptCol(s), R = { ...m, startRow: m.startRow + 1, startColumn: S, endColumn: S };
     let O, A;
     if (i) {
-      const P = await i.getFilterValues({
+      const w = await i.getFilterValues({
         unitId: o,
         subUnitId: l,
         filteredOutRowsByOtherColumns: Array.from(N),
@@ -969,9 +969,9 @@ let $e = class extends ue {
         iterateRange: R,
         alreadyChecked: Array.from(C)
       });
-      O = P.filterTreeItems, A = P.filterTreeMapCache;
+      O = w.filterTreeItems, A = w.filterTreeMapCache;
     } else {
-      const P = Zt(
+      const w = Zt(
         !!_,
         a,
         R,
@@ -982,7 +982,7 @@ let $e = class extends ue {
         F,
         c.getStyles()
       );
-      O = P.filterTreeItems, A = P.filterTreeMapCache;
+      O = w.filterTreeItems, A = w.filterTreeMapCache;
     }
     return e.createInstance($e, r, s, O, A);
   }
@@ -1015,7 +1015,7 @@ let $e = class extends ue {
     const r = be.deepClone(this._filterItems), s = et(r, e.key);
     if (!s)
       return;
-    const n = Kt(s);
+    const n = zt(s);
     ge(s, !n), this._manuallyUpdateFilterItems(r);
   }
   onFilterOnly(e) {
@@ -1044,7 +1044,7 @@ let $e = class extends ue {
   async apply() {
     if (this._disposed)
       return !1;
-    const e = ze(this._filterItems), { checked: r, checkedItems: s } = e, n = this.rawFilterItems;
+    const e = Xe(this._filterItems), { checked: r, checkedItems: s } = e, n = this.rawFilterItems;
     let a = 0;
     for (const c of n)
       a += c.count;
@@ -1060,9 +1060,9 @@ let $e = class extends ue {
       });
     {
       l.filters = {};
-      const c = s.filter((f) => f.key !== "empty");
+      const c = s.filter((m) => m.key !== "empty");
       c.length > 0 && (l.filters = {
-        filters: c.flatMap((f) => f.originValues ? Array.from(f.originValues) : [f.title])
+        filters: c.flatMap((m) => m.originValues ? Array.from(m.originValues) : [m.title])
       }), c.length !== s.length && (l.filters.blank = !0);
     }
     return this._commandService.executeCommand(V.id, {
@@ -1103,9 +1103,9 @@ let Le = class extends ue {
     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, f = (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 = f == null ? void 0 : f.cellFillColors) != null ? O : []), F = /* @__PURE__ */ new Map(), N = new Set((A = f == null ? void 0 : f.cellTextColors) != null ? A : []);
-    for (const P of l.iterateByColumn(p, !1, !0)) {
-      const { row: Y, col: Z, value: se } = P;
+    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 : []);
+    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);
@@ -1207,7 +1207,7 @@ const ae = "FILTER_PANEL_OPENED", Me = {
   id: "sheet.operation.open-filter-panel",
   type: Be.OPERATION,
   handler: (t, e) => {
-    const r = t.get(We), s = t.get(z), n = t.get(X), a = t.get(j), i = t.has(_t) ? t.get(_t) : null;
+    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 { 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;
@@ -1216,17 +1216,17 @@ const ae = "FILTER_PANEL_OPENED", Me = {
   id: "sheet.operation.close-filter-panel",
   type: Be.OPERATION,
   handler: (t) => {
-    const e = t.get(We), r = t.get(X), s = t.get(Mr, $t.OPTIONAL);
+    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;
   }
-}, Xt = {
+}, qt = {
   id: "sheet.operation.apply-filter",
   type: Be.OPERATION,
   handler: (t, e) => {
     const { filterBy: r } = e;
-    return t.get(X).changeFilterBy(r);
+    return t.get(q).changeFilterBy(r);
   }
-}, zt = "sheets-filter-ui.config", xe = {};
+}, 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--)
     (i = t[a]) && (n = i(n) || n);
@@ -1251,10 +1251,10 @@ let ce = class extends ue {
               worksheetTypes: [pe, ve]
             }, [c], i, o);
           else {
-            const f = (r = this._sheetsSelectionService.getCurrentLastSelection()) == null ? void 0 : r.range;
-            if (f) {
-              let S = { ...f };
-              S = f.startColumn === f.endColumn && f.startRow === f.endRow ? Zr(S, { left: !0, right: !0, up: !0, down: !0 }, l) : S, h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
+            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], i, o);
@@ -1278,37 +1278,37 @@ let ce = class extends ue {
   }
 };
 ce = Ti([
-  oe(0, T(z)),
+  oe(0, T(X)),
   oe(1, T(G)),
   oe(2, j),
   oe(3, T(Gr)),
   oe(4, T(re)),
   oe(5, T(jr))
 ], ce);
-const q = 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");
+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 {
   static drawNoCriteria(e, r, s, n) {
     e.save(), Ct.drawWith(e, {
       radius: 2,
-      width: q,
-      height: q,
+      width: K,
+      height: K,
       fill: n
-    }), e.lineCap = "square", e.strokeStyle = s, e.scale(r / q, r / q), 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();
+    }), 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, {
       radius: 2,
-      width: q,
-      height: q,
+      width: K,
+      height: K,
       fill: n
-    }), e.scale(r / q, r / q), e.fillStyle = s, e.fill(Ei), e.restore();
+    }), e.scale(r / K, r / K), e.fillStyle = s, e.fill(Ei), 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--)
     (i = t[a]) && (n = i(n) || n);
   return n;
-}, qe = (t, e) => (r, s) => e(r, s, t);
+}, Ke = (t, e) => (r, s) => e(r, s, t);
 const B = 16, Ce = 1;
 let tt = class extends Vr {
   constructor(e, r, s, n, a) {
@@ -1353,9 +1353,9 @@ let tt = class extends Vr {
   }
 };
 tt = Ni([
-  qe(2, We),
-  qe(3, j),
-  qe(4, T(Lt))
+  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--)
@@ -1401,7 +1401,7 @@ let rt = class extends Mt {
           ii(
             ([c]) => {
               var h;
-              return c.type === Be.MUTATION && ((h = c.params) == null ? void 0 : h.unitId) === r.getUnitId() && (vr.has(c.id) || c.id === qr.id);
+              return c.type === Be.MUTATION && ((h = c.params) == null ? void 0 : h.unitId) === r.getUnitId() && (vr.has(c.id) || c.id === Kr.id);
             }
           ),
           Vt(20, void 0, { leading: !1, trailing: !0 }),
@@ -1438,12 +1438,12 @@ let rt = class extends Mt {
     if (!c)
       return;
     this._interceptCellContent(n, i, e.range);
-    const { startColumn: h, endColumn: f, startRow: S } = r;
-    for (let p = h; p <= f; 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: P } = C, Y = A - R, Z = P - O;
+    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)
         continue;
-      const se = !!s.getFilterColumn(p), M = A - B - Ce, E = Ri(O, P, Z, N), Qe = {
+      const se = !!s.getFilterColumn(p), M = A - B - Ce, E = Ri(O, w, Z, N), Qe = {
         left: M,
         top: E,
         height: B,
@@ -1459,11 +1459,11 @@ let rt = class extends Mt {
   }
   _interceptCellContent(e, r, s) {
     const { startRow: n, startColumn: a, endColumn: i } = s;
-    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(Xr.CELL_CONTENT, {
-      effect: fr.Style,
+    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(qr.CELL_CONTENT, {
+      effect: mr.Style,
       handler: (o, l, c) => {
-        const { row: h, col: f, unitId: S, subUnitId: p } = l;
-        return S !== e || p !== r || h !== n || f < a || f > i || ((!o || o === l.rawData) && (o = { ...l.rawData }), o.fontRenderExtension = {
+        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 = {
           ...o == null ? void 0 : o.fontRenderExtension,
           rightOffset: B
         }), c(o);
@@ -1479,13 +1479,13 @@ let rt = class extends Mt {
 rt = yi([
   te(1, T(re)),
   te(2, T(Ir)),
-  te(3, T(z)),
+  te(3, T(X)),
   te(4, T(Lt)),
-  te(5, T(Kr)),
+  te(5, T(zr)),
   te(6, j),
   te(7, yr)
 ], rt);
-var Ai = Object.getOwnPropertyDescriptor, wi = (t, e, r, s) => {
+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--)
     (i = t[a]) && (n = i(n) || n);
   return n;
@@ -1503,11 +1503,11 @@ let Ee = class extends Mt {
     ));
   }
 };
-Ee = wi([
+Ee = Pi([
   yt(0, Wt),
   yt(1, T(Dt))
 ], Ee);
-var Pi = Object.defineProperty, $i = Object.getOwnPropertyDescriptor, Li = (t, e, r) => e in t ? Pi(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Mi = (t, e, r, s) => {
+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--)
     (i = t[a]) && (n = i(n) || n);
   return n;
@@ -1521,7 +1521,7 @@ let Ue = class extends it {
       xe,
       this._config
     );
-    s && this._configService.setConfig("menu", s, { merge: !0 }), this._configService.setConfig(zt, n);
+    s && this._configService.setConfig("menu", s, { merge: !0 }), this._configService.setConfig(Xt, n);
   }
   onStarting() {
     [
@@ -1543,8 +1543,8 @@ Ue = Mi([
   Ot(1, T(re)),
   Ot(2, Ut)
 ], Ue);
-function fe({ ref: t, ...e }) {
-  const { icon: r, id: s, className: n, extend: a, ...i } = e, o = `univerjs-icon univerjs-icon-${s} ${n || ""}`.trim(), l = mi(`_${Hi()}`);
+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}`, {
     defIds: r.defIds,
     idSuffix: l.current
@@ -1588,7 +1588,7 @@ function ki(t, e) {
 function Hi() {
   return Math.random().toString(36).substring(2, 8);
 }
-fe.displayName = "UniverIcon";
+me.displayName = "UniverIcon";
 const Di = {
   tag: "svg",
   attrs: {
@@ -1612,7 +1612,7 @@ const Di = {
     }
   }]
 }, tr = Ne(function(e, r) {
-  return de(fe, Object.assign({}, e, {
+  return de(me, Object.assign({}, e, {
     id: "a-icon",
     ref: r,
     icon: Di
@@ -1642,7 +1642,7 @@ const Bi = {
     }
   }]
 }, rr = Ne(function(e, r) {
-  return de(fe, Object.assign({}, e, {
+  return de(me, Object.assign({}, e, {
     id: "ban-icon",
     ref: r,
     icon: Bi
@@ -1668,7 +1668,7 @@ const Wi = {
     }
   }]
 }, ir = Ne(function(e, r) {
-  return de(fe, Object.assign({}, e, {
+  return de(me, Object.assign({}, e, {
     id: "filter-icon",
     ref: r,
     icon: Wi
@@ -1692,7 +1692,7 @@ const Vi = {
     }
   }]
 }, sr = Ne(function(e, r) {
-  return de(fe, Object.assign({}, e, {
+  return de(me, Object.assign({}, e, {
     id: "info-icon",
     ref: r,
     icon: Vi
@@ -1718,7 +1718,7 @@ const Qi = {
     }
   }]
 }, nr = Ne(function(e, r) {
-  return de(fe, Object.assign({}, e, {
+  return de(me, Object.assign({}, e, {
     id: "success-icon",
     ref: r,
     icon: Qi
@@ -1757,20 +1757,20 @@ function Gi(t) {
                   children: s.map((o, l) => /* @__PURE__ */ y(
                     "div",
                     {
-                      className: "univer-relative univer-h-6 univer-w-6",
+                      className: "univer-relative univer-size-6",
                       onClick: () => a(o),
                       children: [
                         o.color ? /* @__PURE__ */ d(
                           "button",
                           {
                             type: "button",
-                            className: Ae("univer-box-border univer-h-6 univer-w-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: 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"),
                             style: { backgroundColor: o.color }
                           }
                         ) : /* @__PURE__ */ d(
                           rr,
                           {
-                            className: "univer-h-6 univer-w-6 univer-cursor-pointer univer-rounded-full hover:univer-ring-2 hover:univer-ring-offset-2 hover:univer-ring-offset-white"
+                            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, {})
@@ -1796,13 +1796,13 @@ function Gi(t) {
                   children: n.map((o, l) => /* @__PURE__ */ y(
                     "div",
                     {
-                      className: "univer-relative univer-h-6 univer-w-6",
+                      className: "univer-relative univer-size-6",
                       onClick: () => i(o),
                       children: [
                         /* @__PURE__ */ d(
                           "div",
                           {
-                            className: "univer-box-border univer-flex univer-h-full univer-w-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)]",
+                            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 } })
                           }
                         ),
@@ -1817,7 +1817,7 @@ function Gi(t) {
             s.length <= 1 && n.length <= 1 && /* @__PURE__ */ d(
               "div",
               {
-                className: "univer-flex univer-h-full univer-w-full univer-items-center univer-justify-center univer-text-sm univer-text-gray-900 dark:!univer-text-gray-200",
+                className: "univer-flex univer-size-full univer-items-center univer-justify-center univer-text-sm univer-text-gray-900 dark:!univer-text-gray-200",
                 children: r.t("sheets-filter.panel.filter-by-color-none")
               }
             )
@@ -1831,11 +1831,11 @@ function bt() {
   return /* @__PURE__ */ d(
     "div",
     {
-      className: "univer-absolute -univer-bottom-0.5 -univer-right-0.5 univer-flex univer-h-3 univer-w-3 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-full univer-bg-white",
+      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,
         {
-          className: "univer-h-full univer-w-full univer-font-bold univer-text-[#418F1F]"
+          className: "univer-size-full univer-font-bold univer-text-[#418F1F]"
         }
       )
     }
@@ -1849,9 +1849,9 @@ function ji(t) {
     e.onPrimaryConditionChange(C);
   }, [e]), c = Zi(r), h = U((C) => {
     e.onConditionFormChange(C);
-  }, [e]), f = r.t("sheets-filter.panel.input-values-placeholder");
+  }, [e]), m = r.t("sheets-filter.panel.input-values-placeholder");
   function S(C, F, N) {
-    const R = m.getItemByOperator(C).numOfParameters === 1;
+    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") }),
@@ -1870,7 +1870,7 @@ function ji(t) {
         {
           className: "univer-mt-2",
           value: F,
-          placeholder: f,
+          placeholder: m,
           onChange: (O) => h({ [N === "operator1" ? "val1" : "val2"]: O })
         }
       ) })
@@ -1883,7 +1883,7 @@ function ji(t) {
       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 }),
-        m.getItemByOperator(s.operator).numOfParameters !== 0 ? /* @__PURE__ */ y(
+        f.getItemByOperator(s.operator).numOfParameters !== 0 ? /* @__PURE__ */ y(
           "div",
           {
             "data-u-comp": "sheets-filter-panel-conditions-container-inner",
@@ -1915,51 +1915,51 @@ function Yi(t) {
   return ut(() => [
     {
       options: [
-        { label: t.t(m.NONE.label), value: m.NONE.operator }
+        { label: t.t(f.NONE.label), value: f.NONE.operator }
       ]
     },
     {
       options: [
-        { label: t.t(m.EMPTY.label), value: m.EMPTY.operator },
-        { label: t.t(m.NOT_EMPTY.label), value: m.NOT_EMPTY.operator }
+        { label: t.t(f.EMPTY.label), value: f.EMPTY.operator },
+        { label: t.t(f.NOT_EMPTY.label), value: f.NOT_EMPTY.operator }
       ]
     },
     {
       options: [
-        { 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 }
+        { label: t.t(f.TEXT_CONTAINS.label), value: f.TEXT_CONTAINS.operator },
+        { label: t.t(f.DOES_NOT_CONTAIN.label), value: f.DOES_NOT_CONTAIN.operator },
+        { label: t.t(f.STARTS_WITH.label), value: f.STARTS_WITH.operator },
+        { label: t.t(f.ENDS_WITH.label), value: f.ENDS_WITH.operator },
+        { label: t.t(f.EQUALS.label), value: f.EQUALS.operator }
       ]
     },
     {
       options: [
-        { 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 }
+        { label: t.t(f.GREATER_THAN.label), value: f.GREATER_THAN.operator },
+        { label: t.t(f.GREATER_THAN_OR_EQUAL.label), value: f.GREATER_THAN_OR_EQUAL.operator },
+        { label: t.t(f.LESS_THAN.label), value: f.LESS_THAN.operator },
+        { label: t.t(f.LESS_THAN_OR_EQUAL.label), value: f.LESS_THAN_OR_EQUAL.operator },
+        { label: t.t(f.EQUAL.label), value: f.EQUAL.operator },
+        { label: t.t(f.NOT_EQUAL.label), value: f.NOT_EQUAL.operator },
+        { label: t.t(f.BETWEEN.label), value: f.BETWEEN.operator },
+        { label: t.t(f.NOT_BETWEEN.label), value: f.NOT_BETWEEN.operator }
       ]
     },
     {
       options: [
-        { label: t.t(m.CUSTOM.label), value: m.CUSTOM.operator }
+        { label: t.t(f.CUSTOM.label), value: f.CUSTOM.operator }
       ]
     }
   ], [e, t]);
 }
 function Zi(t) {
   const e = t.getCurrentLocale();
-  return ut(() => m.ALL_CONDITIONS.filter((r) => r.numOfParameters !== 2).map((r) => ({ label: t.t(r.label), value: r.operator })), [e, t]);
+  return ut(() => f.ALL_CONDITIONS.filter((r) => r.numOfParameters !== 2).map((r) => ({ label: t.t(r.label), value: r.operator })), [e, t]);
 }
-function Ki(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 = ze(n), o = i.checked > 0 && i.unchecked === 0, l = i.checked > 0 && i.unchecked > 0, c = e.treeMapCache, h = U(() => {
+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(() => {
     e.onCheckAllToggled(!o);
-  }, [e, o]), f = U((p) => {
+  }, [e, o]), m = U((p) => {
     e.setSearchString(p);
   }, [e]);
   function S(p) {
@@ -1980,7 +1980,7 @@ function Ki(t) {
             autoFocus: !0,
             value: s,
             placeholder: r.t("sheets-filter.panel.search-placeholder"),
-            onChange: f
+            onChange: m
           }
         ),
         /* @__PURE__ */ y(
@@ -1998,7 +1998,7 @@ function Ki(t) {
                     "div",
                     {
                       "data-u-comp": "sheets-filter-panel-values-item-inner",
-                      className: "univer-box-border univer-flex univer-h-7 univer-items-center univer-rounded-md univer-pb-0 univer-pl-5 univer-pr-0.5 univer-pt-0 univer-text-sm",
+                      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,
@@ -2088,7 +2088,7 @@ function Ki(t) {
     }
   );
 }
-function qi() {
+function Ki() {
   const t = D(Tr);
   if (!L(t.visible$, void 0, !0)) return null;
   const r = D(G), s = D(Bt), n = L(t.enabled$, void 0, !0);
@@ -2126,17 +2126,17 @@ function qi() {
     }
   );
 }
-function Xi() {
+function qi() {
   var F;
-  const t = D(X), 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 = zi(e), o = !L(t.hasCriteria$), l = U((N) => {
-    r.executeCommand(Xt.id, { filterBy: 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$) || he(!1), void 0, !1, [n]), i = Xi(e), o = !L(t.hasCriteria$), l = U((N) => {
+    r.executeCommand(qt.id, { filterBy: N });
   }, [r]), c = U(async () => {
     await (n == null ? void 0 : n.clear()), r.executeCommand(Se.id);
   }, [n, r]), h = U(() => {
     r.executeCommand(Se.id);
-  }, [r]), f = U(async () => {
+  }, [r]), m = U(async () => {
     await (n == null ? void 0 : n.apply()), r.executeCommand(Se.id);
-  }, [n, r]), p = (F = D(z).activeFilterModel) == null ? void 0 : F.getRange(), _ = t.col, C = xr(Ar.FILTER_PANEL_EMBED_POINT);
+  }, [n, r]), p = (F = D(X).activeFilterModel) == null ? void 0 : F.getRange(), _ = t.col, C = xr(Ar.FILTER_PANEL_EMBED_POINT);
   return /* @__PURE__ */ y(
     "div",
     {
@@ -2151,7 +2151,7 @@ function Xi() {
           }
         ),
         /* @__PURE__ */ d("div", { className: "univer-mb-1 univer-flex-shrink-0 univer-flex-grow-0", children: /* @__PURE__ */ d(
-          fi,
+          mi,
           {
             value: s,
             items: i,
@@ -2163,10 +2163,10 @@ function Xi() {
           {
             "data-u-comp": "sheets-filter-panel-content",
             className: "univer-flex-shrink univer-flex-grow univer-pt-2",
-            children: s === w.VALUES ? /* @__PURE__ */ d(Ki, { model: n }) : s === w.COLORS ? /* @__PURE__ */ d(Gi, { model: n }) : /* @__PURE__ */ d(ji, { model: n })
+            children: s === P.VALUES ? /* @__PURE__ */ d(zi, { model: n }) : s === P.COLORS ? /* @__PURE__ */ d(Gi, { model: n }) : /* @__PURE__ */ d(ji, { model: n })
           }
         ) : /* @__PURE__ */ d("div", { className: "univer-flex-1" }),
-        /* @__PURE__ */ d(qi, {}),
+        /* @__PURE__ */ d(Ki, {}),
         /* @__PURE__ */ y(
           "div",
           {
@@ -2176,7 +2176,7 @@ function Xi() {
               /* @__PURE__ */ d(Ze, { 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: f, children: e.t("sheets-filter.panel.confirm") })
+                /* @__PURE__ */ d(Ze, { disabled: !a, variant: "primary", onClick: m, children: e.t("sheets-filter.panel.confirm") })
               ] })
             ]
           }
@@ -2185,16 +2185,16 @@ function Xi() {
     }
   );
 }
-function zi(t) {
+function Xi(t) {
   const e = t.getCurrentLocale();
   return ut(() => [
-    { label: t.t("sheets-filter.panel.by-values"), value: w.VALUES },
-    { label: t.t("sheets-filter.panel.by-colors"), value: w.COLORS },
-    { label: t.t("sheets-filter.panel.by-conditions"), value: w.CONDITIONS }
+    { 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(z);
+  const e = t.get(X);
   return {
     id: Fe.id,
     type: lt.BUTTON_SELECTOR,
@@ -2202,9 +2202,9 @@ function Ji(t) {
     tooltip: "sheets-filter.toolbar.smart-toggle-filter-tooltip",
     hidden$: ot(t, ie.UNIVER_SHEET),
     activated$: e.activeFilterModel$.pipe(le((r) => !!r)),
-    disabled$: wr(
+    disabled$: Pr(
       t,
-      Pr(
+      wr(
         t,
         {
           worksheetTypes: [pe, ve],
@@ -2215,7 +2215,7 @@ function Ji(t) {
   };
 }
 function es(t) {
-  const e = t.get(z);
+  const e = t.get(X);
   return {
     id: nt.id,
     type: lt.BUTTON,
@@ -2228,7 +2228,7 @@ function es(t) {
   };
 }
 function ts(t) {
-  const e = t.get(z);
+  const e = t.get(X);
   return {
     id: st.id,
     type: lt.BUTTON,
@@ -2269,10 +2269,10 @@ var ss = Object.getOwnPropertyDescriptor, ns = (t, e, r, s) => {
 }, $ = (t, e) => (r, s) => e(r, s, t);
 const Rt = "FILTER_PANEL_POPUP";
 let ke = class extends Ee {
-  constructor(e, r, s, n, a, i, o, l, c, h, f, S, p) {
+  constructor(e, r, s, n, a, i, o, l, c, h, m, S, p) {
     super(p, S);
     v(this, "_popupDisposable");
-    this._injector = e, this._componentManager = r, this._sheetsFilterPanelService = s, this._sheetCanvasPopupService = n, this._sheetsFilterService = a, this._localeService = i, this._shortcutService = o, this._commandService = l, this._menuManagerService = c, this._contextService = h, this._messageService = f, this._initCommands(), this._initShortcuts(), this._initMenuItems(), this._initUI();
+    this._injector = e, this._componentManager = r, this._sheetsFilterPanelService = s, this._sheetCanvasPopupService = n, this._sheetsFilterService = a, this._localeService = i, this._shortcutService = o, this._commandService = l, this._menuManagerService = c, this._contextService = h, this._messageService = m, this._initCommands(), this._initShortcuts(), this._initMenuItems(), this._initUI();
   }
   dispose() {
     super.dispose(), this._closeFilterPopup();
@@ -2292,7 +2292,7 @@ let ke = class extends Ee {
       V,
       nt,
       st,
-      Xt,
+      qt,
       Me,
       Se
     ].forEach((e) => {
@@ -2304,7 +2304,7 @@ let ke = class extends Ee {
   }
   _initUI() {
     [
-      [Rt, Xi],
+      [Rt, qi],
       ["FilterIcon", ir]
     ].forEach(([e, r]) => {
       this.disposeWithMe(
@@ -2339,9 +2339,9 @@ let ke = class extends Ee {
 ke = ns([
   $(0, T(re)),
   $(1, T(Dr)),
-  $(2, T(X)),
+  $(2, T(q)),
   $(3, T(Lr)),
-  $(4, T(z)),
+  $(4, T(X)),
   $(5, T(G)),
   $(6, Br),
   $(7, j),
@@ -2355,7 +2355,7 @@ var os = Object.defineProperty, ls = Object.getOwnPropertyDescriptor, as = (t, e
   for (var n = s > 1 ? void 0 : s ? ls(e, r) : e, a = t.length - 1, i; a >= 0; a--)
     (i = t[a]) && (n = i(n) || n);
   return n;
-}, Xe = (t, e) => (r, s) => e(r, s, t), or = (t, e, r) => as(t, typeof e != "symbol" ? e + "" : e, r);
+}, 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) {
@@ -2365,14 +2365,14 @@ let He = class extends it {
       xe,
       this._config
     );
-    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig(zt, a);
+    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig(Xt, a);
   }
   onStarting() {
     pr(this._injector, [
-      [X],
+      [q],
       [ce],
       [ke]
-    ]), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([we, {
+    ]), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([Pe, {
       useFactory: () => oi(
         this._rpcChannelService.requestChannel(ht)
       )
@@ -2393,40 +2393,40 @@ or(He, "type", ie.UNIVER_SHEET);
 or(He, "pluginName", us);
 He = cs([
   xt(Ht),
-  Xe(1, T(re)),
-  Xe(2, Ut),
-  Xe(3, mr(Gt))
+  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--)
     (i = t[a]) && (n = i(n) || n);
   return n;
 }, At = (t, e) => (r, s) => e(r, s, t), Oe;
-let wt = (Oe = class extends it {
+let Pt = (Oe = class extends it {
   constructor(t, e, r) {
     super(), this._config = t, this._injector = e, this._rpcChannelService = r;
   }
   onStarting() {
     [
-      [we, { useClass: Je }]
+      [Pe, { useClass: Je }]
     ].forEach((t) => this._injector.add(t));
   }
   onReady() {
     this._rpcChannelService.registerChannel(
       ht,
-      li(this._injector.get(we))
+      li(this._injector.get(Pe))
     );
   }
 }, v(Oe, "type", ie.UNIVER_SHEET), v(Oe, "pluginName", "SHEET_FILTER_UI_WORKER_PLUGIN"), Oe);
-wt = ds([
+Pt = ds([
   At(1, T(re)),
   At(2, Gt)
-], wt);
+], Pt);
 export {
-  Xt as ChangeFilterByOperation,
+  qt as ChangeFilterByOperation,
   Se as CloseFilterPanelOperation,
   Me as OpenFilterPanelOperation,
   Ue as UniverSheetsFilterMobileUIPlugin,
   He as UniverSheetsFilterUIPlugin,
-  wt as UniverSheetsFilterUIWorkerPlugin
+  Pt as UniverSheetsFilterUIWorkerPlugin
 };