wangys/schoolNews
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

serv\web- 日志

Browse Source
This commit is contained in:
wangys
2025-10-30 16:40:56 +08:00
parent 82b6f14e64
commit 2b252e1b3c
91 changed files with 6003 additions and 1485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
schoolNewsWeb/src/views/admin/manage/system/DeptManageView.vue
View File

@@ -424,7 +424,19 @@ async function fetchDeptRoles() {
auth: true
};
}
return await deptApi.getDeptByRole(currentDept.value);
const result = await deptApi.getDeptByRole(currentDept.value);
// 转换数据格式，将 UserDeptRoleVO 转换为与 SysRole 一致的格式
if (result.success && result.dataList) {
result.dataList = result.dataList.map(item => ({
roleID: item.roleID,
name: item.roleName, // roleName -> name
description: item.roleDescription // roleDescription -> description
}));
}
return result;
}
// 查看绑定角色

88
schoolNewsWeb/src/views/admin/manage/system/MenuManageView.vue
View File

@@ -166,7 +166,12 @@
right-title="已选权限"
:fetch-available-api="fetchAllPermissions"
:fetch-selected-api="fetchMenuPermissions"
: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"
@@ -505,11 +510,80 @@ async function fetchAllPermissions() {
// 获取菜单已绑定权限的接口
async function fetchMenuPermissions() {
if (!currentMenu.value?.menuID) {
return { success: true, dataList: [] };
return {
success: true,
dataList: [],
code: 200,
message: '',
login: true,
auth: true
};
}
return await menuApi.getMenuPermission(currentMenu.value.menuID);
}
// 过滤已选项
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: SysMenu) {
currentMenu.value = row;
@@ -535,8 +609,11 @@ async function handlePermissionConfirm(items: SysPermission[]) {
const currentBoundResult = await menuApi.getMenuPermission(currentMenu.value.menuID);
const currentBoundIds = (currentBoundResult.dataList || []).map(p => p.permissionID).filter((id): id is string => !!id);
// 新选择的权限ID
const newSelectedIds = items.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));
@@ -546,7 +623,8 @@ async function handlePermissionConfirm(items: SysPermission[]) {
// 构建需要绑定的权限对象数组
if (permissionsToBind.length > 0) {
const permissionsToBindObjects = items.filter(p => p.permissionID && permissionsToBind.includes(p.permissionID));
const permissionsToBindObjects = items
.filter((item: any) => !item.isModule && item.permissionID && permissionsToBind.includes(item.permissionID));
const bindMenu = {
...currentMenu.value,
@@ -569,6 +647,8 @@ async function handlePermissionConfirm(items: SysPermission[]) {
}
ElMessage.success('权限绑定保存成功');
bindPermissionDialogVisible.value = false;
resetBindList();
// 刷新菜单列表
await loadMenuList();

123
schoolNewsWeb/src/views/admin/manage/system/ModulePermissionManageView.vue
View File

@@ -286,7 +286,12 @@
right-title="已选菜单"
:fetch-available-api="fetchAllMenus"
:fetch-selected-api="fetchPermissionMenus"
:filter-selected="filterMenus"
:item-config="{ id: 'menuID', label: 'name', sublabel: 'url' }"
:use-tree="true"
:tree-transform="transformMenusToTree"
:tree-props="{ children: 'children', label: 'name', id: 'menuID' }"
:only-leaf-selectable="true"
unit-name="个"
search-placeholder="搜索菜单名称..."
@confirm="handleMenuConfirm"
@@ -301,6 +306,7 @@
right-title="已选角色"
:fetch-available-api="fetchAllRoles"
:fetch-selected-api="fetchPermissionRoles"
:filter-selected="filterRoles"
:item-config="{ id: 'roleID', label: 'name', sublabel: 'description' }"
unit-name="个"
search-placeholder="搜索角色名称..."
@@ -622,7 +628,11 @@ async function fetchPermissionMenus() {
success: result.success,
login: result.login ?? true,
auth: result.auth ?? true,
dataList: result.data?.menus || []
dataList: result.dataList?.map(item => ({
...item,
name: item.menuName,
url: item.menuUrl
})) || []
};
}
@@ -651,10 +661,115 @@ async function fetchPermissionRoles() {
success: result.success,
login: result.login ?? true,
auth: result.auth ?? true,
dataList: result.data?.roles || []
dataList: result.dataList?.map(item => ({
...item,
name: item.roleName,
description: item.roleDescription
})) || []
};
}
// 过滤已选菜单项
function filterMenus(available: any[], selected: any[]) {
const selectedIds = new Set(selected.map(item => item.menuID));
return available.filter(item => !selectedIds.has(item.menuID));
}
// 过滤已选角色项
function filterRoles(available: any[], selected: any[]) {
const selectedIds = new Set(selected.map(item => item.roleID));
return available.filter(item => !selectedIds.has(item.roleID));
}
// 将菜单扁平数据转换为树形结构（根据parentID构建）
function transformMenusToTree(flatData: any[]): any[] {
if (!flatData || flatData.length === 0) {
return [];
}
const tree: any[] = [];
const map = new Map<string, any>();
const maxDepth = flatData.length; // 最多遍历len层
// 初始化所有节点
flatData.forEach(item => {
if (item.menuID) {
map.set(item.menuID, { ...item, children: [] });
}
});
// 循环构建树结构，最多遍历maxDepth次
for (let depth = 0; depth < maxDepth; depth++) {
let hasChanges = false;
flatData.forEach(item => {
if (!item.menuID) return;
const node = map.get(item.menuID);
if (!node) return;
// 如果节点已经在树中，跳过
if (isMenuNodeInTree(node, tree)) {
return;
}
if (!item.parentID || item.parentID === '0' || item.parentID === '') {
// 根节点
if (!isMenuNodeInTree(node, tree)) {
tree.push(node);
hasChanges = true;
}
} else {
// 查找父节点
const parent = map.get(item.parentID);
if (parent && isMenuNodeInTree(parent, tree)) {
if (!parent.children) {
parent.children = [];
}
if (!parent.children.includes(node)) {
parent.children.push(node);
hasChanges = true;
}
}
}
});
// 如果没有变化，说明树构建完成
if (!hasChanges) {
break;
}
}
// 清理空的children数组
function cleanEmptyChildren(nodes: any[]) {
nodes.forEach(node => {
if (node.children && node.children.length === 0) {
delete node.children;
} else if (node.children && node.children.length > 0) {
cleanEmptyChildren(node.children);
}
});
}
cleanEmptyChildren(tree);
return tree;
}
// 检查菜单节点是否已经在树中
function isMenuNodeInTree(node: any, tree: any[]): boolean {
for (const treeNode of tree) {
if (treeNode.menuID === node.menuID) {
return true;
}
if (treeNode.children && treeNode.children.length > 0) {
if (isMenuNodeInTree(node, treeNode.children)) {
return true;
}
}
}
return false;
}
// 绑定菜单
async function handleBindMenu(permission: SysPermission) {
currentPermission.value = permission;
@@ -708,6 +823,8 @@ async function handleMenuConfirm(items: SysMenu[]) {
}
ElMessage.success('菜单绑定保存成功');
bindMenuDialogVisible.value = false;
resetBindList();
} catch (error) {
console.error('保存菜单绑定失败:', error);
ElMessage.error('保存菜单绑定失败');
@@ -757,6 +874,8 @@ async function handleRoleConfirm(items: SysRole[]) {
}
ElMessage.success('角色绑定保存成功');
bindRoleDialogVisible.value = false;
resetBindList();
} catch (error) {
console.error('保存角色绑定失败:', error);
ElMessage.error('保存角色绑定失败');

159
schoolNewsWeb/src/views/admin/manage/system/RoleManageView.vue
View File

@@ -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();