Skip to content

Beautiful Open-Source Form Builder

Fix logic actions options (#136)

formsdeva1e2f7b21db2
diff --git a/resources/js/components/open/forms/components/form-logic-components/FormBlockLogicEditor.vue b/resources/js/components/open/forms/components/form-logic-components/FormBlockLogicEditor.vue
index 32399f6f2..b6d78a635 100644
--- a/resources/js/components/open/forms/components/form-logic-components/FormBlockLogicEditor.vue
+++ b/resources/js/components/open/forms/components/form-logic-components/FormBlockLogicEditor.vue
@@ -154,12 +154,9 @@ export default {
},
deep: true
},
- 'field.required': {
- handler() {
- this.cleanConditions()
- },
- deep: true
- }
+ 'field.required': 'cleanConditions',
+ 'field.disabled': 'cleanConditions',
+ 'field.hidden': 'cleanConditions',
},
mounted() {
@@ -185,12 +182,9 @@ export default {
}
},
cleanConditions() {
- if (this.required && this.logic.actions.includes('require-answer')) {
- this.$set(this.logic, 'actions', this.logic.actions.filter((action) => action !== 'require-answer'))
- } else if (!this.required && this.logic.actions.includes('make-it-optional')) {
- this.$set(this.logic, 'actions', this.logic.actions.filter((action) => action !== 'make-it-optional'))
- }
- this.resetKey++
+ const availableActions = this.actionOptions.map(function(op){ return op.value });
+ this.$set(this.logic, 'actions', availableActions.filter(value => this.logic.actions.includes(value)))
+ this.refreshActions()
},
refreshActions() {
this.resetKey++