easy3wui 1.5.49-beta8 → 1.5.50-beta1

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;
@@ -617,7 +620,8 @@ var _initialiseProps = function _initialiseProps() {
     return strDesensitize;
   };
 
-  this.getImplicit = function (dataIndex, index) {
+  this.getImplicit = function (event, dataIndex, index) {
+    event.stopPropagation(); // 禁止事件冒泡
     var arrData = _this3.state.arrData;
 
     if (_comonConfig.dataDesensitizationUrl) {
@@ -655,6 +659,7 @@ var _initialiseProps = function _initialiseProps() {
         arrData: arrData // 更新数据
       });
     }
+    // return false;
   };
 
   this.touchCreateColumns = function (columns) {
@@ -704,7 +709,7 @@ var _initialiseProps = function _initialiseProps() {
             break;
         }
         if (item.children) {
-          item.children = recursion(item.children);
+          recursion(item.children);
         }
       }
     };
@@ -732,8 +737,8 @@ var _initialiseProps = function _initialiseProps() {
                       ' ',
                       _react2['default'].createElement(
                         'a',
-                        { onClick: function onClick() {
-                            return _this3.getImplicit(dataIndex, index);
+                        { onClick: function onClick(e) {
+                            return _this3.getImplicit(e, dataIndex, index);
                           } },
                         _react2['default'].createElement(_icon2['default'], { type: arrData.length && arrData[index][dataIndex + '-dataDesensitizationEyeFlag'] ? 'eye' : 'eye-invisible' })
                       )
@@ -745,8 +750,8 @@ var _initialiseProps = function _initialiseProps() {
                     ' ',
                     _react2['default'].createElement(
                       'a',
-                      { onClick: function onClick() {
-                          return _this3.getImplicit(dataIndex, index);
+                      { onClick: function onClick(e) {
+                          return _this3.getImplicit(e, dataIndex, index);
                         } },
                       _react2['default'].createElement(_icon2['default'], { type: arrData.length && arrData[index][dataIndex + '-dataDesensitizationEyeFlag'] ? 'eye' : 'eye-invisible' })
                     )
@@ -760,8 +765,8 @@ var _initialiseProps = function _initialiseProps() {
                   ' ',
                   _react2['default'].createElement(
                     'a',
-                    { onClick: function onClick() {
-                        return _this3.getImplicit(dataIndex, index);
+                    { onClick: function onClick(e) {
+                        return _this3.getImplicit(e, dataIndex, index);
                       } },
                     _react2['default'].createElement(_icon2['default'], { type: arrData.length && arrData[index][dataIndex + '-dataDesensitizationEyeFlag'] ? 'eye' : 'eye-invisible' })
                   )
@@ -791,7 +796,7 @@ var _initialiseProps = function _initialiseProps() {
           item.minWidth = 5;
         }
         if (item.children) {
-          item.children = recursionT(item.children);
+          recursionT(item.children);
         }
       };
 
@@ -858,6 +863,35 @@ 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 (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-beta8",
+  "version": "1.5.50-beta1",
   "description": "easy3wui components for react",
   "keywords": [
     "react",