fmui-base 2.3.46 → 2.3.47

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.47：表单子表编辑保存时会丢失第一条数据
 - 2.3.46：表单子表支持默认展开或者收起
 - 2.3.45：数据已被他人修改时，刷新表单内容保留批示意见
 - 2.3.44：数据已被他人修改时，刷新表单内容

package/lib/form/subForm.js

@@ -223,6 +223,18 @@ var PageHome = function (_React$Component) {
       this.loadComponet();
     }
 
+    // 子表默认空行的 mainTblData：办理/编辑态需带空白 id（与 detailAdd 一致），否则 edit 保存时后端不 INSERT
+
+  }, {
+    key: 'getEmptySubRowMainTblData',
+    value: function getEmptySubRowMainTblData() {
+      var status = this.props.status;
+      if (status == '0' || status == 0) {
+        return [];
+      }
+      return [{ key: 'id', value: '', required: false }];
+    }
+
     //处理子表数据
 
   }, {
@@ -234,6 +246,7 @@ var PageHome = function (_React$Component) {
       var fieldControll = itemParam.fieldControll;
       var subtableReadonly = itemParam.subtableReadonly === true;
       var defaultShow = this.getDefaultShow();
+      var emptyRowMainTblData = this.getEmptySubRowMainTblData();
       var mustFields = "";
       if (fieldControll) {
         mustFields = fieldControll.mustFields;
@@ -263,7 +276,7 @@ var PageHome = function (_React$Component) {
                   }
                 } else if (!subtableReadonly) {
                   var subForm2 = { show: defaultShow, form: subForm };
-                  value.push({ mainTblData: [], mainTblName: itemCode });
+                  value.push({ mainTblData: emptyRowMainTblData.slice(), mainTblName: itemCode });
                   subFormList.push(subForm2);
                 }
                 break;
@@ -285,7 +298,7 @@ var PageHome = function (_React$Component) {
               }
             } else if (!subtableReadonly) {
               var subForm2 = { show: defaultShow, form: subForm };
-              value.push({ mainTblData: [], mainTblName: itemCode });
+              value.push({ mainTblData: emptyRowMainTblData.slice(), mainTblName: itemCode });
               subFormList.push(subForm2);
             }
             break;
@@ -304,7 +317,7 @@ var PageHome = function (_React$Component) {
         var subForm3 = { show: defaultShow, form: subForm };
         subFormList.push(subForm3);
         itemParam.subForm = subFormList;
-        value.push({ mainTblData: [], mainTblName: itemCode });
+        value.push({ mainTblData: emptyRowMainTblData.slice(), mainTblName: itemCode });
         var relatedFlag = false;
         for (var i = 0; i < relatedTbl.length; i++) {
           var relateditem = relatedTbl[i];
@@ -315,14 +328,14 @@ var PageHome = function (_React$Component) {
           }
         }
         if (!relatedFlag) {
-          value.push({ mainTblData: [], mainTblName: itemCode });
+          value.push({ mainTblData: emptyRowMainTblData.slice(), mainTblName: itemCode });
           subTbl.push({ subTblData: [], subTblName: itemCode });
         }
       } else {
         var subForm3 = { show: defaultShow, form: subForm };
         subFormList.push(subForm3);
         itemParam.subForm = subFormList;
-        value.push({ mainTblData: [], mainTblName: itemCode });
+        value.push({ mainTblData: emptyRowMainTblData.slice(), mainTblName: itemCode });
         subTbl.push({ subTblData: [], subTblName: itemCode });
       }
       return value;

package/package.json

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