com-angel-authorization 1.0.26 → 1.0.27

package/dist/react/index.js

@@ -457,7 +457,7 @@ 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 rawParentId = row.parentId ?? row.parent_id;
+  const rawParentId = row.parentId ?? row.parent_id ?? (row.parent && typeof row.parent === "object" ? row.parent.resourceId ?? row.parent.resource_id ?? row.parent.id : void 0);
   const parentId = rawParentId === void 0 || rawParentId === null || rawParentId === "" || String(rawParentId) === "0" ? null : String(rawParentId);
   const rawDepth = row.depth;
   const parsedDepth = Number(rawDepth);
@@ -614,7 +614,11 @@ function createMenuResourceApi(request) {
         url: `/authorization-resources/${encodeURIComponent(resourceId)}/sub-resources`,
         signal
       });
-      return extractRecords(json).map(mapMenuResource).filter((item) => item !== null);
+      return extractRecords(json).map(mapMenuResource).filter((item) => item !== null).map((item) => ({
+        ...item,
+        // 子资源接口常不回 parentId，用请求路径上的父级补齐
+        parentId: item.parentId ?? resourceId
+      }));
     },
     listPermissionPoints(params, signal) {
       return permissionApi.list(params, signal);
@@ -1266,12 +1270,32 @@ function MenuManager({
     });
     return Array.from(map.values());
   }, [records, childrenMap]);
+  const resolveRowParentId = useCallback3(
+    (row) => {
+      if (row.parentId) return row.parentId;
+      for (const [parentId, children] of Object.entries(childrenMap)) {
+        if (children.some((child) => child.resourceId === row.resourceId)) {
+          return parentId;
+        }
+      }
+      return null;
+    },
+    [childrenMap]
+  );
   const parentOptions = useMemo3(() => {
-    return allKnownMenus.filter((row) => !editing || row.resourceId !== editing.resourceId).map((row) => ({
+    const opts = allKnownMenus.filter((row) => !editing || row.resourceId !== editing.resourceId).map((row) => ({
       value: row.resourceId,
       label: `${row.name}\uFF08${MENU_TYPE_LABEL[row.type]}\uFF09`
     }));
-  }, [allKnownMenus, editing]);
+    if (form.parentId && !opts.some((opt) => opt.value === form.parentId)) {
+      const parent = allKnownMenus.find((row) => row.resourceId === form.parentId);
+      opts.unshift({
+        value: form.parentId,
+        label: parent ? `${parent.name}\uFF08${MENU_TYPE_LABEL[parent.type]}\uFF09` : form.parentId
+      });
+    }
+    return opts;
+  }, [allKnownMenus, editing, form.parentId]);
   const flatRows = useMemo3(() => {
     const rows = [];
     const walk = (list) => {
@@ -1364,10 +1388,11 @@ function MenuManager({
     void loadPermissionPoints();
   };
   const openEdit = (row) => {
+    const parentId = resolveRowParentId(row);
     setEditing(row);
     setForm({
-      parentId: row.parentId ?? null,
-      depth: resolveMenuDepth(row.parentId ?? null, allKnownMenus),
+      parentId,
+      depth: row.depth > 0 ? row.depth : resolveMenuDepth(parentId, allKnownMenus),
       type: row.type,
       name: row.name,
       identification: row.identification,