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

Merge pull request #6619 from dataease/pr@dev@feat_filter_required

Browse Source 
feat: 过滤器设置为必填选项
This commit is contained in:
fit2cloud-chenyw 2023-11-09 16:30:09 +08:00 committed by GitHub
commit 46a4c07b1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 67 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/frontend/src/components/widget/deWidget/DeDate.vue
View File

@ -226,7 +226,11 @@ export default {
},
watch: {
'values': function(val, old) {
if (!this.inDraw) {
this.$emit('widget-value-changed', val)
}
},
'viewIds': function(value, old) {
if (typeof value === 'undefined' || value === old) return
this.setCondition()

5
core/frontend/src/components/widget/deWidget/DeInputSearch.vue
View File

@ -66,6 +66,11 @@ export default {
}
},
watch: {
'value': function(val, old) {
if (!this.inDraw) {
this.$emit('widget-value-changed', val)
}
},
'viewIds': function(value, old) {
if (typeof value === 'undefined' || value === old) return
this.setCondition()

10
core/frontend/src/components/widget/deWidget/DeNumberRange.vue
View File

@ -105,6 +105,16 @@ export default {
}
},
watch: {
'form.min': function(val, old) {
if (!this.inDraw) {
this.$emit('widget-value-changed', val)
}
},
'form.max': function(val, old) {
if (!this.inDraw) {
this.$emit('widget-value-changed', val)
}
},
'viewIds': function(value, old) {
if (typeof value === 'undefined' || value === old) return
this.setCondition()

5
core/frontend/src/components/widget/deWidget/DeSelectGrid.vue
View File

@ -148,6 +148,11 @@ export default {
}
},
watch: {
'value': function(val, old) {
if (!this.inDraw) {
this.$emit('widget-value-changed', val)
}
},
'viewIds': function(value, old) {
if (typeof value === 'undefined' || value === old) return
this.setCondition()

5
core/frontend/src/components/widget/deWidget/DeSelectTree.vue
View File

@ -122,6 +122,11 @@ export default {
},
watch: {
'value': function(val, old) {
if (!this.inDraw) {
this.$emit('widget-value-changed', val)
}
},
'viewIds': function(value, old) {
if (typeof value === 'undefined' || value === old) return
this.setCondition()

6
core/frontend/src/views/panel/filter/FilterDialog.vue
View File

@ -477,7 +477,11 @@ export default {
},
methods: {
widgetValChange(val) {
this.widgetValue = val
if (val === null) {
this.widgetValue = null
return
}
this.widgetValue = val.toString()
},
requiredChange(val) {
this.required = val

16
core/frontend/src/views/panel/filter/defaultValue/DeDateDefault.vue
View File

@ -138,6 +138,7 @@
:style="element.style"
:element="element"
:in-draw="false"
@widget-value-changed="widgetValChanged"
/>
</el-form-item>
@ -195,11 +196,26 @@ export default {
return 2
}
},
watch: {
'dval': function(val, old) {
if (this.element.options.attrs.default.isDynamic) {
this.$emit('widget-value-changed', val)
}
}
},
created() {
this.setDval()
},
methods: {
widgetValChanged(val) {
if (!this.element.options.attrs.default.isDynamic) {
this.$emit('widget-value-changed', val)
}
},
dynamicChange(value) {
if (!value) {
this.$emit('widget-value-changed', this.element.options.value)
}
this.setDval()
},
dkeyChange(value) {

16
core/frontend/src/views/panel/filter/defaultValue/DeDateRangeDefault.vue
View File

@ -275,6 +275,7 @@
:element="element"
class="relative-time"
:in-draw="false"
@widget-value-changed="widgetValChanged"
/>
</el-form-item>
@ -334,12 +335,27 @@ export default {
return result
}
},
watch: {
'dval': function(val, old) {
if (this.element.options.attrs.default.isDynamic) {
this.$emit('widget-value-changed', val)
}
}
},
created() {
this.fillEmptySuffixTime()
this.setDval()
},
methods: {
widgetValChanged(val) {
if (!this.element.options.attrs.default.isDynamic) {
this.$emit('widget-value-changed', val)
}
},
dynamicChange(value) {
if (!value) {
this.$emit('widget-value-changed', this.element.options.value)
}
this.setDval()
},
dkeyChange(value) {