@univerjs/sheets-filter-ui 0.5.4 → 0.5.5-experimental.20250122-3362a4a

package/lib/es/index.js

@@ -1,688 +1,701 @@
-var Kt = Object.defineProperty;
-var Xt = (t, e, r) => e in t ? Kt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
-var _ = (t, e, r) => Xt(t, typeof e != "symbol" ? e + "" : e, r);
-import { BooleanNumber as nt, createIdentifier as gt, Inject as E, LocaleService as K, Disposable as pe, IUniverInstanceService as Ye, ILogService as Zt, extractPureTextFromCell as Jt, numfmt as it, Injector as X, ICommandService as W, Quantity as vt, Tools as Fe, CommandType as $e, IContextService as we, useDependency as te, UniverInstanceType as Z, ThemeService as Et, RxDisposable as Tt, fromCallback as zt, InterceptorEffectEnum as er, DependentOn as Ft, Optional as tr, Plugin as qe, merge as Ct, IConfigService as Nt } from "@univerjs/core";
-import { IRPCChannelService as Pt, toModule as rr, fromModule as sr } from "@univerjs/rpc";
-import { CustomFilterOperator as u, SetSheetsFilterCriteriaCommand as re, SheetsFilterService as k, SmartToggleSheetsFilterCommand as me, ClearSheetsFilterCriteriaCommand as Ke, ReCalcSheetsFilterCommand as Xe, FILTER_MUTATIONS as nr, SetSheetsFilterRangeMutation as ir, SetSheetsFilterCriteriaMutation as or, RemoveSheetsFilterMutation as ar, ReCalcSheetsFilterMutation as lr, RemoveSheetFilterCommand as cr, SetSheetFilterRangeCommand as ur, UniverSheetsFilterPlugin as Ot } from "@univerjs/sheets-filter";
-import { RefRangeService as hr, SheetPermissionCheckController as dr, SheetsSelectionsService as fr, getSheetCommandTarget as pr, RangeProtectionPermissionViewPoint as le, WorksheetFilterPermission as ce, WorksheetViewPermission as ue, expandToContinuousRange as mr, SheetInterceptorService as _r, SetRangeValuesMutation as Sr, INTERCEPTOR_POINT as gr } from "@univerjs/sheets";
-import { ILayoutService as vr, useObservable as V, useComponentsOfPart as Er, ComponentContainer as Tr, MenuItemType as Ze, getMenuHiddenObservable as Je, RibbonStartGroup as Fr, KeyCode as Cr, MetaKeys as ot, ComponentManager as Nr, IShortcutService as Pr, IMenuManagerService as Or, IMessageService as Rr } from "@univerjs/ui";
-import { SetCellEditVisibleOperation as Ir, SheetsUIPart as yr, getObservableWithExclusiveRange$ as Ar, getCurrentRangeDisable$ as br, whenSheetEditorFocused as Lr, SheetSkeletonManagerService as Mr, ISheetSelectionRenderService as $r, SelectionControl as wr, attachSelectionWithCoord as Ur, getCoordByCell as Hr, SheetsRenderService as Rt, SheetCanvasPopManagerService as Dr } from "@univerjs/sheets-ui";
-import { BehaviorSubject as q, ReplaySubject as xr, of as _e, Subject as Br, merge as Vr, combineLatest as jr, throttleTime as It, startWith as yt, map as se, shareReplay as Wr, switchMap as ze, filter as kr, takeUntil as Qr, distinctUntilChanged as Gr } from "rxjs";
-import { Select as at, RadioGroup as Yr, Radio as lt, Input as At, Checkbox as qr, Tree as Kr, Button as Ce, Segmented as Xr, MessageType as Zr } from "@univerjs/design";
-import { Rect as ct, Shape as Jr, IRenderManagerService as bt } from "@univerjs/engine-render";
-import zr, { forwardRef as Lt, useRef as es, createElement as Mt, useCallback as D, useMemo as et } from "react";
-const $t = "sheets-filter-ui.config", Ne = {};
-var N = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SECOND", t))(N || {}), S = /* @__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))(S || {}), f;
-((t) => {
-  t.NONE = {
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
+import { BooleanNumber, createIdentifier, Inject, LocaleService, Disposable, IUniverInstanceService, ILogService, extractPureTextFromCell, numfmt, Injector, ICommandService, Quantity, Tools, CommandType, IContextService, useDependency, UniverInstanceType, ThemeService, RxDisposable, fromCallback, InterceptorEffectEnum, DependentOn, Optional, Plugin, merge as merge$1, IConfigService } from "@univerjs/core";
+import { IRPCChannelService, toModule, fromModule } from "@univerjs/rpc";
+import { CustomFilterOperator, SetSheetsFilterCriteriaCommand, SheetsFilterService, SmartToggleSheetsFilterCommand, ClearSheetsFilterCriteriaCommand, ReCalcSheetsFilterCommand, FILTER_MUTATIONS, SetSheetsFilterRangeMutation, SetSheetsFilterCriteriaMutation, RemoveSheetsFilterMutation, ReCalcSheetsFilterMutation, RemoveSheetFilterCommand, SetSheetFilterRangeCommand, UniverSheetsFilterPlugin } from "@univerjs/sheets-filter";
+import { RefRangeService, SheetPermissionCheckController, SheetsSelectionsService, getSheetCommandTarget, RangeProtectionPermissionViewPoint, WorksheetFilterPermission, WorksheetViewPermission, expandToContinuousRange, SheetInterceptorService, SetRangeValuesMutation, INTERCEPTOR_POINT } from "@univerjs/sheets";
+import { ILayoutService, useObservable, useComponentsOfPart, ComponentContainer, MenuItemType, getMenuHiddenObservable, RibbonStartGroup, KeyCode, MetaKeys, ComponentManager, IShortcutService, IMenuManagerService, IMessageService } from "@univerjs/ui";
+import { SetCellEditVisibleOperation, SheetsUIPart, getObservableWithExclusiveRange$, getCurrentRangeDisable$, SheetSkeletonManagerService, ISheetSelectionRenderService, SelectionControl, attachSelectionWithCoord, getCoordByCell, SheetsRenderService, whenSheetEditorFocused, SheetCanvasPopManagerService } from "@univerjs/sheets-ui";
+import { BehaviorSubject, ReplaySubject, of, Subject, merge, combineLatest, throttleTime, startWith, map, shareReplay, switchMap, filter, takeUntil, distinctUntilChanged } from "rxjs";
+import { Select, RadioGroup, Radio, Input, Checkbox, Tree, Button, Segmented, MessageType } from "@univerjs/design";
+import { Rect, Shape, IRenderManagerService } from "@univerjs/engine-render";
+import { jsx, jsxs, Fragment } from "react/jsx-runtime";
+import { forwardRef, useRef, createElement, useCallback, useMemo } from "react";
+const SHEETS_FILTER_UI_PLUGIN_CONFIG_KEY = "sheets-filter-ui.config", defaultPluginConfig = {};
+var OperatorOrder = /* @__PURE__ */ ((OperatorOrder2) => (OperatorOrder2[OperatorOrder2.FIRST = 0] = "FIRST", OperatorOrder2[OperatorOrder2.SECOND = 1] = "SECOND", OperatorOrder2))(OperatorOrder || {}), ExtendCustomFilterOperator = /* @__PURE__ */ ((ExtendCustomFilterOperator2) => (ExtendCustomFilterOperator2.NONE = "none", ExtendCustomFilterOperator2.STARTS_WITH = "startsWith", ExtendCustomFilterOperator2.DOES_NOT_START_WITH = "doesNotStartWith", ExtendCustomFilterOperator2.ENDS_WITH = "endsWith", ExtendCustomFilterOperator2.DOES_NOT_END_WITH = "doesNotEndWith", ExtendCustomFilterOperator2.CONTAINS = "contains", ExtendCustomFilterOperator2.DOES_NOT_CONTAIN = "doesNotContain", ExtendCustomFilterOperator2.EQUALS = "equals", ExtendCustomFilterOperator2.NOT_EQUALS = "notEquals", ExtendCustomFilterOperator2.EMPTY = "empty", ExtendCustomFilterOperator2.NOT_EMPTY = "notEmpty", ExtendCustomFilterOperator2.BETWEEN = "between", ExtendCustomFilterOperator2.NOT_BETWEEN = "notBetween", ExtendCustomFilterOperator2.CUSTOM = "custom", ExtendCustomFilterOperator2))(ExtendCustomFilterOperator || {}), FilterConditionItems;
+((FilterConditionItems2) => {
+  FilterConditionItems2.NONE = {
     label: "sheets-filter.conditions.none",
-    operator: S.NONE,
-    order: N.SECOND,
+    operator: ExtendCustomFilterOperator.NONE,
+    order: OperatorOrder.SECOND,
     numOfParameters: 0,
-    getDefaultFormParams: () => {
+    getDefaultFormParams: /* @__PURE__ */ __name(() => {
       throw new Error("[FilterConditionItems.NONE]: should not have initial form params!");
-    },
-    testMappingParams: (s) => s.operator1 === S.NONE,
-    mapToFilterColumn: () => null,
-    testMappingFilterColumn: (s) => !s.customFilters && !s.filters ? {} : !1
-  }, t.EMPTY = {
+    }, "getDefaultFormParams"),
+    testMappingParams: /* @__PURE__ */ __name((params) => params.operator1 === ExtendCustomFilterOperator.NONE, "testMappingParams"),
+    mapToFilterColumn: /* @__PURE__ */ __name(() => null, "mapToFilterColumn"),
+    testMappingFilterColumn: /* @__PURE__ */ __name((filterColumn) => !filterColumn.customFilters && !filterColumn.filters ? {} : !1, "testMappingFilterColumn")
+  }, FilterConditionItems2.EMPTY = {
     label: "sheets-filter.conditions.empty",
-    operator: S.EMPTY,
-    order: N.SECOND,
+    operator: ExtendCustomFilterOperator.EMPTY,
+    order: OperatorOrder.SECOND,
     numOfParameters: 0,
-    getDefaultFormParams: () => {
+    getDefaultFormParams: /* @__PURE__ */ __name(() => {
       throw new Error("[FilterConditionItems.EMPTY]: should not have initial form params!");
-    },
-    testMappingParams: ({ operator1: s }) => s === S.EMPTY,
-    mapToFilterColumn: () => ({ customFilters: { customFilters: [{ val: "" }] } }),
-    testMappingFilterColumn: (s) => {
-      var c;
-      if (((c = s.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
+    }, "getDefaultFormParams"),
+    testMappingParams: /* @__PURE__ */ __name(({ operator1 }) => operator1 === ExtendCustomFilterOperator.EMPTY, "testMappingParams"),
+    mapToFilterColumn: /* @__PURE__ */ __name(() => ({ customFilters: { customFilters: [{ val: "" }] } }), "mapToFilterColumn"),
+    testMappingFilterColumn: /* @__PURE__ */ __name((filterColumn) => {
+      var _a13;
+      if (((_a13 = filterColumn.customFilters) == null ? void 0 : _a13.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0];
-      return o.val === "" && o.operator === void 0 ? { operator1: S.EMPTY } : !1;
-    }
-  }, t.NOT_EMPTY = {
+      const firstCustomFilter = filterColumn.customFilters.customFilters[0];
+      return firstCustomFilter.val === "" && firstCustomFilter.operator === void 0 ? { operator1: ExtendCustomFilterOperator.EMPTY } : !1;
+    }, "testMappingFilterColumn")
+  }, FilterConditionItems2.NOT_EMPTY = {
     label: "sheets-filter.conditions.not-empty",
-    operator: S.NOT_EMPTY,
-    order: N.SECOND,
+    operator: ExtendCustomFilterOperator.NOT_EMPTY,
+    order: OperatorOrder.SECOND,
     numOfParameters: 0,
-    getDefaultFormParams: () => {
+    getDefaultFormParams: /* @__PURE__ */ __name(() => {
       throw new Error("[FilterConditionItems.NOT_EMPTY]: should not have initial form params!");
-    },
-    testMappingParams: ({ operator1: s }) => s === S.NOT_EMPTY,
-    mapToFilterColumn: () => ({ customFilters: { customFilters: [{ val: "", operator: u.NOT_EQUALS }] } }),
-    testMappingFilterColumn: (s) => {
-      var c;
-      if (((c = s.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
+    }, "getDefaultFormParams"),
+    testMappingParams: /* @__PURE__ */ __name(({ operator1 }) => operator1 === ExtendCustomFilterOperator.NOT_EMPTY, "testMappingParams"),
+    mapToFilterColumn: /* @__PURE__ */ __name(() => ({ customFilters: { customFilters: [{ val: "", operator: CustomFilterOperator.NOT_EQUALS }] } }), "mapToFilterColumn"),
+    testMappingFilterColumn: /* @__PURE__ */ __name((filterColumn) => {
+      var _a13;
+      if (((_a13 = filterColumn.customFilters) == null ? void 0 : _a13.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0];
-      return o.val === " " && o.operator === u.NOT_EQUALS ? { operator1: S.NOT_EMPTY } : !1;
-    }
-  }, t.TEXT_CONTAINS = {
+      const firstCustomFilter = filterColumn.customFilters.customFilters[0];
+      return firstCustomFilter.val === " " && firstCustomFilter.operator === CustomFilterOperator.NOT_EQUALS ? { operator1: ExtendCustomFilterOperator.NOT_EMPTY } : !1;
+    }, "testMappingFilterColumn")
+  }, FilterConditionItems2.TEXT_CONTAINS = {
     label: "sheets-filter.conditions.text-contains",
-    operator: S.CONTAINS,
-    order: N.FIRST,
+    operator: ExtendCustomFilterOperator.CONTAINS,
+    order: OperatorOrder.FIRST,
     numOfParameters: 1,
-    getDefaultFormParams: () => ({ operator1: S.CONTAINS, val1: "" }),
-    testMappingParams: (s) => {
-      const [o] = L(s);
-      return o === S.CONTAINS;
-    },
-    mapToFilterColumn: (s) => {
-      const { val1: o } = s;
-      return o === "" ? null : {
-        customFilters: { customFilters: [{ val: `*${o}*` }] }
+    getDefaultFormParams: /* @__PURE__ */ __name(() => ({ operator1: ExtendCustomFilterOperator.CONTAINS, val1: "" }), "getDefaultFormParams"),
+    testMappingParams: /* @__PURE__ */ __name((params) => {
+      const [op] = getOnlyOperatorAndVal(params);
+      return op === ExtendCustomFilterOperator.CONTAINS;
+    }, "testMappingParams"),
+    mapToFilterColumn: /* @__PURE__ */ __name((mapParams) => {
+      const { val1 } = mapParams;
+      return val1 === "" ? null : {
+        customFilters: { customFilters: [{ val: `*${val1}*` }] }
       };
-    },
-    testMappingFilterColumn: (s) => {
-      var c;
-      if (((c = s.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
+    }, "mapToFilterColumn"),
+    testMappingFilterColumn: /* @__PURE__ */ __name((filterColumn) => {
+      var _a13;
+      if (((_a13 = filterColumn.customFilters) == null ? void 0 : _a13.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0], a = o.val.toString();
-      return !o.operator && a.startsWith("*") && a.endsWith("*") ? { operator1: S.CONTAINS, val1: a.slice(1, -1) } : !1;
-    }
-  }, t.DOES_NOT_CONTAIN = {
+      const firstCustomFilter = filterColumn.customFilters.customFilters[0], valAsString = firstCustomFilter.val.toString();
+      return !firstCustomFilter.operator && valAsString.startsWith("*") && valAsString.endsWith("*") ? { operator1: ExtendCustomFilterOperator.CONTAINS, val1: valAsString.slice(1, -1) } : !1;
+    }, "testMappingFilterColumn")
+  }, FilterConditionItems2.DOES_NOT_CONTAIN = {
     label: "sheets-filter.conditions.does-not-contain",
-    operator: S.DOES_NOT_CONTAIN,
-    order: N.FIRST,
+    operator: ExtendCustomFilterOperator.DOES_NOT_CONTAIN,
+    order: OperatorOrder.FIRST,
     numOfParameters: 1,
-    getDefaultFormParams: () => ({ operator1: S.DOES_NOT_CONTAIN, val1: "" }),
-    mapToFilterColumn: (s) => ({
-      customFilters: { customFilters: [{ val: `*${s.val1}*`, operator: u.NOT_EQUALS }] }
-    }),
-    testMappingParams: (s) => {
-      const [o] = L(s);
-      return o === S.DOES_NOT_CONTAIN;
-    },
-    testMappingFilterColumn: (s) => {
-      var c;
-      if (((c = s.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
+    getDefaultFormParams: /* @__PURE__ */ __name(() => ({ operator1: ExtendCustomFilterOperator.DOES_NOT_CONTAIN, val1: "" }), "getDefaultFormParams"),
+    mapToFilterColumn: /* @__PURE__ */ __name((mapParams) => ({
+      customFilters: { customFilters: [{ val: `*${mapParams.val1}*`, operator: CustomFilterOperator.NOT_EQUALS }] }
+    }), "mapToFilterColumn"),
+    testMappingParams: /* @__PURE__ */ __name((params) => {
+      const [op] = getOnlyOperatorAndVal(params);
+      return op === ExtendCustomFilterOperator.DOES_NOT_CONTAIN;
+    }, "testMappingParams"),
+    testMappingFilterColumn: /* @__PURE__ */ __name((filterColumn) => {
+      var _a13;
+      if (((_a13 = filterColumn.customFilters) == null ? void 0 : _a13.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0], a = o.val.toString();
-      return o.operator === u.NOT_EQUALS && a.startsWith("*") && a.endsWith("*") ? { operator1: S.DOES_NOT_CONTAIN, val1: a.slice(1, -1) } : !1;
-    }
-  }, t.STARTS_WITH = {
+      const firstCustomFilter = filterColumn.customFilters.customFilters[0], valAsString = firstCustomFilter.val.toString();
+      return firstCustomFilter.operator === CustomFilterOperator.NOT_EQUALS && valAsString.startsWith("*") && valAsString.endsWith("*") ? { operator1: ExtendCustomFilterOperator.DOES_NOT_CONTAIN, val1: valAsString.slice(1, -1) } : !1;
+    }, "testMappingFilterColumn")
+  }, FilterConditionItems2.STARTS_WITH = {
     label: "sheets-filter.conditions.starts-with",
-    operator: S.STARTS_WITH,
-    order: N.FIRST,
+    operator: ExtendCustomFilterOperator.STARTS_WITH,
+    order: OperatorOrder.FIRST,
     numOfParameters: 1,
-    getDefaultFormParams: () => ({ operator1: S.STARTS_WITH, val1: "" }),
-    mapToFilterColumn: (s) => ({
-      customFilters: { customFilters: [{ val: `${s.val1}*` }] }
-    }),
-    testMappingParams: (s) => {
-      const [o] = L(s);
-      return o === S.STARTS_WITH;
-    },
-    testMappingFilterColumn: (s) => {
-      var c;
-      if (((c = s.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
+    getDefaultFormParams: /* @__PURE__ */ __name(() => ({ operator1: ExtendCustomFilterOperator.STARTS_WITH, val1: "" }), "getDefaultFormParams"),
+    mapToFilterColumn: /* @__PURE__ */ __name((mapParams) => ({
+      customFilters: { customFilters: [{ val: `${mapParams.val1}*` }] }
+    }), "mapToFilterColumn"),
+    testMappingParams: /* @__PURE__ */ __name((params) => {
+      const [op] = getOnlyOperatorAndVal(params);
+      return op === ExtendCustomFilterOperator.STARTS_WITH;
+    }, "testMappingParams"),
+    testMappingFilterColumn: /* @__PURE__ */ __name((filterColumn) => {
+      var _a13;
+      if (((_a13 = filterColumn.customFilters) == null ? void 0 : _a13.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0], a = o.val.toString();
-      return !o.operator && a.endsWith("*") && !a.startsWith("*") ? { operator1: S.STARTS_WITH, val1: a.slice(0, -1) } : !1;
-    }
-  }, t.ENDS_WITH = {
+      const firstCustomFilter = filterColumn.customFilters.customFilters[0], valAsString = firstCustomFilter.val.toString();
+      return !firstCustomFilter.operator && valAsString.endsWith("*") && !valAsString.startsWith("*") ? { operator1: ExtendCustomFilterOperator.STARTS_WITH, val1: valAsString.slice(0, -1) } : !1;
+    }, "testMappingFilterColumn")
+  }, FilterConditionItems2.ENDS_WITH = {
     label: "sheets-filter.conditions.ends-with",
-    operator: S.ENDS_WITH,
-    order: N.FIRST,
+    operator: ExtendCustomFilterOperator.ENDS_WITH,
+    order: OperatorOrder.FIRST,
     numOfParameters: 1,
-    getDefaultFormParams: () => ({ operator1: S.ENDS_WITH, val1: "" }),
-    mapToFilterColumn: (s) => ({
-      customFilters: { customFilters: [{ val: `*${s.val1}` }] }
-    }),
-    testMappingParams: (s) => {
-      const [o] = L(s);
-      return o === S.ENDS_WITH;
-    },
-    testMappingFilterColumn: (s) => {
-      var c;
-      if (((c = s.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
+    getDefaultFormParams: /* @__PURE__ */ __name(() => ({ operator1: ExtendCustomFilterOperator.ENDS_WITH, val1: "" }), "getDefaultFormParams"),
+    mapToFilterColumn: /* @__PURE__ */ __name((mapParams) => ({
+      customFilters: { customFilters: [{ val: `*${mapParams.val1}` }] }
+    }), "mapToFilterColumn"),
+    testMappingParams: /* @__PURE__ */ __name((params) => {
+      const [op] = getOnlyOperatorAndVal(params);
+      return op === ExtendCustomFilterOperator.ENDS_WITH;
+    }, "testMappingParams"),
+    testMappingFilterColumn: /* @__PURE__ */ __name((filterColumn) => {
+      var _a13;
+      if (((_a13 = filterColumn.customFilters) == null ? void 0 : _a13.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0], a = o.val.toString();
-      return !o.operator && a.startsWith("*") && !a.endsWith("*") ? { operator1: S.ENDS_WITH, val1: a.slice(1) } : !1;
-    }
-  }, t.EQUALS = {
+      const firstCustomFilter = filterColumn.customFilters.customFilters[0], valAsString = firstCustomFilter.val.toString();
+      return !firstCustomFilter.operator && valAsString.startsWith("*") && !valAsString.endsWith("*") ? { operator1: ExtendCustomFilterOperator.ENDS_WITH, val1: valAsString.slice(1) } : !1;
+    }, "testMappingFilterColumn")
+  }, FilterConditionItems2.EQUALS = {
     label: "sheets-filter.conditions.equals",
-    operator: S.EQUALS,
-    order: N.FIRST,
+    operator: ExtendCustomFilterOperator.EQUALS,
+    order: OperatorOrder.FIRST,
     numOfParameters: 1,
-    getDefaultFormParams: () => ({ operator1: S.EQUALS, val1: "" }),
-    testMappingParams: (s) => {
-      const [o] = L(s);
-      return o === S.EQUALS;
-    },
-    mapToFilterColumn: (s) => {
-      const { val1: o } = s;
-      return o === "" ? null : {
-        customFilters: { customFilters: [{ val: o }] }
+    getDefaultFormParams: /* @__PURE__ */ __name(() => ({ operator1: ExtendCustomFilterOperator.EQUALS, val1: "" }), "getDefaultFormParams"),
+    testMappingParams: /* @__PURE__ */ __name((params) => {
+      const [op] = getOnlyOperatorAndVal(params);
+      return op === ExtendCustomFilterOperator.EQUALS;
+    }, "testMappingParams"),
+    mapToFilterColumn: /* @__PURE__ */ __name((mapParams) => {
+      const { val1 } = mapParams;
+      return val1 === "" ? null : {
+        customFilters: { customFilters: [{ val: val1 }] }
       };
-    },
-    testMappingFilterColumn: (s) => {
-      var o, a, c;
-      return ((a = (o = s.filters) == null ? void 0 : o.filters) == null ? void 0 : a.length) === 1 ? { operator1: S.EQUALS, val1: "" } : ((c = s.customFilters) == null ? void 0 : c.customFilters.length) === 1 && !s.customFilters.customFilters[0].operator ? { operator1: S.EQUALS, val1: s.customFilters.customFilters[0].val.toString() } : !1;
-    }
-  }, t.GREATER_THAN = {
+    }, "mapToFilterColumn"),
+    testMappingFilterColumn: /* @__PURE__ */ __name((filterColumn) => {
+      var _a13, _b, _c;
+      return ((_b = (_a13 = filterColumn.filters) == null ? void 0 : _a13.filters) == null ? void 0 : _b.length) === 1 ? { operator1: ExtendCustomFilterOperator.EQUALS, val1: "" } : ((_c = filterColumn.customFilters) == null ? void 0 : _c.customFilters.length) === 1 && !filterColumn.customFilters.customFilters[0].operator ? { operator1: ExtendCustomFilterOperator.EQUALS, val1: filterColumn.customFilters.customFilters[0].val.toString() } : !1;
+    }, "testMappingFilterColumn")
+  }, FilterConditionItems2.GREATER_THAN = {
     label: "sheets-filter.conditions.greater-than",
-    operator: u.GREATER_THAN,
+    operator: CustomFilterOperator.GREATER_THAN,
     numOfParameters: 1,
-    order: N.FIRST,
-    getDefaultFormParams: () => ({ operator1: u.GREATER_THAN, val1: "" }),
-    mapToFilterColumn: (s) => ({
-      customFilters: { customFilters: [{ val: s.val1, operator: u.GREATER_THAN }] }
-    }),
-    testMappingParams: (s) => {
-      const [o] = L(s);
-      return o === u.GREATER_THAN;
-    },
-    testMappingFilterColumn: (s) => {
-      var a;
-      if (((a = s.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
+    order: OperatorOrder.FIRST,
+    getDefaultFormParams: /* @__PURE__ */ __name(() => ({ operator1: CustomFilterOperator.GREATER_THAN, val1: "" }), "getDefaultFormParams"),
+    mapToFilterColumn: /* @__PURE__ */ __name((mapParams) => ({
+      customFilters: { customFilters: [{ val: mapParams.val1, operator: CustomFilterOperator.GREATER_THAN }] }
+    }), "mapToFilterColumn"),
+    testMappingParams: /* @__PURE__ */ __name((params) => {
+      const [op] = getOnlyOperatorAndVal(params);
+      return op === CustomFilterOperator.GREATER_THAN;
+    }, "testMappingParams"),
+    testMappingFilterColumn: /* @__PURE__ */ __name((filterColumn) => {
+      var _a13;
+      if (((_a13 = filterColumn.customFilters) == null ? void 0 : _a13.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0];
-      return o.operator !== u.GREATER_THAN ? !1 : { operator1: u.GREATER_THAN, val1: o.val.toString() };
-    }
-  }, t.GREATER_THAN_OR_EQUAL = {
+      const firstCustomFilter = filterColumn.customFilters.customFilters[0];
+      return firstCustomFilter.operator !== CustomFilterOperator.GREATER_THAN ? !1 : { operator1: CustomFilterOperator.GREATER_THAN, val1: firstCustomFilter.val.toString() };
+    }, "testMappingFilterColumn")
+  }, FilterConditionItems2.GREATER_THAN_OR_EQUAL = {
     label: "sheets-filter.conditions.greater-than-or-equal",
-    operator: u.GREATER_THAN_OR_EQUAL,
+    operator: CustomFilterOperator.GREATER_THAN_OR_EQUAL,
     numOfParameters: 1,
-    order: N.FIRST,
-    getDefaultFormParams: () => ({ operator1: u.GREATER_THAN_OR_EQUAL, val1: "" }),
-    testMappingParams: (s) => {
-      const [o] = L(s);
-      return o === u.GREATER_THAN_OR_EQUAL;
-    },
-    mapToFilterColumn: (s) => ({
-      customFilters: { customFilters: [{ val: s.val1, operator: u.GREATER_THAN_OR_EQUAL }] }
-    }),
-    testMappingFilterColumn: (s) => {
-      var a;
-      if (((a = s.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
+    order: OperatorOrder.FIRST,
+    getDefaultFormParams: /* @__PURE__ */ __name(() => ({ operator1: CustomFilterOperator.GREATER_THAN_OR_EQUAL, val1: "" }), "getDefaultFormParams"),
+    testMappingParams: /* @__PURE__ */ __name((params) => {
+      const [op] = getOnlyOperatorAndVal(params);
+      return op === CustomFilterOperator.GREATER_THAN_OR_EQUAL;
+    }, "testMappingParams"),
+    mapToFilterColumn: /* @__PURE__ */ __name((mapParams) => ({
+      customFilters: { customFilters: [{ val: mapParams.val1, operator: CustomFilterOperator.GREATER_THAN_OR_EQUAL }] }
+    }), "mapToFilterColumn"),
+    testMappingFilterColumn: /* @__PURE__ */ __name((filterColumn) => {
+      var _a13;
+      if (((_a13 = filterColumn.customFilters) == null ? void 0 : _a13.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0];
-      return o.operator !== u.GREATER_THAN_OR_EQUAL ? !1 : { operator1: u.GREATER_THAN_OR_EQUAL, val1: o.val.toString() };
-    }
-  }, t.LESS_THAN = {
+      const firstCustomFilter = filterColumn.customFilters.customFilters[0];
+      return firstCustomFilter.operator !== CustomFilterOperator.GREATER_THAN_OR_EQUAL ? !1 : { operator1: CustomFilterOperator.GREATER_THAN_OR_EQUAL, val1: firstCustomFilter.val.toString() };
+    }, "testMappingFilterColumn")
+  }, FilterConditionItems2.LESS_THAN = {
     label: "sheets-filter.conditions.less-than",
-    operator: u.LESS_THAN,
+    operator: CustomFilterOperator.LESS_THAN,
     numOfParameters: 1,
-    order: N.FIRST,
-    getDefaultFormParams: () => ({ operator1: u.LESS_THAN, val1: "" }),
-    testMappingParams: (s) => {
-      const [o] = L(s);
-      return o === u.LESS_THAN;
-    },
-    mapToFilterColumn: (s) => ({
-      customFilters: { customFilters: [{ val: s.val1, operator: u.LESS_THAN }] }
-    }),
-    testMappingFilterColumn: (s) => {
-      var a;
-      if (((a = s.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
+    order: OperatorOrder.FIRST,
+    getDefaultFormParams: /* @__PURE__ */ __name(() => ({ operator1: CustomFilterOperator.LESS_THAN, val1: "" }), "getDefaultFormParams"),
+    testMappingParams: /* @__PURE__ */ __name((params) => {
+      const [op] = getOnlyOperatorAndVal(params);
+      return op === CustomFilterOperator.LESS_THAN;
+    }, "testMappingParams"),
+    mapToFilterColumn: /* @__PURE__ */ __name((mapParams) => ({
+      customFilters: { customFilters: [{ val: mapParams.val1, operator: CustomFilterOperator.LESS_THAN }] }
+    }), "mapToFilterColumn"),
+    testMappingFilterColumn: /* @__PURE__ */ __name((filterColumn) => {
+      var _a13;
+      if (((_a13 = filterColumn.customFilters) == null ? void 0 : _a13.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0];
-      return o.operator !== u.LESS_THAN ? !1 : { operator1: u.LESS_THAN, val1: o.val.toString() };
-    }
-  }, t.LESS_THAN_OR_EQUAL = {
+      const firstCustomFilter = filterColumn.customFilters.customFilters[0];
+      return firstCustomFilter.operator !== CustomFilterOperator.LESS_THAN ? !1 : { operator1: CustomFilterOperator.LESS_THAN, val1: firstCustomFilter.val.toString() };
+    }, "testMappingFilterColumn")
+  }, FilterConditionItems2.LESS_THAN_OR_EQUAL = {
     label: "sheets-filter.conditions.less-than-or-equal",
-    operator: u.LESS_THAN_OR_EQUAL,
+    operator: CustomFilterOperator.LESS_THAN_OR_EQUAL,
     numOfParameters: 1,
-    order: N.FIRST,
-    getDefaultFormParams: () => ({ operator1: u.LESS_THAN_OR_EQUAL, val1: "" }),
-    testMappingParams: (s) => {
-      const [o] = L(s);
-      return o === u.LESS_THAN_OR_EQUAL;
-    },
-    mapToFilterColumn: (s) => ({
-      customFilters: { customFilters: [{ val: s.val1, operator: u.LESS_THAN_OR_EQUAL }] }
-    }),
-    testMappingFilterColumn: (s) => {
-      var a;
-      if (((a = s.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
+    order: OperatorOrder.FIRST,
+    getDefaultFormParams: /* @__PURE__ */ __name(() => ({ operator1: CustomFilterOperator.LESS_THAN_OR_EQUAL, val1: "" }), "getDefaultFormParams"),
+    testMappingParams: /* @__PURE__ */ __name((params) => {
+      const [op] = getOnlyOperatorAndVal(params);
+      return op === CustomFilterOperator.LESS_THAN_OR_EQUAL;
+    }, "testMappingParams"),
+    mapToFilterColumn: /* @__PURE__ */ __name((mapParams) => ({
+      customFilters: { customFilters: [{ val: mapParams.val1, operator: CustomFilterOperator.LESS_THAN_OR_EQUAL }] }
+    }), "mapToFilterColumn"),
+    testMappingFilterColumn: /* @__PURE__ */ __name((filterColumn) => {
+      var _a13;
+      if (((_a13 = filterColumn.customFilters) == null ? void 0 : _a13.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0];
-      return o.operator !== u.LESS_THAN_OR_EQUAL ? !1 : { operator1: u.LESS_THAN_OR_EQUAL, val1: o.val.toString() };
-    }
-  }, t.EQUAL = {
+      const firstCustomFilter = filterColumn.customFilters.customFilters[0];
+      return firstCustomFilter.operator !== CustomFilterOperator.LESS_THAN_OR_EQUAL ? !1 : { operator1: CustomFilterOperator.LESS_THAN_OR_EQUAL, val1: firstCustomFilter.val.toString() };
+    }, "testMappingFilterColumn")
+  }, FilterConditionItems2.EQUAL = {
     label: "sheets-filter.conditions.equal",
-    operator: u.EQUAL,
+    operator: CustomFilterOperator.EQUAL,
     numOfParameters: 1,
-    order: N.FIRST,
-    getDefaultFormParams: () => ({ operator1: u.EQUAL, val1: "" }),
-    testMappingParams: (s) => {
-      const [o] = L(s);
-      return o === u.EQUAL;
-    },
-    mapToFilterColumn: (s) => ({
-      customFilters: { customFilters: [{ val: s.val1, operator: u.EQUAL }] }
-    }),
-    testMappingFilterColumn: (s) => {
-      var a;
-      if (((a = s.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
+    order: OperatorOrder.FIRST,
+    getDefaultFormParams: /* @__PURE__ */ __name(() => ({ operator1: CustomFilterOperator.EQUAL, val1: "" }), "getDefaultFormParams"),
+    testMappingParams: /* @__PURE__ */ __name((params) => {
+      const [op] = getOnlyOperatorAndVal(params);
+      return op === CustomFilterOperator.EQUAL;
+    }, "testMappingParams"),
+    mapToFilterColumn: /* @__PURE__ */ __name((mapParams) => ({
+      customFilters: { customFilters: [{ val: mapParams.val1, operator: CustomFilterOperator.EQUAL }] }
+    }), "mapToFilterColumn"),
+    testMappingFilterColumn: /* @__PURE__ */ __name((filterColumn) => {
+      var _a13;
+      if (((_a13 = filterColumn.customFilters) == null ? void 0 : _a13.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0];
-      return o.operator !== u.EQUAL ? !1 : { operator1: u.EQUAL, val1: o.val.toString() };
-    }
-  }, t.NOT_EQUAL = {
+      const firstCustomFilter = filterColumn.customFilters.customFilters[0];
+      return firstCustomFilter.operator !== CustomFilterOperator.EQUAL ? !1 : { operator1: CustomFilterOperator.EQUAL, val1: firstCustomFilter.val.toString() };
+    }, "testMappingFilterColumn")
+  }, FilterConditionItems2.NOT_EQUAL = {
     label: "sheets-filter.conditions.not-equal",
-    operator: u.NOT_EQUALS,
+    operator: CustomFilterOperator.NOT_EQUALS,
     numOfParameters: 1,
-    order: N.FIRST,
-    getDefaultFormParams: () => ({ operator1: u.NOT_EQUALS, val1: "" }),
-    testMappingParams: (s) => {
-      const [o] = L(s);
-      return o === u.NOT_EQUALS;
-    },
-    mapToFilterColumn: (s) => ({
-      customFilters: { customFilters: [{ val: s.val1, operator: u.NOT_EQUALS }] }
-    }),
-    testMappingFilterColumn: (s) => {
-      var a;
-      if (((a = s.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
+    order: OperatorOrder.FIRST,
+    getDefaultFormParams: /* @__PURE__ */ __name(() => ({ operator1: CustomFilterOperator.NOT_EQUALS, val1: "" }), "getDefaultFormParams"),
+    testMappingParams: /* @__PURE__ */ __name((params) => {
+      const [op] = getOnlyOperatorAndVal(params);
+      return op === CustomFilterOperator.NOT_EQUALS;
+    }, "testMappingParams"),
+    mapToFilterColumn: /* @__PURE__ */ __name((mapParams) => ({
+      customFilters: { customFilters: [{ val: mapParams.val1, operator: CustomFilterOperator.NOT_EQUALS }] }
+    }), "mapToFilterColumn"),
+    testMappingFilterColumn: /* @__PURE__ */ __name((filterColumn) => {
+      var _a13;
+      if (((_a13 = filterColumn.customFilters) == null ? void 0 : _a13.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0];
-      return o.operator !== u.NOT_EQUALS ? !1 : { operator1: u.NOT_EQUALS, val1: o.val.toString() };
-    }
-  }, t.BETWEEN = {
+      const firstCustomFilter = filterColumn.customFilters.customFilters[0];
+      return firstCustomFilter.operator !== CustomFilterOperator.NOT_EQUALS ? !1 : { operator1: CustomFilterOperator.NOT_EQUALS, val1: firstCustomFilter.val.toString() };
+    }, "testMappingFilterColumn")
+  }, FilterConditionItems2.BETWEEN = {
     label: "sheets-filter.conditions.between",
-    operator: S.BETWEEN,
-    order: N.SECOND,
+    operator: ExtendCustomFilterOperator.BETWEEN,
+    order: OperatorOrder.SECOND,
     numOfParameters: 2,
-    getDefaultFormParams: () => ({
+    getDefaultFormParams: /* @__PURE__ */ __name(() => ({
       and: !0,
-      operator1: u.GREATER_THAN_OR_EQUAL,
+      operator1: CustomFilterOperator.GREATER_THAN_OR_EQUAL,
       val1: "",
-      operator2: u.LESS_THAN_OR_EQUAL,
+      operator2: CustomFilterOperator.LESS_THAN_OR_EQUAL,
       val2: ""
-    }),
-    testMappingParams: (s) => {
-      const { and: o, operator1: a, operator2: c } = s;
-      if (!o) return !1;
-      const h = [a, c];
-      return h.includes(u.GREATER_THAN_OR_EQUAL) && h.includes(u.LESS_THAN_OR_EQUAL);
-    },
-    mapToFilterColumn: (s) => {
-      const { val1: o, val2: a, operator1: c } = s, h = c === u.GREATER_THAN_OR_EQUAL;
+    }), "getDefaultFormParams"),
+    testMappingParams: /* @__PURE__ */ __name((params) => {
+      const { and, operator1, operator2 } = params;
+      if (!and) return !1;
+      const operators = [operator1, operator2];
+      return operators.includes(CustomFilterOperator.GREATER_THAN_OR_EQUAL) && operators.includes(CustomFilterOperator.LESS_THAN_OR_EQUAL);
+    }, "testMappingParams"),
+    mapToFilterColumn: /* @__PURE__ */ __name((mapParams) => {
+      const { val1, val2, operator1 } = mapParams, operator1IsGreater = operator1 === CustomFilterOperator.GREATER_THAN_OR_EQUAL;
       return {
         customFilters: {
-          and: nt.TRUE,
+          and: BooleanNumber.TRUE,
           customFilters: [
-            { val: h ? o : a, operator: u.GREATER_THAN_OR_EQUAL },
-            { val: h ? a : o, operator: u.LESS_THAN_OR_EQUAL }
+            { val: operator1IsGreater ? val1 : val2, operator: CustomFilterOperator.GREATER_THAN_OR_EQUAL },
+            { val: operator1IsGreater ? val2 : val1, operator: CustomFilterOperator.LESS_THAN_OR_EQUAL }
           ]
         }
       };
-    },
-    testMappingFilterColumn: (s) => {
-      var c;
-      if (((c = s.customFilters) == null ? void 0 : c.customFilters.length) !== 2)
+    }, "mapToFilterColumn"),
+    testMappingFilterColumn: /* @__PURE__ */ __name((filterColumn) => {
+      var _a13;
+      if (((_a13 = filterColumn.customFilters) == null ? void 0 : _a13.customFilters.length) !== 2)
         return !1;
-      const [o, a] = s.customFilters.customFilters;
-      return o.operator === u.GREATER_THAN_OR_EQUAL && a.operator === u.LESS_THAN_OR_EQUAL && s.customFilters.and ? {
+      const [firstCustomFilter, secondCustomFilter] = filterColumn.customFilters.customFilters;
+      return firstCustomFilter.operator === CustomFilterOperator.GREATER_THAN_OR_EQUAL && secondCustomFilter.operator === CustomFilterOperator.LESS_THAN_OR_EQUAL && filterColumn.customFilters.and ? {
         and: !0,
-        operator1: u.GREATER_THAN_OR_EQUAL,
-        val1: o.val.toString(),
-        operator2: u.LESS_THAN_OR_EQUAL,
-        val2: a.val.toString()
-      } : a.operator === u.GREATER_THAN_OR_EQUAL && o.operator === u.LESS_THAN_OR_EQUAL && s.customFilters.and ? {
+        operator1: CustomFilterOperator.GREATER_THAN_OR_EQUAL,
+        val1: firstCustomFilter.val.toString(),
+        operator2: CustomFilterOperator.LESS_THAN_OR_EQUAL,
+        val2: secondCustomFilter.val.toString()
+      } : secondCustomFilter.operator === CustomFilterOperator.GREATER_THAN_OR_EQUAL && firstCustomFilter.operator === CustomFilterOperator.LESS_THAN_OR_EQUAL && filterColumn.customFilters.and ? {
         and: !0,
-        operator1: u.GREATER_THAN_OR_EQUAL,
-        val1: a.val.toString(),
-        operator2: u.LESS_THAN_OR_EQUAL,
-        val2: o.val.toLocaleString()
+        operator1: CustomFilterOperator.GREATER_THAN_OR_EQUAL,
+        val1: secondCustomFilter.val.toString(),
+        operator2: CustomFilterOperator.LESS_THAN_OR_EQUAL,
+        val2: firstCustomFilter.val.toLocaleString()
       } : !1;
-    }
-  }, t.NOT_BETWEEN = {
+    }, "testMappingFilterColumn")
+  }, FilterConditionItems2.NOT_BETWEEN = {
     label: "sheets-filter.conditions.not-between",
-    operator: S.NOT_BETWEEN,
-    order: N.SECOND,
+    operator: ExtendCustomFilterOperator.NOT_BETWEEN,
+    order: OperatorOrder.SECOND,
     numOfParameters: 2,
-    getDefaultFormParams: () => ({
-      operator1: u.LESS_THAN,
+    getDefaultFormParams: /* @__PURE__ */ __name(() => ({
+      operator1: CustomFilterOperator.LESS_THAN,
       val1: "",
-      operator2: u.GREATER_THAN,
+      operator2: CustomFilterOperator.GREATER_THAN,
       val2: ""
-    }),
-    testMappingParams: (s) => {
-      const { and: o, operator1: a, operator2: c } = s;
-      if (o) return !1;
-      const h = [a, c];
-      return h.includes(u.GREATER_THAN) && h.includes(u.LESS_THAN);
-    },
-    mapToFilterColumn: (s) => {
-      const { val1: o, val2: a, operator1: c } = s, h = c === u.GREATER_THAN;
+    }), "getDefaultFormParams"),
+    testMappingParams: /* @__PURE__ */ __name((params) => {
+      const { and, operator1, operator2 } = params;
+      if (and) return !1;
+      const operators = [operator1, operator2];
+      return operators.includes(CustomFilterOperator.GREATER_THAN) && operators.includes(CustomFilterOperator.LESS_THAN);
+    }, "testMappingParams"),
+    mapToFilterColumn: /* @__PURE__ */ __name((mapParams) => {
+      const { val1, val2, operator1 } = mapParams, operator1IsGreater = operator1 === CustomFilterOperator.GREATER_THAN;
       return {
         customFilters: {
           customFilters: [
-            { val: h ? o : a, operator: u.GREATER_THAN },
-            { val: h ? a : o, operator: u.LESS_THAN }
+            { val: operator1IsGreater ? val1 : val2, operator: CustomFilterOperator.GREATER_THAN },
+            { val: operator1IsGreater ? val2 : val1, operator: CustomFilterOperator.LESS_THAN }
           ]
         }
       };
-    },
-    testMappingFilterColumn: (s) => {
-      var c;
-      if (((c = s.customFilters) == null ? void 0 : c.customFilters.length) !== 2)
+    }, "mapToFilterColumn"),
+    testMappingFilterColumn: /* @__PURE__ */ __name((filterColumn) => {
+      var _a13;
+      if (((_a13 = filterColumn.customFilters) == null ? void 0 : _a13.customFilters.length) !== 2)
         return !1;
-      const [o, a] = s.customFilters.customFilters;
-      return o.operator === u.LESS_THAN && a.operator === u.GREATER_THAN && !s.customFilters.and ? {
-        operator1: u.LESS_THAN,
-        val1: o.val.toString(),
-        operator2: u.GREATER_THAN,
-        val2: a.val.toString()
-      } : a.operator === u.LESS_THAN && o.operator === u.GREATER_THAN && !s.customFilters.and ? {
-        operator1: u.GREATER_THAN,
-        val1: a.val.toString(),
-        operator2: u.LESS_THAN,
-        val2: o.val.toLocaleString()
+      const [firstCustomFilter, secondCustomFilter] = filterColumn.customFilters.customFilters;
+      return firstCustomFilter.operator === CustomFilterOperator.LESS_THAN && secondCustomFilter.operator === CustomFilterOperator.GREATER_THAN && !filterColumn.customFilters.and ? {
+        operator1: CustomFilterOperator.LESS_THAN,
+        val1: firstCustomFilter.val.toString(),
+        operator2: CustomFilterOperator.GREATER_THAN,
+        val2: secondCustomFilter.val.toString()
+      } : secondCustomFilter.operator === CustomFilterOperator.LESS_THAN && firstCustomFilter.operator === CustomFilterOperator.GREATER_THAN && !filterColumn.customFilters.and ? {
+        operator1: CustomFilterOperator.GREATER_THAN,
+        val1: secondCustomFilter.val.toString(),
+        operator2: CustomFilterOperator.LESS_THAN,
+        val2: firstCustomFilter.val.toLocaleString()
       } : !1;
-    }
-  }, t.CUSTOM = {
+    }, "testMappingFilterColumn")
+  }, FilterConditionItems2.CUSTOM = {
     label: "sheets-filter.conditions.custom",
-    operator: S.CUSTOM,
-    order: N.SECOND,
+    operator: ExtendCustomFilterOperator.CUSTOM,
+    order: OperatorOrder.SECOND,
     numOfParameters: 2,
-    getDefaultFormParams: () => ({
-      operator1: S.NONE,
+    getDefaultFormParams: /* @__PURE__ */ __name(() => ({
+      operator1: ExtendCustomFilterOperator.NONE,
       val1: "",
-      operator2: S.NONE,
+      operator2: ExtendCustomFilterOperator.NONE,
       val2: ""
-    }),
-    testMappingParams: () => !0,
-    mapToFilterColumn: (s) => {
-      const { and: o, val1: a, val2: c, operator1: h, operator2: d } = s;
-      function g(I, R) {
-        for (const M of t.ALL_CONDITIONS)
-          if (M.operator === I)
-            return M.mapToFilterColumn({ val1: R, operator1: I });
+    }), "getDefaultFormParams"),
+    testMappingParams: /* @__PURE__ */ __name(() => !0, "testMappingParams"),
+    mapToFilterColumn: /* @__PURE__ */ __name((mapParams) => {
+      const { and, val1, val2, operator1, operator2 } = mapParams;
+      function mapOperator(operator, val) {
+        for (const condition of FilterConditionItems2.ALL_CONDITIONS)
+          if (condition.operator === operator)
+            return condition.mapToFilterColumn({ val1: val, operator1: operator });
       }
-      const m = !h || h === t.NONE.operator, T = !d || d === t.NONE.operator;
-      if (m && T)
-        return t.NONE.mapToFilterColumn({});
-      if (m)
-        return g(d, c);
-      if (T)
-        return g(h, a);
-      const v = g(h, a), P = g(d, c), F = {
+      __name(mapOperator, "mapOperator");
+      const operator1IsNone = !operator1 || operator1 === FilterConditionItems2.NONE.operator, operator2IsNone = !operator2 || operator2 === FilterConditionItems2.NONE.operator;
+      if (operator1IsNone && operator2IsNone)
+        return FilterConditionItems2.NONE.mapToFilterColumn({});
+      if (operator1IsNone)
+        return mapOperator(operator2, val2);
+      if (operator2IsNone)
+        return mapOperator(operator1, val1);
+      const mappedCustomFilter1 = mapOperator(operator1, val1), mappedCustomFilter2 = mapOperator(operator2, val2), customFilters = {
         customFilters: [
-          v.customFilters.customFilters[0],
-          P.customFilters.customFilters[0]
+          mappedCustomFilter1.customFilters.customFilters[0],
+          mappedCustomFilter2.customFilters.customFilters[0]
         ]
       };
-      return o && (F.and = nt.TRUE), { customFilters: F };
-    },
-    testMappingFilterColumn: (s) => {
-      var c;
-      if (((c = s.customFilters) == null ? void 0 : c.customFilters.length) !== 2)
+      return and && (customFilters.and = BooleanNumber.TRUE), { customFilters };
+    }, "mapToFilterColumn"),
+    testMappingFilterColumn: /* @__PURE__ */ __name((filterColumn) => {
+      var _a13;
+      if (((_a13 = filterColumn.customFilters) == null ? void 0 : _a13.customFilters.length) !== 2)
         return !1;
-      const o = s.customFilters.customFilters.map((h) => l({ customFilters: { customFilters: [h] } })), a = {
-        operator1: o[0][0].operator,
-        val1: o[0][1].val1,
-        operator2: o[1][0].operator,
-        val2: o[1][1].val1
+      const params = filterColumn.customFilters.customFilters.map((customFilter) => testMappingFilterColumn({ customFilters: { customFilters: [customFilter] } })), result = {
+        operator1: params[0][0].operator,
+        val1: params[0][1].val1,
+        operator2: params[1][0].operator,
+        val2: params[1][1].val1
       };
-      return s.customFilters.and && (a.and = !0), a;
-    }
-  }, t.ALL_CONDITIONS = [
+      return filterColumn.customFilters.and && (result.and = !0), result;
+    }, "testMappingFilterColumn")
+  }, FilterConditionItems2.ALL_CONDITIONS = [
     // ------------------------------
-    t.NONE,
+    FilterConditionItems2.NONE,
     // ------------------------------
-    t.EMPTY,
-    t.NOT_EMPTY,
+    FilterConditionItems2.EMPTY,
+    FilterConditionItems2.NOT_EMPTY,
     // ------------------------------
-    t.TEXT_CONTAINS,
-    t.DOES_NOT_CONTAIN,
-    t.STARTS_WITH,
-    t.ENDS_WITH,
-    t.EQUALS,
+    FilterConditionItems2.TEXT_CONTAINS,
+    FilterConditionItems2.DOES_NOT_CONTAIN,
+    FilterConditionItems2.STARTS_WITH,
+    FilterConditionItems2.ENDS_WITH,
+    FilterConditionItems2.EQUALS,
     // ------------------------------
-    t.GREATER_THAN,
-    t.GREATER_THAN_OR_EQUAL,
-    t.LESS_THAN,
-    t.LESS_THAN_OR_EQUAL,
-    t.EQUAL,
-    t.NOT_EQUAL,
-    t.BETWEEN,
-    t.NOT_BETWEEN,
+    FilterConditionItems2.GREATER_THAN,
+    FilterConditionItems2.GREATER_THAN_OR_EQUAL,
+    FilterConditionItems2.LESS_THAN,
+    FilterConditionItems2.LESS_THAN_OR_EQUAL,
+    FilterConditionItems2.EQUAL,
+    FilterConditionItems2.NOT_EQUAL,
+    FilterConditionItems2.BETWEEN,
+    FilterConditionItems2.NOT_BETWEEN,
     // ------------------------------
-    t.CUSTOM
+    FilterConditionItems2.CUSTOM
   ];
-  function e(s) {
-    const o = t.ALL_CONDITIONS.find((a) => a.operator === s);
-    if (!o)
-      throw new Error(`[SheetsFilter]: no condition item found for operator: ${s}`);
-    return o;
-  }
-  t.getItemByOperator = e;
-  function r(s, o) {
-    for (const a of t.ALL_CONDITIONS.filter((c) => c.numOfParameters === o))
-      if (a.numOfParameters !== 0 && a.testMappingParams(s))
-        return a;
-    for (const a of t.ALL_CONDITIONS)
-      if (a.testMappingParams(s))
-        return a;
+  function getItemByOperator(operator) {
+    const item = FilterConditionItems2.ALL_CONDITIONS.find((condition) => condition.operator === operator);
+    if (!item)
+      throw new Error(`[SheetsFilter]: no condition item found for operator: ${operator}`);
+    return item;
+  }
+  __name(getItemByOperator, "getItemByOperator"), FilterConditionItems2.getItemByOperator = getItemByOperator;
+  function testMappingParams(mapParams, numOfParameters) {
+    for (const condition of FilterConditionItems2.ALL_CONDITIONS.filter((condition2) => condition2.numOfParameters === numOfParameters))
+      if (condition.numOfParameters !== 0 && condition.testMappingParams(mapParams))
+        return condition;
+    for (const condition of FilterConditionItems2.ALL_CONDITIONS)
+      if (condition.testMappingParams(mapParams))
+        return condition;
     throw new Error("[SheetsFilter]: no condition item can be mapped from the filter map params!");
   }
-  t.testMappingParams = r;
-  function n(s) {
-    const o = t.ALL_CONDITIONS.find((a) => a.operator === s);
-    return (o == null ? void 0 : o.numOfParameters) === 0 ? { operator1: o.operator } : o.getDefaultFormParams();
-  }
-  t.getInitialFormParams = n;
-  function i(s, o) {
-    return s.mapToFilterColumn(o);
-  }
-  t.mapToFilterColumn = i;
-  function l(s) {
-    if (!s)
-      return [t.NONE, {}];
-    for (const o of t.ALL_CONDITIONS) {
-      const a = o.testMappingFilterColumn(s);
-      if (a)
-        return [o, a];
+  __name(testMappingParams, "testMappingParams"), FilterConditionItems2.testMappingParams = testMappingParams;
+  function getInitialFormParams(operator) {
+    const condition = FilterConditionItems2.ALL_CONDITIONS.find((condition2) => condition2.operator === operator);
+    return (condition == null ? void 0 : condition.numOfParameters) === 0 ? { operator1: condition.operator } : condition.getDefaultFormParams();
+  }
+  __name(getInitialFormParams, "getInitialFormParams"), FilterConditionItems2.getInitialFormParams = getInitialFormParams;
+  function mapToFilterColumn(condition, mapParams) {
+    return condition.mapToFilterColumn(mapParams);
+  }
+  __name(mapToFilterColumn, "mapToFilterColumn"), FilterConditionItems2.mapToFilterColumn = mapToFilterColumn;
+  function testMappingFilterColumn(filterColumn) {
+    if (!filterColumn)
+      return [FilterConditionItems2.NONE, {}];
+    for (const condition of FilterConditionItems2.ALL_CONDITIONS) {
+      const mapParams = condition.testMappingFilterColumn(filterColumn);
+      if (mapParams)
+        return [condition, mapParams];
     }
-    return [t.NONE, {}];
+    return [FilterConditionItems2.NONE, {}];
   }
-  t.testMappingFilterColumn = l;
-})(f || (f = {}));
-function L(t) {
-  const { operator1: e, operator2: r, val1: n, val2: i } = t;
-  if (e && r)
+  __name(testMappingFilterColumn, "testMappingFilterColumn"), FilterConditionItems2.testMappingFilterColumn = testMappingFilterColumn;
+})(FilterConditionItems || (FilterConditionItems = {}));
+function getOnlyOperatorAndVal(mapParams) {
+  const { operator1, operator2, val1, val2 } = mapParams;
+  if (operator1 && operator2)
     throw new Error("Both operator1 and operator2 are set!");
-  if (!e && !r)
+  if (!operator1 && !operator2)
     throw new Error("Neither operator1 and operator2 and both not set!");
-  return e ? [e, n] : [r, i];
+  return operator1 ? [operator1, val1] : [operator2, val2];
 }
-function je(t) {
-  const e = [], r = [];
-  let n = 0, i = 0;
-  function l(s) {
-    s.leaf && (s.checked ? (e.push(s), n += s.count) : (r.push(s), i += s.count)), s.children && s.children.forEach(l);
-  }
-  return t.forEach(l), {
-    checkedItems: e,
-    uncheckedItems: r,
-    checked: n,
-    unchecked: i
+__name(getOnlyOperatorAndVal, "getOnlyOperatorAndVal");
+function statisticFilterByValueItems(items) {
+  const checkedItems = [], uncheckedItems = [];
+  let checked = 0, unchecked = 0;
+  function traverse(node) {
+    node.leaf && (node.checked ? (checkedItems.push(node), checked += node.count) : (uncheckedItems.push(node), unchecked += node.count)), node.children && node.children.forEach(traverse);
+  }
+  return __name(traverse, "traverse"), items.forEach(traverse), {
+    checkedItems,
+    uncheckedItems,
+    checked,
+    unchecked
   };
 }
-var ts = Object.defineProperty, rs = Object.getOwnPropertyDescriptor, ss = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? rs(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && ts(e, r, i), i;
-}, De = (t, e) => (r, n) => e(r, n, t);
-const tt = "sheets-filter.generate-filter-values.service", Pe = gt(tt), ns = ["yyyy-mm-dd", "yyyy-mm-dd;@", "yyyy/mm/dd;@", "yyyy/mm/dd hh:mm", "yyyy-m-d am/pm h:mm", "yyyy-MM-dd", "yyyy/MM/dd", "yyyy/mm/dd", 'yyyy"年"MM"月"dd"日"', "MM-dd", 'M"月"d"日"', "MM-dd A/P hh:mm"];
-let We = class extends pe {
-  constructor(t, e, r) {
-    super(), this._localeService = t, this._univerInstanceService = e, this._logService = r;
-  }
-  async getFilterValues(t) {
-    var h;
-    const { unitId: e, subUnitId: r, filteredOutRowsByOtherColumns: n, filters: i, blankChecked: l, iterateRange: s, alreadyChecked: o } = t, a = this._univerInstanceService.getUnit(e), c = (h = this._univerInstanceService.getUnit(e)) == null ? void 0 : h.getSheetBySheetId(r);
-    return !a || !c ? [] : (this._logService.debug("[SheetsGenerateFilterValuesService]", "getFilterValues for", { unitId: e, subUnitId: r }), wt(i, this._localeService, s, c, new Set(n), new Set(o.map(String)), l, a.getStyles()));
-  }
-};
-We = ss([
-  De(0, E(K)),
-  De(1, Ye),
-  De(2, Zt)
-], We);
-function wt(t, e, r, n, i, l, s, o) {
-  var v, P, F, I, R, M, $, Se, ge;
-  const a = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map(), h = "yyyy-mm-dd", d = new Set(ns), g = "empty";
-  let m = 0;
-  for (const y of n.iterateByColumn(r, !1, !1)) {
-    const { row: Gt, rowSpan: st = 1 } = y;
-    let J = 0;
-    for (; J < st; ) {
-      const Yt = Gt + J;
-      if (i.has(Yt)) {
-        J++;
+__name(statisticFilterByValueItems, "statisticFilterByValueItems");
+var __defProp$9 = Object.defineProperty, __getOwnPropDesc$9 = Object.getOwnPropertyDescriptor, __decorateClass$9 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$9(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$9(target, key, result), result;
+}, "__decorateClass$9"), __decorateParam$9 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$9");
+const SHEETS_GENERATE_FILTER_VALUES_SERVICE_NAME = "sheets-filter.generate-filter-values.service", ISheetsGenerateFilterValuesService = createIdentifier(SHEETS_GENERATE_FILTER_VALUES_SERVICE_NAME), CAN_PARSE_DATE_FORMAT = ["yyyy-mm-dd", "yyyy-mm-dd;@", "yyyy/mm/dd;@", "yyyy/mm/dd hh:mm", "yyyy-m-d am/pm h:mm", "yyyy-MM-dd", "yyyy/MM/dd", "yyyy/mm/dd", 'yyyy"年"MM"月"dd"日"', "MM-dd", 'M"月"d"日"', "MM-dd A/P hh:mm"];
+var _a;
+let SheetsGenerateFilterValuesService = (_a = class extends Disposable {
+  constructor(_localeService, _univerInstanceService, _logService) {
+    super(), this._localeService = _localeService, this._univerInstanceService = _univerInstanceService, this._logService = _logService;
+  }
+  async getFilterValues(params) {
+    var _a13;
+    const { unitId, subUnitId, filteredOutRowsByOtherColumns, filters, blankChecked, iterateRange, alreadyChecked } = params, workbook = this._univerInstanceService.getUnit(unitId), worksheet = (_a13 = this._univerInstanceService.getUnit(unitId)) == null ? void 0 : _a13.getSheetBySheetId(subUnitId);
+    return !workbook || !worksheet ? [] : (this._logService.debug("[SheetsGenerateFilterValuesService]", "getFilterValues for", { unitId, subUnitId }), getFilterTreeByValueItems(filters, this._localeService, iterateRange, worksheet, new Set(filteredOutRowsByOtherColumns), new Set(alreadyChecked.map(String)), blankChecked, workbook.getStyles()));
+  }
+}, __name(_a, "SheetsGenerateFilterValuesService"), _a);
+SheetsGenerateFilterValuesService = __decorateClass$9([
+  __decorateParam$9(0, Inject(LocaleService)),
+  __decorateParam$9(1, IUniverInstanceService),
+  __decorateParam$9(2, ILogService)
+], SheetsGenerateFilterValuesService);
+function getFilterTreeByValueItems(filters, localeService, iterateRange, worksheet, filteredOutRowsByOtherColumns, alreadyChecked, blankChecked, styles2) {
+  var _a13, _b, _c, _d, _e, _f, _g, _h, _i;
+  const items = /* @__PURE__ */ new Map(), treeMap = /* @__PURE__ */ new Map(), DefaultPattern = "yyyy-mm-dd", canSplitPatternSet = new Set(CAN_PARSE_DATE_FORMAT), EmptyKey = "empty";
+  let emptyCount = 0;
+  for (const cell of worksheet.iterateByColumn(iterateRange, !1, !1)) {
+    const { row, rowSpan = 1 } = cell;
+    let rowIndex = 0;
+    for (; rowIndex < rowSpan; ) {
+      const targetRow = row + rowIndex;
+      if (filteredOutRowsByOtherColumns.has(targetRow)) {
+        rowIndex++;
         continue;
       }
-      const Q = y != null && y.value ? Jt(y.value) : "";
-      if (!Q) {
-        m += 1, J += st;
+      const value = cell != null && cell.value ? extractPureTextFromCell(cell.value) : "";
+      if (!value) {
+        emptyCount += 1, rowIndex += rowSpan;
         continue;
       }
-      const ve = (v = y.value) != null && v.v && !y.value.p ? (I = (F = o.get((P = y.value) == null ? void 0 : P.s)) == null ? void 0 : F.n) == null ? void 0 : I.pattern : "", qt = ve && it.isDate(ve);
-      if (ve && qt && d.has(ve)) {
-        const x = (R = n.getCellRaw(y.row, y.col)) == null ? void 0 : R.v;
-        if (!x) {
-          J++;
+      const fmtStr = (_a13 = cell.value) != null && _a13.v && !cell.value.p ? (_d = (_c = styles2.get((_b = cell.value) == null ? void 0 : _b.s)) == null ? void 0 : _c.n) == null ? void 0 : _d.pattern : "", isDateValue = fmtStr && numfmt.isDate(fmtStr);
+      if (fmtStr && isDateValue && canSplitPatternSet.has(fmtStr)) {
+        const originValue = (_e = worksheet.getCellRaw(cell.row, cell.col)) == null ? void 0 : _e.v;
+        if (!originValue) {
+          rowIndex++;
           continue;
         }
-        const z = it.format(h, x), [O, w, oe] = z.split("-").map(Number);
-        let G = a.get(`${O}`);
-        G || (G = {
-          title: `${O}`,
-          key: `${O}`,
+        const valueParsedByDefaultPattern = numfmt.format(DefaultPattern, originValue), [year, month, day] = valueParsedByDefaultPattern.split("-").map(Number);
+        let yearItem = items.get(`${year}`);
+        yearItem || (yearItem = {
+          title: `${year}`,
+          key: `${year}`,
           children: [],
           count: 0,
           leaf: !1,
           checked: !1
-        }, a.set(`${O}`, G), c.set(`${O}`, [`${O}`]));
-        let U = (M = G.children) == null ? void 0 : M.find((He) => He.key === `${O}-${w}`);
-        U || (U = {
-          title: e.t(`sheets-filter.date.${w}`),
-          key: `${O}-${w}`,
+        }, items.set(`${year}`, yearItem), treeMap.set(`${year}`, [`${year}`]));
+        let monthItem = (_f = yearItem.children) == null ? void 0 : _f.find((item) => item.key === `${year}-${month}`);
+        monthItem || (monthItem = {
+          title: localeService.t(`sheets-filter.date.${month}`),
+          key: `${year}-${month}`,
           children: [],
           count: 0,
           leaf: !1,
           checked: !1
-        }, ($ = G.children) == null || $.push(U), c.set(`${O}-${w}`, [`${O}`, `${O}-${w}`]));
-        const Ue = (Se = U == null ? void 0 : U.children) == null ? void 0 : Se.find((He) => He.key === `${O}-${w}-${oe}`);
-        Ue ? (Ue.originValues.add(Q), Ue.count++, U.count++, G.count++) : ((ge = U.children) == null || ge.push({
-          title: `${oe}`,
-          key: `${O}-${w}-${oe}`,
+        }, (_g = yearItem.children) == null || _g.push(monthItem), treeMap.set(`${year}-${month}`, [`${year}`, `${year}-${month}`]));
+        const dayItem = (_h = monthItem == null ? void 0 : monthItem.children) == null ? void 0 : _h.find((item) => item.key === `${year}-${month}-${day}`);
+        dayItem ? (dayItem.originValues.add(value), dayItem.count++, monthItem.count++, yearItem.count++) : ((_i = monthItem.children) == null || _i.push({
+          title: `${day}`,
+          key: `${year}-${month}-${day}`,
           count: 1,
-          originValues: /* @__PURE__ */ new Set([Q]),
+          originValues: /* @__PURE__ */ new Set([value]),
           leaf: !0,
-          checked: l.size ? l.has(Q) : !s
-        }), U.count++, G.count++, c.set(`${O}-${w}-${oe}`, [`${O}`, `${O}-${w}`, `${O}-${w}-${oe}`]));
+          checked: alreadyChecked.size ? alreadyChecked.has(value) : !blankChecked
+        }), monthItem.count++, yearItem.count++, treeMap.set(`${year}-${month}-${day}`, [`${year}`, `${year}-${month}`, `${year}-${month}-${day}`]));
       } else {
-        const x = Q;
-        let z = a.get(x);
-        z ? z.count++ : (z = {
-          title: Q,
+        const key = value;
+        let item = items.get(key);
+        item ? item.count++ : (item = {
+          title: value,
           leaf: !0,
-          checked: l.size ? l.has(Q) : !s,
-          key: x,
+          checked: alreadyChecked.size ? alreadyChecked.has(value) : !blankChecked,
+          key,
           count: 1
-        }, a.set(x, z), c.set(x, [x]));
+        }, items.set(key, item), treeMap.set(key, [key]));
       }
-      J++;
+      rowIndex++;
     }
   }
-  const T = t ? s : !0;
-  if (m > 0) {
-    const y = {
-      title: e.t("sheets-filter.panel.empty"),
-      count: m,
+  const initialBlankChecked = filters ? blankChecked : !0;
+  if (emptyCount > 0) {
+    const item = {
+      title: localeService.t("sheets-filter.panel.empty"),
+      count: emptyCount,
       leaf: !0,
-      checked: T,
-      key: g
+      checked: initialBlankChecked,
+      key: EmptyKey
     };
-    a.set("empty", y), c.set("empty", [g]);
+    items.set("empty", item), treeMap.set("empty", [EmptyKey]);
   }
   return {
-    filterTreeItems: is(Array.from(a.values())),
-    filterTreeMapCache: c
+    filterTreeItems: generateFilterTreeBySort(Array.from(items.values())),
+    filterTreeMapCache: treeMap
   };
 }
-function is(t) {
-  return Array.from(t).sort((e, r) => e.children && !r.children ? -1 : !e.children && r.children ? 1 : r.title.localeCompare(e.title)).map((e) => (e.children && e.children.sort((r, n) => {
-    const i = Number.parseInt(r.key.split("-")[1], 10), l = Number.parseInt(n.key.split("-")[1], 10);
-    return i - l;
-  }).forEach((r) => {
-    r.children && r.children.sort((n, i) => {
-      const l = Number.parseInt(n.key.split("-")[2], 10), s = Number.parseInt(i.key.split("-")[2], 10);
-      return l - s;
+__name(getFilterTreeByValueItems, "getFilterTreeByValueItems");
+function generateFilterTreeBySort(tree) {
+  return Array.from(tree).sort((a, b) => a.children && !b.children ? -1 : !a.children && b.children ? 1 : b.title.localeCompare(a.title)).map((yearItem) => (yearItem.children && yearItem.children.sort((a, b) => {
+    const monthA = Number.parseInt(a.key.split("-")[1], 10), monthB = Number.parseInt(b.key.split("-")[1], 10);
+    return monthA - monthB;
+  }).forEach((monthItem) => {
+    monthItem.children && monthItem.children.sort((a, b) => {
+      const dayA = Number.parseInt(a.key.split("-")[2], 10), dayB = Number.parseInt(b.key.split("-")[2], 10);
+      return dayA - dayB;
     });
-  }), e));
+  }), yearItem));
 }
-function ke(t, e) {
-  for (const r of t) {
-    if (r.key === e)
-      return r;
-    if (r.children) {
-      const n = ke(r.children, e);
-      if (n)
-        return n;
+__name(generateFilterTreeBySort, "generateFilterTreeBySort");
+function findObjectByKey(data, targetKey) {
+  for (const node of data) {
+    if (node.key === targetKey)
+      return node;
+    if (node.children) {
+      const result = findObjectByKey(node.children, targetKey);
+      if (result)
+        return result;
     }
   }
   return null;
 }
-function Ut(t) {
-  return t.leaf ? t.checked : t.children ? t.children.every((e) => Ut(e)) : !0;
+__name(findObjectByKey, "findObjectByKey");
+function areAllLeafNodesChecked(node) {
+  return node.leaf ? node.checked : node.children ? node.children.every((child) => areAllLeafNodesChecked(child)) : !0;
 }
-function he(t, e) {
-  t.leaf && (e !== void 0 ? t.checked = e : t.checked = !t.checked), t.children && t.children.forEach((r) => he(r, e));
+__name(areAllLeafNodesChecked, "areAllLeafNodesChecked");
+function updateLeafNodesCheckedStatus(node, status) {
+  node.leaf && (status !== void 0 ? node.checked = status : node.checked = !node.checked), node.children && node.children.forEach((child) => updateLeafNodesCheckedStatus(child, status));
 }
-function Ht(t, e) {
-  const r = [];
-  return t.forEach((n) => {
-    const i = n.originValues ? e.some(
-      (o) => Array.from(n.originValues).some(
-        (a) => a.toLowerCase().includes(o.toLowerCase())
+__name(updateLeafNodesCheckedStatus, "updateLeafNodesCheckedStatus");
+function searchTree(items, searchKeywords) {
+  const result = [];
+  return items.forEach((item) => {
+    const originMatches = item.originValues ? searchKeywords.some(
+      (keyword) => Array.from(item.originValues).some(
+        (value) => value.toLowerCase().includes(keyword.toLowerCase())
       )
-    ) : !1, l = !i && e.some(
-      (o) => n.title.toLowerCase().includes(o.toLowerCase())
+    ) : !1, titleMatches = !originMatches && searchKeywords.some(
+      (keyword) => item.title.toLowerCase().includes(keyword.toLowerCase())
     );
-    if (i || l)
-      r.push({ ...n });
-    else if (n.children) {
-      const o = Ht(n.children, e);
-      if (o.length > 0) {
-        const a = o.reduce((c, h) => c + h.count, 0);
-        r.push({ ...n, count: a, children: o });
+    if (originMatches || titleMatches)
+      result.push({ ...item });
+    else if (item.children) {
+      const filteredChildren = searchTree(item.children, searchKeywords);
+      if (filteredChildren.length > 0) {
+        const aggregatedCount = filteredChildren.reduce((sum, child) => sum + child.count, 0);
+        result.push({ ...item, count: aggregatedCount, children: filteredChildren });
       }
     }
-  }), r;
+  }), result;
 }
-var os = Object.defineProperty, as = Object.getOwnPropertyDescriptor, rt = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? as(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && os(e, r, i), i;
-}, Oe = (t, e) => (r, n) => e(r, n, t), Re = /* @__PURE__ */ ((t) => (t[t.VALUES = 0] = "VALUES", t[t.CONDITIONS = 1] = "CONDITIONS", t))(Re || {});
-gt("sheets-filter-ui.sheets-filter-panel.service");
-let j = class extends pe {
-  constructor(e, r) {
+__name(searchTree, "searchTree");
+var __defProp$8 = Object.defineProperty, __getOwnPropDesc$8 = Object.getOwnPropertyDescriptor, __decorateClass$8 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$8(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$8(target, key, result), result;
+}, "__decorateClass$8"), __decorateParam$8 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$8"), FilterBy = /* @__PURE__ */ ((FilterBy2) => (FilterBy2[FilterBy2.VALUES = 0] = "VALUES", FilterBy2[FilterBy2.CONDITIONS = 1] = "CONDITIONS", FilterBy2))(FilterBy || {});
+createIdentifier("sheets-filter-ui.sheets-filter-panel.service");
+var _a2;
+let SheetsFilterPanelService = (_a2 = class extends Disposable {
+  constructor(_injector, _refRangeService) {
     super();
-    _(this, "_filterBy$", new q(
+    __publicField(this, "_filterBy$", new BehaviorSubject(
       0
       /* VALUES */
     ));
-    _(this, "filterBy$", this._filterBy$.asObservable());
-    _(this, "_filterByModel$", new xr(1));
-    _(this, "filterByModel$", this._filterByModel$.asObservable());
-    _(this, "_filterByModel", null);
-    _(this, "_hasCriteria$", new q(!1));
-    _(this, "hasCriteria$", this._hasCriteria$.asObservable());
-    _(this, "_filterModel", null);
-    _(this, "_col$", new q(-1));
-    _(this, "col$", this._col$.asObservable());
-    _(this, "_filterHeaderListener", null);
-    this._injector = e, this._refRangeService = r;
+    __publicField(this, "filterBy$", this._filterBy$.asObservable());
+    __publicField(this, "_filterByModel$", new ReplaySubject(1));
+    __publicField(this, "filterByModel$", this._filterByModel$.asObservable());
+    __publicField(this, "_filterByModel", null);
+    __publicField(this, "_hasCriteria$", new BehaviorSubject(!1));
+    __publicField(this, "hasCriteria$", this._hasCriteria$.asObservable());
+    __publicField(this, "_filterModel", null);
+    __publicField(this, "_col$", new BehaviorSubject(-1));
+    __publicField(this, "col$", this._col$.asObservable());
+    __publicField(this, "_filterHeaderListener", null);
+    this._injector = _injector, this._refRangeService = _refRangeService;
   }
   get filterBy() {
     return this._filterBy$.getValue();
@@ -690,8 +703,8 @@ let j = class extends pe {
   get filterByModel() {
     return this._filterByModel;
   }
-  set filterByModel(e) {
-    this._filterByModel = e, this._filterByModel$.next(e);
+  set filterByModel(model) {
+    this._filterByModel = model, this._filterByModel$.next(model);
   }
   get filterModel() {
     return this._filterModel;
@@ -702,98 +715,99 @@ let j = class extends pe {
   dispose() {
     this._filterBy$.complete(), this._filterByModel$.complete(), this._hasCriteria$.complete();
   }
-  setupCol(e, r) {
-    this.terminate(), this._filterModel = e, this._col$.next(r);
-    const n = e.getFilterColumn(r);
-    if (n) {
-      const i = n.getColumnData();
-      if (i.customFilters) {
-        this._hasCriteria$.next(!0), this._setupByConditions(e, r);
+  setupCol(filterModel, col) {
+    this.terminate(), this._filterModel = filterModel, this._col$.next(col);
+    const filterColumn = filterModel.getFilterColumn(col);
+    if (filterColumn) {
+      const info = filterColumn.getColumnData();
+      if (info.customFilters) {
+        this._hasCriteria$.next(!0), this._setupByConditions(filterModel, col);
         return;
       }
-      if (i.filters) {
-        this._hasCriteria$.next(!0), this._setupByValues(e, r);
+      if (info.filters) {
+        this._hasCriteria$.next(!0), this._setupByValues(filterModel, col);
         return;
       }
-      this._hasCriteria$.next(!1), this._setupByValues(e, r);
+      this._hasCriteria$.next(!1), this._setupByValues(filterModel, col);
       return;
     }
-    this._hasCriteria$.next(!1), this._setupByValues(e, r);
+    this._hasCriteria$.next(!1), this._setupByValues(filterModel, col);
   }
-  changeFilterBy(e) {
-    return !this._filterModel || this.col === -1 ? !1 : (e === 0 ? this._setupByValues(this._filterModel, this.col) : this._setupByConditions(this._filterModel, this.col), !0);
+  changeFilterBy(filterBy) {
+    return !this._filterModel || this.col === -1 ? !1 : (filterBy === 0 ? this._setupByValues(this._filterModel, this.col) : this._setupByConditions(this._filterModel, this.col), !0);
   }
   terminate() {
     return this._filterModel = null, this._col$.next(-1), this._disposeFilterHeaderChangeListener(), !0;
   }
   _disposeFilterHeaderChangeListener() {
-    var e;
-    (e = this._filterHeaderListener) == null || e.dispose(), this._filterHeaderListener = null;
+    var _a13;
+    (_a13 = this._filterHeaderListener) == null || _a13.dispose(), this._filterHeaderListener = null;
   }
-  _listenToFilterHeaderChange(e, r) {
+  _listenToFilterHeaderChange(filterModel, col) {
     this._disposeFilterHeaderChangeListener();
-    const n = e.unitId, i = e.subUnitId, l = e.getRange(), s = {
-      startColumn: r,
-      startRow: l.startRow,
-      endRow: l.startRow,
-      endColumn: r
+    const unitId = filterModel.unitId, subUnitId = filterModel.subUnitId, filterRange = filterModel.getRange(), columnHeaderRange = {
+      startColumn: col,
+      startRow: filterRange.startRow,
+      endRow: filterRange.startRow,
+      endColumn: col
     };
-    this._filterHeaderListener = this._refRangeService.watchRange(n, i, s, (o, a) => {
-      if (!a)
+    this._filterHeaderListener = this._refRangeService.watchRange(unitId, subUnitId, columnHeaderRange, (before, after) => {
+      if (!after)
         this.terminate();
       else {
-        const c = a.startColumn - o.startColumn;
-        c !== 0 && this._filterByModel.deltaCol(c);
+        const offset = after.startColumn - before.startColumn;
+        offset !== 0 && this._filterByModel.deltaCol(offset);
       }
     });
   }
-  async _setupByValues(e, r) {
+  async _setupByValues(filterModel, col) {
     this._disposePreviousModel();
-    const n = e.getRange();
-    if (n.startRow === n.endRow) return !1;
-    const i = await ye.fromFilterColumn(
+    const range = filterModel.getRange();
+    if (range.startRow === range.endRow) return !1;
+    const filterByModel = await ByValuesModel.fromFilterColumn(
       this._injector,
-      e,
-      r
+      filterModel,
+      col
     );
-    return this.filterByModel = i, this._filterBy$.next(
+    return this.filterByModel = filterByModel, this._filterBy$.next(
       0
       /* VALUES */
-    ), this._listenToFilterHeaderChange(e, r), !0;
+    ), this._listenToFilterHeaderChange(filterModel, col), !0;
   }
-  _setupByConditions(e, r) {
+  _setupByConditions(filterModel, col) {
     this._disposePreviousModel();
-    const n = e.getRange();
-    if (n.startRow === n.endRow) return !1;
-    const i = Ie.fromFilterColumn(
+    const range = filterModel.getRange();
+    if (range.startRow === range.endRow) return !1;
+    const model = ByConditionsModel.fromFilterColumn(
       this._injector,
-      e,
-      r,
-      e.getFilterColumn(r)
+      filterModel,
+      col,
+      filterModel.getFilterColumn(col)
     );
-    return this.filterByModel = i, this._filterBy$.next(
+    return this.filterByModel = model, this._filterBy$.next(
       1
       /* CONDITIONS */
-    ), this._listenToFilterHeaderChange(e, r), !0;
+    ), this._listenToFilterHeaderChange(filterModel, col), !0;
   }
   _disposePreviousModel() {
-    var e;
-    (e = this._filterByModel) == null || e.dispose(), this.filterByModel = null;
-  }
-};
-j = rt([
-  Oe(0, E(X)),
-  Oe(1, E(hr))
-], j);
-let Ie = class extends pe {
-  constructor(e, r, n, i, l) {
+    var _a13;
+    (_a13 = this._filterByModel) == null || _a13.dispose(), this.filterByModel = null;
+  }
+}, __name(_a2, "SheetsFilterPanelService"), _a2);
+SheetsFilterPanelService = __decorateClass$8([
+  __decorateParam$8(0, Inject(Injector)),
+  __decorateParam$8(1, Inject(RefRangeService))
+], SheetsFilterPanelService);
+var _a3;
+let ByConditionsModel = (_a3 = class extends Disposable {
+  constructor(_filterModel, col, conditionItem, conditionParams, _commandService) {
     super();
-    _(this, "canApply$", _e(!0));
-    _(this, "_conditionItem$");
-    _(this, "conditionItem$");
-    _(this, "_filterConditionFormParams$");
-    _(this, "filterConditionFormParams$");
-    this._filterModel = e, this.col = r, this._commandService = l, this._conditionItem$ = new q(n), this.conditionItem$ = this._conditionItem$.asObservable(), this._filterConditionFormParams$ = new q(i), this.filterConditionFormParams$ = this._filterConditionFormParams$.asObservable();
+    __publicField(this, "canApply$", of(!0));
+    __publicField(this, "_conditionItem$");
+    __publicField(this, "conditionItem$");
+    __publicField(this, "_filterConditionFormParams$");
+    __publicField(this, "filterConditionFormParams$");
+    this._filterModel = _filterModel, this.col = col, this._commandService = _commandService, this._conditionItem$ = new BehaviorSubject(conditionItem), this.conditionItem$ = this._conditionItem$.asObservable(), this._filterConditionFormParams$ = new BehaviorSubject(conditionParams), this.filterConditionFormParams$ = this._filterConditionFormParams$.asObservable();
   }
   /**
    * Create a model with targeting filter column. If there is not a filter column, the model would be created with
@@ -806,9 +820,9 @@ let Ie = class extends pe {
    *
    * @returns the model to control the panel's state
    */
-  static fromFilterColumn(e, r, n, i) {
-    const [l, s] = f.testMappingFilterColumn(i == null ? void 0 : i.getColumnData());
-    return e.createInstance(Ie, r, n, l, s);
+  static fromFilterColumn(injector, filterModel, col, filterColumn) {
+    const [conditionItem, conditionParams] = FilterConditionItems.testMappingFilterColumn(filterColumn == null ? void 0 : filterColumn.getColumnData());
+    return injector.createInstance(ByConditionsModel, filterModel, col, conditionItem, conditionParams);
   }
   get conditionItem() {
     return this._conditionItem$.getValue();
@@ -819,11 +833,11 @@ let Ie = class extends pe {
   dispose() {
     super.dispose(), this._conditionItem$.complete(), this._filterConditionFormParams$.complete();
   }
-  deltaCol(e) {
-    this.col += e;
+  deltaCol(offset) {
+    this.col += offset;
   }
   clear() {
-    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(re.id, {
+    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(SetSheetsFilterCriteriaCommand.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
@@ -835,23 +849,23 @@ let Ie = class extends pe {
    */
   async apply() {
     if (this._disposed) return !1;
-    const e = f.mapToFilterColumn(this.conditionItem, this.filterConditionFormParams);
-    return this._commandService.executeCommand(re.id, {
+    const filterColumn = FilterConditionItems.mapToFilterColumn(this.conditionItem, this.filterConditionFormParams);
+    return this._commandService.executeCommand(SetSheetsFilterCriteriaCommand.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
-      criteria: e
+      criteria: filterColumn
     });
   }
   /**
    * This method would be called when user changes the primary condition. The model would load the corresponding
    * `IFilterConditionFormParams` and load default condition form params.
    */
-  onPrimaryConditionChange(e) {
-    const r = f.ALL_CONDITIONS.find((n) => n.operator === e);
-    if (!r)
-      throw new Error(`[ByConditionsModel]: condition item not found for operator: ${e}!`);
-    this._conditionItem$.next(r), this._filterConditionFormParams$.next(f.getInitialFormParams(e));
+  onPrimaryConditionChange(operator) {
+    const conditionItem = FilterConditionItems.ALL_CONDITIONS.find((item) => item.operator === operator);
+    if (!conditionItem)
+      throw new Error(`[ByConditionsModel]: condition item not found for operator: ${operator}!`);
+    this._conditionItem$.next(conditionItem), this._filterConditionFormParams$.next(FilterConditionItems.getInitialFormParams(operator));
   }
   /**
    * This method would be called when user changes the primary conditions, the input values or "AND" "OR" ratio.
@@ -861,46 +875,47 @@ let Ie = class extends pe {
    *
    * @param params
    */
-  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 n = f.testMappingParams(r, this.conditionItem.numOfParameters);
-      this._conditionItem$.next(n);
+  onConditionFormChange(params) {
+    const newParams = { ...this.filterConditionFormParams, ...params };
+    if (newParams.and !== !0 && delete newParams.and, typeof params.and < "u" || typeof params.operator1 < "u" || typeof params.operator2 < "u") {
+      const conditionItem = FilterConditionItems.testMappingParams(newParams, this.conditionItem.numOfParameters);
+      this._conditionItem$.next(conditionItem);
     }
-    this._filterConditionFormParams$.next(r);
-  }
-};
-Ie = rt([
-  Oe(4, W)
-], Ie);
-let ye = class extends pe {
-  constructor(e, r, n, i, l) {
+    this._filterConditionFormParams$.next(newParams);
+  }
+}, __name(_a3, "ByConditionsModel"), _a3);
+ByConditionsModel = __decorateClass$8([
+  __decorateParam$8(4, ICommandService)
+], ByConditionsModel);
+var _a4;
+let ByValuesModel = (_a4 = class extends Disposable {
+  constructor(_filterModel, col, items, cache, _commandService) {
     super();
-    _(this, "_rawFilterItems$");
-    _(this, "rawFilterItems$");
-    _(this, "filterItems$");
-    _(this, "_filterItems", []);
-    _(this, "_treeMapCache");
-    _(this, "canApply$");
-    _(this, "_manuallyUpdateFilterItems$");
-    _(this, "_searchString$");
-    _(this, "searchString$");
-    this._filterModel = e, this.col = r, this._commandService = l, this._treeMapCache = i, this._searchString$ = new q(""), this.searchString$ = this._searchString$.asObservable(), this._rawFilterItems$ = new q(n), this.rawFilterItems$ = this._rawFilterItems$.asObservable(), this._manuallyUpdateFilterItems$ = new Br(), this.filterItems$ = Vr(
-      jr([
+    __publicField(this, "_rawFilterItems$");
+    __publicField(this, "rawFilterItems$");
+    __publicField(this, "filterItems$");
+    __publicField(this, "_filterItems", []);
+    __publicField(this, "_treeMapCache");
+    __publicField(this, "canApply$");
+    __publicField(this, "_manuallyUpdateFilterItems$");
+    __publicField(this, "_searchString$");
+    __publicField(this, "searchString$");
+    this._filterModel = _filterModel, this.col = col, this._commandService = _commandService, this._treeMapCache = cache, this._searchString$ = new BehaviorSubject(""), this.searchString$ = this._searchString$.asObservable(), this._rawFilterItems$ = new BehaviorSubject(items), this.rawFilterItems$ = this._rawFilterItems$.asObservable(), this._manuallyUpdateFilterItems$ = new Subject(), this.filterItems$ = merge(
+      combineLatest([
         this._searchString$.pipe(
-          It(500, void 0, { leading: !0, trailing: !0 }),
-          yt(void 0)
+          throttleTime(500, void 0, { leading: !0, trailing: !0 }),
+          startWith(void 0)
         ),
         this._rawFilterItems$
       ]).pipe(
-        se(([s, o]) => {
-          if (!s) return o;
-          const c = s.toLowerCase().split(/\s+/).filter((h) => !!h);
-          return Ht(o, c);
+        map(([searchString, items2]) => {
+          if (!searchString) return items2;
+          const searchKeyWords = searchString.toLowerCase().split(/\s+/).filter((s) => !!s);
+          return searchTree(items2, searchKeyWords);
         })
       ),
       this._manuallyUpdateFilterItems$
-    ).pipe(Wr(1)), this.canApply$ = this.filterItems$.pipe(se((s) => je(s).checked > 0)), this.disposeWithMe(this.filterItems$.subscribe((s) => this._filterItems = s));
+    ).pipe(shareReplay(1)), this.canApply$ = this.filterItems$.pipe(map((items2) => statisticFilterByValueItems(items2).checked > 0)), this.disposeWithMe(this.filterItems$.subscribe((items2) => this._filterItems = items2));
   }
   /**
    * Create a model with targeting filter column. If there is not a filter column, the model would be created with
@@ -912,30 +927,30 @@ let ye = class extends pe {
    *
    * @returns the model to control the panel's state
    */
-  static async fromFilterColumn(e, r, n) {
-    var M;
-    const i = e.get(Ye), l = e.get(K), s = e.get(Pe, vt.OPTIONAL), { unitId: o, subUnitId: a } = r, c = i.getUniverSheetInstance(o);
-    if (!c) throw new Error(`[ByValuesModel]: Workbook not found for filter model with unitId: ${o}!`);
-    const h = c == null ? void 0 : c.getSheetBySheetId(a);
-    if (!h) throw new Error(`[ByValuesModel]: Worksheet not found for filter model with unitId: ${o} and subUnitId: ${a}!`);
-    const d = r.getRange(), g = n, m = (M = r.getFilterColumn(n)) == null ? void 0 : M.getColumnData().filters, T = new Set(m == null ? void 0 : m.filters), v = !!(m && m.blank), P = r.getFilteredOutRowsExceptCol(n), F = { ...d, startRow: d.startRow + 1, startColumn: g, endColumn: g };
-    let I, R;
-    if (s) {
-      const $ = await s.getFilterValues({
-        unitId: o,
-        subUnitId: a,
-        filteredOutRowsByOtherColumns: Array.from(P),
-        filters: !!m,
-        blankChecked: v,
-        iterateRange: F,
-        alreadyChecked: Array.from(T)
+  static async fromFilterColumn(injector, filterModel, col) {
+    var _a13;
+    const univerInstanceService = injector.get(IUniverInstanceService), localeService = injector.get(LocaleService), generateFilterValuesService = injector.get(ISheetsGenerateFilterValuesService, Quantity.OPTIONAL), { unitId, subUnitId } = filterModel, workbook = univerInstanceService.getUniverSheetInstance(unitId);
+    if (!workbook) throw new Error(`[ByValuesModel]: Workbook not found for filter model with unitId: ${unitId}!`);
+    const worksheet = workbook == null ? void 0 : workbook.getSheetBySheetId(subUnitId);
+    if (!worksheet) throw new Error(`[ByValuesModel]: Worksheet not found for filter model with unitId: ${unitId} and subUnitId: ${subUnitId}!`);
+    const range = filterModel.getRange(), column = col, filters = (_a13 = filterModel.getFilterColumn(col)) == null ? void 0 : _a13.getColumnData().filters, alreadyChecked = new Set(filters == null ? void 0 : filters.filters), blankChecked = !!(filters && filters.blank), filteredOutRowsByOtherColumns = filterModel.getFilteredOutRowsExceptCol(col), iterateRange = { ...range, startRow: range.startRow + 1, startColumn: column, endColumn: column };
+    let items, cache;
+    if (generateFilterValuesService) {
+      const res = await generateFilterValuesService.getFilterValues({
+        unitId,
+        subUnitId,
+        filteredOutRowsByOtherColumns: Array.from(filteredOutRowsByOtherColumns),
+        filters: !!filters,
+        blankChecked,
+        iterateRange,
+        alreadyChecked: Array.from(alreadyChecked)
       });
-      I = $.filterTreeItems, R = $.filterTreeMapCache;
+      items = res.filterTreeItems, cache = res.filterTreeMapCache;
     } else {
-      const $ = wt(!!m, l, F, h, P, T, v, c.getStyles());
-      I = $.filterTreeItems, R = $.filterTreeMapCache;
+      const res = getFilterTreeByValueItems(!!filters, localeService, iterateRange, worksheet, filteredOutRowsByOtherColumns, alreadyChecked, blankChecked, workbook.getStyles());
+      items = res.filterTreeItems, cache = res.filterTreeMapCache;
     }
-    return e.createInstance(ye, r, n, I, R);
+    return injector.createInstance(ByValuesModel, filterModel, col, items, cache);
   }
   get rawFilterItems() {
     return this._rawFilterItems$.getValue();
@@ -949,40 +964,40 @@ let ye = class extends pe {
   dispose() {
     this._rawFilterItems$.complete(), this._searchString$.complete();
   }
-  deltaCol(e) {
-    this.col += e;
+  deltaCol(offset) {
+    this.col += offset;
   }
-  setSearchString(e) {
-    this._searchString$.next(e);
+  setSearchString(str) {
+    this._searchString$.next(str);
   }
-  onCheckAllToggled(e) {
-    const r = Fe.deepClone(this._filterItems);
-    r.forEach((n) => he(n, e)), this._manuallyUpdateFilterItems(r);
+  onCheckAllToggled(checked) {
+    const items = Tools.deepClone(this._filterItems);
+    items.forEach((item) => updateLeafNodesCheckedStatus(item, checked)), this._manuallyUpdateFilterItems(items);
   }
   /**
    * Toggle a filter item.
    */
-  onFilterCheckToggled(e) {
-    const r = Fe.deepClone(this._filterItems), n = ke(r, e.key);
-    if (!n)
+  onFilterCheckToggled(item) {
+    const items = Tools.deepClone(this._filterItems), changedItem = findObjectByKey(items, item.key);
+    if (!changedItem)
       return;
-    const i = Ut(n);
-    he(n, !i), this._manuallyUpdateFilterItems(r);
+    const allLeafChecked = areAllLeafNodesChecked(changedItem);
+    updateLeafNodesCheckedStatus(changedItem, !allLeafChecked), this._manuallyUpdateFilterItems(items);
   }
-  onFilterOnly(e) {
-    const r = Fe.deepClone(this._filterItems);
-    r.forEach((n) => he(n, !1)), e.forEach((n) => {
-      const i = ke(r, n);
-      i && he(i, !0);
-    }), this._manuallyUpdateFilterItems(r);
+  onFilterOnly(itemKeys) {
+    const items = Tools.deepClone(this._filterItems);
+    items.forEach((item) => updateLeafNodesCheckedStatus(item, !1)), itemKeys.forEach((key) => {
+      const changedItem = findObjectByKey(items, key);
+      changedItem && updateLeafNodesCheckedStatus(changedItem, !0);
+    }), this._manuallyUpdateFilterItems(items);
   }
-  _manuallyUpdateFilterItems(e) {
-    this._manuallyUpdateFilterItems$.next(e);
+  _manuallyUpdateFilterItems(items) {
+    this._manuallyUpdateFilterItems$.next(items);
   }
   // expose method here to let the panel change filter items
   // #region ByValuesModel apply methods
   clear() {
-    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(re.id, {
+    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(SetSheetsFilterCriteriaCommand.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
@@ -995,541 +1010,521 @@ let ye = class extends pe {
   async apply() {
     if (this._disposed)
       return !1;
-    const e = je(this._filterItems), { checked: r, checkedItems: n } = e, i = this.rawFilterItems;
-    let l = 0;
-    for (const c of i)
-      l += c.count;
-    const s = r === 0, o = e.checked === l, a = { colId: this.col };
-    if (s)
+    const statistics = statisticFilterByValueItems(this._filterItems), { checked, checkedItems } = statistics, rawFilterItems = this.rawFilterItems;
+    let rawFilterCount = 0;
+    for (const item of rawFilterItems)
+      rawFilterCount += item.count;
+    const noChecked = checked === 0, allChecked = statistics.checked === rawFilterCount, criteria = { colId: this.col };
+    if (noChecked)
       throw new Error("[ByValuesModel]: no checked items!");
-    if (o)
-      return this._commandService.executeCommand(re.id, {
+    if (allChecked)
+      return this._commandService.executeCommand(SetSheetsFilterCriteriaCommand.id, {
         unitId: this._filterModel.unitId,
         subUnitId: this._filterModel.subUnitId,
         col: this.col,
         criteria: null
       });
     {
-      a.filters = {};
-      const c = n.filter((d) => d.key !== "empty");
-      c.length > 0 && (a.filters = {
-        filters: c.flatMap((d) => d.originValues ? Array.from(d.originValues) : [d.title])
-      }), c.length !== n.length && (a.filters.blank = !0);
+      criteria.filters = {};
+      const nonEmptyItems = checkedItems.filter((item) => item.key !== "empty");
+      nonEmptyItems.length > 0 && (criteria.filters = {
+        filters: nonEmptyItems.flatMap((item) => item.originValues ? Array.from(item.originValues) : [item.title])
+      }), nonEmptyItems.length !== checkedItems.length && (criteria.filters.blank = !0);
     }
-    return this._commandService.executeCommand(re.id, {
+    return this._commandService.executeCommand(SetSheetsFilterCriteriaCommand.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
-      criteria: a
+      criteria
     });
   }
   // #endregion
-};
-ye = rt([
-  Oe(4, W)
-], ye);
-const ne = "FILTER_PANEL_OPENED", Ae = {
+}, __name(_a4, "ByValuesModel"), _a4);
+ByValuesModel = __decorateClass$8([
+  __decorateParam$8(4, ICommandService)
+], ByValuesModel);
+const FILTER_PANEL_OPENED_KEY = "FILTER_PANEL_OPENED", OpenFilterPanelOperation = {
   id: "sheet.operation.open-filter-panel",
-  type: $e.OPERATION,
-  handler: (t, e) => {
-    const r = t.get(we), n = t.get(k), i = t.get(j);
-    t.get(W).syncExecuteCommand(Ir.id, { visible: !1 });
-    const { unitId: s, subUnitId: o, col: a } = e, c = n.getFilterModel(s, o);
-    return c ? (i.setupCol(c, a), r.getContextValue(ne) || r.setContextValue(ne, !0), !0) : !1;
-  }
-}, de = {
+  type: CommandType.OPERATION,
+  handler: /* @__PURE__ */ __name((accessor, params) => {
+    const contextService = accessor.get(IContextService), sheetsFilterService = accessor.get(SheetsFilterService), sheetsFilterPanelService = accessor.get(SheetsFilterPanelService);
+    accessor.get(ICommandService).syncExecuteCommand(SetCellEditVisibleOperation.id, { visible: !1 });
+    const { unitId, subUnitId, col } = params, filterModel = sheetsFilterService.getFilterModel(unitId, subUnitId);
+    return filterModel ? (sheetsFilterPanelService.setupCol(filterModel, col), contextService.getContextValue(FILTER_PANEL_OPENED_KEY) || contextService.setContextValue(FILTER_PANEL_OPENED_KEY, !0), !0) : !1;
+  }, "handler")
+}, CloseFilterPanelOperation = {
   id: "sheet.operation.close-filter-panel",
-  type: $e.OPERATION,
-  handler: (t) => {
-    const e = t.get(we), r = t.get(j), n = t.get(vr, vt.OPTIONAL);
-    return e.getContextValue(ne) ? (e.setContextValue(ne, !1), n == null || n.focus(), r.terminate()) : !1;
-  }
-}, Dt = {
+  type: CommandType.OPERATION,
+  handler: /* @__PURE__ */ __name((accessor) => {
+    const contextService = accessor.get(IContextService), sheetsFilterPanelService = accessor.get(SheetsFilterPanelService), layoutService = accessor.get(ILayoutService, Quantity.OPTIONAL);
+    return contextService.getContextValue(FILTER_PANEL_OPENED_KEY) ? (contextService.setContextValue(FILTER_PANEL_OPENED_KEY, !1), layoutService == null || layoutService.focus(), sheetsFilterPanelService.terminate()) : !1;
+  }, "handler")
+}, ChangeFilterByOperation = {
   id: "sheet.operation.apply-filter",
-  type: $e.OPERATION,
-  handler: (t, e) => {
-    const { filterBy: r } = e;
-    return t.get(j).changeFilterBy(r);
-  }
+  type: CommandType.OPERATION,
+  handler: /* @__PURE__ */ __name((accessor, params) => {
+    const { filterBy } = params;
+    return accessor.get(SheetsFilterPanelService).changeFilterBy(filterBy);
+  }, "handler")
 };
-var ls = Object.defineProperty, cs = Object.getOwnPropertyDescriptor, us = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? cs(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && ls(e, r, i), i;
-}, ee = (t, e) => (r, n) => e(r, n, t);
-let ie = class extends pe {
-  constructor(t, e, r, n, i, l) {
-    super(), this._sheetsFilterService = t, this._localeService = e, this._commandService = r, this._sheetPermissionCheckPermission = n, this._injector = i, this._sheetsSelectionService = l, this._commandExecutedListener();
+var __defProp$7 = Object.defineProperty, __getOwnPropDesc$7 = Object.getOwnPropertyDescriptor, __decorateClass$7 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$7(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$7(target, key, result), result;
+}, "__decorateClass$7"), __decorateParam$7 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$7"), _a5;
+let SheetsFilterPermissionController = (_a5 = class extends Disposable {
+  constructor(_sheetsFilterService, _localeService, _commandService, _sheetPermissionCheckPermission, _injector, _sheetsSelectionService) {
+    super(), this._sheetsFilterService = _sheetsFilterService, this._localeService = _localeService, this._commandService = _commandService, this._sheetPermissionCheckPermission = _sheetPermissionCheckPermission, this._injector = _injector, this._sheetsSelectionService = _sheetsSelectionService, this._commandExecutedListener();
   }
   _commandExecutedListener() {
     this.disposeWithMe(
-      this._commandService.beforeCommandExecuted((t) => {
-        var e, r, n;
-        if (t.id === me.id) {
-          const i = this._injector.get(Ye), l = pr(i);
-          if (!l) return;
-          const { unitId: s, subUnitId: o, worksheet: a } = l, c = (e = this._sheetsFilterService.getFilterModel(s, o)) == null ? void 0 : e.getRange();
-          let h;
-          if (c)
-            h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
-              rangeTypes: [le],
-              worksheetTypes: [ce, ue]
-            }, [c]);
+      this._commandService.beforeCommandExecuted((command) => {
+        var _a13, _b, _c;
+        if (command.id === SmartToggleSheetsFilterCommand.id) {
+          const univerInstanceService = this._injector.get(IUniverInstanceService), target = getSheetCommandTarget(univerInstanceService);
+          if (!target) return;
+          const { unitId, subUnitId, worksheet } = target, filterRange = (_a13 = this._sheetsFilterService.getFilterModel(unitId, subUnitId)) == null ? void 0 : _a13.getRange();
+          let permission;
+          if (filterRange)
+            permission = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
+              rangeTypes: [RangeProtectionPermissionViewPoint],
+              worksheetTypes: [WorksheetFilterPermission, WorksheetViewPermission]
+            }, [filterRange]);
           else {
-            const d = (r = this._sheetsSelectionService.getCurrentLastSelection()) == null ? void 0 : r.range;
-            if (d) {
-              let g = { ...d };
-              g = d.startColumn === d.endColumn && d.startRow === d.endRow ? mr(g, { left: !0, right: !0, up: !0, down: !0 }, a) : g, h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
-                rangeTypes: [le],
-                worksheetTypes: [ue, ce]
-              }, [g], s, o);
+            const range = (_b = this._sheetsSelectionService.getCurrentLastSelection()) == null ? void 0 : _b.range;
+            if (range) {
+              let newRange = { ...range };
+              newRange = range.startColumn === range.endColumn && range.startRow === range.endRow ? expandToContinuousRange(newRange, { left: !0, right: !0, up: !0, down: !0 }, worksheet) : newRange, permission = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
+                rangeTypes: [RangeProtectionPermissionViewPoint],
+                worksheetTypes: [WorksheetViewPermission, WorksheetFilterPermission]
+              }, [newRange], unitId, subUnitId);
             } else
-              h = this._sheetPermissionCheckPermission.permissionCheckWithoutRange({
-                rangeTypes: [le],
-                worksheetTypes: [ue, ce]
+              permission = this._sheetPermissionCheckPermission.permissionCheckWithoutRange({
+                rangeTypes: [RangeProtectionPermissionViewPoint],
+                worksheetTypes: [WorksheetViewPermission, WorksheetFilterPermission]
               });
           }
-          h || this._sheetPermissionCheckPermission.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.filterErr"));
+          permission || this._sheetPermissionCheckPermission.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.filterErr"));
         }
-        if (t.id === Ae.id) {
-          const i = t.params, { unitId: l, subUnitId: s } = i, o = (n = this._sheetsFilterService.getFilterModel(l, s)) == null ? void 0 : n.getRange(), a = Fe.deepClone(o);
-          a && (a.startColumn = i.col, a.endColumn = i.col, this._sheetPermissionCheckPermission.permissionCheckWithRanges({
-            rangeTypes: [le],
-            worksheetTypes: [ce, ue]
-          }, [a]) || this._sheetPermissionCheckPermission.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.filterErr")));
+        if (command.id === OpenFilterPanelOperation.id) {
+          const params = command.params, { unitId, subUnitId } = params, filterRange = (_c = this._sheetsFilterService.getFilterModel(unitId, subUnitId)) == null ? void 0 : _c.getRange(), colRange = Tools.deepClone(filterRange);
+          colRange && (colRange.startColumn = params.col, colRange.endColumn = params.col, this._sheetPermissionCheckPermission.permissionCheckWithRanges({
+            rangeTypes: [RangeProtectionPermissionViewPoint],
+            worksheetTypes: [WorksheetFilterPermission, WorksheetViewPermission]
+          }, [colRange]) || this._sheetPermissionCheckPermission.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.filterErr")));
         }
       })
     );
   }
-};
-ie = us([
-  ee(0, E(k)),
-  ee(1, E(K)),
-  ee(2, W),
-  ee(3, E(dr)),
-  ee(4, E(X)),
-  ee(5, E(fr))
-], ie);
-var b = function() {
-  return b = Object.assign || function(t) {
-    for (var e, r = 1, n = arguments.length; r < n; r++) {
-      e = arguments[r];
-      for (var i in e) Object.prototype.hasOwnProperty.call(e, i) && (t[i] = e[i]);
+}, __name(_a5, "SheetsFilterPermissionController"), _a5);
+SheetsFilterPermissionController = __decorateClass$7([
+  __decorateParam$7(0, Inject(SheetsFilterService)),
+  __decorateParam$7(1, Inject(LocaleService)),
+  __decorateParam$7(2, ICommandService),
+  __decorateParam$7(3, Inject(SheetPermissionCheckController)),
+  __decorateParam$7(4, Inject(Injector)),
+  __decorateParam$7(5, Inject(SheetsSelectionsService))
+], SheetsFilterPermissionController);
+var __assign = function() {
+  return __assign = Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) Object.prototype.hasOwnProperty.call(s, p) && (t[p] = s[p]);
     }
     return t;
-  }, b.apply(this, arguments);
-}, hs = function(t, e) {
-  var r = {};
-  for (var n in t) Object.prototype.hasOwnProperty.call(t, n) && e.indexOf(n) < 0 && (r[n] = t[n]);
-  if (t != null && typeof Object.getOwnPropertySymbols == "function")
-    for (var i = 0, n = Object.getOwnPropertySymbols(t); i < n.length; i++)
-      e.indexOf(n[i]) < 0 && Object.prototype.propertyIsEnumerable.call(t, n[i]) && (r[n[i]] = t[n[i]]);
-  return r;
-}, xt = Lt(function(t, e) {
-  var r = t.icon, n = t.id, i = t.className, l = t.extend, s = hs(t, ["icon", "id", "className", "extend"]), o = "univerjs-icon univerjs-icon-".concat(n, " ").concat(i || "").trim(), a = es("_".concat(ps()));
-  return Bt(r, "".concat(n), { defIds: r.defIds, idSuffix: a.current }, b({ ref: e, className: o }, s), l);
+  }, __assign.apply(this, arguments);
+}, __rest = function(s, e) {
+  var t = {};
+  for (var p in s) Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0 && (t[p] = s[p]);
+  if (s != null && typeof Object.getOwnPropertySymbols == "function")
+    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
+      e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]) && (t[p[i]] = s[p[i]]);
+  return t;
+}, IconBase = forwardRef(function(props, ref) {
+  var icon = props.icon, id = props.id, className = props.className, extend = props.extend, restProps = __rest(props, ["icon", "id", "className", "extend"]), cls = "univerjs-icon univerjs-icon-".concat(id, " ").concat(className || "").trim(), idSuffix = useRef("_".concat(generateShortUuid()));
+  return render(icon, "".concat(id), { defIds: icon.defIds, idSuffix: idSuffix.current }, __assign({ ref, className: cls }, restProps), extend);
 });
-function Bt(t, e, r, n, i) {
-  return Mt(t.tag, b(b({ key: e }, ds(t, r, i)), n), (fs(t, r).children || []).map(function(l, s) {
-    return Bt(l, "".concat(e, "-").concat(t.tag, "-").concat(s), r, void 0, i);
+function render(node, id, runtimeProps, rootProps, extend) {
+  return createElement(node.tag, __assign(__assign({ key: id }, replaceRuntimeIdsAndExtInAttrs(node, runtimeProps, extend)), rootProps), (replaceRuntimeIdsInDefs(node, runtimeProps).children || []).map(function(child, index) {
+    return render(child, "".concat(id, "-").concat(node.tag, "-").concat(index), runtimeProps, void 0, extend);
   }));
 }
-function ds(t, e, r) {
-  var n = b({}, t.attrs);
-  r != null && r.colorChannel1 && n.fill === "colorChannel1" && (n.fill = r.colorChannel1);
-  var i = e.defIds;
-  return !i || i.length === 0 || (t.tag === "use" && n["xlink:href"] && (n["xlink:href"] = n["xlink:href"] + e.idSuffix), Object.entries(n).forEach(function(l) {
-    var s = l[0], o = l[1];
-    typeof o == "string" && (n[s] = o.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
-  })), n;
+__name(render, "render");
+function replaceRuntimeIdsAndExtInAttrs(node, runtimeProps, extend) {
+  var attrs = __assign({}, node.attrs);
+  extend != null && extend.colorChannel1 && attrs.fill === "colorChannel1" && (attrs.fill = extend.colorChannel1);
+  var defIds = runtimeProps.defIds;
+  return !defIds || defIds.length === 0 || (node.tag === "use" && attrs["xlink:href"] && (attrs["xlink:href"] = attrs["xlink:href"] + runtimeProps.idSuffix), Object.entries(attrs).forEach(function(_a13) {
+    var key = _a13[0], value = _a13[1];
+    typeof value == "string" && (attrs[key] = value.replace(/url\(#(.*)\)/, "url(#$1".concat(runtimeProps.idSuffix, ")")));
+  })), attrs;
 }
-function fs(t, e) {
-  var r, n = e.defIds;
-  return !n || n.length === 0 ? t : t.tag === "defs" && (!((r = t.children) === null || r === void 0) && r.length) ? b(b({}, t), { children: t.children.map(function(i) {
-    return typeof i.attrs.id == "string" && n && n.indexOf(i.attrs.id) > -1 ? b(b({}, i), { attrs: b(b({}, i.attrs), { id: i.attrs.id + e.idSuffix }) }) : i;
-  }) }) : t;
+__name(replaceRuntimeIdsAndExtInAttrs, "replaceRuntimeIdsAndExtInAttrs");
+function replaceRuntimeIdsInDefs(node, runtimeProps) {
+  var _a13, defIds = runtimeProps.defIds;
+  return !defIds || defIds.length === 0 ? node : node.tag === "defs" && (!((_a13 = node.children) === null || _a13 === void 0) && _a13.length) ? __assign(__assign({}, node), { children: node.children.map(function(child) {
+    return typeof child.attrs.id == "string" && defIds && defIds.indexOf(child.attrs.id) > -1 ? __assign(__assign({}, child), { attrs: __assign(__assign({}, child.attrs), { id: child.attrs.id + runtimeProps.idSuffix }) }) : child;
+  }) }) : node;
 }
-function ps() {
+__name(replaceRuntimeIdsInDefs, "replaceRuntimeIdsInDefs");
+function generateShortUuid() {
   return Math.random().toString(36).substring(2, 8);
 }
-xt.displayName = "UniverIcon";
-var ms = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M3.32182 2.60967C2.98161 2.60967 2.79671 3.0074 3.01601 3.2675L6.85819 7.8246C6.94943 7.93282 6.99947 8.06981 6.99947 8.21136V12.7338C6.99947 12.898 7.0998 13.0455 7.2525 13.1058L8.73833 13.6928C9.00085 13.7965 9.28531 13.6031 9.28531 13.3208V8.21136C9.28531 8.06981 9.33535 7.93282 9.42659 7.8246L13.2688 3.2675C13.4881 3.0074 13.3032 2.60967 12.963 2.60967H3.32182ZM2.09858 4.04101C1.22139 3.0006 1.96097 1.40967 3.32182 1.40967H12.963C14.3238 1.40967 15.0634 3.0006 14.1862 4.04101L10.4853 8.43054V13.3208C10.4853 14.4498 9.34747 15.2237 8.29742 14.8089L6.81158 14.2219C6.20078 13.9806 5.79947 13.3905 5.79947 12.7338V8.43054L2.09858 4.04101Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Vt = Lt(function(t, e) {
-  return Mt(xt, Object.assign({}, t, {
+__name(generateShortUuid, "generateShortUuid");
+IconBase.displayName = "UniverIcon";
+var element = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M3.32182 2.60967C2.98161 2.60967 2.79671 3.0074 3.01601 3.2675L6.85819 7.8246C6.94943 7.93282 6.99947 8.06981 6.99947 8.21136V12.7338C6.99947 12.898 7.0998 13.0455 7.2525 13.1058L8.73833 13.6928C9.00085 13.7965 9.28531 13.6031 9.28531 13.3208V8.21136C9.28531 8.06981 9.33535 7.93282 9.42659 7.8246L13.2688 3.2675C13.4881 3.0074 13.3032 2.60967 12.963 2.60967H3.32182ZM2.09858 4.04101C1.22139 3.0006 1.96097 1.40967 3.32182 1.40967H12.963C14.3238 1.40967 15.0634 3.0006 14.1862 4.04101L10.4853 8.43054V13.3208C10.4853 14.4498 9.34747 15.2237 8.29742 14.8089L6.81158 14.2219C6.20078 13.9806 5.79947 13.3905 5.79947 12.7338V8.43054L2.09858 4.04101Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, FilterSingle = forwardRef(function(props, ref) {
+  return createElement(IconBase, Object.assign({}, props, {
     id: "filter-single",
-    ref: e,
-    icon: ms
+    ref,
+    icon: element
   }));
 });
-Vt.displayName = "FilterSingle";
-var xe = { exports: {} }, ae = {};
-/**
- * @license React
- * react-jsx-runtime.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-var ut;
-function _s() {
-  if (ut) return ae;
-  ut = 1;
-  var t = zr, e = Symbol.for("react.element"), r = Symbol.for("react.fragment"), n = Object.prototype.hasOwnProperty, i = t.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, l = { key: !0, ref: !0, __self: !0, __source: !0 };
-  function s(o, a, c) {
-    var h, d = {}, g = null, m = null;
-    c !== void 0 && (g = "" + c), a.key !== void 0 && (g = "" + a.key), a.ref !== void 0 && (m = a.ref);
-    for (h in a) n.call(a, h) && !l.hasOwnProperty(h) && (d[h] = a[h]);
-    if (o && o.defaultProps) for (h in a = o.defaultProps, a) d[h] === void 0 && (d[h] = a[h]);
-    return { $$typeof: e, type: o, key: g, ref: m, props: d, _owner: i.current };
-  }
-  return ae.Fragment = r, ae.jsx = s, ae.jsxs = s, ae;
-}
-var ht;
-function Ss() {
-  return ht || (ht = 1, xe.exports = _s()), xe.exports;
-}
-var p = Ss();
-const gs = "univer-sheets-filter-panel", vs = "univer-sheets-filter-panel-header", Es = "univer-sheets-filter-panel-content", Ts = "univer-sheets-filter-panel-select-all", Fs = "univer-sheets-filter-panel-select-all-count", Cs = "univer-sheets-filter-panel-values-container", Ns = "univer-input-affix-wrapper", Ps = "univer-select", Os = "univer-radio-group", Rs = "univer-sheets-filter-panel-values-find", Is = "univer-sheets-filter-panel-values-list", ys = "univer-sheets-filter-panel-values-list-inner-container", As = "univer-sheets-filter-panel-values-virtual", bs = "univer-sheets-filter-panel-values-item", Ls = "univer-sheets-filter-panel-values-item-inner", Ms = "univer-sheets-filter-panel-values-item-count", $s = "univer-sheets-filter-panel-values-item-exclude-button", ws = "univer-sheets-filter-panel-values-item-text", Us = "univer-sheets-filter-panel-conditions-container", Hs = "univer-sheets-filter-panel-conditions-container-inner", Ds = "univer-sheets-filter-panel-conditions-desc", xs = "univer-sheets-filter-panel-footer", Bs = "univer-sheets-filter-panel-footer-primary-buttons", Vs = "univer-button", js = "univer-input", Ws = "univer-form-dual-column-layout", ks = "univer-sheets-filter-tree-node", Qs = "univer-sheets-filter-tree-node-filter-only", Gs = "univer-sheets-filter-tree-node-attach", C = {
-  sheetsFilterPanel: gs,
-  sheetsFilterPanelHeader: vs,
-  sheetsFilterPanelContent: Es,
-  sheetsFilterPanelSelectAll: Ts,
-  sheetsFilterPanelSelectAllCount: Fs,
-  sheetsFilterPanelValuesContainer: Cs,
-  inputAffixWrapper: Ns,
-  select: Ps,
-  radioGroup: Os,
-  sheetsFilterPanelValuesFind: Rs,
-  sheetsFilterPanelValuesList: Is,
-  sheetsFilterPanelValuesListInnerContainer: ys,
-  sheetsFilterPanelValuesVirtual: As,
-  sheetsFilterPanelValuesItem: bs,
-  sheetsFilterPanelValuesItemInner: Ls,
-  sheetsFilterPanelValuesItemCount: Ms,
-  sheetsFilterPanelValuesItemExcludeButton: $s,
-  sheetsFilterPanelValuesItemText: ws,
-  sheetsFilterPanelConditionsContainer: Us,
-  sheetsFilterPanelConditionsContainerInner: Hs,
-  sheetsFilterPanelConditionsDesc: Ds,
-  sheetsFilterPanelFooter: xs,
-  sheetsFilterPanelFooterPrimaryButtons: Bs,
-  button: Vs,
-  input: js,
-  formDualColumnLayout: Ws,
-  sheetsFilterTreeNode: ks,
-  sheetsFilterTreeNodeFilterOnly: Qs,
-  sheetsFilterTreeNodeAttach: Gs
+FilterSingle.displayName = "FilterSingle";
+const sheetsFilterPanel = "univer-sheets-filter-panel", sheetsFilterPanelHeader = "univer-sheets-filter-panel-header", sheetsFilterPanelContent = "univer-sheets-filter-panel-content", sheetsFilterPanelSelectAll = "univer-sheets-filter-panel-select-all", sheetsFilterPanelSelectAllCount = "univer-sheets-filter-panel-select-all-count", sheetsFilterPanelValuesContainer = "univer-sheets-filter-panel-values-container", inputAffixWrapper = "univer-input-affix-wrapper", select = "univer-select", radioGroup = "univer-radio-group", sheetsFilterPanelValuesFind = "univer-sheets-filter-panel-values-find", sheetsFilterPanelValuesList = "univer-sheets-filter-panel-values-list", sheetsFilterPanelValuesListInnerContainer = "univer-sheets-filter-panel-values-list-inner-container", sheetsFilterPanelValuesVirtual = "univer-sheets-filter-panel-values-virtual", sheetsFilterPanelValuesItem = "univer-sheets-filter-panel-values-item", sheetsFilterPanelValuesItemInner = "univer-sheets-filter-panel-values-item-inner", sheetsFilterPanelValuesItemCount = "univer-sheets-filter-panel-values-item-count", sheetsFilterPanelValuesItemExcludeButton = "univer-sheets-filter-panel-values-item-exclude-button", sheetsFilterPanelValuesItemText = "univer-sheets-filter-panel-values-item-text", sheetsFilterPanelConditionsContainer = "univer-sheets-filter-panel-conditions-container", sheetsFilterPanelConditionsContainerInner = "univer-sheets-filter-panel-conditions-container-inner", sheetsFilterPanelConditionsDesc = "univer-sheets-filter-panel-conditions-desc", sheetsFilterPanelFooter = "univer-sheets-filter-panel-footer", sheetsFilterPanelFooterPrimaryButtons = "univer-sheets-filter-panel-footer-primary-buttons", button = "univer-button", input = "univer-input", formDualColumnLayout = "univer-form-dual-column-layout", sheetsFilterTreeNode = "univer-sheets-filter-tree-node", sheetsFilterTreeNodeFilterOnly = "univer-sheets-filter-tree-node-filter-only", sheetsFilterTreeNodeAttach = "univer-sheets-filter-tree-node-attach", styles = {
+  sheetsFilterPanel,
+  sheetsFilterPanelHeader,
+  sheetsFilterPanelContent,
+  sheetsFilterPanelSelectAll,
+  sheetsFilterPanelSelectAllCount,
+  sheetsFilterPanelValuesContainer,
+  inputAffixWrapper,
+  select,
+  radioGroup,
+  sheetsFilterPanelValuesFind,
+  sheetsFilterPanelValuesList,
+  sheetsFilterPanelValuesListInnerContainer,
+  sheetsFilterPanelValuesVirtual,
+  sheetsFilterPanelValuesItem,
+  sheetsFilterPanelValuesItemInner,
+  sheetsFilterPanelValuesItemCount,
+  sheetsFilterPanelValuesItemExcludeButton,
+  sheetsFilterPanelValuesItemText,
+  sheetsFilterPanelConditionsContainer,
+  sheetsFilterPanelConditionsContainerInner,
+  sheetsFilterPanelConditionsDesc,
+  sheetsFilterPanelFooter,
+  sheetsFilterPanelFooterPrimaryButtons,
+  button,
+  input,
+  formDualColumnLayout,
+  sheetsFilterTreeNode,
+  sheetsFilterTreeNodeFilterOnly,
+  sheetsFilterTreeNodeAttach
 };
-function Ys(t) {
-  var m, T;
-  const { model: e } = t, r = te(K), n = V(e.conditionItem$, void 0), i = V(e.filterConditionFormParams$, void 0), l = i != null && i.and ? "AND" : "OR", s = D((v) => {
-    e.onConditionFormChange({ and: v === "AND" });
-  }, [e]), o = qs(r), a = D((v) => {
-    e.onPrimaryConditionChange(v);
-  }, [e]), c = Ks(r), h = D((v) => {
-    e.onConditionFormChange(v);
-  }, [e]), d = r.t("sheets-filter.panel.input-values-placeholder");
-  function g(v, P, F) {
-    const I = f.getItemByOperator(v).numOfParameters === 1;
-    return /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
-      F === "operator2" && /* @__PURE__ */ p.jsxs(Yr, { value: l, onChange: s, children: [
-        /* @__PURE__ */ p.jsx(lt, { value: "AND", children: r.t("sheets-filter.panel.and") }),
-        /* @__PURE__ */ p.jsx(lt, { value: "OR", children: r.t("sheets-filter.panel.or") })
+function FilterByCondition(props) {
+  var _a13, _b;
+  const { model } = props, localeService = useDependency(LocaleService), condition = useObservable(model.conditionItem$, void 0), formParams = useObservable(model.filterConditionFormParams$, void 0), radioValue = formParams != null && formParams.and ? "AND" : "OR", onRadioChange = useCallback((key) => {
+    model.onConditionFormChange({ and: key === "AND" });
+  }, [model]), primaryOptions = usePrimaryOptions(localeService), onPrimaryConditionChange = useCallback((value) => {
+    model.onPrimaryConditionChange(value);
+  }, [model]), secondaryOptions = useSecondaryOptions(localeService), onFormParamsChange = useCallback((diffParams) => {
+    model.onConditionFormChange(diffParams);
+  }, [model]), placeholder = localeService.t("sheets-filter.panel.input-values-placeholder");
+  function renderSecondaryCondition(operator, val, name) {
+    const shouldRenderInput = FilterConditionItems.getItemByOperator(operator).numOfParameters === 1;
+    return /* @__PURE__ */ jsxs(Fragment, { children: [
+      name === "operator2" && /* @__PURE__ */ jsxs(RadioGroup, { value: radioValue, onChange: onRadioChange, children: [
+        /* @__PURE__ */ jsx(Radio, { value: "AND", children: localeService.t("sheets-filter.panel.and") }),
+        /* @__PURE__ */ jsx(Radio, { value: "OR", children: localeService.t("sheets-filter.panel.or") })
       ] }),
-      /* @__PURE__ */ p.jsx(at, { value: v, options: c, onChange: (R) => h({ [F]: R }) }),
-      I && /* @__PURE__ */ p.jsx("div", { children: /* @__PURE__ */ p.jsx(At, { value: P, placeholder: d, onChange: (R) => h({ [F === "operator1" ? "val1" : "val2"]: R }) }) })
+      /* @__PURE__ */ jsx(Select, { value: operator, options: secondaryOptions, onChange: /* @__PURE__ */ __name((operator2) => onFormParamsChange({ [name]: operator2 }), "onChange") }),
+      shouldRenderInput && /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(Input, { value: val, placeholder, onChange: /* @__PURE__ */ __name((value) => onFormParamsChange({ [name === "operator1" ? "val1" : "val2"]: value }), "onChange") }) })
     ] });
   }
-  return /* @__PURE__ */ p.jsx("div", { className: C.sheetsFilterPanelConditionsContainer, children: n && i && /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
-    /* @__PURE__ */ p.jsx(at, { value: n.operator, options: o, onChange: a }),
-    f.getItemByOperator(n.operator).numOfParameters !== 0 ? /* @__PURE__ */ p.jsxs("div", { className: C.sheetsFilterPanelConditionsContainerInner, children: [
-      n.numOfParameters >= 1 && g(i.operator1, (m = i.val1) != null ? m : "", "operator1"),
-      n.numOfParameters >= 2 && g(i.operator2, (T = i.val2) != null ? T : "", "operator2"),
-      /* @__PURE__ */ p.jsxs("div", { className: C.sheetsFilterPanelConditionsDesc, children: [
-        r.t("sheets-filter.panel.?"),
-        /* @__PURE__ */ p.jsx("br", {}),
-        r.t("sheets-filter.panel.*")
+  return __name(renderSecondaryCondition, "renderSecondaryCondition"), /* @__PURE__ */ jsx("div", { className: styles.sheetsFilterPanelConditionsContainer, children: condition && formParams && /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx(Select, { value: condition.operator, options: primaryOptions, onChange: onPrimaryConditionChange }),
+    FilterConditionItems.getItemByOperator(condition.operator).numOfParameters !== 0 ? /* @__PURE__ */ jsxs("div", { className: styles.sheetsFilterPanelConditionsContainerInner, children: [
+      condition.numOfParameters >= 1 && renderSecondaryCondition(formParams.operator1, (_a13 = formParams.val1) != null ? _a13 : "", "operator1"),
+      condition.numOfParameters >= 2 && renderSecondaryCondition(formParams.operator2, (_b = formParams.val2) != null ? _b : "", "operator2"),
+      /* @__PURE__ */ jsxs("div", { className: styles.sheetsFilterPanelConditionsDesc, children: [
+        localeService.t("sheets-filter.panel.?"),
+        /* @__PURE__ */ jsx("br", {}),
+        localeService.t("sheets-filter.panel.*")
       ] })
     ] }) : null
   ] }) });
 }
-function qs(t) {
-  const e = t.getCurrentLocale();
-  return et(
+__name(FilterByCondition, "FilterByCondition");
+function usePrimaryOptions(localeService) {
+  const locale = localeService.getCurrentLocale();
+  return useMemo(
     () => [
       {
         options: [
-          { label: t.t(f.NONE.label), value: f.NONE.operator }
+          { label: localeService.t(FilterConditionItems.NONE.label), value: FilterConditionItems.NONE.operator }
         ]
       },
       {
         options: [
-          { label: t.t(f.EMPTY.label), value: f.EMPTY.operator },
-          { label: t.t(f.NOT_EMPTY.label), value: f.NOT_EMPTY.operator }
+          { label: localeService.t(FilterConditionItems.EMPTY.label), value: FilterConditionItems.EMPTY.operator },
+          { label: localeService.t(FilterConditionItems.NOT_EMPTY.label), value: FilterConditionItems.NOT_EMPTY.operator }
         ]
       },
       {
         options: [
-          { 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 }
+          { label: localeService.t(FilterConditionItems.TEXT_CONTAINS.label), value: FilterConditionItems.TEXT_CONTAINS.operator },
+          { label: localeService.t(FilterConditionItems.DOES_NOT_CONTAIN.label), value: FilterConditionItems.DOES_NOT_CONTAIN.operator },
+          { label: localeService.t(FilterConditionItems.STARTS_WITH.label), value: FilterConditionItems.STARTS_WITH.operator },
+          { label: localeService.t(FilterConditionItems.ENDS_WITH.label), value: FilterConditionItems.ENDS_WITH.operator },
+          { label: localeService.t(FilterConditionItems.EQUALS.label), value: FilterConditionItems.EQUALS.operator }
         ]
       },
       {
         options: [
-          { 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 }
+          { label: localeService.t(FilterConditionItems.GREATER_THAN.label), value: FilterConditionItems.GREATER_THAN.operator },
+          { label: localeService.t(FilterConditionItems.GREATER_THAN_OR_EQUAL.label), value: FilterConditionItems.GREATER_THAN_OR_EQUAL.operator },
+          { label: localeService.t(FilterConditionItems.LESS_THAN.label), value: FilterConditionItems.LESS_THAN.operator },
+          { label: localeService.t(FilterConditionItems.LESS_THAN_OR_EQUAL.label), value: FilterConditionItems.LESS_THAN_OR_EQUAL.operator },
+          { label: localeService.t(FilterConditionItems.EQUAL.label), value: FilterConditionItems.EQUAL.operator },
+          { label: localeService.t(FilterConditionItems.NOT_EQUAL.label), value: FilterConditionItems.NOT_EQUAL.operator },
+          { label: localeService.t(FilterConditionItems.BETWEEN.label), value: FilterConditionItems.BETWEEN.operator },
+          { label: localeService.t(FilterConditionItems.NOT_BETWEEN.label), value: FilterConditionItems.NOT_BETWEEN.operator }
         ]
       },
       {
         options: [
-          { label: t.t(f.CUSTOM.label), value: f.CUSTOM.operator }
+          { label: localeService.t(FilterConditionItems.CUSTOM.label), value: FilterConditionItems.CUSTOM.operator }
         ]
       }
     ],
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [e, t]
+    [locale, localeService]
   );
 }
-function Ks(t) {
-  const e = t.getCurrentLocale();
-  return et(
-    () => f.ALL_CONDITIONS.filter((r) => r.numOfParameters !== 2).map((r) => ({ label: t.t(r.label), value: r.operator })),
+__name(usePrimaryOptions, "usePrimaryOptions");
+function useSecondaryOptions(localeService) {
+  const locale = localeService.getCurrentLocale();
+  return useMemo(
+    () => FilterConditionItems.ALL_CONDITIONS.filter((c) => c.numOfParameters !== 2).map((c) => ({ label: localeService.t(c.label), value: c.operator })),
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [e, t]
+    [locale, localeService]
   );
 }
-function Xs(t) {
-  const { model: e } = t, r = te(K), n = V(e.searchString$, "", !0), i = V(e.filterItems$, void 0, !0), l = r.t("sheets-filter.panel.filter-only"), s = je(i), o = s.checked > 0 && s.unchecked === 0, a = s.checked > 0 && s.unchecked > 0, c = e.treeMapCache, h = D(() => {
-    e.onCheckAllToggled(!o);
-  }, [e, o]), d = D((m) => {
-    e.setSearchString(m);
-  }, [e]);
-  function g(m) {
-    let T = [];
-    return m.forEach((v) => {
-      v.checked && T.push(v.key), v.children && (T = T.concat(g(v.children)));
-    }), T;
-  }
-  return /* @__PURE__ */ p.jsxs("div", { className: C.sheetsFilterPanelValuesContainer, children: [
-    /* @__PURE__ */ p.jsx(At, { autoFocus: !0, value: n, placeholder: r.t("sheets-filter.panel.search-placeholder"), onChange: d }),
-    /* @__PURE__ */ p.jsxs("div", { className: C.sheetsFilterPanelValuesList, children: [
-      /* @__PURE__ */ p.jsx("div", { className: C.sheetsFilterPanelValuesItem, children: /* @__PURE__ */ p.jsxs("div", { className: C.sheetsFilterPanelValuesItemInner, children: [
-        /* @__PURE__ */ p.jsx(
-          qr,
+__name(useSecondaryOptions, "useSecondaryOptions");
+function FilterByValue(props) {
+  const { model } = props, localeService = useDependency(LocaleService), searchText = useObservable(model.searchString$, "", !0), items = useObservable(model.filterItems$, void 0, !0), filterOnly = localeService.t("sheets-filter.panel.filter-only"), stat = statisticFilterByValueItems(items), allChecked = stat.checked > 0 && stat.unchecked === 0, indeterminate = stat.checked > 0 && stat.unchecked > 0, treeMap = model.treeMapCache, onCheckAllToggled = useCallback(() => {
+    model.onCheckAllToggled(!allChecked);
+  }, [model, allChecked]), onSearchValueChange = useCallback((str) => {
+    model.setSearchString(str);
+  }, [model]);
+  function extractCheckedKeys(items2) {
+    let checkedKeys = [];
+    return items2.forEach((item) => {
+      item.checked && checkedKeys.push(item.key), item.children && (checkedKeys = checkedKeys.concat(extractCheckedKeys(item.children)));
+    }), checkedKeys;
+  }
+  return __name(extractCheckedKeys, "extractCheckedKeys"), /* @__PURE__ */ jsxs("div", { className: styles.sheetsFilterPanelValuesContainer, children: [
+    /* @__PURE__ */ jsx(Input, { autoFocus: !0, value: searchText, placeholder: localeService.t("sheets-filter.panel.search-placeholder"), onChange: onSearchValueChange }),
+    /* @__PURE__ */ jsxs("div", { className: styles.sheetsFilterPanelValuesList, children: [
+      /* @__PURE__ */ jsx("div", { className: styles.sheetsFilterPanelValuesItem, children: /* @__PURE__ */ jsxs("div", { className: styles.sheetsFilterPanelValuesItemInner, children: [
+        /* @__PURE__ */ jsx(
+          Checkbox,
           {
-            indeterminate: a,
-            disabled: i.length === 0,
-            checked: o,
-            onChange: h
+            indeterminate,
+            disabled: items.length === 0,
+            checked: allChecked,
+            onChange: onCheckAllToggled
           }
         ),
-        /* @__PURE__ */ p.jsx("span", { className: C.sheetsFilterPanelValuesItemText, children: `${r.t("sheets-filter.panel.select-all")}` }),
-        /* @__PURE__ */ p.jsx("span", { className: C.sheetsFilterPanelValuesItemCount, children: `(${s.checked}/${s.checked + s.unchecked})` })
+        /* @__PURE__ */ jsx("span", { className: styles.sheetsFilterPanelValuesItemText, children: `${localeService.t("sheets-filter.panel.select-all")}` }),
+        /* @__PURE__ */ jsx("span", { className: styles.sheetsFilterPanelValuesItemCount, children: `(${stat.checked}/${stat.checked + stat.unchecked})` })
       ] }) }),
-      /* @__PURE__ */ p.jsx("div", { className: C.sheetsFilterPanelValuesVirtual, children: /* @__PURE__ */ p.jsx(
-        Kr,
+      /* @__PURE__ */ jsx("div", { className: styles.sheetsFilterPanelValuesVirtual, children: /* @__PURE__ */ jsx(
+        Tree,
         {
-          data: i,
+          data: items,
           defaultExpandAll: !1,
-          valueGroup: g(i),
+          valueGroup: extractCheckedKeys(items),
           height: 180,
-          onChange: (m) => {
-            e.onFilterCheckToggled(m);
-          },
-          defaultCache: c,
+          onChange: /* @__PURE__ */ __name((node) => {
+            model.onFilterCheckToggled(node);
+          }, "onChange"),
+          defaultCache: treeMap,
           itemHeight: 28,
-          treeNodeClassName: C.sheetsFilterTreeNode,
-          attachRender: (m) => /* @__PURE__ */ p.jsxs("div", { className: C.sheetsFilterTreeNodeAttach, children: [
-            /* @__PURE__ */ p.jsx("span", { className: C.sheetsFilterPanelValuesItemCount, children: `(${m.count})` }),
-            /* @__PURE__ */ p.jsx(
-              Ce,
+          treeNodeClassName: styles.sheetsFilterTreeNode,
+          attachRender: /* @__PURE__ */ __name((item) => /* @__PURE__ */ jsxs("div", { className: styles.sheetsFilterTreeNodeAttach, children: [
+            /* @__PURE__ */ jsx("span", { className: styles.sheetsFilterPanelValuesItemCount, children: `(${item.count})` }),
+            /* @__PURE__ */ jsx(
+              Button,
               {
-                className: C.sheetsFilterTreeNodeFilterOnly,
+                className: styles.sheetsFilterTreeNodeFilterOnly,
                 size: "small",
                 type: "link",
-                onClick: () => {
-                  const T = [];
-                  m.children ? m.children.forEach((v) => {
-                    v.children ? v.children.forEach((P) => {
-                      T.push(P.key);
-                    }) : T.push(v.key);
-                  }) : T.push(m.key), e.onFilterOnly(T);
-                },
-                children: l
+                onClick: /* @__PURE__ */ __name(() => {
+                  const filterValues = [];
+                  item.children ? item.children.forEach((child) => {
+                    child.children ? child.children.forEach((subChild) => {
+                      filterValues.push(subChild.key);
+                    }) : filterValues.push(child.key);
+                  }) : filterValues.push(item.key), model.onFilterOnly(filterValues);
+                }, "onClick"),
+                children: filterOnly
               }
             )
-          ] })
+          ] }), "attachRender")
         }
       ) })
     ] })
   ] });
 }
-function Zs() {
-  var P;
-  const t = te(j), e = te(K), r = te(W), n = V(t.filterBy$, void 0, !0), i = V(t.filterByModel$, void 0, !1), l = V(() => (i == null ? void 0 : i.canApply$) || _e(!1), void 0, !1, [i]), s = Js(e), o = !V(t.hasCriteria$), a = D((F) => {
-    r.executeCommand(Dt.id, { filterBy: F });
-  }, [r]), c = D(async () => {
-    await (i == null ? void 0 : i.clear()), r.executeCommand(de.id);
-  }, [i, r]), h = D(() => {
-    r.executeCommand(de.id);
-  }, [r]), d = D(async () => {
-    await (i == null ? void 0 : i.apply()), r.executeCommand(de.id);
-  }, [i, r]), m = (P = te(k).activeFilterModel) == null ? void 0 : P.getRange(), T = t.col, v = Er(yr.FILTER_PANEL_EMBED_POINT);
-  return /* @__PURE__ */ p.jsxs("div", { className: C.sheetsFilterPanel, children: [
-    /* @__PURE__ */ p.jsx(
-      Tr,
+__name(FilterByValue, "FilterByValue");
+function FilterPanel() {
+  var _a13;
+  const sheetsFilterPanelService = useDependency(SheetsFilterPanelService), localeService = useDependency(LocaleService), commandService = useDependency(ICommandService), filterBy = useObservable(sheetsFilterPanelService.filterBy$, void 0, !0), filterByModel = useObservable(sheetsFilterPanelService.filterByModel$, void 0, !1), canApply = useObservable(() => (filterByModel == null ? void 0 : filterByModel.canApply$) || of(!1), void 0, !1, [filterByModel]), options = useFilterByOptions(localeService), clearFilterDisabled = !useObservable(sheetsFilterPanelService.hasCriteria$), onFilterByTypeChange = useCallback((value) => {
+    commandService.executeCommand(ChangeFilterByOperation.id, { filterBy: value });
+  }, [commandService]), onClearCriteria = useCallback(async () => {
+    await (filterByModel == null ? void 0 : filterByModel.clear()), commandService.executeCommand(CloseFilterPanelOperation.id);
+  }, [filterByModel, commandService]), onCancel = useCallback(() => {
+    commandService.executeCommand(CloseFilterPanelOperation.id);
+  }, [commandService]), onApply = useCallback(async () => {
+    await (filterByModel == null ? void 0 : filterByModel.apply()), commandService.executeCommand(CloseFilterPanelOperation.id);
+  }, [filterByModel, commandService]), range = (_a13 = useDependency(SheetsFilterService).activeFilterModel) == null ? void 0 : _a13.getRange(), colIndex = sheetsFilterPanelService.col, FilterPanelEmbedPointPart = useComponentsOfPart(SheetsUIPart.FILTER_PANEL_EMBED_POINT);
+  return /* @__PURE__ */ jsxs("div", { className: styles.sheetsFilterPanel, children: [
+    /* @__PURE__ */ jsx(
+      ComponentContainer,
       {
-        components: v,
-        sharedProps: { range: m, colIndex: T, onClose: h }
+        components: FilterPanelEmbedPointPart,
+        sharedProps: { range, colIndex, onClose: onCancel }
       }
     ),
-    /* @__PURE__ */ p.jsx("div", { className: C.sheetsFilterPanelHeader, children: /* @__PURE__ */ p.jsx(Xr, { value: n, options: s, onChange: (F) => a(F) }) }),
-    i ? /* @__PURE__ */ p.jsx("div", { className: C.sheetsFilterPanelContent, children: n === Re.VALUES ? /* @__PURE__ */ p.jsx(Xs, { model: i }) : /* @__PURE__ */ p.jsx(Ys, { model: i }) }) : /* @__PURE__ */ p.jsx("div", { style: { flex: 1 } }),
-    /* @__PURE__ */ p.jsxs("div", { className: C.sheetsFilterPanelFooter, children: [
-      /* @__PURE__ */ p.jsx(Ce, { type: "link", onClick: c, disabled: o, children: e.t("sheets-filter.panel.clear-filter") }),
-      /* @__PURE__ */ p.jsxs("span", { className: C.sheetsFilterPanelFooterPrimaryButtons, children: [
-        /* @__PURE__ */ p.jsx(Ce, { type: "default", onClick: h, children: e.t("sheets-filter.panel.cancel") }),
-        /* @__PURE__ */ p.jsx(Ce, { disabled: !l, type: "primary", onClick: d, children: e.t("sheets-filter.panel.confirm") })
+    /* @__PURE__ */ jsx("div", { className: styles.sheetsFilterPanelHeader, children: /* @__PURE__ */ jsx(Segmented, { value: filterBy, options, onChange: /* @__PURE__ */ __name((value) => onFilterByTypeChange(value), "onChange") }) }),
+    filterByModel ? /* @__PURE__ */ jsx("div", { className: styles.sheetsFilterPanelContent, children: filterBy === FilterBy.VALUES ? /* @__PURE__ */ jsx(FilterByValue, { model: filterByModel }) : /* @__PURE__ */ jsx(FilterByCondition, { model: filterByModel }) }) : /* @__PURE__ */ jsx("div", { style: { flex: 1 } }),
+    /* @__PURE__ */ jsxs("div", { className: styles.sheetsFilterPanelFooter, children: [
+      /* @__PURE__ */ jsx(Button, { type: "link", onClick: onClearCriteria, disabled: clearFilterDisabled, children: localeService.t("sheets-filter.panel.clear-filter") }),
+      /* @__PURE__ */ jsxs("span", { className: styles.sheetsFilterPanelFooterPrimaryButtons, children: [
+        /* @__PURE__ */ jsx(Button, { type: "default", onClick: onCancel, children: localeService.t("sheets-filter.panel.cancel") }),
+        /* @__PURE__ */ jsx(Button, { disabled: !canApply, type: "primary", onClick: onApply, children: localeService.t("sheets-filter.panel.confirm") })
       ] })
     ] })
   ] });
 }
-function Js(t) {
-  const e = t.getCurrentLocale();
-  return et(
+__name(FilterPanel, "FilterPanel");
+function useFilterByOptions(localeService) {
+  const locale = localeService.getCurrentLocale();
+  return useMemo(
     () => [
-      { label: t.t("sheets-filter.panel.by-values"), value: Re.VALUES },
-      { label: t.t("sheets-filter.panel.by-conditions"), value: Re.CONDITIONS }
+      { label: localeService.t("sheets-filter.panel.by-values"), value: FilterBy.VALUES },
+      { label: localeService.t("sheets-filter.panel.by-conditions"), value: FilterBy.CONDITIONS }
     ],
-    [e, t]
+    [locale, localeService]
   );
 }
-function zs(t) {
-  const e = t.get(k);
+__name(useFilterByOptions, "useFilterByOptions");
+function SmartToggleFilterMenuItemFactory(accessor) {
+  const sheetsFilterService = accessor.get(SheetsFilterService);
   return {
-    id: me.id,
-    type: Ze.BUTTON_SELECTOR,
+    id: SmartToggleSheetsFilterCommand.id,
+    type: MenuItemType.BUTTON_SELECTOR,
     icon: "FilterSingle",
     tooltip: "sheets-filter.toolbar.smart-toggle-filter-tooltip",
-    hidden$: Je(t, Z.UNIVER_SHEET),
-    activated$: e.activeFilterModel$.pipe(se((r) => !!r)),
-    disabled$: Ar(t, br(t, { worksheetTypes: [ce, ue], rangeTypes: [le] }))
+    hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+    activated$: sheetsFilterService.activeFilterModel$.pipe(map((model) => !!model)),
+    disabled$: getObservableWithExclusiveRange$(accessor, getCurrentRangeDisable$(accessor, { worksheetTypes: [WorksheetFilterPermission, WorksheetViewPermission], rangeTypes: [RangeProtectionPermissionViewPoint] }))
   };
 }
-function en(t) {
-  const e = t.get(k);
+__name(SmartToggleFilterMenuItemFactory, "SmartToggleFilterMenuItemFactory");
+function ClearFilterCriteriaMenuItemFactory(accessor) {
+  const sheetsFilterService = accessor.get(SheetsFilterService);
   return {
-    id: Ke.id,
-    type: Ze.BUTTON,
+    id: ClearSheetsFilterCriteriaCommand.id,
+    type: MenuItemType.BUTTON,
     title: "sheets-filter.toolbar.clear-filter-criteria",
-    hidden$: Je(t, Z.UNIVER_SHEET),
-    disabled$: e.activeFilterModel$.pipe(ze((r) => {
-      var n;
-      return (n = r == null ? void 0 : r.hasCriteria$.pipe(se((i) => !i))) != null ? n : _e(!0);
+    hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+    disabled$: sheetsFilterService.activeFilterModel$.pipe(switchMap((model) => {
+      var _a13;
+      return (_a13 = model == null ? void 0 : model.hasCriteria$.pipe(map((m) => !m))) != null ? _a13 : of(!0);
     }))
   };
 }
-function tn(t) {
-  const e = t.get(k);
+__name(ClearFilterCriteriaMenuItemFactory, "ClearFilterCriteriaMenuItemFactory");
+function ReCalcFilterMenuItemFactory(accessor) {
+  const sheetsFilterService = accessor.get(SheetsFilterService);
   return {
-    id: Xe.id,
-    type: Ze.BUTTON,
+    id: ReCalcSheetsFilterCommand.id,
+    type: MenuItemType.BUTTON,
     title: "sheets-filter.toolbar.re-calc-filter-conditions",
-    hidden$: Je(t, Z.UNIVER_SHEET),
-    disabled$: e.activeFilterModel$.pipe(ze((r) => {
-      var n;
-      return (n = r == null ? void 0 : r.hasCriteria$.pipe(se((i) => !i))) != null ? n : _e(!0);
+    hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+    disabled$: sheetsFilterService.activeFilterModel$.pipe(switchMap((model) => {
+      var _a13;
+      return (_a13 = model == null ? void 0 : model.hasCriteria$.pipe(map((m) => !m))) != null ? _a13 : of(!0);
     }))
   };
 }
-const rn = {
-  [Fr.FORMULAS_INSERT]: {
-    [me.id]: {
+__name(ReCalcFilterMenuItemFactory, "ReCalcFilterMenuItemFactory");
+const menuSchema = {
+  [RibbonStartGroup.FORMULAS_INSERT]: {
+    [SmartToggleSheetsFilterCommand.id]: {
       order: 10,
-      menuItemFactory: zs,
-      [Ke.id]: {
+      menuItemFactory: SmartToggleFilterMenuItemFactory,
+      [ClearSheetsFilterCriteriaCommand.id]: {
         order: 0,
-        menuItemFactory: en
+        menuItemFactory: ClearFilterCriteriaMenuItemFactory
       },
-      [Xe.id]: {
+      [ReCalcSheetsFilterCommand.id]: {
         order: 1,
-        menuItemFactory: tn
+        menuItemFactory: ReCalcFilterMenuItemFactory
       }
     }
   }
-}, sn = {
-  id: me.id,
-  binding: Cr.L | ot.CTRL_COMMAND | ot.SHIFT,
-  description: "sheets-filter.shortcut.smart-toggle-filter",
-  preconditions: Lr,
-  group: "4_sheet-edit"
-}, B = 16, nn = 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 dt {
-  static drawNoCriteria(e, r, n, i) {
-    e.save(), ct.drawWith(e, {
+}, BUTTON_VIEWPORT = 16, FILTER_BUTTON_EMPTY = 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"), _FilterButton = class _FilterButton {
+  static drawNoCriteria(ctx, size, fgColor, bgColor) {
+    ctx.save(), Rect.drawWith(ctx, {
       radius: 2,
-      width: B,
-      height: B,
-      fill: i
-    }), e.lineCap = "square", e.strokeStyle = n, e.scale(r / B, r / B), 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();
+      width: BUTTON_VIEWPORT,
+      height: BUTTON_VIEWPORT,
+      fill: bgColor
+    }), ctx.lineCap = "square", ctx.strokeStyle = fgColor, ctx.scale(size / BUTTON_VIEWPORT, size / BUTTON_VIEWPORT), ctx.beginPath(), ctx.lineWidth = 1, ctx.lineCap = "round", ctx.moveTo(3, 4), ctx.lineTo(13, 4), ctx.moveTo(4.5, 8), ctx.lineTo(11.5, 8), ctx.moveTo(6, 12), ctx.lineTo(10, 12), ctx.stroke(), ctx.restore();
   }
-  static drawHasCriteria(e, r, n, i) {
-    e.save(), ct.drawWith(e, {
+  static drawHasCriteria(ctx, size, fgColor, bgColor) {
+    ctx.save(), Rect.drawWith(ctx, {
       radius: 2,
-      width: B,
-      height: B,
-      fill: i
-    }), e.scale(r / B, r / B), e.fillStyle = n, e.fill(nn), e.restore();
+      width: BUTTON_VIEWPORT,
+      height: BUTTON_VIEWPORT,
+      fill: bgColor
+    }), ctx.scale(size / BUTTON_VIEWPORT, size / BUTTON_VIEWPORT), ctx.fillStyle = fgColor, ctx.fill(FILTER_BUTTON_EMPTY), ctx.restore();
   }
-}
-var on = Object.defineProperty, an = Object.getOwnPropertyDescriptor, ln = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? an(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && on(e, r, i), i;
-}, Be = (t, e) => (r, n) => e(r, n, t);
-const H = 16, Ee = 1;
-let Qe = class extends Jr {
-  constructor(e, r, n, i, l) {
-    super(e, r);
-    _(this, "_cellWidth", 0);
-    _(this, "_cellHeight", 0);
-    _(this, "_filterParams");
-    _(this, "_hovered", !1);
-    this._contextService = n, this._commandService = i, this._themeService = l, this.setShapeProps(r), this.onPointerDown$.subscribeEvent((s) => this.onPointerDown(s)), this.onPointerEnter$.subscribeEvent(() => this.onPointerEnter()), this.onPointerLeave$.subscribeEvent(() => this.onPointerLeave());
-  }
-  setShapeProps(e) {
-    typeof e.cellHeight < "u" && (this._cellHeight = e.cellHeight), typeof e.cellWidth < "u" && (this._cellWidth = e.cellWidth), typeof e.filterParams < "u" && (this._filterParams = e.filterParams), this.transformByState({
-      width: e.width,
-      height: e.height
+};
+__name(_FilterButton, "FilterButton");
+let FilterButton = _FilterButton;
+var __defProp$6 = Object.defineProperty, __getOwnPropDesc$6 = Object.getOwnPropertyDescriptor, __decorateClass$6 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$6(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$6(target, key, result), result;
+}, "__decorateClass$6"), __decorateParam$6 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$6");
+const FILTER_ICON_SIZE = 16, FILTER_ICON_PADDING = 1;
+var _a6;
+let SheetsFilterButtonShape = (_a6 = class extends Shape {
+  constructor(key, props, _contextService, _commandService, _themeService) {
+    super(key, props);
+    __publicField(this, "_cellWidth", 0);
+    __publicField(this, "_cellHeight", 0);
+    __publicField(this, "_filterParams");
+    __publicField(this, "_hovered", !1);
+    this._contextService = _contextService, this._commandService = _commandService, this._themeService = _themeService, this.setShapeProps(props), this.onPointerDown$.subscribeEvent((evt) => this.onPointerDown(evt)), this.onPointerEnter$.subscribeEvent(() => this.onPointerEnter()), this.onPointerLeave$.subscribeEvent(() => this.onPointerLeave());
+  }
+  setShapeProps(props) {
+    typeof props.cellHeight < "u" && (this._cellHeight = props.cellHeight), typeof props.cellWidth < "u" && (this._cellWidth = props.cellWidth), typeof props.filterParams < "u" && (this._filterParams = props.filterParams), this.transformByState({
+      width: props.width,
+      height: props.height
     });
   }
-  _draw(e) {
-    const r = this._cellHeight, n = this._cellWidth, i = H - n, l = H - r;
-    e.save();
-    const s = new Path2D();
-    s.rect(i, l, n, r), e.clip(s);
-    const { hasCriteria: o } = this._filterParams, a = this._themeService.getCurrentTheme().primaryColor, c = this._hovered ? this._themeService.getCurrentTheme().grey50 : "rgba(255, 255, 255, 1.0)";
-    o ? dt.drawHasCriteria(e, H, a, c) : dt.drawNoCriteria(e, H, a, c), e.restore();
+  _draw(ctx) {
+    const cellHeight = this._cellHeight, cellWidth = this._cellWidth, left = FILTER_ICON_SIZE - cellWidth, top = FILTER_ICON_SIZE - cellHeight;
+    ctx.save();
+    const cellRegion = new Path2D();
+    cellRegion.rect(left, top, cellWidth, cellHeight), ctx.clip(cellRegion);
+    const { hasCriteria } = this._filterParams, fgColor = this._themeService.getCurrentTheme().primaryColor, bgColor = this._hovered ? this._themeService.getCurrentTheme().grey50 : "rgba(255, 255, 255, 1.0)";
+    hasCriteria ? FilterButton.drawHasCriteria(ctx, FILTER_ICON_SIZE, fgColor, bgColor) : FilterButton.drawNoCriteria(ctx, FILTER_ICON_SIZE, fgColor, bgColor), ctx.restore();
   }
-  onPointerDown(e) {
-    if (e.button === 2)
+  onPointerDown(evt) {
+    if (evt.button === 2)
       return;
-    const { col: r, unitId: n, subUnitId: i } = this._filterParams;
-    this._contextService.getContextValue(ne) || !this._commandService.hasCommand(Ae.id) || setTimeout(() => {
-      this._commandService.executeCommand(Ae.id, {
-        unitId: n,
-        subUnitId: i,
-        col: r
+    const { col, unitId, subUnitId } = this._filterParams;
+    this._contextService.getContextValue(FILTER_PANEL_OPENED_KEY) || !this._commandService.hasCommand(OpenFilterPanelOperation.id) || setTimeout(() => {
+      this._commandService.executeCommand(OpenFilterPanelOperation.id, {
+        unitId,
+        subUnitId,
+        col
       });
     }, 200);
   }
@@ -1539,342 +1534,353 @@ let Qe = class extends Jr {
   onPointerLeave() {
     this._hovered = !1, this.makeDirty(!0);
   }
-};
-Qe = ln([
-  Be(2, we),
-  Be(3, W),
-  Be(4, E(Et))
-], Qe);
-var cn = Object.defineProperty, un = Object.getOwnPropertyDescriptor, hn = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? un(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && cn(e, r, i), i;
-}, Y = (t, e) => (r, n) => e(r, n, t);
-const dn = 1e3, fn = 5e3;
-let Ge = class extends Tt {
-  constructor(e, r, n, i, l, s, o, a) {
+}, __name(_a6, "SheetsFilterButtonShape"), _a6);
+SheetsFilterButtonShape = __decorateClass$6([
+  __decorateParam$6(2, IContextService),
+  __decorateParam$6(3, ICommandService),
+  __decorateParam$6(4, Inject(ThemeService))
+], SheetsFilterButtonShape);
+var __defProp$5 = Object.defineProperty, __getOwnPropDesc$5 = Object.getOwnPropertyDescriptor, __decorateClass$5 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$5(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$5(target, key, result), result;
+}, "__decorateClass$5"), __decorateParam$5 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$5");
+const DEFAULT_Z_INDEX = 1e3, SHEETS_FILTER_BUTTON_Z_INDEX = 5e3;
+var _a7;
+let SheetsFilterRenderController = (_a7 = class extends RxDisposable {
+  constructor(_context, _injector, _sheetSkeletonManagerService, _sheetsFilterService, _themeService, _sheetInterceptorService, _commandService, _selectionRenderService) {
     super();
-    _(this, "_filterRangeShape", null);
-    _(this, "_buttonRenderDisposable", null);
-    _(this, "_filterButtonShapes", []);
-    this._context = e, this._injector = r, this._sheetSkeletonManagerService = n, this._sheetsFilterService = i, this._themeService = l, this._sheetInterceptorService = s, this._commandService = o, this._selectionRenderService = a, this._initRenderer();
+    __publicField(this, "_filterRangeShape", null);
+    __publicField(this, "_buttonRenderDisposable", null);
+    __publicField(this, "_filterButtonShapes", []);
+    this._context = _context, this._injector = _injector, this._sheetSkeletonManagerService = _sheetSkeletonManagerService, this._sheetsFilterService = _sheetsFilterService, this._themeService = _themeService, this._sheetInterceptorService = _sheetInterceptorService, this._commandService = _commandService, this._selectionRenderService = _selectionRenderService, this._initRenderer();
   }
   dispose() {
     super.dispose(), this._disposeRendering();
   }
   _initRenderer() {
     this._sheetSkeletonManagerService.currentSkeleton$.pipe(
-      ze((e) => {
-        var o, a;
-        if (!e) return _e(null);
-        const { unit: r, unitId: n } = this._context, i = ((o = r.getActiveSheet()) == null ? void 0 : o.getSheetId()) || "", l = (a = this._sheetsFilterService.getFilterModel(n, i)) != null ? a : void 0, s = () => ({
-          unitId: n,
-          worksheetId: i,
-          filterModel: l,
-          range: l == null ? void 0 : l.getRange(),
-          skeleton: e.skeleton
-        });
-        return zt(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(
-          kr(
-            ([c]) => {
-              var h;
-              return c.type === $e.MUTATION && ((h = c.params) == null ? void 0 : h.unitId) === r.getUnitId() && (nr.has(c.id) || c.id === Sr.id);
+      switchMap((skeletonParams) => {
+        var _a13, _b;
+        if (!skeletonParams) return of(null);
+        const { unit: workbook, unitId } = this._context, worksheetId = ((_a13 = workbook.getActiveSheet()) == null ? void 0 : _a13.getSheetId()) || "", filterModel = (_b = this._sheetsFilterService.getFilterModel(unitId, worksheetId)) != null ? _b : void 0, getParams = /* @__PURE__ */ __name(() => ({
+          unitId,
+          worksheetId,
+          filterModel,
+          range: filterModel == null ? void 0 : filterModel.getRange(),
+          skeleton: skeletonParams.skeleton
+        }), "getParams");
+        return fromCallback(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(
+          filter(
+            ([command]) => {
+              var _a14;
+              return command.type === CommandType.MUTATION && ((_a14 = command.params) == null ? void 0 : _a14.unitId) === workbook.getUnitId() && (FILTER_MUTATIONS.has(command.id) || command.id === SetRangeValuesMutation.id);
             }
           ),
-          It(20, void 0, { leading: !1, trailing: !0 }),
-          se(s),
-          yt(s())
+          throttleTime(20, void 0, { leading: !1, trailing: !0 }),
+          map(getParams),
+          startWith(getParams())
           // must trigger once
         );
       }),
-      Qr(this.dispose$)
-    ).subscribe((e) => {
-      this._disposeRendering(), !(!e || !e.range) && (this._renderRange(e.range, e.skeleton), this._renderButtons(e));
+      takeUntil(this.dispose$)
+    ).subscribe((renderParams) => {
+      this._disposeRendering(), !(!renderParams || !renderParams.range) && (this._renderRange(renderParams.range, renderParams.skeleton), this._renderButtons(renderParams));
     });
   }
-  _renderRange(e, r) {
-    const { scene: n } = this._context, { rowHeaderWidth: i, columnHeaderHeight: l } = r, s = this._filterRangeShape = new wr(
-      n,
-      dn,
+  _renderRange(range, skeleton) {
+    const { scene } = this._context, { rowHeaderWidth, columnHeaderHeight } = skeleton, filterRangeShape = this._filterRangeShape = new SelectionControl(
+      scene,
+      DEFAULT_Z_INDEX,
       this._themeService,
       {
-        rowHeaderWidth: i,
-        columnHeaderHeight: l,
+        rowHeaderWidth,
+        columnHeaderHeight,
         enableAutoFill: !1,
         highlightHeader: !1
       }
-    ), a = Ur({
-      range: e,
+    ), selectionWithCoord = attachSelectionWithCoord({
+      range,
       primary: null,
       style: { fill: "rgba(0, 0, 0, 0.0)" }
-    }, r);
-    s.updateRangeBySelectionWithCoord(a), s.setEvent(!1), n.makeDirty(!0);
-  }
-  _renderButtons(e) {
-    const { range: r, filterModel: n, unitId: i, skeleton: l, worksheetId: s } = e, { scene: o } = this._context;
-    this._interceptCellContent(i, s, e.range);
-    const { startColumn: a, endColumn: c, startRow: h } = r;
-    for (let d = a; d <= c; d++) {
-      const g = `sheets-filter-button-${d}`, m = Hr(h, d, o, l), { startX: T, startY: v, endX: P, endY: F } = m, I = P - T, R = F - v;
-      if (R <= Ee || I <= Ee)
+    }, skeleton);
+    filterRangeShape.updateRangeBySelectionWithCoord(selectionWithCoord), filterRangeShape.setEvent(!1), scene.makeDirty(!0);
+  }
+  _renderButtons(params) {
+    const { range, filterModel, unitId, skeleton, worksheetId } = params, { scene } = this._context;
+    this._interceptCellContent(unitId, worksheetId, params.range);
+    const { startColumn, endColumn, startRow } = range;
+    for (let col = startColumn; col <= endColumn; col++) {
+      const key = `sheets-filter-button-${col}`, startPosition = getCoordByCell(startRow, col, scene, skeleton), { startX, startY, endX, endY } = startPosition, cellWidth = endX - startX, cellHeight = endY - startY;
+      if (cellHeight <= FILTER_ICON_PADDING || cellWidth <= FILTER_ICON_PADDING)
         continue;
-      const M = !!n.getFilterColumn(d), $ = P - H - Ee, Se = F - H - Ee, ge = {
-        left: $,
-        top: Se,
-        height: H,
-        width: H,
-        zIndex: fn,
-        cellHeight: R,
-        cellWidth: I,
-        filterParams: { unitId: i, subUnitId: s, col: d, hasCriteria: M }
-      }, y = this._injector.createInstance(Qe, g, ge);
-      this._filterButtonShapes.push(y);
+      const hasCriteria = !!filterModel.getFilterColumn(col), iconStartX = endX - FILTER_ICON_SIZE - FILTER_ICON_PADDING, iconStartY = endY - FILTER_ICON_SIZE - FILTER_ICON_PADDING, props = {
+        left: iconStartX,
+        top: iconStartY,
+        height: FILTER_ICON_SIZE,
+        width: FILTER_ICON_SIZE,
+        zIndex: SHEETS_FILTER_BUTTON_Z_INDEX,
+        cellHeight,
+        cellWidth,
+        filterParams: { unitId, subUnitId: worksheetId, col, hasCriteria }
+      }, buttonShape = this._injector.createInstance(SheetsFilterButtonShape, key, props);
+      this._filterButtonShapes.push(buttonShape);
     }
-    o.addObjects(this._filterButtonShapes), o.makeDirty();
-  }
-  _interceptCellContent(e, r, n) {
-    const { startRow: i, startColumn: l, endColumn: s } = n;
-    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(gr.CELL_CONTENT, {
-      effect: er.Style,
-      handler: (o, a, c) => {
-        const { row: h, col: d, unitId: g, subUnitId: m } = a;
-        return g !== e || m !== r || h !== i || d < l || d > s ? c(o) : c({
-          ...o,
+    scene.addObjects(this._filterButtonShapes), scene.makeDirty();
+  }
+  _interceptCellContent(workbookId, worksheetId, range) {
+    const { startRow, startColumn, endColumn } = range;
+    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(INTERCEPTOR_POINT.CELL_CONTENT, {
+      effect: InterceptorEffectEnum.Style,
+      handler: /* @__PURE__ */ __name((cell, pos, next) => {
+        const { row, col, unitId, subUnitId } = pos;
+        return unitId !== workbookId || subUnitId !== worksheetId || row !== startRow || col < startColumn || col > endColumn ? next(cell) : next({
+          ...cell,
           fontRenderExtension: {
-            ...o == null ? void 0 : o.fontRenderExtension,
-            rightOffset: H
+            ...cell == null ? void 0 : cell.fontRenderExtension,
+            rightOffset: FILTER_ICON_SIZE
           }
         });
-      },
+      }, "handler"),
       priority: 10
     });
   }
   _disposeRendering() {
-    var e, r;
-    (e = this._filterRangeShape) == null || e.dispose(), this._filterButtonShapes.forEach((n) => n.dispose()), (r = this._buttonRenderDisposable) == null || r.dispose(), this._filterRangeShape = null, this._buttonRenderDisposable = null, this._filterButtonShapes = [];
-  }
-};
-Ge = hn([
-  Y(1, E(X)),
-  Y(2, E(Mr)),
-  Y(3, E(k)),
-  Y(4, E(Et)),
-  Y(5, E(_r)),
-  Y(6, W),
-  Y(7, $r)
-], Ge);
-var pn = Object.defineProperty, mn = Object.getOwnPropertyDescriptor, _n = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? mn(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && pn(e, r, i), i;
-}, ft = (t, e) => (r, n) => e(r, n, t);
-let fe = class extends Tt {
-  constructor(t, e) {
-    super(), this._renderManagerService = t, this._sheetsRenderService = e, [
-      ir,
-      or,
-      ar,
-      lr
-    ].forEach((r) => this.disposeWithMe(this._sheetsRenderService.registerSkeletonChangingMutations(r.id))), this.disposeWithMe(this._renderManagerService.registerRenderModule(
-      Z.UNIVER_SHEET,
-      [Ge]
+    var _a13, _b;
+    (_a13 = this._filterRangeShape) == null || _a13.dispose(), this._filterButtonShapes.forEach((s) => s.dispose()), (_b = this._buttonRenderDisposable) == null || _b.dispose(), this._filterRangeShape = null, this._buttonRenderDisposable = null, this._filterButtonShapes = [];
+  }
+}, __name(_a7, "SheetsFilterRenderController"), _a7);
+SheetsFilterRenderController = __decorateClass$5([
+  __decorateParam$5(1, Inject(Injector)),
+  __decorateParam$5(2, Inject(SheetSkeletonManagerService)),
+  __decorateParam$5(3, Inject(SheetsFilterService)),
+  __decorateParam$5(4, Inject(ThemeService)),
+  __decorateParam$5(5, Inject(SheetInterceptorService)),
+  __decorateParam$5(6, ICommandService),
+  __decorateParam$5(7, ISheetSelectionRenderService)
+], SheetsFilterRenderController);
+var __defProp$4 = Object.defineProperty, __getOwnPropDesc$4 = Object.getOwnPropertyDescriptor, __decorateClass$4 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$4(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$4(target, key, result), result;
+}, "__decorateClass$4"), __decorateParam$4 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$4"), _a8;
+let SheetsFilterUIMobileController = (_a8 = class extends RxDisposable {
+  constructor(_renderManagerService, _sheetsRenderService) {
+    super(), this._renderManagerService = _renderManagerService, this._sheetsRenderService = _sheetsRenderService, [
+      SetSheetsFilterRangeMutation,
+      SetSheetsFilterCriteriaMutation,
+      RemoveSheetsFilterMutation,
+      ReCalcSheetsFilterMutation
+    ].forEach((m) => this.disposeWithMe(this._sheetsRenderService.registerSkeletonChangingMutations(m.id))), this.disposeWithMe(this._renderManagerService.registerRenderModule(
+      UniverInstanceType.UNIVER_SHEET,
+      [SheetsFilterRenderController]
     ));
   }
+}, __name(_a8, "SheetsFilterUIMobileController"), _a8);
+SheetsFilterUIMobileController = __decorateClass$4([
+  __decorateParam$4(0, IRenderManagerService),
+  __decorateParam$4(1, Inject(SheetsRenderService))
+], SheetsFilterUIMobileController);
+const SmartToggleFilterShortcut = {
+  id: SmartToggleSheetsFilterCommand.id,
+  binding: KeyCode.L | MetaKeys.CTRL_COMMAND | MetaKeys.SHIFT,
+  description: "sheets-filter.shortcut.smart-toggle-filter",
+  preconditions: whenSheetEditorFocused,
+  group: "4_sheet-edit"
 };
-fe = _n([
-  ft(0, bt),
-  ft(1, E(Rt))
-], fe);
-var Sn = Object.defineProperty, gn = Object.getOwnPropertyDescriptor, vn = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? gn(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && Sn(e, r, i), i;
-}, A = (t, e) => (r, n) => e(r, n, t);
-const pt = "FILTER_PANEL_POPUP";
-let be = class extends fe {
-  constructor(e, r, n, i, l, s, o, a, c, h, d, g, m) {
-    super(m, g);
-    _(this, "_popupDisposable");
-    this._injector = e, this._componentManager = r, this._sheetsFilterPanelService = n, this._sheetCanvasPopupService = i, this._sheetsFilterService = l, this._localeService = s, this._shortcutService = o, this._commandService = a, this._menuManagerService = c, this._contextService = h, this._messageService = d, this._initCommands(), this._initShortcuts(), this._initMenuItems(), this._initUI();
+var __defProp$3 = Object.defineProperty, __getOwnPropDesc$3 = Object.getOwnPropertyDescriptor, __decorateClass$3 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$3(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$3(target, key, result), result;
+}, "__decorateClass$3"), __decorateParam$3 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$3");
+const FILTER_PANEL_POPUP_KEY = "FILTER_PANEL_POPUP";
+var _a9;
+let SheetsFilterUIDesktopController = (_a9 = class extends SheetsFilterUIMobileController {
+  constructor(_injector, _componentManager, _sheetsFilterPanelService, _sheetCanvasPopupService, _sheetsFilterService, _localeService, _shortcutService, _commandService, _menuManagerService, _contextService, _messageService, sheetsRenderService, renderManagerService) {
+    super(renderManagerService, sheetsRenderService);
+    __publicField(this, "_popupDisposable");
+    this._injector = _injector, this._componentManager = _componentManager, this._sheetsFilterPanelService = _sheetsFilterPanelService, this._sheetCanvasPopupService = _sheetCanvasPopupService, this._sheetsFilterService = _sheetsFilterService, this._localeService = _localeService, this._shortcutService = _shortcutService, this._commandService = _commandService, this._menuManagerService = _menuManagerService, this._contextService = _contextService, this._messageService = _messageService, this._initCommands(), this._initShortcuts(), this._initMenuItems(), this._initUI();
   }
   dispose() {
     super.dispose(), this._closeFilterPopup();
   }
   _initShortcuts() {
     [
-      sn
-    ].forEach((e) => {
-      this.disposeWithMe(this._shortcutService.registerShortcut(e));
+      SmartToggleFilterShortcut
+    ].forEach((shortcut) => {
+      this.disposeWithMe(this._shortcutService.registerShortcut(shortcut));
     });
   }
   _initCommands() {
     [
-      me,
-      cr,
-      ur,
-      re,
-      Ke,
-      Xe,
-      Dt,
-      Ae,
-      de
-    ].forEach((e) => {
-      this.disposeWithMe(this._commandService.registerCommand(e));
+      SmartToggleSheetsFilterCommand,
+      RemoveSheetFilterCommand,
+      SetSheetFilterRangeCommand,
+      SetSheetsFilterCriteriaCommand,
+      ClearSheetsFilterCriteriaCommand,
+      ReCalcSheetsFilterCommand,
+      ChangeFilterByOperation,
+      OpenFilterPanelOperation,
+      CloseFilterPanelOperation
+    ].forEach((c) => {
+      this.disposeWithMe(this._commandService.registerCommand(c));
     });
   }
   _initMenuItems() {
-    this._menuManagerService.mergeMenu(rn);
+    this._menuManagerService.mergeMenu(menuSchema);
   }
   _initUI() {
-    this.disposeWithMe(this._componentManager.register(pt, Zs)), this.disposeWithMe(this._componentManager.register("FilterSingle", Vt)), this.disposeWithMe(this._contextService.subscribeContextValue$(ne).pipe(Gr()).subscribe((e) => {
-      e ? this._openFilterPopup() : this._closeFilterPopup();
-    })), this.disposeWithMe(this._sheetsFilterService.errorMsg$.subscribe((e) => {
-      e && this._messageService.show({
-        type: Zr.Error,
-        content: this._localeService.t(e)
+    this.disposeWithMe(this._componentManager.register(FILTER_PANEL_POPUP_KEY, FilterPanel)), this.disposeWithMe(this._componentManager.register("FilterSingle", FilterSingle)), this.disposeWithMe(this._contextService.subscribeContextValue$(FILTER_PANEL_OPENED_KEY).pipe(distinctUntilChanged()).subscribe((open) => {
+      open ? this._openFilterPopup() : this._closeFilterPopup();
+    })), this.disposeWithMe(this._sheetsFilterService.errorMsg$.subscribe((content) => {
+      content && this._messageService.show({
+        type: MessageType.Error,
+        content: this._localeService.t(content)
       });
     }));
   }
   _openFilterPopup() {
-    const e = this._sheetsFilterPanelService.filterModel;
-    if (!e)
+    const currentFilterModel = this._sheetsFilterPanelService.filterModel;
+    if (!currentFilterModel)
       throw new Error("[SheetsFilterUIController]: no filter model when opening filter popup!");
-    const r = e.getRange(), n = this._sheetsFilterPanelService.col, { startRow: i } = r;
-    this._popupDisposable = this._sheetCanvasPopupService.attachPopupToCell(i, n, {
-      componentKey: pt,
+    const range = currentFilterModel.getRange(), col = this._sheetsFilterPanelService.col, { startRow } = range;
+    this._popupDisposable = this._sheetCanvasPopupService.attachPopupToCell(startRow, col, {
+      componentKey: FILTER_PANEL_POPUP_KEY,
       direction: "horizontal",
-      onClickOutside: () => this._commandService.syncExecuteCommand(de.id),
+      onClickOutside: /* @__PURE__ */ __name(() => this._commandService.syncExecuteCommand(CloseFilterPanelOperation.id), "onClickOutside"),
       offset: [5, 0]
     });
   }
   _closeFilterPopup() {
-    var e;
-    (e = this._popupDisposable) == null || e.dispose(), this._popupDisposable = null;
-  }
-};
-be = vn([
-  A(0, E(X)),
-  A(1, E(Nr)),
-  A(2, E(j)),
-  A(3, E(Dr)),
-  A(4, E(k)),
-  A(5, E(K)),
-  A(6, Pr),
-  A(7, W),
-  A(8, Or),
-  A(9, we),
-  A(10, Rr),
-  A(11, E(Rt)),
-  A(12, bt)
-], be);
-var jt = Object.defineProperty, En = Object.getOwnPropertyDescriptor, Tn = (t, e, r) => e in t ? jt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Fn = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? En(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && jt(e, r, i), i;
-}, Ve = (t, e) => (r, n) => e(r, n, t), Wt = (t, e, r) => Tn(t, typeof e != "symbol" ? e + "" : e, r);
-const Cn = "SHEET_FILTER_UI_PLUGIN";
-let Le = class extends qe {
-  constructor(t = Ne, e, r, n) {
-    super(), this._config = t, this._injector = e, this._configService = r, this._rpcChannelService = n;
-    const { menu: i, ...l } = Ct(
+    var _a13;
+    (_a13 = this._popupDisposable) == null || _a13.dispose(), this._popupDisposable = null;
+  }
+}, __name(_a9, "SheetsFilterUIDesktopController"), _a9);
+SheetsFilterUIDesktopController = __decorateClass$3([
+  __decorateParam$3(0, Inject(Injector)),
+  __decorateParam$3(1, Inject(ComponentManager)),
+  __decorateParam$3(2, Inject(SheetsFilterPanelService)),
+  __decorateParam$3(3, Inject(SheetCanvasPopManagerService)),
+  __decorateParam$3(4, Inject(SheetsFilterService)),
+  __decorateParam$3(5, Inject(LocaleService)),
+  __decorateParam$3(6, IShortcutService),
+  __decorateParam$3(7, ICommandService),
+  __decorateParam$3(8, IMenuManagerService),
+  __decorateParam$3(9, IContextService),
+  __decorateParam$3(10, IMessageService),
+  __decorateParam$3(11, Inject(SheetsRenderService)),
+  __decorateParam$3(12, IRenderManagerService)
+], SheetsFilterUIDesktopController);
+var __defProp$2 = Object.defineProperty, __getOwnPropDesc$2 = Object.getOwnPropertyDescriptor, __defNormalProp$1 = /* @__PURE__ */ __name((obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value, "__defNormalProp$1"), __decorateClass$2 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$2(target, key, result), result;
+}, "__decorateClass$2"), __decorateParam$2 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$2"), __publicField$1 = /* @__PURE__ */ __name((obj, key, value) => __defNormalProp$1(obj, typeof key != "symbol" ? key + "" : key, value), "__publicField$1");
+const NAME$1 = "SHEET_FILTER_UI_PLUGIN";
+var _a10;
+let UniverSheetsFilterUIPlugin = (_a10 = class extends Plugin {
+  constructor(_config = defaultPluginConfig, _injector, _configService, _rpcChannelService) {
+    super(), this._config = _config, this._injector = _injector, this._configService = _configService, this._rpcChannelService = _rpcChannelService;
+    const { menu, ...rest } = merge$1(
       {},
-      Ne,
+      defaultPluginConfig,
       this._config
     );
-    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig($t, l);
+    menu && this._configService.setConfig("menu", menu, { merge: !0 }), this._configService.setConfig(SHEETS_FILTER_UI_PLUGIN_CONFIG_KEY, rest);
   }
   onStarting() {
     [
-      [j],
-      [ie],
-      [be]
-    ].forEach((t) => this._injector.add(t)), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([Pe, {
-      useFactory: () => rr(
-        this._rpcChannelService.requestChannel(tt)
-      )
+      [SheetsFilterPanelService],
+      [SheetsFilterPermissionController],
+      [SheetsFilterUIDesktopController]
+    ].forEach((d) => this._injector.add(d)), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([ISheetsGenerateFilterValuesService, {
+      useFactory: /* @__PURE__ */ __name(() => toModule(
+        this._rpcChannelService.requestChannel(SHEETS_GENERATE_FILTER_VALUES_SERVICE_NAME)
+      ), "useFactory")
     }]);
   }
   onReady() {
-    this._injector.get(ie);
+    this._injector.get(SheetsFilterPermissionController);
   }
   onRendered() {
-    this._injector.get(be);
-  }
-};
-Wt(Le, "type", Z.UNIVER_SHEET);
-Wt(Le, "pluginName", Cn);
-Le = Fn([
-  Ft(Ot),
-  Ve(1, E(X)),
-  Ve(2, Nt),
-  Ve(3, tr(Pt))
-], Le);
-var kt = Object.defineProperty, Nn = Object.getOwnPropertyDescriptor, Pn = (t, e, r) => e in t ? kt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, On = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? Nn(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && kt(e, r, i), i;
-}, mt = (t, e) => (r, n) => e(r, n, t), Qt = (t, e, r) => Pn(t, typeof e != "symbol" ? e + "" : e, r);
-const Rn = "SHEET_FILTER_UI_PLUGIN";
-let Me = class extends qe {
-  constructor(t = Ne, e, r) {
-    super(), this._config = t, this._injector = e, this._configService = r;
-    const { menu: n, ...i } = Ct(
+    this._injector.get(SheetsFilterUIDesktopController);
+  }
+}, __name(_a10, "UniverSheetsFilterUIPlugin"), _a10);
+__publicField$1(UniverSheetsFilterUIPlugin, "type", UniverInstanceType.UNIVER_SHEET);
+__publicField$1(UniverSheetsFilterUIPlugin, "pluginName", NAME$1);
+UniverSheetsFilterUIPlugin = __decorateClass$2([
+  DependentOn(UniverSheetsFilterPlugin),
+  __decorateParam$2(1, Inject(Injector)),
+  __decorateParam$2(2, IConfigService),
+  __decorateParam$2(3, Optional(IRPCChannelService))
+], UniverSheetsFilterUIPlugin);
+var __defProp$1 = Object.defineProperty, __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor, __defNormalProp2 = /* @__PURE__ */ __name((obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value, "__defNormalProp"), __decorateClass$1 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$1(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$1(target, key, result), result;
+}, "__decorateClass$1"), __decorateParam$1 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$1"), __publicField2 = /* @__PURE__ */ __name((obj, key, value) => __defNormalProp2(obj, typeof key != "symbol" ? key + "" : key, value), "__publicField");
+const NAME = "SHEET_FILTER_UI_PLUGIN";
+var _a11;
+let UniverSheetsFilterMobileUIPlugin = (_a11 = class extends Plugin {
+  constructor(_config = defaultPluginConfig, _injector, _configService) {
+    super(), this._config = _config, this._injector = _injector, this._configService = _configService;
+    const { menu, ...rest } = merge$1(
       {},
-      Ne,
+      defaultPluginConfig,
       this._config
     );
-    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig($t, i);
+    menu && this._configService.setConfig("menu", menu, { merge: !0 }), this._configService.setConfig(SHEETS_FILTER_UI_PLUGIN_CONFIG_KEY, rest);
   }
   onStarting() {
     [
-      [ie],
-      [fe]
-    ].forEach((t) => this._injector.add(t));
+      [SheetsFilterPermissionController],
+      [SheetsFilterUIMobileController]
+    ].forEach((d) => this._injector.add(d));
   }
   onReady() {
-    this._injector.get(ie);
+    this._injector.get(SheetsFilterPermissionController);
   }
   onRendered() {
-    this._injector.get(fe);
-  }
-};
-Qt(Me, "type", Z.UNIVER_SHEET);
-Qt(Me, "pluginName", Rn);
-Me = On([
-  Ft(Ot),
-  mt(1, E(X)),
-  mt(2, Nt)
-], Me);
-var In = Object.defineProperty, yn = Object.getOwnPropertyDescriptor, An = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? yn(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && In(e, r, i), i;
-}, _t = (t, e) => (r, n) => e(r, n, t), Te;
-let St = (Te = class extends qe {
-  constructor(t, e, r) {
-    super(), this._config = t, this._injector = e, this._rpcChannelService = r;
+    this._injector.get(SheetsFilterUIMobileController);
+  }
+}, __name(_a11, "UniverSheetsFilterMobileUIPlugin"), _a11);
+__publicField2(UniverSheetsFilterMobileUIPlugin, "type", UniverInstanceType.UNIVER_SHEET);
+__publicField2(UniverSheetsFilterMobileUIPlugin, "pluginName", NAME);
+UniverSheetsFilterMobileUIPlugin = __decorateClass$1([
+  DependentOn(UniverSheetsFilterPlugin),
+  __decorateParam$1(1, Inject(Injector)),
+  __decorateParam$1(2, IConfigService)
+], UniverSheetsFilterMobileUIPlugin);
+var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __decorateClass = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp2(target, key, result), result;
+}, "__decorateClass"), __decorateParam = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam"), _a12;
+let UniverSheetsFilterUIWorkerPlugin = (_a12 = class extends Plugin {
+  constructor(_config, _injector, _rpcChannelService) {
+    super(), this._config = _config, this._injector = _injector, this._rpcChannelService = _rpcChannelService;
   }
   onStarting() {
     [
-      [Pe, { useClass: We }]
-    ].forEach((t) => this._injector.add(t));
+      [ISheetsGenerateFilterValuesService, { useClass: SheetsGenerateFilterValuesService }]
+    ].forEach((d) => this._injector.add(d));
   }
   onReady() {
     this._rpcChannelService.registerChannel(
-      tt,
-      sr(this._injector.get(Pe))
+      SHEETS_GENERATE_FILTER_VALUES_SERVICE_NAME,
+      fromModule(this._injector.get(ISheetsGenerateFilterValuesService))
     );
   }
-}, _(Te, "type", Z.UNIVER_SHEET), _(Te, "pluginName", "SHEET_FILTER_UI_WORKER_PLUGIN"), Te);
-St = An([
-  _t(1, E(X)),
-  _t(2, Pt)
-], St);
+}, __name(_a12, "UniverSheetsFilterUIWorkerPlugin"), __publicField(_a12, "type", UniverInstanceType.UNIVER_SHEET), __publicField(_a12, "pluginName", "SHEET_FILTER_UI_WORKER_PLUGIN"), _a12);
+UniverSheetsFilterUIWorkerPlugin = __decorateClass([
+  __decorateParam(1, Inject(Injector)),
+  __decorateParam(2, IRPCChannelService)
+], UniverSheetsFilterUIWorkerPlugin);
 export {
-  Dt as ChangeFilterByOperation,
-  de as CloseFilterPanelOperation,
-  Ae as OpenFilterPanelOperation,
-  Me as UniverSheetsFilterMobileUIPlugin,
-  Le as UniverSheetsFilterUIPlugin,
-  St as UniverSheetsFilterUIWorkerPlugin
+  ChangeFilterByOperation,
+  CloseFilterPanelOperation,
+  OpenFilterPanelOperation,
+  UniverSheetsFilterMobileUIPlugin,
+  UniverSheetsFilterUIPlugin,
+  UniverSheetsFilterUIWorkerPlugin
 };