easy3wui 1.5.64-beta.10 → 1.5.64-beta.12

package/lib/Easy3wEditBigTable/index.js

@@ -276,7 +276,7 @@ var Easy3wEditBigTable = function (_Component) {
       });
     };
 
-    _this.getToolbar = function () {
+    _this.touchGetToolbar = function () {
       var objToolbarProps = _this.props.objToolbarProps;
       var addRowFlag = objToolbarProps.addRowFlag,
           addRowButtonText = objToolbarProps.addRowButtonText,
@@ -424,7 +424,7 @@ var Easy3wEditBigTable = function (_Component) {
         } else {
           _this.saveEditBigTableModelZJ('deleteRow', arrRows);
         }
-        _this.onSelectedRowsChange([], []); // 选择行清空
+        _this.touchSelectedRowsChange(new Set()); // 选择行清空
       } else {
         _modal2['default'].error({
           title: '错误',
@@ -625,15 +625,27 @@ var Easy3wEditBigTable = function (_Component) {
       }
     };
 
-    _this.touchSelectedRowsChange = function (selectedRows) {
+    _this.touchSelectedRowsChange = function (selectedRows, a, b) {
       var _this$props7 = _this.props,
+          dataList = _this$props7.dataList,
           rowKey = _this$props7.rowKey,
           touchSelectedRowsChangeCB = _this$props7.touchSelectedRowsChangeCB;
 
-      var arrValuesInfo = Array.from(selectedRows);
-      var arrValues = [];
-      arrValuesInfo.map(function (item) {
-        arrValues.push(item[rowKey]);
+      var arrValues = Array.from(selectedRows);
+      var arrValuesInfo = [];
+      arrValues.map(function (item) {
+        var rowInfo = {};
+        if (rowKey === 'autoAddNumber_idx_edit') {
+          rowInfo = (0, _extends5['default'])({}, dataList[item]);
+        } else {
+          dataList.map(function (obj) {
+            if (obj[rowKey] === item[rowKey]) {
+              rowInfo = (0, _extends5['default'])({}, obj);
+            }
+            return obj;
+          });
+        }
+        arrValuesInfo.push(rowInfo);
         return item;
       });
       if (touchSelectedRowsChangeCB && typeof touchSelectedRowsChangeCB === 'function') {
@@ -653,6 +665,7 @@ var Easy3wEditBigTable = function (_Component) {
       bidPureComponent(_this);
     }
     _this.state = {
+      visible: false, // 隐藏批量录入Modal
       sortColumns: [], // 排序字段
       objFilters: {
         enabled: false // 是否启用筛选条件
@@ -754,7 +767,7 @@ var Easy3wEditBigTable = function (_Component) {
 
   // 批量录入--隐藏批量录入Modal
 
-  // 批量录入--确认回调 ---待完善
+  // 批量录入--确认回调
 
   // #endregion 右上角按钮处理--toolbar
 
@@ -812,7 +825,7 @@ var Easy3wEditBigTable = function (_Component) {
     return _react2['default'].createElement(
       'div',
       { className: (0, _classnames2['default'])(['Easy3wEditBigTable']) },
-      objToolbarProps ? this.getToolbar() : '',
+      objToolbarProps ? this.touchGetToolbar() : '',
       _react2['default'].createElement(_reactDataGrid2['default'], (0, _extends5['default'])({}, objPrps, {
         columns: this.touchCreateColumns(columns) // 表头
         , defaultColumnOptions: {

package/lib/Easy3wModal/index.js

@@ -62,7 +62,7 @@ var Easy3wModal = function (_Component) {
       args[_key] = arguments[_key];
     }
 
-    return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (e, func) {
+    return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.modalRef = (0, _react.createRef)(), _this.onClickFunc = function (e, func) {
       var globalLoading = _this.props.loadingFlag.global;
       if (globalLoading) {
         _notification3['default'].warning({
@@ -100,6 +100,13 @@ var Easy3wModal = function (_Component) {
     }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
   }
 
+  Easy3wModal.prototype.componentWillUnmount = function componentWillUnmount() {
+    // 确保在组件卸载后不会尝试访问 DOM 节点
+    if (this.modalRef.current) {
+      document.body.style.overflow = '';
+    }
+  };
+
   Easy3wModal.prototype.render = function render() {
     var _props = this.props,
         title = _props.title,
@@ -114,6 +121,7 @@ var Easy3wModal = function (_Component) {
     return _react2['default'].createElement(
       _modal2['default'],
       (0, _extends3['default'])({
+        ref: this.modalRef,
         title: title,
         visible: visible,
         confirmLoading: loadingFlag,

package/package.json

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