fmui-base 2.1.80 → 2.1.82

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.1.82：月日时间类型显示
+- 2.1.81：关联字段隐藏冲突处理
 - 2.1.80：审批按钮扩展方法，公众号隐藏附件下载按钮，子表支持扩展按钮
 - 2.1.79：审批支持传阅范围设置
 - 2.1.78：自动编号重复赋值问题处理

package/lib/form/form.js

@@ -917,6 +917,8 @@ var PageHome = function (_React$Component) {
             dateFormat = "YMDHM";
           } else if (dateDisplayFormat == "YearMon") {
             dateFormat = "YM";
+          } else if (dateDisplayFormat == "MonthDay") {
+            dateFormat = "MD";
           } else if (dateDisplayFormat == "Year") {
             dateFormat = "Y";
           } else if (dateDisplayFormat == "ODate") {
@@ -1669,9 +1671,12 @@ var PageHome = function (_React$Component) {
                     // relaFieldMap["key"]="isHidden";
                     if (item.triggerFieldVal == mainTblDataItem.value) {
                       itemParam.isHidden = true;
+                      defaulthideFields.push(itemParam.uniqueName);
+                      console.log("true====" + itemParam.uniqueName);
                     } else if (defaulthideFields.indexOf(itemParam.uniqueName) != -1) {
                       itemParam.isHidden = true;
                     } else {
+                      console.log("false====" + itemParam.uniqueName);
                       itemParam.isHidden = false;
                     }
                   } else if (editType == 'must') {
@@ -2431,6 +2436,9 @@ var PageHome = function (_React$Component) {
           } else if (formatStr == 'YM') {
             //年月
             return year + '-' + month;
+          } else if (formatStr == 'MD') {
+            //月日
+            return month + '-' + dates;
           } else if (formatStr == 'YMDT') {
             //年月日，上下午
             var hour = this.dealwithDate(date.getHours());

package/lib/form/table.js

@@ -884,7 +884,7 @@ var PageHome = function (_React$Component) {
 				}
 			}
 
-			console.log("dealwithRelaField===");
+			console.log("dealwithRelaField===table===");
 			if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
 				//解决同一字段 关联字段 编辑方式相同时冲突
 				var hideFlag = false;
@@ -943,6 +943,8 @@ var PageHome = function (_React$Component) {
 									relaFieldMap["value"] = true;
 								} else if (!hideFlag && hideFields.indexOf(relaFieldTblNameArrayItem) == -1) {
 									relaFieldMap["value"] = false;
+								} else if (hideFields.indexOf(relaFieldTblNameArrayItem) != -1) {
+									relaFieldMap["value"] = true;
 								} else {
 									relaFieldMap["value"] = false;
 								}

package/package.json

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