fmui-base 2.0.87 → 2.0.89

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志  
+- 2.0.89：表单组件子表处理
+- 2.0.88：表单组件支持关联表子表功能
 - 2.0.87：表单组件未用到的批示意见显示隐藏根据传的参数控制
 - 2.0.86：流程列表标题样式
 - 2.0.85：表单未用到的批示意见默认隐藏  

package/lib/form/subForm.js

@@ -140,6 +140,7 @@ var PageHome = function (_React$Component) {
       var status = this.props.status; //判断是否能选择,0新增，1修改,2查看
       var data = this.props.data; //数据
       var subTbl = data.subTbl; //子表
+      var relatedTbl = data.relatedTbl; //关联表
       //var dataType = this.props.dataType;//数据类型，main:主表，sub：子表，
       var itemParam = {}; //元素参数
       var id = form.id;
@@ -174,8 +175,9 @@ var PageHome = function (_React$Component) {
       }
       itemParam.subtableReadonly = subtableReadonly;
       var subForm = form.children;
-      var value = this.dealwithSubForm(subForm, itemParam, subTbl);
+      var value = this.dealwithSubForm(subForm, itemParam, subTbl, relatedTbl);
       data.subTbl = subTbl;
+      data.relatedTbl = relatedTbl;
       itemParam.show = true;
       itemParam.value = value;
       itemParam.detailAction = form.detailAction; //添加事件名字
@@ -213,10 +215,37 @@ var PageHome = function (_React$Component) {
 
   }, {
     key: 'dealwithSubForm',
-    value: function dealwithSubForm(subForm, itemParam, subTbl) {
+    value: function dealwithSubForm(subForm, itemParam, subTbl, relatedTbl) {
+      console.log("===dealwithSubForm===");
       var subFormList = [];
       var itemCode = itemParam.key;
       var value = [];
+      if (relatedTbl && relatedTbl.length > 0) {
+        for (var i = 0; i < relatedTbl.length; i++) {
+          var relateditem = relatedTbl[i];
+          var relatedSubTblData = relateditem.relatedSubTblData;
+          if (relatedSubTblData && relatedSubTblData.length > 0) {
+            for (var j = 0; j < relatedSubTblData.length; j++) {
+              var item = relatedSubTblData[j];
+              if (item.subTblName == itemCode) {
+                var subTblData = item.subTblData;
+                if (subTblData.length > 0) {
+                  for (var j = 0; j < subTblData.length; j++) {
+                    value.push({ mainTblData: subTblData[j], mainTblName: itemCode });
+                    var subForm1 = { show: true, form: subForm };
+                    subFormList.push(subForm1);
+                  }
+                } else {
+                  var subForm2 = { show: true, form: subForm };
+                  value.push({ mainTblData: [], mainTblName: itemCode });
+                  subFormList.push(subForm2);
+                }
+                break;
+              }
+            }
+          }
+        }
+      }
       if (subTbl.length > 0) {
         for (var i = 0; i < subTbl.length; i++) {
           var item = subTbl[i];
@@ -239,6 +268,18 @@ var PageHome = function (_React$Component) {
       }
       if (subFormList.length > 0) {
         itemParam.subForm = subFormList;
+      } else if (relatedTbl && relatedTbl.length > 0) {
+        var subForm3 = { show: true, form: subForm };
+        subFormList.push(subForm3);
+        itemParam.subForm = subFormList;
+        value.push({ mainTblData: [], mainTblName: itemCode });
+        for (var i = 0; i < relatedTbl.length; i++) {
+          var relateditem = relatedTbl[i];
+          if (relateditem.relatedMainTblName == itemParam.parentTblName) {
+            relatedTbl[i].relatedSubTblData.push({ subTblData: [], subTblName: itemCode });
+            break;
+          }
+        }
       } else {
         var subForm3 = { show: true, form: subForm };
         subFormList.push(subForm3);
@@ -271,6 +312,7 @@ var PageHome = function (_React$Component) {
       var itemParam = this.state.itemParam;
       var data = this.props.data;
       var subTblList = data.subTbl; //子表
+      var relatedTbl = data.relatedTbl; //关联表
       /* var calculateExpList = data.calculateExpList;//计算公式列表 
        var calculateExpList1 = value.calculateExpList;//计算公式列表
        if(calculateExpList1){
@@ -295,7 +337,7 @@ var PageHome = function (_React$Component) {
        	data.calculateExpList = calculateExpList;
        }*/
 
-      this.dealwithSubData(subTblList, subTblNo, value);
+      this.dealwithSubData(subTblList, subTblNo, value, relatedTbl);
       data.subCalculateExpList = value.calculateExpList;
       data.subTblNo = subTblNo;
       this.props.onChange(data, itemParam1, subTblNo);
@@ -305,7 +347,7 @@ var PageHome = function (_React$Component) {
 
   }, {
     key: 'dealwithSubData',
-    value: function dealwithSubData(subTblList, subTblNo, value) {
+    value: function dealwithSubData(subTblList, subTblNo, value, relatedTbl) {
       if (subTblList.length > 0) {
         //子表数据为空
         for (var j = 0; j < subTblList.length; j++) {
@@ -315,6 +357,17 @@ var PageHome = function (_React$Component) {
           }
         }
       }
+      if (relatedTbl && relatedTbl.length > 0) {
+        for (var i = 0; i < relatedTbl.length; i++) {
+          var relatedSubTblData = relatedTbl[i].relatedSubTblData;
+          for (var j = 0; j < relatedSubTblData.length; j++) {
+            if (value.mainTblName == relatedSubTblData[j].subTblName) {
+              relatedSubTblData[j].subTblData[subTblNo] = value.mainTblData;
+              break;
+            }
+          }
+        }
+      }
     }
 
     //重新加载组件
@@ -567,6 +620,7 @@ var PageHome = function (_React$Component) {
 
         var data = this.props.data;
         var subTblList = data.subTbl;
+        var relatedTbl = data.relatedTbl;
         for (var j = 0; j < subTblList.length; j++) {
           if (subTblList[j].subTblName == itemParam.key) {
             var subTblData = subTblList[j].subTblData;

package/lib/process_info/processInfo.js

@@ -3143,6 +3143,7 @@ var PageHome = function (_React$Component) {
                 var relatedTblItem = relatedTbl[i];
                 if (relatedTblItem) {
                     var relatedMainTblData = relatedTblItem.relatedMainTblData;
+                    var relatedSubTblData = relatedTblItem.relatedSubTblData;
                     if (relatedMainTblData) {
                         for (var j = 0; j < relatedMainTblData.length; j++) {
                             if (relatedMainTblData[j].key == "id") {
@@ -3150,6 +3151,23 @@ var PageHome = function (_React$Component) {
                             }
                         }
                     }
+                    if (relatedSubTblData) {
+                        for (var j = 0; j < relatedSubTblData.length; j++) {
+                            var subTblData = relatedSubTblData[j].subTblData;
+                            if (subTblData && subTblData.length > 0) {
+                                for (var k = 0; k < subTblData.length; k++) {
+                                    var subTblDataItem = subTblData[k];
+                                    if (subTblDataItem && subTblDataItem.length > 0) {
+                                        for (var f = 0; f < subTblDataItem.length; f++) {
+                                            if (subTblDataItem[f].key == "id") {
+                                                allEditIdsArray.push(subTblDataItem[f].value);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
                 }
             }
 
@@ -3172,6 +3190,25 @@ var PageHome = function (_React$Component) {
                     }
                 }
             }
+
+            for (var i = 0; i < subTbl.length; i++) {
+                var subTableItem = subTbl[i];
+                var subTblData = subTableItem.subTblData;
+                if (subTblData && subTblData.length > 0) {
+                    for (var j = 0; j < subTblData.length; j++) {
+                        var subTblDataItem = subTblData[j];
+                        var id = "";
+                        for (var m = 0; m < subTblDataItem.length; m++) {
+                            if (subTblDataItem[m].key == 'id') {
+                                if (subTblDataItem[m].value) {
+                                    allEditIdsArray.push(subTblDataItem[m].value);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
             // if(subTbl.length>0){
             //     allEditIdsArray.push(mainTableId);
             // }

package/package.json

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