@univerjs/sheets-filter 0.5.0 → 0.5.1-nightly.202411301606

package/lib/es/index.js

@@ -1,94 +1,71 @@
-var ge = Object.defineProperty;
-var _e = (i, r, e) => r in i ? ge(i, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[r] = e;
-var w = (i, r, e) => _e(i, typeof r != "symbol" ? r + "" : r, e);
-import { CommandType as E, isNumeric as Re, Disposable as V, Rectangle as Y, mergeSets as Q, Tools as k, extractPureTextFromCell as Ce, CellValueType as K, UniverInstanceType as U, fromCallback as pe, IResourceManagerService as Fe, IUniverInstanceService as x, ICommandService as N, Inject as H, DisposableCollection as we, moveMatrixArray as ee, Plugin as Se, Injector as ve, IConfigService as Me, IUndoRedoService as j, ErrorService as Ee, LocaleService as Oe, sequenceExecute as ye } from "@univerjs/core";
-import { BehaviorSubject as b, merge as Ae, filter as Ne, switchMap as Te, of as xe } from "rxjs";
-import { SheetInterceptorService as Ie, RefRangeService as $e, SetWorksheetActiveOperation as Pe, CopySheetCommand as Ue, RemoveSheetCommand as be, INTERCEPTOR_POINT as Le, RemoveRowMutation as Be, InsertRowMutation as ze, SetRangeValuesMutation as He, expandToContinuousRange as le, getSheetCommandTarget as B, MoveRowsCommand as De, MoveRangeCommand as We, EffectRefRangId as te, RemoveRowCommand as Ve, RemoveColCommand as je, InsertColCommand as qe, InsertRowCommand as Qe, SheetsSelectionsService as Ge, isSingleCellSelection as Je } from "@univerjs/sheets";
-const R = {
-  id: "sheet.mutation.set-filter-range",
-  type: E.MUTATION,
-  handler: (i, r) => {
-    const { subUnitId: e, unitId: t, range: n } = r;
-    return i.get(M).ensureFilterModel(t, e).setRange(n), !0;
-  }
-}, C = {
-  id: "sheet.mutation.set-filter-criteria",
-  type: E.MUTATION,
-  handler: (i, r) => {
-    const { subUnitId: e, unitId: t, criteria: n, col: s, reCalc: o = !0 } = r, a = i.get(M).getFilterModel(t, e);
-    return a ? (a.setCriteria(s, n, o), !0) : !1;
-  }
-}, O = {
-  id: "sheet.mutation.remove-filter",
-  type: E.MUTATION,
-  handler: (i, r) => {
-    const { unitId: e, subUnitId: t } = r;
-    return i.get(M).removeFilterModel(e, t);
-  }
-}, L = {
-  id: "sheet.mutation.re-calc-filter",
-  type: E.MUTATION,
-  handler: (i, r) => {
-    const { unitId: e, subUnitId: t } = r, s = i.get(M).getFilterModel(e, t);
-    return s ? (s.reCalc(), !0) : !1;
-  }
-};
-var T = /* @__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))(T || {});
-const Ye = {
-  operator: T.GREATER_THAN,
+var pe = Object.defineProperty;
+var Fe = (i, r, e) => r in i ? pe(i, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[r] = e;
+var w = (i, r, e) => Fe(i, typeof r != "symbol" ? r + "" : r, e);
+import { isNumeric as we, Disposable as V, Rectangle as Y, mergeSets as Q, Tools as k, extractPureTextFromCell as Se, CellValueType as K, UniverInstanceType as U, fromCallback as ve, CommandType as E, IResourceManagerService as Me, IUniverInstanceService as x, ICommandService as T, Inject as z, DisposableCollection as Ee, moveMatrixArray as ee, Plugin as Oe, Injector as ye, IConfigService as Ae, IUndoRedoService as j, ErrorService as Te, LocaleService as Ne, sequenceExecute as xe } from "@univerjs/core";
+import { SheetInterceptorService as Ie, RefRangeService as $e, SetWorksheetActiveOperation as Pe, CopySheetCommand as Ue, RemoveSheetCommand as be, INTERCEPTOR_POINT as Le, RemoveRowMutation as Be, InsertRowMutation as ze, SetRangeValuesMutation as He, expandToContinuousRange as le, getSheetCommandTarget as L, MoveRowsCommand as De, MoveRangeCommand as We, EffectRefRangId as te, RemoveRowCommand as Ve, RemoveColCommand as je, InsertColCommand as qe, InsertRowCommand as Qe, SheetsSelectionsService as Ge, isSingleCellSelection as Je } from "@univerjs/sheets";
+import { BehaviorSubject as b, merge as Ye, filter as Ke, switchMap as Xe, of as Ze } from "rxjs";
+const ke = "sheets-filter.config", et = {}, ae = "sheet.mutation.set-filter-range", ce = "sheet.mutation.set-filter-criteria", de = "sheet.mutation.remove-filter", ue = "sheet.mutation.re-calc-filter", tt = /* @__PURE__ */ new Set([
+  ae,
+  ce,
+  de,
+  ue
+]);
+var N = /* @__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))(N || {});
+const rt = {
+  operator: N.GREATER_THAN,
   fn: (i, r) => $(i) ? i > r : !1
-}, Ke = {
-  operator: T.GREATER_THAN_OR_EQUAL,
+}, nt = {
+  operator: N.GREATER_THAN_OR_EQUAL,
   fn: (i, r) => $(i) ? i >= r : !1
-}, Xe = {
-  operator: T.LESS_THAN,
+}, it = {
+  operator: N.LESS_THAN,
   fn: (i, r) => $(i) ? i < r : !1
-}, Ze = {
-  operator: T.LESS_THAN_OR_EQUAL,
+}, st = {
+  operator: N.LESS_THAN_OR_EQUAL,
   fn: (i, r) => $(i) ? i <= r : !1
-}, ke = {
-  operator: T.EQUAL,
+}, ot = {
+  operator: N.EQUAL,
   fn: (i, r) => $(i) ? i === r : !1
-}, ae = {
-  operator: T.NOT_EQUALS,
+}, he = {
+  operator: N.NOT_EQUALS,
   fn: (i, r) => {
     if (typeof r == "string") {
       if (r === " ")
         return i != null;
-      const e = de(i);
-      return e && nt(r) ? !ue(r).test(e) : e !== r;
+      const e = me(i);
+      return e && dt(r) ? !ge(r).test(e) : e !== r;
     }
     return $(i) ? i !== r : !0;
   }
-}, ce = /* @__PURE__ */ new Map([]), et = [Ye, Ke, Xe, Ze, ke, ae];
-et.forEach((i) => {
-  ce.set(i.operator, i);
+}, fe = /* @__PURE__ */ new Map([]), lt = [rt, nt, it, st, ot, he];
+lt.forEach((i) => {
+  fe.set(i.operator, i);
 });
-function tt(i) {
+function at(i) {
   return !!i;
 }
-const rt = {
+const ct = {
   fn: (i, r) => {
-    const e = de(i);
-    return e === null ? r === "" : ue(r).test(e);
+    const e = me(i);
+    return e === null ? r === "" : ge(r).test(e);
   }
 };
 function re(i) {
-  return i ? ce.get(i) : rt;
+  return i ? fe.get(i) : ct;
 }
 function $(i) {
   return typeof i == "number";
 }
 function ne(i) {
-  return !!(typeof i == "number" || typeof i == "string" && Re(i));
+  return !!(typeof i == "number" || typeof i == "string" && we(i));
 }
-function de(i) {
+function me(i) {
   return typeof i == "boolean" || i == null ? null : typeof i == "string" ? i : i.toString();
 }
-function nt(i) {
+function dt(i) {
   return typeof i == "number" ? !1 : i.indexOf("*") !== -1 || i.indexOf("?") !== -1;
 }
-function ue(i) {
+function ge(i) {
   const r = i.replace(/[.+^${}()|[\]\\]/g, "\\$&").replaceAll("?", ".").replace(/[*]/g, ".$&");
   return new RegExp(`^${r}$`);
 }
@@ -211,7 +188,7 @@ class D extends V {
     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 it(
+    this._filterColumnByIndex.has(e) ? l = this._filterColumnByIndex.get(e) : (l = new ut(
       this.unitId,
       this.subUnitId,
       this._worksheet,
@@ -241,7 +218,7 @@ class D extends V {
     }
   }
 }
-class it extends V {
+class ut extends V {
   constructor(e, t, n, s, o) {
     super();
     w(this, "_filteredOutRows", null);
@@ -306,7 +283,7 @@ class it extends V {
       const { row: a, rowSpan: c, col: h } = l;
       if (o.has(a) && (!c || c === 1))
         continue;
-      const d = this._filterByValues ? Ce(this._worksheet.getCell(a, h)) : ht(this._worksheet, a, h);
+      const d = this._filterByValues ? Se(this._worksheet.getCell(a, h)) : pt(this._worksheet, a, h);
       if (!this._filterFn(d) && (s.add(a), c))
         for (let u = 1; u < c; u++)
           s.add(a + u);
@@ -314,40 +291,40 @@ class it extends V {
     return s;
   }
   _generateFilterFn() {
-    this._criteria && (this._filterFn = st(this._criteria), this._filterByValues = !!this._criteria.filters);
+    this._criteria && (this._filterFn = ht(this._criteria), this._filterByValues = !!this._criteria.filters);
   }
 }
-function st(i) {
+function ht(i) {
   if (i.filters)
-    return ot(i.filters);
+    return ft(i.filters);
   if (i.customFilters)
-    return lt(i.customFilters);
+    return mt(i.customFilters);
   throw new Error("[FilterModel]: other types of filters are not supported yet.");
 }
-function ot(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 lt(i) {
-  const r = i.customFilters.map((e) => ut(e));
-  return dt(r) ? i.and ? at(r) : ct(r) : r[0];
+function mt(i) {
+  const r = i.customFilters.map((e) => Ct(e));
+  return Rt(r) ? i.and ? gt(r) : _t(r) : r[0];
 }
-function at(i) {
+function gt(i) {
   const [r, e] = i;
   return (t) => r(t) && e(t);
 }
-function ct(i) {
+function _t(i) {
   const [r, e] = i;
   return (t) => r(t) || e(t);
 }
-function dt(i) {
+function Rt(i) {
   return i.length === 2;
 }
-function ut(i) {
+function Ct(i) {
   const r = i.val;
-  if (i.operator === T.NOT_EQUALS && !ne(r))
-    return (n) => ae.fn(n, r);
-  if (tt(i.operator)) {
+  if (i.operator === N.NOT_EQUALS && !ne(r))
+    return (n) => he.fn(n, r);
+  if (at(i.operator)) {
     if (!ne(r)) return () => !1;
     const n = re(i.operator), s = Number(r);
     return (o) => n.fn(o, s);
@@ -355,7 +332,7 @@ function ut(i) {
   const e = re(i.operator);
   return (t) => e.fn(t, r);
 }
-function ht(i, r, e) {
+function pt(i, r, e) {
   const t = i.getCell(r, e);
   if (!t) return null;
   const n = i.getCellRaw(r, e);
@@ -368,17 +345,12 @@ function ie(i) {
   const e = i.v;
   return typeof e == "string" ? i.t === K.BOOLEAN ? e.toUpperCase() : e : typeof e == "number" ? i.t === K.BOOLEAN ? e ? "TRUE" : "FALSE" : e : typeof e == "boolean" ? e ? "TRUE" : "FALSE" : "";
 }
-var ft = Object.defineProperty, mt = Object.getOwnPropertyDescriptor, gt = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? mt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+var Ft = Object.defineProperty, wt = Object.getOwnPropertyDescriptor, St = (i, r, e, t) => {
+  for (var n = t > 1 ? void 0 : t ? wt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (n = (t ? o(r, e, n) : o(n)) || n);
-  return t && n && ft(r, e, n), n;
+  return t && n && Ft(r, e, n), n;
 }, J = (i, r) => (e, t) => r(e, t, i);
-const _t = /* @__PURE__ */ new Set([
-  R.id,
-  C.id,
-  O.id,
-  L.id
-]), he = "SHEET_FILTER_PLUGIN";
+const _e = "SHEET_FILTER_PLUGIN";
 let M = class extends V {
   constructor(r, e, t) {
     super();
@@ -446,13 +418,13 @@ let M = class extends V {
   }
   _initActiveFilterModel() {
     this.disposeWithMe(
-      Ae(
+      Ye(
         // source1: executing filter related mutations
-        pe(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(Ne(([r]) => r.type === E.MUTATION && _t.has(r.id))),
+        ve(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(Ke(([r]) => r.type === E.MUTATION && tt.has(r.id))),
         // source2: activate sheet changes
-        this._univerInstanceService.getCurrentTypeOfUnit$(U.UNIVER_SHEET).pipe(Te((r) => {
+        this._univerInstanceService.getCurrentTypeOfUnit$(U.UNIVER_SHEET).pipe(Xe((r) => {
           var e;
-          return (e = r == null ? void 0 : r.activeSheet$) != null ? e : xe(null);
+          return (e = r == null ? void 0 : r.activeSheet$) != null ? e : Ze(null);
         }))
       ).subscribe(() => this._updateActiveFilterModel())
     );
@@ -475,7 +447,7 @@ let M = class extends V {
   }
   _initModel() {
     this._resourcesManagerService.registerPluginResource({
-      pluginName: he,
+      pluginName: _e,
       businesses: [U.UNIVER_SHEET],
       toJson: (r) => this._serializeAutoFiltersForUnit(r),
       parseJson: (r) => JSON.parse(r),
@@ -492,12 +464,41 @@ let M = class extends V {
     this._filterModels.has(r) || this._filterModels.set(r, /* @__PURE__ */ new Map()), this._filterModels.get(r).set(e, t);
   }
 };
-M = gt([
-  J(0, Fe),
+M = St([
+  J(0, Me),
   J(1, x),
-  J(2, N)
+  J(2, T)
 ], M);
-function Rt(i, r) {
+const R = {
+  id: ae,
+  type: E.MUTATION,
+  handler: (i, r) => {
+    const { subUnitId: e, unitId: t, range: n } = r;
+    return i.get(M).ensureFilterModel(t, e).setRange(n), !0;
+  }
+}, p = {
+  id: ce,
+  type: E.MUTATION,
+  handler: (i, r) => {
+    const { subUnitId: e, unitId: t, criteria: n, col: s, reCalc: o = !0 } = r, a = i.get(M).getFilterModel(t, e);
+    return a ? (a.setCriteria(s, n, o), !0) : !1;
+  }
+}, O = {
+  id: de,
+  type: E.MUTATION,
+  handler: (i, r) => {
+    const { unitId: e, subUnitId: t } = r;
+    return i.get(M).removeFilterModel(e, t);
+  }
+}, H = {
+  id: ue,
+  type: E.MUTATION,
+  handler: (i, r) => {
+    const { unitId: e, subUnitId: t } = r, s = i.get(M).getFilterModel(e, t);
+    return s ? (s.reCalc(), !0) : !1;
+  }
+};
+function vt(i, r) {
   for (let e = 0; e < i.length; e++) {
     let t = e;
     if (i[e])
@@ -507,24 +508,24 @@ function Rt(i, r) {
   return i.filter((e) => e !== null);
 }
 function I(i) {
-  return Rt(i, (r, e) => r.id === C.id && e.id === C.id && r.params.unitId === e.params.unitId && r.params.subUnitId === e.params.subUnitId && r.params.col === e.params.col);
+  return vt(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 Ct = Object.defineProperty, pt = Object.getOwnPropertyDescriptor, Ft = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? pt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+var Mt = Object.defineProperty, Et = Object.getOwnPropertyDescriptor, Ot = (i, r, e, t) => {
+  for (var n = t > 1 ? void 0 : t ? Et(r, e) : r, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (n = (t ? o(r, e, n) : o(n)) || n);
-  return t && n && Ct(r, e, n), n;
+  return t && n && Mt(r, e, n), n;
 }, P = (i, r) => (e, t) => r(e, t, i);
 let W = class extends V {
   constructor(r, e, t, n, s) {
     super();
-    w(this, "_disposableCollection", new we());
+    w(this, "_disposableCollection", new Ee());
     this._commandService = r, this._sheetInterceptorService = e, this._sheetsFilterService = t, this._univerInstanceService = n, this._refRangeService = s, this._initCommands(), this._initRowFilteredInterceptor(), this._initInterceptors(), this._commandExecutedListener(), this._initErrorHandling();
   }
   _initCommands() {
     [
-      C,
+      p,
       R,
-      L,
+      H,
       O
     ].forEach((r) => this.disposeWithMe(this._commandService.registerCommand(r)));
   }
@@ -624,12 +625,12 @@ let W = class extends V {
         startColumn: a <= o ? o + h : o,
         endColumn: l + h
       }
-    }, p = {
+    }, C = {
       unitId: e,
       subUnitId: t,
       range: s
     };
-    d.push({ id: R.id, params: g }), u.push({ id: R.id, params: p });
+    d.push({ id: R.id, params: g }), u.push({ id: R.id, params: C });
     const F = n.getAllFilterColumns().filter((f) => f[0] >= m);
     if (F.length !== 0) {
       const { newRange: f, oldRange: v } = this.moveCriteria(e, t, F, h);
@@ -638,8 +639,8 @@ let W = class extends V {
     return { redos: I(d), undos: I(u) };
   }
   _handleInsertRowCommand(r, e, t) {
-    var p;
-    const n = this._sheetsFilterService.getFilterModel(e, t), s = (p = n == null ? void 0 : n.getRange()) != null ? p : null;
+    var C;
+    const n = this._sheetsFilterService.getFilterModel(e, t), s = (C = n == null ? void 0 : n.getRange()) != null ? C : null;
     if (!n || !s)
       return this._handleNull();
     const { startRow: o, endRow: l } = s, { startRow: a, endRow: c } = r.range, h = c - a + 1;
@@ -674,15 +675,15 @@ let W = class extends V {
     const h = [], d = [], u = c < o ? 0 : Math.min(c, l) - Math.max(a, o) + 1, m = c - a + 1, g = n.getAllFilterColumns();
     g.forEach((_) => {
       const [f, v] = _;
-      f <= c && f >= a && (h.push({ id: C.id, params: { unitId: e, subUnitId: t, col: f, criteria: null } }), d.push({ id: C.id, params: { unitId: e, subUnitId: t, col: f, criteria: { ...v.serialize(), colId: f } } }));
+      f <= c && f >= a && (h.push({ id: p.id, params: { unitId: e, subUnitId: t, col: f, criteria: null } }), d.push({ id: p.id, params: { unitId: e, subUnitId: t, col: f, criteria: { ...v.serialize(), colId: f } } }));
     });
-    const p = g.filter((_) => {
+    const C = g.filter((_) => {
       const [f, v] = _;
       return f > c;
     });
     let S = { undos: [], redos: [] };
-    if (p.length > 0) {
-      const { oldRange: _, newRange: f } = this.moveCriteria(e, t, p, -m);
+    if (C.length > 0) {
+      const { oldRange: _, newRange: f } = this.moveCriteria(e, t, C, -m);
       S = f, h.push(..._.redos), d.unshift(..._.undos);
     }
     if (u === l - o + 1) {
@@ -705,7 +706,7 @@ let W = class extends V {
     };
   }
   _handleRemoveRowCommand(r, e, t) {
-    var p;
+    var C;
     const n = this._sheetsFilterService.getFilterModel(e, t);
     if (!n)
       return this._handleNull();
@@ -743,10 +744,10 @@ let W = class extends V {
           col: _,
           criteria: { ...f.serialize(), colId: _ }
         };
-        d.push({ id: C.id, params: v });
+        d.push({ id: p.id, params: v });
       });
     } else {
-      const S = (p = this._univerInstanceService.getUniverSheetInstance(e)) == null ? void 0 : p.getSheetBySheetId(t);
+      const S = (C = this._univerInstanceService.getUniverSheetInstance(e)) == null ? void 0 : C.getSheetBySheetId(t);
       if (!S)
         return this._handleNull();
       const F = [];
@@ -786,8 +787,8 @@ let W = class extends V {
     ee(a.startColumn, a.endColumn - a.startColumn + 1, c.startColumn, u);
     let m = s.startColumn, g = s.endColumn;
     o >= a.startColumn && o <= a.endColumn && c.startColumn > a.startColumn && a.endColumn < l && (m = a.endColumn + 1), l >= a.startColumn && l <= a.endColumn && c.startColumn < a.startColumn && a.startColumn > o && (g = a.startColumn - 1);
-    const p = Object.keys(u).map((f) => Number(f)), S = p.find((f) => u[f].colIndex === g), F = p.find((f) => u[f].colIndex === m);
-    if (p.forEach((f) => {
+    const C = Object.keys(u).map((f) => Number(f)), S = C.find((f) => u[f].colIndex === g), F = C.find((f) => u[f].colIndex === m);
+    if (C.forEach((f) => {
       var X, Z;
       const { colIndex: v, filter: y } = u[f], A = f;
       if (y) {
@@ -797,13 +798,13 @@ let W = class extends V {
             subUnitId: t,
             col: A,
             criteria: { ...y.serialize(), colId: A }
-          }, me = {
+          }, Ce = {
             unitId: e,
             subUnitId: t,
             col: A,
             criteria: n.getFilterColumn(A) ? { ...(X = n.getFilterColumn(A)) == null ? void 0 : X.serialize(), colId: A } : null
           };
-          h.push({ id: C.id, params: q }), d.push({ id: C.id, params: me });
+          h.push({ id: p.id, params: q }), d.push({ id: p.id, params: Ce });
         }
         if (!((Z = u[v]) != null && Z.filter)) {
           const q = {
@@ -812,7 +813,7 @@ let W = class extends V {
             col: v,
             criteria: null
           };
-          h.push({ id: C.id, params: q }), d.push({ id: C.id, params: { unitId: e, subUnitId: t, col: v, criteria: { ...y.serialize(), colId: v } } });
+          h.push({ id: p.id, params: q }), d.push({ id: p.id, params: { unitId: e, subUnitId: t, col: v, criteria: { ...y.serialize(), colId: v } } });
         }
       }
     }), o !== F || l !== S) {
@@ -848,7 +849,7 @@ let W = class extends V {
     const m = o;
     let g = l;
     l >= a.startRow && l <= a.endRow && c.startRow < a.startRow && a.startRow > o && (g = a.startRow - 1), ee(a.startRow, a.endRow - a.startRow + 1, c.startRow, u);
-    const p = Object.keys(u).map((f) => Number(f)), S = p.find((f) => u[f].oldIndex === g), F = p.find((f) => u[f].oldIndex === m);
+    const C = Object.keys(u).map((f) => Number(f)), S = C.find((f) => u[f].oldIndex === g), F = C.find((f) => u[f].oldIndex === m);
     if (o !== F || l !== S) {
       const f = {
         unitId: e,
@@ -859,7 +860,7 @@ let W = class extends V {
           endRow: S
         }
       };
-      h.push({ id: R.id, params: f }, { id: L.id, params: { unitId: e, subUnitId: t } }), d.push({ id: R.id, params: { range: s, unitId: e, subUnitId: t } }, { id: L.id, params: { unitId: e, subUnitId: t } });
+      h.push({ id: R.id, params: f }, { id: H.id, params: { unitId: e, subUnitId: t } }), d.push({ id: R.id, params: { range: s, unitId: e, subUnitId: t } }, { id: H.id, params: { unitId: e, subUnitId: t } });
     }
     return {
       redos: h,
@@ -886,12 +887,12 @@ let W = class extends V {
           unitId: e,
           subUnitId: t
         }
-      }, g = { id: R.id, params: { unitId: e, subUnitId: t, range: u } }, p = { id: R.id, params: { unitId: e, subUnitId: t, range: l } };
-      a.push(m, g), c.push(m, p);
+      }, g = { id: R.id, params: { unitId: e, subUnitId: t, range: u } }, C = { id: R.id, params: { unitId: e, subUnitId: t, range: l } };
+      a.push(m, g), c.push(m, C);
       const S = o.getAllFilterColumns(), F = s.startColumn - n.startColumn;
       S.forEach((_) => {
         const [f, v] = _;
-        v && (a.push({ id: C.id, params: { unitId: e, subUnitId: t, col: f + F, criteria: { ...v.serialize(), colId: f + F } } }), c.push({ id: C.id, params: { unitId: e, subUnitId: t, col: f, criteria: { ...v.serialize(), colId: f } } }));
+        v && (a.push({ id: p.id, params: { unitId: e, subUnitId: t, col: f + F, criteria: { ...v.serialize(), colId: f + F } } }), c.push({ id: p.id, params: { unitId: e, subUnitId: t, col: f, criteria: { ...v.serialize(), colId: f } } }));
       });
     } else if (Y.intersects(s, l)) {
       const h = {
@@ -914,7 +915,7 @@ let W = class extends V {
       return this._handleNull();
     const o = [], l = [];
     return n.getAllFilterColumns().forEach(([c, h]) => {
-      l.push({ id: C.id, params: { unitId: e, subUnitId: t, col: c, criteria: { ...h.serialize(), colId: c } } });
+      l.push({ id: p.id, params: { unitId: e, subUnitId: t, col: c, criteria: { ...h.serialize(), colId: c } } });
     }), o.push({ id: O.id, params: { unitId: e, subUnitId: t, range: s } }), l.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } }), {
       undos: l,
       redos: o
@@ -929,7 +930,7 @@ let W = class extends V {
       return this._handleNull();
     const o = [], l = [], a = [], c = [];
     return n.getAllFilterColumns().forEach(([d, u]) => {
-      o.push({ id: C.id, params: { unitId: r, subUnitId: t, col: d, criteria: { ...u.serialize(), colId: d } } }), a.push({ id: C.id, params: { unitId: r, subUnitId: t, col: d, criteria: null } });
+      o.push({ id: p.id, params: { unitId: r, subUnitId: t, col: d, criteria: { ...u.serialize(), colId: d } } }), a.push({ id: p.id, params: { unitId: r, subUnitId: t, col: d, criteria: null } });
     }), a.push({ id: O.id, params: { unitId: r, subUnitId: t, range: s } }), o.unshift({ id: R.id, params: { range: s, unitId: r, subUnitId: t } }), {
       undos: l,
       redos: o,
@@ -962,13 +963,13 @@ let W = class extends V {
     return t.forEach((h) => {
       const [d, u] = h;
       l.push({
-        id: C.id,
+        id: p.id,
         params: {
           ...s,
           col: d
         }
       }), o.push({
-        id: C.id,
+        id: p.id,
         params: {
           ...s,
           col: d,
@@ -978,14 +979,14 @@ let W = class extends V {
     }), t.forEach((h) => {
       const [d, u] = h;
       c.push({
-        id: C.id,
+        id: p.id,
         params: {
           ...s,
           col: d + n,
           criteria: { ...u.serialize(), colId: d + n }
         }
       }), a.push({
-        id: C.id,
+        id: p.id,
         params: {
           ...s,
           col: d + n,
@@ -1016,8 +1017,8 @@ let W = class extends V {
           if (g < d)
             l.push(g);
           else if (a = !0, g <= u) {
-            const p = Math.max(d, l.length ? l[l.length - 1] + 1 : d);
-            l.push(p);
+            const C = Math.max(d, l.length ? l[l.length - 1] + 1 : d);
+            l.push(C);
           } else
             l.push(g - (u - d + 1 - m.length));
         });
@@ -1036,9 +1037,9 @@ let W = class extends V {
             for (let m = d.startColumn; m <= d.endColumn; m++) {
               const g = (c = u == null ? void 0 : u[d.startRow]) == null ? void 0 : c[m];
               if (g && this._cellHasValue(g)) {
-                const p = (h = this._univerInstanceService.getUnit(t)) == null ? void 0 : h.getSheetBySheetId(n);
-                if (p) {
-                  const S = le(d, { down: !0 }, p), F = this._sheetsFilterService.getFilterModel(t, n), _ = F.getRange();
+                const C = (h = this._univerInstanceService.getUnit(t)) == null ? void 0 : h.getSheetBySheetId(n);
+                if (C) {
+                  const S = le(d, { down: !0 }, C), F = this._sheetsFilterService.getFilterModel(t, n), _ = F.getRange();
                   F.setRange({
                     ..._,
                     endRow: S.endRow
@@ -1074,7 +1075,7 @@ let W = class extends V {
   }
   _initErrorHandling() {
     this.disposeWithMe(this._commandService.beforeCommandExecuted((r) => {
-      const e = r.params, t = B(this._univerInstanceService);
+      const e = r.params, t = L(this._univerInstanceService);
       if (!t) return;
       const { subUnitId: n, unitId: s } = t, o = this._sheetsFilterService.getFilterModel(s, n);
       if (!o) return;
@@ -1088,24 +1089,23 @@ let W = class extends V {
     return !(e.length === 0 || e.every((t) => t == null));
   }
 };
-W = Ft([
-  P(0, N),
-  P(1, H(Ie)),
-  P(2, H(M)),
+W = Ot([
+  P(0, T),
+  P(1, z(Ie)),
+  P(2, z(M)),
   P(3, x),
-  P(4, H($e))
+  P(4, z($e))
 ], W);
-const wt = "sheets-filter.config", St = {};
-var vt = Object.defineProperty, Mt = Object.getOwnPropertyDescriptor, Et = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? Mt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+var yt = Object.defineProperty, 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--)
     (o = i[s]) && (n = (t ? o(r, e, n) : o(n)) || n);
-  return t && n && vt(r, e, n), n;
-}, se = (i, r) => (e, t) => r(e, t, i), z;
-let oe = (z = class extends Se {
-  constructor(i = St, r, e) {
+  return t && n && yt(r, e, n), n;
+}, se = (i, r) => (e, t) => r(e, t, i), B;
+let oe = (B = class extends Oe {
+  constructor(i = et, r, e) {
     super(), this._config = i, this._injector = r, this._configService = e;
     const { ...t } = this._config;
-    this._configService.setConfig(wt, t);
+    this._configService.setConfig(ke, t);
   }
   onStarting() {
     [
@@ -1116,19 +1116,19 @@ let oe = (z = class extends Se {
   onReady() {
     this._injector.get(W);
   }
-}, w(z, "type", U.UNIVER_SHEET), w(z, "pluginName", he), z);
-oe = Et([
-  se(1, H(ve)),
-  se(2, Me)
+}, w(B, "type", U.UNIVER_SHEET), w(B, "pluginName", _e), B);
+oe = Tt([
+  se(1, z(ye)),
+  se(2, Ae)
 ], oe);
-const Ot = {
+const Nt = {
   id: "sheet.command.set-filter-range",
   type: E.COMMAND,
   handler: (i, r) => {
-    const e = i.get(M), t = i.get(N), n = i.get(j), s = i.get(x), { unitId: o, subUnitId: l, range: a } = r;
-    if (!B(s, r) || e.getFilterModel(o, l)) return !1;
+    const e = i.get(M), t = i.get(T), n = i.get(j), s = i.get(x), { unitId: o, subUnitId: l, range: a } = r;
+    if (!L(s, r) || e.getFilterModel(o, l)) return !1;
     if (a.endRow === a.startRow) {
-      const m = i.get(Ee), g = i.get(Oe);
+      const m = i.get(Te), g = i.get(Ne);
       return m.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);
@@ -1138,49 +1138,49 @@ const Ot = {
       redoMutations: [d]
     }), u;
   }
-}, yt = {
+}, xt = {
   id: "sheet.command.remove-sheet-filter",
   type: E.COMMAND,
   handler: (i, r) => {
-    const e = i.get(x), t = i.get(M), n = i.get(N), s = i.get(j), o = B(e, r);
+    const e = i.get(x), t = i.get(M), n = i.get(T), s = i.get(j), o = L(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 = At(l, a, h), u = n.syncExecuteCommand(O.id, { unitId: l, subUnitId: a });
+    const h = c == null ? void 0 : c.serialize(), d = It(l, a, h), u = n.syncExecuteCommand(O.id, { unitId: l, subUnitId: a });
     return u && s.pushUndoRedo({
       unitID: l,
       undoMutations: d,
       redoMutations: [{ id: O.id, params: { unitId: l, subUnitId: a } }]
     }), u;
   }
-}, Ut = {
+}, zt = {
   id: "sheet.command.smart-toggle-filter",
   type: E.COMMAND,
   handler: async (i) => {
-    const r = i.get(x), e = i.get(M), t = i.get(N), n = r.getCurrentUnitForType(U.UNIVER_SHEET), s = n == null ? void 0 : n.getActiveSheet();
+    const r = i.get(x), e = i.get(M), t = i.get(T), n = r.getCurrentUnitForType(U.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(yt.id, { unitId: o, subUnitId: l });
+      return t.executeCommand(xt.id, { unitId: o, subUnitId: l });
     const h = i.get(Ge).getCurrentLastSelection();
     if (!h) return !1;
     const d = h.range, u = Je(h) ? le(d, { left: !0, right: !0, up: !0, down: !0 }, s) : d;
-    return t.executeCommand(Ot.id, {
+    return t.executeCommand(Nt.id, {
       unitId: o,
       subUnitId: l,
       range: u
     });
   }
-}, bt = {
+}, Ht = {
   id: "sheet.command.set-filter-criteria",
   type: E.COMMAND,
   handler: async (i, r) => {
-    const e = i.get(M), t = i.get(N), n = i.get(j), { unitId: s, subUnitId: o, col: l, criteria: a } = r, c = e.getFilterModel(s, o);
+    const e = i.get(M), t = i.get(T), n = i.get(j), { 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 = Tt(s, o, l, d), m = {
-      id: C.id,
+    const d = c.getFilterColumn(l), u = Pt(s, o, l, d), m = {
+      id: p.id,
       params: {
         unitId: s,
         subUnitId: o,
@@ -1194,32 +1194,32 @@ const Ot = {
       redoMutations: [m]
     }), g;
   }
-}, Lt = {
+}, Dt = {
   id: "sheet.command.clear-filter-criteria",
   type: E.COMMAND,
   handler: (i, r) => {
-    const e = i.get(M), t = i.get(j), n = i.get(N), s = i.get(x), o = B(s, r);
+    const e = i.get(M), t = i.get(j), n = i.get(T), s = i.get(x), o = L(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 = fe(l, a, h), u = Nt(l, a, h);
-    return ye(u, n).result ? (t.pushUndoRedo({
+    const h = c.serialize(), d = Re(l, a, h), u = $t(l, a, h);
+    return xe(u, n).result ? (t.pushUndoRedo({
       unitID: l,
       undoMutations: d,
       redoMutations: u
     }), !0) : !1;
   }
-}, Bt = {
+}, Wt = {
   id: "sheet.command.re-calc-filter",
   type: E.COMMAND,
   handler: (i, r) => {
-    const e = i.get(M), t = i.get(N), n = i.get(x), s = B(n, r);
+    const e = i.get(M), t = i.get(T), n = i.get(x), s = L(n, r);
     if (!s) return !1;
     const { unitId: o, subUnitId: l } = s;
-    return e.getFilterModel(s.unitId, s.subUnitId) ? t.executeCommand(L.id, { unitId: o, subUnitId: l }) : !1;
+    return e.getFilterModel(s.unitId, s.subUnitId) ? t.executeCommand(H.id, { unitId: o, subUnitId: l }) : !1;
   }
 };
-function At(i, r, e) {
+function It(i, r, e) {
   const t = [], n = {
     id: R.id,
     params: {
@@ -1228,14 +1228,14 @@ function At(i, r, e) {
       range: e.ref
     }
   };
-  return t.push(n), fe(i, r, e).forEach((o) => t.push(o)), t;
+  return t.push(n), Re(i, r, e).forEach((o) => t.push(o)), t;
 }
-function fe(i, r, e) {
+function Re(i, r, e) {
   var n;
   const t = [];
   return (n = e.filterColumns) == null || n.forEach((s) => {
     const o = {
-      id: C.id,
+      id: p.id,
       params: {
         unitId: i,
         subUnitId: r,
@@ -1246,12 +1246,12 @@ function fe(i, r, e) {
     t.push(o);
   }), t;
 }
-function Nt(i, r, e) {
+function $t(i, r, e) {
   var n;
   const t = [];
   return (n = e.filterColumns) == null || n.forEach((s) => {
     const o = {
-      id: C.id,
+      id: p.id,
       params: {
         unitId: i,
         subUnitId: r,
@@ -1262,10 +1262,10 @@ function Nt(i, r, e) {
     t.push(o);
   }), t;
 }
-function Tt(i, r, e, t) {
+function Pt(i, r, e, t) {
   if (!t)
     return {
-      id: C.id,
+      id: p.id,
       params: {
         unitId: i,
         subUnitId: r,
@@ -1275,7 +1275,7 @@ function Tt(i, r, e, t) {
     };
   const n = t.serialize();
   return {
-    id: C.id,
+    id: p.id,
     params: {
       unitId: i,
       subUnitId: r,
@@ -1285,28 +1285,28 @@ function Tt(i, r, e, t) {
   };
 }
 export {
-  Lt as ClearSheetsFilterCriteriaCommand,
-  T as CustomFilterOperator,
-  _t as FILTER_MUTATIONS,
-  it as FilterColumn,
+  Dt as ClearSheetsFilterCriteriaCommand,
+  N as CustomFilterOperator,
+  tt as FILTER_MUTATIONS,
+  ut as FilterColumn,
   D as FilterModel,
-  Bt as ReCalcSheetsFilterCommand,
-  L as ReCalcSheetsFilterMutation,
-  yt as RemoveSheetFilterCommand,
+  Wt as ReCalcSheetsFilterCommand,
+  H as ReCalcSheetsFilterMutation,
+  xt as RemoveSheetFilterCommand,
   O as RemoveSheetsFilterMutation,
-  he as SHEET_FILTER_SNAPSHOT_ID,
-  Ot as SetSheetFilterRangeCommand,
-  bt as SetSheetsFilterCriteriaCommand,
-  C as SetSheetsFilterCriteriaMutation,
+  _e as SHEET_FILTER_SNAPSHOT_ID,
+  Nt as SetSheetFilterRangeCommand,
+  Ht as SetSheetsFilterCriteriaCommand,
+  p as SetSheetsFilterCriteriaMutation,
   R as SetSheetsFilterRangeMutation,
   M as SheetsFilterService,
-  Ut as SmartToggleSheetsFilterCommand,
+  zt as SmartToggleSheetsFilterCommand,
   oe as UniverSheetsFilterPlugin,
-  ke as equals,
+  ot as equals,
   re as getCustomFilterFn,
-  Ye as greaterThan,
-  Ke as greaterThanOrEqualTo,
-  Xe as lessThan,
-  Ze as lessThanOrEqualTo,
-  ae as notEquals
+  rt as greaterThan,
+  nt as greaterThanOrEqualTo,
+  it as lessThan,
+  st as lessThanOrEqualTo,
+  he as notEquals
 };