Merge pull request #1383 from CYBAI/fix-1381

Get value from key first; if not existing, try recursive get

Author: AllenFang

Diff for: packages/react-bootstrap-table2/src/utils.js

@@ -12,6 +12,11 @@ function splitNested(str) {
 }
 
 function get(target, field) {
+  const directGet = target[field];
+  if (directGet !== undefined && directGet !== null) {
+    return directGet;
+  }
+
   const pathArray = splitNested(field);
   let result;
   try {

Diff for: packages/react-bootstrap-table2/test/utils.test.js

@@ -10,7 +10,8 @@ describe('Utils', () => {
         city: {
           name: 'B'
         }
-      }
+      },
+      'person.name': 'John Doe'
     };
 
     it('should return correct data', () => {
@@ -19,6 +20,7 @@ describe('Utils', () => {
       expect(_.get(data, 'address.city.name')).toEqual(data.address.city.name);
       expect(_.get(data, 'address.notExist')).toEqual(undefined);
       expect(_.get(data, 'address.not.exist')).toEqual(undefined);
+      expect(_.get(data, 'person.name')).toEqual(data['person.name']);
     });
   });