@univerjs/sheets-table 0.10.2 → 0.10.3-experimental.20250812-b4b6f1a

package/lib/index.js

@@ -1,56 +1,56 @@
-var Ke = Object.defineProperty;
-var Xe = (t, e, n) => e in t ? Ke(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n;
-var b = (t, e, n) => Xe(t, typeof e != "symbol" ? e + "" : e, n);
-import { CellValueType as q, BorderStyleTypes as Ze, generateRandomId as L, IUniverInstanceService as W, Inject as C, LocaleService as de, Disposable as k, CommandType as N, IUndoRedoService as A, ICommandService as x, sequenceExecute as B, IResourceManagerService as et, Rectangle as Se, RTree as tt, InterceptorEffectEnum as nt, UniverInstanceType as he, customNameCharacterCheck as rt, ILogService as st, Injector as Be, Plugin as at, merge as ot, registerDependencies as it, touchDependencies as Me, IConfigService as lt } from "@univerjs/core";
-import { getSheetCommandTarget as $, SheetInterceptorService as _e, INTERCEPTOR_POINT as Le, AddRangeThemeMutation as Ee, RemoveRangeThemeMutation as We, SheetRangeThemeModel as He, SheetsSelectionsService as ge, InsertRowMutation as Pe, RemoveRowMutation as Ve, getMoveRangeUndoRedoMutations as me, InsertColMutation as qe, RemoveColMutation as Je, IExclusiveRangeService as ut, RefRangeService as ct, RemoveColCommand as dt, RemoveRowCommand as ht, InsertColCommand as gt, InsertRowCommand as mt, SheetRangeThemeService as bt, RangeThemeStyle as wt } from "@univerjs/sheets";
-import { Subject as Q, BehaviorSubject as ke, filter as be, switchMap as ve } from "rxjs";
-var I = /* @__PURE__ */ ((t) => (t.Insert = "insert", t.Delete = "delete", t))(I || {}), D = /* @__PURE__ */ ((t) => (t.Row = "row", t.Col = "column", t))(D || {}), Qe = /* @__PURE__ */ ((t) => (t.None = "none", t.String = "string", t.Number = "number", t.Date = "date", t.Bool = "bool", t.Checkbox = "checkbox", t.List = "list", t))(Qe || {}), ee = /* @__PURE__ */ ((t) => (t.manual = "manual", t.condition = "condition", t))(ee || {}), U = /* @__PURE__ */ ((t) => (t.Date = "date", t.Number = "number", t.String = "string", t.Logic = "logic", t))(U || {}), F = /* @__PURE__ */ ((t) => (t.Equal = "equal", t.NotEqual = "notEqual", t.GreaterThan = "greaterThan", t.GreaterThanOrEqual = "greaterThanOrEqual", t.LessThan = "lessThan", t.LessThanOrEqual = "lessThanOrEqual", t.Between = "between", t.NotBetween = "notBetween", t.Above = "above", t.Below = "below", t.TopN = "topN", t))(F || {}), P = /* @__PURE__ */ ((t) => (t.Equal = "equal", t.NotEqual = "notEqual", t.Contains = "contains", t.NotContains = "notContains", t.StartsWith = "startsWith", t.EndsWith = "endsWith", t))(P || {}), g = /* @__PURE__ */ ((t) => (t.Equal = "equal", t.NotEqual = "notEqual", t.After = "after", t.AfterOrEqual = "afterOrEqual", t.Before = "before", t.BeforeOrEqual = "beforeOrEqual", t.Between = "between", t.NotBetween = "notBetween", t.Today = "today", t.Yesterday = "yesterday", t.Tomorrow = "tomorrow", t.ThisWeek = "thisWeek", t.LastWeek = "lastWeek", t.NextWeek = "nextWeek", t.ThisMonth = "thisMonth", t.LastMonth = "lastMonth", t.NextMonth = "nextMonth", t.ThisQuarter = "thisQuarter", t.LastQuarter = "lastQuarter", t.NextQuarter = "nextQuarter", t.ThisYear = "thisYear", t.LastYear = "lastYear", t.NextYear = "nextYear", t.YearToDate = "yearToDate", t.Quarter = "quarter", t.Month = "month", t.M1 = "m1", t.M2 = "m2", t.M3 = "m3", t.M4 = "m4", t.M5 = "m5", t.M6 = "m6", t.M7 = "m7", t.M8 = "m8", t.M9 = "m9", t.M10 = "m10", t.M11 = "m11", t.M12 = "m12", t.Q1 = "q1", t.Q2 = "q2", t.Q3 = "q3", t.Q4 = "q4", t))(g || {}), V = /* @__PURE__ */ ((t) => (t[t.FilteredSortNone = 1] = "FilteredSortNone", t[t.FilteredSortAsc = 2] = "FilteredSortAsc", t[t.FilteredSortDesc = 3] = "FilteredSortDesc", t[t.FilterNoneSortNone = 4] = "FilterNoneSortNone", t[t.FilterNoneSortAsc = 5] = "FilterNoneSortAsc", t[t.FilterNoneSortDesc = 6] = "FilterNoneSortDesc", t))(V || {}), G = /* @__PURE__ */ ((t) => (t.Asc = "asc", t.Desc = "desc", t.None = "none", t))(G || {});
-function Z(t, e) {
+var Ze = Object.defineProperty;
+var et = (t, e, n) => e in t ? Ze(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n;
+var b = (t, e, n) => et(t, typeof e != "symbol" ? e + "" : e, n);
+import { CellValueType as q, BorderStyleTypes as tt, generateRandomId as L, IUniverInstanceService as W, Inject as C, LocaleService as de, Disposable as k, CommandType as N, IUndoRedoService as A, ICommandService as x, sequenceExecute as B, IResourceManagerService as nt, Rectangle as pe, RTree as rt, InterceptorEffectEnum as st, UniverInstanceType as he, customNameCharacterCheck as at, ILogService as ot, Injector as Ae, IConfigService as Be, Plugin as it, merge as lt, registerDependencies as ut, touchDependencies as Ie } from "@univerjs/core";
+import { getSheetCommandTarget as $, SheetInterceptorService as Ce, INTERCEPTOR_POINT as Le, AddRangeThemeMutation as Ee, RemoveRangeThemeMutation as We, SheetRangeThemeModel as He, SheetsSelectionsService as ge, InsertRowMutation as Pe, RemoveRowMutation as Ve, getMoveRangeUndoRedoMutations as me, InsertColMutation as qe, RemoveColMutation as Je, IExclusiveRangeService as ct, RefRangeService as dt, RemoveColCommand as ht, RemoveRowCommand as gt, InsertColCommand as mt, InsertRowCommand as bt, SheetRangeThemeService as wt, RangeThemeStyle as ft } from "@univerjs/sheets";
+import { Subject as Q, BehaviorSubject as ke, filter as be, switchMap as Me } from "rxjs";
+var I = /* @__PURE__ */ ((t) => (t.Insert = "insert", t.Delete = "delete", t))(I || {}), D = /* @__PURE__ */ ((t) => (t.Row = "row", t.Col = "column", t))(D || {}), Qe = /* @__PURE__ */ ((t) => (t.None = "none", t.String = "string", t.Number = "number", t.Date = "date", t.Bool = "bool", t.Checkbox = "checkbox", t.List = "list", t))(Qe || {}), Z = /* @__PURE__ */ ((t) => (t.manual = "manual", t.condition = "condition", t))(Z || {}), U = /* @__PURE__ */ ((t) => (t.Date = "date", t.Number = "number", t.String = "string", t.Logic = "logic", t))(U || {}), F = /* @__PURE__ */ ((t) => (t.Equal = "equal", t.NotEqual = "notEqual", t.GreaterThan = "greaterThan", t.GreaterThanOrEqual = "greaterThanOrEqual", t.LessThan = "lessThan", t.LessThanOrEqual = "lessThanOrEqual", t.Between = "between", t.NotBetween = "notBetween", t.Above = "above", t.Below = "below", t.TopN = "topN", t))(F || {}), P = /* @__PURE__ */ ((t) => (t.Equal = "equal", t.NotEqual = "notEqual", t.Contains = "contains", t.NotContains = "notContains", t.StartsWith = "startsWith", t.EndsWith = "endsWith", t))(P || {}), g = /* @__PURE__ */ ((t) => (t.Equal = "equal", t.NotEqual = "notEqual", t.After = "after", t.AfterOrEqual = "afterOrEqual", t.Before = "before", t.BeforeOrEqual = "beforeOrEqual", t.Between = "between", t.NotBetween = "notBetween", t.Today = "today", t.Yesterday = "yesterday", t.Tomorrow = "tomorrow", t.ThisWeek = "thisWeek", t.LastWeek = "lastWeek", t.NextWeek = "nextWeek", t.ThisMonth = "thisMonth", t.LastMonth = "lastMonth", t.NextMonth = "nextMonth", t.ThisQuarter = "thisQuarter", t.LastQuarter = "lastQuarter", t.NextQuarter = "nextQuarter", t.ThisYear = "thisYear", t.LastYear = "lastYear", t.NextYear = "nextYear", t.YearToDate = "yearToDate", t.Quarter = "quarter", t.Month = "month", t.M1 = "m1", t.M2 = "m2", t.M3 = "m3", t.M4 = "m4", t.M5 = "m5", t.M6 = "m6", t.M7 = "m7", t.M8 = "m8", t.M9 = "m9", t.M10 = "m10", t.M11 = "m11", t.M12 = "m12", t.Q1 = "q1", t.Q2 = "q2", t.Q3 = "q3", t.Q4 = "q4", t))(g || {}), V = /* @__PURE__ */ ((t) => (t[t.FilteredSortNone = 1] = "FilteredSortNone", t[t.FilteredSortAsc = 2] = "FilteredSortAsc", t[t.FilteredSortDesc = 3] = "FilteredSortDesc", t[t.FilterNoneSortNone = 4] = "FilterNoneSortNone", t[t.FilterNoneSortAsc = 5] = "FilterNoneSortAsc", t[t.FilterNoneSortDesc = 6] = "FilterNoneSortDesc", t))(V || {}), Y = /* @__PURE__ */ ((t) => (t.Asc = "asc", t.Desc = "desc", t.None = "none", t))(Y || {});
+function X(t, e) {
   return `${e} ${t}`;
 }
-const Fe = "TRUE", De = "FALSE", Rt = (t) => {
+const ve = "TRUE", Fe = "FALSE", Rt = (t) => {
   var n;
   return ((n = t.body) == null ? void 0 : n.dataStream.replace(/\r\n$/, "")) || "";
 };
 function Ye(t) {
   if (t) {
     const { v: e, t: n, p: r } = t;
-    return r ? Rt(r) : (n === q.FORCE_STRING || n === q.STRING) && e !== void 0 && e !== null ? String(e) : n === q.BOOLEAN ? e ? Fe : De : n === q.NUMBER ? String(e) : typeof e === "boolean" ? e ? Fe : De : e == null ? "" : String(e);
+    return r ? Rt(r) : (n === q.FORCE_STRING || n === q.STRING) && e !== void 0 && e !== null ? String(e) : n === q.BOOLEAN ? e ? ve : Fe : n === q.NUMBER ? String(e) : typeof e === "boolean" ? e ? ve : Fe : e == null ? "" : String(e);
   }
   return "";
 }
-function ft(t, e) {
+function pt(t, e) {
   if (t != null)
     switch (e) {
-      case G.Asc:
+      case Y.Asc:
         return V.FilteredSortAsc;
-      case G.Desc:
+      case Y.Desc:
         return V.FilteredSortDesc;
       default:
         return V.FilteredSortNone;
     }
   else
     switch (e) {
-      case G.Asc:
+      case Y.Asc:
         return V.FilterNoneSortAsc;
-      case G.Desc:
+      case Y.Desc:
         return V.FilterNoneSortDesc;
       default:
         return V.FilterNoneSortNone;
     }
 }
-function pt(t) {
-  return t ? t.filterType === ee.condition : !1;
+function St(t) {
+  return t ? t.filterType === Z.condition : !1;
 }
 function tr(t) {
-  return t ? t.filterType === ee.manual : !1;
+  return t ? t.filterType === Z.manual : !1;
 }
 const y = {
-  s: Ze.THIN,
+  s: tt.THIN,
   cl: {
     rgb: "rgb(95 101 116)"
   }
-}, nr = {
+}, Ge = "sheets-table.config", De = {}, nr = {
   headerRowStyle: {
     bd: {
       t: y
@@ -104,14 +104,14 @@ const y = {
       }
     };
   return e;
-}, St = [
+}, Ct = [
   [["#6280F9", "#FFFFFF", "#BAC6F8", "#D2DAFA"], ["#fff"]],
   [["#16BDCA", "#FFFFFF", "#EDFAFA", "#AFECEF"], ["#000"]],
   [["#31C48D", "#FFFFFF", "#F3FAF7", "#BCF0DA"], ["#fff"]],
   [["#AC94FA", "#FFFFFF", "#F6F5FF", "#EDEBFE"], ["#fff"]],
   [["#F17EBB", "#FFFFFF", "#FDF2F8", "#FCE8F3"], ["#fff"]],
   [["#F98080", "#FFFFFF", "#FDF2F2", "#FDE8E8"], ["#fff"]]
-], Y = St.map((t, e) => {
+], je = Ct.map((t, e) => {
   const [n, r] = t, [s, a, o, l] = n, [u] = r;
   return {
     name: `table-default-${e}`,
@@ -191,79 +191,79 @@ class J {
     this.id = e.id, this.displayName = e.displayName, this.dataType = e.dataType, this.formula = e.formula, this.meta = e.meta, this.style = e.style;
   }
 }
-const Ct = (t) => t.getMonth() <= 2, _t = (t) => {
+const _t = (t) => t.getMonth() <= 2, Tt = (t) => {
   const e = t.getMonth();
   return e > 2 && e <= 5;
-}, Tt = (t) => {
+}, It = (t) => {
   const e = t.getMonth();
   return e > 5 && e <= 8;
-}, It = (t) => {
+}, Mt = (t) => {
   const e = t.getMonth();
   return e > 8 && e <= 11;
-}, Mt = (t) => t.getMonth() === 0, vt = (t) => t.getMonth() === 1, Ft = (t) => t.getMonth() === 2, Dt = (t) => t.getMonth() === 3, Nt = (t) => t.getMonth() === 4, yt = (t) => t.getMonth() === 5, xt = (t) => t.getMonth() === 6, Ot = (t) => t.getMonth() === 7, Ut = (t) => t.getMonth() === 8, $t = (t) => t.getMonth() === 9, At = (t) => t.getMonth() === 10, Bt = (t) => t.getMonth() === 11, Lt = (t, e = /* @__PURE__ */ new Date()) => t.toDateString() === e.toDateString(), Et = (t, e = /* @__PURE__ */ new Date()) => {
+}, vt = (t) => t.getMonth() === 0, Ft = (t) => t.getMonth() === 1, Dt = (t) => t.getMonth() === 2, Nt = (t) => t.getMonth() === 3, yt = (t) => t.getMonth() === 4, xt = (t) => t.getMonth() === 5, Ot = (t) => t.getMonth() === 6, Ut = (t) => t.getMonth() === 7, $t = (t) => t.getMonth() === 8, At = (t) => t.getMonth() === 9, Bt = (t) => t.getMonth() === 10, Lt = (t) => t.getMonth() === 11, Et = (t, e = /* @__PURE__ */ new Date()) => t.toDateString() === e.toDateString(), Wt = (t, e = /* @__PURE__ */ new Date()) => {
   const n = new Date(e);
   return n.setDate(n.getDate() + 1), t.toDateString() === n.toDateString();
-}, Wt = (t, e = /* @__PURE__ */ new Date()) => {
+}, Ht = (t, e = /* @__PURE__ */ new Date()) => {
   const n = new Date(e);
   return n.setDate(n.getDate() - 1), t.toDateString() === n.toDateString();
-}, j = (t) => {
+}, G = (t) => {
   const e = t.getDay(), n = t.getDate() - e + (e === 0 ? -6 : 1), r = new Date(t);
   return r.setDate(n), r;
-}, Ge = 10080 * 60 * 1e3, Ht = (t, e = /* @__PURE__ */ new Date()) => {
-  const n = j(t), r = j(e);
-  return n.toDateString() === r.toDateString();
-}, Pt = (t, e = /* @__PURE__ */ new Date()) => {
-  const n = j(t), r = new Date(j(e).getTime() + Ge);
+}, ze = 10080 * 60 * 1e3, Pt = (t, e = /* @__PURE__ */ new Date()) => {
+  const n = G(t), r = G(e);
   return n.toDateString() === r.toDateString();
 }, Vt = (t, e = /* @__PURE__ */ new Date()) => {
-  const n = j(t), r = new Date(j(e).getTime() - Ge);
+  const n = G(t), r = new Date(G(e).getTime() + ze);
   return n.toDateString() === r.toDateString();
-}, qt = (t, e = /* @__PURE__ */ new Date()) => t.getFullYear() === e.getFullYear() && t.getMonth() === e.getMonth(), Jt = (t) => {
+}, qt = (t, e = /* @__PURE__ */ new Date()) => {
+  const n = G(t), r = new Date(G(e).getTime() - ze);
+  return n.toDateString() === r.toDateString();
+}, Jt = (t, e = /* @__PURE__ */ new Date()) => t.getFullYear() === e.getFullYear() && t.getMonth() === e.getMonth(), kt = (t) => {
   const e = new Date(t);
   return e.setHours(0, 0, 0, 0), e.setDate(1), e;
-}, kt = (t, e = /* @__PURE__ */ new Date()) => {
+}, Qt = (t, e = /* @__PURE__ */ new Date()) => {
   const n = new Date(e);
   n.setHours(0, 0, 0, 0), n.setMonth(n.getMonth() + 1, 1);
   const r = new Date(n);
   r.setMonth(r.getMonth() + 1, 0);
   const s = t.getTime();
   return s >= n.getTime() && s < r.getTime();
-}, Qt = (t, e = /* @__PURE__ */ new Date()) => {
-  const n = Jt(e), r = new Date(n);
+}, Yt = (t, e = /* @__PURE__ */ new Date()) => {
+  const n = kt(e), r = new Date(n);
   r.setMonth(r.getMonth() + 1, 0);
   const s = t.getTime();
   return s >= n.getTime() && s < r.getTime();
-}, Te = (t) => {
+}, _e = (t) => {
   const e = new Date(t);
   e.setHours(0, 0, 0, 0), e.setDate(1);
   const n = e.getMonth();
   return e.setMonth(n - n % 3), e;
-}, Yt = (t, e = /* @__PURE__ */ new Date()) => {
-  const n = Te(e), r = new Date(n);
+}, Gt = (t, e = /* @__PURE__ */ new Date()) => {
+  const n = _e(e), r = new Date(n);
   r.setMonth(r.getMonth() + 3);
   const s = t.getTime();
   return s >= n.getTime() && s < r.getTime();
-}, Gt = (t, e = /* @__PURE__ */ new Date()) => {
-  const n = Te(e), r = new Date(n);
+}, jt = (t, e = /* @__PURE__ */ new Date()) => {
+  const n = _e(e), r = new Date(n);
   r.setMonth(r.getMonth() + 3);
   const s = new Date(r);
   s.setMonth(s.getMonth() + 3, 0);
   const a = t.getTime();
   return a >= r.getTime() && a < s.getTime();
-}, jt = (t, e = /* @__PURE__ */ new Date()) => {
-  const n = Te(e), r = new Date(n);
+}, zt = (t, e = /* @__PURE__ */ new Date()) => {
+  const n = _e(e), r = new Date(n);
   r.setMonth(r.getMonth() - 3);
   const s = new Date(n);
   s.setDate(0);
   const a = t.getTime();
   return a >= r.getTime() && a < s.getTime();
-}, zt = (t, e = /* @__PURE__ */ new Date()) => t.getFullYear() === e.getFullYear(), Kt = (t, e = /* @__PURE__ */ new Date()) => t.getFullYear() === e.getFullYear() + 1, Xt = (t, e = /* @__PURE__ */ new Date()) => t.getFullYear() === e.getFullYear() - 1, Zt = (t, e = /* @__PURE__ */ new Date()) => {
+}, Kt = (t, e = /* @__PURE__ */ new Date()) => t.getFullYear() === e.getFullYear(), Xt = (t, e = /* @__PURE__ */ new Date()) => t.getFullYear() === e.getFullYear() + 1, Zt = (t, e = /* @__PURE__ */ new Date()) => t.getFullYear() === e.getFullYear() - 1, en = (t, e = /* @__PURE__ */ new Date()) => {
   const n = new Date(e);
   n.setHours(0, 0, 0, 0), n.setMonth(0, 1);
   const r = t.getTime();
   return r >= n.getTime() && r < e.getTime();
 };
-function en(t) {
+function tn(t) {
   switch (t.compareType) {
     case g.Equal: {
       const e = new Date(t.expectedValue);
@@ -301,105 +301,105 @@ function en(t) {
       };
     case g.Today: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => Lt(n, e);
+      return (n) => Et(n, e);
     }
     case g.Yesterday: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => Wt(n, e);
+      return (n) => Ht(n, e);
     }
     case g.Tomorrow: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => Et(n, e);
+      return (n) => Wt(n, e);
     }
     case g.ThisWeek: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => Ht(n, e);
+      return (n) => Pt(n, e);
     }
     case g.LastWeek: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => Vt(n, e);
+      return (n) => qt(n, e);
     }
     case g.NextWeek: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => Pt(n, e);
+      return (n) => Vt(n, e);
     }
     case g.ThisMonth: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => qt(n, e);
+      return (n) => Jt(n, e);
     }
     case g.LastMonth: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => Qt(n, e);
+      return (n) => Yt(n, e);
     }
     case g.NextMonth: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => kt(n, e);
+      return (n) => Qt(n, e);
     }
     case g.ThisQuarter: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => Yt(n, e);
+      return (n) => Gt(n, e);
     }
     case g.LastQuarter: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => jt(n, e);
+      return (n) => zt(n, e);
     }
     case g.NextQuarter: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => Gt(n, e);
+      return (n) => jt(n, e);
     }
     case g.ThisYear: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => zt(n, e);
+      return (n) => Kt(n, e);
     }
     case g.LastYear: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => Xt(n, e);
+      return (n) => Zt(n, e);
     }
     case g.NextYear: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => Kt(n, e);
+      return (n) => Xt(n, e);
     }
     case g.YearToDate: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => Zt(n, e);
+      return (n) => en(n, e);
     }
     case g.M1:
-      return Mt;
-    case g.M2:
       return vt;
-    case g.M3:
+    case g.M2:
       return Ft;
-    case g.M4:
+    case g.M3:
       return Dt;
-    case g.M5:
+    case g.M4:
       return Nt;
-    case g.M6:
+    case g.M5:
       return yt;
-    case g.M7:
+    case g.M6:
       return xt;
-    case g.M8:
+    case g.M7:
       return Ot;
-    case g.M9:
+    case g.M8:
       return Ut;
-    case g.M10:
+    case g.M9:
       return $t;
-    case g.M11:
+    case g.M10:
       return At;
-    case g.M12:
+    case g.M11:
       return Bt;
+    case g.M12:
+      return Lt;
     case g.Q1:
-      return Ct;
-    case g.Q2:
       return _t;
-    case g.Q3:
+    case g.Q2:
       return Tt;
-    case g.Q4:
+    case g.Q3:
       return It;
+    case g.Q4:
+      return Mt;
     default:
       throw new Error("Unsupported compare type");
   }
 }
-class tn {
+class nn {
   /**
    * Initializes a new instance of the Heap class.
    */
@@ -463,7 +463,7 @@ class tn {
     return this.heap.includes(e);
   }
 }
-class nn extends tn {
+class rn extends nn {
   /**
    * Initializes a new instance of the MinHeap class.
    */
@@ -502,13 +502,13 @@ class nn extends tn {
     this.heap[0] = this.heap.pop(), this.shiftDown(0);
   }
 }
-const rn = (t, e) => {
-  const n = new nn();
+const sn = (t, e) => {
+  const n = new rn();
   for (const r of t)
     n.insert(r), n.size() > e && n.pop();
   return n.heap;
-}, sn = (t, e) => t > e, an = (t, e) => t < e, on = (t, e, n) => rn(t, e).includes(n);
-function ln(t, e) {
+}, an = (t, e) => t > e, on = (t, e) => t < e, ln = (t, e, n) => sn(t, e).includes(n);
+function un(t, e) {
   switch (t.compareType) {
     case F.Equal: {
       const n = Number(t.expectedValue);
@@ -544,59 +544,59 @@ function ln(t, e) {
     }
     case F.Above: {
       const n = e.average;
-      return (r) => sn(r, n);
+      return (r) => an(r, n);
     }
     case F.Below: {
       const n = e.average;
-      return (r) => an(r, n);
+      return (r) => on(r, n);
     }
     case F.TopN: {
       const n = e.list, r = Number(t.expectedValue);
-      return (s) => on(n, r, s);
+      return (s) => ln(n, r, s);
     }
   }
 }
-const K = (t) => {
+const z = (t) => {
   const n = t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&").replace(/\\\*/g, ".*").replace(/\\\?/g, ".");
   return new RegExp(`^${n}$`);
-}, un = (t, e) => K(e).test(t), cn = (t, e) => !K(e).test(t), dn = (t, e) => K(`*${e}*`).test(t), hn = (t, e) => !K(`*${e}*`).test(t), gn = (t, e) => K(`${e}*`).test(t), mn = (t, e) => K(`*${e}`).test(t);
-function bn(t) {
+}, cn = (t, e) => z(e).test(t), dn = (t, e) => !z(e).test(t), hn = (t, e) => z(`*${e}*`).test(t), gn = (t, e) => !z(`*${e}*`).test(t), mn = (t, e) => z(`${e}*`).test(t), bn = (t, e) => z(`*${e}`).test(t);
+function wn(t) {
   switch (t.compareType) {
     case P.Equal:
-      return (e) => un(e, t.expectedValue);
-    case P.NotEqual:
       return (e) => cn(e, t.expectedValue);
-    case P.Contains:
+    case P.NotEqual:
       return (e) => dn(e, t.expectedValue);
-    case P.NotContains:
+    case P.Contains:
       return (e) => hn(e, t.expectedValue);
-    case P.StartsWith:
+    case P.NotContains:
       return (e) => gn(e, t.expectedValue);
-    case P.EndsWith:
+    case P.StartsWith:
       return (e) => mn(e, t.expectedValue);
+    case P.EndsWith:
+      return (e) => bn(e, t.expectedValue);
     default:
       return console.error(`Unknown filter operator: ${t.compareType}`), (e) => !0;
   }
 }
-const wn = /* @__PURE__ */ new Set([
+const fn = /* @__PURE__ */ new Set([
   F.Above,
   F.Below,
   F.TopN
 ]);
 g.Today, g.Yesterday, g.Tomorrow, g.ThisWeek, g.LastWeek, g.NextWeek, g.ThisMonth, g.LastMonth, g.NextMonth, g.ThisQuarter, g.LastQuarter, g.NextQuarter, g.NextYear, g.ThisYear, g.LastYear, g.YearToDate;
-function je(t) {
-  return wn.has(t);
+function Ke(t) {
+  return fn.has(t);
 }
 function Rn(t, e) {
-  if (je(t.filterInfo.compareType))
+  if (Ke(t.filterInfo.compareType))
     return (n) => !0;
   switch (t.filterInfo.conditionType) {
     case U.Date:
-      return en(t.filterInfo);
+      return tn(t.filterInfo);
     case U.Number:
-      return ln(t.filterInfo, e);
+      return un(t.filterInfo, e);
     case U.String:
-      return bn(t.filterInfo);
+      return wn(t.filterInfo);
     case U.Logic:
     default:
       return (n) => !0;
@@ -606,24 +606,32 @@ function oe(t, e, n, r) {
   switch (r) {
     case U.Date: {
       const s = Ne(t, e, n);
-      return s ? Sn(s) : null;
+      return s ? Cn(s) : null;
     }
     case U.Number:
       return Ne(t, e, n);
     case U.String:
     default:
-      return pn(t, e, n);
+      return Sn(t, e, n);
   }
 }
-const fn = (t) => {
+const pn = (t) => {
   var n;
   return ((n = t.body) == null ? void 0 : n.dataStream.replace(/\r\n$/, "")) || "";
 };
-function pn(t, e, n) {
+function Sn(t, e, n) {
   const r = t.getCell(e, n);
   if (!r) return null;
   const { v: s, t: a, p: o } = r;
-  return o ? fn(o) : typeof s == "string" ? a === q.BOOLEAN ? s.toUpperCase() : s : typeof s == "number" ? a === q.BOOLEAN ? s ? "TRUE" : "FALSE" : s : typeof s == "boolean" ? s ? "TRUE" : "FALSE" : s === void 0 ? "(空白)" : String(s);
+  if (o)
+    return pn(o);
+  if (typeof s == "string")
+    return a === q.BOOLEAN ? s.toUpperCase() : s;
+  if (typeof s == "number")
+    return a === q.BOOLEAN ? s ? "TRUE" : "FALSE" : s;
+  if (typeof s == "boolean") return s ? "TRUE" : "FALSE";
+  if (s !== void 0)
+    return String(s);
 }
 function Ne(t, e, n) {
   const r = t.getCell(e, n);
@@ -631,7 +639,7 @@ function Ne(t, e, n) {
   const { v: s, t: a, p: o } = r;
   return o ? null : typeof s == "string" && a === q.NUMBER ? Number(t.getCellRaw(e, n).v) : Number(s);
 }
-function Sn(t) {
+function Cn(t) {
   const e = new Date(Date.UTC(1900, 0, 1, 0, 0, 0)), n = new Date(Date.UTC(1900, 1, 28, 0, 0, 0));
   let r = t - 1;
   return r > (n.getTime() - e.getTime()) / (1e3 * 3600 * 24) && (r -= 1), r < 0 && (r = t), new Date(e.getTime() + r * (1e3 * 3600 * 24));
@@ -654,8 +662,8 @@ class ye {
   }
   getFilterState(e) {
     var r;
-    const n = ((r = this._tableSortInfo) == null ? void 0 : r.columnIndex) === e ? this._tableSortInfo.sortState : G.None;
-    return ft(this._tableColumnFilterList[e], n);
+    const n = ((r = this._tableSortInfo) == null ? void 0 : r.columnIndex) === e ? this._tableSortInfo.sortState : Y.None;
+    return pt(this._tableColumnFilterList[e], n);
   }
   getSortState() {
     var e;
@@ -681,7 +689,7 @@ class ye {
     if (a && e) {
       const { startRow: o, endRow: l, startColumn: u } = n, i = u + r, h = this.getExecuteFunc(e, n, r, a);
       for (let d = o; d <= l; d++) {
-        const c = pt(a) ? a.filterInfo.conditionType : U.String;
+        const c = St(a) ? a.filterInfo.conditionType : U.String;
         oe(e, d, i, c) === null ? s.add(d) : h(oe(e, d, i, c)) || s.add(d);
       }
     }
@@ -699,11 +707,11 @@ class ye {
     };
   }
   getExecuteFunc(e, n, r, s) {
-    if (s.filterType === ee.manual) {
+    if (s.filterType === Z.manual) {
       const a = new Set(s.values);
       return (o) => a.has(o);
-    } else if (s.filterType === ee.condition) {
-      const o = je(s.filterInfo.compareType) ? this._getNumberCalculatedOptions(e, n, r) : void 0;
+    } else if (s.filterType === Z.condition) {
+      const o = Ke(s.filterInfo.compareType) ? this._getNumberCalculatedOptions(e, n, r) : void 0;
       return Rn(s, o);
     } else
       return (a) => !0;
@@ -839,7 +847,7 @@ class xe {
   }
   getTableStyleId() {
     var e;
-    return (e = this._tableStyleId) != null ? e : Y[0].name;
+    return (e = this._tableStyleId) != null ? e : je[0].name;
   }
   setTableStyleId(e) {
     this._tableStyleId = e;
@@ -909,8 +917,8 @@ class xe {
     this._id = "", this._name = "", this._tableStyleId = "", this._showHeader = !0, this._showFooter = !0, delete this._range, this._columns.clear(), this._columnOrder = [];
   }
 }
-var Cn = Object.getOwnPropertyDescriptor, _n = (t, e, n, r) => {
-  for (var s = r > 1 ? void 0 : r ? Cn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
+var _n = Object.getOwnPropertyDescriptor, Tn = (t, e, n, r) => {
+  for (var s = r > 1 ? void 0 : r ? _n(e, n) : e, a = t.length - 1, o; a >= 0; a--)
     (o = t[a]) && (s = o(s) || s);
   return s;
 }, Oe = (t, e) => (n, r) => e(n, r, t);
@@ -941,7 +949,7 @@ let _ = class extends k {
     var d;
     const a = (d = this._univerInstanceService.getUnit(e)) == null ? void 0 : d.getSheetBySheetId(n), { startRow: o, startColumn: l, endColumn: u } = r, i = [], h = s != null ? s : "Column";
     for (let c = l; c <= u; c++)
-      i.push(Ye(a == null ? void 0 : a.getCell(o, c)) || Z(c - l + 1, h));
+      i.push(Ye(a == null ? void 0 : a.getCell(o, c)) || X(c - l + 1, h));
     return i;
   }
   /**
@@ -1074,7 +1082,7 @@ let _ = class extends k {
       else if (o === "column") {
         d.endColumn += u;
         for (let c = 0; c < u; c++) {
-          const m = this._localeService.t("sheets-table.columnPrefix"), S = new J(L(), Z(s.getColumnsCount() + 1 + c, m));
+          const m = this._localeService.t("sheets-table.columnPrefix"), S = new J(L(), X(s.getColumnsCount() + 1 + c, m));
           i != null && i[c] && S.fromJSON(i[c]);
           const w = l + c - h.startColumn;
           s.insertColumn(w, S);
@@ -1104,7 +1112,7 @@ let _ = class extends k {
     if (o.startColumn < a.startColumn) {
       const l = a.startColumn - o.startColumn, u = this._localeService.t("sheets-table.columnPrefix");
       for (let i = 0; i < l; i++)
-        s.insertColumn(a.startColumn, new J(L(), Z(s.getColumnsCount() + 1, u)));
+        s.insertColumn(a.startColumn, new J(L(), X(s.getColumnsCount() + 1, u)));
     } else if (o.startColumn > a.startColumn) {
       const l = o.startColumn - a.startColumn;
       for (let u = l - 1; u >= 0; u--) {
@@ -1121,7 +1129,7 @@ let _ = class extends k {
     } else if (o.endColumn > a.endColumn) {
       const l = o.endColumn - a.endColumn;
       for (let u = 0; u < l; u++)
-        s.insertColumn(a.endColumn, new J(L(), Z(s.getColumnsCount() + 1, "Column")));
+        s.insertColumn(a.endColumn, new J(L(), X(s.getColumnsCount() + 1, "Column")));
     }
     s.setRange(o), this._tableRangeChanged$.next({
       unitId: e,
@@ -1210,16 +1218,16 @@ let _ = class extends k {
     }), this._tableMap.clear();
   }
 };
-_ = _n([
+_ = Tn([
   Oe(0, W),
   Oe(1, C(de))
 ], _);
-var Tn = Object.getOwnPropertyDescriptor, In = (t, e, n, r) => {
-  for (var s = r > 1 ? void 0 : r ? Tn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
+var In = Object.getOwnPropertyDescriptor, Mn = (t, e, n, r) => {
+  for (var s = r > 1 ? void 0 : r ? In(e, n) : e, a = t.length - 1, o; a >= 0; a--)
     (o = t[a]) && (s = o(s) || s);
   return s;
-}, Mn = (t, e) => (n, r) => e(n, r, t);
-let z = class extends k {
+}, vn = (t, e) => (n, r) => e(n, r, t);
+let j = class extends k {
   constructor(t) {
     super(), this._tableManager = t;
   }
@@ -1263,24 +1271,24 @@ let z = class extends k {
     return oe(t, e, n, r);
   }
 };
-z = In([
-  Mn(0, C(_))
-], z);
-const te = {
+j = Mn([
+  vn(0, C(_))
+], j);
+const ee = {
   id: "sheet.mutation.add-table",
   type: N.MUTATION,
   handler: (t, e) => {
     const { tableId: n, unitId: r, subUnitId: s, name: a, range: o, header: l, options: u } = e;
-    return t.get(z).addTable(r, s, a, o, l, n, u), !0;
+    return t.get(j).addTable(r, s, a, o, l, n, u), !0;
   }
-}, ne = {
+}, te = {
   id: "sheet.mutation.delete-table",
   type: N.MUTATION,
   handler: (t, e) => {
     const { unitId: n, subUnitId: r, tableId: s } = e;
-    return t.get(z).deleteTable(n, r, s), !0;
+    return t.get(j).deleteTable(n, r, s), !0;
   }
-}, vn = {
+}, Fn = {
   id: "sheet.command.add-table",
   type: N.COMMAND,
   handler: (t, e) => {
@@ -1290,17 +1298,17 @@ const te = {
     const n = t.get(A), r = t.get(x), s = t.get(de), a = (w = e.id) != null ? w : L();
     let o = e.name;
     if (!o) {
-      const R = t.get(_).getTableList(e.unitId).length;
-      o = `${s.t("sheets-table.tablePrefix")}${R + 1}`;
+      const f = t.get(_).getTableList(e.unitId).length;
+      o = `${s.t("sheets-table.tablePrefix")}${f + 1}`;
     }
     const l = [], u = [], i = t.get(_), { unitId: h, subUnitId: d, range: c } = e, m = i.getColumnHeader(h, d, c, s.t("sheets-table.columnPrefix"));
-    return l.push({ id: te.id, params: { ...e, tableId: a, name: o, header: m } }), u.push({ id: ne.id, params: { tableId: a, unitId: e.unitId } }), B(l, r) && n.pushUndoRedo({
+    return l.push({ id: ee.id, params: { ...e, tableId: a, name: o, header: m } }), u.push({ id: te.id, params: { tableId: a, unitId: e.unitId } }), B(l, r) && n.pushUndoRedo({
       unitID: e.unitId,
       undoMutations: u,
       redoMutations: l
     }), !0;
   }
-}, Fn = {
+}, Dn = {
   id: "sheet.command.delete-table",
   type: N.COMMAND,
   handler: (t, e) => {
@@ -1309,8 +1317,8 @@ const te = {
     const n = t.get(A), r = t.get(x), s = t.get(_), a = [], o = [], l = s.getTable(e.unitId, e.tableId), u = l == null ? void 0 : l.toJSON();
     if (!u)
       throw new Error("[TableManager]: Table not found");
-    return a.push({ id: ne.id, params: { ...e } }), o.push({
-      id: te.id,
+    return a.push({ id: te.id, params: { ...e } }), o.push({
+      id: ee.id,
       params: {
         unitId: e.unitId,
         subUnitId: e.subUnitId,
@@ -1325,29 +1333,29 @@ const te = {
       redoMutations: a
     }), !0;
   }
-}, Ce = {
+}, Se = {
   id: "sheet.mutation.set-table-filter",
   type: N.MUTATION,
   handler: (t, e) => {
     const { tableId: n, unitId: r, column: s, tableFilter: a } = e;
     return t.get(_).addFilter(r, n, s, a), !0;
   }
-}, Dn = {
+}, Nn = {
   id: "sheet.command.set-table-filter",
   type: N.COMMAND,
   handler: (t, e) => {
     if (!e)
       return !1;
     const n = t.get(A), r = t.get(x), s = e.tableId || L(), a = [], o = [];
-    return a.push({ id: Ce.id, params: { ...e, tableId: s } }), o.push({ id: Ce.id, params: { ...e, tableId: s, tableFilter: void 0 } }), B(a, r) && n.pushUndoRedo({
+    return a.push({ id: Se.id, params: { ...e, tableId: s } }), o.push({ id: Se.id, params: { ...e, tableId: s, tableFilter: void 0 } }), B(a, r) && n.pushUndoRedo({
       unitID: e.unitId,
       undoMutations: o,
       redoMutations: a
     }), !0;
   }
-}, ze = "SHEET_TABLE_PLUGIN", se = "SHEET_TABLE", Nn = "table-custom";
-var yn = Object.getOwnPropertyDescriptor, xn = (t, e, n, r) => {
-  for (var s = r > 1 ? void 0 : r ? yn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
+}, Xe = "SHEET_TABLE_PLUGIN", re = "SHEET_TABLE", yn = "table-custom";
+var xn = Object.getOwnPropertyDescriptor, On = (t, e, n, r) => {
+  for (var s = r > 1 ? void 0 : r ? xn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
     (o = t[a]) && (s = o(s) || s);
   return s;
 }, we = (t, e) => (n, r) => e(n, r, t);
@@ -1360,13 +1368,13 @@ let E = class extends k {
   getContainerTableWithRange(e, n, r) {
     const s = this._ensureTableRangeRTree(e), o = Array.from(s.bulkSearch([{ unitId: e, sheetId: n, range: r }])).find((l) => {
       const u = this._tableManager.getTable(e, String(l));
-      return u ? Se.contains(u.getRange(), r) : !1;
+      return u ? pe.contains(u.getRange(), r) : !1;
     });
     if (o)
       return this._tableManager.getTable(e, String(o));
   }
   _ensureTableRangeRTree(e) {
-    return this._tableRangeRTree.has(e) || this._tableRangeRTree.set(e, new tt()), this._tableRangeRTree.get(e);
+    return this._tableRangeRTree.has(e) || this._tableRangeRTree.set(e, new rt()), this._tableRangeRTree.get(e);
   }
   registerTableChangeEvent() {
     this.disposeWithMe(
@@ -1409,7 +1417,7 @@ let E = class extends k {
   registerTableHeaderInterceptor() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(Le.CELL_CONTENT, {
-        effect: nt.Value,
+        effect: st.Value,
         handler: (e, n, r) => {
           const { row: s, col: a, unitId: o, subUnitId: l } = n, u = this._ensureTableRangeRTree(o);
           if ((e == null ? void 0 : e.v) === void 0 && u) {
@@ -1452,7 +1460,7 @@ let E = class extends k {
         }
       },
       businesses: [he.UNIVER_SHEET],
-      pluginName: ze,
+      pluginName: Xe,
       onLoad: (e, n) => {
         this._fromJSON(e, n);
       },
@@ -1465,10 +1473,10 @@ let E = class extends k {
     super.dispose(), this._tableRangeRTree.clear();
   }
 };
-E = xn([
-  we(0, C(_e)),
+E = On([
+  we(0, C(Ce)),
   we(1, C(_)),
-  we(2, C(et))
+  we(2, C(nt))
 ], E);
 const p = {
   id: "sheet.mutation.set-sheet-table",
@@ -1479,7 +1487,7 @@ const p = {
     const { unitId: n, tableId: r, config: s } = e;
     return t.get(_).setTableByConfig(n, r, s), !0;
   }
-}, On = {
+}, Un = {
   id: "sheet.command.add-table-theme",
   type: N.COMMAND,
   handler: (t, e) => {
@@ -1530,7 +1538,7 @@ const p = {
       redoMutations: o
     }), !0;
   }
-}, Un = {
+}, $n = {
   id: "sheet.command.remove-table-theme",
   type: N.COMMAND,
   handler: (t, e) => {
@@ -1538,8 +1546,8 @@ const p = {
       return !1;
     const { unitId: n, tableId: r, themeName: s } = e, a = t.get(_), o = t.get(He), l = a.getTableById(n, r);
     if (!l) return !1;
-    const u = l.getSubunitId(), i = [], h = [], d = o.getRegisteredRangeThemes().filter((R) => R == null ? void 0 : R.startsWith("table-default"));
-    let m = o.getRegisteredRangeThemes().filter((R) => R == null ? void 0 : R.startsWith(Nn)).find((R) => R !== s);
+    const u = l.getSubunitId(), i = [], h = [], d = o.getRegisteredRangeThemes().filter((f) => f == null ? void 0 : f.startsWith("table-default"));
+    let m = o.getRegisteredRangeThemes().filter((f) => f == null ? void 0 : f.startsWith(yn)).find((f) => f !== s);
     m || (m = d[0]), i.push({ id: p.id, params: { unitId: n, subUnitId: u, tableId: r, config: { theme: m } } }), i.push({ id: We.id, params: { unitId: n, subUnitId: u, styleName: s } });
     const S = o.getDefaultRangeThemeStyle(s);
     S && (h.push({ id: Ee.id, params: { unitId: n, subUnitId: u, styleJSON: S.toJson() } }), h.push({ id: p.id, params: { unitId: n, subUnitId: u, tableId: r, config: { theme: s } } }));
@@ -1550,7 +1558,7 @@ const p = {
       undoMutations: h
     }), !0;
   }
-}, $n = {
+}, An = {
   id: "sheet.command.set-table-config",
   type: N.COMMAND,
   // eslint-disable-next-line max-lines-per-function
@@ -1563,8 +1571,8 @@ const p = {
     if (S && S.getSheets().forEach((O) => {
       w.add(O.getName());
     }), s) {
-      if (!rt(s, w))
-        return t.get(st).warn(c.t("sheets-table.tableNameError")), !1;
+      if (!at(s, w))
+        return t.get(ot).warn(c.t("sheets-table.tableNameError")), !1;
       h.name = i.getDisplayName(), d.name = s;
     }
     o && (h.rowColOperation = {
@@ -1575,13 +1583,13 @@ const p = {
     }, d.rowColOperation = o), a && (h.updateRange = {
       newRange: i.getRange()
     }, d.updateRange = a), l && (h.theme = i.getTableStyleId(), d.theme = l);
-    const f = {
+    const R = {
       unitId: n,
       subUnitId: i.getSubunitId(),
       tableId: r,
       config: d
     };
-    return t.get(x).executeCommand(p.id, f), t.get(A).pushUndoRedo({
+    return t.get(x).executeCommand(p.id, R), t.get(A).pushUndoRedo({
       unitID: n,
       undoMutations: [
         {
@@ -1597,12 +1605,12 @@ const p = {
       redoMutations: [
         {
           id: p.id,
-          params: f
+          params: R
         }
       ]
     }), !0;
   }
-}, An = {
+}, Bn = {
   id: "sheet.command.table-insert-row",
   type: N.COMMAND,
   handler: (t) => {
@@ -1615,16 +1623,16 @@ const p = {
     t.get(_);
     const h = u[0].range, c = t.get(E).getContainerTableWithRange(a, o, h);
     if (!c) return !1;
-    const m = h.endRow - h.startRow + 1, w = s.getRowCount() - 1, f = s.getCellMatrix().getDataRange().endRow, R = [], T = [];
-    if (w - f < m)
-      R.push({
+    const m = h.endRow - h.startRow + 1, w = s.getRowCount() - 1, R = s.getCellMatrix().getDataRange().endRow, f = [], T = [];
+    if (w - R < m)
+      f.push({
         id: Pe.id,
         params: {
           unitId: a,
           subUnitId: o,
           range: { ...h }
         }
-      }), R.push({
+      }), f.push({
         id: p.id,
         params: {
           unitId: a,
@@ -1661,7 +1669,7 @@ const p = {
       });
     else {
       const M = { ...c.getRange() };
-      R.push({
+      f.push({
         id: p.id,
         params: {
           unitId: a,
@@ -1689,14 +1697,14 @@ const p = {
           }
         }
       });
-      const X = me(
+      const K = me(
         t,
         {
           unitId: a,
           subUnitId: o,
           range: {
             startRow: h.startRow,
-            endRow: f,
+            endRow: R,
             startColumn: M.startColumn,
             endColumn: M.endColumn
           }
@@ -1706,22 +1714,22 @@ const p = {
           subUnitId: o,
           range: {
             startRow: h.startRow + m,
-            endRow: f + m,
+            endRow: R + m,
             startColumn: M.startColumn,
             endColumn: M.endColumn
           }
         }
       );
-      X && (R.push(...X.redos), T.push(...X.undos));
+      K && (f.push(...K.redos), T.push(...K.undos));
     }
     const O = t.get(x);
-    return B(R, O) && t.get(A).pushUndoRedo({
+    return B(f, O) && t.get(A).pushUndoRedo({
       unitID: a,
       undoMutations: T,
-      redoMutations: R
+      redoMutations: f
     }), !0;
   }
-}, Bn = {
+}, Ln = {
   id: "sheet.command.table-insert-col",
   type: N.COMMAND,
   handler: (t) => {
@@ -1733,16 +1741,16 @@ const p = {
       return !1;
     const i = l[0].range, d = t.get(E).getContainerTableWithRange(s, a, i);
     if (!d) return !1;
-    const c = i.endColumn - i.startColumn + 1, S = r.getColumnCount() - 1, w = r.getCellMatrix().getDataRange().endColumn, f = [], R = [];
+    const c = i.endColumn - i.startColumn + 1, S = r.getColumnCount() - 1, w = r.getCellMatrix().getDataRange().endColumn, R = [], f = [];
     if (S - w < c)
-      f.push({
+      R.push({
         id: qe.id,
         params: {
           unitId: s,
           subUnitId: a,
           range: { ...i }
         }
-      }), f.push({
+      }), R.push({
         id: p.id,
         params: {
           unitId: s,
@@ -1757,7 +1765,7 @@ const p = {
             }
           }
         }
-      }), R.push({
+      }), f.push({
         id: p.id,
         params: {
           unitId: s,
@@ -1772,7 +1780,7 @@ const p = {
             }
           }
         }
-      }), R.push({
+      }), f.push({
         id: Je.id,
         params: {
           unitId: s,
@@ -1782,7 +1790,7 @@ const p = {
       });
     else {
       const v = d.getRange();
-      f.push({
+      R.push({
         id: p.id,
         params: {
           unitId: s,
@@ -1797,7 +1805,7 @@ const p = {
             }
           }
         }
-      }), R.push({
+      }), f.push({
         id: p.id,
         params: {
           unitId: s,
@@ -1836,16 +1844,16 @@ const p = {
           }
         }
       );
-      M && (f.push(...M.redos), R.push(...M.undos));
+      M && (R.push(...M.redos), f.push(...M.undos));
     }
     const T = t.get(x);
-    return B(f, T) && t.get(A).pushUndoRedo({
+    return B(R, T) && t.get(A).pushUndoRedo({
       unitID: s,
-      undoMutations: R,
-      redoMutations: f
+      undoMutations: f,
+      redoMutations: R
     }), !0;
   }
-}, Ln = {
+}, En = {
   id: "sheet.command.table-remove-row",
   type: N.COMMAND,
   handler: (t, e) => {
@@ -1888,14 +1896,14 @@ const p = {
         }
       }
     });
-    const R = r.worksheet.getCellMatrix().getDataRange().endRow, T = me(
+    const f = r.worksheet.getCellMatrix().getDataRange().endRow, T = me(
       t,
       {
         unitId: s,
         subUnitId: a,
         range: {
           startRow: i.endRow + 1,
-          endRow: R,
+          endRow: f,
           startColumn: w.startColumn,
           endColumn: w.endColumn
         }
@@ -1905,7 +1913,7 @@ const p = {
         subUnitId: a,
         range: {
           startRow: i.startRow,
-          endRow: R - c,
+          endRow: f - c,
           startColumn: w.startColumn,
           endColumn: w.endColumn
         }
@@ -1919,7 +1927,7 @@ const p = {
       redoMutations: m
     }), !0;
   }
-}, En = {
+}, Wn = {
   id: "sheet.command.table-remove-col",
   type: N.COMMAND,
   handler: (t, e) => {
@@ -1935,7 +1943,7 @@ const p = {
       return !1;
     const h = u[0].range, c = t.get(E).getContainerTableWithRange(a, o, h);
     if (!c) return !1;
-    const m = h.endColumn - h.startColumn + 1, S = [], w = [], f = c.getRange();
+    const m = h.endColumn - h.startColumn + 1, S = [], w = [], R = c.getRange();
     S.push({
       id: p.id,
       params: {
@@ -1952,10 +1960,10 @@ const p = {
         }
       }
     });
-    const R = [], T = h.startColumn - f.startColumn;
-    for (let re = 0; re < m; re++) {
-      const Ie = c.getTableInfo().columns[T + re];
-      Ie && R.push(Ie);
+    const f = [], T = h.startColumn - R.startColumn;
+    for (let ne = 0; ne < m; ne++) {
+      const Te = c.getTableInfo().columns[T + ne];
+      Te && f.push(Te);
     }
     w.push({
       id: p.id,
@@ -1969,7 +1977,7 @@ const p = {
             rowColType: D.Col,
             index: h.startColumn,
             count: m,
-            columnsJson: R
+            columnsJson: f
           }
         }
       }
@@ -1980,8 +1988,8 @@ const p = {
         unitId: a,
         subUnitId: o,
         range: {
-          startRow: f.startRow,
-          endRow: f.endRow,
+          startRow: R.startRow,
+          endRow: R.endRow,
           startColumn: h.endColumn + 1,
           endColumn: v
         }
@@ -1990,27 +1998,27 @@ const p = {
         unitId: a,
         subUnitId: o,
         range: {
-          startRow: f.startRow,
-          endRow: f.endRow,
+          startRow: R.startRow,
+          endRow: R.endRow,
           startColumn: h.startColumn,
           endColumn: v - m
         }
       }
     );
     M && (S.push(...M.redos), w.push(...M.undos));
-    const X = t.get(x);
-    return B(S, X) && t.get(A).pushUndoRedo({
+    const K = t.get(x);
+    return B(S, K) && t.get(A).pushUndoRedo({
       unitID: a,
       undoMutations: w,
       redoMutations: S
     }), !0;
   }
-}, Wn = "sheets-table.config", Ue = {};
+};
 var Hn = Object.getOwnPropertyDescriptor, Pn = (t, e, n, r) => {
   for (var s = r > 1 ? void 0 : r ? Hn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
     (o = t[a]) && (s = o(s) || s);
   return s;
-}, $e = (t, e) => (n, r) => e(n, r, t);
+}, Ue = (t, e) => (n, r) => e(n, r, t);
 let ie = class extends k {
   constructor(t, e) {
     super(), this._tableManager = t, this._exclusiveRangeService = e, this._initRangeListener();
@@ -2019,7 +2027,7 @@ let ie = class extends k {
     this.disposeWithMe(
       this._tableManager.tableRangeChanged$.subscribe((t) => {
         const { range: e, tableId: n, unitId: r, subUnitId: s } = t;
-        this._exclusiveRangeService.clearExclusiveRangesByGroupId(r, s, se, n), this._exclusiveRangeService.addExclusiveRange(r, s, se, [{
+        this._exclusiveRangeService.clearExclusiveRangesByGroupId(r, s, re, n), this._exclusiveRangeService.addExclusiveRange(r, s, re, [{
           range: { ...e },
           groupId: n
         }]);
@@ -2027,7 +2035,7 @@ let ie = class extends k {
     ), this.disposeWithMe(
       this._tableManager.tableAdd$.subscribe((t) => {
         const { tableId: e, unitId: n, subUnitId: r, range: s } = t;
-        this._exclusiveRangeService.addExclusiveRange(n, r, se, [{
+        this._exclusiveRangeService.addExclusiveRange(n, r, re, [{
           range: { ...s },
           groupId: e
         }]);
@@ -2035,14 +2043,14 @@ let ie = class extends k {
     ), this.disposeWithMe(
       this._tableManager.tableDelete$.subscribe((t) => {
         const { tableId: e, unitId: n, subUnitId: r } = t;
-        this._exclusiveRangeService.clearExclusiveRangesByGroupId(n, r, se, e);
+        this._exclusiveRangeService.clearExclusiveRangesByGroupId(n, r, re, e);
       })
     );
   }
 };
 ie = Pn([
-  $e(0, C(_)),
-  $e(1, C(ut))
+  Ue(0, C(_)),
+  Ue(1, C(ct))
 ], ie);
 var Vn = Object.getOwnPropertyDescriptor, qn = (t, e, n, r) => {
   for (var s = r > 1 ? void 0 : r ? Vn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
@@ -2059,13 +2067,13 @@ let le = class extends k {
       getMutations(e) {
         const n = { redos: [], undos: [] }, { id: r, params: s } = e;
         switch (r) {
-          case mt.id:
+          case bt.id:
             return t._generateTableMutationWithInsertRow(s);
-          case gt.id:
+          case mt.id:
             return t._generateTableMutationWithInsertCol(s);
-          case ht.id:
+          case gt.id:
             return t._generateTableMutationWithRemoveRow(s);
-          case dt.id:
+          case ht.id:
             return t._generateTableMutationWithRemoveCol(s);
         }
         return n;
@@ -2173,10 +2181,10 @@ let le = class extends k {
     const { range: i } = t, h = i.endRow - i.startRow + 1;
     return u.forEach((d) => {
       const c = d.getRange();
-      if (Se.intersects(c, i))
+      if (pe.intersects(c, i))
         if (i.startRow <= c.startRow && i.endRow >= c.startRow) {
           r.push({
-            id: ne.id,
+            id: te.id,
             params: {
               unitId: o,
               subUnitId: l,
@@ -2185,7 +2193,7 @@ let le = class extends k {
           });
           const m = d.toJSON();
           e.push({
-            id: te.id,
+            id: ee.id,
             params: {
               unitId: o,
               subUnitId: l,
@@ -2266,24 +2274,24 @@ let le = class extends k {
     const { range: i } = t, h = i.endColumn - i.startColumn + 1;
     return u.forEach((d) => {
       const c = d.getRange();
-      if (Se.intersects(c, i)) {
+      if (pe.intersects(c, i)) {
         if (i.startColumn <= c.startColumn && i.endColumn >= c.endColumn) {
           r.push({
-            id: ne.id,
+            id: te.id,
             params: {
               unitId: o,
               subUnitId: l,
               tableId: d.getId()
             }
           });
-          const m = d.toJSON(), { startRow: S, startColumn: w, endColumn: f } = m.range, R = this._univerInstanceService.getUnit(o), T = R == null ? void 0 : R.getSheetBySheetId(l);
+          const m = d.toJSON(), { startRow: S, startColumn: w, endColumn: R } = m.range, f = this._univerInstanceService.getUnit(o), T = f == null ? void 0 : f.getSheetBySheetId(l);
           if (!T)
             return { undos: e, redos: n, preRedos: r, preUndos: s };
           const O = [];
-          for (let v = w; v <= f; v++)
-            O.push(Ye(T == null ? void 0 : T.getCell(S, v)) || Z(v - w + 1, this._localeService.t("sheets-table.columnPrefix")));
+          for (let v = w; v <= R; v++)
+            O.push(Ye(T == null ? void 0 : T.getCell(S, v)) || X(v - w + 1, this._localeService.t("sheets-table.columnPrefix")));
           e.push({
-            id: te.id,
+            id: ee.id,
             params: {
               unitId: o,
               subUnitId: l,
@@ -2314,8 +2322,8 @@ let le = class extends k {
           });
           const S = [];
           for (let w = 0; w < m; w++) {
-            const f = d.getTableColumnByIndex(w);
-            f && S.push(f.toJSON());
+            const R = d.getTableColumnByIndex(w);
+            R && S.push(R.toJSON());
           }
           e.push({
             id: p.id,
@@ -2353,9 +2361,9 @@ let le = class extends k {
             }
           });
           const S = [], w = i.startColumn - c.startColumn;
-          for (let f = 0; f < m; f++) {
-            const R = d.getTableColumnByIndex(f + w);
-            R && S.push(R.toJSON());
+          for (let R = 0; R < m; R++) {
+            const f = d.getTableColumnByIndex(R + w);
+            f && S.push(f.toJSON());
           }
           e.push({
             id: p.id,
@@ -2393,8 +2401,8 @@ let le = class extends k {
           });
           const m = [], S = i.startColumn - c.startColumn;
           for (let w = 0; w < h; w++) {
-            const f = d.getTableColumnByIndex(w + S);
-            f && m.push(f.toJSON());
+            const R = d.getTableColumnByIndex(w + S);
+            R && m.push(R.toJSON());
           }
           e.push({
             id: p.id,
@@ -2473,10 +2481,10 @@ let le = class extends k {
 };
 le = qn([
   H(0, C(x)),
-  H(1, C(ct)),
+  H(1, C(dt)),
   H(2, C(W)),
-  H(3, C(Be)),
-  H(4, C(_e)),
+  H(3, C(Ae)),
+  H(4, C(Ce)),
   H(5, C(_)),
   H(6, C(de))
 ], le);
@@ -2484,72 +2492,81 @@ var Jn = Object.getOwnPropertyDescriptor, kn = (t, e, n, r) => {
   for (var s = r > 1 ? void 0 : r ? Jn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
     (o = t[a]) && (s = o(s) || s);
   return s;
-}, Re = (t, e) => (n, r) => e(n, r, t);
+}, se = (t, e) => (n, r) => e(n, r, t);
 let ue = class extends k {
-  constructor(t, e, n) {
-    super(), this._tableManager = t, this._sheetRangeThemeService = e, this._sheetRangeThemeModel = n, this.registerTableChangeEvent(), this._initDefaultTableTheme();
+  constructor(e, n, r, s) {
+    super();
+    b(this, "_defaultThemeIndex", 0);
+    b(this, "_allThemes", []);
+    this._tableManager = e, this._sheetRangeThemeService = n, this._sheetRangeThemeModel = r, this._configService = s, this._initUserTableTheme(), this.registerTableChangeEvent(), this._initDefaultTableTheme();
   }
   registerTableChangeEvent() {
     this.disposeWithMe(
-      this._tableManager.tableAdd$.subscribe((t) => {
-        const { range: e, tableId: n, unitId: r, subUnitId: s } = t, o = this._tableManager.getTable(r, n).getTableStyleId() || Y[0].name;
-        this._sheetRangeThemeService.registerRangeThemeStyle(o, {
-          unitId: r,
-          subUnitId: s,
-          range: { ...e }
+      this._tableManager.tableAdd$.subscribe((e) => {
+        const { range: n, tableId: r, unitId: s, subUnitId: a } = e, o = this._tableManager.getTable(s, r), l = this._allThemes[this._defaultThemeIndex].name;
+        o.setTableStyleId(l), this._sheetRangeThemeService.registerRangeThemeStyle(l, {
+          unitId: s,
+          subUnitId: a,
+          range: { ...n }
         });
       })
     ), this.disposeWithMe(
-      this._tableManager.tableRangeChanged$.subscribe((t) => {
-        const { range: e, oldRange: n, tableId: r, unitId: s, subUnitId: a } = t, l = this._tableManager.getTable(s, r).getTableStyleId() || Y[0].name;
-        this._sheetRangeThemeService.removeRangeThemeRule(l, {
-          unitId: s,
-          subUnitId: a,
+      this._tableManager.tableRangeChanged$.subscribe((e) => {
+        const { range: n, oldRange: r, tableId: s, unitId: a, subUnitId: o } = e, l = this._tableManager.getTable(a, s);
+        let u = l.getTableStyleId();
+        u || (u = this._allThemes[this._defaultThemeIndex].name, l.setTableStyleId(u)), this._sheetRangeThemeService.removeRangeThemeRule(u, {
+          unitId: a,
+          subUnitId: o,
+          range: { ...r }
+        }), this._sheetRangeThemeService.registerRangeThemeStyle(u, {
+          unitId: a,
+          subUnitId: o,
           range: { ...n }
-        }), this._sheetRangeThemeService.registerRangeThemeStyle(l, {
-          unitId: s,
-          subUnitId: a,
-          range: { ...e }
         });
       })
     ), this.disposeWithMe(
-      this._tableManager.tableThemeChanged$.subscribe((t) => {
-        const { theme: e, oldTheme: n, tableId: r, unitId: s, subUnitId: a } = t, l = this._tableManager.getTable(s, r).getRange();
-        this._sheetRangeThemeService.removeRangeThemeRule(n, {
-          unitId: s,
-          subUnitId: a,
-          range: { ...l }
-        }), this._sheetRangeThemeService.registerRangeThemeStyle(e, {
-          unitId: s,
-          subUnitId: a,
-          range: { ...l }
+      this._tableManager.tableThemeChanged$.subscribe((e) => {
+        const { theme: n, oldTheme: r, tableId: s, unitId: a, subUnitId: o } = e, u = this._tableManager.getTable(a, s).getRange();
+        this._sheetRangeThemeService.removeRangeThemeRule(r, {
+          unitId: a,
+          subUnitId: o,
+          range: { ...u }
+        }), this._sheetRangeThemeService.registerRangeThemeStyle(n, {
+          unitId: a,
+          subUnitId: o,
+          range: { ...u }
         });
       })
     ), this.disposeWithMe(
-      this._tableManager.tableDelete$.subscribe((t) => {
-        const { range: e, unitId: n, subUnitId: r, tableStyleId: s = Y[0].name } = t;
-        this._sheetRangeThemeService.removeRangeThemeRule(s, {
-          unitId: n,
-          subUnitId: r,
-          range: { ...e }
+      this._tableManager.tableDelete$.subscribe((e) => {
+        const { range: n, unitId: r, subUnitId: s, tableStyleId: a = this._allThemes[this._defaultThemeIndex].name } = e;
+        this._sheetRangeThemeService.removeRangeThemeRule(a, {
+          unitId: r,
+          subUnitId: s,
+          range: { ...n }
         });
       })
     );
   }
+  _initUserTableTheme() {
+    const e = this._configService.getConfig(Ge) || {}, n = e.defaultThemeIndex || 0, r = e.userThemes || [];
+    this._defaultThemeIndex = n, this._allThemes = r.concat(je);
+  }
   _initDefaultTableTheme() {
-    for (let t = 0; t < Y.length; t++) {
-      const { name: e, style: n } = Y[t], r = new wt(e, n);
-      this._sheetRangeThemeModel.registerDefaultRangeTheme(r);
+    for (let e = 0; e < this._allThemes.length; e++) {
+      const { name: n, style: r } = this._allThemes[e], s = new ft(n, r);
+      this._sheetRangeThemeModel.registerDefaultRangeTheme(s);
     }
   }
   dispose() {
-    super.dispose();
+    super.dispose(), this._allThemes = [], this._defaultThemeIndex = 0;
   }
 };
 ue = kn([
-  Re(0, C(_)),
-  Re(1, C(bt)),
-  Re(2, C(He))
+  se(0, C(_)),
+  se(1, C(wt)),
+  se(2, C(He)),
+  se(3, Be)
 ], ue);
 var Qn = Object.getOwnPropertyDescriptor, Yn = (t, e, n, r) => {
   for (var s = r > 1 ? void 0 : r ? Qn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
@@ -2584,9 +2601,9 @@ let ce = class extends k {
   _initFilteredOutRows() {
     this._tableManager.tableInitStatus$.pipe(
       be((e) => e),
-      ve(() => this._univerInstanceService.getCurrentTypeOfUnit$(he.UNIVER_SHEET)),
+      Me(() => this._univerInstanceService.getCurrentTypeOfUnit$(he.UNIVER_SHEET)),
       be((e) => e != null),
-      ve((e) => e.activeSheet$),
+      Me((e) => e.activeSheet$),
       be((e) => e != null)
     ).subscribe(() => {
       const e = $(this._univerInstanceService);
@@ -2624,101 +2641,101 @@ let ce = class extends k {
 };
 ce = Yn([
   fe(0, C(_)),
-  fe(1, C(_e)),
+  fe(1, C(Ce)),
   fe(2, C(W))
 ], ce);
 var Gn = Object.getOwnPropertyDescriptor, jn = (t, e, n, r) => {
   for (var s = r > 1 ? void 0 : r ? Gn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
     (o = t[a]) && (s = o(s) || s);
   return s;
-}, pe = (t, e) => (n, r) => e(n, r, t), ae;
-let Ae = (ae = class extends at {
-  constructor(t = Ue, e, n, r) {
+}, Re = (t, e) => (n, r) => e(n, r, t), ae;
+let $e = (ae = class extends it {
+  constructor(t = De, e, n, r) {
     super(), this._config = t, this._injector = e, this._configService = n, this._commandService = r;
-    const { ...s } = ot(
+    const { ...s } = lt(
       {},
-      Ue,
+      De,
       this._config
     );
-    this._configService.setConfig(Wn, s), this._initRegisterCommand();
+    this._configService.setConfig(Ge, s), this._initRegisterCommand();
   }
   onStarting() {
-    it(this._injector, [
+    ut(this._injector, [
       [_],
       [ue],
       [E],
-      [z],
+      [j],
       [ce],
       [ie],
       [le]
-    ]), Me(this._injector, [
+    ]), Ie(this._injector, [
       [ie],
       [le],
       [ue],
       [E],
-      [z],
+      [j],
       [ce]
     ]);
   }
   onReady() {
-    Me(this._injector, [
+    Ie(this._injector, [
       [_]
     ]);
   }
   _initRegisterCommand() {
     [
-      vn,
-      te,
       Fn,
-      ne,
-      Ce,
+      ee,
       Dn,
-      $n,
+      te,
+      Se,
+      Nn,
+      An,
       p,
-      On,
       Un,
-      An,
+      $n,
       Bn,
       Ln,
-      En
+      En,
+      Wn
     ].forEach((t) => this._commandService.registerCommand(t));
   }
-}, b(ae, "pluginName", ze), b(ae, "type", he.UNIVER_SHEET), ae);
-Ae = jn([
-  pe(1, C(Be)),
-  pe(2, lt),
-  pe(3, C(x))
-], Ae);
+}, b(ae, "pluginName", Xe), b(ae, "type", he.UNIVER_SHEET), ae);
+$e = jn([
+  Re(1, C(Ae)),
+  Re(2, Be),
+  Re(3, C(x))
+], $e);
 export {
-  vn as AddSheetTableCommand,
-  te as AddSheetTableMutation,
-  On as AddTableThemeCommand,
-  Fn as DeleteSheetTableCommand,
-  ne as DeleteSheetTableMutation,
-  Un as RemoveTableThemeCommand,
-  Nn as SHEET_TABLE_CUSTOM_THEME_PREFIX,
-  $n as SetSheetTableCommand,
-  Dn as SetSheetTableFilterCommand,
-  Ce as SetSheetTableFilterMutation,
+  Fn as AddSheetTableCommand,
+  ee as AddSheetTableMutation,
+  Un as AddTableThemeCommand,
+  Dn as DeleteSheetTableCommand,
+  te as DeleteSheetTableMutation,
+  $n as RemoveTableThemeCommand,
+  yn as SHEET_TABLE_CUSTOM_THEME_PREFIX,
+  An as SetSheetTableCommand,
+  Nn as SetSheetTableFilterCommand,
+  Se as SetSheetTableFilterMutation,
   p as SetSheetTableMutation,
-  Bn as SheetTableInsertColCommand,
-  An as SheetTableInsertRowCommand,
-  En as SheetTableRemoveColCommand,
-  Ln as SheetTableRemoveRowCommand,
-  z as SheetTableService,
+  Ln as SheetTableInsertColCommand,
+  Bn as SheetTableInsertRowCommand,
+  Wn as SheetTableRemoveColCommand,
+  En as SheetTableRemoveRowCommand,
+  j as SheetTableService,
   V as SheetsTableButtonStateEnum,
   E as SheetsTableController,
-  G as SheetsTableSortStateEnum,
+  Y as SheetsTableSortStateEnum,
   Qe as TableColumnDataTypeEnum,
-  ee as TableColumnFilterTypeEnum,
+  Z as TableColumnFilterTypeEnum,
   U as TableConditionTypeEnum,
   g as TableDateCompareTypeEnum,
   _ as TableManager,
   F as TableNumberCompareTypeEnum,
   P as TableStringCompareTypeEnum,
-  Ae as UniverSheetsTablePlugin,
+  $e as UniverSheetsTablePlugin,
   nr as customEmptyThemeWithBorderStyle,
-  pt as isConditionFilter,
+  St as isConditionFilter,
   tr as isManualFilter,
   rr as processStyleWithBorderStyle
 };