serv\web- 日志

schoolNewsWeb/src/views/admin/manage/system/RoleManageView.vue

@@ -102,9 +102,14 @@
       :title="`绑定权限 - ${currentRole?.name || ''}`"
       left-title="可选权限"
       right-title="已选权限"
-      :available-items="availablePermissions"
-      :initial-target-items="initialBoundPermissions"
+      :fetch-available-api="fetchAllPermissions"
+      :fetch-selected-api="fetchRolePermissions"
+      :filter-selected="filterPermissions"
       :item-config="{ id: 'permissionID', label: 'name', sublabel: 'code' }"
+      :use-tree="true"
+      :tree-transform="transformPermissionsToTree"
+      :tree-props="{ children: 'children', label: 'displayName', id: 'permissionID' }"
+      :only-leaf-selectable="true"
       unit-name="个"
       search-placeholder="搜索权限名称或编码..."
       @confirm="handlePermissionConfirm"
@@ -124,7 +129,7 @@ import { GenericSelector } from '@/components/base';
 defineOptions({
   name: 'RoleManageView'
 });
-import { ref, onMounted, reactive, computed } from 'vue';
+import { ref, onMounted, reactive } from 'vue';
 import { ElMessage, ElMessageBox, FormInstance, FormRules } from 'element-plus';
 import { Plus } from '@element-plus/icons-vue';
 
@@ -134,9 +139,10 @@ const loading = ref(false);
 const submitting = ref(false);
 
 // 权限绑定相关数据
-const permissionList = ref<SysPermission[]>([]);
+// 移除：改为由 GenericSelector 通过 API 加载
+// const permissionList = ref<SysPermission[]>([]);
+// const initialBoundPermissions = ref<SysPermission[]>([]);
 const currentRole = ref<SysRole | null>(null);
-const initialBoundPermissions = ref<SysPermission[]>([]);
 
 // 对话框状态
 const dialogVisible = ref(false);
@@ -251,43 +257,105 @@ function resetForm() {
   });
 }
 
-// 计算可选权限（过滤掉已绑定的）
-const availablePermissions = computed(() => {
-  const boundIds = new Set(initialBoundPermissions.value.map(p => p.permissionID));
-  return permissionList.value.filter(p => !boundIds.has(p.permissionID));
-});
+// 获取所有权限的API函数
+async function fetchAllPermissions() {
+  const permission: SysPermission = {
+    permissionID: undefined,
+    name: undefined,
+    code: undefined,
+    description: undefined,
+  };
+  return await permissionApi.getPermissionList(permission);
+}
+
+// 获取角色已绑定权限的API函数
+async function fetchRolePermissions() {
+  if (!currentRole.value || !currentRole.value.roleID) {
+    return {
+      success: true,
+      dataList: [],
+      code: 200,
+      message: '',
+      login: true,
+      auth: true
+    };
+  }
+  return await roleApi.getRolePermission({
+    roleID: currentRole.value.roleID
+  });
+}
+
+// 过滤已选项
+function filterPermissions(available: any[], selected: any[]) {
+  const selectedIds = new Set(selected.map(item => item.permissionID));
+  return available.filter(item => !selectedIds.has(item.permissionID));
+}
+
+// 将权限按模块ID构建树形结构
+function transformPermissionsToTree(flatData: any[]) {
+  if (!flatData || flatData.length === 0) {
+    return [];
+  }
+  
+  // 按模块分组
+  const moduleMap = new Map<string, any>();
+  const tree: any[] = [];
+  
+  flatData.forEach(item => {
+    const moduleID = item.moduleID;
+    
+    if (!moduleID) {
+      // 没有模块ID的权限作为根节点
+      tree.push({
+        ...item,
+        displayName: item.name,
+        isModule: false
+      });
+      return;
+    }
+    
+    if (!moduleMap.has(moduleID)) {
+      // 创建模块节点
+      moduleMap.set(moduleID, {
+        permissionID: moduleID, // 使用moduleID作为ID，确保唯一性
+        displayName: item.moduleName || moduleID,
+        moduleID: moduleID,
+        moduleName: item.moduleName,
+        moduleCode: item.moduleCode,
+        moduleDescription: item.moduleDescription,
+        children: [],
+        isModule: true // 标记这是模块节点
+      });
+    }
+    
+    // 添加权限到模块的children中
+    const moduleNode = moduleMap.get(moduleID);
+    if (moduleNode) {
+      moduleNode.children.push({
+        ...item,
+        displayName: item.name,
+        isModule: false // 标记这是权限节点
+      });
+    }
+  });
+  
+  // 将所有模块添加到树中
+  moduleMap.forEach(moduleNode => {
+    tree.push(moduleNode);
+  });
+  
+  return tree;
+}
 
 // 查看绑定权限
 async function handleBindPermission(row: SysRole) {
   currentRole.value = row;
-  
-  try {
-    // 获取所有权限
-    let permission: SysPermission = {
-      permissionID: undefined,
-      name: undefined,
-      code: undefined,
-      description: undefined,
-    };
-    const permissionResult = await permissionApi.getPermissionList(permission);
-    permissionList.value = permissionResult.dataList || [];
-    
-    // 获取已绑定的权限
-    const bindingResult = await roleApi.getRolePermission({
-      roleID: row.roleID
-    });
-    initialBoundPermissions.value = bindingResult.dataList || [];
-    
-    bindPermissionDialogVisible.value = true;
-  } catch (error) {
-    console.error('获取权限绑定信息失败:', error);
-    ElMessage.error('获取权限绑定信息失败');
-  }
+  bindPermissionDialogVisible.value = true;
+  // 不再需要预加载数据，由 GenericSelector 在打开时自动调用 API 加载
 }
 
 // 重置绑定列表
 function resetBindList() {
-  initialBoundPermissions.value = [];
   currentRole.value = null;
 }
 
@@ -301,11 +369,20 @@ async function handlePermissionConfirm(items: SysPermission[]) {
   try {
     submitting.value = true;
     
-    // 获取当前已绑定的权限ID
-    const currentBoundIds = initialBoundPermissions.value.map(p => p.permissionID).filter((id): id is string => !!id);
+    // 重新获取当前已绑定的权限
+    const bindingResult = await roleApi.getRolePermission({
+      roleID: currentRole.value.roleID
+    });
+    const currentBoundPermissions = bindingResult.dataList || [];
     
-    // 新选择的权限ID
-    const newSelectedIds = items.map(p => p.permissionID).filter((id): id is string => !!id);
+    // 获取当前已绑定的权限ID
+    const currentBoundIds = currentBoundPermissions.map(p => p.permissionID).filter((id): id is string => !!id);
+    
+    // 新选择的权限ID（过滤掉模块节点，只保留权限节点）
+    const newSelectedIds = items
+      .filter((item: any) => !item.isModule) // 只保留权限节点，过滤模块节点
+      .map(p => p.permissionID)
+      .filter((id): id is string => !!id);
     
     // 找出需要绑定的权限（新增的）
     const permissionsToBind = newSelectedIds.filter(id => !currentBoundIds.includes(id));
@@ -316,7 +393,7 @@ async function handlePermissionConfirm(items: SysPermission[]) {
     // 构建需要绑定的权限对象数组
     if (permissionsToBind.length > 0) {
       const permissionsToBindObjects = permissionsToBind.map(permissionID => {
-        const permission = permissionList.value.find(p => p.permissionID === permissionID);
+        const permission = items.find(p => p.permissionID === permissionID);
         return permission || { permissionID: permissionID };
       });
       
@@ -331,7 +408,7 @@ async function handlePermissionConfirm(items: SysPermission[]) {
     // 构建需要解绑的权限对象数组
     if (permissionsToUnbind.length > 0) {
       const permissionsToUnbindObjects = permissionsToUnbind.map(permissionID => {
-        const permission = permissionList.value.find(p => p.permissionID === permissionID);
+        const permission = currentBoundPermissions.find(p => p.permissionID === permissionID);
         return permission || { permissionID: permissionID };
       });
       
@@ -344,6 +421,8 @@ async function handlePermissionConfirm(items: SysPermission[]) {
     }
     
     ElMessage.success('权限绑定保存成功');
+    bindPermissionDialogVisible.value = false;
+    resetBindList();
     
     // 刷新角色列表
     await loadRoleList();