easy3wui 1.5.8-7.beta → 1.5.8-9.beta

package/lib/Easy3wCard/indexM.js

@@ -92,10 +92,14 @@ var Easy3wCardM = function (_Component) {
             // 单个元素，检查是否是 Alert
             var _children = children,
                 item = _children[0];
-            var props = item.props;
-            var closable = props.closable,
-                message = props.message,
-                typeA = props.type;
+
+            var _ref3 = item || {},
+                props = _ref3.props;
+
+            var _ref4 = props || {},
+                closable = _ref4.closable,
+                message = _ref4.message,
+                typeA = _ref4.type;
 
             if (closable && message && typeA === 'success') {
               children = null;
@@ -103,10 +107,13 @@ var Easy3wCardM = function (_Component) {
           } else {
             // 多个元素，查找并移除 Alert
             var foundIndex = children.findIndex(function (item) {
-              var props = item.props;
-              var closable = props.closable,
-                  message = props.message,
-                  typeA = props.type;
+              var _ref5 = item || {},
+                  props = _ref5.props;
+
+              var _ref6 = props || {},
+                  closable = _ref6.closable,
+                  message = _ref6.message,
+                  typeA = _ref6.type;
 
               return closable && message && typeA === 'success';
             });
@@ -127,8 +134,8 @@ var Easy3wCardM = function (_Component) {
         var _label = label,
             _props = _label.props;
 
-        var _ref3 = _props || {},
-            childrenLabel = _ref3.children;
+        var _ref7 = _props || {},
+            childrenLabel = _ref7.children;
 
         if (childrenLabel && childrenLabel instanceof Array) {
           // 创建 childrenLabel 的可变副本，避免修改只读的 props.children
@@ -136,12 +143,12 @@ var Easy3wCardM = function (_Component) {
           var _foundIndex = childrenLabelCopy.findIndex(function (item) {
             var propsCL = item.props;
 
-            var _ref4 = propsCL || {},
-                childrenLabelC = _ref4.children,
-                style = _ref4.style;
+            var _ref8 = propsCL || {},
+                childrenLabelC = _ref8.children,
+                style = _ref8.style;
 
-            var _ref5 = style || {},
-                color = _ref5.color;
+            var _ref9 = style || {},
+                color = _ref9.color;
             // const { name } = type && type instanceof Object ? type : {};
 
 

package/lib/Easy3wCard/indexPC.js

@@ -91,10 +91,14 @@ var Easy3wCardPC = function (_Component) {
             // 单个元素，检查是否是 Alert
             var _children = children,
                 item = _children[0];
-            var props = item.props;
-            var closable = props.closable,
-                message = props.message,
-                typeA = props.type;
+
+            var _ref3 = item || {},
+                props = _ref3.props;
+
+            var _ref4 = props || {},
+                closable = _ref4.closable,
+                message = _ref4.message,
+                typeA = _ref4.type;
 
             if (closable && message && typeA === 'success') {
               children = null;
@@ -102,10 +106,13 @@ var Easy3wCardPC = function (_Component) {
           } else {
             // 多个元素，查找并移除 Alert
             var foundIndex = children.findIndex(function (item) {
-              var props = item.props;
-              var closable = props.closable,
-                  message = props.message,
-                  typeA = props.type;
+              var _ref5 = item || {},
+                  props = _ref5.props;
+
+              var _ref6 = props || {},
+                  closable = _ref6.closable,
+                  message = _ref6.message,
+                  typeA = _ref6.type;
 
               return closable && message && typeA === 'success';
             });
@@ -126,8 +133,8 @@ var Easy3wCardPC = function (_Component) {
         var _label = label,
             _props = _label.props;
 
-        var _ref3 = _props || {},
-            childrenLabel = _ref3.children;
+        var _ref7 = _props || {},
+            childrenLabel = _ref7.children;
 
         if (childrenLabel && childrenLabel instanceof Array) {
           // 创建 childrenLabel 的可变副本，避免修改只读的 props.children
@@ -135,12 +142,12 @@ var Easy3wCardPC = function (_Component) {
           var _foundIndex = childrenLabelCopy.findIndex(function (item) {
             var propsCL = item.props;
 
-            var _ref4 = propsCL || {},
-                childrenLabelC = _ref4.children,
-                style = _ref4.style;
+            var _ref8 = propsCL || {},
+                childrenLabelC = _ref8.children,
+                style = _ref8.style;
 
-            var _ref5 = style || {},
-                color = _ref5.color;
+            var _ref9 = style || {},
+                color = _ref9.color;
             // const { name } = type && type instanceof Object ? type : {};
 
 
@@ -200,7 +207,8 @@ var Easy3wCardPC = function (_Component) {
         cardHelpInfo ? _react2['default'].createElement(_alert2['default'], {
           message: cardHelpInfo,
           type: 'success',
-          closable: true
+          closable: true,
+          showIcon: true
         }) : '',
         children
       );

package/lib/Easy3wQryGrid/index.js

@@ -148,6 +148,12 @@ var _button2 = _interopRequireDefault(_button);
 
 require('antd/lib/button/style');
 
+var _tooltip = require('antd/lib/tooltip');
+
+var _tooltip2 = _interopRequireDefault(_tooltip);
+
+require('antd/lib/tooltip/style');
+
 var _moment = require('moment');
 
 var _moment2 = _interopRequireDefault(_moment);
@@ -277,13 +283,40 @@ var Easy3wQryGrid = function (_Component) {
       }
       return value;
     }, _this.getColItem = function (colObj, formItemLayout) {
+      var e3wFieldCfg = _this.props.e3wFieldCfg;
+      var fieldId = colObj.fieldId,
+          _colObj$cmptPros = colObj.cmptPros,
+          cmptPros = _colObj$cmptPros === undefined ? {} : _colObj$cmptPros;
       var label = colObj.label,
-          fieldId = colObj.fieldId,
-          required = colObj.required;
-
-      var itemArea = _this.getItemArea(colObj);
-      var itemValue = _this.getItemValue(colObj);
-      var formItem = _this.getFormItem(colObj, required, label, fieldId, itemValue, itemArea, formItemLayout);
+          required = colObj.required,
+          helpInfo = colObj.helpInfo;
+
+      var objCfg = e3wFieldCfg && e3wFieldCfg[fieldId] && e3wFieldCfg[fieldId] instanceof Object ? e3wFieldCfg[fieldId] : null;
+      if (objCfg) {
+        var fieldSName = objCfg.fieldSName,
+            fieldDesc = objCfg.fieldDesc,
+            fieldHelpInfo = objCfg.fieldHelpInfo,
+            fieldReqFlag = objCfg.fieldReqFlag,
+            fieldDspFlag = objCfg.fieldDspFlag;
+
+        required = fieldReqFlag === '0' ? false : fieldReqFlag === '1' ? true : required;
+        if (fieldDspFlag === '0') {
+          return null;
+        }
+        helpInfo = fieldHelpInfo || helpInfo;
+        label = fieldSName || label;
+        // colObj cmptPros
+        cmptPros.placeholder = fieldDesc || cmptPros.placeholder;
+      }
+      var objCol = (0, _extends3['default'])({}, colObj, {
+        cmptPros: cmptPros,
+        label: label,
+        required: required,
+        helpInfo: helpInfo
+      });
+      var itemArea = _this.getItemArea(objCol);
+      var itemValue = _this.getItemValue(objCol);
+      var formItem = _this.getFormItem(objCol, required, label, fieldId, itemValue, itemArea, formItemLayout);
       return formItem;
     }, _this.getFormItem = function (item, required, label, fieldId, itemValue, itemArea, formItemLayout) {
       var form = _this.props.form;
@@ -291,7 +324,8 @@ var Easy3wQryGrid = function (_Component) {
       var popoverFlag = item.popoverFlag,
           popProps = item.popProps,
           formItemProps = item.formItemProps,
-          fieldType = item.fieldType;
+          fieldType = item.fieldType,
+          helpInfo = item.helpInfo;
 
       var decoratorObj = {
         initialValue: itemValue,
@@ -308,6 +342,22 @@ var Easy3wQryGrid = function (_Component) {
           valuePropName: 'defaultValue'
         });
       }
+      var formItemLabel = label;
+      if (helpInfo) {
+        formItemLabel = _react2['default'].createElement(
+          _tooltip2['default'],
+          {
+            placement: 'top',
+            title: _react2['default'].createElement(
+              'span',
+              { style: { whiteSpace: 'pre-wrap' } },
+              helpInfo
+            )
+          },
+          label,
+          _react2['default'].createElement(_icon2['default'], { type: 'question-circle' })
+        );
+      }
       if (popoverFlag) {
         var title = popProps.title,
             content = popProps.content,
@@ -316,7 +366,7 @@ var Easy3wQryGrid = function (_Component) {
         return _react2['default'].createElement(
           FormItem,
           (0, _extends3['default'])({
-            label: label
+            label: formItemLabel
           }, formItemProps, formItemLayout),
           _react2['default'].createElement(
             _popover2['default'],
@@ -340,7 +390,7 @@ var Easy3wQryGrid = function (_Component) {
         return _react2['default'].createElement(
           FormItem,
           (0, _extends3['default'])({
-            label: label
+            label: formItemLabel
           }, formItemProps, formItemLayout),
           getFieldDecorator(fieldId, (0, _extends3['default'])({}, decoratorObj))(itemArea)
         );
@@ -509,7 +559,9 @@ var Easy3wQryGrid = function (_Component) {
     var itemForms = [];
     qryItems.forEach(function (item) {
       var a = _this2.getColItem(item, formItemLayoutTest);
-      itemForms.push(a);
+      if (a) {
+        itemForms.push(a);
+      }
     });
     var hiddenForms = [];
     if (hiddenItems) {

package/package.json

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