github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 11:32:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #7582 from dataease/pr@dev-v2_dzz

Browse Source 
Pr@dev v2 dzz
This commit is contained in:
dataeaseShu 2024-01-11 14:00:00 +08:00 committed by GitHub
commit 9308b27ee3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
View File

@ -689,6 +689,7 @@ const addOperation = (cmd, condition, index) => {
case 'del': case 'del':
renameInput.value = [] renameInput.value = []
conditions.value.splice(index, 1) conditions.value.splice(index, 1)
curComponent.value = null
break break
case 'rename': case 'rename':
renameInput.value = [] renameInput.value = []
@ -820,7 +821,7 @@ defineExpose({
</template> </template>
</draggable> </draggable>
</div> </div>
<div class="chart-field" :class="curComponent.auto && 'hidden'"> <div v-if="!!curComponent" class="chart-field" :class="curComponent.auto && 'hidden'">
<div class="mask" v-if="curComponent.auto"></div> <div class="mask" v-if="curComponent.auto"></div>
<div class="title flex-align-center"> <div class="title flex-align-center">
选择关联图表及字段 选择关联图表及字段
@ -917,7 +918,7 @@ defineExpose({
</el-checkbox-group> </el-checkbox-group>
</div> </div>
</div> </div>
<div class="condition-configuration"> <div v-if="!!curComponent" class="condition-configuration">
<div class="mask condition" v-if="curComponent.auto"></div> <div class="mask condition" v-if="curComponent.auto"></div>
<div class="title flex-align-center"> <div class="title flex-align-center">
查询条件配置 查询条件配置

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

@ -638,16 +638,26 @@ const onChange = file => {
fileList = file fileList = file
} }
const replaceLoading = ref(false)
const addLoading = ref(false)
const uploadExcel = editType => { const uploadExcel = editType => {
const formData = new FormData() const formData = new FormData()
formData.append('file', fileList.raw) formData.append('file', fileList.raw)
formData.append('type', '') formData.append('type', '')
formData.append('editType', editType) formData.append('editType', editType)
formData.append('id', (nodeInfo.id || 0) as string) formData.append('id', (nodeInfo.id || 0) as string)
return uploadFile(formData).then(res => { replaceLoading.value = editType === 0
nodeInfo.editType = editType addLoading.value = editType === 1
datasourceEditor.value.init(nodeInfo, nodeInfo.id, res) return uploadFile(formData)
}) .then(res => {
nodeInfo.editType = editType
datasourceEditor.value.init(nodeInfo, nodeInfo.id, res)
})
.finally(() => {
replaceLoading.value = false
addLoading.value = false
})
} }
const activeName = ref('table') const activeName = ref('table')
const defaultProps = { const defaultProps = {
@ -839,7 +849,7 @@ const getMenuList = (val: boolean) => {
name="file" name="file"
> >
<template #trigger> <template #trigger>
<el-button class="replace-excel" type="primary"> <el-button v-loading="replaceLoading" class="replace-excel" type="primary">
<template #icon> <template #icon>
<Icon name="icon_edit_outlined"></Icon> <Icon name="icon_edit_outlined"></Icon>
</template> </template>
@ -860,7 +870,7 @@ const getMenuList = (val: boolean) => {
name="file" name="file"
> >
<template #trigger> <template #trigger>
<el-button type="primary"> <el-button v-loading="addLoading" type="primary">
<template #icon> <template #icon>
<Icon name="icon_new-item_outlined"></Icon> <Icon name="icon_new-item_outlined"></Icon>
</template> </template>