com-angel-authorization 1.0.6 → 1.0.8

package/dist/react/index.d.cts

@@ -168,7 +168,8 @@ type AuthorizationResourceListResult = {
 };
 type MenuResource = {
     resourceId: string;
-    parentId: string;
+    /** 上级菜单 ID；无上级时为 null */
+    parentId: string | null;
     type: MenuResourceType;
     name: string;
     identification: string;
@@ -178,7 +179,8 @@ type MenuResource = {
     status: ResourceStatus;
 };
 type MenuResourceFormValues = {
-    parentId: string;
+    /** 上级菜单 ID；选择「无」时为 null */
+    parentId: string | null;
     type: MenuResourceType;
     name: string;
     identification: string;
@@ -204,7 +206,11 @@ declare const MENU_TYPE_MENU: MenuResourceType;
 declare const MENU_TYPE_BUTTON: MenuResourceType;
 /** 菜单列表查询 type 参数 */
 declare const MENU_LIST_TYPE_PARAM = "page,menu,button";
-declare const ROOT_PARENT_ID = "0";
+/**
+ * 上级菜单选择「无」时，表单 select 使用的空值。
+ * 提交接口时会转换为 parentId: null。
+ */
+declare const ROOT_PARENT_ID = "";
 declare const RESOURCE_STATUS_ENABLED: ResourceStatus;
 declare const RESOURCE_STATUS_DISABLED: ResourceStatus;
 declare const RESOURCE_STATUS_OPTIONS: {
@@ -293,6 +299,36 @@ type MenuManagerProps = {
 };
 declare function MenuManager({ api, title, pageSize: initialPageSize, toolbarExtra, }: MenuManagerProps): react.JSX.Element;
 
+type SystemAdminMenuKey = 'menu' | 'resource';
+type SystemAdminSubMenu = {
+    key: SystemAdminMenuKey;
+    label: string;
+};
+type SystemAdminMenuGroup = {
+    key: 'system';
+    label: string;
+    children: SystemAdminSubMenu[];
+};
+/** 系统管理菜单结构：菜单管理、权限点管理为其子菜单 */
+declare const SYSTEM_ADMIN_MENU: SystemAdminMenuGroup;
+declare const SYSTEM_ADMIN_DEFAULT_KEY: SystemAdminMenuKey;
+
+type SystemAdminProps = {
+    menuApi: MenuResourceApi;
+    resourceApi: AuthorizationResourceApi;
+    /** 默认选中的子菜单，默认菜单管理 */
+    defaultActiveKey?: SystemAdminMenuKey;
+    /** 受控选中 key */
+    activeKey?: SystemAdminMenuKey;
+    onActiveKeyChange?: (key: SystemAdminMenuKey) => void;
+    title?: string;
+    toolbarExtra?: ReactNode;
+};
+/**
+ * 系统管理：侧栏父菜单「系统管理」，子菜单为「菜单管理」「权限点管理」。
+ */
+declare function SystemAdmin({ menuApi, resourceApi, defaultActiveKey, activeKey: controlledKey, onActiveKeyChange, title, toolbarExtra, }: SystemAdminProps): react.JSX.Element;
+
 interface SnowyflakeOptions {
     epoch?: bigint;
     workerId?: bigint;
@@ -323,4 +359,4 @@ declare const snowyflake: ConfigurableSnowflake;
 declare function getAppClientId(): string;
 declare function getDeviceWorkerId(): string;
 
-export { type ApiResourceType, type AuthorizationResource, type AuthorizationResourceApi, type AuthorizationResourceFormValues, type AuthorizationResourceListResult, Can, type CanProps, type CheckOptions, type CreateAuthorizationResourceBody, type CreateDefaultResourceRequestOptions, type CreateMenuResourceBody, type FetchAuthorizationResourcesParams, type FetchMenuResourcesParams, type HttpMethod, type ListPaginationParams, type ListPaginationResult, MENU_LIST_TYPE_PARAM, MENU_TYPE_BUTTON, MENU_TYPE_LABEL, MENU_TYPE_MENU, MENU_TYPE_OPTIONS, MENU_TYPE_PAGE, MENU_VISIBILITY_OPTIONS, type MatchMode, MenuManager, type MenuManagerProps, type MenuResource, type MenuResourceApi, type MenuResourceFormValues, type MenuResourceListResult, type MenuResourceType, type PageDirection, type PermissionChecker, type PermissionCode, type PermissionListener, PermissionProvider, type PermissionProviderProps, type PermissionState, PermissionStore, RESOURCE_PRIVATE_OPTIONS, RESOURCE_STATUS_DISABLED, RESOURCE_STATUS_ENABLED, RESOURCE_STATUS_OPTIONS, RESOURCE_TYPE_API, ROOT_PARENT_ID, type ResourceHttpRequest, ResourceManager, type ResourceManagerProps, type ResourceRequestOptions, type ResourceStatus, type ResourceType, type RoleCode, type UpdateAuthorizationResourceBody, type UpdateMenuResourceBody, type UsePermissionResult, appendQueryParam, buildCreateBody, buildCreateMenuBody, buildUpdateBody, buildUpdateMenuBody, createAuthorizationResourceApi, createDefaultResourceRequest, createMenuResourceApi, createPermissionStore, extractPagination, extractRecords, getAppClientId, getDeviceWorkerId, mapAuthorizationResource, mapMenuResource, snowyflake, useHasPermission, useHasRole, usePermission };
+export { type ApiResourceType, type AuthorizationResource, type AuthorizationResourceApi, type AuthorizationResourceFormValues, type AuthorizationResourceListResult, Can, type CanProps, type CheckOptions, type CreateAuthorizationResourceBody, type CreateDefaultResourceRequestOptions, type CreateMenuResourceBody, type FetchAuthorizationResourcesParams, type FetchMenuResourcesParams, type HttpMethod, type ListPaginationParams, type ListPaginationResult, MENU_LIST_TYPE_PARAM, MENU_TYPE_BUTTON, MENU_TYPE_LABEL, MENU_TYPE_MENU, MENU_TYPE_OPTIONS, MENU_TYPE_PAGE, MENU_VISIBILITY_OPTIONS, type MatchMode, MenuManager, type MenuManagerProps, type MenuResource, type MenuResourceApi, type MenuResourceFormValues, type MenuResourceListResult, type MenuResourceType, type PageDirection, type PermissionChecker, type PermissionCode, type PermissionListener, PermissionProvider, type PermissionProviderProps, type PermissionState, PermissionStore, RESOURCE_PRIVATE_OPTIONS, RESOURCE_STATUS_DISABLED, RESOURCE_STATUS_ENABLED, RESOURCE_STATUS_OPTIONS, RESOURCE_TYPE_API, ROOT_PARENT_ID, type ResourceHttpRequest, ResourceManager, type ResourceManagerProps, type ResourceRequestOptions, type ResourceStatus, type ResourceType, type RoleCode, SYSTEM_ADMIN_DEFAULT_KEY, SYSTEM_ADMIN_MENU, SystemAdmin, type SystemAdminMenuGroup, type SystemAdminMenuKey, type SystemAdminProps, type SystemAdminSubMenu, type UpdateAuthorizationResourceBody, type UpdateMenuResourceBody, type UsePermissionResult, appendQueryParam, buildCreateBody, buildCreateMenuBody, buildUpdateBody, buildUpdateMenuBody, createAuthorizationResourceApi, createDefaultResourceRequest, createMenuResourceApi, createPermissionStore, extractPagination, extractRecords, getAppClientId, getDeviceWorkerId, mapAuthorizationResource, mapMenuResource, snowyflake, useHasPermission, useHasRole, usePermission };

package/dist/react/index.d.ts

@@ -168,7 +168,8 @@ type AuthorizationResourceListResult = {
 };
 type MenuResource = {
     resourceId: string;
-    parentId: string;
+    /** 上级菜单 ID；无上级时为 null */
+    parentId: string | null;
     type: MenuResourceType;
     name: string;
     identification: string;
@@ -178,7 +179,8 @@ type MenuResource = {
     status: ResourceStatus;
 };
 type MenuResourceFormValues = {
-    parentId: string;
+    /** 上级菜单 ID；选择「无」时为 null */
+    parentId: string | null;
     type: MenuResourceType;
     name: string;
     identification: string;
@@ -204,7 +206,11 @@ declare const MENU_TYPE_MENU: MenuResourceType;
 declare const MENU_TYPE_BUTTON: MenuResourceType;
 /** 菜单列表查询 type 参数 */
 declare const MENU_LIST_TYPE_PARAM = "page,menu,button";
-declare const ROOT_PARENT_ID = "0";
+/**
+ * 上级菜单选择「无」时，表单 select 使用的空值。
+ * 提交接口时会转换为 parentId: null。
+ */
+declare const ROOT_PARENT_ID = "";
 declare const RESOURCE_STATUS_ENABLED: ResourceStatus;
 declare const RESOURCE_STATUS_DISABLED: ResourceStatus;
 declare const RESOURCE_STATUS_OPTIONS: {
@@ -293,6 +299,36 @@ type MenuManagerProps = {
 };
 declare function MenuManager({ api, title, pageSize: initialPageSize, toolbarExtra, }: MenuManagerProps): react.JSX.Element;
 
+type SystemAdminMenuKey = 'menu' | 'resource';
+type SystemAdminSubMenu = {
+    key: SystemAdminMenuKey;
+    label: string;
+};
+type SystemAdminMenuGroup = {
+    key: 'system';
+    label: string;
+    children: SystemAdminSubMenu[];
+};
+/** 系统管理菜单结构：菜单管理、权限点管理为其子菜单 */
+declare const SYSTEM_ADMIN_MENU: SystemAdminMenuGroup;
+declare const SYSTEM_ADMIN_DEFAULT_KEY: SystemAdminMenuKey;
+
+type SystemAdminProps = {
+    menuApi: MenuResourceApi;
+    resourceApi: AuthorizationResourceApi;
+    /** 默认选中的子菜单，默认菜单管理 */
+    defaultActiveKey?: SystemAdminMenuKey;
+    /** 受控选中 key */
+    activeKey?: SystemAdminMenuKey;
+    onActiveKeyChange?: (key: SystemAdminMenuKey) => void;
+    title?: string;
+    toolbarExtra?: ReactNode;
+};
+/**
+ * 系统管理：侧栏父菜单「系统管理」，子菜单为「菜单管理」「权限点管理」。
+ */
+declare function SystemAdmin({ menuApi, resourceApi, defaultActiveKey, activeKey: controlledKey, onActiveKeyChange, title, toolbarExtra, }: SystemAdminProps): react.JSX.Element;
+
 interface SnowyflakeOptions {
     epoch?: bigint;
     workerId?: bigint;
@@ -323,4 +359,4 @@ declare const snowyflake: ConfigurableSnowflake;
 declare function getAppClientId(): string;
 declare function getDeviceWorkerId(): string;
 
-export { type ApiResourceType, type AuthorizationResource, type AuthorizationResourceApi, type AuthorizationResourceFormValues, type AuthorizationResourceListResult, Can, type CanProps, type CheckOptions, type CreateAuthorizationResourceBody, type CreateDefaultResourceRequestOptions, type CreateMenuResourceBody, type FetchAuthorizationResourcesParams, type FetchMenuResourcesParams, type HttpMethod, type ListPaginationParams, type ListPaginationResult, MENU_LIST_TYPE_PARAM, MENU_TYPE_BUTTON, MENU_TYPE_LABEL, MENU_TYPE_MENU, MENU_TYPE_OPTIONS, MENU_TYPE_PAGE, MENU_VISIBILITY_OPTIONS, type MatchMode, MenuManager, type MenuManagerProps, type MenuResource, type MenuResourceApi, type MenuResourceFormValues, type MenuResourceListResult, type MenuResourceType, type PageDirection, type PermissionChecker, type PermissionCode, type PermissionListener, PermissionProvider, type PermissionProviderProps, type PermissionState, PermissionStore, RESOURCE_PRIVATE_OPTIONS, RESOURCE_STATUS_DISABLED, RESOURCE_STATUS_ENABLED, RESOURCE_STATUS_OPTIONS, RESOURCE_TYPE_API, ROOT_PARENT_ID, type ResourceHttpRequest, ResourceManager, type ResourceManagerProps, type ResourceRequestOptions, type ResourceStatus, type ResourceType, type RoleCode, type UpdateAuthorizationResourceBody, type UpdateMenuResourceBody, type UsePermissionResult, appendQueryParam, buildCreateBody, buildCreateMenuBody, buildUpdateBody, buildUpdateMenuBody, createAuthorizationResourceApi, createDefaultResourceRequest, createMenuResourceApi, createPermissionStore, extractPagination, extractRecords, getAppClientId, getDeviceWorkerId, mapAuthorizationResource, mapMenuResource, snowyflake, useHasPermission, useHasRole, usePermission };
+export { type ApiResourceType, type AuthorizationResource, type AuthorizationResourceApi, type AuthorizationResourceFormValues, type AuthorizationResourceListResult, Can, type CanProps, type CheckOptions, type CreateAuthorizationResourceBody, type CreateDefaultResourceRequestOptions, type CreateMenuResourceBody, type FetchAuthorizationResourcesParams, type FetchMenuResourcesParams, type HttpMethod, type ListPaginationParams, type ListPaginationResult, MENU_LIST_TYPE_PARAM, MENU_TYPE_BUTTON, MENU_TYPE_LABEL, MENU_TYPE_MENU, MENU_TYPE_OPTIONS, MENU_TYPE_PAGE, MENU_VISIBILITY_OPTIONS, type MatchMode, MenuManager, type MenuManagerProps, type MenuResource, type MenuResourceApi, type MenuResourceFormValues, type MenuResourceListResult, type MenuResourceType, type PageDirection, type PermissionChecker, type PermissionCode, type PermissionListener, PermissionProvider, type PermissionProviderProps, type PermissionState, PermissionStore, RESOURCE_PRIVATE_OPTIONS, RESOURCE_STATUS_DISABLED, RESOURCE_STATUS_ENABLED, RESOURCE_STATUS_OPTIONS, RESOURCE_TYPE_API, ROOT_PARENT_ID, type ResourceHttpRequest, ResourceManager, type ResourceManagerProps, type ResourceRequestOptions, type ResourceStatus, type ResourceType, type RoleCode, SYSTEM_ADMIN_DEFAULT_KEY, SYSTEM_ADMIN_MENU, SystemAdmin, type SystemAdminMenuGroup, type SystemAdminMenuKey, type SystemAdminProps, type SystemAdminSubMenu, type UpdateAuthorizationResourceBody, type UpdateMenuResourceBody, type UsePermissionResult, appendQueryParam, buildCreateBody, buildCreateMenuBody, buildUpdateBody, buildUpdateMenuBody, createAuthorizationResourceApi, createDefaultResourceRequest, createMenuResourceApi, createPermissionStore, extractPagination, extractRecords, getAppClientId, getDeviceWorkerId, mapAuthorizationResource, mapMenuResource, snowyflake, useHasPermission, useHasRole, usePermission };

package/dist/react/index.js

@@ -237,7 +237,7 @@ var MENU_TYPE_PAGE = "page";
 var MENU_TYPE_MENU = "menu";
 var MENU_TYPE_BUTTON = "button";
 var MENU_LIST_TYPE_PARAM = "page,menu,button";
-var ROOT_PARENT_ID = "0";
+var ROOT_PARENT_ID = "";
 var RESOURCE_STATUS_ENABLED = 1;
 var RESOURCE_STATUS_DISABLED = 0;
 var RESOURCE_STATUS_OPTIONS = [
@@ -454,10 +454,11 @@ function mapMenuResource(item) {
   );
   const permissionNamesRaw = row.permissionPointNames ?? row.permission_point_names ?? row.permissionNames;
   const permissionPointNames = Array.isArray(permissionNamesRaw) ? permissionNamesRaw.map((n) => String(n ?? "")).filter(Boolean) : void 0;
-  const parentId = row.parentId ?? row.parent_id ?? ROOT_PARENT_ID;
+  const rawParentId = row.parentId ?? row.parent_id;
+  const parentId = rawParentId === void 0 || rawParentId === null || rawParentId === "" || String(rawParentId) === "0" ? null : String(rawParentId);
   return {
     resourceId: String(resourceId),
-    parentId: parentId === void 0 || parentId === null ? ROOT_PARENT_ID : String(parentId),
+    parentId,
     type: toMenuType(row.type),
     name: String(row.name ?? ""),
     identification: String(row.identification ?? row.identity ?? row.path ?? ""),
@@ -498,7 +499,7 @@ function buildUpdateBody(values) {
 function buildCreateMenuBody(values, resourceId = getAppClientId()) {
   return {
     resourceId,
-    parentId: values.parentId || ROOT_PARENT_ID,
+    parentId: values.parentId ? values.parentId : null,
     type: values.type,
     name: values.name.trim(),
     identification: values.identification.trim(),
@@ -508,7 +509,7 @@ function buildCreateMenuBody(values, resourceId = getAppClientId()) {
 }
 function buildUpdateMenuBody(values) {
   return {
-    parentId: values.parentId || ROOT_PARENT_ID,
+    parentId: values.parentId ? values.parentId : null,
     type: values.type,
     name: values.name.trim(),
     identification: values.identification.trim(),
@@ -1177,7 +1178,7 @@ import {
 import { jsx as jsx3, jsxs as jsxs2 } from "react/jsx-runtime";
 var PAGE_SIZE_OPTIONS2 = ["10", "20", "50", "100"];
 var emptyForm2 = () => ({
-  parentId: ROOT_PARENT_ID,
+  parentId: null,
   type: MENU_TYPE_MENU,
   name: "",
   identification: "",
@@ -1261,7 +1262,7 @@ function MenuManager({
   const openEdit = (row) => {
     setEditing(row);
     setForm({
-      parentId: row.parentId || ROOT_PARENT_ID,
+      parentId: row.parentId ?? null,
       type: row.type,
       name: row.name,
       identification: row.identification,
@@ -1437,10 +1438,13 @@ function MenuManager({
                 "select",
                 {
                   style: styles2.input,
-                  value: form.parentId,
-                  onChange: (e) => setForm((prev) => ({ ...prev, parentId: e.target.value })),
+                  value: form.parentId ?? ROOT_PARENT_ID,
+                  onChange: (e) => setForm((prev) => ({
+                    ...prev,
+                    parentId: e.target.value ? e.target.value : null
+                  })),
                   children: [
-                    /* @__PURE__ */ jsx3("option", { value: ROOT_PARENT_ID, children: "\u6839\u76EE\u5F55" }),
+                    /* @__PURE__ */ jsx3("option", { value: ROOT_PARENT_ID, children: "\u65E0" }),
                     parentOptions.map((opt) => /* @__PURE__ */ jsx3("option", { value: opt.value, children: opt.label }, opt.value))
                   ]
                 }
@@ -1793,6 +1797,149 @@ var styles2 = {
     paddingTop: 4
   }
 };
+
+// src/react/SystemAdmin.tsx
+import { useMemo as useMemo4, useState as useState4 } from "react";
+
+// src/admin/menu.ts
+var SYSTEM_ADMIN_MENU = {
+  key: "system",
+  label: "\u7CFB\u7EDF\u7BA1\u7406",
+  children: [
+    { key: "menu", label: "\u83DC\u5355\u7BA1\u7406" },
+    { key: "resource", label: "\u6743\u9650\u70B9\u7BA1\u7406" }
+  ]
+};
+var SYSTEM_ADMIN_DEFAULT_KEY = "menu";
+
+// src/react/SystemAdmin.tsx
+import { jsx as jsx4, jsxs as jsxs3 } from "react/jsx-runtime";
+function SystemAdmin({
+  menuApi,
+  resourceApi,
+  defaultActiveKey = SYSTEM_ADMIN_DEFAULT_KEY,
+  activeKey: controlledKey,
+  onActiveKeyChange,
+  title = SYSTEM_ADMIN_MENU.label,
+  toolbarExtra
+}) {
+  const [innerKey, setInnerKey] = useState4(defaultActiveKey);
+  const activeKey = controlledKey ?? innerKey;
+  const setActiveKey = (key) => {
+    if (controlledKey === void 0) setInnerKey(key);
+    onActiveKeyChange?.(key);
+  };
+  const activeLabel = useMemo4(
+    () => SYSTEM_ADMIN_MENU.children.find((item) => item.key === activeKey)?.label ?? "",
+    [activeKey]
+  );
+  return /* @__PURE__ */ jsxs3("div", { style: styles3.root, children: [
+    /* @__PURE__ */ jsxs3("aside", { style: styles3.sidebar, children: [
+      /* @__PURE__ */ jsx4("div", { style: styles3.sidebarTitle, children: title }),
+      /* @__PURE__ */ jsx4("nav", { style: styles3.nav, children: SYSTEM_ADMIN_MENU.children.map((item) => {
+        const active = item.key === activeKey;
+        return /* @__PURE__ */ jsx4(
+          "button",
+          {
+            type: "button",
+            style: {
+              ...styles3.navItem,
+              ...active ? styles3.navItemActive : null
+            },
+            onClick: () => setActiveKey(item.key),
+            children: item.label
+          },
+          item.key
+        );
+      }) })
+    ] }),
+    /* @__PURE__ */ jsxs3("main", { style: styles3.content, children: [
+      /* @__PURE__ */ jsxs3("div", { style: styles3.contentHeader, children: [
+        /* @__PURE__ */ jsxs3("div", { style: styles3.breadcrumb, children: [
+          /* @__PURE__ */ jsx4("span", { style: styles3.breadcrumbParent, children: title }),
+          /* @__PURE__ */ jsx4("span", { style: styles3.breadcrumbSep, children: "/" }),
+          /* @__PURE__ */ jsx4("span", { style: styles3.breadcrumbCurrent, children: activeLabel })
+        ] }),
+        toolbarExtra
+      ] }),
+      /* @__PURE__ */ jsx4("div", { style: styles3.panel, children: activeKey === "menu" ? /* @__PURE__ */ jsx4(MenuManager, { api: menuApi, title: "\u83DC\u5355\u7BA1\u7406" }) : /* @__PURE__ */ jsx4(ResourceManager, { api: resourceApi, title: "\u6743\u9650\u70B9\u7BA1\u7406" }) })
+    ] })
+  ] });
+}
+var styles3 = {
+  root: {
+    display: "flex",
+    minHeight: 560,
+    border: "1px solid #eaecf0",
+    borderRadius: 12,
+    overflow: "hidden",
+    background: "#fff",
+    fontFamily: '"PingFang SC", "Microsoft YaHei", -apple-system, BlinkMacSystemFont, sans-serif',
+    color: "#101828"
+  },
+  sidebar: {
+    width: 200,
+    flexShrink: 0,
+    borderRight: "1px solid #eaecf0",
+    background: "#f9fafb",
+    padding: "16px 12px"
+  },
+  sidebarTitle: {
+    fontSize: 14,
+    fontWeight: 600,
+    color: "#344054",
+    padding: "4px 10px 12px"
+  },
+  nav: {
+    display: "flex",
+    flexDirection: "column",
+    gap: 4
+  },
+  navItem: {
+    border: "none",
+    background: "transparent",
+    textAlign: "left",
+    padding: "10px 12px",
+    borderRadius: 8,
+    fontSize: 14,
+    color: "#475467",
+    cursor: "pointer"
+  },
+  navItemActive: {
+    background: "#e6f7f9",
+    color: "#049BAD",
+    fontWeight: 600
+  },
+  content: {
+    flex: 1,
+    minWidth: 0,
+    display: "flex",
+    flexDirection: "column",
+    background: "#fff"
+  },
+  contentHeader: {
+    display: "flex",
+    alignItems: "center",
+    justifyContent: "space-between",
+    gap: 12,
+    padding: "12px 16px",
+    borderBottom: "1px solid #f2f4f7"
+  },
+  breadcrumb: {
+    display: "flex",
+    alignItems: "center",
+    gap: 8,
+    fontSize: 13
+  },
+  breadcrumbParent: { color: "#98a2b3" },
+  breadcrumbSep: { color: "#d0d5dd" },
+  breadcrumbCurrent: { color: "#344054", fontWeight: 600 },
+  panel: {
+    flex: 1,
+    minHeight: 0,
+    overflow: "auto"
+  }
+};
 export {
   Can,
   MENU_LIST_TYPE_PARAM,
@@ -1812,6 +1959,9 @@ export {
   RESOURCE_TYPE_API,
   ROOT_PARENT_ID,
   ResourceManager,
+  SYSTEM_ADMIN_DEFAULT_KEY,
+  SYSTEM_ADMIN_MENU,
+  SystemAdmin,
   appendQueryParam,
   buildCreateBody,
   buildCreateMenuBody,