@univerjs/sheets-filter 0.4.2 → 0.5.0-beta.0

package/lib/es/index.js

@@ -1,124 +1,117 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
-import { CommandType, isNumeric, Disposable, Rectangle, mergeSets, Tools, extractPureTextFromCell, CellValueType, UniverInstanceType, fromCallback, IResourceManagerService, IUniverInstanceService, ICommandService, Inject, DisposableCollection, moveMatrixArray, Plugin, Injector, IConfigService } from "@univerjs/core";
-import { BehaviorSubject, merge, filter, switchMap, of } from "rxjs";
-import { SheetInterceptorService, RefRangeService, SetWorksheetActiveOperation, CopySheetCommand, RemoveSheetCommand, INTERCEPTOR_POINT, RemoveRowMutation, InsertRowMutation, SetRangeValuesMutation, expandToContinuousRange, getSheetCommandTarget, MoveRowsCommand, MoveRangeCommand, EffectRefRangId, RemoveRowCommand, RemoveColCommand, InsertColCommand, InsertRowCommand } from "@univerjs/sheets";
-const SetSheetsFilterRangeMutation = {
+var ge = Object.defineProperty;
+var _e = (i, r, e) => r in i ? ge(i, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[r] = e;
+var w = (i, r, e) => _e(i, typeof r != "symbol" ? r + "" : r, e);
+import { CommandType as E, isNumeric as Re, Disposable as V, Rectangle as Y, mergeSets as Q, Tools as k, extractPureTextFromCell as Ce, CellValueType as K, UniverInstanceType as U, fromCallback as pe, IResourceManagerService as Fe, IUniverInstanceService as x, ICommandService as N, Inject as H, DisposableCollection as we, moveMatrixArray as ee, Plugin as Se, Injector as ve, IConfigService as Me, IUndoRedoService as j, ErrorService as Ee, LocaleService as Oe, sequenceExecute as ye } from "@univerjs/core";
+import { BehaviorSubject as b, merge as Ae, filter as Ne, switchMap as Te, of as xe } from "rxjs";
+import { SheetInterceptorService as Ie, RefRangeService as $e, SetWorksheetActiveOperation as Pe, CopySheetCommand as Ue, RemoveSheetCommand as be, INTERCEPTOR_POINT as Le, RemoveRowMutation as Be, InsertRowMutation as ze, SetRangeValuesMutation as He, expandToContinuousRange as le, getSheetCommandTarget as B, MoveRowsCommand as De, MoveRangeCommand as We, EffectRefRangId as te, RemoveRowCommand as Ve, RemoveColCommand as je, InsertColCommand as qe, InsertRowCommand as Qe, SheetsSelectionsService as Ge, isSingleCellSelection as Je } from "@univerjs/sheets";
+const R = {
   id: "sheet.mutation.set-filter-range",
-  type: CommandType.MUTATION,
-  handler: /* @__PURE__ */ __name((accessor, params) => {
-    const { subUnitId, unitId, range } = params;
-    return accessor.get(SheetsFilterService).ensureFilterModel(unitId, subUnitId).setRange(range), !0;
-  }, "handler")
-}, SetSheetsFilterCriteriaMutation = {
+  type: E.MUTATION,
+  handler: (i, r) => {
+    const { subUnitId: e, unitId: t, range: n } = r;
+    return i.get(M).ensureFilterModel(t, e).setRange(n), !0;
+  }
+}, C = {
   id: "sheet.mutation.set-filter-criteria",
-  type: CommandType.MUTATION,
-  handler: /* @__PURE__ */ __name((accessor, params) => {
-    const { subUnitId, unitId, criteria, col, reCalc = !0 } = params, filterModel = accessor.get(SheetsFilterService).getFilterModel(unitId, subUnitId);
-    return filterModel ? (filterModel.setCriteria(col, criteria, reCalc), !0) : !1;
-  }, "handler")
-}, RemoveSheetsFilterMutation = {
+  type: E.MUTATION,
+  handler: (i, r) => {
+    const { subUnitId: e, unitId: t, criteria: n, col: s, reCalc: o = !0 } = r, a = i.get(M).getFilterModel(t, e);
+    return a ? (a.setCriteria(s, n, o), !0) : !1;
+  }
+}, O = {
   id: "sheet.mutation.remove-filter",
-  type: CommandType.MUTATION,
-  handler: /* @__PURE__ */ __name((accessor, params) => {
-    const { unitId, subUnitId } = params;
-    return accessor.get(SheetsFilterService).removeFilterModel(unitId, subUnitId);
-  }, "handler")
-}, ReCalcSheetsFilterMutation = {
+  type: E.MUTATION,
+  handler: (i, r) => {
+    const { unitId: e, subUnitId: t } = r;
+    return i.get(M).removeFilterModel(e, t);
+  }
+}, L = {
   id: "sheet.mutation.re-calc-filter",
-  type: CommandType.MUTATION,
-  handler: /* @__PURE__ */ __name((accessor, params) => {
-    const { unitId, subUnitId } = params, filterModel = accessor.get(SheetsFilterService).getFilterModel(unitId, subUnitId);
-    return filterModel ? (filterModel.reCalc(), !0) : !1;
-  }, "handler")
+  type: E.MUTATION,
+  handler: (i, r) => {
+    const { unitId: e, subUnitId: t } = r, s = i.get(M).getFilterModel(e, t);
+    return s ? (s.reCalc(), !0) : !1;
+  }
 };
-var CustomFilterOperator = /* @__PURE__ */ ((CustomFilterOperator2) => (CustomFilterOperator2.EQUAL = "equal", CustomFilterOperator2.GREATER_THAN = "greaterThan", CustomFilterOperator2.GREATER_THAN_OR_EQUAL = "greaterThanOrEqual", CustomFilterOperator2.LESS_THAN = "lessThan", CustomFilterOperator2.LESS_THAN_OR_EQUAL = "lessThanOrEqual", CustomFilterOperator2.NOT_EQUALS = "notEqual", CustomFilterOperator2))(CustomFilterOperator || {});
-const greaterThan = {
-  operator: CustomFilterOperator.GREATER_THAN,
-  fn: /* @__PURE__ */ __name((value, compare) => ensureNumber(value) ? value > compare : !1, "fn")
-}, greaterThanOrEqualTo = {
-  operator: CustomFilterOperator.GREATER_THAN_OR_EQUAL,
-  fn: /* @__PURE__ */ __name((value, compare) => ensureNumber(value) ? value >= compare : !1, "fn")
-}, lessThan = {
-  operator: CustomFilterOperator.LESS_THAN,
-  fn: /* @__PURE__ */ __name((value, compare) => ensureNumber(value) ? value < compare : !1, "fn")
-}, lessThanOrEqualTo = {
-  operator: CustomFilterOperator.LESS_THAN_OR_EQUAL,
-  fn: /* @__PURE__ */ __name((value, compare) => ensureNumber(value) ? value <= compare : !1, "fn")
-}, equals = {
-  operator: CustomFilterOperator.EQUAL,
-  fn: /* @__PURE__ */ __name((value, compare) => ensureNumber(value) ? value === compare : !1, "fn")
-}, notEquals = {
-  operator: CustomFilterOperator.NOT_EQUALS,
-  fn: /* @__PURE__ */ __name((value, compare) => {
-    if (typeof compare == "string") {
-      if (compare === " ")
-        return value != null;
-      const ensuredString = ensureString(value);
-      return ensuredString && isWildCardString(compare) ? !createREGEXFromWildChar(compare).test(ensuredString) : ensuredString !== compare;
+var T = /* @__PURE__ */ ((i) => (i.EQUAL = "equal", i.GREATER_THAN = "greaterThan", i.GREATER_THAN_OR_EQUAL = "greaterThanOrEqual", i.LESS_THAN = "lessThan", i.LESS_THAN_OR_EQUAL = "lessThanOrEqual", i.NOT_EQUALS = "notEqual", i))(T || {});
+const Ye = {
+  operator: T.GREATER_THAN,
+  fn: (i, r) => $(i) ? i > r : !1
+}, Ke = {
+  operator: T.GREATER_THAN_OR_EQUAL,
+  fn: (i, r) => $(i) ? i >= r : !1
+}, Xe = {
+  operator: T.LESS_THAN,
+  fn: (i, r) => $(i) ? i < r : !1
+}, Ze = {
+  operator: T.LESS_THAN_OR_EQUAL,
+  fn: (i, r) => $(i) ? i <= r : !1
+}, ke = {
+  operator: T.EQUAL,
+  fn: (i, r) => $(i) ? i === r : !1
+}, ae = {
+  operator: T.NOT_EQUALS,
+  fn: (i, r) => {
+    if (typeof r == "string") {
+      if (r === " ")
+        return i != null;
+      const e = de(i);
+      return e && nt(r) ? !ue(r).test(e) : e !== r;
     }
-    return ensureNumber(value) ? value !== compare : !0;
-  }, "fn")
-}, CustomFilterFnRegistry = /* @__PURE__ */ new Map([]), ALL_CUSTOM_FILTER_FUNCTIONS = [greaterThan, greaterThanOrEqualTo, lessThan, lessThanOrEqualTo, equals, notEquals];
-ALL_CUSTOM_FILTER_FUNCTIONS.forEach((fn) => {
-  CustomFilterFnRegistry.set(fn.operator, fn);
+    return $(i) ? i !== r : !0;
+  }
+}, ce = /* @__PURE__ */ new Map([]), et = [Ye, Ke, Xe, Ze, ke, ae];
+et.forEach((i) => {
+  ce.set(i.operator, i);
 });
-function isNumericFilterFn(operator) {
-  return !!operator;
+function tt(i) {
+  return !!i;
 }
-__name(isNumericFilterFn, "isNumericFilterFn");
-const textMatch = {
-  fn: /* @__PURE__ */ __name((value, compare) => {
-    const ensured = ensureString(value);
-    return ensured === null ? compare === "" : createREGEXFromWildChar(compare).test(ensured);
-  }, "fn")
+const rt = {
+  fn: (i, r) => {
+    const e = de(i);
+    return e === null ? r === "" : ue(r).test(e);
+  }
 };
-function getCustomFilterFn(operator) {
-  return operator ? CustomFilterFnRegistry.get(operator) : textMatch;
+function re(i) {
+  return i ? ce.get(i) : rt;
 }
-__name(getCustomFilterFn, "getCustomFilterFn");
-function ensureNumber(value) {
-  return typeof value == "number";
+function $(i) {
+  return typeof i == "number";
 }
-__name(ensureNumber, "ensureNumber");
-function ensureNumeric(value) {
-  return !!(typeof value == "number" || typeof value == "string" && isNumeric(value));
+function ne(i) {
+  return !!(typeof i == "number" || typeof i == "string" && Re(i));
 }
-__name(ensureNumeric, "ensureNumeric");
-function ensureString(value) {
-  return typeof value == "boolean" || value == null ? null : typeof value == "string" ? value : value.toString();
+function de(i) {
+  return typeof i == "boolean" || i == null ? null : typeof i == "string" ? i : i.toString();
 }
-__name(ensureString, "ensureString");
-function isWildCardString(str) {
-  return typeof str == "number" ? !1 : str.indexOf("*") !== -1 || str.indexOf("?") !== -1;
+function nt(i) {
+  return typeof i == "number" ? !1 : i.indexOf("*") !== -1 || i.indexOf("?") !== -1;
 }
-__name(isWildCardString, "isWildCardString");
-function createREGEXFromWildChar(wildChar) {
-  const regexpStr = wildChar.replace(/[.+^${}()|[\]\\]/g, "\\$&").replaceAll("?", ".").replace(/[*]/g, ".$&");
-  return new RegExp(`^${regexpStr}$`);
+function ue(i) {
+  const r = i.replace(/[.+^${}()|[\]\\]/g, "\\$&").replaceAll("?", ".").replace(/[*]/g, ".$&");
+  return new RegExp(`^${r}$`);
 }
-__name(createREGEXFromWildChar, "createREGEXFromWildChar");
-const EMPTY = /* @__PURE__ */ __name(() => /* @__PURE__ */ new Set(), "EMPTY"), _FilterModel = class _FilterModel extends Disposable {
-  constructor(unitId, subUnitId, _worksheet) {
+const G = () => /* @__PURE__ */ new Set();
+class D extends V {
+  constructor(e, t, n) {
     super();
-    __publicField(this, "_filteredOutRows$", new BehaviorSubject(EMPTY()));
+    w(this, "_filteredOutRows$", new b(G()));
     /** An observable value. A set of filtered out rows. */
-    __publicField(this, "filteredOutRows$", this._filteredOutRows$.asObservable());
+    w(this, "filteredOutRows$", this._filteredOutRows$.asObservable());
     // TODO: we may need to update which cols have criteria rather than simple boolean
-    __publicField(this, "_hasCriteria$", new BehaviorSubject(!1));
-    __publicField(this, "hasCriteria$", this._hasCriteria$.asObservable());
-    __publicField(this, "_filterColumnByIndex", /* @__PURE__ */ new Map());
-    __publicField(this, "_alreadyFilteredOutRows", EMPTY());
-    __publicField(this, "_range");
-    this.unitId = unitId, this.subUnitId = subUnitId, this._worksheet = _worksheet;
+    w(this, "_hasCriteria$", new b(!1));
+    w(this, "hasCriteria$", this._hasCriteria$.asObservable());
+    w(this, "_filterColumnByIndex", /* @__PURE__ */ new Map());
+    w(this, "_alreadyFilteredOutRows", G());
+    w(this, "_range");
+    this.unitId = e, this.subUnitId = t, this._worksheet = n;
   }
   get filteredOutRows() {
     return this._filteredOutRows$.getValue();
   }
-  set filteredOutRows(rows) {
-    this._alreadyFilteredOutRows = rows, this._filteredOutRows$.next(rows);
+  set filteredOutRows(e) {
+    this._alreadyFilteredOutRows = e, this._filteredOutRows$.next(e);
   }
   dispose() {
     super.dispose(), this._filteredOutRows$.complete(), this._hasCriteria$.complete();
@@ -127,11 +120,11 @@ const EMPTY = /* @__PURE__ */ __name(() => /* @__PURE__ */ new Set(), "EMPTY"),
    * Serialize this filter model to the JSON format representation.
    */
   serialize() {
-    const result = {
-      ref: Rectangle.clone(this._range),
-      filterColumns: this._getAllFilterColumns(!0).sort(([offset1], [offset2]) => offset1 - offset2).map(([_, filterColumn]) => filterColumn.serialize())
+    const e = {
+      ref: Y.clone(this._range),
+      filterColumns: this._getAllFilterColumns(!0).sort(([t], [n]) => t - n).map(([t, n]) => n.serialize())
     };
-    return this._alreadyFilteredOutRows && (result.cachedFilteredOut = Array.from(this._alreadyFilteredOutRows).sort()), result;
+    return this._alreadyFilteredOutRows && (e.cachedFilteredOut = Array.from(this._alreadyFilteredOutRows).sort()), e;
   }
   /**
    * Deserialize auto filter info to construct a `FilterModel` object.
@@ -140,16 +133,16 @@ const EMPTY = /* @__PURE__ */ __name(() => /* @__PURE__ */ new Set(), "EMPTY"),
    * @param worksheet the Worksheet object
    * @param autoFilter auto filter data
    */
-  static deserialize(unitId, subUnitId, worksheet, autoFilter) {
-    const filterModel = new _FilterModel(unitId, subUnitId, worksheet);
-    return filterModel._dump(autoFilter), filterModel;
+  static deserialize(e, t, n, s) {
+    const o = new D(e, t, n);
+    return o._dump(s), o;
   }
-  _dump(autoFilter) {
-    var _a4;
-    this.setRange(autoFilter.ref), (_a4 = autoFilter.filterColumns) == null || _a4.forEach((filterColumn) => this._setCriteriaWithoutReCalc(filterColumn.colId, filterColumn)), autoFilter.cachedFilteredOut && (this._alreadyFilteredOutRows = new Set(autoFilter.cachedFilteredOut), this._emit()), this._emitHasCriteria();
+  _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();
   }
-  isRowFiltered(row) {
-    return this._alreadyFilteredOutRows.has(row);
+  isRowFiltered(e) {
+    return this._alreadyFilteredOutRows.has(e);
   }
   getRange() {
     if (!this._range)
@@ -161,74 +154,74 @@ const EMPTY = /* @__PURE__ */ __name(() => /* @__PURE__ */ new Set(), "EMPTY"),
    * another word it would not change `filteredOutRows` on `FilterModel` nor `FilterColumn`.
    * @param col
    */
-  getFilteredOutRowsExceptCol(col) {
-    return this._getAllFilterColumns(!0).filter(([colOffset]) => colOffset !== col).reduce((acc, [, filterColumn]) => {
-      const newResult = filterColumn.calc({ getAlreadyFilteredOutRows: /* @__PURE__ */ __name(() => acc, "getAlreadyFilteredOutRows") });
-      return newResult ? mergeSets(acc, newResult) : acc;
+  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;
     }, /* @__PURE__ */ new Set());
   }
   /**
    * Set range of the filter model, this would remove some `IFilterColumn`
    * if the new range not overlaps the old range.
    */
-  setRange(range) {
-    this._range = range, this._getAllFilterColumns(!0).forEach(([col, filterColumn]) => {
-      filterColumn.setRangeAndColumn({
-        startRow: range.startRow,
-        endRow: range.endRow,
-        startColumn: col,
-        endColumn: col
-      }, col);
+  setRange(e) {
+    this._range = e, this._getAllFilterColumns(!0).forEach(([t, n]) => {
+      n.setRangeAndColumn({
+        startRow: e.startRow,
+        endRow: e.endRow,
+        startColumn: t,
+        endColumn: t
+      }, t);
     });
   }
   /**
    * Set or remove filter criteria on a specific row.
    */
-  setCriteria(col, criteria, reCalc = !1) {
+  setCriteria(e, t, n = !1) {
     if (!this._range)
       throw new Error("[FilterModel] could not set criteria before a range is set!");
-    if (!criteria) {
-      this._removeCriteria(col), this._rebuildAlreadyFilteredOutRowsWithCache(), reCalc && this._reCalcAllColumns(), this._emit(), this._emitHasCriteria();
+    if (!t) {
+      this._removeCriteria(e), this._rebuildAlreadyFilteredOutRowsWithCache(), n && this._reCalcAllColumns(), this._emit(), this._emitHasCriteria();
       return;
     }
-    this._setCriteriaWithoutReCalc(col, criteria), reCalc && (this._rebuildAlreadyFilteredOutRowsWithCache(), this._reCalcWithNoCacheColumns(), this._emit(), this._emitHasCriteria());
+    this._setCriteriaWithoutReCalc(e, t), n && (this._rebuildAlreadyFilteredOutRowsWithCache(), this._reCalcWithNoCacheColumns(), this._emit(), this._emitHasCriteria());
   }
   getAllFilterColumns() {
     return this._getAllFilterColumns(!0);
   }
-  getFilterColumn(index) {
-    var _a4;
-    return (_a4 = this._filterColumnByIndex.get(index)) != null ? _a4 : null;
+  getFilterColumn(e) {
+    var t;
+    return (t = this._filterColumnByIndex.get(e)) != null ? t : null;
   }
   reCalc() {
     this._reCalcAllColumns(), this._emit();
   }
-  _getAllFilterColumns(withCol = !1) {
-    const columns = Array.from(this._filterColumnByIndex.entries());
-    return withCol ? columns : columns.map(([_, filterColumn]) => filterColumn);
+  _getAllFilterColumns(e = !1) {
+    const t = Array.from(this._filterColumnByIndex.entries());
+    return e ? t : t.map(([n, s]) => s);
   }
   _reCalcAllColumns() {
-    this._alreadyFilteredOutRows = EMPTY(), this._getAllFilterColumns().forEach((filterColumn) => filterColumn.__clearCache()), this._reCalcWithNoCacheColumns();
+    this._alreadyFilteredOutRows = G(), this._getAllFilterColumns().forEach((e) => e.__clearCache()), this._reCalcWithNoCacheColumns();
   }
-  _setCriteriaWithoutReCalc(col, criteria) {
-    const range = this._range;
-    if (!range)
+  _setCriteriaWithoutReCalc(e, t) {
+    const n = this._range;
+    if (!n)
       throw new Error("[FilterModel] could not set criteria before a range is set!");
-    const { startColumn, endColumn } = range;
-    if (col > endColumn || col < startColumn)
-      throw new Error(`[FilterModel] could not set criteria on column ${col} which is out of range!`);
-    let filterColumn;
-    this._filterColumnByIndex.has(col) ? filterColumn = this._filterColumnByIndex.get(col) : (filterColumn = new FilterColumn(
+    const { startColumn: s, endColumn: o } = n;
+    if (e > o || e < s)
+      throw new Error(`[FilterModel] could not set criteria on column ${e} which is out of range!`);
+    let l;
+    this._filterColumnByIndex.has(e) ? l = this._filterColumnByIndex.get(e) : (l = new it(
       this.unitId,
       this.subUnitId,
       this._worksheet,
-      criteria,
-      { getAlreadyFilteredOutRows: /* @__PURE__ */ __name(() => this._alreadyFilteredOutRows, "getAlreadyFilteredOutRows") }
-    ), filterColumn.setRangeAndColumn(range, col), this._filterColumnByIndex.set(col, filterColumn)), filterColumn.setCriteria(criteria);
+      t,
+      { getAlreadyFilteredOutRows: () => this._alreadyFilteredOutRows }
+    ), l.setRangeAndColumn(n, e), this._filterColumnByIndex.set(e, l)), l.setCriteria(t);
   }
-  _removeCriteria(col) {
-    const filterColumn = this._filterColumnByIndex.get(col);
-    filterColumn && (filterColumn.dispose(), this._filterColumnByIndex.delete(col));
+  _removeCriteria(e) {
+    const t = this._filterColumnByIndex.get(e);
+    t && (t.dispose(), this._filterColumnByIndex.delete(e));
   }
   _emit() {
     this._filteredOutRows$.next(this._alreadyFilteredOutRows);
@@ -237,29 +230,27 @@ const EMPTY = /* @__PURE__ */ __name(() => /* @__PURE__ */ new Set(), "EMPTY"),
     this._hasCriteria$.next(this._filterColumnByIndex.size > 0);
   }
   _rebuildAlreadyFilteredOutRowsWithCache() {
-    const newFilteredOutRows = this._getAllFilterColumns().filter((filterColumn) => filterColumn.hasCache()).reduce((acc, filterColumn) => mergeSets(acc, filterColumn.filteredOutRows), /* @__PURE__ */ new Set());
-    this._alreadyFilteredOutRows = newFilteredOutRows;
+    const e = this._getAllFilterColumns().filter((t) => t.hasCache()).reduce((t, n) => Q(t, n.filteredOutRows), /* @__PURE__ */ new Set());
+    this._alreadyFilteredOutRows = e;
   }
   _reCalcWithNoCacheColumns() {
-    const noCacheFilteredOutRows = this._getAllFilterColumns().filter((filterColumn) => !filterColumn.hasCache());
-    for (const filterColumn of noCacheFilteredOutRows) {
-      const filteredRows = filterColumn.reCalc();
-      filteredRows && (this._alreadyFilteredOutRows = mergeSets(this._alreadyFilteredOutRows, filteredRows));
+    const e = this._getAllFilterColumns().filter((t) => !t.hasCache());
+    for (const t of e) {
+      const n = t.reCalc();
+      n && (this._alreadyFilteredOutRows = Q(this._alreadyFilteredOutRows, n));
     }
   }
-};
-__name(_FilterModel, "FilterModel");
-let FilterModel = _FilterModel;
-const _FilterColumn = class _FilterColumn extends Disposable {
-  constructor(unitId, subUnitId, _worksheet, _criteria, _filterColumnContext) {
+}
+class it extends V {
+  constructor(e, t, n, s, o) {
     super();
-    __publicField(this, "_filteredOutRows", null);
+    w(this, "_filteredOutRows", null);
     /** Cache the filter function.  */
-    __publicField(this, "_filterFn", null);
-    __publicField(this, "_range", null);
-    __publicField(this, "_column", 0);
-    __publicField(this, "_filterByValues", !1);
-    this.unitId = unitId, this.subUnitId = subUnitId, this._worksheet = _worksheet, this._criteria = _criteria, this._filterColumnContext = _filterColumnContext;
+    w(this, "_filterFn", null);
+    w(this, "_range", null);
+    w(this, "_column", 0);
+    w(this, "_filterByValues", !1);
+    this.unitId = e, this.subUnitId = t, this._worksheet = n, this._criteria = s, this._filterColumnContext = o;
   }
   get filteredOutRows() {
     return this._filteredOutRows;
@@ -276,7 +267,7 @@ const _FilterColumn = class _FilterColumn extends Disposable {
   serialize() {
     if (!this._criteria)
       throw new Error("[FilterColumn]: could not serialize without a filter column!");
-    return Tools.deepClone({
+    return k.deepClone({
       ...this._criteria,
       colId: this._column
     });
@@ -285,14 +276,14 @@ const _FilterColumn = class _FilterColumn extends Disposable {
     return this._filteredOutRows !== null;
   }
   // The first row should be omitted!
-  setRangeAndColumn(range, column) {
-    this._range = range, this._column = column;
+  setRangeAndColumn(e, t) {
+    this._range = e, this._column = t;
   }
-  setCriteria(criteria) {
-    this._criteria = criteria, this._generateFilterFn(), this._filteredOutRows = null;
+  setCriteria(e) {
+    this._criteria = e, this._generateFilterFn(), this._filteredOutRows = null;
   }
   getColumnData() {
-    return Tools.deepClone(this._criteria);
+    return k.deepClone(this._criteria);
   }
   /**
    * Trigger new calculation on this `FilterModel` instance.
@@ -303,115 +294,103 @@ const _FilterColumn = class _FilterColumn extends Disposable {
   reCalc() {
     return this._filteredOutRows = this.calc(this._filterColumnContext), this._filteredOutRows;
   }
-  calc(context) {
+  calc(e) {
     if (!this._filterFn)
       throw new Error("[FilterColumn] cannot calculate without a filter fn!");
     if (!this._range)
       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 column = this._column, iterateRange = { startColumn: column, endColumn: column, startRow: this._range.startRow + 1, endRow: this._range.endRow }, filteredOutRows = /* @__PURE__ */ new Set(), filteredOutByOthers = context.getAlreadyFilteredOutRows();
-    for (const range of this._worksheet.iterateByColumn(iterateRange, !1, !1)) {
-      const { row, rowSpan, col } = range;
-      if (filteredOutByOthers.has(row) && (!rowSpan || rowSpan === 1))
+    const t = this._column, n = { startColumn: t, endColumn: t, startRow: this._range.startRow + 1, endRow: this._range.endRow }, s = /* @__PURE__ */ new Set(), o = e.getAlreadyFilteredOutRows();
+    for (const l of this._worksheet.iterateByColumn(n, !1, !1)) {
+      const { row: a, rowSpan: c, col: h } = l;
+      if (o.has(a) && (!c || c === 1))
         continue;
-      const value = this._filterByValues ? extractPureTextFromCell(this._worksheet.getCell(row, col)) : getFilterValueForConditionalFiltering(this._worksheet, row, col);
-      if (!this._filterFn(value) && (filteredOutRows.add(row), rowSpan))
-        for (let i = 1; i < rowSpan; i++)
-          filteredOutRows.add(row + i);
+      const d = this._filterByValues ? Ce(this._worksheet.getCell(a, h)) : ht(this._worksheet, a, h);
+      if (!this._filterFn(d) && (s.add(a), c))
+        for (let u = 1; u < c; u++)
+          s.add(a + u);
     }
-    return filteredOutRows;
+    return s;
   }
   _generateFilterFn() {
-    this._criteria && (this._filterFn = generateFilterFn(this._criteria), this._filterByValues = !!this._criteria.filters);
+    this._criteria && (this._filterFn = st(this._criteria), this._filterByValues = !!this._criteria.filters);
   }
-};
-__name(_FilterColumn, "FilterColumn");
-let FilterColumn = _FilterColumn;
-function generateFilterFn(column) {
-  if (column.filters)
-    return filterByValuesFnFactory(column.filters);
-  if (column.customFilters)
-    return customFilterFnFactory(column.customFilters);
+}
+function st(i) {
+  if (i.filters)
+    return ot(i.filters);
+  if (i.customFilters)
+    return lt(i.customFilters);
   throw new Error("[FilterModel]: other types of filters are not supported yet.");
 }
-__name(generateFilterFn, "generateFilterFn");
-function filterByValuesFnFactory(values) {
-  const includeBlank = !!values.blank, valuesSet = new Set(values.filters);
-  return (value) => value === void 0 || value === "" ? includeBlank : valuesSet.has(typeof value == "string" ? value : `${value}`);
+function ot(i) {
+  const r = !!i.blank, e = new Set(i.filters);
+  return (t) => t === void 0 || t === "" ? r : e.has(typeof t == "string" ? t : `${t}`);
 }
-__name(filterByValuesFnFactory, "filterByValuesFnFactory");
-function customFilterFnFactory(customFilters) {
-  const customFilterFns = customFilters.customFilters.map((filter2) => generateCustomFilterFn(filter2));
-  return isCompoundCustomFilter(customFilterFns) ? customFilters.and ? AND(customFilterFns) : OR(customFilterFns) : customFilterFns[0];
+function lt(i) {
+  const r = i.customFilters.map((e) => ut(e));
+  return dt(r) ? i.and ? at(r) : ct(r) : r[0];
 }
-__name(customFilterFnFactory, "customFilterFnFactory");
-function AND(filterFns) {
-  const [fn1, fn2] = filterFns;
-  return (value) => fn1(value) && fn2(value);
+function at(i) {
+  const [r, e] = i;
+  return (t) => r(t) && e(t);
 }
-__name(AND, "AND");
-function OR(filterFns) {
-  const [fn1, fn2] = filterFns;
-  return (value) => fn1(value) || fn2(value);
+function ct(i) {
+  const [r, e] = i;
+  return (t) => r(t) || e(t);
 }
-__name(OR, "OR");
-function isCompoundCustomFilter(filter2) {
-  return filter2.length === 2;
+function dt(i) {
+  return i.length === 2;
 }
-__name(isCompoundCustomFilter, "isCompoundCustomFilter");
-function generateCustomFilterFn(filter2) {
-  const compare = filter2.val;
-  if (filter2.operator === CustomFilterOperator.NOT_EQUALS && !ensureNumeric(compare))
-    return (value) => notEquals.fn(value, compare);
-  if (isNumericFilterFn(filter2.operator)) {
-    if (!ensureNumeric(compare)) return () => !1;
-    const customFilterFn2 = getCustomFilterFn(filter2.operator), ensuredNumber = Number(compare);
-    return (value) => customFilterFn2.fn(value, ensuredNumber);
-  }
-  const customFilterFn = getCustomFilterFn(filter2.operator);
-  return (value) => customFilterFn.fn(value, compare);
+function ut(i) {
+  const r = i.val;
+  if (i.operator === T.NOT_EQUALS && !ne(r))
+    return (n) => ae.fn(n, r);
+  if (tt(i.operator)) {
+    if (!ne(r)) return () => !1;
+    const n = re(i.operator), s = Number(r);
+    return (o) => n.fn(o, s);
+  }
+  const e = re(i.operator);
+  return (t) => e.fn(t, r);
 }
-__name(generateCustomFilterFn, "generateCustomFilterFn");
-function getFilterValueForConditionalFiltering(worksheet, row, col) {
-  const interceptedCell = worksheet.getCell(row, col);
-  if (!interceptedCell) return null;
-  const rawCell = worksheet.getCellRaw(row, col);
-  return interceptedCell && !rawCell ? extractFilterValueFromCell(interceptedCell) : rawCell ? interceptedCell.t === CellValueType.NUMBER && typeof interceptedCell.v == "string" ? rawCell.v : extractFilterValueFromCell(rawCell) : null;
+function ht(i, r, e) {
+  const t = i.getCell(r, e);
+  if (!t) return null;
+  const n = i.getCellRaw(r, e);
+  return t && !n ? ie(t) : n ? t.t === K.NUMBER && typeof t.v == "string" ? n.v : ie(n) : null;
 }
-__name(getFilterValueForConditionalFiltering, "getFilterValueForConditionalFiltering");
-function extractFilterValueFromCell(cell) {
-  var _a4, _b;
-  const richTextValue = (_b = (_a4 = cell.p) == null ? void 0 : _a4.body) == null ? void 0 : _b.dataStream;
-  if (richTextValue) return richTextValue.trimEnd();
-  const rawValue = cell.v;
-  return typeof rawValue == "string" ? cell.t === CellValueType.BOOLEAN ? rawValue.toUpperCase() : rawValue : typeof rawValue == "number" ? cell.t === CellValueType.BOOLEAN ? rawValue ? "TRUE" : "FALSE" : rawValue : typeof rawValue == "boolean" ? rawValue ? "TRUE" : "FALSE" : "";
+function ie(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 === K.BOOLEAN ? e.toUpperCase() : e : typeof e == "number" ? i.t === K.BOOLEAN ? e ? "TRUE" : "FALSE" : e : typeof e == "boolean" ? e ? "TRUE" : "FALSE" : "";
 }
-__name(extractFilterValueFromCell, "extractFilterValueFromCell");
-var __defProp$2 = Object.defineProperty, __getOwnPropDesc$2 = Object.getOwnPropertyDescriptor, __decorateClass$2 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
-    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
-  return kind && result && __defProp$2(target, key, result), result;
-}, "__decorateClass$2"), __decorateParam$2 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$2");
-const FILTER_MUTATIONS = /* @__PURE__ */ new Set([
-  SetSheetsFilterRangeMutation.id,
-  SetSheetsFilterCriteriaMutation.id,
-  RemoveSheetsFilterMutation.id,
-  ReCalcSheetsFilterMutation.id
-]), SHEET_FILTER_SNAPSHOT_ID = "SHEET_FILTER_PLUGIN";
-var _a;
-let SheetsFilterService = (_a = class extends Disposable {
-  constructor(_resourcesManagerService, _univerInstanceService, _commandService) {
+var ft = Object.defineProperty, mt = Object.getOwnPropertyDescriptor, gt = (i, r, e, t) => {
+  for (var n = t > 1 ? void 0 : t ? mt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+    (o = i[s]) && (n = (t ? o(r, e, n) : o(n)) || n);
+  return t && n && ft(r, e, n), n;
+}, J = (i, r) => (e, t) => r(e, t, i);
+const _t = /* @__PURE__ */ new Set([
+  R.id,
+  C.id,
+  O.id,
+  L.id
+]), he = "SHEET_FILTER_PLUGIN";
+let M = class extends V {
+  constructor(r, e, t) {
     super();
-    __publicField(this, "_filterModels", /* @__PURE__ */ new Map());
-    __publicField(this, "_loadedUnitId$", new BehaviorSubject(null));
-    __publicField(this, "loadedUnitId$", this._loadedUnitId$.asObservable());
-    __publicField(this, "_errorMsg$", new BehaviorSubject(null));
-    __publicField(this, "errorMsg$", this._errorMsg$.asObservable());
-    __publicField(this, "_activeFilterModel$", new BehaviorSubject(null));
+    w(this, "_filterModels", /* @__PURE__ */ new Map());
+    w(this, "_loadedUnitId$", new b(null));
+    w(this, "loadedUnitId$", this._loadedUnitId$.asObservable());
+    w(this, "_errorMsg$", new b(null));
+    w(this, "errorMsg$", this._errorMsg$.asObservable());
+    w(this, "_activeFilterModel$", new b(null));
     /** An observable value emitting the current Workbook's active Worksheet's filter model (if there is one). */
-    __publicField(this, "activeFilterModel$", this._activeFilterModel$.asObservable());
-    this._resourcesManagerService = _resourcesManagerService, this._univerInstanceService = _univerInstanceService, this._commandService = _commandService, this._initModel(), this._initActiveFilterModel();
+    w(this, "activeFilterModel$", this._activeFilterModel$.asObservable());
+    this._resourcesManagerService = r, this._univerInstanceService = e, this._commandService = t, this._initModel(), this._initActiveFilterModel();
   }
   /** The current Workbook's active Worksheet's filter model (if there is one). */
   get activeFilterModel() {
@@ -422,208 +401,206 @@ let SheetsFilterService = (_a = class extends Disposable {
    * @param unitId
    * @param subUnitId
    */
-  ensureFilterModel(unitId, subUnitId) {
-    const already = this.getFilterModel(unitId, subUnitId);
-    if (already)
-      return already;
-    const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
-    if (!workbook)
-      throw new Error(`[SheetsFilterService]: could not create "FilterModel" on a non-existing workbook ${unitId}!`);
-    const worksheet = workbook.getSheetBySheetId(subUnitId);
-    if (!worksheet)
-      throw new Error(`[SheetsFilterService]: could not create "FilterModel" on a non-existing worksheet ${subUnitId}!`);
-    const filterModel = new FilterModel(unitId, subUnitId, worksheet);
-    return this._cacheFilterModel(unitId, subUnitId, filterModel), filterModel;
-  }
-  getFilterModel(unitId, subUnitId) {
-    var _a4, _b;
-    return (_b = (_a4 = this._filterModels.get(unitId)) == null ? void 0 : _a4.get(subUnitId)) != null ? _b : null;
-  }
-  removeFilterModel(unitId, subUnitId) {
-    const already = this.getFilterModel(unitId, subUnitId);
-    return already ? (already.dispose(), this._filterModels.get(unitId).delete(subUnitId), !0) : !1;
-  }
-  setFilterErrorMsg(content) {
-    this._errorMsg$.next(content);
+  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 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);
+    return this._cacheFilterModel(r, 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;
+  }
+  removeFilterModel(r, e) {
+    const t = this.getFilterModel(r, e);
+    return t ? (t.dispose(), this._filterModels.get(r).delete(e), !0) : !1;
+  }
+  setFilterErrorMsg(r) {
+    this._errorMsg$.next(r);
   }
   _updateActiveFilterModel() {
-    let workbook;
+    let r;
     try {
-      if (workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET), !workbook) {
+      if (r = this._univerInstanceService.getCurrentUnitForType(U.UNIVER_SHEET), !r) {
         this._activeFilterModel$.next(null);
         return;
       }
-    } catch (err) {
-      console.error("[SheetsFilterService]: could not get active workbook!", err);
+    } catch (o) {
+      console.error("[SheetsFilterService]: could not get active workbook!", o);
       return;
     }
-    const activeSheet = workbook.getActiveSheet(!0);
-    if (!activeSheet) {
+    const e = r.getActiveSheet(!0);
+    if (!e) {
       this._activeFilterModel$.next(null);
       return;
     }
-    const unitId = activeSheet.getUnitId(), subUnitId = activeSheet.getSheetId(), filterModel = this.getFilterModel(unitId, subUnitId);
-    this._activeFilterModel$.next(filterModel);
+    const t = e.getUnitId(), n = e.getSheetId(), s = this.getFilterModel(t, n);
+    this._activeFilterModel$.next(s);
   }
   _initActiveFilterModel() {
     this.disposeWithMe(
-      merge(
+      Ae(
         // source1: executing filter related mutations
-        fromCallback(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(filter(([command]) => command.type === CommandType.MUTATION && FILTER_MUTATIONS.has(command.id))),
+        pe(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(Ne(([r]) => r.type === E.MUTATION && _t.has(r.id))),
         // source2: activate sheet changes
-        this._univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).pipe(switchMap((workbook) => {
-          var _a4;
-          return (_a4 = workbook == null ? void 0 : workbook.activeSheet$) != null ? _a4 : of(null);
+        this._univerInstanceService.getCurrentTypeOfUnit$(U.UNIVER_SHEET).pipe(Te((r) => {
+          var e;
+          return (e = r == null ? void 0 : r.activeSheet$) != null ? e : xe(null);
         }))
       ).subscribe(() => this._updateActiveFilterModel())
     );
   }
-  _serializeAutoFiltersForUnit(unitId) {
-    const allFilterModels = this._filterModels.get(unitId);
-    if (!allFilterModels)
+  _serializeAutoFiltersForUnit(r) {
+    const e = this._filterModels.get(r);
+    if (!e)
       return "{}";
-    const json = {};
-    return allFilterModels.forEach((model, worksheetId) => {
-      json[worksheetId] = model.serialize();
-    }), JSON.stringify(json);
-  }
-  _deserializeAutoFiltersForUnit(unitId, json) {
-    const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
-    Object.keys(json).forEach((worksheetId) => {
-      const autoFilter = json[worksheetId], filterModel = FilterModel.deserialize(unitId, worksheetId, workbook.getSheetBySheetId(worksheetId), autoFilter);
-      this._cacheFilterModel(unitId, worksheetId, filterModel);
+    const t = {};
+    return e.forEach((n, s) => {
+      t[s] = n.serialize();
+    }), JSON.stringify(t);
+  }
+  _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);
+      this._cacheFilterModel(r, n, o);
     });
   }
   _initModel() {
     this._resourcesManagerService.registerPluginResource({
-      pluginName: SHEET_FILTER_SNAPSHOT_ID,
-      businesses: [UniverInstanceType.UNIVER_SHEET],
-      toJson: /* @__PURE__ */ __name((id) => this._serializeAutoFiltersForUnit(id), "toJson"),
-      parseJson: /* @__PURE__ */ __name((json) => JSON.parse(json), "parseJson"),
-      onLoad: /* @__PURE__ */ __name((unitId, value) => {
-        this._deserializeAutoFiltersForUnit(unitId, value), this._loadedUnitId$.next(unitId), this._updateActiveFilterModel();
-      }, "onLoad"),
-      onUnLoad: /* @__PURE__ */ __name((unitId) => {
-        const allFilterModels = this._filterModels.get(unitId);
-        allFilterModels && (allFilterModels.forEach((model) => model.dispose()), this._filterModels.delete(unitId));
-      }, "onUnLoad")
+      pluginName: he,
+      businesses: [U.UNIVER_SHEET],
+      toJson: (r) => this._serializeAutoFiltersForUnit(r),
+      parseJson: (r) => JSON.parse(r),
+      onLoad: (r, e) => {
+        this._deserializeAutoFiltersForUnit(r, e), this._loadedUnitId$.next(r), this._updateActiveFilterModel();
+      },
+      onUnLoad: (r) => {
+        const e = this._filterModels.get(r);
+        e && (e.forEach((t) => t.dispose()), this._filterModels.delete(r));
+      }
     });
   }
-  _cacheFilterModel(unitId, subUnitId, filterModel) {
-    this._filterModels.has(unitId) || this._filterModels.set(unitId, /* @__PURE__ */ new Map()), this._filterModels.get(unitId).set(subUnitId, filterModel);
-  }
-}, __name(_a, "SheetsFilterService"), _a);
-SheetsFilterService = __decorateClass$2([
-  __decorateParam$2(0, IResourceManagerService),
-  __decorateParam$2(1, IUniverInstanceService),
-  __decorateParam$2(2, ICommandService)
-], SheetsFilterService);
-function objectsShaker(target, isEqual) {
-  for (let i = 0; i < target.length; i++) {
-    let cur = i;
-    if (target[i])
-      for (let j = i + 1; j < target.length; j++)
-        target[cur] && target[j] && isEqual(target[cur], target[j]) && (target[cur] = null, cur = j);
-  }
-  return target.filter((o) => o !== null);
+  _cacheFilterModel(r, e, t) {
+    this._filterModels.has(r) || this._filterModels.set(r, /* @__PURE__ */ new Map()), this._filterModels.get(r).set(e, t);
+  }
+};
+M = gt([
+  J(0, Fe),
+  J(1, x),
+  J(2, N)
+], M);
+function Rt(i, r) {
+  for (let e = 0; e < i.length; e++) {
+    let t = e;
+    if (i[e])
+      for (let n = e + 1; n < i.length; n++)
+        i[t] && i[n] && r(i[t], i[n]) && (i[t] = null, t = n);
+  }
+  return i.filter((e) => e !== null);
 }
-__name(objectsShaker, "objectsShaker");
-function mergeSetFilterCriteria(mutations) {
-  return objectsShaker(mutations, (o1, o2) => o1.id === SetSheetsFilterCriteriaMutation.id && o2.id === SetSheetsFilterCriteriaMutation.id && o1.params.unitId === o2.params.unitId && o1.params.subUnitId === o2.params.subUnitId && o1.params.col === o2.params.col);
+function I(i) {
+  return Rt(i, (r, e) => r.id === C.id && e.id === C.id && r.params.unitId === e.params.unitId && r.params.subUnitId === e.params.subUnitId && r.params.col === e.params.col);
 }
-__name(mergeSetFilterCriteria, "mergeSetFilterCriteria");
-var __defProp$1 = Object.defineProperty, __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor, __decorateClass$1 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$1(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
-    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
-  return kind && result && __defProp$1(target, key, result), result;
-}, "__decorateClass$1"), __decorateParam$1 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$1"), _a2;
-let SheetsFilterController = (_a2 = class extends Disposable {
-  constructor(_commandService, _sheetInterceptorService, _sheetsFilterService, _univerInstanceService, _refRangeService) {
+var Ct = Object.defineProperty, pt = Object.getOwnPropertyDescriptor, Ft = (i, r, e, t) => {
+  for (var n = t > 1 ? void 0 : t ? pt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+    (o = i[s]) && (n = (t ? o(r, e, n) : o(n)) || n);
+  return t && n && Ct(r, e, n), n;
+}, P = (i, r) => (e, t) => r(e, t, i);
+let W = class extends V {
+  constructor(r, e, t, n, s) {
     super();
-    __publicField(this, "_disposableCollection", new DisposableCollection());
-    this._commandService = _commandService, this._sheetInterceptorService = _sheetInterceptorService, this._sheetsFilterService = _sheetsFilterService, this._univerInstanceService = _univerInstanceService, this._refRangeService = _refRangeService, this._initCommands(), this._initRowFilteredInterceptor(), this._initInterceptors(), this._commandExecutedListener(), this._initErrorHandling();
+    w(this, "_disposableCollection", new we());
+    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() {
     [
-      SetSheetsFilterCriteriaMutation,
-      SetSheetsFilterRangeMutation,
-      ReCalcSheetsFilterMutation,
-      RemoveSheetsFilterMutation
-    ].forEach((command) => this.disposeWithMe(this._commandService.registerCommand(command)));
+      C,
+      R,
+      L,
+      O
+    ].forEach((r) => this.disposeWithMe(this._commandService.registerCommand(r)));
   }
   _initInterceptors() {
     this.disposeWithMe(this._sheetInterceptorService.interceptCommand({
-      getMutations: /* @__PURE__ */ __name((command) => this._getUpdateFilter(command), "getMutations")
-    })), this.disposeWithMe(this._commandService.onCommandExecuted((commandInfo) => {
-      if (commandInfo.id === SetWorksheetActiveOperation.id) {
-        const params = commandInfo.params, sheetId = params.subUnitId, unitId = params.unitId;
-        if (!sheetId || !unitId)
+      getMutations: (r) => this._getUpdateFilter(r)
+    })), this.disposeWithMe(this._commandService.onCommandExecuted((r) => {
+      if (r.id === Pe.id) {
+        const e = r.params, t = e.subUnitId, n = e.unitId;
+        if (!t || !n)
           return;
-        this._registerRefRange(unitId, sheetId);
+        this._registerRefRange(n, t);
       }
-      if (commandInfo.id === SetSheetsFilterRangeMutation.id) {
-        const params = commandInfo.params, sheetId = params.subUnitId, unitId = params.unitId;
-        if (!sheetId || !unitId)
+      if (r.id === R.id) {
+        const e = r.params, t = e.subUnitId, n = e.unitId;
+        if (!t || !n)
           return;
-        this._registerRefRange(params.unitId, params.subUnitId);
+        this._registerRefRange(e.unitId, e.subUnitId);
       }
-    })), this.disposeWithMe(this._sheetsFilterService.loadedUnitId$.subscribe((unitId) => {
-      if (unitId) {
-        const workbook = this._univerInstanceService.getUniverSheetInstance(unitId), sheet = workbook == null ? void 0 : workbook.getActiveSheet();
-        sheet && this._registerRefRange(unitId, sheet.getSheetId());
+    })), this.disposeWithMe(this._sheetsFilterService.loadedUnitId$.subscribe((r) => {
+      if (r) {
+        const e = this._univerInstanceService.getUniverSheetInstance(r), t = e == null ? void 0 : e.getActiveSheet();
+        t && this._registerRefRange(r, t.getSheetId());
       }
     }));
   }
-  _registerRefRange(unitId, subUnitId) {
-    var _a4;
+  _registerRefRange(r, e) {
+    var l;
     this._disposableCollection.dispose();
-    const workbook = this._univerInstanceService.getUniverSheetInstance(unitId), workSheet = workbook == null ? void 0 : workbook.getSheetBySheetId(subUnitId);
-    if (!workbook || !workSheet) return;
-    const range = (_a4 = this._sheetsFilterService.getFilterModel(unitId, subUnitId)) == null ? void 0 : _a4.getRange(), handler = /* @__PURE__ */ __name((config) => {
-      switch (config.id) {
-        case InsertRowCommand.id: {
-          const params = config.params, _unitId = params.unitId || unitId, _subUnitId = params.subUnitId || subUnitId;
-          return this._handleInsertRowCommand(params, _unitId, _subUnitId);
+    const t = this._univerInstanceService.getUniverSheetInstance(r), n = t == null ? void 0 : t.getSheetBySheetId(e);
+    if (!t || !n) return;
+    const s = (l = this._sheetsFilterService.getFilterModel(r, e)) == null ? void 0 : l.getRange(), o = (a) => {
+      switch (a.id) {
+        case Qe.id: {
+          const c = a.params, h = c.unitId || r, d = c.subUnitId || e;
+          return this._handleInsertRowCommand(c, h, d);
         }
-        case InsertColCommand.id: {
-          const params = config.params, _unitId = params.unitId || unitId, _subUnitId = params.subUnitId || subUnitId;
-          return this._handleInsertColCommand(params, _unitId, _subUnitId);
+        case qe.id: {
+          const c = a.params, h = c.unitId || r, d = c.subUnitId || e;
+          return this._handleInsertColCommand(c, h, d);
         }
-        case RemoveColCommand.id: {
-          const params = config.params;
-          return this._handleRemoveColCommand(params, unitId, subUnitId);
+        case je.id: {
+          const c = a.params;
+          return this._handleRemoveColCommand(c, r, e);
         }
-        case RemoveRowCommand.id: {
-          const params = config.params;
-          return this._handleRemoveRowCommand(params, unitId, subUnitId);
+        case Ve.id: {
+          const c = a.params;
+          return this._handleRemoveRowCommand(c, r, e);
         }
-        case EffectRefRangId.MoveColsCommandId: {
-          const params = config.params;
-          return this._handleMoveColsCommand(params, unitId, subUnitId);
+        case te.MoveColsCommandId: {
+          const c = a.params;
+          return this._handleMoveColsCommand(c, r, e);
         }
-        case EffectRefRangId.MoveRowsCommandId: {
-          const params = config.params;
-          return this._handleMoveRowsCommand(params, unitId, subUnitId);
+        case te.MoveRowsCommandId: {
+          const c = a.params;
+          return this._handleMoveRowsCommand(c, r, e);
         }
-        case MoveRangeCommand.id: {
-          const params = config.params;
-          return this._handleMoveRangeCommand(params, unitId, subUnitId);
+        case We.id: {
+          const c = a.params;
+          return this._handleMoveRangeCommand(c, r, e);
         }
       }
       return { redos: [], undos: [] };
-    }, "handler");
-    range && this._disposableCollection.add(this._refRangeService.registerRefRange(range, handler, unitId, subUnitId));
-  }
-  _getUpdateFilter(command) {
-    const { id } = command;
-    switch (id) {
-      case RemoveSheetCommand.id: {
-        const params = command.params;
-        return this._handleRemoveSheetCommand(params, params.unitId, params.subUnitId);
+    };
+    s && this._disposableCollection.add(this._refRangeService.registerRefRange(s, o, r, e));
+  }
+  _getUpdateFilter(r) {
+    const { id: e } = r;
+    switch (e) {
+      case be.id: {
+        const t = r.params;
+        return this._handleRemoveSheetCommand(t, t.unitId, t.subUnitId);
       }
-      case CopySheetCommand.id: {
-        const params = command.params, { targetSubUnitId, unitId, subUnitId } = params;
-        return !unitId || !subUnitId || !targetSubUnitId ? this._handleNull() : this._handleCopySheetCommand(unitId, subUnitId, targetSubUnitId);
+      case Ue.id: {
+        const t = r.params, { targetSubUnitId: n, unitId: s, subUnitId: o } = t;
+        return !s || !o || !n ? this._handleNull() : this._handleCopySheetCommand(s, o, n);
       }
     }
     return {
@@ -631,441 +608,441 @@ let SheetsFilterController = (_a2 = class extends Disposable {
       undos: []
     };
   }
-  _handleInsertColCommand(config, unitId, subUnitId) {
-    var _a4;
-    const filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId), filterRange = (_a4 = filterModel == null ? void 0 : filterModel.getRange()) != null ? _a4 : null;
-    if (!filterModel || !filterRange)
+  _handleInsertColCommand(r, e, t) {
+    var _;
+    const n = this._sheetsFilterService.getFilterModel(e, t), s = (_ = n == null ? void 0 : n.getRange()) != null ? _ : null;
+    if (!n || !s)
       return this._handleNull();
-    const { startColumn, endColumn } = filterRange, { startColumn: insertStartColumn, endColumn: insertEndColumn } = config.range, count = insertEndColumn - insertStartColumn + 1;
-    if (insertEndColumn > endColumn)
+    const { startColumn: o, endColumn: l } = s, { startColumn: a, endColumn: c } = r.range, h = c - a + 1;
+    if (c > l)
       return this._handleNull();
-    const redos = [], undos = [], anchor = insertStartColumn, setFilterRangeMutationParams = {
-      unitId,
-      subUnitId,
+    const d = [], u = [], m = a, g = {
+      unitId: e,
+      subUnitId: t,
       range: {
-        ...filterRange,
-        startColumn: insertStartColumn <= startColumn ? startColumn + count : startColumn,
-        endColumn: endColumn + count
+        ...s,
+        startColumn: a <= o ? o + h : o,
+        endColumn: l + h
       }
-    }, undoSetFilterRangeMutationParams = {
-      unitId,
-      subUnitId,
-      range: filterRange
+    }, p = {
+      unitId: e,
+      subUnitId: t,
+      range: s
     };
-    redos.push({ id: SetSheetsFilterRangeMutation.id, params: setFilterRangeMutationParams }), undos.push({ id: SetSheetsFilterRangeMutation.id, params: undoSetFilterRangeMutationParams });
-    const effected = filterModel.getAllFilterColumns().filter((column) => column[0] >= anchor);
-    if (effected.length !== 0) {
-      const { newRange, oldRange } = this.moveCriteria(unitId, subUnitId, effected, count);
-      redos.push(...newRange.redos, ...oldRange.redos), undos.push(...newRange.undos, ...oldRange.undos);
+    d.push({ id: R.id, params: g }), u.push({ id: R.id, params: p });
+    const F = n.getAllFilterColumns().filter((f) => f[0] >= m);
+    if (F.length !== 0) {
+      const { newRange: f, oldRange: v } = this.moveCriteria(e, t, F, h);
+      d.push(...f.redos, ...v.redos), u.push(...f.undos, ...v.undos);
     }
-    return { redos: mergeSetFilterCriteria(redos), undos: mergeSetFilterCriteria(undos) };
+    return { redos: I(d), undos: I(u) };
   }
-  _handleInsertRowCommand(config, unitId, subUnitId) {
-    var _a4;
-    const filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId), filterRange = (_a4 = filterModel == null ? void 0 : filterModel.getRange()) != null ? _a4 : null;
-    if (!filterModel || !filterRange)
+  _handleInsertRowCommand(r, e, t) {
+    var p;
+    const n = this._sheetsFilterService.getFilterModel(e, t), s = (p = n == null ? void 0 : n.getRange()) != null ? p : null;
+    if (!n || !s)
       return this._handleNull();
-    const { startRow, endRow } = filterRange, { startRow: insertStartRow, endRow: insertEndRow } = config.range, rowCount = insertEndRow - insertStartRow + 1;
-    if (insertEndRow > endRow)
+    const { startRow: o, endRow: l } = s, { startRow: a, endRow: c } = r.range, h = c - a + 1;
+    if (c > l)
       return this._handleNull();
-    const redos = [], undos = [], setFilterRangeParams = {
-      unitId,
-      subUnitId,
+    const d = [], u = [], m = {
+      unitId: e,
+      subUnitId: t,
       range: {
-        ...filterRange,
-        startRow: insertStartRow <= startRow ? startRow + rowCount : startRow,
-        endRow: endRow + rowCount
+        ...s,
+        startRow: a <= o ? o + h : o,
+        endRow: l + h
       }
-    }, undoSetFilterRangeMutationParams = {
-      unitId,
-      subUnitId,
-      range: filterRange
+    }, g = {
+      unitId: e,
+      subUnitId: t,
+      range: s
     };
-    return redos.push({ id: SetSheetsFilterRangeMutation.id, params: setFilterRangeParams }), undos.push({ id: SetSheetsFilterRangeMutation.id, params: undoSetFilterRangeMutationParams }), {
-      redos: mergeSetFilterCriteria(redos),
-      undos: mergeSetFilterCriteria(undos)
+    return d.push({ id: R.id, params: m }), u.push({ id: R.id, params: g }), {
+      redos: I(d),
+      undos: I(u)
     };
   }
-  _handleRemoveColCommand(config, unitId, subUnitId) {
-    var _a4;
-    const filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId), filterRange = (_a4 = filterModel == null ? void 0 : filterModel.getRange()) != null ? _a4 : null;
-    if (!filterModel || !filterRange)
+  _handleRemoveColCommand(r, e, t) {
+    var F;
+    const n = this._sheetsFilterService.getFilterModel(e, t), s = (F = n == null ? void 0 : n.getRange()) != null ? F : null;
+    if (!n || !s)
       return this._handleNull();
-    const { startColumn, endColumn } = filterRange, { startColumn: removeStartColumn, endColumn: removeEndColumn } = config.range;
-    if (removeStartColumn > endColumn)
+    const { startColumn: o, endColumn: l } = s, { startColumn: a, endColumn: c } = r.range;
+    if (a > l)
       return this._handleNull();
-    const redos = [], undos = [], rangeRemoveCount = removeEndColumn < startColumn ? 0 : Math.min(removeEndColumn, endColumn) - Math.max(removeStartColumn, startColumn) + 1, removeCount = removeEndColumn - removeStartColumn + 1, filterColumn = filterModel.getAllFilterColumns();
-    filterColumn.forEach((column) => {
-      const [col, filter2] = column;
-      col <= removeEndColumn && col >= removeStartColumn && (redos.push({ id: SetSheetsFilterCriteriaMutation.id, params: { unitId, subUnitId, col, criteria: null } }), undos.push({ id: SetSheetsFilterCriteriaMutation.id, params: { unitId, subUnitId, col, criteria: { ...filter2.serialize(), colId: col } } }));
+    const h = [], d = [], u = c < o ? 0 : Math.min(c, l) - Math.max(a, o) + 1, m = c - a + 1, g = n.getAllFilterColumns();
+    g.forEach((_) => {
+      const [f, v] = _;
+      f <= c && f >= a && (h.push({ id: C.id, params: { unitId: e, subUnitId: t, col: f, criteria: null } }), d.push({ id: C.id, params: { unitId: e, subUnitId: t, col: f, criteria: { ...v.serialize(), colId: f } } }));
     });
-    const shifted = filterColumn.filter((column) => {
-      const [col, _] = column;
-      return col > removeEndColumn;
+    const p = g.filter((_) => {
+      const [f, v] = _;
+      return f > c;
     });
-    let newRangeCriteria = { undos: [], redos: [] };
-    if (shifted.length > 0) {
-      const { oldRange, newRange } = this.moveCriteria(unitId, subUnitId, shifted, -removeCount);
-      newRangeCriteria = newRange, redos.push(...oldRange.redos), undos.unshift(...oldRange.undos);
+    let S = { undos: [], redos: [] };
+    if (p.length > 0) {
+      const { oldRange: _, newRange: f } = this.moveCriteria(e, t, p, -m);
+      S = f, h.push(..._.redos), d.unshift(..._.undos);
     }
-    if (rangeRemoveCount === endColumn - startColumn + 1) {
-      const removeFilterRangeMutationParams = {
-        unitId,
-        subUnitId
+    if (u === l - o + 1) {
+      const _ = {
+        unitId: e,
+        subUnitId: t
       };
-      redos.push({ id: RemoveSheetsFilterMutation.id, params: removeFilterRangeMutationParams }), undos.unshift({ id: SetSheetsFilterRangeMutation.id, params: { range: filterRange, unitId, subUnitId } });
+      h.push({ id: O.id, params: _ }), d.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
     } else {
-      const newStartColumn = startColumn <= removeStartColumn ? startColumn : rangeRemoveCount === 0 ? startColumn - removeCount : removeStartColumn, newEndColumn = startColumn <= removeStartColumn ? endColumn - rangeRemoveCount : endColumn - removeCount, setFilterRangeMutationParams = {
-        unitId,
-        subUnitId,
-        range: { ...filterRange, startColumn: newStartColumn, endColumn: newEndColumn }
+      const _ = o <= a ? o : u === 0 ? o - m : a, f = o <= a ? l - u : l - m, v = {
+        unitId: e,
+        subUnitId: t,
+        range: { ...s, startColumn: _, endColumn: f }
       };
-      redos.push({ id: SetSheetsFilterRangeMutation.id, params: setFilterRangeMutationParams }), undos.unshift({ id: SetSheetsFilterRangeMutation.id, params: { range: filterRange, unitId, subUnitId } }), redos.push(...newRangeCriteria.redos), undos.unshift(...newRangeCriteria.undos);
+      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);
     }
     return {
-      undos,
-      redos
+      undos: d,
+      redos: h
     };
   }
-  _handleRemoveRowCommand(config, unitId, subUnitId) {
-    var _a4;
-    const filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId);
-    if (!filterModel)
+  _handleRemoveRowCommand(r, e, t) {
+    var p;
+    const n = this._sheetsFilterService.getFilterModel(e, t);
+    if (!n)
       return this._handleNull();
-    const filterRange = filterModel.getRange(), { startRow, endRow } = filterRange, { startRow: removeStartRow, endRow: removeEndRow } = config.range;
-    if (removeStartRow > endRow)
+    const s = n.getRange(), { startRow: o, endRow: l } = s, { startRow: a, endRow: c } = r.range;
+    if (a > l)
       return this._handleNull();
-    if (removeEndRow < startRow)
+    if (c < o)
       return {
-        undos: [{ id: SetSheetsFilterRangeMutation.id, params: { range: filterRange, unitId, subUnitId } }],
+        undos: [{ id: R.id, params: { range: s, unitId: e, subUnitId: t } }],
         redos: [{
-          id: SetSheetsFilterRangeMutation.id,
+          id: R.id,
           params: {
             range: {
-              ...filterRange,
-              startRow: startRow - (removeEndRow - removeStartRow + 1),
-              endRow: endRow - (removeEndRow - removeStartRow + 1)
+              ...s,
+              startRow: o - (c - a + 1),
+              endRow: l - (c - a + 1)
             },
-            unitId,
-            subUnitId
+            unitId: e,
+            subUnitId: t
           }
         }]
       };
-    const redos = [], undos = [], filterColumn = filterModel.getAllFilterColumns(), filterHeaderIsRemoved = startRow <= removeEndRow && startRow >= removeStartRow;
-    undos.push({ id: SetSheetsFilterRangeMutation.id, params: { range: filterRange, unitId, subUnitId } });
-    const count = Math.min(removeEndRow, endRow) - Math.max(removeStartRow, startRow) + 1;
-    if (count === endRow - startRow + 1 || filterHeaderIsRemoved) {
-      const removeFilterRangeMutationParams = {
-        unitId,
-        subUnitId
+    const h = [], d = [], u = n.getAllFilterColumns(), m = o <= c && o >= a;
+    d.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 || m) {
+      const S = {
+        unitId: e,
+        subUnitId: t
       };
-      redos.push({ id: RemoveSheetsFilterMutation.id, params: removeFilterRangeMutationParams }), filterColumn.forEach((column) => {
-        const [offset, filter2] = column, setCriteriaMutationParams = {
-          unitId,
-          subUnitId,
-          col: offset,
-          criteria: { ...filter2.serialize(), colId: offset }
+      h.push({ id: O.id, params: S }), u.forEach((F) => {
+        const [_, f] = F, v = {
+          unitId: e,
+          subUnitId: t,
+          col: _,
+          criteria: { ...f.serialize(), colId: _ }
         };
-        undos.push({ id: SetSheetsFilterCriteriaMutation.id, params: setCriteriaMutationParams });
+        d.push({ id: C.id, params: v });
       });
     } else {
-      const worksheet = (_a4 = this._univerInstanceService.getUniverSheetInstance(unitId)) == null ? void 0 : _a4.getSheetBySheetId(subUnitId);
-      if (!worksheet)
+      const S = (p = this._univerInstanceService.getUniverSheetInstance(e)) == null ? void 0 : p.getSheetBySheetId(t);
+      if (!S)
         return this._handleNull();
-      const hiddenRows = [];
-      for (let r = removeStartRow; r <= removeEndRow; r++)
-        worksheet.getRowFiltered(r) && hiddenRows.push(r);
-      const afterStartRow = Math.min(startRow, removeStartRow), afterEndRow = afterStartRow + (endRow - startRow) - count + hiddenRows.length, setFilterRangeMutationParams = {
-        unitId,
-        subUnitId,
+      const F = [];
+      for (let y = a; y <= c; y++)
+        S.getRowFiltered(y) && F.push(y);
+      const _ = Math.min(o, a), f = _ + (l - o) - g + F.length, v = {
+        unitId: e,
+        subUnitId: t,
         range: {
-          ...filterRange,
-          startRow: afterStartRow,
-          endRow: afterEndRow
+          ...s,
+          startRow: _,
+          endRow: f
         }
       };
-      redos.push({ id: SetSheetsFilterRangeMutation.id, params: setFilterRangeMutationParams });
+      h.push({ id: R.id, params: v });
     }
     return {
-      undos: mergeSetFilterCriteria(undos),
-      redos: mergeSetFilterCriteria(redos)
+      undos: I(d),
+      redos: I(h)
     };
   }
   // eslint-disable-next-line max-lines-per-function
-  _handleMoveColsCommand(config, unitId, subUnitId) {
-    var _a4;
-    const filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId), filterRange = (_a4 = filterModel == null ? void 0 : filterModel.getRange()) != null ? _a4 : null;
-    if (!filterModel || !filterRange)
+  _handleMoveColsCommand(r, e, t) {
+    var _;
+    const n = this._sheetsFilterService.getFilterModel(e, t), s = (_ = n == null ? void 0 : n.getRange()) != null ? _ : null;
+    if (!n || !s)
       return this._handleNull();
-    const { startColumn, endColumn } = filterRange, { fromRange, toRange } = config;
-    if (fromRange.endColumn < startColumn && toRange.startColumn <= startColumn || fromRange.startColumn > endColumn && toRange.endColumn > endColumn)
+    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 redos = [], undos = [], filterCol = {};
-    for (let col = startColumn; col <= endColumn; col++)
-      filterCol[col] = {
-        colIndex: col,
-        filter: filterModel.getFilterColumn(col)
+    const h = [], d = [], u = {};
+    for (let f = o; f <= l; f++)
+      u[f] = {
+        colIndex: f,
+        filter: n.getFilterColumn(f)
       };
-    moveMatrixArray(fromRange.startColumn, fromRange.endColumn - fromRange.startColumn + 1, toRange.startColumn, filterCol);
-    let startBorder = filterRange.startColumn, endBorder = filterRange.endColumn;
-    startColumn >= fromRange.startColumn && startColumn <= fromRange.endColumn && toRange.startColumn > fromRange.startColumn && fromRange.endColumn < endColumn && (startBorder = fromRange.endColumn + 1), endColumn >= fromRange.startColumn && endColumn <= fromRange.endColumn && toRange.startColumn < fromRange.startColumn && fromRange.startColumn > startColumn && (endBorder = fromRange.startColumn - 1);
-    const numberCols = Object.keys(filterCol).map((col) => Number(col)), newEnd = numberCols.find((col) => filterCol[col].colIndex === endBorder), newStart = numberCols.find((col) => filterCol[col].colIndex === startBorder);
-    if (numberCols.forEach((col) => {
-      var _a5, _b;
-      const { colIndex: oldColIndex, filter: filter2 } = filterCol[col], newColIndex = col;
-      if (filter2) {
-        if (newColIndex >= newStart && newColIndex <= newEnd) {
-          const setCriteriaMutationParams = {
-            unitId,
-            subUnitId,
-            col: newColIndex,
-            criteria: { ...filter2.serialize(), colId: newColIndex }
-          }, undoSetCriteriaMutationParams = {
-            unitId,
-            subUnitId,
-            col: newColIndex,
-            criteria: filterModel.getFilterColumn(newColIndex) ? { ...(_a5 = filterModel.getFilterColumn(newColIndex)) == null ? void 0 : _a5.serialize(), colId: newColIndex } : null
+    ee(a.startColumn, a.endColumn - a.startColumn + 1, c.startColumn, u);
+    let m = s.startColumn, g = s.endColumn;
+    o >= a.startColumn && o <= a.endColumn && c.startColumn > a.startColumn && a.endColumn < l && (m = a.endColumn + 1), l >= a.startColumn && l <= a.endColumn && c.startColumn < a.startColumn && a.startColumn > o && (g = a.startColumn - 1);
+    const p = Object.keys(u).map((f) => Number(f)), S = p.find((f) => u[f].colIndex === g), F = p.find((f) => u[f].colIndex === m);
+    if (p.forEach((f) => {
+      var X, Z;
+      const { colIndex: v, filter: y } = u[f], A = f;
+      if (y) {
+        if (A >= F && A <= S) {
+          const q = {
+            unitId: e,
+            subUnitId: t,
+            col: A,
+            criteria: { ...y.serialize(), colId: A }
+          }, me = {
+            unitId: e,
+            subUnitId: t,
+            col: A,
+            criteria: n.getFilterColumn(A) ? { ...(X = n.getFilterColumn(A)) == null ? void 0 : X.serialize(), colId: A } : null
           };
-          redos.push({ id: SetSheetsFilterCriteriaMutation.id, params: setCriteriaMutationParams }), undos.push({ id: SetSheetsFilterCriteriaMutation.id, params: undoSetCriteriaMutationParams });
+          h.push({ id: C.id, params: q }), d.push({ id: C.id, params: me });
         }
-        if (!((_b = filterCol[oldColIndex]) != null && _b.filter)) {
-          const setCriteriaMutationParams = {
-            unitId,
-            subUnitId,
-            col: oldColIndex,
+        if (!((Z = u[v]) != null && Z.filter)) {
+          const q = {
+            unitId: e,
+            subUnitId: t,
+            col: v,
             criteria: null
           };
-          redos.push({ id: SetSheetsFilterCriteriaMutation.id, params: setCriteriaMutationParams }), undos.push({ id: SetSheetsFilterCriteriaMutation.id, params: { unitId, subUnitId, col: oldColIndex, criteria: { ...filter2.serialize(), colId: oldColIndex } } });
+          h.push({ id: C.id, params: q }), d.push({ id: C.id, params: { unitId: e, subUnitId: t, col: v, criteria: { ...y.serialize(), colId: v } } });
         }
       }
-    }), startColumn !== newStart || endColumn !== newEnd) {
-      const setFilterRangeMutationParams = {
-        unitId,
-        subUnitId,
+    }), o !== F || l !== S) {
+      const f = {
+        unitId: e,
+        subUnitId: t,
         range: {
-          ...filterRange,
-          startColumn: newStart,
-          endColumn: newEnd
+          ...s,
+          startColumn: F,
+          endColumn: S
         }
       };
-      redos.unshift({ id: SetSheetsFilterRangeMutation.id, params: setFilterRangeMutationParams }), undos.unshift({ id: SetSheetsFilterRangeMutation.id, params: { range: filterRange, unitId, subUnitId } });
+      h.unshift({ id: R.id, params: f }), d.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
     }
     return {
-      undos,
-      redos
+      undos: d,
+      redos: h
     };
   }
-  _handleMoveRowsCommand(config, unitId, subUnitId) {
-    var _a4;
-    const filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId), filterRange = (_a4 = filterModel == null ? void 0 : filterModel.getRange()) != null ? _a4 : null;
-    if (!filterModel || !filterRange)
+  _handleMoveRowsCommand(r, e, t) {
+    var _;
+    const n = this._sheetsFilterService.getFilterModel(e, t), s = (_ = n == null ? void 0 : n.getRange()) != null ? _ : null;
+    if (!n || !s)
       return this._handleNull();
-    const { startRow, endRow } = filterRange, { fromRange, toRange } = config;
-    if (fromRange.endRow < startRow && toRange.startRow <= startRow || fromRange.startRow > endRow && toRange.endRow > endRow)
+    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 redos = [], undos = [], filterRow = {};
-    for (let row = startRow; row <= endRow; row++)
-      filterRow[row] = {
-        oldIndex: row
+    const h = [], d = [], u = {};
+    for (let f = o; f <= l; f++)
+      u[f] = {
+        oldIndex: f
       };
-    const startBorder = startRow;
-    let endBorder = endRow;
-    endRow >= fromRange.startRow && endRow <= fromRange.endRow && toRange.startRow < fromRange.startRow && fromRange.startRow > startRow && (endBorder = fromRange.startRow - 1), moveMatrixArray(fromRange.startRow, fromRange.endRow - fromRange.startRow + 1, toRange.startRow, filterRow);
-    const numberRows = Object.keys(filterRow).map((row) => Number(row)), newEnd = numberRows.find((row) => filterRow[row].oldIndex === endBorder), newStart = numberRows.find((row) => filterRow[row].oldIndex === startBorder);
-    if (startRow !== newStart || endRow !== newEnd) {
-      const setFilterRangeMutationParams = {
-        unitId,
-        subUnitId,
+    const m = o;
+    let g = l;
+    l >= a.startRow && l <= a.endRow && c.startRow < a.startRow && a.startRow > o && (g = a.startRow - 1), ee(a.startRow, a.endRow - a.startRow + 1, c.startRow, u);
+    const p = Object.keys(u).map((f) => Number(f)), S = p.find((f) => u[f].oldIndex === g), F = p.find((f) => u[f].oldIndex === m);
+    if (o !== F || l !== S) {
+      const f = {
+        unitId: e,
+        subUnitId: t,
         range: {
-          ...filterRange,
-          startRow: newStart,
-          endRow: newEnd
+          ...s,
+          startRow: F,
+          endRow: S
         }
       };
-      redos.push({ id: SetSheetsFilterRangeMutation.id, params: setFilterRangeMutationParams }, { id: ReCalcSheetsFilterMutation.id, params: { unitId, subUnitId } }), undos.push({ id: SetSheetsFilterRangeMutation.id, params: { range: filterRange, unitId, subUnitId } }, { id: ReCalcSheetsFilterMutation.id, params: { unitId, subUnitId } });
+      h.push({ id: R.id, params: f }, { id: L.id, params: { unitId: e, subUnitId: t } }), d.push({ id: R.id, params: { range: s, unitId: e, subUnitId: t } }, { id: L.id, params: { unitId: e, subUnitId: t } });
     }
     return {
-      redos,
-      undos
+      redos: h,
+      undos: d
     };
   }
-  _handleMoveRangeCommand(config, unitId, subUnitId) {
-    const { fromRange, toRange } = config, filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId);
-    if (!filterModel)
+  _handleMoveRangeCommand(r, e, t) {
+    const { fromRange: n, toRange: s } = r, o = this._sheetsFilterService.getFilterModel(e, t);
+    if (!o)
       return this._handleNull();
-    const filterRange = filterModel.getRange();
-    if (!filterRange)
+    const l = o.getRange();
+    if (!l)
       return this._handleNull();
-    const redos = [], undos = [];
-    if (Rectangle.contains(fromRange, filterRange)) {
-      const rowOffset = filterRange.startRow - fromRange.startRow, colOffset = filterRange.startColumn - fromRange.startColumn, newFilterRange = {
-        startRow: toRange.startRow + rowOffset,
-        startColumn: toRange.startColumn + colOffset,
-        endRow: toRange.startRow + rowOffset + (filterRange.endRow - filterRange.startRow),
-        endColumn: toRange.startColumn + colOffset + (filterRange.endColumn - filterRange.startColumn)
-      }, removeFilter = {
-        id: RemoveSheetsFilterMutation.id,
+    const a = [], c = [];
+    if (Y.contains(n, l)) {
+      const h = l.startRow - n.startRow, d = l.startColumn - n.startColumn, u = {
+        startRow: s.startRow + h,
+        startColumn: s.startColumn + d,
+        endRow: s.startRow + h + (l.endRow - l.startRow),
+        endColumn: s.startColumn + d + (l.endColumn - l.startColumn)
+      }, m = {
+        id: O.id,
         params: {
-          unitId,
-          subUnitId
+          unitId: e,
+          subUnitId: t
         }
-      }, setNewFilterRange = { id: SetSheetsFilterRangeMutation.id, params: { unitId, subUnitId, range: newFilterRange } }, setOldFilterRange = { id: SetSheetsFilterRangeMutation.id, params: { unitId, subUnitId, range: filterRange } };
-      redos.push(removeFilter, setNewFilterRange), undos.push(removeFilter, setOldFilterRange);
-      const filterColumn = filterModel.getAllFilterColumns(), moveColDelta = toRange.startColumn - fromRange.startColumn;
-      filterColumn.forEach((column) => {
-        const [col, criteria] = column;
-        criteria && (redos.push({ id: SetSheetsFilterCriteriaMutation.id, params: { unitId, subUnitId, col: col + moveColDelta, criteria: { ...criteria.serialize(), colId: col + moveColDelta } } }), undos.push({ id: SetSheetsFilterCriteriaMutation.id, params: { unitId, subUnitId, col, criteria: { ...criteria.serialize(), colId: col } } }));
+      }, g = { id: R.id, params: { unitId: e, subUnitId: t, range: u } }, p = { id: R.id, params: { unitId: e, subUnitId: t, range: l } };
+      a.push(m, g), c.push(m, p);
+      const S = o.getAllFilterColumns(), F = s.startColumn - n.startColumn;
+      S.forEach((_) => {
+        const [f, v] = _;
+        v && (a.push({ id: C.id, params: { unitId: e, subUnitId: t, col: f + F, criteria: { ...v.serialize(), colId: f + F } } }), c.push({ id: C.id, params: { unitId: e, subUnitId: t, col: f, criteria: { ...v.serialize(), colId: f } } }));
       });
-    } else if (Rectangle.intersects(toRange, filterRange)) {
-      const newFilterRange = {
-        ...filterRange,
-        endRow: Math.max(filterRange.endRow, toRange.endRow)
+    } else if (Y.intersects(s, l)) {
+      const h = {
+        ...l,
+        endRow: Math.max(l.endRow, s.endRow)
       };
-      redos.push({ id: SetSheetsFilterRangeMutation.id, params: { unitId, subUnitId, range: newFilterRange } }), undos.push({ id: SetSheetsFilterRangeMutation.id, params: { unitId, subUnitId, range: filterRange } });
+      a.push({ id: R.id, params: { unitId: e, subUnitId: t, range: h } }), c.push({ id: R.id, params: { unitId: e, subUnitId: t, range: l } });
     }
     return {
-      redos,
-      undos
+      redos: a,
+      undos: c
     };
   }
-  _handleRemoveSheetCommand(config, unitId, subUnitId) {
-    const filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId);
-    if (!filterModel)
+  _handleRemoveSheetCommand(r, e, t) {
+    const n = this._sheetsFilterService.getFilterModel(e, t);
+    if (!n)
       return this._handleNull();
-    const filterRange = filterModel.getRange();
-    if (!filterRange)
+    const s = n.getRange();
+    if (!s)
       return this._handleNull();
-    const redos = [], undos = [];
-    return filterModel.getAllFilterColumns().forEach(([col, filter2]) => {
-      undos.push({ id: SetSheetsFilterCriteriaMutation.id, params: { unitId, subUnitId, col, criteria: { ...filter2.serialize(), colId: col } } });
-    }), redos.push({ id: RemoveSheetsFilterMutation.id, params: { unitId, subUnitId, range: filterRange } }), undos.unshift({ id: SetSheetsFilterRangeMutation.id, params: { range: filterRange, unitId, subUnitId } }), {
-      undos,
-      redos
+    const o = [], l = [];
+    return n.getAllFilterColumns().forEach(([c, h]) => {
+      l.push({ id: C.id, params: { unitId: e, subUnitId: t, col: c, criteria: { ...h.serialize(), colId: c } } });
+    }), o.push({ id: O.id, params: { unitId: e, subUnitId: t, range: s } }), l.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } }), {
+      undos: l,
+      redos: o
     };
   }
-  _handleCopySheetCommand(unitId, subUnitId, targetSubUnitId) {
-    const filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId);
-    if (!filterModel)
+  _handleCopySheetCommand(r, e, t) {
+    const n = this._sheetsFilterService.getFilterModel(r, e);
+    if (!n)
       return this._handleNull();
-    const filterRange = filterModel.getRange();
-    if (!filterRange)
+    const s = n.getRange();
+    if (!s)
       return this._handleNull();
-    const redos = [], undos = [], preUndos = [], preRedos = [];
-    return filterModel.getAllFilterColumns().forEach(([col, filter2]) => {
-      redos.push({ id: SetSheetsFilterCriteriaMutation.id, params: { unitId, subUnitId: targetSubUnitId, col, criteria: { ...filter2.serialize(), colId: col } } }), preUndos.push({ id: SetSheetsFilterCriteriaMutation.id, params: { unitId, subUnitId: targetSubUnitId, col, criteria: null } });
-    }), preUndos.push({ id: RemoveSheetsFilterMutation.id, params: { unitId, subUnitId: targetSubUnitId, range: filterRange } }), redos.unshift({ id: SetSheetsFilterRangeMutation.id, params: { range: filterRange, unitId, subUnitId: targetSubUnitId } }), {
-      undos,
-      redos,
-      preUndos,
-      preRedos
+    const o = [], l = [], a = [], c = [];
+    return n.getAllFilterColumns().forEach(([d, u]) => {
+      o.push({ id: C.id, params: { unitId: r, subUnitId: t, col: d, criteria: { ...u.serialize(), colId: d } } }), a.push({ id: C.id, params: { unitId: r, subUnitId: t, col: d, criteria: null } });
+    }), a.push({ id: O.id, params: { unitId: r, subUnitId: t, range: s } }), o.unshift({ id: R.id, params: { range: s, unitId: r, subUnitId: t } }), {
+      undos: l,
+      redos: o,
+      preUndos: a,
+      preRedos: c
     };
   }
   _handleNull() {
     return { redos: [], undos: [] };
   }
   _initRowFilteredInterceptor() {
-    this.disposeWithMe(this._sheetInterceptorService.intercept(INTERCEPTOR_POINT.ROW_FILTERED, {
+    this.disposeWithMe(this._sheetInterceptorService.intercept(Le.ROW_FILTERED, {
       // sheet-interceptor.service.ts
-      handler: /* @__PURE__ */ __name((filtered, rowLocation) => {
-        var _a4, _b;
-        return filtered ? !0 : (_b = (_a4 = this._sheetsFilterService.getFilterModel(
-          rowLocation.unitId,
-          rowLocation.subUnitId
-        )) == null ? void 0 : _a4.isRowFiltered(rowLocation.row)) != null ? _b : !1;
-      }, "handler")
+      handler: (r, e) => {
+        var t, n;
+        return r ? !0 : (n = (t = this._sheetsFilterService.getFilterModel(
+          e.unitId,
+          e.subUnitId
+        )) == null ? void 0 : t.isRowFiltered(e.row)) != null ? n : !1;
+      }
     }));
   }
-  moveCriteria(unitId, subUnitId, target, step) {
-    const defaultSetCriteriaMutationParams = {
-      unitId,
-      subUnitId,
+  moveCriteria(r, e, t, n) {
+    const s = {
+      unitId: r,
+      subUnitId: e,
       criteria: null,
       col: -1
-    }, oldUndos = [], oldRedos = [], newUndos = [], newRedos = [];
-    return target.forEach((column) => {
-      const [offset, filter2] = column;
-      oldRedos.push({
-        id: SetSheetsFilterCriteriaMutation.id,
+    }, o = [], l = [], a = [], c = [];
+    return t.forEach((h) => {
+      const [d, u] = h;
+      l.push({
+        id: C.id,
         params: {
-          ...defaultSetCriteriaMutationParams,
-          col: offset
+          ...s,
+          col: d
         }
-      }), oldUndos.push({
-        id: SetSheetsFilterCriteriaMutation.id,
+      }), o.push({
+        id: C.id,
         params: {
-          ...defaultSetCriteriaMutationParams,
-          col: offset,
-          criteria: { ...filter2.serialize(), colId: offset }
+          ...s,
+          col: d,
+          criteria: { ...u.serialize(), colId: d }
         }
       });
-    }), target.forEach((column) => {
-      const [offset, filter2] = column;
-      newRedos.push({
-        id: SetSheetsFilterCriteriaMutation.id,
+    }), t.forEach((h) => {
+      const [d, u] = h;
+      c.push({
+        id: C.id,
         params: {
-          ...defaultSetCriteriaMutationParams,
-          col: offset + step,
-          criteria: { ...filter2.serialize(), colId: offset + step }
+          ...s,
+          col: d + n,
+          criteria: { ...u.serialize(), colId: d + n }
         }
-      }), newUndos.push({
-        id: SetSheetsFilterCriteriaMutation.id,
+      }), a.push({
+        id: C.id,
         params: {
-          ...defaultSetCriteriaMutationParams,
-          col: offset + step,
+          ...s,
+          col: d + n,
           criteria: null
         }
       });
     }), {
       newRange: {
-        redos: newRedos,
-        undos: newUndos
+        redos: c,
+        undos: a
       },
       oldRange: {
-        redos: oldRedos,
-        undos: oldUndos
+        redos: l,
+        undos: o
       }
     };
   }
   _commandExecutedListener() {
-    this.disposeWithMe(this._commandService.onCommandExecuted((command, options) => {
-      var _a4, _b;
-      const { unitId, subUnitId } = command.params || {}, filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId);
-      if (!filterModel) return;
-      const filteredOutRows = Array.from(filterModel.filteredOutRows).sort((a, b) => a - b), newFilteredOutRows = [];
-      let changed = !1;
-      if (command.id === RemoveRowMutation.id) {
-        const { startRow, endRow } = command.params.range, filterOutInRemove = filteredOutRows.filter((row) => row >= startRow && row <= endRow);
-        filteredOutRows.forEach((row) => {
-          if (row < startRow)
-            newFilteredOutRows.push(row);
-          else if (changed = !0, row <= endRow) {
-            const newIndex = Math.max(startRow, newFilteredOutRows.length ? newFilteredOutRows[newFilteredOutRows.length - 1] + 1 : startRow);
-            newFilteredOutRows.push(newIndex);
+    this.disposeWithMe(this._commandService.onCommandExecuted((r, e) => {
+      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 = [];
+      let a = !1;
+      if (r.id === Be.id) {
+        const { startRow: d, endRow: u } = r.params.range, m = o.filter((g) => g >= d && g <= u);
+        o.forEach((g) => {
+          if (g < d)
+            l.push(g);
+          else if (a = !0, g <= u) {
+            const p = Math.max(d, l.length ? l[l.length - 1] + 1 : d);
+            l.push(p);
           } else
-            newFilteredOutRows.push(row - (endRow - startRow + 1 - filterOutInRemove.length));
+            l.push(g - (u - d + 1 - m.length));
         });
       }
-      if (command.id === InsertRowMutation.id) {
-        const { startRow, endRow } = command.params.range;
-        filteredOutRows.forEach((row) => {
-          row >= startRow ? (changed = !0, newFilteredOutRows.push(row + (endRow - startRow + 1))) : newFilteredOutRows.push(row);
+      if (r.id === ze.id) {
+        const { startRow: d, endRow: u } = r.params.range;
+        o.forEach((m) => {
+          m >= d ? (a = !0, l.push(m + (u - d + 1))) : l.push(m);
         });
       }
-      if (changed && (filterModel.filteredOutRows = new Set(newFilteredOutRows)), command.id === SetRangeValuesMutation.id && !(options != null && options.onlyLocal)) {
-        const extendRegion = this._getExtendRegion(unitId, subUnitId);
-        if (extendRegion) {
-          const cellValue = command.params.cellValue;
-          if (cellValue)
-            for (let col = extendRegion.startColumn; col <= extendRegion.endColumn; col++) {
-              const cell = (_a4 = cellValue == null ? void 0 : cellValue[extendRegion.startRow]) == null ? void 0 : _a4[col];
-              if (cell && this._cellHasValue(cell)) {
-                const worksheet = (_b = this._univerInstanceService.getUnit(unitId)) == null ? void 0 : _b.getSheetBySheetId(subUnitId);
-                if (worksheet) {
-                  const extendedRange = expandToContinuousRange(extendRegion, { down: !0 }, worksheet), filterModel2 = this._sheetsFilterService.getFilterModel(unitId, subUnitId), filterRange = filterModel2.getRange();
-                  filterModel2.setRange({
-                    ...filterRange,
-                    endRow: extendedRange.endRow
-                  }), this._registerRefRange(unitId, subUnitId);
+      if (a && (s.filteredOutRows = new Set(l)), r.id === He.id && !(e != null && e.onlyLocal)) {
+        const d = this._getExtendRegion(t, n);
+        if (d) {
+          const u = r.params.cellValue;
+          if (u)
+            for (let m = d.startColumn; m <= d.endColumn; m++) {
+              const g = (c = u == null ? void 0 : u[d.startRow]) == null ? void 0 : c[m];
+              if (g && this._cellHasValue(g)) {
+                const p = (h = this._univerInstanceService.getUnit(t)) == null ? void 0 : h.getSheetBySheetId(n);
+                if (p) {
+                  const S = le(d, { down: !0 }, p), F = this._sheetsFilterService.getFilterModel(t, n), _ = F.getRange();
+                  F.setRange({
+                    ..._,
+                    endRow: S.endRow
+                  }), this._registerRefRange(t, n);
                 }
               }
             }
@@ -1073,94 +1050,263 @@ let SheetsFilterController = (_a2 = class extends Disposable {
       }
     }));
   }
-  _getExtendRegion(unitId, subUnitId) {
-    var _a4;
-    const filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId);
-    if (!filterModel)
+  _getExtendRegion(r, e) {
+    var a;
+    const t = this._sheetsFilterService.getFilterModel(r, e);
+    if (!t)
       return null;
-    const worksheet = (_a4 = this._univerInstanceService.getUnit(unitId)) == null ? void 0 : _a4.getSheetBySheetId(subUnitId);
-    if (!worksheet)
+    const n = (a = this._univerInstanceService.getUnit(r)) == null ? void 0 : a.getSheetBySheetId(e);
+    if (!n)
       return null;
-    const filterRange = filterModel.getRange();
-    if (!filterRange)
+    const s = t.getRange();
+    if (!s)
       return null;
-    const maxRowIndex = worksheet.getRowCount() - 1, rowManager = worksheet.getRowManager();
-    for (let row = filterRange.endRow + 1; row <= maxRowIndex; row++)
-      if (rowManager.getRowRawVisible(row))
+    const o = n.getRowCount() - 1, l = n.getRowManager();
+    for (let c = s.endRow + 1; c <= o; c++)
+      if (l.getRowRawVisible(c))
         return {
-          startRow: row,
-          endRow: row,
-          startColumn: filterRange.startColumn,
-          endColumn: filterRange.endColumn
+          startRow: c,
+          endRow: c,
+          startColumn: s.startColumn,
+          endColumn: s.endColumn
         };
     return null;
   }
   _initErrorHandling() {
-    this.disposeWithMe(this._commandService.beforeCommandExecuted((command) => {
-      const params = command.params, target = getSheetCommandTarget(this._univerInstanceService);
-      if (!target) return;
-      const { subUnitId, unitId } = target, filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId);
-      if (!filterModel) return;
-      const filterRange = filterModel.getRange();
-      if (command.id === MoveRowsCommand.id && params.fromRange.startRow <= filterRange.startRow && params.fromRange.endRow < filterRange.endRow && params.fromRange.endRow >= filterRange.startRow)
+    this.disposeWithMe(this._commandService.beforeCommandExecuted((r) => {
+      const e = r.params, t = B(this._univerInstanceService);
+      if (!t) return;
+      const { subUnitId: n, unitId: s } = t, o = this._sheetsFilterService.getFilterModel(s, n);
+      if (!o) return;
+      const l = o.getRange();
+      if (r.id === De.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");
     }));
   }
-  _cellHasValue(cell) {
-    const values = Object.values(cell);
-    return !(values.length === 0 || values.every((v) => v == null));
-  }
-}, __name(_a2, "SheetsFilterController"), _a2);
-SheetsFilterController = __decorateClass$1([
-  __decorateParam$1(0, ICommandService),
-  __decorateParam$1(1, Inject(SheetInterceptorService)),
-  __decorateParam$1(2, Inject(SheetsFilterService)),
-  __decorateParam$1(3, IUniverInstanceService),
-  __decorateParam$1(4, Inject(RefRangeService))
-], SheetsFilterController);
-const PLUGIN_CONFIG_KEY = "sheets-filter.config", defaultPluginConfig = {};
-var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __decorateClass = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
-    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
-  return kind && result && __defProp2(target, key, result), result;
-}, "__decorateClass"), __decorateParam = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam"), _a3;
-let UniverSheetsFilterPlugin = (_a3 = class extends Plugin {
-  constructor(_config = defaultPluginConfig, _injector, _configService) {
-    super(), this._config = _config, this._injector = _injector, this._configService = _configService;
-    const { ...rest } = this._config;
-    this._configService.setConfig(PLUGIN_CONFIG_KEY, rest);
+  _cellHasValue(r) {
+    const e = Object.values(r);
+    return !(e.length === 0 || e.every((t) => t == null));
+  }
+};
+W = Ft([
+  P(0, N),
+  P(1, H(Ie)),
+  P(2, H(M)),
+  P(3, x),
+  P(4, H($e))
+], W);
+const wt = "sheets-filter.config", St = {};
+var vt = Object.defineProperty, Mt = Object.getOwnPropertyDescriptor, Et = (i, r, e, t) => {
+  for (var n = t > 1 ? void 0 : t ? Mt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+    (o = i[s]) && (n = (t ? o(r, e, n) : o(n)) || n);
+  return t && n && vt(r, e, n), n;
+}, se = (i, r) => (e, t) => r(e, t, i), z;
+let oe = (z = class extends Se {
+  constructor(i = St, r, e) {
+    super(), this._config = i, this._injector = r, this._configService = e;
+    const { ...t } = this._config;
+    this._configService.setConfig(wt, t);
   }
   onStarting() {
     [
-      [SheetsFilterService],
-      [SheetsFilterController]
-    ].forEach((d) => this._injector.add(d));
+      [M],
+      [W]
+    ].forEach((i) => this._injector.add(i));
   }
   onReady() {
-    this._injector.get(SheetsFilterController);
+    this._injector.get(W);
+  }
+}, w(z, "type", U.UNIVER_SHEET), w(z, "pluginName", he), z);
+oe = Et([
+  se(1, H(ve)),
+  se(2, Me)
+], oe);
+const Ot = {
+  id: "sheet.command.set-filter-range",
+  type: E.COMMAND,
+  handler: (i, r) => {
+    const e = i.get(M), t = i.get(N), n = i.get(j), s = i.get(x), { unitId: o, subUnitId: l, range: a } = r;
+    if (!B(s, r) || e.getFilterModel(o, l)) return !1;
+    if (a.endRow === a.startRow) {
+      const m = i.get(Ee), g = i.get(Oe);
+      return m.emit(g.t("sheets-filter.command.not-valid-filter-range")), !1;
+    }
+    const d = { id: R.id, params: { unitId: o, subUnitId: l, range: a } }, u = t.syncExecuteCommand(d.id, d.params);
+    return u && n.pushUndoRedo({
+      unitID: o,
+      undoMutations: [{ id: O.id, params: { unitId: o, subUnitId: l } }],
+      redoMutations: [d]
+    }), u;
+  }
+}, yt = {
+  id: "sheet.command.remove-sheet-filter",
+  type: E.COMMAND,
+  handler: (i, r) => {
+    const e = i.get(x), t = i.get(M), n = i.get(N), s = i.get(j), o = B(e, r);
+    if (!o) return !1;
+    const { unitId: l, subUnitId: a } = o, c = t.getFilterModel(l, a);
+    if (!c) return !1;
+    const h = c == null ? void 0 : c.serialize(), d = At(l, a, h), u = n.syncExecuteCommand(O.id, { unitId: l, subUnitId: a });
+    return u && s.pushUndoRedo({
+      unitID: l,
+      undoMutations: d,
+      redoMutations: [{ id: O.id, params: { unitId: l, subUnitId: a } }]
+    }), u;
+  }
+}, Ut = {
+  id: "sheet.command.smart-toggle-filter",
+  type: E.COMMAND,
+  handler: async (i) => {
+    const r = i.get(x), e = i.get(M), t = i.get(N), n = r.getCurrentUnitForType(U.UNIVER_SHEET), s = n == null ? void 0 : n.getActiveSheet();
+    if (!s || !n) return !1;
+    const o = n.getUnitId(), l = s.getSheetId();
+    if (e.getFilterModel(o, l))
+      return t.executeCommand(yt.id, { unitId: o, subUnitId: l });
+    const h = i.get(Ge).getCurrentLastSelection();
+    if (!h) return !1;
+    const d = h.range, u = Je(h) ? le(d, { left: !0, right: !0, up: !0, down: !0 }, s) : d;
+    return t.executeCommand(Ot.id, {
+      unitId: o,
+      subUnitId: l,
+      range: u
+    });
   }
-}, __name(_a3, "UniverSheetsFilterPlugin"), __publicField(_a3, "type", UniverInstanceType.UNIVER_SHEET), __publicField(_a3, "pluginName", SHEET_FILTER_SNAPSHOT_ID), _a3);
-UniverSheetsFilterPlugin = __decorateClass([
-  __decorateParam(1, Inject(Injector)),
-  __decorateParam(2, IConfigService)
-], UniverSheetsFilterPlugin);
+}, bt = {
+  id: "sheet.command.set-filter-criteria",
+  type: E.COMMAND,
+  handler: async (i, r) => {
+    const e = i.get(M), t = i.get(N), n = i.get(j), { unitId: s, subUnitId: o, col: l, criteria: a } = r, c = e.getFilterModel(s, o);
+    if (!c) return !1;
+    const h = c.getRange();
+    if (!h || l < h.startColumn || l > h.endColumn) return !1;
+    const d = c.getFilterColumn(l), u = Tt(s, o, l, d), m = {
+      id: C.id,
+      params: {
+        unitId: s,
+        subUnitId: o,
+        col: l,
+        criteria: a
+      }
+    }, g = t.syncExecuteCommand(m.id, m.params);
+    return g && n.pushUndoRedo({
+      unitID: s,
+      undoMutations: [u],
+      redoMutations: [m]
+    }), g;
+  }
+}, Lt = {
+  id: "sheet.command.clear-filter-criteria",
+  type: E.COMMAND,
+  handler: (i, r) => {
+    const e = i.get(M), t = i.get(j), n = i.get(N), s = i.get(x), o = B(s, r);
+    if (!o) return !1;
+    const { unitId: l, subUnitId: a } = o, c = e.getFilterModel(o.unitId, o.subUnitId);
+    if (!c) return !1;
+    const h = c.serialize(), d = fe(l, a, h), u = Nt(l, a, h);
+    return ye(u, n).result ? (t.pushUndoRedo({
+      unitID: l,
+      undoMutations: d,
+      redoMutations: u
+    }), !0) : !1;
+  }
+}, Bt = {
+  id: "sheet.command.re-calc-filter",
+  type: E.COMMAND,
+  handler: (i, r) => {
+    const e = i.get(M), t = i.get(N), n = i.get(x), s = B(n, r);
+    if (!s) return !1;
+    const { unitId: o, subUnitId: l } = s;
+    return e.getFilterModel(s.unitId, s.subUnitId) ? t.executeCommand(L.id, { unitId: o, subUnitId: l }) : !1;
+  }
+};
+function At(i, r, e) {
+  const t = [], n = {
+    id: R.id,
+    params: {
+      unitId: i,
+      subUnitId: r,
+      range: e.ref
+    }
+  };
+  return t.push(n), fe(i, r, e).forEach((o) => t.push(o)), t;
+}
+function fe(i, r, e) {
+  var n;
+  const t = [];
+  return (n = e.filterColumns) == null || n.forEach((s) => {
+    const o = {
+      id: C.id,
+      params: {
+        unitId: i,
+        subUnitId: r,
+        col: s.colId,
+        criteria: s
+      }
+    };
+    t.push(o);
+  }), t;
+}
+function Nt(i, r, e) {
+  var n;
+  const t = [];
+  return (n = e.filterColumns) == null || n.forEach((s) => {
+    const o = {
+      id: C.id,
+      params: {
+        unitId: i,
+        subUnitId: r,
+        col: s.colId,
+        criteria: null
+      }
+    };
+    t.push(o);
+  }), t;
+}
+function Tt(i, r, e, t) {
+  if (!t)
+    return {
+      id: C.id,
+      params: {
+        unitId: i,
+        subUnitId: r,
+        col: e,
+        criteria: null
+      }
+    };
+  const n = t.serialize();
+  return {
+    id: C.id,
+    params: {
+      unitId: i,
+      subUnitId: r,
+      col: e,
+      criteria: n
+    }
+  };
+}
 export {
-  CustomFilterOperator,
-  FILTER_MUTATIONS,
-  FilterColumn,
-  FilterModel,
-  ReCalcSheetsFilterMutation,
-  RemoveSheetsFilterMutation,
-  SHEET_FILTER_SNAPSHOT_ID,
-  SetSheetsFilterCriteriaMutation,
-  SetSheetsFilterRangeMutation,
-  SheetsFilterService,
-  UniverSheetsFilterPlugin,
-  equals,
-  getCustomFilterFn,
-  greaterThan,
-  greaterThanOrEqualTo,
-  lessThan,
-  lessThanOrEqualTo,
-  notEquals
+  Lt as ClearSheetsFilterCriteriaCommand,
+  T as CustomFilterOperator,
+  _t as FILTER_MUTATIONS,
+  it as FilterColumn,
+  D as FilterModel,
+  Bt as ReCalcSheetsFilterCommand,
+  L as ReCalcSheetsFilterMutation,
+  yt as RemoveSheetFilterCommand,
+  O as RemoveSheetsFilterMutation,
+  he as SHEET_FILTER_SNAPSHOT_ID,
+  Ot as SetSheetFilterRangeCommand,
+  bt as SetSheetsFilterCriteriaCommand,
+  C as SetSheetsFilterCriteriaMutation,
+  R as SetSheetsFilterRangeMutation,
+  M as SheetsFilterService,
+  Ut as SmartToggleSheetsFilterCommand,
+  oe as UniverSheetsFilterPlugin,
+  ke as equals,
+  re as getCustomFilterFn,
+  Ye as greaterThan,
+  Ke as greaterThanOrEqualTo,
+  Xe as lessThan,
+  Ze as lessThanOrEqualTo,
+  ae as notEquals
 };