fmui-base 2.2.56 → 2.2.57

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.57: 子表字段支持字段关联
 - 2.2.56: 手写签名按钮自定义，画笔上下抖动问题修复
 - 2.2.55: 流程列表分类搜索
 - 2.2.54: 手写签名样式调整

package/lib/form/form.js

@@ -2704,7 +2704,7 @@ var PageHome = function (_React$Component) {
       } else {
         newValue = "";
       }
-      var formItem = data.formItem;
+      var formItem = this.props.allForm.item;
       var mainTblData = data.mainTblData;
       if (userId && formItem) {
         // t.refs[mainTblName+"_"+itemExt.key].reloadItemParam(itemExt.value);
@@ -2723,7 +2723,7 @@ var PageHome = function (_React$Component) {
                     } else if (relatepopuservalue == 'relateusercode') {
                       mainTblDataItem.value = userInfo.userCode;
                     } else if (relatepopuservalue == 'relateusertelphone') {
-                      mainTblDataItem.value = userInfo.telephone;
+                      mainTblDataItem.value = userInfo.userTelephone;
                     } else if (relatepopuservalue == 'relateuserdutyname') {
                       mainTblDataItem.value = userInfo.dutyName;
                     } else if (relatepopuservalue == 'relateusercardid') {
@@ -2732,6 +2732,45 @@ var PageHome = function (_React$Component) {
                     t.props.reloadItemParam(data.mainTblName + "_" + mainTblDataItem.key, mainTblDataItem.value);
                   }
                 }
+              } else if (item.children && item.children.length > 0) {
+                for (var k = 0; k < item.children.length; k++) {
+                  var childItem = item.children[k];
+                  if (childItem.dataAttr && childItem.dataAttr.relatepopuserField && childItem.dataAttr.relatepopuserField == code) {
+                    var relatepopuservalue = childItem.dataAttr.relatepopuserValue;
+                    for (var j = 0; j < mainTblData.length; j++) {
+                      var mainTblDataItem = mainTblData[j];
+                      if (mainTblDataItem.key == childItem.itemCode) {
+                        if (relatepopuservalue == 'relateuserorg') {
+                          mainTblDataItem.value = userInfo.orgName;
+                        } else if (relatepopuservalue == 'relateusercode') {
+                          mainTblDataItem.value = userInfo.userCode;
+                        } else if (relatepopuservalue == 'relateusertelphone') {
+                          mainTblDataItem.value = userInfo.userTelephone;
+                        } else if (relatepopuservalue == 'relateuserdutyname') {
+                          mainTblDataItem.value = userInfo.dutyName;
+                        } else if (relatepopuservalue == 'relateusercardid') {
+                          mainTblDataItem.value = userInfo.cardId;
+                        }
+                        // 如果当前Form是在子表中（dataType === 'sub'），需要通过SubForm来刷新
+                        // SubForm的reloadSubItemParam方法可以刷新子表所有行的字段
+                        if (t.props.dataType === 'sub' && t.props.subTblName === data.mainTblName) {
+                          // 尝试通过props获取reloadSubItemParam方法（如果SubForm传递了的话）
+                          if (t.props.reloadSubItemParam && typeof t.props.reloadSubItemParam === 'function') {
+                            var reloadParams = [];
+                            reloadParams.push({
+                              key: mainTblDataItem.uniqueName,
+                              value: mainTblDataItem.value,
+                              index: t.props.keyNo
+                            });
+                            if (reloadParams.length > 0) {
+                              t.props.reloadSubItemParam(reloadParams);
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
               }
             }
           } else {}

package/lib/form/subForm.js

@@ -743,7 +743,7 @@ var PageHome = function (_React$Component) {
             'div',
             { className: item.show ? "" : "t-DN" },
             item.form.map(function (item2, j) {
-              return _react2.default.createElement(_form2.default, { className: "subform_" + item2.uniqueName, keyNo: i, ref: item2.uniqueName + '_' + i, dataType: 'sub', subTblName: t.state.itemParam.key, module: t.state.module, formKey: item2.formKey, status: t.state.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyle, data: t.state.itemParam.value[i], fieldControll: t.state.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.props.formRelaFieldMaps, linkFields: t.props.linkFields, onChange: _this2.changeSub.bind(_this2, _this2.state.itemParam, i) });
+              return _react2.default.createElement(_form2.default, { className: "subform_" + item2.uniqueName, keyNo: i, ref: item2.uniqueName + '_' + i, dataType: 'sub', subTblName: t.state.itemParam.key, module: t.state.module, formKey: item2.formKey, status: t.state.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyle, data: t.state.itemParam.value[i], fieldControll: t.state.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.props.formRelaFieldMaps, linkFields: t.props.linkFields, onChange: _this2.changeSub.bind(_this2, _this2.state.itemParam, i), reloadSubItemParam: _this2.reloadSubItemParam.bind(_this2) });
             })
           )
         );

package/package.json

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