easy3wui 1.5.55-rc.9 → 1.5.55

package/lib/Easy3wEditBigTable/Easy3wEditBigTableForm.js

@@ -120,6 +120,7 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
         // rules 校验规则
         // ruleType 校验规则类型
         // onChange 字段值变化回调
+        // cmptPros 组件属性
 
         var arrHiddenItems = [];
         if (hiddeKeys) {

package/lib/Easy3wEditBigTable/index.js

@@ -111,22 +111,34 @@ var Easy3wEditBigTable = function (_Component) {
   };
 
   Easy3wEditBigTable.prototype.componentWillUnmount = function componentWillUnmount() {
+    var objToolbarProps = this.props.objToolbarProps;
+
+    var _ref = objToolbarProps || {},
+        _ref$unloadSaveFlag = _ref.unloadSaveFlag,
+        unloadSaveFlag = _ref$unloadSaveFlag === undefined ? true : _ref$unloadSaveFlag;
+    // unloadSaveFlag 是否在卸载后保存 true 需要保存 false 不需要保存
+
+
     var saveFlag = this.state.saveFlag;
+    // saveFlag 是否已保存 true 已保存 false 未保存
+
     var saveEditBigTableZJ = this.saveEditBigTableZJ;
 
-    if (saveFlag) {
-      // 已保存
-    } else {
-      // 有变更-未保存
-      _modal2['default'].confirm({
-        title: '提示',
-        content: '表格数据未保存, 是否保存？',
-        okText: '保存',
-        cancelText: '取消',
-        onOk: function onOk() {
-          saveEditBigTableZJ();
-        }
-      });
+    if (unloadSaveFlag) {
+      if (saveFlag) {
+        // 已保存
+      } else {
+        // 有变更-未保存
+        _modal2['default'].confirm({
+          title: '提示',
+          content: '表格数据未保存, 是否保存？',
+          okText: '保存',
+          cancelText: '取消',
+          onOk: function onOk() {
+            saveEditBigTableZJ();
+          }
+        });
+      }
     }
   };
   // 绑定组件
@@ -424,9 +436,9 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.touchCopyRow = function () {
-    var _props4 = _this3.props,
-        rows = _props4.rows,
-        rowsView = _props4.rowsView;
+    var _state4 = _this3.state,
+        rows = _state4.rows,
+        rowsView = _state4.rowsView;
     var arrValues = _this3.state.arrValues;
 
     if (arrValues.length) {
@@ -449,12 +461,12 @@ var _initialiseProps = function _initialiseProps() {
 
   this.deleteRow = function () {
     var rows = _this3.state.rows;
-    var _state4 = _this3.state,
-        arrValues = _state4.arrValues,
-        arrValuesInfo = _state4.arrValuesInfo;
-    var _props5 = _this3.props,
-        objToolbarProps = _props5.objToolbarProps,
-        rowKey = _props5.rowKey;
+    var _state5 = _this3.state,
+        arrValues = _state5.arrValues,
+        arrValuesInfo = _state5.arrValuesInfo;
+    var _props4 = _this3.props,
+        objToolbarProps = _props4.objToolbarProps,
+        rowKey = _props4.rowKey;
     var deleteRowInterface = objToolbarProps.deleteRowInterface;
 
     if (arrValues.length) {
@@ -559,17 +571,16 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.confirmCallbackBatchEditBigTable = function (objFormData, objColumn) {
-    var _state5 = _this3.state,
-        rows = _state5.rows,
-        rowsView = _state5.rowsView;
-    var _props6 = _this3.props,
-        touchAutoCompute = _props6.touchAutoCompute,
-        rowKey = _props6.rowKey;
+    var _state6 = _this3.state,
+        rows = _state6.rows,
+        rowsView = _state6.rowsView;
+    var _props5 = _this3.props,
+        touchAutoCompute = _props5.touchAutoCompute,
+        rowKey = _props5.rowKey;
     // const rows = this.getRows();
 
-    rowsView.map(function (row) {
-      var autoAddNumberIdxEdit = row.autoAddNumber_idx_edit,
-          autoAddNumberIdxView = row.autoAddNumber_idx_view;
+    rowsView.map(function (row, index) {
+      var autoAddNumberIdxEdit = row.autoAddNumber_idx_edit;
 
       var updated = (0, _extends3['default'])({}, objFormData);
       if (touchAutoCompute && typeof touchAutoCompute === 'function') {
@@ -585,8 +596,8 @@ var _initialiseProps = function _initialiseProps() {
         // updated 改变的单元格的新值
         updated = touchAutoCompute({
           cellKey: objColumn.key,
-          fromRow: autoAddNumberIdxView,
-          toRow: autoAddNumberIdxView,
+          fromRow: index,
+          toRow: index,
           fromRowId: row[rowKey],
           toRowId: row[rowKey],
           rowIds: [row[rowKey]],
@@ -597,19 +608,27 @@ var _initialiseProps = function _initialiseProps() {
         });
       }
       rows[autoAddNumberIdxEdit] = (0, _extends3['default'])({}, rows[autoAddNumberIdxEdit], updated);
-      rowsView[autoAddNumberIdxView] = (0, _extends3['default'])({}, rowsView[autoAddNumberIdxView], updated);
+      rowsView[index] = (0, _extends3['default'])({}, rowsView[index], updated);
       return row;
     });
     _this3.onGridRowsUpdatedZJ('confirmCallbackBatchEditBigTable', rows, rowsView);
   };
 
   this.getRows = function (rows) {
-    var _state6 = _this3.state,
-        filters = _state6.filters,
-        sortColumn = _state6.sortColumn,
-        sortDirection = _state6.sortDirection;
-
-    return Selectors.getRows({ rows: rows || _this3.state.rows, filters: filters, sortColumn: sortColumn, sortDirection: sortDirection });
+    var _state7 = _this3.state,
+        filters = _state7.filters,
+        sortColumn = _state7.sortColumn,
+        sortDirection = _state7.sortDirection;
+    // 预处理数据，替换 null或undefined 值, 避免查询时报错
+
+    var cleanedRows = (rows || _this3.state.rows).map(function (row) {
+      var cleanedRow = {};
+      Object.keys(row).forEach(function (key) {
+        cleanedRow[key] = row[key] === null || row[key] === undefined ? '' : row[key]; // 将 null或undefined 替换为空字符串或其他默认值
+      });
+      return cleanedRow;
+    });
+    return Selectors.getRows({ rows: cleanedRows, filters: filters, sortColumn: sortColumn, sortDirection: sortDirection });
   };
 
   this.getSize = function () {
@@ -622,7 +641,10 @@ var _initialiseProps = function _initialiseProps() {
     var rowsView = _this3.state.rowsView;
     // autoAddNumber_idx_view 自动添加序号 显示数据的索引
 
-    return (0, _extends3['default'])({}, rowsView[rowIdx], { autoAddNumber_idx_view: rowIdx + 1 });
+    if (rowsView[rowIdx]) {
+      rowsView[rowIdx].autoAddNumber_idx_view = rowIdx + 1;
+    }
+    return rowsView[rowIdx];
   };
 
   this.touchLoopDataNum = function (dataList) {
@@ -675,10 +697,10 @@ var _initialiseProps = function _initialiseProps() {
 
   this.getHearder = function () {
     var columns = _this3.props.columns;
-    var _props7 = _this3.props,
-        arrColumnsKey = _props7.arrColumnsKey,
-        objSheet = _props7.objSheet,
-        arrColInfo = _props7.arrColInfo;
+    var _props6 = _this3.props,
+        arrColumnsKey = _props6.arrColumnsKey,
+        objSheet = _props6.objSheet,
+        arrColInfo = _props6.arrColInfo;
 
 
     var arrColumnsKeyNew = ['id'];
@@ -907,23 +929,48 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.touchRowRenderer = function (obj) {
-    var onCheckCellIsEditable = _this3.props.onCheckCellIsEditable;
+    var _props7 = _this3.props,
+        onCheckCellIsEditable = _props7.onCheckCellIsEditable,
+        touchSetRowClass = _props7.touchSetRowClass,
+        touchSetRowStyle = _props7.touchSetRowStyle;
     var renderBaseRow = obj.renderBaseRow,
         columns = obj.columns,
         row = obj.row,
         idx = obj.idx;
 
     var onCheckCellIsEditableNew = onCheckCellIsEditable || _this3.onCheckCellIsEditable;
-    var columnsNew = [].concat(columns);
+    var columnsNew = [];
+    // 单元格样式
     columns.map(function (column, index) {
+      var touchSetCellClass = column.touchSetCellClass;
+
+      var cellClass = column.cellClass || '';
+
+      // 单元格样式
+      if (touchSetCellClass && typeof touchSetCellClass === 'function') {
+        cellClass += touchSetCellClass({ column: column, idx: idx, row: row, columnIndex: index });
+      }
+      // 编辑单元格样式
       if (onCheckCellIsEditableNew({ column: column, idx: idx, row: row })) {
-        columnsNew[index] = (0, _extends3['default'])({}, column, { cellClass: (column.cellClass || '') + ' custom-edit-cell' });
+        cellClass += 'custom-edit-cell'; // 编辑单元格样式
       }
+      columnsNew.push((0, _extends3['default'])({}, column, { cellClass: cellClass }));
       return column;
     });
+    // 行样式-行class
+    var rowClass = '';
+    if (touchSetRowClass && typeof touchSetRowClass === 'function') {
+      rowClass = touchSetRowClass({ row: row, idx: idx, obj: obj });
+    }
+    // 行样式-行style
+    var rowStyle = {};
+    if (touchSetRowStyle && typeof touchSetRowStyle === 'function') {
+      rowStyle = touchSetRowStyle({ row: row, idx: idx, obj: obj });
+    }
+
     return _react2['default'].createElement(
       'span',
-      null,
+      { className: rowClass, style: rowStyle },
       renderBaseRow((0, _extends3['default'])({}, obj, {
         columns: [].concat(columnsNew)
       }))
@@ -970,7 +1017,7 @@ var _initialiseProps = function _initialiseProps() {
         onRowsDeselected: _this3.onRowsDeselected,
         selectBy: {
           keys: {
-            rowKey: rowKey || 'id',
+            rowKey: rowKey,
             values: arrValues
           }
           // indexes: this.state.arrValues,
@@ -1018,8 +1065,8 @@ var _initialiseProps = function _initialiseProps() {
   this.saveEditBigTableZJ = function () {
     var objToolbarProps = _this3.props.objToolbarProps;
 
-    var _ref = objToolbarProps || {},
-        saveEditBigTable = _ref.saveEditBigTable;
+    var _ref2 = objToolbarProps || {},
+        saveEditBigTable = _ref2.saveEditBigTable;
 
     if (saveEditBigTable && typeof saveEditBigTable === 'function') {
       // 数据变更-回调函数
@@ -1045,9 +1092,8 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.checkData = function () {
-    var _props10 = _this3.props,
-        columns = _props10.columns,
-        rows = _props10.rows;
+    var rows = _this3.state.rows;
+    var columns = _this3.props.columns;
 
     var strCheckFailRows = ''; // 校验失败的行号
     var arrRequiredMessage = []; // 必填提示信息
@@ -1085,31 +1131,34 @@ var _initialiseProps = function _initialiseProps() {
         }
       }
     });
-    _modal2['default'].error({
-      title: '校验失败',
-      content: _react2['default'].createElement(
-        'div',
-        null,
-        arrRequiredMessage.map(function (item, index) {
-          return index === 0 ? _react2['default'].createElement(
-            'span',
-            null,
-            item
-          ) : _react2['default'].createElement(
-            'span',
-            null,
-            _react2['default'].createElement('br', null),
-            item
-          );
-        })
-      )
-    });
-    console.error(arrRequiredMessage, strCheckFailRows);
+    if (strCheckFailRows) {
+      // 校验失败
+      _modal2['default'].error({
+        title: '校验失败',
+        content: _react2['default'].createElement(
+          'div',
+          null,
+          arrRequiredMessage.map(function (item, index) {
+            return index === 0 ? _react2['default'].createElement(
+              'span',
+              null,
+              item
+            ) : _react2['default'].createElement(
+              'span',
+              null,
+              _react2['default'].createElement('br', null),
+              item
+            );
+          })
+        )
+      });
+      console.error(arrRequiredMessage, strCheckFailRows);
+    }
     return { arrRequiredMessage: arrRequiredMessage, strCheckFailRows: strCheckFailRows };
   };
 
   this.touchFormatNum = function (num) {
-    return !isNaN(num) && isFinite(num) ? (0, _numeral2['default'])(num).format('0,0.00') : num || '';
+    return num !== '' && !isNaN(num) && isFinite(num) ? (0, _numeral2['default'])(num).format('0,0.00') : num || '';
   };
 };
 

package/package.json

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