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

package/lib/index.js

@@ -2,10 +2,10 @@ 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 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 { 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 { 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, RibbonStartGroup as Er, KeyCode as Tr, MetaKeys as st, ComponentManager as Nr, IShortcutService as Fr, IMenuManagerService as Cr, IMessageService as yr } from "@univerjs/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 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 { 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";
@@ -13,12 +13,12 @@ import { Rect as at, Shape as Xr, IRenderManagerService as bt } from "@univerjs/
 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 F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SECOND", t))(F || {}), _ = /* @__PURE__ */ ((t) => (t.NONE = "none", t.STARTS_WITH = "startsWith", t.DOES_NOT_START_WITH = "doesNotStartWith", t.ENDS_WITH = "endsWith", t.DOES_NOT_END_WITH = "doesNotEndWith", t.CONTAINS = "contains", t.DOES_NOT_CONTAIN = "doesNotContain", t.EQUALS = "equals", t.NOT_EQUALS = "notEquals", t.EMPTY = "empty", t.NOT_EMPTY = "notEmpty", t.BETWEEN = "between", t.NOT_BETWEEN = "notBetween", t.CUSTOM = "custom", t))(_ || {}), d;
+var C = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SECOND", t))(C || {}), _ = /* @__PURE__ */ ((t) => (t.NONE = "none", t.STARTS_WITH = "startsWith", t.DOES_NOT_START_WITH = "doesNotStartWith", t.ENDS_WITH = "endsWith", t.DOES_NOT_END_WITH = "doesNotEndWith", t.CONTAINS = "contains", t.DOES_NOT_CONTAIN = "doesNotContain", t.EQUALS = "equals", t.NOT_EQUALS = "notEquals", t.EMPTY = "empty", t.NOT_EMPTY = "notEmpty", t.BETWEEN = "between", t.NOT_BETWEEN = "notBetween", t.CUSTOM = "custom", t))(_ || {}), d;
 ((t) => {
   t.NONE = {
     label: "sheets-filter.conditions.none",
     operator: _.NONE,
-    order: F.SECOND,
+    order: C.SECOND,
     numOfParameters: 0,
     getDefaultFormParams: () => {
       throw new Error("[FilterConditionItems.NONE]: should not have initial form params!");
@@ -29,7 +29,7 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
   }, t.EMPTY = {
     label: "sheets-filter.conditions.empty",
     operator: _.EMPTY,
-    order: F.SECOND,
+    order: C.SECOND,
     numOfParameters: 0,
     getDefaultFormParams: () => {
       throw new Error("[FilterConditionItems.EMPTY]: should not have initial form params!");
@@ -46,7 +46,7 @@ var F = /* @__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: F.SECOND,
+    order: C.SECOND,
     numOfParameters: 0,
     getDefaultFormParams: () => {
       throw new Error("[FilterConditionItems.NOT_EMPTY]: should not have initial form params!");
@@ -63,7 +63,7 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
   }, t.TEXT_CONTAINS = {
     label: "sheets-filter.conditions.text-contains",
     operator: _.CONTAINS,
-    order: F.FIRST,
+    order: C.FIRST,
     numOfParameters: 1,
     getDefaultFormParams: () => ({ operator1: _.CONTAINS, val1: "" }),
     testMappingParams: (i) => {
@@ -86,7 +86,7 @@ var F = /* @__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: F.FIRST,
+    order: C.FIRST,
     numOfParameters: 1,
     getDefaultFormParams: () => ({ operator1: _.DOES_NOT_CONTAIN, val1: "" }),
     mapToFilterColumn: (i) => ({
@@ -106,7 +106,7 @@ var F = /* @__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: F.FIRST,
+    order: C.FIRST,
     numOfParameters: 1,
     getDefaultFormParams: () => ({ operator1: _.STARTS_WITH, val1: "" }),
     mapToFilterColumn: (i) => ({
@@ -126,7 +126,7 @@ var F = /* @__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: F.FIRST,
+    order: C.FIRST,
     numOfParameters: 1,
     getDefaultFormParams: () => ({ operator1: _.ENDS_WITH, val1: "" }),
     mapToFilterColumn: (i) => ({
@@ -146,7 +146,7 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
   }, t.EQUALS = {
     label: "sheets-filter.conditions.equals",
     operator: _.EQUALS,
-    order: F.FIRST,
+    order: C.FIRST,
     numOfParameters: 1,
     getDefaultFormParams: () => ({ operator1: _.EQUALS, val1: "" }),
     testMappingParams: (i) => {
@@ -167,7 +167,7 @@ var F = /* @__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: F.FIRST,
+    order: C.FIRST,
     getDefaultFormParams: () => ({ operator1: u.GREATER_THAN, val1: "" }),
     mapToFilterColumn: (i) => ({
       customFilters: { customFilters: [{ val: i.val1, operator: u.GREATER_THAN }] }
@@ -187,7 +187,7 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     label: "sheets-filter.conditions.greater-than-or-equal",
     operator: u.GREATER_THAN_OR_EQUAL,
     numOfParameters: 1,
-    order: F.FIRST,
+    order: C.FIRST,
     getDefaultFormParams: () => ({ operator1: u.GREATER_THAN_OR_EQUAL, val1: "" }),
     testMappingParams: (i) => {
       const [o] = L(i);
@@ -207,7 +207,7 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     label: "sheets-filter.conditions.less-than",
     operator: u.LESS_THAN,
     numOfParameters: 1,
-    order: F.FIRST,
+    order: C.FIRST,
     getDefaultFormParams: () => ({ operator1: u.LESS_THAN, val1: "" }),
     testMappingParams: (i) => {
       const [o] = L(i);
@@ -227,7 +227,7 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     label: "sheets-filter.conditions.less-than-or-equal",
     operator: u.LESS_THAN_OR_EQUAL,
     numOfParameters: 1,
-    order: F.FIRST,
+    order: C.FIRST,
     getDefaultFormParams: () => ({ operator1: u.LESS_THAN_OR_EQUAL, val1: "" }),
     testMappingParams: (i) => {
       const [o] = L(i);
@@ -247,7 +247,7 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     label: "sheets-filter.conditions.equal",
     operator: u.EQUAL,
     numOfParameters: 1,
-    order: F.FIRST,
+    order: C.FIRST,
     getDefaultFormParams: () => ({ operator1: u.EQUAL, val1: "" }),
     testMappingParams: (i) => {
       const [o] = L(i);
@@ -267,7 +267,7 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     label: "sheets-filter.conditions.not-equal",
     operator: u.NOT_EQUALS,
     numOfParameters: 1,
-    order: F.FIRST,
+    order: C.FIRST,
     getDefaultFormParams: () => ({ operator1: u.NOT_EQUALS, val1: "" }),
     testMappingParams: (i) => {
       const [o] = L(i);
@@ -286,7 +286,7 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
   }, t.BETWEEN = {
     label: "sheets-filter.conditions.between",
     operator: _.BETWEEN,
-    order: F.SECOND,
+    order: C.SECOND,
     numOfParameters: 2,
     getDefaultFormParams: () => ({
       and: !0,
@@ -335,7 +335,7 @@ var F = /* @__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: F.SECOND,
+    order: C.SECOND,
     numOfParameters: 2,
     getDefaultFormParams: () => ({
       operator1: u.LESS_THAN,
@@ -380,7 +380,7 @@ var F = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
   }, t.CUSTOM = {
     label: "sheets-filter.conditions.custom",
     operator: _.CUSTOM,
-    order: F.SECOND,
+    order: C.SECOND,
     numOfParameters: 2,
     getDefaultFormParams: () => ({
       operator1: _.NONE,
@@ -403,10 +403,10 @@ var F = /* @__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), C = g(m, c), N = {
+      const v = g(h, a), F = g(m, c), N = {
         customFilters: [
           v.customFilters.customFilters[0],
-          C.customFilters.customFilters[0]
+          F.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", 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"];
+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"];
 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, C, N, R, O, M, w, _e, ve;
+  var v, F, N, R, O, M, w, _e, ve;
   const a = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map(), h = "yyyy-mm-dd", m = new Set(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((C = I.value) == null ? void 0 : C.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((F = I.value) == null ? void 0 : F.s)) == null ? void 0 : N.n) == null ? void 0 : R.pattern : "", jt = ge && it.isDate(ge);
       if (ge && jt && m.has(ge)) {
         const k = (O = s.getCellRaw(I.row, I.col)) == null ? void 0 : O.v;
         if (!k) {
@@ -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;
-}, Ce = (t, e) => (r, s) => e(r, s, t), ye = /* @__PURE__ */ ((t) => (t[t.VALUES = 0] = "VALUES", t[t.CONDITIONS = 1] = "CONDITIONS", t))(ye || {});
+}, Fe = (t, e) => (r, s) => e(r, s, t), ye = /* @__PURE__ */ ((t) => (t[t.VALUES = 0] = "VALUES", t[t.CONDITIONS = 1] = "CONDITIONS", t))(ye || {});
 _t("sheets-filter-ui.sheets-filter-panel.service");
 let W = class extends me {
   constructor(e, r) {
@@ -788,8 +788,8 @@ let W = class extends me {
   }
 };
 W = et([
-  Ce(0, E(X)),
-  Ce(1, E(cr))
+  Fe(0, E(X)),
+  Fe(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([
-  Ce(4, Q)
+  Fe(4, Q)
 ], Oe);
 let Re = class extends me {
   constructor(e, r, s, n, l) {
@@ -920,17 +920,17 @@ let Re = class extends me {
    */
   static async fromFilterColumn(e, r, s) {
     var M;
-    const n = e.get(Ge), l = e.get(K), i = e.get(Fe, vt.OPTIONAL), { unitId: o, subUnitId: a } = r, c = n.getUniverSheetInstance(o);
+    const n = e.get(Ge), l = e.get(K), i = e.get(Ce, vt.OPTIONAL), { unitId: o, subUnitId: a } = r, c = n.getUniverSheetInstance(o);
     if (!c) throw new Error(`[ByValuesModel]: Workbook not found for filter model with unitId: ${o}!`);
     const h = c == null ? void 0 : c.getSheetBySheetId(a);
     if (!h) throw new Error(`[ByValuesModel]: Worksheet not found for filter model with unitId: ${o} and subUnitId: ${a}!`);
-    const 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), C = r.getFilteredOutRowsExceptCol(s), N = { ...m, startRow: m.startRow + 1, startColumn: g, endColumn: g };
+    const m = r.getRange(), g = s, p = (M = r.getFilterColumn(s)) == null ? void 0 : M.getColumnData().filters, T = new Set(p == null ? void 0 : p.filters), v = !!(p && p.blank), F = r.getFilteredOutRowsExceptCol(s), N = { ...m, startRow: m.startRow + 1, startColumn: g, endColumn: g };
     let R, O;
     if (i) {
       const w = await i.getFilterValues({
         unitId: o,
         subUnitId: a,
-        filteredOutRowsByOtherColumns: Array.from(C),
+        filteredOutRowsByOtherColumns: Array.from(F),
         filters: !!p,
         blankChecked: v,
         iterateRange: N,
@@ -938,7 +938,7 @@ let Re = class extends me {
       });
       R = w.filterTreeItems, O = w.filterTreeMapCache;
     } else {
-      const w = $t(!!p, l, N, h, C, T, v, c.getStyles());
+      const w = $t(!!p, l, N, h, F, T, v, c.getStyles());
       R = w.filterTreeItems, O = w.filterTreeMapCache;
     }
     return e.createInstance(Re, r, s, R, O);
@@ -1032,7 +1032,7 @@ let Re = class extends me {
   // #endregion
 };
 Re = et([
-  Ce(4, Q)
+  Fe(4, Q)
 ], Re);
 const se = "FILTER_PANEL_OPENED", Ie = {
   id: "sheet.operation.open-filter-panel",
@@ -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, C, N) {
+  function g(v, F, 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: C,
+          value: F,
           placeholder: m,
           onChange: (O) => h({ [N === "operator1" ? "val1" : "val2"]: O })
         }
@@ -1342,7 +1342,7 @@ function pi(t) {
                           "span",
                           {
                             "data-u-comp": "sheets-filter-panel-values-item-text",
-                            className: "univer-mx-1 univer-inline-block univer-flex-shrink univer-overflow-hidden univer-text-ellipsis univer-whitespace-nowrap univer-text-gray-900 dark:univer-text-white",
+                            className: "univer-mx-1 univer-inline-block univer-flex-shrink univer-overflow-hidden univer-text-ellipsis univer-whitespace-nowrap univer-text-gray-900 dark:!univer-text-white",
                             children: `${r.t("sheets-filter.panel.select-all")}`
                           }
                         ),
@@ -1350,7 +1350,7 @@ function pi(t) {
                           "span",
                           {
                             "data-u-comp": "sheets-filter-panel-values-item-count",
-                            className: "univer-text-gray-400 dark:univer-text-gray-500",
+                            className: "univer-text-gray-400 dark:!univer-text-gray-500",
                             children: `(${i.checked}/${i.checked + i.unchecked})`
                           }
                         )
@@ -1375,8 +1375,8 @@ function pi(t) {
                           univer-pr-2 univer-border-box univer-max-w-[245px] univer-rounded-md
                           [&:hover_a]:univer-inline-block
                           hover:univer-bg-gray-50 univer-h-full
-                          univer-text-gray-900 dark:hover:univer-bg-gray-900
-                          dark:univer-text-white
+                          univer-text-gray-900 dark:hover:!univer-bg-gray-900
+                          dark:!univer-text-white
                         `,
                   attachRender: (p) => /* @__PURE__ */ b(
                     "div",
@@ -1387,7 +1387,7 @@ function pi(t) {
                           "span",
                           {
                             "data-u-comp": "sheets-filter-panel-values-item-count",
-                            className: "univer-text-gray-400 dark:univer-text-gray-500",
+                            className: "univer-text-gray-400 dark:!univer-text-gray-500",
                             children: `(${p.count})`
                           }
                         ),
@@ -1398,8 +1398,8 @@ function pi(t) {
                             onClick: () => {
                               const T = [];
                               p.children ? p.children.forEach((v) => {
-                                v.children ? v.children.forEach((C) => {
-                                  T.push(C.key);
+                                v.children ? v.children.forEach((F) => {
+                                  T.push(F.key);
                                 }) : T.push(v.key);
                               }) : T.push(p.key), e.onFilterOnly(T);
                             },
@@ -1419,7 +1419,7 @@ function pi(t) {
   );
 }
 function fi() {
-  var C;
+  var F;
   const t = te(W), e = te(K), r = te(Q), s = B(t.filterBy$, void 0, !0), n = B(t.filterByModel$, void 0, !1), l = B(() => (n == null ? void 0 : n.canApply$) || fe(!1), void 0, !1, [n]), i = _i(e), o = !B(t.hasCriteria$), a = D((N) => {
     r.executeCommand(Dt.id, { filterBy: N });
   }, [r]), c = D(async () => {
@@ -1428,12 +1428,12 @@ function fi() {
     r.executeCommand(he.id);
   }, [r]), m = D(async () => {
     await (n == null ? void 0 : n.apply()), r.executeCommand(he.id);
-  }, [n, r]), p = (C = te(V).activeFilterModel) == null ? void 0 : C.getRange(), T = t.col, v = gr(Rr.FILTER_PANEL_EMBED_POINT);
+  }, [n, r]), p = (F = te(V).activeFilterModel) == null ? void 0 : F.getRange(), T = t.col, v = gr(Rr.FILTER_PANEL_EMBED_POINT);
   return /* @__PURE__ */ b(
     "div",
     {
       "data-u-comp": "sheets-filter-panel",
-      className: "univer-box-border univer-flex univer-h-[432px] univer-w-[312px] univer-flex-col univer-rounded-lg univer-bg-white univer-p-4 univer-shadow-lg dark:univer-border-gray-600 dark:univer-bg-gray-700",
+      className: "univer-box-border univer-flex univer-h-[442px] univer-w-[312px] univer-flex-col univer-rounded-lg univer-bg-white univer-p-4 univer-shadow-lg dark:!univer-border-gray-600 dark:!univer-bg-gray-700",
       children: [
         /* @__PURE__ */ S(
           Sr,
@@ -1457,7 +1457,7 @@ function fi() {
             className: "univer-flex-shrink univer-flex-grow univer-pt-2",
             children: s === ye.VALUES ? /* @__PURE__ */ S(pi, { model: n }) : /* @__PURE__ */ S(hi, { model: n })
           }
-        ) : /* @__PURE__ */ S("div", { style: { flex: 1 } }),
+        ) : /* @__PURE__ */ S("div", { className: "univer-flex-1" }),
         /* @__PURE__ */ b(
           "div",
           {
@@ -1465,7 +1465,7 @@ function fi() {
             className: "univer-mt-4 univer-inline-flex univer-flex-shrink-0 univer-flex-grow-0 univer-flex-nowrap univer-justify-between univer-overflow-hidden",
             children: [
               /* @__PURE__ */ S(Ue, { variant: "link", onClick: c, disabled: o, children: e.t("sheets-filter.panel.clear-filter") }),
-              /* @__PURE__ */ b("span", { className: "univer-space-x-2", children: [
+              /* @__PURE__ */ b("span", { className: "univer-flex univer-gap-2", children: [
                 /* @__PURE__ */ S(Ue, { variant: "default", onClick: h, children: e.t("sheets-filter.panel.cancel") }),
                 /* @__PURE__ */ S(Ue, { disabled: !l, variant: "primary", onClick: m, children: e.t("sheets-filter.panel.confirm") })
               ] })
@@ -1522,9 +1522,9 @@ function Si(t) {
   };
 }
 const Ei = {
-  [Er.FORMULAS_INSERT]: {
+  [Er.ORGANIZATION]: {
     [pe.id]: {
-      order: 10,
+      order: 2,
       menuItemFactory: vi,
       [qe.id]: {
         order: 0,
@@ -1555,7 +1555,7 @@ class ut {
     }), e.scale(r / x, r / x), e.fillStyle = s, e.fill(Ti), e.restore();
   }
 }
-var Ni = Object.getOwnPropertyDescriptor, Fi = (t, e, r, s) => {
+var Ni = Object.getOwnPropertyDescriptor, Ci = (t, e, r, s) => {
   for (var n = s > 1 ? void 0 : s ? Ni(e, r) : e, l = t.length - 1, i; l >= 0; l--)
     (i = t[l]) && (n = i(n) || n);
   return n;
@@ -1603,13 +1603,13 @@ let Qe = class extends Xr {
     this._hovered = !1, this.makeDirty(!0);
   }
 };
-Qe = Fi([
+Qe = Ci([
   De(2, Me),
   De(3, Q),
   De(4, E(gt))
 ], Qe);
-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--)
+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--)
     (i = t[l]) && (n = i(n) || n);
   return n;
 }, Y = (t, e) => (r, s) => e(r, s, t);
@@ -1678,10 +1678,10 @@ 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: C, endY: N } = p, R = C - T, O = N - v;
+      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;
       if (O <= Se || R <= Se)
         continue;
-      const M = !!s.getFilterColumn(m), w = C - H - Se, _e = N - H - Se, ve = {
+      const M = !!s.getFilterColumn(m), w = F - H - Se, _e = N - H - Se, ve = {
         left: w,
         top: _e,
         height: H,
@@ -1796,7 +1796,14 @@ let Ae = class extends de {
     this._menuManagerService.mergeMenu(Ei);
   }
   _initUI() {
-    this.disposeWithMe(this._componentManager.register(dt, fi)), this.disposeWithMe(this._componentManager.register("FilterSingle", Bt)), this.disposeWithMe(this._contextService.subscribeContextValue$(se).pipe(Vr()).subscribe((e) => {
+    [
+      [dt, fi],
+      ["FilterSingle", Bt]
+    ].forEach(([e, r]) => {
+      this.disposeWithMe(
+        this._componentManager.register(e, r)
+      );
+    }), this.disposeWithMe(this._contextService.subscribeContextValue$(se).pipe(Vr()).subscribe((e) => {
       e ? this._openFilterPopup() : this._closeFilterPopup();
     })), this.disposeWithMe(this._sheetsFilterService.errorMsg$.subscribe((e) => {
       e && this._messageService.show({
@@ -1829,9 +1836,9 @@ Ae = Li([
   A(3, E(Ur)),
   A(4, E(V)),
   A(5, E(K)),
-  A(6, Fr),
+  A(6, Cr),
   A(7, Q),
-  A(8, Cr),
+  A(8, Fr),
   A(9, Me),
   A(10, yr),
   A(11, E(yt)),
@@ -1858,7 +1865,7 @@ let Pe = class extends je {
       [W],
       [ne],
       [Ae]
-    ].forEach((t) => this._injector.add(t)), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([Fe, {
+    ].forEach((t) => this._injector.add(t)), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([Ce, {
       useFactory: () => er(
         this._rpcChannelService.requestChannel(Je)
       )
@@ -1874,10 +1881,10 @@ let Pe = class extends je {
 Wt(Pe, "type", Z.UNIVER_SHEET);
 Wt(Pe, "pluginName", Hi);
 Pe = Ui([
-  Et(Ct),
+  Et(Ft),
   ke(1, E(X)),
   ke(2, Tt),
-  ke(3, Jt(Ft))
+  ke(3, Jt(Ct))
 ], 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--)
@@ -1911,7 +1918,7 @@ let be = class extends je {
 Qt(be, "type", Z.UNIVER_SHEET);
 Qt(be, "pluginName", Wi);
 be = Bi([
-  Et(Ct),
+  Et(Ft),
   mt(1, E(X)),
   mt(2, Tt)
 ], be);
@@ -1926,19 +1933,19 @@ let ft = (Ee = class extends je {
   }
   onStarting() {
     [
-      [Fe, { useClass: Be }]
+      [Ce, { useClass: Be }]
     ].forEach((t) => this._injector.add(t));
   }
   onReady() {
     this._rpcChannelService.registerChannel(
       Je,
-      tr(this._injector.get(Fe))
+      tr(this._injector.get(Ce))
     );
   }
 }, f(Ee, "type", Z.UNIVER_SHEET), f(Ee, "pluginName", "SHEET_FILTER_UI_WORKER_PLUGIN"), Ee);
 ft = Vi([
   pt(1, E(X)),
-  pt(2, Ft)
+  pt(2, Ct)
 ], ft);
 export {
   Dt as ChangeFilterByOperation,

package/lib/types/locale/en-US.d.ts

@@ -1,3 +1,83 @@
-import { default as zhCN } from './zh-CN';
-declare const locale: typeof zhCN;
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+declare const locale: {
+    'sheets-filter': {
+        toolbar: {
+            'smart-toggle-filter-tooltip': string;
+            'clear-filter-criteria': string;
+            're-calc-filter-conditions': string;
+        };
+        command: {
+            'not-valid-filter-range': string;
+        };
+        shortcut: {
+            'smart-toggle-filter': string;
+        };
+        panel: {
+            'clear-filter': string;
+            cancel: string;
+            confirm: string;
+            'by-values': string;
+            'by-conditions': string;
+            'filter-only': string;
+            'search-placeholder': string;
+            'select-all': string;
+            'input-values-placeholder': string;
+            and: string;
+            or: string;
+            empty: string;
+            '?': string;
+            '*': string;
+        };
+        conditions: {
+            none: string;
+            empty: string;
+            'not-empty': string;
+            'text-contains': string;
+            'does-not-contain': string;
+            'starts-with': string;
+            'ends-with': string;
+            equals: string;
+            'greater-than': string;
+            'greater-than-or-equal': string;
+            'less-than': string;
+            'less-than-or-equal': string;
+            equal: string;
+            'not-equal': string;
+            between: string;
+            'not-between': string;
+            custom: string;
+        };
+        msg: {
+            'filter-header-forbidden': string;
+        };
+        date: {
+            1: string;
+            2: string;
+            3: string;
+            4: string;
+            5: string;
+            6: string;
+            7: string;
+            8: string;
+            9: string;
+            10: string;
+            11: string;
+            12: string;
+        };
+    };
+};
 export default locale;

package/lib/types/locale/fa-IR.d.ts

@@ -1,3 +1,3 @@
-import { default as zhCN } from './zh-CN';
-declare const locale: typeof zhCN;
+import { default as enUS } from './en-US';
+declare const locale: typeof enUS;
 export default locale;

package/lib/types/locale/ru-RU.d.ts

@@ -1,3 +1,3 @@
-import { default as zhCN } from './zh-CN';
-declare const locale: typeof zhCN;
+import { default as enUS } from './en-US';
+declare const locale: typeof enUS;
 export default locale;

package/lib/types/locale/vi-VN.d.ts

@@ -1,3 +1,3 @@
-import { default as zhCN } from './zh-CN';
-declare const locale: typeof zhCN;
+import { default as enUS } from './en-US';
+declare const locale: typeof enUS;
 export default locale;