easy3wui 1.5.84 → 1.5.85

package/lib/Easy3wGridPage/indexPC.js

@@ -2,6 +2,10 @@
 
 exports.__esModule = true;
 
+var _objectWithoutProperties2 = require('babel-runtime/helpers/objectWithoutProperties');
+
+var _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2);
+
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -56,6 +60,12 @@ var _tooltip2 = _interopRequireDefault(_tooltip);
 
 require('antd/lib/tooltip/style');
 
+var _icon = require('antd/lib/icon');
+
+var _icon2 = _interopRequireDefault(_icon);
+
+require('antd/lib/icon/style');
+
 var _numeral = require('numeral');
 
 var _numeral2 = _interopRequireDefault(_numeral);
@@ -118,7 +128,10 @@ var Easy3wGridPagePC = function (_Component) {
       that.setState({ pagination: { offset: 1, limit: 10 } });
     }
   };
+  // #region 获取表头
+
 
+  // #endregion 获取表头
   Easy3wGridPagePC.prototype.render = function render() {
     var _this2 = this;
 
@@ -149,77 +162,76 @@ var Easy3wGridPagePC = function (_Component) {
     var printFlag = printArr[1] === printValue;
     var hasFormParentClass = this.myRef.current && this.myRef.current.closest('.e3wFormPageWrap'); // 是否处于表单页面
     var paginationProps = false; // 默认不分页
-    var recursion = function recursion(arr) {
-      arr.forEach(function (item) {
-        var columnsType = item.type;
-        // const { title } = item;
-        // if (!(printFlag || hasFormParentClass) && title && typeof title === 'string' && title.length > 6) {
-        //   item.title = <Tooltip placement="topLeft" title={title}>{title.substring(0, 6)}...</Tooltip>;
-        // }
-        switch (columnsType) {
-          case 'shortText':
-            item.className = 'e3wGridShortText';break;
-          case 'longText':
-            item.className = 'e3wGridLongText';break;
-          case 'number':
-            item.className = 'e3wGridNumber';break;
-          case 'maxText':
-            item.className = 'e3wMaxText';break;
-          case 'numeralFormat':
-            item.className = 'e3wGridNumber';break;
-          default:
-            item.className = 'e3wGridShortText';
-            break;
-        }
-        if (item.children) {
-          recursion(item.children);
-        }
-      });
-    };
-    var recursionT = function recursionT(arr) {
-      arr.forEach(function (item) {
-        if (!item.render) {
-          item.render = function (text) {
-            var globalData = _this2.props.globalData;
-
-            var _ref = globalData || {},
-                dataDesensitizationEyeFlag = _ref.dataDesensitizationEyeFlag;
-
-            var strTextNew = _comonConfig.dataDesensitizationFlag ? dataDesensitizationEyeFlag ? text : (0, _easy3wui.Easy3wGetDesensitization)(text) : text;
-            if (strTextNew && strTextNew.length * 14 > 160) {
-              return _react2['default'].createElement(
-                _tooltip2['default'],
-                { placement: 'topLeft', title: strTextNew, style: { whiteSpace: 'pre-wrap', wordWrap: 'break-word' } },
-                strTextNew
-              );
-            } else {
-              return strTextNew;
-            }
-          };
-          if (item.type === 'numeralFormat') {
-            item.render = function (text) {
-              return _react2['default'].createElement(
-                _tooltip2['default'],
-                { placement: 'topLeft', title: _this2.numeralFormat(text), style: { whiteSpace: 'pre-wrap', wordWrap: 'break-word' } },
-                _this2.numeralFormat(text)
-              );
-            };
-          }
-        }if (item.fixed) {
-          item.className = 'e3wText';
-          item.minWidth = 5;
-        }
-        if (item.children) {
-          recursionT(item.children);
-        }
-      });
-    };
-    recursion(columns);
-    if (dataList) {
-      if (dataList.length > 0) {
-        recursionT(columns);
-      }
-    }
+    // const recursion = (arr) => {
+    //   arr.forEach((item) => {
+    //     const columnsType = item.type;
+    //     // const { title } = item;
+    //     // if (!(printFlag || hasFormParentClass) && title && typeof title === 'string' && title.length > 6) {
+    //     //   item.title = <Tooltip placement="topLeft" title={title}>{title.substring(0, 6)}...</Tooltip>;
+    //     // }
+    //     switch (columnsType) {
+    //       case 'shortText':
+    //         item.className = 'e3wGridShortText'; break;
+    //       case 'longText':
+    //         item.className = 'e3wGridLongText'; break;
+    //       case 'number':
+    //         item.className = 'e3wGridNumber'; break;
+    //       case 'maxText':
+    //         item.className = 'e3wMaxText'; break;
+    //       case 'numeralFormat':
+    //         item.className = 'e3wGridNumber'; break;
+    //       default:
+    //         item.className = 'e3wGridShortText';
+    //         break;
+    //     }
+    //     if (item.children) {
+    //       recursion(item.children);
+    //     }
+    //   });
+    // };
+    // const recursionT = (arr) => {
+    //   arr.forEach((item) => {
+    //     if (!item.render) {
+    //       item.render = (text) => {
+    //         const { globalData } = this.props;
+    //         const { dataDesensitizationEyeFlag } = globalData || {};
+    //         const strTextNew = dataDesensitizationFlag ? (dataDesensitizationEyeFlag ? text : Easy3wGetDesensitization(text)) : text;
+    //         if (strTextNew && strTextNew.length * 14 > 160) {
+    //           return (
+    //             <Tooltip placement="topLeft" title={strTextNew} style={{ whiteSpace: 'pre-wrap', wordWrap: 'break-word' }}>
+    //               {strTextNew}
+    //             </Tooltip>
+    //           );
+    //         } else {
+    //           return strTextNew;
+    //         }
+    //       };
+    //       if (item.type === 'numeralFormat') {
+    //         item.render = (text) => {
+    //           return (
+    //             <Tooltip placement="topLeft" title={this.numeralFormat(text)} style={{ whiteSpace: 'pre-wrap', wordWrap: 'break-word' }}>
+    //               {this.numeralFormat(text)}
+    //             </Tooltip>
+    //           );
+    //         };
+    //       }
+    //     } if (item.fixed) {
+    //       item.className = 'e3wText';
+    //       item.minWidth = 5;
+    //     }
+    //     if (item.children) {
+    //       recursionT(item.children);
+    //     }
+    //   });
+    // };
+    // recursion(columns);
+    // if (dataList) {
+    //   if (dataList.length > 0) {
+    //     recursionT(columns);
+    //   }
+    // }
+    // let myColumns = columns;
+    var myColumns = this.getColumns(columns);
     var rowSelection = null;
     if (checkType) {
       // 若需选择框
@@ -246,7 +258,6 @@ var Easy3wGridPagePC = function (_Component) {
         }
       };
     }
-    var myColumns = columns;
     // 处理分页 start
     if (needPaginationFlag || handleSearchNew) {
       var defaultCurrent = paginationInfo ? paginationInfo.offset : 1;
@@ -266,8 +277,8 @@ var Easy3wGridPagePC = function (_Component) {
         pageSizeOptions: ['10', '20', '30', '40', '50', '100']
       };
       if (autoAddNumber) {
-        if (columns.length > 0) {
-          var fixed = columns[0].fixed;
+        if (myColumns.length > 0) {
+          var fixed = myColumns[0].fixed;
 
           myColumns = [{
             title: '序号',
@@ -283,7 +294,7 @@ var Easy3wGridPagePC = function (_Component) {
                 ' '
               );
             }
-          }].concat(columns);
+          }].concat(myColumns);
         }
       }
     }
@@ -662,6 +673,182 @@ var _initialiseProps = function _initialiseProps() {
       handleSearchNew(paginationInfo, formVal);
     }
   };
+
+  this.getColumns = function (columns) {
+    var dataList = _this3.props.dataList;
+
+    var myColumns = [];
+    columns.map(function (item) {
+      var itemNew = (0, _extends3['default'])({}, item);
+      var columnsType = item.type;
+      switch (columnsType) {
+        case 'shortText':
+          itemNew.className = 'e3wGridShortText';break;
+        case 'longText':
+          itemNew.className = 'e3wGridLongText';break;
+        case 'number':
+          itemNew.className = 'e3wGridNumber';break;
+        case 'maxText':
+          itemNew.className = 'e3wMaxText';break;
+        case 'numeralFormat':
+          itemNew.className = 'e3wGridNumber';break;
+        default:
+          itemNew.className = 'e3wGridShortText';
+          break;
+      }
+      if (item.children) {
+        itemNew.children = _this3.getColumns(item.children);
+      }
+      if (dataList && dataList.length) {
+        if (!item.render) {
+          itemNew.render = function (text) {
+            var globalData = _this3.props.globalData;
+
+            var _ref = globalData || {},
+                dataDesensitizationEyeFlag = _ref.dataDesensitizationEyeFlag;
+
+            var strTextNew = _comonConfig.dataDesensitizationFlag ? dataDesensitizationEyeFlag ? text : (0, _easy3wui.Easy3wGetDesensitization)(text) : text;
+            if (strTextNew && strTextNew.length * 14 > 160) {
+              return _react2['default'].createElement(
+                _tooltip2['default'],
+                { placement: 'topLeft', title: strTextNew, style: { whiteSpace: 'pre-wrap', wordWrap: 'break-word' } },
+                strTextNew
+              );
+            } else {
+              return strTextNew;
+            }
+          };
+          if (item.type === 'numeralFormat') {
+            itemNew.render = function (text) {
+              return _react2['default'].createElement(
+                _tooltip2['default'],
+                { placement: 'topLeft', title: _this3.numeralFormat(text), style: { whiteSpace: 'pre-wrap', wordWrap: 'break-word' } },
+                _this3.numeralFormat(text)
+              );
+            };
+          }
+        }if (item.fixed) {
+          itemNew.className = 'e3wText';
+          itemNew.minWidth = 5;
+        }
+      }
+      var e3wFieldCfg = _this3.props.e3wFieldCfg;
+      var dataIndex = item.dataIndex;
+      var required = item.required,
+          title = item.title,
+          helpInfo = item.helpInfo;
+
+      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 item;
+        } else {
+          required = fieldReqFlag === '0' ? false : fieldReqFlag === '1' ? true : required;
+          if (fieldSName) {
+            title = fieldSName;
+          }
+          helpInfo = fieldHelpInfo || helpInfo;
+          if (helpInfo) {
+            var needHelpFlag = true;
+            if (title && title instanceof Object) {
+              var _title = title,
+                  props = _title.props;
+
+              var _ref2 = props || {},
+                  placement = _ref2.placement,
+                  titleT = _ref2.title,
+                  children = _ref2.children,
+                  restProps = (0, _objectWithoutProperties3['default'])(_ref2, ['placement', 'title', 'children']);
+
+              if (placement && titleT && children) {
+                // 创建新的Tooltip组件，继承现有props，更新title
+                title = _react2['default'].createElement(
+                  _tooltip2['default'],
+                  (0, _extends3['default'])({}, restProps, {
+                    title: _react2['default'].createElement(
+                      'span',
+                      { style: { whiteSpace: 'pre-wrap' } },
+                      helpInfo
+                    )
+                  }),
+                  children
+                );
+                needHelpFlag = false;
+              }
+            }
+            if (needHelpFlag) {
+              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) {
+            title = _react2['default'].createElement(
+              'span',
+              null,
+              _react2['default'].createElement(
+                'span',
+                { style: { color: 'red' } },
+                '*'
+              ),
+              title
+            );
+          }
+        }
+        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;
+    });
+    return myColumns;
+  };
 };
 
 exports['default'] = Easy3wGridPagePC;

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/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.84",
+  "version": "1.5.85",
   "description": "easy3wui components for react",
   "keywords": [
     "react",
@@ -22,6 +22,9 @@
     "lib",
     "assets/*.css"
   ],
+  "overrides": {
+    "graceful-fs": "^4.2.11"
+  },
   "main": "lib/index",
   "license": "上海同在互联网科技有限公司 版权所有",
   "config": {