diff --git a/api/api_v1/endpoints/dashboard.py b/api/api_v1/endpoints/dashboard.py index 2dce755..d98d58f 100644 --- a/api/api_v1/endpoints/dashboard.py +++ b/api/api_v1/endpoints/dashboard.py @@ -162,7 +162,7 @@ async def edit_report(data_in: schemas.EditReport, """编辑报表""" res = await crud.dashboard.update_one(db, {'_id': data_in.id, 'reports.report_id': data_in.report.report_id}, - {'$set': {'reports.$': data_in.report.dict()}}) + {'$set': {'reports.$': data_in.report.dict(skip_defaults=True)}}) return schemas.Msg(code=0, msg='ok', data='ok') diff --git a/core/config.py b/core/config.py index eac4872..7a411c7 100644 --- a/core/config.py +++ b/core/config.py @@ -81,6 +81,7 @@ class Settings(BaseSettings): 'max': lambda x: func.max(x), 'min': lambda x: func.min(x), 'distinct_count': lambda x: func.uniqCombined(x), + 'uniqCombined': lambda x: func.uniqCombined(x), } CK_OPERATOR = { diff --git a/schemas/dashboard.py b/schemas/dashboard.py index 5b5b094..f2a7761 100644 --- a/schemas/dashboard.py +++ b/schemas/dashboard.py @@ -35,7 +35,7 @@ class Report(BaseModel): ascending: bool = None model: str = None graph_size: str = None - sort: int = 999 + sort: int = None modelswitch: bool = None avesumdata: bool = True daydata: bool = True