fmui-base 2.2.10 → 2.2.11

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.11：关联字段编辑方式为编辑时互相冲突问题解决
 - 2.2.10：表单组件样式
 - 2.2.9：统一待办列表样式
 - 2.2.8：深圳CA加签

package/lib/form/table.js

@@ -862,13 +862,17 @@ var PageHome = function (_React$Component) {
 			var thisSubTblNo = thisItem.subTblNo;
 			var mustFields = [];
 			var hideFields = [];
+			var showFields = [];
 
 			var defaultmustFields = [];
 			var defaulthideFields = [];
+			var defaultshowFields = [];
 
 			var fieldControll = this.props.fieldControll;
 			var hiddenFields = fieldControll.hiddenFields;
 			var mustFieldsStr = fieldControll.mustFields;
+			var showFieldsStr = fieldControll.showFields;
+
 			if (hiddenFields && hiddenFields != '') {
 				for (var i = 0; i < hiddenFields.split(',').length; i++) {
 					if (hiddenFields.split(',')[i] && hiddenFields.split(',')[i] != '') {
@@ -883,6 +887,13 @@ var PageHome = function (_React$Component) {
 					}
 				}
 			}
+			if (showFieldsStr && showFieldsStr != '') {
+				for (var i = 0; i < showFieldsStr.split(',').length; i++) {
+					if (showFieldsStr.split(',')[i] && showFieldsStr.split(',')[i] != '') {
+						defaultshowFields.push(showFieldsStr.split(',')[i]);
+					}
+				}
+			}
 
 			console.log("dealwithRelaField===table===");
 			if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
@@ -992,10 +1003,10 @@ var PageHome = function (_React$Component) {
 								}
 							} else if (editType == 'edit') {
 								relaFieldMap["key"] = "readOnly";
-								if (triggerFieldVal == nowValue) {
+								if (triggerFieldVal == nowValue && defaultshowFields.indexOf(relaFieldTblNameArrayItem) != -1) {
 									relaFieldMap["value"] = false;
 									editFlag = true;
-								} else if (!editFlag) {
+								} else if (!editFlag && defaultshowFields.indexOf(relaFieldTblNameArrayItem) != -1) {
 									relaFieldMap["value"] = true;
 								} else {
 									relaFieldMap["value"] = false;

package/package.json

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