easy3wui 1.5.49-beta3 → 1.5.49-beta6

package/lib/Easy3wGridPage/index.js

@@ -114,7 +114,6 @@ var Easy3wGridPage = function (_Component) {
     _this.state = {
       // 数据
       arrData: arrData, // 列表
-      arrColumns: [], // 列
       // 选择
       selectedRowKeysState: selectedKey || [],
       selectedRowsState: selectedVal || [],
@@ -125,31 +124,15 @@ var Easy3wGridPage = function (_Component) {
   }
 
   Easy3wGridPage.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
-    var _props = this.props,
-        _props$dataList = _props.dataList,
-        dataList = _props$dataList === undefined ? [] : _props$dataList,
-        _props$columns = _props.columns,
-        columns = _props$columns === undefined ? [] : _props$columns;
-
-    var arrDataFlag = false;
-    var arrColumnsFlag = false;
-    var objSetData = {};
-    if (nextProps.dataList && nextProps.dataList.length !== dataList.length || JSON.stringify(nextProps.dataList) !== JSON.stringify(dataList)) {
-      arrDataFlag = true;
-      objSetData.arrData = nextProps.dataList && nextProps.dataList.length ? JSON.parse(JSON.stringify(nextProps.dataList)) : [];
-      // this.setState({
-      //   arrData: nextProps.dataList && nextProps.dataList.length ? JSON.parse(JSON.stringify(nextProps.dataList)) : [],
-      // });
-    }
-    if (nextProps.columns && nextProps.columns.length !== columns.length) {
-      arrColumnsFlag = true;
-      objSetData.arrColumns = nextProps.columns && nextProps.columns.length ? this.touchCreateColumns((0, _cloneDeep2['default'])(nextProps.columns)) : [];
-      // this.setState({
-      //   arrColumns: nextProps.columns && nextProps.columns.length ? this.touchCreateColumns(cloneDeep(nextProps.columns)) : [],
-      // });
-    }
-    if (arrColumnsFlag || arrDataFlag) {
-      this.setState((0, _extends3['default'])({}, objSetData));
+    var _props$dataList = this.props.dataList,
+        dataList = _props$dataList === undefined ? [] : _props$dataList;
+    var _nextProps$dataList = nextProps.dataList,
+        nextDataList = _nextProps$dataList === undefined ? [] : _nextProps$dataList;
+
+    if (nextDataList.length !== dataList.length || JSON.stringify(nextDataList) !== JSON.stringify(dataList)) {
+      this.setState({
+        arrData: nextDataList.length ? JSON.parse(JSON.stringify(nextDataList)) : []
+      });
     }
     if (nextProps.cleanFlag === '1') {
       this.delAll();
@@ -167,26 +150,26 @@ var Easy3wGridPage = function (_Component) {
   Easy3wGridPage.prototype.render = function render() {
     var _this2 = this;
 
-    var _props2 = this.props,
-        columns = _props2.columns,
-        loading = _props2.loading,
-        getCheckboxProps = _props2.getCheckboxProps,
-        needPaginationFlag = _props2.needPaginationFlag,
-        gridProps = _props2.gridProps,
-        totalResult = _props2.totalResult,
-        rowKey = _props2.rowKey,
-        checkType = _props2.checkType,
-        bordered = _props2.bordered,
-        chooseFlag = _props2.chooseFlag,
-        scroll = _props2.scroll,
-        className = _props2.className,
-        paginationInfo = _props2.paginationInfo;
+    var _props = this.props,
+        columns = _props.columns,
+        loading = _props.loading,
+        getCheckboxProps = _props.getCheckboxProps,
+        needPaginationFlag = _props.needPaginationFlag,
+        gridProps = _props.gridProps,
+        totalResult = _props.totalResult,
+        rowKey = _props.rowKey,
+        checkType = _props.checkType,
+        bordered = _props.bordered,
+        chooseFlag = _props.chooseFlag,
+        scroll = _props.scroll,
+        className = _props.className,
+        paginationInfo = _props.paginationInfo;
     var arrData = this.state.arrData;
     // [].concat(arrA)
     // 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(columns);
     // const arrColumns = this.touchCreateColumns(columns);
     var _state = this.state,
         selectedRowKeysState = _state.selectedRowKeysState,
@@ -261,7 +244,7 @@ var Easy3wGridPage = function (_Component) {
       { className: gridProps || this.props.rowType ? gridProps.onRow || this.props.rowType ? 'onRow' : null : null },
       _react2['default'].createElement(_table2['default'], (0, _extends3['default'])({
         className: printFlag ? 'scrollPrint' : className || 'scrollX',
-        columns: this.state.arrColumns && this.state.arrColumns.length ? this.state.arrColumns : arrColumns,
+        columns: arrColumns,
         dataSource: arrData,
         pagination: paginationProps,
         loading: loading,
@@ -302,11 +285,11 @@ var _initialiseProps = function _initialiseProps() {
     var _state2 = _this3.state,
         selectedRowKeysState = _state2.selectedRowKeysState,
         selectedRowsState = _state2.selectedRowsState;
-    var _props3 = _this3.props,
-        rowKey = _props3.rowKey,
-        rowKeyCname = _props3.rowKeyCname,
-        selectChangeCallback = _props3.selectChangeCallback,
-        chooseFlag = _props3.chooseFlag;
+    var _props2 = _this3.props,
+        rowKey = _props2.rowKey,
+        rowKeyCname = _props2.rowKeyCname,
+        selectChangeCallback = _props2.selectChangeCallback,
+        chooseFlag = _props2.chooseFlag;
 
     selectedRowKeysState.splice(selectedRowKeysState.findIndex(function (selectedRowKey) {
       return selectedRowKey === closeKey;
@@ -343,11 +326,11 @@ var _initialiseProps = function _initialiseProps() {
 
     var selectedRowKeysStateArr = selectedRowKeysState;
     var selectedRowsStateArr = selectedRowsState;
-    var _props4 = _this3.props,
-        rowKey = _props4.rowKey,
-        rowKeyCname = _props4.rowKeyCname,
-        selectChangeCallback = _props4.selectChangeCallback,
-        chooseFlag = _props4.chooseFlag;
+    var _props3 = _this3.props,
+        rowKey = _props3.rowKey,
+        rowKeyCname = _props3.rowKeyCname,
+        selectChangeCallback = _props3.selectChangeCallback,
+        chooseFlag = _props3.chooseFlag;
 
     var newSelRowKeysTags = [];
     selectedRowKeysStateArr.splice(selectedRowKeysStateArr.findIndex(function (selectedRowKey) {
@@ -394,12 +377,12 @@ var _initialiseProps = function _initialiseProps() {
     var _state4 = _this3.state,
         selectedRowKeysState = _state4.selectedRowKeysState,
         selectedRowsState = _state4.selectedRowsState;
-    var _props5 = _this3.props,
-        rowKey = _props5.rowKey,
-        rowKeyCname = _props5.rowKeyCname,
-        selectChangeCallback = _props5.selectChangeCallback,
-        chooseFlag = _props5.chooseFlag,
-        checkType = _props5.checkType;
+    var _props4 = _this3.props,
+        rowKey = _props4.rowKey,
+        rowKeyCname = _props4.rowKeyCname,
+        selectChangeCallback = _props4.selectChangeCallback,
+        chooseFlag = _props4.chooseFlag,
+        checkType = _props4.checkType;
 
     if (checkType === 'radio') {
       selectedRowKeysState = [];
@@ -435,11 +418,11 @@ var _initialiseProps = function _initialiseProps() {
     var _state5 = _this3.state,
         selectedRowKeysState = _state5.selectedRowKeysState,
         selectedRowsState = _state5.selectedRowsState;
-    var _props6 = _this3.props,
-        rowKey = _props6.rowKey,
-        rowKeyCname = _props6.rowKeyCname,
-        selectChangeCallback = _props6.selectChangeCallback,
-        chooseFlag = _props6.chooseFlag;
+    var _props5 = _this3.props,
+        rowKey = _props5.rowKey,
+        rowKeyCname = _props5.rowKeyCname,
+        selectChangeCallback = _props5.selectChangeCallback,
+        chooseFlag = _props5.chooseFlag;
 
     removeRows.forEach(function (removeRow) {
       selectedRowKeysState.splice(selectedRowKeysState.findIndex(function (selectedRowKey) {
@@ -512,11 +495,11 @@ var _initialiseProps = function _initialiseProps() {
 
     var selectedRowKeysStateArr = selectedRowKeysState;
     var selectedRowsStateArr = selectedRowsState;
-    var _props7 = _this3.props,
-        rowKey = _props7.rowKey,
-        rowKeyCname = _props7.rowKeyCname,
-        selectChangeCallback = _props7.selectChangeCallback,
-        chooseFlag = _props7.chooseFlag;
+    var _props6 = _this3.props,
+        rowKey = _props6.rowKey,
+        rowKeyCname = _props6.rowKeyCname,
+        selectChangeCallback = _props6.selectChangeCallback,
+        chooseFlag = _props6.chooseFlag;
 
     var flag = false;
     var newSelRowKeysTags = [];
@@ -585,10 +568,10 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.handleTableChange = function (pagination) {
-    var _props8 = _this3.props,
-        selfDealPageChangeFunc = _props8.selfDealPageChangeFunc,
-        getSearchCondition = _props8.getSearchCondition,
-        handleSearch = _props8.handleSearch;
+    var _props7 = _this3.props,
+        selfDealPageChangeFunc = _props7.selfDealPageChangeFunc,
+        getSearchCondition = _props7.getSearchCondition,
+        handleSearch = _props7.handleSearch;
 
     var formVal = getSearchCondition();
     var paginationInfo = { offset: pagination.current, limit: pagination.pageSize };
@@ -677,10 +660,10 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.touchCreateColumns = function (columns) {
-    var _props9 = _this3.props,
-        dataList = _props9.dataList,
-        autoAddNumber = _props9.autoAddNumber,
-        paginationInfo = _props9.paginationInfo;
+    var _props8 = _this3.props,
+        dataList = _props8.dataList,
+        autoAddNumber = _props8.autoAddNumber,
+        paginationInfo = _props8.paginationInfo;
     var arrData = _this3.state.arrData;
 
     var current = paginationInfo ? paginationInfo.offset : _this3.state.pagination.offset;
@@ -689,7 +672,8 @@ var _initialiseProps = function _initialiseProps() {
     var printValue = _this3.props.printValue || 'print';
     var printFlag = printArr[1] === printValue;
     var recursion = function recursion(arr) {
-      arr.forEach(function (item) {
+      return arr.map(function (item) {
+        var itemNew = {};
         var columnsType = item.type;
         if (item.fixed && printFlag) {
           item.fixed = null;
@@ -710,12 +694,15 @@ var _initialiseProps = function _initialiseProps() {
             break;
         }
         if (item.children) {
-          recursion(item.children);
+          itemNew.children = [].concat(recursion(item.children));
         }
+        itemNew = (0, _extends3['default'])({}, item);
+        return itemNew;
       });
     };
     var recursionT = function recursionT(arr) {
-      arr.forEach(function (item) {
+      return arr.map(function (item) {
+        var itemNew = {};
         if (item.fixed && printFlag) {
           item.fixed = null;
         }
@@ -797,19 +784,21 @@ var _initialiseProps = function _initialiseProps() {
           item.minWidth = 5;
         }
         if (item.children) {
-          recursionT(item.children);
+          itemNew.children = [].concat(recursionT(item.children));
         }
+        itemNew = (0, _extends3['default'])({}, item);
+        return itemNew;
       });
     };
-    recursion(columns);
+    var columnsNew = recursion(columns);
     if (dataList) {
       if (dataList.length > 0) {
-        recursionT(columns);
+        columnsNew = recursionT(columns);
       }
     }
-    var columnsNew = columns;
+    // let columnsNew = columns;
     if (autoAddNumber) {
-      if (columns.length > 0) {
+      if (columnsNew.length > 0) {
         columnsNew = [{
           title: '序号',
           dataIndex: 'number',
@@ -822,7 +811,7 @@ var _initialiseProps = function _initialiseProps() {
               ' '
             );
           }
-        }].concat(columns);
+        }].concat(columnsNew);
       }
     }
     return columnsNew;

package/package.json

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