com-angel-authorization 1.0.28 → 1.0.30

package/dist/vue/index.cjs

@@ -584,6 +584,23 @@ function toStringArray(value) {
   }
   return [];
 }
+function mapMenuPermissionPoints(value) {
+  if (!Array.isArray(value)) return void 0;
+  const points = value.map((item) => {
+    if (!item || typeof item !== "object") return null;
+    const row = item;
+    const name = String(row.name ?? "").trim();
+    if (!name) return null;
+    const resourceId = row.resourceId ?? row.resource_id ?? row.id;
+    const identification = row.identification ?? row.identity;
+    return {
+      ...resourceId !== void 0 && resourceId !== null && resourceId !== "" ? { resourceId: String(resourceId) } : {},
+      name,
+      ...identification !== void 0 && identification !== null && identification !== "" ? { identification: String(identification) } : {}
+    };
+  }).filter((item) => item !== null);
+  return points.length ? points : void 0;
+}
 function toMenuType(value) {
   const v = String(value ?? "").toLowerCase();
   if (v === MENU_TYPE_PAGE || v === MENU_TYPE_MENU || v === MENU_TYPE_BUTTON) {
@@ -611,11 +628,14 @@ function mapMenuResource(item) {
   const row = item;
   const resourceId = row.resourceId ?? row.resource_id ?? row.id;
   if (resourceId === void 0 || resourceId === null || resourceId === "") return null;
+  const permissionPoints = mapMenuPermissionPoints(
+    row.permissionPoints ?? row.permission_points
+  );
   const permissionPointIds = toStringArray(
-    row.permissionPointIds ?? row.permission_point_ids ?? row.permissionPoints ?? row.permissions
+    row.permissionPointIds ?? row.permission_point_ids ?? (permissionPoints?.length ? permissionPoints.map((p) => p.resourceId).filter(Boolean) : void 0) ?? row.permissions
   );
   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 permissionPointNames = Array.isArray(permissionNamesRaw) ? permissionNamesRaw.map((n) => String(n ?? "")).filter(Boolean) : permissionPoints?.map((p) => p.name).filter(Boolean);
   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;
@@ -635,7 +655,8 @@ function mapMenuResource(item) {
     name: String(row.name ?? ""),
     identification: String(row.identification ?? row.identity ?? row.path ?? ""),
     permissionPointIds,
-    permissionPointNames,
+    permissionPoints,
+    permissionPointNames: permissionPointNames && permissionPointNames.length ? permissionPointNames : void 0,
     status: toResourceStatus(row.status),
     sort
   };
@@ -2038,6 +2059,9 @@ var MenuManager = (0, import_vue4.defineComponent)({
       form.permissionPointIds = exists ? form.permissionPointIds.filter((x) => x !== id) : [...form.permissionPointIds, id];
     }
     function renderPermissionLabels(row) {
+      if (row.permissionPoints?.length) {
+        return row.permissionPoints.map((p) => p.name).filter(Boolean).join("\u3001") || "\u2014";
+      }
       if (row.permissionPointNames?.length) {
         return row.permissionPointNames.join("\u3001");
       }
@@ -2219,15 +2243,14 @@ var MenuManager = (0, import_vue4.defineComponent)({
       ]),
       dialogOpen.value ? (0, import_vue4.h)(
         "div",
-        { style: s2.mask, onClick: closeDialog },
+        { style: s2.mask },
         [
           (0, import_vue4.h)(
             "div",
             {
               style: { ...s2.dialog, maxWidth: "520px" },
               role: "dialog",
-              "aria-modal": "true",
-              onClick: (e) => e.stopPropagation()
+              "aria-modal": "true"
             },
             [
               (0, import_vue4.h)("div", { style: s2.dialogHeader }, [
@@ -2414,15 +2437,6 @@ var MenuManager = (0, import_vue4.defineComponent)({
                     )
                   ]),
                   (0, import_vue4.h)("div", { style: s2.dialogFooter }, [
-                    (0, import_vue4.h)(
-                      "button",
-                      {
-                        type: "button",
-                        style: s2.secondaryBtn,
-                        onClick: closeDialog
-                      },
-                      "\u53D6\u6D88"
-                    ),
                     (0, import_vue4.h)(
                       "button",
                       {