fmui-base 2.1.47 → 2.1.49

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.1.49：流程提交到最后结束节点可以直接结束，跳过确认环节
+- 2.1.48：表单子表数据丢失处理，子表与关联表子表冲突
 - 2.1.47：流程支持发起子流程
 - 2.1.46：流程支持发起子流程
 - 2.1.44：流程转交批示意见必填校验 

package/lib/form/subForm.js

@@ -291,13 +291,19 @@ var PageHome = function (_React$Component) {
         subFormList.push(subForm3);
         itemParam.subForm = subFormList;
         value.push({ mainTblData: [], mainTblName: itemCode });
+        var relatedFlag = false;
         for (var i = 0; i < relatedTbl.length; i++) {
           var relateditem = relatedTbl[i];
           if (relateditem.relatedMainTblName == itemParam.parentTblName) {
             relatedTbl[i].relatedSubTblData.push({ subTblData: [], subTblName: itemCode });
+            relatedFlag = true;
             break;
           }
         }
+        if (!relatedFlag) {
+          value.push({ mainTblData: [], mainTblName: itemCode });
+          subTbl.push({ subTblData: [], subTblName: itemCode });
+        }
       } else {
         var subForm3 = { show: true, form: subForm };
         subFormList.push(subForm3);

package/lib/process_info/processInfo.js

@@ -2322,17 +2322,28 @@ var PageHome = function (_React$Component) {
                         if (nextList.length == 1 && nextList[0]['end']) {
                             //下一个后继活动是结束
                             isEnd = true;
-                            if (hasCommentField == "0" && hasCirculate == false && radomList.length == 0) {
-                                t.setState({
-                                    urgentHidden: true,
-                                    urgentList: [],
-                                    isEnd: isEnd
-                                }, function () {
-                                    param.selectedActivity = '[{"id":"end_node","name":"结束","level":""}]';
-                                    t.sendFlow(param);
-                                });
-                                return false;
-                            }
+
+                            t.setState({
+                                urgentHidden: true,
+                                urgentList: [],
+                                isEnd: isEnd
+                            }, function () {
+                                param.selectedActivity = '[{"id":"end_node","name":"结束","level":""}]';
+                                t.sendFlow(param);
+                            });
+                            return false;
+
+                            // if(hasCommentField=="0" && hasCirculate==false && radomList.length==0){
+                            //     t.setState({
+                            //         urgentHidden:true,
+                            //         urgentList:[],
+                            //         isEnd:isEnd
+                            //     },function(){
+                            //         param.selectedActivity='[{"id":"end_node","name":"结束","level":""}]';
+                            //         t.sendFlow(param);
+                            //     });
+                            //     return false;
+                            // }
                         }
                         //let tasktype = t.state.tasktype;
                         var urgentHidden = false;

package/package.json

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