fmui-base 2.1.80 → 2.1.81

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
@@ -3,6 +3,7 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
+ - 2.1.81:关联字段隐藏冲突处理
6
7
  - 2.1.80:审批按钮扩展方法,公众号隐藏附件下载按钮,子表支持扩展按钮
7
8
  - 2.1.79:审批支持传阅范围设置
8
9
  - 2.1.78:自动编号重复赋值问题处理
package/lib/form/form.js CHANGED
@@ -1669,9 +1669,12 @@ var PageHome = function (_React$Component) {
1669
1669
  // relaFieldMap["key"]="isHidden";
1670
1670
  if (item.triggerFieldVal == mainTblDataItem.value) {
1671
1671
  itemParam.isHidden = true;
1672
+ defaulthideFields.push(itemParam.uniqueName);
1673
+ console.log("true====" + itemParam.uniqueName);
1672
1674
  } else if (defaulthideFields.indexOf(itemParam.uniqueName) != -1) {
1673
1675
  itemParam.isHidden = true;
1674
1676
  } else {
1677
+ console.log("false====" + itemParam.uniqueName);
1675
1678
  itemParam.isHidden = false;
1676
1679
  }
1677
1680
  } else if (editType == 'must') {
package/lib/form/table.js CHANGED
@@ -884,7 +884,7 @@ var PageHome = function (_React$Component) {
884
884
  }
885
885
  }
886
886
 
887
- console.log("dealwithRelaField===");
887
+ console.log("dealwithRelaField===table===");
888
888
  if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
889
889
  //解决同一字段 关联字段 编辑方式相同时冲突
890
890
  var hideFlag = false;
@@ -943,6 +943,8 @@ var PageHome = function (_React$Component) {
943
943
  relaFieldMap["value"] = true;
944
944
  } else if (!hideFlag && hideFields.indexOf(relaFieldTblNameArrayItem) == -1) {
945
945
  relaFieldMap["value"] = false;
946
+ } else if (hideFields.indexOf(relaFieldTblNameArrayItem) != -1) {
947
+ relaFieldMap["value"] = true;
946
948
  } else {
947
949
  relaFieldMap["value"] = false;
948
950
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.1.80",
3
+ "version": "2.1.81",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",