@hkyhy/marsun-components-core 0.1.139 → 0.1.140

package/README.md

@@ -136,6 +136,7 @@ node scripts/version-check.mjs --apply   # → 0.1.99
 
 也可在 Actions 中手动运行 **Publish npm**，填写已有 tag 重新发布。
 
+- 2026-10-29：`v0.1.140` — Table：列配置重排/增量列后归位 `fixed` 列，避免操作列 sticky 失效
 - 2026-10-23：`v0.1.138` — CreateActionForm：`allocatorDisabled` / `defaultAssigneeUserId`（Related S3-1523）
 - 2026-10-22：`v0.1.137` — InboxBell：`action_assigned_ack` 恒「查看任务」（禁「去执行」）；Related S3-1721
 - 2026-10-21：`v0.1.136` — MessageCenter 推送规则级别改为业务 DI `levelOptions`（禁写死 L1/L2/L3；S3 可注入 L2+）

package/dist/components/Table/Table.d.ts

@@ -1,7 +1,7 @@
 import { TableProps as AntTableProps } from 'antd';
 import { Key, ReactElement, ReactNode, Ref } from 'react';
 import { TableColumnConfigFetcher, TableColumnConfigItem, TableColumnConfigSaver } from './columnConfigTypes';
-import { applyColumnConfig, applyLeafWidthOverrides, clearColumnWidthAtPath, clampColumnWidth, columnsLeafPathSignature, COLUMN_CONFIG_COL_KEY, COLUMN_RESIZE_MAX_WIDTH, COLUMN_RESIZE_MIN_WIDTH, columnsToConfig, configHasLeafWidths, copyColumnWidths, FLEX_SPACER_COL_KEY, hideColumnAtPath, insertBeforeFixedRight, isFixedColumn, isInternalColumnKey, setColumnWidthAtPath } from './columnConfigUtils';
+import { applyColumnConfig, applyLeafWidthOverrides, clearColumnWidthAtPath, clampColumnWidth, columnsLeafPathSignature, COLUMN_CONFIG_COL_KEY, COLUMN_RESIZE_MAX_WIDTH, COLUMN_RESIZE_MIN_WIDTH, columnsToConfig, configHasLeafWidths, copyColumnWidths, FLEX_SPACER_COL_KEY, hideColumnAtPath, insertBeforeFixedRight, isFixedColumn, isInternalColumnKey, normalizeFixedColumnOrder, setColumnWidthAtPath } from './columnConfigUtils';
 import { TablePrefs, TablePrefsFetcher, TablePrefsSaver } from './tablePrefsTypes';
 import { TableFetchHandle, TableFetchMapped, TableFetchQuery } from './useTableFetch';
 export type { TableColumnConfigFetcher, TableColumnConfigItem, TableColumnConfigSaver, TableFetchHandle, TableFetchMapped, TableFetchQuery, TablePrefs, TablePrefsFetcher, TablePrefsSaver, };
@@ -61,4 +61,4 @@ declare const Table: <RecordType extends object = Record<string, unknown>>(props
 export default Table;
 export { emptyTablePrefs } from './tablePrefsTypes';
 export { applyHiddenRows, mergeTablePrefs, normalizeHiddenRowKeys, parseTablePrefs, serializeTablePrefs, } from './tablePrefsUtils';
-export { applyColumnConfig, applyLeafWidthOverrides, clearColumnWidthAtPath, clampColumnWidth, columnsLeafPathSignature, COLUMN_CONFIG_COL_KEY, COLUMN_RESIZE_MAX_WIDTH, COLUMN_RESIZE_MIN_WIDTH, columnsToConfig, configHasLeafWidths, copyColumnWidths, FLEX_SPACER_COL_KEY, hideColumnAtPath, insertBeforeFixedRight, isFixedColumn, isInternalColumnKey, setColumnWidthAtPath, };
+export { applyColumnConfig, applyLeafWidthOverrides, clearColumnWidthAtPath, clampColumnWidth, columnsLeafPathSignature, COLUMN_CONFIG_COL_KEY, COLUMN_RESIZE_MAX_WIDTH, COLUMN_RESIZE_MIN_WIDTH, columnsToConfig, configHasLeafWidths, copyColumnWidths, FLEX_SPACER_COL_KEY, hideColumnAtPath, insertBeforeFixedRight, isFixedColumn, isInternalColumnKey, normalizeFixedColumnOrder, setColumnWidthAtPath, };

package/dist/components/Table/Table.js

@@ -5,19 +5,19 @@ import { forwardRef as Pe, useImperativeHandle as Ie, useMemo as x, useRef as yt
 import { flushSync as Ee } from "react-dom";
 import kt from "./columnConfig.module.scss.js";
 import { ColumnConfigTrigger as Te } from "./ColumnConfigPanel.js";
-import { COLUMN_RESIZE_MAX_WIDTH as Ae, COLUMN_RESIZE_MIN_WIDTH as Ne, columnsLeafPathSignature as Fe, applyColumnConfig as je, applyLeafWidthOverrides as Mt, columnsToPanelItems as ke, copyColumnWidths as Me, columnsToConfig as Bt, clampColumnWidth as St, setColumnWidthAtPath as Be, clearColumnWidthAtPath as De, hideColumnAtPath as Ue, configHasLeafWidths as $e, insertBeforeFixedRight as Ge, FLEX_SPACER_COL_KEY as qe, COLUMN_CONFIG_COL_KEY as Xe, isInternalColumnKey as Wt, shortChildId as $t } from "./columnConfigUtils.js";
-import { isFixedColumn as On } from "./columnConfigUtils.js";
-import Ze from "./ResizableHeaderCell.js";
+import { COLUMN_RESIZE_MAX_WIDTH as Ae, COLUMN_RESIZE_MIN_WIDTH as Ne, columnsLeafPathSignature as Fe, applyColumnConfig as je, applyLeafWidthOverrides as Mt, columnsToPanelItems as ke, copyColumnWidths as Me, columnsToConfig as Bt, clampColumnWidth as St, setColumnWidthAtPath as Be, clearColumnWidthAtPath as De, hideColumnAtPath as Ue, normalizeFixedColumnOrder as $e, configHasLeafWidths as Ge, insertBeforeFixedRight as qe, FLEX_SPACER_COL_KEY as Xe, COLUMN_CONFIG_COL_KEY as Ze, isInternalColumnKey as Wt, shortChildId as $t } from "./columnConfigUtils.js";
+import { isFixedColumn as Rn } from "./columnConfigUtils.js";
+import Ye from "./ResizableHeaderCell.js";
 import p from "./style.module.scss.js";
-import { emptyTablePrefs as Ye } from "./tablePrefsTypes.js";
-import { normalizeHiddenRowKeys as Ct, mergeTablePrefs as lt, applyHiddenRows as Je } from "./tablePrefsUtils.js";
-import { parseTablePrefs as bn, serializeTablePrefs as Ln } from "./tablePrefsUtils.js";
-import { useTableFetch as Qe } from "./useTableFetch.js";
-import { useMarsunFetch as Ve } from "../../provider/context.js";
+import { emptyTablePrefs as Je } from "./tablePrefsTypes.js";
+import { normalizeHiddenRowKeys as Ct, mergeTablePrefs as lt, applyHiddenRows as Qe } from "./tablePrefsUtils.js";
+import { parseTablePrefs as Ln, serializeTablePrefs as vn } from "./tablePrefsUtils.js";
+import { useTableFetch as Ve } from "./useTableFetch.js";
+import { useMarsunFetch as we } from "../../provider/context.js";
 import Dt from "../Empty/Empty.js";
 import { Eye as Gt } from "../Icons/Eye.js";
-const we = { x: "max-content" }, G = 40, Ke = 64;
-function tn(i) {
+const Ke = { x: "max-content" }, G = 40, tn = 64;
+function en(i) {
   return `共 ${i} 项`;
 }
 function qt(i) {
@@ -32,14 +32,14 @@ function qt(i) {
       continue;
     }
     const c = o.width;
-    typeof c == "number" && Number.isFinite(c) && c > 0 ? l += c : l += Ke;
+    typeof c == "number" && Number.isFinite(c) && c > 0 ? l += c : l += tn;
   }
   return l;
 }
 function Xt(i, l) {
   return i.key != null && String(i.key) !== "" ? String(i.key) : i.dataIndex != null ? Array.isArray(i.dataIndex) ? i.dataIndex.join(".") : String(i.dataIndex) : `__col_${l}`;
 }
-function en(i, l, f) {
+function nn(i, l, f) {
   if (typeof f == "function") return String(f(i, l));
   if (typeof f == "string" && f) {
     const o = i[f];
@@ -52,7 +52,7 @@ function Zt(i, l, f, o = []) {
     var R;
     const _ = Xt(a, c);
     if (Wt(_)) return a;
-    const d = f ? $t(f, _) : _, O = [...o, d], u = a.onHeaderCell;
+    const u = f ? $t(f, _) : _, O = [...o, u], d = a.onHeaderCell;
     if ((R = a.children) != null && R.length)
       return {
         ...a,
@@ -67,7 +67,7 @@ function Zt(i, l, f, o = []) {
     return {
       ...a,
       onHeaderCell: (W) => ({
-        ...typeof u == "function" ? u(W) : u || {},
+        ...typeof d == "function" ? d(W) : d || {},
         "data-marsun-col-path": q,
         width: P,
         minWidth: l.minWidth,
@@ -80,18 +80,18 @@ function Zt(i, l, f, o = []) {
     };
   });
 }
-const nn = 6;
+const rn = 6;
 function Yt(i, l, f, o = [], a = 0, c) {
   let _ = 0;
-  return i.map((d, O) => {
+  return i.map((u, O) => {
     var g, N;
-    const u = Xt(d, O);
-    if (Wt(u)) return d;
-    const q = f ? $t(f, u) : u, P = [...o, q], R = d.onHeaderCell;
+    const d = Xt(u, O);
+    if (Wt(d)) return u;
+    const q = f ? $t(f, d) : d, P = [...o, q], R = u.onHeaderCell;
     let W = c;
-    a === 0 && (W = (g = d.children) != null && g.length ? _++ : void 0);
-    const D = W == null ? void 0 : a === 0 ? p.headerDepth0 : a === 1 ? p.headerDepth1 : p.headerDepth2, I = W == null ? void 0 : p[`headerGroup${W % nn}`], U = /* @__PURE__ */ et("span", { className: p.headerTitleWithEye, children: [
-      /* @__PURE__ */ y("span", { className: p.headerTitleText, children: d.title }),
+    a === 0 && (W = (g = u.children) != null && g.length ? _++ : void 0);
+    const D = W == null ? void 0 : a === 0 ? p.headerDepth0 : a === 1 ? p.headerDepth1 : p.headerDepth2, I = W == null ? void 0 : p[`headerGroup${W % rn}`], U = /* @__PURE__ */ et("span", { className: p.headerTitleWithEye, children: [
+      /* @__PURE__ */ y("span", { className: p.headerTitleText, children: u.title }),
       /* @__PURE__ */ y(Ut, { title: "隐藏此列", children: /* @__PURE__ */ y(
         "button",
         {
@@ -111,26 +111,26 @@ function Yt(i, l, f, o = [], a = 0, c) {
         className: at(X.className, I, D)
       };
     };
-    return (N = d.children) != null && N.length ? {
-      ...d,
+    return (N = u.children) != null && N.length ? {
+      ...u,
       title: U,
       onHeaderCell: b,
       children: Yt(
-        d.children,
+        u.children,
         l,
-        u,
+        d,
         P,
         a + 1,
         W
       )
     } : {
-      ...d,
+      ...u,
       title: U,
       onHeaderCell: b
     };
   });
 }
-function rn({
+function sn({
   className: i,
   style: l,
   scroll: f,
@@ -138,9 +138,9 @@ function rn({
   locale: a,
   columns: c,
   dataSource: _,
-  rowKey: d,
+  rowKey: u,
   loading: O,
-  tableName: u,
+  tableName: d,
   columnConfigEnabled: q,
   fetchColumnConfig: P,
   saveColumnConfig: R,
@@ -170,17 +170,17 @@ function rn({
   ...le
 }, ae) {
   var Ft;
-  const ot = Ve(), {
+  const ot = we(), {
     fetchMode: ct,
     rows: oe,
     total: ce,
-    loading: ue,
+    loading: de,
     error: xt,
-    currentPage: de,
+    currentPage: ue,
     pageSize: he,
     setPage: fe,
     reload: zt
-  } = Qe({
+  } = Ve({
     dataSource: _,
     fetchData: wt,
     fetchUrl: Kt,
@@ -195,10 +195,10 @@ function rn({
     onFetched: ie
   });
   Ie(ae, () => ({ reload: zt }), [zt]);
-  const ut = ct ? oe : _, me = !!O || ct && ue, j = q ?? !!u, v = Jt ?? !!u, E = Qt, T = Vt, Y = x(
+  const dt = ct ? oe : _, me = !!O || ct && de, j = q ?? !!d, v = Jt ?? !!d, E = Qt, T = Vt, Y = x(
     () => ({ minWidth: E, maxWidth: T }),
     [E, T]
-  ), rt = yt(c), dt = yt(null), [s, st] = tt(null), [Ht, pe] = tt(!1), [ht, ft] = tt(!j), [Ot, ye] = tt([]), [k, Q] = tt({}), $ = yt(k);
+  ), rt = yt(c), ut = yt(null), [s, st] = tt(null), [Ht, pe] = tt(!1), [ht, ft] = tt(!j), [Ot, ye] = tt([]), [k, Q] = tt({}), $ = yt(k);
   $.current = k, gt(() => {
     rt.current = c;
   }, [c]);
@@ -209,7 +209,7 @@ function rn({
   gt(() => {
     Q({}), $.current = {};
   }, [ge]), gt(() => {
-    if (!j && !v || !u || !(D || P)) {
+    if (!j && !v || !d || !(D || P)) {
       ft(!0);
       return;
     }
@@ -218,11 +218,11 @@ function rn({
       var n;
       try {
         if (D) {
-          const r = await D(u);
+          const r = await D(d);
           t || st((n = r == null ? void 0 : r.columns) != null && n.length ? r : null);
         } else if (P) {
-          const r = await P(u);
-          t || st(r != null && r.length ? Ye(r) : null);
+          const r = await P(d);
+          t || st(r != null && r.length ? Je(r) : null);
         }
       } catch {
         t || st(null);
@@ -232,7 +232,7 @@ function rn({
     })(), () => {
       t = !0;
     };
-  }, [j, v, u, D, P]);
+  }, [j, v, d, D, P]);
   const A = (Ft = s == null ? void 0 : s.columns) != null && Ft.length ? s.columns : null, M = x(() => N !== void 0 ? Ct(N, g) : Ct(Ot, g), [N, Ot, g]), J = z(
     (t) => {
       const e = Ct(t, g);
@@ -241,13 +241,13 @@ function rn({
     [N, g, F]
   ), B = z(
     async (t) => {
-      if (st(t), U == null || U(t), W == null || W(t.columns), u && I) {
-        await I(u, t);
+      if (st(t), U == null || U(t), W == null || W(t.columns), d && I) {
+        await I(d, t);
         return;
       }
-      u && R && await R(u, t.columns);
+      d && R && await R(d, t.columns);
     },
-    [u, I, R, U, W]
+    [d, I, R, U, W]
   ), Rt = x(() => {
     const t = c || [];
     let e;
@@ -290,7 +290,7 @@ function rn({
     });
   }, []), _t = z(
     (t) => {
-      const e = dt.current;
+      const e = ut.current;
       if (!e) return;
       const n = e.querySelectorAll("[data-marsun-col-path]");
       n.length && Ee(() => {
@@ -308,7 +308,7 @@ function rn({
     [E, T]
   ), Pt = z(
     async (t, e) => {
-      const n = t.join("/"), r = St(e, E, T), h = dt.current, S = { ...$.current, [n]: r };
+      const n = t.join("/"), r = St(e, E, T), h = ut.current, S = { ...$.current, [n]: r };
       h && h.querySelectorAll("[data-marsun-col-path]").forEach((m) => {
         const C = m.getAttribute("data-marsun-col-path");
         if (!C || C === n || S[C] != null) return;
@@ -355,7 +355,9 @@ function rn({
     },
     [g, M, J]
   ), mt = x(() => {
-    let t = Rt;
+    let t = $e(
+      Rt
+    );
     if (j && ht && (t = Yt(t, (n) => {
       Et(n);
     })), v && (t = Zt(t, {
@@ -370,23 +372,23 @@ function rn({
       onResetPath: (n) => {
         It(n);
       }
-    })), v && (Object.keys(k).length > 0 || $e(A))) {
+    })), v && (Object.keys(k).length > 0 || Ge(A))) {
       const n = {
-        key: qe,
+        key: Xe,
         title: "",
         className: p.flexSpacerCol,
         onHeaderCell: () => ({ className: p.flexSpacerCol }),
         onCell: () => ({ className: p.flexSpacerCol }),
         render: () => null
       };
-      t = Ge(
+      t = qe(
         t,
         n
       );
     }
     if (j && ht) {
       const n = {
-        key: Xe,
+        key: Ze,
         width: G,
         fixed: "right",
         align: "center",
@@ -438,12 +440,12 @@ function rn({
     E,
     T,
     k
-  ]), We = x(() => b ? Je(ut, M, typeof d == "function" || typeof d == "string" ? d : void 0, g) : ut, [b, ut, M, d, g]), xe = o === !1 ? !1 : {
+  ]), We = x(() => b ? Qe(dt, M, typeof u == "function" || typeof u == "string" ? u : void 0, g) : dt, [b, dt, M, u, g]), xe = o === !1 ? !1 : {
     showSizeChanger: !0,
-    showTotal: tn,
+    showTotal: en,
     ...o && typeof o == "object" ? o : {},
     ...ct ? {
-      current: de,
+      current: ue,
       pageSize: he,
       total: ce,
       onChange: (t, e) => {
@@ -477,7 +479,7 @@ function rn({
       columnWidth: t + 20,
       renderCell: (e, n, r, h) => {
         var K;
-        const H = ((K = L.renderCell) == null ? void 0 : K.call(L, e, n, r, h)) ?? h, m = en(n, r, d), C = pt.has(m);
+        const H = ((K = L.renderCell) == null ? void 0 : K.call(L, e, n, r, h)) ?? h, m = nn(n, r, u), C = pt.has(m);
         return /* @__PURE__ */ et("span", { className: p.rowSelectWithEye, children: [
           H,
           /* @__PURE__ */ y(Ut, { title: C ? "主对标不可隐藏" : "隐藏此行", children: /* @__PURE__ */ y(
@@ -496,13 +498,13 @@ function rn({
         ] });
       }
     };
-  }, [L, b, d, pt, Tt]), w = x(() => {
+  }, [L, b, u, pt, Tt]), w = x(() => {
     const t = qt(mt);
     if (!t) return 0;
     const e = V ? typeof V.columnWidth == "number" ? V.columnWidth : 48 : 0;
     return t + e;
   }, [mt, V]), Re = x(() => {
-    const t = f === void 0 ? { ...we } : { ...f };
+    const t = f === void 0 ? { ...Ke } : { ...f };
     return w > 0 ? { ...t, x: w } : t;
   }, [f, w]), be = x(() => {
     const t = Z == null ? void 0 : Z.header, e = t && "cell" in t ? t.cell : void 0;
@@ -510,11 +512,11 @@ function rn({
       ...Z,
       header: {
         ...t,
-        cell: (r) => !(typeof r.onResize == "function") && e ? /* @__PURE__ */ y(e, { ...r }) : /* @__PURE__ */ y(Ze, { ...r })
+        cell: (r) => !(typeof r.onResize == "function") && e ? /* @__PURE__ */ y(e, { ...r }) : /* @__PURE__ */ y(Ye, { ...r })
       }
     } : Z;
   }, [Z, v]);
-  return /* @__PURE__ */ et("div", { ref: dt, className: at("marsun-table-shell", p["marsun-table-shell"]), children: [
+  return /* @__PURE__ */ et("div", { ref: ut, className: at("marsun-table-shell", p["marsun-table-shell"]), children: [
     Nt ? /* @__PURE__ */ y("div", { className: p["marsun-table-toolbar"], children: Nt }) : null,
     /* @__PURE__ */ y(
       _e,
@@ -529,7 +531,7 @@ function rn({
         locale: ze,
         columns: mt,
         dataSource: We,
-        rowKey: d,
+        rowKey: u,
         loading: me,
         rowSelection: V,
         components: be,
@@ -538,31 +540,32 @@ function rn({
     )
   ] });
 }
-const xn = Pe(rn);
+const zn = Pe(sn);
 export {
-  Xe as COLUMN_CONFIG_COL_KEY,
+  Ze as COLUMN_CONFIG_COL_KEY,
   Ae as COLUMN_RESIZE_MAX_WIDTH,
   Ne as COLUMN_RESIZE_MIN_WIDTH,
-  qe as FLEX_SPACER_COL_KEY,
+  Xe as FLEX_SPACER_COL_KEY,
   je as applyColumnConfig,
-  Je as applyHiddenRows,
+  Qe as applyHiddenRows,
   Mt as applyLeafWidthOverrides,
   St as clampColumnWidth,
   De as clearColumnWidthAtPath,
   Fe as columnsLeafPathSignature,
   Bt as columnsToConfig,
-  $e as configHasLeafWidths,
+  Ge as configHasLeafWidths,
   Me as copyColumnWidths,
-  xn as default,
-  Ye as emptyTablePrefs,
+  zn as default,
+  Je as emptyTablePrefs,
   Ue as hideColumnAtPath,
-  Ge as insertBeforeFixedRight,
-  On as isFixedColumn,
+  qe as insertBeforeFixedRight,
+  Rn as isFixedColumn,
   Wt as isInternalColumnKey,
   lt as mergeTablePrefs,
+  $e as normalizeFixedColumnOrder,
   Ct as normalizeHiddenRowKeys,
-  bn as parseTablePrefs,
-  Ln as serializeTablePrefs,
+  Ln as parseTablePrefs,
+  vn as serializeTablePrefs,
   Be as setColumnWidthAtPath
 };
 //# sourceMappingURL=Table.js.map