forked from github/dataease
fix: 添加一个数据集后能否直接关闭数据集创建页面或者给个选择
This commit is contained in:
parent
a888a09cd0
commit
94ec27862c
@ -2,6 +2,7 @@
|
||||
import { ref, reactive, computed, watch, nextTick } from 'vue'
|
||||
import { ElMessage } from 'element-plus-secondary'
|
||||
import { useI18n } from '@/hooks/web/useI18n'
|
||||
import { useEmitt } from '@/hooks/web/useEmitt'
|
||||
import {
|
||||
getDatasetTree,
|
||||
moveDatasetTree,
|
||||
@ -270,6 +271,7 @@ const saveDataset = () => {
|
||||
ElMessage.success('重命名成功')
|
||||
break
|
||||
default:
|
||||
useEmitt().emitter.emit('onDatasetSave')
|
||||
ElMessage.success(t('common.save_success'))
|
||||
break
|
||||
}
|
||||
|
@ -11,6 +11,7 @@ import {
|
||||
onBeforeUnmount
|
||||
} from 'vue'
|
||||
import { useI18n } from '@/hooks/web/useI18n'
|
||||
import { useEmitt } from '@/hooks/web/useEmitt'
|
||||
import { ElIcon, ElMessageBox, ElMessage } from 'element-plus-secondary'
|
||||
import type { Action } from 'element-plus-secondary'
|
||||
import FieldMore from './FieldMore.vue'
|
||||
@ -316,6 +317,9 @@ const editeSave = () => {
|
||||
})
|
||||
.then(() => {
|
||||
ElMessage.success('保存成功')
|
||||
if (willBack) {
|
||||
pushDataset()
|
||||
}
|
||||
})
|
||||
.finally(() => {
|
||||
loading.value = false
|
||||
@ -822,8 +826,17 @@ const handleResize = debounce(() => {
|
||||
}
|
||||
dragHeight.value = clientHeight - sqlResultHeight.value - 56
|
||||
}, 60)
|
||||
let willBack = false
|
||||
const saveAndBack = () => {
|
||||
if (!willBack) return
|
||||
pushDataset()
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
useEmitt({
|
||||
name: 'onDatasetSave',
|
||||
callback: saveAndBack
|
||||
})
|
||||
window.addEventListener('resize', handleResize)
|
||||
getSqlResultHeight()
|
||||
quotaTableHeight.value = sqlResultHeight.value - 242
|
||||
@ -868,6 +881,10 @@ const datasetSave = () => {
|
||||
datasetName.value
|
||||
)
|
||||
}
|
||||
const datasetSaveAndBack = () => {
|
||||
willBack = true
|
||||
datasetSave()
|
||||
}
|
||||
|
||||
const datasetPreviewLoading = ref(false)
|
||||
|
||||
@ -1118,6 +1135,9 @@ const getDsIconName = data => {
|
||||
</template>
|
||||
</span>
|
||||
<span class="oprate">
|
||||
<el-button :disabled="showInput" type="primary" @click="datasetSaveAndBack"
|
||||
>保存并返回</el-button
|
||||
>
|
||||
<el-button :disabled="showInput" type="primary" @click="datasetSave">保存</el-button>
|
||||
</span>
|
||||
</div>
|
||||
|
Loading…
Reference in New Issue
Block a user