@univerjs/sheets-filter 0.9.1 → 0.9.2

package/lib/index.js

@@ -1,89 +1,90 @@
-var ve = Object.defineProperty;
-var Me = (i, r, e) => r in i ? ve(i, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[r] = e;
-var w = (i, r, e) => Me(i, typeof r != "symbol" ? r + "" : r, e);
-import { isNumeric as Ee, Disposable as B, Rectangle as K, mergeSets as G, Tools as te, extractPureTextFromCell as ye, CellValueType as X, UniverInstanceType as D, fromCallback as Oe, CommandType as E, IResourceManagerService as Ae, IUniverInstanceService as T, ICommandService as N, IUndoRedoService as q, sequenceExecute as Te, ErrorService as Ne, LocaleService as xe, Inject as I, Optional as Ie, DisposableCollection as $e, moveMatrixArray as re, Plugin as Pe, merge as Ue, touchDependencies as De, Injector as Le, IConfigService as Be } from "@univerjs/core";
-import { getSheetCommandTarget as b, SheetsSelectionsService as be, isSingleCellSelection as He, expandToContinuousRange as de, SheetInterceptorService as ze, RefRangeService as We, SetWorksheetActiveOperation as Ve, CopySheetCommand as je, RemoveSheetCommand as ke, INTERCEPTOR_POINT as qe, RemoveRowMutation as Qe, InsertRowMutation as Ge, SetRangeValuesMutation as Je, MoveRowsCommand as Ye, MoveRangeCommand as Ke, EffectRefRangId as ne, RemoveRowCommand as Xe, RemoveColCommand as Ze, InsertColCommand as et, InsertRowCommand as tt } from "@univerjs/sheets";
-import { BehaviorSubject as L, merge as rt, filter as nt, switchMap as it, of as st } from "rxjs";
-import { DataSyncPrimaryController as ot } from "@univerjs/rpc";
-import { IActiveDirtyManagerService as lt, ISheetRowFilteredService as at } from "@univerjs/engine-formula";
-const ue = "sheet.mutation.set-filter-range", he = "sheet.mutation.set-filter-criteria", me = "sheet.mutation.remove-filter", fe = "sheet.mutation.re-calc-filter", ge = /* @__PURE__ */ new Set([
-  ue,
-  he,
+var Ee = Object.defineProperty;
+var Oe = (i, r, e) => r in i ? Ee(i, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[r] = e;
+var S = (i, r, e) => Oe(i, typeof r != "symbol" ? r + "" : r, e);
+import { isNumeric as ye, Disposable as B, Rectangle as X, mergeSets as J, Tools as re, extractPureTextFromCell as Ae, CellValueType as Z, ColorKit as ne, UniverInstanceType as b, fromCallback as Te, CommandType as E, IResourceManagerService as Ne, IUniverInstanceService as T, ICommandService as N, IUndoRedoService as G, sequenceExecute as xe, ErrorService as Ie, LocaleService as $e, Inject as $, Optional as Ue, DisposableCollection as Le, moveMatrixArray as ie, Plugin as Pe, merge as be, touchDependencies as De, Injector as Be, IConfigService as He } from "@univerjs/core";
+import { getSheetCommandTarget as H, SheetsSelectionsService as ze, isSingleCellSelection as Ve, expandToContinuousRange as he, SheetInterceptorService as We, RefRangeService as je, SetWorksheetActiveOperation as ke, CopySheetCommand as qe, RemoveSheetCommand as Ge, INTERCEPTOR_POINT as Qe, RemoveRowMutation as Je, InsertRowMutation as Ke, SetRangeValuesMutation as Ye, MoveRowsCommand as Xe, MoveRangeCommand as Ze, EffectRefRangId as se, RemoveRowCommand as et, RemoveColCommand as tt, InsertColCommand as rt, InsertRowCommand as nt } from "@univerjs/sheets";
+import { BehaviorSubject as D, merge as it, filter as st, switchMap as ot, of as lt } from "rxjs";
+import { COLOR_BLACK_RGB as at } from "@univerjs/engine-render";
+import { DataSyncPrimaryController as ct } from "@univerjs/rpc";
+import { IActiveDirtyManagerService as ut, ISheetRowFilteredService as dt } from "@univerjs/engine-formula";
+const fe = "sheet.mutation.set-filter-range", me = "sheet.mutation.set-filter-criteria", ge = "sheet.mutation.remove-filter", _e = "sheet.mutation.re-calc-filter", Re = /* @__PURE__ */ new Set([
+  fe,
   me,
-  fe
+  ge,
+  _e
 ]);
-var x = /* @__PURE__ */ ((i) => (i.EQUAL = "equal", i.GREATER_THAN = "greaterThan", i.GREATER_THAN_OR_EQUAL = "greaterThanOrEqual", i.LESS_THAN = "lessThan", i.LESS_THAN_OR_EQUAL = "lessThanOrEqual", i.NOT_EQUALS = "notEqual", i))(x || {});
-const ct = {
+var I = /* @__PURE__ */ ((i) => (i[i.VALUES = 0] = "VALUES", i[i.COLORS = 1] = "COLORS", i[i.CONDITIONS = 2] = "CONDITIONS", i))(I || {}), x = /* @__PURE__ */ ((i) => (i.EQUAL = "equal", i.GREATER_THAN = "greaterThan", i.GREATER_THAN_OR_EQUAL = "greaterThanOrEqual", i.LESS_THAN = "lessThan", i.LESS_THAN_OR_EQUAL = "lessThanOrEqual", i.NOT_EQUALS = "notEqual", i))(x || {});
+const ht = {
   operator: x.GREATER_THAN,
-  fn: (i, r) => U(i) ? i > r : !1
-}, dt = {
+  fn: (i, r) => P(i) ? i > r : !1
+}, ft = {
   operator: x.GREATER_THAN_OR_EQUAL,
-  fn: (i, r) => U(i) ? i >= r : !1
-}, ut = {
+  fn: (i, r) => P(i) ? i >= r : !1
+}, mt = {
   operator: x.LESS_THAN,
-  fn: (i, r) => U(i) ? i < r : !1
-}, ht = {
+  fn: (i, r) => P(i) ? i < r : !1
+}, gt = {
   operator: x.LESS_THAN_OR_EQUAL,
-  fn: (i, r) => U(i) ? i <= r : !1
-}, mt = {
+  fn: (i, r) => P(i) ? i <= r : !1
+}, _t = {
   operator: x.EQUAL,
-  fn: (i, r) => U(i) ? i === r : !1
-}, _e = {
+  fn: (i, r) => P(i) ? i === r : !1
+}, Ce = {
   operator: x.NOT_EQUALS,
   fn: (i, r) => {
     if (typeof r == "string") {
       if (r === " ")
         return i != null;
-      const e = Ce(i);
-      return e && Rt(r) ? !pe(r).test(e) : e !== r;
+      const e = Fe(i);
+      return e && Ft(r) ? !Se(r).test(e) : e !== r;
     }
-    return U(i) ? i !== r : !0;
+    return P(i) ? i !== r : !0;
   }
-}, Re = /* @__PURE__ */ new Map([]), ft = [ct, dt, ut, ht, mt, _e];
-ft.forEach((i) => {
-  Re.set(i.operator, i);
+}, pe = /* @__PURE__ */ new Map([]), Rt = [ht, ft, mt, gt, _t, Ce];
+Rt.forEach((i) => {
+  pe.set(i.operator, i);
 });
-function gt(i) {
+function Ct(i) {
   return !!i;
 }
-const _t = {
+const pt = {
   fn: (i, r) => {
-    const e = Ce(i);
-    return e === null ? r === "" : pe(r).test(e);
+    const e = Fe(i);
+    return e === null ? r === "" : Se(r).test(e);
   }
 };
-function ie(i) {
-  return i ? Re.get(i) : _t;
+function oe(i) {
+  return i ? pe.get(i) : pt;
 }
-function U(i) {
+function P(i) {
   return typeof i == "number";
 }
-function se(i) {
-  return !!(typeof i == "number" || typeof i == "string" && Ee(i));
+function le(i) {
+  return !!(typeof i == "number" || typeof i == "string" && ye(i));
 }
-function Ce(i) {
+function Fe(i) {
   return typeof i == "boolean" || i == null ? null : typeof i == "string" ? i : i.toString();
 }
-function Rt(i) {
+function Ft(i) {
   return typeof i == "number" ? !1 : i.indexOf("*") !== -1 || i.indexOf("?") !== -1;
 }
-function pe(i) {
+function Se(i) {
   const r = i.replace(/[.+^${}()|[\]\\]/g, "\\$&").replaceAll("?", ".").replace(/[*]/g, ".$&");
   return new RegExp(`^${r}$`);
 }
-const J = () => /* @__PURE__ */ new Set();
-class V extends B {
+const K = () => /* @__PURE__ */ new Set();
+class j extends B {
   constructor(e, t, n) {
     super();
-    w(this, "_filteredOutRows$", new L(J()));
+    S(this, "_filteredOutRows$", new D(K()));
     /** An observable value. A set of filtered out rows. */
-    w(this, "filteredOutRows$", this._filteredOutRows$.asObservable());
+    S(this, "filteredOutRows$", this._filteredOutRows$.asObservable());
     // TODO: we may need to update which cols have criteria rather than simple boolean
-    w(this, "_hasCriteria$", new L(!1));
-    w(this, "hasCriteria$", this._hasCriteria$.asObservable());
-    w(this, "_filterColumnByIndex", /* @__PURE__ */ new Map());
-    w(this, "_alreadyFilteredOutRows", J());
-    w(this, "_range");
+    S(this, "_hasCriteria$", new D(!1));
+    S(this, "hasCriteria$", this._hasCriteria$.asObservable());
+    S(this, "_filterColumnByIndex", /* @__PURE__ */ new Map());
+    S(this, "_alreadyFilteredOutRows", K());
+    S(this, "_range");
     this.unitId = e, this.subUnitId = t, this._worksheet = n;
   }
   get filteredOutRows() {
@@ -100,7 +101,7 @@ class V extends B {
    */
   serialize() {
     const e = {
-      ref: K.clone(this._range),
+      ref: X.clone(this._range),
       filterColumns: this._getAllFilterColumns(!0).sort(([t], [n]) => t - n).map(([t, n]) => n.serialize())
     };
     return this._alreadyFilteredOutRows && (e.cachedFilteredOut = Array.from(this._alreadyFilteredOutRows).sort()), e;
@@ -113,7 +114,7 @@ class V extends B {
    * @param autoFilter auto filter data
    */
   static deserialize(e, t, n, s) {
-    const o = new V(e, t, n);
+    const o = new j(e, t, n);
     return o._dump(s), o;
   }
   _dump(e) {
@@ -136,7 +137,7 @@ class V extends B {
   getFilteredOutRowsExceptCol(e) {
     return this._getAllFilterColumns(!0).filter(([t]) => t !== e).reduce((t, [, n]) => {
       const s = n.calc({ getAlreadyFilteredOutRows: () => t });
-      return s ? G(t, s) : t;
+      return s ? J(t, s) : t;
     }, /* @__PURE__ */ new Set());
   }
   /**
@@ -180,7 +181,7 @@ class V extends B {
     return e ? t : t.map(([n, s]) => s);
   }
   _reCalcAllColumns() {
-    this._alreadyFilteredOutRows = J(), this._getAllFilterColumns().forEach((e) => e.__clearCache()), this._reCalcWithNoCacheColumns();
+    this._alreadyFilteredOutRows = K(), this._getAllFilterColumns().forEach((e) => e.__clearCache()), this._reCalcWithNoCacheColumns();
   }
   _setCriteriaWithoutReCalc(e, t) {
     const n = this._range;
@@ -190,7 +191,7 @@ class V extends B {
     if (e > o || e < s)
       throw new Error(`[FilterModel] could not set criteria on column ${e} which is out of range!`);
     let l;
-    this._filterColumnByIndex.has(e) ? l = this._filterColumnByIndex.get(e) : (l = new Ct(
+    this._filterColumnByIndex.has(e) ? l = this._filterColumnByIndex.get(e) : (l = new St(
       this.unitId,
       this.subUnitId,
       this._worksheet,
@@ -209,31 +210,34 @@ class V extends B {
     this._hasCriteria$.next(this._filterColumnByIndex.size > 0);
   }
   _rebuildAlreadyFilteredOutRowsWithCache() {
-    const e = this._getAllFilterColumns().filter((t) => t.hasCache()).reduce((t, n) => G(t, n.filteredOutRows), /* @__PURE__ */ new Set());
+    const e = this._getAllFilterColumns().filter((t) => t.hasCache()).reduce((t, n) => J(t, n.filteredOutRows), /* @__PURE__ */ new Set());
     this._alreadyFilteredOutRows = e;
   }
   _reCalcWithNoCacheColumns() {
     const e = this._getAllFilterColumns().filter((t) => !t.hasCache());
     for (const t of e) {
       const n = t.reCalc();
-      n && (this._alreadyFilteredOutRows = G(this._alreadyFilteredOutRows, n));
+      n && (this._alreadyFilteredOutRows = J(this._alreadyFilteredOutRows, n));
     }
   }
 }
-class Ct extends B {
+class St extends B {
   constructor(e, t, n, s, o) {
     super();
-    w(this, "_filteredOutRows", null);
+    S(this, "_filteredOutRows", null);
     /** Cache the filter function.  */
-    w(this, "_filterFn", null);
-    w(this, "_range", null);
-    w(this, "_column", 0);
-    w(this, "_filterByValues", !1);
+    S(this, "_filterFn", null);
+    S(this, "_range", null);
+    S(this, "_column", 0);
+    S(this, "_filterBy", I.VALUES);
     this.unitId = e, this.subUnitId = t, this._worksheet = n, this._criteria = s, this._filterColumnContext = o;
   }
   get filteredOutRows() {
     return this._filteredOutRows;
   }
+  get filterBy() {
+    return this._filterBy;
+  }
   dispose() {
     super.dispose(), this._filteredOutRows = null;
   }
@@ -246,7 +250,7 @@ class Ct extends B {
   serialize() {
     if (!this._criteria)
       throw new Error("[FilterColumn]: could not serialize without a filter column!");
-    return te.deepClone({
+    return re.deepClone({
       ...this._criteria,
       colId: this._column
     });
@@ -262,7 +266,7 @@ class Ct extends B {
     this._criteria = e, this._generateFilterFn(), this._filteredOutRows = null;
   }
   getColumnData() {
-    return te.deepClone(this._criteria);
+    return re.deepClone(this._criteria);
   }
   /**
    * Trigger new calculation on this `FilterModel` instance.
@@ -285,85 +289,109 @@ class Ct extends B {
       const { row: a, rowSpan: c, col: h } = l;
       if (o.has(a) && (!c || c === 1))
         continue;
-      const d = this._filterByValues ? ye(this._worksheet.getCell(a, h)) : yt(this._worksheet, a, h);
-      if (!this._filterFn(d) && (s.add(a), c))
-        for (let u = 1; u < c; u++)
-          s.add(a + u);
+      if (!(this._filterBy === I.VALUES ? this._filterFn(Ae(this._worksheet.getCell(a, h))) : this._filterBy === I.COLORS ? this._filterFn(this._worksheet.getComposedCellStyle(a, h)) : this._filterFn(Nt(this._worksheet, a, h))) && (s.add(a), c))
+        for (let d = 1; d < c; d++)
+          s.add(a + d);
     }
     return s;
   }
   _generateFilterFn() {
-    this._criteria && (this._filterFn = pt(this._criteria), this._filterByValues = !!this._criteria.filters);
+    this._criteria && (this._filterFn = wt(this._criteria), this._filterBy = this._criteria.filters ? I.VALUES : this._criteria.colorFilters ? I.COLORS : I.CONDITIONS);
   }
 }
-function pt(i) {
+function wt(i) {
   if (i.filters)
-    return Ft(i.filters);
+    return vt(i.filters);
+  if (i.colorFilters)
+    return Mt(i.colorFilters);
   if (i.customFilters)
-    return wt(i.customFilters);
+    return Et(i.customFilters);
   throw new Error("[FilterModel]: other types of filters are not supported yet.");
 }
-function Ft(i) {
+function vt(i) {
   const r = !!i.blank, e = new Set(i.filters);
   return (t) => t === void 0 || t === "" ? r : e.has(typeof t == "string" ? t : `${t}`);
 }
-function wt(i) {
-  const r = i.customFilters.map((e) => Et(e));
-  return Mt(r) ? i.and ? St(r) : vt(r) : r[0];
+function Mt(i) {
+  if (i.cellFillColors) {
+    const r = new Set(i.cellFillColors);
+    return (e) => {
+      var n;
+      if (!e || !((n = e.bg) != null && n.rgb))
+        return !!r.has(null);
+      const t = new ne(e.bg.rgb).toRgbString();
+      return r.has(t);
+    };
+  }
+  if (i.cellTextColors) {
+    const r = new Set(i.cellTextColors);
+    return (e) => {
+      var n;
+      if (!e || !((n = e.cl) != null && n.rgb))
+        return !!r.has(at);
+      const t = new ne(e.cl.rgb).toRgbString();
+      return r.has(t);
+    };
+  }
+  throw new Error("[FilterModel]: color filters are not supported yet.");
 }
-function St(i) {
+function Et(i) {
+  const r = i.customFilters.map((e) => Tt(e));
+  return At(r) ? i.and ? Ot(r) : yt(r) : r[0];
+}
+function Ot(i) {
   const [r, e] = i;
   return (t) => r(t) && e(t);
 }
-function vt(i) {
+function yt(i) {
   const [r, e] = i;
   return (t) => r(t) || e(t);
 }
-function Mt(i) {
+function At(i) {
   return i.length === 2;
 }
-function Et(i) {
+function Tt(i) {
   const r = i.val;
-  if (i.operator === x.NOT_EQUALS && !se(r))
-    return (n) => _e.fn(n, r);
-  if (gt(i.operator)) {
-    if (!se(r)) return () => !1;
-    const n = ie(i.operator), s = Number(r);
+  if (i.operator === x.NOT_EQUALS && !le(r))
+    return (n) => Ce.fn(n, r);
+  if (Ct(i.operator)) {
+    if (!le(r)) return () => !1;
+    const n = oe(i.operator), s = Number(r);
     return (o) => n.fn(o, s);
   }
-  const e = ie(i.operator);
+  const e = oe(i.operator);
   return (t) => e.fn(t, r);
 }
-function yt(i, r, e) {
+function Nt(i, r, e) {
   const t = i.getCell(r, e);
   if (!t) return null;
   const n = i.getCellRaw(r, e);
-  return t && !n ? oe(t) : n ? t.t === X.NUMBER && typeof t.v == "string" ? n.v : oe(n) : null;
+  return t && !n ? ae(t) : n ? t.t === Z.NUMBER && typeof t.v == "string" ? n.v : ae(n) : null;
 }
-function oe(i) {
+function ae(i) {
   var t, n;
   const r = (n = (t = i.p) == null ? void 0 : t.body) == null ? void 0 : n.dataStream;
   if (r) return r.trimEnd();
   const e = i.v;
-  return typeof e == "string" ? i.t === X.BOOLEAN ? e.toUpperCase() : e : typeof e == "number" ? i.t === X.BOOLEAN ? e ? "TRUE" : "FALSE" : e : typeof e == "boolean" ? e ? "TRUE" : "FALSE" : "";
+  return typeof e == "string" ? i.t === Z.BOOLEAN ? e.toUpperCase() : e : typeof e == "number" ? i.t === Z.BOOLEAN ? e ? "TRUE" : "FALSE" : e : typeof e == "boolean" ? e ? "TRUE" : "FALSE" : "";
 }
-var Ot = Object.getOwnPropertyDescriptor, At = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? Ot(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+var xt = Object.getOwnPropertyDescriptor, It = (i, r, e, t) => {
+  for (var n = t > 1 ? void 0 : t ? xt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (n = o(n) || n);
   return n;
 }, Y = (i, r) => (e, t) => r(e, t, i);
-const Fe = "SHEET_FILTER_PLUGIN";
+const we = "SHEET_FILTER_PLUGIN";
 let M = class extends B {
   constructor(r, e, t) {
     super();
-    w(this, "_filterModels", /* @__PURE__ */ new Map());
-    w(this, "_loadedUnitId$", new L(null));
-    w(this, "loadedUnitId$", this._loadedUnitId$.asObservable());
-    w(this, "_errorMsg$", new L(null));
-    w(this, "errorMsg$", this._errorMsg$.asObservable());
-    w(this, "_activeFilterModel$", new L(null));
+    S(this, "_filterModels", /* @__PURE__ */ new Map());
+    S(this, "_loadedUnitId$", new D(null));
+    S(this, "loadedUnitId$", this._loadedUnitId$.asObservable());
+    S(this, "_errorMsg$", new D(null));
+    S(this, "errorMsg$", this._errorMsg$.asObservable());
+    S(this, "_activeFilterModel$", new D(null));
     /** An observable value emitting the current Workbook's active Worksheet's filter model (if there is one). */
-    w(this, "activeFilterModel$", this._activeFilterModel$.asObservable());
+    S(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). */
@@ -385,7 +413,7 @@ let M = class extends B {
     const s = n.getSheetBySheetId(e);
     if (!s)
       throw new Error(`[SheetsFilterService]: could not create "FilterModel" on a non-existing worksheet ${e}!`);
-    const o = new V(r, e, s);
+    const o = new j(r, e, s);
     return this._cacheFilterModel(r, e, o), o;
   }
   getFilterModel(r, e) {
@@ -402,7 +430,7 @@ let M = class extends B {
   _updateActiveFilterModel() {
     let r;
     try {
-      if (r = this._univerInstanceService.getCurrentUnitForType(D.UNIVER_SHEET), !r) {
+      if (r = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET), !r) {
         this._activeFilterModel$.next(null);
         return;
       }
@@ -420,13 +448,13 @@ let M = class extends B {
   }
   _initActiveFilterModel() {
     this.disposeWithMe(
-      rt(
+      it(
         // source1: executing filter related mutations
-        Oe(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(nt(([r]) => r.type === E.MUTATION && ge.has(r.id))),
+        Te(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(st(([r]) => r.type === E.MUTATION && Re.has(r.id))),
         // source2: activate sheet changes
-        this._univerInstanceService.getCurrentTypeOfUnit$(D.UNIVER_SHEET).pipe(it((r) => {
+        this._univerInstanceService.getCurrentTypeOfUnit$(b.UNIVER_SHEET).pipe(ot((r) => {
           var e;
-          return (e = r == null ? void 0 : r.activeSheet$) != null ? e : st(null);
+          return (e = r == null ? void 0 : r.activeSheet$) != null ? e : lt(null);
         }))
       ).subscribe(() => this._updateActiveFilterModel())
     );
@@ -443,14 +471,14 @@ let M = class extends B {
   _deserializeAutoFiltersForUnit(r, e) {
     const t = this._univerInstanceService.getUniverSheetInstance(r);
     Object.keys(e).forEach((n) => {
-      const s = e[n], o = V.deserialize(r, n, t.getSheetBySheetId(n), s);
+      const s = e[n], o = j.deserialize(r, n, t.getSheetBySheetId(n), s);
       this._cacheFilterModel(r, n, o);
     });
   }
   _initModel() {
     this._resourcesManagerService.registerPluginResource({
-      pluginName: Fe,
-      businesses: [D.UNIVER_SHEET],
+      pluginName: we,
+      businesses: [b.UNIVER_SHEET],
       toJson: (r) => this._serializeAutoFiltersForUnit(r),
       parseJson: (r) => JSON.parse(r),
       onLoad: (r, e) => {
@@ -466,98 +494,98 @@ let M = class extends B {
     this._filterModels.has(r) || this._filterModels.set(r, /* @__PURE__ */ new Map()), this._filterModels.get(r).set(e, t);
   }
 };
-M = At([
-  Y(0, Ae),
+M = It([
+  Y(0, Ne),
   Y(1, T),
   Y(2, N)
 ], M);
 const R = {
-  id: ue,
+  id: fe,
   type: E.MUTATION,
   handler: (i, r) => {
     const { subUnitId: e, unitId: t, range: n } = r;
     return i.get(M).ensureFilterModel(t, e).setRange(n), !0;
   }
 }, p = {
-  id: he,
+  id: me,
   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;
   }
-}, y = {
-  id: me,
+}, O = {
+  id: ge,
   type: E.MUTATION,
   handler: (i, r) => {
     const { unitId: e, subUnitId: t } = r;
     return i.get(M).removeFilterModel(e, t);
   }
 }, W = {
-  id: fe,
+  id: _e,
   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;
   }
-}, Tt = {
+}, $t = {
   id: "sheet.command.set-filter-range",
   type: E.COMMAND,
   handler: (i, r) => {
-    const e = i.get(M), t = i.get(N), n = i.get(q), s = i.get(T), { unitId: o, subUnitId: l, range: a } = r;
-    if (!b(s, r) || e.getFilterModel(o, l)) return !1;
+    const e = i.get(M), t = i.get(N), n = i.get(G), s = i.get(T), { unitId: o, subUnitId: l, range: a } = r;
+    if (!H(s, r) || e.getFilterModel(o, l)) return !1;
     if (a.endRow === a.startRow) {
-      const f = i.get(Ne), g = i.get(xe);
-      return f.emit(g.t("sheets-filter.command.not-valid-filter-range")), !1;
+      const m = i.get(Ie), g = i.get($e);
+      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({
+    const u = { id: R.id, params: { unitId: o, subUnitId: l, range: a } }, d = t.syncExecuteCommand(u.id, u.params);
+    return d && n.pushUndoRedo({
       unitID: o,
-      undoMutations: [{ id: y.id, params: { unitId: o, subUnitId: l } }],
-      redoMutations: [d]
-    }), u;
+      undoMutations: [{ id: O.id, params: { unitId: o, subUnitId: l } }],
+      redoMutations: [u]
+    }), d;
   }
-}, Nt = {
+}, Ut = {
   id: "sheet.command.remove-sheet-filter",
   type: E.COMMAND,
   handler: (i, r) => {
-    const e = i.get(T), t = i.get(M), n = i.get(N), s = i.get(q), o = b(e, r);
+    const e = i.get(T), t = i.get(M), n = i.get(N), s = i.get(G), o = H(e, r);
     if (!o) return !1;
     const { unitId: l, subUnitId: a } = o, c = t.getFilterModel(l, a);
     if (!c) return !1;
-    const h = c == null ? void 0 : c.serialize(), d = xt(l, a, h), u = n.syncExecuteCommand(y.id, { unitId: l, subUnitId: a });
-    return u && s.pushUndoRedo({
+    const h = c == null ? void 0 : c.serialize(), u = Lt(l, a, h), d = n.syncExecuteCommand(O.id, { unitId: l, subUnitId: a });
+    return d && s.pushUndoRedo({
       unitID: l,
-      undoMutations: d,
-      redoMutations: [{ id: y.id, params: { unitId: l, subUnitId: a } }]
-    }), u;
+      undoMutations: u,
+      redoMutations: [{ id: O.id, params: { unitId: l, subUnitId: a } }]
+    }), d;
   }
-}, Gt = {
+}, Zt = {
   id: "sheet.command.smart-toggle-filter",
   type: E.COMMAND,
   handler: async (i) => {
-    const r = i.get(T), e = i.get(M), t = i.get(N), n = r.getCurrentUnitForType(D.UNIVER_SHEET), s = n == null ? void 0 : n.getActiveSheet();
+    const r = i.get(T), e = i.get(M), t = i.get(N), n = r.getCurrentUnitForType(b.UNIVER_SHEET), s = n == null ? void 0 : n.getActiveSheet();
     if (!s || !n) return !1;
     const o = n.getUnitId(), l = s.getSheetId();
     if (e.getFilterModel(o, l))
-      return t.executeCommand(Nt.id, { unitId: o, subUnitId: l });
-    const h = i.get(be).getCurrentLastSelection();
+      return t.executeCommand(Ut.id, { unitId: o, subUnitId: l });
+    const h = i.get(ze).getCurrentLastSelection();
     if (!h) return !1;
-    const d = h.range, u = He(h) ? de(d, { left: !0, right: !0, up: !0, down: !0 }, s) : d;
-    return t.executeCommand(Tt.id, {
+    const u = h.range, d = Ve(h) ? he(u, { left: !0, right: !0, up: !0, down: !0 }, s) : u;
+    return t.executeCommand($t.id, {
       unitId: o,
       subUnitId: l,
-      range: u
+      range: d
     });
   }
-}, Jt = {
+}, er = {
   id: "sheet.command.set-filter-criteria",
   type: E.COMMAND,
   handler: (i, r) => {
-    const e = i.get(M), t = i.get(N), n = i.get(q), { unitId: s, subUnitId: o, col: l, criteria: a } = r, c = e.getFilterModel(s, o);
+    const e = i.get(M), t = i.get(N), n = i.get(G), { unitId: s, subUnitId: o, col: l, criteria: a } = r, c = e.getFilterModel(s, o);
     if (!c) return !1;
     const h = c.getRange();
     if (!h || l < h.startColumn || l > h.endColumn) return !1;
-    const d = c.getFilterColumn(l), u = $t(s, o, l, d), f = {
+    const u = c.getFilterColumn(l), d = bt(s, o, l, u), m = {
       id: p.id,
       params: {
         unitId: s,
@@ -565,39 +593,39 @@ const R = {
         col: l,
         criteria: a
       }
-    }, g = t.syncExecuteCommand(f.id, f.params);
+    }, g = t.syncExecuteCommand(m.id, m.params);
     return g && n.pushUndoRedo({
       unitID: s,
-      undoMutations: [u],
-      redoMutations: [f]
+      undoMutations: [d],
+      redoMutations: [m]
     }), g;
   }
-}, Yt = {
+}, tr = {
   id: "sheet.command.clear-filter-criteria",
   type: E.COMMAND,
   handler: (i, r) => {
-    const e = i.get(M), t = i.get(q), n = i.get(N), s = i.get(T), o = b(s, r);
+    const e = i.get(M), t = i.get(G), n = i.get(N), s = i.get(T), o = H(s, r);
     if (!o) return !1;
     const { unitId: l, subUnitId: a } = o, c = e.getFilterModel(o.unitId, o.subUnitId);
     if (!c) return !1;
-    const h = c.serialize(), d = we(l, a, h), u = It(l, a, h);
-    return Te(u, n).result ? (t.pushUndoRedo({
+    const h = c.serialize(), u = ve(l, a, h), d = Pt(l, a, h);
+    return xe(d, n).result ? (t.pushUndoRedo({
       unitID: l,
-      undoMutations: d,
-      redoMutations: u
+      undoMutations: u,
+      redoMutations: d
     }), !0) : !1;
   }
-}, Kt = {
+}, rr = {
   id: "sheet.command.re-calc-filter",
   type: E.COMMAND,
   handler: (i, r) => {
-    const e = i.get(M), t = i.get(N), n = i.get(T), s = b(n, r);
+    const e = i.get(M), t = i.get(N), n = i.get(T), s = H(n, r);
     if (!s) return !1;
     const { unitId: o, subUnitId: l } = s;
     return e.getFilterModel(s.unitId, s.subUnitId) ? t.executeCommand(W.id, { unitId: o, subUnitId: l }) : !1;
   }
 };
-function xt(i, r, e) {
+function Lt(i, r, e) {
   const t = [], n = {
     id: R.id,
     params: {
@@ -606,9 +634,9 @@ function xt(i, r, e) {
       range: e.ref
     }
   };
-  return t.push(n), we(i, r, e).forEach((o) => t.push(o)), t;
+  return t.push(n), ve(i, r, e).forEach((o) => t.push(o)), t;
 }
-function we(i, r, e) {
+function ve(i, r, e) {
   var n;
   const t = [];
   return (n = e.filterColumns) == null || n.forEach((s) => {
@@ -624,7 +652,7 @@ function we(i, r, e) {
     t.push(o);
   }), t;
 }
-function It(i, r, e) {
+function Pt(i, r, e) {
   var n;
   const t = [];
   return (n = e.filterColumns) == null || n.forEach((s) => {
@@ -640,7 +668,7 @@ function It(i, r, e) {
     t.push(o);
   }), t;
 }
-function $t(i, r, e, t) {
+function bt(i, r, e, t) {
   if (!t)
     return {
       id: p.id,
@@ -662,8 +690,8 @@ function $t(i, r, e, t) {
     }
   };
 }
-const Pt = "sheets-filter.config", le = {};
-function Ut(i, r) {
+const Dt = "sheets-filter.config", ce = {};
+function Bt(i, r) {
   for (let e = 0; e < i.length; e++) {
     let t = e;
     if (i[e])
@@ -672,18 +700,18 @@ function Ut(i, r) {
   }
   return i.filter((e) => e !== null);
 }
-function $(i) {
-  return Ut(i, (r, e) => r.id === p.id && e.id === p.id && r.params.unitId === e.params.unitId && r.params.subUnitId === e.params.subUnitId && r.params.col === e.params.col);
+function U(i) {
+  return Bt(i, (r, e) => r.id === p.id && e.id === p.id && r.params.unitId === e.params.unitId && r.params.subUnitId === e.params.subUnitId && r.params.col === e.params.col);
 }
-var Dt = Object.getOwnPropertyDescriptor, Lt = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? Dt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+var Ht = Object.getOwnPropertyDescriptor, zt = (i, r, e, t) => {
+  for (var n = t > 1 ? void 0 : t ? Ht(r, e) : r, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (n = o(n) || n);
   return n;
-}, P = (i, r) => (e, t) => r(e, t, i);
-let j = class extends B {
+}, L = (i, r) => (e, t) => r(e, t, i);
+let k = class extends B {
   constructor(r, e, t, n, s, o) {
     super();
-    w(this, "_disposableCollection", new $e());
+    S(this, "_disposableCollection", new Le());
     this._commandService = r, this._sheetInterceptorService = e, this._sheetsFilterService = t, this._univerInstanceService = n, this._refRangeService = s, this._dataSyncPrimaryController = o, this._initCommands(), this._initRowFilteredInterceptor(), this._initInterceptors(), this._commandExecutedListener(), this._initErrorHandling();
   }
   _initCommands() {
@@ -691,7 +719,7 @@ let j = class extends B {
       p,
       R,
       W,
-      y
+      O
     ].forEach((r) => {
       var e;
       this.disposeWithMe(this._commandService.registerCommand(r)), (e = this._dataSyncPrimaryController) == null || e.registerSyncingMutations(r);
@@ -701,7 +729,7 @@ let j = class extends B {
     this.disposeWithMe(this._sheetInterceptorService.interceptCommand({
       getMutations: (r) => this._getUpdateFilter(r)
     })), this.disposeWithMe(this._commandService.onCommandExecuted((r) => {
-      if (r.id === Ve.id) {
+      if (r.id === ke.id) {
         const e = r.params, t = e.subUnitId, n = e.unitId;
         if (!t || !n)
           return;
@@ -727,31 +755,31 @@ let j = class extends B {
     if (!t || !n) return;
     const s = (l = this._sheetsFilterService.getFilterModel(r, e)) == null ? void 0 : l.getRange(), o = (a) => {
       switch (a.id) {
-        case tt.id: {
-          const c = a.params, h = c.unitId || r, d = c.subUnitId || e;
-          return this._handleInsertRowCommand(c, h, d);
+        case nt.id: {
+          const c = a.params, h = c.unitId || r, u = c.subUnitId || e;
+          return this._handleInsertRowCommand(c, h, u);
         }
-        case et.id: {
-          const c = a.params, h = c.unitId || r, d = c.subUnitId || e;
-          return this._handleInsertColCommand(c, h, d);
+        case rt.id: {
+          const c = a.params, h = c.unitId || r, u = c.subUnitId || e;
+          return this._handleInsertColCommand(c, h, u);
         }
-        case Ze.id: {
+        case tt.id: {
           const c = a.params;
           return this._handleRemoveColCommand(c, r, e);
         }
-        case Xe.id: {
+        case et.id: {
           const c = a.params;
           return this._handleRemoveRowCommand(c, r, e);
         }
-        case ne.MoveColsCommandId: {
+        case se.MoveColsCommandId: {
           const c = a.params;
           return this._handleMoveColsCommand(c, r, e);
         }
-        case ne.MoveRowsCommandId: {
+        case se.MoveRowsCommandId: {
           const c = a.params;
           return this._handleMoveRowsCommand(c, r, e);
         }
-        case Ke.id: {
+        case Ze.id: {
           const c = a.params;
           return this._handleMoveRangeCommand(c, r, e);
         }
@@ -763,11 +791,11 @@ let j = class extends B {
   _getUpdateFilter(r) {
     const { id: e } = r;
     switch (e) {
-      case ke.id: {
+      case Ge.id: {
         const t = r.params;
         return this._handleRemoveSheetCommand(t, t.unitId, t.subUnitId);
       }
-      case je.id: {
+      case qe.id: {
         const t = r.params, { targetSubUnitId: n, unitId: s, subUnitId: o } = t;
         return !s || !o || !n ? this._handleNull() : this._handleCopySheetCommand(s, o, n);
       }
@@ -785,7 +813,7 @@ let j = class extends B {
     const { startColumn: o, endColumn: l } = s, { startColumn: a, endColumn: c } = r.range, h = c - a + 1;
     if (c > l)
       return this._handleNull();
-    const d = [], u = [], f = a, g = {
+    const u = [], d = [], m = a, g = {
       unitId: e,
       subUnitId: t,
       range: {
@@ -798,13 +826,13 @@ let j = class extends B {
       subUnitId: t,
       range: s
     };
-    d.push({ id: R.id, params: g }), u.push({ id: R.id, params: C });
-    const F = n.getAllFilterColumns().filter((m) => m[0] >= f);
+    u.push({ id: R.id, params: g }), d.push({ id: R.id, params: C });
+    const F = n.getAllFilterColumns().filter((f) => f[0] >= m);
     if (F.length !== 0) {
-      const { newRange: m, oldRange: v } = this._moveCriteria(e, t, F, h);
-      d.push(...m.redos, ...v.redos), u.push(...m.undos, ...v.undos);
+      const { newRange: f, oldRange: v } = this._moveCriteria(e, t, F, h);
+      u.push(...f.redos, ...v.redos), d.push(...f.undos, ...v.undos);
     }
-    return { redos: $(d), undos: $(u) };
+    return { redos: U(u), undos: U(d) };
   }
   _handleInsertRowCommand(r, e, t) {
     var C;
@@ -814,7 +842,7 @@ let j = class extends B {
     const { startRow: o, endRow: l } = s, { startRow: a, endRow: c } = r.range, h = c - a + 1;
     if (c > l)
       return this._handleNull();
-    const d = [], u = [], f = {
+    const u = [], d = [], m = {
       unitId: e,
       subUnitId: t,
       range: {
@@ -827,9 +855,9 @@ let j = class extends B {
       subUnitId: t,
       range: s
     };
-    return d.push({ id: R.id, params: f }), u.push({ id: R.id, params: g }), {
-      redos: $(d),
-      undos: $(u)
+    return u.push({ id: R.id, params: m }), d.push({ id: R.id, params: g }), {
+      redos: U(u),
+      undos: U(d)
     };
   }
   _handleRemoveColCommand(r, e, t) {
@@ -840,36 +868,36 @@ let j = class extends B {
     const { startColumn: o, endColumn: l } = s, { startColumn: a, endColumn: c } = r.range;
     if (a > l)
       return this._handleNull();
-    const h = [], d = [], u = c < o ? 0 : Math.min(c, l) - Math.max(a, o) + 1, f = c - a + 1, g = n.getAllFilterColumns();
+    const h = [], u = [], d = c < o ? 0 : Math.min(c, l) - Math.max(a, o) + 1, m = c - a + 1, g = n.getAllFilterColumns();
     g.forEach((_) => {
-      const [m, v] = _;
-      m <= c && m >= a && (h.push({ id: p.id, params: { unitId: e, subUnitId: t, col: m, criteria: null } }), d.push({ id: p.id, params: { unitId: e, subUnitId: t, col: m, criteria: { ...v.serialize(), colId: m } } }));
+      const [f, v] = _;
+      f <= c && f >= a && (h.push({ id: p.id, params: { unitId: e, subUnitId: t, col: f, criteria: null } }), u.push({ id: p.id, params: { unitId: e, subUnitId: t, col: f, criteria: { ...v.serialize(), colId: f } } }));
     });
     const C = g.filter((_) => {
-      const [m, v] = _;
-      return m > c;
+      const [f, v] = _;
+      return f > c;
     });
-    let S = { undos: [], redos: [] };
+    let w = { undos: [], redos: [] };
     if (C.length > 0) {
-      const { oldRange: _, newRange: m } = this._moveCriteria(e, t, C, -f);
-      S = m, h.push(..._.redos), d.unshift(..._.undos);
+      const { oldRange: _, newRange: f } = this._moveCriteria(e, t, C, -m);
+      w = f, h.push(..._.redos), u.unshift(..._.undos);
     }
-    if (u === l - o + 1) {
+    if (d === l - o + 1) {
       const _ = {
         unitId: e,
         subUnitId: t
       };
-      h.push({ id: y.id, params: _ }), d.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
+      h.push({ id: O.id, params: _ }), u.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
     } else {
-      const _ = o <= a ? o : u === 0 ? o - f : a, m = o <= a ? l - u : l - f, v = {
+      const _ = o <= a ? o : d === 0 ? o - m : a, f = o <= a ? l - d : l - m, v = {
         unitId: e,
         subUnitId: t,
-        range: { ...s, startColumn: _, endColumn: m }
+        range: { ...s, startColumn: _, endColumn: f }
       };
-      h.push({ id: R.id, params: v }), d.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } }), h.push(...S.redos), d.unshift(...S.undos);
+      h.push({ id: R.id, params: v }), u.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } }), h.push(...w.redos), u.unshift(...w.undos);
     }
     return {
-      undos: d,
+      undos: u,
       redos: h
     };
   }
@@ -897,44 +925,44 @@ let j = class extends B {
           }
         }]
       };
-    const h = [], d = [], u = n.getAllFilterColumns(), f = o <= c && o >= a;
-    d.push({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
+    const h = [], u = [], d = n.getAllFilterColumns(), m = o <= c && o >= a;
+    u.push({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
     const g = Math.min(c, l) - Math.max(a, o) + 1;
-    if (g === l - o + 1 || f) {
-      const S = {
+    if (g === l - o + 1 || m) {
+      const w = {
         unitId: e,
         subUnitId: t
       };
-      h.push({ id: y.id, params: S }), u.forEach((F) => {
-        const [_, m] = F, v = {
+      h.push({ id: O.id, params: w }), d.forEach((F) => {
+        const [_, f] = F, v = {
           unitId: e,
           subUnitId: t,
           col: _,
-          criteria: { ...m.serialize(), colId: _ }
+          criteria: { ...f.serialize(), colId: _ }
         };
-        d.push({ id: p.id, params: v });
+        u.push({ id: p.id, params: v });
       });
     } else {
-      const S = (C = this._univerInstanceService.getUniverSheetInstance(e)) == null ? void 0 : C.getSheetBySheetId(t);
-      if (!S)
+      const w = (C = this._univerInstanceService.getUniverSheetInstance(e)) == null ? void 0 : C.getSheetBySheetId(t);
+      if (!w)
         return this._handleNull();
       const F = [];
-      for (let O = a; O <= c; O++)
-        S.getRowFiltered(O) && F.push(O);
-      const _ = Math.min(o, a), m = _ + (l - o) - g + F.length, v = {
+      for (let y = a; y <= c; y++)
+        w.getRowFiltered(y) && F.push(y);
+      const _ = Math.min(o, a), f = _ + (l - o) - g + F.length, v = {
         unitId: e,
         subUnitId: t,
         range: {
           ...s,
           startRow: _,
-          endRow: m
+          endRow: f
         }
       };
       h.push({ id: R.id, params: v });
     }
     return {
-      undos: $(d),
-      redos: $(h)
+      undos: U(u),
+      redos: U(h)
     };
   }
   // eslint-disable-next-line max-lines-per-function
@@ -946,58 +974,58 @@ let j = class extends B {
     const { startColumn: o, endColumn: l } = s, { fromRange: a, toRange: c } = r;
     if (a.endColumn < o && c.startColumn <= o || a.startColumn > l && c.endColumn > l)
       return this._handleNull();
-    const h = [], d = [], u = {};
-    for (let m = o; m <= l; m++)
-      u[m] = {
-        colIndex: m,
-        filter: n.getFilterColumn(m)
+    const h = [], u = [], d = {};
+    for (let f = o; f <= l; f++)
+      d[f] = {
+        colIndex: f,
+        filter: n.getFilterColumn(f)
       };
-    re(a.startColumn, a.endColumn - a.startColumn + 1, c.startColumn, u);
-    let f = s.startColumn, g = s.endColumn;
-    o >= a.startColumn && o <= a.endColumn && c.startColumn > a.startColumn && a.endColumn < l && (f = a.endColumn + 1), l >= a.startColumn && l <= a.endColumn && c.startColumn < a.startColumn && a.startColumn > o && (g = a.startColumn - 1);
-    const C = Object.keys(u).map((m) => Number(m)), S = C.find((m) => u[m].colIndex === g), F = C.find((m) => u[m].colIndex === f);
-    if (C.forEach((m) => {
-      var Z, ee;
-      const { colIndex: v, filter: O } = u[m], A = m;
-      if (O) {
-        if (A >= F && A <= S) {
+    ie(a.startColumn, a.endColumn - a.startColumn + 1, c.startColumn, d);
+    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 C = Object.keys(d).map((f) => Number(f)), w = C.find((f) => d[f].colIndex === g), F = C.find((f) => d[f].colIndex === m);
+    if (C.forEach((f) => {
+      var ee, te;
+      const { colIndex: v, filter: y } = d[f], A = f;
+      if (y) {
+        if (A >= F && A <= w) {
           const Q = {
             unitId: e,
             subUnitId: t,
             col: A,
-            criteria: { ...O.serialize(), colId: A }
-          }, Se = {
+            criteria: { ...y.serialize(), colId: A }
+          }, Me = {
             unitId: e,
             subUnitId: t,
             col: A,
-            criteria: n.getFilterColumn(A) ? { ...(Z = n.getFilterColumn(A)) == null ? void 0 : Z.serialize(), colId: A } : null
+            criteria: n.getFilterColumn(A) ? { ...(ee = n.getFilterColumn(A)) == null ? void 0 : ee.serialize(), colId: A } : null
           };
-          h.push({ id: p.id, params: Q }), d.push({ id: p.id, params: Se });
+          h.push({ id: p.id, params: Q }), u.push({ id: p.id, params: Me });
         }
-        if (!((ee = u[v]) != null && ee.filter)) {
+        if (!((te = d[v]) != null && te.filter)) {
           const Q = {
             unitId: e,
             subUnitId: t,
             col: v,
             criteria: null
           };
-          h.push({ id: p.id, params: Q }), d.push({ id: p.id, params: { unitId: e, subUnitId: t, col: v, criteria: { ...O.serialize(), colId: v } } });
+          h.push({ id: p.id, params: Q }), u.push({ id: p.id, params: { unitId: e, subUnitId: t, col: v, criteria: { ...y.serialize(), colId: v } } });
         }
       }
-    }), o !== F || l !== S) {
-      const m = {
+    }), o !== F || l !== w) {
+      const f = {
         unitId: e,
         subUnitId: t,
         range: {
           ...s,
           startColumn: F,
-          endColumn: S
+          endColumn: w
         }
       };
-      h.unshift({ id: R.id, params: m }), d.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
+      h.unshift({ id: R.id, params: f }), u.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
     }
     return {
-      undos: d,
+      undos: u,
       redos: h
     };
   }
@@ -1009,30 +1037,30 @@ let j = class extends B {
     const { startRow: o, endRow: l } = s, { fromRange: a, toRange: c } = r;
     if (a.endRow < o && c.startRow <= o || a.startRow > l && c.endRow > l)
       return this._handleNull();
-    const h = [], d = [], u = {};
-    for (let m = o; m <= l; m++)
-      u[m] = {
-        oldIndex: m
+    const h = [], u = [], d = {};
+    for (let f = o; f <= l; f++)
+      d[f] = {
+        oldIndex: f
       };
-    const f = o;
+    const m = o;
     let g = l;
-    l >= a.startRow && l <= a.endRow && c.startRow < a.startRow && a.startRow > o && (g = a.startRow - 1), re(a.startRow, a.endRow - a.startRow + 1, c.startRow, u);
-    const C = Object.keys(u).map((m) => Number(m)), S = C.find((m) => u[m].oldIndex === g), F = C.find((m) => u[m].oldIndex === f);
-    if (o !== F || l !== S) {
-      const m = {
+    l >= a.startRow && l <= a.endRow && c.startRow < a.startRow && a.startRow > o && (g = a.startRow - 1), ie(a.startRow, a.endRow - a.startRow + 1, c.startRow, d);
+    const C = Object.keys(d).map((f) => Number(f)), w = C.find((f) => d[f].oldIndex === g), F = C.find((f) => d[f].oldIndex === m);
+    if (o !== F || l !== w) {
+      const f = {
         unitId: e,
         subUnitId: t,
         range: {
           ...s,
           startRow: F,
-          endRow: S
+          endRow: w
         }
       };
-      h.push({ id: R.id, params: m }, { id: W.id, params: { unitId: e, subUnitId: t } }), d.push({ id: R.id, params: { range: s, unitId: e, subUnitId: t } }, { id: W.id, params: { unitId: e, subUnitId: t } });
+      h.push({ id: R.id, params: f }, { id: W.id, params: { unitId: e, subUnitId: t } }), u.push({ id: R.id, params: { range: s, unitId: e, subUnitId: t } }, { id: W.id, params: { unitId: e, subUnitId: t } });
     }
     return {
       redos: h,
-      undos: d
+      undos: u
     };
   }
   _handleMoveRangeCommand(r, e, t) {
@@ -1043,26 +1071,26 @@ let j = class extends B {
     if (!l)
       return this._handleNull();
     const a = [], c = [];
-    if (K.contains(n, l)) {
-      const h = l.startRow - n.startRow, d = l.startColumn - n.startColumn, u = {
+    if (X.contains(n, l)) {
+      const h = l.startRow - n.startRow, u = l.startColumn - n.startColumn, d = {
         startRow: s.startRow + h,
-        startColumn: s.startColumn + d,
+        startColumn: s.startColumn + u,
         endRow: s.startRow + h + (l.endRow - l.startRow),
-        endColumn: s.startColumn + d + (l.endColumn - l.startColumn)
-      }, f = {
-        id: y.id,
+        endColumn: s.startColumn + u + (l.endColumn - l.startColumn)
+      }, m = {
+        id: O.id,
         params: {
           unitId: e,
           subUnitId: t
         }
-      }, g = { id: R.id, params: { unitId: e, subUnitId: t, range: u } }, C = { id: R.id, params: { unitId: e, subUnitId: t, range: l } };
-      a.push(f, g), c.push(f, C);
-      const S = o.getAllFilterColumns(), F = s.startColumn - n.startColumn;
-      S.forEach((_) => {
-        const [m, v] = _;
-        v && (a.push({ id: p.id, params: { unitId: e, subUnitId: t, col: m + F, criteria: { ...v.serialize(), colId: m + F } } }), c.push({ id: p.id, params: { unitId: e, subUnitId: t, col: m, criteria: { ...v.serialize(), colId: m } } }));
+      }, g = { id: R.id, params: { unitId: e, subUnitId: t, range: d } }, C = { id: R.id, params: { unitId: e, subUnitId: t, range: l } };
+      a.push(m, g), c.push(m, C);
+      const w = o.getAllFilterColumns(), F = s.startColumn - n.startColumn;
+      w.forEach((_) => {
+        const [f, v] = _;
+        v && (a.push({ id: p.id, params: { unitId: e, subUnitId: t, col: f + F, criteria: { ...v.serialize(), colId: f + F } } }), c.push({ id: p.id, params: { unitId: e, subUnitId: t, col: f, criteria: { ...v.serialize(), colId: f } } }));
       });
-    } else if (K.intersects(s, l)) {
+    } else if (X.intersects(s, l)) {
       const h = {
         ...l,
         endRow: Math.max(l.endRow, s.endRow)
@@ -1084,7 +1112,7 @@ let j = class extends B {
     const o = [], l = [];
     return n.getAllFilterColumns().forEach(([c, h]) => {
       l.push({ id: p.id, params: { unitId: e, subUnitId: t, col: c, criteria: { ...h.serialize(), colId: c } } });
-    }), o.push({ id: y.id, params: { unitId: e, subUnitId: t, range: s } }), l.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } }), {
+    }), 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
     };
@@ -1097,9 +1125,9 @@ let j = class extends B {
     if (!s)
       return this._handleNull();
     const o = [], l = [], a = [], c = [];
-    return n.getAllFilterColumns().forEach(([d, u]) => {
-      o.push({ id: p.id, params: { unitId: r, subUnitId: t, col: d, criteria: { ...u.serialize(), colId: d } } }), a.push({ id: p.id, params: { unitId: r, subUnitId: t, col: d, criteria: null } });
-    }), a.push({ id: y.id, params: { unitId: r, subUnitId: t, range: s } }), o.unshift({ id: R.id, params: { range: s, unitId: r, subUnitId: t } }), {
+    return n.getAllFilterColumns().forEach(([u, d]) => {
+      o.push({ id: p.id, params: { unitId: r, subUnitId: t, col: u, criteria: { ...d.serialize(), colId: u } } }), a.push({ id: p.id, params: { unitId: r, subUnitId: t, col: u, criteria: null } });
+    }), a.push({ id: 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,
@@ -1110,7 +1138,7 @@ let j = class extends B {
     return { redos: [], undos: [] };
   }
   _initRowFilteredInterceptor() {
-    this.disposeWithMe(this._sheetInterceptorService.intercept(qe.ROW_FILTERED, {
+    this.disposeWithMe(this._sheetInterceptorService.intercept(Qe.ROW_FILTERED, {
       // sheet-interceptor.service.ts
       handler: (r, e) => {
         var t, n;
@@ -1129,35 +1157,35 @@ let j = class extends B {
       col: -1
     }, o = [], l = [], a = [], c = [];
     return t.forEach((h) => {
-      const [d, u] = h;
+      const [u, d] = h;
       l.push({
         id: p.id,
         params: {
           ...s,
-          col: d
+          col: u
         }
       }), o.push({
         id: p.id,
         params: {
           ...s,
-          col: d,
-          criteria: { ...u.serialize(), colId: d }
+          col: u,
+          criteria: { ...d.serialize(), colId: u }
         }
       });
     }), t.forEach((h) => {
-      const [d, u] = h;
+      const [u, d] = h;
       c.push({
         id: p.id,
         params: {
           ...s,
-          col: d + n,
-          criteria: { ...u.serialize(), colId: d + n }
+          col: u + n,
+          criteria: { ...d.serialize(), colId: u + n }
         }
       }), a.push({
         id: p.id,
         params: {
           ...s,
-          col: d + n,
+          col: u + n,
           criteria: null
         }
       });
@@ -1177,40 +1205,40 @@ let j = class extends B {
       var c, h;
       const { unitId: t, subUnitId: n } = r.params || {}, s = this._sheetsFilterService.getFilterModel(t, n);
       if (!s) return;
-      const o = Array.from(s.filteredOutRows).sort((d, u) => d - u), l = [];
+      const o = Array.from(s.filteredOutRows).sort((u, d) => u - d), l = [];
       let a = !1;
-      if (r.id === Qe.id) {
-        const { startRow: d, endRow: u } = r.params.range, f = o.filter((g) => g >= d && g <= u);
+      if (r.id === Je.id) {
+        const { startRow: u, endRow: d } = r.params.range, m = o.filter((g) => g >= u && g <= d);
         o.forEach((g) => {
-          if (g < d)
+          if (g < u)
             l.push(g);
-          else if (a = !0, g <= u) {
-            const C = Math.max(d, l.length ? l[l.length - 1] + 1 : d);
+          else if (a = !0, g <= d) {
+            const C = Math.max(u, l.length ? l[l.length - 1] + 1 : u);
             l.push(C);
           } else
-            l.push(g - (u - d + 1 - f.length));
+            l.push(g - (d - u + 1 - m.length));
         });
       }
-      if (r.id === Ge.id) {
-        const { startRow: d, endRow: u } = r.params.range;
-        o.forEach((f) => {
-          f >= d ? (a = !0, l.push(f + (u - d + 1))) : l.push(f);
+      if (r.id === Ke.id) {
+        const { startRow: u, endRow: d } = r.params.range;
+        o.forEach((m) => {
+          m >= u ? (a = !0, l.push(m + (d - u + 1))) : l.push(m);
         });
       }
-      if (a && (s.filteredOutRows = new Set(l)), r.id === Je.id && !(e != null && e.onlyLocal)) {
-        const d = this._getExtendRegion(t, n);
-        if (d) {
-          const u = r.params.cellValue;
-          if (u)
-            for (let f = d.startColumn; f <= d.endColumn; f++) {
-              const g = (c = u == null ? void 0 : u[d.startRow]) == null ? void 0 : c[f];
+      if (a && (s.filteredOutRows = new Set(l)), r.id === Ye.id && !(e != null && e.onlyLocal)) {
+        const u = this._getExtendRegion(t, n);
+        if (u) {
+          const d = r.params.cellValue;
+          if (d)
+            for (let m = u.startColumn; m <= u.endColumn; m++) {
+              const g = (c = d == null ? void 0 : d[u.startRow]) == null ? void 0 : c[m];
               if (g && this._cellHasValue(g)) {
                 const C = (h = this._univerInstanceService.getUnit(t)) == null ? void 0 : h.getSheetBySheetId(n);
                 if (C) {
-                  const S = de(d, { down: !0 }, C), F = this._sheetsFilterService.getFilterModel(t, n), _ = F.getRange();
+                  const w = he(u, { down: !0 }, C), F = this._sheetsFilterService.getFilterModel(t, n), _ = F.getRange();
                   F.setRange({
                     ..._,
-                    endRow: S.endRow
+                    endRow: w.endRow
                   }), this._registerRefRange(t, n);
                 }
               }
@@ -1243,12 +1271,12 @@ let j = class extends B {
   }
   _initErrorHandling() {
     this.disposeWithMe(this._commandService.beforeCommandExecuted((r) => {
-      const e = r.params, t = b(this._univerInstanceService);
+      const e = r.params, t = H(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 === Ye.id && e.fromRange.startRow <= l.startRow && e.fromRange.endRow < l.endRow && e.fromRange.endRow >= l.startRow)
+      if (r.id === Xe.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");
     }));
   }
@@ -1257,25 +1285,25 @@ let j = class extends B {
     return !(e.length === 0 || e.every((t) => t == null));
   }
 };
-j = Lt([
-  P(0, N),
-  P(1, I(ze)),
-  P(2, I(M)),
-  P(3, T),
-  P(4, I(We)),
-  P(5, Ie(ot))
-], j);
-var Bt = Object.getOwnPropertyDescriptor, bt = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? Bt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+k = zt([
+  L(0, N),
+  L(1, $(We)),
+  L(2, $(M)),
+  L(3, T),
+  L(4, $(je)),
+  L(5, Ue(ct))
+], k);
+var Vt = Object.getOwnPropertyDescriptor, Wt = (i, r, e, t) => {
+  for (var n = t > 1 ? void 0 : t ? Vt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (n = o(n) || n);
   return n;
-}, H = (i, r) => (e, t) => r(e, t, i);
-let k = class extends B {
+}, z = (i, r) => (e, t) => r(e, t, i);
+let q = class extends B {
   constructor(i, r, e, t) {
     super(), this._activeDirtyManagerService = i, this._sheetRowFilteredService = r, this._sheetsFilterService = e, this._univerInstanceService = t, this._initFormulaDirtyRange(), this._registerSheetRowFiltered();
   }
   _initFormulaDirtyRange() {
-    ge.forEach((i) => {
+    Re.forEach((i) => {
       this._activeDirtyManagerService.register(
         i,
         {
@@ -1319,68 +1347,69 @@ let k = class extends B {
     });
   }
 };
-k = bt([
-  H(0, I(lt)),
-  H(1, I(at)),
-  H(2, I(M)),
-  H(3, T)
-], k);
-var Ht = Object.getOwnPropertyDescriptor, zt = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? Ht(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+q = Wt([
+  z(0, $(ut)),
+  z(1, $(dt)),
+  z(2, $(M)),
+  z(3, T)
+], q);
+var jt = Object.getOwnPropertyDescriptor, kt = (i, r, e, t) => {
+  for (var n = t > 1 ? void 0 : t ? jt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (n = o(n) || n);
   return n;
-}, ae = (i, r) => (e, t) => r(e, t, i), z;
-let ce = (z = class extends Pe {
-  constructor(i = le, r, e) {
+}, ue = (i, r) => (e, t) => r(e, t, i), V;
+let de = (V = class extends Pe {
+  constructor(i = ce, r, e) {
     super(), this._config = i, this._injector = r, this._configService = e;
-    const { ...t } = Ue(
+    const { ...t } = be(
       {},
-      le,
+      ce,
       this._config
     );
-    this._configService.setConfig(Pt, t);
+    this._configService.setConfig(Dt, t);
   }
   onStarting() {
     [
-      [k],
+      [q],
       [M],
-      [j]
+      [k]
     ].forEach((i) => this._injector.add(i));
   }
   onReady() {
     De(this._injector, [
-      [k],
-      [j]
+      [q],
+      [k]
     ]);
   }
-}, w(z, "type", D.UNIVER_SHEET), w(z, "pluginName", Fe), z);
-ce = zt([
-  ae(1, I(Le)),
-  ae(2, Be)
-], ce);
+}, S(V, "type", b.UNIVER_SHEET), S(V, "pluginName", we), V);
+de = kt([
+  ue(1, $(Be)),
+  ue(2, He)
+], de);
 export {
-  Yt as ClearSheetsFilterCriteriaCommand,
+  tr as ClearSheetsFilterCriteriaCommand,
   x as CustomFilterOperator,
-  ge as FILTER_MUTATIONS,
-  Ct as FilterColumn,
-  V as FilterModel,
-  Kt as ReCalcSheetsFilterCommand,
+  Re as FILTER_MUTATIONS,
+  I as FilterBy,
+  St as FilterColumn,
+  j as FilterModel,
+  rr as ReCalcSheetsFilterCommand,
   W as ReCalcSheetsFilterMutation,
-  Nt as RemoveSheetFilterCommand,
-  y as RemoveSheetsFilterMutation,
-  Fe as SHEET_FILTER_SNAPSHOT_ID,
-  Tt as SetSheetFilterRangeCommand,
-  Jt as SetSheetsFilterCriteriaCommand,
+  Ut as RemoveSheetFilterCommand,
+  O as RemoveSheetsFilterMutation,
+  we as SHEET_FILTER_SNAPSHOT_ID,
+  $t as SetSheetFilterRangeCommand,
+  er as SetSheetsFilterCriteriaCommand,
   p as SetSheetsFilterCriteriaMutation,
   R as SetSheetsFilterRangeMutation,
   M as SheetsFilterService,
-  Gt as SmartToggleSheetsFilterCommand,
-  ce as UniverSheetsFilterPlugin,
-  mt as equals,
-  ie as getCustomFilterFn,
-  ct as greaterThan,
-  dt as greaterThanOrEqualTo,
-  ut as lessThan,
-  ht as lessThanOrEqualTo,
-  _e as notEquals
+  Zt as SmartToggleSheetsFilterCommand,
+  de as UniverSheetsFilterPlugin,
+  _t as equals,
+  oe as getCustomFilterFn,
+  ht as greaterThan,
+  ft as greaterThanOrEqualTo,
+  mt as lessThan,
+  gt as lessThanOrEqualTo,
+  Ce as notEquals
 };