Merge pull request #8602 from dataease/pr@dev_dataset_loading

fix(数据集): 数据集预览时,当数据在loading时,只在局部显示loading,其他区域比如编辑,可以正常操作。
This commit is contained in:
dataeaseShu 2024-03-20 14:56:54 +08:00 committed by GitHub
commit 546ce25d51
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -114,6 +114,7 @@
name="dataPreview"
>
<tab-data-preview
v-loading="tableLoading"
:param="param"
:table="table"
:fields="fields"
@ -286,6 +287,7 @@ export default {
table: {
name: ''
},
tableLoading: false,
fields: [],
exportDatasetLoading: false,
filedList: [],
@ -376,6 +378,7 @@ export default {
post('/dataset/table/getWithPermission/' + id, null)
.then((response) => {
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
})
}
},