@univerjs/sheets-filter 0.8.2 → 0.8.3-nightly.202506271607

package/lib/index.js

@@ -1,31 +1,31 @@
 var ve = Object.defineProperty;
 var Me = (i, r, e) => r in i ? ve(i, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[r] = e;
 var w = (i, r, e) => Me(i, typeof r != "symbol" ? r + "" : r, e);
-import { isNumeric as Ee, Disposable as B, Rectangle as K, mergeSets as G, Tools as te, extractPureTextFromCell as ye, CellValueType as X, UniverInstanceType as D, fromCallback as Oe, CommandType as E, IResourceManagerService as Ae, IUniverInstanceService as T, ICommandService as N, Inject as I, Optional as Te, DisposableCollection as Ne, moveMatrixArray as re, Plugin as xe, merge as Ie, touchDependencies as $e, Injector as Pe, IConfigService as Ue, IUndoRedoService as q, sequenceExecute as De, ErrorService as Le, LocaleService as Be } from "@univerjs/core";
-import { DataSyncPrimaryController as be } from "@univerjs/rpc";
-import { SheetInterceptorService as He, RefRangeService as ze, SetWorksheetActiveOperation as We, CopySheetCommand as Ve, RemoveSheetCommand as je, INTERCEPTOR_POINT as ke, RemoveRowMutation as qe, InsertRowMutation as Qe, SetRangeValuesMutation as Ge, expandToContinuousRange as de, getSheetCommandTarget as b, MoveRowsCommand as Je, MoveRangeCommand as Ye, EffectRefRangId as ne, RemoveRowCommand as Ke, RemoveColCommand as Xe, InsertColCommand as Ze, InsertRowCommand as et, SheetsSelectionsService as tt, isSingleCellSelection as rt } from "@univerjs/sheets";
-import { BehaviorSubject as L, merge as nt, filter as it, switchMap as st, of as ot } from "rxjs";
+import { isNumeric as Ee, Disposable as B, Rectangle as K, mergeSets as G, Tools as te, extractPureTextFromCell as ye, CellValueType as X, UniverInstanceType as D, fromCallback as Oe, CommandType as E, IResourceManagerService as Ae, IUniverInstanceService as T, ICommandService as N, IUndoRedoService as q, sequenceExecute as Te, ErrorService as Ne, LocaleService as xe, Inject as I, Optional as Ie, DisposableCollection as $e, moveMatrixArray as re, Plugin as Pe, merge as Ue, touchDependencies as De, Injector as Le, IConfigService as Be } from "@univerjs/core";
+import { getSheetCommandTarget as b, SheetsSelectionsService as be, isSingleCellSelection as He, expandToContinuousRange as de, SheetInterceptorService as ze, RefRangeService as We, SetWorksheetActiveOperation as Ve, CopySheetCommand as je, RemoveSheetCommand as ke, INTERCEPTOR_POINT as qe, RemoveRowMutation as Qe, InsertRowMutation as Ge, SetRangeValuesMutation as Je, MoveRowsCommand as Ye, MoveRangeCommand as Ke, EffectRefRangId as ne, RemoveRowCommand as Xe, RemoveColCommand as Ze, InsertColCommand as et, InsertRowCommand as tt } from "@univerjs/sheets";
+import { BehaviorSubject as L, merge as rt, filter as nt, switchMap as it, of as st } from "rxjs";
+import { DataSyncPrimaryController as ot } from "@univerjs/rpc";
 import { IActiveDirtyManagerService as lt, ISheetRowFilteredService as at } from "@univerjs/engine-formula";
-const ct = "sheets-filter.config", ie = {}, ue = "sheet.mutation.set-filter-range", he = "sheet.mutation.set-filter-criteria", me = "sheet.mutation.remove-filter", fe = "sheet.mutation.re-calc-filter", ge = /* @__PURE__ */ new Set([
+const ue = "sheet.mutation.set-filter-range", he = "sheet.mutation.set-filter-criteria", me = "sheet.mutation.remove-filter", fe = "sheet.mutation.re-calc-filter", ge = /* @__PURE__ */ new Set([
   ue,
   he,
   me,
   fe
 ]);
 var x = /* @__PURE__ */ ((i) => (i.EQUAL = "equal", i.GREATER_THAN = "greaterThan", i.GREATER_THAN_OR_EQUAL = "greaterThanOrEqual", i.LESS_THAN = "lessThan", i.LESS_THAN_OR_EQUAL = "lessThanOrEqual", i.NOT_EQUALS = "notEqual", i))(x || {});
-const dt = {
+const ct = {
   operator: x.GREATER_THAN,
   fn: (i, r) => U(i) ? i > r : !1
-}, ut = {
+}, dt = {
   operator: x.GREATER_THAN_OR_EQUAL,
   fn: (i, r) => U(i) ? i >= r : !1
-}, ht = {
+}, ut = {
   operator: x.LESS_THAN,
   fn: (i, r) => U(i) ? i < r : !1
-}, mt = {
+}, ht = {
   operator: x.LESS_THAN_OR_EQUAL,
   fn: (i, r) => U(i) ? i <= r : !1
-}, ft = {
+}, mt = {
   operator: x.EQUAL,
   fn: (i, r) => U(i) ? i === r : !1
 }, _e = {
@@ -35,36 +35,36 @@ const dt = {
       if (r === " ")
         return i != null;
       const e = Ce(i);
-      return e && Ct(r) ? !pe(r).test(e) : e !== r;
+      return e && Rt(r) ? !pe(r).test(e) : e !== r;
     }
     return U(i) ? i !== r : !0;
   }
-}, Re = /* @__PURE__ */ new Map([]), gt = [dt, ut, ht, mt, ft, _e];
-gt.forEach((i) => {
+}, Re = /* @__PURE__ */ new Map([]), ft = [ct, dt, ut, ht, mt, _e];
+ft.forEach((i) => {
   Re.set(i.operator, i);
 });
-function _t(i) {
+function gt(i) {
   return !!i;
 }
-const Rt = {
+const _t = {
   fn: (i, r) => {
     const e = Ce(i);
     return e === null ? r === "" : pe(r).test(e);
   }
 };
-function se(i) {
-  return i ? Re.get(i) : Rt;
+function ie(i) {
+  return i ? Re.get(i) : _t;
 }
 function U(i) {
   return typeof i == "number";
 }
-function oe(i) {
+function se(i) {
   return !!(typeof i == "number" || typeof i == "string" && Ee(i));
 }
 function Ce(i) {
   return typeof i == "boolean" || i == null ? null : typeof i == "string" ? i : i.toString();
 }
-function Ct(i) {
+function Rt(i) {
   return typeof i == "number" ? !1 : i.indexOf("*") !== -1 || i.indexOf("?") !== -1;
 }
 function pe(i) {
@@ -190,7 +190,7 @@ class V extends B {
     if (e > o || e < s)
       throw new Error(`[FilterModel] could not set criteria on column ${e} which is out of range!`);
     let l;
-    this._filterColumnByIndex.has(e) ? l = this._filterColumnByIndex.get(e) : (l = new pt(
+    this._filterColumnByIndex.has(e) ? l = this._filterColumnByIndex.get(e) : (l = new Ct(
       this.unitId,
       this.subUnitId,
       this._worksheet,
@@ -220,7 +220,7 @@ class V extends B {
     }
   }
 }
-class pt extends B {
+class Ct extends B {
   constructor(e, t, n, s, o) {
     super();
     w(this, "_filteredOutRows", null);
@@ -285,7 +285,7 @@ class pt extends B {
       const { row: a, rowSpan: c, col: h } = l;
       if (o.has(a) && (!c || c === 1))
         continue;
-      const d = this._filterByValues ? ye(this._worksheet.getCell(a, h)) : Ot(this._worksheet, a, h);
+      const d = this._filterByValues ? ye(this._worksheet.getCell(a, h)) : yt(this._worksheet, a, h);
       if (!this._filterFn(d) && (s.add(a), c))
         for (let u = 1; u < c; u++)
           s.add(a + u);
@@ -293,62 +293,62 @@ class pt extends B {
     return s;
   }
   _generateFilterFn() {
-    this._criteria && (this._filterFn = Ft(this._criteria), this._filterByValues = !!this._criteria.filters);
+    this._criteria && (this._filterFn = pt(this._criteria), this._filterByValues = !!this._criteria.filters);
   }
 }
-function Ft(i) {
+function pt(i) {
   if (i.filters)
-    return wt(i.filters);
+    return Ft(i.filters);
   if (i.customFilters)
-    return St(i.customFilters);
+    return wt(i.customFilters);
   throw new Error("[FilterModel]: other types of filters are not supported yet.");
 }
-function wt(i) {
+function Ft(i) {
   const r = !!i.blank, e = new Set(i.filters);
   return (t) => t === void 0 || t === "" ? r : e.has(typeof t == "string" ? t : `${t}`);
 }
-function St(i) {
-  const r = i.customFilters.map((e) => yt(e));
-  return Et(r) ? i.and ? vt(r) : Mt(r) : r[0];
+function wt(i) {
+  const r = i.customFilters.map((e) => Et(e));
+  return Mt(r) ? i.and ? St(r) : vt(r) : r[0];
 }
-function vt(i) {
+function St(i) {
   const [r, e] = i;
   return (t) => r(t) && e(t);
 }
-function Mt(i) {
+function vt(i) {
   const [r, e] = i;
   return (t) => r(t) || e(t);
 }
-function Et(i) {
+function Mt(i) {
   return i.length === 2;
 }
-function yt(i) {
+function Et(i) {
   const r = i.val;
-  if (i.operator === x.NOT_EQUALS && !oe(r))
+  if (i.operator === x.NOT_EQUALS && !se(r))
     return (n) => _e.fn(n, r);
-  if (_t(i.operator)) {
-    if (!oe(r)) return () => !1;
-    const n = se(i.operator), s = Number(r);
+  if (gt(i.operator)) {
+    if (!se(r)) return () => !1;
+    const n = ie(i.operator), s = Number(r);
     return (o) => n.fn(o, s);
   }
-  const e = se(i.operator);
+  const e = ie(i.operator);
   return (t) => e.fn(t, r);
 }
-function Ot(i, r, e) {
+function yt(i, r, e) {
   const t = i.getCell(r, e);
   if (!t) return null;
   const n = i.getCellRaw(r, e);
-  return t && !n ? le(t) : n ? t.t === X.NUMBER && typeof t.v == "string" ? n.v : le(n) : null;
+  return t && !n ? oe(t) : n ? t.t === X.NUMBER && typeof t.v == "string" ? n.v : oe(n) : null;
 }
-function le(i) {
+function oe(i) {
   var t, n;
   const r = (n = (t = i.p) == null ? void 0 : t.body) == null ? void 0 : n.dataStream;
   if (r) return r.trimEnd();
   const e = i.v;
   return typeof e == "string" ? i.t === X.BOOLEAN ? e.toUpperCase() : e : typeof e == "number" ? i.t === X.BOOLEAN ? e ? "TRUE" : "FALSE" : e : typeof e == "boolean" ? e ? "TRUE" : "FALSE" : "";
 }
-var At = Object.getOwnPropertyDescriptor, Tt = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? At(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+var Ot = Object.getOwnPropertyDescriptor, At = (i, r, e, t) => {
+  for (var n = t > 1 ? void 0 : t ? Ot(r, e) : r, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (n = o(n) || n);
   return n;
 }, Y = (i, r) => (e, t) => r(e, t, i);
@@ -420,13 +420,13 @@ let M = class extends B {
   }
   _initActiveFilterModel() {
     this.disposeWithMe(
-      nt(
+      rt(
         // source1: executing filter related mutations
-        Oe(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(it(([r]) => r.type === E.MUTATION && ge.has(r.id))),
+        Oe(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(nt(([r]) => r.type === E.MUTATION && ge.has(r.id))),
         // source2: activate sheet changes
-        this._univerInstanceService.getCurrentTypeOfUnit$(D.UNIVER_SHEET).pipe(st((r) => {
+        this._univerInstanceService.getCurrentTypeOfUnit$(D.UNIVER_SHEET).pipe(it((r) => {
           var e;
-          return (e = r == null ? void 0 : r.activeSheet$) != null ? e : ot(null);
+          return (e = r == null ? void 0 : r.activeSheet$) != null ? e : st(null);
         }))
       ).subscribe(() => this._updateActiveFilterModel())
     );
@@ -466,7 +466,7 @@ let M = class extends B {
     this._filterModels.has(r) || this._filterModels.set(r, /* @__PURE__ */ new Map()), this._filterModels.get(r).set(e, t);
   }
 };
-M = Tt([
+M = At([
   Y(0, Ae),
   Y(1, T),
   Y(2, N)
@@ -499,8 +499,171 @@ const R = {
     const { unitId: e, subUnitId: t } = r, s = i.get(M).getFilterModel(e, t);
     return s ? (s.reCalc(), !0) : !1;
   }
+}, Tt = {
+  id: "sheet.command.set-filter-range",
+  type: E.COMMAND,
+  handler: (i, r) => {
+    const e = i.get(M), t = i.get(N), n = i.get(q), s = i.get(T), { unitId: o, subUnitId: l, range: a } = r;
+    if (!b(s, r) || e.getFilterModel(o, l)) return !1;
+    if (a.endRow === a.startRow) {
+      const f = i.get(Ne), g = i.get(xe);
+      return f.emit(g.t("sheets-filter.command.not-valid-filter-range")), !1;
+    }
+    const d = { id: R.id, params: { unitId: o, subUnitId: l, range: a } }, u = t.syncExecuteCommand(d.id, d.params);
+    return u && n.pushUndoRedo({
+      unitID: o,
+      undoMutations: [{ id: y.id, params: { unitId: o, subUnitId: l } }],
+      redoMutations: [d]
+    }), u;
+  }
+}, Nt = {
+  id: "sheet.command.remove-sheet-filter",
+  type: E.COMMAND,
+  handler: (i, r) => {
+    const e = i.get(T), t = i.get(M), n = i.get(N), s = i.get(q), o = b(e, r);
+    if (!o) return !1;
+    const { unitId: l, subUnitId: a } = o, c = t.getFilterModel(l, a);
+    if (!c) return !1;
+    const h = c == null ? void 0 : c.serialize(), d = xt(l, a, h), u = n.syncExecuteCommand(y.id, { unitId: l, subUnitId: a });
+    return u && s.pushUndoRedo({
+      unitID: l,
+      undoMutations: d,
+      redoMutations: [{ id: y.id, params: { unitId: l, subUnitId: a } }]
+    }), u;
+  }
+}, Gt = {
+  id: "sheet.command.smart-toggle-filter",
+  type: E.COMMAND,
+  handler: async (i) => {
+    const r = i.get(T), e = i.get(M), t = i.get(N), n = r.getCurrentUnitForType(D.UNIVER_SHEET), s = n == null ? void 0 : n.getActiveSheet();
+    if (!s || !n) return !1;
+    const o = n.getUnitId(), l = s.getSheetId();
+    if (e.getFilterModel(o, l))
+      return t.executeCommand(Nt.id, { unitId: o, subUnitId: l });
+    const h = i.get(be).getCurrentLastSelection();
+    if (!h) return !1;
+    const d = h.range, u = He(h) ? de(d, { left: !0, right: !0, up: !0, down: !0 }, s) : d;
+    return t.executeCommand(Tt.id, {
+      unitId: o,
+      subUnitId: l,
+      range: u
+    });
+  }
+}, Jt = {
+  id: "sheet.command.set-filter-criteria",
+  type: E.COMMAND,
+  handler: (i, r) => {
+    const e = i.get(M), t = i.get(N), n = i.get(q), { unitId: s, subUnitId: o, col: l, criteria: a } = r, c = e.getFilterModel(s, o);
+    if (!c) return !1;
+    const h = c.getRange();
+    if (!h || l < h.startColumn || l > h.endColumn) return !1;
+    const d = c.getFilterColumn(l), u = $t(s, o, l, d), f = {
+      id: p.id,
+      params: {
+        unitId: s,
+        subUnitId: o,
+        col: l,
+        criteria: a
+      }
+    }, g = t.syncExecuteCommand(f.id, f.params);
+    return g && n.pushUndoRedo({
+      unitID: s,
+      undoMutations: [u],
+      redoMutations: [f]
+    }), g;
+  }
+}, Yt = {
+  id: "sheet.command.clear-filter-criteria",
+  type: E.COMMAND,
+  handler: (i, r) => {
+    const e = i.get(M), t = i.get(q), n = i.get(N), s = i.get(T), o = b(s, r);
+    if (!o) return !1;
+    const { unitId: l, subUnitId: a } = o, c = e.getFilterModel(o.unitId, o.subUnitId);
+    if (!c) return !1;
+    const h = c.serialize(), d = we(l, a, h), u = It(l, a, h);
+    return Te(u, n).result ? (t.pushUndoRedo({
+      unitID: l,
+      undoMutations: d,
+      redoMutations: u
+    }), !0) : !1;
+  }
+}, Kt = {
+  id: "sheet.command.re-calc-filter",
+  type: E.COMMAND,
+  handler: (i, r) => {
+    const e = i.get(M), t = i.get(N), n = i.get(T), s = b(n, r);
+    if (!s) return !1;
+    const { unitId: o, subUnitId: l } = s;
+    return e.getFilterModel(s.unitId, s.subUnitId) ? t.executeCommand(W.id, { unitId: o, subUnitId: l }) : !1;
+  }
 };
-function Nt(i, r) {
+function xt(i, r, e) {
+  const t = [], n = {
+    id: R.id,
+    params: {
+      unitId: i,
+      subUnitId: r,
+      range: e.ref
+    }
+  };
+  return t.push(n), we(i, r, e).forEach((o) => t.push(o)), t;
+}
+function we(i, r, e) {
+  var n;
+  const t = [];
+  return (n = e.filterColumns) == null || n.forEach((s) => {
+    const o = {
+      id: p.id,
+      params: {
+        unitId: i,
+        subUnitId: r,
+        col: s.colId,
+        criteria: s
+      }
+    };
+    t.push(o);
+  }), t;
+}
+function It(i, r, e) {
+  var n;
+  const t = [];
+  return (n = e.filterColumns) == null || n.forEach((s) => {
+    const o = {
+      id: p.id,
+      params: {
+        unitId: i,
+        subUnitId: r,
+        col: s.colId,
+        criteria: null
+      }
+    };
+    t.push(o);
+  }), t;
+}
+function $t(i, r, e, t) {
+  if (!t)
+    return {
+      id: p.id,
+      params: {
+        unitId: i,
+        subUnitId: r,
+        col: e,
+        criteria: null
+      }
+    };
+  const n = t.serialize();
+  return {
+    id: p.id,
+    params: {
+      unitId: i,
+      subUnitId: r,
+      col: e,
+      criteria: n
+    }
+  };
+}
+const Pt = "sheets-filter.config", le = {};
+function Ut(i, r) {
   for (let e = 0; e < i.length; e++) {
     let t = e;
     if (i[e])
@@ -510,17 +673,17 @@ function Nt(i, r) {
   return i.filter((e) => e !== null);
 }
 function $(i) {
-  return Nt(i, (r, e) => r.id === p.id && e.id === p.id && r.params.unitId === e.params.unitId && r.params.subUnitId === e.params.subUnitId && r.params.col === e.params.col);
+  return Ut(i, (r, e) => r.id === p.id && e.id === p.id && r.params.unitId === e.params.unitId && r.params.subUnitId === e.params.subUnitId && r.params.col === e.params.col);
 }
-var xt = Object.getOwnPropertyDescriptor, It = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? xt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+var Dt = Object.getOwnPropertyDescriptor, Lt = (i, r, e, t) => {
+  for (var n = t > 1 ? void 0 : t ? Dt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (n = o(n) || n);
   return n;
 }, P = (i, r) => (e, t) => r(e, t, i);
 let j = class extends B {
   constructor(r, e, t, n, s, o) {
     super();
-    w(this, "_disposableCollection", new Ne());
+    w(this, "_disposableCollection", new $e());
     this._commandService = r, this._sheetInterceptorService = e, this._sheetsFilterService = t, this._univerInstanceService = n, this._refRangeService = s, this._dataSyncPrimaryController = o, this._initCommands(), this._initRowFilteredInterceptor(), this._initInterceptors(), this._commandExecutedListener(), this._initErrorHandling();
   }
   _initCommands() {
@@ -538,7 +701,7 @@ let j = class extends B {
     this.disposeWithMe(this._sheetInterceptorService.interceptCommand({
       getMutations: (r) => this._getUpdateFilter(r)
     })), this.disposeWithMe(this._commandService.onCommandExecuted((r) => {
-      if (r.id === We.id) {
+      if (r.id === Ve.id) {
         const e = r.params, t = e.subUnitId, n = e.unitId;
         if (!t || !n)
           return;
@@ -564,19 +727,19 @@ let j = class extends B {
     if (!t || !n) return;
     const s = (l = this._sheetsFilterService.getFilterModel(r, e)) == null ? void 0 : l.getRange(), o = (a) => {
       switch (a.id) {
-        case et.id: {
+        case tt.id: {
           const c = a.params, h = c.unitId || r, d = c.subUnitId || e;
           return this._handleInsertRowCommand(c, h, d);
         }
-        case Ze.id: {
+        case et.id: {
           const c = a.params, h = c.unitId || r, d = c.subUnitId || e;
           return this._handleInsertColCommand(c, h, d);
         }
-        case Xe.id: {
+        case Ze.id: {
           const c = a.params;
           return this._handleRemoveColCommand(c, r, e);
         }
-        case Ke.id: {
+        case Xe.id: {
           const c = a.params;
           return this._handleRemoveRowCommand(c, r, e);
         }
@@ -588,7 +751,7 @@ let j = class extends B {
           const c = a.params;
           return this._handleMoveRowsCommand(c, r, e);
         }
-        case Ye.id: {
+        case Ke.id: {
           const c = a.params;
           return this._handleMoveRangeCommand(c, r, e);
         }
@@ -600,11 +763,11 @@ let j = class extends B {
   _getUpdateFilter(r) {
     const { id: e } = r;
     switch (e) {
-      case je.id: {
+      case ke.id: {
         const t = r.params;
         return this._handleRemoveSheetCommand(t, t.unitId, t.subUnitId);
       }
-      case Ve.id: {
+      case je.id: {
         const t = r.params, { targetSubUnitId: n, unitId: s, subUnitId: o } = t;
         return !s || !o || !n ? this._handleNull() : this._handleCopySheetCommand(s, o, n);
       }
@@ -947,7 +1110,7 @@ let j = class extends B {
     return { redos: [], undos: [] };
   }
   _initRowFilteredInterceptor() {
-    this.disposeWithMe(this._sheetInterceptorService.intercept(ke.ROW_FILTERED, {
+    this.disposeWithMe(this._sheetInterceptorService.intercept(qe.ROW_FILTERED, {
       // sheet-interceptor.service.ts
       handler: (r, e) => {
         var t, n;
@@ -1016,7 +1179,7 @@ let j = class extends B {
       if (!s) return;
       const o = Array.from(s.filteredOutRows).sort((d, u) => d - u), l = [];
       let a = !1;
-      if (r.id === qe.id) {
+      if (r.id === Qe.id) {
         const { startRow: d, endRow: u } = r.params.range, f = o.filter((g) => g >= d && g <= u);
         o.forEach((g) => {
           if (g < d)
@@ -1028,13 +1191,13 @@ let j = class extends B {
             l.push(g - (u - d + 1 - f.length));
         });
       }
-      if (r.id === Qe.id) {
+      if (r.id === Ge.id) {
         const { startRow: d, endRow: u } = r.params.range;
         o.forEach((f) => {
           f >= d ? (a = !0, l.push(f + (u - d + 1))) : l.push(f);
         });
       }
-      if (a && (s.filteredOutRows = new Set(l)), r.id === Ge.id && !(e != null && e.onlyLocal)) {
+      if (a && (s.filteredOutRows = new Set(l)), r.id === Je.id && !(e != null && e.onlyLocal)) {
         const d = this._getExtendRegion(t, n);
         if (d) {
           const u = r.params.cellValue;
@@ -1085,7 +1248,7 @@ let j = class extends B {
       const { subUnitId: n, unitId: s } = t, o = this._sheetsFilterService.getFilterModel(s, n);
       if (!o) return;
       const l = o.getRange();
-      if (r.id === Je.id && e.fromRange.startRow <= l.startRow && e.fromRange.endRow < l.endRow && e.fromRange.endRow >= l.startRow)
+      if (r.id === Ye.id && e.fromRange.startRow <= l.startRow && e.fromRange.endRow < l.endRow && e.fromRange.endRow >= l.startRow)
         throw this._sheetsFilterService.setFilterErrorMsg("sheets-filter.msg.filter-header-forbidden"), new Error("[SheetsFilterController]: Cannot move header row of filter");
     }));
   }
@@ -1094,16 +1257,16 @@ let j = class extends B {
     return !(e.length === 0 || e.every((t) => t == null));
   }
 };
-j = It([
+j = Lt([
   P(0, N),
-  P(1, I(He)),
+  P(1, I(ze)),
   P(2, I(M)),
   P(3, T),
-  P(4, I(ze)),
-  P(5, Te(be))
+  P(4, I(We)),
+  P(5, Ie(ot))
 ], j);
-var $t = Object.getOwnPropertyDescriptor, Pt = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? $t(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+var Bt = Object.getOwnPropertyDescriptor, bt = (i, r, e, t) => {
+  for (var n = t > 1 ? void 0 : t ? Bt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (n = o(n) || n);
   return n;
 }, H = (i, r) => (e, t) => r(e, t, i);
@@ -1156,26 +1319,26 @@ let k = class extends B {
     });
   }
 };
-k = Pt([
+k = bt([
   H(0, I(lt)),
   H(1, I(at)),
   H(2, I(M)),
   H(3, T)
 ], k);
-var Ut = Object.getOwnPropertyDescriptor, Dt = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? Ut(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+var Ht = Object.getOwnPropertyDescriptor, zt = (i, r, e, t) => {
+  for (var n = t > 1 ? void 0 : t ? Ht(r, e) : r, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (n = o(n) || n);
   return n;
 }, ae = (i, r) => (e, t) => r(e, t, i), z;
-let ce = (z = class extends xe {
-  constructor(i = ie, r, e) {
+let ce = (z = class extends Pe {
+  constructor(i = le, r, e) {
     super(), this._config = i, this._injector = r, this._configService = e;
-    const { ...t } = Ie(
+    const { ...t } = Ue(
       {},
-      ie,
+      le,
       this._config
     );
-    this._configService.setConfig(ct, t);
+    this._configService.setConfig(Pt, t);
   }
   onStarting() {
     [
@@ -1185,202 +1348,39 @@ let ce = (z = class extends xe {
     ].forEach((i) => this._injector.add(i));
   }
   onReady() {
-    $e(this._injector, [
+    De(this._injector, [
       [k],
       [j]
     ]);
   }
 }, w(z, "type", D.UNIVER_SHEET), w(z, "pluginName", Fe), z);
-ce = Dt([
-  ae(1, I(Pe)),
-  ae(2, Ue)
+ce = zt([
+  ae(1, I(Le)),
+  ae(2, Be)
 ], ce);
-const Lt = {
-  id: "sheet.command.set-filter-range",
-  type: E.COMMAND,
-  handler: (i, r) => {
-    const e = i.get(M), t = i.get(N), n = i.get(q), s = i.get(T), { unitId: o, subUnitId: l, range: a } = r;
-    if (!b(s, r) || e.getFilterModel(o, l)) return !1;
-    if (a.endRow === a.startRow) {
-      const f = i.get(Le), g = i.get(Be);
-      return f.emit(g.t("sheets-filter.command.not-valid-filter-range")), !1;
-    }
-    const d = { id: R.id, params: { unitId: o, subUnitId: l, range: a } }, u = t.syncExecuteCommand(d.id, d.params);
-    return u && n.pushUndoRedo({
-      unitID: o,
-      undoMutations: [{ id: y.id, params: { unitId: o, subUnitId: l } }],
-      redoMutations: [d]
-    }), u;
-  }
-}, Bt = {
-  id: "sheet.command.remove-sheet-filter",
-  type: E.COMMAND,
-  handler: (i, r) => {
-    const e = i.get(T), t = i.get(M), n = i.get(N), s = i.get(q), o = b(e, r);
-    if (!o) return !1;
-    const { unitId: l, subUnitId: a } = o, c = t.getFilterModel(l, a);
-    if (!c) return !1;
-    const h = c == null ? void 0 : c.serialize(), d = bt(l, a, h), u = n.syncExecuteCommand(y.id, { unitId: l, subUnitId: a });
-    return u && s.pushUndoRedo({
-      unitID: l,
-      undoMutations: d,
-      redoMutations: [{ id: y.id, params: { unitId: l, subUnitId: a } }]
-    }), u;
-  }
-}, Gt = {
-  id: "sheet.command.smart-toggle-filter",
-  type: E.COMMAND,
-  handler: async (i) => {
-    const r = i.get(T), e = i.get(M), t = i.get(N), n = r.getCurrentUnitForType(D.UNIVER_SHEET), s = n == null ? void 0 : n.getActiveSheet();
-    if (!s || !n) return !1;
-    const o = n.getUnitId(), l = s.getSheetId();
-    if (e.getFilterModel(o, l))
-      return t.executeCommand(Bt.id, { unitId: o, subUnitId: l });
-    const h = i.get(tt).getCurrentLastSelection();
-    if (!h) return !1;
-    const d = h.range, u = rt(h) ? de(d, { left: !0, right: !0, up: !0, down: !0 }, s) : d;
-    return t.executeCommand(Lt.id, {
-      unitId: o,
-      subUnitId: l,
-      range: u
-    });
-  }
-}, Jt = {
-  id: "sheet.command.set-filter-criteria",
-  type: E.COMMAND,
-  handler: (i, r) => {
-    const e = i.get(M), t = i.get(N), n = i.get(q), { unitId: s, subUnitId: o, col: l, criteria: a } = r, c = e.getFilterModel(s, o);
-    if (!c) return !1;
-    const h = c.getRange();
-    if (!h || l < h.startColumn || l > h.endColumn) return !1;
-    const d = c.getFilterColumn(l), u = zt(s, o, l, d), f = {
-      id: p.id,
-      params: {
-        unitId: s,
-        subUnitId: o,
-        col: l,
-        criteria: a
-      }
-    }, g = t.syncExecuteCommand(f.id, f.params);
-    return g && n.pushUndoRedo({
-      unitID: s,
-      undoMutations: [u],
-      redoMutations: [f]
-    }), g;
-  }
-}, Yt = {
-  id: "sheet.command.clear-filter-criteria",
-  type: E.COMMAND,
-  handler: (i, r) => {
-    const e = i.get(M), t = i.get(q), n = i.get(N), s = i.get(T), o = b(s, r);
-    if (!o) return !1;
-    const { unitId: l, subUnitId: a } = o, c = e.getFilterModel(o.unitId, o.subUnitId);
-    if (!c) return !1;
-    const h = c.serialize(), d = we(l, a, h), u = Ht(l, a, h);
-    return De(u, n).result ? (t.pushUndoRedo({
-      unitID: l,
-      undoMutations: d,
-      redoMutations: u
-    }), !0) : !1;
-  }
-}, Kt = {
-  id: "sheet.command.re-calc-filter",
-  type: E.COMMAND,
-  handler: (i, r) => {
-    const e = i.get(M), t = i.get(N), n = i.get(T), s = b(n, r);
-    if (!s) return !1;
-    const { unitId: o, subUnitId: l } = s;
-    return e.getFilterModel(s.unitId, s.subUnitId) ? t.executeCommand(W.id, { unitId: o, subUnitId: l }) : !1;
-  }
-};
-function bt(i, r, e) {
-  const t = [], n = {
-    id: R.id,
-    params: {
-      unitId: i,
-      subUnitId: r,
-      range: e.ref
-    }
-  };
-  return t.push(n), we(i, r, e).forEach((o) => t.push(o)), t;
-}
-function we(i, r, e) {
-  var n;
-  const t = [];
-  return (n = e.filterColumns) == null || n.forEach((s) => {
-    const o = {
-      id: p.id,
-      params: {
-        unitId: i,
-        subUnitId: r,
-        col: s.colId,
-        criteria: s
-      }
-    };
-    t.push(o);
-  }), t;
-}
-function Ht(i, r, e) {
-  var n;
-  const t = [];
-  return (n = e.filterColumns) == null || n.forEach((s) => {
-    const o = {
-      id: p.id,
-      params: {
-        unitId: i,
-        subUnitId: r,
-        col: s.colId,
-        criteria: null
-      }
-    };
-    t.push(o);
-  }), t;
-}
-function zt(i, r, e, t) {
-  if (!t)
-    return {
-      id: p.id,
-      params: {
-        unitId: i,
-        subUnitId: r,
-        col: e,
-        criteria: null
-      }
-    };
-  const n = t.serialize();
-  return {
-    id: p.id,
-    params: {
-      unitId: i,
-      subUnitId: r,
-      col: e,
-      criteria: n
-    }
-  };
-}
 export {
   Yt as ClearSheetsFilterCriteriaCommand,
   x as CustomFilterOperator,
   ge as FILTER_MUTATIONS,
-  pt as FilterColumn,
+  Ct as FilterColumn,
   V as FilterModel,
   Kt as ReCalcSheetsFilterCommand,
   W as ReCalcSheetsFilterMutation,
-  Bt as RemoveSheetFilterCommand,
+  Nt as RemoveSheetFilterCommand,
   y as RemoveSheetsFilterMutation,
   Fe as SHEET_FILTER_SNAPSHOT_ID,
-  Lt as SetSheetFilterRangeCommand,
+  Tt as SetSheetFilterRangeCommand,
   Jt as SetSheetsFilterCriteriaCommand,
   p as SetSheetsFilterCriteriaMutation,
   R as SetSheetsFilterRangeMutation,
   M as SheetsFilterService,
   Gt as SmartToggleSheetsFilterCommand,
   ce as UniverSheetsFilterPlugin,
-  ft as equals,
-  se as getCustomFilterFn,
-  dt as greaterThan,
-  ut as greaterThanOrEqualTo,
-  ht as lessThan,
-  mt as lessThanOrEqualTo,
+  mt as equals,
+  ie as getCustomFilterFn,
+  ct as greaterThan,
+  dt as greaterThanOrEqualTo,
+  ut as lessThan,
+  ht as lessThanOrEqualTo,
   _e as notEquals
 };