From bcc4ddc4380410edc2156466223bb08ca2d9c4e3 Mon Sep 17 00:00:00 2001 From: youluna Date: Tue, 15 Sep 2020 20:47:44 +0800 Subject: [PATCH] fix(Select): crash when mode=tag&&value={null}&&isPreview, close #2175 --- src/select/base.jsx | 4 ++-- test/select/index-spec.js | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/select/base.jsx b/src/select/base.jsx index 9beb06a774..387b39ba5f 100644 --- a/src/select/base.jsx +++ b/src/select/base.jsx @@ -651,7 +651,7 @@ export default class Base extends React.Component { style={style} className={className} isPreview={isPreview} - value={fillProps ? valueDS[fillProps] : valueDS && valueDS.label} + value={valueDS ? (fillProps ? valueDS[fillProps] : valueDS.label) : ''} /> ); } else { @@ -660,7 +660,7 @@ export default class Base extends React.Component { style={style} className={className} isPreview={isPreview} - value={valueDS.map(i => i.label).join(', ')} + value={(valueDS || []).map(i => i.label).join(', ')} /> ); } diff --git a/test/select/index-spec.js b/test/select/index-spec.js index 1a4fd562f9..c5a48a4163 100644 --- a/test/select/index-spec.js +++ b/test/select/index-spec.js @@ -338,6 +338,19 @@ describe('Select', () => { assert(wrapper.getDOMNode().innerText === ''); }); + it('should renderPreview mode="tag"', () => { + const wrapper = mount( +