@hkyhy/marsun-components-core 0.1.138 → 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/Iam/client.d.ts

@@ -39,4 +39,7 @@ export type IamClient = {
     listUserSharedGroups: (userId: string) => Promise<IamSharedGroup[]>;
     setUserAppRoleCodes: (userId: string, roleCodes: string[]) => Promise<void>;
     setUserSharedGroups: (userId: string, groupIds: string[]) => Promise<void>;
+    /** 可选：个人 App 数据范围（S3）；Assets 可不实现 */
+    getUserAppDataScope?: (userId: string) => Promise<string | null>;
+    setUserAppDataScope?: (userId: string, dataScope: string | null) => Promise<void>;
 };

package/dist/components/Iam/index.d.ts

@@ -4,7 +4,7 @@ export { buildDraftEffectivePermissions, type DraftEpPerm, } from './utils/draft
 export { roleDisplayName, roleSelectOption } from './utils/roleDisplay';
 export { MULTI_TAG_SHOW_LENGTH, multiTagSelectProps } from './utils/multiTagSelect';
 export { catalogToItems } from './utils/catalogToItems';
-export { default as IamUsersPage, type IamUsersPageProps } from './pages/IamUsersPage';
+export { default as IamUsersPage, type IamUsersPageProps, type IamPersonalDataScopeConfig, } from './pages/IamUsersPage';
 export { IamRolesPage, IamRolePermissionsPage, displayRoleDescription, type IamRolesPageProps, type IamRolePermissionsPageProps, } from './pages/IamRolesPage';
 export { default as IamOrgPage, type IamOrgPageProps } from './pages/IamOrgPage';
 export { default as IamSharedGroupsPage, type IamSharedGroupsPageProps, } from './pages/IamSharedGroupsPage';

package/dist/components/Iam/pages/IamUsersPage.d.ts

@@ -1,10 +1,24 @@
 import { PermissionBindCatalog } from '../../PermissionBindPanel';
 import { IamClient } from '../client';
+export type IamPersonalDataScopeConfig = {
+    /** value 用 '' 表示未设置（提交转 null） */
+    options: {
+        value: string;
+        label: string;
+    }[];
+    /** 选未设置时展示 */
+    unsetHint?: string;
+};
 export type IamUsersPageProps = {
     client: IamClient;
     catalog: PermissionBindCatalog;
     systemEntryCodes: readonly string[];
     tableName?: string;
     title?: string;
+    /**
+     * 个人数据范围（S3）：传入后启用可编辑 Select，并调用 client.get/setUserAppDataScope。
+     * Assets 不传则保持只读「全公司」占位。
+     */
+    personalDataScope?: IamPersonalDataScopeConfig;
 };
-export default function IamUsersPage({ client, catalog, systemEntryCodes, tableName, title, }: IamUsersPageProps): import("react").JSX.Element;
+export default function IamUsersPage({ client, catalog, systemEntryCodes, tableName, title, personalDataScope, }: IamUsersPageProps): import("react").JSX.Element;

package/dist/components/Iam/pages/IamUsersPage.js

@@ -1,153 +1,156 @@
-import { jsxs as b, jsx as t } from "react/jsx-runtime";
-import { message as y, Space as L, Button as V, Typography as z } from "antd";
-import { useState as n, useMemo as d, useCallback as D, useEffect as de } from "react";
-import { catalogToItems as H } from "../utils/catalogToItems.js";
-import { buildDraftEffectivePermissions as ce } from "../utils/draftEffectivePermissions.js";
-import { multiTagSelectProps as $, MULTI_TAG_SHOW_LENGTH as pe } from "../utils/multiTagSelect.js";
-import { roleSelectOption as ue, roleDisplayName as fe } from "../utils/roleDisplay.js";
-import ye from "../../ReactFilter/getFilterValue.js";
+import { jsxs as P, jsx as s } from "react/jsx-runtime";
+import { message as h, Space as j, Button as Y, Alert as ye, Typography as D } from "antd";
+import { useState as n, useMemo as c, useCallback as K, useEffect as he } from "react";
+import { catalogToItems as W } from "../utils/catalogToItems.js";
+import { buildDraftEffectivePermissions as Ce } from "../utils/draftEffectivePermissions.js";
+import { multiTagSelectProps as q, MULTI_TAG_SHOW_LENGTH as we } from "../utils/multiTagSelect.js";
+import { roleSelectOption as Se, roleDisplayName as Ie } from "../utils/roleDisplay.js";
+import ve from "../../ReactFilter/getFilterValue.js";
 import "../../ReactFilter/entry.js";
-import ge from "../../Layout/ModulePageShell/index.js";
-import he from "../../ReactFilter/Filter.js";
-import { InputFilterItem as Ce } from "../../ReactFilter/fields/index.js";
-import we from "../../Table/Table.js";
-import Se from "../../Modal/Modal/index.js";
-import Ie from "../../Descriptions/CommonDescriptions.js";
-import { FormModal as ve, FormInfo as be, Select as R } from "../../Form/kneFormInfo.js";
-import Ee from "../../Form/FormDataSync.js";
-import Pe from "../../PermissionBindPanel/PermissionBindPanel.js";
-import Te from "../../Tag/Tags/index.js";
-import { SEMANTIC_COLORS as ke } from "../../Tag/SemanticTag.js";
-const Fe = he, Oe = 420;
-function Re(l) {
-  var g, h;
-  const c = (g = l.roles) != null && g.length ? /* @__PURE__ */ t(
-    Te,
+import be from "../../Layout/ModulePageShell/index.js";
+import Ee from "../../ReactFilter/Filter.js";
+import { InputFilterItem as Pe } from "../../ReactFilter/fields/index.js";
+import Ae from "../../Table/Table.js";
+import Te from "../../Modal/Modal/index.js";
+import Ue from "../../Descriptions/CommonDescriptions.js";
+import { FormModal as ke, FormInfo as Fe, Select as x } from "../../Form/kneFormInfo.js";
+import Oe from "../../Form/FormDataSync.js";
+import Re from "../../PermissionBindPanel/PermissionBindPanel.js";
+import xe from "../../Tag/Tags/index.js";
+import { SEMANTIC_COLORS as Ne } from "../../Tag/SemanticTag.js";
+const Be = Ee, Me = 420;
+function _e(r) {
+  var C, w;
+  const p = (C = r.roles) != null && C.length ? /* @__PURE__ */ s(
+    xe,
     {
-      tags: l.roles.map((u) => fe(u)),
-      showLength: pe,
-      color: ke.INFO,
+      tags: r.roles.map((f) => Ie(f)),
+      showLength: we,
+      color: Ne.INFO,
       empty: "—"
     }
   ) : "—";
   return [
-    { label: "工号", value: l.employeeId || "—" },
-    { label: "姓名", value: l.displayName || "—" },
-    { label: "邮箱", value: l.email || "—" },
+    { label: "工号", value: r.employeeId || "—" },
+    { label: "姓名", value: r.displayName || "—" },
+    { label: "邮箱", value: r.email || "—" },
     {
       label: "组织",
-      value: ((h = l.orgs) == null ? void 0 : h.map((u) => u.name).filter(Boolean).join("、")) || "—",
+      value: ((w = r.orgs) == null ? void 0 : w.map((f) => f.name).filter(Boolean).join("、")) || "—",
       span: 2
     },
-    { label: "角色", value: c, span: 2 }
+    { label: "角色", value: p, span: 2 }
   ];
 }
-function Qe({
-  client: l,
-  catalog: c,
-  systemEntryCodes: g,
-  tableName: h = "iam_users",
-  title: u = "用户管理"
+function so({
+  client: r,
+  catalog: p,
+  systemEntryCodes: C,
+  tableName: w = "iam_users",
+  title: f = "用户管理",
+  personalDataScope: d
 }) {
-  const [j, x] = n(!1), [Y, K] = n([]), [W, q] = n(0), [E, N] = n(1), [P, J] = n([]), A = d(() => {
-    const e = ye(P);
+  var $;
+  const [J, N] = n(!1), [Q, X] = n([]), [Z, ee] = n(0), [A, B] = n(1), [T, oe] = n([]), M = c(() => {
+    const e = ve(T);
     return String(e.keyword ?? "");
-  }, [P]), [f, T] = n(null), [Q, M] = n(!1), [i, k] = n(null), [C, X] = n([]), [w, Z] = n([]), [S, U] = n([]), [I, B] = n([]), [ee, oe] = n(0), _ = d(() => {
+  }, [T]), [y, U] = n(null), [re, _] = n(!1), [i, k] = n(null), [S, te] = n([]), [I, se] = n([]), [v, G] = n([]), [b, L] = n([]), [F, V] = n(""), [le, ae] = n(0), g = !!(($ = d == null ? void 0 : d.options) != null && $.length && r.getUserAppDataScope && r.setUserAppDataScope), z = c(() => {
     const e = {};
-    for (const r of H(c))
-      e[r.code] = r.name;
+    for (const t of W(p))
+      e[t.code] = t.name;
     return e;
-  }, [c]), v = d(
-    () => ce({
-      roleCodes: S,
-      groupIds: I,
-      roles: C,
-      groups: w,
-      nameByCode: _
+  }, [p]), E = c(
+    () => Ce({
+      roleCodes: v,
+      groupIds: b,
+      roles: S,
+      groups: I,
+      nameByCode: z
     }),
-    [S, I, C, w, _]
-  ), G = d(() => {
-    const e = v.filter((o) => o.layer !== "RESOURCE").map((o) => ({
+    [v, b, S, I, z]
+  ), H = c(() => {
+    const e = E.filter((o) => o.layer !== "RESOURCE").map((o) => ({
       id: o.code,
       code: o.code,
       name: o.name || o.code,
       layer: o.layer
-    })), r = new Map(e.map((o) => [o.code, o])), a = H(c).map((o) => {
-      const m = r.get(o.code);
+    })), t = new Map(e.map((o) => [o.code, o])), a = W(p).map((o) => {
+      const m = t.get(o.code);
       return m ? { ...o, name: m.name || o.name, layer: m.layer || o.layer } : o;
-    }), s = new Set(a.map((o) => o.code));
-    return [...a, ...e.filter((o) => !s.has(o.code))];
-  }, [v, c]), re = d(
-    () => v.filter((e) => e.layer !== "RESOURCE").map((e) => e.code),
-    [v]
-  ), te = d(() => C.map((e) => ue(e)), [C]), le = d(
-    () => w.map((e) => ({
+    }), l = new Set(a.map((o) => o.code));
+    return [...a, ...e.filter((o) => !l.has(o.code))];
+  }, [E, p]), ne = c(
+    () => E.filter((e) => e.layer !== "RESOURCE").map((e) => e.code),
+    [E]
+  ), ie = c(() => S.map((e) => Se(e)), [S]), de = c(
+    () => I.map((e) => ({
       value: e.id,
       label: e.name || e.code,
       title: e.code ? `编码：${e.code}` : e.name
     })),
-    [w]
-  ), F = D(async () => {
-    x(!0);
+    [I]
+  ), O = K(async () => {
+    N(!0);
     try {
-      const e = await l.listUsers({ page: E, pageSize: 20, keyword: A || void 0 });
-      K(e.pageData), q(e.total);
+      const e = await r.listUsers({ page: A, pageSize: 20, keyword: M || void 0 });
+      X(e.pageData), ee(e.total);
     } catch (e) {
-      y.error(e instanceof Error ? e.message : "加载失败");
+      h.error(e instanceof Error ? e.message : "加载失败");
     } finally {
-      x(!1);
+      N(!1);
     }
-  }, [l, E, A]);
-  de(() => {
-    F();
-  }, [F]);
-  const se = async (e) => {
-    var r, a;
-    T(e), M(!0);
+  }, [r, A, M]);
+  he(() => {
+    O();
+  }, [O]);
+  const me = async (e) => {
+    var t, a;
+    U(e), _(!0);
     try {
-      const s = await l.getUser(e.id);
-      T({
+      const l = await r.getUser(e.id);
+      U({
         ...e,
-        ...s,
-        orgs: (r = s.orgs) != null && r.length ? s.orgs : e.orgs,
-        roles: (a = s.roles) != null && a.length ? s.roles : e.roles
+        ...l,
+        orgs: (t = l.orgs) != null && t.length ? l.orgs : e.orgs,
+        roles: (a = l.roles) != null && a.length ? l.roles : e.roles
       });
-    } catch (s) {
-      y.error(s instanceof Error ? s.message : "加载用户详情失败");
+    } catch (l) {
+      h.error(l instanceof Error ? l.message : "加载用户详情失败");
     } finally {
-      M(!1);
+      _(!1);
     }
-  }, ae = async (e) => {
-    var r;
+  }, ce = async (e) => {
+    var t;
     k(e);
     try {
-      const [a, s, o, m] = await Promise.all([
-        l.listRoles(),
-        l.listSharedGroups(),
-        l.listUserSharedGroups(e.id),
-        l.getUser(e.id)
+      const [a, l, o, m, R] = await Promise.all([
+        r.listRoles(),
+        r.listSharedGroups(),
+        r.listUserSharedGroups(e.id),
+        r.getUser(e.id),
+        g && r.getUserAppDataScope ? r.getUserAppDataScope(e.id) : Promise.resolve(null)
       ]);
-      X(a), Z(s), B(o.map((p) => p.id));
-      const O = ((r = m.roles) == null ? void 0 : r.filter((p) => a.some((me) => me.code === p.code)).map((p) => p.code)) || [];
-      U(O), oe((p) => p + 1);
+      te(a), se(l), L(o.map((u) => u.id));
+      const ge = ((t = m.roles) == null ? void 0 : t.filter((u) => a.some((fe) => fe.code === u.code)).map((u) => u.code)) || [];
+      G(ge), V(R || ""), ae((u) => u + 1);
     } catch (a) {
-      y.error(a instanceof Error ? a.message : "加载权限失败");
+      h.error(a instanceof Error ? a.message : "加载权限失败");
     }
-  }, ne = D((e) => {
-    Array.isArray(e.groupIds) && B(e.groupIds.map(String)), Array.isArray(e.roleCodes) && U(e.roleCodes.map(String));
-  }, []), ie = d(() => f ? Re(f) : [], [f]);
-  return /* @__PURE__ */ b(ge, { title: u, fillHeight: !1, children: [
-    /* @__PURE__ */ t("div", { style: { marginBottom: 12 }, children: /* @__PURE__ */ t(
-      Fe,
+  }, pe = K((e) => {
+    Array.isArray(e.groupIds) && L(e.groupIds.map(String)), Array.isArray(e.roleCodes) && G(e.roleCodes.map(String)), typeof e.dataScope == "string" && V(e.dataScope);
+  }, []), ue = c(() => y ? _e(y) : [], [y]);
+  return /* @__PURE__ */ P(be, { title: f, fillHeight: !1, children: [
+    /* @__PURE__ */ s("div", { style: { marginBottom: 12 }, children: /* @__PURE__ */ s(
+      Be,
       {
-        value: P,
+        value: T,
         onChange: (e) => {
-          J(e), N(1);
+          oe(e), B(1);
         },
         list: [
           [
             {
-              type: Ce,
+              type: Pe,
               props: {
                 name: "keyword",
                 label: "工号/姓名",
@@ -158,18 +161,18 @@ function Qe({
         ]
       }
     ) }),
-    /* @__PURE__ */ t(
-      we,
+    /* @__PURE__ */ s(
+      Ae,
       {
         rowKey: "id",
-        loading: j,
-        dataSource: Y,
-        tableName: h,
+        loading: J,
+        dataSource: Q,
+        tableName: w,
         pagination: {
-          current: E,
-          total: W,
+          current: A,
+          total: Z,
           pageSize: 20,
-          onChange: N
+          onChange: B
         },
         columns: [
           { title: "工号", dataIndex: "employeeId" },
@@ -178,45 +181,45 @@ function Qe({
           {
             title: "组织",
             key: "org",
-            render: (e, r) => {
-              var a, s, o, m;
-              return ((s = (a = r.orgs) == null ? void 0 : a.find((O) => O.isPrimary)) == null ? void 0 : s.name) || ((m = (o = r.orgs) == null ? void 0 : o[0]) == null ? void 0 : m.name) || "—";
+            render: (e, t) => {
+              var a, l, o, m;
+              return ((l = (a = t.orgs) == null ? void 0 : a.find((R) => R.isPrimary)) == null ? void 0 : l.name) || ((m = (o = t.orgs) == null ? void 0 : o[0]) == null ? void 0 : m.name) || "—";
             }
           },
           {
             title: "操作",
             key: "ops",
-            render: (e, r) => /* @__PURE__ */ b(L, { children: [
-              /* @__PURE__ */ t(V, { type: "link", size: "small", onClick: () => void se(r), children: "查看" }),
-              /* @__PURE__ */ t(V, { type: "link", size: "small", onClick: () => void ae(r), children: "权限管理" })
+            render: (e, t) => /* @__PURE__ */ P(j, { children: [
+              /* @__PURE__ */ s(Y, { type: "link", size: "small", onClick: () => void me(t), children: "查看" }),
+              /* @__PURE__ */ s(Y, { type: "link", size: "small", onClick: () => void ce(t), children: "权限管理" })
             ] })
           }
         ]
       }
     ),
-    /* @__PURE__ */ t(
-      Se,
+    /* @__PURE__ */ s(
+      Te,
       {
-        open: !!f,
+        open: !!y,
         title: "查看用户",
-        onCancel: () => T(null),
+        onCancel: () => U(null),
         footer: null,
         size: "M",
         scrollable: !0,
-        children: f ? /* @__PURE__ */ t(
-          Ie,
+        children: y ? /* @__PURE__ */ s(
+          Ue,
           {
-            content: ie,
+            content: ue,
             column: 1,
             bordered: !0,
             size: "small",
-            title: Q ? "加载中…" : void 0
+            title: re ? "加载中…" : void 0
           }
         ) : null
       }
     ),
-    /* @__PURE__ */ t(
-      ve,
+    /* @__PURE__ */ s(
+      ke,
       {
         open: !!i,
         title: `权限管理 · ${(i == null ? void 0 : i.displayName) || ""}`,
@@ -226,89 +229,95 @@ function Qe({
         cancelText: "取消",
         formProps: {
           data: {
-            dataScope: "COMPANY",
-            groupIds: I,
-            roleCodes: S
+            dataScope: g ? F : "COMPANY",
+            groupIds: b,
+            roleCodes: v
           },
           onSubmit: async (e) => {
             if (i)
               try {
-                await l.setUserAppRoleCodes(i.id, e.roleCodes ?? S), await l.setUserSharedGroups(i.id, e.groupIds ?? I), y.success("已保存"), k(null), F();
-              } catch (r) {
-                throw y.error(r instanceof Error ? r.message : "保存失败"), r;
+                if (g && r.setUserAppDataScope) {
+                  const t = String(e.dataScope ?? F ?? "").trim();
+                  await r.setUserAppDataScope(i.id, t || null);
+                }
+                await r.setUserAppRoleCodes(i.id, e.roleCodes ?? v), await r.setUserSharedGroups(i.id, e.groupIds ?? b), h.success("已保存"), k(null), O();
+              } catch (t) {
+                throw h.error(t instanceof Error ? t.message : "保存失败"), t;
               }
           }
         },
-        children: /* @__PURE__ */ b(L, { direction: "vertical", style: { width: "100%" }, size: "middle", children: [
-          /* @__PURE__ */ t(
-            be,
+        children: /* @__PURE__ */ P(j, { direction: "vertical", style: { width: "100%" }, size: "middle", children: [
+          g && !F && (d != null && d.unsetHint) ? /* @__PURE__ */ s(ye, { type: "warning", showIcon: !0, message: d.unsetHint }) : null,
+          /* @__PURE__ */ s(
+            Fe,
             {
               column: 2,
               gap: 16,
               list: [
-                /* @__PURE__ */ t(
-                  R,
+                /* @__PURE__ */ s(
+                  x,
                   {
                     name: "dataScope",
-                    label: "数据权限",
-                    disabled: !0,
-                    options: [{ value: "COMPANY", label: "全公司" }]
+                    label: "数据范围",
+                    disabled: !g,
+                    options: g ? d.options : [{ value: "COMPANY", label: "全公司" }],
+                    placeholder: "请选择个人数据范围"
                   },
                   "dataScope"
                 ),
-                /* @__PURE__ */ t(
-                  R,
+                /* @__PURE__ */ s(
+                  x,
                   {
                     name: "groupIds",
                     label: "共享组",
                     mode: "multiple",
                     allowClear: !0,
-                    options: le,
+                    options: de,
                     placeholder: "请选择共享组（可选）",
-                    ...$
+                    ...q
                   },
                   "groupIds"
                 ),
-                /* @__PURE__ */ t(
-                  R,
+                /* @__PURE__ */ s(
+                  x,
                   {
                     name: "roleCodes",
                     label: "用户角色",
                     mode: "multiple",
                     allowClear: !0,
-                    options: te,
+                    options: ie,
                     placeholder: "请选择本应用角色（可选）",
-                    ...$
+                    ...q
                   },
                   "roleCodes"
                 )
               ]
             }
           ),
-          /* @__PURE__ */ t(Ee, { onChange: ne }),
-          /* @__PURE__ */ b("div", { children: [
-            /* @__PURE__ */ t(z.Text, { strong: !0, children: "权限点（只读预览）" }),
-            G.length === 0 ? /* @__PURE__ */ t(z.Text, { type: "secondary", style: { display: "block", marginTop: 8 }, children: "暂无权限点" }) : /* @__PURE__ */ t("div", { style: { marginTop: 8 }, children: /* @__PURE__ */ t(
-              Pe,
+          /* @__PURE__ */ s(Oe, { onChange: pe }),
+          /* @__PURE__ */ P("div", { children: [
+            /* @__PURE__ */ s(D.Text, { strong: !0, children: "权限点（只读预览）" }),
+            H.length === 0 ? /* @__PURE__ */ s(D.Text, { type: "secondary", style: { display: "block", marginTop: 8 }, children: "暂无权限点" }) : /* @__PURE__ */ s("div", { style: { marginTop: 8 }, children: /* @__PURE__ */ s(
+              Re,
               {
-                catalog: c,
-                permissions: G,
-                value: re,
+                catalog: p,
+                permissions: H,
+                value: ne,
                 onChange: () => {
                 },
-                systemEntryCodes: [...g],
+                systemEntryCodes: [...C],
                 readOnly: !0,
-                height: Oe
+                height: Me
               }
             ) })
           ] })
         ] })
       },
-      `iam-perm-${(i == null ? void 0 : i.id) || "x"}-${ee}`
+      `iam-perm-${(i == null ? void 0 : i.id) || "x"}-${le}`
     )
   ] });
 }
 export {
-  Qe as default
+  so as default
 };
 //# sourceMappingURL=IamUsersPage.js.map