com-angel-authorization 1.0.18 → 1.0.20

package/dist/vue/index.js

@@ -3765,7 +3765,8 @@ var s4 = {
     flexDirection: "column",
     gap: "6px",
     maxHeight: "160px",
-    overflow: "auto"
+    overflow: "auto",
+    marginTop: "8px"
   },
   checkItem: {
     display: "flex",
@@ -3784,10 +3785,35 @@ var s4 = {
     backgroundColor: "#ffffff"
   },
   hint: { fontSize: "13px", color: "#98a2b3", padding: "4px 0" },
-  switchRow: {
+  selectTrigger: {
     display: "flex",
     alignItems: "center",
     justifyContent: "space-between",
+    gap: "8px",
+    width: "100%",
+    border: "1px solid #d0d5dd",
+    borderRadius: "8px",
+    padding: "8px 10px",
+    background: "#fff",
+    cursor: "pointer",
+    fontSize: "14px",
+    color: "#101828",
+    boxSizing: "border-box",
+    textAlign: "left"
+  },
+  selectTriggerText: {
+    flex: "1",
+    overflow: "hidden",
+    textOverflow: "ellipsis",
+    whiteSpace: "nowrap"
+  },
+  selectPlaceholder: { color: "#98a2b3" },
+  selectChevron: { color: "#667085", fontSize: "10px", flexShrink: "0" },
+  required: { color: "#d92d20", marginLeft: "2px" },
+  switchRow: {
+    display: "flex",
+    alignItems: "center",
+    justifyContent: "flex-start",
     gap: "12px"
   },
   switchTrack: {
@@ -3856,7 +3882,10 @@ var UserManager = defineComponent5({
     const deleting = ref4(false);
     const groups = ref4([]);
     const roles = ref4([]);
-    const optionsLoading = ref4(false);
+    const rolesLoading = ref4(false);
+    const groupsOpen = ref4(false);
+    const groupsLoading = ref4(false);
+    const groupsLoaded = ref4(false);
     function enabledParam() {
       if (enabledFilter.value === "all") return void 0;
       return enabledFilter.value === "true";
@@ -3884,19 +3913,26 @@ var UserManager = defineComponent5({
         loading.value = false;
       }
     }
-    async function loadOptions() {
-      optionsLoading.value = true;
+    async function loadRoles() {
+      rolesLoading.value = true;
       try {
-        const [groupList, roleList] = await Promise.all([
-          props.api.listGroups(),
-          props.api.listRoleOptions()
-        ]);
-        groups.value = groupList;
-        roles.value = roleList;
+        roles.value = await props.api.listRoleOptions();
+      } catch (err) {
+        formError.value = err instanceof Error ? err.message : "\u52A0\u8F7D\u89D2\u8272\u5931\u8D25";
+      } finally {
+        rolesLoading.value = false;
+      }
+    }
+    async function loadGroups() {
+      if (groupsLoaded.value || groupsLoading.value) return;
+      groupsLoading.value = true;
+      try {
+        groups.value = await props.api.listGroups();
+        groupsLoaded.value = true;
       } catch (err) {
-        formError.value = err instanceof Error ? err.message : "\u52A0\u8F7D\u90E8\u95E8/\u89D2\u8272\u5931\u8D25";
+        formError.value = err instanceof Error ? err.message : "\u52A0\u8F7D\u90E8\u95E8\u5931\u8D25";
       } finally {
-        optionsLoading.value = false;
+        groupsLoading.value = false;
       }
     }
     function handleSearch() {
@@ -3909,12 +3945,18 @@ var UserManager = defineComponent5({
       enabledFilter.value = "all";
       pageToken.value = "";
     }
+    function resetGroupPanel() {
+      groupsOpen.value = false;
+      groups.value = [];
+      groupsLoaded.value = false;
+    }
     function openCreate() {
       editing.value = null;
       Object.assign(form, emptyForm4());
       formError.value = "";
+      resetGroupPanel();
       dialogOpen.value = true;
-      void loadOptions();
+      void loadRoles();
     }
     function openEdit(row) {
       editing.value = row;
@@ -3927,12 +3969,17 @@ var UserManager = defineComponent5({
         enabled: row.enabled
       });
       formError.value = "";
+      resetGroupPanel();
       dialogOpen.value = true;
-      void loadOptions();
+      void loadRoles();
     }
     function closeDialog() {
       if (!saving.value) dialogOpen.value = false;
     }
+    function toggleGroupsPanel() {
+      groupsOpen.value = !groupsOpen.value;
+      if (groupsOpen.value) void loadGroups();
+    }
     function toggleId(field, id) {
       const exists = form[field].includes(id);
       form[field] = exists ? form[field].filter((x) => x !== id) : [...form[field], id];
@@ -3952,6 +3999,10 @@ var UserManager = defineComponent5({
         formError.value = "\u8BF7\u586B\u5199\u521D\u59CB\u5BC6\u7801";
         return;
       }
+      if (!form.groupIds.length) {
+        formError.value = "\u8BF7\u9009\u62E9\u5F52\u5C5E\u90E8\u95E8";
+        return;
+      }
       saving.value = true;
       formError.value = "";
       error.value = "";
@@ -3992,8 +4043,7 @@ var UserManager = defineComponent5({
     function groupLabel(row) {
       if (row.groupNames?.length) return row.groupNames.join("\u3001");
       if (!row.groupIds.length) return "\u2014";
-      const map = new Map(groups.value.map((g) => [g.groupId, g.name]));
-      return row.groupIds.map((id) => map.get(id) || id).join("\u3001");
+      return row.groupIds.join("\u3001");
     }
     function roleLabel(row) {
       if (row.roleNames?.length) return row.roleNames.join("\u3001");
@@ -4001,16 +4051,28 @@ var UserManager = defineComponent5({
       const map = new Map(roles.value.map((r) => [r.roleId, r.name]));
       return row.roleIds.map((id) => map.get(id) || id).join("\u3001");
     }
+    function selectedGroupSummary() {
+      if (!form.groupIds.length) return "\u8BF7\u9009\u62E9\u5F52\u5C5E\u90E8\u95E8";
+      if (groupsLoaded.value) {
+        const map = new Map(groups.value.map((g) => [g.groupId, g.name]));
+        return form.groupIds.map((id) => map.get(id) || id).join("\u3001");
+      }
+      if (editing.value?.groupNames?.length) {
+        const map = new Map(
+          editing.value.groupIds.map((id, i) => [
+            id,
+            editing.value?.groupNames?.[i] || id
+          ])
+        );
+        return form.groupIds.map((id) => map.get(id) || id).join("\u3001");
+      }
+      return `\u5DF2\u9009 ${form.groupIds.length} \u4E2A\u90E8\u95E8`;
+    }
     onMounted4(() => {
       void loadList("current", "");
       void (async () => {
         try {
-          const [groupList, roleList] = await Promise.all([
-            props.api.listGroups(),
-            props.api.listRoleOptions()
-          ]);
-          groups.value = groupList;
-          roles.value = roleList;
+          roles.value = await props.api.listRoleOptions();
         } catch {
         }
       })();
@@ -4262,9 +4324,34 @@ var UserManager = defineComponent5({
                   })
                 ]),
                 h4("fieldset", { style: s4.fieldset }, [
-                  h4("legend", { style: s4.label }, "\u5F52\u5C5E\u90E8\u95E8"),
-                  h4("div", { style: s4.multiSelect }, [
-                    optionsLoading.value ? h4("div", { style: s4.hint }, "\u52A0\u8F7D\u4E2D\u2026") : groups.value.length === 0 ? h4("div", { style: s4.hint }, "\u6682\u65E0\u90E8\u95E8\u6570\u636E") : groups.value.map(
+                  h4("legend", { style: s4.label }, [
+                    "\u5F52\u5C5E\u90E8\u95E8 ",
+                    h4("span", { style: s4.required }, "*")
+                  ]),
+                  h4(
+                    "button",
+                    {
+                      type: "button",
+                      style: s4.selectTrigger,
+                      "aria-expanded": groupsOpen.value,
+                      onClick: toggleGroupsPanel
+                    },
+                    [
+                      h4("span", {
+                        style: {
+                          ...s4.selectTriggerText,
+                          ...form.groupIds.length ? {} : s4.selectPlaceholder
+                        }
+                      }, selectedGroupSummary()),
+                      h4(
+                        "span",
+                        { style: s4.selectChevron },
+                        groupsOpen.value ? "\u25B2" : "\u25BC"
+                      )
+                    ]
+                  ),
+                  groupsOpen.value ? h4("div", { style: s4.multiSelect }, [
+                    groupsLoading.value ? h4("div", { style: s4.hint }, "\u52A0\u8F7D\u4E2D\u2026") : groups.value.length === 0 ? h4("div", { style: s4.hint }, "\u6682\u65E0\u90E8\u95E8\u6570\u636E") : groups.value.map(
                       (g) => h4(
                         "label",
                         {
@@ -4284,12 +4371,12 @@ var UserManager = defineComponent5({
                         ]
                       )
                     )
-                  ])
+                  ]) : null
                 ]),
                 h4("fieldset", { style: s4.fieldset }, [
                   h4("legend", { style: s4.label }, "\u7528\u6237\u89D2\u8272"),
                   h4("div", { style: s4.multiSelect }, [
-                    optionsLoading.value ? h4("div", { style: s4.hint }, "\u52A0\u8F7D\u4E2D\u2026") : roles.value.length === 0 ? h4("div", { style: s4.hint }, "\u6682\u65E0\u89D2\u8272\u6570\u636E") : roles.value.map(
+                    rolesLoading.value ? h4("div", { style: s4.hint }, "\u52A0\u8F7D\u4E2D\u2026") : roles.value.length === 0 ? h4("div", { style: s4.hint }, "\u6682\u65E0\u89D2\u8272\u6570\u636E") : roles.value.map(
                       (r) => h4(
                         "label",
                         {
@@ -4431,10 +4518,10 @@ var SYSTEM_ADMIN_MENU = {
   key: "system",
   label: "\u7CFB\u7EDF\u7BA1\u7406",
   children: [
-    { key: "menu", label: "\u83DC\u5355\u7BA1\u7406" },
-    { key: "resource", label: "\u6743\u9650\u70B9\u7BA1\u7406" },
+    { key: "user", label: "\u7528\u6237\u7BA1\u7406" },
     { key: "role", label: "\u89D2\u8272\u7BA1\u7406" },
-    { key: "user", label: "\u7528\u6237\u7BA1\u7406" }
+    { key: "menu", label: "\u83DC\u5355\u7BA1\u7406" },
+    { key: "resource", label: "\u6743\u9650\u70B9\u7BA1\u7406" }
   ]
 };
 var SYSTEM_ADMIN_DEFAULT_KEY = "menu";