fmui-base 2.0.14 → 2.0.16

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.16: 移动端半天日期选择需求开发
+- 2.0.15: 移动端选人组件问题修改
 - 2.0.14: 选人组件页签扩展功能;流程删除后，移动端提醒优化
 - 2.0.13: 退回意见弹窗问题修复
 - 2.0.12: 表单时间问题修复

package/lib/form/form.js

@@ -861,6 +861,8 @@ var PageHome = function (_React$Component) {
           } else if (dateDisplayFormat == "zhDate") {
             dateFormat = "YMD";
             dateFormatShow = "zhDate";
+          } else if (dateDisplayFormat == "AmPmDate") {
+            dateFormat = "YMDT";
           } else {
             dateFormat = "YMDHM";
           }
@@ -876,7 +878,6 @@ var PageHome = function (_React$Component) {
           dateFormat = "YMDHM";
         }
         itemParam.dateFormat = dateFormat;
-
         if (value && Array.isArray(value)) {
           if (value.length == 5) {
             var month = value[1] < 10 ? '0' + value[1] : value[1];
@@ -2104,8 +2105,11 @@ var PageHome = function (_React$Component) {
       var data = this.props.data;
       var itemParam = this.state.itemParam;
       var dateFormat = itemParam.dateFormat;
-
       var dateStr = this.dateFormat(value.value, dateFormat);
+      if (dateFormat == "YMDT") {
+        //年月日，上下午修改数据
+        value.value = new Date(dateStr).getTime();
+      }
       data = this.editData(code, dateStr, data);
 
       itemParam.value = value;
@@ -2168,6 +2172,17 @@ var PageHome = function (_React$Component) {
         } else if (formatStr == 'YM') {
           //年月
           return year + '-' + month;
+        } else if (formatStr == 'YMDT') {
+          //年月日，上下午
+          var hour = this.dealwithDate(date.getHours());
+          var min = this.dealwithDate(date.getMinutes());
+          if (hour == "09") {
+            return year + '-' + month + '-' + dates + ' 11:59:59';
+          } else if (hour == "18") {
+            return year + '-' + month + '-' + dates + ' 23:59:59';
+          } else {
+            return year + '-' + month + '-' + dates + ' ' + hour + ':' + min;
+          }
         } else {
           return '';
         }

package/lib/form/table.js

@@ -936,13 +936,14 @@ var PageHome = function (_React$Component) {
 										//当为时间时且有differDate或者differHour函数
 										var differDateRegExp = new RegExp("differDate\\(", "g");
 										var differHourRegExp = new RegExp("differHour\\(", "g");
-										if (exp.match(differDateRegExp) || exp.match(differHourRegExp)) {
+										var differHalfDateRegExp = new RegExp("differHalfDate\\(", "g");
+										if (exp.match(differDateRegExp) || exp.match(differHourRegExp) || exp.match(differHalfDateRegExp)) {
 											//当有differDate函数
 											if (typeof filedItemValue == 'undefined' || filedItemValue == "" || filedItemValue == null) {
 												//filedItemValue = 0;
 												return false;
 											} else {
-												filedItemValue = filedItemValue.value;
+												filedItemValue = filedItemValue.value ? filedItemValue.value : filedItemValue;
 											}
 										}
 									}
@@ -969,6 +970,7 @@ var PageHome = function (_React$Component) {
 							exp = exp.replace(new RegExp("rmb\\(", "g"), 'calculate.rmb(');
 							exp = exp.replace(new RegExp("differDate\\(", "g"), 'calculate.differDate(');
 							exp = exp.replace(new RegExp("differHour\\(", "g"), 'calculate.differHour(');
+							exp = exp.replace(new RegExp("differHalfDate\\(", "g"), 'calculate.differHalfDate(');
 							try {
 								var res = eval(exp);
 							} catch (e) {
@@ -996,10 +998,10 @@ var PageHome = function (_React$Component) {
 										res = Number(res).toFixed(decimalPlace) + '';
 									} else {
 										if (fieldArray.length == 0) {
-											var aDP = getActualDecimalPlace(exp);
+											var aDP = this.getActualDecimalPlace(exp);
 											res = res.toFixed(aDP) + '';
 										} else {
-											var maxDP = getMaxDecimalPlace(fieldItemArray); //获取参与计算的字段中 最长的小数位
+											var maxDP = this.getMaxDecimalPlace(fieldItemArray); //获取参与计算的字段中 最长的小数位
 											res = res.toFixed(maxDP) + '';
 										}
 									}

package/lib/selectMember/select.js

@@ -159,7 +159,9 @@ var Page = function (_React$Component) {
           if (data.data && data.data.length > 0) {
             for (var j = 0; j < data.data.length; j++) {
               chooseCode += data.data[j].popuCode + ",";
-              chooseObj += data.data[j].chooseObj + ",";
+              if (data.data[j].chooseObj) {
+                chooseObj += data.data[j].chooseObj ? data.data[j].chooseObj : "" + ",";
+              }
               chooseName += data.data[j].popuName + ",";
               if (data.data[j].popuUrl) {
                 extObj[data.data[j].popuCode] = data.data[j];
@@ -175,6 +177,9 @@ var Page = function (_React$Component) {
           }
         }
       } });
+    if (popCode.indexOf("common,") >= 0) {
+      chooseCode = "common," + chooseCode;
+    }
     _this.state = {
       bottomHeight: bottomHeight,
       baseCorpId: baseCorpId,

package/package.json

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