easy3wui 1.5.64-beta.6 → 1.5.64-beta.8

package/assets/editBigTable.css

@@ -72,3 +72,6 @@
   color: #999;
   opacity: 1;
 }
+.Easy3wEditBigTable .custom-edit-cell {
+  background-color: #f6ffed;
+}

package/assets/index.css

@@ -1556,3 +1556,6 @@ input.ant-input-number-input {
   color: #999;
   opacity: 1;
 }
+.Easy3wEditBigTable .custom-edit-cell {
+  background-color: #f6ffed;
+}

package/lib/Easy3wEditBigTable/index.js

@@ -36,16 +36,10 @@ var _reactDataGrid2 = _interopRequireDefault(_reactDataGrid);
 
 require('react-data-grid/lib/styles.css');
 
-var _reactDataGridAddons = require('react-data-grid-addons');
-
 var _xlsx = require('xlsx');
 
 var _xlsx2 = _interopRequireDefault(_xlsx);
 
-var _numeral = require('numeral');
-
-var _numeral2 = _interopRequireDefault(_numeral);
-
 var _classnames = require('classnames');
 
 var _classnames2 = _interopRequireDefault(_classnames);
@@ -56,8 +50,6 @@ var _Easy3wEditBigTableForm2 = _interopRequireDefault(_Easy3wEditBigTableForm);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-var Selectors = _reactDataGridAddons.Data.Selectors; /* eslint-disable no-alert */
-
 var Easy3wEditBigTable = function (_Component) {
   (0, _inherits3['default'])(Easy3wEditBigTable, _Component);
 
@@ -70,18 +62,48 @@ var Easy3wEditBigTable = function (_Component) {
       _this[pureComponentName] = that;
     };
 
+    _this.touchCreateColumns = function (columns) {
+      var _this$props = _this.props,
+          _this$props$autoAddNu = _this$props.autoAddNumber,
+          autoAddNumber = _this$props$autoAddNu === undefined ? true : _this$props$autoAddNu,
+          selectedFlag = _this$props.selectedFlag;
+
+      if (autoAddNumber) {
+        columns.unshift({
+          name: '序号',
+          key: 'index',
+          renderCell: function renderCell(_ref) {
+            var rowIdx = _ref.rowIdx;
+            return rowIdx + 1;
+          }
+        });
+      }
+      if (selectedFlag) {
+        columns.unshift(_reactDataGrid.SelectColumn);
+      }
+      return columns;
+    };
+
     _this.touchDP = function () {
-      var rows = _this.props.rows;
+      var dataList = _this.props.dataList;
 
-      var arrOriginalRows = [].concat(rows); // 原始数据
+      var arrOriginalRows = [].concat(dataList); // 原始数据
       var _this$state = _this.state,
           objFilters = _this$state.objFilters,
           sortColumns = _this$state.sortColumns;
 
       var arrRows = [].concat(arrOriginalRows);
+      var numFlag = false;
       if (objFilters.enabled) {
         // 启用筛选条件
         arrRows = _this.touchFilter(objFilters, arrOriginalRows);
+        numFlag = true;
+      }
+      if (!numFlag) {
+        arrRows.map(function (item, index) {
+          item.autoAddNumber_idx_edit = index;
+          return item;
+        });
       }
       if (sortColumns.length > 0) {
         // 有排序字段
@@ -94,7 +116,8 @@ var Easy3wEditBigTable = function (_Component) {
       var objFiltersNew = (0, _extends5['default'])({}, objFilters);
       delete objFiltersNew.enabled;
       var arrFilterKeys = Object.keys(objFiltersNew);
-      return arrRows.filter(function (r) {
+      return arrRows.filter(function (r, index) {
+        r.autoAddNumber_idx_edit = index;
         var filterFlag = true;
         arrFilterKeys.map(function (key) {
           filterFlag = filterFlag && (objFilters[key] || objFilters[key] === 0 ? r[key] && r[key].includes(objFilters[key]) : true);
@@ -115,7 +138,7 @@ var Easy3wEditBigTable = function (_Component) {
         }
         return true;
       });
-      return arrRows.sort(function (a, b) {
+      var arr = arrRows.sort(function (a, b) {
         // const comparator = getComparator(objSortColumns.columnKey);
         var compResult = 0; // 比较结果
         switch (dataType) {
@@ -163,28 +186,40 @@ var Easy3wEditBigTable = function (_Component) {
           return compResult;
         }
       });
+      return arr;
     };
 
-    _this.touchcountTotal = function () {
-      var rowsView = [].concat(_this.arrRows);
-      var objTotal = {}; // 总计对象
+    _this.touchCountTotal = function (rowsView, columns) {
       rowsView.map(function (row, index) {
-        _this.props.columns.map(function (item, idx) {
+        columns.map(function (item, idx) {
           var key = item.key,
-              totalFlag = item.totalFlag;
+              totalFlag = item.totalFlag,
+              children = item.children;
 
-          if (totalFlag && typeof totalFlag === 'boolean') {
+          if (children) {
+            _this.touchCountTotal(rowsView, children);
+          } else if (totalFlag && typeof totalFlag === 'boolean') {
             if (index === 0) {
-              objTotal[key] = 0;
+              _this.objTotal[key] = 0;
             }
             var intData = Number(row[key]) || 0;
-            objTotal[key] += intData;
+            _this.objTotal[key] += intData;
           }
           return idx;
         });
         return index;
       });
-      return objTotal;
+      return _this.objTotal;
+    };
+
+    _this.touchSetState = function (objState, callback) {
+      // objState 要设置的state对象
+      // callback 回调函数 非必须
+      if (callback && typeof callback === 'function') {
+        _this.setState(objState, callback);
+      } else {
+        _this.setState(objState);
+      }
     };
 
     _this.touchFilters = function () {
@@ -194,6 +229,12 @@ var Easy3wEditBigTable = function (_Component) {
         objFilters: (0, _extends5['default'])({}, objFilters, {
           enabled: !objFilters.enabled
         })
+      }, function () {
+        var touchFiltersChangeState = _this.props.touchFiltersChangeState;
+
+        if (touchFiltersChangeState && typeof touchFiltersChangeState === 'function') {
+          touchFiltersChangeState((0, _extends5['default'])({}, _this.state.objFilters));
+        }
       });
     };
 
@@ -204,6 +245,12 @@ var Easy3wEditBigTable = function (_Component) {
 
       _this.setState({
         objFilters: (0, _extends5['default'])({}, objFilters, (_extends2 = {}, _extends2[fieldId] = value, _extends2))
+      }, function () {
+        var touchFiltersChangeState = _this.props.touchFiltersChangeState;
+
+        if (touchFiltersChangeState && typeof touchFiltersChangeState === 'function') {
+          touchFiltersChangeState((0, _extends5['default'])({}, _this.state.objFilters));
+        }
       });
     };
 
@@ -214,6 +261,12 @@ var Easy3wEditBigTable = function (_Component) {
         objFilters: {
           enabled: objFilters.enabled
         }
+      }, function () {
+        var touchFiltersChangeState = _this.props.touchFiltersChangeState;
+
+        if (touchFiltersChangeState && typeof touchFiltersChangeState === 'function') {
+          touchFiltersChangeState((0, _extends5['default'])({}, _this.state.objFilters));
+        }
       });
     };
 
@@ -307,18 +360,18 @@ var Easy3wEditBigTable = function (_Component) {
     };
 
     _this.touchAddRow = function () {
-      var _ref;
+      var _ref2;
 
       var rowKey = _this.props.rowKey;
-      var rows = _this.props.rows;
+      var dataList = _this.props.dataList;
 
-      _this.saveEditBigTableModelZJ('touchAddRow', [].concat(rows, [(_ref = {}, _ref[rowKey] = 'add_' + (rows.length - 1) + '_' + new Date().getTime(), _ref)]));
+      _this.saveEditBigTableModelZJ('touchAddRow', [].concat(dataList, [(_ref2 = {}, _ref2[rowKey] = 'add_' + (dataList.length - 1) + '_' + new Date().getTime(), _ref2)]));
     };
 
     _this.touchCopyRow = function () {
-      var _this$props = _this.props,
-          rows = _this$props.rows,
-          rowKey = _this$props.rowKey;
+      var _this$props2 = _this.props,
+          dataList = _this$props2.dataList,
+          rowKey = _this$props2.rowKey;
       var arrValuesInfo = _this.state.arrValuesInfo;
 
       if (arrValuesInfo.length) {
@@ -330,7 +383,7 @@ var Easy3wEditBigTable = function (_Component) {
           arrNew.push(newRow);
           return item;
         });
-        _this.saveEditBigTableModelZJ('touchCopyRow', [].concat(rows, arrNew));
+        _this.saveEditBigTableModelZJ('touchCopyRow', [].concat(dataList, arrNew));
       } else {
         _modal2['default'].error({
           title: '错误',
@@ -340,18 +393,18 @@ var Easy3wEditBigTable = function (_Component) {
     };
 
     _this.deleteRow = function () {
-      var rows = _this.props.rows;
+      var dataList = _this.props.dataList;
       var _this$state2 = _this.state,
           arrValues = _this$state2.arrValues,
           arrValuesInfo = _this$state2.arrValuesInfo;
-      var _this$props2 = _this.props,
-          objToolbarProps = _this$props2.objToolbarProps,
-          rowKey = _this$props2.rowKey;
+      var _this$props3 = _this.props,
+          objToolbarProps = _this$props3.objToolbarProps,
+          rowKey = _this$props3.rowKey;
       var deleteRowInterface = objToolbarProps.deleteRowInterface;
 
       if (arrValues.length) {
         var arrRows = []; // 删除数据后的新数组
-        rows.map(function (row) {
+        dataList.map(function (row) {
           var flag = true;
           arrValues.map(function (key) {
             if (key === row[rowKey]) {
@@ -380,12 +433,12 @@ var Easy3wEditBigTable = function (_Component) {
       }
     };
 
-    _this.getHearder = function () {
-      var _this$props3 = _this.props,
-          columns = _this$props3.columns,
-          arrColumnsKey = _this$props3.arrColumnsKey,
-          objSheet = _this$props3.objSheet,
-          arrColInfo = _this$props3.arrColInfo;
+    _this.touchGetHearder = function () {
+      var _this$props4 = _this.props,
+          columns = _this$props4.columns,
+          arrColumnsKey = _this$props4.arrColumnsKey,
+          objSheet = _this$props4.objSheet,
+          arrColInfo = _this$props4.arrColInfo;
 
 
       var arrColumnsKeyNew = ['id'];
@@ -426,17 +479,17 @@ var Easy3wEditBigTable = function (_Component) {
         var file = e.target.files[0];
         var reader = new FileReader();
         reader.onload = function (event) {
-          var _this$getHearder = _this.getHearder(),
-              arrColumnsKey = _this$getHearder.arrColumnsKey;
+          var _this$touchGetHearder = _this.touchGetHearder(),
+              arrColumnsKey = _this$touchGetHearder.arrColumnsKey;
 
           var data = event.target.result;
           var workbook = _xlsx2['default'].read(data, { type: 'binary' });
           var firstSheetName = workbook.SheetNames[0];
           var worksheet = workbook.Sheets[firstSheetName];
-          var rows = _xlsx2['default'].utils.sheet_to_json(worksheet, { header: arrColumnsKey });
-          rows.shift(); // 去掉表头
-          // const rowsView = this.getRows(rows); // 表格显示数据
-          _this.saveEditBigTableModelZJ('touchImport', rows);
+          var dataList = _xlsx2['default'].utils.sheet_to_json(worksheet, { header: arrColumnsKey });
+          dataList.shift(); // 去掉表头
+          // const rowsView = this.getRows(dataList); // 表格显示数据
+          _this.saveEditBigTableModelZJ('touchImport', dataList);
         };
         reader.readAsBinaryString(file);
       };
@@ -444,9 +497,9 @@ var Easy3wEditBigTable = function (_Component) {
     };
 
     _this.touchExport = function () {
-      var _this$getHearder2 = _this.getHearder(),
-          objSheet = _this$getHearder2.objSheet,
-          arrColInfo = _this$getHearder2.arrColInfo;
+      var _this$touchGetHearder2 = _this.touchGetHearder(),
+          objSheet = _this$touchGetHearder2.objSheet,
+          arrColInfo = _this$touchGetHearder2.arrColInfo;
 
       var rowsView = [].concat(_this.arrRows);
       // 计算 rowsView 中所有对象字段最多的长度
@@ -487,61 +540,46 @@ var Easy3wEditBigTable = function (_Component) {
     };
 
     _this.confirmCallbackBatchEditBigTable = function (objFormData, objColumn) {
-      var _this$props4 = _this.props,
-          rows = _this$props4.rows,
-          touchAutoCompute = _this$props4.touchAutoCompute,
-          rowKey = _this$props4.rowKey;
+      var _this$props5 = _this.props,
+          dataList = _this$props5.dataList,
+          touchAutoCompute = _this$props5.touchAutoCompute,
+          rowKey = _this$props5.rowKey;
 
       var rowsView = [].concat(_this.arrRows);
-      rowsView.map(function (row, index) {
-        var rowId = row[rowKey];
+      rowsView.map(function (row) {
+        // const rowId = row[rowKey];
+        var autoAddNumberIdxEdit = row.autoAddNumber_idx_edit;
         // const { [rowKey]:  } = row;
+
         var updated = (0, _extends5['default'])({}, objFormData);
         if (touchAutoCompute && typeof touchAutoCompute === 'function') {
           // 数据变更-自动计算行数据
-          // action 改变的动作类型，'CELL_UPDATE' 单元格更新，'CELL_BATCH_CHANGE' 单元格批量更新 CELL_UPDATE, COLUMN_FILL, COPY_PASTE, CELL_DRAG
-          // cellKey 改变的单元格的key
-          // fromRow 改变的单元格的原来行序号
-          // fromRowData 改变的单元格的原来行数据
-          // fromRowId 改变的单元格的原来行id(行唯一标识)
-          // rowIds 所有被选中的行id
-          // toRow 改变的单元格的新行序号
-          // toRowId 改变的单元格的新行id
-          // updated 改变的单元格的新值
           updated = touchAutoCompute({
             cellKey: objColumn.key,
-            fromRow: index,
-            toRow: index,
-            fromRowId: row[rowKey],
-            toRowId: row[rowKey],
-            rowIds: [row[rowKey]],
             updated: updated,
-            action: 'CELL_BATCH_CHANGE',
-            fromRowData: row,
             toRowData: row
           });
         }
-        rows[rowId] = (0, _extends5['default'])({}, rows[rowId], updated);
-        rowsView[index] = (0, _extends5['default'])({}, rowsView[index], updated);
+        dataList[autoAddNumberIdxEdit] = (0, _extends5['default'])({}, dataList[autoAddNumberIdxEdit], updated);
         return row;
       });
-      _this.saveEditBigTableModelZJ('confirmCallbackBatchEditBigTable', rows);
+      _this.saveEditBigTableModelZJ('confirmCallbackBatchEditBigTable', dataList);
     };
 
-    _this.saveEditBigTableModelZJ = function (operationType, rows) {
+    _this.saveEditBigTableModelZJ = function (operationType, dataList) {
       var saveEditBigTableModel = _this.props.saveEditBigTableModel;
 
       if (saveEditBigTableModel && typeof saveEditBigTableModel === 'function') {
         // 数据变更-回调函数
-        saveEditBigTableModel(operationType, rows);
+        saveEditBigTableModel(operationType, dataList);
       }
     };
 
     _this.saveEditBigTableZJ = function () {
       var objToolbarProps = _this.props.objToolbarProps;
 
-      var _ref2 = objToolbarProps || {},
-          saveEditBigTable = _ref2.saveEditBigTable;
+      var _ref3 = objToolbarProps || {},
+          saveEditBigTable = _ref3.saveEditBigTable;
 
       if (saveEditBigTable && typeof saveEditBigTable === 'function') {
         // 数据变更-回调函数
@@ -557,21 +595,40 @@ var Easy3wEditBigTable = function (_Component) {
       });
     };
 
-    _this.touchRowsChange = function (updatedRows, _ref3) {
-      var indexes = _ref3.indexes,
-          column = _ref3.column;
-    }
-    // const { cellKey, toRowData, updated } = objUpdated;
-    // const { cellKey }
-    // const touchAutoCompute
-
-    // #endregion 表单编辑
-
-    // #region 行选择
-    ;
+    _this.touchRowsChange = function (updatedRows, obj) {
+      var indexes = obj.indexes,
+          column = obj.column;
+      var _this$props6 = _this.props,
+          touchAutoCompute = _this$props6.touchAutoCompute,
+          dataList = _this$props6.dataList;
+      var key = column.key;
+
+      if (indexes && indexes.length) {
+        indexes.map(function (index) {
+          var updated = updatedRows[index];
+          var _updated = updated,
+              autoAddNumberIdxEdit = _updated.autoAddNumber_idx_edit;
+
+          if (touchAutoCompute && typeof touchAutoCompute === 'function') {
+            var _updated2;
+
+            updated = touchAutoCompute({
+              cellKey: key,
+              updated: (_updated2 = {}, _updated2[column.key] = updated[column.key], _updated2),
+              toRowData: _this.arrRows[index]
+            });
+          }
+          dataList[autoAddNumberIdxEdit] = (0, _extends5['default'])({}, dataList[autoAddNumberIdxEdit], updated);
+          return index;
+        });
+        _this.saveEditBigTableModelZJ('touchRowsChange', dataList);
+      }
+    };
 
     _this.touchSelectedRowsChange = function (selectedRows) {
-      var rowKey = _this.props.rowKey;
+      var _this$props7 = _this.props,
+          rowKey = _this$props7.rowKey,
+          touchSelectedRowsChangeCB = _this$props7.touchSelectedRowsChangeCB;
 
       var arrValuesInfo = Array.from(selectedRows);
       var arrValues = [];
@@ -579,6 +636,9 @@ var Easy3wEditBigTable = function (_Component) {
         arrValues.push(item[rowKey]);
         return item;
       });
+      if (touchSelectedRowsChangeCB && typeof touchSelectedRowsChangeCB === 'function') {
+        touchSelectedRowsChangeCB(arrValues, arrValuesInfo, selectedRows);
+      }
       _this.setState({
         // 表格选择
         selectedRows: selectedRows, // 选中的行
@@ -640,6 +700,9 @@ var Easy3wEditBigTable = function (_Component) {
   };
   // 绑定组件
 
+  // #region 表头列处理
+
+  // #endregion 表头列处理
 
   // #region 数据处理
   // 数据处理
@@ -652,6 +715,11 @@ var Easy3wEditBigTable = function (_Component) {
 
   // #endregion 数据处理
 
+  // #region state变更
+  // 设置组件state
+
+  // #endregion state变更
+
   // #region 筛选
   // 切换筛选
 
@@ -699,7 +767,11 @@ var Easy3wEditBigTable = function (_Component) {
 
   // #endregion 保存
 
-  // #region 表单编辑
+  // #region 表单数据编辑
+
+  // #endregion 表单数据编辑
+
+  // #region 行选择
 
 
   // #endregion 行选择
@@ -726,13 +798,15 @@ var Easy3wEditBigTable = function (_Component) {
     this.arrRows = this.touchDP();
     var objPrps = {};
     // #region 总计行
-    if (topTotalFlag) {
-      var arrTotalRows = [this.touchcountTotal()];
-      objPrps.topSummaryRows = arrTotalRows;
-    }
-    if (bottomTotalFlag) {
-      var _arrTotalRows = [this.touchcountTotal()];
-      objPrps.bottomSummaryRows = _arrTotalRows;
+    if (topTotalFlag || bottomTotalFlag) {
+      this.objTotal = {}; // 总计对象
+      var arrTotalRows = [this.touchCountTotal(this.arrRows, columns)];
+      if (topTotalFlag) {
+        objPrps.topSummaryRows = arrTotalRows;
+      }
+      if (bottomTotalFlag) {
+        objPrps.bottomSummaryRows = arrTotalRows;
+      }
     }
     // #endregion 总计行
     return _react2['default'].createElement(
@@ -740,7 +814,7 @@ var Easy3wEditBigTable = function (_Component) {
       { className: (0, _classnames2['default'])(['Easy3wEditBigTable']) },
       objToolbarProps ? this.getToolbar() : '',
       _react2['default'].createElement(_reactDataGrid2['default'], (0, _extends5['default'])({}, objPrps, {
-        columns: columns // 表头
+        columns: this.touchCreateColumns(columns) // 表头
         , defaultColumnOptions: {
           resizable: true // 可调整列宽
         },
@@ -756,8 +830,8 @@ var Easy3wEditBigTable = function (_Component) {
         selectedRows: selectedRows,
         onSelectedRowsChange: this.touchSelectedRowsChange
         // 表格编辑时触发
-        // onRowsChange={rows => this.saveEditBigTableModelZJ('onSelectedRowsChange', rows)}
         , onRowsChange: this.touchRowsChange
+        // 其它属性
       }, objOtherProps)),
       visible ? _react2['default'].createElement(_Easy3wEditBigTableForm2['default'] // 批量录入Modal
       , { visible: visible // 是否显示
@@ -774,10 +848,12 @@ var Easy3wEditBigTable = function (_Component) {
   };
 
   return Easy3wEditBigTable;
-}(_react.Component);
+}(_react.Component); /* eslint-disable no-param-reassign */
+/* eslint-disable no-alert */
+
 
 Easy3wEditBigTable.defaultProps = {
-  rowKey: 'id' // 表格主键 原始数据索引
+  rowKey: 'autoAddNumber_idx_edit' // 表格主键 原始数据索引
 };
 exports['default'] = Easy3wEditBigTable;
 module.exports = exports['default'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.64-beta.6",
+  "version": "1.5.64-beta.8",
   "description": "easy3wui components for react",
   "keywords": [
     "react",