com-angel-authorization 1.0.27 → 1.0.29

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
   };
@@ -1835,6 +1856,7 @@ var MenuManager = (0, import_vue4.defineComponent)({
     const saving = (0, import_vue4.ref)(false);
     const deletingRow = (0, import_vue4.ref)(null);
     const deleting = (0, import_vue4.ref)(false);
+    const permissionKeyword = (0, import_vue4.ref)("");
     const permissionNameMap = (0, import_vue4.computed)(() => {
       const map = /* @__PURE__ */ new Map();
       permissionPoints.value.forEach(
@@ -1842,6 +1864,13 @@ var MenuManager = (0, import_vue4.defineComponent)({
       );
       return map;
     });
+    const filteredPermissionPoints = (0, import_vue4.computed)(() => {
+      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 = (0, import_vue4.computed)(() => {
       const map = /* @__PURE__ */ new Map();
       records.value.forEach((row) => map.set(row.resourceId, row));
@@ -1947,6 +1976,7 @@ var MenuManager = (0, import_vue4.defineComponent)({
     }
     function openCreate(parent) {
       editing.value = null;
+      permissionKeyword.value = "";
       if (parent) {
         Object.assign(form, {
           ...emptyForm2(),
@@ -1962,6 +1992,7 @@ var MenuManager = (0, import_vue4.defineComponent)({
     function openEdit(row) {
       const parentId = resolveRowParentId(row);
       editing.value = row;
+      permissionKeyword.value = "";
       Object.assign(form, {
         parentId,
         depth: row.depth > 0 ? row.depth : resolveMenuDepth(parentId, allKnownMenus.value),
@@ -1976,7 +2007,10 @@ var MenuManager = (0, import_vue4.defineComponent)({
       void loadPermissionPoints();
     }
     function closeDialog() {
-      if (!saving.value) dialogOpen.value = false;
+      if (!saving.value) {
+        dialogOpen.value = false;
+        permissionKeyword.value = "";
+      }
     }
     async function handleSubmit(event) {
       event.preventDefault();
@@ -2025,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");
       }
@@ -2324,6 +2361,21 @@ var MenuManager = (0, import_vue4.defineComponent)({
                   ]),
                   (0, import_vue4.h)("fieldset", { style: s2.fieldset }, [
                     (0, import_vue4.h)("legend", { style: s2.label }, "\u6743\u9650\u6807\u8BC6"),
+                    permissionPoints.value.length > 0 ? [
+                      (0, import_vue4.h)("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;
+                        }
+                      }),
+                      (0, import_vue4.h)(
+                        "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,
                     (0, import_vue4.h)(
                       "div",
                       { style: s2.multiSelect },
@@ -2333,7 +2385,7 @@ var MenuManager = (0, import_vue4.defineComponent)({
                           { 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 ? [(0, import_vue4.h)("div", { style: s2.hint }, "\u65E0\u5339\u914D\u6743\u9650\u70B9")] : filteredPermissionPoints.value.map(
                         (p) => (0, import_vue4.h)(
                           "label",
                           { key: p.resourceId, style: s2.checkItem },