easy3wui 1.6.0 → 1.6.1

package/lib/Easy3wFormPage/index.js

@@ -196,6 +196,10 @@ var _dva = require('dva');
 
 var _easy3wui = require('easy3wui');
 
+var _propTypes = require('prop-types');
+
+var _comonConfig = require('comonConfigPath/comonConfig');
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 // import TagSelect from '../Easy3wTagSelect/index.js';
@@ -203,8 +207,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
 // import Easy3wUploadB from '../../Easy3wUploadB';
 // import Easy3wUploadM from '../../Easy3wUploadM';
 
-_moment2['default'].locale('zh-cn');
-
+_moment2['default'].locale('zh-cn'); /* eslint-disable prefer-destructuring */
 var Option = _select2['default'].Option;
 var MonthPicker = _datePicker2['default'].MonthPicker,
     RangePicker = _datePicker2['default'].RangePicker;
@@ -220,7 +223,7 @@ var singleItem = {
 };
 var mixSingle = {
   labelCol: { span: 4 },
-  wrapperCol: { span: 18 }
+  wrapperCol: { span: 20 }
 };
 var mixSingleWithBtn = {
   labelCol: { span: 4 },
@@ -228,7 +231,7 @@ var mixSingleWithBtn = {
 };
 var doubleItemLeft = {
   labelCol: { span: 8 },
-  wrapperCol: { span: 12 }
+  wrapperCol: { span: 16 }
 };
 var doubleItemLeftWithBtn = {
   labelCol: { span: 8 },
@@ -236,7 +239,7 @@ var doubleItemLeftWithBtn = {
 };
 var formItemRight = {
   labelCol: { span: 8 },
-  wrapperCol: { span: 12 }
+  wrapperCol: { span: 16 }
 };
 var threeItem = {
   labelCol: { span: 9 },
@@ -255,8 +258,13 @@ var formItemRightWithBtn = {
   wrapperCol: { span: 12 }
 };
 var formItemStyle = {
-  marginBottom: 6
+  margin: '0px'
+  // marginBottom: '3px',
+  // marginTop: '3px',
 };
+// const rowItemStyle = {
+//   padding: '3px',
+// };
 
 var Easy3wFormPage = function (_Component) {
   (0, _inherits3['default'])(Easy3wFormPage, _Component);
@@ -270,7 +278,9 @@ var Easy3wFormPage = function (_Component) {
       args[_key] = arguments[_key];
     }
 
-    return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (e, func) {
+    return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.state = {
+      leftCount: 0 // 字数输入个数
+    }, _this.onClickFunc = function (e, func) {
       var globalLoading = _this.props.loadingFlag.global;
       if (globalLoading) {
         _notification3['default'].warning({
@@ -377,27 +387,46 @@ var Easy3wFormPage = function (_Component) {
         return _braftEditor2['default'].createEditorState(value);
       }
       if (allReadFlag || readFlag) {
-        return value;
-      }
-      if (fieldType === 'datePicker') {
-        /** 格式化日期型数据 */
-        value = value ? (0, _moment2['default'])(value, 'YYYY-MM-DD') : undefined;
-      }
-      if (fieldType === 'dateTimePicker') {
-        /** 格式化日期时间型数据 */
-        value = value ? (0, _moment2['default'])(value, 'YYYY-MM-DD HH:mm:ss') : undefined;
-      }
-      if (fieldType === 'monthPicker') {
-        /** 格式化年月型数据 */
-        value = value ? (0, _moment2['default'])(value, 'YYYY-MM') : undefined;
-      }
-      if (fieldType === 'rangePicker') {
-        /** 格式化年月型数据 */
-        value = value[1] ? [(0, _moment2['default'])(value[0], 'YYYY-MM-DD'), (0, _moment2['default'])(value[1], 'YYYY-MM-DD')] : undefined;
-      }
-      if (fieldType === 'timePicker') {
-        /** 格式化时间型数据 */
-        value = value ? (0, _moment2['default'])(value, 'HH:mm:ss') : undefined;
+        if (fieldType === 'treeSelect') {
+          /** select */
+          if (!value) {
+            value = undefined;
+          } else if (typeof value === 'object') {
+            if (!value && !value.key && !value.value) {
+              value = undefined;
+            } else if (value instanceof Array && value.length > 0) {
+              // 数组
+              var arrVal = value.map(function (itemVal) {
+                return itemVal.label;
+              });
+              value = arrVal.join();
+            } else {
+              // 对象
+              value = value.label;
+            }
+          }
+        }
+      } else {
+        if (fieldType === 'datePicker') {
+          /** 格式化日期型数据 */
+          value = value ? (0, _moment2['default'])(value, 'YYYY-MM-DD') : undefined;
+        }
+        if (fieldType === 'dateTimePicker') {
+          /** 格式化日期时间型数据 */
+          value = value ? (0, _moment2['default'])(value, 'YYYY-MM-DD HH:mm:ss') : undefined;
+        }
+        if (fieldType === 'monthPicker') {
+          /** 格式化年月型数据 */
+          value = value ? (0, _moment2['default'])(value, 'YYYY-MM') : undefined;
+        }
+        if (fieldType === 'rangePicker') {
+          /** 格式化年月型数据 */
+          value = value[1] ? [(0, _moment2['default'])(value[0], 'YYYY-MM-DD'), (0, _moment2['default'])(value[1], 'YYYY-MM-DD')] : undefined;
+        }
+        if (fieldType === 'timePicker') {
+          /** 格式化时间型数据 */
+          value = value ? (0, _moment2['default'])(value, 'HH:mm:ss') : undefined;
+        }
       }
       if (fieldType === 'select') {
         /** select */
@@ -421,13 +450,13 @@ var Easy3wFormPage = function (_Component) {
       if (afterBtn) {
         var allBtn = afterBtn.map(function (btn) {
           if (btn.objType === 'btn') {
-            return _this.btnHandler(btn);
+            return _this.btnHandler(btn, 'afterBtn');
           }
           if (btn.objType === 'a') {
-            return _this.aHandler(btn);
+            return _this.aHandler(btn, 'afterBtn');
           }
           if (btn.objType === 'string') {
-            return _this.strHandler(btn);
+            return _this.strHandler(btn, 'afterBtn');
           }
           return {};
         });
@@ -449,6 +478,7 @@ var Easy3wFormPage = function (_Component) {
           popProps = item.popProps,
           fieldType = item.fieldType,
           disableFlag = item.disableFlag,
+          value = item.value,
           formItemProps = item.formItemProps,
           novalueFlag = item.novalueFlag,
           label = item.label,
@@ -507,27 +537,50 @@ var Easy3wFormPage = function (_Component) {
             (0, _extends3['default'])({
               label: label
             }, formItemLayout, formItemProps, {
-              style: formItemStyle
+              style: formItemStyle,
+              className: (0, _classnames2['default'])(['formContent'])
             }),
             getFieldDecorator(fieldId + 'Easy3wView', {
               initialValue: 'easy3wView',
               rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
-            })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
+            })(_react2['default'].createElement(_input2['default'], { type: 'hidden', size: 'small' })),
             _react2['default'].createElement('div', { dangerouslySetInnerHTML: { __html: itemValue.toHTML() } }),
             afterBtns
           );
         }
+        if (fieldType === 'textarea') {
+          return _react2['default'].createElement(
+            FormItem,
+            (0, _extends3['default'])({
+              label: label
+            }, formItemLayout, formItemProps, {
+              style: formItemStyle,
+              className: (0, _classnames2['default'])(['formContent'])
+            }),
+            getFieldDecorator(fieldId + 'Easy3wView', {
+              initialValue: 'easy3wView',
+              rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
+            })(_react2['default'].createElement(_input2['default'], { type: 'hidden', size: 'small' })),
+            _react2['default'].createElement(
+              'pre',
+              { style: { marginBottom: '0px', 'white-space': 'break-spaces', 'font-size': 'inherit', 'font-family': 'inherit' } },
+              itemValue
+            ),
+            afterBtns
+          );
+        }
         return _react2['default'].createElement(
           FormItem,
           (0, _extends3['default'])({
             label: label
           }, formItemLayout, formItemProps, {
-            style: formItemStyle
+            style: formItemStyle,
+            className: (0, _classnames2['default'])(['formContent'])
           }),
           getFieldDecorator(fieldId + 'Easy3wView', {
             initialValue: 'easy3wView',
             rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
-          })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
+          })(_react2['default'].createElement(_input2['default'], { type: 'hidden', size: 'small' })),
           itemValue,
           ' ',
           afterBtns
@@ -540,36 +593,49 @@ var Easy3wFormPage = function (_Component) {
 
         return _react2['default'].createElement(
           'div',
-          { style: { position: 'relative' } },
+          null,
           _react2['default'].createElement(
             FormItem,
             (0, _extends3['default'])({
               label: label
             }, formItemLayout, formItemProps, {
-              style: formItemStyle
+              style: formItemStyle,
+              className: (0, _classnames2['default'])(['formContent'])
             }),
-            formItemChild,
-            _react2['default'].createElement(
-              _popover2['default'],
-              {
-                title: title,
-                content: _react2['default'].createElement(
-                  'div',
-                  { style: { padding: '4px 0' } },
-                  _react2['default'].createElement(
-                    'span',
-                    { style: { color: '#5468b2', width: 200, height: 300 } },
-                    content
-                  )
-                ),
-                placement: placement
-              },
-              getFieldDecorator(fieldId, (0, _extends3['default'])({}, decoratorObj))(itemArea)
-            ),
             _react2['default'].createElement(
               'div',
-              { style: { position: 'absolute', left: '100%', top: '0px', zIndex: 2 } },
-              afterBtns
+              { className: (0, _classnames2['default'])(['hasAfterBtns']), style: { display: 'flex', flexDirection: 'row', flexWrap: 'wrap' } },
+              _react2['default'].createElement(
+                'span',
+                { style: { wordBreak: 'break-all' } },
+                formItemChild
+              ),
+              _react2['default'].createElement(
+                'span',
+                { style: { flexGrow: 1 } },
+                _react2['default'].createElement(
+                  _popover2['default'],
+                  {
+                    title: title,
+                    content: _react2['default'].createElement(
+                      'div',
+                      { style: { padding: '4px 0' } },
+                      _react2['default'].createElement(
+                        'span',
+                        { style: { color: '#5468b2', width: 200, height: 300 } },
+                        content
+                      )
+                    ),
+                    placement: placement
+                  },
+                  getFieldDecorator(fieldId, (0, _extends3['default'])({}, decoratorObj))(itemArea)
+                )
+              ),
+              _react2['default'].createElement(
+                'div',
+                null,
+                afterBtns
+              )
             )
           )
         );
@@ -579,7 +645,8 @@ var Easy3wFormPage = function (_Component) {
           (0, _extends3['default'])({
             label: label
           }, formItemLayout, formItemProps, {
-            style: formItemStyle
+            style: formItemStyle,
+            className: (0, _classnames2['default'])(['formContent'])
           }),
           itemArea
         );
@@ -589,16 +656,25 @@ var Easy3wFormPage = function (_Component) {
           (0, _extends3['default'])({
             label: label
           }, formItemLayout, formItemProps, {
-            style: formItemStyle
+            style: formItemStyle,
+            className: (0, _classnames2['default'])(['formContent'])
           }),
           _react2['default'].createElement(
             'div',
-            { style: { position: 'relative' } },
-            formItemChild,
-            getFieldDecorator(fieldId, (0, _extends3['default'])({}, decoratorObj))(itemArea),
+            { className: (0, _classnames2['default'])(['hasAfterBtns']), style: { display: 'flex', flexDirection: 'row', flexWrap: 'wrap' } },
+            _react2['default'].createElement(
+              'span',
+              { style: { wordBreak: 'break-all' } },
+              formItemChild
+            ),
+            _react2['default'].createElement(
+              'span',
+              { style: { flexGrow: 1 } },
+              getFieldDecorator(fieldId, (0, _extends3['default'])({}, decoratorObj))(itemArea)
+            ),
             _react2['default'].createElement(
               'div',
-              { style: { position: 'absolute', left: '100%', top: '0px', zIndex: 2 } },
+              null,
               afterBtns
             )
           )
@@ -647,12 +723,13 @@ var Easy3wFormPage = function (_Component) {
             {
               labelCol: { span: 48 },
               wrapperCol: { span: 48 },
-              style: formItemStyle
+              style: formItemStyle,
+              className: (0, _classnames2['default'])(['formContent'])
             },
             getFieldDecorator(fieldId + 'Easy3wView', {
               initialValue: 'easy3wView',
               rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
-            })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
+            })(_react2['default'].createElement(_input2['default'], { type: 'hidden', size: 'small' })),
             itemValue
           )
         );
@@ -673,7 +750,8 @@ var Easy3wFormPage = function (_Component) {
               {
                 labelCol: { span: 48 },
                 wrapperCol: { span: 48 },
-                style: formItemStyle
+                style: formItemStyle,
+                className: (0, _classnames2['default'])(['formContent'])
               },
               _react2['default'].createElement(
                 _popover2['default'],
@@ -717,7 +795,8 @@ var Easy3wFormPage = function (_Component) {
               {
                 labelCol: { span: 48 },
                 wrapperCol: { span: 48 },
-                style: formItemStyle
+                style: formItemStyle,
+                className: (0, _classnames2['default'])(['formContent'])
               },
               getFieldDecorator(fieldId, (0, _extends3['default'])({}, decoratorObj))(itemArea)
             )
@@ -899,10 +978,22 @@ var Easy3wFormPage = function (_Component) {
         var _up2 = _this.getUploadMColItem(colObj, formItemLayout);
         return _up2;
       }
-      if (fieldType === 'inputNumberFormat') {
-        var _up3 = _this.inputNumberFormatHandler(colObj, formItemLayout);
+      if (fieldType === 'select') {
+        var _up3 = _this.getSelectColItem(colObj, formItemLayout);
         return _up3;
       }
+      if (fieldType === 'radio') {
+        var _up4 = _this.getRadioColItem(colObj, formItemLayout);
+        return _up4;
+      }
+      if (fieldType === 'checkBox') {
+        var _up5 = _this.getCheckBoxColItem(colObj, formItemLayout);
+        return _up5;
+      }
+      if (fieldType === 'inputNumberFormat') {
+        var _up6 = _this.inputNumberFormatHandler(colObj, formItemLayout);
+        return _up6;
+      }
       var formItem = _this.getFormItem(colObj, itemValue, afterBtns, itemArea, formItemLayout);
       return formItem;
     }, _this.getAllForms = function () {
@@ -925,7 +1016,11 @@ var Easy3wFormPage = function (_Component) {
       var hiddenForms = [];
       if (rowItems) {
         uiForms = rowItems.map(function (rowItem) {
-          var singleRow = _this.getSingleRow(rowItem);
+          var singleRow = _react2['default'].createElement(
+            'div',
+            null,
+            _this.getSingleRow(rowItem)
+          );
           return singleRow;
         });
       }
@@ -948,7 +1043,7 @@ var Easy3wFormPage = function (_Component) {
       return _react2['default'].createElement(
         'span',
         null,
-        getFieldDecorator(fieldId, { initialValue: value })(_react2['default'].createElement(_input2['default'], { type: 'hidden' }))
+        getFieldDecorator(fieldId, { initialValue: value })(_react2['default'].createElement(_input2['default'], { type: 'hidden', size: 'small' }))
       );
     }, _this.getUploadColItem = function (colObj, formItemLayout) {
       var label = colObj.label,
@@ -973,7 +1068,9 @@ var Easy3wFormPage = function (_Component) {
         sendData: '',
         form: form,
         required: required,
-        label: label
+        label: label,
+        style: formItemStyle,
+        className: (0, _classnames2['default'])(['formContent'])
       }, formItemLayout, cmptProsNew));
     }, _this.getUploadBColItem = function (colObj, formItemLayout) {
       var label = colObj.label,
@@ -997,7 +1094,9 @@ var Easy3wFormPage = function (_Component) {
         sendData: '',
         form: form,
         required: required,
-        label: label
+        label: label,
+        style: formItemStyle,
+        className: (0, _classnames2['default'])(['formContent'])
       }, formItemLayout, cmptProsNew));
     }, _this.getUploadMColItem = function (colObj, formItemLayout) {
       var label = colObj.label,
@@ -1020,12 +1119,14 @@ var Easy3wFormPage = function (_Component) {
         sendData: '',
         form: form,
         required: required,
-        label: label
+        label: label,
+        style: formItemStyle,
+        className: (0, _classnames2['default'])(['formContent'])
       }, formItemLayout, cmptProsNew));
     }, _this.inputHandler = function (item) {
       var cmptPros = item.cmptPros;
 
-      return _react2['default'].createElement(_input2['default'], cmptPros);
+      return _react2['default'].createElement(_input2['default'], (0, _extends3['default'])({}, cmptPros, { size: 'small' }));
     }, _this.selectHandler = function (item) {
       var cmptPros = item.cmptPros;
       var optionLst = cmptPros.optionLst;
@@ -1042,7 +1143,8 @@ var Easy3wFormPage = function (_Component) {
         (0, _extends3['default'])({
           style: { width: '100%' }
         }, cmptPros, {
-          allowClear: true
+          allowClear: true,
+          size: 'small'
         }),
         selectOpts
       );
@@ -1064,11 +1166,11 @@ var Easy3wFormPage = function (_Component) {
     }, _this.sliderHandler = function (item) {
       var cmptPros = item.cmptPros;
 
-      return _react2['default'].createElement(_slider2['default'], cmptPros);
+      return _react2['default'].createElement(_slider2['default'], (0, _extends3['default'])({}, cmptPros, { size: 'small' }));
     }, _this.switchHandler = function (item) {
       var cmptPros = item.cmptPros;
 
-      return _react2['default'].createElement(_switch2['default'], cmptPros);
+      return _react2['default'].createElement(_switch2['default'], (0, _extends3['default'])({}, cmptPros, { size: 'small' }));
     }, _this.datePickerHandler = function (item) {
       var cmptPros = item.cmptPros;
 
@@ -1076,7 +1178,9 @@ var Easy3wFormPage = function (_Component) {
         locale: _zh_CN2['default'],
         style: { width: '100%', marginRight: 0 },
         format: 'YYYY-MM-DD'
-      }, cmptPros));
+      }, cmptPros, {
+        size: 'small'
+      }));
     }, _this.rangeMinutes = function (start, mid, end) {
       var result = [];
       for (var i = start; i < mid; i += 1) {
@@ -1110,7 +1214,9 @@ var Easy3wFormPage = function (_Component) {
           format: 'YYYY-MM-DD HH:mm:ss',
           showTime: true,
           locale: _zh_CN2['default']
-        }, cmptPros));
+        }, cmptPros, {
+          size: 'small'
+        }));
       } else {
         return _react2['default'].createElement(_datePicker2['default'], (0, _extends3['default'])({
           style: { width: '100%', marginRight: 0 },
@@ -1118,20 +1224,26 @@ var Easy3wFormPage = function (_Component) {
           showTime: { hideDisabledOptions: true, defaultValue: (0, _moment2['default'])('09:00:00', 'HH:mm:ss') },
           format: 'YYYY-MM-DD HH:mm',
           locale: _zh_CN2['default']
-        }, cmptPros));
+        }, cmptPros, {
+          size: 'small'
+        }));
       }
     }, _this.timePickerHandler = function (item) {
       var cmptPros = item.cmptPros;
 
       return _react2['default'].createElement(_timePicker2['default'], (0, _extends3['default'])({
         format: 'HH:mm:ss'
-      }, cmptPros));
+      }, cmptPros, {
+        size: 'small'
+      }));
     }, _this.monthPickerHandler = function (item) {
       var cmptPros = item.cmptPros;
 
       return _react2['default'].createElement(MonthPicker, (0, _extends3['default'])({
         format: 'YYYY-MM'
-      }, cmptPros));
+      }, cmptPros, {
+        size: 'small'
+      }));
     }, _this.rangePickerHandler = function (item) {
       var cmptPros = item.cmptPros;
 
@@ -1139,11 +1251,15 @@ var Easy3wFormPage = function (_Component) {
         locale: _zh_CN2['default'],
         style: { width: '100%' },
         format: 'YYYY-MM-DD'
-      }, cmptPros));
+      }, cmptPros, {
+        size: 'small'
+      }));
     }, _this.transferHandler = function (item) {
       var cmptPros = item.cmptPros;
 
-      return _react2['default'].createElement(_transfer2['default'], cmptPros);
+      return _react2['default'].createElement(_transfer2['default'], (0, _extends3['default'])({}, cmptPros, {
+        size: 'small'
+      }));
     }, _this.treeSelectHandler = function (item) {
       var cmptPros = item.cmptPros;
 
@@ -1160,7 +1276,9 @@ var Easy3wFormPage = function (_Component) {
           width: '100%'
         }
       };
-      return _react2['default'].createElement(_treeSelect2['default'], (0, _extends3['default'])({}, treeSelectProps, cmptPros));
+      return _react2['default'].createElement(_treeSelect2['default'], (0, _extends3['default'])({}, treeSelectProps, cmptPros, {
+        size: 'small'
+      }));
     }, _this.radioHandler = function (item) {
       var cmptPros = item.cmptPros;
 
@@ -1170,12 +1288,21 @@ var Easy3wFormPage = function (_Component) {
 
       return _react2['default'].createElement(CheckboxGroup, cmptPros);
     }, _this.textAreaOnchange = function (e, maxLength) {
+      if (e && e.target.value.length) {
+        _this.setState({ leftCount: e.target.value.length });
+      }
       if (e && e.target.value.length > maxLength) {
         _message3['default'].info('\u8F93\u5165\u5B57\u6570\u4E0D\u80FD\u8D85\u8FC7' + maxLength);
       }
     }, _this.textareaHandler = function (item) {
+      var readFlag = item.readFlag,
+          value = item.value;
       var cmptPros = item.cmptPros;
 
+      var cmptProsNew = cmptPros || {};
+      cmptPros = (0, _extends3['default'])({}, cmptPros, {
+        rows: cmptProsNew.rows || 2
+      });
       var maxlength = void 0;
       if (!cmptPros || cmptPros && !cmptPros.rows) {
         cmptPros = (0, _extends3['default'])({}, cmptPros, { autosize: true });
@@ -1183,14 +1310,26 @@ var Easy3wFormPage = function (_Component) {
       if (cmptPros && (cmptPros.maxLength || cmptPros.maxlength)) {
         maxlength = cmptPros.maxLength || cmptPros.maxlength;
       }
-      return _react2['default'].createElement(TextArea, (0, _extends3['default'])({ onChange: function onChange(e) {
-          return _this.textAreaOnchange(e, maxlength);
-        } }, cmptPros));
+      if (cmptPros && cmptPros.showCountFlag) {
+        var maxCount = Number(cmptPros.maxLength || cmptPros.maxlength) || 200;
+        return _react2['default'].createElement(
+          'div',
+          { className: (0, _classnames2['default'])(['countContent']), 'data-count': _this.state.leftCount + '/' + maxCount },
+          _react2['default'].createElement(TextArea, (0, _extends3['default'])({ style: { padding: '0 11px', lineHeight: '24px' }, onChange: function onChange(e) {
+              return _this.textAreaOnchange(e, maxlength);
+            } }, cmptPros))
+        );
+      } else {
+        return _react2['default'].createElement(TextArea, (0, _extends3['default'])({ style: { padding: '0 11px', lineHeight: '24px' }, onChange: function onChange(e) {
+            return _this.textAreaOnchange(e, maxlength);
+          } }, cmptPros));
+      }
     }, _this.inputNumberHandler = function (item) {
       var cmptPros = item.cmptPros;
 
-      return _react2['default'].createElement(_inputNumber2['default'], cmptPros);
+      return _react2['default'].createElement(_inputNumber2['default'], (0, _extends3['default'])({}, cmptPros, { size: 'small' }));
     }, _this.inputNumberFormatHandler = function (item, formItemLayout) {
+      var allReadFlag = _this.props.allReadFlag;
       var getFieldDecorator = _this.props.form.getFieldDecorator;
       var cmptPros = item.cmptPros,
           label = item.label,
@@ -1199,6 +1338,7 @@ var Easy3wFormPage = function (_Component) {
           required = item.required,
           value = item.value,
           disableFlag = item.disableFlag,
+          readFlag = item.readFlag,
           formItemProps = item.formItemProps;
 
       var addrules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }];
@@ -1208,19 +1348,38 @@ var Easy3wFormPage = function (_Component) {
         addrules.push.apply(addrules, rules);
       }
       var afterBtns = _this.getAfterBtn(item);
+      // 只读场景格式化数字金额
+      var valueFormat = '';
+      if (Number(value)) {
+        var numValue = Number(value).toFixed(2);
+        valueFormat = numValue.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+      }
+      if (readFlag || allReadFlag) {
+        return _react2['default'].createElement(
+          FormItem,
+          (0, _extends3['default'])({
+            label: label
+          }, formItemLayout, formItemProps, {
+            style: formItemStyle,
+            className: (0, _classnames2['default'])(['formContent'])
+          }),
+          valueFormat + ' ' + (cmptPros && cmptPros.addonAfter ? cmptPros.addonAfter : '')
+        );
+      }
       return _react2['default'].createElement(
         FormItem,
         (0, _extends3['default'])({
           label: label
         }, formItemLayout, formItemProps, {
-          style: formItemStyle
+          style: formItemStyle,
+          className: cmptPros && cmptPros.addonAfter ? (0, _classnames2['default'])(['formContentAlone']) : (0, _classnames2['default'])(['formContent'])
         }),
         _react2['default'].createElement(
           'div',
-          { style: { position: 'relative' } },
+          { className: (0, _classnames2['default'])(['hasAfterBtns']), style: { display: 'flex', flexDirection: 'row', flexWrap: 'wrap' } },
           _react2['default'].createElement(
             _row2['default'],
-            null,
+            { style: { flexGrow: 1 } },
             _react2['default'].createElement(
               _col2['default'],
               { span: cmptPros && cmptPros.addonAfter ? 21 : 24 },
@@ -1237,27 +1396,295 @@ var Easy3wFormPage = function (_Component) {
                   var _this$props$form$setF;
 
                   return _this.props.form.setFieldsValue((_this$props$form$setF = {}, _this$props$form$setF[item.fieldId] = onChangeValue, _this$props$form$setF));
-                },
-                style: { width: '100%', bottom: '4px' }
-              }, cmptPros)))
+                }
+                // style={{ width: '100%', bottom: '4px' }}
+                , style: { width: '100%' }
+              }, cmptPros, {
+                size: 'small'
+              })))
             ),
             _react2['default'].createElement(
               _col2['default'],
               { span: cmptPros && cmptPros.addonAfter ? 3 : 0 },
               cmptPros ? cmptPros.addonAfter ? _react2['default'].createElement(
                 'span',
-                { className: 'ant-input-group-addon', style: { lineHeight: '30px', borderRadius: '0px 5px 5px 0px' } },
+                { className: 'ant-input-group-addon', style: { lineHeight: '23px', borderRight: '1px solid #e8e8e8', borderRadius: '0px 5px 5px 0px', width: 'inherit' } },
                 cmptPros.addonAfter
               ) : null : null
             )
           ),
           _react2['default'].createElement(
             'div',
-            { style: { position: 'absolute', left: '100%', zIndex: 2, top: '0px' } },
+            null,
             afterBtns
           )
         )
       );
+    }, _this.getSelectColItem = function (item, formItemLayout) {
+      var _this$props5 = _this.props,
+          form = _this$props5.form,
+          allReadFlag = _this$props5.allReadFlag;
+      var getFieldDecorator = form.getFieldDecorator;
+      var cmptPros = item.cmptPros,
+          label = item.label,
+          fieldId = item.fieldId,
+          required = item.required,
+          value = item.value,
+          formItemProps = item.formItemProps,
+          disableFlag = item.disableFlag,
+          readFlag = item.readFlag;
+      var optionLst = cmptPros.optionLst,
+          mode = cmptPros.mode,
+          labelInValue = cmptPros.labelInValue;
+
+      var selectOpts = '';
+      var disabled = false;
+      var strValue = []; // 只读多选字符串
+      var findObj = ''; // 只读单选字符串
+      var afterBtns = _this.getAfterBtn(item);
+      selectOpts = optionLst && optionLst.map(function (opt) {
+        return opt.key || opt.value ? _react2['default'].createElement(
+          Option,
+          { key: opt.value || opt.key, disabled: opt.disabled },
+          opt.label
+        ) : '';
+      });
+      var allContents = optionLst && optionLst.map(function (opt) {
+        if (value && value instanceof Array && value.length > 0) {
+          var valueContents = value && value.length > 0 && value.map(function (val) {
+            if ((opt.value === val || opt.value === val.value) && opt.label !== '请选择') {
+              strValue.push(opt.label);
+            }
+            return valueContents;
+          });
+        } else if (opt.label !== '请选择' && opt.value === value) {
+          findObj = opt.label;
+        } else if (labelInValue && typeof value === 'object') {
+          findObj = value.label;
+        }
+        return allContents;
+      });
+      if (disableFlag || cmptPros.disableFlag) {
+        disabled = true;
+      }
+      if (allReadFlag) {
+        disabled = true;
+      }
+      var cmptProsNew = (0, _extends3['default'])({}, cmptPros, { disabled: disabled });
+      if (allReadFlag || readFlag) {
+        return _react2['default'].createElement(
+          FormItem,
+          (0, _extends3['default'])({
+            label: label
+          }, formItemLayout, formItemProps, {
+            style: formItemStyle,
+            className: (0, _classnames2['default'])(['formContent'])
+          }),
+          getFieldDecorator(fieldId + 'Easy3wView', {
+            initialValue: 'easy3wView',
+            rules: [{ required: required, message: '\u8BF7\u586B\u5199' + label }]
+          })(_react2['default'].createElement(_input2['default'], { type: 'hidden', size: 'small' })),
+          mode === 'multiple' ? strValue.join() : findObj
+        );
+      } else {
+        return _react2['default'].createElement(
+          FormItem,
+          (0, _extends3['default'])({
+            label: label
+          }, formItemLayout, formItemProps, {
+            style: formItemStyle,
+            className: (0, _classnames2['default'])(['formContent'])
+          }),
+          _react2['default'].createElement(
+            'div',
+            { className: (0, _classnames2['default'])(['hasAfterBtns']), style: { display: 'flex', flexDirection: 'row', flexWrap: 'wrap' } },
+            _react2['default'].createElement(
+              'span',
+              { style: { flexGrow: 1 } },
+              getFieldDecorator(fieldId, {
+                initialValue: value,
+                rules: [{ required: required, message: '\u8BF7\u9009\u62E9' + label }]
+              })(_react2['default'].createElement(
+                _select2['default'],
+                (0, _extends3['default'])({
+                  style: { width: '100%' }
+                }, cmptProsNew, {
+                  size: 'small'
+                }),
+                selectOpts
+              ))
+            ),
+            _react2['default'].createElement(
+              'div',
+              null,
+              afterBtns
+            )
+          )
+        );
+      }
+    }, _this.getRadioColItem = function (item, formItemLayout) {
+      var _this$props6 = _this.props,
+          form = _this$props6.form,
+          allReadFlag = _this$props6.allReadFlag;
+      var cmptPros = item.cmptPros,
+          label = item.label,
+          fieldId = item.fieldId,
+          required = item.required,
+          requiredMessage = item.requiredMessage,
+          formItemProps = item.formItemProps,
+          disableFlag = item.disableFlag,
+          readFlag = item.readFlag;
+      var value = item.value;
+      var _cmptPros$options = cmptPros.options,
+          options = _cmptPros$options === undefined ? [] : _cmptPros$options;
+      var getFieldDecorator = form.getFieldDecorator;
+
+      var disabled = false;
+      var addRules = [];
+      // 添加rule,getValueFromEvent属性
+      var decoratorObj = {
+        rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
+      };
+      if (cmptPros) {
+        if (cmptPros.rules) {
+          var rules = cmptPros.rules;
+
+          addRules = rules;
+          decoratorObj.rules.push(addRules);
+        }
+        if (cmptPros.getValueFromEvent) {
+          var getValueFromEvent = cmptPros.getValueFromEvent;
+
+          decoratorObj = (0, _extends3['default'])({}, decoratorObj, { getValueFromEvent: getValueFromEvent });
+        }
+      }
+      if (disableFlag || cmptPros.disableFlag) {
+        disabled = true;
+      }
+      if (allReadFlag) {
+        disabled = true;
+      }
+
+      var cmptProsNew = (0, _extends3['default'])({}, cmptPros, { disabled: disabled });
+      if (allReadFlag || readFlag) {
+        options.map(function (opt) {
+          if (value === opt.value) {
+            value = opt.label;
+          }
+          return '';
+        });
+        return _react2['default'].createElement(
+          FormItem,
+          (0, _extends3['default'])({
+            label: label
+          }, formItemLayout, formItemProps, {
+            style: formItemStyle,
+            className: (0, _classnames2['default'])(['formContent'])
+          }),
+          getFieldDecorator(fieldId + 'Easy3wView', {
+            initialValue: 'easy3wView',
+            rules: [{ required: required, message: '\u8BF7\u586B\u5199' + label }]
+          })(_react2['default'].createElement(_input2['default'], { type: 'hidden', size: 'small' })),
+          value
+        );
+      } else {
+        return _react2['default'].createElement(
+          FormItem,
+          (0, _extends3['default'])({
+            label: label
+          }, formItemLayout, formItemProps, {
+            style: formItemStyle,
+            className: (0, _classnames2['default'])(['formContent'])
+          }),
+          getFieldDecorator(fieldId, (0, _extends3['default'])({}, decoratorObj, {
+            initialValue: value
+          }))(_react2['default'].createElement(RadioGroup, cmptProsNew))
+        );
+      }
+    }, _this.getCheckBoxColItem = function (item, formItemLayout) {
+      var _this$props7 = _this.props,
+          form = _this$props7.form,
+          allReadFlag = _this$props7.allReadFlag;
+      var getFieldDecorator = form.getFieldDecorator;
+      var _item$cmptPros = item.cmptPros,
+          cmptPros = _item$cmptPros === undefined ? {} : _item$cmptPros,
+          label = item.label,
+          fieldId = item.fieldId,
+          required = item.required,
+          formItemProps = item.formItemProps,
+          disableFlag = item.disableFlag,
+          requiredMessage = item.requiredMessage,
+          readFlag = item.readFlag;
+      var value = item.value;
+      var _cmptPros$options2 = cmptPros.options,
+          options = _cmptPros$options2 === undefined ? [] : _cmptPros$options2;
+
+      var disabled = false;
+      var addRules = [];
+      // 添加rule,getValueFromEvent属性
+      var decoratorObj = {
+        rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
+      };
+      if (cmptPros) {
+        if (cmptPros.rules) {
+          var rules = cmptPros.rules;
+
+          addRules = rules;
+          decoratorObj.rules.push(addRules);
+        }
+        if (cmptPros.getValueFromEvent) {
+          var getValueFromEvent = cmptPros.getValueFromEvent;
+
+          decoratorObj = (0, _extends3['default'])({}, decoratorObj, { getValueFromEvent: getValueFromEvent });
+        }
+      }
+      if (disableFlag || cmptPros.disableFlag) {
+        disabled = true;
+      }
+      if (allReadFlag) {
+        disabled = true;
+      }
+      var cmptProsNew = (0, _extends3['default'])({}, cmptPros, { disabled: disabled });
+      if (allReadFlag || readFlag) {
+        var arrValue = [];
+        options.map(function (opt) {
+          value.map(function (val) {
+            if (val === opt.value) {
+              arrValue.push(opt.label);
+            }
+            return '';
+          });
+          return '';
+        });
+        value = arrValue.join(',');
+        return _react2['default'].createElement(
+          FormItem,
+          (0, _extends3['default'])({
+            label: label
+          }, formItemLayout, formItemProps, {
+            style: formItemStyle,
+            className: (0, _classnames2['default'])(['formContent'])
+          }),
+          getFieldDecorator(fieldId + 'Easy3wView', {
+            initialValue: 'easy3wView',
+            rules: [{ required: required, message: '\u8BF7\u586B\u5199' + label }]
+          })(_react2['default'].createElement(_input2['default'], { type: 'hidden', size: 'small' })),
+          value
+        );
+      } else {
+        return _react2['default'].createElement(
+          FormItem,
+          (0, _extends3['default'])({
+            label: label
+          }, formItemLayout, formItemProps, {
+            style: formItemStyle,
+            className: (0, _classnames2['default'])(['formContent'])
+          }),
+          getFieldDecorator(fieldId, (0, _extends3['default'])({}, decoratorObj, {
+            initialValue: value
+          }))(_react2['default'].createElement(CheckboxGroup, cmptProsNew))
+        );
+      }
     }, _this.numberInputHandler = function (item) {
       var cmptPros = item.cmptPros;
 
@@ -1270,7 +1697,9 @@ var Easy3wFormPage = function (_Component) {
           return _this.numberInputonBlur(e, item);
         },
         rules: [{ pattern: /^\d+(\.\d+)?$/, message: '数字' }]
-      }, cmptPros));
+      }, cmptPros, {
+        size: 'small'
+      }));
     }, _this.numberInputonChange = function (e) {
       var value = e.target.value;
 
@@ -1297,15 +1726,15 @@ var Easy3wFormPage = function (_Component) {
     }, _this.mentionHandler = function (item) {
       var cmptPros = item.cmptPros;
 
-      return _react2['default'].createElement(_mention2['default'], cmptPros);
+      return _react2['default'].createElement(_mention2['default'], (0, _extends3['default'])({}, cmptPros, { size: 'small' }));
     }, _this.rateHandler = function (item) {
       var cmptPros = item.cmptPros;
 
-      return _react2['default'].createElement(_rate2['default'], cmptPros);
+      return _react2['default'].createElement(_rate2['default'], (0, _extends3['default'])({}, cmptPros, { size: 'small' }));
     }, _this.autoCompleteHandler = function (item) {
       var cmptPros = item.cmptPros;
 
-      return _react2['default'].createElement(_autoComplete2['default'], cmptPros);
+      return _react2['default'].createElement(_autoComplete2['default'], (0, _extends3['default'])({}, cmptPros, { size: 'small' }));
     }, _this.braftEditorHandler = function (item) {
       var cmptPros = item.cmptPros;
 
@@ -1313,11 +1742,11 @@ var Easy3wFormPage = function (_Component) {
     }, _this.cascaderHandler = function (item) {
       var cmptPros = item.cmptPros;
 
-      return _react2['default'].createElement(_cascader2['default'], cmptPros);
+      return _react2['default'].createElement(_cascader2['default'], (0, _extends3['default'])({}, cmptPros, { size: 'small' }));
     }, _this.iconHandler = function (item) {
       var cmptPros = item.cmptPros;
 
-      return _react2['default'].createElement(_icon2['default'], cmptPros);
+      return _react2['default'].createElement(_icon2['default'], (0, _extends3['default'])({}, cmptPros, { size: 'small' }));
     }, _this.strTemplateHandler = function (item) {
       var cmptPros = item.cmptPros;
       var templateArray = cmptPros.templateArray;
@@ -1341,7 +1770,7 @@ var Easy3wFormPage = function (_Component) {
       var value = item.value;
 
       return value;
-    }, _this.btnHandler = function (obj) {
+    }, _this.btnHandler = function (obj, btnType) {
       var func = obj.func,
           cName = obj.cName,
           confirmContent = obj.confirmContent;
@@ -1354,8 +1783,12 @@ var Easy3wFormPage = function (_Component) {
             } },
           _react2['default'].createElement(
             _button2['default'],
-            { className: (0, _classnames2['default'])(['e3wFootBtn']) },
-            cName
+            { className: (0, _classnames2['default'])([btnType === 'afterBtn' ? '' : 'e3wFootBtn']), size: 'small' },
+            _react2['default'].createElement(
+              'a',
+              null,
+              cName
+            )
           )
         );
       }
@@ -1365,11 +1798,16 @@ var Easy3wFormPage = function (_Component) {
           onClick: function onClick(e) {
             return _this.onClickFunc(e, func);
           },
-          className: (0, _classnames2['default'])(['e3wFootBtn'])
+          className: (0, _classnames2['default'])([btnType === 'afterBtn' ? '' : 'e3wFootBtn']),
+          size: 'small'
         },
-        cName
+        _react2['default'].createElement(
+          'a',
+          null,
+          cName
+        )
       );
-    }, _this.aHandler = function (obj) {
+    }, _this.aHandler = function (obj, btnType) {
       var func = obj.func,
           cName = obj.cName;
 
@@ -1379,18 +1817,18 @@ var Easy3wFormPage = function (_Component) {
           onClick: function onClick(e) {
             return _this.onClickFunc(e, func);
           },
-          className: (0, _classnames2['default'])(['e3wFootBtn'])
+          className: (0, _classnames2['default'])([btnType === 'afterBtn' ? '' : 'e3wFootBtn'])
         },
         cName
       );
-    }, _this.strHandler = function (obj) {
+    }, _this.strHandler = function (obj, btnType) {
       var cName = obj.cName,
           color = obj.color;
 
       return _react2['default'].createElement(
         'span',
         {
-          className: (0, _classnames2['default'])(['e3wFootBtn']),
+          className: (0, _classnames2['default'])([btnType === 'afterBtn' ? '' : 'e3wFootBtn']),
           style: { color: color || '' }
         },
         cName
@@ -1480,10 +1918,20 @@ var Easy3wFormPage = function (_Component) {
 
   /** inputNumber end */
 
-  /** inputNumber start */
+  /** inputNumber start inherit不兼容ie8以下 */
 
   /** inputNumber end */
 
+  // #region Select
+
+  // #endregion
+  // #region Radio
+
+  // #endregion
+
+  // #region
+
+
   /** numberInput start */
   // numberInputHandler = (item) => {
   //   return (
@@ -1544,7 +1992,29 @@ var Easy3wFormPage = function (_Component) {
   /** strHandler end */
 
   Easy3wFormPage.prototype.render = function render() {
-    return this.getAllForms();
+    var getAllForms = this.getAllForms();
+    var borderFlag = this.props.borderFlag;
+    // noLabelFlag 布尔值
+
+    var noBorderFlag = false;
+    if (typeof this.props.noBorderFlag === 'boolean') {
+      noBorderFlag = this.props.noBorderFlag;
+    } else if (typeof _comonConfig.noBorderFlag === 'boolean') {
+      noBorderFlag = _comonConfig.noBorderFlag;
+    }
+    if (noBorderFlag) {
+      return _react2['default'].createElement(
+        'div',
+        { className: (0, _classnames2['default'])(['e3wFormPageNoBorder']) },
+        getAllForms
+      );
+    } else {
+      return _react2['default'].createElement(
+        'div',
+        { className: (0, _classnames2['default'])(['e3wFormPage']) },
+        getAllForms
+      );
+    }
   };
 
   return Easy3wFormPage;