com-angel-authorization 1.0.16 → 1.0.18

package/README.md

@@ -427,13 +427,59 @@ export function Page() {
 
 列表支持 `keyword` 搜索与 page-token 分页。表头：角色名称、描述、操作（编辑 / 授权 / 删除）。
 
-点击「授权」打开树形勾选弹窗：勾选父节点会级联子节点；保存调用 `POST /system/roles/{role-id}/permissions`。
+点击「授权」打开树形勾选弹窗（父子联动：勾选父节点级联子节点；子节点全选/取消会回写父节点；部分勾选为半选态）。保存调用 `POST /system/roles/{role-id}/permissions`。
+
+---
+
+## 用户管理（CRUD）
+
+对接后端 `/system/users`。
+
+| 操作 | 方法 | 地址 |
+|------|------|------|
+| 列表 | GET | `/system/users?keyword=&enabled=&page-token=&page-size=&page-direction=` |
+| 新增 | POST | `/system/users` |
+| 修改 | PATCH | `/system/users/{user-id}` |
+| 删除 | DELETE | `/system/users/{user-id}` |
+| 部门下拉 | GET | `/system/groups?keyword=` |
+| 角色下拉 | GET | `/system/roles?keyword=` |
+
+### React
+
+```tsx
+import {
+  UserManager,
+  createSystemUserApi,
+  createDefaultResourceRequest,
+} from 'com-angel-authorization/react';
+
+const api = createSystemUserApi(
+  createDefaultResourceRequest({ baseUrl: '/api' }),
+);
+
+export function Page() {
+  return <UserManager api={api} />;
+}
+```
+
+### 表单字段
+
+| 字段 | 说明 |
+|------|------|
+| username | 账号：不少于 6 位，且同时包含字母与数字 |
+| name | 用户名 |
+| password | 初始密码（编辑时可留空表示不修改） |
+| groupIds | 归属部门，多选（`/system/groups`） |
+| roleIds | 用户角色，多选（`/system/roles`） |
+| enabled | 是否启用（boolean，Switch） |
+
+列表支持 `keyword`、`enabled` 过滤与 page-token 分页。
 
 ---
 
 ## 系统管理（含子菜单）
 
-将「菜单管理」「权限点管理」「角色管理」作为「系统管理」的子菜单展示：
+将「菜单管理」「权限点管理」「角色管理」「用户管理」作为「系统管理」的子菜单展示：
 
 ```tsx
 import {
@@ -441,6 +487,7 @@ import {
   createMenuResourceApi,
   createAuthorizationResourceApi,
   createSystemRoleApi,
+  createSystemUserApi,
   createDefaultResourceRequest,
   SYSTEM_ADMIN_MENU,
 } from 'com-angel-authorization/react';
@@ -449,9 +496,15 @@ const request = createDefaultResourceRequest({ baseUrl: '/api' });
 const menuApi = createMenuResourceApi(request);
 const resourceApi = createAuthorizationResourceApi(request);
 const roleApi = createSystemRoleApi(request);
+const userApi = createSystemUserApi(request);
 
-// 侧栏：系统管理 → 菜单管理 / 权限点管理 / 角色管理
-<SystemAdmin menuApi={menuApi} resourceApi={resourceApi} roleApi={roleApi} />
+// 侧栏：系统管理 → 菜单 / 权限点 / 角色 / 用户管理
+<SystemAdmin
+  menuApi={menuApi}
+  resourceApi={resourceApi}
+  roleApi={roleApi}
+  userApi={userApi}
+/>
 
 // 也可把菜单结构接到自有路由
 console.log(SYSTEM_ADMIN_MENU);
@@ -459,6 +512,7 @@ console.log(SYSTEM_ADMIN_MENU);
 //   { key: 'menu', label: '菜单管理' },
 //   { key: 'resource', label: '权限点管理' },
 //   { key: 'role', label: '角色管理' },
+//   { key: 'user', label: '用户管理' },
 // ]}
 ```
 

package/dist/index.cjs

@@ -188,7 +188,8 @@ var SYSTEM_ADMIN_MENU = {
   children: [
     { key: "menu", label: "\u83DC\u5355\u7BA1\u7406" },
     { key: "resource", label: "\u6743\u9650\u70B9\u7BA1\u7406" },
-    { key: "role", label: "\u89D2\u8272\u7BA1\u7406" }
+    { key: "role", label: "\u89D2\u8272\u7BA1\u7406" },
+    { key: "user", label: "\u7528\u6237\u7BA1\u7406" }
   ]
 };
 var SYSTEM_ADMIN_DEFAULT_KEY = "menu";
@@ -602,6 +603,72 @@ function mapRolePermissions(payload) {
 function collectTreeResourceIds(node) {
   return [node.resourceId, ...node.children.flatMap(collectTreeResourceIds)];
 }
+function buildPermissionTreeIndex(tree) {
+  const parentMap = /* @__PURE__ */ new Map();
+  const nodeMap = /* @__PURE__ */ new Map();
+  const walk = (nodes, parentId) => {
+    for (const node of nodes) {
+      parentMap.set(node.resourceId, parentId);
+      nodeMap.set(node.resourceId, node);
+      if (node.children.length > 0) {
+        walk(node.children, node.resourceId);
+      }
+    }
+  };
+  walk(tree, null);
+  return { parentMap, nodeMap };
+}
+function togglePermissionCheck(tree, checked, node) {
+  const next = new Set(checked);
+  const ids = collectTreeResourceIds(node);
+  const shouldCheck = !checked.has(node.resourceId);
+  if (shouldCheck) {
+    ids.forEach((id) => next.add(id));
+  } else {
+    ids.forEach((id) => next.delete(id));
+  }
+  const { parentMap, nodeMap } = buildPermissionTreeIndex(tree);
+  let parentId = parentMap.get(node.resourceId) ?? null;
+  while (parentId) {
+    const parent = nodeMap.get(parentId);
+    if (!parent) break;
+    const allChildrenChecked = parent.children.every(
+      (child) => next.has(child.resourceId)
+    );
+    if (allChildrenChecked && parent.children.length > 0) {
+      next.add(parentId);
+    } else {
+      next.delete(parentId);
+    }
+    parentId = parentMap.get(parentId) ?? null;
+  }
+  return next;
+}
+function countCheckedDescendants(node, checked) {
+  let total = 0;
+  let checkedCount = 0;
+  const walk = (n) => {
+    for (const child of n.children) {
+      total += 1;
+      if (checked.has(child.resourceId)) checkedCount += 1;
+      walk(child);
+    }
+  };
+  walk(node);
+  return { total, checkedCount };
+}
+function hasCheckedDescendant(node, checked) {
+  for (const child of node.children) {
+    if (checked.has(child.resourceId) || hasCheckedDescendant(child, checked)) {
+      return true;
+    }
+  }
+  return false;
+}
+function isPermissionNodeIndeterminate(node, checked) {
+  if (checked.has(node.resourceId) || node.children.length === 0) return false;
+  return hasCheckedDescendant(node, checked);
+}
 function buildListUrl2(params) {
   const parts = [];
   appendQueryParam(parts, "keyword", params?.keyword ?? "");
@@ -683,6 +750,169 @@ function createSystemRoleApi(request) {
   };
 }
 
+// src/users/index.ts
+function asIdList(value) {
+  if (!Array.isArray(value)) return [];
+  return value.map((item) => {
+    if (item === void 0 || item === null || item === "") return "";
+    if (typeof item === "object") {
+      const row = item;
+      const id = row.groupId ?? row.roleId ?? row.id;
+      return id === void 0 || id === null ? "" : String(id);
+    }
+    return String(item);
+  }).filter(Boolean);
+}
+function asNameList(value) {
+  if (!Array.isArray(value)) return void 0;
+  const names = value.map((item) => {
+    if (item === void 0 || item === null) return "";
+    if (typeof item === "object") {
+      return String(item.name ?? "");
+    }
+    return String(item);
+  }).filter(Boolean);
+  return names.length ? names : void 0;
+}
+function mapSystemUser(item) {
+  if (!item || typeof item !== "object") return null;
+  const row = item;
+  const userId = row.userId ?? row.user_id ?? row.id;
+  if (userId === void 0 || userId === null || userId === "") return null;
+  return {
+    userId: String(userId),
+    username: String(row.username ?? row.account ?? ""),
+    name: String(row.name ?? ""),
+    groupIds: asIdList(row.groupIds ?? row.group_ids ?? row.groups),
+    roleIds: asIdList(row.roleIds ?? row.role_ids ?? row.roles),
+    groupNames: asNameList(row.groupNames ?? row.group_names ?? row.groups),
+    roleNames: asNameList(row.roleNames ?? row.role_names ?? row.roles),
+    enabled: Boolean(row.enabled ?? row.enable ?? true)
+  };
+}
+function mapSystemGroupOption(item) {
+  if (!item || typeof item !== "object") return null;
+  const row = item;
+  const groupId = row.groupId ?? row.group_id ?? row.id;
+  if (groupId === void 0 || groupId === null || groupId === "") return null;
+  return {
+    groupId: String(groupId),
+    name: String(row.name ?? "")
+  };
+}
+function mapSystemRoleOption(item) {
+  if (!item || typeof item !== "object") return null;
+  const row = item;
+  const roleId = row.roleId ?? row.role_id ?? row.id;
+  if (roleId === void 0 || roleId === null || roleId === "") return null;
+  return {
+    roleId: String(roleId),
+    name: String(row.name ?? "")
+  };
+}
+function validateUsername(username) {
+  const value = username.trim();
+  if (value.length < 6) return "\u8D26\u53F7\u957F\u5EA6\u4E0D\u5C11\u4E8E 6 \u4E2A\u5B57\u7B26";
+  if (!/[A-Za-z]/.test(value) || !/[0-9]/.test(value)) {
+    return "\u8D26\u53F7\u9700\u540C\u65F6\u5305\u542B\u5B57\u6BCD\u548C\u6570\u5B57";
+  }
+  return null;
+}
+function buildListUrl3(params) {
+  const parts = [];
+  appendQueryParam(parts, "keyword", params?.keyword ?? "");
+  if (params?.enabled !== void 0) {
+    appendQueryParam(parts, "enabled", String(params.enabled));
+  }
+  appendQueryParam(parts, "page-token", params?.pagination?.pageToken ?? "");
+  appendQueryParam(parts, "page-size", params?.pagination?.pageSize ?? "20");
+  appendQueryParam(parts, "page-direction", params?.pagination?.pageDirection ?? "current");
+  return parts.length ? `/system/users?${parts.join("&")}` : "/system/users";
+}
+function buildKeywordUrl(base, keyword) {
+  const parts = [];
+  appendQueryParam(parts, "keyword", keyword ?? "");
+  return parts.length ? `${base}?${parts.join("&")}` : base;
+}
+function buildCreateUserBody(values) {
+  return {
+    username: values.username.trim(),
+    name: values.name.trim(),
+    password: values.password,
+    groupIds: [...new Set(values.groupIds.map(String))],
+    roleIds: [...new Set(values.roleIds.map(String))],
+    enabled: Boolean(values.enabled)
+  };
+}
+function buildUpdateUserBody(values) {
+  const body = {
+    username: values.username.trim(),
+    name: values.name.trim(),
+    groupIds: [...new Set(values.groupIds.map(String))],
+    roleIds: [...new Set(values.roleIds.map(String))],
+    enabled: Boolean(values.enabled)
+  };
+  if (values.password.trim()) {
+    body.password = values.password;
+  }
+  return body;
+}
+function createSystemUserApi(request) {
+  return {
+    async list(params, signal) {
+      const json = await request({
+        method: "GET",
+        url: buildListUrl3(params),
+        signal
+      });
+      const records = extractRecords(json).map(mapSystemUser).filter((item) => item !== null);
+      return {
+        records,
+        ...extractPagination(json)
+      };
+    },
+    async create(values, signal) {
+      return request({
+        method: "POST",
+        url: "/system/users",
+        body: buildCreateUserBody(values),
+        signal
+      });
+    },
+    async update(userId, values, signal) {
+      return request({
+        method: "PATCH",
+        url: `/system/users/${encodeURIComponent(userId)}`,
+        body: buildUpdateUserBody(values),
+        signal
+      });
+    },
+    async remove(userId, signal) {
+      return request({
+        method: "DELETE",
+        url: `/system/users/${encodeURIComponent(userId)}`,
+        signal
+      });
+    },
+    async listGroups(params, signal) {
+      const json = await request({
+        method: "GET",
+        url: buildKeywordUrl("/system/groups", params?.keyword),
+        signal
+      });
+      return extractRecords(json).map(mapSystemGroupOption).filter((item) => item !== null);
+    },
+    async listRoleOptions(params, signal) {
+      const json = await request({
+        method: "GET",
+        url: buildKeywordUrl("/system/roles", params?.keyword),
+        signal
+      });
+      return extractRecords(json).map(mapSystemRoleOption).filter((item) => item !== null);
+    }
+  };
+}
+
 exports.MENU_LEAF_NO = MENU_LEAF_NO;
 exports.MENU_LEAF_YES = MENU_LEAF_YES;
 exports.MENU_LIST_TYPE_PARAM = MENU_LIST_TYPE_PARAM;
@@ -706,27 +936,39 @@ exports.appendQueryParam = appendQueryParam;
 exports.buildCreateBody = buildCreateBody;
 exports.buildCreateMenuBody = buildCreateMenuBody;
 exports.buildCreateRoleBody = buildCreateRoleBody;
+exports.buildCreateUserBody = buildCreateUserBody;
+exports.buildPermissionTreeIndex = buildPermissionTreeIndex;
 exports.buildSavePermissionsBody = buildSavePermissionsBody;
 exports.buildUpdateBody = buildUpdateBody;
 exports.buildUpdateMenuBody = buildUpdateMenuBody;
 exports.buildUpdateRoleBody = buildUpdateRoleBody;
+exports.buildUpdateUserBody = buildUpdateUserBody;
 exports.collectTreeResourceIds = collectTreeResourceIds;
+exports.countCheckedDescendants = countCheckedDescendants;
 exports.createAuthorizationResourceApi = createAuthorizationResourceApi;
 exports.createDefaultResourceRequest = createDefaultResourceRequest;
 exports.createMenuResourceApi = createMenuResourceApi;
 exports.createPermissionStore = createPermissionStore;
 exports.createSystemRoleApi = createSystemRoleApi;
+exports.createSystemUserApi = createSystemUserApi;
 exports.extractPagination = extractPagination;
 exports.extractRecords = extractRecords;
 exports.getAppClientId = getAppClientId;
 exports.getDeviceWorkerId = getDeviceWorkerId;
+exports.hasCheckedDescendant = hasCheckedDescendant;
 exports.isMenuLeaf = isMenuLeaf;
+exports.isPermissionNodeIndeterminate = isPermissionNodeIndeterminate;
 exports.mapAuthorizationResource = mapAuthorizationResource;
 exports.mapMenuResource = mapMenuResource;
 exports.mapPermissionTreeNode = mapPermissionTreeNode;
 exports.mapRolePermissions = mapRolePermissions;
+exports.mapSystemGroupOption = mapSystemGroupOption;
 exports.mapSystemRole = mapSystemRole;
+exports.mapSystemRoleOption = mapSystemRoleOption;
+exports.mapSystemUser = mapSystemUser;
 exports.resolveMenuDepth = resolveMenuDepth;
 exports.snowyflake = snowyflake;
+exports.togglePermissionCheck = togglePermissionCheck;
+exports.validateUsername = validateUsername;
 //# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map