fmui-base 2.1.48 → 2.1.50

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.1.50：流程普通退回增加回调
+- 2.1.49：流程提交到最后结束节点可以直接结束，跳过确认环节
 - 2.1.48：表单子表数据丢失处理，子表与关联表子表冲突
 - 2.1.47：流程支持发起子流程
 - 2.1.46：流程支持发起子流程

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;
@@ -4066,6 +4077,8 @@ var PageHome = function (_React$Component) {
                 //操作回调
                 if (content.isStart == '1' && typeof FlowCommon.operateCallBack === "function") {
                     FlowCommon.operateCallBack({ type: 0, dataId: dataId, isBatch: 0 }, t.state);
+                } else if (typeof FlowCommon.operateCallBack === "function") {
+                    FlowCommon.operateCallBack({ type: 8, dataId: dataId, isBatch: 0 }, t.state);
                 }
                 //项目开发扩展
                 var mobileExt;
@@ -4076,8 +4089,10 @@ var PageHome = function (_React$Component) {
                 } catch (e) {
                     // alert("exception: "+e.message);
                 }
-                if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
+                if (content.isStart == '1' && typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
                     mobileExt["operateCallBack"]({ type: 0, dataId: dataId, isBatch: 0 }, t.state);
+                } else if (typeof FlowCommon.operateCallBack === "function") {
+                    FlowCommon.operateCallBack({ type: 8, dataId: dataId, isBatch: 0 }, t.state);
                 }
 
                 if (isPush == '1') {

package/package.json

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