com-angel-authorization 1.0.7 → 1.0.9

package/dist/react/index.d.cts

@@ -168,7 +168,12 @@ type AuthorizationResourceListResult = {
 };
 type MenuResource = {
     resourceId: string;
-    parentId: string;
+    /** 上级菜单 ID；无上级时为 null */
+    parentId: string | null;
+    /**
+     * 菜单层级：无上级（根）为 1，其余为上级 depth + 1
+     */
+    depth: number;
     type: MenuResourceType;
     name: string;
     identification: string;
@@ -178,7 +183,10 @@ type MenuResource = {
     status: ResourceStatus;
 };
 type MenuResourceFormValues = {
-    parentId: string;
+    /** 上级菜单 ID；选择「无」时为 null */
+    parentId: string | null;
+    /** 由 parentId 自动计算：无为 1，否则上级 depth + 1 */
+    depth: number;
     type: MenuResourceType;
     name: string;
     identification: string;
@@ -204,7 +212,13 @@ 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 ROOT_MENU_DEPTH = 1;
 declare const RESOURCE_STATUS_ENABLED: ResourceStatus;
 declare const RESOURCE_STATUS_DISABLED: ResourceStatus;
 declare const RESOURCE_STATUS_OPTIONS: {
@@ -253,6 +267,10 @@ type MenuResourceApi = {
 };
 declare function mapAuthorizationResource(item: unknown): AuthorizationResource | null;
 declare function mapMenuResource(item: unknown): MenuResource | null;
+/**
+ * 根据上级菜单计算 depth：无上级为 1，否则为上级 depth + 1。
+ */
+declare function resolveMenuDepth(parentId: string | null | undefined, menus: Array<Pick<MenuResource, 'resourceId' | 'depth'>>): number;
 declare function buildCreateBody(values: AuthorizationResourceFormValues, resourceId?: string): CreateAuthorizationResourceBody;
 declare function buildUpdateBody(values: AuthorizationResourceFormValues): UpdateAuthorizationResourceBody;
 declare function buildCreateMenuBody(values: MenuResourceFormValues, resourceId?: string): CreateMenuResourceBody;
@@ -353,4 +371,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, 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 };
+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_MENU_DEPTH, 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, resolveMenuDepth, snowyflake, useHasPermission, useHasRole, usePermission };

package/dist/react/index.d.ts

@@ -168,7 +168,12 @@ type AuthorizationResourceListResult = {
 };
 type MenuResource = {
     resourceId: string;
-    parentId: string;
+    /** 上级菜单 ID；无上级时为 null */
+    parentId: string | null;
+    /**
+     * 菜单层级：无上级（根）为 1，其余为上级 depth + 1
+     */
+    depth: number;
     type: MenuResourceType;
     name: string;
     identification: string;
@@ -178,7 +183,10 @@ type MenuResource = {
     status: ResourceStatus;
 };
 type MenuResourceFormValues = {
-    parentId: string;
+    /** 上级菜单 ID；选择「无」时为 null */
+    parentId: string | null;
+    /** 由 parentId 自动计算：无为 1，否则上级 depth + 1 */
+    depth: number;
     type: MenuResourceType;
     name: string;
     identification: string;
@@ -204,7 +212,13 @@ 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 ROOT_MENU_DEPTH = 1;
 declare const RESOURCE_STATUS_ENABLED: ResourceStatus;
 declare const RESOURCE_STATUS_DISABLED: ResourceStatus;
 declare const RESOURCE_STATUS_OPTIONS: {
@@ -253,6 +267,10 @@ type MenuResourceApi = {
 };
 declare function mapAuthorizationResource(item: unknown): AuthorizationResource | null;
 declare function mapMenuResource(item: unknown): MenuResource | null;
+/**
+ * 根据上级菜单计算 depth：无上级为 1，否则为上级 depth + 1。
+ */
+declare function resolveMenuDepth(parentId: string | null | undefined, menus: Array<Pick<MenuResource, 'resourceId' | 'depth'>>): number;
 declare function buildCreateBody(values: AuthorizationResourceFormValues, resourceId?: string): CreateAuthorizationResourceBody;
 declare function buildUpdateBody(values: AuthorizationResourceFormValues): UpdateAuthorizationResourceBody;
 declare function buildCreateMenuBody(values: MenuResourceFormValues, resourceId?: string): CreateMenuResourceBody;
@@ -353,4 +371,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, 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 };
+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_MENU_DEPTH, 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, resolveMenuDepth, snowyflake, useHasPermission, useHasRole, usePermission };

package/dist/react/index.js

@@ -237,7 +237,8 @@ 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 ROOT_MENU_DEPTH = 1;
 var RESOURCE_STATUS_ENABLED = 1;
 var RESOURCE_STATUS_DISABLED = 0;
 var RESOURCE_STATUS_OPTIONS = [
@@ -454,10 +455,15 @@ 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);
+  const rawDepth = row.depth;
+  const parsedDepth = Number(rawDepth);
+  const depth = Number.isFinite(parsedDepth) && parsedDepth > 0 ? Math.floor(parsedDepth) : parentId ? ROOT_MENU_DEPTH + 1 : ROOT_MENU_DEPTH;
   return {
     resourceId: String(resourceId),
-    parentId: parentId === void 0 || parentId === null ? ROOT_PARENT_ID : String(parentId),
+    parentId,
+    depth,
     type: toMenuType(row.type),
     name: String(row.name ?? ""),
     identification: String(row.identification ?? row.identity ?? row.path ?? ""),
@@ -466,6 +472,12 @@ function mapMenuResource(item) {
     status: toResourceStatus(row.status)
   };
 }
+function resolveMenuDepth(parentId, menus) {
+  if (!parentId) return ROOT_MENU_DEPTH;
+  const parent = menus.find((item) => item.resourceId === parentId);
+  const parentDepth = parent && Number.isFinite(parent.depth) && parent.depth > 0 ? Math.floor(parent.depth) : ROOT_MENU_DEPTH;
+  return parentDepth + 1;
+}
 function buildListUrl(type, params) {
   const parts = [];
   appendQueryParam(parts, "type", type);
@@ -496,9 +508,11 @@ function buildUpdateBody(values) {
   };
 }
 function buildCreateMenuBody(values, resourceId = getAppClientId()) {
+  const parentId = values.parentId ? values.parentId : null;
   return {
     resourceId,
-    parentId: values.parentId || ROOT_PARENT_ID,
+    parentId,
+    depth: values.depth > 0 ? Math.floor(values.depth) : parentId ? ROOT_MENU_DEPTH + 1 : ROOT_MENU_DEPTH,
     type: values.type,
     name: values.name.trim(),
     identification: values.identification.trim(),
@@ -507,8 +521,10 @@ function buildCreateMenuBody(values, resourceId = getAppClientId()) {
   };
 }
 function buildUpdateMenuBody(values) {
+  const parentId = values.parentId ? values.parentId : null;
   return {
-    parentId: values.parentId || ROOT_PARENT_ID,
+    parentId,
+    depth: values.depth > 0 ? Math.floor(values.depth) : parentId ? ROOT_MENU_DEPTH + 1 : ROOT_MENU_DEPTH,
     type: values.type,
     name: values.name.trim(),
     identification: values.identification.trim(),
@@ -1177,7 +1193,8 @@ 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,
+  depth: ROOT_MENU_DEPTH,
   type: MENU_TYPE_MENU,
   name: "",
   identification: "",
@@ -1261,7 +1278,8 @@ function MenuManager({
   const openEdit = (row) => {
     setEditing(row);
     setForm({
-      parentId: row.parentId || ROOT_PARENT_ID,
+      parentId: row.parentId ?? null,
+      depth: resolveMenuDepth(row.parentId ?? null, records),
       type: row.type,
       name: row.name,
       identification: row.identification,
@@ -1437,15 +1455,26 @@ 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) => {
+                    const parentId = e.target.value ? e.target.value : null;
+                    setForm((prev) => ({
+                      ...prev,
+                      parentId,
+                      depth: resolveMenuDepth(parentId, records)
+                    }));
+                  },
                   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))
                   ]
                 }
               )
             ] }),
+            /* @__PURE__ */ jsxs2("div", { style: styles2.field, children: [
+              /* @__PURE__ */ jsx3("span", { style: styles2.label, children: "\u83DC\u5355\u5C42\u7EA7\uFF08depth\uFF09" }),
+              /* @__PURE__ */ jsx3("input", { style: styles2.input, value: form.depth, readOnly: true })
+            ] }),
             /* @__PURE__ */ jsxs2("fieldset", { style: styles2.fieldset, children: [
               /* @__PURE__ */ jsx3("legend", { style: styles2.label, children: "\u83DC\u5355\u7C7B\u578B" }),
               /* @__PURE__ */ jsx3("div", { style: styles2.radioGroup, children: MENU_TYPE_OPTIONS.map((opt) => /* @__PURE__ */ jsxs2("label", { style: styles2.radioItem, children: [
@@ -1953,6 +1982,7 @@ export {
   RESOURCE_STATUS_ENABLED,
   RESOURCE_STATUS_OPTIONS,
   RESOURCE_TYPE_API,
+  ROOT_MENU_DEPTH,
   ROOT_PARENT_ID,
   ResourceManager,
   SYSTEM_ADMIN_DEFAULT_KEY,
@@ -1973,6 +2003,7 @@ export {
   getDeviceWorkerId,
   mapAuthorizationResource,
   mapMenuResource,
+  resolveMenuDepth,
   snowyflake,
   useHasPermission,
   useHasRole,