@univerjs/sheets-table 0.10.6 → 0.10.7-nightly.202509090319

package/lib/index.js

@@ -1,42 +1,42 @@
 var Ze = Object.defineProperty;
 var et = (t, e, n) => e in t ? Ze(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n;
 var b = (t, e, n) => et(t, typeof e != "symbol" ? e + "" : e, n);
-import { CellValueType as q, BorderStyleTypes as tt, generateRandomId as L, IUniverInstanceService as W, Inject as C, LocaleService as de, Disposable as k, CommandType as N, IUndoRedoService as A, ICommandService as x, sequenceExecute as B, IResourceManagerService as nt, Rectangle as pe, RTree as rt, InterceptorEffectEnum as st, UniverInstanceType as he, customNameCharacterCheck as at, ILogService as ot, Injector as Ae, IConfigService as Be, Plugin as it, merge as lt, registerDependencies as ut, touchDependencies as Ie } from "@univerjs/core";
-import { getSheetCommandTarget as $, SheetInterceptorService as Ce, INTERCEPTOR_POINT as Le, AddRangeThemeMutation as Ee, RemoveRangeThemeMutation as We, SheetRangeThemeModel as He, SheetsSelectionsService as ge, InsertRowMutation as Pe, RemoveRowMutation as Ve, getMoveRangeUndoRedoMutations as me, InsertColMutation as qe, RemoveColMutation as Je, IExclusiveRangeService as ct, RefRangeService as dt, RemoveColCommand as ht, RemoveRowCommand as gt, InsertColCommand as mt, InsertRowCommand as bt, SheetRangeThemeService as wt, RangeThemeStyle as ft } from "@univerjs/sheets";
-import { Subject as Q, BehaviorSubject as ke, filter as be, switchMap as Me } from "rxjs";
-var I = /* @__PURE__ */ ((t) => (t.Insert = "insert", t.Delete = "delete", t))(I || {}), D = /* @__PURE__ */ ((t) => (t.Row = "row", t.Col = "column", t))(D || {}), Qe = /* @__PURE__ */ ((t) => (t.None = "none", t.String = "string", t.Number = "number", t.Date = "date", t.Bool = "bool", t.Checkbox = "checkbox", t.List = "list", t))(Qe || {}), Z = /* @__PURE__ */ ((t) => (t.manual = "manual", t.condition = "condition", t))(Z || {}), U = /* @__PURE__ */ ((t) => (t.Date = "date", t.Number = "number", t.String = "string", t.Logic = "logic", t))(U || {}), F = /* @__PURE__ */ ((t) => (t.Equal = "equal", t.NotEqual = "notEqual", t.GreaterThan = "greaterThan", t.GreaterThanOrEqual = "greaterThanOrEqual", t.LessThan = "lessThan", t.LessThanOrEqual = "lessThanOrEqual", t.Between = "between", t.NotBetween = "notBetween", t.Above = "above", t.Below = "below", t.TopN = "topN", t))(F || {}), P = /* @__PURE__ */ ((t) => (t.Equal = "equal", t.NotEqual = "notEqual", t.Contains = "contains", t.NotContains = "notContains", t.StartsWith = "startsWith", t.EndsWith = "endsWith", t))(P || {}), g = /* @__PURE__ */ ((t) => (t.Equal = "equal", t.NotEqual = "notEqual", t.After = "after", t.AfterOrEqual = "afterOrEqual", t.Before = "before", t.BeforeOrEqual = "beforeOrEqual", t.Between = "between", t.NotBetween = "notBetween", t.Today = "today", t.Yesterday = "yesterday", t.Tomorrow = "tomorrow", t.ThisWeek = "thisWeek", t.LastWeek = "lastWeek", t.NextWeek = "nextWeek", t.ThisMonth = "thisMonth", t.LastMonth = "lastMonth", t.NextMonth = "nextMonth", t.ThisQuarter = "thisQuarter", t.LastQuarter = "lastQuarter", t.NextQuarter = "nextQuarter", t.ThisYear = "thisYear", t.LastYear = "lastYear", t.NextYear = "nextYear", t.YearToDate = "yearToDate", t.Quarter = "quarter", t.Month = "month", t.M1 = "m1", t.M2 = "m2", t.M3 = "m3", t.M4 = "m4", t.M5 = "m5", t.M6 = "m6", t.M7 = "m7", t.M8 = "m8", t.M9 = "m9", t.M10 = "m10", t.M11 = "m11", t.M12 = "m12", t.Q1 = "q1", t.Q2 = "q2", t.Q3 = "q3", t.Q4 = "q4", t))(g || {}), V = /* @__PURE__ */ ((t) => (t[t.FilteredSortNone = 1] = "FilteredSortNone", t[t.FilteredSortAsc = 2] = "FilteredSortAsc", t[t.FilteredSortDesc = 3] = "FilteredSortDesc", t[t.FilterNoneSortNone = 4] = "FilterNoneSortNone", t[t.FilterNoneSortAsc = 5] = "FilterNoneSortAsc", t[t.FilterNoneSortDesc = 6] = "FilterNoneSortDesc", t))(V || {}), Y = /* @__PURE__ */ ((t) => (t.Asc = "asc", t.Desc = "desc", t.None = "none", t))(Y || {});
+import { CellValueType as V, BorderStyleTypes as tt, generateRandomId as q, IUniverInstanceService as E, Inject as C, LocaleService as de, Disposable as k, CommandType as y, IUndoRedoService as A, ICommandService as x, sequenceExecute as B, IResourceManagerService as nt, Rectangle as pe, RTree as rt, InterceptorEffectEnum as st, UniverInstanceType as he, customNameCharacterCheck as at, ILogService as ot, Injector as Ae, IConfigService as Be, Plugin as it, merge as lt, registerDependencies as ut, touchDependencies as Ie } from "@univerjs/core";
+import { getSheetCommandTarget as $, SheetInterceptorService as Ce, INTERCEPTOR_POINT as Le, AddRangeThemeMutation as Ee, RemoveRangeThemeMutation as We, SheetRangeThemeModel as He, SheetsSelectionsService as ge, InsertRowMutation as Pe, RemoveRowMutation as Ve, getMoveRangeUndoRedoMutations as me, InsertColMutation as qe, RemoveColMutation as ke, IExclusiveRangeService as ct, RefRangeService as dt, RemoveColCommand as ht, RemoveRowCommand as gt, InsertColCommand as mt, InsertRowCommand as bt, SheetRangeThemeService as wt, RangeThemeStyle as Rt } from "@univerjs/sheets";
+import { Subject as J, BehaviorSubject as Je, filter as be, switchMap as Me } from "rxjs";
+var I = /* @__PURE__ */ ((t) => (t.Insert = "insert", t.Delete = "delete", t))(I || {}), D = /* @__PURE__ */ ((t) => (t.Row = "row", t.Col = "column", t))(D || {}), Qe = /* @__PURE__ */ ((t) => (t.None = "none", t.String = "string", t.Number = "number", t.Date = "date", t.Bool = "bool", t.Checkbox = "checkbox", t.List = "list", t))(Qe || {}), Z = /* @__PURE__ */ ((t) => (t.manual = "manual", t.condition = "condition", t))(Z || {}), U = /* @__PURE__ */ ((t) => (t.Date = "date", t.Number = "number", t.String = "string", t.Logic = "logic", t))(U || {}), F = /* @__PURE__ */ ((t) => (t.Equal = "equal", t.NotEqual = "notEqual", t.GreaterThan = "greaterThan", t.GreaterThanOrEqual = "greaterThanOrEqual", t.LessThan = "lessThan", t.LessThanOrEqual = "lessThanOrEqual", t.Between = "between", t.NotBetween = "notBetween", t.Above = "above", t.Below = "below", t.TopN = "topN", t))(F || {}), 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 || {}), 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 || {}), Q = /* @__PURE__ */ ((t) => (t.Asc = "asc", t.Desc = "desc", t.None = "none", t))(Q || {});
 function X(t, e) {
   return `${e} ${t}`;
 }
-const ve = "TRUE", Fe = "FALSE", Rt = (t) => {
+const ve = "TRUE", Fe = "FALSE", ft = (t) => {
   var n;
   return ((n = t.body) == null ? void 0 : n.dataStream.replace(/\r\n$/, "")) || "";
 };
 function Ye(t) {
   if (t) {
     const { v: e, t: n, p: r } = t;
-    return r ? Rt(r) : (n === q.FORCE_STRING || n === q.STRING) && e !== void 0 && e !== null ? String(e) : n === q.BOOLEAN ? e ? ve : Fe : n === q.NUMBER ? String(e) : typeof e === "boolean" ? e ? ve : Fe : e == null ? "" : String(e);
+    return r ? ft(r) : (n === V.FORCE_STRING || n === V.STRING) && e !== void 0 && e !== null ? String(e) : n === V.BOOLEAN ? e ? ve : Fe : n === V.NUMBER ? String(e) : typeof e === "boolean" ? e ? ve : Fe : e == null ? "" : String(e);
   }
   return "";
 }
 function pt(t, e) {
   if (t != null)
     switch (e) {
-      case Y.Asc:
-        return V.FilteredSortAsc;
-      case Y.Desc:
-        return V.FilteredSortDesc;
+      case Q.Asc:
+        return P.FilteredSortAsc;
+      case Q.Desc:
+        return P.FilteredSortDesc;
       default:
-        return V.FilteredSortNone;
+        return P.FilteredSortNone;
     }
   else
     switch (e) {
-      case Y.Asc:
-        return V.FilterNoneSortAsc;
-      case Y.Desc:
-        return V.FilterNoneSortDesc;
+      case Q.Asc:
+        return P.FilterNoneSortAsc;
+      case Q.Desc:
+        return P.FilterNoneSortDesc;
       default:
-        return V.FilterNoneSortNone;
+        return P.FilterNoneSortNone;
     }
 }
 function St(t) {
@@ -45,30 +45,30 @@ function St(t) {
 function tr(t) {
   return t ? t.filterType === Z.manual : !1;
 }
-const y = {
+const N = {
   s: tt.THIN,
   cl: {
-    rgb: "rgb(95 101 116)"
+    rgb: "rgb(95, 101, 116)"
   }
 }, Ge = "sheets-table.config", De = {}, nr = {
   headerRowStyle: {
     bd: {
-      t: y
+      t: N
     }
   },
   headerColumnStyle: {
     bd: {
-      l: y
+      l: N
     }
   },
   lastColumnStyle: {
     bd: {
-      r: y
+      r: N
     }
   },
   lastRowStyle: {
     bd: {
-      b: y
+      b: N
     }
   }
 }, rr = (t, e) => {
@@ -77,7 +77,7 @@ const y = {
       return {
         ...e,
         bd: {
-          t: y
+          t: N
         }
       };
   } else if (t === "lastRowStyle") {
@@ -85,7 +85,7 @@ const y = {
       return {
         ...e,
         bd: {
-          b: y
+          b: N
         }
       };
   } else if (t === "lastColumnStyle") {
@@ -93,14 +93,14 @@ const y = {
       return {
         ...e,
         bd: {
-          r: y
+          r: N
         }
       };
   } else if (t === "headerColumnStyle" && !e.bd)
     return {
       ...e,
       bd: {
-        l: y
+        l: N
       }
     };
   return e;
@@ -112,7 +112,7 @@ const y = {
   [["#F17EBB", "#FFFFFF", "#FDF2F8", "#FCE8F3"], ["#fff"]],
   [["#F98080", "#FFFFFF", "#FDF2F2", "#FDE8E8"], ["#fff"]]
 ], je = Ct.map((t, e) => {
-  const [n, r] = t, [s, a, o, l] = n, [u] = r;
+  const [n, r] = t, [s, a, o, u] = n, [l] = r;
   return {
     name: `table-default-${e}`,
     style: {
@@ -121,15 +121,15 @@ const y = {
           rgb: s
         },
         cl: {
-          rgb: u
+          rgb: l
         },
         bd: {
-          t: y
+          t: N
         }
       },
       headerColumnStyle: {
         bd: {
-          l: y
+          l: N
         }
       },
       firstRowStyle: {
@@ -144,21 +144,21 @@ const y = {
       },
       lastRowStyle: {
         bg: {
-          rgb: l
+          rgb: u
         },
         bd: {
-          b: y
+          b: N
         }
       },
       lastColumnStyle: {
         bd: {
-          r: y
+          r: N
         }
       }
     }
   };
 });
-class J {
+class Y {
   constructor(e, n) {
     b(this, "dataType");
     b(this, "id");
@@ -200,7 +200,7 @@ const _t = (t) => t.getMonth() <= 2, Tt = (t) => {
 }, Mt = (t) => {
   const e = t.getMonth();
   return e > 8 && e <= 11;
-}, vt = (t) => t.getMonth() === 0, Ft = (t) => t.getMonth() === 1, Dt = (t) => t.getMonth() === 2, Nt = (t) => t.getMonth() === 3, yt = (t) => t.getMonth() === 4, xt = (t) => t.getMonth() === 5, Ot = (t) => t.getMonth() === 6, Ut = (t) => t.getMonth() === 7, $t = (t) => t.getMonth() === 8, At = (t) => t.getMonth() === 9, Bt = (t) => t.getMonth() === 10, Lt = (t) => t.getMonth() === 11, Et = (t, e = /* @__PURE__ */ new Date()) => t.toDateString() === e.toDateString(), Wt = (t, e = /* @__PURE__ */ new Date()) => {
+}, vt = (t) => t.getMonth() === 0, Ft = (t) => t.getMonth() === 1, Dt = (t) => t.getMonth() === 2, yt = (t) => t.getMonth() === 3, Nt = (t) => t.getMonth() === 4, xt = (t) => t.getMonth() === 5, Ot = (t) => t.getMonth() === 6, Ut = (t) => t.getMonth() === 7, $t = (t) => t.getMonth() === 8, At = (t) => t.getMonth() === 9, Bt = (t) => t.getMonth() === 10, Lt = (t) => t.getMonth() === 11, Et = (t, e = /* @__PURE__ */ new Date()) => t.toDateString() === e.toDateString(), Wt = (t, e = /* @__PURE__ */ new Date()) => {
   const n = new Date(e);
   return n.setDate(n.getDate() + 1), t.toDateString() === n.toDateString();
 }, Ht = (t, e = /* @__PURE__ */ new Date()) => {
@@ -218,7 +218,7 @@ const _t = (t) => t.getMonth() <= 2, Tt = (t) => {
 }, qt = (t, e = /* @__PURE__ */ new Date()) => {
   const n = G(t), r = new Date(G(e).getTime() - ze);
   return n.toDateString() === r.toDateString();
-}, Jt = (t, e = /* @__PURE__ */ new Date()) => t.getFullYear() === e.getFullYear() && t.getMonth() === e.getMonth(), kt = (t) => {
+}, kt = (t, e = /* @__PURE__ */ new Date()) => t.getFullYear() === e.getFullYear() && t.getMonth() === e.getMonth(), Jt = (t) => {
   const e = new Date(t);
   return e.setHours(0, 0, 0, 0), e.setDate(1), e;
 }, Qt = (t, e = /* @__PURE__ */ new Date()) => {
@@ -229,7 +229,7 @@ const _t = (t) => t.getMonth() <= 2, Tt = (t) => {
   const s = t.getTime();
   return s >= n.getTime() && s < r.getTime();
 }, Yt = (t, e = /* @__PURE__ */ new Date()) => {
-  const n = kt(e), r = new Date(n);
+  const n = Jt(e), r = new Date(n);
   r.setMonth(r.getMonth() + 1, 0);
   const s = t.getTime();
   return s >= n.getTime() && s < r.getTime();
@@ -325,7 +325,7 @@ function tn(t) {
     }
     case g.ThisMonth: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
-      return (n) => Jt(n, e);
+      return (n) => kt(n, e);
     }
     case g.LastMonth: {
       const e = t.anchorTime ? new Date(t.anchorTime) : /* @__PURE__ */ new Date();
@@ -370,9 +370,9 @@ function tn(t) {
     case g.M3:
       return Dt;
     case g.M4:
-      return Nt;
-    case g.M5:
       return yt;
+    case g.M5:
+      return Nt;
     case g.M6:
       return xt;
     case g.M7:
@@ -562,32 +562,32 @@ const z = (t) => {
 }, cn = (t, e) => z(e).test(t), dn = (t, e) => !z(e).test(t), hn = (t, e) => z(`*${e}*`).test(t), gn = (t, e) => !z(`*${e}*`).test(t), mn = (t, e) => z(`${e}*`).test(t), bn = (t, e) => z(`*${e}`).test(t);
 function wn(t) {
   switch (t.compareType) {
-    case P.Equal:
+    case H.Equal:
       return (e) => cn(e, t.expectedValue);
-    case P.NotEqual:
+    case H.NotEqual:
       return (e) => dn(e, t.expectedValue);
-    case P.Contains:
+    case H.Contains:
       return (e) => hn(e, t.expectedValue);
-    case P.NotContains:
+    case H.NotContains:
       return (e) => gn(e, t.expectedValue);
-    case P.StartsWith:
+    case H.StartsWith:
       return (e) => mn(e, t.expectedValue);
-    case P.EndsWith:
+    case H.EndsWith:
       return (e) => bn(e, t.expectedValue);
     default:
       return console.error(`Unknown filter operator: ${t.compareType}`), (e) => !0;
   }
 }
-const fn = /* @__PURE__ */ new Set([
+const Rn = /* @__PURE__ */ new Set([
   F.Above,
   F.Below,
   F.TopN
 ]);
 g.Today, g.Yesterday, g.Tomorrow, g.ThisWeek, g.LastWeek, g.NextWeek, g.ThisMonth, g.LastMonth, g.NextMonth, g.ThisQuarter, g.LastQuarter, g.NextQuarter, g.NextYear, g.ThisYear, g.LastYear, g.YearToDate;
 function Ke(t) {
-  return fn.has(t);
+  return Rn.has(t);
 }
-function Rn(t, e) {
+function fn(t, e) {
   if (Ke(t.filterInfo.compareType))
     return (n) => !0;
   switch (t.filterInfo.conditionType) {
@@ -605,11 +605,11 @@ function Rn(t, e) {
 function oe(t, e, n, r) {
   switch (r) {
     case U.Date: {
-      const s = Ne(t, e, n);
+      const s = ye(t, e, n);
       return s ? Cn(s) : null;
     }
     case U.Number:
-      return Ne(t, e, n);
+      return ye(t, e, n);
     case U.String:
     default:
       return Sn(t, e, n);
@@ -626,25 +626,25 @@ function Sn(t, e, n) {
   if (o)
     return pn(o);
   if (typeof s == "string")
-    return a === q.BOOLEAN ? s.toUpperCase() : s;
+    return a === V.BOOLEAN ? s.toUpperCase() : s;
   if (typeof s == "number")
-    return a === q.BOOLEAN ? s ? "TRUE" : "FALSE" : s;
+    return a === V.BOOLEAN ? s ? "TRUE" : "FALSE" : s;
   if (typeof s == "boolean") return s ? "TRUE" : "FALSE";
   if (s !== void 0)
     return String(s);
 }
-function Ne(t, e, n) {
+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 === q.NUMBER ? Number(t.getCellRaw(e, n).v) : Number(s);
+  return o ? null : typeof s == "string" && a === V.NUMBER ? Number(t.getCellRaw(e, n).v) : Number(s);
 }
 function Cn(t) {
   const e = new Date(Date.UTC(1900, 0, 1, 0, 0, 0)), n = new Date(Date.UTC(1900, 1, 28, 0, 0, 0));
   let r = t - 1;
   return r > (n.getTime() - e.getTime()) / (1e3 * 3600 * 24) && (r -= 1), r < 0 && (r = t), new Date(e.getTime() + r * (1e3 * 3600 * 24));
 }
-class ye {
+class Ne {
   constructor() {
     b(this, "_tableColumnFilterList");
     b(this, "_tableSortInfo");
@@ -662,7 +662,7 @@ class ye {
   }
   getFilterState(e) {
     var r;
-    const n = ((r = this._tableSortInfo) == null ? void 0 : r.columnIndex) === e ? this._tableSortInfo.sortState : Y.None;
+    const n = ((r = this._tableSortInfo) == null ? void 0 : r.columnIndex) === e ? this._tableSortInfo.sortState : Q.None;
     return pt(this._tableColumnFilterList[e], n);
   }
   getSortState() {
@@ -687,22 +687,22 @@ class ye {
   doColumnFilter(e, n, r, s) {
     const a = this._tableColumnFilterList[r];
     if (a && e) {
-      const { startRow: o, endRow: l, startColumn: u } = n, i = u + r, h = this.getExecuteFunc(e, n, r, a);
-      for (let d = o; d <= l; d++) {
+      const { startRow: o, endRow: u, startColumn: l } = n, i = l + r, h = this.getExecuteFunc(e, n, r, a);
+      for (let d = o; d <= u; d++) {
         const c = St(a) ? a.filterInfo.conditionType : U.String;
         oe(e, d, i, c) === null ? s.add(d) : h(oe(e, d, i, c)) || s.add(d);
       }
     }
   }
   _getNumberCalculatedOptions(e, n, r) {
-    const { startRow: s, endRow: a, startColumn: o } = n, l = o + r, u = [];
+    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 = oe(e, d, l, U.Number);
-      c !== null && (u.push(c), i++, h += c);
+      const c = oe(e, d, u, U.Number);
+      c !== null && (l.push(c), i++, h += c);
     }
     return {
-      list: u,
+      list: l,
       average: i > 0 ? h / i : 0
     };
   }
@@ -712,7 +712,7 @@ class ye {
       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 Rn(s, o);
+      return fn(s, o);
     } else
       return (a) => !0;
   }
@@ -746,24 +746,21 @@ class xe {
     b(this, "tableMeta");
     b(this, "_tableFilters");
     b(this, "_subUnitId");
-    this._id = e, this._range = r, this._name = n, this._tableFilters = new ye(), this._init(s, a);
+    this._id = e, this._range = r, this._name = n, this._tableFilters = new Ne(), this._init(s, a);
   }
   _init(e, n) {
-    var r;
-    if (this._tableStyleId = n == null ? void 0 : n.tableStyleId, this._showHeader = (r = n == null ? void 0 : n.showHeader) != null ? r : !0, this._showFooter = !1, n.columns)
-      n.columns.forEach((s) => {
-        const a = s.id || L(), o = new J(a, s.displayName);
-        o.fromJSON(s), this._columns.set(a, o), this._columnOrder.push(a);
-      });
-    else {
-      const s = this.getRange(), a = s.startColumn, o = s.endColumn;
-      for (let l = a; l <= o; l++) {
-        const u = L(), i = new J(u, e[l - a]);
-        this._columns.set(u, i), this._columnOrder.push(u);
-      }
+    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;
+      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);
+      this._columns.set(h, c), this._columnOrder.push(h);
     }
-    n.filters && n.filters.forEach((a, o) => {
-      a && this._tableFilters.setColumnFilter(o, a);
+    n.filters && n.filters.forEach((i, h) => {
+      i && this._tableFilters.setColumnFilter(h, i);
     });
   }
   setTableFilterColumn(e, n) {
@@ -776,17 +773,17 @@ class xe {
     return this._tableFilters;
   }
   getTableFilterRange() {
-    const e = this.getRange(), n = this.isShowHeader(), r = this.isShowFooter(), { startRow: s, startColumn: a, endRow: o, endColumn: l } = e, u = n ? s + 1 : s, i = r ? o - 1 : o;
+    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;
     return {
-      startRow: u,
+      startRow: l,
       startColumn: a,
       endRow: i,
-      endColumn: l
+      endColumn: u
     };
   }
   setColumns(e) {
     this._columns.clear(), this._columnOrder = [], e.forEach((n) => {
-      const r = new J(n.id, n.displayName);
+      const r = new Y(n.id, n.displayName);
       r.fromJSON(n), this._columns.set(n.id, r), this._columnOrder.push(n.id);
     });
   }
@@ -908,10 +905,11 @@ class xe {
     };
   }
   fromJSON(e) {
-    this._id = e.id, this._name = e.name, this._range = e.range, this.tableMeta = e.meta, this._tableStyleId = e.options.tableStyleId || "", this._showHeader = e.options.showHeader || !0, this._showFooter = e.options.showFooter || !0, e.columns.forEach((r) => {
-      const s = new J(r.id, r.displayName);
-      s.fromJSON(r), this._columns.set(r.id, s), this._columnOrder.push(r.id);
-    }), this._tableFilters = new ye(), this._tableFilters.fromJSON(e.filters);
+    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);
+      o.fromJSON(a), this._columns.set(a.id, o), this._columnOrder.push(a.id);
+    }), this._tableFilters = new Ne(), 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 = [];
@@ -926,19 +924,19 @@ let _ = class extends k {
   constructor(e, n) {
     super();
     b(this, "_tableMap");
-    b(this, "_tableAdd$", new Q());
+    b(this, "_tableAdd$", new J());
     b(this, "tableAdd$", this._tableAdd$.asObservable());
-    b(this, "_tableDelete$", new Q());
+    b(this, "_tableDelete$", new J());
     b(this, "tableDelete$", this._tableDelete$.asObservable());
-    b(this, "_tableNameChanged$", new Q());
+    b(this, "_tableNameChanged$", new J());
     b(this, "tableNameChanged$", this._tableNameChanged$.asObservable());
-    b(this, "_tableRangeChanged$", new Q());
+    b(this, "_tableRangeChanged$", new J());
     b(this, "tableRangeChanged$", this._tableRangeChanged$.asObservable());
-    b(this, "_tableThemeChanged$", new Q());
+    b(this, "_tableThemeChanged$", new J());
     b(this, "tableThemeChanged$", this._tableThemeChanged$.asObservable());
-    b(this, "_tableFilterChanged$", new Q());
+    b(this, "_tableFilterChanged$", new J());
     b(this, "tableFilterChanged$", this._tableFilterChanged$.asObservable());
-    b(this, "_tableInitStatus", new ke(!1));
+    b(this, "_tableInitStatus", new Je(!1));
     b(this, "tableInitStatus$", this._tableInitStatus.asObservable());
     this._univerInstanceService = e, this._localeService = n, this._tableMap = /* @__PURE__ */ new Map();
   }
@@ -947,9 +945,9 @@ let _ = class extends k {
   }
   getColumnHeader(e, n, r, s) {
     var d;
-    const a = (d = this._univerInstanceService.getUnit(e)) == null ? void 0 : d.getSheetBySheetId(n), { startRow: o, startColumn: l, endColumn: u } = r, i = [], h = s != null ? s : "Column";
-    for (let c = l; c <= u; c++)
-      i.push(Ye(a == null ? void 0 : a.getCell(o, c)) || X(c - l + 1, h));
+    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;
   }
   /**
@@ -961,24 +959,25 @@ let _ = class extends k {
    * @param {ITableOptions} [options] Other options of the table.
    * @returns {string} The table id.
    */
-  addTable(e, n, r, s, a, o, l) {
-    const u = o != null ? o : L(), i = a || this.getColumnHeader(e, n, s), h = new xe(u, r, s, i, l);
-    return h.setSubunitId(n), this._ensureUnit(e).set(u, h), this._tableAdd$.next({
+  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({
       unitId: e,
       subUnitId: n,
       range: s,
       tableName: r,
-      tableId: u
-    }), u;
+      tableId: l,
+      tableStyleId: u == null ? void 0 : u.tableStyleId
+    }), l;
   }
   addFilter(e, n, r, s) {
     const a = this.getTable(e, n);
     if (a) {
       a.getTableFilters().setColumnFilter(r, s);
-      const l = a.getSubunitId();
+      const u = a.getSubunitId();
       this._tableFilterChanged$.next({
         unitId: e,
-        subUnitId: l,
+        subUnitId: u,
         tableId: n
       });
     }
@@ -1020,7 +1019,7 @@ let _ = class extends k {
     const r = this._tableMap.get(e);
     if (!r)
       return n;
-    const s = new Set(Array.from(r.values()).map((l) => l.getDisplayName()));
+    const s = new Set(Array.from(r.values()).map((u) => u.getDisplayName()));
     let a = n, o = 1;
     for (; s.has(a); )
       a = `${n}-${o}`, o++;
@@ -1061,12 +1060,12 @@ let _ = class extends k {
     if (s) {
       const a = s.getTableInfo(), o = s.getTableStyleId();
       r == null || r.delete(n);
-      const { subUnitId: l, range: u, name: i } = a;
+      const { subUnitId: u, range: l, name: i } = a;
       this._tableDelete$.next({
         unitId: e,
-        subUnitId: l,
+        subUnitId: u,
         tableId: n,
-        range: u,
+        range: l,
         tableName: i,
         tableStyleId: o
       });
@@ -1075,25 +1074,25 @@ let _ = class extends k {
   operationTableRowCol(e, n, r) {
     const s = this.getTableById(e, n);
     if (!s) return;
-    const { operationType: a, rowColType: o, index: l, count: u, columnsJson: i } = r, h = s.getRange(), d = { ...h };
+    const { operationType: a, rowColType: o, index: u, count: l, columnsJson: i } = r, h = s.getRange(), d = { ...h };
     if (a === I.Insert) {
       if (o === "row")
-        d.endRow += u;
+        d.endRow += l;
       else if (o === "column") {
-        d.endColumn += u;
-        for (let c = 0; c < u; c++) {
-          const m = this._localeService.t("sheets-table.columnPrefix"), S = new J(L(), X(s.getColumnsCount() + 1 + c, m));
+        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]);
-          const w = l + c - h.startColumn;
+          const w = u + c - h.startColumn;
           s.insertColumn(w, S);
         }
       }
     } else if (o === "row")
-      d.endRow -= u;
+      d.endRow -= l;
     else if (o === "column") {
-      d.endColumn -= u;
-      for (let c = u - 1; c >= 0; c--) {
-        const m = l + c - h.startColumn;
+      d.endColumn -= l;
+      for (let c = l - 1; c >= 0; c--) {
+        const m = u + c - h.startColumn;
         s.removeColumn(m);
       }
     }
@@ -1110,26 +1109,26 @@ let _ = class extends k {
     if (!s) return;
     const a = s.getRange(), o = r.newRange;
     if (o.startColumn < a.startColumn) {
-      const l = a.startColumn - o.startColumn, u = this._localeService.t("sheets-table.columnPrefix");
-      for (let i = 0; i < l; i++)
-        s.insertColumn(a.startColumn, new J(L(), X(s.getColumnsCount() + 1, u)));
+      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)));
     } else if (o.startColumn > a.startColumn) {
-      const l = o.startColumn - a.startColumn;
-      for (let u = l - 1; u >= 0; u--) {
-        const i = o.startColumn + u - 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);
       }
     }
     if (o.endColumn < a.endColumn) {
-      const l = a.endColumn - o.endColumn;
-      for (let u = l - 1; u >= 0; u--) {
-        const i = o.endColumn + u - a.startColumn;
+      const u = a.endColumn - o.endColumn;
+      for (let l = u - 1; l >= 0; l--) {
+        const i = o.endColumn + l - a.startColumn;
         s.removeColumn(i);
       }
     } else if (o.endColumn > a.endColumn) {
-      const l = o.endColumn - a.endColumn;
-      for (let u = 0; u < l; u++)
-        s.insertColumn(a.endColumn, new J(L(), X(s.getColumnsCount() + 1, "Column")));
+      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")));
     }
     s.setRange(o), this._tableRangeChanged$.next({
       unitId: e,
@@ -1143,18 +1142,18 @@ let _ = class extends k {
     var c;
     const s = this._tableMap.get(e), a = s == null ? void 0 : s.get(n);
     if (!a) return;
-    const o = a.getSubunitId(), { name: l, updateRange: u, rowColOperation: i, theme: h, options: d } = r;
-    if (l) {
+    const o = a.getSubunitId(), { name: u, updateRange: l, rowColOperation: i, theme: h, options: d } = r;
+    if (u) {
       const m = a.getDisplayName();
-      a.setDisplayName(l), this._tableNameChanged$.next({
+      a.setDisplayName(u), this._tableNameChanged$.next({
         unitId: e,
         subUnitId: o,
         tableId: n,
-        tableName: l,
+        tableName: u,
         oldTableName: m
       });
     }
-    if (i && this.operationTableRowCol(e, n, i), u && this.updateTableRange(e, n, u), h) {
+    if (i && this.operationTableRowCol(e, n, i), l && this.updateTableRange(e, n, l), h) {
       const m = (c = a.getTableStyleId()) != null ? c : "default";
       a.setTableStyleId(h), this._tableThemeChanged$.next({
         unitId: e,
@@ -1172,8 +1171,8 @@ let _ = class extends k {
       const a = s.getSubunitId();
       if (!n[a]) {
         const o = /* @__PURE__ */ new Set();
-        this.getTablesBySubunitId(e, a).forEach((u) => {
-          const i = u.getTableFilters().getFilterOutRows();
+        this.getTablesBySubunitId(e, a).forEach((l) => {
+          const i = l.getTableFilters().getFilterOutRows();
           if (i)
             for (const h of i)
               o.add(h);
@@ -1191,13 +1190,13 @@ let _ = class extends k {
       const o = $(this._univerInstanceService, { unitId: e, subUnitId: a });
       if (!o)
         return;
-      const l = o.worksheet;
-      let u;
-      n[a].tables ? u = n[a].tables : Array.isArray(n[a]) && (u = n[a]), u && u.forEach((i) => {
+      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) {
           const c = d.getTableFilters();
-          c.fromJSON(i.filters), c.doFilter(l, d.getTableFilterRange());
+          c.fromJSON(i.filters), c.doFilter(u, d.getTableFilterRange());
         }
         d.setSubunitId(a), r.set(i.id, d), this._tableAdd$.next({
           unitId: e,
@@ -1219,7 +1218,7 @@ let _ = class extends k {
   }
 };
 _ = Tn([
-  Oe(0, W),
+  Oe(0, E),
   Oe(1, C(de))
 ], _);
 var In = Object.getOwnPropertyDescriptor, Mn = (t, e, n, r) => {
@@ -1276,46 +1275,46 @@ j = Mn([
 ], j);
 const ee = {
   id: "sheet.mutation.add-table",
-  type: N.MUTATION,
+  type: y.MUTATION,
   handler: (t, e) => {
-    const { tableId: n, unitId: r, subUnitId: s, name: a, range: o, header: l, options: u } = e;
-    return t.get(j).addTable(r, s, a, o, l, n, u), !0;
+    const { tableId: n, unitId: r, subUnitId: s, name: a, range: o, header: u, options: l } = e;
+    return t.get(j).addTable(r, s, a, o, u, n, l), !0;
   }
 }, te = {
   id: "sheet.mutation.delete-table",
-  type: N.MUTATION,
+  type: y.MUTATION,
   handler: (t, e) => {
     const { unitId: n, subUnitId: r, tableId: s } = e;
     return t.get(j).deleteTable(n, r, s), !0;
   }
 }, Fn = {
   id: "sheet.command.add-table",
-  type: N.COMMAND,
+  type: y.COMMAND,
   handler: (t, e) => {
     var w;
     if (!e)
       return !1;
-    const n = t.get(A), r = t.get(x), s = t.get(de), a = (w = e.id) != null ? w : L();
+    const n = t.get(A), r = t.get(x), s = t.get(de), a = (w = e.id) != null ? w : q();
     let o = e.name;
     if (!o) {
-      const f = t.get(_).getTableList(e.unitId).length;
-      o = `${s.t("sheets-table.tablePrefix")}${f + 1}`;
+      const R = t.get(_).getTableList(e.unitId).length;
+      o = `${s.t("sheets-table.tablePrefix")}${R + 1}`;
     }
-    const l = [], u = [], i = t.get(_), { unitId: h, subUnitId: d, range: c } = e, m = i.getColumnHeader(h, d, c, s.t("sheets-table.columnPrefix"));
-    return l.push({ id: ee.id, params: { ...e, tableId: a, name: o, header: m } }), u.push({ id: te.id, params: { tableId: a, unitId: e.unitId } }), B(l, r) && n.pushUndoRedo({
+    const u = [], l = [], i = t.get(_), { 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 } }), B(u, r) && n.pushUndoRedo({
       unitID: e.unitId,
-      undoMutations: u,
-      redoMutations: l
+      undoMutations: l,
+      redoMutations: u
     }), !0;
   }
 }, Dn = {
   id: "sheet.command.delete-table",
-  type: N.COMMAND,
+  type: y.COMMAND,
   handler: (t, e) => {
     if (!e)
       return !1;
-    const n = t.get(A), r = t.get(x), s = t.get(_), a = [], o = [], l = s.getTable(e.unitId, e.tableId), u = l == null ? void 0 : l.toJSON();
-    if (!u)
+    const n = t.get(A), r = t.get(x), s = t.get(_), a = [], o = [], u = s.getTable(e.unitId, e.tableId), l = u == null ? void 0 : u.toJSON();
+    if (!l)
       throw new Error("[TableManager]: Table not found");
     return a.push({ id: te.id, params: { ...e } }), o.push({
       id: ee.id,
@@ -1323,9 +1322,9 @@ const ee = {
         unitId: e.unitId,
         subUnitId: e.subUnitId,
         tableId: e.tableId,
-        name: u.name,
-        range: u.range,
-        options: u.options
+        name: l.name,
+        range: l.range,
+        options: l.options
       }
     }), B(a, r) && n.pushUndoRedo({
       unitID: e.unitId,
@@ -1335,40 +1334,40 @@ const ee = {
   }
 }, Se = {
   id: "sheet.mutation.set-table-filter",
-  type: N.MUTATION,
+  type: y.MUTATION,
   handler: (t, e) => {
     const { tableId: n, unitId: r, column: s, tableFilter: a } = e;
     return t.get(_).addFilter(r, n, s, a), !0;
   }
-}, Nn = {
+}, yn = {
   id: "sheet.command.set-table-filter",
-  type: N.COMMAND,
+  type: y.COMMAND,
   handler: (t, e) => {
     if (!e)
       return !1;
-    const n = t.get(A), r = t.get(x), s = e.tableId || L(), a = [], o = [];
+    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 } }), B(a, r) && n.pushUndoRedo({
       unitID: e.unitId,
       undoMutations: o,
       redoMutations: a
     }), !0;
   }
-}, Xe = "SHEET_TABLE_PLUGIN", re = "SHEET_TABLE", yn = "table-custom";
+}, Xe = "SHEET_TABLE_PLUGIN", re = "SHEET_TABLE", Nn = "table-custom";
 var xn = Object.getOwnPropertyDescriptor, On = (t, e, n, r) => {
   for (var s = r > 1 ? void 0 : r ? xn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
     (o = t[a]) && (s = o(s) || s);
   return s;
 }, we = (t, e) => (n, r) => e(n, r, t);
-let E = class extends k {
+let L = class extends k {
   constructor(e, n, r) {
     super();
     b(this, "_tableRangeRTree", /* @__PURE__ */ new Map());
     this._sheetInterceptorService = e, this._tableManager = n, this._resourceManagerService = r, this._initSnapshot(), 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((l) => {
-      const u = this._tableManager.getTable(e, String(l));
-      return u ? pe.contains(u.getRange(), r) : !1;
+    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 ? pe.contains(l.getRange(), r) : !1;
     });
     if (o)
       return this._tableManager.getTable(e, String(o));
@@ -1389,13 +1388,13 @@ let E = class extends k {
       })
     ), this.disposeWithMe(
       this._tableManager.tableRangeChanged$.subscribe((e) => {
-        const { range: n, tableId: r, unitId: s, subUnitId: a, oldRange: o } = e, l = this._ensureTableRangeRTree(s);
-        l.remove({
+        const { range: n, tableId: r, unitId: s, subUnitId: a, oldRange: o } = e, u = this._ensureTableRangeRTree(s);
+        u.remove({
           unitId: s,
           sheetId: a,
           id: r,
           range: { ...o }
-        }), l.insert({
+        }), u.insert({
           unitId: s,
           sheetId: a,
           id: r,
@@ -1419,9 +1418,9 @@ let E = class extends k {
       this._sheetInterceptorService.intercept(Le.CELL_CONTENT, {
         effect: st.Value,
         handler: (e, n, r) => {
-          const { row: s, col: a, unitId: o, subUnitId: l } = n, u = this._ensureTableRangeRTree(o);
-          if ((e == null ? void 0 : e.v) === void 0 && u) {
-            const h = Array.from(u.bulkSearch([{ unitId: o, sheetId: l, range: { startColumn: a, endColumn: a, startRow: s, endRow: s } }]));
+          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 } }]));
             if (h.length > 0) {
               const d = this._tableManager.getTable(o, h[0]);
               if (d) {
@@ -1473,14 +1472,14 @@ let E = class extends k {
     super.dispose(), this._tableRangeRTree.clear();
   }
 };
-E = On([
+L = On([
   we(0, C(Ce)),
   we(1, C(_)),
   we(2, C(nt))
-], E);
+], L);
 const p = {
   id: "sheet.mutation.set-sheet-table",
-  type: N.MUTATION,
+  type: y.MUTATION,
   handler: (t, e) => {
     if (!e)
       return !1;
@@ -1489,13 +1488,13 @@ const p = {
   }
 }, Un = {
   id: "sheet.command.add-table-theme",
-  type: N.COMMAND,
+  type: y.COMMAND,
   handler: (t, e) => {
     if (!e)
       return !1;
-    const n = t.get(_), { unitId: r, tableId: s, themeStyle: a } = e, o = [], l = [], u = n.getTableById(r, s);
-    if (!u) return !1;
-    const i = u.getSubunitId();
+    const n = t.get(_), { unitId: r, tableId: s, themeStyle: a } = e, o = [], u = [], l = n.getTableById(r, s);
+    if (!l) return !1;
+    const i = l.getSubunitId();
     o.push({
       id: Ee.id,
       params: {
@@ -1513,17 +1512,17 @@ const p = {
           theme: a.getName()
         }
       }
-    }), l.push({
+    }), u.push({
       id: p.id,
       params: {
         unitId: r,
         subUnitId: i,
         tableId: s,
         config: {
-          themeStyle: u.getTableStyleId()
+          themeStyle: l.getTableStyleId()
         }
       }
-    }), l.push({
+    }), u.push({
       id: We.id,
       params: {
         unitId: r,
@@ -1534,23 +1533,23 @@ const p = {
     const h = t.get(x);
     return B(o, h) && t.get(A).pushUndoRedo({
       unitID: r,
-      undoMutations: l,
+      undoMutations: u,
       redoMutations: o
     }), !0;
   }
 }, $n = {
   id: "sheet.command.remove-table-theme",
-  type: N.COMMAND,
+  type: y.COMMAND,
   handler: (t, e) => {
     if (!e)
       return !1;
-    const { unitId: n, tableId: r, themeName: s } = e, a = t.get(_), o = t.get(He), l = a.getTableById(n, r);
-    if (!l) return !1;
-    const u = l.getSubunitId(), i = [], h = [], d = o.getRegisteredRangeThemes().filter((f) => f == null ? void 0 : f.startsWith("table-default"));
-    let m = o.getRegisteredRangeThemes().filter((f) => f == null ? void 0 : f.startsWith(yn)).find((f) => f !== s);
-    m || (m = d[0]), i.push({ id: p.id, params: { unitId: n, subUnitId: u, tableId: r, config: { theme: m } } }), i.push({ id: We.id, params: { unitId: n, subUnitId: u, styleName: s } });
+    const { unitId: n, tableId: r, themeName: s } = e, a = t.get(_), o = t.get(He), u = a.getTableById(n, r);
+    if (!u) return !1;
+    const l = u.getSubunitId(), i = [], h = [], d = o.getRegisteredRangeThemes().filter((R) => R == null ? void 0 : R.startsWith("table-default"));
+    let m = o.getRegisteredRangeThemes().filter((R) => R == null ? void 0 : R.startsWith(Nn)).find((R) => R !== s);
+    m || (m = d[0]), i.push({ id: p.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: u, styleJSON: S.toJson() } }), h.push({ id: p.id, params: { unitId: n, subUnitId: u, tableId: r, config: { theme: s } } }));
+    S && (h.push({ id: Ee.id, params: { unitId: n, subUnitId: l, styleJSON: S.toJson() } }), h.push({ id: p.id, params: { unitId: n, subUnitId: l, tableId: r, config: { theme: s } } }));
     const w = t.get(x);
     return B(i, w) && t.get(A).pushUndoRedo({
       unitID: n,
@@ -1560,14 +1559,14 @@ const p = {
   }
 }, An = {
   id: "sheet.command.set-table-config",
-  type: N.COMMAND,
+  type: y.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: l } = e, i = t.get(_).getTableById(n, r);
+    const { unitId: n, tableId: r, name: s, updateRange: a, rowColOperation: o, theme: u } = e, i = t.get(_).getTableById(n, r);
     if (!i) return !1;
-    const h = {}, d = {}, c = t.get(de), S = t.get(W).getCurrentUnitOfType(he.UNIVER_SHEET), w = /* @__PURE__ */ new Set();
+    const h = {}, d = {}, c = t.get(de), S = t.get(E).getCurrentUnitOfType(he.UNIVER_SHEET), w = /* @__PURE__ */ new Set();
     if (S && S.getSheets().forEach((O) => {
       w.add(O.getName());
     }), s) {
@@ -1582,14 +1581,14 @@ const p = {
       count: o.count
     }, d.rowColOperation = o), a && (h.updateRange = {
       newRange: i.getRange()
-    }, d.updateRange = a), l && (h.theme = i.getTableStyleId(), d.theme = l);
-    const R = {
+    }, d.updateRange = a), u && (h.theme = i.getTableStyleId(), d.theme = u);
+    const f = {
       unitId: n,
       subUnitId: i.getSubunitId(),
       tableId: r,
       config: d
     };
-    return t.get(x).executeCommand(p.id, R), t.get(A).pushUndoRedo({
+    return t.get(x).executeCommand(p.id, f), t.get(A).pushUndoRedo({
       unitID: n,
       undoMutations: [
         {
@@ -1605,34 +1604,34 @@ const p = {
       redoMutations: [
         {
           id: p.id,
-          params: R
+          params: f
         }
       ]
     }), !0;
   }
 }, Bn = {
   id: "sheet.command.table-insert-row",
-  type: N.COMMAND,
+  type: y.COMMAND,
   handler: (t) => {
-    const e = t.get(W), n = $(e);
+    const e = t.get(E), n = $(e);
     if (!n)
       return !1;
-    const { workbook: r, worksheet: s, unitId: a, subUnitId: o } = n, u = t.get(ge).getCurrentSelections();
-    if (!u.length || u.length > 1)
+    const { workbook: r, worksheet: s, unitId: a, subUnitId: o } = n, l = t.get(ge).getCurrentSelections();
+    if (!l.length || l.length > 1)
       return !1;
     t.get(_);
-    const h = u[0].range, c = t.get(E).getContainerTableWithRange(a, o, h);
+    const h = l[0].range, c = t.get(L).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 = [], T = [];
-    if (w - R < m)
-      f.push({
+    const m = h.endRow - h.startRow + 1, w = s.getRowCount() - 1, f = s.getCellMatrix().getDataRange().endRow, R = [], T = [];
+    if (w - f < m)
+      R.push({
         id: Pe.id,
         params: {
           unitId: a,
           subUnitId: o,
           range: { ...h }
         }
-      }), f.push({
+      }), R.push({
         id: p.id,
         params: {
           unitId: a,
@@ -1669,7 +1668,7 @@ const p = {
       });
     else {
       const M = { ...c.getRange() };
-      f.push({
+      R.push({
         id: p.id,
         params: {
           unitId: a,
@@ -1704,7 +1703,7 @@ const p = {
           subUnitId: o,
           range: {
             startRow: h.startRow,
-            endRow: R,
+            endRow: f,
             startColumn: M.startColumn,
             endColumn: M.endColumn
           }
@@ -1714,43 +1713,43 @@ const p = {
           subUnitId: o,
           range: {
             startRow: h.startRow + m,
-            endRow: R + m,
+            endRow: f + m,
             startColumn: M.startColumn,
             endColumn: M.endColumn
           }
         }
       );
-      K && (f.push(...K.redos), T.push(...K.undos));
+      K && (R.push(...K.redos), T.push(...K.undos));
     }
     const O = t.get(x);
-    return B(f, O) && t.get(A).pushUndoRedo({
+    return B(R, O) && t.get(A).pushUndoRedo({
       unitID: a,
       undoMutations: T,
-      redoMutations: f
+      redoMutations: R
     }), !0;
   }
 }, Ln = {
   id: "sheet.command.table-insert-col",
-  type: N.COMMAND,
+  type: y.COMMAND,
   handler: (t) => {
-    const e = t.get(W), n = $(e);
+    const e = t.get(E), n = $(e);
     if (!n)
       return !1;
-    const { worksheet: r, unitId: s, subUnitId: a } = n, l = t.get(ge).getCurrentSelections();
-    if (!l.length || l.length > 1)
+    const { worksheet: r, unitId: s, subUnitId: a } = n, u = t.get(ge).getCurrentSelections();
+    if (!u.length || u.length > 1)
       return !1;
-    const i = l[0].range, d = t.get(E).getContainerTableWithRange(s, a, i);
+    const i = u[0].range, d = t.get(L).getContainerTableWithRange(s, a, i);
     if (!d) return !1;
-    const c = i.endColumn - i.startColumn + 1, S = r.getColumnCount() - 1, w = r.getCellMatrix().getDataRange().endColumn, R = [], f = [];
+    const c = i.endColumn - i.startColumn + 1, S = r.getColumnCount() - 1, w = r.getCellMatrix().getDataRange().endColumn, f = [], R = [];
     if (S - w < c)
-      R.push({
+      f.push({
         id: qe.id,
         params: {
           unitId: s,
           subUnitId: a,
           range: { ...i }
         }
-      }), R.push({
+      }), f.push({
         id: p.id,
         params: {
           unitId: s,
@@ -1765,7 +1764,7 @@ const p = {
             }
           }
         }
-      }), f.push({
+      }), R.push({
         id: p.id,
         params: {
           unitId: s,
@@ -1780,8 +1779,8 @@ const p = {
             }
           }
         }
-      }), f.push({
-        id: Je.id,
+      }), R.push({
+        id: ke.id,
         params: {
           unitId: s,
           subUnitId: a,
@@ -1790,7 +1789,7 @@ const p = {
       });
     else {
       const v = d.getRange();
-      R.push({
+      f.push({
         id: p.id,
         params: {
           unitId: s,
@@ -1805,7 +1804,7 @@ const p = {
             }
           }
         }
-      }), f.push({
+      }), R.push({
         id: p.id,
         params: {
           unitId: s,
@@ -1844,28 +1843,28 @@ const p = {
           }
         }
       );
-      M && (R.push(...M.redos), f.push(...M.undos));
+      M && (f.push(...M.redos), R.push(...M.undos));
     }
     const T = t.get(x);
-    return B(R, T) && t.get(A).pushUndoRedo({
+    return B(f, T) && t.get(A).pushUndoRedo({
       unitID: s,
-      undoMutations: f,
-      redoMutations: R
+      undoMutations: R,
+      redoMutations: f
     }), !0;
   }
 }, En = {
   id: "sheet.command.table-remove-row",
-  type: N.COMMAND,
+  type: y.COMMAND,
   handler: (t, e) => {
     if (!e)
       return !1;
-    const n = t.get(W), r = $(n);
+    const n = t.get(E), r = $(n);
     if (!r)
       return !1;
-    const { unitId: s, subUnitId: a } = r, l = t.get(ge).getCurrentSelections();
-    if (!l.length || l.length > 1)
+    const { unitId: s, subUnitId: a } = r, u = t.get(ge).getCurrentSelections();
+    if (!u.length || u.length > 1)
       return !1;
-    const i = l[0].range, d = t.get(E).getContainerTableWithRange(s, a, i);
+    const i = u[0].range, d = t.get(L).getContainerTableWithRange(s, a, i);
     if (!d) return !1;
     const c = i.endRow - i.startRow + 1, m = [], S = [], w = d.getRange();
     m.push({
@@ -1896,14 +1895,14 @@ const p = {
         }
       }
     });
-    const f = r.worksheet.getCellMatrix().getDataRange().endRow, T = me(
+    const R = r.worksheet.getCellMatrix().getDataRange().endRow, T = me(
       t,
       {
         unitId: s,
         subUnitId: a,
         range: {
           startRow: i.endRow + 1,
-          endRow: f,
+          endRow: R,
           startColumn: w.startColumn,
           endColumn: w.endColumn
         }
@@ -1913,7 +1912,7 @@ const p = {
         subUnitId: a,
         range: {
           startRow: i.startRow,
-          endRow: f - c,
+          endRow: R - c,
           startColumn: w.startColumn,
           endColumn: w.endColumn
         }
@@ -1929,21 +1928,21 @@ const p = {
   }
 }, Wn = {
   id: "sheet.command.table-remove-col",
-  type: N.COMMAND,
+  type: y.COMMAND,
   handler: (t, e) => {
     if (!e)
       return !1;
-    const n = t.get(W), r = $(n);
+    const n = t.get(E), r = $(n);
     if (!r)
       return !1;
     const { workbook: s, unitId: a, subUnitId: o } = r;
     t.get(_);
-    const u = t.get(ge).getCurrentSelections();
-    if (!u.length || u.length > 1)
+    const l = t.get(ge).getCurrentSelections();
+    if (!l.length || l.length > 1)
       return !1;
-    const h = u[0].range, c = t.get(E).getContainerTableWithRange(a, o, h);
+    const h = l[0].range, c = t.get(L).getContainerTableWithRange(a, o, h);
     if (!c) return !1;
-    const m = h.endColumn - h.startColumn + 1, S = [], w = [], R = c.getRange();
+    const m = h.endColumn - h.startColumn + 1, S = [], w = [], f = c.getRange();
     S.push({
       id: p.id,
       params: {
@@ -1960,10 +1959,10 @@ const p = {
         }
       }
     });
-    const f = [], T = h.startColumn - R.startColumn;
+    const R = [], T = h.startColumn - f.startColumn;
     for (let ne = 0; ne < m; ne++) {
       const Te = c.getTableInfo().columns[T + ne];
-      Te && f.push(Te);
+      Te && R.push(Te);
     }
     w.push({
       id: p.id,
@@ -1977,7 +1976,7 @@ const p = {
             rowColType: D.Col,
             index: h.startColumn,
             count: m,
-            columnsJson: f
+            columnsJson: R
           }
         }
       }
@@ -1988,8 +1987,8 @@ const p = {
         unitId: a,
         subUnitId: o,
         range: {
-          startRow: R.startRow,
-          endRow: R.endRow,
+          startRow: f.startRow,
+          endRow: f.endRow,
           startColumn: h.endColumn + 1,
           endColumn: v
         }
@@ -1998,8 +1997,8 @@ const p = {
         unitId: a,
         subUnitId: o,
         range: {
-          startRow: R.startRow,
-          endRow: R.endRow,
+          startRow: f.startRow,
+          endRow: f.endRow,
           startColumn: h.startColumn,
           endColumn: v - m
         }
@@ -2056,7 +2055,7 @@ var Vn = Object.getOwnPropertyDescriptor, qn = (t, e, n, r) => {
   for (var s = r > 1 ? void 0 : r ? Vn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
     (o = t[a]) && (s = o(s) || s);
   return s;
-}, H = (t, e) => (n, r) => e(n, r, t);
+}, W = (t, e) => (n, r) => e(n, r, t);
 let le = 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();
@@ -2087,17 +2086,17 @@ let le = class extends k {
     const { unitId: s, subUnitId: a } = r, o = this._tableManager.getTablesBySubunitId(s, a);
     if (!o.length)
       return { undos: e, redos: n };
-    const { range: l } = t;
-    return o.forEach((u) => {
-      const i = u.getRange();
-      if (l.startRow > i.startRow && l.startRow <= i.endRow) {
-        const h = l.endRow - l.startRow + 1;
+    const { range: u } = t;
+    return o.forEach((l) => {
+      const i = l.getRange();
+      if (u.startRow > i.startRow && u.startRow <= i.endRow) {
+        const h = u.endRow - u.startRow + 1;
         n.push({
           id: p.id,
           params: {
             unitId: s,
             subUnitId: a,
-            tableId: u.getId(),
+            tableId: l.getId(),
             config: {
               updateRange: {
                 newRange: {
@@ -2112,7 +2111,7 @@ let le = class extends k {
           params: {
             unitId: s,
             subUnitId: a,
-            tableId: u.getId(),
+            tableId: l.getId(),
             config: {
               updateRange: {
                 newRange: {
@@ -2132,22 +2131,22 @@ let le = class extends k {
     const { unitId: s, subUnitId: a } = r, o = this._tableManager.getTablesBySubunitId(s, a);
     if (!o.length)
       return { undos: e, redos: n };
-    const { range: l } = t;
-    return o.forEach((u) => {
-      const i = u.getRange();
-      if (l.startColumn > i.startColumn && l.startColumn <= i.endColumn) {
-        const h = l.endColumn - l.startColumn + 1;
+    const { range: u } = t;
+    return o.forEach((l) => {
+      const i = l.getRange();
+      if (u.startColumn > i.startColumn && u.startColumn <= i.endColumn) {
+        const h = u.endColumn - u.startColumn + 1;
         n.push({
           id: p.id,
           params: {
             unitId: s,
             subUnitId: a,
-            tableId: u.getId(),
+            tableId: l.getId(),
             config: {
               rowColOperation: {
                 operationType: I.Insert,
                 rowColType: D.Col,
-                index: l.startColumn,
+                index: u.startColumn,
                 count: h
               }
             }
@@ -2157,12 +2156,12 @@ let le = class extends k {
           params: {
             unitId: s,
             subUnitId: a,
-            tableId: u.getId(),
+            tableId: l.getId(),
             config: {
               rowColOperation: {
                 operationType: I.Delete,
                 rowColType: D.Col,
-                index: l.startColumn,
+                index: u.startColumn,
                 count: h
               }
             }
@@ -2175,11 +2174,11 @@ let le = class extends k {
     const e = [], n = [], r = [], s = [], a = $(this._univerInstanceService);
     if (!a)
       return { undos: e, redos: n, preRedos: r, preUndos: s };
-    const { unitId: o, subUnitId: l } = a, u = this._tableManager.getTablesBySubunitId(o, l);
-    if (!u.length)
+    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 u.forEach((d) => {
+    return l.forEach((d) => {
       const c = d.getRange();
       if (pe.intersects(c, i))
         if (i.startRow <= c.startRow && i.endRow >= c.startRow) {
@@ -2187,7 +2186,7 @@ let le = class extends k {
             id: te.id,
             params: {
               unitId: o,
-              subUnitId: l,
+              subUnitId: u,
               tableId: d.getId()
             }
           });
@@ -2196,7 +2195,7 @@ let le = class extends k {
             id: ee.id,
             params: {
               unitId: o,
-              subUnitId: l,
+              subUnitId: u,
               tableId: m.id,
               name: m.name,
               range: m.range,
@@ -2207,7 +2206,7 @@ let le = class extends k {
           id: p.id,
           params: {
             unitId: o,
-            subUnitId: l,
+            subUnitId: u,
             tableId: d.getId(),
             config: {
               updateRange: {
@@ -2222,7 +2221,7 @@ let le = class extends k {
           id: p.id,
           params: {
             unitId: o,
-            subUnitId: l,
+            subUnitId: u,
             tableId: d.getId(),
             config: {
               updateRange: {
@@ -2236,7 +2235,7 @@ let le = class extends k {
           id: p.id,
           params: {
             unitId: o,
-            subUnitId: l,
+            subUnitId: u,
             tableId: d.getId(),
             config: {
               updateRange: {
@@ -2251,7 +2250,7 @@ let le = class extends k {
           id: p.id,
           params: {
             unitId: o,
-            subUnitId: l,
+            subUnitId: u,
             tableId: d.getId(),
             config: {
               updateRange: {
@@ -2268,11 +2267,11 @@ let le = class extends k {
     const e = [], n = [], r = [], s = [], a = $(this._univerInstanceService);
     if (!a)
       return { undos: e, redos: n, preRedos: r, preUndos: s };
-    const { unitId: o, subUnitId: l } = a, u = this._tableManager.getTablesBySubunitId(o, l);
-    if (!u.length)
+    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 u.forEach((d) => {
+    return l.forEach((d) => {
       const c = d.getRange();
       if (pe.intersects(c, i)) {
         if (i.startColumn <= c.startColumn && i.endColumn >= c.endColumn) {
@@ -2280,21 +2279,21 @@ let le = class extends k {
             id: te.id,
             params: {
               unitId: o,
-              subUnitId: l,
+              subUnitId: u,
               tableId: d.getId()
             }
           });
-          const m = d.toJSON(), { startRow: S, startColumn: w, endColumn: R } = m.range, f = this._univerInstanceService.getUnit(o), T = f == null ? void 0 : f.getSheetBySheetId(l);
+          const m = d.toJSON(), { startRow: S, startColumn: w, endColumn: f } = m.range, R = this._univerInstanceService.getUnit(o), T = R == null ? void 0 : R.getSheetBySheetId(u);
           if (!T)
             return { undos: e, redos: n, preRedos: r, preUndos: s };
           const O = [];
-          for (let v = w; v <= R; v++)
+          for (let v = w; v <= f; v++)
             O.push(Ye(T == null ? void 0 : T.getCell(S, v)) || X(v - w + 1, this._localeService.t("sheets-table.columnPrefix")));
           e.push({
             id: ee.id,
             params: {
               unitId: o,
-              subUnitId: l,
+              subUnitId: u,
               tableId: m.id,
               name: m.name,
               header: O,
@@ -2308,7 +2307,7 @@ let le = class extends k {
             id: p.id,
             params: {
               unitId: o,
-              subUnitId: l,
+              subUnitId: u,
               tableId: d.getId(),
               config: {
                 rowColOperation: {
@@ -2322,14 +2321,14 @@ let le = class extends k {
           });
           const S = [];
           for (let w = 0; w < m; w++) {
-            const R = d.getTableColumnByIndex(w);
-            R && S.push(R.toJSON());
+            const f = d.getTableColumnByIndex(w);
+            f && S.push(f.toJSON());
           }
           e.push({
             id: p.id,
             params: {
               unitId: o,
-              subUnitId: l,
+              subUnitId: u,
               tableId: d.getId(),
               config: {
                 rowColOperation: {
@@ -2348,7 +2347,7 @@ let le = class extends k {
             id: p.id,
             params: {
               unitId: o,
-              subUnitId: l,
+              subUnitId: u,
               tableId: d.getId(),
               config: {
                 rowColOperation: {
@@ -2361,15 +2360,15 @@ let le = class extends k {
             }
           });
           const S = [], w = i.startColumn - c.startColumn;
-          for (let R = 0; R < m; R++) {
-            const f = d.getTableColumnByIndex(R + w);
-            f && S.push(f.toJSON());
+          for (let f = 0; f < m; f++) {
+            const R = d.getTableColumnByIndex(f + w);
+            R && S.push(R.toJSON());
           }
           e.push({
             id: p.id,
             params: {
               unitId: o,
-              subUnitId: l,
+              subUnitId: u,
               tableId: d.getId(),
               config: {
                 rowColOperation: {
@@ -2387,7 +2386,7 @@ let le = class extends k {
             id: p.id,
             params: {
               unitId: o,
-              subUnitId: l,
+              subUnitId: u,
               tableId: d.getId(),
               config: {
                 rowColOperation: {
@@ -2401,14 +2400,14 @@ let le = class extends k {
           });
           const m = [], S = i.startColumn - c.startColumn;
           for (let w = 0; w < h; w++) {
-            const R = d.getTableColumnByIndex(w + S);
-            R && m.push(R.toJSON());
+            const f = d.getTableColumnByIndex(w + S);
+            f && m.push(f.toJSON());
           }
           e.push({
             id: p.id,
             params: {
               unitId: o,
-              subUnitId: l,
+              subUnitId: u,
               tableId: d.getId(),
               config: {
                 rowColOperation: {
@@ -2429,49 +2428,49 @@ let le = class extends k {
     this._commandService.onCommandExecuted((t) => {
       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((l) => {
-          const u = l.getRange();
-          s.startRow <= u.startRow && this._tableManager.updateTableRange(n, l.getId(), {
+        this._tableManager.getTablesBySubunitId(n, r).forEach((u) => {
+          const l = u.getRange();
+          s.startRow <= l.startRow && this._tableManager.updateTableRange(n, u.getId(), {
             newRange: {
-              ...u,
-              startRow: u.startRow + a,
-              endRow: u.endRow + a
+              ...l,
+              startRow: l.startRow + a,
+              endRow: l.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((l) => {
-          const u = l.getRange();
-          s.startColumn <= u.startColumn && this._tableManager.updateTableRange(n, l.getId(), {
+        this._tableManager.getTablesBySubunitId(n, r).forEach((u) => {
+          const l = u.getRange();
+          s.startColumn <= l.startColumn && this._tableManager.updateTableRange(n, u.getId(), {
             newRange: {
-              ...u,
-              startColumn: u.startColumn + a,
-              endColumn: u.endColumn + a
+              ...l,
+              startColumn: l.startColumn + a,
+              endColumn: l.endColumn + a
             }
           });
         });
       } else 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((l) => {
-          const u = l.getRange();
-          s.startRow < u.startRow && this._tableManager.updateTableRange(n, l.getId(), {
+        this._tableManager.getTablesBySubunitId(n, r).forEach((u) => {
+          const l = u.getRange();
+          s.startRow < l.startRow && this._tableManager.updateTableRange(n, u.getId(), {
             newRange: {
-              ...u,
-              startRow: u.startRow - a,
-              endRow: u.endRow - a
+              ...l,
+              startRow: l.startRow - a,
+              endRow: l.endRow - a
             }
           });
         });
-      } else if (t.id === Je.id) {
+      } 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((l) => {
-          const u = l.getRange();
-          s.startColumn < u.startColumn && this._tableManager.updateTableRange(n, l.getId(), {
+        this._tableManager.getTablesBySubunitId(n, r).forEach((u) => {
+          const l = u.getRange();
+          s.startColumn < l.startColumn && this._tableManager.updateTableRange(n, u.getId(), {
             newRange: {
-              ...u,
-              startColumn: u.startColumn - a,
-              endColumn: u.endColumn - a
+              ...l,
+              startColumn: l.startColumn - a,
+              endColumn: l.endColumn - a
             }
           });
         });
@@ -2480,16 +2479,16 @@ let le = class extends k {
   }
 };
 le = qn([
-  H(0, C(x)),
-  H(1, C(dt)),
-  H(2, C(W)),
-  H(3, C(Ae)),
-  H(4, C(Ce)),
-  H(5, C(_)),
-  H(6, C(de))
+  W(0, C(x)),
+  W(1, C(dt)),
+  W(2, C(E)),
+  W(3, C(Ae)),
+  W(4, C(Ce)),
+  W(5, C(_)),
+  W(6, C(de))
 ], le);
-var Jn = Object.getOwnPropertyDescriptor, kn = (t, e, n, r) => {
-  for (var s = r > 1 ? void 0 : r ? Jn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
+var kn = Object.getOwnPropertyDescriptor, Jn = (t, e, n, r) => {
+  for (var s = r > 1 ? void 0 : r ? kn(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);
@@ -2503,8 +2502,8 @@ let ue = class extends k {
   registerTableChangeEvent() {
     this.disposeWithMe(
       this._tableManager.tableAdd$.subscribe((e) => {
-        const { range: n, tableId: r, unitId: s, subUnitId: a } = e, o = this._tableManager.getTable(s, r), l = this._allThemes[this._defaultThemeIndex].name;
-        o.setTableStyleId(l), this._sheetRangeThemeService.registerRangeThemeStyle(l, {
+        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,
           subUnitId: a,
           range: { ...n }
@@ -2512,13 +2511,13 @@ let ue = class extends k {
       })
     ), this.disposeWithMe(
       this._tableManager.tableRangeChanged$.subscribe((e) => {
-        const { range: n, oldRange: r, tableId: s, unitId: a, subUnitId: o } = e, l = this._tableManager.getTable(a, s);
-        let u = l.getTableStyleId();
-        u || (u = this._allThemes[this._defaultThemeIndex].name, l.setTableStyleId(u)), this._sheetRangeThemeService.removeRangeThemeRule(u, {
+        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, {
           unitId: a,
           subUnitId: o,
           range: { ...r }
-        }), this._sheetRangeThemeService.registerRangeThemeStyle(u, {
+        }), this._sheetRangeThemeService.registerRangeThemeStyle(l, {
           unitId: a,
           subUnitId: o,
           range: { ...n }
@@ -2526,15 +2525,15 @@ let ue = class extends k {
       })
     ), this.disposeWithMe(
       this._tableManager.tableThemeChanged$.subscribe((e) => {
-        const { theme: n, oldTheme: r, tableId: s, unitId: a, subUnitId: o } = e, u = this._tableManager.getTable(a, s).getRange();
+        const { theme: n, oldTheme: r, tableId: s, unitId: a, subUnitId: o } = e, l = this._tableManager.getTable(a, s).getRange();
         this._sheetRangeThemeService.removeRangeThemeRule(r, {
           unitId: a,
           subUnitId: o,
-          range: { ...u }
+          range: { ...l }
         }), this._sheetRangeThemeService.registerRangeThemeStyle(n, {
           unitId: a,
           subUnitId: o,
-          range: { ...u }
+          range: { ...l }
         });
       })
     ), this.disposeWithMe(
@@ -2554,7 +2553,7 @@ let ue = class extends k {
   }
   _initDefaultTableTheme() {
     for (let e = 0; e < this._allThemes.length; e++) {
-      const { name: n, style: r } = this._allThemes[e], s = new ft(n, r);
+      const { name: n, style: r } = this._allThemes[e], s = new Rt(n, r);
       this._sheetRangeThemeModel.registerDefaultRangeTheme(s);
     }
   }
@@ -2562,7 +2561,7 @@ let ue = class extends k {
     super.dispose(), this._allThemes = [], this._defaultThemeIndex = 0;
   }
 };
-ue = kn([
+ue = Jn([
   se(0, C(_)),
   se(1, C(wt)),
   se(2, C(He)),
@@ -2572,11 +2571,11 @@ var Qn = Object.getOwnPropertyDescriptor, Yn = (t, e, n, r) => {
   for (var s = r > 1 ? void 0 : r ? Qn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
     (o = t[a]) && (s = o(s) || s);
   return s;
-}, fe = (t, e) => (n, r) => e(n, r, t);
+}, Re = (t, e) => (n, r) => e(n, r, t);
 let ce = class extends k {
   constructor(e, n, r) {
     super();
-    b(this, "_tableFilteredOutRows$", new ke(/* @__PURE__ */ new Set()));
+    b(this, "_tableFilteredOutRows$", new Je(/* @__PURE__ */ new Set()));
     b(this, "tableFilteredOutRows$", this._tableFilteredOutRows$.asObservable());
     b(this, "_subscription", null);
     this._tableManager = e, this._sheetInterceptorService = n, this._univerInstanceService = r, this.registerFilterChangeEvent(), this.initTableHiddenRowIntercept(), this._initFilteredOutRows();
@@ -2613,8 +2612,8 @@ let ce = class extends k {
       this.tableFilteredOutRows.clear(), this._tableManager.getTablesBySubunitId(n, r).forEach((a) => {
         const o = a.getTableFilters().getFilterOutRows();
         if (o)
-          for (const l of o)
-            this.tableFilteredOutRows.add(l);
+          for (const u of o)
+            this.tableFilteredOutRows.add(u);
       });
     });
   }
@@ -2640,15 +2639,15 @@ let ce = class extends k {
   }
 };
 ce = Yn([
-  fe(0, C(_)),
-  fe(1, C(Ce)),
-  fe(2, C(W))
+  Re(0, C(_)),
+  Re(1, C(Ce)),
+  Re(2, C(E))
 ], ce);
 var Gn = Object.getOwnPropertyDescriptor, jn = (t, e, n, r) => {
   for (var s = r > 1 ? void 0 : r ? Gn(e, n) : e, a = t.length - 1, o; a >= 0; a--)
     (o = t[a]) && (s = o(s) || s);
   return s;
-}, Re = (t, e) => (n, r) => e(n, r, t), ae;
+}, fe = (t, e) => (n, r) => e(n, r, t), ae;
 let $e = (ae = class extends it {
   constructor(t = De, e, n, r) {
     super(), this._config = t, this._injector = e, this._configService = n, this._commandService = r;
@@ -2663,7 +2662,7 @@ let $e = (ae = class extends it {
     ut(this._injector, [
       [_],
       [ue],
-      [E],
+      [L],
       [j],
       [ce],
       [ie],
@@ -2672,7 +2671,7 @@ let $e = (ae = class extends it {
       [ie],
       [le],
       [ue],
-      [E],
+      [L],
       [j],
       [ce]
     ]);
@@ -2689,7 +2688,7 @@ let $e = (ae = class extends it {
       Dn,
       te,
       Se,
-      Nn,
+      yn,
       An,
       p,
       Un,
@@ -2702,9 +2701,9 @@ let $e = (ae = class extends it {
   }
 }, b(ae, "pluginName", Xe), b(ae, "type", he.UNIVER_SHEET), ae);
 $e = jn([
-  Re(1, C(Ae)),
-  Re(2, Be),
-  Re(3, C(x))
+  fe(1, C(Ae)),
+  fe(2, Be),
+  fe(3, C(x))
 ], $e);
 export {
   Fn as AddSheetTableCommand,
@@ -2713,9 +2712,9 @@ export {
   Dn as DeleteSheetTableCommand,
   te as DeleteSheetTableMutation,
   $n as RemoveTableThemeCommand,
-  yn as SHEET_TABLE_CUSTOM_THEME_PREFIX,
+  Nn as SHEET_TABLE_CUSTOM_THEME_PREFIX,
   An as SetSheetTableCommand,
-  Nn as SetSheetTableFilterCommand,
+  yn as SetSheetTableFilterCommand,
   Se as SetSheetTableFilterMutation,
   p as SetSheetTableMutation,
   Ln as SheetTableInsertColCommand,
@@ -2723,16 +2722,16 @@ export {
   Wn as SheetTableRemoveColCommand,
   En as SheetTableRemoveRowCommand,
   j as SheetTableService,
-  V as SheetsTableButtonStateEnum,
-  E as SheetsTableController,
-  Y as SheetsTableSortStateEnum,
+  P as SheetsTableButtonStateEnum,
+  L as SheetsTableController,
+  Q as SheetsTableSortStateEnum,
   Qe as TableColumnDataTypeEnum,
   Z as TableColumnFilterTypeEnum,
   U as TableConditionTypeEnum,
   g as TableDateCompareTypeEnum,
   _ as TableManager,
   F as TableNumberCompareTypeEnum,
-  P as TableStringCompareTypeEnum,
+  H as TableStringCompareTypeEnum,
   $e as UniverSheetsTablePlugin,
   nr as customEmptyThemeWithBorderStyle,
   St as isConditionFilter,