easy3wui 1.5.8-10.beta → 1.5.8-12.beta

package/lib/Easy3wFormPage/indexM.js

@@ -404,20 +404,20 @@ var Easy3wFormPageM = exports.Easy3wFormPageM = function (_Component) {
         var templateArrayNew = [];
         if (fieldType === 'strTemplate' && templateArray && templateArray instanceof Array) {
           templateArray.map(function (item) {
-            var objTemplate = _this.getFieldCfg(item, fieldType);
-            if (objTemplate) {
-              templateArrayNew.push(objTemplate);
+            var _this$getFieldCfg = _this.getFieldCfg(item, fieldType),
+                objCol = _this$getFieldCfg.objCol;
+
+            if (objCol) {
+              templateArrayNew.push(objCol);
             }
             return item;
           });
-          if (templateArrayNew.length) {
-            cmptPros.templateArray = templateArrayNew;
-          }
+          cmptPros.templateArray = templateArrayNew.length ? templateArrayNew : [];
         }
 
-        var _this$getFieldCfg = _this.getFieldCfg(col, fieldType),
-            objCol = _this$getFieldCfg.objCol,
-            emptyCol = _this$getFieldCfg.emptyCol;
+        var _this$getFieldCfg2 = _this.getFieldCfg(col, fieldType),
+            objCol = _this$getFieldCfg2.objCol,
+            emptyCol = _this$getFieldCfg2.emptyCol;
 
         if (objCol) {
           arrCols.push(objCol);

package/lib/Easy3wFormPage/indexPC.js

@@ -395,20 +395,20 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
         var templateArrayNew = [];
         if (fieldType === 'strTemplate' && templateArray && templateArray instanceof Array) {
           templateArray.map(function (item) {
-            var objTemplate = _this.getFieldCfg(item, fieldType);
-            if (objTemplate) {
-              templateArrayNew.push(objTemplate);
+            var _this$getFieldCfg = _this.getFieldCfg(item, fieldType),
+                objCol = _this$getFieldCfg.objCol;
+
+            if (objCol) {
+              templateArrayNew.push(objCol);
             }
             return item;
           });
-          if (templateArrayNew.length) {
-            cmptPros.templateArray = templateArrayNew;
-          }
+          cmptPros.templateArray = templateArrayNew.length ? templateArrayNew : [];
         }
 
-        var _this$getFieldCfg = _this.getFieldCfg(col, fieldType),
-            objCol = _this$getFieldCfg.objCol,
-            emptyCol = _this$getFieldCfg.emptyCol;
+        var _this$getFieldCfg2 = _this.getFieldCfg(col, fieldType),
+            objCol = _this$getFieldCfg2.objCol,
+            emptyCol = _this$getFieldCfg2.emptyCol;
 
         if (objCol) {
           arrCols.push(objCol);
@@ -474,16 +474,18 @@ 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 = props || {},
-                    placement = _ref.placement,
-                    title = _ref.title,
-                    children = _ref.children,
-                    restProps = (0, _objectWithoutProperties3['default'])(_ref, ['placement', 'title', 'children']);
+                var _ref = type || {},
+                    name = _ref.name;
 
-                if (placement && title && children) {
+                var _ref2 = props || {},
+                    title = _ref2.title,
+                    children = _ref2.children,
+                    restProps = (0, _objectWithoutProperties3['default'])(_ref2, ['title', 'children']);
+
+                if (name === 'Tooltip' && title) {
                   // 创建新的Tooltip组件，继承现有props，更新title
                   label = _react2['default'].createElement(
                     _tooltip2['default'],
@@ -528,9 +530,7 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
           };
         }
       } else if (label || value || templateArray || extra) {
-        // templateArrayNew.push(item);console.log('e3wFieldCfg', e3wFieldCfg, objCfg);
         return { objCol: item, emptyCol: null };
-        // } else if (readFlag) {
       } else {
         return { objCol: null, emptyCol: { readFlag: true } };
       }
@@ -635,14 +635,14 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
           disableFlag = item.disableFlag,
           numberFormat = item.numberFormat;
 
-      var _ref2 = globalData || {},
-          dataDesensitizationEyeFlag = _ref2.dataDesensitizationEyeFlag;
+      var _ref3 = globalData || {},
+          dataDesensitizationEyeFlag = _ref3.dataDesensitizationEyeFlag;
 
       var value = item.value;
 
-      var _ref3 = cmptPros || {},
-          addonAfter = _ref3.addonAfter,
-          numeralFormat = _ref3.numeralFormat;
+      var _ref4 = cmptPros || {},
+          addonAfter = _ref4.addonAfter,
+          numeralFormat = _ref4.numeralFormat;
       // numeralFormat 新组件(金额、数字)的格式化参数
 
 
@@ -1228,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 _ref4;
+        var _ref5;
 
         if (_isArray) {
           if (_i >= _iterator.length) break;
-          _ref4 = _iterator[_i++];
+          _ref5 = _iterator[_i++];
         } else {
           _i = _iterator.next();
           if (_i.done) break;
-          _ref4 = _i.value;
+          _ref5 = _i.value;
         }
 
-        var rItem = _ref4;
+        var rItem = _ref5;
 
         if (rItem.cols.length === 3) {
           threeRowItemFlag = true;
@@ -2995,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 _ref5;
+        var _ref6;
 
         if (_isArray2) {
           if (_i3 >= _iterator2.length) break;
-          _ref5 = _iterator2[_i3++];
+          _ref6 = _iterator2[_i3++];
         } else {
           _i3 = _iterator2.next();
           if (_i3.done) break;
-          _ref5 = _i3.value;
+          _ref6 = _i3.value;
         }
 
-        var rItem = _ref5;
+        var rItem = _ref6;
 
         if (rItem.cols.length === 3) {
           threeRowItemFlag = true;

package/lib/Easy3wModal/index.js

@@ -48,6 +48,12 @@ var _button2 = _interopRequireDefault(_button);
 
 require('antd/lib/button/style');
 
+var _alert = require('antd/lib/alert');
+
+var _alert2 = _interopRequireDefault(_alert);
+
+require('antd/lib/alert/style');
+
 var _classnames = require('classnames');
 
 var _classnames2 = _interopRequireDefault(_classnames);
@@ -288,13 +294,22 @@ var Easy3wModal = function (_Component) {
         onOk = _props.onOk,
         width = _props.width,
         footer = _props.footer,
-        footBtnArr = _props.footBtnArr;
+        footBtnArr = _props.footBtnArr,
+        helpInfo = _props.helpInfo,
+        e3wCardId = _props.e3wCardId,
+        e3wCardCfg = _props.e3wCardCfg;
+
+    var objCfg = e3wCardId && e3wCardCfg && e3wCardCfg instanceof Object && e3wCardCfg[e3wCardId] && e3wCardCfg[e3wCardId] instanceof Object ? e3wCardCfg[e3wCardId] : {};
+    var cardHelpInfo = objCfg.cardHelpInfo,
+        cardSName = objCfg.cardSName;
 
+    cardSName = cardSName || title;
+    cardHelpInfo = cardHelpInfo || helpInfo;
     var btnObj = footer && footer.length ? footer : footBtnArr && footBtnArr.length ? this.getBtnObj() : null;
     return _react2['default'].createElement(
       _modal2['default'],
       (0, _extends3['default'])({
-        title: title,
+        title: cardSName,
         visible: visible,
         confirmLoading: loadingFlag,
         onCancel: cancelHandler,
@@ -309,6 +324,12 @@ var Easy3wModal = function (_Component) {
           document.body.style.overflow = '';
         }
       }),
+      cardHelpInfo ? _react2['default'].createElement(_alert2['default'], {
+        message: cardHelpInfo,
+        type: 'success',
+        closable: true,
+        showIcon: true
+      }) : '',
       children
     );
   };

package/package.json

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