fix: 兼容 labelInValue 时 value 为 null 引起的报错 (#590)

* fix: 兼容 labelInValue 时 value 为 null 引起的报错

* fix: 兼容 labelInValue 场景下 value 为 null 引起的报错

* test: not crash when labelInValue and value is null

Author: Dolov

src/utils/commonUtil.ts

@@ -22,20 +22,25 @@ export function toInnerValue(
 ): [RawValueType[], Map<RawValueType, LabelValueType>] {
   const valueMap = new Map<RawValueType, LabelValueType>();
 
-  if (value === undefined || (value === '' && combobox)) {
+  if (
+    value === undefined ||
+    (value === '' && combobox)
+  ) {
     return [[], valueMap];
   }
 
   const values = Array.isArray(value) ? value : [value];
   let rawValues = values as RawValueType[];
 
   if (labelInValue) {
-    rawValues = (values as LabelValueType[]).map((itemValue: LabelValueType) => {
-      const { key, value: val } = itemValue;
-      const finalVal = val !== undefined ? val : key;
-      valueMap.set(finalVal, itemValue);
-      return finalVal;
-    });
+    rawValues = (values as LabelValueType[])
+      .filter(item => !!item)
+      .map((itemValue: LabelValueType) => {
+        const { key, value: val } = itemValue;
+        const finalVal = val !== undefined ? val : key;
+        valueMap.set(finalVal, itemValue);
+        return finalVal;
+      });
   }
 
   return [rawValues, valueMap];

tests/Select.test.tsx

@@ -1450,6 +1450,10 @@ describe('Select.Basic', () => {
     mount(<Select options={null} />);
   });
 
+  it('not crash when labelInValue and value is null', () => {
+    mount(<Select labelInValue value={null} />);
+  });
+
   it('not open when `notFoundCount` is empty & no data', () => {
     const wrapper = mount(<Select options={null} notFoundContent={null} open showSearch />);
     expect(wrapper.find('SelectTrigger').props().visible).toBeFalsy();