Skip to content

Commit 735ab9c

Browse files
committed
Use explicit undefined checks to preserve false boolean values
1 parent f2cf435 commit 735ab9c

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

src/mixins/extensions/DataManager.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,17 @@ export default {
1212
screen,
1313
safeDotName,
1414
`
15-
this.getValue(${JSON.stringify(v.name)}, this.vdata) ||
16-
this.getValue(${JSON.stringify(v.name)}, data) ||
17-
this.initialValue(
18-
'${component}',
19-
'${dataFormat}',
20-
${JSON.stringify(v.config)})
15+
(() => {
16+
const vdataVal = this.getValue(${JSON.stringify(
17+
v.name
18+
)}, this.vdata);
19+
if (vdataVal !== undefined) return vdataVal;
20+
const dataVal = this.getValue(${JSON.stringify(v.name)}, data);
21+
if (dataVal !== undefined) return dataVal;
22+
return this.initialValue('${component}', '${dataFormat}', ${JSON.stringify(
23+
v.config
24+
)});
25+
})()
2126
`,
2227
v.name
2328
);

src/mixins/extensions/DefaultValues.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ export default {
2727
setupDefaultValue(screen, name, value) {
2828
const safeDotName = this.safeDotName(name);
2929
const defaultComputedName = `default_${safeDotName}__`;
30-
this.addData(screen, `${name}_was_filled__`, `!!this.getValue(${JSON.stringify(name)}, this.vdata) || !!this.getValue(${JSON.stringify(name)}, data)`);
30+
this.addData(screen, `${name}_was_filled__`, `this.getValue(${JSON.stringify(name)}, this.vdata) !== undefined || this.getValue(${JSON.stringify(name)}, data) !== undefined`);
3131
this.addMounted(
32-
screen,
33-
`if (!this.${safeDotName}) {
32+
screen,
33+
`if (this.${safeDotName} === undefined) {
3434
this.tryFormField(${JSON.stringify(name)}, () => {
3535
this.${safeDotName} = ${value};
3636
this.setValue(${JSON.stringify(name)}, ${value}, this.vdata, this);});

0 commit comments

Comments
 (0)