Merge remote-tracking branch 'origin/main' into main

Author: Chise1

fast_tmp/site/base.py

@@ -7,7 +7,6 @@
 from tortoise.queryset import QuerySet
 
 from fast_tmp.amis.forms import Column, ColumnInline, Control, ControlEnum, QuickEdit
-from fast_tmp.amis.page import Page
 from fast_tmp.amis.response import AmisStructError
 from fast_tmp.exceptions import NotFoundError
 from fast_tmp.responses import BaseRes, ListDataWithPage
@@ -197,7 +196,7 @@ class RegisterRouter:
     _name: str
     _prefix: str
 
-    async def get_app_page(self, request: Request) -> Page:
+    async def get_app_page(self, request: Request) -> dict:
         raise AttributeError("need write")
 
     def __init__(self, prefix: str, name: str):

fast_tmp/site/field.py

@@ -614,7 +614,6 @@ def create_column(
 # todo 以后考虑创建更新的control分离
 class Password(StrControl):
     _control_type = ControlEnum.input_password
-    _update_control = None
 
     async def get_value(self, request: Request, obj: Model) -> Any:
         return None

tests/test_example/app.py

@@ -1,16 +1,23 @@
 import os
 
+from starlette.requests import Request
+
 os.environ.setdefault("FASTAPI_SETTINGS_MODULE", "test_example.settings")
+
 from test_example.admin import AuthorModel, BookModel, FieldTestingModel
+from test_example.page import UserSelfInfo
 from tortoise.contrib.fastapi import register_tortoise
 
 from fast_tmp.admin.register import register_static_service
 from fast_tmp.conf import settings
 from fast_tmp.factory import create_app
 from fast_tmp.models import User
+from fast_tmp.responses import BaseRes
 from fast_tmp.site import register_model_site
 
-register_model_site({"fieldtesting": [FieldTestingModel(), BookModel(), AuthorModel()]})
+register_model_site(
+    {"fieldtesting": [FieldTestingModel(), BookModel(), AuthorModel(), UserSelfInfo()]}
+)
 app = create_app()
 app.title = "test_example"
 
@@ -26,6 +33,12 @@ async def create_user():
     await user.save()
 
 
+@app.post("/form-test")
+async def test_form(request: Request):
+    print(await request.json())
+    return BaseRes()
+
+
 register_tortoise(app, config=settings.TORTOISE_ORM, generate_schemas=True)
 if settings.DEBUG:
     register_static_service(app)

tests/test_example/test_example/page.py

@@ -0,0 +1,30 @@
+"""
+测试插件功能，支持自己写入规则
+"""
+from starlette.requests import Request
+
+from fast_tmp.amis.forms import Control, Form
+from fast_tmp.amis.page import Page
+from fast_tmp.site.base import RegisterRouter
+
+
+class MarkdownItem(Control):
+    langeuage: str
+    type = "editor"
+
+
+class UserSelfInfo(RegisterRouter):
+    def __init__(self):
+        super().__init__("info", "info")
+
+    async def get_app_page(self, request: Request) -> dict:
+        return Page(
+            title="userselfinfo",
+            body=[
+                Form(
+                    name="form",
+                    body=[MarkdownItem(langeuage="markdown", name="markdown", label="markdown")],
+                    api="/form-test",
+                )
+            ],
+        ).dict(exclude_none=True)

tests/test_plugin.py

@@ -0,0 +1,8 @@
+"""
+测试插件功能，支持自己写入规则
+"""
+from fast_tmp.amis.forms import Control
+
+
+class MarkdownItem(Control):
+    """"""