Fixed form arrangement

This commit is contained in:
Joel Collins 2019-06-18 14:06:10 +01:00
parent fa848112ca
commit d56a8e369f
2 changed files with 24 additions and 8 deletions

View file

@ -50,15 +50,15 @@
:requireConnection="plugin.requiresConnection" :requireConnection="plugin.requiresConnection"
:currentTab="currentTab"> :currentTab="currentTab">
<div class="uk-flex uk-flex-column"> <div class="uk-flex uk-flex-column" v-for="form in plugin.forms" :key="`${form.route}/${form.name}`.replace(/\s+/g, '-').toLowerCase()" >
<JsonForm v-for="form in plugin.forms" <JsonForm
:key="`${form.route}/${form.name}`.replace(/\s+/g, '-').toLowerCase()"
:name="form.name" :name="form.name"
:route="form.route" :route="form.route"
:isTask="form.isTask" :isTask="form.isTask"
:submitLabel="form.submitLabel" :submitLabel="form.submitLabel"
:selfUpdate="form.selfUpdate" :selfUpdate="form.selfUpdate"
:schema="form.schema"/> :schema="form.schema"/>
<hr>
</div> </div>
</tabContent> </tabContent>

View file

@ -1,8 +1,12 @@
<template> <template>
<div> <div>
<form @submit.prevent="submitForm" class="uk-form-stacked">
<button type="button" v-if="selfUpdate" v-on:click="getFormData()" class="uk-button uk-button-primary uk-form-small uk-float-right uk-margin-small uk-width-1-1">{{ "Update values" }}</button> <div class="uk-flex">
<div class="uk-text-bold uk-text-uppercase uk-width-expand">{{ name }}</div>
<a href="#" v-if="selfUpdate" v-on:click="getFormData()" class="uk-icon-link uk-width-auto" uk-icon="refresh"></a>
</div>
<form @submit.prevent="submitForm" class="uk-form-stacked">
<div v-for="(field, index) in schema" :key="index"> <div v-for="(field, index) in schema" :key="index">
<div v-if="Array.isArray(field)" class="uk-grid-small uk-width-1-1 uk-child-width-expand" uk-grid> <div v-if="Array.isArray(field)" class="uk-grid-small uk-width-1-1 uk-child-width-expand" uk-grid>
@ -29,6 +33,7 @@
<button v-bind:hidden="taskRunning" class="uk-button uk-button-primary uk-form-small uk-float-right uk-margin-small uk-width-1-1">{{ submitLabel }}</button> <button v-bind:hidden="taskRunning" class="uk-button uk-button-primary uk-form-small uk-float-right uk-margin-small uk-width-1-1">{{ submitLabel }}</button>
</form> </form>
</div> </div>
</template> </template>
@ -95,10 +100,13 @@ export default {
created() { created() {
this.initialiseFormData() this.initialiseFormData()
if (this.selfUpdate) {
this.getFormData()
}
}, },
methods: { methods: {
initialiseFormData() { initialiseFormData() {
/* /*
This function initialises the form data. This function initialises the form data.
@ -154,8 +162,12 @@ export default {
// Send a quick request // Send a quick request
axios.post(this.submitApiUri, params) axios.post(this.submitApiUri, params)
.then(response => { .then(response => {
// Do something with the response
console.log(response) console.log(response)
// TODO: Have this perform a GET request to update all available parameters // Update the form data if we're self-updating
if (this.selfUpdate) {
this.getFormData()
}
}) })
.catch(error => { .catch(error => {
this.modalError(error) // Let mixin handle error this.modalError(error) // Let mixin handle error
@ -171,7 +183,7 @@ export default {
return this.$store.dispatch('pollTask', [response.data.id, null, null]) return this.$store.dispatch('pollTask', [response.data.id, null, null])
}) })
.then(response => { .then(response => {
console.log("Successfully finished task with response:") // Do something with the response
console.log(response) console.log(response)
}) })
.catch(error => { .catch(error => {
@ -180,6 +192,10 @@ export default {
.finally(() => { .finally(() => {
console.log("Cleaning up after task.") console.log("Cleaning up after task.")
this.taskRunning = false this.taskRunning = false
// Update the form data if we're self-updating
if (this.selfUpdate) {
this.getFormData()
}
}) })
}, },