@univerjs/sheets-filter-ui 0.9.1 → 0.9.2

package/lib/es/index.js

@@ -1,73 +1,73 @@
-var qt = Object.defineProperty;
-var Kt = (t, e, r) => e in t ? qt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
-var f = (t, e, r) => Kt(t, typeof e != "symbol" ? e + "" : e, r);
-import { BooleanNumber as rt, createIdentifier as vt, Inject as E, LocaleService as K, IUniverInstanceService as Ge, ILogService as Xt, extractPureTextFromCell as Zt, numfmt as it, Disposable as me, Injector as X, Quantity as gt, Tools as Te, ICommandService as Q, CommandType as Le, IContextService as we, ThemeService as St, RxDisposable as Et, fromCallback as zt, InterceptorEffectEnum as Jt, UniverInstanceType as Z, DependentOn as Tt, IConfigService as Nt, Plugin as je, merge as Ft, Optional as er, registerDependencies as tr, touchDependencies as st } from "@univerjs/core";
-import { CustomFilterOperator as u, SetSheetsFilterCriteriaCommand as re, SheetsFilterService as V, SmartToggleSheetsFilterCommand as pe, FILTER_MUTATIONS as rr, SetSheetsFilterRangeMutation as ir, SetSheetsFilterCriteriaMutation as sr, RemoveSheetsFilterMutation as nr, ReCalcSheetsFilterMutation as or, UniverSheetsFilterPlugin as Ct, ReCalcSheetsFilterCommand as Ye, ClearSheetsFilterCriteriaCommand as qe, RemoveSheetFilterCommand as ar, SetSheetFilterRangeCommand as lr } from "@univerjs/sheets-filter";
-import { ILayoutService as cr, useDependency as te, useObservable as B, useComponentsOfPart as ur, ComponentContainer as hr, getMenuHiddenObservable as Ke, MenuItemType as Xe, RibbonDataGroup as dr, KeyCode as mr, MetaKeys as nt, ComponentManager as pr, IShortcutService as fr, IMenuManagerService as _r, IMessageService as vr } from "@univerjs/ui";
-import { SetCellEditVisibleOperation as gr, SheetSkeletonManagerService as Sr, ISheetSelectionRenderService as Er, SelectionControl as Tr, attachSelectionWithCoord as Nr, getCoordByCell as Fr, SheetsRenderService as yt, SheetsUIPart as Cr, getObservableWithExclusiveRange$ as yr, getCurrentRangeDisable$ as Or, whenSheetEditorFocused as Rr, SheetCanvasPopManagerService as Ir } from "@univerjs/sheets-ui";
-import { RefRangeService as Ar, SheetPermissionCheckController as Pr, SheetsSelectionsService as br, getSheetCommandTarget as Lr, WorksheetFilterPermission as ae, WorksheetViewPermission as le, RangeProtectionPermissionViewPoint as ce, expandToContinuousRange as wr, SheetInterceptorService as Mr, SetRangeValuesMutation as $r, INTERCEPTOR_POINT as Ur } from "@univerjs/sheets";
-import { BehaviorSubject as q, ReplaySubject as Hr, Subject as Dr, merge as kr, combineLatest as xr, throttleTime as Ot, startWith as Rt, map as ie, shareReplay as Br, of as fe, switchMap as Ze, filter as Wr, takeUntil as Qr, distinctUntilChanged as Vr } from "rxjs";
-import { Rect as ot, Shape as Gr, IRenderManagerService as It } from "@univerjs/engine-render";
-import { IRPCChannelService as At, toModule as jr, fromModule as Yr } from "@univerjs/rpc";
-import { Select as at, clsx as Pt, borderClassName as bt, RadioGroup as qr, Radio as lt, Input as Lt, Checkbox as Kr, Tree as Xr, Segmented as Zr, Button as Ue, MessageType as zr } from "@univerjs/design";
-import { jsx as S, jsxs as b, Fragment as ct } from "react/jsx-runtime";
-import { forwardRef as wt, useRef as Jr, createElement as Mt, useCallback as D, useMemo as ze } from "react";
-var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SECOND", t))(F || {}), _ = /* @__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;
+var sr = Object.defineProperty;
+var nr = (t, e, r) => e in t ? sr(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
+var p = (t, e, r) => nr(t, typeof e != "symbol" ? e + "" : e, r);
+import { BooleanNumber as ht, createIdentifier as Rt, Inject as T, LocaleService as K, IUniverInstanceService as De, ILogService as or, extractPureTextFromCell as lr, numfmt as dt, Disposable as de, Injector as re, Quantity as At, Tools as Re, ColorKit as mt, ICommandService as j, CommandType as Be, IContextService as We, ThemeService as Pt, RxDisposable as wt, fromCallback as ar, InterceptorEffectEnum as cr, UniverInstanceType as ie, DependentOn as Lt, IConfigService as $t, Plugin as tt, merge as Mt, Optional as ur, registerDependencies as hr, touchDependencies as ft } from "@univerjs/core";
+import { CustomFilterOperator as u, FilterBy as A, SetSheetsFilterCriteriaCommand as Q, SheetsFilterService as q, SmartToggleSheetsFilterCommand as Ee, FILTER_MUTATIONS as dr, SetSheetsFilterRangeMutation as mr, SetSheetsFilterCriteriaMutation as fr, RemoveSheetsFilterMutation as pr, ReCalcSheetsFilterMutation as vr, UniverSheetsFilterPlugin as xt, ReCalcSheetsFilterCommand as rt, ClearSheetsFilterCriteriaCommand as it, RemoveSheetFilterCommand as _r, SetSheetFilterRangeCommand as gr } from "@univerjs/sheets-filter";
+import { SetCellEditVisibleOperation as Sr, SheetSkeletonManagerService as Cr, ISheetSelectionRenderService as Tr, SelectionControl as Er, attachSelectionWithCoord as Nr, getCoordByCell as Fr, SheetsRenderService as Ut, SheetsUIPart as yr, getObservableWithExclusiveRange$ as Or, getCurrentRangeDisable$ as Ir, whenSheetEditorFocused as br, SheetCanvasPopManagerService as Rr } from "@univerjs/sheets-ui";
+import { ILayoutService as Ar, useDependency as te, useObservable as H, useComponentsOfPart as Pr, ComponentContainer as wr, getMenuHiddenObservable as st, MenuItemType as nt, RibbonDataGroup as Lr, KeyCode as $r, MetaKeys as pt, ComponentManager as Mr, IShortcutService as xr, IMenuManagerService as Ur, IMessageService as kr } from "@univerjs/ui";
+import { COLOR_BLACK_RGB as vt, Rect as _t, Shape as Hr, IRenderManagerService as kt } from "@univerjs/engine-render";
+import { RefRangeService as Dr, SheetPermissionCheckController as Br, SheetsSelectionsService as Wr, getSheetCommandTarget as Qr, WorksheetFilterPermission as pe, WorksheetViewPermission as ve, RangeProtectionPermissionViewPoint as _e, expandToContinuousRange as Vr, SheetInterceptorService as jr, SetRangeValuesMutation as Gr, INTERCEPTOR_POINT as Yr } from "@univerjs/sheets";
+import { BehaviorSubject as V, ReplaySubject as Zr, Subject as Kr, merge as qr, combineLatest as Xr, throttleTime as Ht, startWith as Dt, map as ce, shareReplay as zr, of as me, switchMap as ot, filter as Jr, takeUntil as ei, distinctUntilChanged as ti } from "rxjs";
+import { IRPCChannelService as Bt, toModule as ri, fromModule as ii } from "@univerjs/rpc";
+import { clsx as Ae, borderClassName as lt, Select as gt, RadioGroup as si, Radio as St, Input as Wt, Checkbox as ni, Tree as oi, Segmented as li, Button as Ge, MessageType as ai } from "@univerjs/design";
+import { jsx as f, jsxs as I, Fragment as Ct } from "react/jsx-runtime";
+import { forwardRef as Ne, useRef as ci, createElement as Fe, useCallback as U, useMemo as at } from "react";
+var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SECOND", t))(y || {}), g = /* @__PURE__ */ ((t) => (t.NONE = "none", t.STARTS_WITH = "startsWith", t.DOES_NOT_START_WITH = "doesNotStartWith", t.ENDS_WITH = "endsWith", t.DOES_NOT_END_WITH = "doesNotEndWith", t.CONTAINS = "contains", t.DOES_NOT_CONTAIN = "doesNotContain", t.EQUALS = "equals", t.NOT_EQUALS = "notEquals", t.EMPTY = "empty", t.NOT_EMPTY = "notEmpty", t.BETWEEN = "between", t.NOT_BETWEEN = "notBetween", t.CUSTOM = "custom", t))(g || {}), m;
 ((t) => {
   t.NONE = {
     label: "sheets-filter.conditions.none",
-    operator: _.NONE,
-    order: F.SECOND,
+    operator: g.NONE,
+    order: y.SECOND,
     numOfParameters: 0,
     getDefaultFormParams: () => {
       throw new Error("[FilterConditionItems.NONE]: should not have initial form params!");
     },
-    testMappingParams: (i) => i.operator1 === _.NONE,
+    testMappingParams: (i) => i.operator1 === g.NONE,
     mapToFilterColumn: () => null,
     testMappingFilterColumn: (i) => !i.customFilters && !i.filters ? {} : !1
   }, t.EMPTY = {
     label: "sheets-filter.conditions.empty",
-    operator: _.EMPTY,
-    order: F.SECOND,
+    operator: g.EMPTY,
+    order: y.SECOND,
     numOfParameters: 0,
     getDefaultFormParams: () => {
       throw new Error("[FilterConditionItems.EMPTY]: should not have initial form params!");
     },
-    testMappingParams: ({ operator1: i }) => i === _.EMPTY,
+    testMappingParams: ({ operator1: i }) => i === g.EMPTY,
     mapToFilterColumn: () => ({ customFilters: { customFilters: [{ val: "" }] } }),
     testMappingFilterColumn: (i) => {
       var c;
       if (((c = i.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
         return !1;
       const o = i.customFilters.customFilters[0];
-      return o.val === "" && o.operator === void 0 ? { operator1: _.EMPTY } : !1;
+      return o.val === "" && o.operator === void 0 ? { operator1: g.EMPTY } : !1;
     }
   }, t.NOT_EMPTY = {
     label: "sheets-filter.conditions.not-empty",
-    operator: _.NOT_EMPTY,
-    order: F.SECOND,
+    operator: g.NOT_EMPTY,
+    order: y.SECOND,
     numOfParameters: 0,
     getDefaultFormParams: () => {
       throw new Error("[FilterConditionItems.NOT_EMPTY]: should not have initial form params!");
     },
-    testMappingParams: ({ operator1: i }) => i === _.NOT_EMPTY,
+    testMappingParams: ({ operator1: i }) => i === g.NOT_EMPTY,
     mapToFilterColumn: () => ({ customFilters: { customFilters: [{ val: "", operator: u.NOT_EQUALS }] } }),
     testMappingFilterColumn: (i) => {
       var c;
       if (((c = i.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
         return !1;
       const o = i.customFilters.customFilters[0];
-      return o.val === " " && o.operator === u.NOT_EQUALS ? { operator1: _.NOT_EMPTY } : !1;
+      return o.val === " " && o.operator === u.NOT_EQUALS ? { operator1: g.NOT_EMPTY } : !1;
     }
   }, t.TEXT_CONTAINS = {
     label: "sheets-filter.conditions.text-contains",
-    operator: _.CONTAINS,
-    order: F.FIRST,
+    operator: g.CONTAINS,
+    order: y.FIRST,
     numOfParameters: 1,
-    getDefaultFormParams: () => ({ operator1: _.CONTAINS, val1: "" }),
+    getDefaultFormParams: () => ({ operator1: g.CONTAINS, val1: "" }),
     testMappingParams: (i) => {
-      const [o] = L(i);
-      return o === _.CONTAINS;
+      const [o] = x(i);
+      return o === g.CONTAINS;
     },
     mapToFilterColumn: (i) => {
       const { val1: o } = i;
@@ -79,78 +79,78 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
       var c;
       if (((c = i.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
         return !1;
-      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;
+      const o = i.customFilters.customFilters[0], l = o.val.toString();
+      return !o.operator && l.startsWith("*") && l.endsWith("*") ? { operator1: g.CONTAINS, val1: l.slice(1, -1) } : !1;
     }
   }, t.DOES_NOT_CONTAIN = {
     label: "sheets-filter.conditions.does-not-contain",
-    operator: _.DOES_NOT_CONTAIN,
-    order: F.FIRST,
+    operator: g.DOES_NOT_CONTAIN,
+    order: y.FIRST,
     numOfParameters: 1,
-    getDefaultFormParams: () => ({ operator1: _.DOES_NOT_CONTAIN, val1: "" }),
+    getDefaultFormParams: () => ({ operator1: g.DOES_NOT_CONTAIN, val1: "" }),
     mapToFilterColumn: (i) => ({
       customFilters: { customFilters: [{ val: `*${i.val1}*`, operator: u.NOT_EQUALS }] }
     }),
     testMappingParams: (i) => {
-      const [o] = L(i);
-      return o === _.DOES_NOT_CONTAIN;
+      const [o] = x(i);
+      return o === g.DOES_NOT_CONTAIN;
     },
     testMappingFilterColumn: (i) => {
       var c;
       if (((c = i.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
         return !1;
-      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;
+      const o = i.customFilters.customFilters[0], l = o.val.toString();
+      return o.operator === u.NOT_EQUALS && l.startsWith("*") && l.endsWith("*") ? { operator1: g.DOES_NOT_CONTAIN, val1: l.slice(1, -1) } : !1;
     }
   }, t.STARTS_WITH = {
     label: "sheets-filter.conditions.starts-with",
-    operator: _.STARTS_WITH,
-    order: F.FIRST,
+    operator: g.STARTS_WITH,
+    order: y.FIRST,
     numOfParameters: 1,
-    getDefaultFormParams: () => ({ operator1: _.STARTS_WITH, val1: "" }),
+    getDefaultFormParams: () => ({ operator1: g.STARTS_WITH, val1: "" }),
     mapToFilterColumn: (i) => ({
       customFilters: { customFilters: [{ val: `${i.val1}*` }] }
     }),
     testMappingParams: (i) => {
-      const [o] = L(i);
-      return o === _.STARTS_WITH;
+      const [o] = x(i);
+      return o === g.STARTS_WITH;
     },
     testMappingFilterColumn: (i) => {
       var c;
       if (((c = i.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
         return !1;
-      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;
+      const o = i.customFilters.customFilters[0], l = o.val.toString();
+      return !o.operator && l.endsWith("*") && !l.startsWith("*") ? { operator1: g.STARTS_WITH, val1: l.slice(0, -1) } : !1;
     }
   }, t.ENDS_WITH = {
     label: "sheets-filter.conditions.ends-with",
-    operator: _.ENDS_WITH,
-    order: F.FIRST,
+    operator: g.ENDS_WITH,
+    order: y.FIRST,
     numOfParameters: 1,
-    getDefaultFormParams: () => ({ operator1: _.ENDS_WITH, val1: "" }),
+    getDefaultFormParams: () => ({ operator1: g.ENDS_WITH, val1: "" }),
     mapToFilterColumn: (i) => ({
       customFilters: { customFilters: [{ val: `*${i.val1}` }] }
     }),
     testMappingParams: (i) => {
-      const [o] = L(i);
-      return o === _.ENDS_WITH;
+      const [o] = x(i);
+      return o === g.ENDS_WITH;
     },
     testMappingFilterColumn: (i) => {
       var c;
       if (((c = i.customFilters) == null ? void 0 : c.customFilters.length) !== 1)
         return !1;
-      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;
+      const o = i.customFilters.customFilters[0], l = o.val.toString();
+      return !o.operator && l.startsWith("*") && !l.endsWith("*") ? { operator1: g.ENDS_WITH, val1: l.slice(1) } : !1;
     }
   }, t.EQUALS = {
     label: "sheets-filter.conditions.equals",
-    operator: _.EQUALS,
-    order: F.FIRST,
+    operator: g.EQUALS,
+    order: y.FIRST,
     numOfParameters: 1,
-    getDefaultFormParams: () => ({ operator1: _.EQUALS, val1: "" }),
+    getDefaultFormParams: () => ({ operator1: g.EQUALS, val1: "" }),
     testMappingParams: (i) => {
-      const [o] = L(i);
-      return o === _.EQUALS;
+      const [o] = x(i);
+      return o === g.EQUALS;
     },
     mapToFilterColumn: (i) => {
       const { val1: o } = i;
@@ -159,25 +159,25 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
       };
     },
     testMappingFilterColumn: (i) => {
-      var o, a, c;
-      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;
+      var o, l, c;
+      return ((l = (o = i.filters) == null ? void 0 : o.filters) == null ? void 0 : l.length) === 1 ? { operator1: g.EQUALS, val1: "" } : ((c = i.customFilters) == null ? void 0 : c.customFilters.length) === 1 && !i.customFilters.customFilters[0].operator ? { operator1: g.EQUALS, val1: i.customFilters.customFilters[0].val.toString() } : !1;
     }
   }, t.GREATER_THAN = {
     label: "sheets-filter.conditions.greater-than",
     operator: u.GREATER_THAN,
     numOfParameters: 1,
-    order: F.FIRST,
+    order: y.FIRST,
     getDefaultFormParams: () => ({ operator1: u.GREATER_THAN, val1: "" }),
     mapToFilterColumn: (i) => ({
       customFilters: { customFilters: [{ val: i.val1, operator: u.GREATER_THAN }] }
     }),
     testMappingParams: (i) => {
-      const [o] = L(i);
+      const [o] = x(i);
       return o === u.GREATER_THAN;
     },
     testMappingFilterColumn: (i) => {
-      var a;
-      if (((a = i.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
+      var l;
+      if (((l = i.customFilters) == null ? void 0 : l.customFilters.length) !== 1)
         return !1;
       const o = i.customFilters.customFilters[0];
       return o.operator !== u.GREATER_THAN ? !1 : { operator1: u.GREATER_THAN, val1: o.val.toString() };
@@ -186,18 +186,18 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     label: "sheets-filter.conditions.greater-than-or-equal",
     operator: u.GREATER_THAN_OR_EQUAL,
     numOfParameters: 1,
-    order: F.FIRST,
+    order: y.FIRST,
     getDefaultFormParams: () => ({ operator1: u.GREATER_THAN_OR_EQUAL, val1: "" }),
     testMappingParams: (i) => {
-      const [o] = L(i);
+      const [o] = x(i);
       return o === u.GREATER_THAN_OR_EQUAL;
     },
     mapToFilterColumn: (i) => ({
       customFilters: { customFilters: [{ val: i.val1, operator: u.GREATER_THAN_OR_EQUAL }] }
     }),
     testMappingFilterColumn: (i) => {
-      var a;
-      if (((a = i.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
+      var l;
+      if (((l = i.customFilters) == null ? void 0 : l.customFilters.length) !== 1)
         return !1;
       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() };
@@ -206,18 +206,18 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     label: "sheets-filter.conditions.less-than",
     operator: u.LESS_THAN,
     numOfParameters: 1,
-    order: F.FIRST,
+    order: y.FIRST,
     getDefaultFormParams: () => ({ operator1: u.LESS_THAN, val1: "" }),
     testMappingParams: (i) => {
-      const [o] = L(i);
+      const [o] = x(i);
       return o === u.LESS_THAN;
     },
     mapToFilterColumn: (i) => ({
       customFilters: { customFilters: [{ val: i.val1, operator: u.LESS_THAN }] }
     }),
     testMappingFilterColumn: (i) => {
-      var a;
-      if (((a = i.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
+      var l;
+      if (((l = i.customFilters) == null ? void 0 : l.customFilters.length) !== 1)
         return !1;
       const o = i.customFilters.customFilters[0];
       return o.operator !== u.LESS_THAN ? !1 : { operator1: u.LESS_THAN, val1: o.val.toString() };
@@ -226,18 +226,18 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     label: "sheets-filter.conditions.less-than-or-equal",
     operator: u.LESS_THAN_OR_EQUAL,
     numOfParameters: 1,
-    order: F.FIRST,
+    order: y.FIRST,
     getDefaultFormParams: () => ({ operator1: u.LESS_THAN_OR_EQUAL, val1: "" }),
     testMappingParams: (i) => {
-      const [o] = L(i);
+      const [o] = x(i);
       return o === u.LESS_THAN_OR_EQUAL;
     },
     mapToFilterColumn: (i) => ({
       customFilters: { customFilters: [{ val: i.val1, operator: u.LESS_THAN_OR_EQUAL }] }
     }),
     testMappingFilterColumn: (i) => {
-      var a;
-      if (((a = i.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
+      var l;
+      if (((l = i.customFilters) == null ? void 0 : l.customFilters.length) !== 1)
         return !1;
       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() };
@@ -246,18 +246,18 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     label: "sheets-filter.conditions.equal",
     operator: u.EQUAL,
     numOfParameters: 1,
-    order: F.FIRST,
+    order: y.FIRST,
     getDefaultFormParams: () => ({ operator1: u.EQUAL, val1: "" }),
     testMappingParams: (i) => {
-      const [o] = L(i);
+      const [o] = x(i);
       return o === u.EQUAL;
     },
     mapToFilterColumn: (i) => ({
       customFilters: { customFilters: [{ val: i.val1, operator: u.EQUAL }] }
     }),
     testMappingFilterColumn: (i) => {
-      var a;
-      if (((a = i.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
+      var l;
+      if (((l = i.customFilters) == null ? void 0 : l.customFilters.length) !== 1)
         return !1;
       const o = i.customFilters.customFilters[0];
       return o.operator !== u.EQUAL ? !1 : { operator1: u.EQUAL, val1: o.val.toString() };
@@ -266,26 +266,26 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     label: "sheets-filter.conditions.not-equal",
     operator: u.NOT_EQUALS,
     numOfParameters: 1,
-    order: F.FIRST,
+    order: y.FIRST,
     getDefaultFormParams: () => ({ operator1: u.NOT_EQUALS, val1: "" }),
     testMappingParams: (i) => {
-      const [o] = L(i);
+      const [o] = x(i);
       return o === u.NOT_EQUALS;
     },
     mapToFilterColumn: (i) => ({
       customFilters: { customFilters: [{ val: i.val1, operator: u.NOT_EQUALS }] }
     }),
     testMappingFilterColumn: (i) => {
-      var a;
-      if (((a = i.customFilters) == null ? void 0 : a.customFilters.length) !== 1)
+      var l;
+      if (((l = i.customFilters) == null ? void 0 : l.customFilters.length) !== 1)
         return !1;
       const o = i.customFilters.customFilters[0];
       return o.operator !== u.NOT_EQUALS ? !1 : { operator1: u.NOT_EQUALS, val1: o.val.toString() };
     }
   }, t.BETWEEN = {
     label: "sheets-filter.conditions.between",
-    operator: _.BETWEEN,
-    order: F.SECOND,
+    operator: g.BETWEEN,
+    order: y.SECOND,
     numOfParameters: 2,
     getDefaultFormParams: () => ({
       and: !0,
@@ -295,19 +295,19 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
       val2: ""
     }),
     testMappingParams: (i) => {
-      const { and: o, operator1: a, operator2: c } = i;
+      const { and: o, operator1: l, operator2: c } = i;
       if (!o) return !1;
-      const h = [a, c];
+      const h = [l, c];
       return h.includes(u.GREATER_THAN_OR_EQUAL) && h.includes(u.LESS_THAN_OR_EQUAL);
     },
     mapToFilterColumn: (i) => {
-      const { val1: o, val2: a, operator1: c } = i, h = c === u.GREATER_THAN_OR_EQUAL;
+      const { val1: o, val2: l, operator1: c } = i, h = c === u.GREATER_THAN_OR_EQUAL;
       return {
         customFilters: {
-          and: rt.TRUE,
+          and: ht.TRUE,
           customFilters: [
-            { val: h ? o : a, operator: u.GREATER_THAN_OR_EQUAL },
-            { val: h ? a : o, operator: u.LESS_THAN_OR_EQUAL }
+            { val: h ? o : l, operator: u.GREATER_THAN_OR_EQUAL },
+            { val: h ? l : o, operator: u.LESS_THAN_OR_EQUAL }
           ]
         }
       };
@@ -316,25 +316,25 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
       var c;
       if (((c = i.customFilters) == null ? void 0 : c.customFilters.length) !== 2)
         return !1;
-      const [o, a] = i.customFilters.customFilters;
-      return o.operator === u.GREATER_THAN_OR_EQUAL && a.operator === u.LESS_THAN_OR_EQUAL && i.customFilters.and ? {
+      const [o, l] = i.customFilters.customFilters;
+      return o.operator === u.GREATER_THAN_OR_EQUAL && l.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 && i.customFilters.and ? {
+        val2: l.val.toString()
+      } : l.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(),
+        val1: l.val.toString(),
         operator2: u.LESS_THAN_OR_EQUAL,
         val2: o.val.toLocaleString()
       } : !1;
     }
   }, t.NOT_BETWEEN = {
     label: "sheets-filter.conditions.not-between",
-    operator: _.NOT_BETWEEN,
-    order: F.SECOND,
+    operator: g.NOT_BETWEEN,
+    order: y.SECOND,
     numOfParameters: 2,
     getDefaultFormParams: () => ({
       operator1: u.LESS_THAN,
@@ -343,18 +343,18 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
       val2: ""
     }),
     testMappingParams: (i) => {
-      const { and: o, operator1: a, operator2: c } = i;
+      const { and: o, operator1: l, operator2: c } = i;
       if (o) return !1;
-      const h = [a, c];
+      const h = [l, c];
       return h.includes(u.GREATER_THAN) && h.includes(u.LESS_THAN);
     },
     mapToFilterColumn: (i) => {
-      const { val1: o, val2: a, operator1: c } = i, h = c === u.GREATER_THAN;
+      const { val1: o, val2: l, operator1: c } = i, h = c === u.GREATER_THAN;
       return {
         customFilters: {
           customFilters: [
-            { val: h ? o : a, operator: u.GREATER_THAN },
-            { val: h ? a : o, operator: u.LESS_THAN }
+            { val: h ? o : l, operator: u.GREATER_THAN },
+            { val: h ? l : o, operator: u.LESS_THAN }
           ]
         }
       };
@@ -363,64 +363,64 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
       var c;
       if (((c = i.customFilters) == null ? void 0 : c.customFilters.length) !== 2)
         return !1;
-      const [o, a] = i.customFilters.customFilters;
-      return o.operator === u.LESS_THAN && a.operator === u.GREATER_THAN && !i.customFilters.and ? {
+      const [o, l] = i.customFilters.customFilters;
+      return o.operator === u.LESS_THAN && l.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 && !i.customFilters.and ? {
+        val2: l.val.toString()
+      } : l.operator === u.LESS_THAN && o.operator === u.GREATER_THAN && !i.customFilters.and ? {
         operator1: u.GREATER_THAN,
-        val1: a.val.toString(),
+        val1: l.val.toString(),
         operator2: u.LESS_THAN,
         val2: o.val.toLocaleString()
       } : !1;
     }
   }, t.CUSTOM = {
     label: "sheets-filter.conditions.custom",
-    operator: _.CUSTOM,
-    order: F.SECOND,
+    operator: g.CUSTOM,
+    order: y.SECOND,
     numOfParameters: 2,
     getDefaultFormParams: () => ({
-      operator1: _.NONE,
+      operator1: g.NONE,
       val1: "",
-      operator2: _.NONE,
+      operator2: g.NONE,
       val2: ""
     }),
     testMappingParams: () => !0,
     mapToFilterColumn: (i) => {
-      const { and: o, val1: a, val2: c, operator1: h, operator2: m } = i;
-      function g(R, O) {
-        for (const w of t.ALL_CONDITIONS)
-          if (w.operator === R)
-            return w.mapToFilterColumn({ val1: O, operator1: R });
+      const { and: o, val1: l, val2: c, operator1: h, operator2: d } = i;
+      function C(b, F) {
+        for (const R of t.ALL_CONDITIONS)
+          if (R.operator === b)
+            return R.mapToFilterColumn({ val1: F, operator1: b });
       }
-      const p = !h || h === t.NONE.operator, T = !m || m === t.NONE.operator;
-      if (p && T)
+      const v = !h || h === t.NONE.operator, _ = !d || d === t.NONE.operator;
+      if (v && _)
         return t.NONE.mapToFilterColumn({});
-      if (p)
-        return g(m, c);
-      if (T)
-        return g(h, a);
-      const v = g(h, a), C = g(m, c), N = {
+      if (v)
+        return C(d, c);
+      if (_)
+        return C(h, l);
+      const S = C(h, l), N = C(d, c), E = {
         customFilters: [
-          v.customFilters.customFilters[0],
-          C.customFilters.customFilters[0]
+          S.customFilters.customFilters[0],
+          N.customFilters.customFilters[0]
         ]
       };
-      return o && (N.and = rt.TRUE), { customFilters: N };
+      return o && (E.and = ht.TRUE), { customFilters: E };
     },
     testMappingFilterColumn: (i) => {
       var c;
       if (((c = i.customFilters) == null ? void 0 : c.customFilters.length) !== 2)
         return !1;
-      const o = i.customFilters.customFilters.map((h) => l({ customFilters: { customFilters: [h] } })), a = {
+      const o = i.customFilters.customFilters.map((h) => a({ customFilters: { customFilters: [h] } })), l = {
         operator1: o[0][0].operator,
         val1: o[0][1].val1,
         operator2: o[1][0].operator,
         val2: o[1][1].val1
       };
-      return i.customFilters.and && (a.and = !0), a;
+      return i.customFilters.and && (l.and = !0), l;
     }
   }, t.ALL_CONDITIONS = [
     // ------------------------------
@@ -447,24 +447,24 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     t.CUSTOM
   ];
   function e(i) {
-    const o = t.ALL_CONDITIONS.find((a) => a.operator === i);
+    const o = t.ALL_CONDITIONS.find((l) => l.operator === i);
     if (!o)
       throw new Error(`[SheetsFilter]: no condition item found for operator: ${i}`);
     return o;
   }
   t.getItemByOperator = e;
   function r(i, o) {
-    for (const a of t.ALL_CONDITIONS.filter((c) => c.numOfParameters === o))
-      if (a.numOfParameters !== 0 && a.testMappingParams(i))
-        return a;
-    for (const a of t.ALL_CONDITIONS)
-      if (a.testMappingParams(i))
-        return a;
+    for (const l of t.ALL_CONDITIONS.filter((c) => c.numOfParameters === o))
+      if (l.numOfParameters !== 0 && l.testMappingParams(i))
+        return l;
+    for (const l of t.ALL_CONDITIONS)
+      if (l.testMappingParams(i))
+        return l;
     throw new Error("[SheetsFilter]: no condition item can be mapped from the filter map params!");
   }
   t.testMappingParams = r;
   function s(i) {
-    const o = t.ALL_CONDITIONS.find((a) => a.operator === i);
+    const o = t.ALL_CONDITIONS.find((l) => l.operator === i);
     return (o == null ? void 0 : o.numOfParameters) === 0 ? { operator1: o.operator } : o.getDefaultFormParams();
   }
   t.getInitialFormParams = s;
@@ -472,19 +472,19 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     return i.mapToFilterColumn(o);
   }
   t.mapToFilterColumn = n;
-  function l(i) {
+  function a(i) {
     if (!i)
       return [t.NONE, {}];
     for (const o of t.ALL_CONDITIONS) {
-      const a = o.testMappingFilterColumn(i);
-      if (a)
-        return [o, a];
+      const l = o.testMappingFilterColumn(i);
+      if (l)
+        return [o, l];
     }
     return [t.NONE, {}];
   }
-  t.testMappingFilterColumn = l;
-})(d || (d = {}));
-function L(t) {
+  t.testMappingFilterColumn = a;
+})(m || (m = {}));
+function x(t) {
   const { operator1: e, operator2: r, val1: s, val2: n } = t;
   if (e && r)
     throw new Error("Both operator1 and operator2 are set!");
@@ -492,201 +492,208 @@ function L(t) {
     throw new Error("Neither operator1 and operator2 and both not set!");
   return e ? [e, s] : [r, n];
 }
-function xe(t) {
+function qe(t) {
   const e = [], r = [];
   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);
+  function a(i) {
+    i.leaf && (i.checked ? (e.push(i), s += i.count) : (r.push(i), n += i.count)), i.children && i.children.forEach(a);
   }
-  return t.forEach(l), {
+  return t.forEach(a), {
     checkedItems: e,
     uncheckedItems: r,
     checked: s,
     unchecked: 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);
+var ui = Object.getOwnPropertyDescriptor, hi = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? ui(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (n = i(n) || n);
   return n;
-}, He = (t, e) => (r, s) => e(r, s, t);
-const Je = "sheets-filter.generate-filter-values.service", Ne = vt(Je), ri = ["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 {
+}, Ye = (t, e) => (r, s) => e(r, s, t);
+const ct = "sheets-filter.generate-filter-values.service", Pe = Rt(ct), di = ["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 Xe = class extends de {
   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: 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 }), $t(n, this._localeService, i, c, new Set(s), new Set(o.map(String)), l, a.getStyles()));
+    var d;
+    const { unitId: e, subUnitId: r, filteredOutRowsByOtherColumns: s, filterColumn: n, filters: a, blankChecked: i, iterateRange: o, alreadyChecked: l } = t, c = this._univerInstanceService.getUnit(e), h = (d = this._univerInstanceService.getUnit(e)) == null ? void 0 : d.getSheetBySheetId(r);
+    return !c || !h ? [] : (this._logService.debug("[SheetsGenerateFilterValuesService]", "getFilterValues for", { unitId: e, subUnitId: r }), Qt(
+      a,
+      this._localeService,
+      o,
+      h,
+      new Set(s),
+      n,
+      new Set(l.map(String)),
+      i,
+      c.getStyles()
+    ));
   }
 };
-Be = ti([
-  He(0, E(K)),
-  He(1, Ge),
-  He(2, Xt)
-], Be);
-function $t(t, e, r, s, n, l, i, o) {
-  var v, C, N, R, O, w, M, _e, ve;
-  const a = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map(), h = "yyyy-mm-dd", m = new Set(ri), g = "empty";
-  let p = 0;
-  for (const I of s.iterateByColumn(r, !1, !1)) {
-    const { row: Gt, rowSpan: tt = 1 } = I;
-    let z = 0;
-    for (; z < tt; ) {
-      const jt = Gt + z;
-      if (n.has(jt)) {
-        z++;
+Xe = hi([
+  Ye(0, T(K)),
+  Ye(1, De),
+  Ye(2, or)
+], Xe);
+function Qt(t, e, r, s, n, a, i, o, l) {
+  var E, b, F, R, w, X, se, ne, D, L;
+  const c = /* @__PURE__ */ new Map(), h = /* @__PURE__ */ new Map(), d = "yyyy-mm-dd", C = new Set(di), v = "empty", _ = !t && ((a == null ? void 0 : a.filterBy) === A.COLORS || (a == null ? void 0 : a.filterBy) === A.CONDITIONS) && ((E = a.filteredOutRows) == null ? void 0 : E.size);
+  let S = 0;
+  for (const $ of s.iterateByColumn(r, !1, !1)) {
+    const { row: tr, rowSpan: ut = 1 } = $;
+    let oe = 0;
+    for (; oe < ut; ) {
+      const rr = tr + oe;
+      if (n.has(rr)) {
+        oe++;
         continue;
       }
-      const G = I != null && I.value ? Zt(I.value) : "";
-      if (!G) {
-        p += 1, z += tt;
+      const z = $ != null && $.value ? lr($.value) : "";
+      if (!z) {
+        S += 1, oe += ut;
         continue;
       }
-      const ge = (v = I.value) != null && v.v && !I.value.p ? (R = (N = o.get((C = I.value) == null ? void 0 : C.s)) == null ? void 0 : N.n) == null ? void 0 : R.pattern : "", Yt = ge && it.getFormatInfo(ge).isDate;
-      if (ge && Yt && m.has(ge)) {
-        const k = (O = s.getCellRaw(I.row, I.col)) == null ? void 0 : O.v;
-        if (!k) {
-          z++;
+      const Oe = (b = $.value) != null && b.v && !$.value.p ? (w = (R = l.get((F = $.value) == null ? void 0 : F.s)) == null ? void 0 : R.n) == null ? void 0 : w.pattern : "", ir = Oe && dt.getFormatInfo(Oe).isDate;
+      if (Oe && ir && C.has(Oe)) {
+        const G = (X = s.getCellRaw($.row, $.col)) == null ? void 0 : X.v;
+        if (!G) {
+          oe++;
           continue;
         }
-        const J = it.format(h, k), [y, $, oe] = J.split("-").map(Number);
-        let j = a.get(`${y}`);
-        j || (j = {
-          title: `${y}`,
-          key: `${y}`,
+        const le = dt.format(d, G), [O, k, fe] = le.split("-").map(Number);
+        let J = c.get(`${O}`);
+        J || (J = {
+          title: `${O}`,
+          key: `${O}`,
           children: [],
           count: 0,
           leaf: !1,
           checked: !1
-        }, a.set(`${y}`, j), c.set(`${y}`, [`${y}`]));
-        let U = (w = j.children) == null ? void 0 : w.find(($e) => $e.key === `${y}-${$}`);
-        U || (U = {
-          title: e.t(`sheets-filter.date.${$}`),
-          key: `${y}-${$}`,
+        }, c.set(`${O}`, J), h.set(`${O}`, [`${O}`]));
+        let B = (se = J.children) == null ? void 0 : se.find((je) => je.key === `${O}-${k}`);
+        B || (B = {
+          title: e.t(`sheets-filter.date.${k}`),
+          key: `${O}-${k}`,
           children: [],
           count: 0,
           leaf: !1,
           checked: !1
-        }, (M = j.children) == null || M.push(U), c.set(`${y}-${$}`, [`${y}`, `${y}-${$}`]));
-        const Me = (_e = U == null ? void 0 : U.children) == null ? void 0 : _e.find(($e) => $e.key === `${y}-${$}-${oe}`);
-        Me ? (Me.originValues.add(G), Me.count++, U.count++, j.count++) : ((ve = U.children) == null || ve.push({
-          title: `${oe}`,
-          key: `${y}-${$}-${oe}`,
+        }, (ne = J.children) == null || ne.push(B), h.set(`${O}-${k}`, [`${O}`, `${O}-${k}`]));
+        const Ve = (D = B == null ? void 0 : B.children) == null ? void 0 : D.find((je) => je.key === `${O}-${k}-${fe}`);
+        Ve ? (Ve.originValues.add(z), Ve.count++, B.count++, J.count++) : ((L = B.children) == null || L.push({
+          title: `${fe}`,
+          key: `${O}-${k}-${fe}`,
           count: 1,
-          originValues: /* @__PURE__ */ new Set([G]),
+          originValues: /* @__PURE__ */ new Set([z]),
           leaf: !0,
-          checked: l.size ? l.has(G) : !i
-        }), U.count++, j.count++, c.set(`${y}-${$}-${oe}`, [`${y}`, `${y}-${$}`, `${y}-${$}-${oe}`]));
+          checked: _ ? !1 : i.size ? i.has(z) : !o
+        }), B.count++, J.count++, h.set(`${O}-${k}-${fe}`, [`${O}`, `${O}-${k}`, `${O}-${k}-${fe}`]));
       } else {
-        const k = G;
-        let J = a.get(k);
-        J ? J.count++ : (J = {
-          title: G,
+        const G = z;
+        let le = c.get(G);
+        le ? le.count++ : (le = {
+          title: z,
           leaf: !0,
-          checked: l.size ? l.has(G) : !i,
-          key: k,
+          checked: _ ? !1 : i.size ? i.has(z) : !o,
+          key: G,
           count: 1
-        }, a.set(k, J), c.set(k, [k]));
+        }, c.set(G, le), h.set(G, [G]));
       }
-      z++;
+      oe++;
     }
   }
-  const T = t ? i : !0;
-  if (p > 0) {
-    const I = {
+  const N = _ ? !1 : t ? o : !0;
+  if (S > 0) {
+    const $ = {
       title: e.t("sheets-filter.panel.empty"),
-      count: p,
+      count: S,
       leaf: !0,
-      checked: T,
-      key: g
+      checked: N,
+      key: v
     };
-    a.set("empty", I), c.set("empty", [g]);
+    c.set("empty", $), h.set("empty", [v]);
   }
   return {
-    filterTreeItems: ii(Array.from(a.values())),
-    filterTreeMapCache: c
+    filterTreeItems: mi(Array.from(c.values())),
+    filterTreeMapCache: h
   };
 }
-function ii(t) {
-  return Array.from(t).sort((e, r) => e.children && !r.children ? -1 : !e.children && r.children ? 1 : si(e.title, r.title)).map((e) => (e.children && e.children.sort((r, s) => {
-    const n = Number.parseInt(r.key.split("-")[1], 10), l = Number.parseInt(s.key.split("-")[1], 10);
-    return n - l;
+function mi(t) {
+  return Array.from(t).sort((e, r) => e.children && !r.children ? -1 : !e.children && r.children ? 1 : fi(e.title, r.title)).map((e) => (e.children && e.children.sort((r, s) => {
+    const n = Number.parseInt(r.key.split("-")[1], 10), a = Number.parseInt(s.key.split("-")[1], 10);
+    return n - a;
   }).forEach((r) => {
     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;
+      const a = Number.parseInt(s.key.split("-")[2], 10), i = Number.parseInt(n.key.split("-")[2], 10);
+      return a - i;
     });
   }), e));
 }
-const ut = (t) => !Number.isNaN(Number(t)) && !Number.isNaN(Number.parseFloat(t));
-function si(t, e) {
-  const r = ut(t), s = ut(e);
+const Tt = (t) => !Number.isNaN(Number(t)) && !Number.isNaN(Number.parseFloat(t));
+function fi(t, e) {
+  const r = Tt(t), s = Tt(e);
   return r && s ? Number.parseFloat(t) - Number.parseFloat(e) : r && !s ? -1 : !r && s ? 1 : t.localeCompare(e);
 }
-function We(t, e) {
+function ze(t, e) {
   for (const r of t) {
     if (r.key === e)
       return r;
     if (r.children) {
-      const s = We(r.children, e);
+      const s = ze(r.children, e);
       if (s)
         return s;
     }
   }
   return null;
 }
-function Ut(t) {
-  return t.leaf ? t.checked : t.children ? t.children.every((e) => Ut(e)) : !0;
+function Vt(t) {
+  return t.leaf ? t.checked : t.children ? t.children.every((e) => Vt(e)) : !0;
 }
-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 ge(t, e) {
+  t.leaf && (e !== void 0 ? t.checked = e : t.checked = !t.checked), t.children && t.children.forEach((r) => ge(r, e));
 }
-function Ht(t, e) {
+function jt(t, e) {
   const r = [];
   return t.forEach((s) => {
     const n = s.originValues ? e.some(
       (o) => Array.from(s.originValues).some(
-        (a) => a.toLowerCase().includes(o.toLowerCase())
+        (l) => l.toLowerCase().includes(o.toLowerCase())
       )
-    ) : !1, l = !n && e.some(
+    ) : !1, a = !n && e.some(
       (o) => s.title.toLowerCase().includes(o.toLowerCase())
     );
-    if (n || l)
+    if (n || a)
       r.push({ ...s });
     else if (s.children) {
-      const o = Ht(s.children, e);
+      const o = jt(s.children, e);
       if (o.length > 0) {
-        const a = o.reduce((c, h) => c + h.count, 0);
-        r.push({ ...s, count: a, children: o });
+        const l = o.reduce((c, h) => c + h.count, 0);
+        r.push({ ...s, count: l, children: o });
       }
     }
   }), r;
 }
-var ni = Object.getOwnPropertyDescriptor, et = (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);
+var pi = Object.getOwnPropertyDescriptor, Qe = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? pi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (n = i(n) || n);
   return n;
-}, Fe = (t, e) => (r, s) => e(r, s, t), Ce = /* @__PURE__ */ ((t) => (t[t.VALUES = 0] = "VALUES", t[t.CONDITIONS = 1] = "CONDITIONS", t))(Ce || {});
-vt("sheets-filter-ui.sheets-filter-panel.service");
-let W = class extends me {
+}, Ce = (t, e) => (r, s) => e(r, s, t);
+Rt("sheets-filter-ui.sheets-filter-panel.service");
+let Z = class extends de {
   constructor(e, r) {
     super();
-    f(this, "_filterBy$", new q(
-      0
-      /* VALUES */
-    ));
-    f(this, "filterBy$", this._filterBy$.asObservable());
-    f(this, "_filterByModel$", new Hr(1));
-    f(this, "filterByModel$", this._filterByModel$.asObservable());
-    f(this, "_filterByModel", null);
-    f(this, "_hasCriteria$", new q(!1));
-    f(this, "hasCriteria$", this._hasCriteria$.asObservable());
-    f(this, "_filterModel", null);
-    f(this, "_col$", new q(-1));
-    f(this, "col$", this._col$.asObservable());
-    f(this, "_filterHeaderListener", null);
+    p(this, "_filterBy$", new V(A.VALUES));
+    p(this, "filterBy$", this._filterBy$.asObservable());
+    p(this, "_filterByModel$", new Zr(1));
+    p(this, "filterByModel$", this._filterByModel$.asObservable());
+    p(this, "_filterByModel", null);
+    p(this, "_hasCriteria$", new V(!1));
+    p(this, "hasCriteria$", this._hasCriteria$.asObservable());
+    p(this, "_filterModel", null);
+    p(this, "_col$", new V(-1));
+    p(this, "col$", this._col$.asObservable());
+    p(this, "_filterHeaderListener", null);
     this._injector = e, this._refRangeService = r;
   }
   get filterBy() {
@@ -716,6 +723,10 @@ let W = class extends me {
         this._hasCriteria$.next(!0), this._setupByConditions(e, r);
         return;
       }
+      if (n.colorFilters) {
+        this._hasCriteria$.next(!0), this._setupByColors(e, r);
+        return;
+      }
       if (n.filters) {
         this._hasCriteria$.next(!0), this._setupByValues(e, r);
         return;
@@ -726,7 +737,20 @@ let W = class extends me {
     this._hasCriteria$.next(!1), this._setupByValues(e, r);
   }
   changeFilterBy(e) {
-    return !this._filterModel || this.col === -1 ? !1 : (e === 0 ? this._setupByValues(this._filterModel, this.col) : this._setupByConditions(this._filterModel, this.col), !0);
+    if (!this._filterModel || this.col === -1)
+      return !1;
+    switch (e) {
+      case A.VALUES:
+        this._setupByValues(this._filterModel, this.col);
+        break;
+      case A.COLORS:
+        this._setupByColors(this._filterModel, this.col);
+        break;
+      case A.CONDITIONS:
+        this._setupByConditions(this._filterModel, this.col);
+        break;
+    }
+    return !0;
   }
   terminate() {
     return this._filterModel = null, this._col$.next(-1), this._disposeFilterHeaderChangeListener(), !0;
@@ -737,17 +761,17 @@ let W = class extends me {
   }
   _listenToFilterHeaderChange(e, r) {
     this._disposeFilterHeaderChangeListener();
-    const s = e.unitId, n = e.subUnitId, l = e.getRange(), i = {
+    const s = e.unitId, n = e.subUnitId, a = e.getRange(), i = {
       startColumn: r,
-      startRow: l.startRow,
-      endRow: l.startRow,
+      startRow: a.startRow,
+      endRow: a.startRow,
       endColumn: r
     };
-    this._filterHeaderListener = this._refRangeService.watchRange(s, n, i, (o, a) => {
-      if (!a)
+    this._filterHeaderListener = this._refRangeService.watchRange(s, n, i, (o, l) => {
+      if (!l)
         this.terminate();
       else {
-        const c = a.startColumn - o.startColumn;
+        const c = l.startColumn - o.startColumn;
         c !== 0 && this._filterByModel.deltaCol(c);
       }
     });
@@ -756,49 +780,54 @@ let W = class extends me {
     this._disposePreviousModel();
     const s = e.getRange();
     if (s.startRow === s.endRow) return !1;
-    const n = await Oe.fromFilterColumn(
+    const n = await Le.fromFilterColumn(
       this._injector,
       e,
       r
     );
-    return this.filterByModel = n, this._filterBy$.next(
-      0
-      /* VALUES */
-    ), this._listenToFilterHeaderChange(e, r), !0;
+    return this.filterByModel = n, this._filterBy$.next(A.VALUES), this._listenToFilterHeaderChange(e, r), !0;
+  }
+  async _setupByColors(e, r) {
+    this._disposePreviousModel();
+    const s = e.getRange();
+    if (s.startRow === s.endRow) return !1;
+    const n = await $e.fromFilterColumn(
+      this._injector,
+      e,
+      r
+    );
+    return this.filterByModel = n, this._filterBy$.next(A.COLORS), this._listenToFilterHeaderChange(e, r), !0;
   }
   _setupByConditions(e, r) {
     this._disposePreviousModel();
     const s = e.getRange();
     if (s.startRow === s.endRow) return !1;
-    const n = ye.fromFilterColumn(
+    const n = we.fromFilterColumn(
       this._injector,
       e,
       r,
       e.getFilterColumn(r)
     );
-    return this.filterByModel = n, this._filterBy$.next(
-      1
-      /* CONDITIONS */
-    ), this._listenToFilterHeaderChange(e, r), !0;
+    return this.filterByModel = n, this._filterBy$.next(A.CONDITIONS), this._listenToFilterHeaderChange(e, r), !0;
   }
   _disposePreviousModel() {
     var e;
     (e = this._filterByModel) == null || e.dispose(), this.filterByModel = null;
   }
 };
-W = et([
-  Fe(0, E(X)),
-  Fe(1, E(Ar))
-], W);
-let ye = class extends me {
-  constructor(e, r, s, n, l) {
+Z = Qe([
+  Ce(0, T(re)),
+  Ce(1, T(Dr))
+], Z);
+let we = class extends de {
+  constructor(e, r, s, n, a) {
     super();
-    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 q(s), this.conditionItem$ = this._conditionItem$.asObservable(), this._filterConditionFormParams$ = new q(n), this.filterConditionFormParams$ = this._filterConditionFormParams$.asObservable();
+    p(this, "canApply$", me(!0));
+    p(this, "_conditionItem$");
+    p(this, "conditionItem$");
+    p(this, "_filterConditionFormParams$");
+    p(this, "filterConditionFormParams$");
+    this._filterModel = e, this.col = r, this._commandService = a, this._conditionItem$ = new V(s), this.conditionItem$ = this._conditionItem$.asObservable(), this._filterConditionFormParams$ = new V(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,8 +841,8 @@ let ye = class extends me {
    * @returns the model to control the panel's state
    */
   static fromFilterColumn(e, r, s, n) {
-    const [l, i] = d.testMappingFilterColumn(n == null ? void 0 : n.getColumnData());
-    return e.createInstance(ye, r, s, l, i);
+    const [a, i] = m.testMappingFilterColumn(n == null ? void 0 : n.getColumnData());
+    return e.createInstance(we, r, s, a, i);
   }
   get conditionItem() {
     return this._conditionItem$.getValue();
@@ -828,7 +857,7 @@ let ye = class extends me {
     this.col += e;
   }
   clear() {
-    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(re.id, {
+    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(Q.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
@@ -840,8 +869,8 @@ let ye = class extends me {
    */
   async apply() {
     if (this._disposed) return !1;
-    const e = d.mapToFilterColumn(this.conditionItem, this.filterConditionFormParams);
-    return this._commandService.executeCommand(re.id, {
+    const e = m.mapToFilterColumn(this.conditionItem, this.filterConditionFormParams);
+    return this._commandService.executeCommand(Q.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
@@ -853,10 +882,10 @@ let ye = class extends me {
    * `IFilterConditionFormParams` and load default condition form params.
    */
   onPrimaryConditionChange(e) {
-    const r = d.ALL_CONDITIONS.find((s) => s.operator === e);
+    const r = m.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(d.getInitialFormParams(e));
+    this._conditionItem$.next(r), this._filterConditionFormParams$.next(m.getInitialFormParams(e));
   }
   /**
    * This method would be called when user changes the primary conditions, the input values or "AND" "OR" ratio.
@@ -869,43 +898,43 @@ let ye = class extends me {
   onConditionFormChange(e) {
     const r = { ...this.filterConditionFormParams, ...e };
     if (r.and !== !0 && delete r.and, typeof e.and < "u" || typeof e.operator1 < "u" || typeof e.operator2 < "u") {
-      const s = d.testMappingParams(r, this.conditionItem.numOfParameters);
+      const s = m.testMappingParams(r, this.conditionItem.numOfParameters);
       this._conditionItem$.next(s);
     }
     this._filterConditionFormParams$.next(r);
   }
 };
-ye = et([
-  Fe(4, Q)
-], ye);
-let Oe = class extends me {
-  constructor(e, r, s, n, l) {
+we = Qe([
+  Ce(4, j)
+], we);
+let Le = class extends de {
+  constructor(e, r, s, n, a) {
     super();
-    f(this, "_rawFilterItems$");
-    f(this, "rawFilterItems$");
-    f(this, "filterItems$");
-    f(this, "_filterItems", []);
-    f(this, "_treeMapCache");
-    f(this, "canApply$");
-    f(this, "_manuallyUpdateFilterItems$");
-    f(this, "_searchString$");
-    f(this, "searchString$");
-    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 Dr(), this.filterItems$ = kr(
-      xr([
+    p(this, "_rawFilterItems$");
+    p(this, "rawFilterItems$");
+    p(this, "filterItems$");
+    p(this, "_filterItems", []);
+    p(this, "_treeMapCache");
+    p(this, "canApply$");
+    p(this, "_manuallyUpdateFilterItems$");
+    p(this, "_searchString$");
+    p(this, "searchString$");
+    this._filterModel = e, this.col = r, this._commandService = a, this._treeMapCache = n, this._searchString$ = new V(""), this.searchString$ = this._searchString$.asObservable(), this._rawFilterItems$ = new V(s), this.rawFilterItems$ = this._rawFilterItems$.asObservable(), this._manuallyUpdateFilterItems$ = new Kr(), this.filterItems$ = qr(
+      Xr([
         this._searchString$.pipe(
-          Ot(500, void 0, { leading: !0, trailing: !0 }),
-          Rt(void 0)
+          Ht(500, void 0, { leading: !0, trailing: !0 }),
+          Dt(void 0)
         ),
         this._rawFilterItems$
       ]).pipe(
-        ie(([i, o]) => {
+        ce(([i, o]) => {
           if (!i) return o;
           const c = i.toLowerCase().split(/\s+/).filter((h) => !!h);
-          return Ht(o, c);
+          return jt(o, c);
         })
       ),
       this._manuallyUpdateFilterItems$
-    ).pipe(Br(1)), this.canApply$ = this.filterItems$.pipe(ie((i) => xe(i).checked > 0)), this.disposeWithMe(this.filterItems$.subscribe((i) => this._filterItems = i));
+    ).pipe(zr(1)), this.canApply$ = this.filterItems$.pipe(ce((i) => qe(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,29 +947,39 @@ let Oe = class extends me {
    * @returns the model to control the panel's state
    */
   static async fromFilterColumn(e, r, s) {
-    var w;
-    const n = e.get(Ge), l = e.get(K), i = e.get(Ne, gt.OPTIONAL), { unitId: o, subUnitId: a } = r, c = n.getUniverSheetInstance(o);
+    const n = e.get(De), a = e.get(K), i = e.get(Pe, At.OPTIONAL), { unitId: o, subUnitId: l } = r, c = n.getUniverSheetInstance(o);
     if (!c) throw new Error(`[ByValuesModel]: Workbook not found for filter model with unitId: ${o}!`);
-    const h = c == null ? void 0 : c.getSheetBySheetId(a);
-    if (!h) throw new Error(`[ByValuesModel]: Worksheet not found for filter model with unitId: ${o} and subUnitId: ${a}!`);
-    const m = r.getRange(), g = s, p = (w = r.getFilterColumn(s)) == null ? void 0 : w.getColumnData().filters, T = new Set(p == null ? void 0 : p.filters), v = !!(p && p.blank), C = r.getFilteredOutRowsExceptCol(s), N = { ...m, startRow: m.startRow + 1, startColumn: g, endColumn: g };
-    let R, O;
+    const h = c == null ? void 0 : c.getSheetBySheetId(l);
+    if (!h) throw new Error(`[ByValuesModel]: Worksheet not found for filter model with unitId: ${o} and subUnitId: ${l}!`);
+    const d = r.getRange(), C = s, v = r.getFilterColumn(s), _ = v == null ? void 0 : v.getColumnData().filters, S = new Set(_ == null ? void 0 : _.filters), N = !!(_ && _.blank), E = r.getFilteredOutRowsExceptCol(s), b = { ...d, startRow: d.startRow + 1, startColumn: C, endColumn: C };
+    let F, R;
     if (i) {
-      const M = await i.getFilterValues({
+      const w = await i.getFilterValues({
         unitId: o,
-        subUnitId: a,
-        filteredOutRowsByOtherColumns: Array.from(C),
-        filters: !!p,
-        blankChecked: v,
-        iterateRange: N,
-        alreadyChecked: Array.from(T)
+        subUnitId: l,
+        filteredOutRowsByOtherColumns: Array.from(E),
+        filterColumn: v,
+        filters: !!_,
+        blankChecked: N,
+        iterateRange: b,
+        alreadyChecked: Array.from(S)
       });
-      R = M.filterTreeItems, O = M.filterTreeMapCache;
+      F = w.filterTreeItems, R = w.filterTreeMapCache;
     } else {
-      const M = $t(!!p, l, N, h, C, T, v, c.getStyles());
-      R = M.filterTreeItems, O = M.filterTreeMapCache;
+      const w = Qt(
+        !!_,
+        a,
+        b,
+        h,
+        E,
+        v,
+        S,
+        N,
+        c.getStyles()
+      );
+      F = w.filterTreeItems, R = w.filterTreeMapCache;
     }
-    return e.createInstance(Oe, r, s, R, O);
+    return e.createInstance(Le, r, s, F, R);
   }
   get rawFilterItems() {
     return this._rawFilterItems$.getValue();
@@ -961,24 +1000,24 @@ let Oe = class extends me {
     this._searchString$.next(e);
   }
   onCheckAllToggled(e) {
-    const r = Te.deepClone(this._filterItems);
-    r.forEach((s) => ue(s, e)), this._manuallyUpdateFilterItems(r);
+    const r = Re.deepClone(this._filterItems);
+    r.forEach((s) => ge(s, e)), this._manuallyUpdateFilterItems(r);
   }
   /**
    * Toggle a filter item.
    */
   onFilterCheckToggled(e) {
-    const r = Te.deepClone(this._filterItems), s = We(r, e.key);
+    const r = Re.deepClone(this._filterItems), s = ze(r, e.key);
     if (!s)
       return;
-    const n = Ut(s);
-    ue(s, !n), this._manuallyUpdateFilterItems(r);
+    const n = Vt(s);
+    ge(s, !n), this._manuallyUpdateFilterItems(r);
   }
   onFilterOnly(e) {
-    const r = Te.deepClone(this._filterItems);
-    r.forEach((s) => ue(s, !1)), e.forEach((s) => {
-      const n = We(r, s);
-      n && ue(n, !0);
+    const r = Re.deepClone(this._filterItems);
+    r.forEach((s) => ge(s, !1)), e.forEach((s) => {
+      const n = ze(r, s);
+      n && ge(n, !0);
     }), this._manuallyUpdateFilterItems(r);
   }
   _manuallyUpdateFilterItems(e) {
@@ -987,7 +1026,7 @@ let Oe = class extends me {
   // expose method here to let the panel change filter items
   // #region ByValuesModel apply methods
   clear() {
-    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(re.id, {
+    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(Q.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
@@ -1000,154 +1039,280 @@ let Oe = class extends me {
   async apply() {
     if (this._disposed)
       return !1;
-    const e = xe(this._filterItems), { checked: r, checkedItems: s } = e, n = this.rawFilterItems;
-    let l = 0;
+    const e = qe(this._filterItems), { checked: r, checkedItems: s } = e, n = this.rawFilterItems;
+    let a = 0;
     for (const c of n)
-      l += c.count;
-    const i = r === 0, o = e.checked === l, a = { colId: this.col };
+      a += c.count;
+    const i = r === 0, o = e.checked === a, l = { colId: this.col };
     if (i)
       throw new Error("[ByValuesModel]: no checked items!");
     if (o)
-      return this._commandService.executeCommand(re.id, {
+      return this._commandService.executeCommand(Q.id, {
         unitId: this._filterModel.unitId,
         subUnitId: this._filterModel.subUnitId,
         col: this.col,
         criteria: null
       });
     {
-      a.filters = {};
-      const c = s.filter((m) => m.key !== "empty");
-      c.length > 0 && (a.filters = {
-        filters: c.flatMap((m) => m.originValues ? Array.from(m.originValues) : [m.title])
-      }), c.length !== s.length && (a.filters.blank = !0);
+      l.filters = {};
+      const c = s.filter((d) => d.key !== "empty");
+      c.length > 0 && (l.filters = {
+        filters: c.flatMap((d) => d.originValues ? Array.from(d.originValues) : [d.title])
+      }), c.length !== s.length && (l.filters.blank = !0);
     }
-    return this._commandService.executeCommand(re.id, {
+    return this._commandService.executeCommand(Q.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
-      criteria: a
+      criteria: l
     });
   }
   // #endregion
 };
-Oe = et([
-  Fe(4, Q)
-], Oe);
-const se = "FILTER_PANEL_OPENED", Re = {
+Le = Qe([
+  Ce(4, j)
+], Le);
+let $e = class extends de {
+  constructor(e, r, s, n, a) {
+    super();
+    p(this, "canApply$", me(!0));
+    p(this, "_cellFillColors$");
+    p(this, "cellFillColors$");
+    p(this, "_cellTextColors$");
+    p(this, "cellTextColors$");
+    this._filterModel = e, this.col = r, this._commandService = a, this._cellFillColors$ = new V(Array.from(s.values())), this.cellFillColors$ = this._cellFillColors$.asObservable(), this._cellTextColors$ = new V(Array.from(n.values())), this.cellTextColors$ = this._cellTextColors$.asObservable();
+  }
+  /**
+   * Create a model with targeting filter column. If there is not a filter column, the model would be created with
+   * default values.
+   *
+   * @param injector
+   * @param filterModel
+   * @param col
+   *
+   * @returns the model to control the panel's state
+   */
+  static async fromFilterColumn(e, r, s) {
+    var b, F, R;
+    const n = e.get(De), { unitId: a, subUnitId: i } = r, o = n.getUniverSheetInstance(a);
+    if (!o) throw new Error(`[ByColorsModel]: Workbook not found for filter model with unitId: ${a}!`);
+    const l = o == null ? void 0 : o.getSheetBySheetId(i);
+    if (!l) throw new Error(`[ByColorsModel]: Worksheet not found for filter model with unitId: ${a} and subUnitId: ${i}!`);
+    const c = r.getRange(), h = s, d = (b = r.getFilterColumn(s)) == null ? void 0 : b.getColumnData().colorFilters, C = r.getFilteredOutRowsExceptCol(s), v = { ...c, startRow: c.startRow + 1, startColumn: h, endColumn: h }, _ = /* @__PURE__ */ new Map(), S = new Set((F = d == null ? void 0 : d.cellFillColors) != null ? F : []), N = /* @__PURE__ */ new Map(), E = new Set((R = d == null ? void 0 : d.cellTextColors) != null ? R : []);
+    for (const w of l.iterateByColumn(v, !1, !0)) {
+      const { row: X, col: se, value: ne } = w;
+      if (C.has(X))
+        continue;
+      const D = l.getComposedCellStyleByCellData(X, se, ne);
+      if (D.bg && D.bg.rgb) {
+        const L = new mt(D.bg.rgb).toRgbString();
+        _.has(L) || _.set(L, { color: L, checked: S.has(L) });
+      } else
+        _.set("default-fill-color", { color: null, checked: S.has(null) });
+      if (D.cl && D.cl.rgb) {
+        const L = new mt(D.cl.rgb).toRgbString();
+        N.has(L) || N.set(L, { color: L, checked: E.has(L) });
+      } else
+        N.set("default-font-color", { color: vt, checked: E.has(vt) });
+    }
+    return e.createInstance($e, r, s, _, N);
+  }
+  get cellFillColors() {
+    return this._cellFillColors$.getValue();
+  }
+  get cellTextColors() {
+    return this._cellTextColors$.getValue();
+  }
+  dispose() {
+    super.dispose(), this._cellFillColors$.complete();
+  }
+  deltaCol(e) {
+    this.col += e;
+  }
+  // expose method here to let the panel change filter items
+  // #region ByColorsModel apply methods
+  clear() {
+    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(Q.id, {
+      unitId: this._filterModel.unitId,
+      subUnitId: this._filterModel.subUnitId,
+      col: this.col,
+      criteria: null
+    });
+  }
+  onFilterCheckToggled(e, r = !0) {
+    const s = r ? this.cellFillColors : this.cellTextColors, n = [];
+    let a = !1;
+    for (let i = 0; i < s.length; i++) {
+      const o = s[i];
+      if (o.color === e.color) {
+        a = !0, n.push({
+          color: o.color,
+          checked: !o.checked
+        });
+        continue;
+      }
+      n.push({
+        color: o.color,
+        checked: o.checked
+      });
+    }
+    a && (this._resetColorsCheckedStatus(!r), r ? this._cellFillColors$.next([...n]) : this._cellTextColors$.next([...n]));
+  }
+  _resetColorsCheckedStatus(e = !0) {
+    const r = e ? this.cellFillColors : this.cellTextColors, s = [];
+    for (let n = 0; n < r.length; n++)
+      s.push({
+        color: r[n].color,
+        checked: !1
+      });
+    e ? this._cellFillColors$.next([...s]) : this._cellTextColors$.next([...s]);
+  }
+  /**
+   * Apply the filter condition to the target filter column.
+   */
+  async apply() {
+    if (this._disposed)
+      return !1;
+    const e = this.cellFillColors.filter((n) => n.checked).map((n) => n.color), r = this.cellTextColors.filter((n) => n.checked).map((n) => n.color);
+    if (e.length === 0 && r.length === 0)
+      return this._commandService.executeCommand(Q.id, {
+        unitId: this._filterModel.unitId,
+        subUnitId: this._filterModel.subUnitId,
+        col: this.col,
+        criteria: null
+      });
+    const s = { colId: this.col };
+    return e.length > 0 ? s.colorFilters = {
+      cellFillColors: e
+    } : r.length > 0 && (s.colorFilters = {
+      cellTextColors: r
+    }), this._commandService.executeCommand(Q.id, {
+      unitId: this._filterModel.unitId,
+      subUnitId: this._filterModel.subUnitId,
+      col: this.col,
+      criteria: s
+    });
+  }
+  // #endregion
+};
+$e = Qe([
+  Ce(4, j)
+], $e);
+const ue = "FILTER_PANEL_OPENED", Me = {
   id: "sheet.operation.open-filter-panel",
-  type: Le.OPERATION,
+  type: Be.OPERATION,
   handler: (t, e) => {
-    const r = t.get(we), s = t.get(V), n = t.get(W);
-    t.get(Q).syncExecuteCommand(gr.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;
+    const r = t.get(We), s = t.get(q), n = t.get(Z);
+    t.get(j).syncExecuteCommand(Sr.id, { visible: !1 });
+    const { unitId: i, subUnitId: o, col: l } = e, c = s.getFilterModel(i, o);
+    return c ? (n.setupCol(c, l), r.getContextValue(ue) || r.setContextValue(ue, !0), !0) : !1;
   }
-}, he = {
+}, Se = {
   id: "sheet.operation.close-filter-panel",
-  type: Le.OPERATION,
+  type: Be.OPERATION,
   handler: (t) => {
-    const e = t.get(we), r = t.get(W), s = t.get(cr, gt.OPTIONAL);
-    return e.getContextValue(se) ? (e.setContextValue(se, !1), s == null || s.focus(), r.terminate()) : !1;
+    const e = t.get(We), r = t.get(Z), s = t.get(Ar, At.OPTIONAL);
+    return e.getContextValue(ue) ? (e.setContextValue(ue, !1), s == null || s.focus(), r.terminate()) : !1;
   }
-}, Dt = {
+}, Gt = {
   id: "sheet.operation.apply-filter",
-  type: Le.OPERATION,
+  type: Be.OPERATION,
   handler: (t, e) => {
     const { filterBy: r } = e;
-    return t.get(W).changeFilterBy(r);
+    return t.get(Z).changeFilterBy(r);
   }
-}, kt = "sheets-filter-ui.config", Ie = {};
-var oi = Object.getOwnPropertyDescriptor, ai = (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);
+}, Yt = "sheets-filter-ui.config", xe = {};
+var vi = Object.getOwnPropertyDescriptor, _i = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? vi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (n = i(n) || n);
   return n;
-}, 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();
+}, ae = (t, e) => (r, s) => e(r, s, t);
+let he = class extends de {
+  constructor(t, e, r, s, n, a) {
+    super(), this._sheetsFilterService = t, this._localeService = e, this._commandService = r, this._sheetPermissionCheckPermission = s, this._injector = n, this._sheetsSelectionService = a, this._commandExecutedListener();
   }
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((t) => {
         var e, r, s;
-        if (t.id === pe.id) {
-          const n = this._injector.get(Ge), l = Lr(n);
-          if (!l) return;
-          const { unitId: i, subUnitId: o, worksheet: a } = l, c = (e = this._sheetsFilterService.getFilterModel(i, o)) == null ? void 0 : e.getRange();
+        if (t.id === Ee.id) {
+          const n = this._injector.get(De), a = Qr(n);
+          if (!a) return;
+          const { unitId: i, subUnitId: o, worksheet: l } = a, c = (e = this._sheetsFilterService.getFilterModel(i, o)) == null ? void 0 : e.getRange();
           let h;
           if (c)
             h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
-              rangeTypes: [ce],
-              worksheetTypes: [ae, le]
+              rangeTypes: [_e],
+              worksheetTypes: [pe, ve]
             }, [c]);
           else {
-            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 ? wr(g, { left: !0, right: !0, up: !0, down: !0 }, a) : g, h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
-                rangeTypes: [ce],
-                worksheetTypes: [le, ae]
-              }, [g], i, o);
+            const d = (r = this._sheetsSelectionService.getCurrentLastSelection()) == null ? void 0 : r.range;
+            if (d) {
+              let C = { ...d };
+              C = d.startColumn === d.endColumn && d.startRow === d.endRow ? Vr(C, { left: !0, right: !0, up: !0, down: !0 }, l) : C, h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
+                rangeTypes: [_e],
+                worksheetTypes: [ve, pe]
+              }, [C], i, o);
             } else
               h = this._sheetPermissionCheckPermission.permissionCheckWithoutRange({
-                rangeTypes: [ce],
-                worksheetTypes: [le, ae]
+                rangeTypes: [_e],
+                worksheetTypes: [ve, pe]
               });
           }
           h || this._sheetPermissionCheckPermission.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.filterErr"));
         }
-        if (t.id === Re.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: [ce],
-            worksheetTypes: [ae, le]
-          }, [a]) || this._sheetPermissionCheckPermission.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.filterErr")));
+        if (t.id === Me.id) {
+          const n = t.params, { unitId: a, subUnitId: i } = n, o = (s = this._sheetsFilterService.getFilterModel(a, i)) == null ? void 0 : s.getRange(), l = Re.deepClone(o);
+          l && (l.startColumn = n.col, l.endColumn = n.col, this._sheetPermissionCheckPermission.permissionCheckWithRanges({
+            rangeTypes: [_e],
+            worksheetTypes: [pe, ve]
+          }, [l]) || this._sheetPermissionCheckPermission.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.filterErr")));
         }
       })
     );
   }
 };
-ne = ai([
-  ee(0, E(V)),
-  ee(1, E(K)),
-  ee(2, Q),
-  ee(3, E(Pr)),
-  ee(4, E(X)),
-  ee(5, E(br))
-], ne);
-const x = 16, li = 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 {
+he = _i([
+  ae(0, T(q)),
+  ae(1, T(K)),
+  ae(2, j),
+  ae(3, T(Br)),
+  ae(4, T(re)),
+  ae(5, T(Wr))
+], he);
+const Y = 16, gi = 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 Et {
   static drawNoCriteria(e, r, s, n) {
-    e.save(), ot.drawWith(e, {
+    e.save(), _t.drawWith(e, {
       radius: 2,
-      width: x,
-      height: x,
+      width: Y,
+      height: Y,
       fill: n
-    }), 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();
+    }), e.lineCap = "square", e.strokeStyle = s, e.scale(r / Y, r / Y), e.beginPath(), e.lineWidth = 1, e.lineCap = "round", e.moveTo(3, 4), e.lineTo(13, 4), e.moveTo(4.5, 8), e.lineTo(11.5, 8), e.moveTo(6, 12), e.lineTo(10, 12), e.stroke(), e.restore();
   }
   static drawHasCriteria(e, r, s, n) {
-    e.save(), ot.drawWith(e, {
+    e.save(), _t.drawWith(e, {
       radius: 2,
-      width: x,
-      height: x,
+      width: Y,
+      height: Y,
       fill: n
-    }), e.scale(r / x, r / x), e.fillStyle = s, e.fill(li), e.restore();
+    }), e.scale(r / Y, r / Y), e.fillStyle = s, e.fill(gi), e.restore();
   }
 }
-var ci = Object.getOwnPropertyDescriptor, ui = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? ci(e, r) : e, l = t.length - 1, i; l >= 0; l--)
-    (i = t[l]) && (n = i(n) || n);
+var Si = Object.getOwnPropertyDescriptor, Ci = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Si(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (n = i(n) || n);
   return n;
-}, De = (t, e) => (r, s) => e(r, s, t);
-const H = 16, Se = 1;
-let Qe = class extends Gr {
-  constructor(e, r, s, n, l) {
+}, Ze = (t, e) => (r, s) => e(r, s, t);
+const W = 16, Ie = 1;
+let Je = class extends Hr {
+  constructor(e, r, s, n, a) {
     super(e, r);
-    f(this, "_cellWidth", 0);
-    f(this, "_cellHeight", 0);
-    f(this, "_filterParams");
-    f(this, "_hovered", !1);
-    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());
+    p(this, "_cellWidth", 0);
+    p(this, "_cellHeight", 0);
+    p(this, "_filterParams");
+    p(this, "_hovered", !1);
+    this._contextService = s, this._commandService = n, this._themeService = a, 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({
@@ -1156,19 +1321,19 @@ let Qe = class extends Gr {
     });
   }
   _draw(e) {
-    const r = this._cellHeight, s = this._cellWidth, n = H - s, l = H - r;
+    const r = this._cellHeight, s = this._cellWidth, n = W - s, a = W - r;
     e.save();
     const i = new Path2D();
-    i.rect(n, l, s, r), e.clip(i);
-    const { hasCriteria: o } = this._filterParams, a = this._themeService.getColorFromTheme("primary.600"), c = this._hovered ? this._themeService.getColorFromTheme("gray.50") : "rgba(255, 255, 255, 1.0)";
-    o ? ht.drawHasCriteria(e, H, a, c) : ht.drawNoCriteria(e, H, a, c), e.restore();
+    i.rect(n, a, s, r), e.clip(i);
+    const { hasCriteria: o } = this._filterParams, l = this._themeService.getColorFromTheme("primary.600"), c = this._hovered ? this._themeService.getColorFromTheme("gray.50") : "rgba(255, 255, 255, 1.0)";
+    o ? Et.drawHasCriteria(e, W, l, c) : Et.drawNoCriteria(e, W, l, c), e.restore();
   }
   onPointerDown(e) {
     if (e.button === 2)
       return;
     const { col: r, unitId: s, subUnitId: n } = this._filterParams;
-    this._contextService.getContextValue(se) || !this._commandService.hasCommand(Re.id) || setTimeout(() => {
-      this._commandService.executeCommand(Re.id, {
+    this._contextService.getContextValue(ue) || !this._commandService.hasCommand(Me.id) || setTimeout(() => {
+      this._commandService.executeCommand(Me.id, {
         unitId: s,
         subUnitId: n,
         col: r
@@ -1182,107 +1347,107 @@ let Qe = class extends Gr {
     this._hovered = !1, this.makeDirty(!0);
   }
 };
-Qe = ui([
-  De(2, we),
-  De(3, Q),
-  De(4, E(St))
-], Qe);
-var hi = Object.getOwnPropertyDescriptor, di = (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);
+Je = Ci([
+  Ze(2, We),
+  Ze(3, j),
+  Ze(4, T(Pt))
+], Je);
+var Ti = Object.getOwnPropertyDescriptor, Ei = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Ti(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (n = i(n) || n);
   return n;
-}, Y = (t, e) => (r, s) => e(r, s, t);
-const mi = 1e3, pi = 5e3;
-let Ve = class extends Et {
-  constructor(e, r, s, n, l, i, o, a) {
+}, ee = (t, e) => (r, s) => e(r, s, t);
+const Ni = 1e3, Fi = 5e3;
+let et = class extends wt {
+  constructor(e, r, s, n, a, i, o, l) {
     super();
-    f(this, "_filterRangeShape", null);
-    f(this, "_buttonRenderDisposable", null);
-    f(this, "_filterButtonShapes", []);
-    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();
+    p(this, "_filterRangeShape", null);
+    p(this, "_buttonRenderDisposable", null);
+    p(this, "_filterButtonShapes", []);
+    this._context = e, this._injector = r, this._sheetSkeletonManagerService = s, this._sheetsFilterService = n, this._themeService = a, this._sheetInterceptorService = i, this._commandService = o, this._selectionRenderService = l, this._initRenderer();
   }
   dispose() {
     super.dispose(), this._disposeRendering();
   }
   _initRenderer() {
     this._sheetSkeletonManagerService.currentSkeleton$.pipe(
-      Ze((e) => {
-        var o, a;
-        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 = () => ({
+      ot((e) => {
+        var o, l;
+        if (!e) return me(null);
+        const { unit: r, unitId: s } = this._context, n = ((o = r.getActiveSheet()) == null ? void 0 : o.getSheetId()) || "", a = (l = this._sheetsFilterService.getFilterModel(s, n)) != null ? l : void 0, i = () => ({
           unitId: s,
           worksheetId: n,
-          filterModel: l,
-          range: l == null ? void 0 : l.getRange(),
+          filterModel: a,
+          range: a == null ? void 0 : a.getRange(),
           skeleton: e.skeleton
         });
-        return zt(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(
-          Wr(
+        return ar(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(
+          Jr(
             ([c]) => {
               var h;
-              return c.type === Le.MUTATION && ((h = c.params) == null ? void 0 : h.unitId) === r.getUnitId() && (rr.has(c.id) || c.id === $r.id);
+              return c.type === Be.MUTATION && ((h = c.params) == null ? void 0 : h.unitId) === r.getUnitId() && (dr.has(c.id) || c.id === Gr.id);
             }
           ),
-          Ot(20, void 0, { leading: !1, trailing: !0 }),
-          ie(i),
-          Rt(i())
+          Ht(20, void 0, { leading: !1, trailing: !0 }),
+          ce(i),
+          Dt(i())
           // must trigger once
         );
       }),
-      Qr(this.dispose$)
+      ei(this.dispose$)
     ).subscribe((e) => {
       this._disposeRendering(), !(!e || !e.range) && (this._renderRange(e.range, e.skeleton), this._renderButtons(e));
     });
   }
   _renderRange(e, r) {
-    const { scene: s } = this._context, { rowHeaderWidth: n, columnHeaderHeight: l } = r, i = this._filterRangeShape = new Tr(
+    const { scene: s } = this._context, { rowHeaderWidth: n, columnHeaderHeight: a } = r, i = this._filterRangeShape = new Er(
       s,
-      mi,
+      Ni,
       this._themeService,
       {
         rowHeaderWidth: n,
-        columnHeaderHeight: l,
+        columnHeaderHeight: a,
         enableAutoFill: !1,
         highlightHeader: !1
       }
-    ), a = Nr({
+    ), l = Nr({
       range: e,
       primary: null,
       style: { fill: "rgba(0, 0, 0, 0.0)" }
     }, r);
-    i.updateRangeBySelectionWithCoord(a), i.setEvent(!1), s.makeDirty(!0);
+    i.updateRangeBySelectionWithCoord(l), i.setEvent(!1), s.makeDirty(!0);
   }
   _renderButtons(e) {
-    const { range: r, filterModel: s, unitId: n, skeleton: l, worksheetId: i } = e, { scene: o } = this._context;
+    const { range: r, filterModel: s, unitId: n, skeleton: a, worksheetId: i } = e, { scene: o } = this._context;
     this._interceptCellContent(n, i, e.range);
-    const { startColumn: a, endColumn: c, startRow: h } = r;
-    for (let m = a; m <= c; m++) {
-      const g = `sheets-filter-button-${m}`, p = Fr(h, m, o, l), { startX: T, startY: v, endX: C, endY: N } = p, R = C - T, O = N - v;
-      if (O <= Se || R <= Se)
+    const { startColumn: l, endColumn: c, startRow: h } = r;
+    for (let d = l; d <= c; d++) {
+      const C = `sheets-filter-button-${d}`, v = Fr(h, d, o, a), { startX: _, startY: S, endX: N, endY: E } = v, b = N - _, F = E - S;
+      if (F <= Ie || b <= Ie)
         continue;
-      const w = !!s.getFilterColumn(m), M = C - H - Se, _e = N - H - Se, ve = {
-        left: M,
-        top: _e,
-        height: H,
-        width: H,
-        zIndex: pi,
-        cellHeight: O,
-        cellWidth: R,
-        filterParams: { unitId: n, subUnitId: i, col: m, hasCriteria: w }
-      }, I = this._injector.createInstance(Qe, g, ve);
-      this._filterButtonShapes.push(I);
+      const R = !!s.getFilterColumn(d), w = N - W - Ie, X = E - W - Ie, se = {
+        left: w,
+        top: X,
+        height: W,
+        width: W,
+        zIndex: Fi,
+        cellHeight: F,
+        cellWidth: b,
+        filterParams: { unitId: n, subUnitId: i, col: d, hasCriteria: R }
+      }, ne = this._injector.createInstance(Je, C, se);
+      this._filterButtonShapes.push(ne);
     }
     o.addObjects(this._filterButtonShapes), o.makeDirty();
   }
   _interceptCellContent(e, r, s) {
-    const { startRow: n, startColumn: l, endColumn: i } = s;
-    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(Ur.CELL_CONTENT, {
-      effect: Jt.Style,
-      handler: (o, a, c) => {
-        const { row: h, col: m, unitId: g, subUnitId: p } = a;
-        return g !== e || p !== r || h !== n || m < l || m > i || ((!o || o === a.rawData) && (o = { ...a.rawData }), o.fontRenderExtension = {
+    const { startRow: n, startColumn: a, endColumn: i } = s;
+    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(Yr.CELL_CONTENT, {
+      effect: cr.Style,
+      handler: (o, l, c) => {
+        const { row: h, col: d, unitId: C, subUnitId: v } = l;
+        return C !== e || v !== r || h !== n || d < a || d > i || ((!o || o === l.rawData) && (o = { ...l.rawData }), o.fontRenderExtension = {
           ...o == null ? void 0 : o.fontRenderExtension,
-          rightOffset: H
+          rightOffset: W
         }), c(o);
       },
       priority: 10
@@ -1293,185 +1458,325 @@ let Ve = class extends Et {
     (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 = [];
   }
 };
-Ve = di([
-  Y(1, E(X)),
-  Y(2, E(Sr)),
-  Y(3, E(V)),
-  Y(4, E(St)),
-  Y(5, E(Mr)),
-  Y(6, Q),
-  Y(7, Er)
-], Ve);
-var fi = Object.getOwnPropertyDescriptor, _i = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? fi(e, r) : e, l = t.length - 1, i; l >= 0; l--)
-    (i = t[l]) && (n = i(n) || n);
+et = Ei([
+  ee(1, T(re)),
+  ee(2, T(Cr)),
+  ee(3, T(q)),
+  ee(4, T(Pt)),
+  ee(5, T(jr)),
+  ee(6, j),
+  ee(7, Tr)
+], et);
+var yi = Object.getOwnPropertyDescriptor, Oi = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? yi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (n = i(n) || n);
   return n;
-}, dt = (t, e) => (r, s) => e(r, s, t);
-let de = class extends Et {
+}, Nt = (t, e) => (r, s) => e(r, s, t);
+let Te = class extends wt {
   constructor(t, e) {
     super(), this._renderManagerService = t, this._sheetsRenderService = e, [
-      ir,
-      sr,
-      nr,
-      or
+      mr,
+      fr,
+      pr,
+      vr
     ].forEach((r) => this.disposeWithMe(this._sheetsRenderService.registerSkeletonChangingMutations(r.id))), this.disposeWithMe(this._renderManagerService.registerRenderModule(
-      Z.UNIVER_SHEET,
-      [Ve]
+      ie.UNIVER_SHEET,
+      [et]
     ));
   }
 };
-de = _i([
-  dt(0, It),
-  dt(1, E(yt))
-], de);
-var vi = Object.defineProperty, gi = Object.getOwnPropertyDescriptor, Si = (t, e, r) => e in t ? vi(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Ei = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? gi(e, r) : e, l = t.length - 1, i; l >= 0; l--)
-    (i = t[l]) && (n = i(n) || n);
+Te = Oi([
+  Nt(0, kt),
+  Nt(1, T(Ut))
+], Te);
+var Ii = Object.defineProperty, bi = Object.getOwnPropertyDescriptor, Ri = (t, e, r) => e in t ? Ii(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Ai = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? bi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (n = i(n) || n);
   return n;
-}, mt = (t, e) => (r, s) => e(r, s, t), xt = (t, e, r) => Si(t, typeof e != "symbol" ? e + "" : e, r);
-const Ti = "SHEET_FILTER_UI_PLUGIN";
-let Ae = class extends je {
-  constructor(t = Ie, e, r) {
+}, Ft = (t, e) => (r, s) => e(r, s, t), Zt = (t, e, r) => Ri(t, typeof e != "symbol" ? e + "" : e, r);
+const Pi = "SHEET_FILTER_UI_PLUGIN";
+let Ue = class extends tt {
+  constructor(t = xe, e, r) {
     super(), this._config = t, this._injector = e, this._configService = r;
-    const { menu: s, ...n } = Ft(
+    const { menu: s, ...n } = Mt(
       {},
-      Ie,
+      xe,
       this._config
     );
-    s && this._configService.setConfig("menu", s, { merge: !0 }), this._configService.setConfig(kt, n);
+    s && this._configService.setConfig("menu", s, { merge: !0 }), this._configService.setConfig(Yt, n);
   }
   onStarting() {
     [
-      [ne],
-      [de]
+      [he],
+      [Te]
     ].forEach((t) => this._injector.add(t));
   }
   onReady() {
-    this._injector.get(ne);
+    this._injector.get(he);
   }
   onRendered() {
-    this._injector.get(de);
+    this._injector.get(Te);
   }
 };
-xt(Ae, "type", Z.UNIVER_SHEET);
-xt(Ae, "pluginName", Ti);
-Ae = Ei([
-  Tt(Ct),
-  mt(1, E(X)),
-  mt(2, Nt)
-], Ae);
-var P = function() {
-  return P = Object.assign || function(t) {
+Zt(Ue, "type", ie.UNIVER_SHEET);
+Zt(Ue, "pluginName", Pi);
+Ue = Ai([
+  Lt(xt),
+  Ft(1, T(re)),
+  Ft(2, $t)
+], Ue);
+var M = function() {
+  return M = 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;
-  }, P.apply(this, arguments);
-}, Ni = function(t, e) {
+  }, M.apply(this, arguments);
+}, wi = function(t, e) {
   var r = {};
   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, 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;
-}, Bt = wt(function(t, e) {
-  var r = t.icon, s = t.id, n = t.className, l = t.extend, i = Ni(t, ["icon", "id", "className", "extend"]), o = "univerjs-icon univerjs-icon-".concat(s, " ").concat(n || "").trim(), a = Jr("_".concat(yi()));
-  return Wt(r, "".concat(s), { defIds: r.defIds, idSuffix: a.current }, P({ ref: e, className: o }, i), l);
+}, ye = Ne(function(t, e) {
+  var r = t.icon, s = t.id, n = t.className, a = t.extend, i = wi(t, ["icon", "id", "className", "extend"]), o = "univerjs-icon univerjs-icon-".concat(s, " ").concat(n || "").trim(), l = ci("_".concat(Mi()));
+  return Kt(r, "".concat(s), { defIds: r.defIds, idSuffix: l.current }, M({ ref: e, className: o }, i), a);
 });
-function Wt(t, e, r, s, n) {
-  return Mt(t.tag, P(P({ key: e }, Fi(t, r, n)), s), (Ci(t, r).children || []).map(function(l, i) {
-    return Wt(l, "".concat(e, "-").concat(t.tag, "-").concat(i), r, void 0, n);
+function Kt(t, e, r, s, n) {
+  return Fe(t.tag, M(M({ key: e }, Li(t, r, n)), s), ($i(t, r).children || []).map(function(a, i) {
+    return Kt(a, "".concat(e, "-").concat(t.tag, "-").concat(i), r, void 0, n);
   }));
 }
-function Fi(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];
+function Li(t, e, r) {
+  var s = M({}, 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(a) {
+    var i = a[0], o = a[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" && s["xlink:href"] && (s["xlink:href"] = s["xlink:href"] + e.idSuffix), Object.entries(s).forEach(function(l) {
-    var i = l[0], o = l[1];
+  return !n || n.length === 0 || (t.tag === "use" && s["xlink:href"] && (s["xlink:href"] = s["xlink:href"] + e.idSuffix), Object.entries(s).forEach(function(a) {
+    var i = a[0], o = a[1];
     typeof o == "string" && (s[i] = o.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   })), s;
 }
-function Ci(t, e) {
+function $i(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.includes(n.attrs.id) ? P(P({}, n), { attrs: P(P({}, n.attrs), { id: n.attrs.id + e.idSuffix }) }) : n;
+  return !s || s.length === 0 ? t : t.tag === "defs" && (!((r = t.children) === null || r === void 0) && r.length) ? M(M({}, t), { children: t.children.map(function(n) {
+    return typeof n.attrs.id == "string" && s && s.includes(n.attrs.id) ? M(M({}, n), { attrs: M(M({}, n.attrs), { id: n.attrs.id + e.idSuffix }) }) : n;
   }) }) : t;
 }
-function yi() {
+function Mi() {
   return Math.random().toString(36).substring(2, 8);
 }
-Bt.displayName = "UniverIcon";
-var Oi = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", 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" } }] }, Qt = wt(function(t, e) {
-  return Mt(Bt, Object.assign({}, t, {
+ye.displayName = "UniverIcon";
+var xi = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 20 20", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M10 1.05957C10.356 1.05957 10.6816 1.26162 10.8408 1.58008L18.8408 17.5801L18.8799 17.668C19.0486 18.1134 18.8551 18.6232 18.4199 18.8408C17.9557 19.0727 17.3913 18.8841 17.1592 18.4199L10 4.10156L2.84082 18.4199C2.60871 18.8841 2.04434 19.0727 1.58008 18.8408C1.11587 18.6087 0.92731 18.0443 1.15918 17.5801L9.15918 1.58008C9.31841 1.26162 9.64395 1.05957 10 1.05957Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M15.3337 11.7261L15.4294 11.731C15.9035 11.779 16.2732 12.1798 16.2732 12.6665C16.2732 13.1532 15.9035 13.554 15.4294 13.602L15.3337 13.6069H4.66675C4.1476 13.6069 3.72632 13.1856 3.72632 12.6665C3.72632 12.1474 4.1476 11.7261 4.66675 11.7261H15.3337Z" } }] }, qt = Ne(function(t, e) {
+  return Fe(ye, Object.assign({}, t, {
+    id: "a-icon",
+    ref: e,
+    icon: xi
+  }));
+});
+qt.displayName = "AIcon";
+var Ui = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 20 20", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M17.0596 10C17.0596 6.10087 13.8992 2.94043 10 2.94043C6.10087 2.94043 2.94043 6.10087 2.94043 10C2.94043 13.8992 6.10087 17.0596 10 17.0596C13.8992 17.0596 17.0596 13.8992 17.0596 10ZM18.9404 10C18.9404 14.9374 14.9374 18.9404 10 18.9404C5.06257 18.9404 1.05957 14.9374 1.05957 10C1.05957 5.06257 5.06257 1.05957 10 1.05957C14.9374 1.05957 18.9404 5.06257 18.9404 10Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M4.29492 4.13476C4.63911 3.79057 5.1845 3.76906 5.55371 4.07031L5.625 4.13476L16.0244 14.5352L16.0889 14.6064C16.3902 14.9757 16.3686 15.52 16.0244 15.8643C15.6573 16.2313 15.0624 16.2313 14.6953 15.8643L4.29492 5.46484L4.23047 5.39355C3.92922 5.02434 3.95073 4.47895 4.29492 4.13476Z" } }] }, Xt = Ne(function(t, e) {
+  return Fe(ye, Object.assign({}, t, {
+    id: "ban-icon",
+    ref: e,
+    icon: Ui
+  }));
+});
+Xt.displayName = "BanIcon";
+var ki = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", 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" } }] }, zt = Ne(function(t, e) {
+  return Fe(ye, Object.assign({}, t, {
     id: "filter-icon",
     ref: e,
-    icon: Oi
+    icon: ki
+  }));
+});
+zt.displayName = "FilterIcon";
+var Hi = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M8 15C11.866 15 15 11.866 15 8C15 4.13401 11.866 1 8 1C4.13401 1 1 4.13401 1 8C1 11.866 4.13401 15 8 15ZM11.7245 6.42417C11.9588 6.18985 11.9588 5.80995 11.7245 5.57564C11.4901 5.34132 11.1102 5.34132 10.8759 5.57564L7.3002 9.15137L5.72446 7.57564C5.49014 7.34132 5.11025 7.34132 4.87593 7.57564C4.64162 7.80995 4.64162 8.18985 4.87593 8.42417L6.87593 10.4242C7.11025 10.6585 7.49014 10.6585 7.72446 10.4242L11.7245 6.42417Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Jt = Ne(function(t, e) {
+  return Fe(ye, Object.assign({}, t, {
+    id: "success-icon",
+    ref: e,
+    icon: Hi
   }));
 });
-Qt.displayName = "FilterIcon";
-function Ri(t) {
-  var p, T;
-  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 = Ii(r), a = D((v) => {
-    e.onPrimaryConditionChange(v);
-  }, [e]), c = Ai(r), h = D((v) => {
-    e.onConditionFormChange(v);
-  }, [e]), m = r.t("sheets-filter.panel.input-values-placeholder");
-  function g(v, C, N) {
-    const R = d.getItemByOperator(v).numOfParameters === 1;
-    return /* @__PURE__ */ b(ct, { children: [
-      N === "operator2" && /* @__PURE__ */ b(qr, { value: l, onChange: i, children: [
-        /* @__PURE__ */ S(lt, { value: "AND", children: r.t("sheets-filter.panel.and") }),
-        /* @__PURE__ */ S(lt, { value: "OR", children: r.t("sheets-filter.panel.or") })
+Jt.displayName = "SuccessIcon";
+function Di(t) {
+  const { model: e } = t, r = te(K), s = H(e.cellFillColors$, [], !0), n = H(e.cellTextColors$, [], !0), a = U((o) => {
+    e.onFilterCheckToggled(o);
+  }, [e]), i = U((o) => {
+    e.onFilterCheckToggled(o, !1);
+  }, [e]);
+  return /* @__PURE__ */ f(
+    "div",
+    {
+      "data-u-comp": "sheets-filter-panel-colors-container",
+      className: "univer-flex univer-h-full univer-min-h-[300px] univer-flex-col",
+      children: /* @__PURE__ */ I(
+        "div",
+        {
+          "data-u-comp": "sheets-filter-panel",
+          className: Ae("univer-mt-2 univer-box-border univer-flex univer-h-[300px] univer-flex-grow univer-flex-col univer-gap-4 univer-overflow-auto univer-rounded-md univer-px-2 univer-py-2.5", lt),
+          children: [
+            s.length > 1 && /* @__PURE__ */ I("div", { children: [
+              /* @__PURE__ */ f(
+                "div",
+                {
+                  className: "univer-mb-2 univer-text-sm univer-text-gray-900 dark:!univer-text-white",
+                  children: r.t("sheets-filter.panel.filter-by-cell-fill-color")
+                }
+              ),
+              /* @__PURE__ */ f(
+                "div",
+                {
+                  className: "univer-grid univer-grid-cols-8 univer-items-center univer-justify-start univer-gap-2",
+                  children: s.map((o, l) => /* @__PURE__ */ I(
+                    "div",
+                    {
+                      className: "univer-relative univer-h-6 univer-w-6",
+                      onClick: () => a(o),
+                      children: [
+                        o.color ? /* @__PURE__ */ f(
+                          "button",
+                          {
+                            type: "button",
+                            className: Ae("univer-box-border univer-h-6 univer-w-6 univer-cursor-pointer univer-rounded-full univer-border univer-border-solid univer-border-transparent univer-bg-gray-300 univer-transition-shadow hover:univer-ring-2 hover:univer-ring-offset-2 hover:univer-ring-offset-white"),
+                            style: { backgroundColor: o.color }
+                          }
+                        ) : /* @__PURE__ */ f(
+                          Xt,
+                          {
+                            className: "univer-h-6 univer-w-6 univer-cursor-pointer univer-rounded-full hover:univer-ring-2 hover:univer-ring-offset-2 hover:univer-ring-offset-white"
+                          }
+                        ),
+                        o.checked && /* @__PURE__ */ f(yt, {})
+                      ]
+                    },
+                    `sheets-filter-cell-fill-color-${l}`
+                  ))
+                }
+              )
+            ] }),
+            n.length > 1 && /* @__PURE__ */ I("div", { children: [
+              /* @__PURE__ */ f(
+                "div",
+                {
+                  className: "univer-mb-2 univer-text-sm univer-text-gray-900 dark:!univer-text-white",
+                  children: r.t("sheets-filter.panel.filter-by-cell-text-color")
+                }
+              ),
+              /* @__PURE__ */ f(
+                "div",
+                {
+                  className: "univer-grid univer-grid-cols-8 univer-items-center univer-justify-start univer-gap-2",
+                  children: n.map((o, l) => /* @__PURE__ */ I(
+                    "div",
+                    {
+                      className: "univer-relative univer-h-6 univer-w-6",
+                      onClick: () => i(o),
+                      children: [
+                        /* @__PURE__ */ f(
+                          "div",
+                          {
+                            className: "univer-box-border univer-flex univer-h-full univer-w-full univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-full univer-border univer-border-solid univer-border-[rgba(13,13,13,0.06)] univer-p-0.5 hover:univer-ring-2 hover:univer-ring-offset-2 hover:univer-ring-offset-white dark:!univer-border-[rgba(255,255,255,0.06)]",
+                            children: /* @__PURE__ */ f(qt, { style: { color: o.color } })
+                          }
+                        ),
+                        o.checked && /* @__PURE__ */ f(yt, {})
+                      ]
+                    },
+                    `sheets-filter-cell-text-color-${l}`
+                  ))
+                }
+              )
+            ] }),
+            s.length <= 1 && n.length <= 1 && /* @__PURE__ */ f(
+              "div",
+              {
+                className: "univer-flex univer-h-full univer-w-full univer-items-center univer-justify-center univer-text-sm univer-text-gray-900",
+                children: r.t("sheets-filter.panel.filter-by-color-none")
+              }
+            )
+          ]
+        }
+      )
+    }
+  );
+}
+function yt() {
+  return /* @__PURE__ */ f(
+    "div",
+    {
+      className: "univer-absolute -univer-bottom-0.5 -univer-right-0.5 univer-flex univer-h-3 univer-w-3 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-full univer-bg-white",
+      children: /* @__PURE__ */ f(
+        Jt,
+        {
+          className: "univer-h-full univer-w-full univer-font-bold univer-text-[#418F1F]"
+        }
+      )
+    }
+  );
+}
+function Bi(t) {
+  var v, _;
+  const { model: e } = t, r = te(K), s = H(e.conditionItem$, void 0), n = H(e.filterConditionFormParams$, void 0), a = n != null && n.and ? "AND" : "OR", i = U((S) => {
+    e.onConditionFormChange({ and: S === "AND" });
+  }, [e]), o = Wi(r), l = U((S) => {
+    e.onPrimaryConditionChange(S);
+  }, [e]), c = Qi(r), h = U((S) => {
+    e.onConditionFormChange(S);
+  }, [e]), d = r.t("sheets-filter.panel.input-values-placeholder");
+  function C(S, N, E) {
+    const b = m.getItemByOperator(S).numOfParameters === 1;
+    return /* @__PURE__ */ I(Ct, { children: [
+      E === "operator2" && /* @__PURE__ */ I(si, { value: a, onChange: i, children: [
+        /* @__PURE__ */ f(St, { value: "AND", children: r.t("sheets-filter.panel.and") }),
+        /* @__PURE__ */ f(St, { value: "OR", children: r.t("sheets-filter.panel.or") })
       ] }),
-      /* @__PURE__ */ S(
-        at,
+      /* @__PURE__ */ f(
+        gt,
         {
-          value: v,
+          value: S,
           options: c,
-          onChange: (O) => h({ [N]: O })
+          onChange: (F) => h({ [E]: F })
         }
       ),
-      R && /* @__PURE__ */ S("div", { children: /* @__PURE__ */ S(
-        Lt,
+      b && /* @__PURE__ */ f("div", { children: /* @__PURE__ */ f(
+        Wt,
         {
           className: "univer-mt-2",
-          value: C,
-          placeholder: m,
-          onChange: (O) => h({ [N === "operator1" ? "val1" : "val2"]: O })
+          value: N,
+          placeholder: d,
+          onChange: (F) => h({ [E === "operator1" ? "val1" : "val2"]: F })
         }
       ) })
     ] });
   }
-  return /* @__PURE__ */ S(
+  return /* @__PURE__ */ f(
     "div",
     {
       "data-u-comp": "sheets-filter-panel-conditions-container",
       className: "univer-flex univer-h-full univer-min-h-[300px] univer-flex-col",
-      children: s && n && /* @__PURE__ */ b(ct, { children: [
-        /* @__PURE__ */ S(at, { value: s.operator, options: o, onChange: a }),
-        d.getItemByOperator(s.operator).numOfParameters !== 0 ? /* @__PURE__ */ b(
+      children: s && n && /* @__PURE__ */ I(Ct, { children: [
+        /* @__PURE__ */ f(gt, { value: s.operator, options: o, onChange: l }),
+        m.getItemByOperator(s.operator).numOfParameters !== 0 ? /* @__PURE__ */ I(
           "div",
           {
             "data-u-comp": "sheets-filter-panel-conditions-container-inner",
-            className: Pt("univer-mt-2 univer-flex-grow univer-overflow-hidden univer-rounded-md univer-p-2", bt),
+            className: Ae("univer-mt-2 univer-flex-grow univer-overflow-hidden univer-rounded-md univer-p-2", lt),
             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(
+              s.numOfParameters >= 1 && C(n.operator1, (v = n.val1) != null ? v : "", "operator1"),
+              s.numOfParameters >= 2 && C(n.operator2, (_ = n.val2) != null ? _ : "", "operator2"),
+              /* @__PURE__ */ I(
                 "div",
                 {
                   "data-u-comp": "sheets-filter-panel-conditions-desc",
                   className: "univer-mt-2 univer-text-xs univer-text-gray-500",
                   children: [
                     r.t("sheets-filter.panel.?"),
-                    /* @__PURE__ */ S("br", {}),
+                    /* @__PURE__ */ f("br", {}),
                     r.t("sheets-filter.panel.*")
                   ]
                 }
@@ -1483,106 +1788,106 @@ function Ri(t) {
     }
   );
 }
-function Ii(t) {
+function Wi(t) {
   const e = t.getCurrentLocale();
-  return ze(() => [
+  return at(() => [
     {
       options: [
-        { label: t.t(d.NONE.label), value: d.NONE.operator }
+        { label: t.t(m.NONE.label), value: m.NONE.operator }
       ]
     },
     {
       options: [
-        { label: t.t(d.EMPTY.label), value: d.EMPTY.operator },
-        { label: t.t(d.NOT_EMPTY.label), value: d.NOT_EMPTY.operator }
+        { label: t.t(m.EMPTY.label), value: m.EMPTY.operator },
+        { label: t.t(m.NOT_EMPTY.label), value: m.NOT_EMPTY.operator }
       ]
     },
     {
       options: [
-        { label: t.t(d.TEXT_CONTAINS.label), value: d.TEXT_CONTAINS.operator },
-        { label: t.t(d.DOES_NOT_CONTAIN.label), value: d.DOES_NOT_CONTAIN.operator },
-        { label: t.t(d.STARTS_WITH.label), value: d.STARTS_WITH.operator },
-        { label: t.t(d.ENDS_WITH.label), value: d.ENDS_WITH.operator },
-        { label: t.t(d.EQUALS.label), value: d.EQUALS.operator }
+        { label: t.t(m.TEXT_CONTAINS.label), value: m.TEXT_CONTAINS.operator },
+        { label: t.t(m.DOES_NOT_CONTAIN.label), value: m.DOES_NOT_CONTAIN.operator },
+        { label: t.t(m.STARTS_WITH.label), value: m.STARTS_WITH.operator },
+        { label: t.t(m.ENDS_WITH.label), value: m.ENDS_WITH.operator },
+        { label: t.t(m.EQUALS.label), value: m.EQUALS.operator }
       ]
     },
     {
       options: [
-        { label: t.t(d.GREATER_THAN.label), value: d.GREATER_THAN.operator },
-        { label: t.t(d.GREATER_THAN_OR_EQUAL.label), value: d.GREATER_THAN_OR_EQUAL.operator },
-        { label: t.t(d.LESS_THAN.label), value: d.LESS_THAN.operator },
-        { label: t.t(d.LESS_THAN_OR_EQUAL.label), value: d.LESS_THAN_OR_EQUAL.operator },
-        { label: t.t(d.EQUAL.label), value: d.EQUAL.operator },
-        { label: t.t(d.NOT_EQUAL.label), value: d.NOT_EQUAL.operator },
-        { label: t.t(d.BETWEEN.label), value: d.BETWEEN.operator },
-        { label: t.t(d.NOT_BETWEEN.label), value: d.NOT_BETWEEN.operator }
+        { label: t.t(m.GREATER_THAN.label), value: m.GREATER_THAN.operator },
+        { label: t.t(m.GREATER_THAN_OR_EQUAL.label), value: m.GREATER_THAN_OR_EQUAL.operator },
+        { label: t.t(m.LESS_THAN.label), value: m.LESS_THAN.operator },
+        { label: t.t(m.LESS_THAN_OR_EQUAL.label), value: m.LESS_THAN_OR_EQUAL.operator },
+        { label: t.t(m.EQUAL.label), value: m.EQUAL.operator },
+        { label: t.t(m.NOT_EQUAL.label), value: m.NOT_EQUAL.operator },
+        { label: t.t(m.BETWEEN.label), value: m.BETWEEN.operator },
+        { label: t.t(m.NOT_BETWEEN.label), value: m.NOT_BETWEEN.operator }
       ]
     },
     {
       options: [
-        { label: t.t(d.CUSTOM.label), value: d.CUSTOM.operator }
+        { label: t.t(m.CUSTOM.label), value: m.CUSTOM.operator }
       ]
     }
   ], [e, t]);
 }
-function Ai(t) {
+function Qi(t) {
   const e = t.getCurrentLocale();
-  return ze(() => d.ALL_CONDITIONS.filter((r) => r.numOfParameters !== 2).map((r) => ({ label: t.t(r.label), value: r.operator })), [e, t]);
+  return at(() => m.ALL_CONDITIONS.filter((r) => r.numOfParameters !== 2).map((r) => ({ label: t.t(r.label), value: r.operator })), [e, t]);
 }
-function Pi(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(() => {
+function Vi(t) {
+  const { model: e } = t, r = te(K), s = H(e.searchString$, "", !0), n = H(e.filterItems$, void 0, !0), a = r.t("sheets-filter.panel.filter-only"), i = qe(n), o = i.checked > 0 && i.unchecked === 0, l = i.checked > 0 && i.unchecked > 0, c = e.treeMapCache, h = U(() => {
     e.onCheckAllToggled(!o);
-  }, [e, o]), m = D((p) => {
-    e.setSearchString(p);
+  }, [e, o]), d = U((v) => {
+    e.setSearchString(v);
   }, [e]);
-  function g(p) {
-    let T = [];
-    return p.forEach((v) => {
-      v.checked && T.push(v.key), v.children && (T = T.concat(g(v.children)));
-    }), T;
+  function C(v) {
+    let _ = [];
+    return v.forEach((S) => {
+      S.checked && _.push(S.key), S.children && (_ = _.concat(C(S.children)));
+    }), _;
   }
-  return /* @__PURE__ */ b(
+  return /* @__PURE__ */ I(
     "div",
     {
       "data-u-comp": "sheets-filter-panel-values-container",
       className: "univer-flex univer-h-full univer-min-h-[300px] univer-flex-col",
       children: [
-        /* @__PURE__ */ S(
-          Lt,
+        /* @__PURE__ */ f(
+          Wt,
           {
             autoFocus: !0,
             value: s,
             placeholder: r.t("sheets-filter.panel.search-placeholder"),
-            onChange: m
+            onChange: d
           }
         ),
-        /* @__PURE__ */ b(
+        /* @__PURE__ */ I(
           "div",
           {
             "data-u-comp": "sheets-filter-panel",
-            className: Pt("univer-mt-2 univer-box-border univer-flex univer-flex-grow univer-flex-col univer-overflow-hidden univer-rounded-md univer-px-2 univer-py-2.5", bt),
+            className: Ae("univer-mt-2 univer-box-border univer-flex univer-flex-grow univer-flex-col univer-overflow-hidden univer-rounded-md univer-px-2 univer-py-2.5", lt),
             children: [
-              /* @__PURE__ */ S(
+              /* @__PURE__ */ f(
                 "div",
                 {
                   "data-u-comp": "sheets-filter-panel-values-item",
                   className: "univer-box-border univer-h-8 univer-w-full univer-py-0.5",
-                  children: /* @__PURE__ */ b(
+                  children: /* @__PURE__ */ I(
                     "div",
                     {
                       "data-u-comp": "sheets-filter-panel-values-item-inner",
                       className: "univer-box-border univer-flex univer-h-7 univer-items-center univer-rounded-md univer-pb-0 univer-pl-5 univer-pr-0.5 univer-pt-0 univer-text-sm",
                       children: [
-                        /* @__PURE__ */ S(
-                          Kr,
+                        /* @__PURE__ */ f(
+                          ni,
                           {
-                            indeterminate: a,
+                            indeterminate: l,
                             disabled: n.length === 0,
                             checked: o,
                             onChange: h
                           }
                         ),
-                        /* @__PURE__ */ S(
+                        /* @__PURE__ */ f(
                           "span",
                           {
                             "data-u-comp": "sheets-filter-panel-values-item-text",
@@ -1590,7 +1895,7 @@ function Pi(t) {
                             children: `${r.t("sheets-filter.panel.select-all")}`
                           }
                         ),
-                        /* @__PURE__ */ S(
+                        /* @__PURE__ */ f(
                           "span",
                           {
                             "data-u-comp": "sheets-filter-panel-values-item-count",
@@ -1603,14 +1908,14 @@ function Pi(t) {
                   )
                 }
               ),
-              /* @__PURE__ */ S("div", { "data-u-comp": "sheets-filter-panel-values-virtual", className: "univer-flex-grow", children: /* @__PURE__ */ S(
-                Xr,
+              /* @__PURE__ */ f("div", { "data-u-comp": "sheets-filter-panel-values-virtual", className: "univer-flex-grow", children: /* @__PURE__ */ f(
+                oi,
                 {
                   data: n,
                   defaultExpandAll: !1,
-                  valueGroup: g(n),
-                  onChange: (p) => {
-                    e.onFilterCheckToggled(p);
+                  valueGroup: C(n),
+                  onChange: (v) => {
+                    e.onFilterCheckToggled(v);
                   },
                   defaultCache: c,
                   itemHeight: 28,
@@ -1621,32 +1926,32 @@ function Pi(t) {
                           univer-text-gray-900 dark:hover:!univer-bg-gray-900
                           dark:!univer-text-white
                         `,
-                  attachRender: (p) => /* @__PURE__ */ b(
+                  attachRender: (v) => /* @__PURE__ */ I(
                     "div",
                     {
                       className: "univer-ml-1 univer-flex univer-h-5 univer-flex-1 univer-cursor-pointer univer-items-center univer-justify-between univer-text-sm univer-text-primary-500",
                       children: [
-                        /* @__PURE__ */ S(
+                        /* @__PURE__ */ f(
                           "span",
                           {
                             "data-u-comp": "sheets-filter-panel-values-item-count",
                             className: "univer-text-gray-400 dark:!univer-text-gray-500",
-                            children: `(${p.count})`
+                            children: `(${v.count})`
                           }
                         ),
-                        /* @__PURE__ */ S(
+                        /* @__PURE__ */ f(
                           "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((v) => {
-                                v.children ? v.children.forEach((C) => {
-                                  T.push(C.key);
-                                }) : T.push(v.key);
-                              }) : T.push(p.key), e.onFilterOnly(T);
+                              const _ = [];
+                              v.children ? v.children.forEach((S) => {
+                                S.children ? S.children.forEach((N) => {
+                                  _.push(N.key);
+                                }) : _.push(S.key);
+                              }) : _.push(v.key), e.onFilterOnly(_);
                             },
-                            children: l
+                            children: a
                           }
                         )
                       ]
@@ -1661,56 +1966,56 @@ function Pi(t) {
     }
   );
 }
-function bi() {
-  var C;
-  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 = Li(e), o = !B(t.hasCriteria$), a = D((N) => {
-    r.executeCommand(Dt.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 = (C = te(V).activeFilterModel) == null ? void 0 : C.getRange(), T = t.col, v = ur(Cr.FILTER_PANEL_EMBED_POINT);
-  return /* @__PURE__ */ b(
+function ji() {
+  var N;
+  const t = te(Z), e = te(K), r = te(j), s = H(t.filterBy$, void 0, !0), n = H(t.filterByModel$, void 0, !1), a = H(() => (n == null ? void 0 : n.canApply$) || me(!1), void 0, !1, [n]), i = Gi(e), o = !H(t.hasCriteria$), l = U((E) => {
+    r.executeCommand(Gt.id, { filterBy: E });
+  }, [r]), c = U(async () => {
+    await (n == null ? void 0 : n.clear()), r.executeCommand(Se.id);
+  }, [n, r]), h = U(() => {
+    r.executeCommand(Se.id);
+  }, [r]), d = U(async () => {
+    await (n == null ? void 0 : n.apply()), r.executeCommand(Se.id);
+  }, [n, r]), v = (N = te(q).activeFilterModel) == null ? void 0 : N.getRange(), _ = t.col, S = Pr(yr.FILTER_PANEL_EMBED_POINT);
+  return /* @__PURE__ */ I(
     "div",
     {
       "data-u-comp": "sheets-filter-panel",
-      className: "univer-box-border univer-flex univer-max-h-[500px] univer-w-[312px] univer-flex-col univer-rounded-lg univer-bg-white univer-p-4 univer-shadow-lg dark:!univer-border-gray-600 dark:!univer-bg-gray-700",
+      className: "univer-box-border univer-flex univer-max-h-[500px] univer-w-[400px] univer-flex-col univer-rounded-lg univer-bg-white univer-p-4 univer-shadow-lg dark:!univer-border-gray-600 dark:!univer-bg-gray-700",
       children: [
-        /* @__PURE__ */ S(
-          hr,
+        /* @__PURE__ */ f(
+          wr,
           {
-            components: v,
-            sharedProps: { range: p, colIndex: T, onClose: h }
+            components: S,
+            sharedProps: { range: v, colIndex: _, onClose: h }
           }
         ),
-        /* @__PURE__ */ S("div", { className: "univer-mb-1 univer-flex-shrink-0 univer-flex-grow-0", children: /* @__PURE__ */ S(
-          Zr,
+        /* @__PURE__ */ f("div", { className: "univer-mb-1 univer-flex-shrink-0 univer-flex-grow-0", children: /* @__PURE__ */ f(
+          li,
           {
             value: s,
             items: i,
-            onChange: (N) => a(N)
+            onChange: (E) => l(E)
           }
         ) }),
-        n ? /* @__PURE__ */ S(
+        n ? /* @__PURE__ */ f(
           "div",
           {
             "data-u-comp": "sheets-filter-panel-content",
             className: "univer-flex-shrink univer-flex-grow univer-pt-2",
-            children: s === Ce.VALUES ? /* @__PURE__ */ S(Pi, { model: n }) : /* @__PURE__ */ S(Ri, { model: n })
+            children: s === A.VALUES ? /* @__PURE__ */ f(Vi, { model: n }) : s === A.COLORS ? /* @__PURE__ */ f(Di, { model: n }) : /* @__PURE__ */ f(Bi, { model: n })
           }
-        ) : /* @__PURE__ */ S("div", { className: "univer-flex-1" }),
-        /* @__PURE__ */ b(
+        ) : /* @__PURE__ */ f("div", { className: "univer-flex-1" }),
+        /* @__PURE__ */ I(
           "div",
           {
             "data-u-comp": "sheets-filter-panel-footer",
             className: "univer-mt-4 univer-inline-flex univer-flex-shrink-0 univer-flex-grow-0 univer-flex-nowrap univer-justify-between univer-overflow-hidden",
             children: [
-              /* @__PURE__ */ S(Ue, { variant: "link", onClick: c, disabled: o, children: e.t("sheets-filter.panel.clear-filter") }),
-              /* @__PURE__ */ b("span", { className: "univer-flex univer-gap-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") })
+              /* @__PURE__ */ f(Ge, { variant: "link", onClick: c, disabled: o, children: e.t("sheets-filter.panel.clear-filter") }),
+              /* @__PURE__ */ I("span", { className: "univer-flex univer-gap-2", children: [
+                /* @__PURE__ */ f(Ge, { variant: "default", onClick: h, children: e.t("sheets-filter.panel.cancel") }),
+                /* @__PURE__ */ f(Ge, { disabled: !a, variant: "primary", onClick: d, children: e.t("sheets-filter.panel.confirm") })
               ] })
             ]
           }
@@ -1719,135 +2024,136 @@ function bi() {
     }
   );
 }
-function Li(t) {
+function Gi(t) {
   const e = t.getCurrentLocale();
-  return ze(() => [
-    { label: t.t("sheets-filter.panel.by-values"), value: Ce.VALUES },
-    { label: t.t("sheets-filter.panel.by-conditions"), value: Ce.CONDITIONS }
+  return at(() => [
+    { label: t.t("sheets-filter.panel.by-values"), value: A.VALUES },
+    { label: t.t("sheets-filter.panel.by-colors"), value: A.COLORS },
+    { label: t.t("sheets-filter.panel.by-conditions"), value: A.CONDITIONS }
   ], [e, t]);
 }
-function wi(t) {
-  const e = t.get(V);
+function Yi(t) {
+  const e = t.get(q);
   return {
-    id: pe.id,
-    type: Xe.BUTTON_SELECTOR,
+    id: Ee.id,
+    type: nt.BUTTON_SELECTOR,
     icon: "FilterIcon",
     tooltip: "sheets-filter.toolbar.smart-toggle-filter-tooltip",
-    hidden$: Ke(t, Z.UNIVER_SHEET),
-    activated$: e.activeFilterModel$.pipe(ie((r) => !!r)),
-    disabled$: yr(
+    hidden$: st(t, ie.UNIVER_SHEET),
+    activated$: e.activeFilterModel$.pipe(ce((r) => !!r)),
+    disabled$: Or(
       t,
-      Or(
+      Ir(
         t,
         {
-          worksheetTypes: [ae, le],
-          rangeTypes: [ce]
+          worksheetTypes: [pe, ve],
+          rangeTypes: [_e]
         }
       )
     )
   };
 }
-function Mi(t) {
-  const e = t.get(V);
+function Zi(t) {
+  const e = t.get(q);
   return {
-    id: qe.id,
-    type: Xe.BUTTON,
+    id: it.id,
+    type: nt.BUTTON,
     title: "sheets-filter.toolbar.clear-filter-criteria",
-    hidden$: Ke(t, Z.UNIVER_SHEET),
-    disabled$: e.activeFilterModel$.pipe(Ze((r) => {
+    hidden$: st(t, ie.UNIVER_SHEET),
+    disabled$: e.activeFilterModel$.pipe(ot((r) => {
       var s;
-      return (s = r == null ? void 0 : r.hasCriteria$.pipe(ie((n) => !n))) != null ? s : fe(!0);
+      return (s = r == null ? void 0 : r.hasCriteria$.pipe(ce((n) => !n))) != null ? s : me(!0);
     }))
   };
 }
-function $i(t) {
-  const e = t.get(V);
+function Ki(t) {
+  const e = t.get(q);
   return {
-    id: Ye.id,
-    type: Xe.BUTTON,
+    id: rt.id,
+    type: nt.BUTTON,
     title: "sheets-filter.toolbar.re-calc-filter-conditions",
-    hidden$: Ke(t, Z.UNIVER_SHEET),
-    disabled$: e.activeFilterModel$.pipe(Ze((r) => {
+    hidden$: st(t, ie.UNIVER_SHEET),
+    disabled$: e.activeFilterModel$.pipe(ot((r) => {
       var s;
-      return (s = r == null ? void 0 : r.hasCriteria$.pipe(ie((n) => !n))) != null ? s : fe(!0);
+      return (s = r == null ? void 0 : r.hasCriteria$.pipe(ce((n) => !n))) != null ? s : me(!0);
     }))
   };
 }
-const Ui = {
-  [dr.ORGANIZATION]: {
-    [pe.id]: {
+const qi = {
+  [Lr.ORGANIZATION]: {
+    [Ee.id]: {
       order: 2,
-      menuItemFactory: wi,
-      [qe.id]: {
+      menuItemFactory: Yi,
+      [it.id]: {
         order: 0,
-        menuItemFactory: Mi
+        menuItemFactory: Zi
       },
-      [Ye.id]: {
+      [rt.id]: {
         order: 1,
-        menuItemFactory: $i
+        menuItemFactory: Ki
       }
     }
   }
-}, Hi = {
-  id: pe.id,
-  binding: mr.L | nt.CTRL_COMMAND | nt.SHIFT,
+}, Xi = {
+  id: Ee.id,
+  binding: $r.L | pt.CTRL_COMMAND | pt.SHIFT,
   description: "sheets-filter.shortcut.smart-toggle-filter",
-  preconditions: Rr,
+  preconditions: br,
   group: "4_sheet-edit"
 };
-var Di = Object.getOwnPropertyDescriptor, ki = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? Di(e, r) : e, l = t.length - 1, i; l >= 0; l--)
-    (i = t[l]) && (n = i(n) || n);
+var zi = Object.getOwnPropertyDescriptor, Ji = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? zi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (n = i(n) || n);
   return n;
-}, A = (t, e) => (r, s) => e(r, s, t);
-const pt = "FILTER_PANEL_POPUP";
-let Pe = class extends de {
-  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 = 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();
+}, P = (t, e) => (r, s) => e(r, s, t);
+const Ot = "FILTER_PANEL_POPUP";
+let ke = class extends Te {
+  constructor(e, r, s, n, a, i, o, l, c, h, d, C, v) {
+    super(v, C);
+    p(this, "_popupDisposable");
+    this._injector = e, this._componentManager = r, this._sheetsFilterPanelService = s, this._sheetCanvasPopupService = n, this._sheetsFilterService = a, this._localeService = i, this._shortcutService = o, this._commandService = l, this._menuManagerService = c, this._contextService = h, this._messageService = d, this._initCommands(), this._initShortcuts(), this._initMenuItems(), this._initUI();
   }
   dispose() {
     super.dispose(), this._closeFilterPopup();
   }
   _initShortcuts() {
     [
-      Hi
+      Xi
     ].forEach((e) => {
       this.disposeWithMe(this._shortcutService.registerShortcut(e));
     });
   }
   _initCommands() {
     [
-      pe,
-      ar,
-      lr,
-      re,
-      qe,
-      Ye,
-      Dt,
-      Re,
-      he
+      Ee,
+      _r,
+      gr,
+      Q,
+      it,
+      rt,
+      Gt,
+      Me,
+      Se
     ].forEach((e) => {
       this.disposeWithMe(this._commandService.registerCommand(e));
     });
   }
   _initMenuItems() {
-    this._menuManagerService.mergeMenu(Ui);
+    this._menuManagerService.mergeMenu(qi);
   }
   _initUI() {
     [
-      [pt, bi],
-      ["FilterIcon", Qt]
+      [Ot, ji],
+      ["FilterIcon", zt]
     ].forEach(([e, r]) => {
       this.disposeWithMe(
         this._componentManager.register(e, r)
       );
-    }), this.disposeWithMe(this._contextService.subscribeContextValue$(se).pipe(Vr()).subscribe((e) => {
+    }), this.disposeWithMe(this._contextService.subscribeContextValue$(ue).pipe(ti()).subscribe((e) => {
       e ? this._openFilterPopup() : this._closeFilterPopup();
     })), this.disposeWithMe(this._sheetsFilterService.errorMsg$.subscribe((e) => {
       e && this._messageService.show({
-        type: zr.Error,
+        type: ai.Error,
         content: this._localeService.t(e)
       });
     }));
@@ -1858,9 +2164,9 @@ let Pe = class extends de {
       throw new Error("[SheetsFilterUIController]: no filter model when opening filter popup!");
     const r = e.getRange(), s = this._sheetsFilterPanelService.col, { startRow: n } = r;
     this._popupDisposable = this._sheetCanvasPopupService.attachPopupToCell(n, s, {
-      componentKey: pt,
+      componentKey: Ot,
       direction: "horizontal",
-      onClickOutside: () => this._commandService.syncExecuteCommand(he.id),
+      onClickOutside: () => this._commandService.syncExecuteCommand(Se.id),
       offset: [5, 0]
     });
   }
@@ -1869,97 +2175,97 @@ let Pe = class extends de {
     (e = this._popupDisposable) == null || e.dispose(), this._popupDisposable = null;
   }
 };
-Pe = ki([
-  A(0, E(X)),
-  A(1, E(pr)),
-  A(2, E(W)),
-  A(3, E(Ir)),
-  A(4, E(V)),
-  A(5, E(K)),
-  A(6, fr),
-  A(7, Q),
-  A(8, _r),
-  A(9, we),
-  A(10, vr),
-  A(11, E(yt)),
-  A(12, It)
-], Pe);
-var xi = Object.defineProperty, Bi = Object.getOwnPropertyDescriptor, Wi = (t, e, r) => e in t ? xi(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Qi = (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);
+ke = Ji([
+  P(0, T(re)),
+  P(1, T(Mr)),
+  P(2, T(Z)),
+  P(3, T(Rr)),
+  P(4, T(q)),
+  P(5, T(K)),
+  P(6, xr),
+  P(7, j),
+  P(8, Ur),
+  P(9, We),
+  P(10, kr),
+  P(11, T(Ut)),
+  P(12, kt)
+], ke);
+var es = Object.defineProperty, ts = Object.getOwnPropertyDescriptor, rs = (t, e, r) => e in t ? es(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, is = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? ts(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (n = i(n) || n);
   return n;
-}, ke = (t, e) => (r, s) => e(r, s, t), Vt = (t, e, r) => Wi(t, typeof e != "symbol" ? e + "" : e, r);
-const Vi = "SHEET_FILTER_UI_PLUGIN";
-let be = class extends je {
-  constructor(t = Ie, e, r, s) {
+}, Ke = (t, e) => (r, s) => e(r, s, t), er = (t, e, r) => rs(t, typeof e != "symbol" ? e + "" : e, r);
+const ss = "SHEET_FILTER_UI_PLUGIN";
+let He = class extends tt {
+  constructor(t = xe, e, r, s) {
     super(), this._config = t, this._injector = e, this._configService = r, this._rpcChannelService = s;
-    const { menu: n, ...l } = Ft(
+    const { menu: n, ...a } = Mt(
       {},
-      Ie,
+      xe,
       this._config
     );
-    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig(kt, l);
+    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig(Yt, a);
   }
   onStarting() {
-    tr(this._injector, [
-      [W],
-      [ne],
-      [Pe]
-    ]), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([Ne, {
-      useFactory: () => jr(
-        this._rpcChannelService.requestChannel(Je)
+    hr(this._injector, [
+      [Z],
+      [he],
+      [ke]
+    ]), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([Pe, {
+      useFactory: () => ri(
+        this._rpcChannelService.requestChannel(ct)
       )
     }]);
   }
   onReady() {
-    st(this._injector, [
-      [ne]
+    ft(this._injector, [
+      [he]
     ]);
   }
   onRendered() {
-    st(this._injector, [
-      [Pe]
+    ft(this._injector, [
+      [ke]
     ]);
   }
 };
-Vt(be, "type", Z.UNIVER_SHEET);
-Vt(be, "pluginName", Vi);
-be = Qi([
-  Tt(Ct),
-  ke(1, E(X)),
-  ke(2, Nt),
-  ke(3, er(At))
-], be);
-var Gi = Object.getOwnPropertyDescriptor, ji = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? Gi(e, r) : e, l = t.length - 1, i; l >= 0; l--)
-    (i = t[l]) && (n = i(n) || n);
+er(He, "type", ie.UNIVER_SHEET);
+er(He, "pluginName", ss);
+He = is([
+  Lt(xt),
+  Ke(1, T(re)),
+  Ke(2, $t),
+  Ke(3, ur(Bt))
+], He);
+var ns = Object.getOwnPropertyDescriptor, os = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? ns(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (n = i(n) || n);
   return n;
-}, ft = (t, e) => (r, s) => e(r, s, t), Ee;
-let _t = (Ee = class extends je {
+}, It = (t, e) => (r, s) => e(r, s, t), be;
+let bt = (be = class extends tt {
   constructor(t, e, r) {
     super(), this._config = t, this._injector = e, this._rpcChannelService = r;
   }
   onStarting() {
     [
-      [Ne, { useClass: Be }]
+      [Pe, { useClass: Xe }]
     ].forEach((t) => this._injector.add(t));
   }
   onReady() {
     this._rpcChannelService.registerChannel(
-      Je,
-      Yr(this._injector.get(Ne))
+      ct,
+      ii(this._injector.get(Pe))
     );
   }
-}, f(Ee, "type", Z.UNIVER_SHEET), f(Ee, "pluginName", "SHEET_FILTER_UI_WORKER_PLUGIN"), Ee);
-_t = ji([
-  ft(1, E(X)),
-  ft(2, At)
-], _t);
+}, p(be, "type", ie.UNIVER_SHEET), p(be, "pluginName", "SHEET_FILTER_UI_WORKER_PLUGIN"), be);
+bt = os([
+  It(1, T(re)),
+  It(2, Bt)
+], bt);
 export {
-  Dt as ChangeFilterByOperation,
-  he as CloseFilterPanelOperation,
-  Re as OpenFilterPanelOperation,
-  Ae as UniverSheetsFilterMobileUIPlugin,
-  be as UniverSheetsFilterUIPlugin,
-  _t as UniverSheetsFilterUIWorkerPlugin
+  Gt as ChangeFilterByOperation,
+  Se as CloseFilterPanelOperation,
+  Me as OpenFilterPanelOperation,
+  Ue as UniverSheetsFilterMobileUIPlugin,
+  He as UniverSheetsFilterUIPlugin,
+  bt as UniverSheetsFilterUIWorkerPlugin
 };