ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(utils): avoid to use default value for null in json-templates (#2165)

Browse Source
This commit is contained in:
Junyi 2023-07-03 06:25:53 +07:00 committed by GitHub
parent 677442c844
commit 71c62245ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/core/utils/src/json-templates.ts
View File

@ -92,15 +92,20 @@ const parseString = (() => {
return matches.reduce((result, match, i) => { return matches.reduce((result, match, i) => {
const parameter = parameters[i]; const parameter = parameters[i];
let value = objectPath.get(context, parameter.key); let value = objectPath.get(context, parameter.key);
if (value == null) { const type = typeof value;
if (type === 'undefined') {
if (typeof parameter.defaultValue === 'undefined') {
return value;
}
value = parameter.defaultValue; value = parameter.defaultValue;
} }
if (typeof value === 'function') { if (type === 'function') {
value = value(); value = value();
} }
if (typeof value === 'object') { if (type === 'object') {
return value; return value;
} }