chore: wip

Author: tangtanglove

src/quark/app/account.py

@@ -1,8 +1,14 @@
-from typing import Any, List
+import json
+from typing import Any, Dict, List
 
-from quark import Request, Resource, models
-from quark.app import actions, searches
+from tortoise import Model
+
+from quark import Message, Request, Resource, models, utils
+from quark.app import actions
 from quark.component.form import field
+from quark.component.form.rule import Rule
+from quark.services.auth import AuthService
+from quark.services.user import UserService
 
 
 class Account(Resource):
@@ -20,32 +26,75 @@ async def init(self, request: Request):
 
         return self
 
+    # 字段
     async def fields(self, request: Request) -> List[Any]:
-        """字段定义"""
-        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", "手机号"),
-        ]
 
-    async def searches(self, request: Request) -> List[Any]:
-        """搜索项定义"""
         return [
-            searches.Input("username", "用户名"),
+            field.image("avatar", "头像"),
+            field.text("nickname", "昵称").set_rules([Rule.required("昵称必须填写")]),
+            field.text("email", "邮箱").set_rules([Rule.required("邮箱必须填写")]),
+            field.text("phone", "手机号").set_rules([Rule.required("手机号必须填写")]),
+            field.radio("sex", "性别")
+            .set_options(
+                [
+                    field.radio_option("男", 1),
+                    field.radio_option("女", 2),
+                ]
+            )
+            .set_default_value(1),
+            field.password("password", "密码")
+            .set_rules(
+                [
+                    Rule.regexp(r"/^.{6,}$/", "密码不少于六位"),
+                    Rule.regexp(r"/.*[A-Z].*/", "至少包含一个大写字母"),
+                    Rule.regexp(r"/.*[a-z].*/", "至少包含一个小写字母"),
+                    Rule.regexp(r"/.*[0-9].*/", "至少包含一个数字"),
+                    Rule.regexp(
+                        r"/.*[!@#$%^&*()_+{}\[\]:;<>,.?~\\/-].*/",
+                        "至少包含一个特殊字符",
+                    ),
+                ]
+            )
+            .set_help(
+                "密码不少于六位，且至少包含一个大写字母、小写字母、数字和特殊字符"
+            ),
         ]
 
+    # 行为
     async def actions(self, request: Request) -> List[Any]:
-        """行为定义"""
         return [
-            actions.CreateLink(self.title),
-            actions.BatchDelete(),
-            actions.EditLink(),
-            actions.DeleteSpecial(),
             actions.FormSubmit(),
             actions.FormReset(),
             actions.FormBack(),
             actions.FormExtraBack(),
         ]
+
+    # 表单显示前回调
+    async def before_form_showing(self, request: Request) -> Any:
+        admin_info = await AuthService(request).get_current_admin()
+        user = await UserService().get_info_by_id(admin_info.id)
+        user_dict = user.__dict__.copy()
+        user_dict.pop("password", None)  # 安全地移除密码字段
+        return user_dict
+
+    # 表单提交处理
+    async def form_handle(
+        self, request: Request, model: Model, data: Dict[str, Any]
+    ) -> Any:
+        # 头像处理
+        if data.get("avatar"):
+            data["avatar"] = json.dumps(data["avatar"], ensure_ascii=False)
+
+        # 加密密码
+        if data.get("password"):
+            data["password"] = utils.hash_password(data["password"])
+
+        try:
+            # 获取登录管理员信息
+            admin_info = await AuthService(request).get_current_admin()
+            model = await UserService().get_info_by_id(admin_info.id)
+            await model.update_from_dict(data)
+        except Exception as e:
+            return Message.error(str(e))
+
+        return Message.success("操作成功")

src/quark/app/web_config.py

@@ -89,7 +89,7 @@ async def actions(self, request: Request) -> List[Any]:
             actions.FormExtraBack(),
         ]
 
-    async def before_form_showing(self, request: Request) -> Dict[str, Any]:
+    async def before_form_showing(self, request: Request) -> Any:
         configs = await Config.filter(status=1).values()
         data = {}
         for config in configs:

src/quark/services/user.py

@@ -1,7 +1,8 @@
+from tortoise.exceptions import DoesNotExist
+
 from ..models.user import User
 from ..services.attachment import AttachmentService
 from ..services.menu import MenuService
-from tortoise.exceptions import DoesNotExist
 
 
 class UserService:
@@ -20,7 +21,7 @@ async def get_info_by_username(self, username: str) -> User:
         try:
             user = await User.get(username=username, status=1)
             if user.avatar:
-                user.avatar = self.attachment_service.get_image_url(user.avatar)
+                user.avatar = await self.attachment_service.get_image_url(user.avatar)
             return user
         except DoesNotExist:
             raise Exception("用户不存在")

src/quark/template/resource_form.py

@@ -112,7 +112,7 @@ async def form_within_tabs(
             .set_initial_values(data)
         )
 
-    async def before_form_showing(self, request: Request) -> Dict[str, Any]:
+    async def before_form_showing(self, request: Request) -> Any:
         """
         表单显示前回调
         """