com-angel-authorization 1.0.25 → 1.0.27

package/dist/vue/index.js

@@ -534,7 +534,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);
@@ -691,7 +691,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);
@@ -1667,6 +1671,11 @@ var s2 = {
     boxSizing: "border-box",
     width: "100%"
   },
+  inputReadonly: {
+    backgroundColor: "#f9fafb",
+    color: "#667085",
+    cursor: "not-allowed"
+  },
   control: {
     width: "16px",
     height: "16px",
@@ -1767,12 +1776,31 @@ var MenuManager = defineComponent3({
       });
       return Array.from(map.values());
     });
-    const parentOptions = computed3(
-      () => allKnownMenus.value.filter((row) => !editing.value || row.resourceId !== editing.value.resourceId).map((row) => ({
+    function resolveRowParentId(row) {
+      if (row.parentId) return row.parentId;
+      for (const [parentId, children] of Object.entries(childrenMap.value)) {
+        if (children.some((child) => child.resourceId === row.resourceId)) {
+          return parentId;
+        }
+      }
+      return null;
+    }
+    const parentOptions = computed3(() => {
+      const opts = allKnownMenus.value.filter((row) => !editing.value || row.resourceId !== editing.value.resourceId).map((row) => ({
         value: row.resourceId,
         label: `${row.name}\uFF08${MENU_TYPE_LABEL[row.type]}\uFF09`
-      }))
-    );
+      }));
+      if (form.parentId && !opts.some((opt) => opt.value === form.parentId)) {
+        const parent = allKnownMenus.value.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;
+    });
     const flatRows = computed3(() => {
       const rows = [];
       const walk = (list) => {
@@ -1858,10 +1886,11 @@ var MenuManager = defineComponent3({
       void loadPermissionPoints();
     }
     function openEdit(row) {
+      const parentId = resolveRowParentId(row);
       editing.value = row;
       Object.assign(form, {
-        parentId: row.parentId ?? null,
-        depth: resolveMenuDepth(row.parentId ?? null, allKnownMenus.value),
+        parentId,
+        depth: row.depth > 0 ? row.depth : resolveMenuDepth(parentId, allKnownMenus.value),
         type: row.type,
         name: row.name,
         identification: row.identification,
@@ -2143,14 +2172,10 @@ var MenuManager = defineComponent3({
                     h2(
                       "select",
                       {
-                        style: s2.input,
+                        style: { ...s2.input, ...s2.inputReadonly },
                         value: form.parentId ?? ROOT_PARENT_ID,
-                        onChange: (e) => {
-                          const value = e.target.value;
-                          const parentId = value ? value : null;
-                          form.parentId = parentId;
-                          form.depth = resolveMenuDepth(parentId, allKnownMenus.value);
-                        }
+                        disabled: true,
+                        "aria-readonly": "true"
                       },
                       [
                         h2("option", { value: ROOT_PARENT_ID }, "\u65E0"),