easy3wui 4.0.30 → 4.0.31-beta2

package/lib/Easy3wDownLoad/index.js

@@ -172,7 +172,9 @@ var Easy3wDownLoad = function (_Component) {
         fileCallURL = _props.fileCallURL;
 
     var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
-    var previewFileFlag = objPreviewFileNew.previewFileFlag;
+    var previewFileFlag = objPreviewFileNew.previewFileFlag,
+        downloadFileFlag = objPreviewFileNew.downloadFileFlag,
+        previewFileType = objPreviewFileNew.previewFileType;
 
     var retObj = '';
     if (downloadArr) {
@@ -200,7 +202,9 @@ var Easy3wDownLoad = function (_Component) {
                 name
               )
             ),
-            _react2['default'].createElement(_icons.DownloadOutlined, { onClick: function onClick() {
+            downloadFileFlag === '1' ? _react2['default'].createElement(_icons.DownloadOutlined, { onClick: function onClick() {
+                return _this2.touchDownload(obj, url);
+              }, style: { float: 'right', lineHeight: '100%' } }) : downloadFileFlag === '0' ? '' : previewFileType.indexOf(fileType) >= 0 ? '' : _react2['default'].createElement(_icons.DownloadOutlined, { onClick: function onClick() {
                 return _this2.touchDownload(obj, url);
               }, style: { float: 'right', lineHeight: '100%' } })
           );

package/lib/Easy3wFormPage/index.js

@@ -488,7 +488,7 @@ var Easy3wFormPage = function (_Component) {
         }
       }
       var objValidator = {};
-      if (fieldType === 'braftEditor' && required) {
+      if (fieldType === 'braftEditor' && required && !(readFlag || allReadFlag)) {
         objValidator = {
           validator: _this.validatorBraftEditor
         };
@@ -533,10 +533,11 @@ var Easy3wFormPage = function (_Component) {
       // 只读文本框改为禁止录入
       if (fieldType === 'textarea' && (readFlag || allReadFlag)) {
         disableFlagReal = true;
-      } else if (fieldType === 'braftEditor') {
-        decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
-          valuePropName: 'defaultValue'
-        });
+        // } else if (fieldType === 'braftEditor') {
+        //   decoratorObj = {
+        //     ...decoratorObj,
+        //     valuePropName: 'defaultValue',
+        //   };
       }
       if (loadFinishFlag === true && bigFormFlag === true) {
         if ((fieldType === 'input' || fieldType === 'textarea') && !hadOnBlurFlag && !disableFlagReal && !notProxyOnblurFlag) {

package/lib/Easy3wNewFormPage/index.js

@@ -501,7 +501,7 @@ var Easy3wNewFormPage = function (_Component) {
         }
       }
       var objValidator = {};
-      if (fieldType === 'braftEditor' && required) {
+      if (fieldType === 'braftEditor' && required && !(readFlag || allReadFlag)) {
         objValidator = {
           validator: _this.validatorBraftEditor
         };
@@ -546,10 +546,11 @@ var Easy3wNewFormPage = function (_Component) {
       // 只读文本框改为禁止录入
       if (fieldType === 'textarea' && (readFlag || allReadFlag)) {
         disableFlagReal = true;
-      } else if (fieldType === 'braftEditor') {
-        decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
-          valuePropName: 'defaultValue'
-        });
+        // } else if (fieldType === 'braftEditor') {
+        //   decoratorObj = {
+        //     ...decoratorObj,
+        //     valuePropName: 'defaultValue',
+        //   };
       }
       if (loadFinishFlag === true && bigFormFlag === true) {
         if ((fieldType === 'input' || fieldType === 'textarea') && !hadOnBlurFlag && !disableFlagReal && !notProxyOnblurFlag) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "4.0.30",
+  "version": "4.0.31-beta2",
   "description": "easy3wui components for react",
   "keywords": [
     "react",