easy3wui 1.5.49 → 1.5.50-beta2

package/lib/Easy3wGridPage/index.js

@@ -106,7 +106,7 @@ var Easy3wGridPage = function (_Component) {
     }
     var dataList = _this.props.dataList;
 
-    var arrData = dataList && dataList.length ? JSON.parse(JSON.stringify(dataList)) : [];
+    var arrData = dataList && dataList.length ? _this.deepCopy(dataList) : [];
     _this.state = {
       // 数据
       arrData: arrData, // 列表
@@ -125,9 +125,10 @@ var Easy3wGridPage = function (_Component) {
     var _nextProps$dataList = nextProps.dataList,
         nextDataList = _nextProps$dataList === undefined ? [] : _nextProps$dataList;
 
-    if (nextDataList.length !== dataList.length || JSON.stringify(nextDataList) !== JSON.stringify(dataList)) {
+    var isEqual = this.touchDeepEqual(nextDataList, dataList);
+    if (!isEqual) {
       this.setState({
-        arrData: nextDataList.length ? JSON.parse(JSON.stringify(nextDataList)) : []
+        arrData: nextDataList.length ? this.deepCopy(dataList) : []
       });
     }
     if (nextProps.cleanFlag === '1') {
@@ -144,6 +145,8 @@ var Easy3wGridPage = function (_Component) {
 
   // 数组深度复制
 
+  // 数组深度比较
+
 
   Easy3wGridPage.prototype.render = function render() {
     var _this2 = this;
@@ -706,7 +709,7 @@ var _initialiseProps = function _initialiseProps() {
             break;
         }
         if (item.children) {
-          item.children = recursion(item.children);
+          recursion(item.children);
         }
       }
     };
@@ -793,7 +796,7 @@ var _initialiseProps = function _initialiseProps() {
           item.minWidth = 5;
         }
         if (item.children) {
-          item.children = recursionT(item.children);
+          recursionT(item.children);
         }
       };
 
@@ -849,7 +852,7 @@ var _initialiseProps = function _initialiseProps() {
     var copy = Array.isArray(obj) ? [] : {};
 
     for (var key in obj) {
-      if (key === 'title' || key === 'filterDropdown') {
+      if (_react2['default'].isValidElement(obj[key])) {
         copy[key] = obj[key];
       } else if (key === 'children' && Array.isArray(obj[key]) || typeof obj[key] === 'object') {
         copy[key] = _this3.deepCopy(obj[key]);
@@ -860,6 +863,37 @@ var _initialiseProps = function _initialiseProps() {
 
     return copy;
   };
+
+  this.touchDeepEqual = function (arrOne, arrTwo) {
+    if (arrOne.length === 0 && arrTwo.length === 0) {
+      return true;
+    }
+    if (arrOne.length !== arrTwo.length) {
+      return false;
+    }
+    for (var i = 0; i < arrOne.length; i += 1) {
+      var objOneKeys = Object.keys(arrOne[i]);
+      var objTwoKeys = Object.keys(arrTwo[i]);
+      if (objOneKeys.length !== objTwoKeys.length) {
+        return false;
+      }
+      for (var key in arrOne[i]) {
+        if (_react2['default'].isValidElement(arrOne[i][key]) || _react2['default'].isValidElement(arrTwo[i][key])) {
+          // 是一个 React 元素
+        } else if (key === 'children' && Array.isArray(arrOne[i][key]) && Array.isArray(arrTwo[i][key])) {
+          var isEqual = _this3.touchDeepEqual(arrOne[i][key], arrTwo[i][key]);
+          if (isEqual) {
+            // 相等
+          } else {
+            return false;
+          }
+        } else if (arrOne[i][key] !== arrTwo[i][key]) {
+          return false;
+        }
+      }
+    }
+    return true;
+  };
 };
 
 exports['default'] = Easy3wGridPage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.49",
+  "version": "1.5.50-beta2",
   "description": "easy3wui components for react",
   "keywords": [
     "react",