easy3wui 1.5.8-5.beta → 1.5.8-6.beta

package/lib/Easy3wEditBigTable/index.js

@@ -2,6 +2,18 @@
 
 exports.__esModule = true;
 
+var _icon = require('antd/lib/icon');
+
+var _icon2 = _interopRequireDefault(_icon);
+
+var _tooltip = require('antd/lib/tooltip');
+
+var _tooltip2 = _interopRequireDefault(_tooltip);
+
+var _objectWithoutProperties2 = require('babel-runtime/helpers/objectWithoutProperties');
+
+var _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2);
+
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -22,6 +34,10 @@ var _inherits2 = require('babel-runtime/helpers/inherits');
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
+require('antd/lib/icon/style');
+
+require('antd/lib/tooltip/style');
+
 require('antd/lib/modal/style');
 
 var _react = require('react');
@@ -54,13 +70,13 @@ var Selectors = _reactDataGridAddons.Data.Selectors;
 // import XLSX from 'xlsx';
 /* eslint-disable no-alert */
 
-var Easy3wEditBigTable = function (_Component) {
-  (0, _inherits3['default'])(Easy3wEditBigTable, _Component);
+var Easy3wEditBigTable = function (_React$Component) {
+  (0, _inherits3['default'])(Easy3wEditBigTable, _React$Component);
 
   function Easy3wEditBigTable(props) {
     (0, _classCallCheck3['default'])(this, Easy3wEditBigTable);
 
-    var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
+    var _this = (0, _possibleConstructorReturn3['default'])(this, _React$Component.call(this, props));
 
     _initialiseProps.call(_this);
 
@@ -248,7 +264,7 @@ var Easy3wEditBigTable = function (_Component) {
       _react2['default'].createElement(
         'style',
         null,
-        strReactDataGridStyle || (strAddReactDataGridStyle || '') + '\n              .custom-edit-cell {  \n                background-color: #f6ffed;\n              }\n            '
+        strReactDataGridStyle || (strAddReactDataGridStyle || '') + '\n              .custom-edit-cell {\n                background-color: #f6ffed;\n              }\n            '
       ),
       _react2['default'].createElement(_reactDataGrid2['default'], (0, _extends3['default'])({}, this.props, {
         ref: this.ReactDataGridRef,
@@ -298,7 +314,7 @@ var Easy3wEditBigTable = function (_Component) {
   };
 
   return Easy3wEditBigTable;
-}(_react.Component);
+}(_react2['default'].Component);
 
 Easy3wEditBigTable.defaultProps = {
   rowKey: 'autoAddNumber_idx_edit' // 表格主键 原始数据索引
@@ -1040,7 +1056,140 @@ var _initialiseProps = function _initialiseProps() {
         columns = _props9.columns;
     // 自动添加序号
 
-    var columnsNew = [].concat(columns);
+    var columnsNew = [];
+    for (var _iterator = columns, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref2;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref2 = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref2 = _i.value;
+      }
+
+      var column = _ref2;
+      var required = column.required,
+          titlec = column.name,
+          helpInfo = column.helpInfo;
+      var e3wFieldCfg = _this3.props.e3wFieldCfg;
+      var dataIndex = column.dataIndex;
+
+      var objCfg = e3wFieldCfg && e3wFieldCfg[dataIndex] && e3wFieldCfg[dataIndex] instanceof Object ? e3wFieldCfg[dataIndex] : null;
+      if (objCfg) {
+        var fieldSName = objCfg.fieldSName,
+            fieldDesc = objCfg.fieldDesc,
+            fieldHelpInfo = objCfg.fieldHelpInfo,
+            fieldReqFlag = objCfg.fieldReqFlag,
+            fieldDspFlag = objCfg.fieldDspFlag;
+
+        if (fieldDspFlag === '0') {
+          // return column;
+          // eslint-disable-next-line no-continue
+          continue;
+        } else {
+          required = fieldReqFlag === '0' ? false : fieldReqFlag === '1' ? true : required;
+          if (fieldSName) {
+            titlec = fieldSName;
+          }
+          helpInfo = fieldHelpInfo || helpInfo;
+          if (helpInfo) {
+            var needHelpFlag = true;
+            if (titlec && titlec instanceof Object) {
+              var _titlec = titlec,
+                  titleType = _titlec.type,
+                  props = _titlec.props;
+
+              var _ref3 = titleType || {},
+                  name = _ref3.name;
+
+              var _ref4 = props || {},
+                  titleT = _ref4.title,
+                  children = _ref4.children,
+                  restProps = (0, _objectWithoutProperties3['default'])(_ref4, ['title', 'children']);
+
+              if (name === 'Tooltip' && titleT) {
+                // 创建新的Tooltip组件，继承现有props，更新title
+                titlec = _react2['default'].createElement(
+                  _tooltip2['default'],
+                  (0, _extends3['default'])({}, restProps, {
+                    title: _react2['default'].createElement(
+                      'span',
+                      { style: { whiteSpace: 'pre-wrap' } },
+                      helpInfo
+                    )
+                  }),
+                  children
+                );
+                needHelpFlag = false;
+              }
+            }
+            if (needHelpFlag) {
+              titlec = _react2['default'].createElement(
+                _tooltip2['default'],
+                {
+                  placement: 'top',
+                  title: _react2['default'].createElement(
+                    'span',
+                    { style: { whiteSpace: 'pre-wrap' } },
+                    helpInfo
+                  )
+                },
+                titlec,
+                _react2['default'].createElement(_icon2['default'], { type: 'question-circle' })
+              );
+            }
+          }
+          if (required) {
+            titlec = _react2['default'].createElement(
+              'span',
+              null,
+              _react2['default'].createElement(
+                'span',
+                { style: { color: 'red' } },
+                '*'
+              ),
+              titlec
+            );
+          }
+        }
+        column.name = titlec;
+        // } else {
+      } else {
+        if (helpInfo) {
+          titlec = _react2['default'].createElement(
+            _tooltip2['default'],
+            {
+              placement: 'top',
+              title: _react2['default'].createElement(
+                'span',
+                { style: { whiteSpace: 'pre-wrap' } },
+                helpInfo
+              )
+            },
+            titlec,
+            _react2['default'].createElement(_icon2['default'], { type: 'question-circle' })
+          );
+        }
+        if (required) {
+          // required, title: titlec, helpInfo
+          titlec = _react2['default'].createElement(
+            'span',
+            null,
+            _react2['default'].createElement(
+              'span',
+              { style: { color: 'red' } },
+              '*'
+            ),
+            titlec
+          );
+        }
+        column.name = titlec;
+      }
+      columnsNew.push((0, _extends3['default'])({}, column));
+      // return column;
+    }
     if (autoAddNumber && typeof autoAddNumber === 'boolean') {
       var objColumns = columns && columns.length > 0 ? columns[0] : {};
       var _objColumns$frozen = objColumns.frozen,
@@ -1069,8 +1218,8 @@ var _initialiseProps = function _initialiseProps() {
   this.saveEditBigTableZJ = function () {
     var objToolbarProps = _this3.props.objToolbarProps;
 
-    var _ref2 = objToolbarProps || {},
-        saveEditBigTable = _ref2.saveEditBigTable;
+    var _ref5 = objToolbarProps || {},
+        saveEditBigTable = _ref5.saveEditBigTable;
 
     if (saveEditBigTable && typeof saveEditBigTable === 'function') {
       // 数据变更-回调函数

package/lib/Easy3wGridPage/indexM.js

@@ -843,6 +843,36 @@ var _initialiseProps = function _initialiseProps() {
         }
         itemNew.title = title;
         // } else {
+      } else {
+        if (helpInfo) {
+          title = _react2['default'].createElement(
+            _tooltip2['default'],
+            {
+              placement: 'top',
+              title: _react2['default'].createElement(
+                'span',
+                { style: { whiteSpace: 'pre-wrap' } },
+                helpInfo
+              )
+            },
+            title,
+            _react2['default'].createElement(_icon2['default'], { type: 'question-circle' })
+          );
+        }
+        if (required) {
+          // required, title: titlec, helpInfo
+          title = _react2['default'].createElement(
+            'span',
+            null,
+            _react2['default'].createElement(
+              'span',
+              { style: { color: 'red' } },
+              '*'
+            ),
+            title
+          );
+        }
+        itemNew.title = title;
       }
       myColumns.push(itemNew);
       return item;

package/lib/Easy3wGridPage/indexPC.js

@@ -816,6 +816,36 @@ var _initialiseProps = function _initialiseProps() {
         }
         itemNew.title = title;
         // } else {
+      } else {
+        if (helpInfo) {
+          title = _react2['default'].createElement(
+            _tooltip2['default'],
+            {
+              placement: 'top',
+              title: _react2['default'].createElement(
+                'span',
+                { style: { whiteSpace: 'pre-wrap' } },
+                helpInfo
+              )
+            },
+            title,
+            _react2['default'].createElement(_icon2['default'], { type: 'question-circle' })
+          );
+        }
+        if (required) {
+          // required, title: titlec, helpInfo
+          title = _react2['default'].createElement(
+            'span',
+            null,
+            _react2['default'].createElement(
+              'span',
+              { style: { color: 'red' } },
+              '*'
+            ),
+            title
+          );
+        }
+        itemNew.title = title;
       }
       myColumns.push(itemNew);
       return item;

package/package.json

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