fix(Select): value no show fillProps with empty dataSource. Close #715

alibaba-fusion · May 24, 2019 · 70a15ab · 70a15ab
1 parent 7bd2d3f
commit 70a15ab
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/select/select.jsx b/src/select/select.jsx
@@ -709,7 +709,10 @@ class Select extends Base {
                 return null;
             }
 
-            const retvalue = fillProps ? value[fillProps] : valueRender(value);
+            const retvalue =
+                fillProps && fillProps in value
+                    ? value[fillProps]
+                    : valueRender(value);
             // 0 => '0'
             return typeof retvalue === 'number'
                 ? retvalue.toString()

diff --git a/test/select/index-spec.js b/test/select/index-spec.js
@@ -268,6 +268,17 @@ describe('Select', () => {
         assert(wrapper.find('.next-select em').text() === 'yyy');
     });
 
+    it('should support fillProps=anything with empty dataSource', () => {
+        wrapper.setProps({
+            value: 'jack',
+            visible: true,
+            fillProps: 'anything',
+            dataSource: []
+        });
+
+        assert(wrapper.find('.next-select em').text() === 'jack');
+    });
+
     it('should support disabled', () => {
         wrapper.setProps({
             disabled: true,