fmui-base 2.1.62 → 2.1.63

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.1.63：表单关联隐藏与流程节点设置隐藏冲突处理
 - 2.1.62：表单单选多选支持200字换行显示
 - 2.1.61：表单单选多选支持200字换行显示
 - 2.1.60：加载中增加遮罩层

package/lib/form/form.js

@@ -1619,7 +1619,28 @@ var PageHome = function (_React$Component) {
   }, {
     key: 'dealwithRelaField',
     value: function dealwithRelaField(itemParam, allForm) {
+      console.log("dealwithRelaField===");
       var formRelaFieldMaps = this.props.formRelaFieldMaps;
+      var defaultmustFields = [];
+      var defaulthideFields = [];
+      var fieldControll = this.props.fieldControll;
+      var hiddenFields = fieldControll.hiddenFields;
+      var mustFieldsStr = fieldControll.mustFields;
+      if (hiddenFields && hiddenFields != '') {
+        for (var i = 0; i < hiddenFields.split(',').length; i++) {
+          if (hiddenFields.split(',')[i] && hiddenFields.split(',')[i] != '') {
+            defaulthideFields.push(hiddenFields.split(',')[i]);
+          }
+        }
+      }
+      if (mustFieldsStr && mustFieldsStr != '') {
+        for (var i = 0; i < mustFieldsStr.split(',').length; i++) {
+          if (mustFieldsStr.split(',')[i] && mustFieldsStr.split(',')[i] != '') {
+            defaultmustFields.push(mustFieldsStr.split(',')[i]);
+          }
+        }
+      }
+
       if (formRelaFieldMaps) {
         if (formRelaFieldMaps[itemParam.uniqueName]) {
           var data = this.props.data;
@@ -1638,6 +1659,8 @@ var PageHome = function (_React$Component) {
                     // relaFieldMap["key"]="isHidden";
                     if (item.triggerFieldVal == mainTblDataItem.value) {
                       itemParam.isHidden = true;
+                    } else if (defaulthideFields.indexOf(itemParam.uniqueName) != -1) {
+                      itemParam.isHidden = true;
                     } else {
                       itemParam.isHidden = false;
                     }

package/lib/form/table.js

@@ -864,6 +864,28 @@ var PageHome = function (_React$Component) {
 			var thisSubTblNo = thisItem.subTblNo;
 			var mustFields = [];
 			var hideFields = [];
+
+			var defaultmustFields = [];
+			var defaulthideFields = [];
+
+			var fieldControll = this.props.fieldControll;
+			var hiddenFields = fieldControll.hiddenFields;
+			var mustFieldsStr = fieldControll.mustFields;
+			if (hiddenFields && hiddenFields != '') {
+				for (var i = 0; i < hiddenFields.split(',').length; i++) {
+					if (hiddenFields.split(',')[i] && hiddenFields.split(',')[i] != '') {
+						defaulthideFields.push(hiddenFields.split(',')[i]);
+					}
+				}
+			}
+			if (mustFieldsStr && mustFieldsStr != '') {
+				for (var i = 0; i < mustFieldsStr.split(',').length; i++) {
+					if (mustFieldsStr.split(',')[i] && mustFieldsStr.split(',')[i] != '') {
+						defaultmustFields.push(mustFieldsStr.split(',')[i]);
+					}
+				}
+			}
+
 			console.log("dealwithRelaField===");
 			if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
 				//解决同一字段 关联字段 编辑方式相同时冲突
@@ -919,6 +941,8 @@ var PageHome = function (_React$Component) {
 									relaFieldMap["value"] = true;
 									hideFlag = true;
 									hideFields.push(relaFieldTblNameArrayItem);
+								} else if (!hideFlag && defaulthideFields.indexOf(relaFieldTblNameArrayItem) != -1) {
+									relaFieldMap["value"] = true;
 								} else if (!hideFlag && hideFields.indexOf(relaFieldTblNameArrayItem) == -1) {
 									relaFieldMap["value"] = false;
 								} else {

package/package.json

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