easy3wui 1.5.53 → 1.5.54

package/lib/Easy3wFormPage/index.js

@@ -702,25 +702,7 @@ var Easy3wFormPage = function (_Component) {
           });
         }
       }
-      if ((readFlag || allReadFlag) && fieldType !== 'textarea' && fieldType !== 'braftEditor') {
-        // if (fieldType === 'braftEditor') {
-        //   return (
-        //     <FormItem
-        //       label={label}
-        //       {...formItemLayout}
-        //       {...formItemProps}
-        //       style={formItemStyle}
-        //     >
-        //       {getFieldDecorator(`${fieldId}Easy3wView`,
-        //         {
-        //           initialValue: 'easy3wView',
-        //           rules: [{ required, message: requiredMessage || `请填写${label}` }],
-        //         })(<Input type="hidden" />)
-        //       }
-        //       <div dangerouslySetInnerHTML={{ __html: itemValue.toHTML() }} />{afterBtns}
-        //     </FormItem>
-        //   );
-        // } else if (fieldType === 'checkBox' || fieldType === 'radio') {
+      if ((readFlag || allReadFlag) && fieldType !== 'braftEditor') {
         if ((fieldType === 'checkBox' || fieldType === 'radio') && label) {
           return _react2['default'].createElement(
             FormItem,
@@ -742,6 +724,26 @@ var Easy3wFormPage = function (_Component) {
               rules: [{ required: required, message: requiredMessage || '\u8BF7' + strRMsg + label }]
             })(itemArea)
           );
+        } else if (fieldType === 'textarea' && typeof str === 'string') {
+          return _react2['default'].createElement(
+            FormItem,
+            (0, _extends3['default'])({
+              label: label
+            }, formItemLayout, formItemProps, {
+              style: formItemStyle
+            }),
+            _react2['default'].createElement(
+              'div',
+              { style: { position: 'relative' } },
+              formItemChild,
+              getFieldDecorator(fieldId, (0, _extends3['default'])({}, decoratorObj))(itemArea),
+              _react2['default'].createElement(
+                'div',
+                { style: { position: 'absolute', left: '100%', top: '0px', zIndex: 2 } },
+                afterBtns
+              )
+            )
+          );
         } else {
           return _react2['default'].createElement(
             FormItem,

package/lib/Easy3wUpload/index.js

@@ -78,6 +78,12 @@ var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
+// 文件上传配置
+var _ref = _comonConfig.objE3wUIFileConfig || {},
+    maxSize = _ref.maxSize;
+// maxSizeB 大附件-文件大小限制 单位：MB
+// maxSize 附件-文件大小限制 单位：MB
+
 var FormItem = _form2['default'].Item;
 var formItemStyle = {
   marginBottom: 6
@@ -141,7 +147,6 @@ var Easy3wUpload = function (_Component) {
         sendData = _props.sendData,
         listType = _props.listType,
         accept = _props.accept,
-        limitSize = _props.limitSize,
         required = _props.required,
         initialValue = _props.initialValue,
         help = _props.help,
@@ -159,6 +164,9 @@ var Easy3wUpload = function (_Component) {
         hadUpdBtn = _props.hadUpdBtn,
         propsAFlag = _props.propsAFlag,
         fileViewFlag = _props.fileViewFlag;
+    var limitSize = this.props.limitSize;
+
+    limitSize = limitSize || maxSize;
     var warnMessage = this.props.warnMessage;
 
     var iniVal = [];

package/lib/Easy3wUploadB/index.js

@@ -88,7 +88,11 @@ var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-// const { previewFileUrl, previewFileFlag, previewFileType } = objPreviewFile || {};
+// 文件上传配置
+var _ref = _comonConfig.objE3wUIFileConfig || {},
+    maxSizeB = _ref.maxSizeB;
+// maxSizeB 大附件-文件大小限制 单位：MB 
+// maxSize 附件-文件大小限制 单位：MB
 
 var formItemStyle = {
   marginBottom: 6
@@ -178,8 +182,8 @@ var BigFileUpload = function (_Component) {
         urlDownloadFile = _props.urlDownloadFile,
         initialValue = _props.initialValue,
         propsAFlag = _props.propsAFlag,
-        fileViewFlag = _props.fileViewFlag,
-        maxFileSize = _props.maxFileSize;
+        fileViewFlag = _props.fileViewFlag;
+    var maxFileSize = this.props.maxFileSize;
     var _state = this.state,
         preUploading = _state.preUploading,
         uploadPercent = _state.uploadPercent,
@@ -188,6 +192,7 @@ var BigFileUpload = function (_Component) {
         uploading = _state.uploading;
     var getFieldDecorator = form.getFieldDecorator;
 
+    maxFileSize = maxFileSize || maxSizeB;
     var uploadProp = {
       // name,
       listType: listType,

package/lib/Easy3wUploadM/index.js

@@ -79,6 +79,11 @@ var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 // const { previewFileUrl, previewFileFlag, previewFileType } = objPreviewFile || {};
+// 文件上传配置
+var _ref = _comonConfig.objE3wUIFileConfig || {},
+    maxSize = _ref.maxSize;
+// maxSizeB 大附件-文件大小限制 单位：MB
+// maxSize 附件-文件大小限制 单位：MB
 
 var formItemStyle = {
   marginBottom: 6
@@ -141,7 +146,6 @@ var Easy3wUploadM = function (_Component) {
         sendData = _props.sendData,
         listType = _props.listType,
         accept = _props.accept,
-        limitSize = _props.limitSize,
         required = _props.required,
         initialValue = _props.initialValue,
         help = _props.help,
@@ -159,6 +163,9 @@ var Easy3wUploadM = function (_Component) {
         downloadAllFlag = _props.downloadAllFlag,
         propsAFlag = _props.propsAFlag,
         fileViewFlag = _props.fileViewFlag;
+    var limitSize = this.props.limitSize;
+
+    limitSize = limitSize || maxSize;
     var warnMessage = this.props.warnMessage;
 
     var iniVal = [];

package/package.json

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