+
+
+
+
+
+
+
+ {{ $t('commons.confirm') }}
+ {{ $t('commons.cancel') }}
+
+
+
+
+
+
diff --git a/frontend/src/views/panel/filter/index.vue b/frontend/src/views/panel/filter/index.vue
index 394c37dc9c..a99b39cf2a 100644
--- a/frontend/src/views/panel/filter/index.vue
+++ b/frontend/src/views/panel/filter/index.vue
@@ -9,7 +9,7 @@
v-for="(widget, index) in item"
:key="widget.widgetName+index"
:data-id="widget.widgetName"
- :draggable="widget.widgetName !== 'buttonSureWidget' || !searchButtonExist"
+ :draggable="(widget.widgetName !== 'buttonSureWidget' && widget.widgetName !== 'buttonResetWidget') || (widget.widgetName === 'buttonSureWidget' && !searchButtonExist) || (widget.widgetName === 'buttonResetWidget' && searchButtonExist)"
:data-index="index"
:class="'filter-widget '+ (widget.defaultClass || '')"
>
@@ -56,7 +56,8 @@ export default {
'numberRangeWidget'
],
'按钮': [
- 'buttonSureWidget'
+ 'buttonSureWidget',
+ 'buttonResetWidget'
]
}
}
@@ -69,17 +70,39 @@ export default {
]),
searchButtonExist() {
return this.componentData && this.componentData.some(component => component.type === 'custom-button' && component.serviceName === 'buttonSureWidget')
+ },
+ resetButtonExist() {
+ return this.componentData && this.componentData.some(component => component.type === 'custom-button' && component.serviceName === 'buttonResetWidget')
+ },
+ resetButtonDisable() {
+ return !this.resetButtonExist && this.searchButtonExist
}
},
watch: {
searchButtonExist(val, old) {
if (val === old) return
if (val) {
- this.widgetSubjects['按钮'][0].widgetName = 'buttonSureWidget'
this.widgetSubjects['按钮'][0].defaultClass = 'button-disable-filter'
+ if (this.resetButtonExist) {
+ this.widgetSubjects['按钮'][1].defaultClass = 'button-disable-filter'
+ } else {
+ this.widgetSubjects['按钮'][1].defaultClass = 'time-filter'
+ }
} else {
- this.widgetSubjects['按钮'][0].widgetName = 'buttonSureWidget'
this.widgetSubjects['按钮'][0].defaultClass = 'time-filter'
+ this.widgetSubjects['按钮'][1].defaultClass = 'button-disable-filter'
+ }
+ },
+ resetButtonExist(val, old) {
+ if (val === old) return
+ if (val) {
+ this.widgetSubjects['按钮'][1].defaultClass = 'button-disable-filter'
+ } else {
+ if (this.searchButtonExist) {
+ this.widgetSubjects['按钮'][1].defaultClass = 'time-filter'
+ } else {
+ this.widgetSubjects['按钮'][1].defaultClass = 'button-disable-filter'
+ }
}
}
},
@@ -98,6 +121,9 @@ export default {
if (this.searchButtonExist && widgetName === 'buttonSureWidget') {
result.defaultClass = 'button-disable-filter'
}
+ if (!this.searchButtonExist && widgetName === 'buttonResetWidget') {
+ result.defaultClass = ' button-disable-filter'
+ }
return result
})
}