@univerjs/sheets-filter 0.6.3 → 0.6.4-nightly.202503101606

package/lib/es/index.js

@@ -1,86 +1,87 @@
-var Fe = Object.defineProperty;
-var we = (i, r, e) => r in i ? Fe(i, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[r] = e;
-var w = (i, r, e) => we(i, typeof r != "symbol" ? r + "" : r, e);
-import { isNumeric as Se, Disposable as V, Rectangle as J, mergeSets as q, Tools as Z, extractPureTextFromCell as ve, CellValueType as Y, UniverInstanceType as P, fromCallback as Me, CommandType as E, IResourceManagerService as Ee, IUniverInstanceService as x, ICommandService as T, Inject as z, DisposableCollection as Oe, moveMatrixArray as ee, Plugin as ye, merge as Ae, Injector as Te, IConfigService as Ne, IUndoRedoService as j, sequenceExecute as xe, ErrorService as Ie, LocaleService as $e } from "@univerjs/core";
-import { SheetInterceptorService as Ue, RefRangeService as Pe, SetWorksheetActiveOperation as Le, CopySheetCommand as be, RemoveSheetCommand as Be, INTERCEPTOR_POINT as ze, RemoveRowMutation as He, InsertRowMutation as De, SetRangeValuesMutation as We, expandToContinuousRange as ae, getSheetCommandTarget as b, MoveRowsCommand as Ve, MoveRangeCommand as je, EffectRefRangId as te, RemoveRowCommand as ke, RemoveColCommand as qe, InsertColCommand as Qe, InsertRowCommand as Ge, SheetsSelectionsService as Je, isSingleCellSelection as Ye } from "@univerjs/sheets";
-import { BehaviorSubject as L, merge as Ke, filter as Xe, switchMap as Ze, of as et } from "rxjs";
-const tt = "sheets-filter.config", re = {}, ce = "sheet.mutation.set-filter-range", de = "sheet.mutation.set-filter-criteria", ue = "sheet.mutation.remove-filter", he = "sheet.mutation.re-calc-filter", rt = /* @__PURE__ */ new Set([
-  ce,
+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 Q, 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 $, DisposableCollection as Te, moveMatrixArray as re, Plugin as Ne, merge as xe, touchDependencies as Ie, Injector as $e, IConfigService as Ue, IUndoRedoService as k, sequenceExecute as Pe, ErrorService as De, LocaleService as Le } from "@univerjs/core";
+import { SheetInterceptorService as Be, RefRangeService as be, SetWorksheetActiveOperation as He, CopySheetCommand as ze, RemoveSheetCommand as We, INTERCEPTOR_POINT as Ve, RemoveRowMutation as je, InsertRowMutation as ke, SetRangeValuesMutation as qe, expandToContinuousRange as ue, getSheetCommandTarget as b, MoveRowsCommand as Qe, MoveRangeCommand as Ge, EffectRefRangId as ne, RemoveRowCommand as Je, RemoveColCommand as Ye, InsertColCommand as Ke, InsertRowCommand as Xe, SheetsSelectionsService as Ze, isSingleCellSelection as et } from "@univerjs/sheets";
+import { BehaviorSubject as L, merge as tt, filter as rt, switchMap as nt, of as it } from "rxjs";
+import { IActiveDirtyManagerService as st } from "@univerjs/engine-formula";
+const ot = "sheets-filter.config", ie = {}, de = "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([
   de,
-  ue,
-  he
+  he,
+  me,
+  fe
 ]);
-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 nt = {
-  operator: N.GREATER_THAN,
-  fn: (i, r) => $(i) ? i > r : !1
-}, it = {
-  operator: N.GREATER_THAN_OR_EQUAL,
-  fn: (i, r) => $(i) ? i >= r : !1
-}, st = {
-  operator: N.LESS_THAN,
-  fn: (i, r) => $(i) ? i < r : !1
-}, ot = {
-  operator: N.LESS_THAN_OR_EQUAL,
-  fn: (i, r) => $(i) ? i <= r : !1
-}, lt = {
-  operator: N.EQUAL,
-  fn: (i, r) => $(i) ? i === r : !1
-}, me = {
-  operator: N.NOT_EQUALS,
+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 lt = {
+  operator: x.GREATER_THAN,
+  fn: (i, r) => U(i) ? i > r : !1
+}, at = {
+  operator: x.GREATER_THAN_OR_EQUAL,
+  fn: (i, r) => U(i) ? i >= r : !1
+}, ct = {
+  operator: x.LESS_THAN,
+  fn: (i, r) => U(i) ? i < r : !1
+}, ut = {
+  operator: x.LESS_THAN_OR_EQUAL,
+  fn: (i, r) => U(i) ? i <= r : !1
+}, dt = {
+  operator: x.EQUAL,
+  fn: (i, r) => U(i) ? i === r : !1
+}, _e = {
+  operator: x.NOT_EQUALS,
   fn: (i, r) => {
     if (typeof r == "string") {
       if (r === " ")
         return i != null;
-      const e = ge(i);
-      return e && ut(r) ? !_e(r).test(e) : e !== r;
+      const e = Ce(i);
+      return e && gt(r) ? !pe(r).test(e) : e !== r;
     }
-    return $(i) ? i !== r : !0;
+    return U(i) ? i !== r : !0;
   }
-}, fe = /* @__PURE__ */ new Map([]), at = [nt, it, st, ot, lt, me];
-at.forEach((i) => {
-  fe.set(i.operator, i);
+}, Re = /* @__PURE__ */ new Map([]), ht = [lt, at, ct, ut, dt, _e];
+ht.forEach((i) => {
+  Re.set(i.operator, i);
 });
-function ct(i) {
+function mt(i) {
   return !!i;
 }
-const dt = {
+const ft = {
   fn: (i, r) => {
-    const e = ge(i);
-    return e === null ? r === "" : _e(r).test(e);
+    const e = Ce(i);
+    return e === null ? r === "" : pe(r).test(e);
   }
 };
-function ne(i) {
-  return i ? fe.get(i) : dt;
+function se(i) {
+  return i ? Re.get(i) : ft;
 }
-function $(i) {
+function U(i) {
   return typeof i == "number";
 }
-function ie(i) {
-  return !!(typeof i == "number" || typeof i == "string" && Se(i));
+function oe(i) {
+  return !!(typeof i == "number" || typeof i == "string" && Ee(i));
 }
-function ge(i) {
+function Ce(i) {
   return typeof i == "boolean" || i == null ? null : typeof i == "string" ? i : i.toString();
 }
-function ut(i) {
+function gt(i) {
   return typeof i == "number" ? !1 : i.indexOf("*") !== -1 || i.indexOf("?") !== -1;
 }
-function _e(i) {
+function pe(i) {
   const r = i.replace(/[.+^${}()|[\]\\]/g, "\\$&").replaceAll("?", ".").replace(/[*]/g, ".$&");
   return new RegExp(`^${r}$`);
 }
-const Q = () => /* @__PURE__ */ new Set();
-class D extends V {
+const G = () => /* @__PURE__ */ new Set();
+class W extends B {
   constructor(e, t, n) {
     super();
-    w(this, "_filteredOutRows$", new L(Q()));
+    w(this, "_filteredOutRows$", new L(G()));
     /** An observable value. A set of filtered out rows. */
     w(this, "filteredOutRows$", this._filteredOutRows$.asObservable());
     // TODO: we may need to update which cols have criteria rather than simple boolean
     w(this, "_hasCriteria$", new L(!1));
     w(this, "hasCriteria$", this._hasCriteria$.asObservable());
     w(this, "_filterColumnByIndex", /* @__PURE__ */ new Map());
-    w(this, "_alreadyFilteredOutRows", Q());
+    w(this, "_alreadyFilteredOutRows", G());
     w(this, "_range");
     this.unitId = e, this.subUnitId = t, this._worksheet = n;
   }
@@ -98,7 +99,7 @@ class D extends V {
    */
   serialize() {
     const e = {
-      ref: J.clone(this._range),
+      ref: K.clone(this._range),
       filterColumns: this._getAllFilterColumns(!0).sort(([t], [n]) => t - n).map(([t, n]) => n.serialize())
     };
     return this._alreadyFilteredOutRows && (e.cachedFilteredOut = Array.from(this._alreadyFilteredOutRows).sort()), e;
@@ -111,7 +112,7 @@ class D extends V {
    * @param autoFilter auto filter data
    */
   static deserialize(e, t, n, s) {
-    const o = new D(e, t, n);
+    const o = new W(e, t, n);
     return o._dump(s), o;
   }
   _dump(e) {
@@ -134,7 +135,7 @@ class D extends V {
   getFilteredOutRowsExceptCol(e) {
     return this._getAllFilterColumns(!0).filter(([t]) => t !== e).reduce((t, [, n]) => {
       const s = n.calc({ getAlreadyFilteredOutRows: () => t });
-      return s ? q(t, s) : t;
+      return s ? Q(t, s) : t;
     }, /* @__PURE__ */ new Set());
   }
   /**
@@ -178,7 +179,7 @@ class D extends V {
     return e ? t : t.map(([n, s]) => s);
   }
   _reCalcAllColumns() {
-    this._alreadyFilteredOutRows = Q(), this._getAllFilterColumns().forEach((e) => e.__clearCache()), this._reCalcWithNoCacheColumns();
+    this._alreadyFilteredOutRows = G(), this._getAllFilterColumns().forEach((e) => e.__clearCache()), this._reCalcWithNoCacheColumns();
   }
   _setCriteriaWithoutReCalc(e, t) {
     const n = this._range;
@@ -188,7 +189,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 ht(
+    this._filterColumnByIndex.has(e) ? l = this._filterColumnByIndex.get(e) : (l = new _t(
       this.unitId,
       this.subUnitId,
       this._worksheet,
@@ -207,18 +208,18 @@ class D extends V {
     this._hasCriteria$.next(this._filterColumnByIndex.size > 0);
   }
   _rebuildAlreadyFilteredOutRowsWithCache() {
-    const e = this._getAllFilterColumns().filter((t) => t.hasCache()).reduce((t, n) => q(t, n.filteredOutRows), /* @__PURE__ */ new Set());
+    const e = this._getAllFilterColumns().filter((t) => t.hasCache()).reduce((t, n) => Q(t, n.filteredOutRows), /* @__PURE__ */ new Set());
     this._alreadyFilteredOutRows = e;
   }
   _reCalcWithNoCacheColumns() {
     const e = this._getAllFilterColumns().filter((t) => !t.hasCache());
     for (const t of e) {
       const n = t.reCalc();
-      n && (this._alreadyFilteredOutRows = q(this._alreadyFilteredOutRows, n));
+      n && (this._alreadyFilteredOutRows = Q(this._alreadyFilteredOutRows, n));
     }
   }
 }
-class ht extends V {
+class _t extends B {
   constructor(e, t, n, s, o) {
     super();
     w(this, "_filteredOutRows", null);
@@ -244,7 +245,7 @@ class ht extends V {
   serialize() {
     if (!this._criteria)
       throw new Error("[FilterColumn]: could not serialize without a filter column!");
-    return Z.deepClone({
+    return te.deepClone({
       ...this._criteria,
       colId: this._column
     });
@@ -260,7 +261,7 @@ class ht extends V {
     this._criteria = e, this._generateFilterFn(), this._filteredOutRows = null;
   }
   getColumnData() {
-    return Z.deepClone(this._criteria);
+    return te.deepClone(this._criteria);
   }
   /**
    * Trigger new calculation on this `FilterModel` instance.
@@ -283,75 +284,75 @@ class ht extends V {
       const { row: a, rowSpan: c, col: h } = l;
       if (o.has(a) && (!c || c === 1))
         continue;
-      const d = this._filterByValues ? ve(this._worksheet.getCell(a, h)) : Ft(this._worksheet, a, h);
-      if (!this._filterFn(d) && (s.add(a), c))
-        for (let u = 1; u < c; u++)
-          s.add(a + u);
+      const u = this._filterByValues ? ye(this._worksheet.getCell(a, h)) : Mt(this._worksheet, a, h);
+      if (!this._filterFn(u) && (s.add(a), c))
+        for (let d = 1; d < c; d++)
+          s.add(a + d);
     }
     return s;
   }
   _generateFilterFn() {
-    this._criteria && (this._filterFn = mt(this._criteria), this._filterByValues = !!this._criteria.filters);
+    this._criteria && (this._filterFn = Rt(this._criteria), this._filterByValues = !!this._criteria.filters);
   }
 }
-function mt(i) {
+function Rt(i) {
   if (i.filters)
-    return ft(i.filters);
+    return Ct(i.filters);
   if (i.customFilters)
-    return gt(i.customFilters);
+    return pt(i.customFilters);
   throw new Error("[FilterModel]: other types of filters are not supported yet.");
 }
-function ft(i) {
+function Ct(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 gt(i) {
-  const r = i.customFilters.map((e) => pt(e));
-  return Ct(r) ? i.and ? _t(r) : Rt(r) : r[0];
+function pt(i) {
+  const r = i.customFilters.map((e) => vt(e));
+  return St(r) ? i.and ? Ft(r) : wt(r) : r[0];
 }
-function _t(i) {
+function Ft(i) {
   const [r, e] = i;
   return (t) => r(t) && e(t);
 }
-function Rt(i) {
+function wt(i) {
   const [r, e] = i;
   return (t) => r(t) || e(t);
 }
-function Ct(i) {
+function St(i) {
   return i.length === 2;
 }
-function pt(i) {
+function vt(i) {
   const r = i.val;
-  if (i.operator === N.NOT_EQUALS && !ie(r))
-    return (n) => me.fn(n, r);
-  if (ct(i.operator)) {
-    if (!ie(r)) return () => !1;
-    const n = ne(i.operator), s = Number(r);
+  if (i.operator === x.NOT_EQUALS && !oe(r))
+    return (n) => _e.fn(n, r);
+  if (mt(i.operator)) {
+    if (!oe(r)) return () => !1;
+    const n = se(i.operator), s = Number(r);
     return (o) => n.fn(o, s);
   }
-  const e = ne(i.operator);
+  const e = se(i.operator);
   return (t) => e.fn(t, r);
 }
-function Ft(i, r, e) {
+function Mt(i, r, e) {
   const t = i.getCell(r, e);
   if (!t) return null;
   const n = i.getCellRaw(r, e);
-  return t && !n ? se(t) : n ? t.t === Y.NUMBER && typeof t.v == "string" ? n.v : se(n) : null;
+  return t && !n ? le(t) : n ? t.t === X.NUMBER && typeof t.v == "string" ? n.v : le(n) : null;
 }
-function se(i) {
+function le(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 === Y.BOOLEAN ? e.toUpperCase() : e : typeof e == "number" ? i.t === Y.BOOLEAN ? e ? "TRUE" : "FALSE" : e : typeof e == "boolean" ? e ? "TRUE" : "FALSE" : "";
+  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 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--)
+var Et = Object.getOwnPropertyDescriptor, yt = (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 = o(n) || n);
   return n;
-}, G = (i, r) => (e, t) => r(e, t, i);
-const Re = "SHEET_FILTER_PLUGIN";
-let M = class extends V {
+}, J = (i, r) => (e, t) => r(e, t, i);
+const Fe = "SHEET_FILTER_PLUGIN";
+let M = class extends B {
   constructor(r, e, t) {
     super();
     w(this, "_filterModels", /* @__PURE__ */ new Map());
@@ -383,7 +384,7 @@ let M = class extends V {
     const s = n.getSheetBySheetId(e);
     if (!s)
       throw new Error(`[SheetsFilterService]: could not create "FilterModel" on a non-existing worksheet ${e}!`);
-    const o = new D(r, e, s);
+    const o = new W(r, e, s);
     return this._cacheFilterModel(r, e, o), o;
   }
   getFilterModel(r, e) {
@@ -400,7 +401,7 @@ let M = class extends V {
   _updateActiveFilterModel() {
     let r;
     try {
-      if (r = this._univerInstanceService.getCurrentUnitForType(P.UNIVER_SHEET), !r) {
+      if (r = this._univerInstanceService.getCurrentUnitForType(D.UNIVER_SHEET), !r) {
         this._activeFilterModel$.next(null);
         return;
       }
@@ -418,13 +419,13 @@ let M = class extends V {
   }
   _initActiveFilterModel() {
     this.disposeWithMe(
-      Ke(
+      tt(
         // source1: executing filter related mutations
-        Me(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(Xe(([r]) => r.type === E.MUTATION && rt.has(r.id))),
+        Oe(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(rt(([r]) => r.type === E.MUTATION && ge.has(r.id))),
         // source2: activate sheet changes
-        this._univerInstanceService.getCurrentTypeOfUnit$(P.UNIVER_SHEET).pipe(Ze((r) => {
+        this._univerInstanceService.getCurrentTypeOfUnit$(D.UNIVER_SHEET).pipe(nt((r) => {
           var e;
-          return (e = r == null ? void 0 : r.activeSheet$) != null ? e : et(null);
+          return (e = r == null ? void 0 : r.activeSheet$) != null ? e : it(null);
         }))
       ).subscribe(() => this._updateActiveFilterModel())
     );
@@ -441,14 +442,14 @@ let M = class extends V {
   _deserializeAutoFiltersForUnit(r, e) {
     const t = this._univerInstanceService.getUniverSheetInstance(r);
     Object.keys(e).forEach((n) => {
-      const s = e[n], o = D.deserialize(r, n, t.getSheetBySheetId(n), s);
+      const s = e[n], o = W.deserialize(r, n, t.getSheetBySheetId(n), s);
       this._cacheFilterModel(r, n, o);
     });
   }
   _initModel() {
     this._resourcesManagerService.registerPluginResource({
-      pluginName: Re,
-      businesses: [P.UNIVER_SHEET],
+      pluginName: Fe,
+      businesses: [D.UNIVER_SHEET],
       toJson: (r) => this._serializeAutoFiltersForUnit(r),
       parseJson: (r) => JSON.parse(r),
       onLoad: (r, e) => {
@@ -464,41 +465,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 = St([
-  G(0, Ee),
-  G(1, x),
-  G(2, T)
+M = yt([
+  J(0, Ae),
+  J(1, T),
+  J(2, N)
 ], M);
 const R = {
-  id: ce,
+  id: de,
   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: de,
+  id: he,
   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: ue,
+}, y = {
+  id: me,
   type: E.MUTATION,
   handler: (i, r) => {
     const { unitId: e, subUnitId: t } = r;
     return i.get(M).removeFilterModel(e, t);
   }
-}, H = {
-  id: he,
+}, z = {
+  id: fe,
   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) {
+function Ot(i, r) {
   for (let e = 0; e < i.length; e++) {
     let t = e;
     if (i[e])
@@ -508,32 +509,32 @@ function vt(i, r) {
   return i.filter((e) => e !== null);
 }
 function I(i) {
-  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);
+  return Ot(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 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 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 = o(n) || n);
   return n;
-}, U = (i, r) => (e, t) => r(e, t, i);
-let W = class extends V {
+}, P = (i, r) => (e, t) => r(e, t, i);
+let V = class extends B {
   constructor(r, e, t, n, s) {
     super();
-    w(this, "_disposableCollection", new Oe());
+    w(this, "_disposableCollection", new Te());
     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() {
     [
       p,
       R,
-      H,
-      O
+      z,
+      y
     ].forEach((r) => this.disposeWithMe(this._commandService.registerCommand(r)));
   }
   _initInterceptors() {
     this.disposeWithMe(this._sheetInterceptorService.interceptCommand({
       getMutations: (r) => this._getUpdateFilter(r)
     })), this.disposeWithMe(this._commandService.onCommandExecuted((r) => {
-      if (r.id === Le.id) {
+      if (r.id === He.id) {
         const e = r.params, t = e.subUnitId, n = e.unitId;
         if (!t || !n)
           return;
@@ -559,31 +560,31 @@ let W = class extends V {
     if (!t || !n) return;
     const s = (l = this._sheetsFilterService.getFilterModel(r, e)) == null ? void 0 : l.getRange(), o = (a) => {
       switch (a.id) {
-        case Ge.id: {
-          const c = a.params, h = c.unitId || r, d = c.subUnitId || e;
-          return this._handleInsertRowCommand(c, h, d);
+        case Xe.id: {
+          const c = a.params, h = c.unitId || r, u = c.subUnitId || e;
+          return this._handleInsertRowCommand(c, h, u);
         }
-        case Qe.id: {
-          const c = a.params, h = c.unitId || r, d = c.subUnitId || e;
-          return this._handleInsertColCommand(c, h, d);
+        case Ke.id: {
+          const c = a.params, h = c.unitId || r, u = c.subUnitId || e;
+          return this._handleInsertColCommand(c, h, u);
         }
-        case qe.id: {
+        case Ye.id: {
           const c = a.params;
           return this._handleRemoveColCommand(c, r, e);
         }
-        case ke.id: {
+        case Je.id: {
           const c = a.params;
           return this._handleRemoveRowCommand(c, r, e);
         }
-        case te.MoveColsCommandId: {
+        case ne.MoveColsCommandId: {
           const c = a.params;
           return this._handleMoveColsCommand(c, r, e);
         }
-        case te.MoveRowsCommandId: {
+        case ne.MoveRowsCommandId: {
           const c = a.params;
           return this._handleMoveRowsCommand(c, r, e);
         }
-        case je.id: {
+        case Ge.id: {
           const c = a.params;
           return this._handleMoveRangeCommand(c, r, e);
         }
@@ -595,11 +596,11 @@ let W = class extends V {
   _getUpdateFilter(r) {
     const { id: e } = r;
     switch (e) {
-      case Be.id: {
+      case We.id: {
         const t = r.params;
         return this._handleRemoveSheetCommand(t, t.unitId, t.subUnitId);
       }
-      case be.id: {
+      case ze.id: {
         const t = r.params, { targetSubUnitId: n, unitId: s, subUnitId: o } = t;
         return !s || !o || !n ? this._handleNull() : this._handleCopySheetCommand(s, o, n);
       }
@@ -617,7 +618,7 @@ let W = class extends V {
     const { startColumn: o, endColumn: l } = s, { startColumn: a, endColumn: c } = r.range, h = c - a + 1;
     if (c > l)
       return this._handleNull();
-    const d = [], u = [], f = a, g = {
+    const u = [], d = [], f = a, g = {
       unitId: e,
       subUnitId: t,
       range: {
@@ -630,13 +631,13 @@ let W = class extends V {
       subUnitId: t,
       range: s
     };
-    d.push({ id: R.id, params: g }), u.push({ id: R.id, params: C });
+    u.push({ id: R.id, params: g }), d.push({ id: R.id, params: C });
     const F = n.getAllFilterColumns().filter((m) => m[0] >= f);
     if (F.length !== 0) {
       const { newRange: m, oldRange: v } = this._moveCriteria(e, t, F, h);
-      d.push(...m.redos, ...v.redos), u.push(...m.undos, ...v.undos);
+      u.push(...m.redos, ...v.redos), d.push(...m.undos, ...v.undos);
     }
-    return { redos: I(d), undos: I(u) };
+    return { redos: I(u), undos: I(d) };
   }
   _handleInsertRowCommand(r, e, t) {
     var C;
@@ -646,7 +647,7 @@ let W = class extends V {
     const { startRow: o, endRow: l } = s, { startRow: a, endRow: c } = r.range, h = c - a + 1;
     if (c > l)
       return this._handleNull();
-    const d = [], u = [], f = {
+    const u = [], d = [], f = {
       unitId: e,
       subUnitId: t,
       range: {
@@ -659,9 +660,9 @@ let W = class extends V {
       subUnitId: t,
       range: s
     };
-    return d.push({ id: R.id, params: f }), u.push({ id: R.id, params: g }), {
-      redos: I(d),
-      undos: I(u)
+    return u.push({ id: R.id, params: f }), d.push({ id: R.id, params: g }), {
+      redos: I(u),
+      undos: I(d)
     };
   }
   _handleRemoveColCommand(r, e, t) {
@@ -672,10 +673,10 @@ let W = class extends V {
     const { startColumn: o, endColumn: l } = s, { startColumn: a, endColumn: c } = r.range;
     if (a > l)
       return this._handleNull();
-    const h = [], d = [], u = c < o ? 0 : Math.min(c, l) - Math.max(a, o) + 1, f = c - a + 1, g = n.getAllFilterColumns();
+    const h = [], u = [], d = c < o ? 0 : Math.min(c, l) - Math.max(a, o) + 1, f = c - a + 1, g = n.getAllFilterColumns();
     g.forEach((_) => {
       const [m, v] = _;
-      m <= c && m >= a && (h.push({ id: p.id, params: { unitId: e, subUnitId: t, col: m, criteria: null } }), d.push({ id: p.id, params: { unitId: e, subUnitId: t, col: m, criteria: { ...v.serialize(), colId: m } } }));
+      m <= c && m >= a && (h.push({ id: p.id, params: { unitId: e, subUnitId: t, col: m, criteria: null } }), u.push({ id: p.id, params: { unitId: e, subUnitId: t, col: m, criteria: { ...v.serialize(), colId: m } } }));
     });
     const C = g.filter((_) => {
       const [m, v] = _;
@@ -684,24 +685,24 @@ let W = class extends V {
     let S = { undos: [], redos: [] };
     if (C.length > 0) {
       const { oldRange: _, newRange: m } = this._moveCriteria(e, t, C, -f);
-      S = m, h.push(..._.redos), d.unshift(..._.undos);
+      S = m, h.push(..._.redos), u.unshift(..._.undos);
     }
-    if (u === l - o + 1) {
+    if (d === l - o + 1) {
       const _ = {
         unitId: e,
         subUnitId: t
       };
-      h.push({ id: O.id, params: _ }), d.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
+      h.push({ id: y.id, params: _ }), u.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
     } else {
-      const _ = o <= a ? o : u === 0 ? o - f : a, m = o <= a ? l - u : l - f, v = {
+      const _ = o <= a ? o : d === 0 ? o - f : a, m = o <= a ? l - d : l - f, v = {
         unitId: e,
         subUnitId: t,
         range: { ...s, startColumn: _, endColumn: m }
       };
-      h.push({ id: R.id, params: v }), d.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } }), h.push(...S.redos), d.unshift(...S.undos);
+      h.push({ id: R.id, params: v }), u.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } }), h.push(...S.redos), u.unshift(...S.undos);
     }
     return {
-      undos: d,
+      undos: u,
       redos: h
     };
   }
@@ -729,30 +730,30 @@ let W = class extends V {
           }
         }]
       };
-    const h = [], d = [], u = n.getAllFilterColumns(), f = o <= c && o >= a;
-    d.push({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
+    const h = [], u = [], d = n.getAllFilterColumns(), f = o <= c && o >= a;
+    u.push({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
     const g = Math.min(c, l) - Math.max(a, o) + 1;
     if (g === l - o + 1 || f) {
       const S = {
         unitId: e,
         subUnitId: t
       };
-      h.push({ id: O.id, params: S }), u.forEach((F) => {
+      h.push({ id: y.id, params: S }), d.forEach((F) => {
         const [_, m] = F, v = {
           unitId: e,
           subUnitId: t,
           col: _,
           criteria: { ...m.serialize(), colId: _ }
         };
-        d.push({ id: p.id, params: v });
+        u.push({ id: p.id, params: v });
       });
     } else {
       const S = (C = this._univerInstanceService.getUniverSheetInstance(e)) == null ? void 0 : C.getSheetBySheetId(t);
       if (!S)
         return this._handleNull();
       const F = [];
-      for (let y = a; y <= c; y++)
-        S.getRowFiltered(y) && F.push(y);
+      for (let O = a; O <= c; O++)
+        S.getRowFiltered(O) && F.push(O);
       const _ = Math.min(o, a), m = _ + (l - o) - g + F.length, v = {
         unitId: e,
         subUnitId: t,
@@ -765,7 +766,7 @@ let W = class extends V {
       h.push({ id: R.id, params: v });
     }
     return {
-      undos: I(d),
+      undos: I(u),
       redos: I(h)
     };
   }
@@ -778,42 +779,42 @@ let W = class extends V {
     const { startColumn: o, endColumn: l } = s, { fromRange: a, toRange: c } = r;
     if (a.endColumn < o && c.startColumn <= o || a.startColumn > l && c.endColumn > l)
       return this._handleNull();
-    const h = [], d = [], u = {};
+    const h = [], u = [], d = {};
     for (let m = o; m <= l; m++)
-      u[m] = {
+      d[m] = {
         colIndex: m,
         filter: n.getFilterColumn(m)
       };
-    ee(a.startColumn, a.endColumn - a.startColumn + 1, c.startColumn, u);
+    re(a.startColumn, a.endColumn - a.startColumn + 1, c.startColumn, d);
     let f = s.startColumn, g = s.endColumn;
     o >= a.startColumn && o <= a.endColumn && c.startColumn > a.startColumn && a.endColumn < l && (f = a.endColumn + 1), l >= a.startColumn && l <= a.endColumn && c.startColumn < a.startColumn && a.startColumn > o && (g = a.startColumn - 1);
-    const C = Object.keys(u).map((m) => Number(m)), S = C.find((m) => u[m].colIndex === g), F = C.find((m) => u[m].colIndex === f);
+    const C = Object.keys(d).map((m) => Number(m)), S = C.find((m) => d[m].colIndex === g), F = C.find((m) => d[m].colIndex === f);
     if (C.forEach((m) => {
-      var K, X;
-      const { colIndex: v, filter: y } = u[m], A = m;
-      if (y) {
+      var Z, ee;
+      const { colIndex: v, filter: O } = d[m], A = m;
+      if (O) {
         if (A >= F && A <= S) {
-          const k = {
+          const q = {
             unitId: e,
             subUnitId: t,
             col: A,
-            criteria: { ...y.serialize(), colId: A }
-          }, pe = {
+            criteria: { ...O.serialize(), colId: A }
+          }, Se = {
             unitId: e,
             subUnitId: t,
             col: A,
-            criteria: n.getFilterColumn(A) ? { ...(K = n.getFilterColumn(A)) == null ? void 0 : K.serialize(), colId: A } : null
+            criteria: n.getFilterColumn(A) ? { ...(Z = n.getFilterColumn(A)) == null ? void 0 : Z.serialize(), colId: A } : null
           };
-          h.push({ id: p.id, params: k }), d.push({ id: p.id, params: pe });
+          h.push({ id: p.id, params: q }), u.push({ id: p.id, params: Se });
         }
-        if (!((X = u[v]) != null && X.filter)) {
-          const k = {
+        if (!((ee = d[v]) != null && ee.filter)) {
+          const q = {
             unitId: e,
             subUnitId: t,
             col: v,
             criteria: null
           };
-          h.push({ id: p.id, params: k }), d.push({ id: p.id, params: { unitId: e, subUnitId: t, col: v, criteria: { ...y.serialize(), colId: v } } });
+          h.push({ id: p.id, params: q }), u.push({ id: p.id, params: { unitId: e, subUnitId: t, col: v, criteria: { ...O.serialize(), colId: v } } });
         }
       }
     }), o !== F || l !== S) {
@@ -826,10 +827,10 @@ let W = class extends V {
           endColumn: S
         }
       };
-      h.unshift({ id: R.id, params: m }), d.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
+      h.unshift({ id: R.id, params: m }), u.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
     }
     return {
-      undos: d,
+      undos: u,
       redos: h
     };
   }
@@ -841,15 +842,15 @@ let W = class extends V {
     const { startRow: o, endRow: l } = s, { fromRange: a, toRange: c } = r;
     if (a.endRow < o && c.startRow <= o || a.startRow > l && c.endRow > l)
       return this._handleNull();
-    const h = [], d = [], u = {};
+    const h = [], u = [], d = {};
     for (let m = o; m <= l; m++)
-      u[m] = {
+      d[m] = {
         oldIndex: m
       };
     const f = 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 C = Object.keys(u).map((m) => Number(m)), S = C.find((m) => u[m].oldIndex === g), F = C.find((m) => u[m].oldIndex === f);
+    l >= a.startRow && l <= a.endRow && c.startRow < a.startRow && a.startRow > o && (g = a.startRow - 1), re(a.startRow, a.endRow - a.startRow + 1, c.startRow, d);
+    const C = Object.keys(d).map((m) => Number(m)), S = C.find((m) => d[m].oldIndex === g), F = C.find((m) => d[m].oldIndex === f);
     if (o !== F || l !== S) {
       const m = {
         unitId: e,
@@ -860,11 +861,11 @@ let W = class extends V {
           endRow: S
         }
       };
-      h.push({ id: R.id, params: m }, { 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 } });
+      h.push({ id: R.id, params: m }, { id: z.id, params: { unitId: e, subUnitId: t } }), u.push({ id: R.id, params: { range: s, unitId: e, subUnitId: t } }, { id: z.id, params: { unitId: e, subUnitId: t } });
     }
     return {
       redos: h,
-      undos: d
+      undos: u
     };
   }
   _handleMoveRangeCommand(r, e, t) {
@@ -875,26 +876,26 @@ let W = class extends V {
     if (!l)
       return this._handleNull();
     const a = [], c = [];
-    if (J.contains(n, l)) {
-      const h = l.startRow - n.startRow, d = l.startColumn - n.startColumn, u = {
+    if (K.contains(n, l)) {
+      const h = l.startRow - n.startRow, u = l.startColumn - n.startColumn, d = {
         startRow: s.startRow + h,
-        startColumn: s.startColumn + d,
+        startColumn: s.startColumn + u,
         endRow: s.startRow + h + (l.endRow - l.startRow),
-        endColumn: s.startColumn + d + (l.endColumn - l.startColumn)
+        endColumn: s.startColumn + u + (l.endColumn - l.startColumn)
       }, f = {
-        id: O.id,
+        id: y.id,
         params: {
           unitId: e,
           subUnitId: t
         }
-      }, g = { id: R.id, params: { unitId: e, subUnitId: t, range: u } }, C = { id: R.id, params: { unitId: e, subUnitId: t, range: l } };
+      }, g = { id: R.id, params: { unitId: e, subUnitId: t, range: d } }, C = { id: R.id, params: { unitId: e, subUnitId: t, range: l } };
       a.push(f, g), c.push(f, C);
       const S = o.getAllFilterColumns(), F = s.startColumn - n.startColumn;
       S.forEach((_) => {
         const [m, v] = _;
         v && (a.push({ id: p.id, params: { unitId: e, subUnitId: t, col: m + F, criteria: { ...v.serialize(), colId: m + F } } }), c.push({ id: p.id, params: { unitId: e, subUnitId: t, col: m, criteria: { ...v.serialize(), colId: m } } }));
       });
-    } else if (J.intersects(s, l)) {
+    } else if (K.intersects(s, l)) {
       const h = {
         ...l,
         endRow: Math.max(l.endRow, s.endRow)
@@ -916,7 +917,7 @@ let W = class extends V {
     const o = [], l = [];
     return n.getAllFilterColumns().forEach(([c, h]) => {
       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 } }), {
+    }), o.push({ id: y.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,9 +930,9 @@ let W = class extends V {
     if (!s)
       return this._handleNull();
     const o = [], l = [], a = [], c = [];
-    return n.getAllFilterColumns().forEach(([d, u]) => {
-      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 } }), {
+    return n.getAllFilterColumns().forEach(([u, d]) => {
+      o.push({ id: p.id, params: { unitId: r, subUnitId: t, col: u, criteria: { ...d.serialize(), colId: u } } }), a.push({ id: p.id, params: { unitId: r, subUnitId: t, col: u, criteria: null } });
+    }), a.push({ id: y.id, params: { unitId: r, subUnitId: t, range: s } }), o.unshift({ id: R.id, params: { range: s, unitId: r, subUnitId: t } }), {
       undos: l,
       redos: o,
       preUndos: a,
@@ -942,7 +943,7 @@ let W = class extends V {
     return { redos: [], undos: [] };
   }
   _initRowFilteredInterceptor() {
-    this.disposeWithMe(this._sheetInterceptorService.intercept(ze.ROW_FILTERED, {
+    this.disposeWithMe(this._sheetInterceptorService.intercept(Ve.ROW_FILTERED, {
       // sheet-interceptor.service.ts
       handler: (r, e) => {
         var t, n;
@@ -961,35 +962,35 @@ let W = class extends V {
       col: -1
     }, o = [], l = [], a = [], c = [];
     return t.forEach((h) => {
-      const [d, u] = h;
+      const [u, d] = h;
       l.push({
         id: p.id,
         params: {
           ...s,
-          col: d
+          col: u
         }
       }), o.push({
         id: p.id,
         params: {
           ...s,
-          col: d,
-          criteria: { ...u.serialize(), colId: d }
+          col: u,
+          criteria: { ...d.serialize(), colId: u }
         }
       });
     }), t.forEach((h) => {
-      const [d, u] = h;
+      const [u, d] = h;
       c.push({
         id: p.id,
         params: {
           ...s,
-          col: d + n,
-          criteria: { ...u.serialize(), colId: d + n }
+          col: u + n,
+          criteria: { ...d.serialize(), colId: u + n }
         }
       }), a.push({
         id: p.id,
         params: {
           ...s,
-          col: d + n,
+          col: u + n,
           criteria: null
         }
       });
@@ -1009,37 +1010,37 @@ let W = class extends V {
       var c, h;
       const { unitId: t, subUnitId: n } = r.params || {}, s = this._sheetsFilterService.getFilterModel(t, n);
       if (!s) return;
-      const o = Array.from(s.filteredOutRows).sort((d, u) => d - u), l = [];
+      const o = Array.from(s.filteredOutRows).sort((u, d) => u - d), l = [];
       let a = !1;
-      if (r.id === He.id) {
-        const { startRow: d, endRow: u } = r.params.range, f = o.filter((g) => g >= d && g <= u);
+      if (r.id === je.id) {
+        const { startRow: u, endRow: d } = r.params.range, f = o.filter((g) => g >= u && g <= d);
         o.forEach((g) => {
-          if (g < d)
+          if (g < u)
             l.push(g);
-          else if (a = !0, g <= u) {
-            const C = Math.max(d, l.length ? l[l.length - 1] + 1 : d);
+          else if (a = !0, g <= d) {
+            const C = Math.max(u, l.length ? l[l.length - 1] + 1 : u);
             l.push(C);
           } else
-            l.push(g - (u - d + 1 - f.length));
+            l.push(g - (d - u + 1 - f.length));
         });
       }
-      if (r.id === De.id) {
-        const { startRow: d, endRow: u } = r.params.range;
+      if (r.id === ke.id) {
+        const { startRow: u, endRow: d } = r.params.range;
         o.forEach((f) => {
-          f >= d ? (a = !0, l.push(f + (u - d + 1))) : l.push(f);
+          f >= u ? (a = !0, l.push(f + (d - u + 1))) : l.push(f);
         });
       }
-      if (a && (s.filteredOutRows = new Set(l)), r.id === We.id && !(e != null && e.onlyLocal)) {
-        const d = this._getExtendRegion(t, n);
-        if (d) {
-          const u = r.params.cellValue;
-          if (u)
-            for (let f = d.startColumn; f <= d.endColumn; f++) {
-              const g = (c = u == null ? void 0 : u[d.startRow]) == null ? void 0 : c[f];
+      if (a && (s.filteredOutRows = new Set(l)), r.id === qe.id && !(e != null && e.onlyLocal)) {
+        const u = this._getExtendRegion(t, n);
+        if (u) {
+          const d = r.params.cellValue;
+          if (d)
+            for (let f = u.startColumn; f <= u.endColumn; f++) {
+              const g = (c = d == null ? void 0 : d[u.startRow]) == null ? void 0 : c[f];
               if (g && this._cellHasValue(g)) {
                 const C = (h = this._univerInstanceService.getUnit(t)) == null ? void 0 : h.getSheetBySheetId(n);
                 if (C) {
-                  const S = ae(d, { down: !0 }, C), F = this._sheetsFilterService.getFilterModel(t, n), _ = F.getRange();
+                  const S = ue(u, { down: !0 }, C), F = this._sheetsFilterService.getFilterModel(t, n), _ = F.getRange();
                   F.setRange({
                     ..._,
                     endRow: S.endRow
@@ -1080,7 +1081,7 @@ let W = class extends V {
       const { subUnitId: n, unitId: s } = t, o = this._sheetsFilterService.getFilterModel(s, n);
       if (!o) return;
       const l = o.getRange();
-      if (r.id === Ve.id && e.fromRange.startRow <= l.startRow && e.fromRange.endRow < l.endRow && e.fromRange.endRow >= l.startRow)
+      if (r.id === Qe.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");
     }));
   }
@@ -1089,101 +1090,158 @@ let W = class extends V {
     return !(e.length === 0 || e.every((t) => t == null));
   }
 };
-W = Et([
-  U(0, T),
-  U(1, z(Ue)),
-  U(2, z(M)),
-  U(3, x),
-  U(4, z(Pe))
-], W);
-var Ot = Object.getOwnPropertyDescriptor, yt = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? Ot(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+V = Tt([
+  P(0, N),
+  P(1, $(Be)),
+  P(2, $(M)),
+  P(3, T),
+  P(4, $(be))
+], V);
+var Nt = Object.getOwnPropertyDescriptor, xt = (i, r, e, t) => {
+  for (var n = t > 1 ? void 0 : t ? Nt(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);
+let j = class extends B {
+  constructor(i, r, e) {
+    super(), this._activeDirtyManagerService = i, this._sheetsFilterService = r, this._univerInstanceService = e, this._initFormulaDirtyRange();
+  }
+  _initFormulaDirtyRange() {
+    ge.forEach((i) => {
+      this._activeDirtyManagerService.register(
+        i,
+        {
+          commandId: i,
+          getDirtyData: (r) => {
+            const e = r.params, { unitId: t, subUnitId: n } = e;
+            return {
+              dirtyRanges: this._getHideRowMutation(t, n),
+              clearDependencyTreeCache: {
+                [t]: {
+                  [n]: "1"
+                }
+              }
+            };
+          }
+        }
+      );
+    });
+  }
+  _getHideRowMutation(i, r) {
+    var l, a;
+    const e = (l = this._sheetsFilterService.getFilterModel(i, r)) == null ? void 0 : l.getRange(), t = (a = this._univerInstanceService.getUnit(i)) == null ? void 0 : a.getSheetBySheetId(r);
+    if (e == null || t == null)
+      return [];
+    const { startRow: n, endRow: s } = e;
+    return [{
+      unitId: i,
+      sheetId: r,
+      range: {
+        startRow: n,
+        startColumn: 0,
+        endRow: s,
+        endColumn: t.getColumnCount() - 1
+      }
+    }];
+  }
+};
+j = xt([
+  Y(0, $(st)),
+  Y(1, $(M)),
+  Y(2, T)
+], j);
+var It = Object.getOwnPropertyDescriptor, $t = (i, r, e, t) => {
+  for (var n = t > 1 ? void 0 : t ? It(r, e) : r, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (n = o(n) || n);
   return n;
-}, oe = (i, r) => (e, t) => r(e, t, i), B;
-let le = (B = class extends ye {
-  constructor(i = re, r, e) {
+}, ae = (i, r) => (e, t) => r(e, t, i), H;
+let ce = (H = class extends Ne {
+  constructor(i = ie, r, e) {
     super(), this._config = i, this._injector = r, this._configService = e;
-    const { ...t } = Ae(
+    const { ...t } = xe(
       {},
-      re,
+      ie,
       this._config
     );
-    this._configService.setConfig(tt, t);
+    this._configService.setConfig(ot, t);
   }
   onStarting() {
     [
+      [j],
       [M],
-      [W]
+      [V]
     ].forEach((i) => this._injector.add(i));
   }
   onReady() {
-    this._injector.get(W);
-  }
-}, w(B, "type", P.UNIVER_SHEET), w(B, "pluginName", Re), B);
-le = yt([
-  oe(1, z(Te)),
-  oe(2, Ne)
-], le);
-const At = {
+    Ie(this._injector, [
+      [j],
+      [V]
+    ]);
+  }
+}, w(H, "type", D.UNIVER_SHEET), w(H, "pluginName", Fe), H);
+ce = $t([
+  ae(1, $($e)),
+  ae(2, Ue)
+], ce);
+const Ut = {
   id: "sheet.command.set-filter-range",
   type: E.COMMAND,
   handler: (i, r) => {
-    const e = i.get(M), t = i.get(T), n = i.get(j), s = i.get(x), { unitId: o, subUnitId: l, range: a } = r;
+    const e = i.get(M), t = i.get(N), n = i.get(k), 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(Ie), g = i.get($e);
+      const f = i.get(De), g = i.get(Le);
       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({
+    const u = { id: R.id, params: { unitId: o, subUnitId: l, range: a } }, d = t.syncExecuteCommand(u.id, u.params);
+    return d && n.pushUndoRedo({
       unitID: o,
-      undoMutations: [{ id: O.id, params: { unitId: o, subUnitId: l } }],
-      redoMutations: [d]
-    }), u;
+      undoMutations: [{ id: y.id, params: { unitId: o, subUnitId: l } }],
+      redoMutations: [u]
+    }), d;
   }
-}, Tt = {
+}, Pt = {
   id: "sheet.command.remove-sheet-filter",
   type: E.COMMAND,
   handler: (i, r) => {
-    const e = i.get(x), t = i.get(M), n = i.get(T), s = i.get(j), o = b(e, r);
+    const e = i.get(T), t = i.get(M), n = i.get(N), s = i.get(k), 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 = Nt(l, a, h), u = n.syncExecuteCommand(O.id, { unitId: l, subUnitId: a });
-    return u && s.pushUndoRedo({
+    const h = c == null ? void 0 : c.serialize(), u = Dt(l, a, h), d = n.syncExecuteCommand(y.id, { unitId: l, subUnitId: a });
+    return d && s.pushUndoRedo({
       unitID: l,
-      undoMutations: d,
-      redoMutations: [{ id: O.id, params: { unitId: l, subUnitId: a } }]
-    }), u;
+      undoMutations: u,
+      redoMutations: [{ id: y.id, params: { unitId: l, subUnitId: a } }]
+    }), d;
   }
-}, bt = {
+}, jt = {
   id: "sheet.command.smart-toggle-filter",
   type: E.COMMAND,
   handler: async (i) => {
-    const r = i.get(x), e = i.get(M), t = i.get(T), n = r.getCurrentUnitForType(P.UNIVER_SHEET), s = n == null ? void 0 : n.getActiveSheet();
+    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(Tt.id, { unitId: o, subUnitId: l });
-    const h = i.get(Je).getCurrentLastSelection();
+      return t.executeCommand(Pt.id, { unitId: o, subUnitId: l });
+    const h = i.get(Ze).getCurrentLastSelection();
     if (!h) return !1;
-    const d = h.range, u = Ye(h) ? ae(d, { left: !0, right: !0, up: !0, down: !0 }, s) : d;
-    return t.executeCommand(At.id, {
+    const u = h.range, d = et(h) ? ue(u, { left: !0, right: !0, up: !0, down: !0 }, s) : u;
+    return t.executeCommand(Ut.id, {
       unitId: o,
       subUnitId: l,
-      range: u
+      range: d
     });
   }
-}, Bt = {
+}, kt = {
   id: "sheet.command.set-filter-criteria",
   type: E.COMMAND,
   handler: (i, r) => {
-    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);
+    const e = i.get(M), t = i.get(N), n = i.get(k), { 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 = It(s, o, l, d), f = {
+    const u = c.getFilterColumn(l), d = Bt(s, o, l, u), f = {
       id: p.id,
       params: {
         unitId: s,
@@ -1194,36 +1252,36 @@ const At = {
     }, g = t.syncExecuteCommand(f.id, f.params);
     return g && n.pushUndoRedo({
       unitID: s,
-      undoMutations: [u],
+      undoMutations: [d],
       redoMutations: [f]
     }), g;
   }
-}, zt = {
+}, qt = {
   id: "sheet.command.clear-filter-criteria",
   type: E.COMMAND,
   handler: (i, r) => {
-    const e = i.get(M), t = i.get(j), n = i.get(T), s = i.get(x), o = b(s, r);
+    const e = i.get(M), t = i.get(k), 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 = Ce(l, a, h), u = xt(l, a, h);
-    return xe(u, n).result ? (t.pushUndoRedo({
+    const h = c.serialize(), u = we(l, a, h), d = Lt(l, a, h);
+    return Pe(d, n).result ? (t.pushUndoRedo({
       unitID: l,
-      undoMutations: d,
-      redoMutations: u
+      undoMutations: u,
+      redoMutations: d
     }), !0) : !1;
   }
-}, Ht = {
+}, Qt = {
   id: "sheet.command.re-calc-filter",
   type: E.COMMAND,
   handler: (i, r) => {
-    const e = i.get(M), t = i.get(T), n = i.get(x), s = b(n, 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(H.id, { unitId: o, subUnitId: l }) : !1;
+    return e.getFilterModel(s.unitId, s.subUnitId) ? t.executeCommand(z.id, { unitId: o, subUnitId: l }) : !1;
   }
 };
-function Nt(i, r, e) {
+function Dt(i, r, e) {
   const t = [], n = {
     id: R.id,
     params: {
@@ -1232,9 +1290,9 @@ function Nt(i, r, e) {
       range: e.ref
     }
   };
-  return t.push(n), Ce(i, r, e).forEach((o) => t.push(o)), t;
+  return t.push(n), we(i, r, e).forEach((o) => t.push(o)), t;
 }
-function Ce(i, r, e) {
+function we(i, r, e) {
   var n;
   const t = [];
   return (n = e.filterColumns) == null || n.forEach((s) => {
@@ -1250,7 +1308,7 @@ function Ce(i, r, e) {
     t.push(o);
   }), t;
 }
-function xt(i, r, e) {
+function Lt(i, r, e) {
   var n;
   const t = [];
   return (n = e.filterColumns) == null || n.forEach((s) => {
@@ -1266,7 +1324,7 @@ function xt(i, r, e) {
     t.push(o);
   }), t;
 }
-function It(i, r, e, t) {
+function Bt(i, r, e, t) {
   if (!t)
     return {
       id: p.id,
@@ -1289,28 +1347,28 @@ function It(i, r, e, t) {
   };
 }
 export {
-  zt as ClearSheetsFilterCriteriaCommand,
-  N as CustomFilterOperator,
-  rt as FILTER_MUTATIONS,
-  ht as FilterColumn,
-  D as FilterModel,
-  Ht as ReCalcSheetsFilterCommand,
-  H as ReCalcSheetsFilterMutation,
-  Tt as RemoveSheetFilterCommand,
-  O as RemoveSheetsFilterMutation,
-  Re as SHEET_FILTER_SNAPSHOT_ID,
-  At as SetSheetFilterRangeCommand,
-  Bt as SetSheetsFilterCriteriaCommand,
+  qt as ClearSheetsFilterCriteriaCommand,
+  x as CustomFilterOperator,
+  ge as FILTER_MUTATIONS,
+  _t as FilterColumn,
+  W as FilterModel,
+  Qt as ReCalcSheetsFilterCommand,
+  z as ReCalcSheetsFilterMutation,
+  Pt as RemoveSheetFilterCommand,
+  y as RemoveSheetsFilterMutation,
+  Fe as SHEET_FILTER_SNAPSHOT_ID,
+  Ut as SetSheetFilterRangeCommand,
+  kt as SetSheetsFilterCriteriaCommand,
   p as SetSheetsFilterCriteriaMutation,
   R as SetSheetsFilterRangeMutation,
   M as SheetsFilterService,
-  bt as SmartToggleSheetsFilterCommand,
-  le as UniverSheetsFilterPlugin,
-  lt as equals,
-  ne as getCustomFilterFn,
-  nt as greaterThan,
-  it as greaterThanOrEqualTo,
-  st as lessThan,
-  ot as lessThanOrEqualTo,
-  me as notEquals
+  jt as SmartToggleSheetsFilterCommand,
+  ce as UniverSheetsFilterPlugin,
+  dt as equals,
+  se as getCustomFilterFn,
+  lt as greaterThan,
+  at as greaterThanOrEqualTo,
+  ct as lessThan,
+  ut as lessThanOrEqualTo,
+  _e as notEquals
 };