Merge pull request #948 from minran/master

fix: table don't change when this.state change data

Author: loadchange

src/table/TableStore.jsx

@@ -10,9 +10,6 @@ import type {
  Column,
  _Column
 } from './Types';
-import {
- deepCompare
-} from './utils'
 
 import normalizeColumns from './normalizeColumns';
 import { getLeafColumns, getValueByPath, getColumns, convertToRows, getRowIdentity } from "./utils";
@@ -128,7 +125,7 @@ export default class TableStore extends Component<TableStoreProps, TableStoreSta
  if (getColumns(this.props) !== nextColumns) {
  this.updateColumns(nextColumns);
  }
- if (deepCompare(data,nextProps.data)){
+ if (data !== nextProps.data) {
  this.updateData(nextProps);
  }
  }

src/table/utils.js

@@ -133,32 +133,30 @@ export function convertToRows(columns: Array<_Column>): Array<Array<_Column>> {
  return rows;
 }
 
-const isObject = (obj: Object): boolean => {
- return Object.prototype.toString.call(obj) === '[object Object]'
-}
-const isArray = (arr: number): boolean => {
- return Object.prototype.toString.call(arr) === '[object Array]'
-}
+const checkType = (data: any): string => Object.prototype.toString.call(data).toLowerCase().slice(8, -1);
+
 const deepCompare = (obj1: any, obj2: any): boolean => {
- if (obj1 && obj2 && obj1.length !== obj2.length) {
- return true
- } else if (isArray(obj1) && isArray(obj2)) {
- return obj1.some((value, key) => (
- deepCompare(value, obj2[key])
- ))
- } else if (isObject(obj1) && isObject(obj2)) {
- for (let key in obj1) {
- if (deepCompare(obj1[key], obj2[key])) {
- return true
- }
+ const obj1Type = checkType(obj1);
+ const obj2Type = checkType(obj2);
+ if (obj1Type !== obj2Type ) return false;
+ 
+ if (obj1Type === 'array' && obj1.length === obj2.length) {
+ return obj1.every((value, key) => (
+ deepCompare(value, obj2[key])
+ ))
+ } 
+ 
+ if (obj1Type === 'object') {
+ for (let key in obj1) {
+ if (!Object.keys(obj2).includes(key)) return false;
+ return deepCompare(obj1[key], obj2[key])
+ }
+ return false
  }
- return false
- }
- return obj1 !== obj2
+ return Object.is(obj1,obj2);
 }
 
 export {
  deepCompare,
- isObject,
- isArray
+ checkType,
 }