Merge pull request #8602 from dataease/pr@dev_dataset_loading
fix(数据集): 数据集预览时,当数据在loading时,只在局部显示loading,其他区域比如编辑,可以正常操作。
This commit is contained in:
commit
546ce25d51
@ -114,6 +114,7 @@
|
|||||||
name="dataPreview"
|
name="dataPreview"
|
||||||
>
|
>
|
||||||
<tab-data-preview
|
<tab-data-preview
|
||||||
|
v-loading="tableLoading"
|
||||||
:param="param"
|
:param="param"
|
||||||
:table="table"
|
:table="table"
|
||||||
:fields="fields"
|
:fields="fields"
|
||||||
@ -286,6 +287,7 @@ export default {
|
|||||||
table: {
|
table: {
|
||||||
name: ''
|
name: ''
|
||||||
},
|
},
|
||||||
|
tableLoading: false,
|
||||||
fields: [],
|
fields: [],
|
||||||
exportDatasetLoading: false,
|
exportDatasetLoading: false,
|
||||||
filedList: [],
|
filedList: [],
|
||||||
@ -376,6 +378,7 @@ export default {
|
|||||||
post('/dataset/table/getWithPermission/' + id, null)
|
post('/dataset/table/getWithPermission/' + id, null)
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
this.table = response.data
|
this.table = response.data
|
||||||
|
this.$cancelRequest('/dataset/table/getPreviewData/**')
|
||||||
this.initPreviewData(this.page)
|
this.initPreviewData(this.page)
|
||||||
})
|
})
|
||||||
.catch((res) => {
|
.catch((res) => {
|
||||||
@ -386,11 +389,12 @@ export default {
|
|||||||
|
|
||||||
initPreviewData(page) {
|
initPreviewData(page) {
|
||||||
if (this.table.id) {
|
if (this.table.id) {
|
||||||
|
this.tableLoading = true
|
||||||
this.table.row = this.tableViewRowForm.row
|
this.table.row = this.tableViewRowForm.row
|
||||||
post(
|
post(
|
||||||
'/dataset/table/getPreviewData/' + page.page + '/' + page.pageSize,
|
'/dataset/table/getPreviewData/' + page.page + '/' + page.pageSize,
|
||||||
this.table,
|
this.table,
|
||||||
true,
|
false,
|
||||||
30000
|
30000
|
||||||
)
|
)
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
@ -408,6 +412,7 @@ export default {
|
|||||||
this.previewDataSuccess = false
|
this.previewDataSuccess = false
|
||||||
}
|
}
|
||||||
this.lastRequestComplete = true
|
this.lastRequestComplete = true
|
||||||
|
this.tableLoading = false
|
||||||
})
|
})
|
||||||
.catch((response) => {
|
.catch((response) => {
|
||||||
this.lastRequestComplete = true
|
this.lastRequestComplete = true
|
||||||
@ -419,6 +424,10 @@ export default {
|
|||||||
show: 0
|
show: 0
|
||||||
}
|
}
|
||||||
this.previewDataSuccess = false
|
this.previewDataSuccess = false
|
||||||
|
if(this.$currentHttpRequestList.some((item, key) => {
|
||||||
|
return key.indexOf('dataset/table/getPreviewData') > -1
|
||||||
|
})) return
|
||||||
|
this.tableLoading = false
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user