feat(dashboard): 最近动态改服务端分页
工作台「最近动态」原为聚合端点内嵌、固定截断前 20 条,操作日志变长后 既撑大响应又只能看到头部。改为独立分页端点: - GET /api/v1/dashboard/activities,支持 pageNum/pageSize/module 筛选 - 模块筛选项与列表同源返回(全量模块名,不随翻页变化),前端不必再取一次全量 - 聚合端点去掉内嵌 activities,避免同一份数据两处查询 前端改用 usePagedList + 统一 AppPagination(每页 10/20/50),模块筛选由 本地过滤改为服务端筛选。集成测试 13 例(含翻页不重不漏 / 模块筛选 / 越权 403)。 Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
1 parent
32b7940067
commit
61fe5cca98
7 files changed
+835
-329
No files matched your search
@@ -1,4 +1,4 @@
|
||||
"""工作台接口(M4 ⑧):四区块一次性聚合。
|
||||
"""工作台接口(M4 ⑧):三区块聚合 + 最近动态分页。
|
||||
|
||||
准入:管理员/财务/领导(与报表、审批接口一致;FR-033/036 的「全部用户」
|
||||
待业务权限清单 #6 答复后再放宽)。只读接口,不写操作日志。
|
||||
@@ -12,7 +12,7 @@ from app.api.deps import DbSession, require_roles
|
||||
from app.core.constants import ROLE_ADMIN, ROLE_FINANCE, ROLE_LEADER
|
||||
from app.core.response import ApiResponse, ok
|
||||
from app.models import User
|
||||
from app.schemas.dashboard import DashboardOut
|
||||
from app.schemas.dashboard import ActivityPageOut, ActivityQuery, DashboardOut
|
||||
from app.services import dashboard_service
|
||||
|
||||
router = APIRouter(prefix="/dashboard", tags=["工作台"])
|
||||
@@ -23,7 +23,7 @@ _DashboardUser = Annotated[
|
||||
]
|
||||
|
||||
|
||||
@router.get("", response_model=ApiResponse[DashboardOut], summary="工作台四区块")
|
||||
@router.get("", response_model=ApiResponse[DashboardOut], summary="工作台三区块")
|
||||
def get_dashboard(
|
||||
session: DbSession,
|
||||
current_user: _DashboardUser,
|
||||
@@ -31,8 +31,22 @@ def get_dashboard(
|
||||
str | None, Query(max_length=7, description="统计月份 YYYY-MM,默认当月")
|
||||
] = None,
|
||||
) -> ApiResponse[DashboardOut]:
|
||||
"""一次返回经营总览/待办/风险预警/最近动态(待办与预警实时派生)。
|
||||
"""一次返回经营总览/待办/风险预警(待办与预警实时派生)。
|
||||
|
||||
待办按当前用户角色只返回其可操作节点(admin 可查看全部在途单)。
|
||||
最近动态是分页列表,走 `GET /dashboard/activities`。
|
||||
"""
|
||||
return ok(dashboard_service.get_dashboard(session, month, current_user=current_user))
|
||||
|
||||
|
||||
@router.get("/activities", response_model=ApiResponse[ActivityPageOut], summary="最近动态(分页)")
|
||||
def list_dashboard_activities(
|
||||
session: DbSession,
|
||||
current_user: _DashboardUser,
|
||||
query: Annotated[ActivityQuery, Query()],
|
||||
) -> ApiResponse[ActivityPageOut]:
|
||||
"""分页查询最近动态,可按模块筛选。
|
||||
|
||||
与聚合端点拆开:翻页只重取这张列表,不必重算总览/待办/预警。
|
||||
"""
|
||||
return ok(dashboard_service.list_activities(session, query))
|
||||
Reference in new issue
Block a user