Skip to content

Commit 9656efa

Browse files
committed
feat: support export with filter
1 parent 8e97a6b commit 9656efa

10 files changed

Lines changed: 20 additions & 17 deletions

File tree

‎backend/apps/data_training/api/data_training.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,11 @@ async def enable(session: SessionDep, id: int, enabled: bool, trans: Trans):
7676
@router.get("/export", summary=f"{PLACEHOLDER_PREFIX}export_dt")
7777
@system_log(LogConfig(operation_type=OperationType.EXPORT, module=OperationModules.DATA_TRAINING))
7878
async def export_excel(session: SessionDep, trans: Trans, current_user: CurrentUser,
79-
question: Optional[str] = Query(None, description="搜索术语(可选)")):
79+
question: Optional[str] = Query(None, description="搜索术语(可选)"),
80+
ds_list: Optional[list[int]] = Query(None, description="数据集ID集合(可选)"),
81+
adv_list: Optional[list[int]] = Query(None, description="高级应用ID集合(可选)")):
8082
def inner():
81-
_list = get_all_data_training(session, question, oid=current_user.oid)
83+
_list = get_all_data_training(session, question, oid=current_user.oid, ds_list=ds_list, adv_list=adv_list)
8284

8385
data_list = []
8486
for obj in _list:

‎backend/apps/data_training/curd/data_training.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,13 @@ def page_data_training(session: SessionDep, current_page: int = 1, page_size: in
154154
return current_page, page_size, total_count, total_pages, _list
155155

156156

157-
def get_all_data_training(session: SessionDep, name: Optional[str] = None, oid: Optional[int] = 1):
157+
def get_all_data_training(session: SessionDep, name: Optional[str] = None, oid: Optional[int] = 1,
158+
ds_list: Optional[list[int]] = None, adv_list: Optional[list[int]] = None):
158159
"""
159160
获取所有数据训练(不分页)
160161
"""
161162
stmt, total_count, total_pages, current_page, page_size = build_data_training_query(
162-
session, oid, name, False
163+
session, oid, name, False, ds_list=ds_list, adv_list=adv_list
163164
)
164165
_list = execute_data_training_query(session, stmt)
165166

‎backend/apps/terminology/api/terminology.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,11 @@ async def enable(session: SessionDep, id: int, enabled: bool, trans: Trans):
7171
@router.get("/export", summary=f"{PLACEHOLDER_PREFIX}export_term")
7272
@system_log(LogConfig(operation_type=OperationType.EXPORT, module=OperationModules.TERMINOLOGY))
7373
async def export_excel(session: SessionDep, trans: Trans, current_user: CurrentUser,
74-
word: Optional[str] = Query(None, description="搜索术语(可选)")):
74+
word: Optional[str] = Query(None, description="搜索术语(可选)"),
75+
ds_list: Optional[list[int]] = Query(None, description="数据集ID集合(可选)"),
76+
adv_list: Optional[list[int]] = Query(None, description="高级应用ID集合(可选)")):
7577
def inner():
76-
_list = get_all_terminology(session, word, oid=current_user.oid)
78+
_list = get_all_terminology(session, word, oid=current_user.oid, ds_list=ds_list, adv_list=adv_list)
7779

7880
data_list = []
7981
for obj in _list:

‎backend/apps/terminology/curd/terminology.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,13 @@ def page_terminology(session: SessionDep, current_page: int = 1, page_size: int
230230
return current_page, page_size, total_count, total_pages, _list
231231

232232

233-
def get_all_terminology(session: SessionDep, name: Optional[str] = None, oid: Optional[int] = 1):
233+
def get_all_terminology(session: SessionDep, name: Optional[str] = None, oid: Optional[int] = 1,
234+
ds_list: Optional[list[int]] = None, adv_list: Optional[list[int]] = None):
234235
"""
235236
获取所有术语(不分页)
236237
"""
237238
stmt, total_count, total_pages, current_page, page_size = build_terminology_query(
238-
session, oid, name, False
239+
session, oid, name, False, ds_list=ds_list, adv_list=adv_list
239240
)
240241
_list = execute_terminology_query(session, stmt)
241242

‎frontend/src/api/professional.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ export const professionalApi = {
88
getOne: (id: any) => request.get(`/system/terminology/${id}`),
99
enable: (id: any, enabled: any) => request.get(`/system/terminology/${id}/enable/${enabled}`),
1010
export2Excel: (params: any) =>
11-
request.get(`/system/terminology/export`, {
12-
params,
11+
request.get(`/system/terminology/export${params}`, {
1312
responseType: 'blob',
1413
requestOptions: { customError: true },
1514
}),

‎frontend/src/api/prompt.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ export const promptApi = {
77
deleteEmbedded: (params: any) => request.delete('/system/custom_prompt', { data: params }),
88
getOne: (id: any) => request.get(`/system/custom_prompt/${id}`),
99
export2Excel: (type: any, params: any) =>
10-
request.get(`/system/custom_prompt/${type}/export`, {
11-
params,
10+
request.post(`/system/custom_prompt/${type}/export`, params, {
1211
responseType: 'blob',
1312
requestOptions: { customError: true },
1413
}),

‎frontend/src/api/training.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ export const trainingApi = {
88
getOne: (id: any) => request.get(`/system/data-training/${id}`),
99
enable: (id: any, enabled: any) => request.get(`/system/data-training/${id}/enable/${enabled}`),
1010
export2Excel: (params: any) =>
11-
request.get(`/system/data-training/export`, {
12-
params,
11+
request.get(`/system/data-training/export${params}`, {
1312
responseType: 'blob',
1413
requestOptions: { customError: true },
1514
}),

‎frontend/src/views/system/professional/index.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ const exportExcel = () => {
9898
}).then(() => {
9999
searchLoading.value = true
100100
professionalApi
101-
.export2Excel(keywords.value ? { word: keywords.value } : {})
101+
.export2Excel(configParams())
102102
.then((res) => {
103103
const blob = new Blob([res], {
104104
type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',

‎frontend/src/views/system/prompt/index.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ const exportExcel = () => {
135135
}).then(() => {
136136
searchLoading.value = true
137137
promptApi
138-
.export2Excel(currentType.value, keywords.value ? { name: keywords.value } : {})
138+
.export2Excel(currentType.value, configParams())
139139
.then((res) => {
140140
const blob = new Blob([res], {
141141
type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',

‎frontend/src/views/system/training/index.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ const exportExcel = () => {
9999
}).then(() => {
100100
searchLoading.value = true
101101
trainingApi
102-
.export2Excel(keywords.value ? { question: keywords.value } : {})
102+
.export2Excel(configParams())
103103
.then((res) => {
104104
const blob = new Blob([res], {
105105
type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',

0 commit comments

Comments
 (0)