fmui-base 2.1.46 → 2.1.48

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.1.48：表单子表数据丢失处理，子表与关联表子表冲突
+- 2.1.47：流程支持发起子流程
 - 2.1.46：流程支持发起子流程
 - 2.1.44：流程转交批示意见必填校验 
 - 2.1.43：选人支持自定义扩展

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

@@ -188,9 +188,6 @@ var PageHome = function (_React$Component) {
             // if(fxUserId!=loginUserId){
             //     Toast.show({
             //         type: 'error',
-            //         content:"您无权查看此流程！"
-            //     });
-            //     return false;
             // }
         }
 
@@ -201,6 +198,9 @@ var PageHome = function (_React$Component) {
         var dataId = props.dataId;
         var editType = '';
         isSub = props.isSub ? props.isSub : '';
+        // if(isSub!=''){
+        //     window.location.reload();
+        // }
         if (dataId && dataId != '-1') {
             //非新增
             setPageTitle("流程详情");
@@ -648,6 +648,7 @@ var PageHome = function (_React$Component) {
             if (ActionSheetButton) {
                 ActionSheetButton.close();
             }
+            console.log("componentWillUnmount");
         }
     }, {
         key: 'imageView',
@@ -728,6 +729,9 @@ var PageHome = function (_React$Component) {
                 } else {
                     t.loadPage(param);
                 }
+                if (isSub != '') {
+                    t.insertBatchRelation(t.state.processInstanceId, isSub, t.state.activityId, '');
+                }
             } else {
                 t.loadPage(param);
             }
@@ -1645,6 +1649,7 @@ var PageHome = function (_React$Component) {
         key: 'change',
         value: function change(data, itemParam) {
             console.log("数据回调" + itemParam.key);
+            debugger;
             //子流程去除id字段
             if (isSub != '' && data) {
                 var mainTblData = data.mainTblData;
@@ -1655,6 +1660,24 @@ var PageHome = function (_React$Component) {
                         }
                     }
                 }
+                var subTbl = data.subTbl;
+                if (subTbl && subTbl.length > 0) {
+                    for (var i = 0; i < subTbl.length; i++) {
+                        var subTblData = subTbl[i].subTblData;
+                        if (subTblData && subTblData.length > 0) {
+                            for (var j = 0; j < subTblData.length; j++) {
+                                var subTblDataItem = subTblData[j];
+                                if (subTblDataItem && subTblDataItem.length > 0) {
+                                    for (var k = 0; k < subTblDataItem.length; k++) {
+                                        if (subTblDataItem[k].key == 'id') {
+                                            subTblDataItem[k].value = "";
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
             }
             this.setState({
                 editFormData: data
@@ -3924,14 +3947,17 @@ var PageHome = function (_React$Component) {
                                         if (dataInherit && dataInherit == '1') {
                                             jumppath = '#/process/processDetails/' + openTaskId + '/' + list[j].formKey + '/' + parentDataId + '/0/0/' + list[j].processInstanceId + '/approve/' + userId + '/undefined/' + parentProcessInstanceId;
                                         }
-                                        if (isPush == '1') {
-                                            closePage();
-                                        } else {
-                                            backPage();
-                                        }
-                                        setTimeout(function () {
-                                            location.hash = jumppath;
-                                        }, 100);
+                                        // if (isPush == '1') {
+                                        //     closePage();
+                                        // } else {
+                                        //     backPage();
+                                        // }
+                                        // setTimeout(function(){
+                                        //     location.hash = jumppath;
+                                        // },100);
+                                        // location.hash = jumppath;
+                                        location.hash = jumppath;
+                                        // location.href =window.location.href.split("#")+ jumppath;
                                     }
                                 }
                             }
@@ -3973,14 +3999,16 @@ var PageHome = function (_React$Component) {
                                                 if (dataInherit && dataInherit == '1') {
                                                     jumppath = '#/process/processDetails/' + openTaskId + '/' + list[j].formKey + '/' + parentDataId + '/0/0/' + list[j].processInstanceId + '/approve/' + userId + '/undefined/' + parentProcessInstanceId;
                                                 }
-                                                if (isPush == '1') {
-                                                    closePage();
-                                                } else {
-                                                    backPage();
-                                                }
-                                                setTimeout(function () {
-                                                    location.hash = jumppath;
-                                                }, 100);
+                                                // if (isPush == '1') {
+                                                //     closePage();
+                                                // } else {
+                                                //     backPage();
+                                                // }
+                                                // setTimeout(function(){
+                                                //     location.hash = jumppath;
+                                                // },100);
+                                                // location.hash = jumppath;
+                                                location.href = window.location.href.split("#") + jumppath;
                                             }
                                         }
                                     }
@@ -4348,6 +4376,7 @@ var PageHome = function (_React$Component) {
                             dataId: dataId
                         });
                     } else {
+
                         if (isPush == '1') {
                             closePage();
                         } else {
@@ -4462,7 +4491,9 @@ var PageHome = function (_React$Component) {
                                 if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
                                     mobileExt["operateCallBack"]({ type: 5, dataId: dataId, isBatch: 0 }, t.state);
                                 }
-
+                                if (isSub != '') {
+                                    backPage(2);
+                                }
                                 if (isPush == '1') {
                                     closePage();
                                     //alert("_thirdMenuType:"+_thirdMenuType);
@@ -4703,9 +4734,7 @@ var PageHome = function (_React$Component) {
                     dataId = content.dataId;
                     t.setState({ dataId: dataId });
                 }
-                if (isSub != '') {
-                    t.insertBatchRelation(t.state.processInstanceId, isSub, t.state.activityId, '');
-                }
+
                 if (typeof FlowCommon.operateCallBack === "function") {
                     // var type = 6;
                     // if(t.state.isStart &&  t.state.dataId==''){//是不是起始节点
@@ -4772,6 +4801,9 @@ var PageHome = function (_React$Component) {
                         t.handleSubmit(1);
                     });
                 } else {
+                    if (isSub != '') {
+                        backPage(2);
+                    }
                     if (isPush == '1') {
                         closePage();
                     } else {

package/package.json

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