Skip to content

重构和修复菜单相关页面代码 #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
4linuxfun merged 6 commits into from
Jan 25, 2024
Merged

重构和修复菜单相关页面代码 #105

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e0d9085
前端：系统管理-角色管理：重构角色编辑
4linuxfun Jan 24, 2024
a3534ee
前端：系统管理-菜单管理：页面逻辑重构
4linuxfun Jan 25, 2024
1138ddf
后端：修复新增菜单icon、sort字段可选
4linuxfun Jan 25, 2024
2fbe50a
后端：修复删除菜单无返回报错
4linuxfun Jan 25, 2024
1c23859
前端：重命名UserDialog组件
4linuxfun Jan 25, 2024
7ed72f1
前端：升级element plus，增加vue-draggable-plus组件
4linuxfun Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
后端：修复删除菜单无返回报错
  • Loading branch information
@4linuxfun
4linuxfun committed Jan 25, 2024
commit 2fbe50a366c1dfb9a60e3c2d554152ce90098035
3 changes: 2 additions & 1 deletion server/routers/internal/menu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,12 @@ async def update_menu(menu: MenuBase, session: Session = Depends(get_session)):
)


@router.delete('/menus/{id}', summary='删除菜单', status_code=status.HTTP_204_NO_CONTENT,
@router.delete('/menus/{id}', summary='删除菜单',
dependencies=[Depends(Authority("menu:del"))])
async def del_menu(id: int, session: Session = Depends(get_session)):
db_obj = crud.menu.get(session, id)
if len(db_obj.roles) > 0:
roles = [role.name for role in db_obj.roles]
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=f"{roles} 角色关联菜单，请先取消关联")
crud.menu.delete(session, id)
return ApiResponse()