github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: select label-in-value error #3216

pull/3224/head
tangjinzhou 2020-11-19 23:03:31 +08:00
parent 00455da385
commit 994e709226
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/vc-select/utils/valueUtil.ts
View File

@ -1,5 +1,5 @@
import { warning } from '../../vc-util/warning'; import { warning } from '../../vc-util/warning';
import { isVNode, VNodeChild } from 'vue'; import { cloneVNode, isVNode, VNodeChild } from 'vue';
import { import {
OptionsType as SelectOptionsType, OptionsType as SelectOptionsType,
OptionData, OptionData,
@ -151,7 +151,13 @@ export const getLabeledValue: GetLabeledValue<FlattenOptionData[]> = (
warning(false, '`label` of `value` is not same as `label` in Select options.'); warning(false, '`label` of `value` is not same as `label` in Select options.');
} }
} else if (item && optionLabelProp in item) { } else if (item && optionLabelProp in item) {
if (Array.isArray(item[optionLabelProp])) {
result.label = isVNode(item[optionLabelProp][0])
? cloneVNode(item[optionLabelProp][0])
: item[optionLabelProp];
} else {
result.label = item[optionLabelProp]; result.label = item[optionLabelProp];
}
} else { } else {
result.label = value; result.label = value;
} }

2
components/vc-select/utils/warningPropsUtil.ts
View File

@ -89,7 +89,7 @@ function warningProps(props: SelectProps) {
warning( warning(
!labelInValue || !labelInValue ||
values.every(val => typeof val === 'object' && ('key' in val || 'value' in val)), values.every(val => typeof val === 'object' && ('key' in val || 'value' in val)),
'`value` should in shape of `{ value: string | number, label?: ReactNode }` when you set `labelInValue` to `true`', '`value` should in shape of `{ value: string | number, label?: any }` when you set `labelInValue` to `true`',
); );
warning( warning(