Skip to content

fix(Data Source): Add a loading animation to the data table selection… #687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dataeaseShu merged 1 commit into from
Dec 25, 2025
Merged

fix(Data Source): Add a loading animation to the data table selection… #687

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 41 additions & 30 deletions frontend/src/views/ds/DatasourceForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ const checkList = ref<any>([])
const tableList = ref<any>([])
const excelUploadSuccess = ref(false)
const tableListLoading = ref(false)
const tableListLoadingV1 = ref(false)
const checkLoading = ref(false)
const dialogTitle = ref('')
const getUploadURL = import.meta.env.VITE_API_BASE_URL + '/datasource/uploadExcel'
Expand Down Expand Up @@ -167,38 +168,44 @@ const initForm = (item: any, editTable: boolean = false) => {
isCreate.value = false
// request tables and check tables

datasourceApi.tableList(item.id).then((res: any) => {
checkList.value = res.map((ele: any) => {
return ele.table_name
})
if (item.type === 'excel') {
tableList.value = form.value.sheets
nextTick(() => {
handleCheckedTablesChange([...checkList.value])
tableListLoadingV1.value = true
datasourceApi
.tableList(item.id)
.then((res: any) => {
checkList.value = res.map((ele: any) => {
return ele.table_name
})
} else {
tableListLoading.value = true
const requestObj = buildConf()
datasourceApi
.getTablesByConf(requestObj)
.then((table) => {
tableList.value = table
checkList.value = checkList.value.filter((ele: string) => {
return table
.map((ele: any) => {
return ele.tableName
})
.includes(ele)
if (item.type === 'excel') {
tableList.value = form.value.sheets
nextTick(() => {
handleCheckedTablesChange([...checkList.value])
})
} else {
tableListLoading.value = true
const requestObj = buildConf()
datasourceApi
.getTablesByConf(requestObj)
.then((table) => {
tableList.value = table
checkList.value = checkList.value.filter((ele: string) => {
return table
.map((ele: any) => {
return ele.tableName
})
.includes(ele)
})
nextTick(() => {
handleCheckedTablesChange([...checkList.value])
})
})
nextTick(() => {
handleCheckedTablesChange([...checkList.value])
.finally(() => {
tableListLoading.value = false
})
})
.finally(() => {
tableListLoading.value = false
})
}
})
}
})
.finally(() => {
tableListLoadingV1.value = false
})
}
} else {
dialogTitle.value = t('ds.form.title.add')
Expand Down Expand Up @@ -708,7 +715,11 @@ defineExpose({
</el-form-item>
</div>
</el-form>
<div v-show="activeStep === 2" v-loading="tableListLoading" class="select-data_table">
<div
v-show="activeStep === 2"
v-loading="tableListLoading || tableListLoadingV1"
class="select-data_table"
>
<div class="title">
{{ $t('ds.form.choose_tables') }} ({{ checkTableList.length }}/ {{ tableList.length }})
</div>
Expand Down