Skip to content

Fix: Page Navigation does not work if the data does not provided FOUR-3488 #1101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agustinbusso merged 3 commits into from
Nov 4, 2021
Merged

Fix: Page Navigation does not work if the data does not provided FOUR-3488 #1101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2d9aba
Default do not overwrites non empty declaration like arrays
caleeli Nov 4, 2021
afafd76
Helper to convert `foo.0.bar` to `foo[0].bar`
caleeli Nov 4, 2021
16eabbf
Test FOUR-3488 screen
caleeli Nov 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/mixins/Json2Vue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ export default {
};
},
methods: {
// Convert foo.0.bar to foo[0].bar
dot2bracket(str) {
return str.replace(/\.\d/g, match => `[${match.substr(1)}]`);
},
submit() {
this.$emit('submit', this.value);
},
Expand Down
8 changes: 4 additions & 4 deletions src/mixins/extensions/DefaultValues.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ export default {
}
// Update vdata
this.addMounted(screen, `
this.setValue(${JSON.stringify(name)}, this.${name}, this.vdata, this);
this.setValue(${JSON.stringify(name)}, this.getValue(${JSON.stringify(name)}), this.vdata, this);
`);
});
},
setupDefaultValue(screen, name, value) {
const defaultComputedName = `default_${name}__`;
this.addData(screen, `${name}_was_filled__`, `!!this.getValue(${JSON.stringify(name)}, this.vdata)`);
this.addData(screen, `${name}_was_filled__`, `!!this.getValue(${JSON.stringify(name)}, this.vdata) || !!this.getValue(${JSON.stringify(name)}, data)`);
this.addMounted(screen, `if (!this.${name}) {
this.tryFormField(${JSON.stringify(name)}, () => {this.${name} = ${value};});
this.tryFormField(${JSON.stringify(name)}, () => {this.${this.dot2bracket(name)} = ${value};});
}`);
screen.computed[defaultComputedName] = {
get: new Function(`return this.tryFormField(${JSON.stringify(name)}, () => ${value});`),
Expand All @@ -46,7 +46,7 @@ export default {
const name = element.config.name;
if (this.isComputedVariable(name, definition)) return;
if (element.config.defaultValue || element.config.initiallyChecked) {
const event = `${name}_was_filled__ |= !!$event; !${name}_was_filled__ && (vdata.${name} = default_${name}__)`;
const event = `${name}_was_filled__ |= !!$event; !${name}_was_filled__ && (vdata.${this.dot2bracket(name)} = default_${name}__)`;
this.addEvent(properties, 'input', event);
}
},
Expand Down
Loading