easy3wui 1.5.49-beta6 → 1.5.49

package/lib/Easy3wGridPage/index.js

@@ -72,10 +72,6 @@ var _numeral = require('numeral');
 
 var _numeral2 = _interopRequireDefault(_numeral);
 
-var _cloneDeep = require('lodash/cloneDeep');
-
-var _cloneDeep2 = _interopRequireDefault(_cloneDeep);
-
 var _comonConfig = require('comonConfigPath/comonConfig');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
@@ -146,6 +142,8 @@ var Easy3wGridPage = function (_Component) {
   // ---------------------------------- 数据脱敏 end ----------------------------------
   // 生成表格
 
+  // 数组深度复制
+
 
   Easy3wGridPage.prototype.render = function render() {
     var _this2 = this;
@@ -169,7 +167,7 @@ var Easy3wGridPage = function (_Component) {
     // const arrColumns = this.touchCreateColumns([].concat(columns));
     // const arrColumns = this.touchCreateColumns(JSON.parse(JSON.stringify(columns)));
 
-    var arrColumns = this.touchCreateColumns(columns);
+    var arrColumns = this.touchCreateColumns(this.deepCopy(columns));
     // const arrColumns = this.touchCreateColumns(columns);
     var _state = this.state,
         selectedRowKeysState = _state.selectedRowKeysState,
@@ -619,7 +617,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) {
@@ -657,6 +656,7 @@ var _initialiseProps = function _initialiseProps() {
         arrData: arrData // 更新数据
       });
     }
+    // return false;
   };
 
   this.touchCreateColumns = function (columns) {
@@ -672,8 +672,20 @@ var _initialiseProps = function _initialiseProps() {
     var printValue = _this3.props.printValue || 'print';
     var printFlag = printArr[1] === printValue;
     var recursion = function recursion(arr) {
-      return arr.map(function (item) {
-        var itemNew = {};
+      for (var _iterator = arr, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+        var _ref2;
+
+        if (_isArray) {
+          if (_i >= _iterator.length) break;
+          _ref2 = _iterator[_i++];
+        } else {
+          _i = _iterator.next();
+          if (_i.done) break;
+          _ref2 = _i.value;
+        }
+
+        var item = _ref2;
+
         var columnsType = item.type;
         if (item.fixed && printFlag) {
           item.fixed = null;
@@ -694,15 +706,12 @@ var _initialiseProps = function _initialiseProps() {
             break;
         }
         if (item.children) {
-          itemNew.children = [].concat(recursion(item.children));
+          item.children = recursion(item.children);
         }
-        itemNew = (0, _extends3['default'])({}, item);
-        return itemNew;
-      });
+      }
     };
     var recursionT = function recursionT(arr) {
-      return arr.map(function (item) {
-        var itemNew = {};
+      var _loop = function _loop(item) {
         if (item.fixed && printFlag) {
           item.fixed = null;
         }
@@ -725,8 +734,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' })
                       )
@@ -738,8 +747,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' })
                     )
@@ -753,8 +762,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' })
                   )
@@ -784,19 +793,34 @@ var _initialiseProps = function _initialiseProps() {
           item.minWidth = 5;
         }
         if (item.children) {
-          itemNew.children = [].concat(recursionT(item.children));
+          item.children = recursionT(item.children);
         }
-        itemNew = (0, _extends3['default'])({}, item);
-        return itemNew;
-      });
+      };
+
+      for (var _iterator2 = arr, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref3;
+
+        if (_isArray2) {
+          if (_i2 >= _iterator2.length) break;
+          _ref3 = _iterator2[_i2++];
+        } else {
+          _i2 = _iterator2.next();
+          if (_i2.done) break;
+          _ref3 = _i2.value;
+        }
+
+        var item = _ref3;
+
+        _loop(item);
+      }
     };
-    var columnsNew = recursion(columns);
+    recursion(columns);
     if (dataList) {
       if (dataList.length > 0) {
-        columnsNew = recursionT(columns);
+        recursionT(columns);
       }
     }
-    // let columnsNew = columns;
+    var columnsNew = columns;
     if (autoAddNumber) {
       if (columnsNew.length > 0) {
         columnsNew = [{
@@ -814,7 +838,27 @@ var _initialiseProps = function _initialiseProps() {
         }].concat(columnsNew);
       }
     }
-    return columnsNew;
+    return [].concat(columnsNew);
+  };
+
+  this.deepCopy = function (obj) {
+    if (typeof obj !== 'object' || obj === null) {
+      return obj;
+    }
+
+    var copy = Array.isArray(obj) ? [] : {};
+
+    for (var key in obj) {
+      if (key === 'title' || key === 'filterDropdown') {
+        copy[key] = obj[key];
+      } else if (key === 'children' && Array.isArray(obj[key]) || typeof obj[key] === 'object') {
+        copy[key] = _this3.deepCopy(obj[key]);
+      } else {
+        copy[key] = obj[key];
+      }
+    }
+
+    return copy;
   };
 };
 

package/package.json

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