fmui-base 2.2.65 → 2.2.67

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.67: 移动端合同管理移动端跳转
+- 2.2.66: 移动端关联字段为空报错
 - 2.2.65: 移动端关联字段报错
 - 2.2.64: 移动端提醒支持强制选中，移动端必提醒
 - 2.2.63: 再次发起回调参数

package/lib/form/table.js

@@ -950,6 +950,8 @@ var PageHome = function (_React$Component) {
 								} else {
 									nowValue = nowValueArray.join(",");
 								}
+							} else {
+								nowValue = "";
 							}
 							var relaFieldMap = {};
 							if (editType == 'hide' || editType == 'rowhide') {
@@ -1101,6 +1103,11 @@ var PageHome = function (_React$Component) {
 				}
 			}
 		}
+	}, {
+		key: 'replaceDollar',
+		value: function replaceDollar(a) {
+			return a && a.indexOf("$") != -1 ? a.replace(/\$/g, "\\$") : a;
+		}
 	}, {
 		key: 'forCalculateExpList',
 		value: function forCalculateExpList(data, itemParam, uniqueName) {
@@ -1125,6 +1132,7 @@ var PageHome = function (_React$Component) {
 							var fieldItemArray = []; //计算公式所有参与的字段itemParam
 							for (var j = 0; j < fieldArray.length; j++) {
 								var fieldArrayItem = fieldArray[j];
+
 								var fieldItem = null;
 								if (this.refs[fieldArrayItem]) {
 									//当字段是主表时
@@ -1187,17 +1195,17 @@ var PageHome = function (_React$Component) {
 										filedItemValue = 0;
 										//return false;
 									}
-									var sumRegExp = new RegExp("sum\\(\\[" + fieldArrayItem + "\\]\\)", "g");
+									var sumRegExp = new RegExp("sum\\(\\[" + this.replaceDollar(fieldArrayItem) + "\\]\\)", "g");
 
 									if (exp.match(sumRegExp)) {
 										//当有sum函数
 										if (Array.isArray(fieldItem)) {
 											var sumValue = this.sum(fieldItem);
-											exp = exp.replace(new RegExp("sum\\(\\[" + fieldArrayItem + "\\]\\)", "g"), "(" + sumValue + ")");
+											exp = exp.replace(new RegExp("sum\\(\\[" + this.replaceDollar(fieldArrayItem) + "\\]\\)", "g"), "(" + sumValue + ")");
 										}
 									}
 
-									exp = exp.replace(new RegExp("\\[" + fieldArrayItem + "\\]", "g"), "(" + filedItemValue + ")");
+									exp = exp.replace(new RegExp("\\[" + this.replaceDollar(fieldArrayItem) + "\\]", "g"), "(" + filedItemValue + ")");
 								}
 							}
 

package/lib/process_list/processList.js

@@ -205,6 +205,8 @@ var ListItem = function (_React$Component) {
                                 _fullUrl = _fullUrl.replace("/" + projectPath + "/", "/budget/budgetproject/").split('?_')[0].split('#/')[0];
                               } else if (module == 'hoa_topic' || module == 'hoa_funds' || module == 'hoa_achievements') {
                                 _fullUrl = _fullUrl.replace("/" + projectPath + "/", "/ky/ky/").split('?_')[0].split('#/')[0];
+                              } else if (module == 'contract_sign' || module == 'contract_sign') {
+                                _fullUrl = _fullUrl.replace("/" + projectPath + "/", "/contract/contract/").split('?_')[0].split('#/')[0];
                               } else if (module.indexOf("dj_") != '-1' || module.indexOf("jj_") != '-1' || module.indexOf("zdh_") != '-1' || module.indexOf("gh_") != '-1') {
                                 _fullUrl = _fullUrl.split('?_')[0].split('#/')[0];
                               } else if (module.indexOf("hoa_") != '-1') {
@@ -325,6 +327,8 @@ var ListItem = function (_React$Component) {
                 fullUrl = fullUrl.replace("/" + projectPath + "/", "/budget/budgetproject/").split('?_')[0].split('/approval/all')[0];
               } else if (module == 'hoa_topic' || module == 'hoa_funds' || module == 'hoa_achievements') {
                 fullUrl = fullUrl.replace("/" + projectPath + "/", "/ky/ky/").split('?_')[0].split('/approval/all')[0];
+              } else if (module == 'contract_sign' || module == 'contract_sign') {
+                fullUrl = fullUrl.replace("/" + projectPath + "/", "/contract/contract/").split('?_')[0].split('#/')[0];
               } else if (module.indexOf("dj_") != '-1' || module.indexOf("jj_") != '-1' || module.indexOf("zdh_") != '-1' || module.indexOf("gh_") != '-1') {
                 fullUrl = fullUrl.split('?_')[0].split('/approval/all')[0];
               } else if (module.indexOf("hoa_") != '-1') {

package/package.json

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