easy3wui 1.5.8-5.beta → 1.5.8-7.beta

package/lib/Easy3wCard/indexM.js

@@ -92,23 +92,23 @@ var Easy3wCardM = function (_Component) {
             // 单个元素，检查是否是 Alert
             var _children = children,
                 item = _children[0];
-            var type = item.type;
+            var props = item.props;
+            var closable = props.closable,
+                message = props.message,
+                typeA = props.type;
 
-            var _ref3 = type && type instanceof Object ? type : {},
-                name = _ref3.name;
-
-            if (name === 'Alert') {
+            if (closable && message && typeA === 'success') {
               children = null;
             }
           } else {
             // 多个元素，查找并移除 Alert
             var foundIndex = children.findIndex(function (item) {
-              var type = item.type;
-
-              var _ref4 = type && type instanceof Object ? type : {},
-                  name = _ref4.name;
+              var props = item.props;
+              var closable = props.closable,
+                  message = props.message,
+                  typeA = props.type;
 
-              return name === 'Alert';
+              return closable && message && typeA === 'success';
             });
             if (foundIndex !== -1) {
               children.splice(foundIndex, 1);
@@ -125,10 +125,10 @@ var Easy3wCardM = function (_Component) {
       var hasReqFlag = false;
       if (label && label instanceof Object) {
         var _label = label,
-            props = _label.props;
+            _props = _label.props;
 
-        var _ref5 = props || {},
-            childrenLabel = _ref5.children;
+        var _ref3 = _props || {},
+            childrenLabel = _ref3.children;
 
         if (childrenLabel && childrenLabel instanceof Array) {
           // 创建 childrenLabel 的可变副本，避免修改只读的 props.children
@@ -136,12 +136,12 @@ var Easy3wCardM = function (_Component) {
           var _foundIndex = childrenLabelCopy.findIndex(function (item) {
             var propsCL = item.props;
 
-            var _ref6 = propsCL || {},
-                childrenLabelC = _ref6.children,
-                style = _ref6.style;
+            var _ref4 = propsCL || {},
+                childrenLabelC = _ref4.children,
+                style = _ref4.style;
 
-            var _ref7 = style || {},
-                color = _ref7.color;
+            var _ref5 = style || {},
+                color = _ref5.color;
             // const { name } = type && type instanceof Object ? type : {};
 
 
@@ -154,7 +154,7 @@ var Easy3wCardM = function (_Component) {
               // 移除红色星号元素
               childrenLabelCopy.splice(_foundIndex, 1);
               // 创建新的 label 元素，使用修改后的 children
-              label = _react2['default'].cloneElement(label, (0, _extends3['default'])({}, props, {
+              label = _react2['default'].cloneElement(label, (0, _extends3['default'])({}, _props, {
                 children: childrenLabelCopy.length === 1 ? childrenLabelCopy[0] : childrenLabelCopy
               }));
             }

package/lib/Easy3wCard/indexPC.js

@@ -91,23 +91,23 @@ var Easy3wCardPC = function (_Component) {
             // 单个元素，检查是否是 Alert
             var _children = children,
                 item = _children[0];
-            var type = item.type;
+            var props = item.props;
+            var closable = props.closable,
+                message = props.message,
+                typeA = props.type;
 
-            var _ref3 = type && type instanceof Object ? type : {},
-                name = _ref3.name;
-
-            if (name === 'Alert') {
+            if (closable && message && typeA === 'success') {
               children = null;
             }
           } else {
             // 多个元素，查找并移除 Alert
             var foundIndex = children.findIndex(function (item) {
-              var type = item.type;
-
-              var _ref4 = type && type instanceof Object ? type : {},
-                  name = _ref4.name;
+              var props = item.props;
+              var closable = props.closable,
+                  message = props.message,
+                  typeA = props.type;
 
-              return name === 'Alert';
+              return closable && message && typeA === 'success';
             });
             if (foundIndex !== -1) {
               children.splice(foundIndex, 1);
@@ -124,10 +124,10 @@ var Easy3wCardPC = function (_Component) {
       var hasReqFlag = false;
       if (label && label instanceof Object) {
         var _label = label,
-            props = _label.props;
+            _props = _label.props;
 
-        var _ref5 = props || {},
-            childrenLabel = _ref5.children;
+        var _ref3 = _props || {},
+            childrenLabel = _ref3.children;
 
         if (childrenLabel && childrenLabel instanceof Array) {
           // 创建 childrenLabel 的可变副本，避免修改只读的 props.children
@@ -135,12 +135,12 @@ var Easy3wCardPC = function (_Component) {
           var _foundIndex = childrenLabelCopy.findIndex(function (item) {
             var propsCL = item.props;
 
-            var _ref6 = propsCL || {},
-                childrenLabelC = _ref6.children,
-                style = _ref6.style;
+            var _ref4 = propsCL || {},
+                childrenLabelC = _ref4.children,
+                style = _ref4.style;
 
-            var _ref7 = style || {},
-                color = _ref7.color;
+            var _ref5 = style || {},
+                color = _ref5.color;
             // const { name } = type && type instanceof Object ? type : {};
 
 
@@ -153,7 +153,7 @@ var Easy3wCardPC = function (_Component) {
               // 移除红色星号元素
               childrenLabelCopy.splice(_foundIndex, 1);
               // 创建新的 label 元素，使用修改后的 children
-              label = _react2['default'].cloneElement(label, (0, _extends3['default'])({}, props, {
+              label = _react2['default'].cloneElement(label, (0, _extends3['default'])({}, _props, {
                 children: childrenLabelCopy.length === 1 ? childrenLabelCopy[0] : childrenLabelCopy
               }));
             }
@@ -195,6 +195,7 @@ var Easy3wCardPC = function (_Component) {
           bordered: false,
           className: (0, _classnames2['default'])(['e3wCardForm']),
           size: size || 'default'
+          // ref={this.myRef}
         },
         cardHelpInfo ? _react2['default'].createElement(_alert2['default'], {
           message: cardHelpInfo,
@@ -205,6 +206,29 @@ var Easy3wCardPC = function (_Component) {
       );
     }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
   }
+  // constructor(props) {
+  //   super(props);
+  //   this.myRef = this.createRef();
+  // }
+
+  // componentDidUpdate() {
+  //   // 使用 findDOMNode 获取 Card 组件的 DOM 节点
+  //   // eslint-disable-next-line react/no-find-dom-node
+  //   const cardNode = ReactDOM.findDOMNode(this.myRef.current);
+  //   if (cardNode) {
+  //     // 查找 Card 内部的 antd Alert 元素
+  //     const alertElements = cardNode.querySelectorAll('.ant-card-body>.ant-alert');
+  //     console.log('alertElements', alertElements);
+  //     // 遍历并移除所有 Alert 元素
+  //     // alertElements.forEach((alertElement) => {
+  //     //   if (alertElement.parentNode) {
+  //     //     console.log('alertElement.parentNode.removeChild', alertElement.parentNode.removeChild);
+  //     //     alertElement.parentNode.removeChild(alertElement);
+  //     //   }
+  //     // });
+  //   }
+  // }
+
   // 根据配置重新渲染 去除原内容： 如帮助及红色*号
 
 

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,137 @@ 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,
+                  props = _titlec.props;
+
+              var _ref3 = props || {},
+                  placement = _ref3.placement,
+                  titleT = _ref3.title,
+                  children = _ref3.children,
+                  restProps = (0, _objectWithoutProperties3['default'])(_ref3, ['placement', 'title', 'children']);
+
+              if (placement && titleT && children) {
+                // 创建新的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 +1215,8 @@ var _initialiseProps = function _initialiseProps() {
   this.saveEditBigTableZJ = function () {
     var objToolbarProps = _this3.props.objToolbarProps;
 
-    var _ref2 = objToolbarProps || {},
-        saveEditBigTable = _ref2.saveEditBigTable;
+    var _ref4 = objToolbarProps || {},
+        saveEditBigTable = _ref4.saveEditBigTable;
 
     if (saveEditBigTable && typeof saveEditBigTable === 'function') {
       // 数据变更-回调函数

package/lib/Easy3wFormPage/indexM.js

@@ -483,18 +483,15 @@ var Easy3wFormPageM = exports.Easy3wFormPageM = function (_Component) {
               var needHelpFlag = true;
               if (label && label instanceof Object) {
                 var _label = label,
-                    type = _label.type,
                     props = _label.props;
 
-                var _ref = type || {},
-                    name = _ref.name;
+                var _ref = props || {},
+                    placement = _ref.placement,
+                    title = _ref.title,
+                    children = _ref.children,
+                    restProps = (0, _objectWithoutProperties3['default'])(_ref, ['placement', 'title', 'children']);
 
-                var _ref2 = props || {},
-                    title = _ref2.title,
-                    children = _ref2.children,
-                    restProps = (0, _objectWithoutProperties3['default'])(_ref2, ['title', 'children']);
-
-                if (name === 'Tooltip' && title) {
+                if (placement && title && children) {
                   // 创建新的Tooltip组件，继承现有props，更新title
                   label = _react2['default'].createElement(
                     _tooltip2['default'],
@@ -753,14 +750,14 @@ var Easy3wFormPageM = exports.Easy3wFormPageM = function (_Component) {
           disableFlag = item.disableFlag,
           numberFormat = item.numberFormat;
 
-      var _ref3 = globalData || {},
-          dataDesensitizationEyeFlag = _ref3.dataDesensitizationEyeFlag;
+      var _ref2 = globalData || {},
+          dataDesensitizationEyeFlag = _ref2.dataDesensitizationEyeFlag;
 
       var value = item.value;
 
-      var _ref4 = cmptPros || {},
-          addonAfter = _ref4.addonAfter,
-          numeralFormat = _ref4.numeralFormat;
+      var _ref3 = cmptPros || {},
+          addonAfter = _ref3.addonAfter,
+          numeralFormat = _ref3.numeralFormat;
       // numeralFormat 新组件(金额、数字)的格式化参数
 
 
@@ -1349,18 +1346,18 @@ var Easy3wFormPageM = exports.Easy3wFormPageM = function (_Component) {
 
       var threeRowItemFlag = false;
       for (var _iterator = rowItemsF, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref5;
+        var _ref4;
 
         if (_isArray) {
           if (_i >= _iterator.length) break;
-          _ref5 = _iterator[_i++];
+          _ref4 = _iterator[_i++];
         } else {
           _i = _iterator.next();
           if (_i.done) break;
-          _ref5 = _i.value;
+          _ref4 = _i.value;
         }
 
-        var rItem = _ref5;
+        var rItem = _ref4;
 
         if (rItem.cols.length === 3) {
           threeRowItemFlag = true;
@@ -3262,18 +3259,18 @@ var Easy3wFormPageTightM = exports.Easy3wFormPageTightM = function (_Component2)
       rowItems = _this2.touchTransformRowItems(rowItems);
       var threeRowItemFlag = false;
       for (var _iterator2 = rowItems, _isArray2 = Array.isArray(_iterator2), _i3 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref6;
+        var _ref5;
 
         if (_isArray2) {
           if (_i3 >= _iterator2.length) break;
-          _ref6 = _iterator2[_i3++];
+          _ref5 = _iterator2[_i3++];
         } else {
           _i3 = _iterator2.next();
           if (_i3.done) break;
-          _ref6 = _i3.value;
+          _ref5 = _i3.value;
         }
 
-        var rItem = _ref6;
+        var rItem = _ref5;
 
         if (rItem.cols.length === 3) {
           threeRowItemFlag = true;

package/lib/Easy3wFormPage/indexPC.js

@@ -474,18 +474,16 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
               var needHelpFlag = true;
               if (label && label instanceof Object) {
                 var _label = label,
-                    type = _label.type,
                     props = _label.props;
+                // const { name } = type || {};
 
-                var _ref = type || {},
-                    name = _ref.name;
+                var _ref = props || {},
+                    placement = _ref.placement,
+                    title = _ref.title,
+                    children = _ref.children,
+                    restProps = (0, _objectWithoutProperties3['default'])(_ref, ['placement', 'title', 'children']);
 
-                var _ref2 = props || {},
-                    title = _ref2.title,
-                    children = _ref2.children,
-                    restProps = (0, _objectWithoutProperties3['default'])(_ref2, ['title', 'children']);
-
-                if (name === 'Tooltip' && title) {
+                if (placement && title && children) {
                   // 创建新的Tooltip组件，继承现有props，更新title
                   label = _react2['default'].createElement(
                     _tooltip2['default'],
@@ -637,14 +635,14 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
           disableFlag = item.disableFlag,
           numberFormat = item.numberFormat;
 
-      var _ref3 = globalData || {},
-          dataDesensitizationEyeFlag = _ref3.dataDesensitizationEyeFlag;
+      var _ref2 = globalData || {},
+          dataDesensitizationEyeFlag = _ref2.dataDesensitizationEyeFlag;
 
       var value = item.value;
 
-      var _ref4 = cmptPros || {},
-          addonAfter = _ref4.addonAfter,
-          numeralFormat = _ref4.numeralFormat;
+      var _ref3 = cmptPros || {},
+          addonAfter = _ref3.addonAfter,
+          numeralFormat = _ref3.numeralFormat;
       // numeralFormat 新组件(金额、数字)的格式化参数
 
 
@@ -1230,18 +1228,18 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
 
       var threeRowItemFlag = false;
       for (var _iterator = rowItemsF, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-        var _ref5;
+        var _ref4;
 
         if (_isArray) {
           if (_i >= _iterator.length) break;
-          _ref5 = _iterator[_i++];
+          _ref4 = _iterator[_i++];
         } else {
           _i = _iterator.next();
           if (_i.done) break;
-          _ref5 = _i.value;
+          _ref4 = _i.value;
         }
 
-        var rItem = _ref5;
+        var rItem = _ref4;
 
         if (rItem.cols.length === 3) {
           threeRowItemFlag = true;
@@ -2997,18 +2995,18 @@ var Easy3wFormPageTightPC = exports.Easy3wFormPageTightPC = function (_Component
 
       var threeRowItemFlag = false;
       for (var _iterator2 = rowItems, _isArray2 = Array.isArray(_iterator2), _i3 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-        var _ref6;
+        var _ref5;
 
         if (_isArray2) {
           if (_i3 >= _iterator2.length) break;
-          _ref6 = _iterator2[_i3++];
+          _ref5 = _iterator2[_i3++];
         } else {
           _i3 = _iterator2.next();
           if (_i3.done) break;
-          _ref6 = _i3.value;
+          _ref5 = _i3.value;
         }
 
-        var rItem = _ref6;
+        var rItem = _ref5;
 
         if (rItem.cols.length === 3) {
           threeRowItemFlag = true;

package/lib/Easy3wGridPage/indexM.js

@@ -785,18 +785,15 @@ var _initialiseProps = function _initialiseProps() {
             var needHelpFlag = true;
             if (title && title instanceof Object) {
               var _title = title,
-                  type = _title.type,
                   props = _title.props;
 
-              var _ref2 = type || {},
-                  name = _ref2.name;
+              var _ref2 = props || {},
+                  placement = _ref2.placement,
+                  titleT = _ref2.title,
+                  children = _ref2.children,
+                  restProps = (0, _objectWithoutProperties3['default'])(_ref2, ['placement', 'title', 'children']);
 
-              var _ref3 = props || {},
-                  titleT = _ref3.title,
-                  children = _ref3.children,
-                  restProps = (0, _objectWithoutProperties3['default'])(_ref3, ['title', 'children']);
-
-              if (name === 'Tooltip' && titleT) {
+              if (placement && titleT && children) {
                 // 创建新的Tooltip组件，继承现有props，更新title
                 title = _react2['default'].createElement(
                   _tooltip2['default'],
@@ -843,6 +840,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

@@ -758,18 +758,15 @@ var _initialiseProps = function _initialiseProps() {
             var needHelpFlag = true;
             if (title && title instanceof Object) {
               var _title = title,
-                  type = _title.type,
                   props = _title.props;
 
-              var _ref2 = type || {},
-                  name = _ref2.name;
+              var _ref2 = props || {},
+                  placement = _ref2.placement,
+                  titleT = _ref2.title,
+                  children = _ref2.children,
+                  restProps = (0, _objectWithoutProperties3['default'])(_ref2, ['placement', 'title', 'children']);
 
-              var _ref3 = props || {},
-                  titleT = _ref3.title,
-                  children = _ref3.children,
-                  restProps = (0, _objectWithoutProperties3['default'])(_ref3, ['title', 'children']);
-
-              if (name === 'Tooltip' && titleT) {
+              if (placement && titleT && children) {
                 // 创建新的Tooltip组件，继承现有props，更新title
                 title = _react2['default'].createElement(
                   _tooltip2['default'],
@@ -816,6 +813,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.87.beta",
   "description": "easy3wui components for react",
   "keywords": [
     "react",