fmui-base 2.1.88 → 2.1.90

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.1.90：退回发起人结束流程调用非正常结束回调
+- 2.1.89：子表选人组件报错
 - 2.1.88：流程增加结束(退回)状态
 - 2.1.87：流程办理支持选择办理缓急
 - 2.1.86：公众号隐藏附件下载按钮

package/lib/form/form.js

@@ -2573,7 +2573,7 @@ var PageHome = function (_React$Component) {
       }
       var formItem = data.formItem;
       var mainTblData = data.mainTblData;
-      if (userId) {
+      if (userId && formItem) {
         // t.refs[mainTblName+"_"+itemExt.key].reloadItemParam(itemExt.value);
         _db2.default.FlowModuleAPI.getUserInfo({ userId: userId }).then(function (content) {
           if (content && content.length > 0) {

package/lib/process_info/processInfo.js

@@ -168,6 +168,8 @@ var PageHome = function (_React$Component) {
     _inherits(PageHome, _React$Component);
 
     function PageHome(props) {
+        var _param;
+
         _classCallCheck(this, PageHome);
 
         /* $(".loading-containter").hide();*/
@@ -319,7 +321,7 @@ var PageHome = function (_React$Component) {
         //自动保存
         var autoSaveApprove = getSystemInfo().autoSaveApprove;
 
-        var param = _defineProperty({
+        var param = (_param = {
             bottom: bottom,
             editType: editType,
             isDraft: isDraft,
@@ -458,7 +460,7 @@ var PageHome = function (_React$Component) {
             selectProcessCode: '', //选中的子流程
             subProcessType: '', //子流程类型 0串行  1并行
             urgencyList: [], //紧急程度列表
-            urgency: '' }, 'urgent', '');
+            urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _param);
         FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
 
         //处理特有参数
@@ -806,6 +808,7 @@ var PageHome = function (_React$Component) {
                     var urgencyList = [];
                     var urgency = '50';
                     var urgentSelectList = {};
+                    var backInitiatorEndFlow = '0';
                     if (content.readScopeId && typeof content.readScopeId != "undefined") {
                         readScopeId = content.readScopeId;
                     }
@@ -837,6 +840,9 @@ var PageHome = function (_React$Component) {
                     if (content.urgency && typeof content.urgency != "undefined") {
                         urgency = content.urgency;
                     }
+                    if (content.backInitiatorEndFlow && typeof content.backInitiatorEndFlow != "undefined") {
+                        backInitiatorEndFlow = content.backInitiatorEndFlow;
+                    }
                     if (content.urgencyList && typeof content.urgencyList != "undefined") {
                         urgencyList = content.urgencyList;
                         if (urgencyList.length > 0) {
@@ -1413,7 +1419,8 @@ var PageHome = function (_React$Component) {
                         dataInherit: dataInherit,
                         subProcessType: subProcessType,
                         urgencyList: urgencyList,
-                        urgentSelectList: urgentSelectList
+                        urgentSelectList: urgentSelectList,
+                        backInitiatorEndFlow: backInitiatorEndFlow
                     }, function () {
                         t.refs["selectMember_circulate"].initSelectData();
                         t.refs["selectMember_circulate1"].initSelectData();
@@ -4172,7 +4179,11 @@ var PageHome = function (_React$Component) {
                 var dataId = t.state.dataId;
                 //操作回调
                 if (content.isStart == '1' && typeof FlowCommon.operateCallBack === "function") {
-                    FlowCommon.operateCallBack({ type: 0, dataId: dataId, isBatch: 0 }, t.state);
+                    if (t.state.backInitiatorEndFlow == '1') {
+                        FlowCommon.operateCallBack({ type: 2, dataId: dataId, isBatch: 0 }, t.state);
+                    } else {
+                        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);
                 }
@@ -4186,7 +4197,11 @@ var PageHome = function (_React$Component) {
                     // alert("exception: "+e.message);
                 }
                 if (content.isStart == '1' && typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
-                    mobileExt["operateCallBack"]({ type: 0, dataId: dataId, isBatch: 0 }, t.state);
+                    if (t.state.backInitiatorEndFlow == '1') {
+                        mobileExt["operateCallBack"]({ type: 2, dataId: dataId, isBatch: 0 }, t.state);
+                    } else {
+                        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);
                 }

package/package.json

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