test/amis
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-12-04 21:08:55 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix(amis-core): 修复select组件中一个未判空导致的渲染错误

Browse Source
This commit is contained in:
wibetter 2023-05-19 17:37:34 +08:00
parent 86eb7ee4b5
commit beea53c83d
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
packages/amis-core/src/utils/normalizeOptions.ts
View File

@ -52,35 +52,37 @@ export function normalizeOptions(
return option;
});
} else if (Array.isArray(options as Options)) {
return (options as Options).map(item => {
const value = item && item[valueField];
/**
* value 有可能为 null，但 null !== undefined，
* 因此从item中读取属性数据，需要判空
*/
const idx =
value !== undefined && !item?.children
? share.values.indexOf(value)
: -1;
return (options as Options)
.filter(item => item !== null && item !== undefined)
.map(item => {
const value = item && item[valueField];
const idx =
value !== undefined && !item.children
? share.values.indexOf(value)
: -1;
if (~idx) {
return share.options[idx];
}
if (~idx) {
return share.options[idx];
}
const option = {
...item,
[valueField]: value
};
const option = {
...item,
[valueField]: value
};
if (typeof option.children !== 'undefined') {
option.children = normalizeOptions(option.children, share, valueField);
} else if (value !== undefined) {
share.values.push(value);
share.options.push(option);
}
if (typeof option.children !== 'undefined') {
option.children = normalizeOptions(
option.children,
share,
valueField
);
} else if (value !== undefined) {
share.values.push(value);
share.options.push(option);
}
return option;
});
return option;
});
} else if (isPlainObject(options)) {
return Object.keys(options).map(key => {
const idx = share.values.indexOf(key);