diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index 0df68a58af..d6393f38a5 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -744,6 +744,12 @@ div:focus { border: 1px solid #999999!important; margin: 0 0 6px 6px!important; } - +.de-checkbox { + width: 100%; + margin-left: 0px !important; + .el-checkbox__input { + padding: 0 0 8px 0 !important; + } +} diff --git a/frontend/src/views/panel/filter/filterDialog.vue b/frontend/src/views/panel/filter/filterDialog.vue index 27d429b3c1..28e85e1d8f 100644 --- a/frontend/src/views/panel/filter/filterDialog.vue +++ b/frontend/src/views/panel/filter/filterDialog.vue @@ -7,7 +7,8 @@
- {{ bread.label }} + + {{ bread.label }} {{ bread.label }} @@ -66,7 +67,12 @@ @start="start1" > -
+
{{ item.name }}
@@ -81,7 +87,8 @@
- {{ bread.label }} + + {{ bread.label }} {{ bread.label }} @@ -135,7 +142,12 @@ @start="start1" > -
+
{{ item.name }}
@@ -171,7 +183,13 @@ @end="end2" > - + @@ -192,46 +210,72 @@ />
-
- - 显示标题 - -
- -
+ +
+ + 显示标题 + + +
+ +
- -
-
- - {{ $t('panel.custom_scope') }} + + + + + + {{ $t('panel.custom_scope') }} - -
- - - - - {{ item.name }} - - - -
+ +
+ + +
+ + {{ item.name }} + + {{ item.name }} + +
- - - -
+ + +
+ + +
+
+
@@ -261,11 +305,22 @@ import DeContainer from '@/components/dataease/DeContainer' import DeAsideContainer from '@/components/dataease/DeAsideContainer' import draggable from 'vuedraggable' import DragItem from '@/components/DragItem' -import { mapState } from 'vuex' -// import { ApplicationContext } from '@/utils/ApplicationContext' -import { groupTree, fieldList, fieldValues, post } from '@/api/dataset/dataset' -import { viewsWithIds } from '@/api/panel/view' -import { authModel } from '@/api/system/sysAuth' +import { + mapState +} from 'vuex' + // import { ApplicationContext } from '@/utils/ApplicationContext' +import { + groupTree, + fieldList, + fieldValues, + post +} from '@/api/dataset/dataset' +import { + viewsWithIds +} from '@/api/panel/view' +import { + authModel +} from '@/api/system/sysAuth' export default { name: 'FilterDialog', components: { @@ -292,12 +347,16 @@ export default { activeName: 'dataset', showDomType: 'tree', comShowDomType: 'view', - dataSetBreads: [ - { label: this.$t('panel.data_list'), link: false, type: 'root' } - ], - componentSetBreads: [ - { label: this.$t('panel.component_list'), link: false, type: 'root' } - ], + dataSetBreads: [{ + label: this.$t('panel.data_list'), + link: false, + type: 'root' + }], + componentSetBreads: [{ + label: this.$t('panel.component_list'), + link: false, + type: 'root' + }], datas: [], sceneDatas: [], // viewDatas: [], @@ -441,7 +500,8 @@ export default { // 判断根节点 ### el.type = el.modelInnerType el.isLeaf = el.leaf - if (el[this.defaultProps.parentId] === null || el[this.defaultProps.parentId] === 0 || el[this.defaultProps.parentId] === '0') { + if (el[this.defaultProps.parentId] === null || el[this.defaultProps.parentId] === 0 || el[this + .defaultProps.parentId] === '0') { roots.push(el) return } @@ -512,11 +572,19 @@ export default { tail.link = true }, addTail(node) { - const tail = { link: false, label: node.label || node.name, type: node.type } + const tail = { + link: false, + label: node.label || node.name, + type: node.type + } this.dataSetBreads.push(tail) }, comAddTail(node) { - const tail = { link: false, label: node.label || node.name, type: node.type } + const tail = { + link: false, + label: node.label || node.name, + type: node.type + } this.componentSetBreads.push(tail) }, @@ -529,19 +597,19 @@ export default { return } } - // this.dataSetBreads = this.dataSetBreads.slice(0, this.dataSetBreads.length - 1) - // this.dataSetBreads[this.dataSetBreads.length - 1]['link'] = false + // this.dataSetBreads = this.dataSetBreads.slice(0, this.dataSetBreads.length - 1) + // this.dataSetBreads[this.dataSetBreads.length - 1]['link'] = false }, comRemoveTail() { this.componentSetBreads = this.componentSetBreads.slice(0, this.componentSetBreads.length - 1) this.componentSetBreads[this.componentSetBreads.length - 1]['link'] = false }, backToLink(bread) { - // if (bread.type === 'field') { - // this.showDomType = 'db' - // } else { - // this.showDomType = 'tree' - // } + // if (bread.type === 'field') { + // this.showDomType = 'db' + // } else { + // this.showDomType = 'tree' + // } this.showDomType = 'tree' this.removeTail(bread) @@ -645,7 +713,7 @@ export default { multipleChange(value) { // this.componentInfo.options.attrs.multiple = value - // this.componentInfo.options.value = null + // this.componentInfo.options.value = null this.$emit('re-fresh-component', this.componentInfo) }, @@ -668,16 +736,19 @@ export default { } } } +