fmui-base 2.2.93 → 2.2.94

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.94：流程办理回调时的type不准确问题修复
 - 2.2.93：表单关联字段重构兼容老版本接口
 - 2.2.92：选人组件页签用户改成组织
 - 2.2.91：流程办理按钮名称要与办理弹窗标题同步

package/lib/process_info/processInfo.js

@@ -2803,9 +2803,6 @@ var PageHome = function (_React$Component) {
                                     checkedItem.end = item.end;
                                     checkedItem.must = item.must;
                                     checkedItem.participants = participants;
-                                    if (item.end == true) {
-                                        isEnd = true;
-                                    }
                                     checkedItem.level = item.level;
                                     checkedItem.maxOutgoing = maxOutgoing;
                                     if (item.must == true && (maxOutgoing == 1 && checkActi == 0 || maxOutgoing == 0)) {
@@ -2849,6 +2846,7 @@ var PageHome = function (_React$Component) {
                                         //nextSelectType = 'radom';
                                     }
                                 }
+                                isEnd = t.getSelectedIsEnd(nextActivityList, nextRadomList);
 
                                 //紧急
                                 var _urgent = t.state.urgent;
@@ -4874,6 +4872,33 @@ var PageHome = function (_React$Component) {
                 t.saveForm(1);
             }, saveTime * 60 * 1000);
         }
+        //根据当前选中的后继/随机节点判断是否结束
+
+    }, {
+        key: 'getSelectedIsEnd',
+        value: function getSelectedIsEnd(nextActivityList, nextRadomList) {
+            var t = this;
+            var activityList = nextActivityList != null ? nextActivityList : t.state.nextActivityList || [];
+            var radomList = nextRadomList != null ? nextRadomList : t.state.nextRadomList || [];
+            for (var i = 0; i < activityList.length; i++) {
+                if (activityList[i].checked && activityList[i].end === true) {
+                    return true;
+                }
+            }
+            for (var j = 0; j < radomList.length; j++) {
+                var subList = radomList[j].subRandomList || [];
+                for (var k = 0; k < subList.length; k++) {
+                    if (subList[k].checked && subList[k].end === true) {
+                        return true;
+                    }
+                }
+            }
+            if (activityList.length === 0 && radomList.length === 0) {
+                return t.state.isEnd;
+            }
+            return false;
+        }
+
         //提交发送流程
 
     }, {
@@ -5017,8 +5042,8 @@ var PageHome = function (_React$Component) {
                     //是不是起始节点 或再次发起
                     type = 4;
                 }
-                if (t.state.isEnd) {
-                    //是不是结束节点
+                if (t.getSelectedIsEnd()) {
+                    //是不是结束节点（以实际选中节点为准）
                     type = 1;
                 }
                 var dataId = t.state.dataId;
@@ -7312,7 +7337,8 @@ var PageHome = function (_React$Component) {
 
                         this.setState({
                             nextActivityList: nextActivityList,
-                            nextRadomList: nextRadomListMain
+                            nextRadomList: nextRadomListMain,
+                            isEnd: this.getSelectedIsEnd(nextActivityList, nextRadomListMain)
                             //nextSelectType:type
                         });
                     } else {
@@ -7337,7 +7363,8 @@ var PageHome = function (_React$Component) {
                         }
                         this.setState({
                             nextActivityList: nextActivity,
-                            nextRadomList: nextRadomListMain
+                            nextRadomList: nextRadomListMain,
+                            isEnd: this.getSelectedIsEnd(nextActivity, nextRadomListMain)
                             //nextSelectType:type
                         });
                     }
@@ -7345,7 +7372,8 @@ var PageHome = function (_React$Component) {
                     if (type == 'next') {
                         //选的是后继节点
                         this.setState({
-                            nextActivityList: nextActivityList
+                            nextActivityList: nextActivityList,
+                            isEnd: this.getSelectedIsEnd(nextActivityList, this.state.nextRadomList)
                             //nextSelectType:type
                         });
                     } else {
@@ -7353,7 +7381,8 @@ var PageHome = function (_React$Component) {
                         var nextRadomListMain = this.state.nextRadomList;
                         nextRadomListMain[n].subRandomList = nextActivityList;
                         this.setState({
-                            nextRadomList: nextRadomListMain
+                            nextRadomList: nextRadomListMain,
+                            isEnd: this.getSelectedIsEnd(this.state.nextActivityList, nextRadomListMain)
                             //nextSelectType:type
                         });
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "2.2.93",
+  "version": "2.2.94",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",