@univerjs/sheets-filter-ui 0.5.2 → 0.5.3-experimental.20250106-4af1f4e

package/lib/es/index.js

@@ -1,13 +1,13 @@
 var Kt = Object.defineProperty;
 var Xt = (t, e, r) => e in t ? Kt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
 var _ = (t, e, r) => Xt(t, typeof e != "symbol" ? e + "" : e, r);
-import { BooleanNumber as nt, createIdentifier as St, Inject as E, LocaleService as K, Disposable as de, IUniverInstanceService as Ye, ILogService as Zt, extractPureTextFromCell as Jt, numfmt as it, Injector as X, ICommandService as W, Quantity as gt, Tools as Fe, CommandType as $e, IContextService as we, useDependency as te, UniverInstanceType as Z, ThemeService as Et, RxDisposable as Tt, fromCallback as zt, InterceptorEffectEnum as er, DependentOn as Ft, Optional as tr, Plugin as qe, merge as Ct, IConfigService as Nt } from "@univerjs/core";
+import { BooleanNumber as it, createIdentifier as St, Inject as E, LocaleService as K, Disposable as de, IUniverInstanceService as Ye, ILogService as Zt, extractPureTextFromCell as Jt, numfmt as nt, Injector as X, ICommandService as W, Quantity as gt, Tools as Fe, CommandType as $e, IContextService as we, useDependency as te, UniverInstanceType as Z, ThemeService as Et, RxDisposable as Tt, fromCallback as zt, InterceptorEffectEnum as er, DependentOn as Ft, Optional as tr, Plugin as qe, merge as Ct, IConfigService as Nt } from "@univerjs/core";
 import { IRPCChannelService as Pt, toModule as rr, fromModule as sr } from "@univerjs/rpc";
-import { CustomFilterOperator as u, SetSheetsFilterCriteriaCommand as re, SheetsFilterService as Q, SmartToggleSheetsFilterCommand as fe, ClearSheetsFilterCriteriaCommand as Ke, ReCalcSheetsFilterCommand as Xe, FILTER_MUTATIONS as nr, SetSheetsFilterRangeMutation as ir, SetSheetsFilterCriteriaMutation as or, RemoveSheetsFilterMutation as ar, ReCalcSheetsFilterMutation as lr, RemoveSheetFilterCommand as cr, SetSheetFilterRangeCommand as ur, UniverSheetsFilterPlugin as Ot } from "@univerjs/sheets-filter";
-import { RefRangeService as hr, SheetsSelectionsService as pr, getSheetCommandTarget as mr, RangeProtectionPermissionViewPoint as le, WorksheetFilterPermission as ce, WorksheetViewPermission as ue, expandToContinuousRange as dr, SheetInterceptorService as fr, SetRangeValuesMutation as _r, INTERCEPTOR_POINT as vr } from "@univerjs/sheets";
-import { SetCellEditVisibleOperation as Sr, SheetPermissionInterceptorBaseController as gr, SheetsUIPart as Er, getObservableWithExclusiveRange$ as Tr, getCurrentRangeDisable$ as Fr, whenSheetEditorFocused as Cr, SheetSkeletonManagerService as Nr, ISheetSelectionRenderService as Pr, SelectionControl as Or, attachSelectionWithCoord as Ir, getCoordByCell as Rr, SheetsRenderService as It, SheetCanvasPopManagerService as yr } from "@univerjs/sheets-ui";
-import { ILayoutService as Ar, useObservable as V, useComponentsOfPart as br, ComponentContainer as Lr, MenuItemType as Ze, getMenuHiddenObservable as Je, RibbonStartGroup as Mr, KeyCode as $r, MetaKeys as ot, ComponentManager as wr, IShortcutService as Ur, IMenuManagerService as Hr, IMessageService as Dr } from "@univerjs/ui";
-import { BehaviorSubject as q, ReplaySubject as xr, of as _e, Subject as Br, merge as Vr, combineLatest as jr, throttleTime as Rt, startWith as yt, map as se, shareReplay as Wr, switchMap as ze, filter as Qr, takeUntil as kr, distinctUntilChanged as Gr } from "rxjs";
+import { CustomFilterOperator as u, SetSheetsFilterCriteriaCommand as re, SheetsFilterService as k, SmartToggleSheetsFilterCommand as fe, ClearSheetsFilterCriteriaCommand as Ke, ReCalcSheetsFilterCommand as Xe, FILTER_MUTATIONS as ir, SetSheetsFilterRangeMutation as nr, SetSheetsFilterCriteriaMutation as or, RemoveSheetsFilterMutation as ar, ReCalcSheetsFilterMutation as lr, RemoveSheetFilterCommand as cr, SetSheetFilterRangeCommand as ur, UniverSheetsFilterPlugin as Ot } from "@univerjs/sheets-filter";
+import { RefRangeService as hr, SheetPermissionCheckController as pr, SheetsSelectionsService as mr, getSheetCommandTarget as dr, RangeProtectionPermissionViewPoint as le, WorksheetFilterPermission as ce, WorksheetViewPermission as ue, expandToContinuousRange as fr, SheetInterceptorService as _r, SetRangeValuesMutation as vr, INTERCEPTOR_POINT as Sr } from "@univerjs/sheets";
+import { ILayoutService as gr, useObservable as V, useComponentsOfPart as Er, ComponentContainer as Tr, MenuItemType as Ze, getMenuHiddenObservable as Je, RibbonStartGroup as Fr, KeyCode as Cr, MetaKeys as ot, ComponentManager as Nr, IShortcutService as Pr, IMenuManagerService as Or, IMessageService as Rr } from "@univerjs/ui";
+import { SetCellEditVisibleOperation as Ir, SheetsUIPart as yr, getObservableWithExclusiveRange$ as Ar, getCurrentRangeDisable$ as br, whenSheetEditorFocused as Lr, SheetSkeletonManagerService as Mr, ISheetSelectionRenderService as $r, SelectionControl as wr, attachSelectionWithCoord as Ur, getCoordByCell as Hr, SheetsRenderService as Rt, SheetCanvasPopManagerService as Dr } from "@univerjs/sheets-ui";
+import { BehaviorSubject as q, ReplaySubject as xr, of as _e, Subject as Br, merge as Vr, combineLatest as jr, throttleTime as It, startWith as yt, map as se, shareReplay as Wr, switchMap as ze, filter as kr, takeUntil as Qr, distinctUntilChanged as Gr } from "rxjs";
 import { Select as at, RadioGroup as Yr, Radio as lt, Input as At, Checkbox as qr, Tree as Kr, Button as Ce, Segmented as Xr, MessageType as Zr } from "@univerjs/design";
 import { Rect as ct, Shape as Jr, IRenderManagerService as bt } from "@univerjs/engine-render";
 import zr, { forwardRef as Lt, useRef as es, createElement as Mt, useCallback as D, useMemo as et } from "react";
@@ -304,7 +304,7 @@ var N = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
       const { val1: o, val2: a, operator1: c } = s, h = c === u.GREATER_THAN_OR_EQUAL;
       return {
         customFilters: {
-          and: nt.TRUE,
+          and: it.TRUE,
           customFilters: [
             { val: h ? o : a, operator: u.GREATER_THAN_OR_EQUAL },
             { val: h ? a : o, operator: u.LESS_THAN_OR_EQUAL }
@@ -390,10 +390,10 @@ var N = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     testMappingParams: () => !0,
     mapToFilterColumn: (s) => {
       const { and: o, val1: a, val2: c, operator1: h, operator2: p } = s;
-      function S(R, I) {
+      function S(I, R) {
         for (const M of t.ALL_CONDITIONS)
-          if (M.operator === R)
-            return M.mapToFilterColumn({ val1: I, operator1: R });
+          if (M.operator === I)
+            return M.mapToFilterColumn({ val1: R, operator1: I });
       }
       const f = !h || h === t.NONE.operator, T = !p || p === t.NONE.operator;
       if (f && T)
@@ -408,7 +408,7 @@ var N = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
           P.customFilters.customFilters[0]
         ]
       };
-      return o && (F.and = nt.TRUE), { customFilters: F };
+      return o && (F.and = it.TRUE), { customFilters: F };
     },
     testMappingFilterColumn: (s) => {
       var c;
@@ -463,15 +463,15 @@ var N = /* @__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(s) {
+  function i(s) {
     const o = t.ALL_CONDITIONS.find((a) => a.operator === s);
     return (o == null ? void 0 : o.numOfParameters) === 0 ? { operator1: o.operator } : o.getDefaultFormParams();
   }
-  t.getInitialFormParams = n;
-  function i(s, o) {
+  t.getInitialFormParams = i;
+  function n(s, o) {
     return s.mapToFilterColumn(o);
   }
-  t.mapToFilterColumn = i;
+  t.mapToFilterColumn = n;
   function l(s) {
     if (!s)
       return [t.NONE, {}];
@@ -485,40 +485,40 @@ var N = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
   t.testMappingFilterColumn = l;
 })(m || (m = {}));
 function L(t) {
-  const { operator1: e, operator2: r, val1: n, val2: i } = t;
+  const { operator1: e, operator2: r, val1: i, 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, i];
+  return e ? [e, i] : [r, n];
 }
 function je(t) {
   const e = [], r = [];
-  let n = 0, i = 0;
+  let i = 0, n = 0;
   function l(s) {
-    s.leaf && (s.checked ? (e.push(s), n += s.count) : (r.push(s), i += s.count)), s.children && s.children.forEach(l);
+    s.leaf && (s.checked ? (e.push(s), i += s.count) : (r.push(s), n += s.count)), s.children && s.children.forEach(l);
   }
   return t.forEach(l), {
     checkedItems: e,
     uncheckedItems: r,
-    checked: n,
-    unchecked: i
+    checked: i,
+    unchecked: n
   };
 }
-var ts = Object.defineProperty, rs = Object.getOwnPropertyDescriptor, ss = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? rs(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && ts(e, r, i), i;
-}, De = (t, e) => (r, n) => e(r, n, t);
-const tt = "sheets-filter.generate-filter-values.service", Pe = St(tt), ns = ["yyyy-mm-dd", "yyyy-mm-dd;@", "yyyy/mm/dd;@", "yyyy/mm/dd hh:mm", "yyyy-m-d am/pm h:mm", "yyyy-MM-dd", "yyyy/MM/dd", "yyyy/mm/dd", 'yyyy"年"MM"月"dd"日"', "MM-dd", 'M"月"d"日"', "MM-dd A/P hh:mm"];
+var ts = Object.defineProperty, rs = Object.getOwnPropertyDescriptor, ss = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? rs(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+    (s = t[l]) && (n = (i ? s(e, r, n) : s(n)) || n);
+  return i && n && ts(e, r, n), n;
+}, De = (t, e) => (r, i) => e(r, i, t);
+const tt = "sheets-filter.generate-filter-values.service", Pe = St(tt), is = ["yyyy-mm-dd", "yyyy-mm-dd;@", "yyyy/mm/dd;@", "yyyy/mm/dd hh:mm", "yyyy-m-d am/pm h:mm", "yyyy-MM-dd", "yyyy/MM/dd", "yyyy/mm/dd", 'yyyy"年"MM"月"dd"日"', "MM-dd", 'M"月"d"日"', "MM-dd A/P hh:mm"];
 let We = class extends de {
   constructor(t, e, r) {
     super(), this._localeService = t, this._univerInstanceService = e, this._logService = r;
   }
   async getFilterValues(t) {
     var h;
-    const { unitId: e, subUnitId: r, filteredOutRowsByOtherColumns: n, filters: i, blankChecked: l, iterateRange: s, alreadyChecked: o } = t, a = this._univerInstanceService.getUnit(e), c = (h = this._univerInstanceService.getUnit(e)) == null ? void 0 : h.getSheetBySheetId(r);
-    return !a || !c ? [] : (this._logService.debug("[SheetsGenerateFilterValuesService]", "getFilterValues for", { unitId: e, subUnitId: r }), wt(i, this._localeService, s, c, new Set(n), new Set(o.map(String)), l, a.getStyles()));
+    const { unitId: e, subUnitId: r, filteredOutRowsByOtherColumns: i, filters: n, blankChecked: l, iterateRange: s, alreadyChecked: o } = t, a = this._univerInstanceService.getUnit(e), c = (h = this._univerInstanceService.getUnit(e)) == null ? void 0 : h.getSheetBySheetId(r);
+    return !a || !c ? [] : (this._logService.debug("[SheetsGenerateFilterValuesService]", "getFilterValues for", { unitId: e, subUnitId: r }), wt(n, this._localeService, s, c, new Set(i), new Set(o.map(String)), l, a.getStyles()));
   }
 };
 We = ss([
@@ -526,32 +526,32 @@ We = ss([
   De(1, Ye),
   De(2, Zt)
 ], We);
-function wt(t, e, r, n, i, l, s, o) {
-  var g, P, F, R, I, M, $, ve, Se;
-  const a = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map(), h = "yyyy-mm-dd", p = new Set(ns), S = "empty";
+function wt(t, e, r, i, n, l, s, o) {
+  var g, P, F, I, R, M, $, ve, Se;
+  const a = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map(), h = "yyyy-mm-dd", p = new Set(is), S = "empty";
   let f = 0;
-  for (const y of n.iterateByColumn(r, !1, !1)) {
+  for (const y of i.iterateByColumn(r, !1, !1)) {
     const { row: Gt, rowSpan: st = 1 } = y;
     let J = 0;
     for (; J < st; ) {
       const Yt = Gt + J;
-      if (i.has(Yt)) {
+      if (n.has(Yt)) {
         J++;
         continue;
       }
-      const k = y != null && y.value ? Jt(y.value) : "";
-      if (!k) {
+      const Q = y != null && y.value ? Jt(y.value) : "";
+      if (!Q) {
         f += 1, J += st;
         continue;
       }
-      const ge = (g = y.value) != null && g.v && !y.value.p ? (R = (F = o.get((P = y.value) == null ? void 0 : P.s)) == null ? void 0 : F.n) == null ? void 0 : R.pattern : "", qt = ge && it.isDate(ge);
+      const ge = (g = y.value) != null && g.v && !y.value.p ? (I = (F = o.get((P = y.value) == null ? void 0 : P.s)) == null ? void 0 : F.n) == null ? void 0 : I.pattern : "", qt = ge && nt.isDate(ge);
       if (ge && qt && p.has(ge)) {
-        const x = (I = n.getCellRaw(y.row, y.col)) == null ? void 0 : I.v;
+        const x = (R = i.getCellRaw(y.row, y.col)) == null ? void 0 : R.v;
         if (!x) {
           J++;
           continue;
         }
-        const z = it.format(h, x), [O, w, oe] = z.split("-").map(Number);
+        const z = nt.format(h, x), [O, w, oe] = z.split("-").map(Number);
         let G = a.get(`${O}`);
         G || (G = {
           title: `${O}`,
@@ -571,21 +571,21 @@ function wt(t, e, r, n, i, l, s, o) {
           checked: !1
         }, ($ = G.children) == null || $.push(U), c.set(`${O}-${w}`, [`${O}`, `${O}-${w}`]));
         const Ue = (ve = U == null ? void 0 : U.children) == null ? void 0 : ve.find((He) => He.key === `${O}-${w}-${oe}`);
-        Ue ? (Ue.originValues.add(k), Ue.count++, U.count++, G.count++) : ((Se = U.children) == null || Se.push({
+        Ue ? (Ue.originValues.add(Q), Ue.count++, U.count++, G.count++) : ((Se = U.children) == null || Se.push({
           title: `${oe}`,
           key: `${O}-${w}-${oe}`,
           count: 1,
-          originValues: /* @__PURE__ */ new Set([k]),
+          originValues: /* @__PURE__ */ new Set([Q]),
           leaf: !0,
-          checked: l.size ? l.has(k) : !s
+          checked: l.size ? l.has(Q) : !s
         }), U.count++, G.count++, c.set(`${O}-${w}-${oe}`, [`${O}`, `${O}-${w}`, `${O}-${w}-${oe}`]));
       } else {
-        const x = k;
+        const x = Q;
         let z = a.get(x);
         z ? z.count++ : (z = {
-          title: k,
+          title: Q,
           leaf: !0,
-          checked: l.size ? l.has(k) : !s,
+          checked: l.size ? l.has(Q) : !s,
           key: x,
           count: 1
         }, a.set(x, z), c.set(x, [x]));
@@ -605,29 +605,29 @@ function wt(t, e, r, n, i, l, s, o) {
     a.set("empty", y), c.set("empty", [S]);
   }
   return {
-    filterTreeItems: is(Array.from(a.values())),
+    filterTreeItems: ns(Array.from(a.values())),
     filterTreeMapCache: c
   };
 }
-function is(t) {
-  return Array.from(t).sort((e, r) => e.children && !r.children ? -1 : !e.children && r.children ? 1 : r.title.localeCompare(e.title)).map((e) => (e.children && e.children.sort((r, n) => {
-    const i = Number.parseInt(r.key.split("-")[1], 10), l = Number.parseInt(n.key.split("-")[1], 10);
-    return i - l;
+function ns(t) {
+  return Array.from(t).sort((e, r) => e.children && !r.children ? -1 : !e.children && r.children ? 1 : r.title.localeCompare(e.title)).map((e) => (e.children && e.children.sort((r, i) => {
+    const n = Number.parseInt(r.key.split("-")[1], 10), l = Number.parseInt(i.key.split("-")[1], 10);
+    return n - l;
   }).forEach((r) => {
-    r.children && r.children.sort((n, i) => {
-      const l = Number.parseInt(n.key.split("-")[2], 10), s = Number.parseInt(i.key.split("-")[2], 10);
+    r.children && r.children.sort((i, n) => {
+      const l = Number.parseInt(i.key.split("-")[2], 10), s = Number.parseInt(n.key.split("-")[2], 10);
       return l - s;
     });
   }), e));
 }
-function Qe(t, e) {
+function ke(t, e) {
   for (const r of t) {
     if (r.key === e)
       return r;
     if (r.children) {
-      const n = Qe(r.children, e);
-      if (n)
-        return n;
+      const i = ke(r.children, e);
+      if (i)
+        return i;
     }
   }
   return null;
@@ -640,30 +640,30 @@ function he(t, e) {
 }
 function Ht(t, e) {
   const r = [];
-  return t.forEach((n) => {
-    const i = n.originValues ? e.some(
-      (o) => Array.from(n.originValues).some(
+  return t.forEach((i) => {
+    const n = i.originValues ? e.some(
+      (o) => Array.from(i.originValues).some(
         (a) => a.toLowerCase().includes(o.toLowerCase())
       )
-    ) : !1, l = !i && e.some(
-      (o) => n.title.toLowerCase().includes(o.toLowerCase())
+    ) : !1, l = !n && e.some(
+      (o) => i.title.toLowerCase().includes(o.toLowerCase())
     );
-    if (i || l)
-      r.push({ ...n });
-    else if (n.children) {
-      const o = Ht(n.children, e);
+    if (n || l)
+      r.push({ ...i });
+    else if (i.children) {
+      const o = Ht(i.children, e);
       if (o.length > 0) {
         const a = o.reduce((c, h) => c + h.count, 0);
-        r.push({ ...n, count: a, children: o });
+        r.push({ ...i, count: a, children: o });
       }
     }
   }), r;
 }
-var os = Object.defineProperty, as = Object.getOwnPropertyDescriptor, rt = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? as(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && os(e, r, i), i;
-}, Oe = (t, e) => (r, n) => e(r, n, t), Ie = /* @__PURE__ */ ((t) => (t[t.VALUES = 0] = "VALUES", t[t.CONDITIONS = 1] = "CONDITIONS", t))(Ie || {});
+var os = Object.defineProperty, as = Object.getOwnPropertyDescriptor, rt = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? as(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+    (s = t[l]) && (n = (i ? s(e, r, n) : s(n)) || n);
+  return i && n && os(e, r, n), n;
+}, Oe = (t, e) => (r, i) => e(r, i, t), Re = /* @__PURE__ */ ((t) => (t[t.VALUES = 0] = "VALUES", t[t.CONDITIONS = 1] = "CONDITIONS", t))(Re || {});
 St("sheets-filter-ui.sheets-filter-panel.service");
 let j = class extends de {
   constructor(e, r) {
@@ -704,14 +704,14 @@ let j = class extends de {
   }
   setupCol(e, r) {
     this.terminate(), this._filterModel = e, this._col$.next(r);
-    const n = e.getFilterColumn(r);
-    if (n) {
-      const i = n.getColumnData();
-      if (i.customFilters) {
+    const i = e.getFilterColumn(r);
+    if (i) {
+      const n = i.getColumnData();
+      if (n.customFilters) {
         this._hasCriteria$.next(!0), this._setupByConditions(e, r);
         return;
       }
-      if (i.filters) {
+      if (n.filters) {
         this._hasCriteria$.next(!0), this._setupByValues(e, r);
         return;
       }
@@ -732,13 +732,13 @@ let j = class extends de {
   }
   _listenToFilterHeaderChange(e, r) {
     this._disposeFilterHeaderChangeListener();
-    const n = e.unitId, i = e.subUnitId, l = e.getRange(), s = {
+    const i = e.unitId, n = e.subUnitId, l = e.getRange(), s = {
       startColumn: r,
       startRow: l.startRow,
       endRow: l.startRow,
       endColumn: r
     };
-    this._filterHeaderListener = this._refRangeService.watchRange(n, i, s, (o, a) => {
+    this._filterHeaderListener = this._refRangeService.watchRange(i, n, s, (o, a) => {
       if (!a)
         this.terminate();
       else {
@@ -749,29 +749,29 @@ let j = class extends de {
   }
   async _setupByValues(e, r) {
     this._disposePreviousModel();
-    const n = e.getRange();
-    if (n.startRow === n.endRow) return !1;
-    const i = await ye.fromFilterColumn(
+    const i = e.getRange();
+    if (i.startRow === i.endRow) return !1;
+    const n = await ye.fromFilterColumn(
       this._injector,
       e,
       r
     );
-    return this.filterByModel = i, this._filterBy$.next(
+    return this.filterByModel = n, this._filterBy$.next(
       0
       /* VALUES */
     ), this._listenToFilterHeaderChange(e, r), !0;
   }
   _setupByConditions(e, r) {
     this._disposePreviousModel();
-    const n = e.getRange();
-    if (n.startRow === n.endRow) return !1;
-    const i = Re.fromFilterColumn(
+    const i = e.getRange();
+    if (i.startRow === i.endRow) return !1;
+    const n = Ie.fromFilterColumn(
       this._injector,
       e,
       r,
       e.getFilterColumn(r)
     );
-    return this.filterByModel = i, this._filterBy$.next(
+    return this.filterByModel = n, this._filterBy$.next(
       1
       /* CONDITIONS */
     ), this._listenToFilterHeaderChange(e, r), !0;
@@ -785,15 +785,15 @@ j = rt([
   Oe(0, E(X)),
   Oe(1, E(hr))
 ], j);
-let Re = class extends de {
-  constructor(e, r, n, i, l) {
+let Ie = class extends de {
+  constructor(e, r, i, n, l) {
     super();
     _(this, "canApply$", _e(!0));
     _(this, "_conditionItem$");
     _(this, "conditionItem$");
     _(this, "_filterConditionFormParams$");
     _(this, "filterConditionFormParams$");
-    this._filterModel = e, this.col = r, this._commandService = l, this._conditionItem$ = new q(n), this.conditionItem$ = this._conditionItem$.asObservable(), this._filterConditionFormParams$ = new q(i), this.filterConditionFormParams$ = this._filterConditionFormParams$.asObservable();
+    this._filterModel = e, this.col = r, this._commandService = l, this._conditionItem$ = new q(i), this.conditionItem$ = this._conditionItem$.asObservable(), this._filterConditionFormParams$ = new q(n), this.filterConditionFormParams$ = this._filterConditionFormParams$.asObservable();
   }
   /**
    * Create a model with targeting filter column. If there is not a filter column, the model would be created with
@@ -806,9 +806,9 @@ let Re = class extends de {
    *
    * @returns the model to control the panel's state
    */
-  static fromFilterColumn(e, r, n, i) {
-    const [l, s] = m.testMappingFilterColumn(i == null ? void 0 : i.getColumnData());
-    return e.createInstance(Re, r, n, l, s);
+  static fromFilterColumn(e, r, i, n) {
+    const [l, s] = m.testMappingFilterColumn(n == null ? void 0 : n.getColumnData());
+    return e.createInstance(Ie, r, i, l, s);
   }
   get conditionItem() {
     return this._conditionItem$.getValue();
@@ -848,7 +848,7 @@ let Re = 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((i) => i.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));
@@ -864,17 +864,17 @@ let Re = 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 i = m.testMappingParams(r, this.conditionItem.numOfParameters);
+      this._conditionItem$.next(i);
     }
     this._filterConditionFormParams$.next(r);
   }
 };
-Re = rt([
+Ie = rt([
   Oe(4, W)
-], Re);
+], Ie);
 let ye = class extends de {
-  constructor(e, r, n, i, l) {
+  constructor(e, r, i, n, l) {
     super();
     _(this, "_rawFilterItems$");
     _(this, "rawFilterItems$");
@@ -885,10 +885,10 @@ let ye = class extends de {
     _(this, "_manuallyUpdateFilterItems$");
     _(this, "_searchString$");
     _(this, "searchString$");
-    this._filterModel = e, this.col = r, this._commandService = l, this._treeMapCache = i, this._searchString$ = new q(""), this.searchString$ = this._searchString$.asObservable(), this._rawFilterItems$ = new q(n), this.rawFilterItems$ = this._rawFilterItems$.asObservable(), this._manuallyUpdateFilterItems$ = new Br(), this.filterItems$ = Vr(
+    this._filterModel = e, this.col = r, this._commandService = l, this._treeMapCache = n, this._searchString$ = new q(""), this.searchString$ = this._searchString$.asObservable(), this._rawFilterItems$ = new q(i), this.rawFilterItems$ = this._rawFilterItems$.asObservable(), this._manuallyUpdateFilterItems$ = new Br(), this.filterItems$ = Vr(
       jr([
         this._searchString$.pipe(
-          Rt(500, void 0, { leading: !0, trailing: !0 }),
+          It(500, void 0, { leading: !0, trailing: !0 }),
           yt(void 0)
         ),
         this._rawFilterItems$
@@ -912,14 +912,14 @@ let ye = class extends de {
    *
    * @returns the model to control the panel's state
    */
-  static async fromFilterColumn(e, r, n) {
+  static async fromFilterColumn(e, r, i) {
     var M;
-    const i = e.get(Ye), l = e.get(K), s = e.get(Pe, gt.OPTIONAL), { unitId: o, subUnitId: a } = r, c = i.getUniverSheetInstance(o);
+    const n = e.get(Ye), l = e.get(K), s = e.get(Pe, gt.OPTIONAL), { unitId: o, subUnitId: a } = r, c = n.getUniverSheetInstance(o);
     if (!c) throw new Error(`[ByValuesModel]: Workbook not found for filter model with unitId: ${o}!`);
     const h = c == null ? void 0 : c.getSheetBySheetId(a);
     if (!h) throw new Error(`[ByValuesModel]: Worksheet not found for filter model with unitId: ${o} and subUnitId: ${a}!`);
-    const p = r.getRange(), S = n, f = (M = r.getFilterColumn(n)) == null ? void 0 : M.getColumnData().filters, T = new Set(f == null ? void 0 : f.filters), g = !!(f && f.blank), P = r.getFilteredOutRowsExceptCol(n), F = { ...p, startRow: p.startRow + 1, startColumn: S, endColumn: S };
-    let R, I;
+    const p = r.getRange(), S = i, f = (M = r.getFilterColumn(i)) == null ? void 0 : M.getColumnData().filters, T = new Set(f == null ? void 0 : f.filters), g = !!(f && f.blank), P = r.getFilteredOutRowsExceptCol(i), F = { ...p, startRow: p.startRow + 1, startColumn: S, endColumn: S };
+    let I, R;
     if (s) {
       const $ = await s.getFilterValues({
         unitId: o,
@@ -930,12 +930,12 @@ let ye = class extends de {
         iterateRange: F,
         alreadyChecked: Array.from(T)
       });
-      R = $.filterTreeItems, I = $.filterTreeMapCache;
+      I = $.filterTreeItems, R = $.filterTreeMapCache;
     } else {
       const $ = wt(!!f, l, F, h, P, T, g, c.getStyles());
-      R = $.filterTreeItems, I = $.filterTreeMapCache;
+      I = $.filterTreeItems, R = $.filterTreeMapCache;
     }
-    return e.createInstance(ye, r, n, R, I);
+    return e.createInstance(ye, r, i, I, R);
   }
   get rawFilterItems() {
     return this._rawFilterItems$.getValue();
@@ -957,23 +957,23 @@ let ye = class extends de {
   }
   onCheckAllToggled(e) {
     const r = Fe.deepClone(this._filterItems);
-    r.forEach((n) => he(n, e)), this._manuallyUpdateFilterItems(r);
+    r.forEach((i) => he(i, e)), this._manuallyUpdateFilterItems(r);
   }
   /**
    * Toggle a filter item.
    */
   onFilterCheckToggled(e) {
-    const r = Fe.deepClone(this._filterItems), n = Qe(r, e.key);
-    if (!n)
+    const r = Fe.deepClone(this._filterItems), i = ke(r, e.key);
+    if (!i)
       return;
-    const i = Ut(n);
-    he(n, !i), this._manuallyUpdateFilterItems(r);
+    const n = Ut(i);
+    he(i, !n), this._manuallyUpdateFilterItems(r);
   }
   onFilterOnly(e) {
     const r = Fe.deepClone(this._filterItems);
-    r.forEach((n) => he(n, !1)), e.forEach((n) => {
-      const i = Qe(r, n);
-      i && he(i, !0);
+    r.forEach((i) => he(i, !1)), e.forEach((i) => {
+      const n = ke(r, i);
+      n && he(n, !0);
     }), this._manuallyUpdateFilterItems(r);
   }
   _manuallyUpdateFilterItems(e) {
@@ -995,9 +995,9 @@ let ye = class extends de {
   async apply() {
     if (this._disposed)
       return !1;
-    const e = je(this._filterItems), { checked: r, checkedItems: n } = e, i = this.rawFilterItems;
+    const e = je(this._filterItems), { checked: r, checkedItems: i } = e, n = this.rawFilterItems;
     let l = 0;
-    for (const c of i)
+    for (const c of n)
       l += c.count;
     const s = r === 0, o = e.checked === l, a = { colId: this.col };
     if (s)
@@ -1011,10 +1011,10 @@ let ye = class extends de {
       });
     {
       a.filters = {};
-      const c = n.filter((p) => p.key !== "empty");
+      const c = i.filter((p) => p.key !== "empty");
       c.length > 0 && (a.filters = {
         filters: c.flatMap((p) => p.originValues ? Array.from(p.originValues) : [p.title])
-      }), c.length !== n.length && (a.filters.blank = !0);
+      }), c.length !== i.length && (a.filters.blank = !0);
     }
     return this._commandService.executeCommand(re.id, {
       unitId: this._filterModel.unitId,
@@ -1028,21 +1028,21 @@ let ye = class extends de {
 ye = rt([
   Oe(4, W)
 ], ye);
-const ne = "FILTER_PANEL_OPENED", Ae = {
+const ie = "FILTER_PANEL_OPENED", Ae = {
   id: "sheet.operation.open-filter-panel",
   type: $e.OPERATION,
   handler: (t, e) => {
-    const r = t.get(we), n = t.get(Q), i = t.get(j);
-    t.get(W).syncExecuteCommand(Sr.id, { visible: !1 });
-    const { unitId: s, subUnitId: o, col: a } = e, c = n.getFilterModel(s, o);
-    return c ? (i.setupCol(c, a), r.getContextValue(ne) || r.setContextValue(ne, !0), !0) : !1;
+    const r = t.get(we), i = t.get(k), n = t.get(j);
+    t.get(W).syncExecuteCommand(Ir.id, { visible: !1 });
+    const { unitId: s, subUnitId: o, col: a } = e, c = i.getFilterModel(s, o);
+    return c ? (n.setupCol(c, a), r.getContextValue(ie) || r.setContextValue(ie, !0), !0) : !1;
   }
 }, pe = {
   id: "sheet.operation.close-filter-panel",
   type: $e.OPERATION,
   handler: (t) => {
-    const e = t.get(we), r = t.get(j), n = t.get(Ar, gt.OPTIONAL);
-    return e.getContextValue(ne) ? (e.setContextValue(ne, !1), n == null || n.focus(), r.terminate()) : !1;
+    const e = t.get(we), r = t.get(j), i = t.get(gr, gt.OPTIONAL);
+    return e.getContextValue(ie) ? (e.setContextValue(ie, !1), i == null || i.focus(), r.terminate()) : !1;
   }
 }, Dt = {
   id: "sheet.operation.apply-filter",
@@ -1052,26 +1052,26 @@ const ne = "FILTER_PANEL_OPENED", Ae = {
     return t.get(j).changeFilterBy(r);
   }
 };
-var ls = Object.defineProperty, cs = Object.getOwnPropertyDescriptor, us = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? cs(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && ls(e, r, i), i;
-}, ee = (t, e) => (r, n) => e(r, n, t);
-let ie = class extends de {
-  constructor(t, e, r, n, i, l) {
-    super(), this._sheetsFilterService = t, this._localeService = e, this._commandService = r, this._sheetPermissionInterceptorBaseController = n, this._injector = i, this._sheetsSelectionService = l, this._commandExecutedListener();
+var ls = Object.defineProperty, cs = Object.getOwnPropertyDescriptor, us = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? cs(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+    (s = t[l]) && (n = (i ? s(e, r, n) : s(n)) || n);
+  return i && n && ls(e, r, n), n;
+}, ee = (t, e) => (r, i) => e(r, i, t);
+let ne = class extends de {
+  constructor(t, e, r, i, n, l) {
+    super(), this._sheetsFilterService = t, this._localeService = e, this._commandService = r, this._sheetPermissionCheckPermission = i, this._injector = n, this._sheetsSelectionService = l, this._commandExecutedListener();
   }
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((t) => {
-        var e, r, n;
+        var e, r, i;
         if (t.id === fe.id) {
-          const i = this._injector.get(Ye), l = mr(i);
+          const n = this._injector.get(Ye), l = dr(n);
           if (!l) return;
           const { unitId: s, subUnitId: o, worksheet: a } = l, c = (e = this._sheetsFilterService.getFilterModel(s, o)) == null ? void 0 : e.getRange();
           let h;
           if (c)
-            h = this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
+            h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
               rangeTypes: [le],
               worksheetTypes: [ce, ue]
             }, [c]);
@@ -1079,74 +1079,74 @@ let ie = class extends de {
             const p = (r = this._sheetsSelectionService.getCurrentLastSelection()) == null ? void 0 : r.range;
             if (p) {
               let S = { ...p };
-              S = p.startColumn === p.endColumn && p.startRow === p.endRow ? dr(S, { left: !0, right: !0, up: !0, down: !0 }, a) : S, h = this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
+              S = p.startColumn === p.endColumn && p.startRow === p.endRow ? fr(S, { left: !0, right: !0, up: !0, down: !0 }, a) : S, h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
                 rangeTypes: [le],
                 worksheetTypes: [ue, ce]
               }, [S], s, o);
             } else
-              h = this._sheetPermissionInterceptorBaseController.permissionCheckWithoutRange({
+              h = this._sheetPermissionCheckPermission.permissionCheckWithoutRange({
                 rangeTypes: [le],
                 worksheetTypes: [ue, ce]
               });
           }
-          h || this._sheetPermissionInterceptorBaseController.haveNotPermissionHandle(this._localeService.t("permission.dialog.filterErr"));
+          h || this._sheetPermissionCheckPermission.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.filterErr"));
         }
         if (t.id === Ae.id) {
-          const i = t.params, { unitId: l, subUnitId: s } = i, o = (n = this._sheetsFilterService.getFilterModel(l, s)) == null ? void 0 : n.getRange(), a = Fe.deepClone(o);
-          a && (a.startColumn = i.col, a.endColumn = i.col, this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
+          const n = t.params, { unitId: l, subUnitId: s } = n, o = (i = this._sheetsFilterService.getFilterModel(l, s)) == null ? void 0 : i.getRange(), a = Fe.deepClone(o);
+          a && (a.startColumn = n.col, a.endColumn = n.col, this._sheetPermissionCheckPermission.permissionCheckWithRanges({
             rangeTypes: [le],
             worksheetTypes: [ce, ue]
-          }, [a]) || this._sheetPermissionInterceptorBaseController.haveNotPermissionHandle(this._localeService.t("permission.dialog.filterErr")));
+          }, [a]) || this._sheetPermissionCheckPermission.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.filterErr")));
         }
       })
     );
   }
 };
-ie = us([
-  ee(0, E(Q)),
+ne = us([
+  ee(0, E(k)),
   ee(1, E(K)),
   ee(2, W),
-  ee(3, E(gr)),
+  ee(3, E(pr)),
   ee(4, E(X)),
-  ee(5, E(pr))
-], ie);
+  ee(5, E(mr))
+], ne);
 var b = function() {
   return b = Object.assign || function(t) {
-    for (var e, r = 1, n = arguments.length; r < n; r++) {
+    for (var e, r = 1, i = arguments.length; r < i; r++) {
       e = arguments[r];
-      for (var i in e) Object.prototype.hasOwnProperty.call(e, i) && (t[i] = e[i]);
+      for (var n in e) Object.prototype.hasOwnProperty.call(e, n) && (t[n] = e[n]);
     }
     return t;
   }, b.apply(this, arguments);
 }, hs = function(t, e) {
   var r = {};
-  for (var n in t) Object.prototype.hasOwnProperty.call(t, n) && e.indexOf(n) < 0 && (r[n] = t[n]);
+  for (var i in t) Object.prototype.hasOwnProperty.call(t, i) && e.indexOf(i) < 0 && (r[i] = t[i]);
   if (t != null && typeof Object.getOwnPropertySymbols == "function")
-    for (var i = 0, n = Object.getOwnPropertySymbols(t); i < n.length; i++)
-      e.indexOf(n[i]) < 0 && Object.prototype.propertyIsEnumerable.call(t, n[i]) && (r[n[i]] = t[n[i]]);
+    for (var n = 0, i = Object.getOwnPropertySymbols(t); n < i.length; n++)
+      e.indexOf(i[n]) < 0 && Object.prototype.propertyIsEnumerable.call(t, i[n]) && (r[i[n]] = t[i[n]]);
   return r;
 }, xt = Lt(function(t, e) {
-  var r = t.icon, n = t.id, i = t.className, l = t.extend, s = hs(t, ["icon", "id", "className", "extend"]), o = "univerjs-icon univerjs-icon-".concat(n, " ").concat(i || "").trim(), a = es("_".concat(ds()));
-  return Bt(r, "".concat(n), { defIds: r.defIds, idSuffix: a.current }, b({ ref: e, className: o }, s), l);
+  var r = t.icon, i = t.id, n = t.className, l = t.extend, s = hs(t, ["icon", "id", "className", "extend"]), o = "univerjs-icon univerjs-icon-".concat(i, " ").concat(n || "").trim(), a = es("_".concat(ds()));
+  return Bt(r, "".concat(i), { defIds: r.defIds, idSuffix: a.current }, b({ ref: e, className: o }, s), l);
 });
-function Bt(t, e, r, n, i) {
-  return Mt(t.tag, b(b({ key: e }, ps(t, r, i)), n), (ms(t, r).children || []).map(function(l, s) {
-    return Bt(l, "".concat(e, "-").concat(t.tag, "-").concat(s), r, void 0, i);
+function Bt(t, e, r, i, n) {
+  return Mt(t.tag, b(b({ key: e }, ps(t, r, n)), i), (ms(t, r).children || []).map(function(l, s) {
+    return Bt(l, "".concat(e, "-").concat(t.tag, "-").concat(s), r, void 0, n);
   }));
 }
 function ps(t, e, r) {
-  var n = b({}, t.attrs);
-  r != null && r.colorChannel1 && n.fill === "colorChannel1" && (n.fill = r.colorChannel1);
-  var i = e.defIds;
-  return !i || i.length === 0 || (t.tag === "use" && n["xlink:href"] && (n["xlink:href"] = n["xlink:href"] + e.idSuffix), Object.entries(n).forEach(function(l) {
+  var i = b({}, t.attrs);
+  r != null && r.colorChannel1 && i.fill === "colorChannel1" && (i.fill = r.colorChannel1);
+  var n = e.defIds;
+  return !n || n.length === 0 || (t.tag === "use" && i["xlink:href"] && (i["xlink:href"] = i["xlink:href"] + e.idSuffix), Object.entries(i).forEach(function(l) {
     var s = l[0], o = l[1];
-    typeof o == "string" && (n[s] = o.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
-  })), n;
+    typeof o == "string" && (i[s] = o.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
+  })), i;
 }
 function ms(t, e) {
-  var r, n = e.defIds;
-  return !n || n.length === 0 ? t : t.tag === "defs" && (!((r = t.children) === null || r === void 0) && r.length) ? b(b({}, t), { children: t.children.map(function(i) {
-    return typeof i.attrs.id == "string" && n && n.indexOf(i.attrs.id) > -1 ? b(b({}, i), { attrs: b(b({}, i.attrs), { id: i.attrs.id + e.idSuffix }) }) : i;
+  var r, i = e.defIds;
+  return !i || i.length === 0 ? t : t.tag === "defs" && (!((r = t.children) === null || r === void 0) && r.length) ? b(b({}, t), { children: t.children.map(function(n) {
+    return typeof n.attrs.id == "string" && i && i.indexOf(n.attrs.id) > -1 ? b(b({}, n), { attrs: b(b({}, n.attrs), { id: n.attrs.id + e.idSuffix }) }) : n;
   }) }) : t;
 }
 function ds() {
@@ -1175,13 +1175,13 @@ var ut;
 function _s() {
   if (ut) return ae;
   ut = 1;
-  var t = zr, e = Symbol.for("react.element"), r = Symbol.for("react.fragment"), n = Object.prototype.hasOwnProperty, i = t.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, l = { key: !0, ref: !0, __self: !0, __source: !0 };
+  var t = zr, e = Symbol.for("react.element"), r = Symbol.for("react.fragment"), i = Object.prototype.hasOwnProperty, n = t.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, l = { key: !0, ref: !0, __self: !0, __source: !0 };
   function s(o, a, c) {
     var h, p = {}, S = null, f = null;
     c !== void 0 && (S = "" + c), a.key !== void 0 && (S = "" + a.key), a.ref !== void 0 && (f = a.ref);
-    for (h in a) n.call(a, h) && !l.hasOwnProperty(h) && (p[h] = a[h]);
+    for (h in a) i.call(a, h) && !l.hasOwnProperty(h) && (p[h] = a[h]);
     if (o && o.defaultProps) for (h in a = o.defaultProps, a) p[h] === void 0 && (p[h] = a[h]);
-    return { $$typeof: e, type: o, key: S, ref: f, props: p, _owner: i.current };
+    return { $$typeof: e, type: o, key: S, ref: f, props: p, _owner: n.current };
   }
   return ae.Fragment = r, ae.jsx = s, ae.jsxs = s, ae;
 }
@@ -1190,7 +1190,7 @@ function vs() {
   return ht || (ht = 1, xe.exports = _s()), xe.exports;
 }
 var d = vs();
-const Ss = "univer-sheets-filter-panel", gs = "univer-sheets-filter-panel-header", Es = "univer-sheets-filter-panel-content", Ts = "univer-sheets-filter-panel-select-all", Fs = "univer-sheets-filter-panel-select-all-count", Cs = "univer-sheets-filter-panel-values-container", Ns = "univer-input-affix-wrapper", Ps = "univer-select", Os = "univer-radio-group", Is = "univer-sheets-filter-panel-values-find", Rs = "univer-sheets-filter-panel-values-list", ys = "univer-sheets-filter-panel-values-list-inner-container", As = "univer-sheets-filter-panel-values-virtual", bs = "univer-sheets-filter-panel-values-item", Ls = "univer-sheets-filter-panel-values-item-inner", Ms = "univer-sheets-filter-panel-values-item-count", $s = "univer-sheets-filter-panel-values-item-exclude-button", ws = "univer-sheets-filter-panel-values-item-text", Us = "univer-sheets-filter-panel-conditions-container", Hs = "univer-sheets-filter-panel-conditions-container-inner", Ds = "univer-sheets-filter-panel-conditions-desc", xs = "univer-sheets-filter-panel-footer", Bs = "univer-sheets-filter-panel-footer-primary-buttons", Vs = "univer-button", js = "univer-input", Ws = "univer-form-dual-column-layout", Qs = "univer-sheets-filter-tree-node", ks = "univer-sheets-filter-tree-node-filter-only", Gs = "univer-sheets-filter-tree-node-attach", C = {
+const Ss = "univer-sheets-filter-panel", gs = "univer-sheets-filter-panel-header", Es = "univer-sheets-filter-panel-content", Ts = "univer-sheets-filter-panel-select-all", Fs = "univer-sheets-filter-panel-select-all-count", Cs = "univer-sheets-filter-panel-values-container", Ns = "univer-input-affix-wrapper", Ps = "univer-select", Os = "univer-radio-group", Rs = "univer-sheets-filter-panel-values-find", Is = "univer-sheets-filter-panel-values-list", ys = "univer-sheets-filter-panel-values-list-inner-container", As = "univer-sheets-filter-panel-values-virtual", bs = "univer-sheets-filter-panel-values-item", Ls = "univer-sheets-filter-panel-values-item-inner", Ms = "univer-sheets-filter-panel-values-item-count", $s = "univer-sheets-filter-panel-values-item-exclude-button", ws = "univer-sheets-filter-panel-values-item-text", Us = "univer-sheets-filter-panel-conditions-container", Hs = "univer-sheets-filter-panel-conditions-container-inner", Ds = "univer-sheets-filter-panel-conditions-desc", xs = "univer-sheets-filter-panel-footer", Bs = "univer-sheets-filter-panel-footer-primary-buttons", Vs = "univer-button", js = "univer-input", Ws = "univer-form-dual-column-layout", ks = "univer-sheets-filter-tree-node", Qs = "univer-sheets-filter-tree-node-filter-only", Gs = "univer-sheets-filter-tree-node-attach", C = {
   sheetsFilterPanel: Ss,
   sheetsFilterPanelHeader: gs,
   sheetsFilterPanelContent: Es,
@@ -1200,8 +1200,8 @@ const Ss = "univer-sheets-filter-panel", gs = "univer-sheets-filter-panel-header
   inputAffixWrapper: Ns,
   select: Ps,
   radioGroup: Os,
-  sheetsFilterPanelValuesFind: Is,
-  sheetsFilterPanelValuesList: Rs,
+  sheetsFilterPanelValuesFind: Rs,
+  sheetsFilterPanelValuesList: Is,
   sheetsFilterPanelValuesListInnerContainer: ys,
   sheetsFilterPanelValuesVirtual: As,
   sheetsFilterPanelValuesItem: bs,
@@ -1217,13 +1217,13 @@ const Ss = "univer-sheets-filter-panel", gs = "univer-sheets-filter-panel-header
   button: Vs,
   input: js,
   formDualColumnLayout: Ws,
-  sheetsFilterTreeNode: Qs,
-  sheetsFilterTreeNodeFilterOnly: ks,
+  sheetsFilterTreeNode: ks,
+  sheetsFilterTreeNodeFilterOnly: Qs,
   sheetsFilterTreeNodeAttach: Gs
 };
 function Ys(t) {
   var f, T;
-  const { model: e } = t, r = te(K), n = V(e.conditionItem$, void 0), i = V(e.filterConditionFormParams$, void 0), l = i != null && i.and ? "AND" : "OR", s = D((g) => {
+  const { model: e } = t, r = te(K), i = V(e.conditionItem$, void 0), n = V(e.filterConditionFormParams$, void 0), l = n != null && n.and ? "AND" : "OR", s = D((g) => {
     e.onConditionFormChange({ and: g === "AND" });
   }, [e]), o = qs(r), a = D((g) => {
     e.onPrimaryConditionChange(g);
@@ -1231,21 +1231,21 @@ function Ys(t) {
     e.onConditionFormChange(g);
   }, [e]), p = r.t("sheets-filter.panel.input-values-placeholder");
   function S(g, P, F) {
-    const R = m.getItemByOperator(g).numOfParameters === 1;
+    const I = m.getItemByOperator(g).numOfParameters === 1;
     return /* @__PURE__ */ d.jsxs(d.Fragment, { children: [
       F === "operator2" && /* @__PURE__ */ d.jsxs(Yr, { value: l, onChange: s, children: [
         /* @__PURE__ */ d.jsx(lt, { value: "AND", children: r.t("sheets-filter.panel.and") }),
         /* @__PURE__ */ d.jsx(lt, { value: "OR", children: r.t("sheets-filter.panel.or") })
       ] }),
-      /* @__PURE__ */ d.jsx(at, { value: g, options: c, onChange: (I) => h({ [F]: I }) }),
-      R && /* @__PURE__ */ d.jsx("div", { children: /* @__PURE__ */ d.jsx(At, { value: P, placeholder: p, onChange: (I) => h({ [F === "operator1" ? "val1" : "val2"]: I }) }) })
+      /* @__PURE__ */ d.jsx(at, { value: g, options: c, onChange: (R) => h({ [F]: R }) }),
+      I && /* @__PURE__ */ d.jsx("div", { children: /* @__PURE__ */ d.jsx(At, { value: P, placeholder: p, onChange: (R) => h({ [F === "operator1" ? "val1" : "val2"]: R }) }) })
     ] });
   }
-  return /* @__PURE__ */ d.jsx("div", { className: C.sheetsFilterPanelConditionsContainer, children: n && i && /* @__PURE__ */ d.jsxs(d.Fragment, { children: [
-    /* @__PURE__ */ d.jsx(at, { value: n.operator, options: o, onChange: a }),
-    m.getItemByOperator(n.operator).numOfParameters !== 0 ? /* @__PURE__ */ d.jsxs("div", { className: C.sheetsFilterPanelConditionsContainerInner, children: [
-      n.numOfParameters >= 1 && S(i.operator1, (f = i.val1) != null ? f : "", "operator1"),
-      n.numOfParameters >= 2 && S(i.operator2, (T = i.val2) != null ? T : "", "operator2"),
+  return /* @__PURE__ */ d.jsx("div", { className: C.sheetsFilterPanelConditionsContainer, children: i && n && /* @__PURE__ */ d.jsxs(d.Fragment, { children: [
+    /* @__PURE__ */ d.jsx(at, { value: i.operator, options: o, onChange: a }),
+    m.getItemByOperator(i.operator).numOfParameters !== 0 ? /* @__PURE__ */ d.jsxs("div", { className: C.sheetsFilterPanelConditionsContainerInner, children: [
+      i.numOfParameters >= 1 && S(n.operator1, (f = n.val1) != null ? f : "", "operator1"),
+      i.numOfParameters >= 2 && S(n.operator2, (T = n.val2) != null ? T : "", "operator2"),
       /* @__PURE__ */ d.jsxs("div", { className: C.sheetsFilterPanelConditionsDesc, children: [
         r.t("sheets-filter.panel.?"),
         /* @__PURE__ */ d.jsx("br", {}),
@@ -1309,7 +1309,7 @@ function Ks(t) {
   );
 }
 function Xs(t) {
-  const { model: e } = t, r = te(K), n = V(e.searchString$, "", !0), i = V(e.filterItems$, void 0, !0), l = r.t("sheets-filter.panel.filter-only"), s = je(i), o = s.checked > 0 && s.unchecked === 0, a = s.checked > 0 && s.unchecked > 0, c = e.treeMapCache, h = D(() => {
+  const { model: e } = t, r = te(K), i = V(e.searchString$, "", !0), n = V(e.filterItems$, void 0, !0), l = r.t("sheets-filter.panel.filter-only"), s = je(n), o = s.checked > 0 && s.unchecked === 0, a = s.checked > 0 && s.unchecked > 0, c = e.treeMapCache, h = D(() => {
     e.onCheckAllToggled(!o);
   }, [e, o]), p = D((f) => {
     e.setSearchString(f);
@@ -1321,14 +1321,14 @@ function Xs(t) {
     }), T;
   }
   return /* @__PURE__ */ d.jsxs("div", { className: C.sheetsFilterPanelValuesContainer, children: [
-    /* @__PURE__ */ d.jsx(At, { autoFocus: !0, value: n, placeholder: r.t("sheets-filter.panel.search-placeholder"), onChange: p }),
+    /* @__PURE__ */ d.jsx(At, { autoFocus: !0, value: i, placeholder: r.t("sheets-filter.panel.search-placeholder"), onChange: p }),
     /* @__PURE__ */ d.jsxs("div", { className: C.sheetsFilterPanelValuesList, children: [
       /* @__PURE__ */ d.jsx("div", { className: C.sheetsFilterPanelValuesItem, children: /* @__PURE__ */ d.jsxs("div", { className: C.sheetsFilterPanelValuesItemInner, children: [
         /* @__PURE__ */ d.jsx(
           qr,
           {
             indeterminate: a,
-            disabled: i.length === 0,
+            disabled: n.length === 0,
             checked: o,
             onChange: h
           }
@@ -1339,9 +1339,9 @@ function Xs(t) {
       /* @__PURE__ */ d.jsx("div", { className: C.sheetsFilterPanelValuesVirtual, children: /* @__PURE__ */ d.jsx(
         Kr,
         {
-          data: i,
+          data: n,
           defaultExpandAll: !1,
-          valueGroup: S(i),
+          valueGroup: S(n),
           height: 180,
           onChange: (f) => {
             e.onFilterCheckToggled(f);
@@ -1376,25 +1376,25 @@ function Xs(t) {
 }
 function Zs() {
   var P;
-  const t = te(j), e = te(K), r = te(W), n = V(t.filterBy$, void 0, !0), i = V(t.filterByModel$, void 0, !1), l = V(() => (i == null ? void 0 : i.canApply$) || _e(!1), void 0, !1, [i]), s = Js(e), o = !V(t.hasCriteria$), a = D((F) => {
+  const t = te(j), e = te(K), r = te(W), i = V(t.filterBy$, void 0, !0), n = V(t.filterByModel$, void 0, !1), l = V(() => (n == null ? void 0 : n.canApply$) || _e(!1), void 0, !1, [n]), s = Js(e), o = !V(t.hasCriteria$), a = D((F) => {
     r.executeCommand(Dt.id, { filterBy: F });
   }, [r]), c = D(async () => {
-    await (i == null ? void 0 : i.clear()), r.executeCommand(pe.id);
-  }, [i, r]), h = D(() => {
+    await (n == null ? void 0 : n.clear()), r.executeCommand(pe.id);
+  }, [n, r]), h = D(() => {
     r.executeCommand(pe.id);
   }, [r]), p = D(async () => {
-    await (i == null ? void 0 : i.apply()), r.executeCommand(pe.id);
-  }, [i, r]), f = (P = te(Q).activeFilterModel) == null ? void 0 : P.getRange(), T = t.col, g = br(Er.FILTER_PANEL_EMBED_POINT);
+    await (n == null ? void 0 : n.apply()), r.executeCommand(pe.id);
+  }, [n, r]), f = (P = te(k).activeFilterModel) == null ? void 0 : P.getRange(), T = t.col, g = Er(yr.FILTER_PANEL_EMBED_POINT);
   return /* @__PURE__ */ d.jsxs("div", { className: C.sheetsFilterPanel, children: [
     /* @__PURE__ */ d.jsx(
-      Lr,
+      Tr,
       {
         components: g,
         sharedProps: { range: f, colIndex: T, onClose: h }
       }
     ),
-    /* @__PURE__ */ d.jsx("div", { className: C.sheetsFilterPanelHeader, children: /* @__PURE__ */ d.jsx(Xr, { value: n, options: s, onChange: (F) => a(F) }) }),
-    i ? /* @__PURE__ */ d.jsx("div", { className: C.sheetsFilterPanelContent, children: n === Ie.VALUES ? /* @__PURE__ */ d.jsx(Xs, { model: i }) : /* @__PURE__ */ d.jsx(Ys, { model: i }) }) : /* @__PURE__ */ d.jsx("div", { style: { flex: 1 } }),
+    /* @__PURE__ */ d.jsx("div", { className: C.sheetsFilterPanelHeader, children: /* @__PURE__ */ d.jsx(Xr, { value: i, options: s, onChange: (F) => a(F) }) }),
+    n ? /* @__PURE__ */ d.jsx("div", { className: C.sheetsFilterPanelContent, children: i === Re.VALUES ? /* @__PURE__ */ d.jsx(Xs, { model: n }) : /* @__PURE__ */ d.jsx(Ys, { model: n }) }) : /* @__PURE__ */ d.jsx("div", { style: { flex: 1 } }),
     /* @__PURE__ */ d.jsxs("div", { className: C.sheetsFilterPanelFooter, children: [
       /* @__PURE__ */ d.jsx(Ce, { type: "link", onClick: c, disabled: o, children: e.t("sheets-filter.panel.clear-filter") }),
       /* @__PURE__ */ d.jsxs("span", { className: C.sheetsFilterPanelFooterPrimaryButtons, children: [
@@ -1408,14 +1408,14 @@ function Js(t) {
   const e = t.getCurrentLocale();
   return et(
     () => [
-      { label: t.t("sheets-filter.panel.by-values"), value: Ie.VALUES },
-      { label: t.t("sheets-filter.panel.by-conditions"), value: Ie.CONDITIONS }
+      { label: t.t("sheets-filter.panel.by-values"), value: Re.VALUES },
+      { label: t.t("sheets-filter.panel.by-conditions"), value: Re.CONDITIONS }
     ],
     [e, t]
   );
 }
 function zs(t) {
-  const e = t.get(Q);
+  const e = t.get(k);
   return {
     id: fe.id,
     type: Ze.BUTTON_SELECTOR,
@@ -1423,89 +1423,89 @@ function zs(t) {
     tooltip: "sheets-filter.toolbar.smart-toggle-filter-tooltip",
     hidden$: Je(t, Z.UNIVER_SHEET),
     activated$: e.activeFilterModel$.pipe(se((r) => !!r)),
-    disabled$: Tr(t, Fr(t, { worksheetTypes: [ce, ue], rangeTypes: [le] }))
+    disabled$: Ar(t, br(t, { worksheetTypes: [ce, ue], rangeTypes: [le] }))
   };
 }
-function en(t) {
-  const e = t.get(Q);
+function ei(t) {
+  const e = t.get(k);
   return {
     id: Ke.id,
     type: Ze.BUTTON,
     title: "sheets-filter.toolbar.clear-filter-criteria",
     hidden$: Je(t, Z.UNIVER_SHEET),
     disabled$: e.activeFilterModel$.pipe(ze((r) => {
-      var n;
-      return (n = r == null ? void 0 : r.hasCriteria$.pipe(se((i) => !i))) != null ? n : _e(!0);
+      var i;
+      return (i = r == null ? void 0 : r.hasCriteria$.pipe(se((n) => !n))) != null ? i : _e(!0);
     }))
   };
 }
-function tn(t) {
-  const e = t.get(Q);
+function ti(t) {
+  const e = t.get(k);
   return {
     id: Xe.id,
     type: Ze.BUTTON,
     title: "sheets-filter.toolbar.re-calc-filter-conditions",
     hidden$: Je(t, Z.UNIVER_SHEET),
     disabled$: e.activeFilterModel$.pipe(ze((r) => {
-      var n;
-      return (n = r == null ? void 0 : r.hasCriteria$.pipe(se((i) => !i))) != null ? n : _e(!0);
+      var i;
+      return (i = r == null ? void 0 : r.hasCriteria$.pipe(se((n) => !n))) != null ? i : _e(!0);
     }))
   };
 }
-const rn = {
-  [Mr.FORMULAS_INSERT]: {
+const ri = {
+  [Fr.FORMULAS_INSERT]: {
     [fe.id]: {
       order: 10,
       menuItemFactory: zs,
       [Ke.id]: {
         order: 0,
-        menuItemFactory: en
+        menuItemFactory: ei
       },
       [Xe.id]: {
         order: 1,
-        menuItemFactory: tn
+        menuItemFactory: ti
       }
     }
   }
-}, sn = {
+}, si = {
   id: fe.id,
-  binding: $r.L | ot.CTRL_COMMAND | ot.SHIFT,
+  binding: Cr.L | ot.CTRL_COMMAND | ot.SHIFT,
   description: "sheets-filter.shortcut.smart-toggle-filter",
-  preconditions: Cr,
+  preconditions: Lr,
   group: "4_sheet-edit"
-}, B = 16, nn = new Path2D("M3.30363 3C2.79117 3 2.51457 3.60097 2.84788 3.99024L6.8 8.60593V12.5662C6.8 12.7184 6.8864 12.8575 7.02289 12.9249L8.76717 13.7863C8.96655 13.8847 9.2 13.7396 9.2 13.5173V8.60593L13.1521 3.99024C13.4854 3.60097 13.2088 3 12.6964 3H3.30363Z");
+}, B = 16, ii = 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 pt {
-  static drawNoCriteria(e, r, n, i) {
+  static drawNoCriteria(e, r, i, n) {
     e.save(), ct.drawWith(e, {
       radius: 2,
       width: B,
       height: B,
-      fill: i
-    }), e.lineCap = "square", e.strokeStyle = n, e.scale(r / B, r / B), e.beginPath(), e.lineWidth = 1, e.lineCap = "round", e.moveTo(3, 4), e.lineTo(13, 4), e.moveTo(4.5, 8), e.lineTo(11.5, 8), e.moveTo(6, 12), e.lineTo(10, 12), e.stroke(), e.restore();
+      fill: n
+    }), e.lineCap = "square", e.strokeStyle = i, e.scale(r / B, r / B), e.beginPath(), e.lineWidth = 1, e.lineCap = "round", e.moveTo(3, 4), e.lineTo(13, 4), e.moveTo(4.5, 8), e.lineTo(11.5, 8), e.moveTo(6, 12), e.lineTo(10, 12), e.stroke(), e.restore();
   }
-  static drawHasCriteria(e, r, n, i) {
+  static drawHasCriteria(e, r, i, n) {
     e.save(), ct.drawWith(e, {
       radius: 2,
       width: B,
       height: B,
-      fill: i
-    }), e.scale(r / B, r / B), e.fillStyle = n, e.fill(nn), e.restore();
+      fill: n
+    }), e.scale(r / B, r / B), e.fillStyle = i, e.fill(ii), e.restore();
   }
 }
-var on = Object.defineProperty, an = Object.getOwnPropertyDescriptor, ln = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? an(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && on(e, r, i), i;
-}, Be = (t, e) => (r, n) => e(r, n, t);
+var ni = Object.defineProperty, oi = Object.getOwnPropertyDescriptor, ai = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? oi(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+    (s = t[l]) && (n = (i ? s(e, r, n) : s(n)) || n);
+  return i && n && ni(e, r, n), n;
+}, Be = (t, e) => (r, i) => e(r, i, t);
 const H = 16, Ee = 1;
-let ke = class extends Jr {
-  constructor(e, r, n, i, l) {
+let Qe = class extends Jr {
+  constructor(e, r, i, n, l) {
     super(e, r);
     _(this, "_cellWidth", 0);
     _(this, "_cellHeight", 0);
     _(this, "_filterParams");
     _(this, "_hovered", !1);
-    this._contextService = n, this._commandService = i, this._themeService = l, this.setShapeProps(r), this.onPointerDown$.subscribeEvent((s) => this.onPointerDown(s)), this.onPointerEnter$.subscribeEvent(() => this.onPointerEnter()), this.onPointerLeave$.subscribeEvent(() => this.onPointerLeave());
+    this._contextService = i, this._commandService = n, this._themeService = l, this.setShapeProps(r), this.onPointerDown$.subscribeEvent((s) => this.onPointerDown(s)), this.onPointerEnter$.subscribeEvent(() => this.onPointerEnter()), this.onPointerLeave$.subscribeEvent(() => this.onPointerLeave());
   }
   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({
@@ -1514,21 +1514,21 @@ let ke = class extends Jr {
     });
   }
   _draw(e) {
-    const r = this._cellHeight, n = this._cellWidth, i = H - n, l = H - r;
+    const r = this._cellHeight, i = this._cellWidth, n = H - i, l = H - r;
     e.save();
     const s = new Path2D();
-    s.rect(i, l, n, r), e.clip(s);
+    s.rect(n, l, i, r), e.clip(s);
     const { hasCriteria: o } = this._filterParams, a = this._themeService.getCurrentTheme().primaryColor, c = this._hovered ? this._themeService.getCurrentTheme().grey50 : "rgba(255, 255, 255, 1.0)";
     o ? pt.drawHasCriteria(e, H, a, c) : pt.drawNoCriteria(e, H, a, c), e.restore();
   }
   onPointerDown(e) {
     if (e.button === 2)
       return;
-    const { col: r, unitId: n, subUnitId: i } = this._filterParams;
-    this._contextService.getContextValue(ne) || !this._commandService.hasCommand(Ae.id) || setTimeout(() => {
+    const { col: r, unitId: i, subUnitId: n } = this._filterParams;
+    this._contextService.getContextValue(ie) || !this._commandService.hasCommand(Ae.id) || setTimeout(() => {
       this._commandService.executeCommand(Ae.id, {
-        unitId: n,
-        subUnitId: i,
+        unitId: i,
+        subUnitId: n,
         col: r
       });
     }, 200);
@@ -1540,24 +1540,24 @@ let ke = class extends Jr {
     this._hovered = !1, this.makeDirty(!0);
   }
 };
-ke = ln([
+Qe = ai([
   Be(2, we),
   Be(3, W),
   Be(4, E(Et))
-], ke);
-var cn = Object.defineProperty, un = Object.getOwnPropertyDescriptor, hn = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? un(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && cn(e, r, i), i;
-}, Y = (t, e) => (r, n) => e(r, n, t);
-const pn = 1e3, mn = 5e3;
+], Qe);
+var li = Object.defineProperty, ci = Object.getOwnPropertyDescriptor, ui = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? ci(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+    (s = t[l]) && (n = (i ? s(e, r, n) : s(n)) || n);
+  return i && n && li(e, r, n), n;
+}, Y = (t, e) => (r, i) => e(r, i, t);
+const hi = 1e3, pi = 5e3;
 let Ge = class extends Tt {
-  constructor(e, r, n, i, l, s, o, a) {
+  constructor(e, r, i, n, l, s, o, a) {
     super();
     _(this, "_filterRangeShape", null);
     _(this, "_buttonRenderDisposable", null);
     _(this, "_filterButtonShapes", []);
-    this._context = e, this._injector = r, this._sheetSkeletonManagerService = n, this._sheetsFilterService = i, this._themeService = l, this._sheetInterceptorService = s, this._commandService = o, this._selectionRenderService = a, this._initRenderer();
+    this._context = e, this._injector = r, this._sheetSkeletonManagerService = i, this._sheetsFilterService = n, this._themeService = l, this._sheetInterceptorService = s, this._commandService = o, this._selectionRenderService = a, this._initRenderer();
   }
   dispose() {
     super.dispose(), this._disposeRendering();
@@ -1567,78 +1567,78 @@ let Ge = class extends Tt {
       ze((e) => {
         var o, a;
         if (!e) return _e(null);
-        const { unit: r, unitId: n } = this._context, i = ((o = r.getActiveSheet()) == null ? void 0 : o.getSheetId()) || "", l = (a = this._sheetsFilterService.getFilterModel(n, i)) != null ? a : void 0, s = () => ({
-          unitId: n,
-          worksheetId: i,
+        const { unit: r, unitId: i } = this._context, n = ((o = r.getActiveSheet()) == null ? void 0 : o.getSheetId()) || "", l = (a = this._sheetsFilterService.getFilterModel(i, n)) != null ? a : void 0, s = () => ({
+          unitId: i,
+          worksheetId: n,
           filterModel: l,
           range: l == null ? void 0 : l.getRange(),
           skeleton: e.skeleton
         });
         return zt(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(
-          Qr(
+          kr(
             ([c]) => {
               var h;
-              return c.type === $e.MUTATION && ((h = c.params) == null ? void 0 : h.unitId) === r.getUnitId() && (nr.has(c.id) || c.id === _r.id);
+              return c.type === $e.MUTATION && ((h = c.params) == null ? void 0 : h.unitId) === r.getUnitId() && (ir.has(c.id) || c.id === vr.id);
             }
           ),
-          Rt(20, void 0, { leading: !1, trailing: !0 }),
+          It(20, void 0, { leading: !1, trailing: !0 }),
           se(s),
           yt(s())
           // must trigger once
         );
       }),
-      kr(this.dispose$)
+      Qr(this.dispose$)
     ).subscribe((e) => {
       this._disposeRendering(), !(!e || !e.range) && (this._renderRange(e.range, e.skeleton), this._renderButtons(e));
     });
   }
   _renderRange(e, r) {
-    const { scene: n } = this._context, { rowHeaderWidth: i, columnHeaderHeight: l } = r, s = this._filterRangeShape = new Or(
-      n,
-      pn,
+    const { scene: i } = this._context, { rowHeaderWidth: n, columnHeaderHeight: l } = r, s = this._filterRangeShape = new wr(
+      i,
+      hi,
       this._themeService,
       {
-        rowHeaderWidth: i,
+        rowHeaderWidth: n,
         columnHeaderHeight: l,
         enableAutoFill: !1,
         highlightHeader: !1
       }
-    ), a = Ir({
+    ), a = Ur({
       range: e,
       primary: null,
       style: { fill: "rgba(0, 0, 0, 0.0)" }
     }, r);
-    s.updateRangeBySelectionWithCoord(a), s.setEvent(!1), n.makeDirty(!0);
+    s.updateRangeBySelectionWithCoord(a), s.setEvent(!1), i.makeDirty(!0);
   }
   _renderButtons(e) {
-    const { range: r, filterModel: n, unitId: i, skeleton: l, worksheetId: s } = e, { scene: o } = this._context;
-    this._interceptCellContent(i, s, e.range);
+    const { range: r, filterModel: i, unitId: n, skeleton: l, worksheetId: s } = e, { scene: o } = this._context;
+    this._interceptCellContent(n, s, e.range);
     const { startColumn: a, endColumn: c, startRow: h } = r;
     for (let p = a; p <= c; p++) {
-      const S = `sheets-filter-button-${p}`, f = Rr(h, p, o, l), { startX: T, startY: g, endX: P, endY: F } = f, R = P - T, I = F - g;
-      if (I <= Ee || R <= Ee)
+      const S = `sheets-filter-button-${p}`, f = Hr(h, p, o, l), { startX: T, startY: g, endX: P, endY: F } = f, I = P - T, R = F - g;
+      if (R <= Ee || I <= Ee)
         continue;
-      const M = !!n.getFilterColumn(p), $ = P - H - Ee, ve = F - H - Ee, Se = {
+      const M = !!i.getFilterColumn(p), $ = P - H - Ee, ve = F - H - Ee, Se = {
         left: $,
         top: ve,
         height: H,
         width: H,
-        zIndex: mn,
-        cellHeight: I,
-        cellWidth: R,
-        filterParams: { unitId: i, subUnitId: s, col: p, hasCriteria: M }
-      }, y = this._injector.createInstance(ke, S, Se);
+        zIndex: pi,
+        cellHeight: R,
+        cellWidth: I,
+        filterParams: { unitId: n, subUnitId: s, col: p, hasCriteria: M }
+      }, y = this._injector.createInstance(Qe, S, Se);
       this._filterButtonShapes.push(y);
     }
     o.addObjects(this._filterButtonShapes), o.makeDirty();
   }
-  _interceptCellContent(e, r, n) {
-    const { startRow: i, startColumn: l, endColumn: s } = n;
-    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(vr.CELL_CONTENT, {
+  _interceptCellContent(e, r, i) {
+    const { startRow: n, startColumn: l, endColumn: s } = i;
+    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(Sr.CELL_CONTENT, {
       effect: er.Style,
       handler: (o, a, c) => {
         const { row: h, col: p, unitId: S, subUnitId: f } = a;
-        return S !== e || f !== r || h !== i || p < l || p > s ? c(o) : c({
+        return S !== e || f !== r || h !== n || p < l || p > s ? c(o) : c({
           ...o,
           fontRenderExtension: {
             ...o == null ? void 0 : o.fontRenderExtension,
@@ -1651,27 +1651,27 @@ let Ge = class extends Tt {
   }
   _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((i) => i.dispose()), (r = this._buttonRenderDisposable) == null || r.dispose(), this._filterRangeShape = null, this._buttonRenderDisposable = null, this._filterButtonShapes = [];
   }
 };
-Ge = hn([
+Ge = ui([
   Y(1, E(X)),
-  Y(2, E(Nr)),
-  Y(3, E(Q)),
+  Y(2, E(Mr)),
+  Y(3, E(k)),
   Y(4, E(Et)),
-  Y(5, E(fr)),
+  Y(5, E(_r)),
   Y(6, W),
-  Y(7, Pr)
+  Y(7, $r)
 ], Ge);
-var dn = Object.defineProperty, fn = Object.getOwnPropertyDescriptor, _n = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? fn(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && dn(e, r, i), i;
-}, mt = (t, e) => (r, n) => e(r, n, t);
+var mi = Object.defineProperty, di = Object.getOwnPropertyDescriptor, fi = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? di(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+    (s = t[l]) && (n = (i ? s(e, r, n) : s(n)) || n);
+  return i && n && mi(e, r, n), n;
+}, mt = (t, e) => (r, i) => e(r, i, t);
 let me = class extends Tt {
   constructor(t, e) {
     super(), this._renderManagerService = t, this._sheetsRenderService = e, [
-      ir,
+      nr,
       or,
       ar,
       lr
@@ -1681,28 +1681,28 @@ let me = class extends Tt {
     ));
   }
 };
-me = _n([
+me = fi([
   mt(0, bt),
-  mt(1, E(It))
+  mt(1, E(Rt))
 ], me);
-var vn = Object.defineProperty, Sn = Object.getOwnPropertyDescriptor, gn = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? Sn(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && vn(e, r, i), i;
-}, A = (t, e) => (r, n) => e(r, n, t);
+var _i = Object.defineProperty, vi = Object.getOwnPropertyDescriptor, Si = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? vi(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+    (s = t[l]) && (n = (i ? s(e, r, n) : s(n)) || n);
+  return i && n && _i(e, r, n), n;
+}, A = (t, e) => (r, i) => e(r, i, t);
 const dt = "FILTER_PANEL_POPUP";
 let be = class extends me {
-  constructor(e, r, n, i, l, s, o, a, c, h, p, S, f) {
+  constructor(e, r, i, n, l, s, o, a, c, h, p, S, f) {
     super(f, S);
     _(this, "_popupDisposable");
-    this._injector = e, this._componentManager = r, this._sheetsFilterPanelService = n, this._sheetCanvasPopupService = i, this._sheetsFilterService = l, this._localeService = s, this._shortcutService = o, this._commandService = a, this._menuManagerService = c, this._contextService = h, this._messageService = p, this._initCommands(), this._initShortcuts(), this._initMenuItems(), this._initUI();
+    this._injector = e, this._componentManager = r, this._sheetsFilterPanelService = i, this._sheetCanvasPopupService = n, this._sheetsFilterService = l, this._localeService = s, this._shortcutService = o, this._commandService = a, this._menuManagerService = c, this._contextService = h, this._messageService = p, this._initCommands(), this._initShortcuts(), this._initMenuItems(), this._initUI();
   }
   dispose() {
     super.dispose(), this._closeFilterPopup();
   }
   _initShortcuts() {
     [
-      sn
+      si
     ].forEach((e) => {
       this.disposeWithMe(this._shortcutService.registerShortcut(e));
     });
@@ -1723,10 +1723,10 @@ let be = class extends me {
     });
   }
   _initMenuItems() {
-    this._menuManagerService.mergeMenu(rn);
+    this._menuManagerService.mergeMenu(ri);
   }
   _initUI() {
-    this.disposeWithMe(this._componentManager.register(dt, Zs)), this.disposeWithMe(this._componentManager.register("FilterSingle", Vt)), this.disposeWithMe(this._contextService.subscribeContextValue$(ne).pipe(Gr()).subscribe((e) => {
+    this.disposeWithMe(this._componentManager.register(dt, Zs)), this.disposeWithMe(this._componentManager.register("FilterSingle", Vt)), this.disposeWithMe(this._contextService.subscribeContextValue$(ie).pipe(Gr()).subscribe((e) => {
       e ? this._openFilterPopup() : this._closeFilterPopup();
     })), this.disposeWithMe(this._sheetsFilterService.errorMsg$.subscribe((e) => {
       e && this._messageService.show({
@@ -1739,8 +1739,8 @@ let be = class extends me {
     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: i } = r;
-    this._popupDisposable = this._sheetCanvasPopupService.attachPopupToCell(i, n, {
+    const r = e.getRange(), i = this._sheetsFilterPanelService.col, { startRow: n } = r;
+    this._popupDisposable = this._sheetCanvasPopupService.attachPopupToCell(n, i, {
       componentKey: dt,
       direction: "horizontal",
       onClickOutside: () => this._commandService.syncExecuteCommand(pe.id),
@@ -1752,41 +1752,41 @@ let be = class extends me {
     (e = this._popupDisposable) == null || e.dispose(), this._popupDisposable = null;
   }
 };
-be = gn([
+be = Si([
   A(0, E(X)),
-  A(1, E(wr)),
+  A(1, E(Nr)),
   A(2, E(j)),
-  A(3, E(yr)),
-  A(4, E(Q)),
+  A(3, E(Dr)),
+  A(4, E(k)),
   A(5, E(K)),
-  A(6, Ur),
+  A(6, Pr),
   A(7, W),
-  A(8, Hr),
+  A(8, Or),
   A(9, we),
-  A(10, Dr),
-  A(11, E(It)),
+  A(10, Rr),
+  A(11, E(Rt)),
   A(12, bt)
 ], be);
-var jt = Object.defineProperty, En = Object.getOwnPropertyDescriptor, Tn = (t, e, r) => e in t ? jt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Fn = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? En(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && jt(e, r, i), i;
-}, Ve = (t, e) => (r, n) => e(r, n, t), Wt = (t, e, r) => Tn(t, typeof e != "symbol" ? e + "" : e, r);
-const Cn = "SHEET_FILTER_UI_PLUGIN";
+var jt = Object.defineProperty, gi = Object.getOwnPropertyDescriptor, Ei = (t, e, r) => e in t ? jt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Ti = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? gi(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+    (s = t[l]) && (n = (i ? s(e, r, n) : s(n)) || n);
+  return i && n && jt(e, r, n), n;
+}, Ve = (t, e) => (r, i) => e(r, i, t), Wt = (t, e, r) => Ei(t, typeof e != "symbol" ? e + "" : e, r);
+const Fi = "SHEET_FILTER_UI_PLUGIN";
 let Le = class extends qe {
-  constructor(t = Ne, e, r, n) {
-    super(), this._config = t, this._injector = e, this._configService = r, this._rpcChannelService = n;
-    const { menu: i, ...l } = Ct(
+  constructor(t = Ne, e, r, i) {
+    super(), this._config = t, this._injector = e, this._configService = r, this._rpcChannelService = i;
+    const { menu: n, ...l } = Ct(
       {},
       Ne,
       this._config
     );
-    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig($t, l);
+    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig($t, l);
   }
   onStarting() {
     [
       [j],
-      [ie],
+      [ne],
       [be]
     ].forEach((t) => this._injector.add(t)), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([Pe, {
       useFactory: () => rr(
@@ -1795,61 +1795,61 @@ let Le = class extends qe {
     }]);
   }
   onReady() {
-    this._injector.get(ie);
+    this._injector.get(ne);
   }
   onRendered() {
     this._injector.get(be);
   }
 };
 Wt(Le, "type", Z.UNIVER_SHEET);
-Wt(Le, "pluginName", Cn);
-Le = Fn([
+Wt(Le, "pluginName", Fi);
+Le = Ti([
   Ft(Ot),
   Ve(1, E(X)),
   Ve(2, Nt),
   Ve(3, tr(Pt))
 ], Le);
-var Qt = Object.defineProperty, Nn = Object.getOwnPropertyDescriptor, Pn = (t, e, r) => e in t ? Qt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, On = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? Nn(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && Qt(e, r, i), i;
-}, ft = (t, e) => (r, n) => e(r, n, t), kt = (t, e, r) => Pn(t, typeof e != "symbol" ? e + "" : e, r);
-const In = "SHEET_FILTER_UI_PLUGIN";
+var kt = Object.defineProperty, Ci = Object.getOwnPropertyDescriptor, Ni = (t, e, r) => e in t ? kt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Pi = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? Ci(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+    (s = t[l]) && (n = (i ? s(e, r, n) : s(n)) || n);
+  return i && n && kt(e, r, n), n;
+}, ft = (t, e) => (r, i) => e(r, i, t), Qt = (t, e, r) => Ni(t, typeof e != "symbol" ? e + "" : e, r);
+const Oi = "SHEET_FILTER_UI_PLUGIN";
 let Me = class extends qe {
   constructor(t = Ne, e, r) {
     super(), this._config = t, this._injector = e, this._configService = r;
-    const { menu: n, ...i } = Ct(
+    const { menu: i, ...n } = Ct(
       {},
       Ne,
       this._config
     );
-    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig($t, i);
+    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig($t, n);
   }
   onStarting() {
     [
-      [ie],
+      [ne],
       [me]
     ].forEach((t) => this._injector.add(t));
   }
   onReady() {
-    this._injector.get(ie);
+    this._injector.get(ne);
   }
   onRendered() {
     this._injector.get(me);
   }
 };
-kt(Me, "type", Z.UNIVER_SHEET);
-kt(Me, "pluginName", In);
-Me = On([
+Qt(Me, "type", Z.UNIVER_SHEET);
+Qt(Me, "pluginName", Oi);
+Me = Pi([
   Ft(Ot),
   ft(1, E(X)),
   ft(2, Nt)
 ], Me);
-var Rn = Object.defineProperty, yn = Object.getOwnPropertyDescriptor, An = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? yn(e, r) : e, l = t.length - 1, s; l >= 0; l--)
-    (s = t[l]) && (i = (n ? s(e, r, i) : s(i)) || i);
-  return n && i && Rn(e, r, i), i;
-}, _t = (t, e) => (r, n) => e(r, n, t), Te;
+var Ri = Object.defineProperty, Ii = Object.getOwnPropertyDescriptor, yi = (t, e, r, i) => {
+  for (var n = i > 1 ? void 0 : i ? Ii(e, r) : e, l = t.length - 1, s; l >= 0; l--)
+    (s = t[l]) && (n = (i ? s(e, r, n) : s(n)) || n);
+  return i && n && Ri(e, r, n), n;
+}, _t = (t, e) => (r, i) => e(r, i, t), Te;
 let vt = (Te = class extends qe {
   constructor(t, e, r) {
     super(), this._config = t, this._injector = e, this._rpcChannelService = r;
@@ -1866,7 +1866,7 @@ let vt = (Te = class extends qe {
     );
   }
 }, _(Te, "type", Z.UNIVER_SHEET), _(Te, "pluginName", "SHEET_FILTER_UI_WORKER_PLUGIN"), Te);
-vt = An([
+vt = yi([
   _t(1, E(X)),
   _t(2, Pt)
 ], vt);