chore: wip

Author: tangtanglove

src/quark/app/actions/menu_create_drawer.py

@@ -4,29 +4,18 @@
 from quark.component.action.action import Action
 from quark.component.form.form import Form
 from quark.template.action import Drawer
+from quark.template.resolves_fields import ResolvesFields
 
 
 class MenuCreateDrawer(Drawer):
 
-    def __init__(
-        self,
-        title: str,
-        api: str,
-        fields: List[Dict[str, Any]],
-        initial_values: Dict[str, Any],
-    ):
+    def __init__(self, resource: Any):
 
-        # 文字
-        self.name = "创建" + title
+        # 资源
+        self.resource = resource
 
-        # api
-        self.api = api
-
-        # 字段
-        self.fields = fields
-
-        # 初始值
-        self.initial_values = initial_values
+        # 名称
+        self.name = "创建" + resource.title
 
         # 类型
         self.type = "primary"
@@ -46,18 +35,24 @@ def __init__(
         # 设置展示位置（只在列表页显示）
         self.set_only_on_index(True)
 
-    def get_body(self, request: Request) -> Dict[str, Any]:
+    async def get_body(self, request: Request):
+        api = await self.resource.creation_api(request)
+        fields = ResolvesFields(
+            request=request,
+            fields=await self.resource.fields(request),
+        ).creation_fields_within_components()
+        data = await self.resource.before_creating(request)
         return (
             Form()
-            .set_api(self.api)
-            .set_body(self.fields)
-            .set_initial_values(self.initial_values)
+            .set_api(api)
+            .set_body(fields)
+            .set_initial_values(data)
             .set_label_col({"span": 6})
             .set_wrapper_col({"span": 18})
-            .set_key("createDrawerForm", destroy=False)
+            .set_key("createDrawerForm", False)
         )
 
-    def get_actions(self, request: Request) -> List[Dict[str, Any]]:
+    async def get_actions(self, request: Request):
         return [
             Action().set_label("取消").set_action_type("cancel"),
             Action()
@@ -66,5 +61,5 @@ def get_actions(self, request: Request) -> List[Dict[str, Any]]:
             .set_with_loading(True)
             .set_reload("table")
             .set_action_type("submit")
-            .set_type("primary", ghost=False),
+            .set_type("primary", False),
         ]

src/quark/app/actions/menu_edit_drawer.py

@@ -1,36 +1,42 @@
-from typing import Any, Dict, List
+from typing import Any, List
 
 from quark import Request
 from quark.component.action.action import Action
 from quark.component.form.form import Form
 from quark.template.action import Drawer
+from quark.template.resolves_fields import ResolvesFields
 
 
 class MenuEditDrawer(Drawer):
 
-    def __init__(self, name: str, api: str, init_api: str, fields: Any):
-        self.name = name
-        self.api = api
-        self.init_api = init_api
-        self.fields = fields
+    def __init__(self, resource: Any):
+        self.resource = resource
+        self.name = "编辑"
         self.type = "link"
         self.size = "small"
         self.destroy_on_close = True
         self.reload = "table"
         self.width = 750
         self.set_only_on_index_table_row(True)
 
-    async def get_body(self, request: Request) -> Dict[str, Any]:
+    async def get_body(self, request: Request) -> Any:
+        api = await self.resource.update_api(request)
+        init_api = await self.resource.edit_value_api(request)
+        fields = ResolvesFields(
+            request=request,
+            fields=await self.resource.fields(request),
+        ).update_fields_within_components()
+
         return (
             Form()
-            .set_api(self.api)
-            .set_init_api(self.init_api)
-            .set_body(self.fields)
+            .set_api(api)
+            .set_init_api(init_api)
+            .set_body(fields)
             .set_layout("vertical")
             .set_key("editDrawerForm", False)
         )
 
-    async def get_actions(self, request: Request) -> List[Dict[str, Any]]:
+    async def get_actions(self, request: Request) -> List[Any]:
         return [
             Action().set_label("取消").set_action_type("cancel"),
             Action()
@@ -39,5 +45,5 @@ async def get_actions(self, request: Request) -> List[Dict[str, Any]]:
             .set_with_loading(True)
             .set_reload("table")
             .set_action_type("submit")
-            .set_type("primary", ghost=False),
+            .set_type("primary", False),
         ]

src/quark/app/image.py

@@ -12,7 +12,6 @@
 class Image(Resource):
     """
     图片管理
-
     """
 
     async def init(self, request: Request):

src/quark/app/menu.py

@@ -3,6 +3,8 @@
 from quark import Request, Resource, models
 from quark.app import actions, searches
 from quark.component.form import field
+from quark.component.form.rule import Rule
+from quark.services import MenuService, PermissionService
 
 
 class Menu(Resource):
@@ -11,41 +13,155 @@ class Menu(Resource):
     """
 
     async def init(self, request: Request):
-
-        # 页面标题
         self.title = "菜单"
-
-        # 模型
         self.model = models.Menu
+        self.table_list_to_tree = True
+        self.query_order = "sort asc"
+        self.page_size = False  # 不分页
 
-        return self
-
+    # 字段
     async def fields(self, request: Request) -> List[Any]:
-        """字段定义"""
+
+        # 权限列表
+        permissions = await PermissionService().data_source()
+
+        # 菜单列表
+        menus = await MenuService().get_list_with_root()
+
         return [
-            field.id("id", "ID"),
-            field.text("nickname", "昵称"),
-            field.text("username", "用户名"),
-            field.password("password", "密码").only_on_forms(),
-            field.text("email", "邮箱").set_editable(True),
-            field.text("phone", "手机号"),
+            field.hidden("id", "ID"),
+            field.hidden("pid", "PID").only_on_index(),
+            field.group(
+                [
+                    field.text("name", "名称").set_rules(
+                        [Rule.required("名称必须填写")]
+                    ),
+                    field.text("guard_name", "守卫")
+                    .set_rules([Rule.required("守卫必须填写")])
+                    .set_default_value("admin")
+                    .only_on_forms(),
+                    field.icon("icon", "图标").only_on_forms(),
+                ]
+            ),
+            field.group(
+                [
+                    field.number("sort", "排序")
+                    .set_editable(True)
+                    .set_default_value(0),
+                    field.tree_select("pid", "父节点")
+                    .set_tree_data(menus, -1, "pid", "name", "id")
+                    .set_default_value(0)
+                    .only_on_forms(),
+                    field.switch("status", "状态")
+                    .set_true_value("正常")
+                    .set_false_value("禁用")
+                    .set_editable(True)
+                    .set_default_value(True),
+                ]
+            ),
+            field.group(
+                [
+                    field.radio("type", "类型")
+                    .set_options(
+                        [
+                            field.radio_option("目录", 1),
+                            field.radio_option("菜单", 2),
+                            field.radio_option("按钮", 3),
+                        ]
+                    )
+                    .set_rules([Rule.required("类型必须选择")])
+                    .set_default_value(1),
+                    field.switch("show", "显示")
+                    .set_true_value("显示")
+                    .set_false_value("隐藏")
+                    .set_editable(True)
+                    .set_default_value(True),
+                ]
+            ),
+            field.dependency().set_when(
+                "type",
+                1,
+                lambda: [
+                    field.text("path", "路由")
+                    .set_rules([Rule.required("路由必须填写")])
+                    .set_editable(True)
+                    .set_help("前端路由")
+                    .set_width(400),
+                ],
+            ),
+            field.dependency().set_when(
+                "type",
+                2,
+                lambda: [
+                    field.switch("is_engine", "引擎组件")
+                    .set_true_value("是")
+                    .set_false_value("否")
+                    .set_default_value(True),
+                    field.switch("is_link", "外部链接")
+                    .set_true_value("是")
+                    .set_false_value("否")
+                    .set_default_value(False),
+                    field.text("path", "路由")
+                    .set_rules([Rule.required("路由必须填写")])
+                    .set_editable(True)
+                    .set_help("前端路由或后端api")
+                    .set_width(400)
+                    .only_on_forms(),
+                ],
+            ),
+            field.dependency().set_when(
+                "type",
+                3,
+                lambda: [
+                    field.transfer("permission_ids", "绑定权限")
+                    .set_data_source(permissions)
+                    .set_list_style({"width": 320, "height": 300})
+                    .set_show_search(True)
+                    .only_on_forms(),
+                ],
+            ),
         ]
 
+    # 搜索
     async def searches(self, request: Request) -> List[Any]:
-        """搜索项定义"""
         return [
-            searches.Input("username", "用户名"),
+            searches.Input("name", "名称"),
+            searches.Input("path", "路由"),
+            searches.Status(),
         ]
 
+    # 行为
     async def actions(self, request: Request) -> List[Any]:
-        """行为定义"""
         return [
-            actions.CreateLink(self.title),
+            actions.MenuCreateDrawer(self),
             actions.BatchDelete(),
-            actions.EditLink(),
-            actions.DeleteSpecial(),
-            actions.FormSubmit(),
-            actions.FormReset(),
-            actions.FormBack(),
-            actions.FormExtraBack(),
+            actions.BatchDisable(),
+            actions.BatchEnable(),
+            actions.ChangeStatus(),
+            actions.MenuEditDrawer(self),
+            actions.Delete(),
         ]
+
+    # 编辑页面显示前回调
+    async def before_editing(
+        self, request: Request, data: Dict[str, Any]
+    ) -> Dict[str, Any]:
+        id_val = request.query_params.get("id", "")
+        try:
+            id_int = int(id_val) if id_val else None
+        except Exception:
+            id_int = None
+
+        if id_int:
+            permission_ids: List[int] = []
+            permissions = await PermissionService().get_menu_permissions(id_int)
+            for v in permissions:
+                permission_ids.append(v.permission_id)
+            data["permission_ids"] = permission_ids
+
+        return data
+
+    # 保存后回调
+    async def after_saved(self, request, id, data, result):
+        if data.get("permission_ids") is not None:
+            await PermissionService().add_menu_permission(id, data["permission_ids"])

src/quark/services/menu.py

@@ -1,4 +1,6 @@
 import uuid
+from typing import List
+
 from ..models.menu import Menu
 
 
@@ -10,7 +12,7 @@ def set_guard_name(self, guard_name: str):
         self.guard_name = guard_name
         return self
 
-    async def get_list(self):
+    async def get_list(self) -> List[Menu]:
         menus = (
             await Menu.filter(guard_name=self.guard_name, status=1)
             .order_by("sort", "id")
@@ -19,9 +21,7 @@ async def get_list(self):
         return menus
 
     async def get_list_with_root(self):
-        menus, err = await self.get_list()
-        if err:
-            return menus, err
+        menus = await self.get_list()
         menus.append(Menu(id=0, pid=-1, name="根节点"))
         return menus
 

src/quark/services/permission.py

@@ -1,3 +1,7 @@
+from typing import List
+
+from quark.models.menu_has_permission import MenuHasPermission
+
 from ..models.permission import Permission
 
 
@@ -32,3 +36,16 @@ async def get_list_by_ids(self, permission_ids):
     async def get_list_by_names(self, permission_names):
         permissions = await Permission.filter(name__in=permission_names).all()
         return permissions
+
+    async def get_menu_permissions(self, menu_id: int):
+        permissions = await MenuHasPermission.filter(menu_id=menu_id).all()
+        return permissions
+
+    async def add_menu_permission(self, menu_id: int, permission_ids: List[int]):
+        await MenuHasPermission.filter(menu_id=menu_id).delete()
+        await MenuHasPermission.bulk_create(
+            [
+                MenuHasPermission(menu_id=menu_id, permission_id=permission_id)
+                for permission_id in permission_ids
+            ]
+        )