@univerjs/sheets-filter-ui 0.8.0-beta.0 → 0.8.0-beta.1

package/lib/es/index.js

@@ -1,24 +1,24 @@
 var Yt = Object.defineProperty;
 var qt = (t, e, r) => e in t ? Yt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
 var f = (t, e, r) => qt(t, typeof e != "symbol" ? e + "" : e, r);
-import { BooleanNumber as rt, createIdentifier as _t, Inject as E, LocaleService as K, IUniverInstanceService as Ge, ILogService as Kt, extractPureTextFromCell as Xt, numfmt as it, Disposable as me, Injector as X, Quantity as vt, Tools as Te, ICommandService as Q, CommandType as Le, IContextService as Me, UniverInstanceType as Z, ThemeService as gt, RxDisposable as St, fromCallback as Zt, InterceptorEffectEnum as zt, DependentOn as Et, IConfigService as Tt, Optional as Jt, Plugin as je, merge as Nt } from "@univerjs/core";
-import { IRPCChannelService as Ct, toModule as er, fromModule as tr } from "@univerjs/rpc";
-import { CustomFilterOperator as u, SetSheetsFilterCriteriaCommand as re, SheetsFilterService as V, SmartToggleSheetsFilterCommand as pe, ReCalcSheetsFilterCommand as Ye, ClearSheetsFilterCriteriaCommand as qe, FILTER_MUTATIONS as rr, SetSheetsFilterRangeMutation as ir, SetSheetsFilterCriteriaMutation as sr, RemoveSheetsFilterMutation as nr, ReCalcSheetsFilterMutation as or, RemoveSheetFilterCommand as ar, SetSheetFilterRangeCommand as lr, UniverSheetsFilterPlugin as Ft } from "@univerjs/sheets-filter";
+import { BooleanNumber as rt, createIdentifier as _t, Inject as E, LocaleService as K, IUniverInstanceService as Ge, ILogService as Kt, extractPureTextFromCell as Xt, numfmt as it, Disposable as me, Injector as X, Quantity as vt, Tools as Te, ICommandService as Q, CommandType as Le, IContextService as we, UniverInstanceType as Z, ThemeService as gt, RxDisposable as St, fromCallback as Zt, InterceptorEffectEnum as zt, DependentOn as Et, IConfigService as Tt, Optional as Jt, Plugin as je, merge as Nt } from "@univerjs/core";
+import { IRPCChannelService as Ft, toModule as er, fromModule as tr } from "@univerjs/rpc";
+import { CustomFilterOperator as u, SetSheetsFilterCriteriaCommand as re, SheetsFilterService as V, SmartToggleSheetsFilterCommand as pe, ReCalcSheetsFilterCommand as Ye, ClearSheetsFilterCriteriaCommand as qe, FILTER_MUTATIONS as rr, SetSheetsFilterRangeMutation as ir, SetSheetsFilterCriteriaMutation as sr, RemoveSheetsFilterMutation as nr, ReCalcSheetsFilterMutation as or, RemoveSheetFilterCommand as ar, SetSheetFilterRangeCommand as lr, UniverSheetsFilterPlugin as Ct } from "@univerjs/sheets-filter";
 import { RefRangeService as cr, SheetPermissionCheckController as ur, SheetsSelectionsService as hr, getSheetCommandTarget as dr, WorksheetFilterPermission as ae, WorksheetViewPermission as le, RangeProtectionPermissionViewPoint as ce, expandToContinuousRange as mr, SheetInterceptorService as pr, SetRangeValuesMutation as fr, INTERCEPTOR_POINT as _r } from "@univerjs/sheets";
-import { ILayoutService as vr, useDependency as te, useObservable as B, useComponentsOfPart as gr, ComponentContainer as Sr, getMenuHiddenObservable as Ke, MenuItemType as Xe, RibbonDataGroup as Er, KeyCode as Tr, MetaKeys as st, ComponentManager as Nr, IShortcutService as Cr, IMenuManagerService as Fr, IMessageService as yr } from "@univerjs/ui";
-import { SetCellEditVisibleOperation as Or, SheetsUIPart as Rr, getObservableWithExclusiveRange$ as Ir, getCurrentRangeDisable$ as Ar, SheetSkeletonManagerService as Pr, ISheetSelectionRenderService as br, SelectionControl as Lr, attachSelectionWithCoord as Mr, getCoordByCell as wr, SheetsRenderService as yt, whenSheetEditorFocused as $r, SheetCanvasPopManagerService as Ur } from "@univerjs/sheets-ui";
+import { ILayoutService as vr, useDependency as te, useObservable as B, useComponentsOfPart as gr, ComponentContainer as Sr, getMenuHiddenObservable as Ke, MenuItemType as Xe, RibbonDataGroup as Er, KeyCode as Tr, MetaKeys as st, ComponentManager as Nr, IShortcutService as Fr, IMenuManagerService as Cr, IMessageService as yr } from "@univerjs/ui";
+import { SetCellEditVisibleOperation as Or, SheetsUIPart as Rr, getObservableWithExclusiveRange$ as Ir, getCurrentRangeDisable$ as Ar, SheetSkeletonManagerService as Pr, ISheetSelectionRenderService as br, SelectionControl as Lr, attachSelectionWithCoord as wr, getCoordByCell as Mr, SheetsRenderService as yt, whenSheetEditorFocused as $r, SheetCanvasPopManagerService as Ur } from "@univerjs/sheets-ui";
 import { BehaviorSubject as q, ReplaySubject as Hr, Subject as Dr, merge as kr, combineLatest as xr, throttleTime as Ot, startWith as Rt, map as ie, shareReplay as Br, of as fe, switchMap as Ze, filter as Wr, takeUntil as Qr, distinctUntilChanged as Vr } from "rxjs";
 import { Select as nt, clsx as It, borderClassName as At, RadioGroup as Gr, Radio as ot, Input as Pt, Checkbox as jr, Tree as Yr, Segmented as qr, Button as Ue, MessageType as Kr } from "@univerjs/design";
 import { Rect as at, Shape as Xr, IRenderManagerService as bt } from "@univerjs/engine-render";
 import { jsx as S, jsxs as b, Fragment as lt } from "react/jsx-runtime";
-import { forwardRef as Lt, useRef as Zr, createElement as Mt, useCallback as D, useMemo as ze } from "react";
-const wt = "sheets-filter-ui.config", Ne = {};
-var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SECOND", t))(C || {}), _ = /* @__PURE__ */ ((t) => (t.NONE = "none", t.STARTS_WITH = "startsWith", t.DOES_NOT_START_WITH = "doesNotStartWith", t.ENDS_WITH = "endsWith", t.DOES_NOT_END_WITH = "doesNotEndWith", t.CONTAINS = "contains", t.DOES_NOT_CONTAIN = "doesNotContain", t.EQUALS = "equals", t.NOT_EQUALS = "notEquals", t.EMPTY = "empty", t.NOT_EMPTY = "notEmpty", t.BETWEEN = "between", t.NOT_BETWEEN = "notBetween", t.CUSTOM = "custom", t))(_ || {}), d;
+import { forwardRef as Lt, useRef as Zr, createElement as wt, useCallback as D, useMemo as ze } from "react";
+const Mt = "sheets-filter-ui.config", Ne = {};
+var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SECOND", t))(F || {}), _ = /* @__PURE__ */ ((t) => (t.NONE = "none", t.STARTS_WITH = "startsWith", t.DOES_NOT_START_WITH = "doesNotStartWith", t.ENDS_WITH = "endsWith", t.DOES_NOT_END_WITH = "doesNotEndWith", t.CONTAINS = "contains", t.DOES_NOT_CONTAIN = "doesNotContain", t.EQUALS = "equals", t.NOT_EQUALS = "notEquals", t.EMPTY = "empty", t.NOT_EMPTY = "notEmpty", t.BETWEEN = "between", t.NOT_BETWEEN = "notBetween", t.CUSTOM = "custom", t))(_ || {}), d;
 ((t) => {
   t.NONE = {
     label: "sheets-filter.conditions.none",
     operator: _.NONE,
-    order: C.SECOND,
+    order: F.SECOND,
     numOfParameters: 0,
     getDefaultFormParams: () => {
       throw new Error("[FilterConditionItems.NONE]: should not have initial form params!");
@@ -29,7 +29,7 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
   }, t.EMPTY = {
     label: "sheets-filter.conditions.empty",
     operator: _.EMPTY,
-    order: C.SECOND,
+    order: F.SECOND,
     numOfParameters: 0,
     getDefaultFormParams: () => {
       throw new Error("[FilterConditionItems.EMPTY]: should not have initial form params!");
@@ -46,7 +46,7 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
   }, t.NOT_EMPTY = {
     label: "sheets-filter.conditions.not-empty",
     operator: _.NOT_EMPTY,
-    order: C.SECOND,
+    order: F.SECOND,
     numOfParameters: 0,
     getDefaultFormParams: () => {
       throw new Error("[FilterConditionItems.NOT_EMPTY]: should not have initial form params!");
@@ -63,7 +63,7 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
   }, t.TEXT_CONTAINS = {
     label: "sheets-filter.conditions.text-contains",
     operator: _.CONTAINS,
-    order: C.FIRST,
+    order: F.FIRST,
     numOfParameters: 1,
     getDefaultFormParams: () => ({ operator1: _.CONTAINS, val1: "" }),
     testMappingParams: (i) => {
@@ -86,7 +86,7 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
   }, t.DOES_NOT_CONTAIN = {
     label: "sheets-filter.conditions.does-not-contain",
     operator: _.DOES_NOT_CONTAIN,
-    order: C.FIRST,
+    order: F.FIRST,
     numOfParameters: 1,
     getDefaultFormParams: () => ({ operator1: _.DOES_NOT_CONTAIN, val1: "" }),
     mapToFilterColumn: (i) => ({
@@ -106,7 +106,7 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
   }, t.STARTS_WITH = {
     label: "sheets-filter.conditions.starts-with",
     operator: _.STARTS_WITH,
-    order: C.FIRST,
+    order: F.FIRST,
     numOfParameters: 1,
     getDefaultFormParams: () => ({ operator1: _.STARTS_WITH, val1: "" }),
     mapToFilterColumn: (i) => ({
@@ -126,7 +126,7 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
   }, t.ENDS_WITH = {
     label: "sheets-filter.conditions.ends-with",
     operator: _.ENDS_WITH,
-    order: C.FIRST,
+    order: F.FIRST,
     numOfParameters: 1,
     getDefaultFormParams: () => ({ operator1: _.ENDS_WITH, val1: "" }),
     mapToFilterColumn: (i) => ({
@@ -146,7 +146,7 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
   }, t.EQUALS = {
     label: "sheets-filter.conditions.equals",
     operator: _.EQUALS,
-    order: C.FIRST,
+    order: F.FIRST,
     numOfParameters: 1,
     getDefaultFormParams: () => ({ operator1: _.EQUALS, val1: "" }),
     testMappingParams: (i) => {
@@ -167,7 +167,7 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     label: "sheets-filter.conditions.greater-than",
     operator: u.GREATER_THAN,
     numOfParameters: 1,
-    order: C.FIRST,
+    order: F.FIRST,
     getDefaultFormParams: () => ({ operator1: u.GREATER_THAN, val1: "" }),
     mapToFilterColumn: (i) => ({
       customFilters: { customFilters: [{ val: i.val1, operator: u.GREATER_THAN }] }
@@ -187,7 +187,7 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     label: "sheets-filter.conditions.greater-than-or-equal",
     operator: u.GREATER_THAN_OR_EQUAL,
     numOfParameters: 1,
-    order: C.FIRST,
+    order: F.FIRST,
     getDefaultFormParams: () => ({ operator1: u.GREATER_THAN_OR_EQUAL, val1: "" }),
     testMappingParams: (i) => {
       const [o] = L(i);
@@ -207,7 +207,7 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     label: "sheets-filter.conditions.less-than",
     operator: u.LESS_THAN,
     numOfParameters: 1,
-    order: C.FIRST,
+    order: F.FIRST,
     getDefaultFormParams: () => ({ operator1: u.LESS_THAN, val1: "" }),
     testMappingParams: (i) => {
       const [o] = L(i);
@@ -227,7 +227,7 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     label: "sheets-filter.conditions.less-than-or-equal",
     operator: u.LESS_THAN_OR_EQUAL,
     numOfParameters: 1,
-    order: C.FIRST,
+    order: F.FIRST,
     getDefaultFormParams: () => ({ operator1: u.LESS_THAN_OR_EQUAL, val1: "" }),
     testMappingParams: (i) => {
       const [o] = L(i);
@@ -247,7 +247,7 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     label: "sheets-filter.conditions.equal",
     operator: u.EQUAL,
     numOfParameters: 1,
-    order: C.FIRST,
+    order: F.FIRST,
     getDefaultFormParams: () => ({ operator1: u.EQUAL, val1: "" }),
     testMappingParams: (i) => {
       const [o] = L(i);
@@ -267,7 +267,7 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     label: "sheets-filter.conditions.not-equal",
     operator: u.NOT_EQUALS,
     numOfParameters: 1,
-    order: C.FIRST,
+    order: F.FIRST,
     getDefaultFormParams: () => ({ operator1: u.NOT_EQUALS, val1: "" }),
     testMappingParams: (i) => {
       const [o] = L(i);
@@ -286,7 +286,7 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
   }, t.BETWEEN = {
     label: "sheets-filter.conditions.between",
     operator: _.BETWEEN,
-    order: C.SECOND,
+    order: F.SECOND,
     numOfParameters: 2,
     getDefaultFormParams: () => ({
       and: !0,
@@ -335,7 +335,7 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
   }, t.NOT_BETWEEN = {
     label: "sheets-filter.conditions.not-between",
     operator: _.NOT_BETWEEN,
-    order: C.SECOND,
+    order: F.SECOND,
     numOfParameters: 2,
     getDefaultFormParams: () => ({
       operator1: u.LESS_THAN,
@@ -380,7 +380,7 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
   }, t.CUSTOM = {
     label: "sheets-filter.conditions.custom",
     operator: _.CUSTOM,
-    order: C.SECOND,
+    order: F.SECOND,
     numOfParameters: 2,
     getDefaultFormParams: () => ({
       operator1: _.NONE,
@@ -392,9 +392,9 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     mapToFilterColumn: (i) => {
       const { and: o, val1: a, val2: c, operator1: h, operator2: m } = i;
       function g(R, O) {
-        for (const M of t.ALL_CONDITIONS)
-          if (M.operator === R)
-            return M.mapToFilterColumn({ val1: O, operator1: R });
+        for (const w of t.ALL_CONDITIONS)
+          if (w.operator === R)
+            return w.mapToFilterColumn({ val1: O, operator1: R });
       }
       const p = !h || h === t.NONE.operator, T = !m || m === t.NONE.operator;
       if (p && T)
@@ -403,10 +403,10 @@ var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
         return g(m, c);
       if (T)
         return g(h, a);
-      const v = g(h, a), F = g(m, c), N = {
+      const v = g(h, a), C = g(m, c), N = {
         customFilters: [
           v.customFilters.customFilters[0],
-          F.customFilters.customFilters[0]
+          C.customFilters.customFilters[0]
         ]
       };
       return o && (N.and = rt.TRUE), { customFilters: N };
@@ -511,7 +511,7 @@ var zr = Object.getOwnPropertyDescriptor, Jr = (t, e, r, s) => {
     (i = t[l]) && (n = i(n) || n);
   return n;
 }, He = (t, e) => (r, s) => e(r, s, t);
-const Je = "sheets-filter.generate-filter-values.service", Ce = _t(Je), ei = ["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"];
+const Je = "sheets-filter.generate-filter-values.service", Fe = _t(Je), ei = ["yyyy-mm-dd", "yyyy-mm-dd;@", "yyyy/mm/dd;@", "yyyy/mm/dd hh:mm", "yyyy-m-d am/pm h:mm", "yyyy-MM-dd", "yyyy/MM/dd", "yyyy/mm/dd", 'yyyy"年"MM"月"dd"日"', "MM-dd", 'M"月"d"日"', "MM-dd A/P hh:mm"];
 let Be = class extends me {
   constructor(t, e, r) {
     super(), this._localeService = t, this._univerInstanceService = e, this._logService = r;
@@ -528,7 +528,7 @@ Be = Jr([
   He(2, Kt)
 ], Be);
 function $t(t, e, r, s, n, l, i, o) {
-  var v, F, N, R, O, M, w, _e, ve;
+  var v, C, N, R, O, w, M, _e, ve;
   const a = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map(), h = "yyyy-mm-dd", m = new Set(ei), g = "empty";
   let p = 0;
   for (const I of s.iterateByColumn(r, !1, !1)) {
@@ -545,7 +545,7 @@ function $t(t, e, r, s, n, l, i, o) {
         p += 1, z += tt;
         continue;
       }
-      const ge = (v = I.value) != null && v.v && !I.value.p ? (R = (N = o.get((F = I.value) == null ? void 0 : F.s)) == null ? void 0 : N.n) == null ? void 0 : R.pattern : "", jt = ge && it.isDate(ge);
+      const ge = (v = I.value) != null && v.v && !I.value.p ? (R = (N = o.get((C = I.value) == null ? void 0 : C.s)) == null ? void 0 : N.n) == null ? void 0 : R.pattern : "", jt = ge && it.getFormatInfo(ge).isDate;
       if (ge && jt && m.has(ge)) {
         const k = (O = s.getCellRaw(I.row, I.col)) == null ? void 0 : O.v;
         if (!k) {
@@ -562,7 +562,7 @@ function $t(t, e, r, s, n, l, i, o) {
           leaf: !1,
           checked: !1
         }, a.set(`${y}`, j), c.set(`${y}`, [`${y}`]));
-        let U = (M = j.children) == null ? void 0 : M.find(($e) => $e.key === `${y}-${$}`);
+        let U = (w = j.children) == null ? void 0 : w.find(($e) => $e.key === `${y}-${$}`);
         U || (U = {
           title: e.t(`sheets-filter.date.${$}`),
           key: `${y}-${$}`,
@@ -570,9 +570,9 @@ function $t(t, e, r, s, n, l, i, o) {
           count: 0,
           leaf: !1,
           checked: !1
-        }, (w = j.children) == null || w.push(U), c.set(`${y}-${$}`, [`${y}`, `${y}-${$}`]));
-        const we = (_e = U == null ? void 0 : U.children) == null ? void 0 : _e.find(($e) => $e.key === `${y}-${$}-${oe}`);
-        we ? (we.originValues.add(G), we.count++, U.count++, j.count++) : ((ve = U.children) == null || ve.push({
+        }, (M = j.children) == null || M.push(U), c.set(`${y}-${$}`, [`${y}`, `${y}-${$}`]));
+        const Me = (_e = U == null ? void 0 : U.children) == null ? void 0 : _e.find(($e) => $e.key === `${y}-${$}-${oe}`);
+        Me ? (Me.originValues.add(G), Me.count++, U.count++, j.count++) : ((ve = U.children) == null || ve.push({
           title: `${oe}`,
           key: `${y}-${$}-${oe}`,
           count: 1,
@@ -669,7 +669,7 @@ var ii = Object.getOwnPropertyDescriptor, et = (t, e, r, s) => {
   for (var n = s > 1 ? void 0 : s ? ii(e, r) : e, l = t.length - 1, i; l >= 0; l--)
     (i = t[l]) && (n = i(n) || n);
   return n;
-}, Fe = (t, e) => (r, s) => e(r, s, t), ye = /* @__PURE__ */ ((t) => (t[t.VALUES = 0] = "VALUES", t[t.CONDITIONS = 1] = "CONDITIONS", t))(ye || {});
+}, Ce = (t, e) => (r, s) => e(r, s, t), ye = /* @__PURE__ */ ((t) => (t[t.VALUES = 0] = "VALUES", t[t.CONDITIONS = 1] = "CONDITIONS", t))(ye || {});
 _t("sheets-filter-ui.sheets-filter-panel.service");
 let W = class extends me {
   constructor(e, r) {
@@ -788,8 +788,8 @@ let W = class extends me {
   }
 };
 W = et([
-  Fe(0, E(X)),
-  Fe(1, E(cr))
+  Ce(0, E(X)),
+  Ce(1, E(cr))
 ], W);
 let Oe = class extends me {
   constructor(e, r, s, n, l) {
@@ -877,7 +877,7 @@ let Oe = class extends me {
   }
 };
 Oe = et([
-  Fe(4, Q)
+  Ce(4, Q)
 ], Oe);
 let Re = class extends me {
   constructor(e, r, s, n, l) {
@@ -919,27 +919,27 @@ let Re = class extends me {
    * @returns the model to control the panel's state
    */
   static async fromFilterColumn(e, r, s) {
-    var M;
-    const n = e.get(Ge), l = e.get(K), i = e.get(Ce, vt.OPTIONAL), { unitId: o, subUnitId: a } = r, c = n.getUniverSheetInstance(o);
+    var w;
+    const n = e.get(Ge), l = e.get(K), i = e.get(Fe, vt.OPTIONAL), { unitId: o, subUnitId: a } = r, c = n.getUniverSheetInstance(o);
     if (!c) throw new Error(`[ByValuesModel]: Workbook not found for filter model with unitId: ${o}!`);
     const h = c == null ? void 0 : c.getSheetBySheetId(a);
     if (!h) throw new Error(`[ByValuesModel]: Worksheet not found for filter model with unitId: ${o} and subUnitId: ${a}!`);
-    const m = r.getRange(), g = s, p = (M = r.getFilterColumn(s)) == null ? void 0 : M.getColumnData().filters, T = new Set(p == null ? void 0 : p.filters), v = !!(p && p.blank), F = r.getFilteredOutRowsExceptCol(s), N = { ...m, startRow: m.startRow + 1, startColumn: g, endColumn: g };
+    const m = r.getRange(), g = s, p = (w = r.getFilterColumn(s)) == null ? void 0 : w.getColumnData().filters, T = new Set(p == null ? void 0 : p.filters), v = !!(p && p.blank), C = r.getFilteredOutRowsExceptCol(s), N = { ...m, startRow: m.startRow + 1, startColumn: g, endColumn: g };
     let R, O;
     if (i) {
-      const w = await i.getFilterValues({
+      const M = await i.getFilterValues({
         unitId: o,
         subUnitId: a,
-        filteredOutRowsByOtherColumns: Array.from(F),
+        filteredOutRowsByOtherColumns: Array.from(C),
         filters: !!p,
         blankChecked: v,
         iterateRange: N,
         alreadyChecked: Array.from(T)
       });
-      R = w.filterTreeItems, O = w.filterTreeMapCache;
+      R = M.filterTreeItems, O = M.filterTreeMapCache;
     } else {
-      const w = $t(!!p, l, N, h, F, T, v, c.getStyles());
-      R = w.filterTreeItems, O = w.filterTreeMapCache;
+      const M = $t(!!p, l, N, h, C, T, v, c.getStyles());
+      R = M.filterTreeItems, O = M.filterTreeMapCache;
     }
     return e.createInstance(Re, r, s, R, O);
   }
@@ -1032,13 +1032,13 @@ let Re = class extends me {
   // #endregion
 };
 Re = et([
-  Fe(4, Q)
+  Ce(4, Q)
 ], Re);
 const se = "FILTER_PANEL_OPENED", Ie = {
   id: "sheet.operation.open-filter-panel",
   type: Le.OPERATION,
   handler: (t, e) => {
-    const r = t.get(Me), s = t.get(V), n = t.get(W);
+    const r = t.get(we), s = t.get(V), n = t.get(W);
     t.get(Q).syncExecuteCommand(Or.id, { visible: !1 });
     const { unitId: i, subUnitId: o, col: a } = e, c = s.getFilterModel(i, o);
     return c ? (n.setupCol(c, a), r.getContextValue(se) || r.setContextValue(se, !0), !0) : !1;
@@ -1047,7 +1047,7 @@ const se = "FILTER_PANEL_OPENED", Ie = {
   id: "sheet.operation.close-filter-panel",
   type: Le.OPERATION,
   handler: (t) => {
-    const e = t.get(Me), r = t.get(W), s = t.get(vr, vt.OPTIONAL);
+    const e = t.get(we), r = t.get(W), s = t.get(vr, vt.OPTIONAL);
     return e.getContextValue(se) ? (e.setContextValue(se, !1), s == null || s.focus(), r.terminate()) : !1;
   }
 }, Dt = {
@@ -1136,7 +1136,7 @@ var P = function() {
   return xt(r, "".concat(s), { defIds: r.defIds, idSuffix: a.current }, P({ ref: e, className: o }, i), l);
 });
 function xt(t, e, r, s, n) {
-  return Mt(t.tag, P(P({ key: e }, ai(t, r, n)), s), (li(t, r).children || []).map(function(l, i) {
+  return wt(t.tag, P(P({ key: e }, ai(t, r, n)), s), (li(t, r).children || []).map(function(l, i) {
     return xt(l, "".concat(e, "-").concat(t.tag, "-").concat(i), r, void 0, n);
   }));
 }
@@ -1155,21 +1155,21 @@ function ai(t, e, r) {
 function li(t, e) {
   var r, s = e.defIds;
   return !s || s.length === 0 ? t : t.tag === "defs" && (!((r = t.children) === null || r === void 0) && r.length) ? P(P({}, t), { children: t.children.map(function(n) {
-    return typeof n.attrs.id == "string" && s && s.indexOf(n.attrs.id) > -1 ? P(P({}, n), { attrs: P(P({}, n.attrs), { id: n.attrs.id + e.idSuffix }) }) : n;
+    return typeof n.attrs.id == "string" && s && s.includes(n.attrs.id) ? P(P({}, n), { attrs: P(P({}, n.attrs), { id: n.attrs.id + e.idSuffix }) }) : n;
   }) }) : t;
 }
 function ci() {
   return Math.random().toString(36).substring(2, 8);
 }
 kt.displayName = "UniverIcon";
-var ui = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M3.32182 2.60967C2.98161 2.60967 2.79671 3.0074 3.01601 3.2675L6.85819 7.8246C6.94943 7.93282 6.99947 8.06981 6.99947 8.21136V12.7338C6.99947 12.898 7.0998 13.0455 7.2525 13.1058L8.73833 13.6928C9.00085 13.7965 9.28531 13.6031 9.28531 13.3208V8.21136C9.28531 8.06981 9.33535 7.93282 9.42659 7.8246L13.2688 3.2675C13.4881 3.0074 13.3032 2.60967 12.963 2.60967H3.32182ZM2.09858 4.04101C1.22139 3.0006 1.96097 1.40967 3.32182 1.40967H12.963C14.3238 1.40967 15.0634 3.0006 14.1862 4.04101L10.4853 8.43054V13.3208C10.4853 14.4498 9.34747 15.2237 8.29742 14.8089L6.81158 14.2219C6.20078 13.9806 5.79947 13.3905 5.79947 12.7338V8.43054L2.09858 4.04101Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Bt = Lt(function(t, e) {
-  return Mt(kt, Object.assign({}, t, {
-    id: "filter-single",
+var ui = { 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" } }] }, Bt = Lt(function(t, e) {
+  return wt(kt, Object.assign({}, t, {
+    id: "filter-icon",
     ref: e,
     icon: ui
   }));
 });
-Bt.displayName = "FilterSingle";
+Bt.displayName = "FilterIcon";
 function hi(t) {
   var p, T;
   const { model: e } = t, r = te(K), s = B(e.conditionItem$, void 0), n = B(e.filterConditionFormParams$, void 0), l = n != null && n.and ? "AND" : "OR", i = D((v) => {
@@ -1179,7 +1179,7 @@ function hi(t) {
   }, [e]), c = mi(r), h = D((v) => {
     e.onConditionFormChange(v);
   }, [e]), m = r.t("sheets-filter.panel.input-values-placeholder");
-  function g(v, F, N) {
+  function g(v, C, N) {
     const R = d.getItemByOperator(v).numOfParameters === 1;
     return /* @__PURE__ */ b(lt, { children: [
       N === "operator2" && /* @__PURE__ */ b(Gr, { value: l, onChange: i, children: [
@@ -1198,7 +1198,7 @@ function hi(t) {
         Pt,
         {
           className: "univer-mt-2",
-          value: F,
+          value: C,
           placeholder: m,
           onChange: (O) => h({ [N === "operator1" ? "val1" : "val2"]: O })
         }
@@ -1398,8 +1398,8 @@ function pi(t) {
                             onClick: () => {
                               const T = [];
                               p.children ? p.children.forEach((v) => {
-                                v.children ? v.children.forEach((F) => {
-                                  T.push(F.key);
+                                v.children ? v.children.forEach((C) => {
+                                  T.push(C.key);
                                 }) : T.push(v.key);
                               }) : T.push(p.key), e.onFilterOnly(T);
                             },
@@ -1419,7 +1419,7 @@ function pi(t) {
   );
 }
 function fi() {
-  var F;
+  var C;
   const t = te(W), e = te(K), r = te(Q), s = B(t.filterBy$, void 0, !0), n = B(t.filterByModel$, void 0, !1), l = B(() => (n == null ? void 0 : n.canApply$) || fe(!1), void 0, !1, [n]), i = _i(e), o = !B(t.hasCriteria$), a = D((N) => {
     r.executeCommand(Dt.id, { filterBy: N });
   }, [r]), c = D(async () => {
@@ -1428,7 +1428,7 @@ function fi() {
     r.executeCommand(he.id);
   }, [r]), m = D(async () => {
     await (n == null ? void 0 : n.apply()), r.executeCommand(he.id);
-  }, [n, r]), p = (F = te(V).activeFilterModel) == null ? void 0 : F.getRange(), T = t.col, v = gr(Rr.FILTER_PANEL_EMBED_POINT);
+  }, [n, r]), p = (C = te(V).activeFilterModel) == null ? void 0 : C.getRange(), T = t.col, v = gr(Rr.FILTER_PANEL_EMBED_POINT);
   return /* @__PURE__ */ b(
     "div",
     {
@@ -1488,7 +1488,7 @@ function vi(t) {
   return {
     id: pe.id,
     type: Xe.BUTTON_SELECTOR,
-    icon: "FilterSingle",
+    icon: "FilterIcon",
     tooltip: "sheets-filter.toolbar.smart-toggle-filter-tooltip",
     hidden$: Ke(t, Z.UNIVER_SHEET),
     activated$: e.activeFilterModel$.pipe(ie((r) => !!r)),
@@ -1555,7 +1555,7 @@ class ut {
     }), e.scale(r / x, r / x), e.fillStyle = s, e.fill(Ti), e.restore();
   }
 }
-var Ni = Object.getOwnPropertyDescriptor, Ci = (t, e, r, s) => {
+var Ni = Object.getOwnPropertyDescriptor, Fi = (t, e, r, s) => {
   for (var n = s > 1 ? void 0 : s ? Ni(e, r) : e, l = t.length - 1, i; l >= 0; l--)
     (i = t[l]) && (n = i(n) || n);
   return n;
@@ -1603,13 +1603,13 @@ let Qe = class extends Xr {
     this._hovered = !1, this.makeDirty(!0);
   }
 };
-Qe = Ci([
-  De(2, Me),
+Qe = Fi([
+  De(2, we),
   De(3, Q),
   De(4, E(gt))
 ], Qe);
-var Fi = Object.getOwnPropertyDescriptor, yi = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? Fi(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+var Ci = Object.getOwnPropertyDescriptor, yi = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Ci(e, r) : e, l = t.length - 1, i; l >= 0; l--)
     (i = t[l]) && (n = i(n) || n);
   return n;
 }, Y = (t, e) => (r, s) => e(r, s, t);
@@ -1666,7 +1666,7 @@ let Ve = class extends St {
         enableAutoFill: !1,
         highlightHeader: !1
       }
-    ), a = Mr({
+    ), a = wr({
       range: e,
       primary: null,
       style: { fill: "rgba(0, 0, 0, 0.0)" }
@@ -1678,18 +1678,18 @@ let Ve = class extends St {
     this._interceptCellContent(n, i, e.range);
     const { startColumn: a, endColumn: c, startRow: h } = r;
     for (let m = a; m <= c; m++) {
-      const g = `sheets-filter-button-${m}`, p = wr(h, m, o, l), { startX: T, startY: v, endX: F, endY: N } = p, R = F - T, O = N - v;
+      const g = `sheets-filter-button-${m}`, p = Mr(h, m, o, l), { startX: T, startY: v, endX: C, endY: N } = p, R = C - T, O = N - v;
       if (O <= Se || R <= Se)
         continue;
-      const M = !!s.getFilterColumn(m), w = F - H - Se, _e = N - H - Se, ve = {
-        left: w,
+      const w = !!s.getFilterColumn(m), M = C - H - Se, _e = N - H - Se, ve = {
+        left: M,
         top: _e,
         height: H,
         width: H,
         zIndex: Ri,
         cellHeight: O,
         cellWidth: R,
-        filterParams: { unitId: n, subUnitId: i, col: m, hasCriteria: M }
+        filterParams: { unitId: n, subUnitId: i, col: m, hasCriteria: w }
       }, I = this._injector.createInstance(Qe, g, ve);
       this._filterButtonShapes.push(I);
     }
@@ -1701,13 +1701,10 @@ let Ve = class extends St {
       effect: zt.Style,
       handler: (o, a, c) => {
         const { row: h, col: m, unitId: g, subUnitId: p } = a;
-        return g !== e || p !== r || h !== n || m < l || m > i ? c(o) : c({
-          ...o,
-          fontRenderExtension: {
-            ...o == null ? void 0 : o.fontRenderExtension,
-            rightOffset: H
-          }
-        });
+        return g !== e || p !== r || h !== n || m < l || m > i || ((!o || o === a.rawData) && (o = { ...a.rawData }), o.fontRenderExtension = {
+          ...o == null ? void 0 : o.fontRenderExtension,
+          rightOffset: H
+        }), c(o);
       },
       priority: 10
     });
@@ -1798,7 +1795,7 @@ let Ae = class extends de {
   _initUI() {
     [
       [dt, fi],
-      ["FilterSingle", Bt]
+      ["FilterIcon", Bt]
     ].forEach(([e, r]) => {
       this.disposeWithMe(
         this._componentManager.register(e, r)
@@ -1836,16 +1833,16 @@ Ae = Li([
   A(3, E(Ur)),
   A(4, E(V)),
   A(5, E(K)),
-  A(6, Cr),
+  A(6, Fr),
   A(7, Q),
-  A(8, Fr),
-  A(9, Me),
+  A(8, Cr),
+  A(9, we),
   A(10, yr),
   A(11, E(yt)),
   A(12, bt)
 ], Ae);
-var Mi = Object.defineProperty, wi = Object.getOwnPropertyDescriptor, $i = (t, e, r) => e in t ? Mi(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Ui = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? wi(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+var wi = Object.defineProperty, Mi = Object.getOwnPropertyDescriptor, $i = (t, e, r) => e in t ? wi(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Ui = (t, e, r, s) => {
+  for (var n = s > 1 ? void 0 : s ? Mi(e, r) : e, l = t.length - 1, i; l >= 0; l--)
     (i = t[l]) && (n = i(n) || n);
   return n;
 }, ke = (t, e) => (r, s) => e(r, s, t), Wt = (t, e, r) => $i(t, typeof e != "symbol" ? e + "" : e, r);
@@ -1858,14 +1855,14 @@ let Pe = class extends je {
       Ne,
       this._config
     );
-    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig(wt, l);
+    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig(Mt, l);
   }
   onStarting() {
     [
       [W],
       [ne],
       [Ae]
-    ].forEach((t) => this._injector.add(t)), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([Ce, {
+    ].forEach((t) => this._injector.add(t)), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([Fe, {
       useFactory: () => er(
         this._rpcChannelService.requestChannel(Je)
       )
@@ -1881,10 +1878,10 @@ let Pe = class extends je {
 Wt(Pe, "type", Z.UNIVER_SHEET);
 Wt(Pe, "pluginName", Hi);
 Pe = Ui([
-  Et(Ft),
+  Et(Ct),
   ke(1, E(X)),
   ke(2, Tt),
-  ke(3, Jt(Ct))
+  ke(3, Jt(Ft))
 ], Pe);
 var Di = Object.defineProperty, ki = Object.getOwnPropertyDescriptor, xi = (t, e, r) => e in t ? Di(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Bi = (t, e, r, s) => {
   for (var n = s > 1 ? void 0 : s ? ki(e, r) : e, l = t.length - 1, i; l >= 0; l--)
@@ -1900,7 +1897,7 @@ let be = class extends je {
       Ne,
       this._config
     );
-    s && this._configService.setConfig("menu", s, { merge: !0 }), this._configService.setConfig(wt, n);
+    s && this._configService.setConfig("menu", s, { merge: !0 }), this._configService.setConfig(Mt, n);
   }
   onStarting() {
     [
@@ -1918,7 +1915,7 @@ let be = class extends je {
 Qt(be, "type", Z.UNIVER_SHEET);
 Qt(be, "pluginName", Wi);
 be = Bi([
-  Et(Ft),
+  Et(Ct),
   mt(1, E(X)),
   mt(2, Tt)
 ], be);
@@ -1933,19 +1930,19 @@ let ft = (Ee = class extends je {
   }
   onStarting() {
     [
-      [Ce, { useClass: Be }]
+      [Fe, { useClass: Be }]
     ].forEach((t) => this._injector.add(t));
   }
   onReady() {
     this._rpcChannelService.registerChannel(
       Je,
-      tr(this._injector.get(Ce))
+      tr(this._injector.get(Fe))
     );
   }
 }, f(Ee, "type", Z.UNIVER_SHEET), f(Ee, "pluginName", "SHEET_FILTER_UI_WORKER_PLUGIN"), Ee);
 ft = Vi([
   pt(1, E(X)),
-  pt(2, Ct)
+  pt(2, Ft)
 ], ft);
 export {
   Dt as ChangeFilterByOperation,