easy3wui 1.5.29 → 1.5.31

package/lib/Easy3wFlow/index.js

@@ -119,10 +119,10 @@ var Easy3wFlow = function (_Component) {
       });
 
       var renderMidTemp = flowData.map(function (flow) {
-        var item = flow.children.find(function (item, index, array) {
-          return item.status != '40';
+        var item = flow.children.find(function (obj) {
+          return obj.status !== '40';
         });
-        item = item ? item : flow.children[0];
+        item = item || flow.children[0];
         var firstItem = item || flow;
         // const firstItem = flow.children[0] || flow;
         var firstItemCode = firstItem.code;
@@ -133,31 +133,33 @@ var Easy3wFlow = function (_Component) {
         var nodeAuthFlag = firstItem.nodeAuthFlag,
             status = firstItem.status;
 
-        if (status === '10' || status === '30') {
-          mainPage = handlePage;
-        }
-        if (status === '20') {
-          if (firstItem.readPage) {
-            mainPage = readPage;
+        if (flow.status === '10' || flow.status === '20' || flow.status === '30') {
+          if (status === '10' || status === '30') {
+            mainPage = handlePage;
           }
-        }
-        if (status === '40') {
-          mainPage = null;
-        }
-        // flag 等于 0 时
-        // 10 待处理-跳转到一个统一的页面
-        // 20 和 30 已完成- 跳转到readPage
-        // 40 未开始，只显示节点
-        if (nodeAuthFlag === '0') {
-          if (status === '10') {
-            mainPage = handlIngPage;
-          }
-          if (status === '20' || status === '30') {
-            mainPage = readPage;
+          if (status === '20') {
+            if (firstItem.readPage) {
+              mainPage = readPage;
+            }
           }
           if (status === '40') {
             mainPage = null;
           }
+          // flag 等于 0 时
+          // 10 待处理-跳转到一个统一的页面
+          // 20 和 30 已完成- 跳转到readPage
+          // 40 未开始，只显示节点
+          if (nodeAuthFlag === '0') {
+            if (status === '10') {
+              mainPage = handlIngPage;
+            }
+            if (status === '20' || status === '30') {
+              mainPage = readPage;
+            }
+            if (status === '40') {
+              mainPage = null;
+            }
+          }
         }
         var processIng = _react2['default'].createElement(_badge2['default'], { status: 'processing' });
         // const mainPage = ((firstItem.status === '10' || firstItem.status === '30') ?

package/lib/Easy3wUpload/index.js

@@ -210,7 +210,7 @@ var Easy3wUpload = function (_Component) {
     if (isRead) {
       upProps = (0, _extends3['default'])({}, upProps, { children: true, showUploadList: { showDownloadIcon: true, showPreviewIcon: true, showRemoveIcon: false } });
     }
-    if (previewFileFlag) {
+    if (previewFileFlag && fileViewFlag !== false) {
       upProps.onPreview = this.onPreview;
     }
     var beforeUpload = function beforeUpload(file) {

package/lib/Easy3wUploadB/index.js

@@ -180,7 +180,8 @@ var BigFileUpload = function (_Component) {
         showUploadList = _props.showUploadList,
         urlDownloadFile = _props.urlDownloadFile,
         initialValue = _props.initialValue,
-        propsAFlag = _props.propsAFlag;
+        propsAFlag = _props.propsAFlag,
+        fileViewFlag = _props.fileViewFlag;
     var _state = this.state,
         preUploading = _state.preUploading,
         uploadPercent = _state.uploadPercent,
@@ -312,7 +313,7 @@ var BigFileUpload = function (_Component) {
       },
       fileList: this.state.fileList
     };
-    if (previewFileFlag) {
+    if (previewFileFlag && fileViewFlag !== false) {
       uploadProp.onPreview = this.onPreview;
     }
     if (isRead) {

package/lib/Easy3wUploadM/index.js

@@ -214,7 +214,7 @@ var Easy3wUploadM = function (_Component) {
     if (isRead) {
       upProps = (0, _extends3['default'])({}, upProps, { children: true, showUploadList: { showPreviewIcon: false, showRemoveIcon: false } });
     }
-    if (previewFileFlag) {
+    if (previewFileFlag && fileViewFlag !== false) {
       upProps.onPreview = this.onPreview;
     }
     var beforeUpload = function beforeUpload(file) {

package/package.json

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