easy3wui 1.5.49-beta5 → 1.5.49-beta8

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((0, _cloneDeep2['default'])(columns));
+    var arrColumns = this.touchCreateColumns(this.deepCopy(columns));
     // const arrColumns = this.touchCreateColumns(columns);
     var _state = this.state,
         selectedRowKeysState = _state.selectedRowKeysState,
@@ -672,7 +670,20 @@ var _initialiseProps = function _initialiseProps() {
     var printValue = _this3.props.printValue || 'print';
     var printFlag = printArr[1] === printValue;
     var recursion = function recursion(arr) {
-      arr.forEach(function (item) {
+      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;
@@ -693,12 +704,12 @@ var _initialiseProps = function _initialiseProps() {
             break;
         }
         if (item.children) {
-          recursion(item.children);
+          item.children = recursion(item.children);
         }
-      });
+      }
     };
     var recursionT = function recursionT(arr) {
-      arr.forEach(function (item) {
+      var _loop = function _loop(item) {
         if (item.fixed && printFlag) {
           item.fixed = null;
         }
@@ -780,9 +791,26 @@ var _initialiseProps = function _initialiseProps() {
           item.minWidth = 5;
         }
         if (item.children) {
-          recursionT(item.children);
+          item.children = recursionT(item.children);
         }
-      });
+      };
+
+      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);
+      }
     };
     recursion(columns);
     if (dataList) {
@@ -792,7 +820,7 @@ var _initialiseProps = function _initialiseProps() {
     }
     var columnsNew = columns;
     if (autoAddNumber) {
-      if (columns.length > 0) {
+      if (columnsNew.length > 0) {
         columnsNew = [{
           title: '序号',
           dataIndex: 'number',
@@ -805,10 +833,30 @@ var _initialiseProps = function _initialiseProps() {
               ' '
             );
           }
-        }].concat(columns);
+        }].concat(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 columnsNew;
+
+    return copy;
   };
 };
 

package/package.json

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