@univerjs/sheets-filter-ui 0.10.3-nightly.202508121228 → 0.10.3-nightly.202508150623

package/lib/es/index.js

@@ -1,17 +1,17 @@
-var sr = Object.defineProperty;
-var or = (t, e, r) => e in t ? sr(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
+var nr = Object.defineProperty;
+var or = (t, e, r) => e in t ? nr(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
 var v = (t, e, r) => or(t, typeof e != "symbol" ? e + "" : e, r);
-import { BooleanNumber as mt, createIdentifier as Pt, Inject as T, LocaleService as X, IUniverInstanceService as Be, ILogService as lr, extractPureTextFromCell as ar, numfmt as ft, Disposable as de, Injector as ie, Quantity as wt, Tools as Re, ColorKit as pt, ICommandService as j, CommandType as We, IContextService as Ve, ThemeService as Lt, RxDisposable as Mt, fromCallback as cr, VerticalAlign as Ae, InterceptorEffectEnum as ur, UniverInstanceType as ne, DependentOn as $t, IConfigService as xt, Plugin as it, merge as Ut, Optional as hr, registerDependencies as dr, touchDependencies as vt } from "@univerjs/core";
-import { CustomFilterOperator as u, FilterBy as w, SetSheetsFilterCriteriaCommand as V, SheetsFilterService as z, SmartToggleSheetsFilterCommand as Fe, FILTER_MUTATIONS as mr, SetSheetsFilterRangeMutation as fr, SetSheetsFilterCriteriaMutation as pr, RemoveSheetsFilterMutation as vr, ReCalcSheetsFilterMutation as _r, UniverSheetsFilterPlugin as kt, ReCalcSheetsFilterCommand as nt, ClearSheetsFilterCriteriaCommand as st, RemoveSheetFilterCommand as gr, SetSheetFilterRangeCommand as Sr } from "@univerjs/sheets-filter";
-import { SetCellEditVisibleOperation as Cr, SheetSkeletonManagerService as Tr, ISheetSelectionRenderService as Er, SelectionControl as Fr, attachSelectionWithCoord as Nr, getCoordByCell as yr, SheetsRenderService as Ht, SheetsUIPart as Or, getObservableWithExclusiveRange$ as Ir, getCurrentRangeDisable$ as br, whenSheetEditorFocused as Rr, SheetCanvasPopManagerService as Ar } from "@univerjs/sheets-ui";
+import { BooleanNumber as mt, createIdentifier as Pt, Inject as T, LocaleService as X, IUniverInstanceService as Be, ILogService as lr, extractPureTextFromCell as ar, numfmt as ft, Disposable as de, Injector as ie, Quantity as wt, Tools as Re, ColorKit as pt, ICommandService as j, CommandType as We, IContextService as Qe, ThemeService as Lt, RxDisposable as Mt, fromCallback as cr, VerticalAlign as Ae, InterceptorEffectEnum as ur, UniverInstanceType as se, DependentOn as $t, IConfigService as xt, Plugin as it, merge as Ut, Optional as hr, registerDependencies as dr, touchDependencies as vt } from "@univerjs/core";
+import { CustomFilterOperator as u, FilterBy as w, SetSheetsFilterCriteriaCommand as Q, SheetsFilterService as z, SmartToggleSheetsFilterCommand as Ne, FILTER_MUTATIONS as mr, SetSheetsFilterRangeMutation as fr, SetSheetsFilterCriteriaMutation as pr, RemoveSheetsFilterMutation as vr, ReCalcSheetsFilterMutation as _r, UniverSheetsFilterPlugin as kt, ReCalcSheetsFilterCommand as st, ClearSheetsFilterCriteriaCommand as nt, RemoveSheetFilterCommand as gr, SetSheetFilterRangeCommand as Sr } from "@univerjs/sheets-filter";
+import { SetCellEditVisibleOperation as Cr, SheetSkeletonManagerService as Tr, ISheetSelectionRenderService as Er, SelectionControl as Nr, attachSelectionWithCoord as Fr, getCoordByCell as yr, SheetsRenderService as Ht, SheetsUIPart as Or, getObservableWithExclusiveRange$ as Ir, getCurrentRangeDisable$ as br, whenSheetEditorFocused as Rr, SheetCanvasPopManagerService as Ar } from "@univerjs/sheets-ui";
 import { ILayoutService as Pr, useDependency as re, useObservable as D, useComponentsOfPart as wr, ComponentContainer as Lr, getMenuHiddenObservable as ot, MenuItemType as lt, RibbonDataGroup as Mr, KeyCode as $r, MetaKeys as _t, ComponentManager as xr, IShortcutService as Ur, IMenuManagerService as kr, IMessageService as Hr } from "@univerjs/ui";
 import { COLOR_BLACK_RGB as gt, Rect as St, Shape as Dr, IRenderManagerService as Dt } from "@univerjs/engine-render";
-import { RefRangeService as Br, SheetPermissionCheckController as Wr, SheetsSelectionsService as Vr, getSheetCommandTarget as Qr, WorksheetFilterPermission as pe, WorksheetViewPermission as ve, RangeProtectionPermissionViewPoint as _e, expandToContinuousRange as jr, SheetInterceptorService as Gr, SetRangeValuesMutation as Yr, SetVerticalTextAlignCommand as Zr, INTERCEPTOR_POINT as Kr } from "@univerjs/sheets";
-import { BehaviorSubject as Q, ReplaySubject as qr, Subject as Xr, merge as zr, combineLatest as Jr, throttleTime as Bt, startWith as Wt, map as ce, shareReplay as ei, of as me, switchMap as at, filter as ti, takeUntil as ri, distinctUntilChanged as ii } from "rxjs";
-import { IRPCChannelService as Vt, toModule as ni, fromModule as si } from "@univerjs/rpc";
-import { clsx as Pe, borderClassName as ct, Select as Ct, RadioGroup as oi, Radio as Tt, Input as Qt, Checkbox as li, Tree as ai, Segmented as ci, Button as Ze, MessageType as ui } from "@univerjs/design";
+import { RefRangeService as Br, SheetPermissionCheckController as Wr, SheetsSelectionsService as Qr, getSheetCommandTarget as Vr, WorksheetFilterPermission as pe, WorksheetViewPermission as ve, RangeProtectionPermissionViewPoint as _e, expandToContinuousRange as jr, SheetInterceptorService as Gr, SetRangeValuesMutation as Yr, INTERCEPTOR_POINT as Zr } from "@univerjs/sheets";
+import { BehaviorSubject as V, ReplaySubject as Kr, Subject as qr, merge as Xr, combineLatest as zr, throttleTime as Bt, startWith as Wt, map as ce, shareReplay as Jr, of as me, switchMap as at, filter as ei, takeUntil as ti, distinctUntilChanged as ri } from "rxjs";
+import { IRPCChannelService as Qt, toModule as ii, fromModule as si } from "@univerjs/rpc";
+import { clsx as Pe, borderClassName as ct, Select as Ct, RadioGroup as ni, Radio as Tt, Input as Vt, Checkbox as oi, Tree as li, Segmented as ai, Button as Ze, MessageType as ci } from "@univerjs/design";
 import { jsx as p, jsxs as I, Fragment as Et } from "react/jsx-runtime";
-import { forwardRef as Ne, useRef as hi, createElement as ye, useCallback as k, useMemo as ut } from "react";
+import { forwardRef as Fe, useRef as ui, createElement as ye, useCallback as k, useMemo as ut } 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 = {
@@ -390,10 +390,10 @@ var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     testMappingParams: () => !0,
     mapToFilterColumn: (i) => {
       const { and: o, val1: l, val2: c, operator1: h, operator2: d } = i;
-      function C(b, N) {
+      function C(b, F) {
         for (const R of t.ALL_CONDITIONS)
           if (R.operator === b)
-            return R.mapToFilterColumn({ val1: N, operator1: b });
+            return R.mapToFilterColumn({ val1: F, operator1: b });
       }
       const f = !h || h === t.NONE.operator, _ = !d || d === t.NONE.operator;
       if (f && _)
@@ -402,13 +402,13 @@ var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
         return C(d, c);
       if (_)
         return C(h, l);
-      const S = C(h, l), E = C(d, c), F = {
+      const S = C(h, l), E = C(d, c), N = {
         customFilters: [
           S.customFilters.customFilters[0],
           E.customFilters.customFilters[0]
         ]
       };
-      return o && (F.and = mt.TRUE), { customFilters: F };
+      return o && (N.and = mt.TRUE), { customFilters: N };
     },
     testMappingFilterColumn: (i) => {
       var c;
@@ -463,15 +463,15 @@ var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     throw new Error("[SheetsFilter]: no condition item can be mapped from the filter map params!");
   }
   t.testMappingParams = r;
-  function n(i) {
+  function s(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 = n;
-  function s(i, o) {
+  t.getInitialFormParams = s;
+  function n(i, o) {
     return i.mapToFilterColumn(o);
   }
-  t.mapToFilterColumn = s;
+  t.mapToFilterColumn = n;
   function a(i) {
     if (!i)
       return [t.NONE, {}];
@@ -485,67 +485,67 @@ var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
   t.testMappingFilterColumn = a;
 })(m || (m = {}));
 function U(t) {
-  const { operator1: e, operator2: r, val1: n, val2: s } = t;
+  const { operator1: e, operator2: r, val1: s, val2: n } = t;
   if (e && r)
     throw new Error("Both operator1 and operator2 are set!");
   if (!e && !r)
     throw new Error("Neither operator1 and operator2 and both not set!");
-  return e ? [e, n] : [r, s];
+  return e ? [e, s] : [r, n];
 }
 function ze(t) {
   const e = [], r = [];
-  let n = 0, s = 0;
+  let s = 0, n = 0;
   function a(i) {
-    i.leaf && (i.checked ? (e.push(i), n += i.count) : (r.push(i), s += i.count)), i.children && i.children.forEach(a);
+    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(a), {
     checkedItems: e,
     uncheckedItems: r,
-    checked: n,
-    unchecked: s
+    checked: s,
+    unchecked: n
   };
 }
-var di = Object.getOwnPropertyDescriptor, mi = (t, e, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? di(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (s = i(s) || s);
-  return s;
-}, Ke = (t, e) => (r, n) => e(r, n, t);
-const ht = "sheets-filter.generate-filter-values.service", we = Pt(ht), fi = ["yyyy-mm-dd", "yyyy-mm-dd;@", "yyyy/mm/dd;@", "yyyy/mm/dd hh:mm", "yyyy-m-d am/pm h:mm", "yyyy-MM-dd", "yyyy/MM/dd", "yyyy/mm/dd", 'yyyy"年"MM"月"dd"日"', "MM-dd", 'M"月"d"日"', "MM-dd A/P hh:mm"];
+var hi = Object.getOwnPropertyDescriptor, di = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? hi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (n = i(n) || n);
+  return n;
+}, Ke = (t, e) => (r, s) => e(r, s, t);
+const ht = "sheets-filter.generate-filter-values.service", we = Pt(ht), mi = ["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 Je = class extends de {
   constructor(t, e, r) {
     super(), this._localeService = t, this._univerInstanceService = e, this._logService = r;
   }
   async getFilterValues(t) {
     var d;
-    const { unitId: e, subUnitId: r, filteredOutRowsByOtherColumns: n, filterColumn: s, 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);
+    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 }), jt(
       a,
       this._localeService,
       o,
       h,
-      new Set(n),
-      s,
+      new Set(s),
+      n,
       new Set(l.map(String)),
       i,
       c.getStyles()
     ));
   }
 };
-Je = mi([
+Je = di([
   Ke(0, T(X)),
   Ke(1, Be),
   Ke(2, lr)
 ], Je);
-function jt(t, e, r, n, s, a, i, o, l) {
-  var F, b, N, R, L, G, Y, se, x, A;
-  const c = /* @__PURE__ */ new Map(), h = /* @__PURE__ */ new Map(), d = "yyyy-mm-dd", C = new Set(fi), f = "empty", _ = !t && ((a == null ? void 0 : a.filterBy) === w.COLORS || (a == null ? void 0 : a.filterBy) === w.CONDITIONS) && ((F = a.filteredOutRows) == null ? void 0 : F.size);
+function jt(t, e, r, s, n, a, i, o, l) {
+  var N, b, F, R, L, G, Y, ne, x, A;
+  const c = /* @__PURE__ */ new Map(), h = /* @__PURE__ */ new Map(), d = "yyyy-mm-dd", C = new Set(mi), f = "empty", _ = !t && ((a == null ? void 0 : a.filterBy) === w.COLORS || (a == null ? void 0 : a.filterBy) === w.CONDITIONS) && ((N = a.filteredOutRows) == null ? void 0 : N.size);
   let S = 0;
-  for (const P of n.iterateByColumn(r, !1, !1)) {
+  for (const P of s.iterateByColumn(r, !1, !1)) {
     const { row: je, rowSpan: dt = 1 } = P;
     let oe = 0;
     for (; oe < dt; ) {
       const ir = je + oe;
-      if (s.has(ir)) {
+      if (n.has(ir)) {
         oe++;
         continue;
       }
@@ -554,9 +554,9 @@ function jt(t, e, r, n, s, a, i, o, l) {
         S += 1, oe += dt;
         continue;
       }
-      const Ie = (b = P.value) != null && b.v && !P.value.p ? (L = (R = l.get((N = P.value) == null ? void 0 : N.s)) == null ? void 0 : R.n) == null ? void 0 : L.pattern : "", nr = Ie && ft.getFormatInfo(Ie).isDate;
-      if (Ie && nr && C.has(Ie)) {
-        const Z = (G = n.getCellRaw(P.row, P.col)) == null ? void 0 : G.v;
+      const Ie = (b = P.value) != null && b.v && !P.value.p ? (L = (R = l.get((F = P.value) == null ? void 0 : F.s)) == null ? void 0 : R.n) == null ? void 0 : L.pattern : "", sr = Ie && ft.getFormatInfo(Ie).isDate;
+      if (Ie && sr && C.has(Ie)) {
+        const Z = (G = s.getCellRaw(P.row, P.col)) == null ? void 0 : G.v;
         if (!Z) {
           oe++;
           continue;
@@ -579,7 +579,7 @@ function jt(t, e, r, n, s, a, i, o, l) {
           count: 0,
           leaf: !1,
           checked: !1
-        }, (se = ee.children) == null || se.push(W), h.set(`${O}-${H}`, [`${O}`, `${O}-${H}`]));
+        }, (ne = ee.children) == null || ne.push(W), h.set(`${O}-${H}`, [`${O}`, `${O}-${H}`]));
         const Ge = (x = W == null ? void 0 : W.children) == null ? void 0 : x.find((Ye) => Ye.key === `${O}-${H}-${fe}`);
         Ge ? (Ge.originValues.add(J), Ge.count++, W.count++, ee.count++) : ((A = W.children) == null || A.push({
           title: `${fe}`,
@@ -615,34 +615,34 @@ function jt(t, e, r, n, s, a, i, o, l) {
     c.set("empty", P), h.set("empty", [f]);
   }
   return {
-    filterTreeItems: pi(Array.from(c.values())),
+    filterTreeItems: fi(Array.from(c.values())),
     filterTreeMapCache: h
   };
 }
-function pi(t) {
-  return Array.from(t).sort((e, r) => e.children && !r.children ? -1 : !e.children && r.children ? 1 : vi(e.title, r.title)).map((e) => (e.children && e.children.sort((r, n) => {
-    const s = Number.parseInt(r.key.split("-")[1], 10), a = Number.parseInt(n.key.split("-")[1], 10);
-    return s - a;
+function fi(t) {
+  return Array.from(t).sort((e, r) => e.children && !r.children ? -1 : !e.children && r.children ? 1 : pi(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((n, s) => {
-      const a = Number.parseInt(n.key.split("-")[2], 10), i = Number.parseInt(s.key.split("-")[2], 10);
+    r.children && r.children.sort((s, n) => {
+      const a = Number.parseInt(s.key.split("-")[2], 10), i = Number.parseInt(n.key.split("-")[2], 10);
       return a - i;
     });
   }), e));
 }
-const Ft = (t) => !Number.isNaN(Number(t)) && !Number.isNaN(Number.parseFloat(t));
-function vi(t, e) {
-  const r = Ft(t), n = Ft(e);
-  return r && n ? Number.parseFloat(t) - Number.parseFloat(e) : r && !n ? -1 : !r && n ? 1 : t.localeCompare(e);
+const Nt = (t) => !Number.isNaN(Number(t)) && !Number.isNaN(Number.parseFloat(t));
+function pi(t, e) {
+  const r = Nt(t), s = Nt(e);
+  return r && s ? Number.parseFloat(t) - Number.parseFloat(e) : r && !s ? -1 : !r && s ? 1 : t.localeCompare(e);
 }
 function et(t, e) {
   for (const r of t) {
     if (r.key === e)
       return r;
     if (r.children) {
-      const n = et(r.children, e);
-      if (n)
-        return n;
+      const s = et(r.children, e);
+      if (s)
+        return s;
     }
   }
   return null;
@@ -655,43 +655,43 @@ function ge(t, e) {
 }
 function Yt(t, e) {
   const r = [];
-  return t.forEach((n) => {
-    const s = n.originValues ? e.some(
-      (o) => Array.from(n.originValues).some(
+  return t.forEach((s) => {
+    const n = s.originValues ? e.some(
+      (o) => Array.from(s.originValues).some(
         (l) => l.toLowerCase().includes(o.toLowerCase())
       )
-    ) : !1, a = !s && e.some(
-      (o) => n.title.toLowerCase().includes(o.toLowerCase())
+    ) : !1, a = !n && e.some(
+      (o) => s.title.toLowerCase().includes(o.toLowerCase())
     );
-    if (s || a)
-      r.push({ ...n });
-    else if (n.children) {
-      const o = Yt(n.children, e);
+    if (n || a)
+      r.push({ ...s });
+    else if (s.children) {
+      const o = Yt(s.children, e);
       if (o.length > 0) {
         const l = o.reduce((c, h) => c + h.count, 0);
-        r.push({ ...n, count: l, children: o });
+        r.push({ ...s, count: l, children: o });
       }
     }
   }), r;
 }
-var _i = Object.getOwnPropertyDescriptor, Qe = (t, e, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? _i(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (s = i(s) || s);
-  return s;
-}, Te = (t, e) => (r, n) => e(r, n, t);
+var vi = Object.getOwnPropertyDescriptor, Ve = (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;
+}, Te = (t, e) => (r, s) => e(r, s, t);
 Pt("sheets-filter-ui.sheets-filter-panel.service");
 let q = class extends de {
   constructor(e, r) {
     super();
-    v(this, "_filterBy$", new Q(w.VALUES));
+    v(this, "_filterBy$", new V(w.VALUES));
     v(this, "filterBy$", this._filterBy$.asObservable());
-    v(this, "_filterByModel$", new qr(1));
+    v(this, "_filterByModel$", new Kr(1));
     v(this, "filterByModel$", this._filterByModel$.asObservable());
     v(this, "_filterByModel", null);
-    v(this, "_hasCriteria$", new Q(!1));
+    v(this, "_hasCriteria$", new V(!1));
     v(this, "hasCriteria$", this._hasCriteria$.asObservable());
     v(this, "_filterModel", null);
-    v(this, "_col$", new Q(-1));
+    v(this, "_col$", new V(-1));
     v(this, "col$", this._col$.asObservable());
     v(this, "_filterHeaderListener", null);
     this._injector = e, this._refRangeService = r;
@@ -716,18 +716,18 @@ let q = class extends de {
   }
   setupCol(e, r) {
     this.terminate(), this._filterModel = e, this._col$.next(r);
-    const n = e.getFilterColumn(r);
-    if (n) {
-      const s = n.getColumnData();
-      if (s.customFilters) {
+    const s = e.getFilterColumn(r);
+    if (s) {
+      const n = s.getColumnData();
+      if (n.customFilters) {
         this._hasCriteria$.next(!0), this._setupByConditions(e, r);
         return;
       }
-      if (s.colorFilters) {
+      if (n.colorFilters) {
         this._hasCriteria$.next(!0), this._setupByColors(e, r);
         return;
       }
-      if (s.filters) {
+      if (n.filters) {
         this._hasCriteria$.next(!0), this._setupByValues(e, r);
         return;
       }
@@ -761,13 +761,13 @@ let q = class extends de {
   }
   _listenToFilterHeaderChange(e, r) {
     this._disposeFilterHeaderChangeListener();
-    const n = e.unitId, s = e.subUnitId, a = e.getRange(), i = {
+    const s = e.unitId, n = e.subUnitId, a = e.getRange(), i = {
       startColumn: r,
       startRow: a.startRow,
       endRow: a.startRow,
       endColumn: r
     };
-    this._filterHeaderListener = this._refRangeService.watchRange(n, s, i, (o, l) => {
+    this._filterHeaderListener = this._refRangeService.watchRange(s, n, i, (o, l) => {
       if (!l)
         this.terminate();
       else {
@@ -778,56 +778,56 @@ let q = class extends de {
   }
   async _setupByValues(e, r) {
     this._disposePreviousModel();
-    const n = e.getRange();
-    if (n.startRow === n.endRow) return !1;
-    const s = await Me.fromFilterColumn(
+    const s = e.getRange();
+    if (s.startRow === s.endRow) return !1;
+    const n = await Me.fromFilterColumn(
       this._injector,
       e,
       r
     );
-    return this.filterByModel = s, this._filterBy$.next(w.VALUES), this._listenToFilterHeaderChange(e, r), !0;
+    return this.filterByModel = n, this._filterBy$.next(w.VALUES), this._listenToFilterHeaderChange(e, r), !0;
   }
   async _setupByColors(e, r) {
     this._disposePreviousModel();
-    const n = e.getRange();
-    if (n.startRow === n.endRow) return !1;
-    const s = await $e.fromFilterColumn(
+    const s = e.getRange();
+    if (s.startRow === s.endRow) return !1;
+    const n = await $e.fromFilterColumn(
       this._injector,
       e,
       r
     );
-    return this.filterByModel = s, this._filterBy$.next(w.COLORS), this._listenToFilterHeaderChange(e, r), !0;
+    return this.filterByModel = n, this._filterBy$.next(w.COLORS), this._listenToFilterHeaderChange(e, r), !0;
   }
   _setupByConditions(e, r) {
     this._disposePreviousModel();
-    const n = e.getRange();
-    if (n.startRow === n.endRow) return !1;
-    const s = Le.fromFilterColumn(
+    const s = e.getRange();
+    if (s.startRow === s.endRow) return !1;
+    const n = Le.fromFilterColumn(
       this._injector,
       e,
       r,
       e.getFilterColumn(r)
     );
-    return this.filterByModel = s, this._filterBy$.next(w.CONDITIONS), this._listenToFilterHeaderChange(e, r), !0;
+    return this.filterByModel = n, this._filterBy$.next(w.CONDITIONS), this._listenToFilterHeaderChange(e, r), !0;
   }
   _disposePreviousModel() {
     var e;
     (e = this._filterByModel) == null || e.dispose(), this.filterByModel = null;
   }
 };
-q = Qe([
+q = Ve([
   Te(0, T(ie)),
   Te(1, T(Br))
 ], q);
 let Le = class extends de {
-  constructor(e, r, n, s, a) {
+  constructor(e, r, s, n, a) {
     super();
     v(this, "canApply$", me(!0));
     v(this, "_conditionItem$");
     v(this, "conditionItem$");
     v(this, "_filterConditionFormParams$");
     v(this, "filterConditionFormParams$");
-    this._filterModel = e, this.col = r, this._commandService = a, this._conditionItem$ = new Q(n), this.conditionItem$ = this._conditionItem$.asObservable(), this._filterConditionFormParams$ = new Q(s), this.filterConditionFormParams$ = this._filterConditionFormParams$.asObservable();
+    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
@@ -840,9 +840,9 @@ let Le = class extends de {
    *
    * @returns the model to control the panel's state
    */
-  static fromFilterColumn(e, r, n, s) {
-    const [a, i] = m.testMappingFilterColumn(s == null ? void 0 : s.getColumnData());
-    return e.createInstance(Le, r, n, a, i);
+  static fromFilterColumn(e, r, s, n) {
+    const [a, i] = m.testMappingFilterColumn(n == null ? void 0 : n.getColumnData());
+    return e.createInstance(Le, r, s, a, i);
   }
   get conditionItem() {
     return this._conditionItem$.getValue();
@@ -857,7 +857,7 @@ let Le = class extends de {
     this.col += e;
   }
   clear() {
-    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(V.id, {
+    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(Q.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
@@ -870,7 +870,7 @@ let Le = class extends de {
   async apply() {
     if (this._disposed) return !1;
     const e = m.mapToFilterColumn(this.conditionItem, this.filterConditionFormParams);
-    return this._commandService.executeCommand(V.id, {
+    return this._commandService.executeCommand(Q.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
@@ -882,7 +882,7 @@ let Le = class extends de {
    * `IFilterConditionFormParams` and load default condition form params.
    */
   onPrimaryConditionChange(e) {
-    const r = m.ALL_CONDITIONS.find((n) => n.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(m.getInitialFormParams(e));
@@ -898,17 +898,17 @@ let Le = class extends de {
   onConditionFormChange(e) {
     const r = { ...this.filterConditionFormParams, ...e };
     if (r.and !== !0 && delete r.and, typeof e.and < "u" || typeof e.operator1 < "u" || typeof e.operator2 < "u") {
-      const n = m.testMappingParams(r, this.conditionItem.numOfParameters);
-      this._conditionItem$.next(n);
+      const s = m.testMappingParams(r, this.conditionItem.numOfParameters);
+      this._conditionItem$.next(s);
     }
     this._filterConditionFormParams$.next(r);
   }
 };
-Le = Qe([
+Le = Ve([
   Te(4, j)
 ], Le);
 let Me = class extends de {
-  constructor(e, r, n, s, a) {
+  constructor(e, r, s, n, a) {
     super();
     v(this, "_rawFilterItems$");
     v(this, "rawFilterItems$");
@@ -919,8 +919,8 @@ let Me = class extends de {
     v(this, "_manuallyUpdateFilterItems$");
     v(this, "_searchString$");
     v(this, "searchString$");
-    this._filterModel = e, this.col = r, this._commandService = a, this._treeMapCache = s, this._searchString$ = new Q(""), this.searchString$ = this._searchString$.asObservable(), this._rawFilterItems$ = new Q(n), this.rawFilterItems$ = this._rawFilterItems$.asObservable(), this._manuallyUpdateFilterItems$ = new Xr(), this.filterItems$ = zr(
-      Jr([
+    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 qr(), this.filterItems$ = Xr(
+      zr([
         this._searchString$.pipe(
           Bt(500, void 0, { leading: !0, trailing: !0 }),
           Wt(void 0)
@@ -934,7 +934,7 @@ let Me = class extends de {
         })
       ),
       this._manuallyUpdateFilterItems$
-    ).pipe(ei(1)), this.canApply$ = this.filterItems$.pipe(ce((i) => ze(i).checked > 0)), this.disposeWithMe(this.filterItems$.subscribe((i) => this._filterItems = i));
+    ).pipe(Jr(1)), this.canApply$ = this.filterItems$.pipe(ce((i) => ze(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
@@ -946,40 +946,40 @@ let Me = class extends de {
    *
    * @returns the model to control the panel's state
    */
-  static async fromFilterColumn(e, r, n) {
-    const s = e.get(Be), a = e.get(X), i = e.get(we, wt.OPTIONAL), { unitId: o, subUnitId: l } = r, c = s.getUniverSheetInstance(o);
+  static async fromFilterColumn(e, r, s) {
+    const n = e.get(Be), a = e.get(X), i = e.get(we, wt.OPTIONAL), { unitId: o, subUnitId: l } = r, c = n.getUniverSheetInstance(o);
     if (!c) throw new Error(`[ByValuesModel]: Workbook not found for filter model with unitId: ${o}!`);
     const h = c == null ? void 0 : c.getSheetBySheetId(l);
     if (!h) throw new Error(`[ByValuesModel]: Worksheet not found for filter model with unitId: ${o} and subUnitId: ${l}!`);
-    const d = r.getRange(), C = n, f = r.getFilterColumn(n), _ = f == null ? void 0 : f.getColumnData().filters, S = new Set(_ == null ? void 0 : _.filters), E = !!(_ && _.blank), F = r.getFilteredOutRowsExceptCol(n), b = { ...d, startRow: d.startRow + 1, startColumn: C, endColumn: C };
-    let N, R;
+    const d = r.getRange(), C = s, f = r.getFilterColumn(s), _ = f == null ? void 0 : f.getColumnData().filters, S = new Set(_ == null ? void 0 : _.filters), E = !!(_ && _.blank), N = r.getFilteredOutRowsExceptCol(s), b = { ...d, startRow: d.startRow + 1, startColumn: C, endColumn: C };
+    let F, R;
     if (i) {
       const L = await i.getFilterValues({
         unitId: o,
         subUnitId: l,
-        filteredOutRowsByOtherColumns: Array.from(F),
+        filteredOutRowsByOtherColumns: Array.from(N),
         filterColumn: f,
         filters: !!_,
         blankChecked: E,
         iterateRange: b,
         alreadyChecked: Array.from(S)
       });
-      N = L.filterTreeItems, R = L.filterTreeMapCache;
+      F = L.filterTreeItems, R = L.filterTreeMapCache;
     } else {
       const L = jt(
         !!_,
         a,
         b,
         h,
-        F,
+        N,
         f,
         S,
         E,
         c.getStyles()
       );
-      N = L.filterTreeItems, R = L.filterTreeMapCache;
+      F = L.filterTreeItems, R = L.filterTreeMapCache;
     }
-    return e.createInstance(Me, r, n, N, R);
+    return e.createInstance(Me, r, s, F, R);
   }
   get rawFilterItems() {
     return this._rawFilterItems$.getValue();
@@ -1001,23 +1001,23 @@ let Me = class extends de {
   }
   onCheckAllToggled(e) {
     const r = Re.deepClone(this._filterItems);
-    r.forEach((n) => ge(n, e)), this._manuallyUpdateFilterItems(r);
+    r.forEach((s) => ge(s, e)), this._manuallyUpdateFilterItems(r);
   }
   /**
    * Toggle a filter item.
    */
   onFilterCheckToggled(e) {
-    const r = Re.deepClone(this._filterItems), n = et(r, e.key);
-    if (!n)
+    const r = Re.deepClone(this._filterItems), s = et(r, e.key);
+    if (!s)
       return;
-    const s = Gt(n);
-    ge(n, !s), this._manuallyUpdateFilterItems(r);
+    const n = Gt(s);
+    ge(s, !n), this._manuallyUpdateFilterItems(r);
   }
   onFilterOnly(e) {
     const r = Re.deepClone(this._filterItems);
-    r.forEach((n) => ge(n, !1)), e.forEach((n) => {
-      const s = et(r, n);
-      s && ge(s, !0);
+    r.forEach((s) => ge(s, !1)), e.forEach((s) => {
+      const n = et(r, s);
+      n && ge(n, !0);
     }), this._manuallyUpdateFilterItems(r);
   }
   _manuallyUpdateFilterItems(e) {
@@ -1026,7 +1026,7 @@ let Me = class extends de {
   // expose method here to let the panel change filter items
   // #region ByValuesModel apply methods
   clear() {
-    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(V.id, {
+    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(Q.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
@@ -1039,15 +1039,15 @@ let Me = class extends de {
   async apply() {
     if (this._disposed)
       return !1;
-    const e = ze(this._filterItems), { checked: r, checkedItems: n } = e, s = this.rawFilterItems;
+    const e = ze(this._filterItems), { checked: r, checkedItems: s } = e, n = this.rawFilterItems;
     let a = 0;
-    for (const c of s)
+    for (const c of n)
       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(V.id, {
+      return this._commandService.executeCommand(Q.id, {
         unitId: this._filterModel.unitId,
         subUnitId: this._filterModel.subUnitId,
         col: this.col,
@@ -1055,12 +1055,12 @@ let Me = class extends de {
       });
     {
       l.filters = {};
-      const c = n.filter((d) => d.key !== "empty");
+      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 !== n.length && (l.filters.blank = !0);
+      }), c.length !== s.length && (l.filters.blank = !0);
     }
-    return this._commandService.executeCommand(V.id, {
+    return this._commandService.executeCommand(Q.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
@@ -1069,18 +1069,18 @@ let Me = class extends de {
   }
   // #endregion
 };
-Me = Qe([
+Me = Ve([
   Te(4, j)
 ], Me);
 let $e = class extends de {
-  constructor(e, r, n, s, a) {
+  constructor(e, r, s, n, a) {
     super();
     v(this, "canApply$", me(!0));
     v(this, "_cellFillColors$");
     v(this, "cellFillColors$");
     v(this, "_cellTextColors$");
     v(this, "cellTextColors$");
-    this._filterModel = e, this.col = r, this._commandService = a, this._cellFillColors$ = new Q(Array.from(n.values())), this.cellFillColors$ = this._cellFillColors$.asObservable(), this._cellTextColors$ = new Q(Array.from(s.values())), this.cellTextColors$ = this._cellTextColors$.asObservable();
+    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
@@ -1092,18 +1092,18 @@ let $e = class extends de {
    *
    * @returns the model to control the panel's state
    */
-  static async fromFilterColumn(e, r, n) {
-    var b, N, R;
-    const s = e.get(Be), { unitId: a, subUnitId: i } = r, o = s.getUniverSheetInstance(a);
+  static async fromFilterColumn(e, r, s) {
+    var b, F, R;
+    const n = e.get(Be), { unitId: a, subUnitId: i } = r, o = n.getUniverSheetInstance(a);
     if (!o) throw new Error(`[ByColorsModel]: Workbook not found for filter model with unitId: ${a}!`);
     const l = o == null ? void 0 : o.getSheetBySheetId(i);
     if (!l) throw new Error(`[ByColorsModel]: Worksheet not found for filter model with unitId: ${a} and subUnitId: ${i}!`);
-    const c = r.getRange(), h = n, d = (b = r.getFilterColumn(n)) == null ? void 0 : b.getColumnData().colorFilters, C = r.getFilteredOutRowsExceptCol(n), f = { ...c, startRow: c.startRow + 1, startColumn: h, endColumn: h }, _ = /* @__PURE__ */ new Map(), S = new Set((N = d == null ? void 0 : d.cellFillColors) != null ? N : []), E = /* @__PURE__ */ new Map(), F = new Set((R = d == null ? void 0 : d.cellTextColors) != null ? R : []);
+    const c = r.getRange(), h = s, d = (b = r.getFilterColumn(s)) == null ? void 0 : b.getColumnData().colorFilters, C = r.getFilteredOutRowsExceptCol(s), f = { ...c, startRow: c.startRow + 1, startColumn: h, endColumn: h }, _ = /* @__PURE__ */ new Map(), S = new Set((F = d == null ? void 0 : d.cellFillColors) != null ? F : []), E = /* @__PURE__ */ new Map(), N = new Set((R = d == null ? void 0 : d.cellTextColors) != null ? R : []);
     for (const L of l.iterateByColumn(f, !1, !0)) {
-      const { row: G, col: Y, value: se } = L;
+      const { row: G, col: Y, value: ne } = L;
       if (C.has(G))
         continue;
-      const x = l.getComposedCellStyleByCellData(G, Y, se);
+      const x = l.getComposedCellStyleByCellData(G, Y, ne);
       if (x.bg && x.bg.rgb) {
         const A = new pt(x.bg.rgb).toRgbString();
         _.has(A) || _.set(A, { color: A, checked: S.has(A) });
@@ -1111,11 +1111,11 @@ let $e = class extends de {
         _.set("default-fill-color", { color: null, checked: S.has(null) });
       if (x.cl && x.cl.rgb) {
         const A = new pt(x.cl.rgb).toRgbString();
-        E.has(A) || E.set(A, { color: A, checked: F.has(A) });
+        E.has(A) || E.set(A, { color: A, checked: N.has(A) });
       } else
-        E.set("default-font-color", { color: gt, checked: F.has(gt) });
+        E.set("default-font-color", { color: gt, checked: N.has(gt) });
     }
-    return e.createInstance($e, r, n, _, E);
+    return e.createInstance($e, r, s, _, E);
   }
   get cellFillColors() {
     return this._cellFillColors$.getValue();
@@ -1132,7 +1132,7 @@ let $e = class extends de {
   // expose method here to let the panel change filter items
   // #region ByColorsModel apply methods
   clear() {
-    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(V.id, {
+    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(Q.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
@@ -1140,32 +1140,32 @@ let $e = class extends de {
     });
   }
   onFilterCheckToggled(e, r = !0) {
-    const n = r ? this.cellFillColors : this.cellTextColors, s = [];
+    const s = r ? this.cellFillColors : this.cellTextColors, n = [];
     let a = !1;
-    for (let i = 0; i < n.length; i++) {
-      const o = n[i];
+    for (let i = 0; i < s.length; i++) {
+      const o = s[i];
       if (o.color === e.color) {
-        a = !0, s.push({
+        a = !0, n.push({
           color: o.color,
           checked: !o.checked
         });
         continue;
       }
-      s.push({
+      n.push({
         color: o.color,
         checked: o.checked
       });
     }
-    a && (this._resetColorsCheckedStatus(!r), r ? this._cellFillColors$.next([...s]) : this._cellTextColors$.next([...s]));
+    a && (this._resetColorsCheckedStatus(!r), r ? this._cellFillColors$.next([...n]) : this._cellTextColors$.next([...n]));
   }
   _resetColorsCheckedStatus(e = !0) {
-    const r = e ? this.cellFillColors : this.cellTextColors, n = [];
-    for (let s = 0; s < r.length; s++)
-      n.push({
-        color: r[s].color,
+    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([...n]) : this._cellTextColors$.next([...n]);
+    e ? this._cellFillColors$.next([...s]) : this._cellTextColors$.next([...s]);
   }
   /**
    * Apply the filter condition to the target filter column.
@@ -1173,46 +1173,46 @@ let $e = class extends de {
   async apply() {
     if (this._disposed)
       return !1;
-    const e = this.cellFillColors.filter((s) => s.checked).map((s) => s.color), r = this.cellTextColors.filter((s) => s.checked).map((s) => s.color);
+    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(V.id, {
+      return this._commandService.executeCommand(Q.id, {
         unitId: this._filterModel.unitId,
         subUnitId: this._filterModel.subUnitId,
         col: this.col,
         criteria: null
       });
-    const n = { colId: this.col };
-    return e.length > 0 ? n.colorFilters = {
+    const s = { colId: this.col };
+    return e.length > 0 ? s.colorFilters = {
       cellFillColors: e
-    } : r.length > 0 && (n.colorFilters = {
+    } : r.length > 0 && (s.colorFilters = {
       cellTextColors: r
-    }), this._commandService.executeCommand(V.id, {
+    }), this._commandService.executeCommand(Q.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
-      criteria: n
+      criteria: s
     });
   }
   // #endregion
 };
-$e = Qe([
+$e = Ve([
   Te(4, j)
 ], $e);
 const ue = "FILTER_PANEL_OPENED", xe = {
   id: "sheet.operation.open-filter-panel",
   type: We.OPERATION,
   handler: (t, e) => {
-    const r = t.get(Ve), n = t.get(z), s = t.get(q);
+    const r = t.get(Qe), s = t.get(z), n = t.get(q);
     t.get(j).syncExecuteCommand(Cr.id, { visible: !1 });
-    const { unitId: i, subUnitId: o, col: l } = e, c = n.getFilterModel(i, o);
-    return c ? (s.setupCol(c, l), r.getContextValue(ue) || r.setContextValue(ue, !0), !0) : !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;
   }
 }, Se = {
   id: "sheet.operation.close-filter-panel",
   type: We.OPERATION,
   handler: (t) => {
-    const e = t.get(Ve), r = t.get(q), n = t.get(Pr, wt.OPTIONAL);
-    return e.getContextValue(ue) ? (e.setContextValue(ue, !1), n == null || n.focus(), r.terminate()) : !1;
+    const e = t.get(Qe), r = t.get(q), s = t.get(Pr, wt.OPTIONAL);
+    return e.getContextValue(ue) ? (e.setContextValue(ue, !1), s == null || s.focus(), r.terminate()) : !1;
   }
 }, Zt = {
   id: "sheet.operation.apply-filter",
@@ -1222,21 +1222,21 @@ const ue = "FILTER_PANEL_OPENED", xe = {
     return t.get(q).changeFilterBy(r);
   }
 }, Kt = "sheets-filter-ui.config", Ue = {};
-var gi = Object.getOwnPropertyDescriptor, Si = (t, e, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? gi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (s = i(s) || s);
-  return s;
-}, ae = (t, e) => (r, n) => e(r, n, t);
+var _i = Object.getOwnPropertyDescriptor, gi = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? _i(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (n = i(n) || n);
+  return n;
+}, ae = (t, e) => (r, s) => e(r, s, t);
 let he = class extends de {
-  constructor(t, e, r, n, s, a) {
-    super(), this._sheetsFilterService = t, this._localeService = e, this._commandService = r, this._sheetPermissionCheckPermission = n, this._injector = s, this._sheetsSelectionService = a, this._commandExecutedListener();
+  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, n;
-        if (t.id === Fe.id) {
-          const s = this._injector.get(Be), a = Qr(s);
+        var e, r, s;
+        if (t.id === Ne.id) {
+          const n = this._injector.get(Be), a = Vr(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;
@@ -1262,8 +1262,8 @@ let he = class extends de {
           h || this._sheetPermissionCheckPermission.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.filterErr"));
         }
         if (t.id === xe.id) {
-          const s = t.params, { unitId: a, subUnitId: i } = s, o = (n = this._sheetsFilterService.getFilterModel(a, i)) == null ? void 0 : n.getRange(), l = Re.deepClone(o);
-          l && (l.startColumn = s.col, l.endColumn = s.col, this._sheetPermissionCheckPermission.permissionCheckWithRanges({
+          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")));
@@ -1272,47 +1272,47 @@ let he = class extends de {
     );
   }
 };
-he = Si([
+he = gi([
   ae(0, T(z)),
   ae(1, T(X)),
   ae(2, j),
   ae(3, T(Wr)),
   ae(4, T(ie)),
-  ae(5, T(Vr))
+  ae(5, T(Qr))
 ], he);
-const K = 16, Ci = 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 Nt {
-  static drawNoCriteria(e, r, n, s) {
+const K = 16, Si = new Path2D("M3.30363 3C2.79117 3 2.51457 3.60097 2.84788 3.99024L6.8 8.60593V12.5662C6.8 12.7184 6.8864 12.8575 7.02289 12.9249L8.76717 13.7863C8.96655 13.8847 9.2 13.7396 9.2 13.5173V8.60593L13.1521 3.99024C13.4854 3.60097 13.2088 3 12.6964 3H3.30363Z");
+class Ft {
+  static drawNoCriteria(e, r, s, n) {
     e.save(), St.drawWith(e, {
       radius: 2,
       width: K,
       height: K,
-      fill: s
-    }), e.lineCap = "square", e.strokeStyle = n, e.scale(r / K, r / K), e.beginPath(), e.lineWidth = 1, e.lineCap = "round", e.moveTo(3, 4), e.lineTo(13, 4), e.moveTo(4.5, 8), e.lineTo(11.5, 8), e.moveTo(6, 12), e.lineTo(10, 12), e.stroke(), e.restore();
+      fill: n
+    }), e.lineCap = "square", e.strokeStyle = s, e.scale(r / K, r / K), e.beginPath(), e.lineWidth = 1, e.lineCap = "round", e.moveTo(3, 4), e.lineTo(13, 4), e.moveTo(4.5, 8), e.lineTo(11.5, 8), e.moveTo(6, 12), e.lineTo(10, 12), e.stroke(), e.restore();
   }
-  static drawHasCriteria(e, r, n, s) {
+  static drawHasCriteria(e, r, s, n) {
     e.save(), St.drawWith(e, {
       radius: 2,
       width: K,
       height: K,
-      fill: s
-    }), e.scale(r / K, r / K), e.fillStyle = n, e.fill(Ci), e.restore();
+      fill: n
+    }), e.scale(r / K, r / K), e.fillStyle = s, e.fill(Si), e.restore();
   }
 }
-var Ti = Object.getOwnPropertyDescriptor, Ei = (t, e, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? Ti(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (s = i(s) || s);
-  return s;
-}, qe = (t, e) => (r, n) => e(r, n, t);
+var Ci = Object.getOwnPropertyDescriptor, Ti = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Ci(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (n = i(n) || n);
+  return n;
+}, qe = (t, e) => (r, s) => e(r, s, t);
 const B = 16, Ce = 1;
 let tt = class extends Dr {
-  constructor(e, r, n, s, a) {
+  constructor(e, r, s, n, a) {
     super(e, r);
     v(this, "_cellWidth", 0);
     v(this, "_cellHeight", 0);
     v(this, "_filterParams");
     v(this, "_hovered", !1);
-    this._contextService = n, this._commandService = s, this._themeService = a, this.setShapeProps(r), this.onPointerDown$.subscribeEvent((i) => this.onPointerDown(i)), this.onPointerEnter$.subscribeEvent(() => this.onPointerEnter()), this.onPointerLeave$.subscribeEvent(() => this.onPointerLeave());
+    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({
@@ -1321,21 +1321,21 @@ let tt = class extends Dr {
     });
   }
   _draw(e) {
-    const r = this._cellHeight, n = this._cellWidth, s = B - n, a = B - r;
+    const r = this._cellHeight, s = this._cellWidth, n = B - s, a = B - r;
     e.save();
     const i = new Path2D();
-    i.rect(s, a, n, r), e.clip(i);
+    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 ? Nt.drawHasCriteria(e, B, l, c) : Nt.drawNoCriteria(e, B, l, c), e.restore();
+    o ? Ft.drawHasCriteria(e, B, l, c) : Ft.drawNoCriteria(e, B, l, c), e.restore();
   }
   onPointerDown(e) {
     if (e.button === 2)
       return;
-    const { col: r, unitId: n, subUnitId: s } = this._filterParams;
+    const { col: r, unitId: s, subUnitId: n } = this._filterParams;
     this._contextService.getContextValue(ue) || !this._commandService.hasCommand(xe.id) || setTimeout(() => {
       this._commandService.executeCommand(xe.id, {
-        unitId: n,
-        subUnitId: s,
+        unitId: s,
+        subUnitId: n,
         col: r
       });
     }, 200);
@@ -1347,19 +1347,19 @@ let tt = class extends Dr {
     this._hovered = !1, this.makeDirty(!0);
   }
 };
-tt = Ei([
-  qe(2, Ve),
+tt = Ti([
+  qe(2, Qe),
   qe(3, j),
   qe(4, T(Lt))
 ], tt);
-var Fi = Object.getOwnPropertyDescriptor, Ni = (t, e, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? Fi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (s = i(s) || s);
-  return s;
-}, te = (t, e) => (r, n) => e(r, n, t);
-const yi = 1e3, Oi = 5e3;
-function Ii(t, e, r, n) {
-  switch (n) {
+var Ei = Object.getOwnPropertyDescriptor, Ni = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Ei(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (n = i(n) || n);
+  return n;
+}, te = (t, e) => (r, s) => e(r, s, t);
+const Fi = 1e3, yi = 5e3;
+function Oi(t, e, r, s) {
+  switch (s) {
     case Ae.TOP:
       return t + Ce;
     case Ae.MIDDLE:
@@ -1370,12 +1370,12 @@ function Ii(t, e, r, n) {
   }
 }
 let rt = class extends Mt {
-  constructor(e, r, n, s, a, i, o, l) {
+  constructor(e, r, s, n, a, i, o, l) {
     super();
     v(this, "_filterRangeShape", null);
     v(this, "_buttonRenderDisposable", null);
     v(this, "_filterButtonShapes", []);
-    this._context = e, this._injector = r, this._sheetSkeletonManagerService = n, this._sheetsFilterService = s, this._themeService = a, this._sheetInterceptorService = i, this._commandService = o, this._selectionRenderService = l, this._initRenderer();
+    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();
@@ -1385,15 +1385,15 @@ let rt = class extends Mt {
       at((e) => {
         var o, l;
         if (!e) return me(null);
-        const { unit: r, unitId: n } = this._context, s = ((o = r.getActiveSheet()) == null ? void 0 : o.getSheetId()) || "", a = (l = this._sheetsFilterService.getFilterModel(n, s)) != null ? l : void 0, i = () => ({
-          unitId: n,
-          worksheetId: s,
+        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: a,
           range: a == null ? void 0 : a.getRange(),
           skeleton: e.skeleton
         });
         return cr(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(
-          ti(
+          ei(
             ([c]) => {
               var h;
               return c.type === We.MUTATION && ((h = c.params) == null ? void 0 : h.unitId) === r.getUnitId() && (mr.has(c.id) || c.id === Yr.id);
@@ -1405,80 +1405,60 @@ let rt = class extends Mt {
           // must trigger once
         );
       }),
-      ri(this.dispose$)
+      ti(this.dispose$)
     ).subscribe((e) => {
       this._disposeRendering(), !(!e || !e.range) && (this._renderRange(e.range, e.skeleton), this._renderButtons(e));
     });
   }
-  _initCommandExecuted() {
-    this.disposeWithMe(
-      this._commandService.onCommandExecuted((e) => {
-        var l, c;
-        if (e.id !== Zr.id)
-          return;
-        const { unit: r, unitId: n } = this._context, s = ((l = r.getActiveSheet()) == null ? void 0 : l.getSheetId()) || "", a = this._sheetSkeletonManagerService.getCurrentSkeleton(), i = (c = this._sheetsFilterService.getFilterModel(n, s)) != null ? c : void 0;
-        if (!a)
-          return;
-        const o = {
-          unitId: n,
-          worksheetId: s,
-          filterModel: i,
-          range: i == null ? void 0 : i.getRange(),
-          skeleton: a
-        };
-        this._disposeRendering(), !(!o || !o.range) && (this._renderRange(o.range, o.skeleton), this._renderButtons(o));
-      })
-    );
-  }
   _renderRange(e, r) {
-    const { scene: n } = this._context, { rowHeaderWidth: s, columnHeaderHeight: a } = r, i = this._filterRangeShape = new Fr(
-      n,
-      yi,
+    const { scene: s } = this._context, { rowHeaderWidth: n, columnHeaderHeight: a } = r, i = this._filterRangeShape = new Nr(
+      s,
+      Fi,
       this._themeService,
       {
-        rowHeaderWidth: s,
+        rowHeaderWidth: n,
         columnHeaderHeight: a,
         enableAutoFill: !1,
         highlightHeader: !1
       }
-    ), l = Nr({
+    ), l = Fr({
       range: e,
       primary: null,
       style: { fill: "rgba(0, 0, 0, 0.0)" }
     }, r);
-    i.updateRangeBySelectionWithCoord(l), i.setEvent(!1), n.makeDirty(!0);
+    i.updateRangeBySelectionWithCoord(l), i.setEvent(!1), s.makeDirty(!0);
   }
   _renderButtons(e) {
-    const { range: r, filterModel: n, unitId: s, skeleton: a, worksheetId: i } = e, { unit: o, scene: l } = this._context, c = o.getSheetBySheetId(i);
+    const { range: r, filterModel: s, unitId: n, skeleton: a, worksheetId: i } = e, { unit: o, scene: l } = this._context, c = o.getSheetBySheetId(i);
     if (!c)
       return;
-    this._interceptCellContent(s, i, e.range);
+    this._interceptCellContent(n, i, e.range);
     const { startColumn: h, endColumn: d, startRow: C } = r;
     for (let f = h; f <= d; f++) {
-      const _ = `sheets-filter-button-${f}`, S = yr(C, f, l, a), E = c.getCellStyle(C, f), F = (E == null ? void 0 : E.vt) || Ae.BOTTOM, { startX: b, startY: N, endX: R, endY: L } = S, G = R - b, Y = L - N;
+      const _ = `sheets-filter-button-${f}`, S = yr(C, f, l, a), E = c.getComposedCellStyle(C, f), N = (E == null ? void 0 : E.vt) || Ae.BOTTOM, { startX: b, startY: F, endX: R, endY: L } = S, G = R - b, Y = L - F;
       if (Y <= Ce || G <= Ce)
         continue;
-      const se = !!n.getFilterColumn(f), x = R - B - Ce, A = Ii(N, L, Y, F), P = {
+      const ne = !!s.getFilterColumn(f), x = R - B - Ce, A = Oi(F, L, Y, N), P = {
         left: x,
         top: A,
         height: B,
         width: B,
-        zIndex: Oi,
+        zIndex: yi,
         cellHeight: Y,
         cellWidth: G,
-        filterParams: { unitId: s, subUnitId: i, col: f, hasCriteria: se }
+        filterParams: { unitId: n, subUnitId: i, col: f, hasCriteria: ne }
       }, je = this._injector.createInstance(tt, _, P);
       this._filterButtonShapes.push(je);
     }
     l.addObjects(this._filterButtonShapes), l.makeDirty();
   }
-  _interceptCellContent(e, r, n) {
-    const { startRow: s, startColumn: a, endColumn: i } = n;
-    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(Kr.CELL_CONTENT, {
+  _interceptCellContent(e, r, s) {
+    const { startRow: n, startColumn: a, endColumn: i } = s;
+    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(Zr.CELL_CONTENT, {
       effect: ur.Style,
       handler: (o, l, c) => {
         const { row: h, col: d, unitId: C, subUnitId: f } = l;
-        return C !== e || f !== r || h !== s || d < a || d > i || ((!o || o === l.rawData) && (o = { ...l.rawData }), o.fontRenderExtension = {
+        return C !== e || f !== r || h !== n || d < a || d > i || ((!o || o === l.rawData) && (o = { ...l.rawData }), o.fontRenderExtension = {
           ...o == null ? void 0 : o.fontRenderExtension,
           rightOffset: B
         }), c(o);
@@ -1488,7 +1468,7 @@ let rt = class extends Mt {
   }
   _disposeRendering() {
     var e, r;
-    (e = this._filterRangeShape) == null || e.dispose(), this._filterButtonShapes.forEach((n) => n.dispose()), (r = this._buttonRenderDisposable) == null || r.dispose(), this._filterRangeShape = null, this._buttonRenderDisposable = null, this._filterButtonShapes = [];
+    (e = this._filterRangeShape) == null || e.dispose(), this._filterButtonShapes.forEach((s) => s.dispose()), (r = this._buttonRenderDisposable) == null || r.dispose(), this._filterRangeShape = null, this._buttonRenderDisposable = null, this._filterButtonShapes = [];
   }
 };
 rt = Ni([
@@ -1500,11 +1480,11 @@ rt = Ni([
   te(6, j),
   te(7, Er)
 ], rt);
-var bi = Object.getOwnPropertyDescriptor, Ri = (t, e, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? bi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (s = i(s) || s);
-  return s;
-}, yt = (t, e) => (r, n) => e(r, n, t);
+var Ii = Object.getOwnPropertyDescriptor, bi = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Ii(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (n = i(n) || n);
+  return n;
+}, yt = (t, e) => (r, s) => e(r, s, t);
 let Ee = class extends Mt {
   constructor(t, e) {
     super(), this._renderManagerService = t, this._sheetsRenderService = e, [
@@ -1513,30 +1493,30 @@ let Ee = class extends Mt {
       vr,
       _r
     ].forEach((r) => this.disposeWithMe(this._sheetsRenderService.registerSkeletonChangingMutations(r.id))), this.disposeWithMe(this._renderManagerService.registerRenderModule(
-      ne.UNIVER_SHEET,
+      se.UNIVER_SHEET,
       [rt]
     ));
   }
 };
-Ee = Ri([
+Ee = bi([
   yt(0, Dt),
   yt(1, T(Ht))
 ], Ee);
-var Ai = Object.defineProperty, Pi = Object.getOwnPropertyDescriptor, wi = (t, e, r) => e in t ? Ai(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Li = (t, e, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? Pi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (s = i(s) || s);
-  return s;
-}, Ot = (t, e) => (r, n) => e(r, n, t), qt = (t, e, r) => wi(t, typeof e != "symbol" ? e + "" : e, r);
-const Mi = "SHEET_FILTER_UI_PLUGIN";
+var Ri = Object.defineProperty, Ai = Object.getOwnPropertyDescriptor, Pi = (t, e, r) => e in t ? Ri(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, wi = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Ai(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (n = i(n) || n);
+  return n;
+}, Ot = (t, e) => (r, s) => e(r, s, t), qt = (t, e, r) => Pi(t, typeof e != "symbol" ? e + "" : e, r);
+const Li = "SHEET_FILTER_UI_PLUGIN";
 let ke = class extends it {
   constructor(t = Ue, e, r) {
     super(), this._config = t, this._injector = e, this._configService = r;
-    const { menu: n, ...s } = Ut(
+    const { menu: s, ...n } = Ut(
       {},
       Ue,
       this._config
     );
-    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig(Kt, s);
+    s && this._configService.setConfig("menu", s, { merge: !0 }), this._configService.setConfig(Kt, n);
   }
   onStarting() {
     [
@@ -1551,93 +1531,93 @@ let ke = class extends it {
     this._injector.get(Ee);
   }
 };
-qt(ke, "type", ne.UNIVER_SHEET);
-qt(ke, "pluginName", Mi);
-ke = Li([
+qt(ke, "type", se.UNIVER_SHEET);
+qt(ke, "pluginName", Li);
+ke = wi([
   $t(kt),
   Ot(1, T(ie)),
   Ot(2, xt)
 ], ke);
 var $ = function() {
   return $ = Object.assign || function(t) {
-    for (var e, r = 1, n = arguments.length; r < n; r++) {
+    for (var e, r = 1, s = arguments.length; r < s; r++) {
       e = arguments[r];
-      for (var s in e) Object.prototype.hasOwnProperty.call(e, s) && (t[s] = e[s]);
+      for (var n in e) Object.prototype.hasOwnProperty.call(e, n) && (t[n] = e[n]);
     }
     return t;
   }, $.apply(this, arguments);
-}, $i = function(t, e) {
+}, Mi = function(t, e) {
   var r = {};
-  for (var n in t) Object.prototype.hasOwnProperty.call(t, n) && e.indexOf(n) < 0 && (r[n] = t[n]);
+  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 s = 0, n = Object.getOwnPropertySymbols(t); s < n.length; s++)
-      e.indexOf(n[s]) < 0 && Object.prototype.propertyIsEnumerable.call(t, n[s]) && (r[n[s]] = t[n[s]]);
+    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;
-}, Oe = Ne(function(t, e) {
-  var r = t.icon, n = t.id, s = t.className, a = t.extend, i = $i(t, ["icon", "id", "className", "extend"]), o = "univerjs-icon univerjs-icon-".concat(n, " ").concat(s || "").trim(), l = hi("_".concat(ki()));
-  return Xt(r, "".concat(n), { defIds: r.defIds, idSuffix: l.current }, $({ ref: e, className: o }, i), a);
+}, Oe = Fe(function(t, e) {
+  var r = t.icon, s = t.id, n = t.className, a = t.extend, i = Mi(t, ["icon", "id", "className", "extend"]), o = "univerjs-icon univerjs-icon-".concat(s, " ").concat(n || "").trim(), l = ui("_".concat(Ui()));
+  return Xt(r, "".concat(s), { defIds: r.defIds, idSuffix: l.current }, $({ ref: e, className: o }, i), a);
 });
-function Xt(t, e, r, n, s) {
-  return ye(t.tag, $($({ key: e }, xi(t, r, s)), n), (Ui(t, r).children || []).map(function(a, i) {
-    return Xt(a, "".concat(e, "-").concat(t.tag, "-").concat(i), r, void 0, s);
+function Xt(t, e, r, s, n) {
+  return ye(t.tag, $($({ key: e }, $i(t, r, n)), s), (xi(t, r).children || []).map(function(a, i) {
+    return Xt(a, "".concat(e, "-").concat(t.tag, "-").concat(i), r, void 0, n);
   }));
 }
-function xi(t, e, r) {
-  var n = $({}, t.attrs);
-  r != null && r.colorChannel1 && n.fill === "colorChannel1" && (n.fill = r.colorChannel1), t.tag === "mask" && n.id && (n.id = n.id + e.idSuffix), Object.entries(n).forEach(function(a) {
+function $i(t, e, r) {
+  var s = $({}, t.attrs);
+  r != null && r.colorChannel1 && s.fill === "colorChannel1" && (s.fill = r.colorChannel1), t.tag === "mask" && s.id && (s.id = s.id + e.idSuffix), Object.entries(s).forEach(function(a) {
     var i = a[0], o = a[1];
-    i === "mask" && typeof o == "string" && (n[i] = o.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
+    i === "mask" && typeof o == "string" && (s[i] = o.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   });
-  var s = e.defIds;
-  return !s || s.length === 0 || (t.tag === "use" && n["xlink:href"] && (n["xlink:href"] = n["xlink:href"] + e.idSuffix), Object.entries(n).forEach(function(a) {
+  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(a) {
     var i = a[0], o = a[1];
-    typeof o == "string" && (n[i] = o.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
-  })), n;
+    typeof o == "string" && (s[i] = o.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
+  })), s;
 }
-function Ui(t, e) {
-  var r, n = e.defIds;
-  return !n || n.length === 0 ? t : t.tag === "defs" && (!((r = t.children) === null || r === void 0) && r.length) ? $($({}, t), { children: t.children.map(function(s) {
-    return typeof s.attrs.id == "string" && n && n.includes(s.attrs.id) ? $($({}, s), { attrs: $($({}, s.attrs), { id: s.attrs.id + e.idSuffix }) }) : s;
+function xi(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) ? $($({}, t), { children: t.children.map(function(n) {
+    return typeof n.attrs.id == "string" && s && s.includes(n.attrs.id) ? $($({}, n), { attrs: $($({}, n.attrs), { id: n.attrs.id + e.idSuffix }) }) : n;
   }) }) : t;
 }
-function ki() {
+function Ui() {
   return Math.random().toString(36).substring(2, 8);
 }
 Oe.displayName = "UniverIcon";
-var Hi = { 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" } }] }, zt = Ne(function(t, e) {
+var ki = { 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" } }] }, zt = Fe(function(t, e) {
   return ye(Oe, Object.assign({}, t, {
     id: "a-icon",
     ref: e,
-    icon: Hi
+    icon: ki
   }));
 });
 zt.displayName = "AIcon";
-var Di = { 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" } }] }, Jt = Ne(function(t, e) {
+var Hi = { 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" } }] }, Jt = Fe(function(t, e) {
   return ye(Oe, Object.assign({}, t, {
     id: "ban-icon",
     ref: e,
-    icon: Di
+    icon: Hi
   }));
 });
 Jt.displayName = "BanIcon";
-var Bi = { 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" } }] }, er = Ne(function(t, e) {
+var Di = { 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" } }] }, er = Fe(function(t, e) {
   return ye(Oe, Object.assign({}, t, {
     id: "filter-icon",
     ref: e,
-    icon: Bi
+    icon: Di
   }));
 });
 er.displayName = "FilterIcon";
-var Wi = { 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" } }] }, tr = Ne(function(t, e) {
+var Bi = { 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" } }] }, tr = Fe(function(t, e) {
   return ye(Oe, Object.assign({}, t, {
     id: "success-icon",
     ref: e,
-    icon: Wi
+    icon: Bi
   }));
 });
 tr.displayName = "SuccessIcon";
-function Vi(t) {
-  const { model: e } = t, r = re(X), n = D(e.cellFillColors$, [], !0), s = D(e.cellTextColors$, [], !0), a = k((o) => {
+function Wi(t) {
+  const { model: e } = t, r = re(X), s = D(e.cellFillColors$, [], !0), n = D(e.cellTextColors$, [], !0), a = k((o) => {
     e.onFilterCheckToggled(o);
   }, [e]), i = k((o) => {
     e.onFilterCheckToggled(o, !1);
@@ -1653,7 +1633,7 @@ function Vi(t) {
           "data-u-comp": "sheets-filter-panel",
           className: Pe("univer-mt-2 univer-box-border univer-flex univer-h-[300px] univer-flex-grow univer-flex-col univer-gap-4 univer-overflow-auto univer-rounded-md univer-px-2 univer-py-2.5", ct),
           children: [
-            n.length > 1 && /* @__PURE__ */ I("div", { children: [
+            s.length > 1 && /* @__PURE__ */ I("div", { children: [
               /* @__PURE__ */ p(
                 "div",
                 {
@@ -1665,7 +1645,7 @@ function Vi(t) {
                 "div",
                 {
                   className: "univer-grid univer-grid-cols-8 univer-items-center univer-justify-start univer-gap-2",
-                  children: n.map((o, l) => /* @__PURE__ */ I(
+                  children: s.map((o, l) => /* @__PURE__ */ I(
                     "div",
                     {
                       className: "univer-relative univer-h-6 univer-w-6",
@@ -1692,7 +1672,7 @@ function Vi(t) {
                 }
               )
             ] }),
-            s.length > 1 && /* @__PURE__ */ I("div", { children: [
+            n.length > 1 && /* @__PURE__ */ I("div", { children: [
               /* @__PURE__ */ p(
                 "div",
                 {
@@ -1704,7 +1684,7 @@ function Vi(t) {
                 "div",
                 {
                   className: "univer-grid univer-grid-cols-8 univer-items-center univer-justify-start univer-gap-2",
-                  children: s.map((o, l) => /* @__PURE__ */ I(
+                  children: n.map((o, l) => /* @__PURE__ */ I(
                     "div",
                     {
                       className: "univer-relative univer-h-6 univer-w-6",
@@ -1725,7 +1705,7 @@ function Vi(t) {
                 }
               )
             ] }),
-            n.length <= 1 && s.length <= 1 && /* @__PURE__ */ p(
+            s.length <= 1 && n.length <= 1 && /* @__PURE__ */ p(
               "div",
               {
                 className: "univer-flex univer-h-full univer-w-full univer-items-center univer-justify-center univer-text-sm univer-text-gray-900 dark:!univer-text-gray-200",
@@ -1754,17 +1734,17 @@ function It() {
 }
 function Qi(t) {
   var f, _;
-  const { model: e } = t, r = re(X), n = D(e.conditionItem$, void 0), s = D(e.filterConditionFormParams$, void 0), a = s != null && s.and ? "AND" : "OR", i = k((S) => {
+  const { model: e } = t, r = re(X), s = D(e.conditionItem$, void 0), n = D(e.filterConditionFormParams$, void 0), a = n != null && n.and ? "AND" : "OR", i = k((S) => {
     e.onConditionFormChange({ and: S === "AND" });
-  }, [e]), o = ji(r), l = k((S) => {
+  }, [e]), o = Vi(r), l = k((S) => {
     e.onPrimaryConditionChange(S);
-  }, [e]), c = Gi(r), h = k((S) => {
+  }, [e]), c = ji(r), h = k((S) => {
     e.onConditionFormChange(S);
   }, [e]), d = r.t("sheets-filter.panel.input-values-placeholder");
-  function C(S, E, F) {
+  function C(S, E, N) {
     const b = m.getItemByOperator(S).numOfParameters === 1;
     return /* @__PURE__ */ I(Et, { children: [
-      F === "operator2" && /* @__PURE__ */ I(oi, { value: a, onChange: i, children: [
+      N === "operator2" && /* @__PURE__ */ I(ni, { value: a, onChange: i, children: [
         /* @__PURE__ */ p(Tt, { value: "AND", children: r.t("sheets-filter.panel.and") }),
         /* @__PURE__ */ p(Tt, { value: "OR", children: r.t("sheets-filter.panel.or") })
       ] }),
@@ -1773,16 +1753,16 @@ function Qi(t) {
         {
           value: S,
           options: c,
-          onChange: (N) => h({ [F]: N })
+          onChange: (F) => h({ [N]: F })
         }
       ),
       b && /* @__PURE__ */ p("div", { children: /* @__PURE__ */ p(
-        Qt,
+        Vt,
         {
           className: "univer-mt-2",
           value: E,
           placeholder: d,
-          onChange: (N) => h({ [F === "operator1" ? "val1" : "val2"]: N })
+          onChange: (F) => h({ [N === "operator1" ? "val1" : "val2"]: F })
         }
       ) })
     ] });
@@ -1792,16 +1772,16 @@ function Qi(t) {
     {
       "data-u-comp": "sheets-filter-panel-conditions-container",
       className: "univer-flex univer-h-full univer-min-h-[300px] univer-flex-col",
-      children: n && s && /* @__PURE__ */ I(Et, { children: [
-        /* @__PURE__ */ p(Ct, { value: n.operator, options: o, onChange: l }),
-        m.getItemByOperator(n.operator).numOfParameters !== 0 ? /* @__PURE__ */ I(
+      children: s && n && /* @__PURE__ */ I(Et, { children: [
+        /* @__PURE__ */ p(Ct, { 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: Pe("univer-mt-2 univer-flex-grow univer-overflow-hidden univer-rounded-md univer-p-2", ct),
             children: [
-              n.numOfParameters >= 1 && C(s.operator1, (f = s.val1) != null ? f : "", "operator1"),
-              n.numOfParameters >= 2 && C(s.operator2, (_ = s.val2) != null ? _ : "", "operator2"),
+              s.numOfParameters >= 1 && C(n.operator1, (f = n.val1) != null ? f : "", "operator1"),
+              s.numOfParameters >= 2 && C(n.operator2, (_ = n.val2) != null ? _ : "", "operator2"),
               /* @__PURE__ */ I(
                 "div",
                 {
@@ -1821,7 +1801,7 @@ function Qi(t) {
     }
   );
 }
-function ji(t) {
+function Vi(t) {
   const e = t.getCurrentLocale();
   return ut(() => [
     {
@@ -1863,12 +1843,12 @@ function ji(t) {
     }
   ], [e, t]);
 }
-function Gi(t) {
+function ji(t) {
   const e = t.getCurrentLocale();
   return ut(() => m.ALL_CONDITIONS.filter((r) => r.numOfParameters !== 2).map((r) => ({ label: t.t(r.label), value: r.operator })), [e, t]);
 }
-function Yi(t) {
-  const { model: e } = t, r = re(X), n = D(e.searchString$, "", !0), s = D(e.filterItems$, void 0, !0), a = r.t("sheets-filter.panel.filter-only"), i = ze(s), o = i.checked > 0 && i.unchecked === 0, l = i.checked > 0 && i.unchecked > 0, c = e.treeMapCache, h = k(() => {
+function Gi(t) {
+  const { model: e } = t, r = re(X), s = D(e.searchString$, "", !0), n = D(e.filterItems$, void 0, !0), a = r.t("sheets-filter.panel.filter-only"), i = ze(n), o = i.checked > 0 && i.unchecked === 0, l = i.checked > 0 && i.unchecked > 0, c = e.treeMapCache, h = k(() => {
     e.onCheckAllToggled(!o);
   }, [e, o]), d = k((f) => {
     e.setSearchString(f);
@@ -1886,10 +1866,10 @@ function Yi(t) {
       className: "univer-flex univer-h-full univer-min-h-[300px] univer-flex-col",
       children: [
         /* @__PURE__ */ p(
-          Qt,
+          Vt,
           {
             autoFocus: !0,
-            value: n,
+            value: s,
             placeholder: r.t("sheets-filter.panel.search-placeholder"),
             onChange: d
           }
@@ -1912,10 +1892,10 @@ function Yi(t) {
                       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__ */ p(
-                          li,
+                          oi,
                           {
                             indeterminate: l,
-                            disabled: s.length === 0,
+                            disabled: n.length === 0,
                             checked: o,
                             onChange: h
                           }
@@ -1942,11 +1922,11 @@ function Yi(t) {
                 }
               ),
               /* @__PURE__ */ p("div", { "data-u-comp": "sheets-filter-panel-values-virtual", className: "univer-flex-grow", children: /* @__PURE__ */ p(
-                ai,
+                li,
                 {
-                  data: s,
+                  data: n,
                   defaultExpandAll: !1,
-                  valueGroup: C(s),
+                  valueGroup: C(n),
                   onChange: (f) => {
                     e.onFilterCheckToggled(f);
                   },
@@ -1999,17 +1979,17 @@ function Yi(t) {
     }
   );
 }
-function Zi() {
+function Yi() {
   var E;
-  const t = re(q), e = re(X), r = re(j), n = D(t.filterBy$, void 0, !0), s = D(t.filterByModel$, void 0, !1), a = D(() => (s == null ? void 0 : s.canApply$) || me(!1), void 0, !1, [s]), i = Ki(e), o = !D(t.hasCriteria$), l = k((F) => {
-    r.executeCommand(Zt.id, { filterBy: F });
+  const t = re(q), e = re(X), r = re(j), s = D(t.filterBy$, void 0, !0), n = D(t.filterByModel$, void 0, !1), a = D(() => (n == null ? void 0 : n.canApply$) || me(!1), void 0, !1, [n]), i = Zi(e), o = !D(t.hasCriteria$), l = k((N) => {
+    r.executeCommand(Zt.id, { filterBy: N });
   }, [r]), c = k(async () => {
-    await (s == null ? void 0 : s.clear()), r.executeCommand(Se.id);
-  }, [s, r]), h = k(() => {
+    await (n == null ? void 0 : n.clear()), r.executeCommand(Se.id);
+  }, [n, r]), h = k(() => {
     r.executeCommand(Se.id);
   }, [r]), d = k(async () => {
-    await (s == null ? void 0 : s.apply()), r.executeCommand(Se.id);
-  }, [s, r]), f = (E = re(z).activeFilterModel) == null ? void 0 : E.getRange(), _ = t.col, S = wr(Or.FILTER_PANEL_EMBED_POINT);
+    await (n == null ? void 0 : n.apply()), r.executeCommand(Se.id);
+  }, [n, r]), f = (E = re(z).activeFilterModel) == null ? void 0 : E.getRange(), _ = t.col, S = wr(Or.FILTER_PANEL_EMBED_POINT);
   return /* @__PURE__ */ I(
     "div",
     {
@@ -2024,19 +2004,19 @@ function Zi() {
           }
         ),
         /* @__PURE__ */ p("div", { className: "univer-mb-1 univer-flex-shrink-0 univer-flex-grow-0", children: /* @__PURE__ */ p(
-          ci,
+          ai,
           {
-            value: n,
+            value: s,
             items: i,
-            onChange: (F) => l(F)
+            onChange: (N) => l(N)
           }
         ) }),
-        s ? /* @__PURE__ */ p(
+        n ? /* @__PURE__ */ p(
           "div",
           {
             "data-u-comp": "sheets-filter-panel-content",
             className: "univer-flex-shrink univer-flex-grow univer-pt-2",
-            children: n === w.VALUES ? /* @__PURE__ */ p(Yi, { model: s }) : n === w.COLORS ? /* @__PURE__ */ p(Vi, { model: s }) : /* @__PURE__ */ p(Qi, { model: s })
+            children: s === w.VALUES ? /* @__PURE__ */ p(Gi, { model: n }) : s === w.COLORS ? /* @__PURE__ */ p(Wi, { model: n }) : /* @__PURE__ */ p(Qi, { model: n })
           }
         ) : /* @__PURE__ */ p("div", { className: "univer-flex-1" }),
         /* @__PURE__ */ I(
@@ -2057,7 +2037,7 @@ function Zi() {
     }
   );
 }
-function Ki(t) {
+function Zi(t) {
   const e = t.getCurrentLocale();
   return ut(() => [
     { label: t.t("sheets-filter.panel.by-values"), value: w.VALUES },
@@ -2065,14 +2045,14 @@ function Ki(t) {
     { label: t.t("sheets-filter.panel.by-conditions"), value: w.CONDITIONS }
   ], [e, t]);
 }
-function qi(t) {
+function Ki(t) {
   const e = t.get(z);
   return {
-    id: Fe.id,
+    id: Ne.id,
     type: lt.BUTTON_SELECTOR,
     icon: "FilterIcon",
     tooltip: "sheets-filter.toolbar.smart-toggle-filter-tooltip",
-    hidden$: ot(t, ne.UNIVER_SHEET),
+    hidden$: ot(t, se.UNIVER_SHEET),
     activated$: e.activeFilterModel$.pipe(ce((r) => !!r)),
     disabled$: Ir(
       t,
@@ -2086,84 +2066,84 @@ function qi(t) {
     )
   };
 }
-function Xi(t) {
+function qi(t) {
   const e = t.get(z);
   return {
-    id: st.id,
+    id: nt.id,
     type: lt.BUTTON,
     title: "sheets-filter.toolbar.clear-filter-criteria",
-    hidden$: ot(t, ne.UNIVER_SHEET),
+    hidden$: ot(t, se.UNIVER_SHEET),
     disabled$: e.activeFilterModel$.pipe(at((r) => {
-      var n;
-      return (n = r == null ? void 0 : r.hasCriteria$.pipe(ce((s) => !s))) != null ? n : me(!0);
+      var s;
+      return (s = r == null ? void 0 : r.hasCriteria$.pipe(ce((n) => !n))) != null ? s : me(!0);
     }))
   };
 }
-function zi(t) {
+function Xi(t) {
   const e = t.get(z);
   return {
-    id: nt.id,
+    id: st.id,
     type: lt.BUTTON,
     title: "sheets-filter.toolbar.re-calc-filter-conditions",
-    hidden$: ot(t, ne.UNIVER_SHEET),
+    hidden$: ot(t, se.UNIVER_SHEET),
     disabled$: e.activeFilterModel$.pipe(at((r) => {
-      var n;
-      return (n = r == null ? void 0 : r.hasCriteria$.pipe(ce((s) => !s))) != null ? n : me(!0);
+      var s;
+      return (s = r == null ? void 0 : r.hasCriteria$.pipe(ce((n) => !n))) != null ? s : me(!0);
     }))
   };
 }
-const Ji = {
+const zi = {
   [Mr.ORGANIZATION]: {
-    [Fe.id]: {
+    [Ne.id]: {
       order: 2,
-      menuItemFactory: qi,
-      [st.id]: {
+      menuItemFactory: Ki,
+      [nt.id]: {
         order: 0,
-        menuItemFactory: Xi
+        menuItemFactory: qi
       },
-      [nt.id]: {
+      [st.id]: {
         order: 1,
-        menuItemFactory: zi
+        menuItemFactory: Xi
       }
     }
   }
-}, en = {
-  id: Fe.id,
+}, Ji = {
+  id: Ne.id,
   binding: $r.L | _t.CTRL_COMMAND | _t.SHIFT,
   description: "sheets-filter.shortcut.smart-toggle-filter",
   preconditions: Rr,
   group: "4_sheet-edit"
 };
-var tn = Object.getOwnPropertyDescriptor, rn = (t, e, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? tn(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (s = i(s) || s);
-  return s;
-}, M = (t, e) => (r, n) => e(r, n, t);
+var es = Object.getOwnPropertyDescriptor, ts = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? es(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (n = i(n) || n);
+  return n;
+}, M = (t, e) => (r, s) => e(r, s, t);
 const bt = "FILTER_PANEL_POPUP";
 let He = class extends Ee {
-  constructor(e, r, n, s, a, i, o, l, c, h, d, C, f) {
+  constructor(e, r, s, n, a, i, o, l, c, h, d, C, f) {
     super(f, C);
     v(this, "_popupDisposable");
-    this._injector = e, this._componentManager = r, this._sheetsFilterPanelService = n, this._sheetCanvasPopupService = s, 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();
+    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() {
     [
-      en
+      Ji
     ].forEach((e) => {
       this.disposeWithMe(this._shortcutService.registerShortcut(e));
     });
   }
   _initCommands() {
     [
-      Fe,
+      Ne,
       gr,
       Sr,
-      V,
-      st,
+      Q,
       nt,
+      st,
       Zt,
       xe,
       Se
@@ -2172,21 +2152,21 @@ let He = class extends Ee {
     });
   }
   _initMenuItems() {
-    this._menuManagerService.mergeMenu(Ji);
+    this._menuManagerService.mergeMenu(zi);
   }
   _initUI() {
     [
-      [bt, Zi],
+      [bt, Yi],
       ["FilterIcon", er]
     ].forEach(([e, r]) => {
       this.disposeWithMe(
         this._componentManager.register(e, r)
       );
-    }), this.disposeWithMe(this._contextService.subscribeContextValue$(ue).pipe(ii()).subscribe((e) => {
+    }), this.disposeWithMe(this._contextService.subscribeContextValue$(ue).pipe(ri()).subscribe((e) => {
       e ? this._openFilterPopup() : this._closeFilterPopup();
     })), this.disposeWithMe(this._sheetsFilterService.errorMsg$.subscribe((e) => {
       e && this._messageService.show({
-        type: ui.Error,
+        type: ci.Error,
         content: this._localeService.t(e)
       });
     }));
@@ -2195,8 +2175,8 @@ let He = class extends Ee {
     const e = this._sheetsFilterPanelService.filterModel;
     if (!e)
       throw new Error("[SheetsFilterUIController]: no filter model when opening filter popup!");
-    const r = e.getRange(), n = this._sheetsFilterPanelService.col, { startRow: s } = r;
-    this._popupDisposable = this._sheetCanvasPopupService.attachPopupToCell(s, n, {
+    const r = e.getRange(), s = this._sheetsFilterPanelService.col, { startRow: n } = r;
+    this._popupDisposable = this._sheetCanvasPopupService.attachPopupToCell(n, s, {
       componentKey: bt,
       direction: "horizontal",
       onClickOutside: () => this._commandService.syncExecuteCommand(Se.id),
@@ -2208,7 +2188,7 @@ let He = class extends Ee {
     (e = this._popupDisposable) == null || e.dispose(), this._popupDisposable = null;
   }
 };
-He = rn([
+He = ts([
   M(0, T(ie)),
   M(1, T(xr)),
   M(2, T(q)),
@@ -2218,26 +2198,26 @@ He = rn([
   M(6, Ur),
   M(7, j),
   M(8, kr),
-  M(9, Ve),
+  M(9, Qe),
   M(10, Hr),
   M(11, T(Ht)),
   M(12, Dt)
 ], He);
-var nn = Object.defineProperty, sn = Object.getOwnPropertyDescriptor, on = (t, e, r) => e in t ? nn(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, ln = (t, e, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? sn(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (s = i(s) || s);
-  return s;
-}, Xe = (t, e) => (r, n) => e(r, n, t), rr = (t, e, r) => on(t, typeof e != "symbol" ? e + "" : e, r);
-const an = "SHEET_FILTER_UI_PLUGIN";
+var rs = Object.defineProperty, is = Object.getOwnPropertyDescriptor, ss = (t, e, r) => e in t ? rs(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, ns = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? is(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (n = i(n) || n);
+  return n;
+}, Xe = (t, e) => (r, s) => e(r, s, t), rr = (t, e, r) => ss(t, typeof e != "symbol" ? e + "" : e, r);
+const os = "SHEET_FILTER_UI_PLUGIN";
 let De = class extends it {
-  constructor(t = Ue, e, r, n) {
-    super(), this._config = t, this._injector = e, this._configService = r, this._rpcChannelService = n;
-    const { menu: s, ...a } = Ut(
+  constructor(t = Ue, e, r, s) {
+    super(), this._config = t, this._injector = e, this._configService = r, this._rpcChannelService = s;
+    const { menu: n, ...a } = Ut(
       {},
       Ue,
       this._config
     );
-    s && this._configService.setConfig("menu", s, { merge: !0 }), this._configService.setConfig(Kt, a);
+    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig(Kt, a);
   }
   onStarting() {
     dr(this._injector, [
@@ -2245,7 +2225,7 @@ let De = class extends it {
       [he],
       [He]
     ]), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([we, {
-      useFactory: () => ni(
+      useFactory: () => ii(
         this._rpcChannelService.requestChannel(ht)
       )
     }]);
@@ -2261,19 +2241,19 @@ let De = class extends it {
     ]);
   }
 };
-rr(De, "type", ne.UNIVER_SHEET);
-rr(De, "pluginName", an);
-De = ln([
+rr(De, "type", se.UNIVER_SHEET);
+rr(De, "pluginName", os);
+De = ns([
   $t(kt),
   Xe(1, T(ie)),
   Xe(2, xt),
-  Xe(3, hr(Vt))
+  Xe(3, hr(Qt))
 ], De);
-var cn = Object.getOwnPropertyDescriptor, un = (t, e, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? cn(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (s = i(s) || s);
-  return s;
-}, Rt = (t, e) => (r, n) => e(r, n, t), be;
+var ls = Object.getOwnPropertyDescriptor, as = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? ls(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (n = i(n) || n);
+  return n;
+}, Rt = (t, e) => (r, s) => e(r, s, t), be;
 let At = (be = class extends it {
   constructor(t, e, r) {
     super(), this._config = t, this._injector = e, this._rpcChannelService = r;
@@ -2289,10 +2269,10 @@ let At = (be = class extends it {
       si(this._injector.get(we))
     );
   }
-}, v(be, "type", ne.UNIVER_SHEET), v(be, "pluginName", "SHEET_FILTER_UI_WORKER_PLUGIN"), be);
-At = un([
+}, v(be, "type", se.UNIVER_SHEET), v(be, "pluginName", "SHEET_FILTER_UI_WORKER_PLUGIN"), be);
+At = as([
   Rt(1, T(ie)),
-  Rt(2, Vt)
+  Rt(2, Qt)
 ], At);
 export {
   Zt as ChangeFilterByOperation,