@univerjs/sheets-filter 0.1.14 → 0.1.16

package/lib/es/index.js

@@ -1,83 +1,83 @@
 var ue = Object.defineProperty;
-var de = (s, r, e) => r in s ? ue(s, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[r] = e;
-var g = (s, r, e) => (de(s, typeof r != "symbol" ? r + "" : r, e), e);
-import { isNumeric as he, Disposable as b, Rectangle as k, mergeSets as z, Tools as q, extractPureTextFromCell as fe, CellValueType as j, CommandType as $, UniverInstanceType as V, fromCallback as me, OnLifecycle as ee, LifecycleStages as te, IResourceManagerService as _e, IUniverInstanceService as re, ICommandService as se, DisposableCollection as ge, moveMatrixArray as G, Plugin as Ce } from "@univerjs/core";
-import { Inject as P, Injector as Re } from "@wendellhu/redi";
-import { BehaviorSubject as x, merge as pe, filter as we, switchMap as Fe, of as ve } from "rxjs";
-import { SheetInterceptorService as Se, RefRangeService as Me, SetWorksheetActivateCommand as Ee, RemoveSheetCommand as Oe, INTERCEPTOR_POINT as ye, RemoveRowMutation as Ae, InsertRowMutation as Te, getSheetCommandTarget as Ne, MoveRowsCommand as xe, MoveRangeCommand as $e, EffectRefRangId as J, RemoveRowCommand as Ie, RemoveColCommand as Pe, InsertColCommand as Le, InsertRowCommand as Be } from "@univerjs/sheets";
-var O = /* @__PURE__ */ ((s) => (s.EQUAL = "equal", s.GREATER_THAN = "greaterThan", s.GREATER_THAN_OR_EQUAL = "greaterThanOrEqual", s.LESS_THAN = "lessThan", s.LESS_THAN_OR_EQUAL = "lessThanOrEqual", s.NOT_EQUALS = "notEqual", s))(O || {});
-const be = {
+var de = (n, t, e) => t in n ? ue(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e;
+var C = (n, t, e) => de(n, typeof t != "symbol" ? t + "" : t, e);
+import { isNumeric as he, Disposable as b, Rectangle as k, mergeSets as z, Tools as q, extractPureTextFromCell as fe, CellValueType as j, CommandType as $, UniverInstanceType as V, fromCallback as me, OnLifecycle as ee, LifecycleStages as te, IResourceManagerService as _e, IUniverInstanceService as re, ICommandService as ne, DisposableCollection as ge, moveMatrixArray as G, Plugin as Re } from "@univerjs/core";
+import { Inject as P, Injector as Ce } from "@wendellhu/redi";
+import { BehaviorSubject as N, merge as pe, filter as we, switchMap as Fe, of as Se } from "rxjs";
+import { SheetInterceptorService as ve, RefRangeService as Me, SetWorksheetActivateCommand as Ee, RemoveSheetCommand as Oe, INTERCEPTOR_POINT as ye, RemoveRowMutation as Ae, InsertRowMutation as Te, SetRangeValuesMutation as xe, expandToContinuousRange as Ne, getSheetCommandTarget as $e, MoveRowsCommand as Ie, MoveRangeCommand as Pe, EffectRefRangId as J, RemoveRowCommand as Be, RemoveColCommand as Le, InsertColCommand as be, InsertRowCommand as Ue } from "@univerjs/sheets";
+var O = /* @__PURE__ */ ((n) => (n.EQUAL = "equal", n.GREATER_THAN = "greaterThan", n.GREATER_THAN_OR_EQUAL = "greaterThanOrEqual", n.LESS_THAN = "lessThan", n.LESS_THAN_OR_EQUAL = "lessThanOrEqual", n.NOT_EQUALS = "notEqual", n))(O || {});
+const ze = {
   operator: O.GREATER_THAN,
-  fn: (s, r) => T(s) ? s > r : !1
-}, Ue = {
+  fn: (n, t) => T(n) ? n > t : !1
+}, He = {
   operator: O.GREATER_THAN_OR_EQUAL,
-  fn: (s, r) => T(s) ? s >= r : !1
-}, ze = {
+  fn: (n, t) => T(n) ? n >= t : !1
+}, We = {
   operator: O.LESS_THAN,
-  fn: (s, r) => T(s) ? s < r : !1
-}, He = {
+  fn: (n, t) => T(n) ? n < t : !1
+}, je = {
   operator: O.LESS_THAN_OR_EQUAL,
-  fn: (s, r) => T(s) ? s <= r : !1
-}, We = {
+  fn: (n, t) => T(n) ? n <= t : !1
+}, Ve = {
   operator: O.EQUAL,
-  fn: (s, r) => T(s) ? s === r : !1
-}, ne = {
+  fn: (n, t) => T(n) ? n === t : !1
+}, se = {
   operator: O.NOT_EQUALS,
-  fn: (s, r) => {
-    if (typeof r == "string") {
-      if (r === " ")
-        return s != null;
-      const e = oe(s);
-      return e && Qe(r) ? !le(r).test(e) : e !== r;
+  fn: (n, t) => {
+    if (typeof t == "string") {
+      if (t === " ")
+        return n != null;
+      const e = oe(n);
+      return e && Ge(t) ? !le(t).test(e) : e !== t;
     }
-    return T(s) ? s !== r : !0;
+    return T(n) ? n !== t : !0;
   }
-}, ie = /* @__PURE__ */ new Map([]), je = [be, Ue, ze, He, We, ne];
-je.forEach((s) => {
-  ie.set(s.operator, s);
+}, ie = /* @__PURE__ */ new Map([]), De = [ze, He, We, je, Ve, se];
+De.forEach((n) => {
+  ie.set(n.operator, n);
 });
-function Ve(s) {
-  return !!s;
+function Qe(n) {
+  return !!n;
 }
-const De = {
-  fn: (s, r) => {
-    const e = oe(s);
-    return e === null ? r === "" : le(r).test(e);
+const qe = {
+  fn: (n, t) => {
+    const e = oe(n);
+    return e === null ? t === "" : le(t).test(e);
   }
 };
-function X(s) {
-  return s ? ie.get(s) : De;
+function X(n) {
+  return n ? ie.get(n) : qe;
 }
-function T(s) {
-  return typeof s == "number";
+function T(n) {
+  return typeof n == "number";
 }
-function Y(s) {
-  return !!(typeof s == "number" || typeof s == "string" && he(s));
+function Y(n) {
+  return !!(typeof n == "number" || typeof n == "string" && he(n));
 }
-function oe(s) {
-  return typeof s == "boolean" || s == null ? null : typeof s == "string" ? s : s.toString();
+function oe(n) {
+  return typeof n == "boolean" || n == null ? null : typeof n == "string" ? n : n.toString();
 }
-function Qe(s) {
-  return typeof s == "number" ? !1 : s.indexOf("*") !== -1 || s.indexOf("?") !== -1;
+function Ge(n) {
+  return typeof n == "number" ? !1 : n.indexOf("*") !== -1 || n.indexOf("?") !== -1;
 }
-function le(s) {
-  const r = s.replace(/[.+^${}()|[\]\\]/g, "\\$&").replaceAll("?", ".").replace(/[*]/g, ".$&");
-  return new RegExp(`^${r}$`);
+function le(n) {
+  const t = n.replace(/[.+^${}()|[\]\\]/g, "\\$&").replaceAll("?", ".").replace(/[*]/g, ".$&");
+  return new RegExp(`^${t}$`);
 }
 const H = () => /* @__PURE__ */ new Set();
-class B extends b {
-  constructor(e, t, n) {
+class L extends b {
+  constructor(e, r, s) {
     super();
-    g(this, "_filteredOutRows$", new x(H()));
+    C(this, "_filteredOutRows$", new N(H()));
     /** An observable value. A set of filtered out rows. */
-    g(this, "filteredOutRows$", this._filteredOutRows$.asObservable());
+    C(this, "filteredOutRows$", this._filteredOutRows$.asObservable());
     // TODO: we may need to update which cols have criteria rather than simple boolean
-    g(this, "_hasCriteria$", new x(!1));
-    g(this, "hasCriteria$", this._hasCriteria$.asObservable());
-    g(this, "_filterColumnByIndex", /* @__PURE__ */ new Map());
-    g(this, "_alreadyFilteredOutRows", H());
-    g(this, "_range");
-    this.unitId = e, this.subUnitId = t, this._worksheet = n;
+    C(this, "_hasCriteria$", new N(!1));
+    C(this, "hasCriteria$", this._hasCriteria$.asObservable());
+    C(this, "_filterColumnByIndex", /* @__PURE__ */ new Map());
+    C(this, "_alreadyFilteredOutRows", H());
+    C(this, "_range");
+    this.unitId = e, this.subUnitId = r, this._worksheet = s;
   }
   get filteredOutRows() {
     return this._filteredOutRows$.getValue();
@@ -94,7 +94,7 @@ class B extends b {
   serialize() {
     const e = {
       ref: k.clone(this._range),
-      filterColumns: this._getAllFilterColumns(!0).sort(([t], [n]) => t - n).map(([t, n]) => n.serialize())
+      filterColumns: this._getAllFilterColumns(!0).sort(([r], [s]) => r - s).map(([r, s]) => s.serialize())
     };
     return this._alreadyFilteredOutRows && (e.cachedFilteredOut = Array.from(this._alreadyFilteredOutRows).sort()), e;
   }
@@ -105,13 +105,13 @@ class B extends b {
    * @param worksheet the Worksheet object
    * @param autoFilter auto filter data
    */
-  static deserialize(e, t, n, i) {
-    const o = new B(e, t, n);
+  static deserialize(e, r, s, i) {
+    const o = new L(e, r, s);
     return o._dump(i), o;
   }
   _dump(e) {
-    var t;
-    this.setRange(e.ref), (t = e.filterColumns) == null || t.forEach((n) => this._setCriteriaWithoutReCalc(n.colId, n)), e.cachedFilteredOut && (this._alreadyFilteredOutRows = new Set(e.cachedFilteredOut), this._emit()), this._emitHasCriteria();
+    var r;
+    this.setRange(e.ref), (r = e.filterColumns) == null || r.forEach((s) => this._setCriteriaWithoutReCalc(s.colId, s)), e.cachedFilteredOut && (this._alreadyFilteredOutRows = new Set(e.cachedFilteredOut), this._emit()), this._emitHasCriteria();
   }
   isRowFiltered(e) {
     return this._alreadyFilteredOutRows.has(e);
@@ -127,9 +127,9 @@ class B extends b {
    * @param col
    */
   getFilteredOutRowsExceptCol(e) {
-    return this._getAllFilterColumns(!0).filter(([t]) => t !== e).reduce((t, [, n]) => {
-      const i = n.calc({ getAlreadyFilteredOutRows: () => t });
-      return i ? z(t, i) : t;
+    return this._getAllFilterColumns(!0).filter(([r]) => r !== e).reduce((r, [, s]) => {
+      const i = s.calc({ getAlreadyFilteredOutRows: () => r });
+      return i ? z(r, i) : r;
     }, /* @__PURE__ */ new Set());
   }
   /**
@@ -137,63 +137,63 @@ class B extends b {
    * if the new range not overlaps the old range.
    */
   setRange(e) {
-    this._range = e, this._getAllFilterColumns(!0).forEach(([t, n]) => {
-      n.setRangeAndColumn({
+    this._range = e, this._getAllFilterColumns(!0).forEach(([r, s]) => {
+      s.setRangeAndColumn({
         startRow: e.startRow,
         endRow: e.endRow,
-        startColumn: t,
-        endColumn: t
-      }, t);
+        startColumn: r,
+        endColumn: r
+      }, r);
     });
   }
   /**
    * Set or remove filter criteria on a specific row.
    */
-  setCriteria(e, t, n = !1) {
+  setCriteria(e, r, s = !1) {
     if (!this._range)
       throw new Error("[FilterModel] could not set criteria before a range is set!");
-    if (!t) {
-      this._removeCriteria(e), this._rebuildAlreadyFilteredOutRowsWithCache(), n && this._reCalcAllColumns(), this._emit(), this._emitHasCriteria();
+    if (!r) {
+      this._removeCriteria(e), this._rebuildAlreadyFilteredOutRowsWithCache(), s && this._reCalcAllColumns(), this._emit(), this._emitHasCriteria();
       return;
     }
-    this._setCriteriaWithoutReCalc(e, t), n && (this._rebuildAlreadyFilteredOutRowsWithCache(), this._reCalcWithNoCacheColumns(), this._emit(), this._emitHasCriteria());
+    this._setCriteriaWithoutReCalc(e, r), s && (this._rebuildAlreadyFilteredOutRowsWithCache(), this._reCalcWithNoCacheColumns(), this._emit(), this._emitHasCriteria());
   }
   getAllFilterColumns() {
     return this._getAllFilterColumns(!0);
   }
   getFilterColumn(e) {
-    var t;
-    return (t = this._filterColumnByIndex.get(e)) != null ? t : null;
+    var r;
+    return (r = this._filterColumnByIndex.get(e)) != null ? r : null;
   }
   reCalc() {
     this._reCalcAllColumns(), this._emit();
   }
   _getAllFilterColumns(e = !1) {
-    const t = Array.from(this._filterColumnByIndex.entries());
-    return e ? t : t.map(([n, i]) => i);
+    const r = Array.from(this._filterColumnByIndex.entries());
+    return e ? r : r.map(([s, i]) => i);
   }
   _reCalcAllColumns() {
     this._alreadyFilteredOutRows = H(), this._getAllFilterColumns().forEach((e) => e.__clearCache()), this._reCalcWithNoCacheColumns();
   }
-  _setCriteriaWithoutReCalc(e, t) {
-    const n = this._range;
-    if (!n)
+  _setCriteriaWithoutReCalc(e, r) {
+    const s = this._range;
+    if (!s)
       throw new Error("[FilterModel] could not set criteria before a range is set!");
-    const { startColumn: i, endColumn: o } = n;
+    const { startColumn: i, endColumn: o } = s;
     if (e > o || e < i)
       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 qe(
+    this._filterColumnByIndex.has(e) ? l = this._filterColumnByIndex.get(e) : (l = new Je(
       this.unitId,
       this.subUnitId,
       this._worksheet,
-      t,
+      r,
       { getAlreadyFilteredOutRows: () => this._alreadyFilteredOutRows }
-    ), l.setRangeAndColumn(n, e), this._filterColumnByIndex.set(e, l)), l.setCriteria(t);
+    ), l.setRangeAndColumn(s, e), this._filterColumnByIndex.set(e, l)), l.setCriteria(r);
   }
   _removeCriteria(e) {
-    const t = this._filterColumnByIndex.get(e);
-    t && (t.dispose(), this._filterColumnByIndex.delete(e));
+    const r = this._filterColumnByIndex.get(e);
+    r && (r.dispose(), this._filterColumnByIndex.delete(e));
   }
   _emit() {
     this._filteredOutRows$.next(this._alreadyFilteredOutRows);
@@ -202,27 +202,27 @@ class B extends b {
     this._hasCriteria$.next(this._filterColumnByIndex.size > 0);
   }
   _rebuildAlreadyFilteredOutRowsWithCache() {
-    const e = this._getAllFilterColumns().filter((t) => t.hasCache()).reduce((t, n) => z(t, n.filteredOutRows), /* @__PURE__ */ new Set());
+    const e = this._getAllFilterColumns().filter((r) => r.hasCache()).reduce((r, s) => z(r, s.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 = z(this._alreadyFilteredOutRows, n));
+    const e = this._getAllFilterColumns().filter((r) => !r.hasCache());
+    for (const r of e) {
+      const s = r.reCalc();
+      s && (this._alreadyFilteredOutRows = z(this._alreadyFilteredOutRows, s));
     }
   }
 }
-class qe extends b {
-  constructor(e, t, n, i, o) {
+class Je extends b {
+  constructor(e, r, s, i, o) {
     super();
-    g(this, "_filteredOutRows", null);
+    C(this, "_filteredOutRows", null);
     /** Cache the filter function.  */
-    g(this, "_filterFn", null);
-    g(this, "_range", null);
-    g(this, "_column", 0);
-    g(this, "_filterByValues", !1);
-    this.unitId = e, this.subUnitId = t, this._worksheet = n, this._criteria = i, this._filterColumnContext = o;
+    C(this, "_filterFn", null);
+    C(this, "_range", null);
+    C(this, "_column", 0);
+    C(this, "_filterByValues", !1);
+    this.unitId = e, this.subUnitId = r, this._worksheet = s, this._criteria = i, this._filterColumnContext = o;
   }
   get filteredOutRows() {
     return this._filteredOutRows;
@@ -248,8 +248,8 @@ class qe extends b {
     return this._filteredOutRows !== null;
   }
   // The first row should be omitted!
-  setRangeAndColumn(e, t) {
-    this._range = e, this._column = t;
+  setRangeAndColumn(e, r) {
+    this._range = e, this._column = r;
   }
   setCriteria(e) {
     this._criteria = e, this._generateFilterFn(), this._filteredOutRows = null;
@@ -273,128 +273,125 @@ class qe extends b {
       throw new Error("[FilterColumn] cannot calculate without a range!");
     if (typeof this._column != "number")
       throw new TypeError("[FilterColumn] cannot calculate without a column offset!");
-    const t = this._column, n = { startColumn: t, endColumn: t, startRow: this._range.startRow + 1, endRow: this._range.endRow }, i = /* @__PURE__ */ new Set(), o = e.getAlreadyFilteredOutRows();
-    for (const l of this._worksheet.iterateByColumn(n, !1, !1)) {
-      const { row: a, rowSpan: u, col: c } = l;
-      if (o.has(a) && (!u || u === 1))
+    const r = this._column, s = { startColumn: r, endColumn: r, startRow: this._range.startRow + 1, endRow: this._range.endRow }, i = /* @__PURE__ */ new Set(), o = e.getAlreadyFilteredOutRows();
+    for (const l of this._worksheet.iterateByColumn(s, !1, !1)) {
+      const { row: c, rowSpan: u, col: a } = l;
+      if (o.has(c) && (!u || u === 1))
         continue;
-      const h = this._filterByValues ? fe(this._worksheet.getCell(a, c)) : et(this._worksheet, a, c);
-      if (!this._filterFn(h) && (i.add(a), u))
-        for (let _ = 1; _ < u; _++)
-          i.add(a + _);
+      const d = this._filterByValues ? fe(this._worksheet.getCell(c, a)) : rt(this._worksheet, c, a);
+      if (!this._filterFn(d) && (i.add(c), u))
+        for (let f = 1; f < u; f++)
+          i.add(c + f);
     }
     return i;
   }
   _generateFilterFn() {
-    this._criteria && (this._filterFn = Ge(this._criteria), this._filterByValues = !!this._criteria.filters);
+    this._criteria && (this._filterFn = Xe(this._criteria), this._filterByValues = !!this._criteria.filters);
   }
 }
-function Ge(s) {
-  if (s.filters)
-    return Je(s.filters);
-  if (s.customFilters)
-    return Xe(s.customFilters);
+function Xe(n) {
+  if (n.filters)
+    return Ye(n.filters);
+  if (n.customFilters)
+    return Ke(n.customFilters);
   throw new Error("[FilterModel]: other types of filters are not supported yet.");
 }
-function Je(s) {
-  const r = !!s.blank, e = new Set(s.filters);
-  return (t) => t === void 0 || t === "" ? r : e.has(typeof t == "string" ? t : `${t}`);
+function Ye(n) {
+  const t = !!n.blank, e = new Set(n.filters);
+  return (r) => r === void 0 || r === "" ? t : e.has(typeof r == "string" ? r : `${r}`);
 }
-function Xe(s) {
-  const r = s.customFilters.map((e) => ke(e));
-  return Ze(r) ? s.and ? Ye(r) : Ke(r) : r[0];
+function Ke(n) {
+  const t = n.customFilters.map((e) => tt(e));
+  return et(t) ? n.and ? Ze(t) : ke(t) : t[0];
 }
-function Ye(s) {
-  const [r, e] = s;
-  return (t) => r(t) && e(t);
+function Ze(n) {
+  const [t, e] = n;
+  return (r) => t(r) && e(r);
 }
-function Ke(s) {
-  const [r, e] = s;
-  return (t) => r(t) || e(t);
+function ke(n) {
+  const [t, e] = n;
+  return (r) => t(r) || e(r);
 }
-function Ze(s) {
-  return s.length === 2;
+function et(n) {
+  return n.length === 2;
 }
-function ke(s) {
-  const r = s.val;
-  if (s.operator === O.NOT_EQUALS && !Y(r))
-    return (n) => ne.fn(n, r);
-  if (Ve(s.operator)) {
-    if (!Y(r))
-      return () => !1;
-    const n = X(s.operator), i = Number(r);
-    return (o) => n.fn(o, i);
-  }
-  const e = X(s.operator);
-  return (t) => e.fn(t, r);
+function tt(n) {
+  const t = n.val;
+  if (n.operator === O.NOT_EQUALS && !Y(t))
+    return (s) => se.fn(s, t);
+  if (Qe(n.operator)) {
+    if (!Y(t)) return () => !1;
+    const s = X(n.operator), i = Number(t);
+    return (o) => s.fn(o, i);
+  }
+  const e = X(n.operator);
+  return (r) => e.fn(r, t);
 }
-function et(s, r, e) {
-  const t = s.getCell(r, e);
-  if (!t)
-    return null;
-  const n = s.getCellRaw(r, e);
-  return t && !n ? K(t) : n ? t.t === j.NUMBER && typeof t.v == "string" ? n.v : K(n) : null;
+function rt(n, t, e) {
+  const r = n.getCell(t, e);
+  if (!r) return null;
+  const s = n.getCellRaw(t, e);
+  return r && !s ? K(r) : s ? r.t === j.NUMBER && typeof r.v == "string" ? s.v : K(s) : null;
 }
-function K(s) {
-  var t, n;
-  const r = (n = (t = s.p) == null ? void 0 : t.body) == null ? void 0 : n.dataStream;
-  if (r)
-    return r.trimEnd();
-  const e = s.v;
-  return typeof e == "string" ? s.t === j.BOOLEAN ? e.toUpperCase() : e : typeof e == "number" ? s.t === j.BOOLEAN ? e ? "TRUE" : "FALSE" : e : typeof e == "boolean" ? e ? "TRUE" : "FALSE" : "";
+function K(n) {
+  var r, s;
+  const t = (s = (r = n.p) == null ? void 0 : r.body) == null ? void 0 : s.dataStream;
+  if (t) return t.trimEnd();
+  const e = n.v;
+  return typeof e == "string" ? n.t === j.BOOLEAN ? e.toUpperCase() : e : typeof e == "number" ? n.t === j.BOOLEAN ? e ? "TRUE" : "FALSE" : e : typeof e == "boolean" ? e ? "TRUE" : "FALSE" : "";
 }
-const R = {
+const w = {
   id: "sheet.mutation.set-filter-range",
   type: $.MUTATION,
-  handler: (s, r) => {
-    const { subUnitId: e, unitId: t, range: n } = r;
-    return s.get(S).ensureFilterModel(t, e).setRange(n), !0;
+  handler: (n, t) => {
+    const { subUnitId: e, unitId: r, range: s } = t;
+    return n.get(v).ensureFilterModel(r, e).setRange(s), !0;
   }
 }, F = {
   id: "sheet.mutation.set-filter-criteria",
   type: $.MUTATION,
-  handler: (s, r) => {
-    const { subUnitId: e, unitId: t, criteria: n, col: i, reCalc: o = !0 } = r, a = s.get(S).getFilterModel(t, e);
-    return a ? (a.setCriteria(i, n, o), !0) : !1;
+  handler: (n, t) => {
+    const { subUnitId: e, unitId: r, criteria: s, col: i, reCalc: o = !0 } = t, c = n.get(v).getFilterModel(r, e);
+    return c ? (c.setCriteria(i, s, o), !0) : !1;
   }
 }, A = {
   id: "sheet.mutation.remove-filter",
   type: $.MUTATION,
-  handler: (s, r) => {
-    const { unitId: e, subUnitId: t } = r;
-    return s.get(S).removeFilterModel(e, t);
+  handler: (n, t) => {
+    const { unitId: e, subUnitId: r } = t;
+    return n.get(v).removeFilterModel(e, r);
   }
 }, ae = {
   id: "sheet.mutation.re-calc-filter",
   type: $.MUTATION,
-  handler: (s, r) => {
-    const { unitId: e, subUnitId: t } = r, i = s.get(S).getFilterModel(e, t);
+  handler: (n, t) => {
+    const { unitId: e, subUnitId: r } = t, i = n.get(v).getFilterModel(e, r);
     return i ? (i.reCalc(), !0) : !1;
   }
 };
-var tt = Object.defineProperty, rt = Object.getOwnPropertyDescriptor, st = (s, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? rt(r, e) : r, i = s.length - 1, o; i >= 0; i--)
-    (o = s[i]) && (n = (t ? o(r, e, n) : o(n)) || n);
-  return t && n && tt(r, e, n), n;
-}, W = (s, r) => (e, t) => r(e, t, s);
-const nt = /* @__PURE__ */ new Set([
-  R.id,
+var nt = Object.defineProperty, st = Object.getOwnPropertyDescriptor, it = (n, t, e, r) => {
+  for (var s = r > 1 ? void 0 : r ? st(t, e) : t, i = n.length - 1, o; i >= 0; i--)
+    (o = n[i]) && (s = (r ? o(t, e, s) : o(s)) || s);
+  return r && s && nt(t, e, s), s;
+}, W = (n, t) => (e, r) => t(e, r, n);
+const ot = /* @__PURE__ */ new Set([
+  w.id,
   F.id,
   A.id,
   ae.id
 ]), ce = "SHEET_FILTER_PLUGIN";
-let S = class extends b {
-  constructor(r, e, t) {
+let v = class extends b {
+  constructor(t, e, r) {
     super();
-    g(this, "_filterModels", /* @__PURE__ */ new Map());
-    g(this, "_loadedUnitId$", new x(null));
-    g(this, "loadedUnitId$", this._loadedUnitId$.asObservable());
-    g(this, "_errorMsg$", new x(null));
-    g(this, "errorMsg$", this._errorMsg$.asObservable());
-    g(this, "_activeFilterModel$", new x(null));
+    C(this, "_filterModels", /* @__PURE__ */ new Map());
+    C(this, "_loadedUnitId$", new N(null));
+    C(this, "loadedUnitId$", this._loadedUnitId$.asObservable());
+    C(this, "_errorMsg$", new N(null));
+    C(this, "errorMsg$", this._errorMsg$.asObservable());
+    C(this, "_activeFilterModel$", new N(null));
     /** An observable value emitting the current Workbook's active Worksheet's filter model (if there is one). */
-    g(this, "activeFilterModel$", this._activeFilterModel$.asObservable());
-    this._resourcesManagerService = r, this._univerInstanceService = e, this._commandService = t, this._initModel(), this._initActiveFilterModel();
+    C(this, "activeFilterModel$", this._activeFilterModel$.asObservable());
+    this._resourcesManagerService = t, this._univerInstanceService = e, this._commandService = r, this._initModel(), this._initActiveFilterModel();
   }
   /** The current Workbook's active Worksheet's filter model (if there is one). */
   get activeFilterModel() {
@@ -405,201 +402,201 @@ let S = class extends b {
    * @param unitId
    * @param subUnitId
    */
-  ensureFilterModel(r, e) {
-    const t = this.getFilterModel(r, e);
-    if (t)
-      return t;
-    const n = this._univerInstanceService.getUniverSheetInstance(r);
-    if (!n)
-      throw new Error(`[SheetsFilterService]: could not create "FilterModel" on a non-existing workbook ${r}!`);
-    const i = n.getSheetBySheetId(e);
+  ensureFilterModel(t, e) {
+    const r = this.getFilterModel(t, e);
+    if (r)
+      return r;
+    const s = this._univerInstanceService.getUniverSheetInstance(t);
+    if (!s)
+      throw new Error(`[SheetsFilterService]: could not create "FilterModel" on a non-existing workbook ${t}!`);
+    const i = s.getSheetBySheetId(e);
     if (!i)
       throw new Error(`[SheetsFilterService]: could not create "FilterModel" on a non-existing worksheet ${e}!`);
-    const o = new B(r, e, i);
-    return this._cacheFilterModel(r, e, o), o;
+    const o = new L(t, e, i);
+    return this._cacheFilterModel(t, e, o), o;
   }
-  getFilterModel(r, e) {
-    var t, n;
-    return (n = (t = this._filterModels.get(r)) == null ? void 0 : t.get(e)) != null ? n : null;
+  getFilterModel(t, e) {
+    var r, s;
+    return (s = (r = this._filterModels.get(t)) == null ? void 0 : r.get(e)) != null ? s : null;
   }
-  removeFilterModel(r, e) {
-    const t = this.getFilterModel(r, e);
-    return t ? (t.dispose(), this._filterModels.get(r).delete(e), !0) : !1;
+  removeFilterModel(t, e) {
+    const r = this.getFilterModel(t, e);
+    return r ? (r.dispose(), this._filterModels.get(t).delete(e), !0) : !1;
   }
-  setFilterErrorMsg(r) {
-    this._errorMsg$.next(r);
+  setFilterErrorMsg(t) {
+    this._errorMsg$.next(t);
   }
   _updateActiveFilterModel() {
-    let r;
+    let t;
     try {
-      if (r = this._univerInstanceService.getCurrentUnitForType(V.UNIVER_SHEET), !r) {
+      if (t = this._univerInstanceService.getCurrentUnitForType(V.UNIVER_SHEET), !t) {
         this._activeFilterModel$.next(null);
         return;
       }
     } catch {
       return;
     }
-    const e = r.getRawActiveSheet();
+    const e = t.getActiveSheet();
     if (!e) {
       this._activeFilterModel$.next(null);
       return;
     }
-    const t = e.getUnitId(), n = e.getSheetId(), i = this.getFilterModel(t, n);
+    const r = e.getUnitId(), s = e.getSheetId(), i = this.getFilterModel(r, s);
     this._activeFilterModel$.next(i);
   }
   _initActiveFilterModel() {
     this.disposeWithMe(
       pe(
         // source1: executing filter related mutations
-        me(this._commandService.onCommandExecuted).pipe(we(([r]) => r.type === $.MUTATION && nt.has(r.id))),
+        me(this._commandService.onCommandExecuted).pipe(we(([t]) => t.type === $.MUTATION && ot.has(t.id))),
         // source2: activate sheet changes
-        this._univerInstanceService.getCurrentTypeOfUnit$(V.UNIVER_SHEET).pipe(Fe((r) => {
+        this._univerInstanceService.getCurrentTypeOfUnit$(V.UNIVER_SHEET).pipe(Fe((t) => {
           var e;
-          return (e = r == null ? void 0 : r.activeSheet$) != null ? e : ve(null);
+          return (e = t == null ? void 0 : t.activeSheet$) != null ? e : Se(null);
         }))
       ).subscribe(() => this._updateActiveFilterModel())
     );
   }
-  _serializeAutoFiltersForUnit(r) {
-    const e = this._filterModels.get(r);
+  _serializeAutoFiltersForUnit(t) {
+    const e = this._filterModels.get(t);
     if (!e)
       return "{}";
-    const t = {};
-    return e.forEach((n, i) => {
-      t[i] = n.serialize();
-    }), JSON.stringify(t);
-  }
-  _deserializeAutoFiltersForUnit(r, e) {
-    const t = this._univerInstanceService.getUniverSheetInstance(r);
-    Object.keys(e).forEach((n) => {
-      const i = e[n], o = B.deserialize(r, n, t.getSheetBySheetId(n), i);
-      this._cacheFilterModel(r, n, o);
+    const r = {};
+    return e.forEach((s, i) => {
+      r[i] = s.serialize();
+    }), JSON.stringify(r);
+  }
+  _deserializeAutoFiltersForUnit(t, e) {
+    const r = this._univerInstanceService.getUniverSheetInstance(t);
+    Object.keys(e).forEach((s) => {
+      const i = e[s], o = L.deserialize(t, s, r.getSheetBySheetId(s), i);
+      this._cacheFilterModel(t, s, o);
     });
   }
   _initModel() {
     this._resourcesManagerService.registerPluginResource({
       pluginName: ce,
       businesses: [2],
-      toJson: (r) => this._serializeAutoFiltersForUnit(r),
-      parseJson: (r) => JSON.parse(r),
-      onLoad: (r, e) => {
-        this._deserializeAutoFiltersForUnit(r, e), this._loadedUnitId$.next(r), this._updateActiveFilterModel();
+      toJson: (t) => this._serializeAutoFiltersForUnit(t),
+      parseJson: (t) => JSON.parse(t),
+      onLoad: (t, e) => {
+        this._deserializeAutoFiltersForUnit(t, e), this._loadedUnitId$.next(t), this._updateActiveFilterModel();
       },
-      onUnLoad: (r) => {
-        const e = this._filterModels.get(r);
-        e && (e.forEach((t) => t.dispose()), this._filterModels.delete(r));
+      onUnLoad: (t) => {
+        const e = this._filterModels.get(t);
+        e && (e.forEach((r) => r.dispose()), this._filterModels.delete(t));
       }
     });
   }
-  _cacheFilterModel(r, e, t) {
-    this._filterModels.has(r) || this._filterModels.set(r, /* @__PURE__ */ new Map()), this._filterModels.get(r).set(e, t);
+  _cacheFilterModel(t, e, r) {
+    this._filterModels.has(t) || this._filterModels.set(t, /* @__PURE__ */ new Map()), this._filterModels.get(t).set(e, r);
   }
 };
-S = st([
-  ee(te.Ready, S),
+v = it([
+  ee(te.Ready, v),
   W(0, _e),
   W(1, re),
-  W(2, se)
-], S);
-function it(s, r) {
-  for (let e = 0; e < s.length; e++) {
-    let t = e;
-    if (s[e])
-      for (let n = e + 1; n < s.length; n++)
-        s[t] && s[n] && r(s[t], s[n]) && (s[t] = null, t = n);
-  }
-  return s.filter((e) => e !== null);
+  W(2, ne)
+], v);
+function lt(n, t) {
+  for (let e = 0; e < n.length; e++) {
+    let r = e;
+    if (n[e])
+      for (let s = e + 1; s < n.length; s++)
+        n[r] && n[s] && t(n[r], n[s]) && (n[r] = null, r = s);
+  }
+  return n.filter((e) => e !== null);
 }
-function E(s) {
-  return it(s, (r, e) => r.id === F.id && e.id === F.id && r.params.unitId === e.params.unitId && r.params.subUnitId === e.params.subUnitId && r.params.col === e.params.col);
+function E(n) {
+  return lt(n, (t, e) => t.id === F.id && e.id === F.id && t.params.unitId === e.params.unitId && t.params.subUnitId === e.params.subUnitId && t.params.col === e.params.col);
 }
-var ot = Object.defineProperty, lt = Object.getOwnPropertyDescriptor, at = (s, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? lt(r, e) : r, i = s.length - 1, o; i >= 0; i--)
-    (o = s[i]) && (n = (t ? o(r, e, n) : o(n)) || n);
-  return t && n && ot(r, e, n), n;
-}, N = (s, r) => (e, t) => r(e, t, s);
-let L = class extends b {
-  constructor(s, r, e, t, n) {
-    super(), this._commandService = s, this._sheetInterceptorService = r, this._sheetsFilterService = e, this._univerInstanceService = t, this._refRangeService = n, this._initCommands(), this._initRowFilteredInterceptor(), this._initInterceptors(), this._commandExecutedListener(), this._initErrorHandling();
+var at = Object.defineProperty, ct = Object.getOwnPropertyDescriptor, ut = (n, t, e, r) => {
+  for (var s = r > 1 ? void 0 : r ? ct(t, e) : t, i = n.length - 1, o; i >= 0; i--)
+    (o = n[i]) && (s = (r ? o(t, e, s) : o(s)) || s);
+  return r && s && at(t, e, s), s;
+}, x = (n, t) => (e, r) => t(e, r, n);
+let B = class extends b {
+  constructor(n, t, e, r, s) {
+    super(), this._commandService = n, this._sheetInterceptorService = t, this._sheetsFilterService = e, this._univerInstanceService = r, this._refRangeService = s, this._initCommands(), this._initRowFilteredInterceptor(), this._initInterceptors(), this._commandExecutedListener(), this._initErrorHandling();
   }
   _initCommands() {
     [
       F,
-      R,
+      w,
       ae,
       A
-    ].forEach((s) => this.disposeWithMe(this._commandService.registerCommand(s)));
+    ].forEach((n) => this.disposeWithMe(this._commandService.registerCommand(n)));
   }
+  // eslint-disable-next-line max-lines-per-function
   _initInterceptors() {
     this.disposeWithMe(this._sheetInterceptorService.interceptCommand({
       getMutations: (e) => this._getUpdateFilter(e)
     }));
-    const s = new ge(), r = (e, t) => {
-      var a;
-      const n = this._univerInstanceService.getUniverSheetInstance(e);
-      if (!n || !(n == null ? void 0 : n.getSheetBySheetId(t)))
-        return;
-      s.dispose();
-      const o = (a = this._sheetsFilterService.getFilterModel(e, t)) == null ? void 0 : a.getRange(), l = (u) => {
+    const n = new ge(), t = (e, r) => {
+      var c;
+      const s = this._univerInstanceService.getUniverSheetInstance(e);
+      if (!s || !(s == null ? void 0 : s.getSheetBySheetId(r))) return;
+      n.dispose();
+      const o = (c = this._sheetsFilterService.getFilterModel(e, r)) == null ? void 0 : c.getRange(), l = (u) => {
         switch (u.id) {
-          case Be.id: {
-            const c = u.params, h = c.unitId || e, _ = c.subUnitId || t;
-            return this._handleInsertRowCommand(c, h, _);
+          case Ue.id: {
+            const a = u.params, d = a.unitId || e, f = a.subUnitId || r;
+            return this._handleInsertRowCommand(a, d, f);
           }
-          case Le.id: {
-            const c = u.params, h = c.unitId || e, _ = c.subUnitId || t;
-            return this._handleInsertColCommand(c, h, _);
+          case be.id: {
+            const a = u.params, d = a.unitId || e, f = a.subUnitId || r;
+            return this._handleInsertColCommand(a, d, f);
           }
-          case Pe.id: {
-            const c = u.params;
-            return this._handleRemoveColCommand(c, e, t);
+          case Le.id: {
+            const a = u.params;
+            return this._handleRemoveColCommand(a, e, r);
           }
-          case Ie.id: {
-            const c = u.params;
-            return this._handleRemoveRowCommand(c, e, t);
+          case Be.id: {
+            const a = u.params;
+            return this._handleRemoveRowCommand(a, e, r);
           }
           case J.MoveColsCommandId: {
-            const c = u.params;
-            return this._handleMoveColsCommand(c, e, t);
+            const a = u.params;
+            return this._handleMoveColsCommand(a, e, r);
           }
           case J.MoveRowsCommandId: {
-            const c = u.params;
-            return this._handleMoveRowsCommand(c, e, t);
+            const a = u.params;
+            return this._handleMoveRowsCommand(a, e, r);
           }
-          case $e.id: {
-            const c = u.params;
-            return this._handleMoveRangeCommand(c, e, t);
+          case Pe.id: {
+            const a = u.params;
+            return this._handleMoveRangeCommand(a, e, r);
           }
         }
         return { redos: [], undos: [] };
       };
-      o && s.add(this._refRangeService.registerRefRange(o, l, e, t));
+      o && n.add(this._refRangeService.registerRefRange(o, l, e, r));
     };
     this.disposeWithMe(this._commandService.onCommandExecuted((e) => {
       if (e.id === Ee.id) {
-        const t = e.params, n = t.subUnitId, i = t.unitId;
-        if (!n || !i)
+        const r = e.params, s = r.subUnitId, i = r.unitId;
+        if (!s || !i)
           return;
-        r(i, n);
+        t(i, s);
       }
-      if (e.id === R.id) {
-        const t = e.params, n = t.subUnitId, i = t.unitId;
-        if (!n || !i)
+      if (e.id === w.id) {
+        const r = e.params, s = r.subUnitId, i = r.unitId;
+        if (!s || !i)
           return;
-        r(t.unitId, t.subUnitId);
+        t(r.unitId, r.subUnitId);
       }
     })), this.disposeWithMe(this._sheetsFilterService.loadedUnitId$.subscribe((e) => {
       if (e) {
-        const t = this._univerInstanceService.getUniverSheetInstance(e), n = t == null ? void 0 : t.getActiveSheet();
-        n && r(e, n.getSheetId());
+        const r = this._univerInstanceService.getUniverSheetInstance(e), s = r == null ? void 0 : r.getActiveSheet();
+        s && t(e, s.getSheetId());
       }
     }));
   }
-  _getUpdateFilter(s) {
-    const { id: r } = s;
-    switch (r) {
+  _getUpdateFilter(n) {
+    const { id: t } = n;
+    switch (t) {
       case Oe.id: {
-        const e = s.params;
+        const e = n.params;
         return this._handleRemoveSheetCommand(e, e.unitId, e.subUnitId);
       }
     }
@@ -608,301 +605,301 @@ let L = class extends b {
       undos: []
     };
   }
-  _handleInsertColCommand(s, r, e) {
-    var m;
-    const t = this._sheetsFilterService.getFilterModel(r, e), n = (m = t == null ? void 0 : t.getRange()) != null ? m : null;
-    if (!t || !n)
+  _handleInsertColCommand(n, t, e) {
+    var _;
+    const r = this._sheetsFilterService.getFilterModel(t, e), s = (_ = r == null ? void 0 : r.getRange()) != null ? _ : null;
+    if (!r || !s)
       return this._handleNull();
-    const { startColumn: i, endColumn: o } = n, { startColumn: l, endColumn: a } = s.range, u = a - l + 1;
-    if (a > o)
+    const { startColumn: i, endColumn: o } = s, { startColumn: l, endColumn: c } = n.range, u = c - l + 1;
+    if (c > o)
       return this._handleNull();
-    const c = [], h = [], _ = l, p = {
-      unitId: r,
+    const a = [], d = [], f = l, g = {
+      unitId: t,
       subUnitId: e,
       range: {
-        ...n,
+        ...s,
         startColumn: l <= i ? i + u : i,
         endColumn: o + u
       }
-    }, C = {
-      unitId: r,
+    }, R = {
+      unitId: t,
       subUnitId: e,
-      range: n
+      range: s
     };
-    c.push({ id: R.id, params: p }), h.push({ id: R.id, params: C });
-    const f = t.getAllFilterColumns().filter((d) => d[0] >= _);
-    if (f.length !== 0) {
-      const { undos: d, redos: v } = this.moveCriteria(r, e, f, u);
-      c.push(...v), h.push(...d);
+    a.push({ id: w.id, params: g }), d.push({ id: w.id, params: R });
+    const m = r.getAllFilterColumns().filter((h) => h[0] >= f);
+    if (m.length !== 0) {
+      const { undos: h, redos: S } = this.moveCriteria(t, e, m, u);
+      a.push(...S), d.push(...h);
     }
-    return { redos: E(c), undos: E(h) };
+    return { redos: E(a), undos: E(d) };
   }
-  _handleInsertRowCommand(s, r, e) {
-    var C;
-    const t = this._sheetsFilterService.getFilterModel(r, e), n = (C = t == null ? void 0 : t.getRange()) != null ? C : null;
-    if (!t || !n)
+  _handleInsertRowCommand(n, t, e) {
+    var R;
+    const r = this._sheetsFilterService.getFilterModel(t, e), s = (R = r == null ? void 0 : r.getRange()) != null ? R : null;
+    if (!r || !s)
       return this._handleNull();
-    const { startRow: i, endRow: o } = n, { startRow: l, endRow: a } = s.range, u = a - l + 1;
-    if (a > o)
+    const { startRow: i, endRow: o } = s, { startRow: l, endRow: c } = n.range, u = c - l + 1;
+    if (c > o)
       return this._handleNull();
-    const c = [], h = [], _ = {
-      unitId: r,
+    const a = [], d = [], f = {
+      unitId: t,
       subUnitId: e,
       range: {
-        ...n,
+        ...s,
         startRow: l <= i ? i + u : i,
         endRow: o + u
       }
-    }, p = {
-      unitId: r,
+    }, g = {
+      unitId: t,
       subUnitId: e,
-      range: n
+      range: s
     };
-    return c.push({ id: R.id, params: _ }), h.push({ id: R.id, params: p }), {
-      redos: E(c),
-      undos: E(h)
+    return a.push({ id: w.id, params: f }), d.push({ id: w.id, params: g }), {
+      redos: E(a),
+      undos: E(d)
     };
   }
-  _handleRemoveColCommand(s, r, e) {
-    var w;
-    const t = this._sheetsFilterService.getFilterModel(r, e), n = (w = t == null ? void 0 : t.getRange()) != null ? w : null;
-    if (!t || !n)
+  _handleRemoveColCommand(n, t, e) {
+    var p;
+    const r = this._sheetsFilterService.getFilterModel(t, e), s = (p = r == null ? void 0 : r.getRange()) != null ? p : null;
+    if (!r || !s)
       return this._handleNull();
-    const { startColumn: i, endColumn: o } = n, { startColumn: l, endColumn: a } = s.range;
+    const { startColumn: i, endColumn: o } = s, { startColumn: l, endColumn: c } = n.range;
     if (l > o)
       return this._handleNull();
-    const u = [], c = [], h = a < i ? 0 : Math.min(a, o) - Math.max(l, i) + 1, _ = a - l + 1, p = t.getAllFilterColumns();
-    p.forEach((f) => {
-      const [m, d] = f;
-      m <= a && m >= l && (u.push({ id: F.id, params: { unitId: r, subUnitId: e, col: m, criteria: null } }), c.push({ id: F.id, params: { unitId: r, subUnitId: e, col: m, criteria: { ...d.serialize(), colId: m } } }));
+    const u = [], a = [], d = c < i ? 0 : Math.min(c, o) - Math.max(l, i) + 1, f = c - l + 1, g = r.getAllFilterColumns();
+    g.forEach((m) => {
+      const [_, h] = m;
+      _ <= c && _ >= l && (u.push({ id: F.id, params: { unitId: t, subUnitId: e, col: _, criteria: null } }), a.push({ id: F.id, params: { unitId: t, subUnitId: e, col: _, criteria: { ...h.serialize(), colId: _ } } }));
     });
-    const C = p.filter((f) => {
-      const [m, d] = f;
-      return m > a;
+    const R = g.filter((m) => {
+      const [_, h] = m;
+      return _ > c;
     });
-    if (C.length > 0) {
-      const { undos: f, redos: m } = this.moveCriteria(r, e, C, -_);
-      u.push(...m), c.push(...f);
+    if (R.length > 0) {
+      const { undos: m, redos: _ } = this.moveCriteria(t, e, R, -f);
+      u.push(..._), a.push(...m);
     }
-    if (h === o - i + 1) {
-      const f = {
-        unitId: r,
+    if (d === o - i + 1) {
+      const m = {
+        unitId: t,
         subUnitId: e
       };
-      u.push({ id: A.id, params: f });
+      u.push({ id: A.id, params: m });
     } else if (i <= l) {
-      const f = o - h, m = {
-        unitId: r,
+      const m = o - d, _ = {
+        unitId: t,
         subUnitId: e,
         range: {
-          ...n,
-          endColumn: f
+          ...s,
+          endColumn: m
         }
       };
-      u.push({ id: R.id, params: m });
+      u.push({ id: w.id, params: _ });
     } else {
-      const f = {
-        unitId: r,
+      const m = {
+        unitId: t,
         subUnitId: e,
         range: {
-          ...n,
+          ...s,
           startColumn: l,
-          endColumn: o - (a - l + 1)
+          endColumn: o - (c - l + 1)
         }
       };
-      u.push({ id: R.id, params: f });
+      u.push({ id: w.id, params: m });
     }
-    return c.push({ id: R.id, params: { range: n, unitId: r, subUnitId: e } }), {
-      undos: E(c),
+    return a.push({ id: w.id, params: { range: s, unitId: t, subUnitId: e } }), {
+      undos: E(a),
       redos: E(u)
     };
   }
-  _handleRemoveRowCommand(s, r, e) {
-    var C;
-    const t = this._sheetsFilterService.getFilterModel(r, e);
-    if (!t)
+  _handleRemoveRowCommand(n, t, e) {
+    var R;
+    const r = this._sheetsFilterService.getFilterModel(t, e);
+    if (!r)
       return this._handleNull();
-    const n = t.getRange(), { startRow: i, endRow: o } = n, { startRow: l, endRow: a } = s.range;
+    const s = r.getRange(), { startRow: i, endRow: o } = s, { startRow: l, endRow: c } = n.range;
     if (l > o)
       return this._handleNull();
-    const u = [], c = [], h = t.getAllFilterColumns(), _ = i <= a && i >= l;
-    c.push({ id: R.id, params: { range: n, unitId: r, subUnitId: e } });
-    const p = Math.min(a, o) - Math.max(l, i) + 1;
-    if (p === o - i + 1 || _) {
-      const w = {
-        unitId: r,
+    const u = [], a = [], d = r.getAllFilterColumns(), f = i <= c && i >= l;
+    a.push({ id: w.id, params: { range: s, unitId: t, subUnitId: e } });
+    const g = Math.min(c, o) - Math.max(l, i) + 1;
+    if (g === o - i + 1 || f) {
+      const p = {
+        unitId: t,
         subUnitId: e
       };
-      u.push({ id: A.id, params: w }), h.forEach((f) => {
-        const [m, d] = f, v = {
-          unitId: r,
+      u.push({ id: A.id, params: p }), d.forEach((m) => {
+        const [_, h] = m, S = {
+          unitId: t,
           subUnitId: e,
-          col: m,
-          criteria: { ...d.serialize(), colId: m }
+          col: _,
+          criteria: { ...h.serialize(), colId: _ }
         };
-        c.push({ id: F.id, params: v });
+        a.push({ id: F.id, params: S });
       });
     } else {
-      const w = (C = this._univerInstanceService.getUniverSheetInstance(r)) == null ? void 0 : C.getSheetBySheetId(e);
-      if (!w)
+      const p = (R = this._univerInstanceService.getUniverSheetInstance(t)) == null ? void 0 : R.getSheetBySheetId(e);
+      if (!p)
         return this._handleNull();
-      const f = [];
-      for (let M = l; M <= a; M++)
-        w.getRowFiltered(M) && f.push(M);
-      const m = Math.min(i, l), d = m + (o - i) - p + f.length, v = {
-        unitId: r,
+      const m = [];
+      for (let M = l; M <= c; M++)
+        p.getRowFiltered(M) && m.push(M);
+      const _ = Math.min(i, l), h = _ + (o - i) - g + m.length, S = {
+        unitId: t,
         subUnitId: e,
         range: {
-          ...n,
-          startRow: m,
-          endRow: d
+          ...s,
+          startRow: _,
+          endRow: h
         }
       };
-      u.push({ id: R.id, params: v });
+      u.push({ id: w.id, params: S });
     }
     return {
-      undos: E(c),
+      undos: E(a),
       redos: E(u)
     };
   }
   // eslint-disable-next-line max-lines-per-function
-  _handleMoveColsCommand(s, r, e) {
-    var m;
-    const t = this._sheetsFilterService.getFilterModel(r, e), n = (m = t == null ? void 0 : t.getRange()) != null ? m : null;
-    if (!t || !n)
+  _handleMoveColsCommand(n, t, e) {
+    var _;
+    const r = this._sheetsFilterService.getFilterModel(t, e), s = (_ = r == null ? void 0 : r.getRange()) != null ? _ : null;
+    if (!r || !s)
       return this._handleNull();
-    const { startColumn: i, endColumn: o } = n, { fromRange: l, toRange: a } = s;
-    if (l.endColumn < i && a.startColumn <= i || l.startColumn > o && a.endColumn > o)
+    const { startColumn: i, endColumn: o } = s, { fromRange: l, toRange: c } = n;
+    if (l.endColumn < i && c.startColumn <= i || l.startColumn > o && c.endColumn > o)
       return this._handleNull();
-    const u = [], c = [], h = {};
-    for (let d = i; d <= o; d++)
-      h[d] = {
-        colIndex: d,
-        filter: t.getFilterColumn(d)
+    const u = [], a = [], d = {};
+    for (let h = i; h <= o; h++)
+      d[h] = {
+        colIndex: h,
+        filter: r.getFilterColumn(h)
       };
-    G(l.startColumn, l.endColumn - l.startColumn + 1, a.startColumn, h);
-    let _ = n.startColumn, p = n.endColumn;
-    i >= l.startColumn && i <= l.endColumn && a.startColumn > l.startColumn && l.endColumn < o && (_ = l.endColumn + 1), o >= l.startColumn && o <= l.endColumn && a.startColumn < l.startColumn && l.startColumn > i && (p = l.startColumn - 1);
-    const C = Object.keys(h).map((d) => Number(d)), w = C.find((d) => h[d].colIndex === p), f = C.find((d) => h[d].colIndex === _);
-    if (C.forEach((d) => {
+    G(l.startColumn, l.endColumn - l.startColumn + 1, c.startColumn, d);
+    let f = s.startColumn, g = s.endColumn;
+    i >= l.startColumn && i <= l.endColumn && c.startColumn > l.startColumn && l.endColumn < o && (f = l.endColumn + 1), o >= l.startColumn && o <= l.endColumn && c.startColumn < l.startColumn && l.startColumn > i && (g = l.startColumn - 1);
+    const R = Object.keys(d).map((h) => Number(h)), p = R.find((h) => d[h].colIndex === g), m = R.find((h) => d[h].colIndex === f);
+    if (R.forEach((h) => {
       var D, Q;
-      const { colIndex: v, filter: M } = h[d], y = d;
+      const { colIndex: S, filter: M } = d[h], y = h;
       if (M) {
-        if (y >= f && y <= w) {
+        if (y >= m && y <= p) {
           const U = {
-            unitId: r,
+            unitId: t,
             subUnitId: e,
             col: y,
             criteria: { ...M.serialize(), colId: y }
           };
-          u.push({ id: F.id, params: U }), c.push({ id: A.id, params: { unitId: r, subUnitId: e, col: y, criteria: { ...(D = t.getFilterColumn(y)) == null ? void 0 : D.serialize(), colId: y } } });
+          u.push({ id: F.id, params: U }), a.push({ id: A.id, params: { unitId: t, subUnitId: e, col: y, criteria: { ...(D = r.getFilterColumn(y)) == null ? void 0 : D.serialize(), colId: y } } });
         }
-        if (!((Q = h[v]) != null && Q.filter)) {
+        if (!((Q = d[S]) != null && Q.filter)) {
           const U = {
-            unitId: r,
+            unitId: t,
             subUnitId: e,
-            col: v,
+            col: S,
             criteria: null
           };
-          u.push({ id: F.id, params: U }), c.push({ id: F.id, params: { unitId: r, subUnitId: e, col: v, criteria: { ...M.serialize(), colId: v } } });
+          u.push({ id: F.id, params: U }), a.push({ id: F.id, params: { unitId: t, subUnitId: e, col: S, criteria: { ...M.serialize(), colId: S } } });
         }
       }
-    }), i !== f || o !== w) {
-      const d = {
-        unitId: r,
+    }), i !== m || o !== p) {
+      const h = {
+        unitId: t,
         subUnitId: e,
         range: {
-          ...n,
-          startColumn: f,
-          endColumn: w
+          ...s,
+          startColumn: m,
+          endColumn: p
         }
       };
-      u.unshift({ id: R.id, params: d }), c.push({ id: R.id, params: { range: n, unitId: r, subUnitId: e } });
+      u.unshift({ id: w.id, params: h }), a.push({ id: w.id, params: { range: s, unitId: t, subUnitId: e } });
     }
     return {
-      undos: c,
+      undos: a,
       redos: u
     };
   }
-  _handleMoveRowsCommand(s, r, e) {
-    var m;
-    const t = this._sheetsFilterService.getFilterModel(r, e), n = (m = t == null ? void 0 : t.getRange()) != null ? m : null;
-    if (!t || !n)
+  _handleMoveRowsCommand(n, t, e) {
+    var _;
+    const r = this._sheetsFilterService.getFilterModel(t, e), s = (_ = r == null ? void 0 : r.getRange()) != null ? _ : null;
+    if (!r || !s)
       return this._handleNull();
-    const { startRow: i, endRow: o } = n, { fromRange: l, toRange: a } = s;
-    if (l.endRow < i && a.startRow <= i || l.startRow > o && a.endRow > o)
+    const { startRow: i, endRow: o } = s, { fromRange: l, toRange: c } = n;
+    if (l.endRow < i && c.startRow <= i || l.startRow > o && c.endRow > o)
       return this._handleNull();
-    const u = [], c = [], h = {};
-    for (let d = i; d <= o; d++)
-      h[d] = {
-        oldIndex: d
+    const u = [], a = [], d = {};
+    for (let h = i; h <= o; h++)
+      d[h] = {
+        oldIndex: h
       };
-    const _ = i;
-    let p = o;
-    o >= l.startRow && o <= l.endRow && a.startRow < l.startRow && l.startRow > i && (p = l.startRow - 1), G(l.startRow, l.endRow - l.startRow + 1, a.startRow, h);
-    const C = Object.keys(h).map((d) => Number(d)), w = C.find((d) => h[d].oldIndex === p), f = C.find((d) => h[d].oldIndex === _);
-    if (i !== f || o !== w) {
-      const d = {
-        unitId: r,
+    const f = i;
+    let g = o;
+    o >= l.startRow && o <= l.endRow && c.startRow < l.startRow && l.startRow > i && (g = l.startRow - 1), G(l.startRow, l.endRow - l.startRow + 1, c.startRow, d);
+    const R = Object.keys(d).map((h) => Number(h)), p = R.find((h) => d[h].oldIndex === g), m = R.find((h) => d[h].oldIndex === f);
+    if (i !== m || o !== p) {
+      const h = {
+        unitId: t,
         subUnitId: e,
         range: {
-          ...n,
-          startRow: f,
-          endRow: w
+          ...s,
+          startRow: m,
+          endRow: p
         }
       };
-      u.unshift({ id: R.id, params: d }), c.push({ id: R.id, params: { range: n, unitId: r, subUnitId: e } });
+      u.unshift({ id: w.id, params: h }), a.push({ id: w.id, params: { range: s, unitId: t, subUnitId: e } });
     }
     return {
       redos: u,
-      undos: c
+      undos: a
     };
   }
-  _handleMoveRangeCommand(s, r, e) {
-    const { fromRange: t, toRange: n } = s, i = this._sheetsFilterService.getFilterModel(r, e);
+  _handleMoveRangeCommand(n, t, e) {
+    const { fromRange: r, toRange: s } = n, i = this._sheetsFilterService.getFilterModel(t, e);
     if (!i)
       return this._handleNull();
     const o = i.getRange();
     if (!o)
       return this._handleNull();
-    const l = [], a = [];
-    if (k.contains(t, o)) {
-      const u = o.startRow - t.startRow, c = o.startColumn - t.startColumn, h = {
-        startRow: n.startRow + u,
-        startColumn: n.startColumn + c,
-        endRow: n.startRow + u + (o.endRow - o.startRow),
-        endColumn: n.startColumn + c + (o.endColumn - o.startColumn)
-      }, _ = {
+    const l = [], c = [];
+    if (k.contains(r, o)) {
+      const u = o.startRow - r.startRow, a = o.startColumn - r.startColumn, d = {
+        startRow: s.startRow + u,
+        startColumn: s.startColumn + a,
+        endRow: s.startRow + u + (o.endRow - o.startRow),
+        endColumn: s.startColumn + a + (o.endColumn - o.startColumn)
+      }, f = {
         id: A.id,
         params: {
-          unitId: r,
+          unitId: t,
           subUnitId: e
         }
-      }, p = { id: R.id, params: { unitId: r, subUnitId: e, range: h } }, C = { id: R.id, params: { unitId: r, subUnitId: e, range: o } };
-      l.push(_, p), a.push(_, C);
-      const w = i.getAllFilterColumns(), f = n.startColumn - t.startColumn;
-      w.forEach((m) => {
-        const [d, v] = m;
-        v && (l.push({ id: F.id, params: { unitId: r, subUnitId: e, col: d + f, criteria: { ...v.serialize(), colId: d + f } } }), a.push({ id: F.id, params: { unitId: r, subUnitId: e, col: d, criteria: { ...v.serialize(), colId: d } } }));
+      }, g = { id: w.id, params: { unitId: t, subUnitId: e, range: d } }, R = { id: w.id, params: { unitId: t, subUnitId: e, range: o } };
+      l.push(f, g), c.push(f, R);
+      const p = i.getAllFilterColumns(), m = s.startColumn - r.startColumn;
+      p.forEach((_) => {
+        const [h, S] = _;
+        S && (l.push({ id: F.id, params: { unitId: t, subUnitId: e, col: h + m, criteria: { ...S.serialize(), colId: h + m } } }), c.push({ id: F.id, params: { unitId: t, subUnitId: e, col: h, criteria: { ...S.serialize(), colId: h } } }));
       });
     }
     return {
       redos: l,
-      undos: a
+      undos: c
     };
   }
-  _handleRemoveSheetCommand(s, r, e) {
-    const t = this._sheetsFilterService.getFilterModel(r, e);
-    if (!t)
+  _handleRemoveSheetCommand(n, t, e) {
+    const r = this._sheetsFilterService.getFilterModel(t, e);
+    if (!r)
       return this._handleNull();
-    const n = t.getRange();
-    if (!n)
+    const s = r.getRange();
+    if (!s)
       return this._handleNull();
     const i = [], o = [];
-    return t.getAllFilterColumns().forEach((a) => {
-      const [u, c] = a;
-      o.push({ id: F.id, params: { unitId: r, subUnitId: e, col: a, criteria: { ...c.serialize(), colId: a } } });
-    }), i.push({ id: A.id, params: { unitId: r, subUnitId: e, range: n } }), o.unshift({ id: R.id, params: { range: n, unitId: r, subUnitId: e } }), {
+    return r.getAllFilterColumns().forEach((c) => {
+      const [u, a] = c;
+      o.push({ id: F.id, params: { unitId: t, subUnitId: e, col: c, criteria: { ...a.serialize(), colId: c } } });
+    }), i.push({ id: A.id, params: { unitId: t, subUnitId: e, range: s } }), o.unshift({ id: w.id, params: { range: s, unitId: t, subUnitId: e } }), {
       undos: o,
       redos: i
     };
@@ -912,52 +909,52 @@ let L = class extends b {
   }
   _initRowFilteredInterceptor() {
     this.disposeWithMe(this._sheetInterceptorService.intercept(ye.ROW_FILTERED, {
-      handler: (s, r) => {
-        var e, t;
-        return s ? !0 : (t = (e = this._sheetsFilterService.getFilterModel(
-          r.unitId,
-          r.subUnitId
-        )) == null ? void 0 : e.isRowFiltered(r.row)) != null ? t : !1;
+      handler: (n, t) => {
+        var e, r;
+        return n ? !0 : (r = (e = this._sheetsFilterService.getFilterModel(
+          t.unitId,
+          t.subUnitId
+        )) == null ? void 0 : e.isRowFiltered(t.row)) != null ? r : !1;
       }
     }));
   }
-  moveCriteria(s, r, e, t) {
-    const n = {
-      unitId: s,
-      subUnitId: r,
+  moveCriteria(n, t, e, r) {
+    const s = {
+      unitId: n,
+      subUnitId: t,
       criteria: null,
       col: -1
     }, i = [], o = [];
     return e.forEach((l) => {
-      const [a, u] = l;
+      const [c, u] = l;
       o.push({
         id: F.id,
         params: {
-          ...n,
-          col: a
+          ...s,
+          col: c
         }
       }), i.push({
         id: F.id,
         params: {
-          ...n,
-          col: a,
-          criteria: { ...u.serialize(), colId: a }
+          ...s,
+          col: c,
+          criteria: { ...u.serialize(), colId: c }
         }
       });
     }), e.forEach((l) => {
-      const [a, u] = l;
+      const [c, u] = l;
       o.push({
         id: F.id,
         params: {
-          ...n,
-          col: a + t,
-          criteria: { ...u.serialize(), colId: a + t }
+          ...s,
+          col: c + r,
+          criteria: { ...u.serialize(), colId: c + r }
         }
       }), i.push({
         id: F.id,
         params: {
-          ...n,
-          col: a + t,
+          ...s,
+          col: c + r,
           criteria: null
         }
       });
@@ -967,91 +964,130 @@ let L = class extends b {
     };
   }
   _commandExecutedListener() {
-    this.disposeWithMe(this._commandService.onCommandExecuted((s) => {
-      const { unitId: r, subUnitId: e } = s.params || {}, t = this._sheetsFilterService.getFilterModel(r, e);
-      if (!t)
-        return;
-      const n = Array.from(t.filteredOutRows).sort((l, a) => l - a), i = [];
-      let o = !1;
-      if (s.id === Ae.id) {
-        const { startRow: l, endRow: a } = s.params.range, u = n.filter((c) => c >= l && c <= a);
-        n.forEach((c) => {
-          if (c < l)
-            i.push(c);
-          else if (o = !0, c <= a) {
-            const h = Math.max(l, i.length ? i[i.length - 1] + 1 : l);
-            i.push(h);
+    this.disposeWithMe(this._commandService.onCommandExecuted((n, t) => {
+      var c, u;
+      const { unitId: e, subUnitId: r } = n.params || {}, s = this._sheetsFilterService.getFilterModel(e, r);
+      if (!s) return;
+      const i = Array.from(s.filteredOutRows).sort((a, d) => a - d), o = [];
+      let l = !1;
+      if (n.id === Ae.id) {
+        const { startRow: a, endRow: d } = n.params.range, f = i.filter((g) => g >= a && g <= d);
+        i.forEach((g) => {
+          if (g < a)
+            o.push(g);
+          else if (l = !0, g <= d) {
+            const R = Math.max(a, o.length ? o[o.length - 1] + 1 : a);
+            o.push(R);
           } else
-            i.push(c - (a - l + 1 - u.length));
+            o.push(g - (d - a + 1 - f.length));
         });
       }
-      if (s.id === Te.id) {
-        const { startRow: l, endRow: a } = s.params.range;
-        n.forEach((u) => {
-          u >= l ? (o = !0, i.push(u + (a - l + 1))) : i.push(u);
+      if (n.id === Te.id) {
+        const { startRow: a, endRow: d } = n.params.range;
+        i.forEach((f) => {
+          f >= a ? (l = !0, o.push(f + (d - a + 1))) : o.push(f);
         });
       }
-      o && (t.filteredOutRows = new Set(i));
+      if (l && (s.filteredOutRows = new Set(o)), n.id === xe.id && !(t != null && t.fromCollab) && !(t != null && t.onlyLocal)) {
+        const a = this._getExtendRegion(e, r);
+        if (a) {
+          const d = n.params.cellValue;
+          if (d)
+            for (let f = a.startColumn; f <= a.endColumn; f++) {
+              const g = (c = d == null ? void 0 : d[a.startRow]) == null ? void 0 : c[f];
+              if (g && Object.keys(g).length !== 0) {
+                const R = (u = this._univerInstanceService.getUnit(e)) == null ? void 0 : u.getSheetBySheetId(r);
+                if (R) {
+                  const p = Ne(a, { down: !0 }, R), m = this._sheetsFilterService.getFilterModel(e, r), _ = m.getRange();
+                  m.setRange({
+                    ..._,
+                    endRow: p.endRow
+                  });
+                }
+              }
+            }
+        }
+      }
     }));
   }
+  _getExtendRegion(n, t) {
+    var l;
+    const e = this._sheetsFilterService.getFilterModel(n, t);
+    if (!e)
+      return null;
+    const r = (l = this._univerInstanceService.getUnit(n)) == null ? void 0 : l.getSheetBySheetId(t);
+    if (!r)
+      return null;
+    const s = e.getRange();
+    if (!s)
+      return null;
+    const i = r.getRowCount() - 1, o = r.getRowManager();
+    for (let c = s.endRow + 1; c <= i; c++)
+      if (o.getRowRawVisible(c))
+        return {
+          startRow: c,
+          endRow: c,
+          startColumn: s.startColumn,
+          endColumn: s.endColumn
+        };
+    return null;
+  }
   _initErrorHandling() {
-    this.disposeWithMe(this._commandService.beforeCommandExecuted((s) => {
-      const r = s.params, e = Ne(this._univerInstanceService);
-      if (!e)
-        return;
-      const { subUnitId: t, unitId: n } = e, i = this._sheetsFilterService.getFilterModel(n, t);
-      if (!i)
-        return;
+    this.disposeWithMe(this._commandService.beforeCommandExecuted((n) => {
+      const t = n.params, e = $e(this._univerInstanceService);
+      if (!e) return;
+      const { subUnitId: r, unitId: s } = e, i = this._sheetsFilterService.getFilterModel(s, r);
+      if (!i) return;
       const o = i.getRange();
-      if (s.id === xe.id && r.fromRange.startRow <= o.startRow && r.fromRange.endRow >= o.startRow)
+      if (n.id === Ie.id && t.fromRange.startRow <= o.startRow && t.fromRange.endRow < o.endRow)
         throw this._sheetsFilterService.setFilterErrorMsg("sheets-filter.msg.filter-header-forbidden"), new Error("[SheetsFilterController]: Cannot move header row of filter");
     }));
   }
 };
-L = at([
-  ee(te.Ready, L),
-  N(0, se),
-  N(1, P(Se)),
-  N(2, P(S)),
-  N(3, re),
-  N(4, P(Me))
-], L);
-var ct = Object.defineProperty, ut = Object.getOwnPropertyDescriptor, dt = (s, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? ut(r, e) : r, i = s.length - 1, o; i >= 0; i--)
-    (o = s[i]) && (n = (t ? o(r, e, n) : o(n)) || n);
-  return t && n && ct(r, e, n), n;
-}, ht = (s, r) => (e, t) => r(e, t, s), I;
-let Z = (I = class extends Ce {
-  constructor(s, r) {
-    super(), this._injector = r;
-  }
-  onStarting(s) {
+B = ut([
+  ee(te.Ready, B),
+  x(0, ne),
+  x(1, P(ve)),
+  x(2, P(v)),
+  x(3, re),
+  x(4, P(Me))
+], B);
+var dt = Object.defineProperty, ht = Object.getOwnPropertyDescriptor, ft = (n, t, e, r) => {
+  for (var s = r > 1 ? void 0 : r ? ht(t, e) : t, i = n.length - 1, o; i >= 0; i--)
+    (o = n[i]) && (s = (r ? o(t, e, s) : o(s)) || s);
+  return r && s && dt(t, e, s), s;
+}, mt = (n, t) => (e, r) => t(e, r, n), I;
+let Z = (I = class extends Re {
+  constructor(n, t) {
+    super(), this._injector = t;
+  }
+  onStarting(n) {
     [
-      [S],
-      [L]
-    ].forEach((r) => s.add(r));
+      [v],
+      [B]
+    ].forEach((t) => n.add(t));
   }
-}, g(I, "type", V.UNIVER_SHEET), g(I, "pluginName", ce), I);
-Z = dt([
-  ht(1, P(Re))
+}, C(I, "type", V.UNIVER_SHEET), C(I, "pluginName", ce), I);
+Z = ft([
+  mt(1, P(Ce))
 ], Z);
 export {
   O as CustomFilterOperator,
-  nt as FILTER_MUTATIONS,
-  qe as FilterColumn,
-  B as FilterModel,
+  ot as FILTER_MUTATIONS,
+  Je as FilterColumn,
+  L as FilterModel,
   ae as ReCalcSheetsFilterMutation,
   A as RemoveSheetsFilterMutation,
   ce as SHEET_FILTER_SNAPSHOT_ID,
   F as SetSheetsFilterCriteriaMutation,
-  R as SetSheetsFilterRangeMutation,
-  S as SheetsFilterService,
+  w as SetSheetsFilterRangeMutation,
+  v as SheetsFilterService,
   Z as UniverSheetsFilterPlugin,
-  We as equals,
+  Ve as equals,
   X as getCustomFilterFn,
-  be as greaterThan,
-  Ue as greaterThanOrEqualTo,
-  ze as lessThan,
-  He as lessThanOrEqualTo,
-  ne as notEquals
+  ze as greaterThan,
+  He as greaterThanOrEqualTo,
+  We as lessThan,
+  je as lessThanOrEqualTo,
+  se as notEquals
 };