chore: wip

Author: tangtanglove

src/quark/app/action_log.py

@@ -1,10 +1,9 @@
 from typing import Any, List
 
-from quark import Request, Resource, models
+from quark import Request, Resource, models,services
 from quark.app import actions, searches
 from quark.component.form import field
 
-
 class ActionLog(Resource):
     """
     操作日志管理
@@ -22,12 +21,16 @@ async def init(self, request: Request):
 
     async def fields(self, request: Request) -> List[Any]:
         """字段定义"""
+        async def get_username(row) -> str:
+            user_info = await services.UserService().get_info_by_id(row.uid)
+            return "账号：<a href='#/layout/index?api=/api/admin/user/detail&id=" + str(user_info.id) + "'>" + user_info.username + "</a><br/>昵称：" + user_info.nickname
+        
         return [
             field.id("id", "ID"),
-            field.text("username", "用户信息"),
+            field.text("username", "用户信息", get_username),
             field.text("url", "行为"),
             field.text("ip", "IP").set_ellipsis(True),
-            field.text("created_at", "发生时间"),
+            field.datetime("created_at", "发生时间"),
         ]
 
     async def searches(self, request: Request) -> List[Any]:

src/quark/app/user.py

@@ -75,18 +75,18 @@ async def fields(self, request: Request) -> List[Any]:
         # 获取所有职位
         positions = await services.PositionService().get_list()
 
-        return [
-            field.id("id", "ID"),
-            field.image("avatar", "头像"),
-            field.text(
-                "username",
-                "用户名",
-                lambda row: "<a href='#/layout/index?api=/api/admin/user/edit&id="
+        async def get_username(row) -> str:
+            return ("<a href='#/layout/index?api=/api/admin/user/edit&id="
                 + str(row.id)
                 + "'>"
                 + row.username
-                + "</a>",
-            )
+                + "</a>")
+            
+
+        return [
+            field.id("id", "ID"),
+            field.image("avatar", "头像"),
+            field.text("username", "用户名", get_username)
             .set_rules(
                 [
                     Rule.required("用户名必须填写"),

src/quark/template/request/detail.py

@@ -76,7 +76,7 @@ async def fill_data(self) -> Dict[str, Any]:
                 # 普通字段
                 callback = field.callback
                 if callback:
-                    fields[name] = callback(result)
+                    fields[name] = await callback(result)
                 else:
                     value = getattr(result, name, None)
                     if value is None:

src/quark/template/request/export.py

@@ -158,7 +158,7 @@ async def performs_list(self, items):
                 if component == "actionField":
                     items_callback = field.callback
                     if items_callback:
-                        action_items = items_callback(item)
+                        action_items = await items_callback(item)
                     else:
                         action_items = field.items
 
@@ -172,7 +172,7 @@ async def performs_list(self, items):
                 else:
                     callback = field.callback
                     if callback:
-                        fields[name] = callback(item)
+                        fields[name] = await callback(item)
                     else:
                         value = getattr(item, name, None)
                         if value is None:

src/quark/template/request/index.py

@@ -169,7 +169,7 @@ async def performs_list(self, items):
                 if component == "actionField":
                     items_callback = field.callback
                     if items_callback:
-                        action_items = items_callback(item)
+                        action_items = await items_callback(item)
                     else:
                         action_items = field.items
 
@@ -183,7 +183,7 @@ async def performs_list(self, items):
                 else:
                     callback = field.callback
                     if callback:
-                        fields[name] = callback(item)
+                        fields[name] = await callback(item)
                     else:
                         value = getattr(item, name, None)
                         if value is None: