feat:完成所有功能

This commit is contained in:
zy7y
2022-09-19 18:02:37 +08:00
parent 7b1d87aa65
commit 5566e6693b
32 changed files with 343 additions and 124 deletions

View File

@@ -1,5 +1,5 @@
from core.utils import list_to_tree
from dbhelper.menu import del_menu, get_tree_menu, insert_menu, put_menu
from dbhelper.menu import del_menu, get_menu, get_tree_menu, insert_menu, put_menu
from schemas import MenuIn, MenuRead, Response
@@ -9,10 +9,16 @@ async def menu_add(data: MenuIn) -> Response[MenuRead]:
async def menu_arr() -> Response:
menus = await get_tree_menu()
return Response(data=list_to_tree(menus))
try:
data = list_to_tree(menus)
except KeyError:
return Response(code=400, msg="菜单根节点丢失")
return Response(data=data)
async def menu_del(pk: int) -> Response:
if await get_menu({"pid": pk}) is not None:
return Response(code=400, msg="请先删除子节点")
if await del_menu(pk) == 0:
return Response(code=400, msg="菜单不存在")
return Response()

View File

@@ -26,8 +26,7 @@ async def role_has_menu(rid: int):
rid: 角色ID
"""
menus = await get_role_menus(rid)
for obj in menus:
obj["meta"] = json.loads(obj["meta"]) if obj["meta"] is not None else None
try:
result = list_to_tree(menus)
except KeyError: