fmui-base 2.2.70 → 2.2.72

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.72: 移动端支持单选、多选、下单单选和下拉多选设置空置进行联动
+- 2.2.71: 单选多选可输入关联不生效问题修复
 - 2.2.70: 移动端表单组件change事件itemParam丢失问题
 - 2.2.69: 移动端异常处理
 - 2.2.68: 移动端合同管理移动端跳转

package/lib/form/table.js

@@ -868,12 +868,13 @@ var PageHome = function (_React$Component) {
 			var isNowSub = false;
 			var subTblName = '';
 			var itemKey = thisItem.key;
+			var uniqueName = thisItem.uniqueName;
 			var tableName = thisItem.tableName;
 			var thisSubTblNo = thisItem.subTblNo;
 			var mustFields = [];
 			var hideFields = [];
 			var showFields = [];
-
+			var formItem = data.formItem;
 			var defaultmustFields = [];
 			var defaulthideFields = [];
 			var defaultshowFields = [];
@@ -915,6 +916,9 @@ var PageHome = function (_React$Component) {
 					var formRelaFieldMapsObjItem = formRelaFieldMapsObj[formIndex];
 					mustFlag = false;
 					var triggerFieldVal = formRelaFieldMapsObjItem.triggerFieldVal;
+					if (triggerFieldVal == " ") {
+						triggerFieldVal = "";
+					}
 					var relaFieldTblName = formRelaFieldMapsObjItem.relaFieldTblName;
 					var editType = formRelaFieldMapsObjItem.editType;
 					if (relaFieldTblName) {
@@ -946,6 +950,13 @@ var PageHome = function (_React$Component) {
 									}
 								}
 							}
+							if (!nowValue || nowValue == '') {
+								formItem.map(function (item) {
+									if (item.uniqueName == uniqueName) {
+										nowValue = item.value;
+									}
+								});
+							}
 
 							if (nowValue && nowValue.indexOf("[") >= 0 && nowValue.indexOf("]") >= 0) {
 								var nowValueArray = JSON.parse(nowValue);
@@ -954,9 +965,25 @@ var PageHome = function (_React$Component) {
 								} else {
 									nowValue = nowValueArray.join(",");
 								}
-							} else {
+							} else if (nowValue == null || typeof nowValue == 'undefined') {
 								nowValue = "";
 							}
+							// 2$#$##$#$3 这种格式的值 直接转换成字符串 不要解析成数组
+							else if (nowValue != '' && (nowValue.indexOf("$#$#") >= 0 || nowValue.indexOf("#$#$") >= 0)) {
+									if (nowValue.indexOf("#$#$") >= 0) {
+										var nowValueList = nowValue.split("#$#$");
+										if (nowValueList.length == 1) {
+											nowValue = nowValueList[0].replace("$#$#", "");
+										} else {
+											nowValueList = nowValueList.map(function (item) {
+												return item.replace("$#$#", "");
+											});
+											nowValue = nowValueList.join(",");
+										}
+									} else if (nowValue.indexOf("$#$#") >= 0) {
+										nowValue = nowValue.replace("$#$#", "");
+									}
+								}
 							var relaFieldMap = {};
 							if (editType == 'hide' || editType == 'rowhide') {
 								relaFieldMap["key"] = "isHidden";

package/package.json

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