@univerjs/sheets-filter-ui 0.6.10 → 0.7.0-beta.0

package/lib/es/index.js

@@ -1,19 +1,19 @@
-var jt = Object.defineProperty;
-var Yt = (t, e, r) => e in t ? jt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
-var f = (t, e, r) => Yt(t, typeof e != "symbol" ? e + "" : e, r);
-import { BooleanNumber as st, createIdentifier as gt, Inject as E, LocaleService as X, IUniverInstanceService as je, ILogService as qt, extractPureTextFromCell as Kt, numfmt as it, Disposable as pe, Injector as Z, Quantity as vt, Tools as Fe, ICommandService as Q, CommandType as Me, IContextService as $e, UniverInstanceType as z, ThemeService as St, RxDisposable as Et, fromCallback as Xt, InterceptorEffectEnum as Zt, DependentOn as Tt, IConfigService as Ft, Optional as zt, Plugin as Ye, merge as Ct } from "@univerjs/core";
-import { IRPCChannelService as Nt, toModule as Jt, fromModule as er } from "@univerjs/rpc";
-import { CustomFilterOperator as u, SetSheetsFilterCriteriaCommand as se, SheetsFilterService as G, SmartToggleSheetsFilterCommand as fe, ReCalcSheetsFilterCommand as qe, ClearSheetsFilterCriteriaCommand as Ke, FILTER_MUTATIONS as tr, SetSheetsFilterRangeMutation as rr, SetSheetsFilterCriteriaMutation as sr, RemoveSheetsFilterMutation as ir, ReCalcSheetsFilterMutation as nr, RemoveSheetFilterCommand as or, SetSheetFilterRangeCommand as ar, UniverSheetsFilterPlugin as Pt } from "@univerjs/sheets-filter";
-import { RefRangeService as lr, SheetPermissionCheckController as cr, SheetsSelectionsService as ur, getSheetCommandTarget as hr, WorksheetFilterPermission as le, WorksheetViewPermission as ce, RangeProtectionPermissionViewPoint as ue, expandToContinuousRange as mr, SheetInterceptorService as dr, SetRangeValuesMutation as pr, INTERCEPTOR_POINT as fr } from "@univerjs/sheets";
-import { ILayoutService as _r, useDependency as re, useObservable as W, useComponentsOfPart as gr, ComponentContainer as vr, getMenuHiddenObservable as Xe, MenuItemType as Ze, RibbonStartGroup as Sr, KeyCode as Er, MetaKeys as nt, ComponentManager as Tr, IShortcutService as Fr, IMenuManagerService as Cr, IMessageService as Nr } from "@univerjs/ui";
-import { SetCellEditVisibleOperation as Pr, SheetsUIPart as Or, getObservableWithExclusiveRange$ as yr, getCurrentRangeDisable$ as Ir, SheetSkeletonManagerService as Rr, ISheetSelectionRenderService as Ar, SelectionControl as br, attachSelectionWithCoord as Lr, getCoordByCell as Mr, SheetsRenderService as Ot, whenSheetEditorFocused as $r, SheetCanvasPopManagerService as wr } from "@univerjs/sheets-ui";
-import { BehaviorSubject as K, ReplaySubject as Ur, Subject as Hr, merge as Dr, combineLatest as kr, throttleTime as yt, startWith as It, map as ie, shareReplay as Br, of as _e, switchMap as ze, filter as Vr, takeUntil as Wr, distinctUntilChanged as xr } from "rxjs";
-import { Select as ot, RadioGroup as Qr, Radio as at, Input as Rt, Checkbox as Gr, Tree as jr, Segmented as Yr, Button as He, MessageType as qr } from "@univerjs/design";
-import { Rect as lt, Shape as Kr, IRenderManagerService as At } from "@univerjs/engine-render";
-import { jsx as S, jsxs as L, Fragment as ct } from "react/jsx-runtime";
-import { forwardRef as bt, useRef as Xr, createElement as Lt, useCallback as k, useMemo as Je } from "react";
-const Mt = "sheets-filter-ui.config", Ce = {};
-var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SECOND", t))(C || {}), _ = /* @__PURE__ */ ((t) => (t.NONE = "none", t.STARTS_WITH = "startsWith", t.DOES_NOT_START_WITH = "doesNotStartWith", t.ENDS_WITH = "endsWith", t.DOES_NOT_END_WITH = "doesNotEndWith", t.CONTAINS = "contains", t.DOES_NOT_CONTAIN = "doesNotContain", t.EQUALS = "equals", t.NOT_EQUALS = "notEquals", t.EMPTY = "empty", t.NOT_EMPTY = "notEmpty", t.BETWEEN = "between", t.NOT_BETWEEN = "notBetween", t.CUSTOM = "custom", t))(_ || {}), m;
+var Gt = Object.defineProperty;
+var jt = (t, e, r) => e in t ? Gt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
+var f = (t, e, r) => jt(t, typeof e != "symbol" ? e + "" : e, r);
+import { BooleanNumber as rt, createIdentifier as _t, Inject as E, LocaleService as K, IUniverInstanceService as Ge, ILogService as Yt, extractPureTextFromCell as qt, numfmt as it, Disposable as me, Injector as X, Quantity as vt, Tools as Te, ICommandService as Q, CommandType as Le, IContextService as Me, UniverInstanceType as Z, ThemeService as gt, RxDisposable as St, fromCallback as Kt, InterceptorEffectEnum as Xt, DependentOn as Et, IConfigService as Tt, Optional as Zt, Plugin as je, merge as Nt } from "@univerjs/core";
+import { IRPCChannelService as Ct, toModule as zt, fromModule as Jt } from "@univerjs/rpc";
+import { CustomFilterOperator as u, SetSheetsFilterCriteriaCommand as re, SheetsFilterService as V, SmartToggleSheetsFilterCommand as pe, ReCalcSheetsFilterCommand as Ye, ClearSheetsFilterCriteriaCommand as qe, FILTER_MUTATIONS as er, SetSheetsFilterRangeMutation as tr, SetSheetsFilterCriteriaMutation as rr, RemoveSheetsFilterMutation as ir, ReCalcSheetsFilterMutation as sr, RemoveSheetFilterCommand as nr, SetSheetFilterRangeCommand as or, UniverSheetsFilterPlugin as Ft } from "@univerjs/sheets-filter";
+import { RefRangeService as ar, SheetPermissionCheckController as lr, SheetsSelectionsService as cr, getSheetCommandTarget as ur, WorksheetFilterPermission as ae, WorksheetViewPermission as le, RangeProtectionPermissionViewPoint as ce, expandToContinuousRange as hr, SheetInterceptorService as dr, SetRangeValuesMutation as mr, INTERCEPTOR_POINT as pr } from "@univerjs/sheets";
+import { ILayoutService as fr, useDependency as te, useObservable as B, useComponentsOfPart as _r, ComponentContainer as vr, getMenuHiddenObservable as Ke, MenuItemType as Xe, RibbonStartGroup as gr, KeyCode as Sr, MetaKeys as st, ComponentManager as Er, IShortcutService as Tr, IMenuManagerService as Nr, IMessageService as Cr } from "@univerjs/ui";
+import { SetCellEditVisibleOperation as Fr, SheetsUIPart as yr, getObservableWithExclusiveRange$ as Or, getCurrentRangeDisable$ as Rr, SheetSkeletonManagerService as Ir, ISheetSelectionRenderService as Ar, SelectionControl as Pr, attachSelectionWithCoord as br, getCoordByCell as Lr, SheetsRenderService as yt, whenSheetEditorFocused as Mr, SheetCanvasPopManagerService as wr } from "@univerjs/sheets-ui";
+import { BehaviorSubject as q, ReplaySubject as $r, Subject as Ur, merge as Hr, combineLatest as Dr, throttleTime as Ot, startWith as Rt, map as ie, shareReplay as kr, of as fe, switchMap as Ze, filter as xr, takeUntil as Br, distinctUntilChanged as Wr } from "rxjs";
+import { Select as nt, RadioGroup as Qr, Radio as ot, Input as It, Checkbox as Vr, Tree as Gr, Segmented as jr, Button as Ue, MessageType as Yr } from "@univerjs/design";
+import { Rect as at, Shape as qr, IRenderManagerService as At } from "@univerjs/engine-render";
+import { jsx as S, jsxs as b, Fragment as lt } from "react/jsx-runtime";
+import { forwardRef as Pt, useRef as Kr, createElement as bt, useCallback as D, useMemo as ze } from "react";
+const Lt = "sheets-filter-ui.config", Ne = {};
+var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SECOND", t))(C || {}), _ = /* @__PURE__ */ ((t) => (t.NONE = "none", t.STARTS_WITH = "startsWith", t.DOES_NOT_START_WITH = "doesNotStartWith", t.ENDS_WITH = "endsWith", t.DOES_NOT_END_WITH = "doesNotEndWith", t.CONTAINS = "contains", t.DOES_NOT_CONTAIN = "doesNotContain", t.EQUALS = "equals", t.NOT_EQUALS = "notEquals", t.EMPTY = "empty", t.NOT_EMPTY = "notEmpty", t.BETWEEN = "between", t.NOT_BETWEEN = "notBetween", t.CUSTOM = "custom", t))(_ || {}), d;
 ((t) => {
   t.NONE = {
     label: "sheets-filter.conditions.none",
@@ -23,9 +23,9 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     getDefaultFormParams: () => {
       throw new Error("[FilterConditionItems.NONE]: should not have initial form params!");
     },
-    testMappingParams: (s) => s.operator1 === _.NONE,
+    testMappingParams: (i) => i.operator1 === _.NONE,
     mapToFilterColumn: () => null,
-    testMappingFilterColumn: (s) => !s.customFilters && !s.filters ? {} : !1
+    testMappingFilterColumn: (i) => !i.customFilters && !i.filters ? {} : !1
   }, t.EMPTY = {
     label: "sheets-filter.conditions.empty",
     operator: _.EMPTY,
@@ -34,13 +34,13 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     getDefaultFormParams: () => {
       throw new Error("[FilterConditionItems.EMPTY]: should not have initial form params!");
     },
-    testMappingParams: ({ operator1: s }) => s === _.EMPTY,
+    testMappingParams: ({ operator1: i }) => i === _.EMPTY,
     mapToFilterColumn: () => ({ customFilters: { customFilters: [{ val: "" }] } }),
-    testMappingFilterColumn: (s) => {
+    testMappingFilterColumn: (i) => {
       var c;
-      if (((c = s.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
+      if (((c = i.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0];
+      const o = i.customFilters.customFilters[0];
       return o.val === "" && o.operator === void 0 ? { operator1: _.EMPTY } : !1;
     }
   }, t.NOT_EMPTY = {
@@ -51,13 +51,13 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     getDefaultFormParams: () => {
       throw new Error("[FilterConditionItems.NOT_EMPTY]: should not have initial form params!");
     },
-    testMappingParams: ({ operator1: s }) => s === _.NOT_EMPTY,
+    testMappingParams: ({ operator1: i }) => i === _.NOT_EMPTY,
     mapToFilterColumn: () => ({ customFilters: { customFilters: [{ val: "", operator: u.NOT_EQUALS }] } }),
-    testMappingFilterColumn: (s) => {
+    testMappingFilterColumn: (i) => {
       var c;
-      if (((c = s.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
+      if (((c = i.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0];
+      const o = i.customFilters.customFilters[0];
       return o.val === " " && o.operator === u.NOT_EQUALS ? { operator1: _.NOT_EMPTY } : !1;
     }
   }, t.TEXT_CONTAINS = {
@@ -66,21 +66,21 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     order: C.FIRST,
     numOfParameters: 1,
     getDefaultFormParams: () => ({ operator1: _.CONTAINS, val1: "" }),
-    testMappingParams: (s) => {
-      const [o] = M(s);
+    testMappingParams: (i) => {
+      const [o] = L(i);
       return o === _.CONTAINS;
     },
-    mapToFilterColumn: (s) => {
-      const { val1: o } = s;
+    mapToFilterColumn: (i) => {
+      const { val1: o } = i;
       return o === "" ? null : {
         customFilters: { customFilters: [{ val: `*${o}*` }] }
       };
     },
-    testMappingFilterColumn: (s) => {
+    testMappingFilterColumn: (i) => {
       var c;
-      if (((c = s.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
+      if (((c = i.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0], a = o.val.toString();
+      const o = i.customFilters.customFilters[0], a = o.val.toString();
       return !o.operator && a.startsWith("*") && a.endsWith("*") ? { operator1: _.CONTAINS, val1: a.slice(1, -1) } : !1;
     }
   }, t.DOES_NOT_CONTAIN = {
@@ -89,18 +89,18 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     order: C.FIRST,
     numOfParameters: 1,
     getDefaultFormParams: () => ({ operator1: _.DOES_NOT_CONTAIN, val1: "" }),
-    mapToFilterColumn: (s) => ({
-      customFilters: { customFilters: [{ val: `*${s.val1}*`, operator: u.NOT_EQUALS }] }
+    mapToFilterColumn: (i) => ({
+      customFilters: { customFilters: [{ val: `*${i.val1}*`, operator: u.NOT_EQUALS }] }
     }),
-    testMappingParams: (s) => {
-      const [o] = M(s);
+    testMappingParams: (i) => {
+      const [o] = L(i);
       return o === _.DOES_NOT_CONTAIN;
     },
-    testMappingFilterColumn: (s) => {
+    testMappingFilterColumn: (i) => {
       var c;
-      if (((c = s.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
+      if (((c = i.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0], a = o.val.toString();
+      const o = i.customFilters.customFilters[0], a = o.val.toString();
       return o.operator === u.NOT_EQUALS && a.startsWith("*") && a.endsWith("*") ? { operator1: _.DOES_NOT_CONTAIN, val1: a.slice(1, -1) } : !1;
     }
   }, t.STARTS_WITH = {
@@ -109,18 +109,18 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     order: C.FIRST,
     numOfParameters: 1,
     getDefaultFormParams: () => ({ operator1: _.STARTS_WITH, val1: "" }),
-    mapToFilterColumn: (s) => ({
-      customFilters: { customFilters: [{ val: `${s.val1}*` }] }
+    mapToFilterColumn: (i) => ({
+      customFilters: { customFilters: [{ val: `${i.val1}*` }] }
     }),
-    testMappingParams: (s) => {
-      const [o] = M(s);
+    testMappingParams: (i) => {
+      const [o] = L(i);
       return o === _.STARTS_WITH;
     },
-    testMappingFilterColumn: (s) => {
+    testMappingFilterColumn: (i) => {
       var c;
-      if (((c = s.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
+      if (((c = i.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0], a = o.val.toString();
+      const o = i.customFilters.customFilters[0], a = o.val.toString();
       return !o.operator && a.endsWith("*") && !a.startsWith("*") ? { operator1: _.STARTS_WITH, val1: a.slice(0, -1) } : !1;
     }
   }, t.ENDS_WITH = {
@@ -129,18 +129,18 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     order: C.FIRST,
     numOfParameters: 1,
     getDefaultFormParams: () => ({ operator1: _.ENDS_WITH, val1: "" }),
-    mapToFilterColumn: (s) => ({
-      customFilters: { customFilters: [{ val: `*${s.val1}` }] }
+    mapToFilterColumn: (i) => ({
+      customFilters: { customFilters: [{ val: `*${i.val1}` }] }
     }),
-    testMappingParams: (s) => {
-      const [o] = M(s);
+    testMappingParams: (i) => {
+      const [o] = L(i);
       return o === _.ENDS_WITH;
     },
-    testMappingFilterColumn: (s) => {
+    testMappingFilterColumn: (i) => {
       var c;
-      if (((c = s.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
+      if (((c = i.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0], a = o.val.toString();
+      const o = i.customFilters.customFilters[0], a = o.val.toString();
       return !o.operator && a.startsWith("*") && !a.endsWith("*") ? { operator1: _.ENDS_WITH, val1: a.slice(1) } : !1;
     }
   }, t.EQUALS = {
@@ -149,19 +149,19 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     order: C.FIRST,
     numOfParameters: 1,
     getDefaultFormParams: () => ({ operator1: _.EQUALS, val1: "" }),
-    testMappingParams: (s) => {
-      const [o] = M(s);
+    testMappingParams: (i) => {
+      const [o] = L(i);
       return o === _.EQUALS;
     },
-    mapToFilterColumn: (s) => {
-      const { val1: o } = s;
+    mapToFilterColumn: (i) => {
+      const { val1: o } = i;
       return o === "" ? null : {
         customFilters: { customFilters: [{ val: o }] }
       };
     },
-    testMappingFilterColumn: (s) => {
+    testMappingFilterColumn: (i) => {
       var o, a, c;
-      return ((a = (o = s.filters) == null ? void 0 : o.filters) == null ? void 0 : a.length) === 1 ? { operator1: _.EQUALS, val1: "" } : ((c = s.customFilters) == null ? void 0 : c.customFilters.length) === 1 && !s.customFilters.customFilters[0].operator ? { operator1: _.EQUALS, val1: s.customFilters.customFilters[0].val.toString() } : !1;
+      return ((a = (o = i.filters) == null ? void 0 : o.filters) == null ? void 0 : a.length) === 1 ? { operator1: _.EQUALS, val1: "" } : ((c = i.customFilters) == null ? void 0 : c.customFilters.length) === 1 && !i.customFilters.customFilters[0].operator ? { operator1: _.EQUALS, val1: i.customFilters.customFilters[0].val.toString() } : !1;
     }
   }, t.GREATER_THAN = {
     label: "sheets-filter.conditions.greater-than",
@@ -169,18 +169,18 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     numOfParameters: 1,
     order: C.FIRST,
     getDefaultFormParams: () => ({ operator1: u.GREATER_THAN, val1: "" }),
-    mapToFilterColumn: (s) => ({
-      customFilters: { customFilters: [{ val: s.val1, operator: u.GREATER_THAN }] }
+    mapToFilterColumn: (i) => ({
+      customFilters: { customFilters: [{ val: i.val1, operator: u.GREATER_THAN }] }
     }),
-    testMappingParams: (s) => {
-      const [o] = M(s);
+    testMappingParams: (i) => {
+      const [o] = L(i);
       return o === u.GREATER_THAN;
     },
-    testMappingFilterColumn: (s) => {
+    testMappingFilterColumn: (i) => {
       var a;
-      if (((a = s.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
+      if (((a = i.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0];
+      const o = i.customFilters.customFilters[0];
       return o.operator !== u.GREATER_THAN ? !1 : { operator1: u.GREATER_THAN, val1: o.val.toString() };
     }
   }, t.GREATER_THAN_OR_EQUAL = {
@@ -189,18 +189,18 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     numOfParameters: 1,
     order: C.FIRST,
     getDefaultFormParams: () => ({ operator1: u.GREATER_THAN_OR_EQUAL, val1: "" }),
-    testMappingParams: (s) => {
-      const [o] = M(s);
+    testMappingParams: (i) => {
+      const [o] = L(i);
       return o === u.GREATER_THAN_OR_EQUAL;
     },
-    mapToFilterColumn: (s) => ({
-      customFilters: { customFilters: [{ val: s.val1, operator: u.GREATER_THAN_OR_EQUAL }] }
+    mapToFilterColumn: (i) => ({
+      customFilters: { customFilters: [{ val: i.val1, operator: u.GREATER_THAN_OR_EQUAL }] }
     }),
-    testMappingFilterColumn: (s) => {
+    testMappingFilterColumn: (i) => {
       var a;
-      if (((a = s.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
+      if (((a = i.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0];
+      const o = i.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 = {
@@ -209,18 +209,18 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     numOfParameters: 1,
     order: C.FIRST,
     getDefaultFormParams: () => ({ operator1: u.LESS_THAN, val1: "" }),
-    testMappingParams: (s) => {
-      const [o] = M(s);
+    testMappingParams: (i) => {
+      const [o] = L(i);
       return o === u.LESS_THAN;
     },
-    mapToFilterColumn: (s) => ({
-      customFilters: { customFilters: [{ val: s.val1, operator: u.LESS_THAN }] }
+    mapToFilterColumn: (i) => ({
+      customFilters: { customFilters: [{ val: i.val1, operator: u.LESS_THAN }] }
     }),
-    testMappingFilterColumn: (s) => {
+    testMappingFilterColumn: (i) => {
       var a;
-      if (((a = s.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
+      if (((a = i.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0];
+      const o = i.customFilters.customFilters[0];
       return o.operator !== u.LESS_THAN ? !1 : { operator1: u.LESS_THAN, val1: o.val.toString() };
     }
   }, t.LESS_THAN_OR_EQUAL = {
@@ -229,18 +229,18 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     numOfParameters: 1,
     order: C.FIRST,
     getDefaultFormParams: () => ({ operator1: u.LESS_THAN_OR_EQUAL, val1: "" }),
-    testMappingParams: (s) => {
-      const [o] = M(s);
+    testMappingParams: (i) => {
+      const [o] = L(i);
       return o === u.LESS_THAN_OR_EQUAL;
     },
-    mapToFilterColumn: (s) => ({
-      customFilters: { customFilters: [{ val: s.val1, operator: u.LESS_THAN_OR_EQUAL }] }
+    mapToFilterColumn: (i) => ({
+      customFilters: { customFilters: [{ val: i.val1, operator: u.LESS_THAN_OR_EQUAL }] }
     }),
-    testMappingFilterColumn: (s) => {
+    testMappingFilterColumn: (i) => {
       var a;
-      if (((a = s.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
+      if (((a = i.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0];
+      const o = i.customFilters.customFilters[0];
       return o.operator !== u.LESS_THAN_OR_EQUAL ? !1 : { operator1: u.LESS_THAN_OR_EQUAL, val1: o.val.toString() };
     }
   }, t.EQUAL = {
@@ -249,18 +249,18 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     numOfParameters: 1,
     order: C.FIRST,
     getDefaultFormParams: () => ({ operator1: u.EQUAL, val1: "" }),
-    testMappingParams: (s) => {
-      const [o] = M(s);
+    testMappingParams: (i) => {
+      const [o] = L(i);
       return o === u.EQUAL;
     },
-    mapToFilterColumn: (s) => ({
-      customFilters: { customFilters: [{ val: s.val1, operator: u.EQUAL }] }
+    mapToFilterColumn: (i) => ({
+      customFilters: { customFilters: [{ val: i.val1, operator: u.EQUAL }] }
     }),
-    testMappingFilterColumn: (s) => {
+    testMappingFilterColumn: (i) => {
       var a;
-      if (((a = s.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
+      if (((a = i.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0];
+      const o = i.customFilters.customFilters[0];
       return o.operator !== u.EQUAL ? !1 : { operator1: u.EQUAL, val1: o.val.toString() };
     }
   }, t.NOT_EQUAL = {
@@ -269,18 +269,18 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     numOfParameters: 1,
     order: C.FIRST,
     getDefaultFormParams: () => ({ operator1: u.NOT_EQUALS, val1: "" }),
-    testMappingParams: (s) => {
-      const [o] = M(s);
+    testMappingParams: (i) => {
+      const [o] = L(i);
       return o === u.NOT_EQUALS;
     },
-    mapToFilterColumn: (s) => ({
-      customFilters: { customFilters: [{ val: s.val1, operator: u.NOT_EQUALS }] }
+    mapToFilterColumn: (i) => ({
+      customFilters: { customFilters: [{ val: i.val1, operator: u.NOT_EQUALS }] }
     }),
-    testMappingFilterColumn: (s) => {
+    testMappingFilterColumn: (i) => {
       var a;
-      if (((a = s.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
+      if (((a = i.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
         return !1;
-      const o = s.customFilters.customFilters[0];
+      const o = i.customFilters.customFilters[0];
       return o.operator !== u.NOT_EQUALS ? !1 : { operator1: u.NOT_EQUALS, val1: o.val.toString() };
     }
   }, t.BETWEEN = {
@@ -295,17 +295,17 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
       operator2: u.LESS_THAN_OR_EQUAL,
       val2: ""
     }),
-    testMappingParams: (s) => {
-      const { and: o, operator1: a, operator2: c } = s;
+    testMappingParams: (i) => {
+      const { and: o, operator1: a, operator2: c } = i;
       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;
+    mapToFilterColumn: (i) => {
+      const { val1: o, val2: a, operator1: c } = i, h = c === u.GREATER_THAN_OR_EQUAL;
       return {
         customFilters: {
-          and: st.TRUE,
+          and: rt.TRUE,
           customFilters: [
             { val: h ? o : a, operator: u.GREATER_THAN_OR_EQUAL },
             { val: h ? a : o, operator: u.LESS_THAN_OR_EQUAL }
@@ -313,18 +313,18 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
         }
       };
     },
-    testMappingFilterColumn: (s) => {
+    testMappingFilterColumn: (i) => {
       var c;
-      if (((c = s.customFilters) == null ? void 0 : c.customFilters.length) !== 2)
+      if (((c = i.customFilters) == null ? void 0 : c.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 [o, a] = i.customFilters.customFilters;
+      return o.operator === u.GREATER_THAN_OR_EQUAL && a.operator === u.LESS_THAN_OR_EQUAL && i.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 ? {
+      } : a.operator === u.GREATER_THAN_OR_EQUAL && o.operator === u.LESS_THAN_OR_EQUAL && i.customFilters.and ? {
         and: !0,
         operator1: u.GREATER_THAN_OR_EQUAL,
         val1: a.val.toString(),
@@ -343,14 +343,14 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
       operator2: u.GREATER_THAN,
       val2: ""
     }),
-    testMappingParams: (s) => {
-      const { and: o, operator1: a, operator2: c } = s;
+    testMappingParams: (i) => {
+      const { and: o, operator1: a, operator2: c } = i;
       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;
+    mapToFilterColumn: (i) => {
+      const { val1: o, val2: a, operator1: c } = i, h = c === u.GREATER_THAN;
       return {
         customFilters: {
           customFilters: [
@@ -360,17 +360,17 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
         }
       };
     },
-    testMappingFilterColumn: (s) => {
+    testMappingFilterColumn: (i) => {
       var c;
-      if (((c = s.customFilters) == null ? void 0 : c.customFilters.length) !== 2)
+      if (((c = i.customFilters) == null ? void 0 : c.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 ? {
+      const [o, a] = i.customFilters.customFilters;
+      return o.operator === u.LESS_THAN && a.operator === u.GREATER_THAN && !i.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 ? {
+      } : a.operator === u.LESS_THAN && o.operator === u.GREATER_THAN && !i.customFilters.and ? {
         operator1: u.GREATER_THAN,
         val1: a.val.toString(),
         operator2: u.LESS_THAN,
@@ -389,39 +389,39 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
       val2: ""
     }),
     testMappingParams: () => !0,
-    mapToFilterColumn: (s) => {
-      const { and: o, val1: a, val2: c, operator1: h, operator2: d } = s;
-      function v(I, O) {
-        for (const $ of t.ALL_CONDITIONS)
-          if ($.operator === I)
-            return $.mapToFilterColumn({ val1: O, operator1: I });
+    mapToFilterColumn: (i) => {
+      const { and: o, val1: a, val2: c, operator1: h, operator2: m } = i;
+      function g(R, O) {
+        for (const M of t.ALL_CONDITIONS)
+          if (M.operator === R)
+            return M.mapToFilterColumn({ val1: O, operator1: R });
       }
-      const p = !h || h === t.NONE.operator, T = !d || d === t.NONE.operator;
+      const p = !h || h === t.NONE.operator, T = !m || m === t.NONE.operator;
       if (p && T)
         return t.NONE.mapToFilterColumn({});
       if (p)
-        return v(d, c);
+        return g(m, c);
       if (T)
-        return v(h, a);
-      const g = v(h, a), N = v(d, c), F = {
+        return g(h, a);
+      const v = g(h, a), F = g(m, c), N = {
         customFilters: [
-          g.customFilters.customFilters[0],
-          N.customFilters.customFilters[0]
+          v.customFilters.customFilters[0],
+          F.customFilters.customFilters[0]
         ]
       };
-      return o && (F.and = st.TRUE), { customFilters: F };
+      return o && (N.and = rt.TRUE), { customFilters: N };
     },
-    testMappingFilterColumn: (s) => {
+    testMappingFilterColumn: (i) => {
       var c;
-      if (((c = s.customFilters) == null ? void 0 : c.customFilters.length) !== 2)
+      if (((c = i.customFilters) == null ? void 0 : c.customFilters.length) !== 2)
         return !1;
-      const o = s.customFilters.customFilters.map((h) => l({ customFilters: { customFilters: [h] } })), a = {
+      const o = i.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
       };
-      return s.customFilters.and && (a.and = !0), a;
+      return i.customFilters.and && (a.and = !0), a;
     }
   }, t.ALL_CONDITIONS = [
     // ------------------------------
@@ -447,193 +447,193 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     // ------------------------------
     t.CUSTOM
   ];
-  function e(s) {
-    const o = t.ALL_CONDITIONS.find((a) => a.operator === s);
+  function e(i) {
+    const o = t.ALL_CONDITIONS.find((a) => a.operator === i);
     if (!o)
-      throw new Error(`[SheetsFilter]: no condition item found for operator: ${s}`);
+      throw new Error(`[SheetsFilter]: no condition item found for operator: ${i}`);
     return o;
   }
   t.getItemByOperator = e;
-  function r(s, o) {
+  function r(i, o) {
     for (const a of t.ALL_CONDITIONS.filter((c) => c.numOfParameters === o))
-      if (a.numOfParameters !== 0 && a.testMappingParams(s))
+      if (a.numOfParameters !== 0 && a.testMappingParams(i))
         return a;
     for (const a of t.ALL_CONDITIONS)
-      if (a.testMappingParams(s))
+      if (a.testMappingParams(i))
         return a;
     throw new Error("[SheetsFilter]: no condition item can be mapped from the filter map params!");
   }
   t.testMappingParams = r;
-  function i(s) {
-    const o = t.ALL_CONDITIONS.find((a) => a.operator === s);
+  function s(i) {
+    const o = t.ALL_CONDITIONS.find((a) => a.operator === i);
     return (o == null ? void 0 : o.numOfParameters) === 0 ? { operator1: o.operator } : o.getDefaultFormParams();
   }
-  t.getInitialFormParams = i;
-  function n(s, o) {
-    return s.mapToFilterColumn(o);
+  t.getInitialFormParams = s;
+  function n(i, o) {
+    return i.mapToFilterColumn(o);
   }
   t.mapToFilterColumn = n;
-  function l(s) {
-    if (!s)
+  function l(i) {
+    if (!i)
       return [t.NONE, {}];
     for (const o of t.ALL_CONDITIONS) {
-      const a = o.testMappingFilterColumn(s);
+      const a = o.testMappingFilterColumn(i);
       if (a)
         return [o, a];
     }
     return [t.NONE, {}];
   }
   t.testMappingFilterColumn = l;
-})(m || (m = {}));
-function M(t) {
-  const { operator1: e, operator2: r, val1: i, val2: n } = t;
+})(d || (d = {}));
+function L(t) {
+  const { operator1: e, operator2: r, val1: s, val2: n } = t;
   if (e && r)
     throw new Error("Both operator1 and operator2 are set!");
   if (!e && !r)
     throw new Error("Neither operator1 and operator2 and both not set!");
-  return e ? [e, i] : [r, n];
+  return e ? [e, s] : [r, n];
 }
-function Ve(t) {
+function xe(t) {
   const e = [], r = [];
-  let i = 0, n = 0;
-  function l(s) {
-    s.leaf && (s.checked ? (e.push(s), i += s.count) : (r.push(s), n += s.count)), s.children && s.children.forEach(l);
+  let s = 0, n = 0;
+  function l(i) {
+    i.leaf && (i.checked ? (e.push(i), s += i.count) : (r.push(i), n += i.count)), i.children && i.children.forEach(l);
   }
   return t.forEach(l), {
     checkedItems: e,
     uncheckedItems: r,
-    checked: i,
+    checked: s,
     unchecked: n
   };
 }
-var Zr = Object.getOwnPropertyDescriptor, zr = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? Zr(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (n = s(n) || n);
+var Xr = Object.getOwnPropertyDescriptor, Zr = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Xr(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+    (i = t[l]) && (n = i(n) || n);
   return n;
-}, De = (t, e) => (r, i) => e(r, i, t);
-const et = "sheets-filter.generate-filter-values.service", Ne = gt(et), Jr = ["yyyy-mm-dd", "yyyy-mm-dd;@", "yyyy/mm/dd;@", "yyyy/mm/dd hh:mm", "yyyy-m-d am/pm h:mm", "yyyy-MM-dd", "yyyy/MM/dd", "yyyy/mm/dd", 'yyyy"年"MM"月"dd"日"', "MM-dd", 'M"月"d"日"', "MM-dd A/P hh:mm"];
-let We = class extends pe {
+}, He = (t, e) => (r, s) => e(r, s, t);
+const Je = "sheets-filter.generate-filter-values.service", Ce = _t(Je), zr = ["yyyy-mm-dd", "yyyy-mm-dd;@", "yyyy/mm/dd;@", "yyyy/mm/dd hh:mm", "yyyy-m-d am/pm h:mm", "yyyy-MM-dd", "yyyy/MM/dd", "yyyy/mm/dd", 'yyyy"年"MM"月"dd"日"', "MM-dd", 'M"月"d"日"', "MM-dd A/P hh:mm"];
+let Be = class extends me {
   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: i, filters: n, blankChecked: l, iterateRange: s, alreadyChecked: o } = t, a = this._univerInstanceService.getUnit(e), c = (h = this._univerInstanceService.getUnit(e)) == null ? void 0 : h.getSheetBySheetId(r);
-    return !a || !c ? [] : (this._logService.debug("[SheetsGenerateFilterValuesService]", "getFilterValues for", { unitId: e, subUnitId: r }), $t(n, this._localeService, s, c, new Set(i), new Set(o.map(String)), l, a.getStyles()));
+    const { unitId: e, subUnitId: r, filteredOutRowsByOtherColumns: s, filters: n, blankChecked: l, iterateRange: i, alreadyChecked: o } = t, a = this._univerInstanceService.getUnit(e), c = (h = this._univerInstanceService.getUnit(e)) == null ? void 0 : h.getSheetBySheetId(r);
+    return !a || !c ? [] : (this._logService.debug("[SheetsGenerateFilterValuesService]", "getFilterValues for", { unitId: e, subUnitId: r }), Mt(n, this._localeService, i, c, new Set(s), new Set(o.map(String)), l, a.getStyles()));
   }
 };
-We = zr([
-  De(0, E(X)),
-  De(1, je),
-  De(2, qt)
-], We);
-function $t(t, e, r, i, n, l, s, o) {
-  var g, N, F, I, O, $, w, ge, ve;
-  const a = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map(), h = "yyyy-mm-dd", d = new Set(Jr), v = "empty";
+Be = Zr([
+  He(0, E(K)),
+  He(1, Ge),
+  He(2, Yt)
+], Be);
+function Mt(t, e, r, s, n, l, i, o) {
+  var v, F, N, R, O, M, w, _e, ve;
+  const a = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map(), h = "yyyy-mm-dd", m = new Set(zr), g = "empty";
   let p = 0;
-  for (const R of i.iterateByColumn(r, !1, !1)) {
-    const { row: xt, rowSpan: rt = 1 } = R;
-    let J = 0;
-    for (; J < rt; ) {
-      const Qt = xt + J;
+  for (const I of s.iterateByColumn(r, !1, !1)) {
+    const { row: Wt, rowSpan: tt = 1 } = I;
+    let z = 0;
+    for (; z < tt; ) {
+      const Qt = Wt + z;
       if (n.has(Qt)) {
-        J++;
+        z++;
         continue;
       }
-      const j = R != null && R.value ? Kt(R.value) : "";
-      if (!j) {
-        p += 1, J += rt;
+      const G = I != null && I.value ? qt(I.value) : "";
+      if (!G) {
+        p += 1, z += tt;
         continue;
       }
-      const Se = (g = R.value) != null && g.v && !R.value.p ? (I = (F = o.get((N = R.value) == null ? void 0 : N.s)) == null ? void 0 : F.n) == null ? void 0 : I.pattern : "", Gt = Se && it.isDate(Se);
-      if (Se && Gt && d.has(Se)) {
-        const B = (O = i.getCellRaw(R.row, R.col)) == null ? void 0 : O.v;
-        if (!B) {
-          J++;
+      const ge = (v = I.value) != null && v.v && !I.value.p ? (R = (N = o.get((F = I.value) == null ? void 0 : F.s)) == null ? void 0 : N.n) == null ? void 0 : R.pattern : "", Vt = ge && it.isDate(ge);
+      if (ge && Vt && m.has(ge)) {
+        const k = (O = s.getCellRaw(I.row, I.col)) == null ? void 0 : O.v;
+        if (!k) {
+          z++;
           continue;
         }
-        const ee = it.format(h, B), [P, U, ae] = ee.split("-").map(Number);
-        let Y = a.get(`${P}`);
-        Y || (Y = {
-          title: `${P}`,
-          key: `${P}`,
+        const J = it.format(h, k), [y, $, oe] = J.split("-").map(Number);
+        let j = a.get(`${y}`);
+        j || (j = {
+          title: `${y}`,
+          key: `${y}`,
           children: [],
           count: 0,
           leaf: !1,
           checked: !1
-        }, a.set(`${P}`, Y), c.set(`${P}`, [`${P}`]));
-        let H = ($ = Y.children) == null ? void 0 : $.find((Ue) => Ue.key === `${P}-${U}`);
-        H || (H = {
-          title: e.t(`sheets-filter.date.${U}`),
-          key: `${P}-${U}`,
+        }, a.set(`${y}`, j), c.set(`${y}`, [`${y}`]));
+        let U = (M = j.children) == null ? void 0 : M.find(($e) => $e.key === `${y}-${$}`);
+        U || (U = {
+          title: e.t(`sheets-filter.date.${$}`),
+          key: `${y}-${$}`,
           children: [],
           count: 0,
           leaf: !1,
           checked: !1
-        }, (w = Y.children) == null || w.push(H), c.set(`${P}-${U}`, [`${P}`, `${P}-${U}`]));
-        const we = (ge = H == null ? void 0 : H.children) == null ? void 0 : ge.find((Ue) => Ue.key === `${P}-${U}-${ae}`);
-        we ? (we.originValues.add(j), we.count++, H.count++, Y.count++) : ((ve = H.children) == null || ve.push({
-          title: `${ae}`,
-          key: `${P}-${U}-${ae}`,
+        }, (w = j.children) == null || w.push(U), c.set(`${y}-${$}`, [`${y}`, `${y}-${$}`]));
+        const we = (_e = U == null ? void 0 : U.children) == null ? void 0 : _e.find(($e) => $e.key === `${y}-${$}-${oe}`);
+        we ? (we.originValues.add(G), we.count++, U.count++, j.count++) : ((ve = U.children) == null || ve.push({
+          title: `${oe}`,
+          key: `${y}-${$}-${oe}`,
           count: 1,
-          originValues: /* @__PURE__ */ new Set([j]),
+          originValues: /* @__PURE__ */ new Set([G]),
           leaf: !0,
-          checked: l.size ? l.has(j) : !s
-        }), H.count++, Y.count++, c.set(`${P}-${U}-${ae}`, [`${P}`, `${P}-${U}`, `${P}-${U}-${ae}`]));
+          checked: l.size ? l.has(G) : !i
+        }), U.count++, j.count++, c.set(`${y}-${$}-${oe}`, [`${y}`, `${y}-${$}`, `${y}-${$}-${oe}`]));
       } else {
-        const B = j;
-        let ee = a.get(B);
-        ee ? ee.count++ : (ee = {
-          title: j,
+        const k = G;
+        let J = a.get(k);
+        J ? J.count++ : (J = {
+          title: G,
           leaf: !0,
-          checked: l.size ? l.has(j) : !s,
-          key: B,
+          checked: l.size ? l.has(G) : !i,
+          key: k,
           count: 1
-        }, a.set(B, ee), c.set(B, [B]));
+        }, a.set(k, J), c.set(k, [k]));
       }
-      J++;
+      z++;
     }
   }
-  const T = t ? s : !0;
+  const T = t ? i : !0;
   if (p > 0) {
-    const R = {
+    const I = {
       title: e.t("sheets-filter.panel.empty"),
       count: p,
       leaf: !0,
       checked: T,
-      key: v
+      key: g
     };
-    a.set("empty", R), c.set("empty", [v]);
+    a.set("empty", I), c.set("empty", [g]);
   }
   return {
-    filterTreeItems: es(Array.from(a.values())),
+    filterTreeItems: Jr(Array.from(a.values())),
     filterTreeMapCache: c
   };
 }
-function es(t) {
-  return Array.from(t).sort((e, r) => e.children && !r.children ? -1 : !e.children && r.children ? 1 : ts(e.title, r.title)).map((e) => (e.children && e.children.sort((r, i) => {
-    const n = Number.parseInt(r.key.split("-")[1], 10), l = Number.parseInt(i.key.split("-")[1], 10);
+function Jr(t) {
+  return Array.from(t).sort((e, r) => e.children && !r.children ? -1 : !e.children && r.children ? 1 : ei(e.title, r.title)).map((e) => (e.children && e.children.sort((r, s) => {
+    const n = Number.parseInt(r.key.split("-")[1], 10), l = Number.parseInt(s.key.split("-")[1], 10);
     return n - l;
   }).forEach((r) => {
-    r.children && r.children.sort((i, n) => {
-      const l = Number.parseInt(i.key.split("-")[2], 10), s = Number.parseInt(n.key.split("-")[2], 10);
-      return l - s;
+    r.children && r.children.sort((s, n) => {
+      const l = Number.parseInt(s.key.split("-")[2], 10), i = Number.parseInt(n.key.split("-")[2], 10);
+      return l - i;
     });
   }), e));
 }
-const ut = (t) => !Number.isNaN(Number(t)) && !Number.isNaN(Number.parseFloat(t));
-function ts(t, e) {
-  const r = ut(t), i = ut(e);
-  return r && i ? Number.parseFloat(t) - Number.parseFloat(e) : r && !i ? -1 : !r && i ? 1 : t.localeCompare(e);
+const ct = (t) => !Number.isNaN(Number(t)) && !Number.isNaN(Number.parseFloat(t));
+function ei(t, e) {
+  const r = ct(t), s = ct(e);
+  return r && s ? Number.parseFloat(t) - Number.parseFloat(e) : r && !s ? -1 : !r && s ? 1 : t.localeCompare(e);
 }
-function xe(t, e) {
+function We(t, e) {
   for (const r of t) {
     if (r.key === e)
       return r;
     if (r.children) {
-      const i = xe(r.children, e);
-      if (i)
-        return i;
+      const s = We(r.children, e);
+      if (s)
+        return s;
     }
   }
   return null;
@@ -641,51 +641,51 @@ function xe(t, e) {
 function wt(t) {
   return t.leaf ? t.checked : t.children ? t.children.every((e) => wt(e)) : !0;
 }
-function he(t, e) {
-  t.leaf && (e !== void 0 ? t.checked = e : t.checked = !t.checked), t.children && t.children.forEach((r) => he(r, e));
+function ue(t, e) {
+  t.leaf && (e !== void 0 ? t.checked = e : t.checked = !t.checked), t.children && t.children.forEach((r) => ue(r, e));
 }
-function Ut(t, e) {
+function $t(t, e) {
   const r = [];
-  return t.forEach((i) => {
-    const n = i.originValues ? e.some(
-      (o) => Array.from(i.originValues).some(
+  return t.forEach((s) => {
+    const n = s.originValues ? e.some(
+      (o) => Array.from(s.originValues).some(
         (a) => a.toLowerCase().includes(o.toLowerCase())
       )
     ) : !1, l = !n && e.some(
-      (o) => i.title.toLowerCase().includes(o.toLowerCase())
+      (o) => s.title.toLowerCase().includes(o.toLowerCase())
     );
     if (n || l)
-      r.push({ ...i });
-    else if (i.children) {
-      const o = Ut(i.children, e);
+      r.push({ ...s });
+    else if (s.children) {
+      const o = $t(s.children, e);
       if (o.length > 0) {
         const a = o.reduce((c, h) => c + h.count, 0);
-        r.push({ ...i, count: a, children: o });
+        r.push({ ...s, count: a, children: o });
       }
     }
   }), r;
 }
-var rs = Object.getOwnPropertyDescriptor, tt = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? rs(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (n = s(n) || n);
+var ti = Object.getOwnPropertyDescriptor, et = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? ti(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+    (i = t[l]) && (n = i(n) || n);
   return n;
-}, Pe = (t, e) => (r, i) => e(r, i, t), Oe = /* @__PURE__ */ ((t) => (t[t.VALUES = 0] = "VALUES", t[t.CONDITIONS = 1] = "CONDITIONS", t))(Oe || {});
-gt("sheets-filter-ui.sheets-filter-panel.service");
-let x = class extends pe {
+}, Fe = (t, e) => (r, s) => e(r, s, t), ye = /* @__PURE__ */ ((t) => (t[t.VALUES = 0] = "VALUES", t[t.CONDITIONS = 1] = "CONDITIONS", t))(ye || {});
+_t("sheets-filter-ui.sheets-filter-panel.service");
+let W = class extends me {
   constructor(e, r) {
     super();
-    f(this, "_filterBy$", new K(
+    f(this, "_filterBy$", new q(
       0
       /* VALUES */
     ));
     f(this, "filterBy$", this._filterBy$.asObservable());
-    f(this, "_filterByModel$", new Ur(1));
+    f(this, "_filterByModel$", new $r(1));
     f(this, "filterByModel$", this._filterByModel$.asObservable());
     f(this, "_filterByModel", null);
-    f(this, "_hasCriteria$", new K(!1));
+    f(this, "_hasCriteria$", new q(!1));
     f(this, "hasCriteria$", this._hasCriteria$.asObservable());
     f(this, "_filterModel", null);
-    f(this, "_col$", new K(-1));
+    f(this, "_col$", new q(-1));
     f(this, "col$", this._col$.asObservable());
     f(this, "_filterHeaderListener", null);
     this._injector = e, this._refRangeService = r;
@@ -710,9 +710,9 @@ let x = class extends pe {
   }
   setupCol(e, r) {
     this.terminate(), this._filterModel = e, this._col$.next(r);
-    const i = e.getFilterColumn(r);
-    if (i) {
-      const n = i.getColumnData();
+    const s = e.getFilterColumn(r);
+    if (s) {
+      const n = s.getColumnData();
       if (n.customFilters) {
         this._hasCriteria$.next(!0), this._setupByConditions(e, r);
         return;
@@ -738,13 +738,13 @@ let x = class extends pe {
   }
   _listenToFilterHeaderChange(e, r) {
     this._disposeFilterHeaderChangeListener();
-    const i = e.unitId, n = e.subUnitId, l = e.getRange(), s = {
+    const s = e.unitId, n = e.subUnitId, l = e.getRange(), i = {
       startColumn: r,
       startRow: l.startRow,
       endRow: l.startRow,
       endColumn: r
     };
-    this._filterHeaderListener = this._refRangeService.watchRange(i, n, s, (o, a) => {
+    this._filterHeaderListener = this._refRangeService.watchRange(s, n, i, (o, a) => {
       if (!a)
         this.terminate();
       else {
@@ -755,9 +755,9 @@ let x = class extends pe {
   }
   async _setupByValues(e, r) {
     this._disposePreviousModel();
-    const i = e.getRange();
-    if (i.startRow === i.endRow) return !1;
-    const n = await Ie.fromFilterColumn(
+    const s = e.getRange();
+    if (s.startRow === s.endRow) return !1;
+    const n = await Re.fromFilterColumn(
       this._injector,
       e,
       r
@@ -769,9 +769,9 @@ let x = class extends pe {
   }
   _setupByConditions(e, r) {
     this._disposePreviousModel();
-    const i = e.getRange();
-    if (i.startRow === i.endRow) return !1;
-    const n = ye.fromFilterColumn(
+    const s = e.getRange();
+    if (s.startRow === s.endRow) return !1;
+    const n = Oe.fromFilterColumn(
       this._injector,
       e,
       r,
@@ -787,19 +787,19 @@ let x = class extends pe {
     (e = this._filterByModel) == null || e.dispose(), this.filterByModel = null;
   }
 };
-x = tt([
-  Pe(0, E(Z)),
-  Pe(1, E(lr))
-], x);
-let ye = class extends pe {
-  constructor(e, r, i, n, l) {
+W = et([
+  Fe(0, E(X)),
+  Fe(1, E(ar))
+], W);
+let Oe = class extends me {
+  constructor(e, r, s, n, l) {
     super();
-    f(this, "canApply$", _e(!0));
+    f(this, "canApply$", fe(!0));
     f(this, "_conditionItem$");
     f(this, "conditionItem$");
     f(this, "_filterConditionFormParams$");
     f(this, "filterConditionFormParams$");
-    this._filterModel = e, this.col = r, this._commandService = l, this._conditionItem$ = new K(i), this.conditionItem$ = this._conditionItem$.asObservable(), this._filterConditionFormParams$ = new K(n), this.filterConditionFormParams$ = this._filterConditionFormParams$.asObservable();
+    this._filterModel = e, this.col = r, this._commandService = l, this._conditionItem$ = new q(s), this.conditionItem$ = this._conditionItem$.asObservable(), this._filterConditionFormParams$ = new q(n), 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
@@ -812,9 +812,9 @@ let ye = class extends pe {
    *
    * @returns the model to control the panel's state
    */
-  static fromFilterColumn(e, r, i, n) {
-    const [l, s] = m.testMappingFilterColumn(n == null ? void 0 : n.getColumnData());
-    return e.createInstance(ye, r, i, l, s);
+  static fromFilterColumn(e, r, s, n) {
+    const [l, i] = d.testMappingFilterColumn(n == null ? void 0 : n.getColumnData());
+    return e.createInstance(Oe, r, s, l, i);
   }
   get conditionItem() {
     return this._conditionItem$.getValue();
@@ -829,7 +829,7 @@ let ye = class extends pe {
     this.col += e;
   }
   clear() {
-    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(se.id, {
+    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(re.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
@@ -841,8 +841,8 @@ let ye = class extends pe {
    */
   async apply() {
     if (this._disposed) return !1;
-    const e = m.mapToFilterColumn(this.conditionItem, this.filterConditionFormParams);
-    return this._commandService.executeCommand(se.id, {
+    const e = d.mapToFilterColumn(this.conditionItem, this.filterConditionFormParams);
+    return this._commandService.executeCommand(re.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
@@ -854,10 +854,10 @@ let ye = class extends pe {
    * `IFilterConditionFormParams` and load default condition form params.
    */
   onPrimaryConditionChange(e) {
-    const r = m.ALL_CONDITIONS.find((i) => i.operator === e);
+    const r = d.ALL_CONDITIONS.find((s) => s.operator === e);
     if (!r)
       throw new Error(`[ByConditionsModel]: condition item not found for operator: ${e}!`);
-    this._conditionItem$.next(r), this._filterConditionFormParams$.next(m.getInitialFormParams(e));
+    this._conditionItem$.next(r), this._filterConditionFormParams$.next(d.getInitialFormParams(e));
   }
   /**
    * This method would be called when user changes the primary conditions, the input values or "AND" "OR" ratio.
@@ -870,17 +870,17 @@ let ye = class extends pe {
   onConditionFormChange(e) {
     const r = { ...this.filterConditionFormParams, ...e };
     if (r.and !== !0 && delete r.and, typeof e.and < "u" || typeof e.operator1 < "u" || typeof e.operator2 < "u") {
-      const i = m.testMappingParams(r, this.conditionItem.numOfParameters);
-      this._conditionItem$.next(i);
+      const s = d.testMappingParams(r, this.conditionItem.numOfParameters);
+      this._conditionItem$.next(s);
     }
     this._filterConditionFormParams$.next(r);
   }
 };
-ye = tt([
-  Pe(4, Q)
-], ye);
-let Ie = class extends pe {
-  constructor(e, r, i, n, l) {
+Oe = et([
+  Fe(4, Q)
+], Oe);
+let Re = class extends me {
+  constructor(e, r, s, n, l) {
     super();
     f(this, "_rawFilterItems$");
     f(this, "rawFilterItems$");
@@ -891,22 +891,22 @@ let Ie = class extends pe {
     f(this, "_manuallyUpdateFilterItems$");
     f(this, "_searchString$");
     f(this, "searchString$");
-    this._filterModel = e, this.col = r, this._commandService = l, this._treeMapCache = n, this._searchString$ = new K(""), this.searchString$ = this._searchString$.asObservable(), this._rawFilterItems$ = new K(i), this.rawFilterItems$ = this._rawFilterItems$.asObservable(), this._manuallyUpdateFilterItems$ = new Hr(), this.filterItems$ = Dr(
-      kr([
+    this._filterModel = e, this.col = r, this._commandService = l, this._treeMapCache = n, this._searchString$ = new q(""), this.searchString$ = this._searchString$.asObservable(), this._rawFilterItems$ = new q(s), this.rawFilterItems$ = this._rawFilterItems$.asObservable(), this._manuallyUpdateFilterItems$ = new Ur(), this.filterItems$ = Hr(
+      Dr([
         this._searchString$.pipe(
-          yt(500, void 0, { leading: !0, trailing: !0 }),
-          It(void 0)
+          Ot(500, void 0, { leading: !0, trailing: !0 }),
+          Rt(void 0)
         ),
         this._rawFilterItems$
       ]).pipe(
-        ie(([s, o]) => {
-          if (!s) return o;
-          const c = s.toLowerCase().split(/\s+/).filter((h) => !!h);
-          return Ut(o, c);
+        ie(([i, o]) => {
+          if (!i) return o;
+          const c = i.toLowerCase().split(/\s+/).filter((h) => !!h);
+          return $t(o, c);
         })
       ),
       this._manuallyUpdateFilterItems$
-    ).pipe(Br(1)), this.canApply$ = this.filterItems$.pipe(ie((s) => Ve(s).checked > 0)), this.disposeWithMe(this.filterItems$.subscribe((s) => this._filterItems = s));
+    ).pipe(kr(1)), this.canApply$ = this.filterItems$.pipe(ie((i) => xe(i).checked > 0)), this.disposeWithMe(this.filterItems$.subscribe((i) => this._filterItems = i));
   }
   /**
    * Create a model with targeting filter column. If there is not a filter column, the model would be created with
@@ -918,30 +918,30 @@ let Ie = class extends pe {
    *
    * @returns the model to control the panel's state
    */
-  static async fromFilterColumn(e, r, i) {
-    var $;
-    const n = e.get(je), l = e.get(X), s = e.get(Ne, vt.OPTIONAL), { unitId: o, subUnitId: a } = r, c = n.getUniverSheetInstance(o);
+  static async fromFilterColumn(e, r, s) {
+    var M;
+    const n = e.get(Ge), l = e.get(K), i = e.get(Ce, vt.OPTIONAL), { unitId: o, subUnitId: a } = r, c = n.getUniverSheetInstance(o);
     if (!c) throw new Error(`[ByValuesModel]: Workbook not found for filter model with unitId: ${o}!`);
     const h = c == null ? void 0 : c.getSheetBySheetId(a);
     if (!h) throw new Error(`[ByValuesModel]: Worksheet not found for filter model with unitId: ${o} and subUnitId: ${a}!`);
-    const d = r.getRange(), v = i, p = ($ = r.getFilterColumn(i)) == null ? void 0 : $.getColumnData().filters, T = new Set(p == null ? void 0 : p.filters), g = !!(p && p.blank), N = r.getFilteredOutRowsExceptCol(i), F = { ...d, startRow: d.startRow + 1, startColumn: v, endColumn: v };
-    let I, O;
-    if (s) {
-      const w = await s.getFilterValues({
+    const m = r.getRange(), g = s, p = (M = r.getFilterColumn(s)) == null ? void 0 : M.getColumnData().filters, T = new Set(p == null ? void 0 : p.filters), v = !!(p && p.blank), F = r.getFilteredOutRowsExceptCol(s), N = { ...m, startRow: m.startRow + 1, startColumn: g, endColumn: g };
+    let R, O;
+    if (i) {
+      const w = await i.getFilterValues({
         unitId: o,
         subUnitId: a,
-        filteredOutRowsByOtherColumns: Array.from(N),
+        filteredOutRowsByOtherColumns: Array.from(F),
         filters: !!p,
-        blankChecked: g,
-        iterateRange: F,
+        blankChecked: v,
+        iterateRange: N,
         alreadyChecked: Array.from(T)
       });
-      I = w.filterTreeItems, O = w.filterTreeMapCache;
+      R = w.filterTreeItems, O = w.filterTreeMapCache;
     } else {
-      const w = $t(!!p, l, F, h, N, T, g, c.getStyles());
-      I = w.filterTreeItems, O = w.filterTreeMapCache;
+      const w = Mt(!!p, l, N, h, F, T, v, c.getStyles());
+      R = w.filterTreeItems, O = w.filterTreeMapCache;
     }
-    return e.createInstance(Ie, r, i, I, O);
+    return e.createInstance(Re, r, s, R, O);
   }
   get rawFilterItems() {
     return this._rawFilterItems$.getValue();
@@ -962,24 +962,24 @@ let Ie = class extends pe {
     this._searchString$.next(e);
   }
   onCheckAllToggled(e) {
-    const r = Fe.deepClone(this._filterItems);
-    r.forEach((i) => he(i, e)), this._manuallyUpdateFilterItems(r);
+    const r = Te.deepClone(this._filterItems);
+    r.forEach((s) => ue(s, e)), this._manuallyUpdateFilterItems(r);
   }
   /**
    * Toggle a filter item.
    */
   onFilterCheckToggled(e) {
-    const r = Fe.deepClone(this._filterItems), i = xe(r, e.key);
-    if (!i)
+    const r = Te.deepClone(this._filterItems), s = We(r, e.key);
+    if (!s)
       return;
-    const n = wt(i);
-    he(i, !n), this._manuallyUpdateFilterItems(r);
+    const n = wt(s);
+    ue(s, !n), this._manuallyUpdateFilterItems(r);
   }
   onFilterOnly(e) {
-    const r = Fe.deepClone(this._filterItems);
-    r.forEach((i) => he(i, !1)), e.forEach((i) => {
-      const n = xe(r, i);
-      n && he(n, !0);
+    const r = Te.deepClone(this._filterItems);
+    r.forEach((s) => ue(s, !1)), e.forEach((s) => {
+      const n = We(r, s);
+      n && ue(n, !0);
     }), this._manuallyUpdateFilterItems(r);
   }
   _manuallyUpdateFilterItems(e) {
@@ -988,7 +988,7 @@ let Ie = class extends pe {
   // expose method here to let the panel change filter items
   // #region ByValuesModel apply methods
   clear() {
-    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(se.id, {
+    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(re.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
@@ -1001,15 +1001,15 @@ let Ie = class extends pe {
   async apply() {
     if (this._disposed)
       return !1;
-    const e = Ve(this._filterItems), { checked: r, checkedItems: i } = e, n = this.rawFilterItems;
+    const e = xe(this._filterItems), { checked: r, checkedItems: s } = e, n = this.rawFilterItems;
     let l = 0;
     for (const c of n)
       l += c.count;
-    const s = r === 0, o = e.checked === l, a = { colId: this.col };
-    if (s)
+    const i = r === 0, o = e.checked === l, a = { colId: this.col };
+    if (i)
       throw new Error("[ByValuesModel]: no checked items!");
     if (o)
-      return this._commandService.executeCommand(se.id, {
+      return this._commandService.executeCommand(re.id, {
         unitId: this._filterModel.unitId,
         subUnitId: this._filterModel.subUnitId,
         col: this.col,
@@ -1017,12 +1017,12 @@ let Ie = class extends pe {
       });
     {
       a.filters = {};
-      const c = i.filter((d) => d.key !== "empty");
+      const c = s.filter((m) => m.key !== "empty");
       c.length > 0 && (a.filters = {
-        filters: c.flatMap((d) => d.originValues ? Array.from(d.originValues) : [d.title])
-      }), c.length !== i.length && (a.filters.blank = !0);
+        filters: c.flatMap((m) => m.originValues ? Array.from(m.originValues) : [m.title])
+      }), c.length !== s.length && (a.filters.blank = !0);
     }
-    return this._commandService.executeCommand(se.id, {
+    return this._commandService.executeCommand(re.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
@@ -1031,474 +1031,582 @@ let Ie = class extends pe {
   }
   // #endregion
 };
-Ie = tt([
-  Pe(4, Q)
-], Ie);
-const ne = "FILTER_PANEL_OPENED", Re = {
+Re = et([
+  Fe(4, Q)
+], Re);
+const se = "FILTER_PANEL_OPENED", Ie = {
   id: "sheet.operation.open-filter-panel",
-  type: Me.OPERATION,
+  type: Le.OPERATION,
   handler: (t, e) => {
-    const r = t.get($e), i = t.get(G), n = t.get(x);
-    t.get(Q).syncExecuteCommand(Pr.id, { visible: !1 });
-    const { unitId: s, subUnitId: o, col: a } = e, c = i.getFilterModel(s, o);
-    return c ? (n.setupCol(c, a), r.getContextValue(ne) || r.setContextValue(ne, !0), !0) : !1;
+    const r = t.get(Me), s = t.get(V), n = t.get(W);
+    t.get(Q).syncExecuteCommand(Fr.id, { visible: !1 });
+    const { unitId: i, subUnitId: o, col: a } = e, c = s.getFilterModel(i, o);
+    return c ? (n.setupCol(c, a), r.getContextValue(se) || r.setContextValue(se, !0), !0) : !1;
   }
-}, me = {
+}, he = {
   id: "sheet.operation.close-filter-panel",
-  type: Me.OPERATION,
+  type: Le.OPERATION,
   handler: (t) => {
-    const e = t.get($e), r = t.get(x), i = t.get(_r, vt.OPTIONAL);
-    return e.getContextValue(ne) ? (e.setContextValue(ne, !1), i == null || i.focus(), r.terminate()) : !1;
+    const e = t.get(Me), r = t.get(W), s = t.get(fr, vt.OPTIONAL);
+    return e.getContextValue(se) ? (e.setContextValue(se, !1), s == null || s.focus(), r.terminate()) : !1;
   }
-}, Ht = {
+}, Ut = {
   id: "sheet.operation.apply-filter",
-  type: Me.OPERATION,
+  type: Le.OPERATION,
   handler: (t, e) => {
     const { filterBy: r } = e;
-    return t.get(x).changeFilterBy(r);
+    return t.get(W).changeFilterBy(r);
   }
 };
-var ss = Object.getOwnPropertyDescriptor, is = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? ss(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (n = s(n) || n);
+var ri = Object.getOwnPropertyDescriptor, ii = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? ri(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+    (i = t[l]) && (n = i(n) || n);
   return n;
-}, te = (t, e) => (r, i) => e(r, i, t);
-let oe = class extends pe {
-  constructor(t, e, r, i, n, l) {
-    super(), this._sheetsFilterService = t, this._localeService = e, this._commandService = r, this._sheetPermissionCheckPermission = i, this._injector = n, this._sheetsSelectionService = l, this._commandExecutedListener();
+}, ee = (t, e) => (r, s) => e(r, s, t);
+let ne = class extends me {
+  constructor(t, e, r, s, n, l) {
+    super(), this._sheetsFilterService = t, this._localeService = e, this._commandService = r, this._sheetPermissionCheckPermission = s, this._injector = n, this._sheetsSelectionService = l, this._commandExecutedListener();
   }
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((t) => {
-        var e, r, i;
-        if (t.id === fe.id) {
-          const n = this._injector.get(je), l = hr(n);
+        var e, r, s;
+        if (t.id === pe.id) {
+          const n = this._injector.get(Ge), l = ur(n);
           if (!l) return;
-          const { unitId: s, subUnitId: o, worksheet: a } = l, c = (e = this._sheetsFilterService.getFilterModel(s, o)) == null ? void 0 : e.getRange();
+          const { unitId: i, subUnitId: o, worksheet: a } = l, c = (e = this._sheetsFilterService.getFilterModel(i, o)) == null ? void 0 : e.getRange();
           let h;
           if (c)
             h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
-              rangeTypes: [ue],
-              worksheetTypes: [le, ce]
+              rangeTypes: [ce],
+              worksheetTypes: [ae, le]
             }, [c]);
           else {
-            const d = (r = this._sheetsSelectionService.getCurrentLastSelection()) == null ? void 0 : r.range;
-            if (d) {
-              let v = { ...d };
-              v = d.startColumn === d.endColumn && d.startRow === d.endRow ? mr(v, { left: !0, right: !0, up: !0, down: !0 }, a) : v, h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
-                rangeTypes: [ue],
-                worksheetTypes: [ce, le]
-              }, [v], s, o);
+            const m = (r = this._sheetsSelectionService.getCurrentLastSelection()) == null ? void 0 : r.range;
+            if (m) {
+              let g = { ...m };
+              g = m.startColumn === m.endColumn && m.startRow === m.endRow ? hr(g, { left: !0, right: !0, up: !0, down: !0 }, a) : g, h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
+                rangeTypes: [ce],
+                worksheetTypes: [le, ae]
+              }, [g], i, o);
             } else
               h = this._sheetPermissionCheckPermission.permissionCheckWithoutRange({
-                rangeTypes: [ue],
-                worksheetTypes: [ce, le]
+                rangeTypes: [ce],
+                worksheetTypes: [le, ae]
               });
           }
           h || this._sheetPermissionCheckPermission.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.filterErr"));
         }
-        if (t.id === Re.id) {
-          const n = t.params, { unitId: l, subUnitId: s } = n, o = (i = this._sheetsFilterService.getFilterModel(l, s)) == null ? void 0 : i.getRange(), a = Fe.deepClone(o);
+        if (t.id === Ie.id) {
+          const n = t.params, { unitId: l, subUnitId: i } = n, o = (s = this._sheetsFilterService.getFilterModel(l, i)) == null ? void 0 : s.getRange(), a = Te.deepClone(o);
           a && (a.startColumn = n.col, a.endColumn = n.col, this._sheetPermissionCheckPermission.permissionCheckWithRanges({
-            rangeTypes: [ue],
-            worksheetTypes: [le, ce]
+            rangeTypes: [ce],
+            worksheetTypes: [ae, le]
           }, [a]) || this._sheetPermissionCheckPermission.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.filterErr")));
         }
       })
     );
   }
 };
-oe = is([
-  te(0, E(G)),
-  te(1, E(X)),
-  te(2, Q),
-  te(3, E(cr)),
-  te(4, E(Z)),
-  te(5, E(ur))
-], oe);
-var b = function() {
-  return b = Object.assign || function(t) {
-    for (var e, r = 1, i = arguments.length; r < i; r++) {
+ne = ii([
+  ee(0, E(V)),
+  ee(1, E(K)),
+  ee(2, Q),
+  ee(3, E(lr)),
+  ee(4, E(X)),
+  ee(5, E(cr))
+], ne);
+var P = function() {
+  return P = Object.assign || function(t) {
+    for (var e, r = 1, s = arguments.length; r < s; r++) {
       e = arguments[r];
       for (var n in e) Object.prototype.hasOwnProperty.call(e, n) && (t[n] = e[n]);
     }
     return t;
-  }, b.apply(this, arguments);
-}, ns = function(t, e) {
+  }, P.apply(this, arguments);
+}, si = function(t, e) {
   var r = {};
-  for (var i in t) Object.prototype.hasOwnProperty.call(t, i) && e.indexOf(i) < 0 && (r[i] = t[i]);
+  for (var s in t) Object.prototype.hasOwnProperty.call(t, s) && e.indexOf(s) < 0 && (r[s] = t[s]);
   if (t != null && typeof Object.getOwnPropertySymbols == "function")
-    for (var n = 0, i = Object.getOwnPropertySymbols(t); n < i.length; n++)
-      e.indexOf(i[n]) < 0 && Object.prototype.propertyIsEnumerable.call(t, i[n]) && (r[i[n]] = t[i[n]]);
+    for (var n = 0, s = Object.getOwnPropertySymbols(t); n < s.length; n++)
+      e.indexOf(s[n]) < 0 && Object.prototype.propertyIsEnumerable.call(t, s[n]) && (r[s[n]] = t[s[n]]);
   return r;
-}, Dt = bt(function(t, e) {
-  var r = t.icon, i = t.id, n = t.className, l = t.extend, s = ns(t, ["icon", "id", "className", "extend"]), o = "univerjs-icon univerjs-icon-".concat(i, " ").concat(n || "").trim(), a = Xr("_".concat(ls()));
-  return kt(r, "".concat(i), { defIds: r.defIds, idSuffix: a.current }, b({ ref: e, className: o }, s), l);
+}, Ht = Pt(function(t, e) {
+  var r = t.icon, s = t.id, n = t.className, l = t.extend, i = si(t, ["icon", "id", "className", "extend"]), o = "univerjs-icon univerjs-icon-".concat(s, " ").concat(n || "").trim(), a = Kr("_".concat(ai()));
+  return Dt(r, "".concat(s), { defIds: r.defIds, idSuffix: a.current }, P({ ref: e, className: o }, i), l);
 });
-function kt(t, e, r, i, n) {
-  return Lt(t.tag, b(b({ key: e }, os(t, r, n)), i), (as(t, r).children || []).map(function(l, s) {
-    return kt(l, "".concat(e, "-").concat(t.tag, "-").concat(s), r, void 0, n);
+function Dt(t, e, r, s, n) {
+  return bt(t.tag, P(P({ key: e }, ni(t, r, n)), s), (oi(t, r).children || []).map(function(l, i) {
+    return Dt(l, "".concat(e, "-").concat(t.tag, "-").concat(i), r, void 0, n);
   }));
 }
-function os(t, e, r) {
-  var i = b({}, t.attrs);
-  r != null && r.colorChannel1 && i.fill === "colorChannel1" && (i.fill = r.colorChannel1), t.tag === "mask" && i.id && (i.id = i.id + e.idSuffix), Object.entries(i).forEach(function(l) {
-    var s = l[0], o = l[1];
-    s === "mask" && typeof o == "string" && (i[s] = o.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
+function ni(t, e, r) {
+  var s = P({}, t.attrs);
+  r != null && r.colorChannel1 && s.fill === "colorChannel1" && (s.fill = r.colorChannel1), t.tag === "mask" && s.id && (s.id = s.id + e.idSuffix), Object.entries(s).forEach(function(l) {
+    var i = l[0], o = l[1];
+    i === "mask" && typeof o == "string" && (s[i] = o.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   });
   var n = e.defIds;
-  return !n || n.length === 0 || (t.tag === "use" && i["xlink:href"] && (i["xlink:href"] = i["xlink:href"] + e.idSuffix), Object.entries(i).forEach(function(l) {
-    var s = l[0], o = l[1];
-    typeof o == "string" && (i[s] = o.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
-  })), i;
+  return !n || n.length === 0 || (t.tag === "use" && s["xlink:href"] && (s["xlink:href"] = s["xlink:href"] + e.idSuffix), Object.entries(s).forEach(function(l) {
+    var i = l[0], o = l[1];
+    typeof o == "string" && (s[i] = o.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
+  })), s;
 }
-function as(t, e) {
-  var r, i = e.defIds;
-  return !i || i.length === 0 ? t : t.tag === "defs" && (!((r = t.children) === null || r === void 0) && r.length) ? b(b({}, t), { children: t.children.map(function(n) {
-    return typeof n.attrs.id == "string" && i && i.indexOf(n.attrs.id) > -1 ? b(b({}, n), { attrs: b(b({}, n.attrs), { id: n.attrs.id + e.idSuffix }) }) : n;
+function oi(t, e) {
+  var r, s = e.defIds;
+  return !s || s.length === 0 ? t : t.tag === "defs" && (!((r = t.children) === null || r === void 0) && r.length) ? P(P({}, t), { children: t.children.map(function(n) {
+    return typeof n.attrs.id == "string" && s && s.indexOf(n.attrs.id) > -1 ? P(P({}, n), { attrs: P(P({}, n.attrs), { id: n.attrs.id + e.idSuffix }) }) : n;
   }) }) : t;
 }
-function ls() {
+function ai() {
   return Math.random().toString(36).substring(2, 8);
 }
-Dt.displayName = "UniverIcon";
-var cs = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M3.32182 2.60967C2.98161 2.60967 2.79671 3.0074 3.01601 3.2675L6.85819 7.8246C6.94943 7.93282 6.99947 8.06981 6.99947 8.21136V12.7338C6.99947 12.898 7.0998 13.0455 7.2525 13.1058L8.73833 13.6928C9.00085 13.7965 9.28531 13.6031 9.28531 13.3208V8.21136C9.28531 8.06981 9.33535 7.93282 9.42659 7.8246L13.2688 3.2675C13.4881 3.0074 13.3032 2.60967 12.963 2.60967H3.32182ZM2.09858 4.04101C1.22139 3.0006 1.96097 1.40967 3.32182 1.40967H12.963C14.3238 1.40967 15.0634 3.0006 14.1862 4.04101L10.4853 8.43054V13.3208C10.4853 14.4498 9.34747 15.2237 8.29742 14.8089L6.81158 14.2219C6.20078 13.9806 5.79947 13.3905 5.79947 12.7338V8.43054L2.09858 4.04101Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Bt = bt(function(t, e) {
-  return Lt(Dt, Object.assign({}, t, {
+Ht.displayName = "UniverIcon";
+var li = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M3.32182 2.60967C2.98161 2.60967 2.79671 3.0074 3.01601 3.2675L6.85819 7.8246C6.94943 7.93282 6.99947 8.06981 6.99947 8.21136V12.7338C6.99947 12.898 7.0998 13.0455 7.2525 13.1058L8.73833 13.6928C9.00085 13.7965 9.28531 13.6031 9.28531 13.3208V8.21136C9.28531 8.06981 9.33535 7.93282 9.42659 7.8246L13.2688 3.2675C13.4881 3.0074 13.3032 2.60967 12.963 2.60967H3.32182ZM2.09858 4.04101C1.22139 3.0006 1.96097 1.40967 3.32182 1.40967H12.963C14.3238 1.40967 15.0634 3.0006 14.1862 4.04101L10.4853 8.43054V13.3208C10.4853 14.4498 9.34747 15.2237 8.29742 14.8089L6.81158 14.2219C6.20078 13.9806 5.79947 13.3905 5.79947 12.7338V8.43054L2.09858 4.04101Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, kt = Pt(function(t, e) {
+  return bt(Ht, Object.assign({}, t, {
     id: "filter-single",
     ref: e,
-    icon: cs
+    icon: li
   }));
 });
-Bt.displayName = "FilterSingle";
-const us = "univer-sheets-filter-panel", hs = "univer-sheets-filter-panel-header", ms = "univer-sheets-filter-panel-content", ds = "univer-sheets-filter-panel-values-container", ps = "univer-sheets-filter-panel-values-virtual", fs = "univer-sheets-filter-panel-values-item", _s = "univer-sheets-filter-panel-values-item-inner", gs = "univer-sheets-filter-panel-values-item-count", vs = "univer-sheets-filter-panel-values-item-text", Ss = "univer-sheets-filter-panel-conditions-container", Es = "univer-sheets-filter-panel-conditions-container-inner", Ts = "univer-sheets-filter-panel-conditions-desc", Fs = "univer-sheets-filter-panel-footer", Cs = "univer-sheets-filter-panel-footer-primary-buttons", y = {
-  sheetsFilterPanel: us,
-  sheetsFilterPanelHeader: hs,
-  sheetsFilterPanelContent: ms,
-  sheetsFilterPanelValuesContainer: ds,
-  sheetsFilterPanelValuesVirtual: ps,
-  sheetsFilterPanelValuesItem: fs,
-  sheetsFilterPanelValuesItemInner: _s,
-  sheetsFilterPanelValuesItemCount: gs,
-  sheetsFilterPanelValuesItemText: vs,
-  sheetsFilterPanelConditionsContainer: Ss,
-  sheetsFilterPanelConditionsContainerInner: Es,
-  sheetsFilterPanelConditionsDesc: Ts,
-  sheetsFilterPanelFooter: Fs,
-  sheetsFilterPanelFooterPrimaryButtons: Cs
-};
-function Ns(t) {
+kt.displayName = "FilterSingle";
+function ci(t) {
   var p, T;
-  const { model: e } = t, r = re(X), i = W(e.conditionItem$, void 0), n = W(e.filterConditionFormParams$, void 0), l = n != null && n.and ? "AND" : "OR", s = k((g) => {
-    e.onConditionFormChange({ and: g === "AND" });
-  }, [e]), o = Ps(r), a = k((g) => {
-    e.onPrimaryConditionChange(g);
-  }, [e]), c = Os(r), h = k((g) => {
-    e.onConditionFormChange(g);
-  }, [e]), d = r.t("sheets-filter.panel.input-values-placeholder");
-  function v(g, N, F) {
-    const I = m.getItemByOperator(g).numOfParameters === 1;
-    return /* @__PURE__ */ L(ct, { children: [
-      F === "operator2" && /* @__PURE__ */ L(Qr, { value: l, onChange: s, children: [
-        /* @__PURE__ */ S(at, { value: "AND", children: r.t("sheets-filter.panel.and") }),
-        /* @__PURE__ */ S(at, { value: "OR", children: r.t("sheets-filter.panel.or") })
+  const { model: e } = t, r = te(K), s = B(e.conditionItem$, void 0), n = B(e.filterConditionFormParams$, void 0), l = n != null && n.and ? "AND" : "OR", i = D((v) => {
+    e.onConditionFormChange({ and: v === "AND" });
+  }, [e]), o = ui(r), a = D((v) => {
+    e.onPrimaryConditionChange(v);
+  }, [e]), c = hi(r), h = D((v) => {
+    e.onConditionFormChange(v);
+  }, [e]), m = r.t("sheets-filter.panel.input-values-placeholder");
+  function g(v, F, N) {
+    const R = d.getItemByOperator(v).numOfParameters === 1;
+    return /* @__PURE__ */ b(lt, { children: [
+      N === "operator2" && /* @__PURE__ */ b(Qr, { value: l, onChange: i, children: [
+        /* @__PURE__ */ S(ot, { value: "AND", children: r.t("sheets-filter.panel.and") }),
+        /* @__PURE__ */ S(ot, { value: "OR", children: r.t("sheets-filter.panel.or") })
       ] }),
-      /* @__PURE__ */ S(ot, { value: g, options: c, onChange: (O) => h({ [F]: O }) }),
-      I && /* @__PURE__ */ S("div", { children: /* @__PURE__ */ S(Rt, { value: N, placeholder: d, onChange: (O) => h({ [F === "operator1" ? "val1" : "val2"]: O }) }) })
+      /* @__PURE__ */ S(
+        nt,
+        {
+          value: v,
+          options: c,
+          onChange: (O) => h({ [N]: O })
+        }
+      ),
+      R && /* @__PURE__ */ S("div", { children: /* @__PURE__ */ S(
+        It,
+        {
+          className: "univer-mt-2",
+          value: F,
+          placeholder: m,
+          onChange: (O) => h({ [N === "operator1" ? "val1" : "val2"]: O })
+        }
+      ) })
     ] });
   }
-  return /* @__PURE__ */ S("div", { className: y.sheetsFilterPanelConditionsContainer, children: i && n && /* @__PURE__ */ L(ct, { children: [
-    /* @__PURE__ */ S(ot, { value: i.operator, options: o, onChange: a }),
-    m.getItemByOperator(i.operator).numOfParameters !== 0 ? /* @__PURE__ */ L("div", { className: y.sheetsFilterPanelConditionsContainerInner, children: [
-      i.numOfParameters >= 1 && v(n.operator1, (p = n.val1) != null ? p : "", "operator1"),
-      i.numOfParameters >= 2 && v(n.operator2, (T = n.val2) != null ? T : "", "operator2"),
-      /* @__PURE__ */ L("div", { className: y.sheetsFilterPanelConditionsDesc, children: [
-        r.t("sheets-filter.panel.?"),
-        /* @__PURE__ */ S("br", {}),
-        r.t("sheets-filter.panel.*")
+  return /* @__PURE__ */ S(
+    "div",
+    {
+      "data-univer-comp-sheets-filter-panel-conditions-container": !0,
+      className: "univer-flex univer-h-full univer-flex-col",
+      children: s && n && /* @__PURE__ */ b(lt, { children: [
+        /* @__PURE__ */ S(nt, { value: s.operator, options: o, onChange: a }),
+        d.getItemByOperator(s.operator).numOfParameters !== 0 ? /* @__PURE__ */ b(
+          "div",
+          {
+            "data-univer-comp-sheets-filter-panel-conditions-container-inner": !0,
+            className: `
+                                  univer-mt-2 univer-flex-grow univer-overflow-hidden univer-rounded-md univer-border
+                                  univer-border-solid univer-border-gray-200 univer-p-2
+                                `,
+            children: [
+              s.numOfParameters >= 1 && g(n.operator1, (p = n.val1) != null ? p : "", "operator1"),
+              s.numOfParameters >= 2 && g(n.operator2, (T = n.val2) != null ? T : "", "operator2"),
+              /* @__PURE__ */ b(
+                "div",
+                {
+                  "data-univer-comp-sheets-filter-panel-conditions-desc": !0,
+                  className: "univer-mt-2 univer-text-xs univer-text-gray-500",
+                  children: [
+                    r.t("sheets-filter.panel.?"),
+                    /* @__PURE__ */ S("br", {}),
+                    r.t("sheets-filter.panel.*")
+                  ]
+                }
+              )
+            ]
+          }
+        ) : null
       ] })
-    ] }) : null
-  ] }) });
+    }
+  );
 }
-function Ps(t) {
+function ui(t) {
   const e = t.getCurrentLocale();
-  return Je(
-    () => [
-      {
-        options: [
-          { label: t.t(m.NONE.label), value: m.NONE.operator }
-        ]
-      },
-      {
-        options: [
-          { label: t.t(m.EMPTY.label), value: m.EMPTY.operator },
-          { label: t.t(m.NOT_EMPTY.label), value: m.NOT_EMPTY.operator }
-        ]
-      },
-      {
-        options: [
-          { label: t.t(m.TEXT_CONTAINS.label), value: m.TEXT_CONTAINS.operator },
-          { label: t.t(m.DOES_NOT_CONTAIN.label), value: m.DOES_NOT_CONTAIN.operator },
-          { label: t.t(m.STARTS_WITH.label), value: m.STARTS_WITH.operator },
-          { label: t.t(m.ENDS_WITH.label), value: m.ENDS_WITH.operator },
-          { label: t.t(m.EQUALS.label), value: m.EQUALS.operator }
-        ]
-      },
-      {
-        options: [
-          { label: t.t(m.GREATER_THAN.label), value: m.GREATER_THAN.operator },
-          { label: t.t(m.GREATER_THAN_OR_EQUAL.label), value: m.GREATER_THAN_OR_EQUAL.operator },
-          { label: t.t(m.LESS_THAN.label), value: m.LESS_THAN.operator },
-          { label: t.t(m.LESS_THAN_OR_EQUAL.label), value: m.LESS_THAN_OR_EQUAL.operator },
-          { label: t.t(m.EQUAL.label), value: m.EQUAL.operator },
-          { label: t.t(m.NOT_EQUAL.label), value: m.NOT_EQUAL.operator },
-          { label: t.t(m.BETWEEN.label), value: m.BETWEEN.operator },
-          { label: t.t(m.NOT_BETWEEN.label), value: m.NOT_BETWEEN.operator }
-        ]
-      },
-      {
-        options: [
-          { label: t.t(m.CUSTOM.label), value: m.CUSTOM.operator }
-        ]
-      }
-    ],
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [e, t]
-  );
+  return ze(() => [
+    {
+      options: [
+        { label: t.t(d.NONE.label), value: d.NONE.operator }
+      ]
+    },
+    {
+      options: [
+        { label: t.t(d.EMPTY.label), value: d.EMPTY.operator },
+        { label: t.t(d.NOT_EMPTY.label), value: d.NOT_EMPTY.operator }
+      ]
+    },
+    {
+      options: [
+        { label: t.t(d.TEXT_CONTAINS.label), value: d.TEXT_CONTAINS.operator },
+        { label: t.t(d.DOES_NOT_CONTAIN.label), value: d.DOES_NOT_CONTAIN.operator },
+        { label: t.t(d.STARTS_WITH.label), value: d.STARTS_WITH.operator },
+        { label: t.t(d.ENDS_WITH.label), value: d.ENDS_WITH.operator },
+        { label: t.t(d.EQUALS.label), value: d.EQUALS.operator }
+      ]
+    },
+    {
+      options: [
+        { label: t.t(d.GREATER_THAN.label), value: d.GREATER_THAN.operator },
+        { label: t.t(d.GREATER_THAN_OR_EQUAL.label), value: d.GREATER_THAN_OR_EQUAL.operator },
+        { label: t.t(d.LESS_THAN.label), value: d.LESS_THAN.operator },
+        { label: t.t(d.LESS_THAN_OR_EQUAL.label), value: d.LESS_THAN_OR_EQUAL.operator },
+        { label: t.t(d.EQUAL.label), value: d.EQUAL.operator },
+        { label: t.t(d.NOT_EQUAL.label), value: d.NOT_EQUAL.operator },
+        { label: t.t(d.BETWEEN.label), value: d.BETWEEN.operator },
+        { label: t.t(d.NOT_BETWEEN.label), value: d.NOT_BETWEEN.operator }
+      ]
+    },
+    {
+      options: [
+        { label: t.t(d.CUSTOM.label), value: d.CUSTOM.operator }
+      ]
+    }
+  ], [e, t]);
 }
-function Os(t) {
+function hi(t) {
   const e = t.getCurrentLocale();
-  return Je(
-    () => m.ALL_CONDITIONS.filter((r) => r.numOfParameters !== 2).map((r) => ({ label: t.t(r.label), value: r.operator })),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [e, t]
-  );
+  return ze(() => d.ALL_CONDITIONS.filter((r) => r.numOfParameters !== 2).map((r) => ({ label: t.t(r.label), value: r.operator })), [e, t]);
 }
-function ys(t) {
-  const { model: e } = t, r = re(X), i = W(e.searchString$, "", !0), n = W(e.filterItems$, void 0, !0), l = r.t("sheets-filter.panel.filter-only"), s = Ve(n), o = s.checked > 0 && s.unchecked === 0, a = s.checked > 0 && s.unchecked > 0, c = e.treeMapCache, h = k(() => {
+function di(t) {
+  const { model: e } = t, r = te(K), s = B(e.searchString$, "", !0), n = B(e.filterItems$, void 0, !0), l = r.t("sheets-filter.panel.filter-only"), i = xe(n), o = i.checked > 0 && i.unchecked === 0, a = i.checked > 0 && i.unchecked > 0, c = e.treeMapCache, h = D(() => {
     e.onCheckAllToggled(!o);
-  }, [e, o]), d = k((p) => {
+  }, [e, o]), m = D((p) => {
     e.setSearchString(p);
   }, [e]);
-  function v(p) {
+  function g(p) {
     let T = [];
-    return p.forEach((g) => {
-      g.checked && T.push(g.key), g.children && (T = T.concat(v(g.children)));
+    return p.forEach((v) => {
+      v.checked && T.push(v.key), v.children && (T = T.concat(g(v.children)));
     }), T;
   }
-  return /* @__PURE__ */ L("div", { className: y.sheetsFilterPanelValuesContainer, children: [
-    /* @__PURE__ */ S(
-      Rt,
-      {
-        autoFocus: !0,
-        value: i,
-        placeholder: r.t("sheets-filter.panel.search-placeholder"),
-        onChange: d
-      }
-    ),
-    /* @__PURE__ */ L(
-      "div",
-      {
-        className: `
+  return /* @__PURE__ */ b(
+    "div",
+    {
+      "data-univer-comp-sheets-filter-panel-values-container": !0,
+      className: "univer-flex univer-h-full univer-flex-col",
+      children: [
+        /* @__PURE__ */ S(
+          It,
+          {
+            autoFocus: !0,
+            value: s,
+            placeholder: r.t("sheets-filter.panel.search-placeholder"),
+            onChange: m
+          }
+        ),
+        /* @__PURE__ */ b(
+          "div",
+          {
+            "data-univer-comp-sheets-filter-panel": !0,
+            className: `
                   univer-mt-2 univer-box-border univer-flex univer-flex-grow univer-flex-col univer-overflow-hidden
                   univer-rounded-md univer-border univer-border-solid univer-border-gray-200 univer-px-2 univer-py-2.5
                 `,
-        children: [
-          /* @__PURE__ */ S("div", { className: y.sheetsFilterPanelValuesItem, children: /* @__PURE__ */ L("div", { className: y.sheetsFilterPanelValuesItemInner, children: [
-            /* @__PURE__ */ S(
-              Gr,
-              {
-                indeterminate: a,
-                disabled: n.length === 0,
-                checked: o,
-                onChange: h
-              }
-            ),
-            /* @__PURE__ */ S("span", { className: y.sheetsFilterPanelValuesItemText, children: `${r.t("sheets-filter.panel.select-all")}` }),
-            /* @__PURE__ */ S("span", { className: y.sheetsFilterPanelValuesItemCount, children: `(${s.checked}/${s.checked + s.unchecked})` })
-          ] }) }),
-          /* @__PURE__ */ S("div", { className: y.sheetsFilterPanelValuesVirtual, children: /* @__PURE__ */ S(
-            jr,
-            {
-              data: n,
-              defaultExpandAll: !1,
-              valueGroup: v(n),
-              height: 180,
-              onChange: (p) => {
-                e.onFilterCheckToggled(p);
-              },
-              defaultCache: c,
-              itemHeight: 28,
-              treeNodeClassName: `
+            children: [
+              /* @__PURE__ */ S(
+                "div",
+                {
+                  "data-univer-comp-sheets-filter-panel-values-item": !0,
+                  className: "univer-box-border univer-h-8 univer-w-full univer-py-0.5",
+                  children: /* @__PURE__ */ b(
+                    "div",
+                    {
+                      "data-univer-comp-sheets-filter-panel-values-item-inner": !0,
+                      className: `
+                          univer-box-border univer-flex univer-h-7 univer-items-center univer-rounded-md univer-pb-0
+                          univer-pl-5 univer-pr-0.5 univer-pt-0 univer-text-[13px]
+                        `,
+                      children: [
+                        /* @__PURE__ */ S(
+                          Vr,
+                          {
+                            indeterminate: a,
+                            disabled: n.length === 0,
+                            checked: o,
+                            onChange: h
+                          }
+                        ),
+                        /* @__PURE__ */ S(
+                          "span",
+                          {
+                            "data-univer-comp-sheets-filter-panel-values-item-text": !0,
+                            className: `
+                              univer-mx-1 univer-inline-block univer-flex-shrink univer-overflow-hidden
+                              univer-text-ellipsis univer-whitespace-nowrap univer-text-gray-950
+                              dark:univer-text-white
+                            `,
+                            children: `${r.t("sheets-filter.panel.select-all")}`
+                          }
+                        ),
+                        /* @__PURE__ */ S(
+                          "span",
+                          {
+                            "data-univer-comp-sheets-filter-panel-values-item-count": !0,
+                            className: `
+                              univer-text-gray-400
+                              dark:univer-text-gray-500
+                            `,
+                            children: `(${i.checked}/${i.checked + i.unchecked})`
+                          }
+                        )
+                      ]
+                    }
+                  )
+                }
+              ),
+              /* @__PURE__ */ S("div", { "data-univer-comp-sheets-filter-panel-values-virtual": !0, className: "univer-flex-grow", children: /* @__PURE__ */ S(
+                Gr,
+                {
+                  data: n,
+                  defaultExpandAll: !1,
+                  valueGroup: g(n),
+                  height: 180,
+                  onChange: (p) => {
+                    e.onFilterCheckToggled(p);
+                  },
+                  defaultCache: c,
+                  itemHeight: 28,
+                  treeNodeClassName: `
                           univer-pr-2 univer-border-box univer-max-w-[245px] univer-rounded-md
                           [&:hover_a]:univer-inline-block
                           hover:univer-bg-gray-50 univer-h-full
+                          univer-text-gray-950
+                          dark:univer-text-white
                         `,
-              attachRender: (p) => /* @__PURE__ */ L(
-                "div",
-                {
-                  className: `
+                  attachRender: (p) => /* @__PURE__ */ b(
+                    "div",
+                    {
+                      className: `
                                   univer-ml-1 univer-flex univer-h-5 univer-flex-1 univer-cursor-pointer
                                   univer-items-center univer-justify-between univer-text-[13px] univer-text-primary-500
                                 `,
-                  children: [
-                    /* @__PURE__ */ S("span", { className: y.sheetsFilterPanelValuesItemCount, children: `(${p.count})` }),
-                    /* @__PURE__ */ S(
-                      "a",
-                      {
-                        className: `
+                      children: [
+                        /* @__PURE__ */ S(
+                          "span",
+                          {
+                            "data-univer-comp-sheets-filter-panel-values-item-count": !0,
+                            className: `
+                                      univer-text-gray-400
+                                      dark:univer-text-gray-500
+                                    `,
+                            children: `(${p.count})`
+                          }
+                        ),
+                        /* @__PURE__ */ S(
+                          "a",
+                          {
+                            className: `
                                       univer-box-border univer-hidden univer-h-4 univer-whitespace-nowrap univer-px-1.5
                                     `,
-                        onClick: () => {
-                          const T = [];
-                          p.children ? p.children.forEach((g) => {
-                            g.children ? g.children.forEach((N) => {
-                              T.push(N.key);
-                            }) : T.push(g.key);
-                          }) : T.push(p.key), e.onFilterOnly(T);
-                        },
-                        children: l
-                      }
-                    )
-                  ]
+                            onClick: () => {
+                              const T = [];
+                              p.children ? p.children.forEach((v) => {
+                                v.children ? v.children.forEach((F) => {
+                                  T.push(F.key);
+                                }) : T.push(v.key);
+                              }) : T.push(p.key), e.onFilterOnly(T);
+                            },
+                            children: l
+                          }
+                        )
+                      ]
+                    }
+                  )
                 }
-              )
-            }
-          ) })
-        ]
-      }
-    )
-  ] });
+              ) })
+            ]
+          }
+        )
+      ]
+    }
+  );
 }
-function Is() {
-  var N;
-  const t = re(x), e = re(X), r = re(Q), i = W(t.filterBy$, void 0, !0), n = W(t.filterByModel$, void 0, !1), l = W(() => (n == null ? void 0 : n.canApply$) || _e(!1), void 0, !1, [n]), s = Rs(e), o = !W(t.hasCriteria$), a = k((F) => {
-    r.executeCommand(Ht.id, { filterBy: F });
-  }, [r]), c = k(async () => {
-    await (n == null ? void 0 : n.clear()), r.executeCommand(me.id);
-  }, [n, r]), h = k(() => {
-    r.executeCommand(me.id);
-  }, [r]), d = k(async () => {
-    await (n == null ? void 0 : n.apply()), r.executeCommand(me.id);
-  }, [n, r]), p = (N = re(G).activeFilterModel) == null ? void 0 : N.getRange(), T = t.col, g = gr(Or.FILTER_PANEL_EMBED_POINT);
-  return /* @__PURE__ */ L("div", { className: y.sheetsFilterPanel, children: [
-    /* @__PURE__ */ S(
-      vr,
-      {
-        components: g,
-        sharedProps: { range: p, colIndex: T, onClose: h }
-      }
-    ),
-    /* @__PURE__ */ S("div", { className: y.sheetsFilterPanelHeader, children: /* @__PURE__ */ S(
-      Yr,
-      {
-        value: i,
-        items: s,
-        onChange: (F) => a(F)
-      }
-    ) }),
-    n ? /* @__PURE__ */ S("div", { className: y.sheetsFilterPanelContent, children: i === Oe.VALUES ? /* @__PURE__ */ S(ys, { model: n }) : /* @__PURE__ */ S(Ns, { model: n }) }) : /* @__PURE__ */ S("div", { style: { flex: 1 } }),
-    /* @__PURE__ */ L("div", { className: y.sheetsFilterPanelFooter, children: [
-      /* @__PURE__ */ S(He, { variant: "link", onClick: c, disabled: o, children: e.t("sheets-filter.panel.clear-filter") }),
-      /* @__PURE__ */ L("span", { className: y.sheetsFilterPanelFooterPrimaryButtons, children: [
-        /* @__PURE__ */ S(He, { variant: "default", onClick: h, children: e.t("sheets-filter.panel.cancel") }),
-        /* @__PURE__ */ S(He, { disabled: !l, variant: "primary", onClick: d, children: e.t("sheets-filter.panel.confirm") })
-      ] })
-    ] })
-  ] });
+function mi() {
+  var F;
+  const t = te(W), e = te(K), r = te(Q), s = B(t.filterBy$, void 0, !0), n = B(t.filterByModel$, void 0, !1), l = B(() => (n == null ? void 0 : n.canApply$) || fe(!1), void 0, !1, [n]), i = pi(e), o = !B(t.hasCriteria$), a = D((N) => {
+    r.executeCommand(Ut.id, { filterBy: N });
+  }, [r]), c = D(async () => {
+    await (n == null ? void 0 : n.clear()), r.executeCommand(he.id);
+  }, [n, r]), h = D(() => {
+    r.executeCommand(he.id);
+  }, [r]), m = D(async () => {
+    await (n == null ? void 0 : n.apply()), r.executeCommand(he.id);
+  }, [n, r]), p = (F = te(V).activeFilterModel) == null ? void 0 : F.getRange(), T = t.col, v = _r(yr.FILTER_PANEL_EMBED_POINT);
+  return /* @__PURE__ */ b(
+    "div",
+    {
+      "data-u-comp-sheets-filter-panel": !0,
+      className: `
+              univer-box-border univer-flex univer-h-[432px] univer-w-[312px] univer-flex-col univer-rounded-lg
+              univer-bg-white univer-p-4 univer-shadow-lg
+              dark:univer-bg-black
+            `,
+      children: [
+        /* @__PURE__ */ S(
+          vr,
+          {
+            components: v,
+            sharedProps: { range: p, colIndex: T, onClose: h }
+          }
+        ),
+        /* @__PURE__ */ S(
+          "div",
+          {
+            "data-u-comp-sheets-filter-panel-header": !0,
+            className: "univer-mb-1 univer-flex-shrink-0 univer-flex-grow-0",
+            children: /* @__PURE__ */ S(
+              jr,
+              {
+                value: s,
+                items: i,
+                onChange: (N) => a(N)
+              }
+            )
+          }
+        ),
+        n ? /* @__PURE__ */ S(
+          "div",
+          {
+            "data-u-comp-sheets-filter-panel-content": !0,
+            className: "univer-flex-shrink univer-flex-grow univer-pt-2",
+            children: s === ye.VALUES ? /* @__PURE__ */ S(di, { model: n }) : /* @__PURE__ */ S(ci, { model: n })
+          }
+        ) : /* @__PURE__ */ S("div", { style: { flex: 1 } }),
+        /* @__PURE__ */ b(
+          "div",
+          {
+            "data-u-comp-sheets-filter-panel-footer": !0,
+            className: `
+                  univer-mt-4 univer-inline-flex univer-flex-shrink-0 univer-flex-grow-0 univer-flex-nowrap
+                  univer-justify-between univer-overflow-hidden
+                `,
+            children: [
+              /* @__PURE__ */ S(Ue, { variant: "link", onClick: c, disabled: o, children: e.t("sheets-filter.panel.clear-filter") }),
+              /* @__PURE__ */ b("span", { className: "univer-space-x-2", children: [
+                /* @__PURE__ */ S(Ue, { variant: "default", onClick: h, children: e.t("sheets-filter.panel.cancel") }),
+                /* @__PURE__ */ S(Ue, { disabled: !l, variant: "primary", onClick: m, children: e.t("sheets-filter.panel.confirm") })
+              ] })
+            ]
+          }
+        )
+      ]
+    }
+  );
 }
-function Rs(t) {
+function pi(t) {
   const e = t.getCurrentLocale();
-  return Je(() => [
-    { label: t.t("sheets-filter.panel.by-values"), value: Oe.VALUES },
-    { label: t.t("sheets-filter.panel.by-conditions"), value: Oe.CONDITIONS }
+  return ze(() => [
+    { label: t.t("sheets-filter.panel.by-values"), value: ye.VALUES },
+    { label: t.t("sheets-filter.panel.by-conditions"), value: ye.CONDITIONS }
   ], [e, t]);
 }
-function As(t) {
-  const e = t.get(G);
+function fi(t) {
+  const e = t.get(V);
   return {
-    id: fe.id,
-    type: Ze.BUTTON_SELECTOR,
+    id: pe.id,
+    type: Xe.BUTTON_SELECTOR,
     icon: "FilterSingle",
     tooltip: "sheets-filter.toolbar.smart-toggle-filter-tooltip",
-    hidden$: Xe(t, z.UNIVER_SHEET),
+    hidden$: Ke(t, Z.UNIVER_SHEET),
     activated$: e.activeFilterModel$.pipe(ie((r) => !!r)),
-    disabled$: yr(t, Ir(t, { worksheetTypes: [le, ce], rangeTypes: [ue] }))
+    disabled$: Or(t, Rr(t, { worksheetTypes: [ae, le], rangeTypes: [ce] }))
   };
 }
-function bs(t) {
-  const e = t.get(G);
+function _i(t) {
+  const e = t.get(V);
   return {
-    id: Ke.id,
-    type: Ze.BUTTON,
+    id: qe.id,
+    type: Xe.BUTTON,
     title: "sheets-filter.toolbar.clear-filter-criteria",
-    hidden$: Xe(t, z.UNIVER_SHEET),
-    disabled$: e.activeFilterModel$.pipe(ze((r) => {
-      var i;
-      return (i = r == null ? void 0 : r.hasCriteria$.pipe(ie((n) => !n))) != null ? i : _e(!0);
+    hidden$: Ke(t, Z.UNIVER_SHEET),
+    disabled$: e.activeFilterModel$.pipe(Ze((r) => {
+      var s;
+      return (s = r == null ? void 0 : r.hasCriteria$.pipe(ie((n) => !n))) != null ? s : fe(!0);
     }))
   };
 }
-function Ls(t) {
-  const e = t.get(G);
+function vi(t) {
+  const e = t.get(V);
   return {
-    id: qe.id,
-    type: Ze.BUTTON,
+    id: Ye.id,
+    type: Xe.BUTTON,
     title: "sheets-filter.toolbar.re-calc-filter-conditions",
-    hidden$: Xe(t, z.UNIVER_SHEET),
-    disabled$: e.activeFilterModel$.pipe(ze((r) => {
-      var i;
-      return (i = r == null ? void 0 : r.hasCriteria$.pipe(ie((n) => !n))) != null ? i : _e(!0);
+    hidden$: Ke(t, Z.UNIVER_SHEET),
+    disabled$: e.activeFilterModel$.pipe(Ze((r) => {
+      var s;
+      return (s = r == null ? void 0 : r.hasCriteria$.pipe(ie((n) => !n))) != null ? s : fe(!0);
     }))
   };
 }
-const Ms = {
-  [Sr.FORMULAS_INSERT]: {
-    [fe.id]: {
+const gi = {
+  [gr.FORMULAS_INSERT]: {
+    [pe.id]: {
       order: 10,
-      menuItemFactory: As,
-      [Ke.id]: {
+      menuItemFactory: fi,
+      [qe.id]: {
         order: 0,
-        menuItemFactory: bs
+        menuItemFactory: _i
       },
-      [qe.id]: {
+      [Ye.id]: {
         order: 1,
-        menuItemFactory: Ls
+        menuItemFactory: vi
       }
     }
   }
-}, V = 16, $s = new Path2D("M3.30363 3C2.79117 3 2.51457 3.60097 2.84788 3.99024L6.8 8.60593V12.5662C6.8 12.7184 6.8864 12.8575 7.02289 12.9249L8.76717 13.7863C8.96655 13.8847 9.2 13.7396 9.2 13.5173V8.60593L13.1521 3.99024C13.4854 3.60097 13.2088 3 12.6964 3H3.30363Z");
-class ht {
-  static drawNoCriteria(e, r, i, n) {
-    e.save(), lt.drawWith(e, {
+}, x = 16, Si = new Path2D("M3.30363 3C2.79117 3 2.51457 3.60097 2.84788 3.99024L6.8 8.60593V12.5662C6.8 12.7184 6.8864 12.8575 7.02289 12.9249L8.76717 13.7863C8.96655 13.8847 9.2 13.7396 9.2 13.5173V8.60593L13.1521 3.99024C13.4854 3.60097 13.2088 3 12.6964 3H3.30363Z");
+class ut {
+  static drawNoCriteria(e, r, s, n) {
+    e.save(), at.drawWith(e, {
       radius: 2,
-      width: V,
-      height: V,
+      width: x,
+      height: x,
       fill: n
-    }), e.lineCap = "square", e.strokeStyle = i, e.scale(r / V, r / V), e.beginPath(), e.lineWidth = 1, e.lineCap = "round", e.moveTo(3, 4), e.lineTo(13, 4), e.moveTo(4.5, 8), e.lineTo(11.5, 8), e.moveTo(6, 12), e.lineTo(10, 12), e.stroke(), e.restore();
+    }), e.lineCap = "square", e.strokeStyle = s, e.scale(r / x, r / x), e.beginPath(), e.lineWidth = 1, e.lineCap = "round", e.moveTo(3, 4), e.lineTo(13, 4), e.moveTo(4.5, 8), e.lineTo(11.5, 8), e.moveTo(6, 12), e.lineTo(10, 12), e.stroke(), e.restore();
   }
-  static drawHasCriteria(e, r, i, n) {
-    e.save(), lt.drawWith(e, {
+  static drawHasCriteria(e, r, s, n) {
+    e.save(), at.drawWith(e, {
       radius: 2,
-      width: V,
-      height: V,
+      width: x,
+      height: x,
       fill: n
-    }), e.scale(r / V, r / V), e.fillStyle = i, e.fill($s), e.restore();
+    }), e.scale(r / x, r / x), e.fillStyle = s, e.fill(Si), e.restore();
   }
 }
-var ws = Object.getOwnPropertyDescriptor, Us = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? ws(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (n = s(n) || n);
+var Ei = Object.getOwnPropertyDescriptor, Ti = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Ei(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+    (i = t[l]) && (n = i(n) || n);
   return n;
-}, ke = (t, e) => (r, i) => e(r, i, t);
-const D = 16, Ee = 1;
-let Qe = class extends Kr {
-  constructor(e, r, i, n, l) {
+}, De = (t, e) => (r, s) => e(r, s, t);
+const H = 16, Se = 1;
+let Qe = class extends qr {
+  constructor(e, r, s, n, l) {
     super(e, r);
     f(this, "_cellWidth", 0);
     f(this, "_cellHeight", 0);
     f(this, "_filterParams");
     f(this, "_hovered", !1);
-    this._contextService = i, this._commandService = n, this._themeService = l, this.setShapeProps(r), this.onPointerDown$.subscribeEvent((s) => this.onPointerDown(s)), this.onPointerEnter$.subscribeEvent(() => this.onPointerEnter()), this.onPointerLeave$.subscribeEvent(() => this.onPointerLeave());
+    this._contextService = s, this._commandService = n, this._themeService = l, this.setShapeProps(r), this.onPointerDown$.subscribeEvent((i) => this.onPointerDown(i)), 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({
@@ -1507,20 +1615,20 @@ let Qe = class extends Kr {
     });
   }
   _draw(e) {
-    const r = this._cellHeight, i = this._cellWidth, n = D - i, l = D - r;
+    const r = this._cellHeight, s = this._cellWidth, n = H - s, l = H - r;
     e.save();
-    const s = new Path2D();
-    s.rect(n, l, i, r), e.clip(s);
+    const i = new Path2D();
+    i.rect(n, l, s, r), e.clip(i);
     const { hasCriteria: o } = this._filterParams, a = this._themeService.getCurrentTheme().primaryColor, c = this._hovered ? this._themeService.getCurrentTheme().grey50 : "rgba(255, 255, 255, 1.0)";
-    o ? ht.drawHasCriteria(e, D, a, c) : ht.drawNoCriteria(e, D, a, c), e.restore();
+    o ? ut.drawHasCriteria(e, H, a, c) : ut.drawNoCriteria(e, H, a, c), e.restore();
   }
   onPointerDown(e) {
     if (e.button === 2)
       return;
-    const { col: r, unitId: i, subUnitId: n } = this._filterParams;
-    this._contextService.getContextValue(ne) || !this._commandService.hasCommand(Re.id) || setTimeout(() => {
-      this._commandService.executeCommand(Re.id, {
-        unitId: i,
+    const { col: r, unitId: s, subUnitId: n } = this._filterParams;
+    this._contextService.getContextValue(se) || !this._commandService.hasCommand(Ie.id) || setTimeout(() => {
+      this._commandService.executeCommand(Ie.id, {
+        unitId: s,
         subUnitId: n,
         col: r
       });
@@ -1533,62 +1641,62 @@ let Qe = class extends Kr {
     this._hovered = !1, this.makeDirty(!0);
   }
 };
-Qe = Us([
-  ke(2, $e),
-  ke(3, Q),
-  ke(4, E(St))
+Qe = Ti([
+  De(2, Me),
+  De(3, Q),
+  De(4, E(gt))
 ], Qe);
-var Hs = Object.getOwnPropertyDescriptor, Ds = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? Hs(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (n = s(n) || n);
+var Ni = Object.getOwnPropertyDescriptor, Ci = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Ni(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+    (i = t[l]) && (n = i(n) || n);
   return n;
-}, q = (t, e) => (r, i) => e(r, i, t);
-const ks = 1e3, Bs = 5e3;
-let Ge = class extends Et {
-  constructor(e, r, i, n, l, s, o, a) {
+}, Y = (t, e) => (r, s) => e(r, s, t);
+const Fi = 1e3, yi = 5e3;
+let Ve = class extends St {
+  constructor(e, r, s, n, l, i, o, a) {
     super();
     f(this, "_filterRangeShape", null);
     f(this, "_buttonRenderDisposable", null);
     f(this, "_filterButtonShapes", []);
-    this._context = e, this._injector = r, this._sheetSkeletonManagerService = i, this._sheetsFilterService = n, this._themeService = l, this._sheetInterceptorService = s, this._commandService = o, this._selectionRenderService = a, this._initRenderer();
+    this._context = e, this._injector = r, this._sheetSkeletonManagerService = s, this._sheetsFilterService = n, this._themeService = l, this._sheetInterceptorService = i, this._commandService = o, this._selectionRenderService = a, this._initRenderer();
   }
   dispose() {
     super.dispose(), this._disposeRendering();
   }
   _initRenderer() {
     this._sheetSkeletonManagerService.currentSkeleton$.pipe(
-      ze((e) => {
+      Ze((e) => {
         var o, a;
-        if (!e) return _e(null);
-        const { unit: r, unitId: i } = this._context, n = ((o = r.getActiveSheet()) == null ? void 0 : o.getSheetId()) || "", l = (a = this._sheetsFilterService.getFilterModel(i, n)) != null ? a : void 0, s = () => ({
-          unitId: i,
+        if (!e) return fe(null);
+        const { unit: r, unitId: s } = this._context, n = ((o = r.getActiveSheet()) == null ? void 0 : o.getSheetId()) || "", l = (a = this._sheetsFilterService.getFilterModel(s, n)) != null ? a : void 0, i = () => ({
+          unitId: s,
           worksheetId: n,
           filterModel: l,
           range: l == null ? void 0 : l.getRange(),
           skeleton: e.skeleton
         });
-        return Xt(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(
-          Vr(
+        return Kt(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(
+          xr(
             ([c]) => {
               var h;
-              return c.type === Me.MUTATION && ((h = c.params) == null ? void 0 : h.unitId) === r.getUnitId() && (tr.has(c.id) || c.id === pr.id);
+              return c.type === Le.MUTATION && ((h = c.params) == null ? void 0 : h.unitId) === r.getUnitId() && (er.has(c.id) || c.id === mr.id);
             }
           ),
-          yt(20, void 0, { leading: !1, trailing: !0 }),
-          ie(s),
-          It(s())
+          Ot(20, void 0, { leading: !1, trailing: !0 }),
+          ie(i),
+          Rt(i())
           // must trigger once
         );
       }),
-      Wr(this.dispose$)
+      Br(this.dispose$)
     ).subscribe((e) => {
       this._disposeRendering(), !(!e || !e.range) && (this._renderRange(e.range, e.skeleton), this._renderButtons(e));
     });
   }
   _renderRange(e, r) {
-    const { scene: i } = this._context, { rowHeaderWidth: n, columnHeaderHeight: l } = r, s = this._filterRangeShape = new br(
-      i,
-      ks,
+    const { scene: s } = this._context, { rowHeaderWidth: n, columnHeaderHeight: l } = r, i = this._filterRangeShape = new Pr(
+      s,
+      Fi,
       this._themeService,
       {
         rowHeaderWidth: n,
@@ -1596,46 +1704,46 @@ let Ge = class extends Et {
         enableAutoFill: !1,
         highlightHeader: !1
       }
-    ), a = Lr({
+    ), a = br({
       range: e,
       primary: null,
       style: { fill: "rgba(0, 0, 0, 0.0)" }
     }, r);
-    s.updateRangeBySelectionWithCoord(a), s.setEvent(!1), i.makeDirty(!0);
+    i.updateRangeBySelectionWithCoord(a), i.setEvent(!1), s.makeDirty(!0);
   }
   _renderButtons(e) {
-    const { range: r, filterModel: i, unitId: n, skeleton: l, worksheetId: s } = e, { scene: o } = this._context;
-    this._interceptCellContent(n, s, e.range);
+    const { range: r, filterModel: s, unitId: n, skeleton: l, worksheetId: i } = e, { scene: o } = this._context;
+    this._interceptCellContent(n, i, e.range);
     const { startColumn: a, endColumn: c, startRow: h } = r;
-    for (let d = a; d <= c; d++) {
-      const v = `sheets-filter-button-${d}`, p = Mr(h, d, o, l), { startX: T, startY: g, endX: N, endY: F } = p, I = N - T, O = F - g;
-      if (O <= Ee || I <= Ee)
+    for (let m = a; m <= c; m++) {
+      const g = `sheets-filter-button-${m}`, p = Lr(h, m, o, l), { startX: T, startY: v, endX: F, endY: N } = p, R = F - T, O = N - v;
+      if (O <= Se || R <= Se)
         continue;
-      const $ = !!i.getFilterColumn(d), w = N - D - Ee, ge = F - D - Ee, ve = {
+      const M = !!s.getFilterColumn(m), w = F - H - Se, _e = N - H - Se, ve = {
         left: w,
-        top: ge,
-        height: D,
-        width: D,
-        zIndex: Bs,
+        top: _e,
+        height: H,
+        width: H,
+        zIndex: yi,
         cellHeight: O,
-        cellWidth: I,
-        filterParams: { unitId: n, subUnitId: s, col: d, hasCriteria: $ }
-      }, R = this._injector.createInstance(Qe, v, ve);
-      this._filterButtonShapes.push(R);
+        cellWidth: R,
+        filterParams: { unitId: n, subUnitId: i, col: m, hasCriteria: M }
+      }, I = this._injector.createInstance(Qe, g, ve);
+      this._filterButtonShapes.push(I);
     }
     o.addObjects(this._filterButtonShapes), o.makeDirty();
   }
-  _interceptCellContent(e, r, i) {
-    const { startRow: n, startColumn: l, endColumn: s } = i;
-    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(fr.CELL_CONTENT, {
-      effect: Zt.Style,
+  _interceptCellContent(e, r, s) {
+    const { startRow: n, startColumn: l, endColumn: i } = s;
+    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(pr.CELL_CONTENT, {
+      effect: Xt.Style,
       handler: (o, a, c) => {
-        const { row: h, col: d, unitId: v, subUnitId: p } = a;
-        return v !== e || p !== r || h !== n || d < l || d > s ? c(o) : c({
+        const { row: h, col: m, unitId: g, subUnitId: p } = a;
+        return g !== e || p !== r || h !== n || m < l || m > i ? c(o) : c({
           ...o,
           fontRenderExtension: {
             ...o == null ? void 0 : o.fontRenderExtension,
-            rightOffset: D
+            rightOffset: H
           }
         });
       },
@@ -1644,93 +1752,93 @@ let Ge = class extends Et {
   }
   _disposeRendering() {
     var e, r;
-    (e = this._filterRangeShape) == null || e.dispose(), this._filterButtonShapes.forEach((i) => i.dispose()), (r = this._buttonRenderDisposable) == null || r.dispose(), this._filterRangeShape = null, this._buttonRenderDisposable = null, this._filterButtonShapes = [];
+    (e = this._filterRangeShape) == null || e.dispose(), this._filterButtonShapes.forEach((s) => s.dispose()), (r = this._buttonRenderDisposable) == null || r.dispose(), this._filterRangeShape = null, this._buttonRenderDisposable = null, this._filterButtonShapes = [];
   }
 };
-Ge = Ds([
-  q(1, E(Z)),
-  q(2, E(Rr)),
-  q(3, E(G)),
-  q(4, E(St)),
-  q(5, E(dr)),
-  q(6, Q),
-  q(7, Ar)
-], Ge);
-var Vs = Object.getOwnPropertyDescriptor, Ws = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? Vs(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (n = s(n) || n);
+Ve = Ci([
+  Y(1, E(X)),
+  Y(2, E(Ir)),
+  Y(3, E(V)),
+  Y(4, E(gt)),
+  Y(5, E(dr)),
+  Y(6, Q),
+  Y(7, Ar)
+], Ve);
+var Oi = Object.getOwnPropertyDescriptor, Ri = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Oi(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+    (i = t[l]) && (n = i(n) || n);
   return n;
-}, mt = (t, e) => (r, i) => e(r, i, t);
-let de = class extends Et {
+}, ht = (t, e) => (r, s) => e(r, s, t);
+let de = class extends St {
   constructor(t, e) {
     super(), this._renderManagerService = t, this._sheetsRenderService = e, [
+      tr,
       rr,
-      sr,
       ir,
-      nr
+      sr
     ].forEach((r) => this.disposeWithMe(this._sheetsRenderService.registerSkeletonChangingMutations(r.id))), this.disposeWithMe(this._renderManagerService.registerRenderModule(
-      z.UNIVER_SHEET,
-      [Ge]
+      Z.UNIVER_SHEET,
+      [Ve]
     ));
   }
 };
-de = Ws([
-  mt(0, At),
-  mt(1, E(Ot))
+de = Ri([
+  ht(0, At),
+  ht(1, E(yt))
 ], de);
-const xs = {
-  id: fe.id,
-  binding: Er.L | nt.CTRL_COMMAND | nt.SHIFT,
+const Ii = {
+  id: pe.id,
+  binding: Sr.L | st.CTRL_COMMAND | st.SHIFT,
   description: "sheets-filter.shortcut.smart-toggle-filter",
-  preconditions: $r,
+  preconditions: Mr,
   group: "4_sheet-edit"
 };
-var Qs = Object.getOwnPropertyDescriptor, Gs = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? Qs(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (n = s(n) || n);
+var Ai = Object.getOwnPropertyDescriptor, Pi = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Ai(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+    (i = t[l]) && (n = i(n) || n);
   return n;
-}, A = (t, e) => (r, i) => e(r, i, t);
+}, A = (t, e) => (r, s) => e(r, s, t);
 const dt = "FILTER_PANEL_POPUP";
 let Ae = class extends de {
-  constructor(e, r, i, n, l, s, o, a, c, h, d, v, p) {
-    super(p, v);
+  constructor(e, r, s, n, l, i, o, a, c, h, m, g, p) {
+    super(p, g);
     f(this, "_popupDisposable");
-    this._injector = e, this._componentManager = r, this._sheetsFilterPanelService = i, this._sheetCanvasPopupService = n, this._sheetsFilterService = l, this._localeService = s, this._shortcutService = o, this._commandService = a, this._menuManagerService = c, this._contextService = h, this._messageService = d, this._initCommands(), this._initShortcuts(), this._initMenuItems(), this._initUI();
+    this._injector = e, this._componentManager = r, this._sheetsFilterPanelService = s, this._sheetCanvasPopupService = n, this._sheetsFilterService = l, this._localeService = i, this._shortcutService = o, this._commandService = a, this._menuManagerService = c, this._contextService = h, this._messageService = m, this._initCommands(), this._initShortcuts(), this._initMenuItems(), this._initUI();
   }
   dispose() {
     super.dispose(), this._closeFilterPopup();
   }
   _initShortcuts() {
     [
-      xs
+      Ii
     ].forEach((e) => {
       this.disposeWithMe(this._shortcutService.registerShortcut(e));
     });
   }
   _initCommands() {
     [
-      fe,
+      pe,
+      nr,
       or,
-      ar,
-      se,
-      Ke,
+      re,
       qe,
-      Ht,
-      Re,
-      me
+      Ye,
+      Ut,
+      Ie,
+      he
     ].forEach((e) => {
       this.disposeWithMe(this._commandService.registerCommand(e));
     });
   }
   _initMenuItems() {
-    this._menuManagerService.mergeMenu(Ms);
+    this._menuManagerService.mergeMenu(gi);
   }
   _initUI() {
-    this.disposeWithMe(this._componentManager.register(dt, Is)), this.disposeWithMe(this._componentManager.register("FilterSingle", Bt)), this.disposeWithMe(this._contextService.subscribeContextValue$(ne).pipe(xr()).subscribe((e) => {
+    this.disposeWithMe(this._componentManager.register(dt, mi)), this.disposeWithMe(this._componentManager.register("FilterSingle", kt)), this.disposeWithMe(this._contextService.subscribeContextValue$(se).pipe(Wr()).subscribe((e) => {
       e ? this._openFilterPopup() : this._closeFilterPopup();
     })), this.disposeWithMe(this._sheetsFilterService.errorMsg$.subscribe((e) => {
       e && this._messageService.show({
-        type: qr.Error,
+        type: Yr.Error,
         content: this._localeService.t(e)
       });
     }));
@@ -1739,11 +1847,11 @@ let Ae = class extends de {
     const e = this._sheetsFilterPanelService.filterModel;
     if (!e)
       throw new Error("[SheetsFilterUIController]: no filter model when opening filter popup!");
-    const r = e.getRange(), i = this._sheetsFilterPanelService.col, { startRow: n } = r;
-    this._popupDisposable = this._sheetCanvasPopupService.attachPopupToCell(n, i, {
+    const r = e.getRange(), s = this._sheetsFilterPanelService.col, { startRow: n } = r;
+    this._popupDisposable = this._sheetCanvasPopupService.attachPopupToCell(n, s, {
       componentKey: dt,
       direction: "horizontal",
-      onClickOutside: () => this._commandService.syncExecuteCommand(me.id),
+      onClickOutside: () => this._commandService.syncExecuteCommand(he.id),
       offset: [5, 0]
     });
   }
@@ -1752,129 +1860,129 @@ let Ae = class extends de {
     (e = this._popupDisposable) == null || e.dispose(), this._popupDisposable = null;
   }
 };
-Ae = Gs([
-  A(0, E(Z)),
-  A(1, E(Tr)),
-  A(2, E(x)),
+Ae = Pi([
+  A(0, E(X)),
+  A(1, E(Er)),
+  A(2, E(W)),
   A(3, E(wr)),
-  A(4, E(G)),
-  A(5, E(X)),
-  A(6, Fr),
+  A(4, E(V)),
+  A(5, E(K)),
+  A(6, Tr),
   A(7, Q),
-  A(8, Cr),
-  A(9, $e),
-  A(10, Nr),
-  A(11, E(Ot)),
+  A(8, Nr),
+  A(9, Me),
+  A(10, Cr),
+  A(11, E(yt)),
   A(12, At)
 ], Ae);
-var js = Object.defineProperty, Ys = Object.getOwnPropertyDescriptor, qs = (t, e, r) => e in t ? js(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Ks = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? Ys(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (n = s(n) || n);
+var bi = Object.defineProperty, Li = Object.getOwnPropertyDescriptor, Mi = (t, e, r) => e in t ? bi(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, wi = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Li(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+    (i = t[l]) && (n = i(n) || n);
   return n;
-}, Be = (t, e) => (r, i) => e(r, i, t), Vt = (t, e, r) => qs(t, typeof e != "symbol" ? e + "" : e, r);
-const Xs = "SHEET_FILTER_UI_PLUGIN";
-let be = class extends Ye {
-  constructor(t = Ce, e, r, i) {
-    super(), this._config = t, this._injector = e, this._configService = r, this._rpcChannelService = i;
-    const { menu: n, ...l } = Ct(
+}, ke = (t, e) => (r, s) => e(r, s, t), xt = (t, e, r) => Mi(t, typeof e != "symbol" ? e + "" : e, r);
+const $i = "SHEET_FILTER_UI_PLUGIN";
+let Pe = class extends je {
+  constructor(t = Ne, e, r, s) {
+    super(), this._config = t, this._injector = e, this._configService = r, this._rpcChannelService = s;
+    const { menu: n, ...l } = Nt(
       {},
-      Ce,
+      Ne,
       this._config
     );
-    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig(Mt, l);
+    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig(Lt, l);
   }
   onStarting() {
     [
-      [x],
-      [oe],
+      [W],
+      [ne],
       [Ae]
-    ].forEach((t) => this._injector.add(t)), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([Ne, {
-      useFactory: () => Jt(
-        this._rpcChannelService.requestChannel(et)
+    ].forEach((t) => this._injector.add(t)), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([Ce, {
+      useFactory: () => zt(
+        this._rpcChannelService.requestChannel(Je)
       )
     }]);
   }
   onReady() {
-    this._injector.get(oe);
+    this._injector.get(ne);
   }
   onRendered() {
     this._injector.get(Ae);
   }
 };
-Vt(be, "type", z.UNIVER_SHEET);
-Vt(be, "pluginName", Xs);
-be = Ks([
-  Tt(Pt),
-  Be(1, E(Z)),
-  Be(2, Ft),
-  Be(3, zt(Nt))
-], be);
-var Zs = Object.defineProperty, zs = Object.getOwnPropertyDescriptor, Js = (t, e, r) => e in t ? Zs(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, ei = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? zs(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (n = s(n) || n);
+xt(Pe, "type", Z.UNIVER_SHEET);
+xt(Pe, "pluginName", $i);
+Pe = wi([
+  Et(Ft),
+  ke(1, E(X)),
+  ke(2, Tt),
+  ke(3, Zt(Ct))
+], Pe);
+var Ui = Object.defineProperty, Hi = Object.getOwnPropertyDescriptor, Di = (t, e, r) => e in t ? Ui(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, ki = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Hi(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+    (i = t[l]) && (n = i(n) || n);
   return n;
-}, pt = (t, e) => (r, i) => e(r, i, t), Wt = (t, e, r) => Js(t, typeof e != "symbol" ? e + "" : e, r);
-const ti = "SHEET_FILTER_UI_PLUGIN";
-let Le = class extends Ye {
-  constructor(t = Ce, e, r) {
+}, mt = (t, e) => (r, s) => e(r, s, t), Bt = (t, e, r) => Di(t, typeof e != "symbol" ? e + "" : e, r);
+const xi = "SHEET_FILTER_UI_PLUGIN";
+let be = class extends je {
+  constructor(t = Ne, e, r) {
     super(), this._config = t, this._injector = e, this._configService = r;
-    const { menu: i, ...n } = Ct(
+    const { menu: s, ...n } = Nt(
       {},
-      Ce,
+      Ne,
       this._config
     );
-    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(Mt, n);
+    s && this._configService.setConfig("menu", s, { merge: !0 }), this._configService.setConfig(Lt, n);
   }
   onStarting() {
     [
-      [oe],
+      [ne],
       [de]
     ].forEach((t) => this._injector.add(t));
   }
   onReady() {
-    this._injector.get(oe);
+    this._injector.get(ne);
   }
   onRendered() {
     this._injector.get(de);
   }
 };
-Wt(Le, "type", z.UNIVER_SHEET);
-Wt(Le, "pluginName", ti);
-Le = ei([
-  Tt(Pt),
-  pt(1, E(Z)),
-  pt(2, Ft)
-], Le);
-var ri = Object.getOwnPropertyDescriptor, si = (t, e, r, i) => {
-  for (var n = i > 1 ? void 0 : i ? ri(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (n = s(n) || n);
+Bt(be, "type", Z.UNIVER_SHEET);
+Bt(be, "pluginName", xi);
+be = ki([
+  Et(Ft),
+  mt(1, E(X)),
+  mt(2, Tt)
+], be);
+var Bi = Object.getOwnPropertyDescriptor, Wi = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Bi(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+    (i = t[l]) && (n = i(n) || n);
   return n;
-}, ft = (t, e) => (r, i) => e(r, i, t), Te;
-let _t = (Te = class extends Ye {
+}, pt = (t, e) => (r, s) => e(r, s, t), Ee;
+let ft = (Ee = class extends je {
   constructor(t, e, r) {
     super(), this._config = t, this._injector = e, this._rpcChannelService = r;
   }
   onStarting() {
     [
-      [Ne, { useClass: We }]
+      [Ce, { useClass: Be }]
     ].forEach((t) => this._injector.add(t));
   }
   onReady() {
     this._rpcChannelService.registerChannel(
-      et,
-      er(this._injector.get(Ne))
+      Je,
+      Jt(this._injector.get(Ce))
     );
   }
-}, f(Te, "type", z.UNIVER_SHEET), f(Te, "pluginName", "SHEET_FILTER_UI_WORKER_PLUGIN"), Te);
-_t = si([
-  ft(1, E(Z)),
-  ft(2, Nt)
-], _t);
+}, f(Ee, "type", Z.UNIVER_SHEET), f(Ee, "pluginName", "SHEET_FILTER_UI_WORKER_PLUGIN"), Ee);
+ft = Wi([
+  pt(1, E(X)),
+  pt(2, Ct)
+], ft);
 export {
-  Ht as ChangeFilterByOperation,
-  me as CloseFilterPanelOperation,
-  Re as OpenFilterPanelOperation,
-  Le as UniverSheetsFilterMobileUIPlugin,
-  be as UniverSheetsFilterUIPlugin,
-  _t as UniverSheetsFilterUIWorkerPlugin
+  Ut as ChangeFilterByOperation,
+  he as CloseFilterPanelOperation,
+  Ie as OpenFilterPanelOperation,
+  be as UniverSheetsFilterMobileUIPlugin,
+  Pe as UniverSheetsFilterUIPlugin,
+  ft as UniverSheetsFilterUIWorkerPlugin
 };