diff --git a/core/frontend/src/views/dataset/data/ViewTable.vue b/core/frontend/src/views/dataset/data/ViewTable.vue index f818a8a2b0..2b4c88d11f 100644 --- a/core/frontend/src/views/dataset/data/ViewTable.vue +++ b/core/frontend/src/views/dataset/data/ViewTable.vue @@ -114,6 +114,7 @@ name="dataPreview" > { this.table = response.data + this.$cancelRequest('/dataset/table/getPreviewData/**') this.initPreviewData(this.page) }) .catch((res) => { @@ -386,11 +389,12 @@ export default { initPreviewData(page) { if (this.table.id) { + this.tableLoading = true this.table.row = this.tableViewRowForm.row post( '/dataset/table/getPreviewData/' + page.page + '/' + page.pageSize, this.table, - true, + false, 30000 ) .then((response) => { @@ -408,6 +412,7 @@ export default { this.previewDataSuccess = false } this.lastRequestComplete = true + this.tableLoading = false }) .catch((response) => { this.lastRequestComplete = true @@ -419,6 +424,10 @@ export default { show: 0 } this.previewDataSuccess = false + if(this.$currentHttpRequestList.some((item, key) => { + return key.indexOf('dataset/table/getPreviewData') > -1 + })) return + this.tableLoading = false }) } },