fmui-base 2.1.55 → 2.1.56

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -2,7 +2,8 @@
2
2
 
3
3
  ---npm publish
4
4
 
5
- ## 更新日志
5
+ ## 更新日志
6
+ - 2.1.56:子表字段关联多个字段关联一个字段冲突问题处理
6
7
  - 2.1.55:主子表支持时间differHalfDay函数
7
8
  - 2.1.54:子表必填项校验定位位置不对
8
9
  - 2.1.53:上传组件根据文件大小显示单位不同
package/lib/form/table.js CHANGED
@@ -862,6 +862,7 @@ var PageHome = function (_React$Component) {
862
862
  var itemKey = thisItem.key;
863
863
  var tableName = thisItem.tableName;
864
864
  var thisSubTblNo = thisItem.subTblNo;
865
+ var mustFields = [];
865
866
  console.log("dealwithRelaField===");
866
867
  if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
867
868
  //解决同一字段 关联字段 编辑方式相同时冲突
@@ -927,7 +928,8 @@ var PageHome = function (_React$Component) {
927
928
  triggerFieldValBoolean = true;
928
929
  mustFlag = true;
929
930
  editFlag = true;
930
- } else if (!mustFlag) {
931
+ mustFields.push(relaFieldTblNameArrayItem);
932
+ } else if (!mustFlag && mustFields.indexOf(relaFieldTblNameArrayItem) == -1) {
931
933
  relaFieldMap["value"] = false;
932
934
  triggerFieldValBoolean = false;
933
935
  } else {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.1.55",
3
+ "version": "2.1.56",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",