center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: API 数据源更新数据

Browse Source
This commit is contained in:
taojinlong 2023-12-04 16:22:22 +08:00
parent d1107c5625
commit 0db5bb3eec
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
View File

@ -121,7 +121,7 @@ const initForm = type => {
updateType: 'all_scope', updateType: 'all_scope',
syncRate: 'SIMPLE_CRON', syncRate: 'SIMPLE_CRON',
simpleCronValue: '1', simpleCronValue: '1',
simpleCronType: 'hour', simpleCronType: 'minute',
startTime: '', startTime: '',
endTime: '', endTime: '',
endLimit: '0', endLimit: '0',
@ -363,6 +363,7 @@ const onRateChange = () => {
} }
if (form.value.syncSetting.syncRate === 'SIMPLE_CRON') { if (form.value.syncSetting.syncRate === 'SIMPLE_CRON') {
form.value.syncSetting.cron = '0 0 0/1 * * ? *' form.value.syncSetting.cron = '0 0 0/1 * * ? *'
form.value.syncSetting.simpleCronType = 'minute'
} }
if (form.value.syncSetting.syncRate === 'CRON') { if (form.value.syncSetting.syncRate === 'CRON') {
form.value.syncSetting.cron = '00 00 * ? * * *' form.value.syncSetting.cron = '00 00 * ? * * *'

46
core/core-frontend/src/views/visualized/data/datasource/form/index.vue
View File

@ -42,7 +42,7 @@ const { t } = useI18n()
const creatDsFolder = ref() const creatDsFolder = ref()
const router = useRouter() const router = useRouter()
const { wsCache } = useCache() const { wsCache } = useCache()
const dsLoading = ref(false)
const state = reactive({ const state = reactive({
datasourceTree: [] datasourceTree: []
}) })
@ -394,21 +394,37 @@ const saveDS = () => {
if (res) { if (res) {
ElMessageBox.confirm(t('datasource.has_same_ds'), options as ElMessageBoxOptions).then( ElMessageBox.confirm(t('datasource.has_same_ds'), options as ElMessageBoxOptions).then(
() => { () => {
save(request).then(res => { if (dsLoading.value === true) {
if (res !== undefined) { return
handleShowFinishPage({ id: res.id, name: res.name }) }
ElMessage.success('保存数据源成功') dsLoading.value = true
} save(request)
}) .then(res => {
if (res !== undefined) {
handleShowFinishPage({ id: res.id, name: res.name })
ElMessage.success('保存数据源成功')
}
})
.finally(() => {
dsLoading.value = false
})
} }
) )
} else { } else {
save(request).then(res => { if (dsLoading.value === true) {
if (res !== undefined) { return
handleShowFinishPage({ id: res.id, name: res.name }) }
ElMessage.success('保存数据源成功') dsLoading.value = true
} save(request)
}) .then(res => {
if (res !== undefined) {
handleShowFinishPage({ id: res.id, name: res.name })
ElMessage.success('保存数据源成功')
}
})
.finally(() => {
dsLoading.value = false
})
} }
}) })
} else { } else {
@ -609,7 +625,7 @@ defineExpose({
</template> </template>
</el-tree> </el-tree>
</div> </div>
<div class="ds-editor" :class="editDs && 'edit-ds'"> <div class="ds-editor" :class="editDs && 'edit-ds'" v-loading="dsLoading">
<div v-show="activeStep !== 0 && !editDs" class="ds-type-title"> <div v-show="activeStep !== 0 && !editDs" class="ds-type-title">
{{ typeTitle }} {{ typeTitle }}
</div> </div>
@ -633,7 +649,7 @@ defineExpose({
</template> </template>
</div> </div>
</div> </div>
<div class="editor-footer"> <div class="editor-footer" v-loading="dsLoading">
<el-button secondary @click="visible = false"> {{ t('common.cancel') }}</el-button> <el-button secondary @click="visible = false"> {{ t('common.cancel') }}</el-button>
<el-button <el-button
v-show="!(activeStep === 0 || (editDs && activeApiStep <= 1))" v-show="!(activeStep === 0 || (editDs && activeApiStep <= 1))"