fix: 修复动态路由问题

api/file.py

@@ -59,7 +59,7 @@ async def upload_file(
         file_type=file.content_type,
         absolute_path=absolute_path,
         relative_path=relative_path,
-        uploader=current_user.get("id"),
+        uploader_id=current_user.get("id"),
     )
     result = await file_record.first().values(
         id="id",

api/login.py

@@ -90,7 +90,7 @@ async def login(
 async def register(request: Request, params: RegisterUserParams):
     register_enabled = (
         True
-        if await request.app.state.redis.get(f'{RedisKeyConfig.SYSTEM_CONFIG.key}:register_enabled')
+        if await request.app.state.redis.get(f'{RedisKeyConfig.SYSTEM_CONFIG.key}:account_register_enabled')
            == 'true'
         else False
     )
@@ -151,7 +151,7 @@ async def get_captcha(request: Request):
     )
     register_enabled = (
         True
-        if await request.app.state.redis.get(f'{RedisKeyConfig.SYSTEM_CONFIG.key}:register_enabled')
+        if await request.app.state.redis.get(f'{RedisKeyConfig.SYSTEM_CONFIG.key}:account_register_enabled')
            == 'true'
         else False
     )

controller/login.py

@@ -188,15 +188,27 @@ class LoginController:
                         child_node = await cls.find_node_recursive(child_item["id"], data)
                         if child_node:
                             children.append(child_node)
-                result = {
+                meta = {
-                    "name": item["name"],
+                    k: v for k, v in {
-                    "path": item["path"],
-                    "meta": {
                         "title": item["title"],
                         "rank": item["rank"],
                         "icon": item["icon"],
+                        "extraIcon": item["extraIcon"],
+                        "showParent": item["showParent"],
+                        "keepAlive": item["keepAlive"],
+                        "frameSrc": item["frameSrc"],
+                        "frameLoading": item["frameLoading"],
                         "permissions": [item["auths"]],
-                    },
+                    }.items() if v
+                }
+                if item["showLink"]:
+                    meta["showLink"] = True
+                else:
+                    meta["showLink"] = False
+                result = {
+                    "name": item["name"],
+                    "path": item["path"],
+                    "meta": meta,
                     "children": children
                 }
                 if item["component"]:
@@ -209,6 +221,8 @@ class LoginController:
                     result.pop("name")
                 if result["children"] == []:
                     result.pop("children")
+                else:
+                    result["children"] = sorted(result["children"], key=lambda x: x["meta"]["rank"])
                 break
         return result
 

controller/query.py

@@ -123,6 +123,9 @@ class QueryController:
                 leaveTransition="permission__leave_transition",
                 activePath="permission__active_path",
                 auths="permission__auths",
+                frameSrc="permission__frame_src",
+                frameLoading="permission__frame_loading",
+                fixedTag="permission__fixed_tag",
                 keepAlive="permission__keep_alive",
                 hiddenTag="permission__hidden_tag",
                 showLink="permission__show_link",

schemas/common.py

@@ -28,6 +28,7 @@ class ListQueryResult(BaseModel):
     result: List = Field(default=[], description="列表数据")
     total: int = Field(default=0, description="总条数")
     page: int = Field(default=1, description="当前页码")
+    pageSize: int = Field(default=10, description="每页数量")
 
 
 class DeleteListParams(BaseModel):

schemas/login.py

@@ -117,13 +117,15 @@ class GetCaptchaResult(BaseModel):
     uuid: Optional[str] = Field(default=None, description="验证码UUID")
     captcha: Optional[str] = Field(default=None, description="验证码图片")
     captcha_enabled: Optional[bool] = Field(default=False, description="是否开启验证码")
+    register_enabled: Optional[bool] = Field(default=False, description="是否开启注册")
 
     class Config:
         json_schema_extra = {
             "example": {
                 "uuid": "1234567890",
                 "captcha": "base64编码的图片",
-                "captcha_enabled": True
+                "captcha_enabled": True,
+                "register_enabled": True
             }
         }