com-angel-authorization 1.0.26 → 1.0.28

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);
@@ -1218,7 +1222,7 @@ import {
   useMemo as useMemo3,
   useState as useState3
 } from "react";
-import { jsx as jsx3, jsxs as jsxs2 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx3, jsxs as jsxs2 } from "react/jsx-runtime";
 var PAGE_SIZE_OPTIONS2 = ["10", "20", "50", "100"];
 var emptyForm2 = () => ({
   parentId: null,
@@ -1253,11 +1257,19 @@ function MenuManager({
   const [saving, setSaving] = useState3(false);
   const [deletingRow, setDeletingRow] = useState3(null);
   const [deleting, setDeleting] = useState3(false);
+  const [permissionKeyword, setPermissionKeyword] = useState3("");
   const permissionNameMap = useMemo3(() => {
     const map = /* @__PURE__ */ new Map();
     permissionPoints.forEach((p) => map.set(p.resourceId, p.name || p.identification));
     return map;
   }, [permissionPoints]);
+  const filteredPermissionPoints = useMemo3(() => {
+    const kw = permissionKeyword.trim().toLowerCase();
+    if (!kw) return permissionPoints;
+    return permissionPoints.filter(
+      (p) => p.name.toLowerCase().includes(kw) || p.identification.toLowerCase().includes(kw)
+    );
+  }, [permissionPoints, permissionKeyword]);
   const allKnownMenus = useMemo3(() => {
     const map = /* @__PURE__ */ new Map();
     records.forEach((row) => map.set(row.resourceId, row));
@@ -1266,12 +1278,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) => {
@@ -1351,6 +1383,7 @@ function MenuManager({
   }, [api, pageSize]);
   const openCreate = (parent) => {
     setEditing(null);
+    setPermissionKeyword("");
     if (parent) {
       setForm({
         ...emptyForm2(),
@@ -1364,10 +1397,12 @@ function MenuManager({
     void loadPermissionPoints();
   };
   const openEdit = (row) => {
+    const parentId = resolveRowParentId(row);
     setEditing(row);
+    setPermissionKeyword("");
     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,
@@ -1381,6 +1416,7 @@ function MenuManager({
   const closeDialog = () => {
     if (saving) return;
     setDialogOpen(false);
+    setPermissionKeyword("");
   };
   const handleSubmit = async (event) => {
     event.preventDefault();
@@ -1644,7 +1680,24 @@ function MenuManager({
             ] }),
             /* @__PURE__ */ jsxs2("fieldset", { style: styles2.fieldset, children: [
               /* @__PURE__ */ jsx3("legend", { style: styles2.label, children: "\u6743\u9650\u6807\u8BC6" }),
-              /* @__PURE__ */ jsx3("div", { style: styles2.multiSelect, children: permissionPoints.length === 0 ? /* @__PURE__ */ jsx3("div", { style: styles2.hint, children: "\u6682\u65E0\u6743\u9650\u70B9\uFF0C\u8BF7\u5148\u5728\u6743\u9650\u70B9\u7BA1\u7406\u4E2D\u65B0\u589E" }) : permissionPoints.map((p) => /* @__PURE__ */ jsxs2("label", { style: styles2.checkItem, children: [
+              permissionPoints.length > 0 ? /* @__PURE__ */ jsxs2(Fragment2, { children: [
+                /* @__PURE__ */ jsx3(
+                  "input",
+                  {
+                    style: { ...styles2.input, marginBottom: 8 },
+                    value: permissionKeyword,
+                    onChange: (e) => setPermissionKeyword(e.target.value),
+                    placeholder: "\u641C\u7D22\u6743\u9650\u540D\u79F0 / \u6807\u8BC6"
+                  }
+                ),
+                /* @__PURE__ */ jsxs2("div", { style: styles2.hint, children: [
+                  "\u5DF2\u9009 ",
+                  form.permissionPointIds.length,
+                  " \u9879",
+                  permissionKeyword.trim() ? ` \xB7 \u5339\u914D ${filteredPermissionPoints.length} / ${permissionPoints.length}` : ` \xB7 \u5171 ${permissionPoints.length} \u9879`
+                ] })
+              ] }) : null,
+              /* @__PURE__ */ jsx3("div", { style: styles2.multiSelect, children: permissionPoints.length === 0 ? /* @__PURE__ */ jsx3("div", { style: styles2.hint, children: "\u6682\u65E0\u6743\u9650\u70B9\uFF0C\u8BF7\u5148\u5728\u6743\u9650\u70B9\u7BA1\u7406\u4E2D\u65B0\u589E" }) : filteredPermissionPoints.length === 0 ? /* @__PURE__ */ jsx3("div", { style: styles2.hint, children: "\u65E0\u5339\u914D\u6743\u9650\u70B9" }) : filteredPermissionPoints.map((p) => /* @__PURE__ */ jsxs2("label", { style: styles2.checkItem, children: [
                 /* @__PURE__ */ jsx3(
                   "input",
                   {