dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7245 from dataease/pr@dev_one_dot_x

Browse Source 
Pr@dev one dot x
This commit is contained in:
dataeaseShu 2023-12-21 11:06:50 +08:00 committed by GitHub
commit bc5b773afd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/frontend/src/views/chart/view/ChartEdit.vue
View File

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

13
core/frontend/src/views/chart/view/FilterTree.vue
View File

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

6
core/frontend/src/views/dataset/data/components/filterFiled.vue
View File

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

3
core/frontend/src/views/msg/Setting.vue
View File

@ -136,6 +136,9 @@ export default {
} else if (node.indeterminate_number_map[key] > 0) { } else if (node.indeterminate_number_map[key] > 0) {
node.check_all_map[key] = false node.check_all_map[key] = false
node.indeterminate_map[key] = true node.indeterminate_map[key] = true
} else {
node.check_all_map[key] = false
node.indeterminate_map[key] = false
} }
} }
} }