github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 12:03:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
Pr@dev v2 dzz
This commit is contained in:
dataeaseShu 2023-10-30 11:50:06 +08:00 committed by GitHub
commit 69b5bb0a2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/core-frontend/src/components/data-visualization/DvToolbar.vue
View File

@ -152,8 +152,8 @@ eventBus.on('clearCanvas', clearCanvas)
</div> </div>
<div class="middle-area"></div> <div class="middle-area"></div>
</template> </template>
<template v-else-if="!isDataEaseBi"> <template v-else>
<el-icon class="custom-el-icon back-icon" @click="backToMain()"> <el-icon v-if="!isDataEaseBi" class="custom-el-icon back-icon" @click="backToMain()">
<Icon class="toolbar-icon" name="icon_left_outlined" /> <Icon class="toolbar-icon" name="icon_left_outlined" />
</el-icon> </el-icon>
<div class="left-area"> <div class="left-area">

1
core/core-frontend/src/custom-component/v-query/Component.vue
View File

@ -184,6 +184,7 @@ onMounted(() => {
emitter.on(`addQueryCriteria${element.value.id}`, addCriteriaConfigOut) emitter.on(`addQueryCriteria${element.value.id}`, addCriteriaConfigOut)
emitter.on(`editQueryCriteria${element.value.id}`, editQueryCriteria) emitter.on(`editQueryCriteria${element.value.id}`, editQueryCriteria)
emitter.on(`updateQueryCriteria${element.value.id}`, updateQueryCriteria) emitter.on(`updateQueryCriteria${element.value.id}`, updateQueryCriteria)
updateQueryCriteria()
}) })
const dragover = () => { const dragover = () => {

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

@ -729,10 +729,17 @@ defineExpose({
value="0" value="0"
/> />
<el-option <el-option
v-if="curComponent.displayType === '2'"
:disabled="curComponent.displayType !== '2'" :disabled="curComponent.displayType !== '2'"
label="数字下拉" label="数字下拉"
value="2" value="2"
/> />
<el-option
v-else
:disabled="curComponent.displayType !== '5'"
label="数字下拉"
value="5"
/>
<el-option <el-option
:disabled="!['1', '7'].includes(curComponent.displayType)" :disabled="!['1', '7'].includes(curComponent.displayType)"
label="时间" label="时间"