@univerjs/sheets-table 0.10.11 → 0.10.12-nightly.202510251119

package/lib/index.js

@@ -1,83 +1,83 @@
 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 P, BorderStyleTypes as tt, createREGEXFromWildChar as j, generateRandomId as q, IUniverInstanceService as E, Inject as p, LocaleService as he, Disposable as k, CommandType as y, IUndoRedoService as A, ICommandService as x, sequenceExecute as L, IResourceManagerService as nt, Rectangle as Ce, RTree as rt, InterceptorEffectEnum as st, UniverInstanceType as ge, customNameCharacterCheck as at, ILogService as ot, Injector as Ae, IConfigService as Le, Plugin as it, merge as lt, registerDependencies as ut, touchDependencies as Ie } from "@univerjs/core";
-import { getSheetCommandTarget as $, SheetInterceptorService as pe, INTERCEPTOR_POINT as Be, AddRangeThemeMutation as Ee, RemoveRangeThemeMutation as We, SheetRangeThemeModel as He, SheetsSelectionsService as me, InsertRowMutation as Ve, RemoveRowMutation as Pe, getMoveRangeUndoRedoMutations as be, InsertColMutation as qe, RemoveColMutation as ke, IExclusiveRangeService as ct, RefRangeService as dt, RemoveColCommand as ht, RemoveRowCommand as gt, InsertColCommand as mt, InsertRowCommand as bt, SheetRangeThemeService as wt, RangeThemeStyle as ft, ZebraCrossingCacheController as Rt } from "@univerjs/sheets";
-import { Subject as J, BehaviorSubject as Je, filter as we, switchMap as Me } from "rxjs";
-var M = /* @__PURE__ */ ((t) => (t.Insert = "insert", t.Delete = "delete", t))(M || {}), 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 || {}), O = /* @__PURE__ */ ((t) => (t.Date = "date", t.Number = "number", t.String = "string", t.Logic = "logic", t))(O || {}), 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 || {}), H = /* @__PURE__ */ ((t) => (t.Equal = "equal", t.NotEqual = "notEqual", t.Contains = "contains", t.NotContains = "notContains", t.StartsWith = "startsWith", t.EndsWith = "endsWith", t))(H || {}), 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 || {}), Q = /* @__PURE__ */ ((t) => (t.Asc = "asc", t.Desc = "desc", t.None = "none", t))(Q || {});
-function X(t, e) {
+import { CellValueType as q, BorderStyleTypes as tt, createREGEXFromWildChar as Z, generateRandomId as L, IUniverInstanceService as E, Inject as p, LocaleService as me, Disposable as Q, CommandType as N, IUndoRedoService as A, ICommandService as x, sequenceExecute as B, IResourceManagerService as nt, Rectangle as Se, RTree as st, InterceptorEffectEnum as rt, UniverInstanceType as z, customNameCharacterCheck as at, ILogService as ot, Injector as Ae, IConfigService as Ee, Plugin as it, merge as lt, registerDependencies as ut, touchDependencies as Ie } from "@univerjs/core";
+import { getSheetCommandTarget as $, SheetInterceptorService as pe, INTERCEPTOR_POINT as Be, RemoveSheetCommand as ct, CopySheetCommand as dt, AddRangeThemeMutation as Le, RemoveRangeThemeMutation as We, SheetRangeThemeModel as He, SheetsSelectionsService as be, InsertRowMutation as Ve, RemoveRowMutation as Pe, getMoveRangeUndoRedoMutations as we, InsertColMutation as qe, RemoveColMutation as Je, IExclusiveRangeService as ht, RefRangeService as gt, RemoveColCommand as mt, RemoveRowCommand as bt, InsertColCommand as wt, InsertRowCommand as ft, SheetRangeThemeService as Rt, RangeThemeStyle as St, ZebraCrossingCacheController as Ct } from "@univerjs/sheets";
+import { Subject as Y, BehaviorSubject as ke, filter as fe, switchMap as Me } from "rxjs";
+var M = /* @__PURE__ */ ((t) => (t.Insert = "insert", t.Delete = "delete", t))(M || {}), y = /* @__PURE__ */ ((t) => (t.Row = "row", t.Col = "column", t))(y || {}), 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 || {}), ne = /* @__PURE__ */ ((t) => (t.manual = "manual", t.condition = "condition", t))(ne || {}), O = /* @__PURE__ */ ((t) => (t.Date = "date", t.Number = "number", t.String = "string", t.Logic = "logic", t))(O || {}), 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 || {}), V = /* @__PURE__ */ ((t) => (t.Equal = "equal", t.NotEqual = "notEqual", t.Contains = "contains", t.NotContains = "notContains", t.StartsWith = "startsWith", t.EndsWith = "endsWith", t))(V || {}), m = /* @__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))(m || {}), P = /* @__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))(P || {}), G = /* @__PURE__ */ ((t) => (t.Asc = "asc", t.Desc = "desc", t.None = "none", t))(G || {});
+function te(t, e) {
   return `${e} ${t}`;
 }
-const ve = "TRUE", Fe = "FALSE", Ct = (t) => {
+const ve = "TRUE", Fe = "FALSE", pt = (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 ? Ct(r) : (n === P.FORCE_STRING || n === P.STRING) && e !== void 0 && e !== null ? String(e) : n === P.BOOLEAN ? e ? ve : Fe : n === P.NUMBER ? String(e) : typeof e === "boolean" ? e ? ve : Fe : e == null ? "" : String(e);
+    const { v: e, t: n, p: s } = t;
+    return s ? pt(s) : (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 St(t, e) {
+function _t(t, e) {
   if (t != null)
     switch (e) {
-      case Q.Asc:
-        return V.FilteredSortAsc;
-      case Q.Desc:
-        return V.FilteredSortDesc;
+      case G.Asc:
+        return P.FilteredSortAsc;
+      case G.Desc:
+        return P.FilteredSortDesc;
       default:
-        return V.FilteredSortNone;
+        return P.FilteredSortNone;
     }
   else
     switch (e) {
-      case Q.Asc:
-        return V.FilterNoneSortAsc;
-      case Q.Desc:
-        return V.FilterNoneSortDesc;
+      case G.Asc:
+        return P.FilterNoneSortAsc;
+      case G.Desc:
+        return P.FilterNoneSortDesc;
       default:
-        return V.FilterNoneSortNone;
+        return P.FilterNoneSortNone;
     }
 }
-function pt(t) {
-  return t ? t.filterType === Z.condition : !1;
+function Tt(t) {
+  return t ? t.filterType === ne.condition : !1;
 }
-function nr(t) {
-  return t ? t.filterType === Z.manual : !1;
+function rs(t) {
+  return t ? t.filterType === ne.manual : !1;
 }
-const N = {
+const D = {
   s: tt.THIN,
   cl: {
     rgb: "rgb(95, 101, 116)"
   }
-}, Ge = "sheets-table.config", De = {}, rr = {
+}, Ge = "sheets-table.config", ye = {}, as = {
   headerRowStyle: {
     bd: {
-      t: N
+      t: D
     }
   },
   headerColumnStyle: {
     bd: {
-      l: N
+      l: D
     }
   },
   lastColumnStyle: {
     bd: {
-      r: N
+      r: D
     }
   },
   lastRowStyle: {
     bd: {
-      b: N
+      b: D
     }
   }
-}, sr = (t, e) => {
+}, os = (t, e) => {
   if (t === "headerRowStyle") {
     if (!e.bd)
       return {
         ...e,
         bd: {
-          t: N
+          t: D
         }
       };
   } else if (t === "lastRowStyle") {
@@ -85,7 +85,7 @@ const N = {
       return {
         ...e,
         bd: {
-          b: N
+          b: D
         }
       };
   } else if (t === "lastColumnStyle") {
@@ -93,43 +93,43 @@ const N = {
       return {
         ...e,
         bd: {
-          r: N
+          r: D
         }
       };
   } else if (t === "headerColumnStyle" && !e.bd)
     return {
       ...e,
       bd: {
-        l: N
+        l: D
       }
     };
   return e;
-}, _t = [
+}, It = [
   [["#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"]]
-], ze = _t.map((t, e) => {
-  const [n, r] = t, [s, a, o, u] = n, [l] = r;
+], ze = It.map((t, e) => {
+  const [n, s] = t, [r, a, o, u] = n, [i] = s;
   return {
     name: `table-default-${e}`,
     style: {
       headerRowStyle: {
         bg: {
-          rgb: s
+          rgb: r
         },
         cl: {
-          rgb: l
+          rgb: i
         },
         bd: {
-          t: N
+          t: D
         }
       },
       headerColumnStyle: {
         bd: {
-          l: N
+          l: D
         }
       },
       firstRowStyle: {
@@ -147,18 +147,18 @@ const N = {
           rgb: u
         },
         bd: {
-          b: N
+          b: D
         }
       },
       lastColumnStyle: {
         bd: {
-          r: N
+          r: D
         }
       }
     }
   };
 });
-class Y {
+class j {
   constructor(e, n) {
     b(this, "dataType");
     b(this, "id");
@@ -191,215 +191,215 @@ class Y {
     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 Tt = (t) => t.getMonth() <= 2, It = (t) => {
+const Mt = (t) => t.getMonth() <= 2, vt = (t) => {
   const e = t.getMonth();
   return e > 2 && e <= 5;
-}, Mt = (t) => {
+}, Ft = (t) => {
   const e = t.getMonth();
   return e > 5 && e <= 8;
-}, vt = (t) => {
+}, yt = (t) => {
   const e = t.getMonth();
   return e > 8 && e <= 11;
-}, Ft = (t) => t.getMonth() === 0, Dt = (t) => t.getMonth() === 1, yt = (t) => t.getMonth() === 2, Nt = (t) => t.getMonth() === 3, xt = (t) => t.getMonth() === 4, Ot = (t) => t.getMonth() === 5, Ut = (t) => t.getMonth() === 6, $t = (t) => t.getMonth() === 7, At = (t) => t.getMonth() === 8, Lt = (t) => t.getMonth() === 9, Bt = (t) => t.getMonth() === 10, Et = (t) => t.getMonth() === 11, Wt = (t, e = /* @__PURE__ */ new Date()) => t.toDateString() === e.toDateString(), Ht = (t, e = /* @__PURE__ */ new Date()) => {
+}, Nt = (t) => t.getMonth() === 0, Dt = (t) => t.getMonth() === 1, xt = (t) => t.getMonth() === 2, Ot = (t) => t.getMonth() === 3, Ut = (t) => t.getMonth() === 4, $t = (t) => t.getMonth() === 5, At = (t) => t.getMonth() === 6, Et = (t) => t.getMonth() === 7, Bt = (t) => t.getMonth() === 8, Lt = (t) => t.getMonth() === 9, Wt = (t) => t.getMonth() === 10, Ht = (t) => t.getMonth() === 11, Vt = (t, e = /* @__PURE__ */ new Date()) => t.toDateString() === e.toDateString(), Pt = (t, e = /* @__PURE__ */ new Date()) => {
   const n = new Date(e);
   return n.setDate(n.getDate() + 1), t.toDateString() === n.toDateString();
-}, Vt = (t, e = /* @__PURE__ */ new Date()) => {
+}, qt = (t, e = /* @__PURE__ */ new Date()) => {
   const n = new Date(e);
   return n.setDate(n.getDate() - 1), t.toDateString() === n.toDateString();
-}, G = (t) => {
-  const e = t.getDay(), n = t.getDate() - e + (e === 0 ? -6 : 1), r = new Date(t);
-  return r.setDate(n), r;
-}, je = 10080 * 60 * 1e3, Pt = (t, e = /* @__PURE__ */ new Date()) => {
-  const n = G(t), r = G(e);
-  return n.toDateString() === r.toDateString();
-}, qt = (t, e = /* @__PURE__ */ new Date()) => {
-  const n = G(t), r = new Date(G(e).getTime() + je);
-  return n.toDateString() === r.toDateString();
+}, K = (t) => {
+  const e = t.getDay(), n = t.getDate() - e + (e === 0 ? -6 : 1), s = new Date(t);
+  return s.setDate(n), s;
+}, je = 10080 * 60 * 1e3, Jt = (t, e = /* @__PURE__ */ new Date()) => {
+  const n = K(t), s = K(e);
+  return n.toDateString() === s.toDateString();
 }, kt = (t, e = /* @__PURE__ */ new Date()) => {
-  const n = G(t), r = new Date(G(e).getTime() - je);
-  return n.toDateString() === r.toDateString();
-}, Jt = (t, e = /* @__PURE__ */ new Date()) => t.getFullYear() === e.getFullYear() && t.getMonth() === e.getMonth(), Qt = (t) => {
+  const n = K(t), s = new Date(K(e).getTime() + je);
+  return n.toDateString() === s.toDateString();
+}, Qt = (t, e = /* @__PURE__ */ new Date()) => {
+  const n = K(t), s = new Date(K(e).getTime() - je);
+  return n.toDateString() === s.toDateString();
+}, Yt = (t, e = /* @__PURE__ */ new Date()) => t.getFullYear() === e.getFullYear() && t.getMonth() === e.getMonth(), Gt = (t) => {
   const e = new Date(t);
   return e.setHours(0, 0, 0, 0), e.setDate(1), e;
-}, Yt = (t, e = /* @__PURE__ */ new Date()) => {
+}, zt = (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();
-}, Gt = (t, e = /* @__PURE__ */ new Date()) => {
-  const n = Qt(e), r = new Date(n);
-  r.setMonth(r.getMonth() + 1, 0);
-  const s = t.getTime();
-  return s >= n.getTime() && s < r.getTime();
+  const s = new Date(n);
+  s.setMonth(s.getMonth() + 1, 0);
+  const r = t.getTime();
+  return r >= n.getTime() && r < s.getTime();
+}, jt = (t, e = /* @__PURE__ */ new Date()) => {
+  const n = Gt(e), s = new Date(n);
+  s.setMonth(s.getMonth() + 1, 0);
+  const r = t.getTime();
+  return r >= n.getTime() && r < s.getTime();
 }, _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;
-}, zt = (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();
-}, 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();
 }, Kt = (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 n = _e(e), s = new Date(n);
+  s.setMonth(s.getMonth() + 3);
+  const r = t.getTime();
+  return r >= n.getTime() && r < s.getTime();
+}, Xt = (t, e = /* @__PURE__ */ new Date()) => {
+  const n = _e(e), s = new Date(n);
+  s.setMonth(s.getMonth() + 3);
+  const r = new Date(s);
+  r.setMonth(r.getMonth() + 3, 0);
+  const a = t.getTime();
+  return a >= s.getTime() && a < r.getTime();
+}, Zt = (t, e = /* @__PURE__ */ new Date()) => {
+  const n = _e(e), s = new Date(n);
+  s.setMonth(s.getMonth() - 3);
+  const r = new Date(n);
+  r.setDate(0);
   const a = t.getTime();
-  return a >= r.getTime() && a < s.getTime();
-}, Xt = (t, e = /* @__PURE__ */ new Date()) => t.getFullYear() === e.getFullYear(), Zt = (t, e = /* @__PURE__ */ new Date()) => t.getFullYear() === e.getFullYear() + 1, en = (t, e = /* @__PURE__ */ new Date()) => t.getFullYear() === e.getFullYear() - 1, tn = (t, e = /* @__PURE__ */ new Date()) => {
+  return a >= s.getTime() && a < r.getTime();
+}, en = (t, e = /* @__PURE__ */ new Date()) => t.getFullYear() === e.getFullYear(), tn = (t, e = /* @__PURE__ */ new Date()) => t.getFullYear() === e.getFullYear() + 1, nn = (t, e = /* @__PURE__ */ new Date()) => t.getFullYear() === e.getFullYear() - 1, sn = (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();
+  const s = t.getTime();
+  return s >= n.getTime() && s < e.getTime();
 };
-function nn(t) {
+function rn(t) {
   switch (t.compareType) {
-    case g.Equal: {
+    case m.Equal: {
       const e = new Date(t.expectedValue);
       return (n) => n.getTime() === e.getTime();
     }
-    case g.NotEqual: {
+    case m.NotEqual: {
       const e = new Date(t.expectedValue);
       return (n) => n.getTime() !== e.getTime();
     }
-    case g.After: {
+    case m.After: {
       const e = new Date(t.expectedValue);
       return (n) => n.getTime() > e.getTime();
     }
-    case g.Before: {
+    case m.Before: {
       const e = new Date(t.expectedValue);
       return (n) => n.getTime() < e.getTime();
     }
-    case g.AfterOrEqual: {
+    case m.AfterOrEqual: {
       const e = new Date(t.expectedValue);
       return (n) => n.getTime() >= e.getTime();
     }
-    case g.BeforeOrEqual: {
+    case m.BeforeOrEqual: {
       const e = new Date(t.expectedValue);
       return (n) => n.getTime() <= e.getTime();
     }
-    case g.Between:
+    case m.Between:
       return (e) => {
-        const [n, r] = t.expectedValue;
-        return e.getTime() >= new Date(n).getTime() && e.getTime() <= new Date(r).getTime();
+        const [n, s] = t.expectedValue;
+        return e.getTime() >= new Date(n).getTime() && e.getTime() <= new Date(s).getTime();
       };
-    case g.NotBetween:
+    case m.NotBetween:
       return (e) => {
-        const [n, r] = t.expectedValue;
-        return e.getTime() < new Date(n).getTime() || e.getTime() > new Date(r).getTime();
+        const [n, s] = t.expectedValue;
+        return e.getTime() < new Date(n).getTime() || e.getTime() > new Date(s).getTime();
       };
-    case g.Today: {
-      const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => Wt(n, e);
-    }
-    case g.Yesterday: {
+    case m.Today: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
       return (n) => Vt(n, e);
     }
-    case g.Tomorrow: {
+    case m.Yesterday: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => Ht(n, e);
+      return (n) => qt(n, e);
     }
-    case g.ThisWeek: {
+    case m.Tomorrow: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
       return (n) => Pt(n, e);
     }
-    case g.LastWeek: {
+    case m.ThisWeek: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => kt(n, e);
+      return (n) => Jt(n, e);
     }
-    case g.NextWeek: {
+    case m.LastWeek: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => qt(n, e);
+      return (n) => Qt(n, e);
     }
-    case g.ThisMonth: {
+    case m.NextWeek: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => Jt(n, e);
+      return (n) => kt(n, e);
     }
-    case g.LastMonth: {
+    case m.ThisMonth: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => Gt(n, e);
+      return (n) => Yt(n, e);
     }
-    case g.NextMonth: {
+    case m.LastMonth: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => Yt(n, e);
+      return (n) => jt(n, e);
     }
-    case g.ThisQuarter: {
+    case m.NextMonth: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
       return (n) => zt(n, e);
     }
-    case g.LastQuarter: {
+    case m.ThisQuarter: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
       return (n) => Kt(n, e);
     }
-    case g.NextQuarter: {
+    case m.LastQuarter: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => jt(n, e);
+      return (n) => Zt(n, e);
     }
-    case g.ThisYear: {
+    case m.NextQuarter: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
       return (n) => Xt(n, e);
     }
-    case g.LastYear: {
+    case m.ThisYear: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
       return (n) => en(n, e);
     }
-    case g.NextYear: {
+    case m.LastYear: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => Zt(n, e);
+      return (n) => nn(n, e);
     }
-    case g.YearToDate: {
+    case m.NextYear: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
       return (n) => tn(n, e);
     }
-    case g.M1:
-      return Ft;
-    case g.M2:
-      return Dt;
-    case g.M3:
-      return yt;
-    case g.M4:
+    case m.YearToDate: {
+      const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
+      return (n) => sn(n, e);
+    }
+    case m.M1:
       return Nt;
-    case g.M5:
+    case m.M2:
+      return Dt;
+    case m.M3:
       return xt;
-    case g.M6:
+    case m.M4:
       return Ot;
-    case g.M7:
+    case m.M5:
       return Ut;
-    case g.M8:
+    case m.M6:
       return $t;
-    case g.M9:
+    case m.M7:
       return At;
-    case g.M10:
-      return Lt;
-    case g.M11:
-      return Bt;
-    case g.M12:
+    case m.M8:
       return Et;
-    case g.Q1:
-      return Tt;
-    case g.Q2:
-      return It;
-    case g.Q3:
+    case m.M9:
+      return Bt;
+    case m.M10:
+      return Lt;
+    case m.M11:
+      return Wt;
+    case m.M12:
+      return Ht;
+    case m.Q1:
       return Mt;
-    case g.Q4:
+    case m.Q2:
       return vt;
+    case m.Q3:
+      return Ft;
+    case m.Q4:
+      return yt;
     default:
       throw new Error("Unsupported compare type");
   }
 }
-class rn {
+class an {
   /**
    * Initializes a new instance of the Heap class.
    */
@@ -413,8 +413,8 @@ class rn {
    * @param index2 The index of the second element.
    */
   swap(e, n) {
-    const r = this.heap[e];
-    this.heap[e] = this.heap[n], this.heap[n] = r;
+    const s = this.heap[e];
+    this.heap[e] = this.heap[n], this.heap[n] = s;
   }
   /**
    * Returns the index of the parent node for the given index.
@@ -463,7 +463,7 @@ class rn {
     return this.heap.includes(e);
   }
 }
-class sn extends rn {
+class on extends an {
   /**
    * Initializes a new instance of the MinHeap class.
    */
@@ -485,8 +485,8 @@ class sn extends rn {
    * @param index The index of the element to be shifted down.
    */
   shiftDown(e) {
-    const n = this.getLeftIndex(e), r = this.getRightIndex(e);
-    this.heap[n] < this.heap[e] && (this.swap(n, e), this.shiftDown(n)), this.heap[r] < this.heap[e] && (this.swap(r, e), this.shiftDown(r));
+    const n = this.getLeftIndex(e), s = this.getRightIndex(e);
+    this.heap[n] < this.heap[e] && (this.swap(n, e), this.shiftDown(n)), this.heap[s] < this.heap[e] && (this.swap(s, e), this.shiftDown(s));
   }
   /**
    * Inserts a new value into the min heap.
@@ -502,146 +502,146 @@ class sn extends rn {
     this.heap[0] = this.heap.pop(), this.shiftDown(0);
   }
 }
-const an = (t, e) => {
-  const n = new sn();
-  for (const r of t)
-    n.insert(r), n.size() > e && n.pop();
+const ln = (t, e) => {
+  const n = new on();
+  for (const s of t)
+    n.insert(s), n.size() > e && n.pop();
   return n.heap;
-}, on = (t, e) => t > e, ln = (t, e) => t < e, un = (t, e, n) => an(t, e).includes(n);
-function cn(t, e) {
+}, un = (t, e) => t > e, cn = (t, e) => t < e, dn = (t, e, n) => ln(t, e).includes(n);
+function hn(t, e) {
   switch (t.compareType) {
     case F.Equal: {
       const n = Number(t.expectedValue);
-      return (r) => r === n;
+      return (s) => s === n;
     }
     case F.NotEqual: {
       const n = Number(t.expectedValue);
-      return (r) => r !== n;
+      return (s) => s !== n;
     }
     case F.GreaterThan: {
       const n = Number(t.expectedValue);
-      return (r) => r > n;
+      return (s) => s > n;
     }
     case F.GreaterThanOrEqual: {
       const n = Number(t.expectedValue);
-      return (r) => r >= n;
+      return (s) => s >= n;
     }
     case F.LessThan: {
       const n = Number(t.expectedValue);
-      return (r) => r < n;
+      return (s) => s < n;
     }
     case F.LessThanOrEqual: {
       const n = Number(t.expectedValue);
-      return (r) => r <= n;
+      return (s) => s <= n;
     }
     case F.Between: {
-      const [n, r] = t.expectedValue, s = Number(n), a = Number(r);
-      return s > a ? (o) => o >= a && o <= s : (o) => o >= s && o <= a;
+      const [n, s] = t.expectedValue, r = Number(n), a = Number(s);
+      return r > a ? (o) => o >= a && o <= r : (o) => o >= r && o <= a;
     }
     case F.NotBetween: {
-      const [n, r] = t.expectedValue, s = Number(n), a = Number(r);
-      return s > a ? (o) => o < a || o > s : (o) => o < s || o > a;
+      const [n, s] = t.expectedValue, r = Number(n), a = Number(s);
+      return r > a ? (o) => o < a || o > r : (o) => o < r || o > a;
     }
     case F.Above: {
       const n = e.average;
-      return (r) => on(r, n);
+      return (s) => un(s, n);
     }
     case F.Below: {
       const n = e.average;
-      return (r) => ln(r, n);
+      return (s) => cn(s, n);
     }
     case F.TopN: {
-      const n = e.list, r = Number(t.expectedValue);
-      return (s) => un(n, r, s);
+      const n = e.list, s = Number(t.expectedValue);
+      return (r) => dn(n, s, r);
     }
   }
 }
-const dn = (t, e) => j(e).test(t), hn = (t, e) => !j(e).test(t), gn = (t, e) => j(`*${e}*`).test(t), mn = (t, e) => !j(`*${e}*`).test(t), bn = (t, e) => j(`${e}*`).test(t), wn = (t, e) => j(`*${e}`).test(t);
-function fn(t) {
+const gn = (t, e) => Z(e).test(t), mn = (t, e) => !Z(e).test(t), bn = (t, e) => Z(`*${e}*`).test(t), wn = (t, e) => !Z(`*${e}*`).test(t), fn = (t, e) => Z(`${e}*`).test(t), Rn = (t, e) => Z(`*${e}`).test(t);
+function Sn(t) {
   switch (t.compareType) {
-    case H.Equal:
-      return (e) => dn(e, t.expectedValue);
-    case H.NotEqual:
-      return (e) => hn(e, t.expectedValue);
-    case H.Contains:
+    case V.Equal:
       return (e) => gn(e, t.expectedValue);
-    case H.NotContains:
+    case V.NotEqual:
       return (e) => mn(e, t.expectedValue);
-    case H.StartsWith:
+    case V.Contains:
       return (e) => bn(e, t.expectedValue);
-    case H.EndsWith:
+    case V.NotContains:
       return (e) => wn(e, t.expectedValue);
+    case V.StartsWith:
+      return (e) => fn(e, t.expectedValue);
+    case V.EndsWith:
+      return (e) => Rn(e, t.expectedValue);
     default:
       return console.error(`Unknown filter operator: ${t.compareType}`), (e) => !0;
   }
 }
-const Rn = /* @__PURE__ */ new Set([
+const Cn = /* @__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;
+m.Today, m.Yesterday, m.Tomorrow, m.ThisWeek, m.LastWeek, m.NextWeek, m.ThisMonth, m.LastMonth, m.NextMonth, m.ThisQuarter, m.LastQuarter, m.NextQuarter, m.NextYear, m.ThisYear, m.LastYear, m.YearToDate;
 function Ke(t) {
-  return Rn.has(t);
+  return Cn.has(t);
 }
-function Cn(t, e) {
+function pn(t, e) {
   if (Ke(t.filterInfo.compareType))
     return (n) => !0;
   switch (t.filterInfo.conditionType) {
     case O.Date:
-      return nn(t.filterInfo);
+      return rn(t.filterInfo);
     case O.Number:
-      return cn(t.filterInfo, e);
+      return hn(t.filterInfo, e);
     case O.String:
-      return fn(t.filterInfo);
+      return Sn(t.filterInfo);
     case O.Logic:
     default:
       return (n) => !0;
   }
 }
-function ie(t, e, n, r) {
-  switch (r) {
+function ue(t, e, n, s) {
+  switch (s) {
     case O.Date: {
-      const s = ye(t, e, n);
-      return s ? _n(s) : null;
+      const r = Ne(t, e, n);
+      return r ? In(r) : null;
     }
     case O.Number:
-      return ye(t, e, n);
+      return Ne(t, e, n);
     case O.String:
     default:
-      return pn(t, e, n);
+      return Tn(t, e, n);
   }
 }
-const Sn = (t) => {
+const _n = (t) => {
   var n;
   return ((n = t.body) == null ? void 0 : n.dataStream.replace(/\r\n$/, "")) || "";
 };
-function pn(t, e, n) {
-  const r = t.getCell(e, n);
-  if (!r) return null;
-  const { v: s, t: a, p: o } = r;
+function Tn(t, e, n) {
+  const s = t.getCell(e, n);
+  if (!s) return null;
+  const { v: r, t: a, p: o } = s;
   if (o)
-    return Sn(o);
-  if (typeof s == "string")
-    return a === P.BOOLEAN ? s.toUpperCase() : s;
-  if (typeof s == "number")
-    return a === P.BOOLEAN ? s ? "TRUE" : "FALSE" : s;
-  if (typeof s == "boolean") return s ? "TRUE" : "FALSE";
-  if (s !== void 0)
-    return String(s);
+    return _n(o);
+  if (typeof r == "string")
+    return a === q.BOOLEAN ? r.toUpperCase() : r;
+  if (typeof r == "number")
+    return a === q.BOOLEAN ? r ? "TRUE" : "FALSE" : r;
+  if (typeof r == "boolean") return r ? "TRUE" : "FALSE";
+  if (r !== void 0)
+    return String(r);
 }
-function ye(t, e, n) {
-  const r = t.getCell(e, n);
-  if (!r) return null;
-  const { v: s, t: a, p: o } = r;
-  return o ? null : typeof s == "string" && a === P.NUMBER ? Number(t.getCellRaw(e, n).v) : Number(s);
+function Ne(t, e, n) {
+  const s = t.getCell(e, n);
+  if (!s) return null;
+  const { v: r, t: a, p: o } = s;
+  return o ? null : typeof r == "string" && a === q.NUMBER ? Number(t.getCellRaw(e, n).v) : Number(r);
 }
-function _n(t) {
+function In(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));
+  let s = t - 1;
+  return s > (n.getTime() - e.getTime()) / (1e3 * 3600 * 24) && (s -= 1), s < 0 && (s = t), new Date(e.getTime() + s * (1e3 * 3600 * 24));
 }
-class Ne {
+class De {
   constructor() {
     b(this, "_tableColumnFilterList");
     b(this, "_tableSortInfo");
@@ -658,58 +658,58 @@ class Ne {
     return this._tableColumnFilterList[e];
   }
   getFilterState(e) {
-    var r;
-    const n = ((r = this._tableSortInfo) == null ? void 0 : r.columnIndex) === e ? this._tableSortInfo.sortState : Q.None;
-    return St(this._tableColumnFilterList[e], n);
+    var s;
+    const n = ((s = this._tableSortInfo) == null ? void 0 : s.columnIndex) === e ? this._tableSortInfo.sortState : G.None;
+    return _t(this._tableColumnFilterList[e], n);
   }
   getSortState() {
     var e;
     return (e = this._tableSortInfo) != null ? e : {};
   }
   getFilterStates(e) {
-    const n = [], { startColumn: r, endColumn: s } = e;
-    for (let a = r; a <= s; a++)
-      n.push(this.getFilterState(a - r));
+    const n = [], { startColumn: s, endColumn: r } = e;
+    for (let a = s; a <= r; a++)
+      n.push(this.getFilterState(a - s));
     return n;
   }
   getFilterOutRows() {
     return this._filterOutRows;
   }
   doFilter(e, n) {
-    const r = /* @__PURE__ */ new Set(), s = this._tableColumnFilterList;
-    for (let a = 0; a < s.length; a++)
-      s[a] && this.doColumnFilter(e, n, a, r);
-    return this._filterOutRows = r, r;
+    const s = /* @__PURE__ */ new Set(), r = this._tableColumnFilterList;
+    for (let a = 0; a < r.length; a++)
+      r[a] && this.doColumnFilter(e, n, a, s);
+    return this._filterOutRows = s, s;
   }
-  doColumnFilter(e, n, r, s) {
-    const a = this._tableColumnFilterList[r];
+  doColumnFilter(e, n, s, r) {
+    const a = this._tableColumnFilterList[s];
     if (a && e) {
-      const { startRow: o, endRow: u, startColumn: l } = n, i = l + r, h = this.getExecuteFunc(e, n, r, a);
+      const { startRow: o, endRow: u, startColumn: i } = n, l = i + s, h = this.getExecuteFunc(e, n, s, a);
       for (let d = o; d <= u; d++) {
-        const c = pt(a) ? a.filterInfo.conditionType : O.String;
-        ie(e, d, i, c) === null ? s.add(d) : h(ie(e, d, i, c)) || s.add(d);
+        const c = Tt(a) ? a.filterInfo.conditionType : O.String;
+        ue(e, d, l, c) === null ? r.add(d) : h(ue(e, d, l, c)) || r.add(d);
       }
     }
   }
-  _getNumberCalculatedOptions(e, n, r) {
-    const { startRow: s, endRow: a, startColumn: o } = n, u = o + r, l = [];
-    let i = 0, h = 0;
-    for (let d = s; d <= a; d++) {
-      const c = ie(e, d, u, O.Number);
-      c !== null && (l.push(c), i++, h += c);
+  _getNumberCalculatedOptions(e, n, s) {
+    const { startRow: r, endRow: a, startColumn: o } = n, u = o + s, i = [];
+    let l = 0, h = 0;
+    for (let d = r; d <= a; d++) {
+      const c = ue(e, d, u, O.Number);
+      c !== null && (i.push(c), l++, h += c);
     }
     return {
-      list: l,
-      average: i > 0 ? h / i : 0
+      list: i,
+      average: l > 0 ? h / l : 0
     };
   }
-  getExecuteFunc(e, n, r, s) {
-    if (s.filterType === Z.manual) {
-      const a = new Set(s.values);
+  getExecuteFunc(e, n, s, r) {
+    if (r.filterType === ne.manual) {
+      const a = new Set(r.values);
       return (o) => a.has(o);
-    } else if (s.filterType === Z.condition) {
-      const o = Ke(s.filterInfo.compareType) ? this._getNumberCalculatedOptions(e, n, r) : void 0;
-      return Cn(s, o);
+    } else if (r.filterType === ne.condition) {
+      const o = Ke(r.filterInfo.compareType) ? this._getNumberCalculatedOptions(e, n, s) : void 0;
+      return pn(r, o);
     } else
       return (a) => !0;
   }
@@ -728,7 +728,7 @@ class Ne {
   }
 }
 class xe {
-  constructor(e, n, r, s, a = {}) {
+  constructor(e, n, s, r, a = {}) {
     b(this, "_id");
     b(this, "_name");
     /**
@@ -743,21 +743,21 @@ class xe {
     b(this, "tableMeta");
     b(this, "_tableFilters");
     b(this, "_subUnitId");
-    this._id = e, this._range = r, this._name = n, this._tableFilters = new Ne(), this._init(s, a);
+    this._id = e, this._range = s, this._name = n, this._tableFilters = new De(), this._init(r, a);
   }
   _init(e, n) {
     var o, u;
     this._tableStyleId = n == null ? void 0 : n.tableStyleId, this._showHeader = (o = n == null ? void 0 : n.showHeader) != null ? o : !0, this._showFooter = !1;
-    const r = this.getRange(), s = r.startColumn, a = r.endColumn;
-    for (let l = s; l <= a; l++) {
-      const i = l - s;
+    const s = this.getRange(), r = s.startColumn, a = s.endColumn;
+    for (let i = r; i <= a; i++) {
+      const l = i - r;
       let h, d;
-      (u = n.columns) != null && u[i] ? (h = n.columns[i].id, d = n.columns[i].displayName) : (h = q(), d = e[l - s]);
-      const c = new Y(h, d);
+      (u = n.columns) != null && u[l] ? (h = n.columns[l].id, d = n.columns[l].displayName) : (h = L(), d = e[i - r]);
+      const c = new j(h, d);
       this._columns.set(h, c), this._columnOrder.push(h);
     }
-    n.filters && n.filters.forEach((i, h) => {
-      i && this._tableFilters.setColumnFilter(h, i);
+    n.filters && n.filters.forEach((l, h) => {
+      l && this._tableFilters.setColumnFilter(h, l);
     });
   }
   setTableFilterColumn(e, n) {
@@ -770,26 +770,26 @@ class xe {
     return this._tableFilters;
   }
   getTableFilterRange() {
-    const e = this.getRange(), n = this.isShowHeader(), r = this.isShowFooter(), { startRow: s, startColumn: a, endRow: o, endColumn: u } = e, l = n ? s + 1 : s, i = r ? o - 1 : o;
+    const e = this.getRange(), n = this.isShowHeader(), s = this.isShowFooter(), { startRow: r, startColumn: a, endRow: o, endColumn: u } = e, i = n ? r + 1 : r, l = s ? o - 1 : o;
     return {
-      startRow: l,
+      startRow: i,
       startColumn: a,
-      endRow: i,
+      endRow: l,
       endColumn: u
     };
   }
   setColumns(e) {
     this._columns.clear(), this._columnOrder = [], e.forEach((n) => {
-      const r = new Y(n.id, n.displayName);
-      r.fromJSON(n), this._columns.set(n.id, r), this._columnOrder.push(n.id);
+      const s = new j(n.id, n.displayName);
+      s.fromJSON(n), this._columns.set(n.id, s), this._columnOrder.push(n.id);
     });
   }
   getColumnsCount() {
     return this._columnOrder.length;
   }
   insertColumn(e, n) {
-    const r = n.id;
-    this._columns.set(r, n), this._columnOrder.splice(e, 0, r);
+    const s = n.id;
+    this._columns.set(s, n), this._columnOrder.splice(e, 0, s);
   }
   removeColumn(e) {
     const n = this._columnOrder[e];
@@ -809,9 +809,9 @@ class xe {
     return this.getColumn(n);
   }
   getColumnNameByIndex(e) {
-    var r;
+    var s;
     const n = this._columnOrder[e];
-    return ((r = this.getColumn(n)) == null ? void 0 : r.getDisplayName()) || "";
+    return ((s = this.getColumn(n)) == null ? void 0 : s.getDisplayName()) || "";
   }
   getId() {
     return this._id;
@@ -902,50 +902,50 @@ class xe {
     };
   }
   fromJSON(e) {
-    var r, s;
-    this._id = e.id, this._name = e.name, this._range = e.range, this.tableMeta = e.meta, this._tableStyleId = e.options.tableStyleId || "", this._showHeader = (r = e.options.showHeader) != null ? r : !0, this._showFooter = (s = e.options.showFooter) != null ? s : !0, e.columns.forEach((a) => {
-      const o = new Y(a.id, a.displayName);
+    var s, r;
+    this._id = e.id, this._name = e.name, this._range = e.range, this.tableMeta = e.meta, this._tableStyleId = e.options.tableStyleId || "", this._showHeader = (s = e.options.showHeader) != null ? s : !0, this._showFooter = (r = e.options.showFooter) != null ? r : !0, e.columns.forEach((a) => {
+      const o = new j(a.id, a.displayName);
       o.fromJSON(a), this._columns.set(a.id, o), this._columnOrder.push(a.id);
-    }), this._tableFilters = new Ne(), this._tableFilters.fromJSON(e.filters);
+    }), this._tableFilters = new De(), this._tableFilters.fromJSON(e.filters);
   }
   dispose() {
     this._id = "", this._name = "", this._tableStyleId = "", this._showHeader = !0, this._showFooter = !0, delete this._range, this._columns.clear(), this._columnOrder = [];
   }
 }
-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--)
-    (o = t[a]) && (s = o(s) || s);
-  return s;
-}, Oe = (t, e) => (n, r) => e(n, r, t);
-let T = class extends k {
+var Mn = Object.getOwnPropertyDescriptor, vn = (t, e, n, s) => {
+  for (var r = s > 1 ? void 0 : s ? Mn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
+    (o = t[a]) && (r = o(r) || r);
+  return r;
+}, Oe = (t, e) => (n, s) => e(n, s, t);
+let T = class extends Q {
   constructor(e, n) {
     super();
     b(this, "_tableMap");
-    b(this, "_tableAdd$", new J());
+    b(this, "_tableAdd$", new Y());
     b(this, "tableAdd$", this._tableAdd$.asObservable());
-    b(this, "_tableDelete$", new J());
+    b(this, "_tableDelete$", new Y());
     b(this, "tableDelete$", this._tableDelete$.asObservable());
-    b(this, "_tableNameChanged$", new J());
+    b(this, "_tableNameChanged$", new Y());
     b(this, "tableNameChanged$", this._tableNameChanged$.asObservable());
-    b(this, "_tableRangeChanged$", new J());
+    b(this, "_tableRangeChanged$", new Y());
     b(this, "tableRangeChanged$", this._tableRangeChanged$.asObservable());
-    b(this, "_tableThemeChanged$", new J());
+    b(this, "_tableThemeChanged$", new Y());
     b(this, "tableThemeChanged$", this._tableThemeChanged$.asObservable());
-    b(this, "_tableFilterChanged$", new J());
+    b(this, "_tableFilterChanged$", new Y());
     b(this, "tableFilterChanged$", this._tableFilterChanged$.asObservable());
-    b(this, "_tableInitStatus", new Je(!1));
+    b(this, "_tableInitStatus", new ke(!1));
     b(this, "tableInitStatus$", this._tableInitStatus.asObservable());
     this._univerInstanceService = e, this._localeService = n, this._tableMap = /* @__PURE__ */ new Map();
   }
   _ensureUnit(e) {
     return this._tableMap.has(e) || this._tableMap.set(e, /* @__PURE__ */ new Map()), this._tableMap.get(e);
   }
-  getColumnHeader(e, n, r, s) {
+  getColumnHeader(e, n, s, r) {
     var d;
-    const a = (d = this._univerInstanceService.getUnit(e)) == null ? void 0 : d.getSheetBySheetId(n), { startRow: o, startColumn: u, endColumn: l } = r, i = [], h = s != null ? s : "Column";
-    for (let c = u; c <= l; c++)
-      i.push(Ye(a == null ? void 0 : a.getCell(o, c)) || X(c - u + 1, h));
-    return i;
+    const a = (d = this._univerInstanceService.getUnit(e)) == null ? void 0 : d.getSheetBySheetId(n), { startRow: o, startColumn: u, endColumn: i } = s, l = [], h = r != null ? r : "Column";
+    for (let c = u; c <= i; c++)
+      l.push(Ye(a == null ? void 0 : a.getCell(o, c)) || te(c - u + 1, h));
+    return l;
   }
   /**
    * Add a table to univer.
@@ -958,21 +958,30 @@ let T = class extends k {
    * @param {ITableOptions} [options] Other options of the table.
    * @returns {string} The table id.
    */
-  addTable(e, n, r, s, a, o, u) {
-    const l = o != null ? o : q(), i = a || this.getColumnHeader(e, n, s), h = new xe(l, r, s, i, u);
-    return h.setSubunitId(n), this._ensureUnit(e).set(l, h), this._tableAdd$.next({
+  addTable(e, n, s, r, a, o, u) {
+    var c;
+    const i = o != null ? o : L(), l = a || this.getColumnHeader(e, n, r), h = new xe(i, s, r, l, u);
+    if (h.setSubunitId(n), this._ensureUnit(e).set(i, h), this._tableAdd$.next({
       unitId: e,
       subUnitId: n,
-      range: s,
-      tableName: r,
-      tableId: l,
+      range: r,
+      tableName: s,
+      tableId: i,
       tableStyleId: u == null ? void 0 : u.tableStyleId
-    }), l;
+    }), u != null && u.filters) {
+      const g = (c = this._univerInstanceService.getUnit(e)) == null ? void 0 : c.getSheetBySheetId(n);
+      h.getTableFilters().doFilter(g, r), this._tableFilterChanged$.next({
+        unitId: e,
+        subUnitId: n,
+        tableId: i
+      });
+    }
+    return i;
   }
-  addFilter(e, n, r, s) {
+  addFilter(e, n, s, r) {
     const a = this.getTable(e, n);
     if (a) {
-      a.getTableFilters().setColumnFilter(r, s);
+      a.getTableFilters().setColumnFilter(s, r);
       const u = a.getSubunitId();
       this._tableFilterChanged$.next({
         unitId: e,
@@ -982,31 +991,31 @@ let T = class extends k {
     }
   }
   getFilterRanges(e, n) {
-    const r = this._tableMap.get(e);
-    if (!r)
+    const s = this._tableMap.get(e);
+    if (!s)
       return [];
-    const s = [];
-    return r.forEach((a) => {
-      a.getSubunitId() === n && a.isShowHeader() && s.push(a.getRange());
-    }), s;
+    const r = [];
+    return s.forEach((a) => {
+      a.getSubunitId() === n && a.isShowHeader() && r.push(a.getRange());
+    }), r;
   }
   getSheetFilterRangeWithState(e, n) {
-    const r = this._tableMap.get(e);
-    if (!r)
+    const s = this._tableMap.get(e);
+    if (!s)
       return [];
-    const s = [];
-    return r.forEach((a) => {
-      a.getSubunitId() === n && a.isShowHeader() && s.push({
+    const r = [];
+    return s.forEach((a) => {
+      a.getSubunitId() === n && a.isShowHeader() && r.push({
         tableId: a.getId(),
         range: a.getRange(),
         states: a.getFilterStates(a.getRange())
       });
-    }), s;
+    }), r;
   }
   getTable(e, n) {
-    const r = this._tableMap.get(e);
-    if (r)
-      return r.get(n);
+    const s = this._tableMap.get(e);
+    if (s)
+      return s.get(n);
   }
   /**
    * Get the unique table name, in excel, the table name should be unique because it is used as a reference.
@@ -1015,12 +1024,12 @@ let T = class extends k {
    * @returns {string} The unique table name
    */
   getUniqueTableName(e, n) {
-    const r = this._tableMap.get(e);
-    if (!r)
+    const s = this._tableMap.get(e);
+    if (!s)
       return n;
-    const s = new Set(Array.from(r.values()).map((u) => u.getDisplayName()));
+    const r = new Set(Array.from(s.values()).map((u) => u.getDisplayName()));
     let a = n, o = 1;
-    for (; s.has(a); )
+    for (; r.has(a); )
       a = `${n}-${o}`, o++;
     return a;
   }
@@ -1035,7 +1044,7 @@ let T = class extends k {
   }
   getTableList(e) {
     const n = this._tableMap.get(e);
-    return n ? Array.from(n.values()).map((r) => ({ ...r.getTableInfo(), unitId: e })) : [];
+    return n ? Array.from(n.values()).map((s) => ({ ...s.getTableInfo(), unitId: e })) : [];
   }
   /**
    * Get the table list by unit id and subunit id.
@@ -1044,165 +1053,165 @@ let T = class extends k {
    * @returns {Table[]} The table list.
    */
   getTablesBySubunitId(e, n) {
-    const r = this._tableMap.get(e);
-    return r ? Array.from(r.values()).filter((s) => s.getSubunitId() === n) : [];
+    const s = this._tableMap.get(e);
+    return s ? Array.from(s.values()).filter((r) => r.getSubunitId() === n) : [];
   }
   getTablesInfoBySubunitId(e, n) {
-    return this.getTablesBySubunitId(e, n).map((r) => ({
-      id: r.getId(),
-      name: r.getDisplayName(),
-      range: r.getRange()
+    return this.getTablesBySubunitId(e, n).map((s) => ({
+      id: s.getId(),
+      name: s.getDisplayName(),
+      range: s.getRange()
     }));
   }
   deleteTable(e, n) {
-    const r = this._tableMap.get(e), s = r == null ? void 0 : r.get(n);
-    if (s) {
-      const a = s.getTableInfo(), o = s.getTableStyleId();
-      r == null || r.delete(n);
-      const { subUnitId: u, range: l, name: i } = a;
+    const s = this._tableMap.get(e), r = s == null ? void 0 : s.get(n);
+    if (r) {
+      const a = r.getTableInfo(), o = r.getTableStyleId();
+      s == null || s.delete(n);
+      const { subUnitId: u, range: i, name: l } = a;
       this._tableDelete$.next({
         unitId: e,
         subUnitId: u,
         tableId: n,
-        range: l,
-        tableName: i,
+        range: i,
+        tableName: l,
         tableStyleId: o
       });
     }
   }
-  operationTableRowCol(e, n, r) {
-    const s = this.getTableById(e, n);
-    if (!s) return;
-    const { operationType: a, rowColType: o, index: u, count: l, columnsJson: i } = r, h = s.getRange(), d = { ...h };
+  operationTableRowCol(e, n, s) {
+    const r = this.getTableById(e, n);
+    if (!r) return;
+    const { operationType: a, rowColType: o, index: u, count: i, columnsJson: l } = s, h = r.getRange(), d = { ...h };
     if (a === M.Insert) {
       if (o === "row")
-        d.endRow += l;
+        d.endRow += i;
       else if (o === "column") {
-        d.endColumn += l;
-        for (let c = 0; c < l; c++) {
-          const m = this._localeService.t("sheets-table.columnPrefix"), S = new Y(q(), X(s.getColumnsCount() + 1 + c, m));
-          i != null && i[c] && S.fromJSON(i[c]);
+        d.endColumn += i;
+        for (let c = 0; c < i; c++) {
+          const g = this._localeService.t("sheets-table.columnPrefix"), C = new j(L(), te(r.getColumnsCount() + 1 + c, g));
+          l != null && l[c] && C.fromJSON(l[c]);
           const w = u + c - h.startColumn;
-          s.insertColumn(w, S);
+          r.insertColumn(w, C);
         }
       }
     } else if (o === "row")
-      d.endRow -= l;
+      d.endRow -= i;
     else if (o === "column") {
-      d.endColumn -= l;
-      for (let c = l - 1; c >= 0; c--) {
-        const m = u + c - h.startColumn;
-        s.removeColumn(m);
+      d.endColumn -= i;
+      for (let c = i - 1; c >= 0; c--) {
+        const g = u + c - h.startColumn;
+        r.removeColumn(g);
       }
     }
-    s.setRange(d), this._tableRangeChanged$.next({
+    r.setRange(d), this._tableRangeChanged$.next({
       unitId: e,
-      subUnitId: s.getSubunitId(),
+      subUnitId: r.getSubunitId(),
       tableId: n,
       range: d,
       oldRange: h
     });
   }
-  updateTableRange(e, n, r) {
-    const s = this.getTableById(e, n);
-    if (!s) return;
-    const a = s.getRange(), o = r.newRange;
+  updateTableRange(e, n, s) {
+    const r = this.getTableById(e, n);
+    if (!r) return;
+    const a = r.getRange(), o = s.newRange;
     if (o.startColumn < a.startColumn) {
-      const u = a.startColumn - o.startColumn, l = this._localeService.t("sheets-table.columnPrefix");
-      for (let i = 0; i < u; i++)
-        s.insertColumn(a.startColumn, new Y(q(), X(s.getColumnsCount() + 1, l)));
+      const u = a.startColumn - o.startColumn, i = this._localeService.t("sheets-table.columnPrefix");
+      for (let l = 0; l < u; l++)
+        r.insertColumn(a.startColumn, new j(L(), te(r.getColumnsCount() + 1, i)));
     } else if (o.startColumn > a.startColumn) {
       const u = o.startColumn - a.startColumn;
-      for (let l = u - 1; l >= 0; l--) {
-        const i = o.startColumn + l - a.startColumn;
-        s.removeColumn(i);
+      for (let i = u - 1; i >= 0; i--) {
+        const l = o.startColumn + i - a.startColumn;
+        r.removeColumn(l);
       }
     }
     if (o.endColumn < a.endColumn) {
       const u = a.endColumn - o.endColumn;
-      for (let l = u - 1; l >= 0; l--) {
-        const i = o.endColumn + l - a.startColumn;
-        s.removeColumn(i);
+      for (let i = u - 1; i >= 0; i--) {
+        const l = o.endColumn + i - a.startColumn;
+        r.removeColumn(l);
       }
     } else if (o.endColumn > a.endColumn) {
       const u = o.endColumn - a.endColumn;
-      for (let l = 0; l < u; l++)
-        s.insertColumn(a.endColumn, new Y(q(), X(s.getColumnsCount() + 1, "Column")));
+      for (let i = 0; i < u; i++)
+        r.insertColumn(a.endColumn, new j(L(), te(r.getColumnsCount() + 1, "Column")));
     }
-    s.setRange(o), this._tableRangeChanged$.next({
+    r.setRange(o), this._tableRangeChanged$.next({
       unitId: e,
-      subUnitId: s.getSubunitId(),
+      subUnitId: r.getSubunitId(),
       tableId: n,
       range: o,
       oldRange: a
     });
   }
-  setTableByConfig(e, n, r) {
+  setTableByConfig(e, n, s) {
     var c;
-    const s = this._tableMap.get(e), a = s == null ? void 0 : s.get(n);
+    const r = this._tableMap.get(e), a = r == null ? void 0 : r.get(n);
     if (!a) return;
-    const o = a.getSubunitId(), { name: u, updateRange: l, rowColOperation: i, theme: h, options: d } = r;
+    const o = a.getSubunitId(), { name: u, updateRange: i, rowColOperation: l, theme: h, options: d } = s;
     if (u) {
-      const m = a.getDisplayName();
+      const g = a.getDisplayName();
       a.setDisplayName(u), this._tableNameChanged$.next({
         unitId: e,
         subUnitId: o,
         tableId: n,
         tableName: u,
-        oldTableName: m
+        oldTableName: g
       });
     }
-    if (i && this.operationTableRowCol(e, n, i), l && this.updateTableRange(e, n, l), h) {
-      const m = (c = a.getTableStyleId()) != null ? c : "default";
+    if (l && this.operationTableRowCol(e, n, l), i && this.updateTableRange(e, n, i), h) {
+      const g = (c = a.getTableStyleId()) != null ? c : "default";
       a.setTableStyleId(h), this._tableThemeChanged$.next({
         unitId: e,
         subUnitId: o,
         tableId: n,
         theme: h,
-        oldTheme: m
+        oldTheme: g
       });
     }
     d && d.showHeader !== void 0 && a.setShowHeader(d.showHeader);
   }
   toJSON(e) {
-    const n = {}, r = this._tableMap.get(e);
-    return r && r.forEach((s) => {
-      const a = s.getSubunitId();
+    const n = {}, s = this._tableMap.get(e);
+    return s && s.forEach((r) => {
+      const a = r.getSubunitId();
       if (!n[a]) {
         const o = /* @__PURE__ */ new Set();
-        this.getTablesBySubunitId(e, a).forEach((l) => {
-          const i = l.getTableFilters().getFilterOutRows();
-          if (i)
-            for (const h of i)
+        this.getTablesBySubunitId(e, a).forEach((i) => {
+          const l = i.getTableFilters().getFilterOutRows();
+          if (l)
+            for (const h of l)
               o.add(h);
         }), n[a] = {
           tables: [],
           tableFilteredOutRows: Array.from(o)
         };
       }
-      n[a].tables.push(s.toJSON());
+      n[a].tables.push(r.toJSON());
     }), n;
   }
   fromJSON(e, n) {
-    const r = this._ensureUnit(e);
+    const s = this._ensureUnit(e);
     Object.keys(n).forEach((a) => {
       const o = $(this._univerInstanceService, { unitId: e, subUnitId: a });
       if (!o)
         return;
       const u = o.worksheet;
-      let l;
-      n[a].tables ? l = n[a].tables : Array.isArray(n[a]) && (l = n[a]), l && l.forEach((i) => {
-        const h = this.getColumnHeader(e, a, i.range), d = new xe(i.id, i.name, i.range, h, i.options);
-        if (d.setTableMeta(i.meta), i.columns.length && d.setColumns(i.columns), i.filters) {
+      let i;
+      n[a].tables ? i = n[a].tables : Array.isArray(n[a]) && (i = n[a]), i && i.forEach((l) => {
+        const h = this.getColumnHeader(e, a, l.range), d = new xe(l.id, l.name, l.range, h, l.options);
+        if (d.setTableMeta(l.meta), l.columns.length && d.setColumns(l.columns), l.filters) {
           const c = d.getTableFilters();
-          c.fromJSON(i.filters), c.doFilter(u, d.getTableFilterRange());
+          c.fromJSON(l.filters), c.doFilter(u, d.getTableFilterRange());
         }
-        d.setSubunitId(a), r.set(i.id, d), this._tableAdd$.next({
+        d.setSubunitId(a), s.set(l.id, d), this._tableAdd$.next({
           unitId: e,
           subUnitId: a,
-          range: i.range,
-          tableName: i.name,
-          tableId: i.id
+          range: l.range,
+          tableName: l.name,
+          tableId: l.id
         });
       });
     }), this._tableInitStatus.next(!0);
@@ -1216,16 +1225,16 @@ let T = class extends k {
     }), this._tableMap.clear();
   }
 };
-T = In([
+T = vn([
   Oe(0, E),
-  Oe(1, p(he))
+  Oe(1, p(me))
 ], T);
-var Mn = Object.getOwnPropertyDescriptor, vn = (t, e, n, r) => {
-  for (var s = r > 1 ? void 0 : r ? Mn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
-    (o = t[a]) && (s = o(s) || s);
-  return s;
-}, Fn = (t, e) => (n, r) => e(n, r, t);
-let z = class extends k {
+var Fn = Object.getOwnPropertyDescriptor, yn = (t, e, n, s) => {
+  for (var r = s > 1 ? void 0 : s ? Fn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
+    (o = t[a]) && (r = o(r) || r);
+  return r;
+}, Nn = (t, e) => (n, s) => e(n, s, t);
+let X = class extends Q {
   constructor(t) {
     super(), this._tableManager = t;
   }
@@ -1240,8 +1249,8 @@ let z = class extends k {
   getTableList(t) {
     return this._tableManager.getTableList(t);
   }
-  addTable(t, e, n, r, s, a, o) {
-    return this._tableManager.addTable(t, e, n, r, s, a, o);
+  addTable(t, e, n, s, r, a, o) {
+    return this._tableManager.addTable(t, e, n, s, r, a, o);
   }
   deleteTable(t, e, n) {
     this._tableManager.deleteTable(t, n);
@@ -1251,161 +1260,161 @@ let z = class extends k {
     return (n = this._tableManager.getTable(t, e)) == null ? void 0 : n.getTableMeta();
   }
   setTableMeta(t, e, n) {
-    var r;
-    (r = this._tableManager.getTable(t, e)) == null || r.setTableMeta(n);
+    var s;
+    (s = this._tableManager.getTable(t, e)) == null || s.setTableMeta(n);
   }
   getTableColumnMeta(t, e, n) {
-    var r, s;
-    return (s = (r = this._tableManager.getTable(t, e)) == null ? void 0 : r.getTableColumnByIndex(n)) == null ? void 0 : s.getMeta();
+    var s, r;
+    return (r = (s = this._tableManager.getTable(t, e)) == null ? void 0 : s.getTableColumnByIndex(n)) == null ? void 0 : r.getMeta();
   }
-  selTableColumnMeta(t, e, n, r) {
-    var s, a;
-    (a = (s = this._tableManager.getTable(t, e)) == null ? void 0 : s.getTableColumnByIndex(n)) == null || a.setMeta(r);
+  selTableColumnMeta(t, e, n, s) {
+    var r, a;
+    (a = (r = this._tableManager.getTable(t, e)) == null ? void 0 : r.getTableColumnByIndex(n)) == null || a.setMeta(s);
   }
-  addFilter(t, e, n, r) {
-    this._tableManager.addFilter(t, e, n, r);
+  addFilter(t, e, n, s) {
+    this._tableManager.addFilter(t, e, n, s);
   }
-  getCellValueWithConditionType(t, e, n, r = O.String) {
-    return ie(t, e, n, r);
+  getCellValueWithConditionType(t, e, n, s = O.String) {
+    return ue(t, e, n, s);
   }
 };
-z = vn([
-  Fn(0, p(T))
-], z);
-const ee = {
+X = yn([
+  Nn(0, p(T))
+], X);
+const J = {
   id: "sheet.mutation.add-table",
-  type: y.MUTATION,
+  type: N.MUTATION,
   handler: (t, e) => {
-    const { tableId: n, unitId: r, subUnitId: s, name: a, range: o, header: u, options: l } = e;
-    return t.get(z).addTable(r, s, a, o, u, n, l), !0;
+    const { tableId: n, unitId: s, subUnitId: r, name: a, range: o, header: u, options: i } = e;
+    return t.get(X).addTable(s, r, a, o, u, n, i), !0;
   }
-}, te = {
+}, k = {
   id: "sheet.mutation.delete-table",
-  type: y.MUTATION,
+  type: N.MUTATION,
   handler: (t, e) => {
-    const { unitId: n, subUnitId: r, tableId: s } = e;
-    return t.get(z).deleteTable(n, r, s), !0;
+    const { unitId: n, subUnitId: s, tableId: r } = e;
+    return t.get(X).deleteTable(n, s, r), !0;
   }
 }, Dn = {
   id: "sheet.command.add-table",
-  type: y.COMMAND,
+  type: N.COMMAND,
   handler: (t, e) => {
     var w;
     if (!e)
       return !1;
-    const n = t.get(A), r = t.get(x), s = t.get(he), a = (w = e.id) != null ? w : q();
+    const n = t.get(A), s = t.get(x), r = t.get(me), a = (w = e.id) != null ? w : L();
     let o = e.name;
     if (!o) {
       const f = t.get(T).getTableList(e.unitId).length;
-      o = `${s.t("sheets-table.tablePrefix")}${f + 1}`;
+      o = `${r.t("sheets-table.tablePrefix")}${f + 1}`;
     }
-    const u = [], l = [], i = t.get(T), { unitId: h, subUnitId: d, range: c } = e, m = i.getColumnHeader(h, d, c, s.t("sheets-table.columnPrefix"));
-    return u.push({ id: ee.id, params: { ...e, tableId: a, name: o, header: m } }), l.push({ id: te.id, params: { tableId: a, unitId: e.unitId } }), L(u, r) && n.pushUndoRedo({
+    const u = [], i = [], l = t.get(T), { unitId: h, subUnitId: d, range: c } = e, g = l.getColumnHeader(h, d, c, r.t("sheets-table.columnPrefix"));
+    return u.push({ id: J.id, params: { ...e, tableId: a, name: o, header: g } }), i.push({ id: k.id, params: { tableId: a, unitId: e.unitId } }), B(u, s) && n.pushUndoRedo({
       unitID: e.unitId,
-      undoMutations: l,
+      undoMutations: i,
       redoMutations: u
     }), !0;
   }
-}, yn = {
+}, xn = {
   id: "sheet.command.delete-table",
-  type: y.COMMAND,
+  type: N.COMMAND,
   handler: (t, e) => {
     if (!e)
       return !1;
-    const n = t.get(A), r = t.get(x), s = t.get(T), a = [], o = [], u = s.getTable(e.unitId, e.tableId), l = u == null ? void 0 : u.toJSON();
-    if (!l)
+    const n = t.get(A), s = t.get(x), r = t.get(T), a = [], o = [], u = r.getTable(e.unitId, e.tableId), i = u == null ? void 0 : u.toJSON();
+    if (!i)
       throw new Error("[TableManager]: Table not found");
-    return a.push({ id: te.id, params: { ...e } }), o.push({
-      id: ee.id,
+    return a.push({ id: k.id, params: { ...e } }), o.push({
+      id: J.id,
       params: {
         unitId: e.unitId,
         subUnitId: e.subUnitId,
         tableId: e.tableId,
-        name: l.name,
-        range: l.range,
-        options: l.options
+        name: i.name,
+        range: i.range,
+        options: i.options
       }
-    }), L(a, r) && n.pushUndoRedo({
+    }), B(a, s) && n.pushUndoRedo({
       unitID: e.unitId,
       undoMutations: o,
       redoMutations: a
     }), !0;
   }
-}, Se = {
+}, Ce = {
   id: "sheet.mutation.set-table-filter",
-  type: y.MUTATION,
+  type: N.MUTATION,
   handler: (t, e) => {
-    const { tableId: n, unitId: r, column: s, tableFilter: a } = e;
-    return t.get(T).addFilter(r, n, s, a), !0;
+    const { tableId: n, unitId: s, column: r, tableFilter: a } = e;
+    return t.get(T).addFilter(s, n, r, a), !0;
   }
-}, Nn = {
+}, On = {
   id: "sheet.command.set-table-filter",
-  type: y.COMMAND,
+  type: N.COMMAND,
   handler: (t, e) => {
     if (!e)
       return !1;
-    const n = t.get(A), r = t.get(x), s = e.tableId || q(), a = [], o = [];
-    return a.push({ id: Se.id, params: { ...e, tableId: s } }), o.push({ id: Se.id, params: { ...e, tableId: s, tableFilter: void 0 } }), L(a, r) && n.pushUndoRedo({
+    const n = t.get(A), s = t.get(x), r = e.tableId || L(), a = [], o = [];
+    return a.push({ id: Ce.id, params: { ...e, tableId: r } }), o.push({ id: Ce.id, params: { ...e, tableId: r, tableFilter: void 0 } }), B(a, s) && n.pushUndoRedo({
       unitID: e.unitId,
       undoMutations: o,
       redoMutations: a
     }), !0;
   }
-}, Xe = "SHEET_TABLE_PLUGIN", re = "SHEET_TABLE", xn = "table-custom";
-var On = Object.getOwnPropertyDescriptor, Un = (t, e, n, r) => {
-  for (var s = r > 1 ? void 0 : r ? On(e, n) : e, a = t.length - 1, o; a >= 0; a--)
-    (o = t[a]) && (s = o(s) || s);
-  return s;
-}, fe = (t, e) => (n, r) => e(n, r, t);
-let B = class extends k {
-  constructor(e, n, r) {
+}, Xe = "SHEET_TABLE_PLUGIN", re = "SHEET_TABLE", Un = "table-custom";
+var $n = Object.getOwnPropertyDescriptor, An = (t, e, n, s) => {
+  for (var r = s > 1 ? void 0 : s ? $n(e, n) : e, a = t.length - 1, o; a >= 0; a--)
+    (o = t[a]) && (r = o(r) || r);
+  return r;
+}, ae = (t, e) => (n, s) => e(n, s, t);
+let W = class extends Q {
+  constructor(e, n, s, r) {
     super();
     b(this, "_tableRangeRTree", /* @__PURE__ */ new Map());
-    this._sheetInterceptorService = e, this._tableManager = n, this._resourceManagerService = r, this._initSnapshot(), this.registerTableChangeEvent(), this.registerTableHeaderInterceptor();
+    this._univerInstanceService = e, this._sheetInterceptorService = n, this._tableManager = s, this._resourceManagerService = r, this._initSnapshot(), this._initSheetChange(), this.registerTableChangeEvent(), this.registerTableHeaderInterceptor();
   }
-  getContainerTableWithRange(e, n, r) {
-    const s = this._ensureTableRangeRTree(e), o = Array.from(s.bulkSearch([{ unitId: e, sheetId: n, range: r }])).find((u) => {
-      const l = this._tableManager.getTable(e, String(u));
-      return l ? Ce.contains(l.getRange(), r) : !1;
+  getContainerTableWithRange(e, n, s) {
+    const r = this._ensureTableRangeRTree(e), o = Array.from(r.bulkSearch([{ unitId: e, sheetId: n, range: s }])).find((u) => {
+      const i = this._tableManager.getTable(e, String(u));
+      return i ? Se.contains(i.getRange(), s) : !1;
     });
     if (o)
       return this._tableManager.getTable(e, String(o));
   }
   _ensureTableRangeRTree(e) {
-    return this._tableRangeRTree.has(e) || this._tableRangeRTree.set(e, new rt()), this._tableRangeRTree.get(e);
+    return this._tableRangeRTree.has(e) || this._tableRangeRTree.set(e, new st()), this._tableRangeRTree.get(e);
   }
   registerTableChangeEvent() {
     this.disposeWithMe(
       this._tableManager.tableAdd$.subscribe((e) => {
-        const { range: n, tableId: r, unitId: s, subUnitId: a } = e;
-        this._ensureTableRangeRTree(s).insert({
-          unitId: s,
+        const { range: n, tableId: s, unitId: r, subUnitId: a } = e;
+        this._ensureTableRangeRTree(r).insert({
+          unitId: r,
           sheetId: a,
-          id: r,
+          id: s,
           range: { ...n }
         });
       })
     ), this.disposeWithMe(
       this._tableManager.tableRangeChanged$.subscribe((e) => {
-        const { range: n, tableId: r, unitId: s, subUnitId: a, oldRange: o } = e, u = this._ensureTableRangeRTree(s);
+        const { range: n, tableId: s, unitId: r, subUnitId: a, oldRange: o } = e, u = this._ensureTableRangeRTree(r);
         u.remove({
-          unitId: s,
+          unitId: r,
           sheetId: a,
-          id: r,
+          id: s,
           range: { ...o }
         }), u.insert({
-          unitId: s,
+          unitId: r,
           sheetId: a,
-          id: r,
+          id: s,
           range: { ...n }
         });
       })
     ), this.disposeWithMe(
       this._tableManager.tableDelete$.subscribe((e) => {
-        const { tableId: n, unitId: r, subUnitId: s, range: a } = e;
-        this._ensureTableRangeRTree(r).remove({
-          unitId: r,
-          sheetId: s,
+        const { tableId: n, unitId: s, subUnitId: r, range: a } = e;
+        this._ensureTableRangeRTree(s).remove({
+          unitId: s,
+          sheetId: r,
           id: n,
           range: { ...a }
         });
@@ -1415,23 +1424,23 @@ let B = class extends k {
   registerTableHeaderInterceptor() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(Be.CELL_CONTENT, {
-        effect: st.Value,
-        handler: (e, n, r) => {
-          const { row: s, col: a, unitId: o, subUnitId: u } = n, l = this._ensureTableRangeRTree(o);
-          if ((e == null ? void 0 : e.v) === void 0 && l) {
-            const h = Array.from(l.bulkSearch([{ unitId: o, sheetId: u, range: { startColumn: a, endColumn: a, startRow: s, endRow: s } }]));
+        effect: rt.Value,
+        handler: (e, n, s) => {
+          const { row: r, col: a, unitId: o, subUnitId: u } = n, i = this._ensureTableRangeRTree(o);
+          if ((e == null ? void 0 : e.v) === void 0 && i) {
+            const h = Array.from(i.bulkSearch([{ unitId: o, sheetId: u, range: { startColumn: a, endColumn: a, startRow: r, endRow: r } }]));
             if (h.length > 0) {
               const d = this._tableManager.getTable(o, h[0]);
               if (d) {
-                const c = d.getRange(), m = a - c.startColumn;
-                if (c.startRow === s) {
-                  const w = d.getColumnNameByIndex(m);
-                  return (!e || e === n.rawData) && (e = { ...n.rawData }), e.v = w, r(e);
+                const c = d.getRange(), g = a - c.startColumn;
+                if (c.startRow === r) {
+                  const w = d.getColumnNameByIndex(g);
+                  return (!e || e === n.rawData) && (e = { ...n.rawData }), e.v = w, s(e);
                 }
               }
             }
           }
-          return r(e);
+          return s(e);
         }
       })
     );
@@ -1457,7 +1466,7 @@ let B = class extends k {
           return {};
         }
       },
-      businesses: [ge.UNIVER_SHEET],
+      businesses: [z.UNIVER_SHEET],
       pluginName: Xe,
       onLoad: (e, n) => {
         this._fromJSON(e, n);
@@ -1467,113 +1476,196 @@ let B = class extends k {
       }
     }));
   }
+  // eslint-disable-next-line max-lines-per-function
+  _initSheetChange() {
+    this.disposeWithMe(
+      this._sheetInterceptorService.interceptCommand({
+        // eslint-disable-next-line max-lines-per-function
+        getMutations: (e) => {
+          var n;
+          if (e.id === ct.id) {
+            const s = e.params, r = s.unitId || this._univerInstanceService.getCurrentUnitOfType(z.UNIVER_SHEET).getUnitId(), a = s.subUnitId || ((n = this._univerInstanceService.getCurrentUnitOfType(z.UNIVER_SHEET).getActiveSheet()) == null ? void 0 : n.getSheetId());
+            if (!r || !a)
+              return { redos: [], undos: [] };
+            const o = this._tableManager.getTablesBySubunitId(r, a);
+            if (o.length === 0)
+              return { redos: [], undos: [] };
+            const u = [], i = [];
+            return o.forEach((l) => {
+              const h = l.toJSON();
+              u.push({
+                id: k.id,
+                params: {
+                  unitId: r,
+                  subUnitId: a,
+                  tableId: h.id
+                }
+              }), i.push({
+                id: J.id,
+                params: {
+                  unitId: r,
+                  subUnitId: a,
+                  name: h.name,
+                  range: h.range,
+                  tableId: h.id,
+                  options: {
+                    ...h.options,
+                    columns: h.columns,
+                    filters: h.filters.tableColumnFilterList
+                  }
+                }
+              });
+            }), { redos: u, undos: i };
+          } else if (e.id === dt.id) {
+            const s = e.params, { unitId: r, subUnitId: a, targetSubUnitId: o } = s;
+            if (!r || !a || !o)
+              return { redos: [], undos: [] };
+            const u = this._tableManager.getTablesBySubunitId(r, a);
+            if (u.length === 0)
+              return { redos: [], undos: [] };
+            const i = [], l = [];
+            return u.forEach((h) => {
+              const d = h.toJSON(), c = L();
+              i.push({
+                id: J.id,
+                params: {
+                  unitId: r,
+                  subUnitId: o,
+                  name: d.name,
+                  range: {
+                    ...d.range,
+                    sheetId: o
+                  },
+                  tableId: c,
+                  options: {
+                    ...d.options,
+                    columns: d.columns,
+                    filters: d.filters.tableColumnFilterList
+                  }
+                }
+              }), l.push({
+                id: k.id,
+                params: {
+                  unitId: r,
+                  subUnitId: o,
+                  tableId: c
+                }
+              });
+            }), { redos: i, undos: l };
+          }
+          return { redos: [], undos: [] };
+        }
+      })
+    );
+  }
   dispose() {
     super.dispose(), this._tableRangeRTree.clear();
   }
 };
-B = Un([
-  fe(0, p(pe)),
-  fe(1, p(T)),
-  fe(2, p(nt))
-], B);
-const C = {
+W = An([
+  ae(0, p(E)),
+  ae(1, p(pe)),
+  ae(2, p(T)),
+  ae(3, p(nt))
+], W);
+const S = {
   id: "sheet.mutation.set-sheet-table",
-  type: y.MUTATION,
+  type: N.MUTATION,
   handler: (t, e) => {
     if (!e)
       return !1;
-    const { unitId: n, tableId: r, config: s } = e;
-    return t.get(T).setTableByConfig(n, r, s), !0;
+    const { unitId: n, tableId: s, config: r } = e;
+    return t.get(T).setTableByConfig(n, s, r), !0;
   }
-}, $n = {
+}, En = {
   id: "sheet.command.add-table-theme",
-  type: y.COMMAND,
+  type: N.COMMAND,
   handler: (t, e) => {
     if (!e)
       return !1;
-    const n = t.get(T), { unitId: r, tableId: s, themeStyle: a } = e, o = [], u = [], l = n.getTableById(r, s);
-    if (!l) return !1;
-    const i = l.getSubunitId();
+    const n = t.get(T), { unitId: s, tableId: r, themeStyle: a } = e, o = [], u = [], i = n.getTableById(s, r);
+    if (!i) return !1;
+    const l = i.getSubunitId();
     o.push({
-      id: Ee.id,
+      id: Le.id,
       params: {
-        unitId: r,
-        subUnitId: i,
+        unitId: s,
+        subUnitId: l,
         styleJSON: a.toJson()
       }
     }), o.push({
-      id: C.id,
+      id: S.id,
       params: {
-        unitId: r,
-        subUnitId: i,
-        tableId: s,
+        unitId: s,
+        subUnitId: l,
+        tableId: r,
         config: {
           theme: a.getName()
         }
       }
     }), u.push({
-      id: C.id,
+      id: S.id,
       params: {
-        unitId: r,
-        subUnitId: i,
-        tableId: s,
+        unitId: s,
+        subUnitId: l,
+        tableId: r,
         config: {
-          themeStyle: l.getTableStyleId()
+          themeStyle: i.getTableStyleId()
         }
       }
     }), u.push({
       id: We.id,
       params: {
-        unitId: r,
-        subUnitId: i,
+        unitId: s,
+        subUnitId: l,
         styleName: a.getName()
       }
     });
     const h = t.get(x);
-    return L(o, h) && t.get(A).pushUndoRedo({
-      unitID: r,
+    return B(o, h) && t.get(A).pushUndoRedo({
+      unitID: s,
       undoMutations: u,
       redoMutations: o
     }), !0;
   }
-}, An = {
+}, Bn = {
   id: "sheet.command.remove-table-theme",
-  type: y.COMMAND,
+  type: N.COMMAND,
   handler: (t, e) => {
     if (!e)
       return !1;
-    const { unitId: n, tableId: r, themeName: s } = e, a = t.get(T), o = t.get(He), u = a.getTableById(n, r);
+    const { unitId: n, tableId: s, themeName: r } = e, a = t.get(T), o = t.get(He), u = a.getTableById(n, s);
     if (!u) return !1;
-    const l = u.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(xn)).find((f) => f !== s);
-    m || (m = d[0]), i.push({ id: C.id, params: { unitId: n, subUnitId: l, tableId: r, config: { theme: m } } }), i.push({ id: We.id, params: { unitId: n, subUnitId: l, styleName: s } });
-    const S = o.getDefaultRangeThemeStyle(s);
-    S && (h.push({ id: Ee.id, params: { unitId: n, subUnitId: l, styleJSON: S.toJson() } }), h.push({ id: C.id, params: { unitId: n, subUnitId: l, tableId: r, config: { theme: s } } }));
+    const i = u.getSubunitId(), l = [], h = [], d = o.getRegisteredRangeThemes().filter((f) => f == null ? void 0 : f.startsWith("table-default"));
+    let g = o.getRegisteredRangeThemes().filter((f) => f == null ? void 0 : f.startsWith(Un)).find((f) => f !== r);
+    g || (g = d[0]), l.push({ id: S.id, params: { unitId: n, subUnitId: i, tableId: s, config: { theme: g } } }), l.push({ id: We.id, params: { unitId: n, subUnitId: i, styleName: r } });
+    const C = o.getDefaultRangeThemeStyle(r);
+    C && (h.push({ id: Le.id, params: { unitId: n, subUnitId: i, styleJSON: C.toJson() } }), h.push({ id: S.id, params: { unitId: n, subUnitId: i, tableId: s, config: { theme: r } } }));
     const w = t.get(x);
-    return L(i, w) && t.get(A).pushUndoRedo({
+    return B(l, w) && t.get(A).pushUndoRedo({
       unitID: n,
-      redoMutations: i,
+      redoMutations: l,
       undoMutations: h
     }), !0;
   }
 }, Ln = {
   id: "sheet.command.set-table-config",
-  type: y.COMMAND,
+  type: N.COMMAND,
   // eslint-disable-next-line max-lines-per-function
   handler: (t, e) => {
     if (!e)
       return !1;
-    const { unitId: n, tableId: r, name: s, updateRange: a, rowColOperation: o, theme: u } = e, l = t.get(T), i = l.getTableById(n, r);
-    if (!i) return !1;
-    const h = {}, d = {}, c = t.get(he), S = t.get(E).getCurrentUnitOfType(ge.UNIVER_SHEET), w = /* @__PURE__ */ new Set();
-    if (S && (S.getSheets().forEach((_) => {
+    const { unitId: n, tableId: s, name: r, updateRange: a, rowColOperation: o, theme: u } = e, i = t.get(T), l = i.getTableById(n, s);
+    if (!l) return !1;
+    const h = {}, d = {}, c = t.get(me), C = t.get(E).getCurrentUnitOfType(z.UNIVER_SHEET), w = /* @__PURE__ */ new Set();
+    if (C && (C.getSheets().forEach((_) => {
       w.add(_.getName());
-    }), l.getTableList(n).forEach((_) => {
+    }), i.getTableList(n).forEach((_) => {
       w.add(_.name);
-    })), s) {
-      if (!at(s, w))
+    })), r) {
+      if (!at(r, w))
         return t.get(ot).warn(c.t("sheets-table.tableNameError")), !1;
-      h.name = i.getDisplayName(), d.name = s;
+      h.name = l.getDisplayName(), d.name = r;
     }
     o && (h.rowColOperation = {
       operationType: o.operationType === M.Insert ? M.Delete : M.Insert,
@@ -1581,50 +1673,50 @@ const C = {
       index: o.index,
       count: o.count
     }, d.rowColOperation = o), a && (h.updateRange = {
-      newRange: i.getRange()
-    }, d.updateRange = a), u && (h.theme = i.getTableStyleId(), d.theme = u);
+      newRange: l.getRange()
+    }, d.updateRange = a), u && (h.theme = l.getTableStyleId(), d.theme = u);
     const R = {
       unitId: n,
-      subUnitId: i.getSubunitId(),
-      tableId: r,
+      subUnitId: l.getSubunitId(),
+      tableId: s,
       config: d
     };
-    return t.get(x).executeCommand(C.id, R), t.get(A).pushUndoRedo({
+    return t.get(x).executeCommand(S.id, R), t.get(A).pushUndoRedo({
       unitID: n,
       undoMutations: [
         {
-          id: C.id,
+          id: S.id,
           params: {
             unitId: n,
-            subUnitId: i.getSubunitId(),
-            tableId: r,
+            subUnitId: l.getSubunitId(),
+            tableId: s,
             config: h
           }
         }
       ],
       redoMutations: [
         {
-          id: C.id,
+          id: S.id,
           params: R
         }
       ]
     }), !0;
   }
-}, Bn = {
+}, Wn = {
   id: "sheet.command.table-insert-row",
-  type: y.COMMAND,
+  type: N.COMMAND,
   handler: (t) => {
     const e = t.get(E), n = $(e);
     if (!n)
       return !1;
-    const { workbook: r, worksheet: s, unitId: a, subUnitId: o } = n, l = t.get(me).getCurrentSelections();
-    if (!l.length || l.length > 1)
+    const { workbook: s, worksheet: r, unitId: a, subUnitId: o } = n, i = t.get(be).getCurrentSelections();
+    if (!i.length || i.length > 1)
       return !1;
     t.get(T);
-    const h = l[0].range, c = t.get(B).getContainerTableWithRange(a, o, h);
+    const h = i[0].range, c = t.get(W).getContainerTableWithRange(a, o, h);
     if (!c) return !1;
-    const m = h.endRow - h.startRow + 1, w = s.getRowCount() - 1, R = s.getCellMatrix().getDataRange().endRow, f = [], I = [];
-    if (w - R < m)
+    const g = h.endRow - h.startRow + 1, w = r.getRowCount() - 1, R = r.getCellMatrix().getDataRange().endRow, f = [], I = [];
+    if (w - R < g)
       f.push({
         id: Ve.id,
         params: {
@@ -1633,7 +1725,7 @@ const C = {
           range: { ...h }
         }
       }), f.push({
-        id: C.id,
+        id: S.id,
         params: {
           unitId: a,
           subUnitId: o,
@@ -1642,13 +1734,13 @@ const C = {
             updateRange: {
               newRange: {
                 ...c.getRange(),
-                endRow: c.getRange().endRow + m
+                endRow: c.getRange().endRow + g
               }
             }
           }
         }
       }), I.push({
-        id: C.id,
+        id: S.id,
         params: {
           unitId: a,
           subUnitId: o,
@@ -1670,7 +1762,7 @@ const C = {
     else {
       const v = { ...c.getRange() };
       f.push({
-        id: C.id,
+        id: S.id,
         params: {
           unitId: a,
           subUnitId: o,
@@ -1679,13 +1771,13 @@ const C = {
             updateRange: {
               newRange: {
                 ...v,
-                endRow: v.endRow + m
+                endRow: v.endRow + g
               }
             }
           }
         }
       }), I.push({
-        id: C.id,
+        id: S.id,
         params: {
           unitId: a,
           subUnitId: o,
@@ -1697,7 +1789,7 @@ const C = {
           }
         }
       });
-      const K = be(
+      const ee = we(
         t,
         {
           unitId: a,
@@ -1713,133 +1805,133 @@ const C = {
           unitId: a,
           subUnitId: o,
           range: {
-            startRow: h.startRow + m,
-            endRow: R + m,
+            startRow: h.startRow + g,
+            endRow: R + g,
             startColumn: v.startColumn,
             endColumn: v.endColumn
           }
         }
       );
-      K && (f.push(...K.redos), I.push(...K.undos));
+      ee && (f.push(...ee.redos), I.push(...ee.undos));
     }
     const U = t.get(x);
-    return L(f, U) && t.get(A).pushUndoRedo({
+    return B(f, U) && t.get(A).pushUndoRedo({
       unitID: a,
       undoMutations: I,
       redoMutations: f
     }), !0;
   }
-}, En = {
+}, Hn = {
   id: "sheet.command.table-insert-col",
-  type: y.COMMAND,
+  type: N.COMMAND,
   handler: (t) => {
     const e = t.get(E), n = $(e);
     if (!n)
       return !1;
-    const { worksheet: r, unitId: s, subUnitId: a } = n, u = t.get(me).getCurrentSelections();
+    const { worksheet: s, unitId: r, subUnitId: a } = n, u = t.get(be).getCurrentSelections();
     if (!u.length || u.length > 1)
       return !1;
-    const i = u[0].range, d = t.get(B).getContainerTableWithRange(s, a, i);
+    const l = u[0].range, d = t.get(W).getContainerTableWithRange(r, a, l);
     if (!d) return !1;
-    const c = i.endColumn - i.startColumn + 1, S = r.getColumnCount() - 1, w = r.getCellMatrix().getDataRange().endColumn, R = [], f = [];
-    if (S - w < c)
+    const c = l.endColumn - l.startColumn + 1, C = s.getColumnCount() - 1, w = s.getCellMatrix().getDataRange().endColumn, R = [], f = [];
+    if (C - w < c)
       R.push({
         id: qe.id,
         params: {
-          unitId: s,
+          unitId: r,
           subUnitId: a,
-          range: { ...i }
+          range: { ...l }
         }
       }), R.push({
-        id: C.id,
+        id: S.id,
         params: {
-          unitId: s,
+          unitId: r,
           subUnitId: a,
           tableId: d.getId(),
           config: {
             rowColOperation: {
               operationType: M.Insert,
-              rowColType: D.Col,
-              index: i.startColumn,
+              rowColType: y.Col,
+              index: l.startColumn,
               count: c
             }
           }
         }
       }), f.push({
-        id: C.id,
+        id: S.id,
         params: {
-          unitId: s,
+          unitId: r,
           subUnitId: a,
           tableId: d.getId(),
           config: {
             rowColOperation: {
               operationType: M.Delete,
-              rowColType: D.Col,
-              index: i.startColumn,
+              rowColType: y.Col,
+              index: l.startColumn,
               count: c
             }
           }
         }
       }), f.push({
-        id: ke.id,
+        id: Je.id,
         params: {
-          unitId: s,
+          unitId: r,
           subUnitId: a,
-          range: { ...i }
+          range: { ...l }
         }
       });
     else {
       const _ = d.getRange();
       R.push({
-        id: C.id,
+        id: S.id,
         params: {
-          unitId: s,
+          unitId: r,
           subUnitId: a,
           tableId: d.getId(),
           config: {
             rowColOperation: {
               operationType: M.Insert,
-              rowColType: D.Col,
-              index: i.startColumn,
+              rowColType: y.Col,
+              index: l.startColumn,
               count: c
             }
           }
         }
       }), f.push({
-        id: C.id,
+        id: S.id,
         params: {
-          unitId: s,
+          unitId: r,
           subUnitId: a,
           tableId: d.getId(),
           config: {
             rowColOperation: {
               operationType: M.Delete,
-              rowColType: D.Col,
-              index: i.startColumn,
+              rowColType: y.Col,
+              index: l.startColumn,
               count: c
             }
           }
         }
       });
-      const v = be(
+      const v = we(
         t,
         {
-          unitId: s,
+          unitId: r,
           subUnitId: a,
           range: {
             startRow: _.startRow,
             endRow: _.endRow,
-            startColumn: i.startColumn,
+            startColumn: l.startColumn,
             endColumn: w
           }
         },
         {
-          unitId: s,
+          unitId: r,
           subUnitId: a,
           range: {
             startRow: _.startRow,
             endRow: _.endRow,
-            startColumn: i.startColumn + c,
+            startColumn: l.startColumn + c,
             endColumn: w + c
           }
         }
@@ -1847,31 +1939,31 @@ const C = {
       v && (R.push(...v.redos), f.push(...v.undos));
     }
     const I = t.get(x);
-    return L(R, I) && t.get(A).pushUndoRedo({
-      unitID: s,
+    return B(R, I) && t.get(A).pushUndoRedo({
+      unitID: r,
       undoMutations: f,
       redoMutations: R
     }), !0;
   }
-}, Wn = {
+}, Vn = {
   id: "sheet.command.table-remove-row",
-  type: y.COMMAND,
+  type: N.COMMAND,
   handler: (t, e) => {
     if (!e)
       return !1;
-    const n = t.get(E), r = $(n);
-    if (!r)
+    const n = t.get(E), s = $(n);
+    if (!s)
       return !1;
-    const { unitId: s, subUnitId: a } = r, u = t.get(me).getCurrentSelections();
+    const { unitId: r, subUnitId: a } = s, u = t.get(be).getCurrentSelections();
     if (!u.length || u.length > 1)
       return !1;
-    const i = u[0].range, d = t.get(B).getContainerTableWithRange(s, a, i);
+    const l = u[0].range, d = t.get(W).getContainerTableWithRange(r, a, l);
     if (!d) return !1;
-    const c = i.endRow - i.startRow + 1, m = [], S = [], w = d.getRange();
-    m.push({
-      id: C.id,
+    const c = l.endRow - l.startRow + 1, g = [], C = [], w = d.getRange();
+    g.push({
+      id: S.id,
       params: {
-        unitId: s,
+        unitId: r,
         subUnitId: a,
         tableId: d.getId(),
         config: {
@@ -1883,10 +1975,10 @@ const C = {
           }
         }
       }
-    }), S.push({
-      id: C.id,
+    }), C.push({
+      id: S.id,
       params: {
-        unitId: s,
+        unitId: r,
         subUnitId: a,
         tableId: d.getId(),
         config: {
@@ -1896,56 +1988,56 @@ const C = {
         }
       }
     });
-    const f = r.worksheet.getCellMatrix().getDataRange().endRow, I = be(
+    const f = s.worksheet.getCellMatrix().getDataRange().endRow, I = we(
       t,
       {
-        unitId: s,
+        unitId: r,
         subUnitId: a,
         range: {
-          startRow: i.endRow + 1,
+          startRow: l.endRow + 1,
           endRow: f,
           startColumn: w.startColumn,
           endColumn: w.endColumn
         }
       },
       {
-        unitId: s,
+        unitId: r,
         subUnitId: a,
         range: {
-          startRow: i.startRow,
+          startRow: l.startRow,
           endRow: f - c,
           startColumn: w.startColumn,
           endColumn: w.endColumn
         }
       }
     );
-    I && (m.push(...I.redos), S.push(...I.undos));
+    I && (g.push(...I.redos), C.push(...I.undos));
     const U = t.get(x);
-    return L(m, U) && t.get(A).pushUndoRedo({
-      unitID: s,
-      undoMutations: S,
-      redoMutations: m
+    return B(g, U) && t.get(A).pushUndoRedo({
+      unitID: r,
+      undoMutations: C,
+      redoMutations: g
     }), !0;
   }
-}, Hn = {
+}, Pn = {
   id: "sheet.command.table-remove-col",
-  type: y.COMMAND,
+  type: N.COMMAND,
   handler: (t, e) => {
     if (!e)
       return !1;
-    const n = t.get(E), r = $(n);
-    if (!r)
+    const n = t.get(E), s = $(n);
+    if (!s)
       return !1;
-    const { workbook: s, unitId: a, subUnitId: o } = r;
+    const { workbook: r, unitId: a, subUnitId: o } = s;
     t.get(T);
-    const l = t.get(me).getCurrentSelections();
-    if (!l.length || l.length > 1)
+    const i = t.get(be).getCurrentSelections();
+    if (!i.length || i.length > 1)
       return !1;
-    const h = l[0].range, c = t.get(B).getContainerTableWithRange(a, o, h);
+    const h = i[0].range, c = t.get(W).getContainerTableWithRange(a, o, h);
     if (!c) return !1;
-    const m = h.endColumn - h.startColumn + 1, S = [], w = [], R = c.getRange();
-    S.push({
-      id: C.id,
+    const g = h.endColumn - h.startColumn + 1, C = [], w = [], R = c.getRange();
+    C.push({
+      id: S.id,
       params: {
         unitId: a,
         subUnitId: o,
@@ -1953,20 +2045,20 @@ const C = {
         config: {
           rowColOperation: {
             operationType: M.Delete,
-            rowColType: D.Col,
+            rowColType: y.Col,
             index: h.startColumn,
-            count: m
+            count: g
           }
         }
       }
     });
     const f = [], I = h.startColumn - R.startColumn;
-    for (let ne = 0; ne < m; ne++) {
-      const Te = c.getTableInfo().columns[I + ne];
+    for (let se = 0; se < g; se++) {
+      const Te = c.getTableInfo().columns[I + se];
       Te && f.push(Te);
     }
     w.push({
-      id: C.id,
+      id: S.id,
       params: {
         unitId: a,
         subUnitId: o,
@@ -1974,15 +2066,15 @@ const C = {
         config: {
           rowColOperation: {
             operationType: M.Insert,
-            rowColType: D.Col,
+            rowColType: y.Col,
             index: h.startColumn,
-            count: m,
+            count: g,
             columnsJson: f
           }
         }
       }
     });
-    const _ = r.worksheet.getCellMatrix().getDataRange().endColumn, v = be(
+    const _ = s.worksheet.getCellMatrix().getDataRange().endColumn, v = we(
       t,
       {
         unitId: a,
@@ -2001,122 +2093,122 @@ const C = {
           startRow: R.startRow,
           endRow: R.endRow,
           startColumn: h.startColumn,
-          endColumn: _ - m
+          endColumn: _ - g
         }
       }
     );
-    v && (S.push(...v.redos), w.push(...v.undos));
-    const K = t.get(x);
-    return L(S, K) && t.get(A).pushUndoRedo({
+    v && (C.push(...v.redos), w.push(...v.undos));
+    const ee = t.get(x);
+    return B(C, ee) && t.get(A).pushUndoRedo({
       unitID: a,
       undoMutations: w,
-      redoMutations: S
+      redoMutations: C
     }), !0;
   }
 };
-var Vn = Object.getOwnPropertyDescriptor, Pn = (t, e, n, r) => {
-  for (var s = r > 1 ? void 0 : r ? Vn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
-    (o = t[a]) && (s = o(s) || s);
-  return s;
-}, Ue = (t, e) => (n, r) => e(n, r, t);
-let le = class extends k {
+var qn = Object.getOwnPropertyDescriptor, Jn = (t, e, n, s) => {
+  for (var r = s > 1 ? void 0 : s ? qn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
+    (o = t[a]) && (r = o(r) || r);
+  return r;
+}, Ue = (t, e) => (n, s) => e(n, s, t);
+let ce = class extends Q {
   constructor(t, e) {
     super(), this._tableManager = t, this._exclusiveRangeService = e, this._initRangeListener();
   }
   _initRangeListener() {
     this.disposeWithMe(
       this._tableManager.tableRangeChanged$.subscribe((t) => {
-        const { range: e, tableId: n, unitId: r, subUnitId: s } = t;
-        this._exclusiveRangeService.clearExclusiveRangesByGroupId(r, s, re, n), this._exclusiveRangeService.addExclusiveRange(r, s, re, [{
+        const { range: e, tableId: n, unitId: s, subUnitId: r } = t;
+        this._exclusiveRangeService.clearExclusiveRangesByGroupId(s, r, re, n), this._exclusiveRangeService.addExclusiveRange(s, r, re, [{
           range: { ...e },
           groupId: n
         }]);
       })
     ), this.disposeWithMe(
       this._tableManager.tableAdd$.subscribe((t) => {
-        const { tableId: e, unitId: n, subUnitId: r, range: s } = t;
-        this._exclusiveRangeService.addExclusiveRange(n, r, re, [{
-          range: { ...s },
+        const { tableId: e, unitId: n, subUnitId: s, range: r } = t;
+        this._exclusiveRangeService.addExclusiveRange(n, s, re, [{
+          range: { ...r },
           groupId: e
         }]);
       })
     ), this.disposeWithMe(
       this._tableManager.tableDelete$.subscribe((t) => {
-        const { tableId: e, unitId: n, subUnitId: r } = t;
-        this._exclusiveRangeService.clearExclusiveRangesByGroupId(n, r, re, e);
+        const { tableId: e, unitId: n, subUnitId: s } = t;
+        this._exclusiveRangeService.clearExclusiveRangesByGroupId(n, s, re, e);
       })
     );
   }
 };
-le = Pn([
+ce = Jn([
   Ue(0, p(T)),
-  Ue(1, p(ct))
-], le);
-var qn = Object.getOwnPropertyDescriptor, kn = (t, e, n, r) => {
-  for (var s = r > 1 ? void 0 : r ? qn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
-    (o = t[a]) && (s = o(s) || s);
-  return s;
-}, W = (t, e) => (n, r) => e(n, r, t);
-let ue = class extends k {
-  constructor(t, e, n, r, s, a, o) {
-    super(), this._commandService = t, this._refRangeService = e, this._univerInstanceService = n, this._injector = r, this._sheetInterceptorService = s, this._tableManager = a, this._localeService = o, this._initCommandInterceptor(), this._initCommandListener();
+  Ue(1, p(ht))
+], ce);
+var kn = Object.getOwnPropertyDescriptor, Qn = (t, e, n, s) => {
+  for (var r = s > 1 ? void 0 : s ? kn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
+    (o = t[a]) && (r = o(r) || r);
+  return r;
+}, H = (t, e) => (n, s) => e(n, s, t);
+let de = class extends Q {
+  constructor(t, e, n, s, r, a, o) {
+    super(), this._commandService = t, this._refRangeService = e, this._univerInstanceService = n, this._injector = s, this._sheetInterceptorService = r, this._tableManager = a, this._localeService = o, this._initCommandInterceptor(), this._initCommandListener();
   }
   _initCommandInterceptor() {
     const t = this;
     this._sheetInterceptorService.interceptCommand({
       getMutations(e) {
-        const n = { redos: [], undos: [] }, { id: r, params: s } = e;
-        switch (r) {
+        const n = { redos: [], undos: [] }, { id: s, params: r } = e;
+        switch (s) {
+          case ft.id:
+            return t._generateTableMutationWithInsertRow(r);
+          case wt.id:
+            return t._generateTableMutationWithInsertCol(r);
           case bt.id:
-            return t._generateTableMutationWithInsertRow(s);
+            return t._generateTableMutationWithRemoveRow(r);
           case mt.id:
-            return t._generateTableMutationWithInsertCol(s);
-          case gt.id:
-            return t._generateTableMutationWithRemoveRow(s);
-          case ht.id:
-            return t._generateTableMutationWithRemoveCol(s);
+            return t._generateTableMutationWithRemoveCol(r);
         }
         return n;
       }
     });
   }
   _generateTableMutationWithInsertRow(t) {
-    const e = [], n = [], r = $(this._univerInstanceService);
-    if (!r)
+    const e = [], n = [], s = $(this._univerInstanceService);
+    if (!s)
       return { undos: e, redos: n };
-    const { unitId: s, subUnitId: a } = r, o = this._tableManager.getTablesBySubunitId(s, a);
+    const { unitId: r, subUnitId: a } = s, o = this._tableManager.getTablesBySubunitId(r, a);
     if (!o.length)
       return { undos: e, redos: n };
     const { range: u } = t;
-    return o.forEach((l) => {
-      const i = l.getRange();
-      if (u.startRow > i.startRow && u.startRow <= i.endRow) {
+    return o.forEach((i) => {
+      const l = i.getRange();
+      if (u.startRow > l.startRow && u.startRow <= l.endRow) {
         const h = u.endRow - u.startRow + 1;
         n.push({
-          id: C.id,
+          id: S.id,
           params: {
-            unitId: s,
+            unitId: r,
             subUnitId: a,
-            tableId: l.getId(),
+            tableId: i.getId(),
             config: {
               updateRange: {
                 newRange: {
-                  ...i,
-                  endRow: i.endRow + h
+                  ...l,
+                  endRow: l.endRow + h
                 }
               }
             }
           }
         }), e.push({
-          id: C.id,
+          id: S.id,
           params: {
-            unitId: s,
+            unitId: r,
             subUnitId: a,
-            tableId: l.getId(),
+            tableId: i.getId(),
             config: {
               updateRange: {
                 newRange: {
-                  ...i
+                  ...l
                 }
               }
             }
@@ -2126,42 +2218,42 @@ let ue = class extends k {
     }), { undos: e, redos: n };
   }
   _generateTableMutationWithInsertCol(t) {
-    const e = [], n = [], r = $(this._univerInstanceService);
-    if (!r)
+    const e = [], n = [], s = $(this._univerInstanceService);
+    if (!s)
       return { undos: e, redos: n };
-    const { unitId: s, subUnitId: a } = r, o = this._tableManager.getTablesBySubunitId(s, a);
+    const { unitId: r, subUnitId: a } = s, o = this._tableManager.getTablesBySubunitId(r, a);
     if (!o.length)
       return { undos: e, redos: n };
     const { range: u } = t;
-    return o.forEach((l) => {
-      const i = l.getRange();
-      if (u.startColumn > i.startColumn && u.startColumn <= i.endColumn) {
+    return o.forEach((i) => {
+      const l = i.getRange();
+      if (u.startColumn > l.startColumn && u.startColumn <= l.endColumn) {
         const h = u.endColumn - u.startColumn + 1;
         n.push({
-          id: C.id,
+          id: S.id,
           params: {
-            unitId: s,
+            unitId: r,
             subUnitId: a,
-            tableId: l.getId(),
+            tableId: i.getId(),
             config: {
               rowColOperation: {
                 operationType: M.Insert,
-                rowColType: D.Col,
+                rowColType: y.Col,
                 index: u.startColumn,
                 count: h
               }
             }
           }
         }), e.push({
-          id: C.id,
+          id: S.id,
           params: {
-            unitId: s,
+            unitId: r,
             subUnitId: a,
-            tableId: l.getId(),
+            tableId: i.getId(),
             config: {
               rowColOperation: {
                 operationType: M.Delete,
-                rowColType: D.Col,
+                rowColType: y.Col,
                 index: u.startColumn,
                 count: h
               }
@@ -2172,39 +2264,39 @@ let ue = class extends k {
     }), { undos: e, redos: n };
   }
   _generateTableMutationWithRemoveRow(t) {
-    const e = [], n = [], r = [], s = [], a = $(this._univerInstanceService);
+    const e = [], n = [], s = [], r = [], a = $(this._univerInstanceService);
     if (!a)
-      return { undos: e, redos: n, preRedos: r, preUndos: s };
-    const { unitId: o, subUnitId: u } = a, l = this._tableManager.getTablesBySubunitId(o, u);
-    if (!l.length)
-      return { undos: e, redos: n, preRedos: r, preUndos: s };
-    const { range: i } = t, h = i.endRow - i.startRow + 1;
-    return l.forEach((d) => {
+      return { undos: e, redos: n, preRedos: s, preUndos: r };
+    const { unitId: o, subUnitId: u } = a, i = this._tableManager.getTablesBySubunitId(o, u);
+    if (!i.length)
+      return { undos: e, redos: n, preRedos: s, preUndos: r };
+    const { range: l } = t, h = l.endRow - l.startRow + 1;
+    return i.forEach((d) => {
       const c = d.getRange();
-      if (Ce.intersects(c, i))
-        if (i.startRow <= c.startRow && i.endRow >= c.startRow) {
-          r.push({
-            id: te.id,
+      if (Se.intersects(c, l))
+        if (l.startRow <= c.startRow && l.endRow >= c.startRow) {
+          s.push({
+            id: k.id,
             params: {
               unitId: o,
               subUnitId: u,
               tableId: d.getId()
             }
           });
-          const m = d.toJSON();
+          const g = d.toJSON();
           e.push({
-            id: ee.id,
+            id: J.id,
             params: {
               unitId: o,
               subUnitId: u,
-              tableId: m.id,
-              name: m.name,
-              range: m.range,
-              options: m.options
+              tableId: g.id,
+              name: g.name,
+              range: g.range,
+              options: g.options
             }
           });
-        } else i.startRow > c.startRow && i.startRow <= c.endRow ? (n.push({
-          id: C.id,
+        } else l.startRow > c.startRow && l.startRow <= c.endRow ? (n.push({
+          id: S.id,
           params: {
             unitId: o,
             subUnitId: u,
@@ -2219,7 +2311,7 @@ let ue = class extends k {
             }
           }
         }), e.push({
-          id: C.id,
+          id: S.id,
           params: {
             unitId: o,
             subUnitId: u,
@@ -2232,8 +2324,8 @@ let ue = class extends k {
               }
             }
           }
-        })) : i.startRow < c.endRow && i.endRow >= c.endRow && (n.push({
-          id: C.id,
+        })) : l.startRow < c.endRow && l.endRow >= c.endRow && (n.push({
+          id: S.id,
           params: {
             unitId: o,
             subUnitId: u,
@@ -2242,13 +2334,13 @@ let ue = class extends k {
               updateRange: {
                 newRange: {
                   ...c,
-                  endRow: i.startRow - 1
+                  endRow: l.startRow - 1
                 }
               }
             }
           }
         }), e.push({
-          id: C.id,
+          id: S.id,
           params: {
             unitId: o,
             subUnitId: u,
@@ -2262,50 +2354,50 @@ let ue = class extends k {
             }
           }
         }));
-    }), { undos: e, redos: n, preRedos: r, preUndos: s };
+    }), { undos: e, redos: n, preRedos: s, preUndos: r };
   }
   _generateTableMutationWithRemoveCol(t) {
-    const e = [], n = [], r = [], s = [], a = $(this._univerInstanceService);
+    const e = [], n = [], s = [], r = [], a = $(this._univerInstanceService);
     if (!a)
-      return { undos: e, redos: n, preRedos: r, preUndos: s };
-    const { unitId: o, subUnitId: u } = a, l = this._tableManager.getTablesBySubunitId(o, u);
-    if (!l.length)
-      return { undos: e, redos: n, preRedos: r, preUndos: s };
-    const { range: i } = t, h = i.endColumn - i.startColumn + 1;
-    return l.forEach((d) => {
+      return { undos: e, redos: n, preRedos: s, preUndos: r };
+    const { unitId: o, subUnitId: u } = a, i = this._tableManager.getTablesBySubunitId(o, u);
+    if (!i.length)
+      return { undos: e, redos: n, preRedos: s, preUndos: r };
+    const { range: l } = t, h = l.endColumn - l.startColumn + 1;
+    return i.forEach((d) => {
       const c = d.getRange();
-      if (Ce.intersects(c, i)) {
-        if (i.startColumn <= c.startColumn && i.endColumn >= c.endColumn) {
-          r.push({
-            id: te.id,
+      if (Se.intersects(c, l)) {
+        if (l.startColumn <= c.startColumn && l.endColumn >= c.endColumn) {
+          s.push({
+            id: k.id,
             params: {
               unitId: o,
               subUnitId: u,
               tableId: d.getId()
             }
           });
-          const m = d.toJSON(), { startRow: S, startColumn: w, endColumn: R } = m.range, f = this._univerInstanceService.getUnit(o), I = f == null ? void 0 : f.getSheetBySheetId(u);
+          const g = d.toJSON(), { startRow: C, startColumn: w, endColumn: R } = g.range, f = this._univerInstanceService.getUnit(o), I = f == null ? void 0 : f.getSheetBySheetId(u);
           if (!I)
-            return { undos: e, redos: n, preRedos: r, preUndos: s };
+            return { undos: e, redos: n, preRedos: s, preUndos: r };
           const U = [];
           for (let _ = w; _ <= R; _++)
-            U.push(Ye(I == null ? void 0 : I.getCell(S, _)) || X(_ - w + 1, this._localeService.t("sheets-table.columnPrefix")));
+            U.push(Ye(I == null ? void 0 : I.getCell(C, _)) || te(_ - w + 1, this._localeService.t("sheets-table.columnPrefix")));
           e.push({
-            id: ee.id,
+            id: J.id,
             params: {
               unitId: o,
               subUnitId: u,
-              tableId: m.id,
-              name: m.name,
+              tableId: g.id,
+              name: g.name,
               header: U,
-              range: m.range,
-              options: m.options
+              range: g.range,
+              options: g.options
             }
           });
-        } else if (i.startColumn <= c.startColumn && i.endColumn >= c.startColumn) {
-          const m = i.endColumn - c.startColumn + 1;
+        } else if (l.startColumn <= c.startColumn && l.endColumn >= c.startColumn) {
+          const g = l.endColumn - c.startColumn + 1;
           n.push({
-            id: C.id,
+            id: S.id,
             params: {
               unitId: o,
               subUnitId: u,
@@ -2313,20 +2405,20 @@ let ue = class extends k {
               config: {
                 rowColOperation: {
                   operationType: M.Delete,
-                  rowColType: D.Col,
+                  rowColType: y.Col,
                   index: c.startColumn,
-                  count: m
+                  count: g
                 }
               }
             }
           });
-          const S = [];
-          for (let w = 0; w < m; w++) {
+          const C = [];
+          for (let w = 0; w < g; w++) {
             const R = d.getTableColumnByIndex(w);
-            R && S.push(R.toJSON());
+            R && C.push(R.toJSON());
           }
           e.push({
-            id: C.id,
+            id: S.id,
             params: {
               unitId: o,
               subUnitId: u,
@@ -2334,18 +2426,18 @@ let ue = class extends k {
               config: {
                 rowColOperation: {
                   operationType: M.Insert,
-                  rowColType: D.Col,
+                  rowColType: y.Col,
                   index: c.startColumn,
-                  count: m,
-                  columnsJson: S
+                  count: g,
+                  columnsJson: C
                 }
               }
             }
           });
-        } else if (i.startColumn > c.startColumn && i.endColumn > c.endColumn) {
-          const m = c.endColumn - i.startColumn + 1;
+        } else if (l.startColumn > c.startColumn && l.endColumn > c.endColumn) {
+          const g = c.endColumn - l.startColumn + 1;
           n.push({
-            id: C.id,
+            id: S.id,
             params: {
               unitId: o,
               subUnitId: u,
@@ -2353,20 +2445,20 @@ let ue = class extends k {
               config: {
                 rowColOperation: {
                   operationType: M.Delete,
-                  rowColType: D.Col,
-                  index: i.startColumn,
-                  count: m
+                  rowColType: y.Col,
+                  index: l.startColumn,
+                  count: g
                 }
               }
             }
           });
-          const S = [], w = i.startColumn - c.startColumn;
-          for (let R = 0; R < m; R++) {
+          const C = [], w = l.startColumn - c.startColumn;
+          for (let R = 0; R < g; R++) {
             const f = d.getTableColumnByIndex(R + w);
-            f && S.push(f.toJSON());
+            f && C.push(f.toJSON());
           }
           e.push({
-            id: C.id,
+            id: S.id,
             params: {
               unitId: o,
               subUnitId: u,
@@ -2374,17 +2466,17 @@ let ue = class extends k {
               config: {
                 rowColOperation: {
                   operationType: M.Insert,
-                  rowColType: D.Col,
-                  index: i.startColumn,
+                  rowColType: y.Col,
+                  index: l.startColumn,
                   count: h,
-                  columnsJson: S
+                  columnsJson: C
                 }
               }
             }
           });
-        } else if (i.startColumn > c.startColumn && i.endColumn <= c.endColumn) {
+        } else if (l.startColumn > c.startColumn && l.endColumn <= c.endColumn) {
           n.push({
-            id: C.id,
+            id: S.id,
             params: {
               unitId: o,
               subUnitId: u,
@@ -2392,20 +2484,20 @@ let ue = class extends k {
               config: {
                 rowColOperation: {
                   operationType: M.Delete,
-                  rowColType: D.Col,
-                  index: i.startColumn,
+                  rowColType: y.Col,
+                  index: l.startColumn,
                   count: h
                 }
               }
             }
           });
-          const m = [], S = i.startColumn - c.startColumn;
+          const g = [], C = l.startColumn - c.startColumn;
           for (let w = 0; w < h; w++) {
-            const R = d.getTableColumnByIndex(w + S);
-            R && m.push(R.toJSON());
+            const R = d.getTableColumnByIndex(w + C);
+            R && g.push(R.toJSON());
           }
           e.push({
-            id: C.id,
+            id: S.id,
             params: {
               unitId: o,
               subUnitId: u,
@@ -2413,65 +2505,65 @@ let ue = class extends k {
               config: {
                 rowColOperation: {
                   operationType: M.Insert,
-                  rowColType: D.Col,
-                  index: i.startColumn,
+                  rowColType: y.Col,
+                  index: l.startColumn,
                   count: h,
-                  columnsJson: m
+                  columnsJson: g
                 }
               }
             }
           });
         }
       }
-    }), { undos: e, redos: n, preRedos: r, preUndos: s };
+    }), { undos: e, redos: n, preRedos: s, preUndos: r };
   }
   _initCommandListener() {
     this._commandService.onCommandExecuted((t) => {
       if (t.id === Ve.id) {
-        const e = t.params, { unitId: n, subUnitId: r, range: s } = e, a = s.endRow - s.startRow + 1;
-        this._tableManager.getTablesBySubunitId(n, r).forEach((u) => {
-          const l = u.getRange();
-          s.startRow <= l.startRow && this._tableManager.updateTableRange(n, u.getId(), {
+        const e = t.params, { unitId: n, subUnitId: s, range: r } = e, a = r.endRow - r.startRow + 1;
+        this._tableManager.getTablesBySubunitId(n, s).forEach((u) => {
+          const i = u.getRange();
+          r.startRow <= i.startRow && this._tableManager.updateTableRange(n, u.getId(), {
             newRange: {
-              ...l,
-              startRow: l.startRow + a,
-              endRow: l.endRow + a
+              ...i,
+              startRow: i.startRow + a,
+              endRow: i.endRow + a
             }
           });
         });
       } else if (t.id === qe.id) {
-        const e = t.params, { unitId: n, subUnitId: r, range: s } = e, a = s.endColumn - s.startColumn + 1;
-        this._tableManager.getTablesBySubunitId(n, r).forEach((u) => {
-          const l = u.getRange();
-          s.startColumn <= l.startColumn && this._tableManager.updateTableRange(n, u.getId(), {
+        const e = t.params, { unitId: n, subUnitId: s, range: r } = e, a = r.endColumn - r.startColumn + 1;
+        this._tableManager.getTablesBySubunitId(n, s).forEach((u) => {
+          const i = u.getRange();
+          r.startColumn <= i.startColumn && this._tableManager.updateTableRange(n, u.getId(), {
             newRange: {
-              ...l,
-              startColumn: l.startColumn + a,
-              endColumn: l.endColumn + a
+              ...i,
+              startColumn: i.startColumn + a,
+              endColumn: i.endColumn + a
             }
           });
         });
       } else if (t.id === Pe.id) {
-        const e = t.params, { unitId: n, subUnitId: r, range: s } = e, a = s.endRow - s.startRow + 1;
-        this._tableManager.getTablesBySubunitId(n, r).forEach((u) => {
-          const l = u.getRange();
-          s.startRow < l.startRow && this._tableManager.updateTableRange(n, u.getId(), {
+        const e = t.params, { unitId: n, subUnitId: s, range: r } = e, a = r.endRow - r.startRow + 1;
+        this._tableManager.getTablesBySubunitId(n, s).forEach((u) => {
+          const i = u.getRange();
+          r.startRow < i.startRow && this._tableManager.updateTableRange(n, u.getId(), {
             newRange: {
-              ...l,
-              startRow: l.startRow - a,
-              endRow: l.endRow - a
+              ...i,
+              startRow: i.startRow - a,
+              endRow: i.endRow - a
             }
           });
         });
-      } else if (t.id === ke.id) {
-        const e = t.params, { unitId: n, subUnitId: r, range: s } = e, a = s.endColumn - s.startColumn + 1;
-        this._tableManager.getTablesBySubunitId(n, r).forEach((u) => {
-          const l = u.getRange();
-          s.startColumn < l.startColumn && this._tableManager.updateTableRange(n, u.getId(), {
+      } else if (t.id === Je.id) {
+        const e = t.params, { unitId: n, subUnitId: s, range: r } = e, a = r.endColumn - r.startColumn + 1;
+        this._tableManager.getTablesBySubunitId(n, s).forEach((u) => {
+          const i = u.getRange();
+          r.startColumn < i.startColumn && this._tableManager.updateTableRange(n, u.getId(), {
             newRange: {
-              ...l,
-              startColumn: l.startColumn - a,
-              endColumn: l.endColumn - a
+              ...i,
+              startColumn: i.startColumn - a,
+              endColumn: i.endColumn - a
             }
           });
         });
@@ -2479,46 +2571,46 @@ let ue = class extends k {
     });
   }
 };
-ue = kn([
-  W(0, p(x)),
-  W(1, p(dt)),
-  W(2, p(E)),
-  W(3, p(Ae)),
-  W(4, p(pe)),
-  W(5, p(T)),
-  W(6, p(he))
-], ue);
-var Jn = Object.getOwnPropertyDescriptor, Qn = (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;
-}, se = (t, e) => (n, r) => e(n, r, t);
-let ce = class extends k {
-  constructor(e, n, r, s) {
+de = Qn([
+  H(0, p(x)),
+  H(1, p(gt)),
+  H(2, p(E)),
+  H(3, p(Ae)),
+  H(4, p(pe)),
+  H(5, p(T)),
+  H(6, p(me))
+], de);
+var Yn = Object.getOwnPropertyDescriptor, Gn = (t, e, n, s) => {
+  for (var r = s > 1 ? void 0 : s ? Yn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
+    (o = t[a]) && (r = o(r) || r);
+  return r;
+}, oe = (t, e) => (n, s) => e(n, s, t);
+let he = class extends Q {
+  constructor(e, n, s, r) {
     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();
+    this._tableManager = e, this._sheetRangeThemeService = n, this._sheetRangeThemeModel = s, this._configService = r, this._initUserTableTheme(), this.registerTableChangeEvent(), this._initDefaultTableTheme();
   }
   registerTableChangeEvent() {
     this.disposeWithMe(
       this._tableManager.tableAdd$.subscribe((e) => {
-        const { range: n, tableId: r, unitId: s, subUnitId: a, tableStyleId: o } = e, u = this._tableManager.getTable(s, r), l = o || this._allThemes[this._defaultThemeIndex].name;
-        u.setTableStyleId(l), this._sheetRangeThemeService.registerRangeThemeStyle(l, {
-          unitId: s,
+        const { range: n, tableId: s, unitId: r, subUnitId: a, tableStyleId: o } = e, u = this._tableManager.getTable(r, s), i = o || this._allThemes[this._defaultThemeIndex].name;
+        u.setTableStyleId(i), this._sheetRangeThemeService.registerRangeThemeStyle(i, {
+          unitId: r,
           subUnitId: a,
           range: { ...n }
         });
       })
     ), this.disposeWithMe(
       this._tableManager.tableRangeChanged$.subscribe((e) => {
-        const { range: n, oldRange: r, tableId: s, unitId: a, subUnitId: o } = e, u = this._tableManager.getTable(a, s);
-        let l = u.getTableStyleId();
-        l || (l = this._allThemes[this._defaultThemeIndex].name, u.setTableStyleId(l)), this._sheetRangeThemeService.removeRangeThemeRule(l, {
+        const { range: n, oldRange: s, tableId: r, unitId: a, subUnitId: o } = e, u = this._tableManager.getTable(a, r);
+        let i = u.getTableStyleId();
+        i || (i = this._allThemes[this._defaultThemeIndex].name, u.setTableStyleId(i)), this._sheetRangeThemeService.removeRangeThemeRule(i, {
           unitId: a,
           subUnitId: o,
-          range: { ...r }
-        }), this._sheetRangeThemeService.registerRangeThemeStyle(l, {
+          range: { ...s }
+        }), this._sheetRangeThemeService.registerRangeThemeStyle(i, {
           unitId: a,
           subUnitId: o,
           range: { ...n }
@@ -2526,60 +2618,60 @@ let ce = class extends k {
       })
     ), this.disposeWithMe(
       this._tableManager.tableThemeChanged$.subscribe((e) => {
-        const { theme: n, oldTheme: r, tableId: s, unitId: a, subUnitId: o } = e, l = this._tableManager.getTable(a, s).getRange();
-        this._sheetRangeThemeService.removeRangeThemeRule(r, {
+        const { theme: n, oldTheme: s, tableId: r, unitId: a, subUnitId: o } = e, i = this._tableManager.getTable(a, r).getRange();
+        this._sheetRangeThemeService.removeRangeThemeRule(s, {
           unitId: a,
           subUnitId: o,
-          range: { ...l }
+          range: { ...i }
         }), this._sheetRangeThemeService.registerRangeThemeStyle(n, {
           unitId: a,
           subUnitId: o,
-          range: { ...l }
+          range: { ...i }
         });
       })
     ), this.disposeWithMe(
       this._tableManager.tableDelete$.subscribe((e) => {
-        const { range: n, unitId: r, subUnitId: s, tableStyleId: a = this._allThemes[this._defaultThemeIndex].name } = e;
+        const { range: n, unitId: s, subUnitId: r, tableStyleId: a = this._allThemes[this._defaultThemeIndex].name } = e;
         this._sheetRangeThemeService.removeRangeThemeRule(a, {
-          unitId: r,
-          subUnitId: s,
+          unitId: s,
+          subUnitId: r,
           range: { ...n }
         });
       })
     );
   }
   _initUserTableTheme() {
-    const e = this._configService.getConfig(Ge) || {}, n = e.defaultThemeIndex || 0, r = e.userThemes || [];
-    this._defaultThemeIndex = n, this._allThemes = r.concat(ze);
+    const e = this._configService.getConfig(Ge) || {}, n = e.defaultThemeIndex || 0, s = e.userThemes || [];
+    this._defaultThemeIndex = n, this._allThemes = s.concat(ze);
   }
   _initDefaultTableTheme() {
     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);
+      const { name: n, style: s } = this._allThemes[e], r = new St(n, s);
+      this._sheetRangeThemeModel.registerDefaultRangeTheme(r);
     }
   }
   dispose() {
     super.dispose(), this._allThemes = [], this._defaultThemeIndex = 0;
   }
 };
-ce = Qn([
-  se(0, p(T)),
-  se(1, p(wt)),
-  se(2, p(He)),
-  se(3, Le)
-], ce);
-var Yn = Object.getOwnPropertyDescriptor, Gn = (t, e, n, r) => {
-  for (var s = r > 1 ? void 0 : r ? Yn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
-    (o = t[a]) && (s = o(s) || s);
-  return s;
-}, ae = (t, e) => (n, r) => e(n, r, t);
-let de = class extends k {
-  constructor(e, n, r, s) {
+he = Gn([
+  oe(0, p(T)),
+  oe(1, p(Rt)),
+  oe(2, p(He)),
+  oe(3, Ee)
+], he);
+var zn = Object.getOwnPropertyDescriptor, jn = (t, e, n, s) => {
+  for (var r = s > 1 ? void 0 : s ? zn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
+    (o = t[a]) && (r = o(r) || r);
+  return r;
+}, ie = (t, e) => (n, s) => e(n, s, t);
+let ge = class extends Q {
+  constructor(e, n, s, r) {
     super();
-    b(this, "_tableFilteredOutRows$", new Je(/* @__PURE__ */ new Set()));
+    b(this, "_tableFilteredOutRows$", new ke(/* @__PURE__ */ new Set()));
     b(this, "tableFilteredOutRows$", this._tableFilteredOutRows$.asObservable());
     b(this, "_subscription", null);
-    this._tableManager = e, this._sheetInterceptorService = n, this._univerInstanceService = r, this._zebraCrossingCacheController = s, this.registerFilterChangeEvent(), this.initTableHiddenRowIntercept(), this._initFilteredOutRows();
+    this._tableManager = e, this._sheetInterceptorService = n, this._univerInstanceService = s, this._zebraCrossingCacheController = r, this.registerFilterChangeEvent(), this.initTableHiddenRowIntercept(), this._initFilteredOutRows();
   }
   get tableFilteredOutRows() {
     return this._tableFilteredOutRows$.value;
@@ -2591,26 +2683,26 @@ let de = class extends k {
     this.disposeWithMe(this._sheetInterceptorService.intercept(Be.ROW_FILTERED, {
       // 这里需要保证优先级高于sheet的筛选，因为筛选没有next,低于筛选的不会触发interceptor
       priority: 100,
-      handler: (e, n, r) => {
+      handler: (e, n, s) => {
         if (e) return !0;
-        const s = this.tableFilteredOutRows.has(n.row);
-        return s ? !0 : r(s);
+        const r = this.tableFilteredOutRows.has(n.row);
+        return r ? !0 : s(r);
       }
     }));
   }
   _initFilteredOutRows() {
     this._tableManager.tableInitStatus$.pipe(
-      we((e) => e),
-      Me(() => this._univerInstanceService.getCurrentTypeOfUnit$(ge.UNIVER_SHEET)),
-      we((e) => e != null),
+      fe((e) => e),
+      Me(() => this._univerInstanceService.getCurrentTypeOfUnit$(z.UNIVER_SHEET)),
+      fe((e) => e != null),
       Me((e) => e.activeSheet$),
-      we((e) => e != null)
+      fe((e) => e != null)
     ).subscribe(() => {
       const e = $(this._univerInstanceService);
       if (!e)
         return;
-      const { unitId: n, subUnitId: r } = e;
-      this.tableFilteredOutRows.clear(), this._tableManager.getTablesBySubunitId(n, r).forEach((a) => {
+      const { unitId: n, subUnitId: s } = e;
+      this.tableFilteredOutRows.clear(), this._tableManager.getTablesBySubunitId(n, s).forEach((a) => {
         const o = a.getTableFilters().getFilterOutRows();
         if (o)
           for (const u of o)
@@ -2621,16 +2713,16 @@ let de = class extends k {
   registerFilterChangeEvent() {
     this.disposeWithMe(
       this._tableManager.tableFilterChanged$.subscribe((e) => {
-        var i;
-        const { unitId: n, subUnitId: r, tableId: s } = e, a = (i = this._univerInstanceService.getUnit(n)) == null ? void 0 : i.getSheetBySheetId(r), o = this._tableManager.getTable(n, s);
+        var l;
+        const { unitId: n, subUnitId: s, tableId: r } = e, a = (l = this._univerInstanceService.getUnit(n)) == null ? void 0 : l.getSheetBySheetId(s), o = this._tableManager.getTable(n, r);
         if (!a || !o)
           return;
-        this.tableFilteredOutRows.clear(), o.getTableFilters().doFilter(a, o.getTableFilterRange()), this._tableManager.getTablesBySubunitId(n, r).forEach((h) => {
+        this.tableFilteredOutRows.clear(), o.getTableFilters().doFilter(a, o.getTableFilterRange()), this._tableManager.getTablesBySubunitId(n, s).forEach((h) => {
           const d = h.getTableFilters().getFilterOutRows();
           if (d)
             for (const c of d)
               this.tableFilteredOutRows.add(c);
-        }), this._zebraCrossingCacheController.updateZebraCrossingCache(n, r);
+        }), this._zebraCrossingCacheController.updateZebraCrossingCache(n, s);
       })
     );
   }
@@ -2639,43 +2731,43 @@ let de = class extends k {
     super.dispose(), (e = this._subscription) == null || e.unsubscribe();
   }
 };
-de = Gn([
-  ae(0, p(T)),
-  ae(1, p(pe)),
-  ae(2, p(E)),
-  ae(3, p(Rt))
-], de);
-var zn = Object.getOwnPropertyDescriptor, jn = (t, e, n, r) => {
-  for (var s = r > 1 ? void 0 : r ? zn(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), oe;
-let $e = (oe = class extends it {
-  constructor(t = De, e, n, r) {
-    super(), this._config = t, this._injector = e, this._configService = n, this._commandService = r;
-    const { ...s } = lt(
+ge = jn([
+  ie(0, p(T)),
+  ie(1, p(pe)),
+  ie(2, p(E)),
+  ie(3, p(Ct))
+], ge);
+var Kn = Object.getOwnPropertyDescriptor, Xn = (t, e, n, s) => {
+  for (var r = s > 1 ? void 0 : s ? Kn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
+    (o = t[a]) && (r = o(r) || r);
+  return r;
+}, Re = (t, e) => (n, s) => e(n, s, t), le;
+let $e = (le = class extends it {
+  constructor(t = ye, e, n, s) {
+    super(), this._config = t, this._injector = e, this._configService = n, this._commandService = s;
+    const { ...r } = lt(
       {},
-      De,
+      ye,
       this._config
     );
-    this._configService.setConfig(Ge, s), this._initRegisterCommand();
+    this._configService.setConfig(Ge, r), this._initRegisterCommand();
   }
   onStarting() {
     ut(this._injector, [
       [T],
+      [he],
+      [W],
+      [X],
+      [ge],
       [ce],
-      [B],
-      [z],
-      [de],
-      [le],
-      [ue]
+      [de]
     ]), Ie(this._injector, [
-      [le],
-      [ue],
       [ce],
-      [B],
-      [z],
-      [de]
+      [de],
+      [he],
+      [W],
+      [X],
+      [ge]
     ]);
   }
   onReady() {
@@ -2686,57 +2778,57 @@ let $e = (oe = class extends it {
   _initRegisterCommand() {
     [
       Dn,
-      ee,
-      yn,
-      te,
-      Se,
-      Nn,
+      J,
+      xn,
+      k,
+      Ce,
+      On,
       Ln,
-      C,
-      $n,
-      An,
-      Bn,
+      S,
       En,
+      Bn,
       Wn,
-      Hn
+      Hn,
+      Vn,
+      Pn
     ].forEach((t) => this._commandService.registerCommand(t));
   }
-}, b(oe, "pluginName", Xe), b(oe, "type", ge.UNIVER_SHEET), oe);
-$e = jn([
+}, b(le, "pluginName", Xe), b(le, "type", z.UNIVER_SHEET), le);
+$e = Xn([
   Re(1, p(Ae)),
-  Re(2, Le),
+  Re(2, Ee),
   Re(3, p(x))
 ], $e);
 export {
   Dn as AddSheetTableCommand,
-  ee as AddSheetTableMutation,
-  $n as AddTableThemeCommand,
-  yn as DeleteSheetTableCommand,
-  te as DeleteSheetTableMutation,
-  An as RemoveTableThemeCommand,
-  xn as SHEET_TABLE_CUSTOM_THEME_PREFIX,
+  J as AddSheetTableMutation,
+  En as AddTableThemeCommand,
+  xn as DeleteSheetTableCommand,
+  k as DeleteSheetTableMutation,
+  Bn as RemoveTableThemeCommand,
+  Un as SHEET_TABLE_CUSTOM_THEME_PREFIX,
   Ln as SetSheetTableCommand,
-  Nn as SetSheetTableFilterCommand,
-  Se as SetSheetTableFilterMutation,
-  C as SetSheetTableMutation,
-  En as SheetTableInsertColCommand,
-  Bn as SheetTableInsertRowCommand,
-  Hn as SheetTableRemoveColCommand,
-  Wn as SheetTableRemoveRowCommand,
-  z as SheetTableService,
-  V as SheetsTableButtonStateEnum,
-  B as SheetsTableController,
-  Q as SheetsTableSortStateEnum,
+  On as SetSheetTableFilterCommand,
+  Ce as SetSheetTableFilterMutation,
+  S as SetSheetTableMutation,
+  Hn as SheetTableInsertColCommand,
+  Wn as SheetTableInsertRowCommand,
+  Pn as SheetTableRemoveColCommand,
+  Vn as SheetTableRemoveRowCommand,
+  X as SheetTableService,
+  P as SheetsTableButtonStateEnum,
+  W as SheetsTableController,
+  G as SheetsTableSortStateEnum,
   Qe as TableColumnDataTypeEnum,
-  Z as TableColumnFilterTypeEnum,
+  ne as TableColumnFilterTypeEnum,
   O as TableConditionTypeEnum,
-  g as TableDateCompareTypeEnum,
+  m as TableDateCompareTypeEnum,
   T as TableManager,
   F as TableNumberCompareTypeEnum,
-  H as TableStringCompareTypeEnum,
+  V as TableStringCompareTypeEnum,
   $e as UniverSheetsTablePlugin,
-  rr as customEmptyThemeWithBorderStyle,
-  pt as isConditionFilter,
-  nr as isManualFilter,
-  sr as processStyleWithBorderStyle
+  as as customEmptyThemeWithBorderStyle,
+  Tt as isConditionFilter,
+  rs as isManualFilter,
+  os as processStyleWithBorderStyle
 };