easy3wui 1.5.55-beta9 → 1.5.55-rc.2

package/lib/Easy3wEditBigTable/Easy3wEditBigTableForm.js

@@ -32,6 +32,8 @@ var _antd = require('antd');
 
 var _easy3wui = require('easy3wui');
 
+var _lib = require('antd/lib');
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 var Easy3wEditBigTableForm = function (_PureComponent) {
@@ -186,7 +188,22 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
             var columns = objOtherParameters.columns;
 
             var objColumn = columns[batchField];
-            confirmCallback(valuesNew, objColumn);
+            var strName = objColumn.strName,
+                name = objColumn.name;
+            // key 字段
+            // required 必填
+            // strName 字串名称
+            // name 字段名称
+
+            _lib.Modal.confirm({
+              content: '\u8BF7\u786E\u8BA4\u6B64\u5217' + (strName || name) + '\u5168\u90E8\u8BBE\u7F6E\u6210\u5F55\u5165\u503C\uFF0C\u5C06\u8986\u76D6\u539F\u503C!',
+              onOk: function onOk() {
+                confirmCallback(valuesNew, objColumn);
+              },
+              onCancel: function onCancel() {},
+              okText: '确认',
+              cancelText: '取消'
+            });
           }
           _this.touchCancel();
         }
@@ -234,7 +251,7 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
         form = _props.form;
     var batchButtonText = objOtherParameters.batchButtonText;
 
-    var footBtnArr = [{ func: this.touchConfirm, cName: '保存' }, { func: this.touchCancel, cName: '取消' }];
+    var footBtnArr = [{ func: this.touchConfirm, cName: '保存' }, { func: this.touchCancel, cName: '关闭' }];
 
     var _getBatchField = this.getBatchField(),
         fieldRowItems = _getBatchField.fieldRowItems,

package/lib/Easy3wEditBigTable/index.js

@@ -71,24 +71,39 @@ var Easy3wEditBigTable = function (_Component) {
     };
 
     _this.onGridRowsUpdated = function (objUpdated) {
-      var fromRowData = objUpdated.fromRowData;
+      var fromRow = objUpdated.fromRow,
+          toRow = objUpdated.toRow,
+          fromRowData = objUpdated.fromRowData,
+          action = objUpdated.action,
+          cellKey = objUpdated.cellKey;
       var updated = objUpdated.updated;
+
+      if (action === 'COPY_PASTE') {
+        updated[cellKey] = fromRowData[cellKey];
+      }
       var _this$props = _this.props,
           touchAutoCompute = _this$props.touchAutoCompute,
-          onGridRowsUpdated = _this$props.onGridRowsUpdated,
-          dataList = _this$props.dataList;
+          dataList = _this$props.dataList; // dataList 表格数据
 
-      if (touchAutoCompute && typeof touchAutoCompute === 'function') {
-        // 数据变更-自动计算行数据
-        updated = touchAutoCompute(objUpdated);
-      }
-      var autoAddNumberIdxEdit = fromRowData.autoAddNumber_idx_edit;
+      var rows = _this.getRows(); // 显示行数据
 
-      dataList[autoAddNumberIdxEdit] = (0, _extends3['default'])({}, fromRowData, updated);
-      if (onGridRowsUpdated && typeof onGridRowsUpdated === 'function') {
-        // 数据变更-回调函数
-        onGridRowsUpdated('onGridRowsUpdated', dataList);
+      for (var i = fromRow; i <= toRow;) {
+        var objRowToUpdate = rows[i] || {};
+        // let rowToUpdate = rows[i];
+        // let updatedRow = update(rowToUpdate, {$merge: updated});
+        // rows[i] = updatedRow;
+
+        if (touchAutoCompute && typeof touchAutoCompute === 'function') {
+          // 数据变更-自动计算行数据
+          updated = touchAutoCompute((0, _extends3['default'])({}, objUpdated, { toRowData: (0, _extends3['default'])({}, objRowToUpdate) }));
+        }
+        var autoAddNumberIdxEdit = objRowToUpdate.autoAddNumber_idx_edit;
+
+        dataList[autoAddNumberIdxEdit] = (0, _extends3['default'])({}, objRowToUpdate, updated);
+        i += 1;
       }
+
+      _this.onGridRowsUpdatedZJ('onGridRowsUpdated', dataList);
     };
 
     _this.onGridSort = function (sortColumn, sortDirection) {
@@ -99,7 +114,9 @@ var Easy3wEditBigTable = function (_Component) {
       var _this$state = _this.state,
           arrValues = _this$state.arrValues,
           arrValuesInfo = _this$state.arrValuesInfo;
-      var rowKey = _this.props.rowKey;
+      var _this$props2 = _this.props,
+          rowKey = _this$props2.rowKey,
+          onRowsSelectedCb = _this$props2.onRowsSelectedCb;
 
       var arrValuesNew = []; // 表格选择行索引
       var arrValuesInfoNew = []; // 表格选择行数据
@@ -110,17 +127,23 @@ var Easy3wEditBigTable = function (_Component) {
       });
       arrValues = arrValues.concat(arrValuesNew); // 表格选择行索引
       arrValuesInfo = arrValuesInfo.concat(arrValuesInfoNew); // 表格选择行数据
+      if (onRowsSelectedCb && typeof onRowsSelectedCb === 'function') {
+        // 表格选择回调函数
+        onRowsSelectedCb('onRowsSelected', arrValues, arrValuesInfo, arrValuesNew, arrValuesInfoNew);
+      }
       _this.onSelectedRowsChange(arrValues, arrValuesInfo);
     };
 
     _this.onRowsDeselected = function (rows) {
-      var _this$state2 = _this.state,
-          arrValues = _this$state2.arrValues,
-          arrValuesInfo = _this$state2.arrValuesInfo;
-      var rowKey = _this.props.rowKey;
+      var arrValuesInfo = _this.state.arrValuesInfo;
+      var _this$props3 = _this.props,
+          rowKey = _this$props3.rowKey,
+          onRowsSelectedCb = _this$props3.onRowsSelectedCb;
 
       var arrValuesNew = []; // 表格选择行索引
       var arrValuesInfoNew = []; // 表格选择行数据
+      var arrSelected = []; // 已选择的行索引
+      var arrSelectedInfo = []; // 已选择的行数据
       arrValuesInfo.filter(function (item) {
         var flag = true;
         rows.map(function (r) {
@@ -129,6 +152,8 @@ var Easy3wEditBigTable = function (_Component) {
           if (item[rowKey] === row[rowKey]) {
             // 删除已取消选择的行
             flag = false;
+            arrSelected.push(item[rowKey]);
+            arrSelectedInfo.push(item);
           }
           return r;
         });
@@ -138,7 +163,11 @@ var Easy3wEditBigTable = function (_Component) {
         }
         return flag;
       });
-      _this.onSelectedRowsChange(arrValues, arrValuesInfo);
+      if (onRowsSelectedCb && typeof onRowsSelectedCb === 'function') {
+        // 表格选择回调函数
+        onRowsSelectedCb('onRowsDeselected', arrValuesNew, arrValuesInfoNew, arrSelected, arrSelectedInfo);
+      }
+      _this.onSelectedRowsChange(arrValuesNew, arrValuesInfoNew);
     };
 
     _this.onSelectedRowsChange = function (arrValues, arrValuesInfo) {
@@ -146,21 +175,14 @@ var Easy3wEditBigTable = function (_Component) {
     };
 
     _this.touchAddRow = function () {
-      var _this$props2 = _this.props,
-          onGridRowsUpdated = _this$props2.onGridRowsUpdated,
-          dataList = _this$props2.dataList;
+      var dataList = _this.props.dataList;
 
       var dataListNew = [].concat(dataList, [{}]);
-      if (onGridRowsUpdated && typeof onGridRowsUpdated === 'function') {
-        // 数据变更-回调函数
-        onGridRowsUpdated('touchAddRow', dataListNew);
-      }
+      _this.onGridRowsUpdatedZJ('touchAddRow', dataListNew);
     };
 
     _this.touchCopyRow = function () {
-      var _this$props3 = _this.props,
-          onGridRowsUpdated = _this$props3.onGridRowsUpdated,
-          dataList = _this$props3.dataList;
+      var dataList = _this.props.dataList;
       var arrValues = _this.state.arrValues;
 
       if (arrValues.length) {
@@ -171,10 +193,7 @@ var Easy3wEditBigTable = function (_Component) {
           return key;
         });
         var dataListNew = [].concat(dataList, newArr);
-        if (onGridRowsUpdated && typeof onGridRowsUpdated === 'function') {
-          // 数据变更-回调函数
-          onGridRowsUpdated('touchCopyRow', dataListNew);
-        }
+        _this.onGridRowsUpdatedZJ('touchCopyRow', dataListNew);
       } else {
         _modal2['default'].error({
           title: '错误',
@@ -186,7 +205,6 @@ var Easy3wEditBigTable = function (_Component) {
     _this.deleteRow = function () {
       var _this$props4 = _this.props,
           dataList = _this$props4.dataList,
-          onGridRowsUpdated = _this$props4.onGridRowsUpdated,
           objToolbarProps = _this$props4.objToolbarProps,
           rowKey = _this$props4.rowKey;
       var deleteRowInterface = objToolbarProps.deleteRowInterface;
@@ -211,10 +229,7 @@ var Easy3wEditBigTable = function (_Component) {
           // 删除行接口
           deleteRowInterface(dataListDel, arrValues);
         }
-        if (onGridRowsUpdated && typeof onGridRowsUpdated === 'function') {
-          // 数据变更-回调函数
-          onGridRowsUpdated('deleteRow', dataListNew);
-        }
+        _this.onGridRowsUpdatedZJ('deleteRow', dataListNew);
         _this.onSelectedRowsChange([], []); // 选择行清空
       } else {
         _modal2['default'].error({
@@ -231,8 +246,6 @@ var Easy3wEditBigTable = function (_Component) {
         var file = e.target.files[0];
         var reader = new FileReader();
         reader.onload = function (event) {
-          var onGridRowsUpdated = _this.props.onGridRowsUpdated;
-
           var _this$getHearder = _this.getHearder(),
               arrColumnsKey = _this$getHearder.arrColumnsKey;
 
@@ -241,11 +254,8 @@ var Easy3wEditBigTable = function (_Component) {
           var firstSheetName = workbook.SheetNames[0];
           var worksheet = workbook.Sheets[firstSheetName];
           var rows = _xlsx2['default'].utils.sheet_to_json(worksheet, { header: arrColumnsKey });
-          rows.shift();
-          if (onGridRowsUpdated && typeof onGridRowsUpdated === 'function') {
-            // 数据变更-回调函数
-            onGridRowsUpdated('touchImport', rows);
-          }
+          rows.shift(); // 去掉表头
+          _this.onGridRowsUpdatedZJ('touchImport', rows);
         };
         reader.readAsBinaryString(file);
       };
@@ -298,12 +308,8 @@ var Easy3wEditBigTable = function (_Component) {
     _this.confirmCallbackBatchEditBigTable = function (objFormData, objColumn) {
       var _this$props5 = _this.props,
           touchAutoCompute = _this$props5.touchAutoCompute,
-          onGridRowsUpdated = _this$props5.onGridRowsUpdated,
           dataList = _this$props5.dataList,
           rowKey = _this$props5.rowKey;
-      // if (touchAutoCompute && typeof touchAutoCompute === 'function') { // 数据变更-自动计算行数据
-      //   updated = touchAutoCompute(objUpdated);
-      // }
 
       var rows = _this.getRows();
       rows.map(function (row) {
@@ -313,7 +319,7 @@ var Easy3wEditBigTable = function (_Component) {
         var updated = (0, _extends3['default'])({}, objFormData);
         if (touchAutoCompute && typeof touchAutoCompute === 'function') {
           // 数据变更-自动计算行数据
-          // action 改变的动作类型，'CELL_UPDATE' 单元格更新，'CELL_BATCH_CHANGE' 单元格批量更新
+          // action 改变的动作类型，'CELL_UPDATE' 单元格更新，'CELL_BATCH_CHANGE' 单元格批量更新 CELL_UPDATE, COLUMN_FILL, COPY_PASTE, CELL_DRAG
           // cellKey 改变的单元格的key
           // fromRow 改变的单元格的原来行序号
           // fromRowData 改变的单元格的原来行数据
@@ -322,22 +328,30 @@ var Easy3wEditBigTable = function (_Component) {
           // toRow 改变的单元格的新行序号
           // toRowId 改变的单元格的新行id
           // updated 改变的单元格的新值
-          updated = touchAutoCompute({ cellKey: objColumn.key, fromRow: autoAddNumberIdxView, toRow: autoAddNumberIdxView, fromRowId: row[rowKey], toRowId: row[rowKey], rowIds: [row[rowKey]], updated: updated, action: 'CELL_BATCH_CHANGE', fromRowData: row });
+          updated = touchAutoCompute({
+            cellKey: objColumn.key,
+            fromRow: autoAddNumberIdxView,
+            toRow: autoAddNumberIdxView,
+            fromRowId: row[rowKey],
+            toRowId: row[rowKey],
+            rowIds: [row[rowKey]],
+            updated: updated,
+            action: 'CELL_BATCH_CHANGE',
+            fromRowData: row,
+            toRowData: row
+          });
         }
         dataList[autoAddNumberIdxEdit] = (0, _extends3['default'])({}, row, updated);
         return row;
       });
-      if (onGridRowsUpdated && typeof onGridRowsUpdated === 'function') {
-        // 数据变更-回调函数
-        onGridRowsUpdated('confirmCallbackBatchEditBigTable', dataList);
-      }
+      _this.onGridRowsUpdatedZJ('confirmCallbackBatchEditBigTable', dataList);
     };
 
     _this.getRows = function () {
-      var _this$state3 = _this.state,
-          filters = _this$state3.filters,
-          sortColumn = _this$state3.sortColumn,
-          sortDirection = _this$state3.sortDirection;
+      var _this$state2 = _this.state,
+          filters = _this$state2.filters,
+          sortColumn = _this$state2.sortColumn,
+          sortDirection = _this$state2.sortDirection;
       var _this$props6 = _this.props,
           dataList = _this$props6.dataList,
           enableCellSelect = _this$props6.enableCellSelect,
@@ -507,7 +521,7 @@ var Easy3wEditBigTable = function (_Component) {
         ) : '',
         saveFlag ? _react2['default'].createElement(
           'button',
-          { type: 'button', className: 'btn', onClick: saveEditBigTable },
+          { type: 'button', className: 'btn', onClick: _this.saveEditBigTableZJ },
           saveButtonText || '保存'
         ) : '',
         deleteFlag ? _react2['default'].createElement(
@@ -648,6 +662,36 @@ var Easy3wEditBigTable = function (_Component) {
       return columnsNew;
     };
 
+    _this.onGridRowsUpdatedZJ = function (operationType, dataList) {
+      var onGridRowsUpdated = _this.props.onGridRowsUpdated;
+
+      if (onGridRowsUpdated && typeof onGridRowsUpdated === 'function') {
+        // 数据变更-回调函数
+        onGridRowsUpdated(operationType, dataList);
+        _this.touchSetSaveFlag(false);
+      }
+    };
+
+    _this.saveEditBigTableZJ = function () {
+      var objToolbarProps = _this.props.objToolbarProps;
+
+      var _ref = objToolbarProps || {},
+          saveEditBigTable = _ref.saveEditBigTable;
+
+      if (saveEditBigTable && typeof saveEditBigTable === 'function') {
+        // 数据变更-回调函数
+        saveEditBigTable('saveEditBigTableZJ', function () {
+          return _this.touchSetSaveFlag(true);
+        });
+      }
+    };
+
+    _this.touchSetSaveFlag = function (saveFlag) {
+      _this.setState({
+        saveFlag: saveFlag // 保存标识 true 已保存 false 未保存
+      });
+    };
+
     _this.checkReactDataGridData = function () {
       var clearFiltersFlag = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
 
@@ -732,14 +776,34 @@ var Easy3wEditBigTable = function (_Component) {
       sortColumn: null, // 排序列
       sortDirection: null, // 排序方向
       // 批量录入
-      visible: false // 隐藏批量录入Modal
+      visible: false, // 隐藏批量录入Modal
+      // 保存标识
+      saveFlag: true // 保存标识 true 已保存 false 未保存
     };
     return _this;
   }
 
   Easy3wEditBigTable.prototype.componentDidMount = function componentDidMount() {};
 
-  Easy3wEditBigTable.prototype.componentWillUnmount = function componentWillUnmount() {};
+  Easy3wEditBigTable.prototype.componentWillUnmount = function componentWillUnmount() {
+    var saveFlag = this.state.saveFlag;
+    var saveEditBigTableZJ = this.saveEditBigTableZJ;
+
+    if (saveFlag) {
+      // 已保存
+    } else {
+      // 有变更-未保存
+      _modal2['default'].confirm({
+        title: '提示',
+        content: '表格数据未保存, 是否保存？',
+        okText: '保存',
+        cancelText: '取消',
+        onOk: function onOk() {
+          saveEditBigTableZJ();
+        }
+      });
+    }
+  };
   // 绑定组件
 
   // 获取列表
@@ -805,6 +869,14 @@ var Easy3wEditBigTable = function (_Component) {
   // 创建columns
 
   // #endregion 设置ReactDataGrid属性
+  // #region 保存
+  // 保存表格数据
+
+  // 保存表格数据
+
+  // 设置保存标识
+
+  // #endregion 保存
   // #region 校验数据
   // 校验处理
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.55-beta9",
+  "version": "1.5.55-rc.2",
   "description": "easy3wui components for react",
   "keywords": [
     "react",