test/amis2
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-11-29 18:48:45 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #10836 from CheshireJCat/fix-jinye-0827-nested-select-label-error

Browse Source 
fix: 修复级联选择器数据源异常label为数组时页面崩溃的问题
This commit is contained in:
hsm-lv 2024-08-27 14:16:08 +08:00 committed by GitHub
commit c84baa4746
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/amis/src/renderers/Form/NestedSelect.tsx
View File

@ -29,7 +29,8 @@ import {
ActionObject,
renderTextByKeyword,
getVariable,
TestIdBuilder
TestIdBuilder,
labelToString
} from 'amis-core';
import {findDOMNode} from 'react-dom';
import xor from 'lodash/xor';
@ -250,15 +251,17 @@ export default class NestedSelectControl extends React.Component<
const regexp = string2regExp(inputValue);
if (hideNodePathLabel) {
return option[labelField || 'label'];
return labelToString(option[labelField || 'label']);
}
const ancestors = getTreeAncestors(options, option, true);
const optionText = option[labelField || 'label'];
const optionText = labelToString(option[labelField || 'label']);
const splitJoin = ' / ';
const title = ancestors
? ancestors.map(item => item[labelField || 'label']).join(splitJoin)
? ancestors
.map(item => labelToString(item[labelField || 'label']))
.join(splitJoin)
: optionText;
return (
@ -269,7 +272,7 @@ export default class NestedSelectControl extends React.Component<
>
{ancestors
? ancestors.map((item, index) => {
const label = item[labelField || 'label'];
const label = labelToString(item[labelField || 'label']);
const value = item[valueField || 'value'];
const isEnd = index === ancestors.length - 1;
return (
@ -709,7 +712,7 @@ export default class NestedSelectControl extends React.Component<
selfChecked = true;
}
let label = option[labelField || 'label'];
let label = labelToString(option[labelField || 'label']);
return (
<div