diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue index ac6e7f230e..d08e699d3f 100644 --- a/frontend/src/components/widget/DeWidget/DeSelect.vue +++ b/frontend/src/components/widget/DeWidget/DeSelect.vue @@ -47,7 +47,7 @@ export default { }, methods: { changeValue(value) { - this.inDraw && this.$emit('set-condition-value', { component: this.element, value: value, operator: this.operator }) + this.inDraw && this.$emit('set-condition-value', { component: this.element, value: [value], operator: this.operator }) } } } diff --git a/frontend/src/components/widget/drawServiceImpl/MySelectImpl.js b/frontend/src/components/widget/drawServiceImpl/MySelectImpl.js index 96efa05c0e..03ab4b8abe 100644 --- a/frontend/src/components/widget/drawServiceImpl/MySelectImpl.js +++ b/frontend/src/components/widget/drawServiceImpl/MySelectImpl.js @@ -44,6 +44,7 @@ class MySelectImpl extends DrawWidgetService { Object.assign(options, { name: 'mySelectWidget' }) super(options) this.filterDialog = true + this.showSwitch = true } initLeftPanel() { diff --git a/frontend/src/views/panel/filter/filterDialog.vue b/frontend/src/views/panel/filter/filterDialog.vue index bd9ef8a2da..cb5c2460eb 100644 --- a/frontend/src/views/panel/filter/filterDialog.vue +++ b/frontend/src/views/panel/filter/filterDialog.vue @@ -106,14 +106,17 @@
- 备选项1 - 备选项 + 自定义控制范围 + +
@@ -182,7 +185,8 @@ export default { }, selectField: [], widget: null, - fieldValues: [] + fieldValues: [], + customRange: false } }, @@ -329,6 +333,12 @@ export default { closeItem(tag) { const index = tag.index this.selectField.splice(index, 1) + }, + showFilterRange() { + // 如果不是自定义范围 直接返回 + if (!this.customRange) { + return + } } } } @@ -461,5 +471,17 @@ export default { width: 100%; height: 100%; } + .i-filter { + text-align: center; + margin-left: 5px; + margin-top: 1px; + } + .i-filter-inactive { + color: #9ea6b2!important; + cursor: not-allowed!important; + } + .i-filter-active { + cursor: pointer!important; + }