fix: 视图过滤器支持与或关系配置优化

This commit is contained in:
dataeaseShu 2023-12-21 11:04:38 +08:00
parent a467297ac5
commit a9d75a2f1d
3 changed files with 11 additions and 10 deletions

View File

@ -2073,7 +2073,7 @@ export default {
},
computed: {
filedList() {
return [...this.dimension, ...this.quota]
return [...this.dimension, ...this.quota].filter(ele => ele.id !== 'count')
},
obj() {
return {

View File

@ -16,15 +16,16 @@
slot="footer"
class="dialog-footer"
>
<el-button
<de-btn
secondary
@click="closeFilter"
>{{ $t('chart.cancel') }}
</el-button>
<el-button
</de-btn>
<de-btn
type="primary"
@click="changeFilter"
>{{ $t('chart.confirm') }}
</el-button>
</de-btn>
</div>
</el-dialog>
</template>
@ -105,13 +106,13 @@ export default {
<style lang="scss">
.filter-tree-cont {
.tree-cont {
height: 200px;
min-height: 67px;
width: 100%;
padding: 16px;
border-radius: 4px;
border: 1px solid var(--deBorderBase, #DCDFE6);
overflow: auto;
max-height: 500px;
.content {
height: 100%;
width: 100%;

View File

@ -350,8 +350,8 @@ export default {
}
this.showTextArea = true
},
filterTypeChange() {
this.item.term = ''
filterTypeChange(val) {
this.item.term = val === 'logic' ? 'eq' : ''
this.item.value = ''
this.initEnumOptions()
},
@ -389,7 +389,7 @@ export default {
filterType: 'logic',
enumValue: '',
value: '',
term: ''
term: 'eq'
})
this.filterListInit(deType)
this.checklist = []