Skip to content

Commit 20ec595

Browse files
committed
refactor: dashboard preview
1 parent 7567c1e commit 20ec595

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

backend/apps/dashboard/api/dashboard_api.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
from apps.dashboard.models.dashboard_model import CreateDashboard, DashboardResponse
66
from common.core.deps import SessionDep, CurrentUser
77
from typing import List
8+
from fastapi.encoders import jsonable_encoder
89

910
router = APIRouter(tags=["dashboard"], prefix="/dashboard")
1011

11-
@router.post("/list", response_model=List[DashboardResponse])
12+
@router.post("/list")
1213
async def datasource_list(session: SessionDep):
1314
return get_dashboard_list(session=session)
1415

backend/apps/dashboard/crud/dashboard_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import uuid
55
def get_dashboard_list(session: SessionDep):
66
statement = select(CoreDashboard)
7-
dashboard_list = session.exec(statement).fetchall()
7+
dashboard_list = session.exec(statement).scalars().all()
88
return dashboard_list
99

1010
def preview_with_id(session: SessionDep, dashboard_id: str):

backend/apps/dashboard/models/dashboard_model.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ class DashboardResponse(BaseModel):
137137
status: Optional[int] = None
138138
self_watermark_status: Optional[int] = None
139139
sort: Optional[int] = None
140-
create_time: Optional[int] = None # 或者用 datetime 类型
140+
create_time: Optional[int] = None
141141
create_by: Optional[str] = None
142-
update_time: Optional[int] = None # 或者用 datetime 类型
142+
update_time: Optional[int] = None
143143
update_by: Optional[str] = None
144144
remark: Optional[str] = None
145145
source: Optional[str] = None
@@ -151,7 +151,7 @@ class DashboardResponse(BaseModel):
151151
check_version: Optional[str] = None
152152

153153
class Config:
154-
orm_mode = True # 允许从 ORM 对象加载
154+
orm_mode = True
155155

156156
# dashboard create obj
157157
class CreateDashboard(BaseModel):

0 commit comments

Comments
 (0)