easy3wui 1.5.55-beta10 → 1.5.55-beta12

package/lib/Easy3wEditBigTable/index.js

@@ -99,7 +99,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 +112,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 +137,8 @@ var Easy3wEditBigTable = function (_Component) {
           if (item[rowKey] === row[rowKey]) {
             // 删除已取消选择的行
             flag = false;
+            arrSelected.push(item[rowKey]);
+            arrSelectedInfo.push(item);
           }
           return r;
         });
@@ -138,7 +148,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,9 +160,9 @@ var Easy3wEditBigTable = function (_Component) {
     };
 
     _this.touchAddRow = function () {
-      var _this$props2 = _this.props,
-          onGridRowsUpdated = _this$props2.onGridRowsUpdated,
-          dataList = _this$props2.dataList;
+      var _this$props4 = _this.props,
+          onGridRowsUpdated = _this$props4.onGridRowsUpdated,
+          dataList = _this$props4.dataList;
 
       var dataListNew = [].concat(dataList, [{}]);
       if (onGridRowsUpdated && typeof onGridRowsUpdated === 'function') {
@@ -158,9 +172,9 @@ var Easy3wEditBigTable = function (_Component) {
     };
 
     _this.touchCopyRow = function () {
-      var _this$props3 = _this.props,
-          onGridRowsUpdated = _this$props3.onGridRowsUpdated,
-          dataList = _this$props3.dataList;
+      var _this$props5 = _this.props,
+          onGridRowsUpdated = _this$props5.onGridRowsUpdated,
+          dataList = _this$props5.dataList;
       var arrValues = _this.state.arrValues;
 
       if (arrValues.length) {
@@ -184,11 +198,11 @@ 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 _this$props6 = _this.props,
+          dataList = _this$props6.dataList,
+          onGridRowsUpdated = _this$props6.onGridRowsUpdated,
+          objToolbarProps = _this$props6.objToolbarProps,
+          rowKey = _this$props6.rowKey;
       var deleteRowInterface = objToolbarProps.deleteRowInterface;
       var arrValues = _this.state.arrValues;
 
@@ -296,11 +310,11 @@ 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;
+      var _this$props7 = _this.props,
+          touchAutoCompute = _this$props7.touchAutoCompute,
+          onGridRowsUpdated = _this$props7.onGridRowsUpdated,
+          dataList = _this$props7.dataList,
+          rowKey = _this$props7.rowKey;
       // if (touchAutoCompute && typeof touchAutoCompute === 'function') { // 数据变更-自动计算行数据
       //   updated = touchAutoCompute(objUpdated);
       // }
@@ -334,14 +348,14 @@ var Easy3wEditBigTable = function (_Component) {
     };
 
     _this.getRows = function () {
-      var _this$state3 = _this.state,
-          filters = _this$state3.filters,
-          sortColumn = _this$state3.sortColumn,
-          sortDirection = _this$state3.sortDirection;
-      var _this$props6 = _this.props,
-          dataList = _this$props6.dataList,
-          enableCellSelect = _this$props6.enableCellSelect,
-          rowSelection = _this$props6.rowSelection;
+      var _this$state2 = _this.state,
+          filters = _this$state2.filters,
+          sortColumn = _this$state2.sortColumn,
+          sortDirection = _this$state2.sortDirection;
+      var _this$props8 = _this.props,
+          dataList = _this$props8.dataList,
+          enableCellSelect = _this$props8.enableCellSelect,
+          rowSelection = _this$props8.rowSelection;
 
       var rows = dataList;
       if (enableCellSelect || rowSelection) {
@@ -400,10 +414,10 @@ var Easy3wEditBigTable = function (_Component) {
 
     _this.getHearder = function () {
       var columns = _this.props.columns;
-      var _this$props7 = _this.props,
-          arrColumnsKey = _this$props7.arrColumnsKey,
-          objSheet = _this$props7.objSheet,
-          arrColInfo = _this$props7.arrColInfo;
+      var _this$props9 = _this.props,
+          arrColumnsKey = _this$props9.arrColumnsKey,
+          objSheet = _this$props9.objSheet,
+          arrColInfo = _this$props9.arrColInfo;
 
 
       var arrColumnsKeyNew = ['id'];
@@ -580,13 +594,13 @@ var Easy3wEditBigTable = function (_Component) {
 
     _this.getReactDataGridProps = function () {
       var arrValues = _this.state.arrValues;
-      var _this$props8 = _this.props,
-          enableCellSelect = _this$props8.enableCellSelect,
-          rowKey = _this$props8.rowKey,
-          objToolbarProps = _this$props8.objToolbarProps,
-          rowSelection = _this$props8.rowSelection,
-          onCheckCellIsEditable = _this$props8.onCheckCellIsEditable,
-          touchRowRenderer = _this$props8.touchRowRenderer;
+      var _this$props10 = _this.props,
+          enableCellSelect = _this$props10.enableCellSelect,
+          rowKey = _this$props10.rowKey,
+          objToolbarProps = _this$props10.objToolbarProps,
+          rowSelection = _this$props10.rowSelection,
+          onCheckCellIsEditable = _this$props10.onCheckCellIsEditable,
+          touchRowRenderer = _this$props10.touchRowRenderer;
 
       var objReactDataGridProps = {}; // ReactDataGrid属性对象
       // toolbar属性
@@ -631,9 +645,9 @@ var Easy3wEditBigTable = function (_Component) {
     };
 
     _this.createColumns = function () {
-      var _this$props9 = _this.props,
-          autoAddNumber = _this$props9.autoAddNumber,
-          columns = _this$props9.columns;
+      var _this$props11 = _this.props,
+          autoAddNumber = _this$props11.autoAddNumber,
+          columns = _this$props11.columns;
       // 自动添加序号
 
       var columnsNew = [].concat(columns);
@@ -658,9 +672,9 @@ var Easy3wEditBigTable = function (_Component) {
     };
 
     _this.checkData = function () {
-      var _this$props10 = _this.props,
-          columns = _this$props10.columns,
-          dataList = _this$props10.dataList;
+      var _this$props12 = _this.props,
+          columns = _this$props12.columns,
+          dataList = _this$props12.dataList;
 
       var strCheckFailRows = ''; // 校验失败的行号
       var arrRequiredMessage = []; // 必填提示信息

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.55-beta10",
+  "version": "1.5.55-beta12",
   "description": "easy3wui components for react",
   "keywords": [
     "react",