diff --git a/ui/src/api/application.ts b/ui/src/api/application.ts index cce0add96..d7aac393d 100644 --- a/ui/src/api/application.ts +++ b/ui/src/api/application.ts @@ -85,8 +85,11 @@ const putApplication: ( * 删除应用 * @param 参数 applicaiton_id */ -const delApplication: (applicaiton_id: String) => Promise> = (applicaiton_id) => { - return del(`${prefix}/${applicaiton_id}`) +const delApplication: ( + applicaiton_id: String, + loading?: Ref +) => Promise> = (applicaiton_id, loading) => { + return del(`${prefix}/${applicaiton_id}`, undefined, {}, loading) } /** diff --git a/ui/src/api/dataset.ts b/ui/src/api/dataset.ts index e2d1ba4f1..a0e89b98b 100644 --- a/ui/src/api/dataset.ts +++ b/ui/src/api/dataset.ts @@ -37,8 +37,11 @@ const getAllDateset: (loading?: Ref) => Promise> = (loadi * 删除数据集 * @param 参数 dataset_id */ -const delDateset: (dataset_id: String) => Promise> = (dataset_id) => { - return del(`${prefix}/${dataset_id}`) +const delDateset: (dataset_id: String, loading?: Ref) => Promise> = ( + dataset_id, + loading +) => { + return del(`${prefix}/${dataset_id}`, undefined, {}, loading) } /** diff --git a/ui/src/views/application/index.vue b/ui/src/views/application/index.vue index 8ce465225..2aca347d3 100644 --- a/ui/src/views/application/index.vue +++ b/ui/src/views/application/index.vue @@ -102,14 +102,6 @@ const paginationConfig = reactive({ const searchValue = ref('') -const noMore = computed( - () => - applicationList.value.length > 0 && - applicationList.value.length === paginationConfig.total && - paginationConfig.total > 20 && - !loading.value -) - function searchHandle() { paginationConfig.total = 0 paginationConfig.current_page = 1 @@ -128,17 +120,11 @@ function deleteApplication(row: any) { confirmButtonClass: 'danger' }) .then(() => { - loading.value = true - applicationApi - .delApplication(row.id) - .then(() => { - const index = applicationList.value.findIndex((v) => v.id === row.id) - applicationList.value.splice(index, 1) - MsgSuccess('删除成功') - }) - .catch(() => { - loading.value = false - }) + applicationApi.delApplication(row.id, loading).then(() => { + const index = applicationList.value.findIndex((v) => v.id === row.id) + applicationList.value.splice(index, 1) + MsgSuccess('删除成功') + }) }) .catch(() => {}) } diff --git a/ui/src/views/dataset/index.vue b/ui/src/views/dataset/index.vue index 3612f6d1a..f1b3bce1d 100644 --- a/ui/src/views/dataset/index.vue +++ b/ui/src/views/dataset/index.vue @@ -75,24 +75,6 @@ const paginationConfig = reactive({ const searchValue = ref('') -const noMore = computed( - () => - datasetList.value.length > 0 && - datasetList.value.length === paginationConfig.total && - paginationConfig.total > 20 && - !loading.value -) -const disabledScroll = computed( - () => datasetList.value.length > 0 && (loading.value || noMore.value) -) - -function loadDataset() { - if (paginationConfig.total > paginationConfig.page_size) { - paginationConfig.current_page += 1 - getList() - } -} - function searchHandle() { paginationConfig.current_page = 1 datasetList.value = [] @@ -109,18 +91,11 @@ function deleteDateset(row: any) { } ) .then(() => { - loading.value = true - datasetApi - .delDateset(row.id) - .then(() => { - const index = datasetList.value.findIndex((v) => v.id === row.id) - datasetList.value.splice(index, 1) - MsgSuccess('删除成功') - loading.value = false - }) - .catch(() => { - loading.value = false - }) + datasetApi.delDateset(row.id, loading).then(() => { + const index = datasetList.value.findIndex((v) => v.id === row.id) + datasetList.value.splice(index, 1) + MsgSuccess('删除成功') + }) }) .catch(() => {}) }