From f1d911bd1ef4c43e3c54e04ce431919a874a8fa2 Mon Sep 17 00:00:00 2001 From: Henry Jonas Date: Thu, 16 Jan 2025 14:11:13 -0400 Subject: [PATCH 1/2] FOUR-19579 : [41110] Bitia S.R.L. - Input in collection edit screen not showing 0 variable --- src/mixins/extensions/DataManager.js | 4 ++-- src/mixins/extensions/DefaultValues.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mixins/extensions/DataManager.js b/src/mixins/extensions/DataManager.js index 0f2264964..532d51e10 100644 --- a/src/mixins/extensions/DataManager.js +++ b/src/mixins/extensions/DataManager.js @@ -12,8 +12,8 @@ export default { screen, safeDotName, ` - this.getValue(${JSON.stringify(v.name)}, this.vdata) || - this.getValue(${JSON.stringify(v.name)}, data) || + this.getValue(${JSON.stringify(v.name)}, this.vdata) ?? + this.getValue(${JSON.stringify(v.name)}, data) ?? this.initialValue( '${component}', '${dataFormat}', diff --git a/src/mixins/extensions/DefaultValues.js b/src/mixins/extensions/DefaultValues.js index 1f9915847..cda842c7f 100644 --- a/src/mixins/extensions/DefaultValues.js +++ b/src/mixins/extensions/DefaultValues.js @@ -29,8 +29,8 @@ export default { const defaultComputedName = `default_${safeDotName}__`; this.addData(screen, `${name}_was_filled__`, `!!this.getValue(${JSON.stringify(name)}, this.vdata) || !!this.getValue(${JSON.stringify(name)}, data)`); this.addMounted( - screen, - `if (!this.${safeDotName}) { + screen, + `if (this.${safeDotName} === undefined || this.${safeDotName} === null) { this.tryFormField(${JSON.stringify(name)}, () => { this.${safeDotName} = ${value}; this.setValue(${JSON.stringify(name)}, ${value}, this.vdata, this);}); From fa7b5551a3983360df2a3c3628247fbb1d8e0056 Mon Sep 17 00:00:00 2001 From: Henry Jonas Date: Fri, 17 Jan 2025 13:29:36 -0400 Subject: [PATCH 2/2] FOUR-19579 : [41110] Bitia S.R.L. - Input in collection edit screen not showing 0 variable --- src/mixins/extensions/DefaultValues.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mixins/extensions/DefaultValues.js b/src/mixins/extensions/DefaultValues.js index cda842c7f..b0ebc20c6 100644 --- a/src/mixins/extensions/DefaultValues.js +++ b/src/mixins/extensions/DefaultValues.js @@ -30,7 +30,7 @@ export default { this.addData(screen, `${name}_was_filled__`, `!!this.getValue(${JSON.stringify(name)}, this.vdata) || !!this.getValue(${JSON.stringify(name)}, data)`); this.addMounted( screen, - `if (this.${safeDotName} === undefined || this.${safeDotName} === null) { + `if (this.${safeDotName} === undefined || this.${safeDotName} === null || this.${safeDotName} === false || this.${safeDotName} === "") { this.tryFormField(${JSON.stringify(name)}, () => { this.${safeDotName} = ${value}; this.setValue(${JSON.stringify(name)}, ${value}, this.vdata, this);});