easy3wui 1.4.229 → 1.4.233

package/assets/btn.css

@@ -5,6 +5,9 @@
 .e3wFootBtn {
   margin: 0px 8px;
 }
+.e3wFormBtn {
+  margin-right: 8px;
+}
 .positionDiv {
   position: absolute;
   right: 12px;

package/assets/flow.css

@@ -521,7 +521,7 @@
 .flowbottom .flowdoc {
   display: inline-block;
   margin: 0 2px;
-  height: 35px;
+  height: 28px;
   text-align: center;
   /*浮动区块居中，必须配合.float-center使用*/
   position: relative;
@@ -749,12 +749,14 @@
 }
 .flowmain .borderblue {
   border: 1px solid #5867ad;
+  border-radius: 4px;
 }
 .flowmain .borderorange {
   border: 1px solid #ad7c59;
 }
 .flowmain .borderblueDashed {
   border: 1px dashed #5867ad;
+  border-radius: 4px;
 }
 .flowmain .borderorangeDashed {
   border: 1px dashed #ad7c59;
@@ -767,7 +769,7 @@
 }
 .flowmain .flowbottomtextblue {
   text-align: center;
-  line-height: 35px;
+  line-height: 28px;
   color: #5867ad;
 }
 .flowmain .flowdoc img {
@@ -777,10 +779,12 @@
   bottom: -1px;
   z-index: 1;
   width: 21px;
+  border-bottom-right-radius: 4px;
 }
 .flowmain .flowbottomtextorange {
   text-align: center;
-  line-height: 35px;
+  line-height: 28px;
+  border-radius: 4px;
 }
 .flowmain .flowbottomtextorange a {
   color: #ad7c59;
@@ -788,8 +792,9 @@
 }
 .flowmain .flowbottomtextgrey {
   text-align: center;
-  line-height: 35px;
+  line-height: 28px;
   color: #999999;
+  border-radius: 4px;
 }
 .flowmain .flowbottomtextgrey a {
   text-align: center;

package/assets/formPage.css

@@ -1,21 +1,32 @@
 .ant-upload-list-item {
+  width: -webkit-max-content;
   width: -moz-max-content;
   width: max-content;
 }
 .ant-upload-list-item .ant-upload-list-item-info {
+  width: -webkit-max-content;
   width: -moz-max-content;
   width: max-content;
 }
 .ant-upload-list-item .anticon-cross {
   right: -2px;
 }
+.e3wFormPageNoBorder {
+  margin: 12px;
+}
+.e3wFormPageNoBorder > div {
+  margin: 3px;
+}
 .e3wFormPage {
   border-top: 1px solid #e8e8e8;
   border-left: 1px solid #e8e8e8;
   border-right: 1px solid #e8e8e8;
   margin: 12px;
 }
-.e3wFormPage > .ant-row {
+.e3wFormPage > div {
+  margin: 3px;
+}
+.e3wFormPage > div > .ant-row {
   border-bottom: 1px solid #e8e8e8;
 }
 .e3wFormItem .ant-form-item {

package/assets/index.css

@@ -966,7 +966,7 @@ s {
 .flowbottom .flowdoc {
   display: inline-block;
   margin: 0 2px;
-  height: 35px;
+  height: 28px;
   text-align: center;
   /*浮动区块居中，必须配合.float-center使用*/
   position: relative;
@@ -1194,12 +1194,14 @@ s {
 }
 .flowmain .borderblue {
   border: 1px solid #5867ad;
+  border-radius: 4px;
 }
 .flowmain .borderorange {
   border: 1px solid #ad7c59;
 }
 .flowmain .borderblueDashed {
   border: 1px dashed #5867ad;
+  border-radius: 4px;
 }
 .flowmain .borderorangeDashed {
   border: 1px dashed #ad7c59;
@@ -1212,7 +1214,7 @@ s {
 }
 .flowmain .flowbottomtextblue {
   text-align: center;
-  line-height: 35px;
+  line-height: 28px;
   color: #5867ad;
 }
 .flowmain .flowdoc img {
@@ -1222,10 +1224,12 @@ s {
   bottom: -1px;
   z-index: 1;
   width: 21px;
+  border-bottom-right-radius: 4px;
 }
 .flowmain .flowbottomtextorange {
   text-align: center;
-  line-height: 35px;
+  line-height: 28px;
+  border-radius: 4px;
 }
 .flowmain .flowbottomtextorange a {
   color: #ad7c59;
@@ -1233,8 +1237,9 @@ s {
 }
 .flowmain .flowbottomtextgrey {
   text-align: center;
-  line-height: 35px;
+  line-height: 28px;
   color: #999999;
+  border-radius: 4px;
 }
 .flowmain .flowbottomtextgrey a {
   text-align: center;
@@ -1527,23 +1532,34 @@ s {
   cursor: pointer;
 }
 .ant-upload-list-item {
+  width: -webkit-max-content;
   width: -moz-max-content;
   width: max-content;
 }
 .ant-upload-list-item .ant-upload-list-item-info {
+  width: -webkit-max-content;
   width: -moz-max-content;
   width: max-content;
 }
 .ant-upload-list-item .anticon-cross {
   right: -2px;
 }
+.e3wFormPageNoBorder {
+  margin: 12px;
+}
+.e3wFormPageNoBorder > div {
+  margin: 3px;
+}
 .e3wFormPage {
   border-top: 1px solid #e8e8e8;
   border-left: 1px solid #e8e8e8;
   border-right: 1px solid #e8e8e8;
   margin: 12px;
 }
-.e3wFormPage > .ant-row {
+.e3wFormPage > div {
+  margin: 3px;
+}
+.e3wFormPage > div > .ant-row {
   border-bottom: 1px solid #e8e8e8;
 }
 .e3wFormItem .ant-form-item {
@@ -1580,6 +1596,9 @@ s {
 .e3wFootBtn {
   margin: 0px 8px;
 }
+.e3wFormBtn {
+  margin-right: 8px;
+}
 .positionDiv {
   position: absolute;
   right: 12px;

package/lib/Easy3wButtonOne/index.js

@@ -117,7 +117,7 @@ var Easy3wButtonOne = function (_Component) {
           } },
         _react2['default'].createElement(
           _button2['default'],
-          (0, _extends3['default'])({}, typeProps, { className: (0, _classnames2['default'])(['btn', 'e3wFootBtn']) }),
+          (0, _extends3['default'])({}, typeProps, { className: (0, _classnames2['default'])(['btn', 'e3wFormBtn']) }),
           cName || children
         )
       );

package/lib/Easy3wFormPage/easy3wFormPage.less

@@ -11,6 +11,12 @@
         .ant-form-item-control {
             line-height: 24px;
         }
+        .ant-form-item label { // * 号突出， 文字对齐
+            padding-left: 12px;
+            .ant-form-item-required::before {
+                margin-left: -10px;
+            }
+        }
       }
 }
 

package/lib/Easy3wFormPage/index.js

@@ -198,6 +198,8 @@ 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';
@@ -205,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;
@@ -257,9 +258,13 @@ var formItemRightWithBtn = {
   wrapperCol: { span: 12 }
 };
 var formItemStyle = {
-  marginBottom: '3px',
-  marginTop: '3px'
+  margin: '0px'
+  // marginBottom: '3px',
+  // marginTop: '3px',
 };
+// const rowItemStyle = {
+//   padding: '3px',
+// };
 
 var Easy3wFormPage = function (_Component) {
   (0, _inherits3['default'])(Easy3wFormPage, _Component);
@@ -473,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,
@@ -542,6 +548,27 @@ var Easy3wFormPage = function (_Component) {
             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',
+              null,
+              itemValue
+            ),
+            afterBtns
+          );
+        }
         return _react2['default'].createElement(
           FormItem,
           (0, _extends3['default'])({
@@ -969,7 +996,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;
         });
       }
@@ -1017,7 +1048,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,
@@ -1041,7 +1074,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,
@@ -1064,7 +1099,9 @@ 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;
@@ -1238,6 +1275,8 @@ var Easy3wFormPage = function (_Component) {
         _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 maxlength = void 0;
@@ -1252,12 +1291,12 @@ var Easy3wFormPage = function (_Component) {
         return _react2['default'].createElement(
           'div',
           { className: (0, _classnames2['default'])(['countContent']), 'data-count': _this.state.leftCount + '/' + maxCount },
-          _react2['default'].createElement(TextArea, (0, _extends3['default'])({ onChange: function onChange(e) {
+          _react2['default'].createElement(TextArea, (0, _extends3['default'])({ style: { minHeight: '24px', height: '24px', padding: '0 11px', lineHeight: '24px' }, onChange: function onChange(e) {
               return _this.textAreaOnchange(e, maxlength);
             } }, cmptPros))
         );
       } else {
-        return _react2['default'].createElement(TextArea, (0, _extends3['default'])({ onChange: function onChange(e) {
+        return _react2['default'].createElement(TextArea, (0, _extends3['default'])({ style: { minHeight: '24px', height: '24px', padding: '0 11px', lineHeight: '24px' }, onChange: function onChange(e) {
             return _this.textAreaOnchange(e, maxlength);
           } }, cmptPros));
       }
@@ -1371,7 +1410,8 @@ var Easy3wFormPage = function (_Component) {
           disableFlag = item.disableFlag,
           readFlag = item.readFlag;
       var optionLst = cmptPros.optionLst,
-          mode = cmptPros.mode;
+          mode = cmptPros.mode,
+          labelInValue = cmptPros.labelInValue;
 
       var selectOpts = '';
       var disabled = false;
@@ -1395,6 +1435,8 @@ var Easy3wFormPage = function (_Component) {
           });
         } else if (opt.label !== '请选择' && opt.value === value) {
           findObj = opt.label;
+        } else if (labelInValue && typeof value === 'object') {
+          findObj = value.label;
         }
         return allContents;
       });
@@ -1460,10 +1502,13 @@ var Easy3wFormPage = function (_Component) {
           label = item.label,
           fieldId = item.fieldId,
           required = item.required,
-          value = item.value,
           requiredMessage = item.requiredMessage,
           formItemProps = item.formItemProps,
-          disableFlag = item.disableFlag;
+          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;
@@ -1493,31 +1538,58 @@ var Easy3wFormPage = function (_Component) {
       }
 
       var cmptProsNew = (0, _extends3['default'])({}, cmptPros, { disabled: disabled });
-      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))
-      );
+      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 cmptPros = item.cmptPros,
+      var _item$cmptPros = item.cmptPros,
+          cmptPros = _item$cmptPros === undefined ? {} : _item$cmptPros,
           label = item.label,
           fieldId = item.fieldId,
           required = item.required,
-          value = item.value,
           formItemProps = item.formItemProps,
           disableFlag = item.disableFlag,
-          requiredMessage = item.requiredMessage;
+          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 = [];
@@ -1545,18 +1617,46 @@ var Easy3wFormPage = function (_Component) {
         disabled = true;
       }
       var cmptProsNew = (0, _extends3['default'])({}, cmptPros, { disabled: disabled });
-      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))
-      );
+      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;
 
@@ -1857,14 +1957,19 @@ var Easy3wFormPage = function (_Component) {
 
   Easy3wFormPage.prototype.render = function render() {
     var getAllForms = this.getAllForms();
-    var _props = this.props,
-        borderFlag = _props.borderFlag,
-        noBorderFlag = _props.noBorderFlag;
-
+    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',
-        { style: { marginTop: '9px' } },
+        { className: (0, _classnames2['default'])(['e3wFormPageNoBorder']) },
         getAllForms
       );
     } else {

package/lib/Easy3wUpload/index.js

@@ -80,7 +80,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
 
 var FormItem = _form2['default'].Item;
 var formItemStyle = {
-  marginBottom: 0
+  // marginBottom: 0,
+  margin: 3
 };
 
 var Easy3wUpload = function (_Component) {

package/lib/Easy3wUploadB/index.js

@@ -93,7 +93,8 @@ var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 var formItemStyle = {
-  marginBottom: 0
+  // marginBottom: 0,
+  margin: 3
 };
 
 var BigFileUpload = function (_Component) {

package/lib/Easy3wUploadM/index.js

@@ -79,7 +79,8 @@ var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 var formItemStyle = {
-  marginBottom: 0
+  // marginBottom: 0,
+  margin: 3
 };
 
 var Easy3wUploadM = function (_Component) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.4.229",
+  "version": "1.4.233",
   "description": "easy3wui components for react",
   "keywords": [
     "react",