com-angel-authorization 1.0.26 → 1.0.28

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);
@@ -1757,6 +1761,7 @@ var MenuManager = defineComponent3({
     const saving = ref2(false);
     const deletingRow = ref2(null);
     const deleting = ref2(false);
+    const permissionKeyword = ref2("");
     const permissionNameMap = computed3(() => {
       const map = /* @__PURE__ */ new Map();
       permissionPoints.value.forEach(
@@ -1764,6 +1769,13 @@ var MenuManager = defineComponent3({
       );
       return map;
     });
+    const filteredPermissionPoints = computed3(() => {
+      const kw = permissionKeyword.value.trim().toLowerCase();
+      if (!kw) return permissionPoints.value;
+      return permissionPoints.value.filter(
+        (p) => p.name.toLowerCase().includes(kw) || p.identification.toLowerCase().includes(kw)
+      );
+    });
     const allKnownMenus = computed3(() => {
       const map = /* @__PURE__ */ new Map();
       records.value.forEach((row) => map.set(row.resourceId, row));
@@ -1772,12 +1784,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) => {
@@ -1850,6 +1881,7 @@ var MenuManager = defineComponent3({
     }
     function openCreate(parent) {
       editing.value = null;
+      permissionKeyword.value = "";
       if (parent) {
         Object.assign(form, {
           ...emptyForm2(),
@@ -1863,10 +1895,12 @@ var MenuManager = defineComponent3({
       void loadPermissionPoints();
     }
     function openEdit(row) {
+      const parentId = resolveRowParentId(row);
       editing.value = row;
+      permissionKeyword.value = "";
       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,
@@ -1878,7 +1912,10 @@ var MenuManager = defineComponent3({
       void loadPermissionPoints();
     }
     function closeDialog() {
-      if (!saving.value) dialogOpen.value = false;
+      if (!saving.value) {
+        dialogOpen.value = false;
+        permissionKeyword.value = "";
+      }
     }
     async function handleSubmit(event) {
       event.preventDefault();
@@ -2226,6 +2263,21 @@ var MenuManager = defineComponent3({
                   ]),
                   h2("fieldset", { style: s2.fieldset }, [
                     h2("legend", { style: s2.label }, "\u6743\u9650\u6807\u8BC6"),
+                    permissionPoints.value.length > 0 ? [
+                      h2("input", {
+                        style: { ...s2.input, marginBottom: "8px" },
+                        value: permissionKeyword.value,
+                        placeholder: "\u641C\u7D22\u6743\u9650\u540D\u79F0 / \u6807\u8BC6",
+                        onInput: (e) => {
+                          permissionKeyword.value = e.target.value;
+                        }
+                      }),
+                      h2(
+                        "div",
+                        { style: s2.hint },
+                        permissionKeyword.value.trim() ? `\u5DF2\u9009 ${form.permissionPointIds.length} \u9879 \xB7 \u5339\u914D ${filteredPermissionPoints.value.length} / ${permissionPoints.value.length}` : `\u5DF2\u9009 ${form.permissionPointIds.length} \u9879 \xB7 \u5171 ${permissionPoints.value.length} \u9879`
+                      )
+                    ] : null,
                     h2(
                       "div",
                       { style: s2.multiSelect },
@@ -2235,7 +2287,7 @@ var MenuManager = defineComponent3({
                           { style: s2.hint },
                           "\u6682\u65E0\u6743\u9650\u70B9\uFF0C\u8BF7\u5148\u5728\u6743\u9650\u70B9\u7BA1\u7406\u4E2D\u65B0\u589E"
                         )
-                      ] : permissionPoints.value.map(
+                      ] : filteredPermissionPoints.value.length === 0 ? [h2("div", { style: s2.hint }, "\u65E0\u5339\u914D\u6743\u9650\u70B9")] : filteredPermissionPoints.value.map(
                         (p) => h2(
                           "label",
                           { key: p.resourceId, style: s2.checkItem },