easy3wui 1.5.55-beta6 → 1.5.55-beta8

package/lib/Easy3wEditBigTable/index.js

@@ -96,37 +96,53 @@ var Easy3wEditBigTable = function (_Component) {
     };
 
     _this.onRowsSelected = function (rows) {
-      var arrValues = _this.state.arrValues;
+      var _this$state = _this.state,
+          arrValues = _this$state.arrValues,
+          arrValuesInfo = _this$state.arrValuesInfo;
       var rowKey = _this.props.rowKey;
 
-      var arrValuesNew = arrValues.concat(rows.map(function (r) {
-        return r.row[rowKey];
-      })); // 表格选择行索引
-      _this.onSelectedRowsChange(arrValuesNew);
+      var arrValuesNew = []; // 表格选择行索引
+      var arrValuesInfoNew = []; // 表格选择行数据
+      rows.map(function (r) {
+        arrValuesNew.push(r.row[rowKey]);
+        arrValuesInfoNew.push(r.row);
+        return r;
+      });
+      arrValues = arrValues.concat(arrValuesNew); // 表格选择行索引
+      arrValuesInfo = arrValuesInfo.concat(arrValuesInfoNew); // 表格选择行数据
+      _this.onSelectedRowsChange(arrValues, arrValuesInfo);
     };
 
     _this.onRowsDeselected = function (rows) {
-      var arrValues = _this.state.arrValues;
+      var _this$state2 = _this.state,
+          arrValues = _this$state2.arrValues,
+          arrValuesInfo = _this$state2.arrValuesInfo;
       var rowKey = _this.props.rowKey;
 
-      var arrValuesNew = arrValues.filter(function (key) {
+      var arrValuesNew = []; // 表格选择行索引
+      var arrValuesInfoNew = []; // 表格选择行数据
+      arrValuesInfo.filter(function (item) {
         var flag = true;
         rows.map(function (r) {
           var row = r.row;
 
-          if (key === row[rowKey]) {
+          if (item[rowKey] === row[rowKey]) {
             // 删除已取消选择的行
             flag = false;
           }
           return r;
         });
+        if (flag) {
+          arrValuesNew.push(item[rowKey]);
+          arrValuesInfoNew.push(item);
+        }
         return flag;
       });
-      _this.onSelectedRowsChange(arrValuesNew);
+      _this.onSelectedRowsChange(arrValues, arrValuesInfo);
     };
 
-    _this.onSelectedRowsChange = function (arrValues) {
-      _this.setState({ arrValues: arrValues });
+    _this.onSelectedRowsChange = function (arrValues, arrValuesInfo) {
+      _this.setState({ arrValues: arrValues, arrValuesInfo: arrValuesInfo });
     };
 
     _this.touchAddRow = function () {
@@ -199,7 +215,7 @@ var Easy3wEditBigTable = function (_Component) {
           // 数据变更-回调函数
           onGridRowsUpdated('deleteRow', dataListNew);
         }
-        _this.onSelectedRowsChange([]); // 选择行清空
+        _this.onSelectedRowsChange([], []); // 选择行清空
       } else {
         _modal2['default'].error({
           title: '错误',
@@ -318,10 +334,10 @@ var Easy3wEditBigTable = function (_Component) {
     };
 
     _this.getRows = function () {
-      var _this$state = _this.state,
-          filters = _this$state.filters,
-          sortColumn = _this$state.sortColumn,
-          sortDirection = _this$state.sortDirection;
+      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,
@@ -522,14 +538,20 @@ var Easy3wEditBigTable = function (_Component) {
       // rowIdx：当前行的索引
 
       var editable = column.editable,
-          editor = column.editor;
+          editor = column.editor,
+          onCheckCellIsEditable = column.onCheckCellIsEditable;
 
+      var editableFlag = false; // 单元格是否可编辑 true 允许编辑 false 禁止编辑
       if (editable || editor) {
         // 单元格可编辑
-        return true; // 返回 true 表示允许编辑
+        editableFlag = true;
+        if (onCheckCellIsEditable && typeof onCheckCellIsEditable === 'function') {
+          editableFlag = onCheckCellIsEditable(obj); // 自定义单元格是否可编辑
+        }
       } else {
-        return false; // 返回 false 表示禁止编辑
+        editableFlag = false;
       }
+      return editableFlag;
     };
 
     _this.touchRowRenderer = function (obj) {
@@ -582,7 +604,7 @@ var Easy3wEditBigTable = function (_Component) {
         objReactDataGridProps.enableCellSelect = enableCellSelect;
         objReactDataGridProps.onGridRowsUpdated = _this.onGridRowsUpdated; // 表格编辑
         if (onCheckCellIsEditable) {
-          objReactDataGridProps.onCheckCellIsEditable = onCheckCellIsEditable; // 单元格是否可编辑
+          objReactDataGridProps.onCheckCellIsEditable = onCheckCellIsEditable || _this.onCheckCellIsEditable; // 单元格是否可编辑
         }
         objReactDataGridProps.rowRenderer = touchRowRenderer || _this.touchRowRenderer; // 表格行渲染
       }
@@ -703,6 +725,7 @@ var Easy3wEditBigTable = function (_Component) {
     _this.state = {
       // 表格选择
       arrValues: [], // 表格选择行索引
+      arrValuesInfo: [], // 表格选择行数据
       // 查询条件
       filters: {},
       // 排序--sort

package/package.json

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