-
Notifications
You must be signed in to change notification settings - Fork 163
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9 from michielkempen/master
Solve issues discussed in #6
- Loading branch information
Showing
14 changed files
with
261 additions
and
204 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| { | ||
| "/dist/js/field.js": "/dist/js/field.js", | ||
| "/dist/css/field.css": "/dist/css/field.css" | ||
| "/dist/js/field.js": "/dist/js/field.js" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| <template> | ||
| <div v-if="dependenciesSatisfied"> | ||
| <div v-for="childField in field.fields"> | ||
| <component | ||
| :is="'detail-' + childField.component" | ||
| :resource-id="resourceId" | ||
| :resource-name="resourceName" | ||
| :field="childField" | ||
| :ref="'field-' + childField.attribute" | ||
| /> | ||
| </div> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
| export default { | ||
| props: ['resource', 'resourceName', 'resourceId', 'field'], | ||
| created() { | ||
| this.updateDependencyStatus() | ||
| }, | ||
| data() { | ||
| return { | ||
| dependenciesSatisfied: false, | ||
| } | ||
| }, | ||
| methods: { | ||
| updateDependencyStatus() { | ||
| for (let dependency of this.field.dependencies) { | ||
| if(! dependency.satisfied) { | ||
| this.dependenciesSatisfied = false; | ||
| return; | ||
| } | ||
| } | ||
| this.dependenciesSatisfied = true; | ||
| }, | ||
| } | ||
| } | ||
| </script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,102 +1,94 @@ | ||
| <template> | ||
| <div v-show="show"> | ||
| <div v-for="field in childFields"> | ||
| <component | ||
| :is="'form-' + field.component" | ||
| :resource-id="resourceId" | ||
| :resource-name="resourceName" | ||
| :field="field" | ||
| :ref="'field-' + field.attribute" | ||
| /> | ||
| </div> | ||
| </div> | ||
| <div v-if="dependenciesSatisfied"> | ||
| <div v-for="childField in field.fields"> | ||
| <component | ||
| :is="'form-' + childField.component" | ||
| :resource-id="resourceId" | ||
| :resource-name="resourceName" | ||
| :field="childField" | ||
| :ref="'field-' + childField.attribute" | ||
| /> | ||
| </div> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
| import {FormField, HandlesValidationErrors} from 'laravel-nova' | ||
| export default { | ||
| mixins: [FormField, HandlesValidationErrors], | ||
| props: ['resourceName', 'resourceId', 'field'], | ||
| created() { | ||
| this.field.fields.forEach(f => { | ||
| f.value = this.field.value[f.attribute] | ||
| }) | ||
| }, | ||
| mounted() { | ||
| this.field.dependencies.forEach(dependency => { | ||
| Nova.$on(dependency.field + '-value-changed', (e) => { | ||
| this.compareValues[dependency.field] = e.value | ||
| var vm = this | ||
| vm.show = true | ||
| this.field.dependencies.forEach(dependency => { | ||
| if (dependency.notEmpty) { | ||
| if (this.compareValues[dependency.field] == '' || this.compareValues[dependency.field] == null) { | ||
| vm.show = false | ||
| } | ||
| } else { | ||
| if (dependency.value !== this.compareValues[dependency.field]) { | ||
| vm.show = false | ||
| } | ||
| } | ||
| }) | ||
| }) | ||
| }) | ||
| this.registerValueWatchers(this.$root) | ||
| }, | ||
| data() { | ||
| return { | ||
| compareValues: {}, | ||
| show: false | ||
| } | ||
| }, | ||
| computed: { | ||
| childFields() { | ||
| return this.field.fields | ||
| } | ||
| }, | ||
| methods: { | ||
| registerValueWatchers (root) { | ||
| root.$children.forEach(component => { | ||
| if (component.constructor.options !== undefined && component.constructor.options.name !== undefined) { | ||
| if (component.constructor.options.name.endsWith('-field') || this.field.depends_custom.includes(component.constructor.options.name)) { | ||
| component.$watch('value', (value, oldValue) => { | ||
| Nova.$emit(component.field.attribute + '-value-changed', { | ||
| field: component.field, | ||
| value: component.value | ||
| }) | ||
| }, {immediate: true}) | ||
| component.$watch('selectedResource.value', (value, oldValue) => { | ||
| Nova.$emit(component.field.attribute + '-value-changed', { | ||
| field: component.field, | ||
| value: component.selectedResource != null ? component.selectedResource.value : component.value | ||
| }) | ||
| }, {immediate: true}) | ||
| } | ||
| } | ||
| this.registerValueWatchers(component) | ||
| }) | ||
| }, | ||
| /** | ||
| * Fill the given FormData object with the field's internal value. | ||
| */ | ||
| fill(formData) { | ||
| this.field.fields.forEach(f => { | ||
| formData.append(f.attribute, this.$refs['field-' + f.attribute][0].value) | ||
| }) | ||
| } | ||
| } | ||
| } | ||
| import {FormField, HandlesValidationErrors} from 'laravel-nova' | ||
| export default { | ||
| mixins: [FormField, HandlesValidationErrors], | ||
| props: ['resourceName', 'resourceId', 'field'], | ||
| mounted() { | ||
| this.registerDependencyWatchers(this.$root) | ||
| this.updateDependencyStatus() | ||
| }, | ||
| data() { | ||
| return { | ||
| dependencyValues: {}, | ||
| dependenciesSatisfied: false, | ||
| } | ||
| }, | ||
| methods: { | ||
| registerDependencyWatchers(root) { | ||
| root.$children.forEach(component => { | ||
| if (this.componentIsDependency(component)) { | ||
| component.$watch('value', (value) => { | ||
| this.dependencyValues[component.field.attribute] = value; | ||
| this.updateDependencyStatus() | ||
| }, {immediate: true}) | ||
| this.dependencyValues[component.field.attribute] = component.field.value; | ||
| } | ||
| this.registerDependencyWatchers(component) | ||
| }) | ||
| }, | ||
| componentIsDependency(component) { | ||
| if(component.field === undefined) { | ||
| return false; | ||
| } | ||
| for (let dependency of this.field.dependencies) { | ||
| if(component.field.attribute === dependency.field) { | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| }, | ||
| updateDependencyStatus() { | ||
| for (let dependency of this.field.dependencies) { | ||
| if(dependency.hasOwnProperty('notEmpty') && ! this.dependencyValues[dependency.field]) { | ||
| this.dependenciesSatisfied = false; | ||
| return; | ||
| } | ||
| if(dependency.hasOwnProperty('value') && this.dependencyValues[dependency.field] !== dependency.value) { | ||
| this.dependenciesSatisfied = false; | ||
| return; | ||
| } | ||
| } | ||
| this.dependenciesSatisfied = true; | ||
| }, | ||
| fill(formData) { | ||
| if(this.dependenciesSatisfied) { | ||
| this.$children.forEach(f => { | ||
| f.fill(formData) | ||
| }) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| </script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| Nova.booting((Vue, router) => { | ||
| Vue.component('detail-nova-dependency-container', require('./components/DetailField')); | ||
| Vue.component('form-nova-dependency-container', require('./components/FormField')); | ||
| }) |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.