@@ -186,51 +186,23 @@ export default {
const workingFormStore = useWorkingFormStore()
return {
route: useRoute(),
- workingFormStore
+ workingFormStore,
+ form: storeToRefs(workingFormStore).content,
}
},
data () {
return {
- formFields: [],
removing: null
}
},
- computed: {
- form: {
- get () {
- return this.workingFormStore.content
- },
- /* We add a setter */
- set (value) {
- this.workingFormStore.set(value)
- }
- }
- },
-
- watch: {
- formFields: {
- deep: true,
- handler () {
- this.form.properties = this.formFields
- }
- },
-
- 'form.properties': {
- deep: true,
- handler () {
- // If different, then update
- if (this.form.properties.length !== this.formFields.length ||
- JSON.stringify(this.form.properties) !== JSON.stringify(this.formFields)) {
- this.formFields = clonedeep(this.form.properties)
- }
- }
- }
-
+ beforeMount() {
+ console.log('beforemounted formfields editor with', this.form)
},
mounted () {
+ console.log('mounted formfields editor with', this.form)
this.init()
},
@@ -279,9 +251,11 @@ export default {
},
init () {
if (this.route.name === 'forms-create' || this.route.name === 'forms-create-guest') { // Set Default fields
- this.formFields = (this.form.properties.length > 0) ? clonedeep(this.form.properties) : this.getDefaultFields()
+ if (!this.form.properties) {
+ this.form.properties = this.getDefaultFields()
+ }
} else {
- this.formFields = clonedeep(this.form.properties).map((field) => {
+ this.form.properties = this.form.properties.map((field) => {
// Add more field properties
field.placeholder = field.placeholder || null
field.prefill = field.prefill || null
@@ -291,7 +265,6 @@ export default {
return field
})
}
- this.form.properties = this.formFields
},
generateUUID () {
let d = new Date().getTime()// Timestamp
@@ -324,9 +297,7 @@ export default {
this.workingFormStore.openSettingsForField(index)
},
removeBlock (blockIndex) {
- const newFields = clonedeep(this.formFields)
- newFields.splice(blockIndex, 1)
- this.formFields = newFields
+ this.form.properties.splice(blockIndex, 1)
this.closeSidebar()
},
closeSidebar () {
diff --git a/client/components/open/forms/components/FormSubmissions.vue b/client/components/open/forms/components/FormSubmissions.vue
index eabdad8..65e36cf 100644
--- a/client/components/open/forms/components/FormSubmissions.vue
+++ b/client/components/open/forms/components/FormSubmissions.vue
@@ -23,18 +23,26 @@
Form Fields
-
- {{ field.name }}
-
+
+
+
+ {{ field.name }}
+
+
+
Removed Fields
-
- {{ field.name }}
-
+
+
+
+ {{ field.name }}
+
+
+
@@ -80,18 +88,15 @@