fmui-base 2.0.74 → 2.0.76

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.76：移动门户修改精选专题样式
+- 2.0.75：表单项目扩展问题修改;表单计算问题修改
 - 2.0.74：移动门户部件样式修改
 - 2.0.73：移动门户部件样式修改
 - 2.0.72：选人组件初始化性能优化

package/lib/form/form.js

@@ -888,6 +888,37 @@ var PageHome = function (_React$Component) {
           if (maxDate) {
             itemParam.maxDate = maxDate;
           }
+          var fromCalculate = form.dataAttr.fromCalculate;
+          if (fromCalculate && typeof fromCalculate != "undefined") {
+            var calculateExpList = fromCalculate.calculateExpList; //计算公式列表
+            var calculateExp = fromCalculate.calculateExp; //计算公式
+            if (calculateExp) {
+              var fieldArray = this.getFieldArray(calculateExp);
+              if (!value) {
+                value = this.dealwithCalculate(calculateExp, fieldArray, form, allForm);
+              }
+              for (var i = 0; i < fieldArray.length; i++) {
+                var calculateExpValue;
+                if (calculateExpList) {
+                  calculateExpValue = calculateExpList[fieldArray[i]];
+                  if (!calculateExpValue) {
+                    calculateExpValue = [];
+                  }
+                } else {
+                  calculateExpList = {};
+                  calculateExpValue = [];
+                }
+
+                var calculateExpValueItem = {};
+                calculateExpValueItem.exp = calculateExp; //计算公式
+                calculateExpValueItem.result = uniqueName; //公式结果字段
+                calculateExpValueItem.key = key; //公式结果字段key
+                calculateExpValue.push(calculateExpValueItem);
+                calculateExpList[fieldArray[i]] = calculateExpValue;
+              }
+              data.calculateExpList = calculateExpList;
+            }
+          }
         } else {
           dateFormat = "YMDHM";
         }

package/lib/form/subForm.js

@@ -340,11 +340,15 @@ var PageHome = function (_React$Component) {
     key: 'reloadSubItemParam',
     value: function reloadSubItemParam(itemNew) {
       if (itemNew != null && itemNew != undefined && Array.isArray(itemNew)) {
+        var itemParam = this.state.itemParam;
+        var value = itemParam.value;
         for (var i = 0; i < itemNew.length; i++) {
           var fieldCode = itemNew[i].key;
           var value = itemNew[i].value;
           var index = itemNew[i].index;
-          var itemParam = this.state.itemParam;
+          if (value[index]) {
+            value[index][fieldCode] = value;
+          }
           if (this.refs[fieldCode + '_' + index]) {
             var valueItem = {};
             valueItem.key = 'value';

package/lib/form/table.js

@@ -365,19 +365,19 @@ var PageHome = function (_React$Component) {
 									} else {
 										if (itemExt.index || itemExt.index == 0) {
 											if (itemExt.subCode) {
+
 												t.refs["sub_" + itemExt.key].refs[itemExt.key + "_" + itemExt.subCode + "_" + itemExt.index].reloadItemParam(itemExt.value);
+												// t.refs["sub_" + itemExt.key].reloadSubItemParam([itemExt]);
 												for (var iExtSub = 0; iExtSub < subTbl.length; iExtSub++) {
 													var subTblName = subTbl[iExtSub].subTblName;
 													if (subTblName == itemExt.key) {
 														if (itemExt.data) {
 															var subTblData = subTbl[iExtSub].subTblData;
-															for (var iExtSubData = 0; iExtSubData < subTblData.length; iExtSubData++) {
-																if (subTblData.length > itemExt.index) {
-																	var subTblItemData = subTblData[iExtSubData];
-																	for (var iExtSubDataItem = 0; iExtSubDataItem < subTblItemData.length; iExtSubDataItem++) {
-																		if (itemExt.subCode == subTblItemData[iExtSubDataItem].key) {
-																			subTblItemData[iExtSubDataItem].value = itemExt.data;
-																		}
+															if (subTblData.length > itemExt.index) {
+																var subTblItemData = subTbl[iExtSub].subTblData[itemExt.index];
+																for (var iExtSubDataItem = 0; iExtSubDataItem < subTblItemData.length; iExtSubDataItem++) {
+																	if (itemExt.subCode == subTblItemData[iExtSubDataItem].key) {
+																		subTblItemData[iExtSubDataItem].value = itemExt.data;
 																	}
 																}
 															}
@@ -953,6 +953,19 @@ var PageHome = function (_React$Component) {
 											}
 										}
 									}
+									if (itemParam.itemType == 'datetime' || itemParam.itemType == 'text') {
+										console.log("adddays");
+										var adddaysDateRegExp = new RegExp("adddays\\(", "g");
+										if (exp.match(adddaysDateRegExp)) {
+											//当有adddays函数
+											if (typeof filedItemValue == 'undefined' || filedItemValue == "" || filedItemValue == null) {
+												//filedItemValue = 0;
+												return false;
+											} else {
+												filedItemValue = filedItemValue.value ? filedItemValue.value : filedItemValue;
+											}
+										}
+									}
 
 									if (typeof filedItemValue == 'undefined' || filedItemValue == "" && filedItemValue != "0" || filedItemValue == null) {
 										//当filedItemValue为空或者其他异常状态时置为0
@@ -977,6 +990,7 @@ var PageHome = function (_React$Component) {
 							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(');
+							exp = exp.replace(new RegExp("adddays\\(", "g"), 'calculate.adddays(');
 							try {
 								var res = eval(exp);
 							} catch (e) {
@@ -1018,8 +1032,8 @@ var PageHome = function (_React$Component) {
 							var resultMap = {};
 							resultMap.key = 'value';
 							resultMap.value = res;
-							this.refs[resultItem].reloadItemParam([resultMap]);
 							data = this.editData(resultKey, res, data);
+							this.refs[resultItem].reloadItemParam([resultMap]);
 						}
 						if (returnResultItem && returnResultItem.length > 0) {
 							for (var r = 0; r < returnResultItem.length; r++) {

package/lib/react_grid/react_grid.js

@@ -1678,7 +1678,7 @@ var MyGrid = function (_React$Component) {
         if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0) {
           componentContent = _react2.default.createElement(
             _Carousel2.default,
-            { showNav: true, height: '90px', auto: false, className: 'jxzt-content', onSlideClick: function onSlideClick(option) {
+            { showNav: true, auto: false, className: 'jxzt-content', onSlideClick: function onSlideClick(option) {
                 t.skip2Zhuanti(option);
               } },
             _carouselItem

package/lib/react_grid/react_grid.less

@@ -620,7 +620,7 @@
 
   // 通知部件
   .carousel-notice.t-slide {
-    margin: 16px;
+    // margin: 16px;
     border-radius: 5px;
 
     .t-slide-item {
@@ -667,6 +667,7 @@
 
   .jxzt-content {
     margin: 0;
+    height: 100% ;
     .t-image-slide-item {
       // height: 91px !important;
       background-image: url(/mobile/fmui/images/notice-card-bg.png);
@@ -675,7 +676,7 @@
     }
   
     .t-slide-view {
-      height: 90px;
+      height: 100% !important;
     }
   }
 

package/package.json

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