fmui-base 2.0.56 → 2.0.57

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.57：表单子表删除计算修改；批量办理
 - 2.0.56：移动端在线编辑预览增加下载按钮
 - 2.0.55：流程页面发起按钮问题修改
 - 2.0.54：移动门户添加下拉刷新

package/lib/form/subForm.js

@@ -298,7 +298,7 @@ var PageHome = function (_React$Component) {
       this.dealwithSubData(subTblList, subTblNo, value);
       data.subCalculateExpList = value.calculateExpList;
       data.subTblNo = subTblNo;
-      this.props.onChange(data, itemParam1);
+      this.props.onChange(data, itemParam1, subTblNo);
     }
 
     //处理子表数据
@@ -448,10 +448,10 @@ var PageHome = function (_React$Component) {
         for (var c = 0; c < children.length; c++) {
           var itemPa = children[c];
           var uniqueName = itemPa.uniqueName;
-          cropItem.uniqueName = uniqueName;
-          cropItem.itemType = itemPa.itemType;
-          cropItem.inputFormat = itemPa.inputFormat;
-          cropItem.decimalPlace = itemPa.decimalPlace;
+          //  cropItem.uniqueName=uniqueName;
+          //  cropItem.itemType=itemPa.itemType;
+          //  cropItem.inputFormat=itemPa.inputFormat;
+          //  cropItem.decimalPlace=itemPa.decimalPlace;
           var hiddenFields = '';
           if (this.state.itemParam.fieldControll) {
             hiddenFields = this.state.itemParam.fieldControll.hiddenFields;

package/lib/form/table.js

@@ -301,7 +301,7 @@ var PageHome = function (_React$Component) {
 		}
 	}, {
 		key: 'change',
-		value: function change(data, itemParam) {
+		value: function change(data, itemParam, subTblNo) {
 			var t = this;
 			var module = t.props.module;
 			var formKey = t.props.allForm ? t.props.allForm.formcode : "";
@@ -312,7 +312,7 @@ var PageHome = function (_React$Component) {
 				var mainTblData = data.mainTblData;
 				var mainTblName = data.mainTblName;
 				var subTbl = data.subTbl;
-				var subTblNo = data.subTblNo;
+				// var subTblNo = data.subTblNo; 
 				//处理特有参数
 				if (typeof FlowCommon.dealwithFormItemChange === "function") {
 					FlowCommon.dealwithFormItemChange(itemParam, this);
@@ -375,7 +375,7 @@ var PageHome = function (_React$Component) {
 																if (subTblData.length > itemExt.index) {
 																	var subTblItemData = subTblData[iExtSubData];
 																	for (var iExtSubDataItem = 0; iExtSubDataItem < subTblItemData.length; iExtSubDataItem++) {
-																		if (itemExt.key == subTblItemData[iExtSubDataItem].key) {
+																		if (itemExt.subCode == subTblItemData[iExtSubDataItem].key) {
 																			subTblItemData[iExtSubDataItem].value = itemExt.data;
 																		}
 																	}
@@ -420,11 +420,11 @@ var PageHome = function (_React$Component) {
 					});
 				}
 				var uniqueName = itemParam.uniqueName;
-				if (itemParam.itemType == 'text' || itemParam.itemType == 'datetime') {
+				if (itemParam.itemType == 'text' || itemParam.itemType == 'datetime' || itemParam.itemType == 'detail') {
 					//当等于单行文本或者时间时
 					this.forCalculateExpList(data, itemParam, uniqueName);
 					if (data.subCalculateExpList) {
-						this.forSubCalculateExpList(data, itemParam, uniqueName);
+						this.forSubCalculateExpList(data, itemParam, uniqueName, subTblNo);
 					}
 				}
 
@@ -1031,7 +1031,7 @@ var PageHome = function (_React$Component) {
 		}
 	}, {
 		key: 'forSubCalculateExpList',
-		value: function forSubCalculateExpList(data, itemParam, uniqueName) {
+		value: function forSubCalculateExpList(data, itemParam, uniqueName, subTblNo) {
 			var that = this;
 			var calculateExpList = data.subCalculateExpList;
 			if (calculateExpList) {
@@ -1049,29 +1049,39 @@ var PageHome = function (_React$Component) {
 							var exp = calculateExpValue[i].exp; //计算公式
 							var resultItem = calculateExpValue[i].result; //当前修改字段的uniqname,如：test_mobileform_sz2
 							returnResultItem[i] = resultItem;
+							if (itemParam.itemType == "detail") {
+								break;
+							}
 							var resultKey = calculateExpValue[i].key; //当前修改字段的code,如：sz2
 							var fieldArray = this.getFieldArray(exp); //获取计算公式参与的字段
 							var fieldItemArray = []; //计算公式所有参与的字段itemParam
+
+							// for(var h=0;h<data.subTbl.length;h++){
+							// if(data.subTbl[h].subTblName == itemParam.key){
+							// 	if(data.subTbl[h].subTblData.length>0){
+							// 		for(var l=0;l<data.subTbl[h].subTblData.length;l++){
 							for (var j = 0; j < fieldArray.length; j++) {
 								var fieldArrayItem = fieldArray[j];
 								var fieldItem = null;
-								if (this.refs[fieldArrayItem]) {
-									//当字段是主表时
-									fieldItem = this.refs[fieldArrayItem].getItemParam();
-								} else {
-									var subTableName = this.getSubRef(fieldArrayItem);
-									if (subTableName != "" && this.refs['sub_' + subTableName]) {
-										//当字段是子表时
-										fieldItem = this.refs['sub_' + subTableName].getSubItemParam(fieldArrayItem);
-									}
+								// if (this.refs[fieldArrayItem]) {//当字段是主表时
+								// 	fieldItem = this.refs[fieldArrayItem].getItemParam();
+								// } else {
+								var subTableName = this.getSubRef(fieldArrayItem);
+								if (subTableName != "" && this.refs['sub_' + subTableName]) {
+									//当字段是子表时
+									fieldItem = this.refs['sub_' + subTableName].getSubItemParam(fieldArrayItem);
+								}
+								if (fieldItem == null || fieldItem.length <= subTblNo) {
+									break;
 								}
+								// }
 								if (fieldItem != null) {
 									var filedItemValue = "";
 									if (Array.isArray(fieldItem)) {
 										//当是数组时，代表是子表
 										if (fieldItem.length > 0) {
-											fieldItemArray.push(fieldItem[data.subTblNo]);
-											filedItemValue = fieldItem[data.subTblNo].value;
+											fieldItemArray.push(fieldItem[subTblNo]);
+											filedItemValue = fieldItem[subTblNo].value;
 										}
 									} else {
 										fieldItemArray.push(fieldItem);
@@ -1133,19 +1143,23 @@ var PageHome = function (_React$Component) {
 								} else {
 									var fieldType = itemParam.inputFormat;
 									var decimalPlace = itemParam.decimalPlace;
-									var subTbl = data.subTbl;
-									subTbl.map(function (item, index) {
-										if (item.subTblName == itemParam.tableName) {
-											var subTblData = item.subTblData;
-											var subTblDatas = subTblData[data.subTblNo];
-											for (var j = 0; j < subTblDatas.length; j++) {
-												if (subTblDatas[j].key == resultKey) {
-													fieldType = subTblDatas[j].inputFormat;
-													decimalPlace = subTblDatas[j].decimalPlace;
-												}
-											}
-										}
-									});
+									// var subTbl = data.subTbl;
+									// subTbl.map(function (item, index) {
+									// 	if (item.subTblName == itemParam.tableName) {
+									// 		var subTblData = item.subTblData;
+									// 		var subTblDatas = subTblData[data.subTblNo];
+									// 		for (var k = 0; k < subTblDatas.length; k++) {
+									// 			if (subTblDatas[k].key == resultKey) {
+									// 				fieldType = subTblDatas[k].inputFormat;
+									// 				decimalPlace = subTblDatas[k].decimalPlace;
+									// 			}
+									// 		}
+
+									// 	}
+									// });
+									// fieldType = data.subTbl[h].subTblData[l].inputFormat;
+									// decimalPlace = data.subTbl[h].subTblData[l].decimalPlace;
+
 
 									if (exp.indexOf("differHalfDate") < 0) {
 										if (fieldType == 'int' || fieldType == 'float') {
@@ -1164,15 +1178,41 @@ var PageHome = function (_React$Component) {
 							}
 							var resultMap = {};
 							resultMap.key = itemParam.tableName + "_" + resultKey;
-							resultMap.index = data.subTblNo;
+							resultMap.index = subTblNo;
 							resultMap.value = res;
 							this.refs['sub_' + itemParam.tableName].reloadSubItemParam([resultMap]);
 							data = this.editSubData(itemParam.tableName, resultKey, res, data);
+							// 		}
+							// 	}
+							// }
+							// }
+
+						}
+						if (returnResultItem && returnResultItem.length > 0) {
+							for (var r = 0; r < returnResultItem.length; r++) {
+								this.forCalculateExpList(data, itemParam, returnResultItem[r]);
+								this.forSubCalculateExpList(data, itemParam, returnResultItem[r], subTblNo);
+							}
 						}
+					}
+				} else {
+					if (itemParam.itemType == "detail") {
+						var returnResultItem = [];
+						for (var key in calculateExpList) {
+							if (calculateExpList[key] && calculateExpList[key].length > 0) {
+								for (var m = 0; m < calculateExpList[key].length; m++) {
+									var result = calculateExpList[key][m].result;
+									if (returnResultItem.indexOf(result) == -1) {
+										returnResultItem.push(result);
+									}
+								}
+							}
+						}
+
 						if (returnResultItem && returnResultItem.length > 0) {
 							for (var r = 0; r < returnResultItem.length; r++) {
 								this.forCalculateExpList(data, itemParam, returnResultItem[r]);
-								this.forSubCalculateExpList(data, itemParam, returnResultItem[r]);
+								// this.forSubCalculateExpList(data, itemParam, returnResultItem[r],subTblNo);
 							}
 						}
 					}

package/lib/process_batch/processBatch.js

@@ -121,6 +121,41 @@ var PageHome = function (_React$Component) {
             content: '是否保存为常用语',
             disable: false
         }];
+
+        var markValue = getSysMarkConfigValue('approve');
+        var markValueJson = JSON.parse(markValue);
+
+        var sysSMSsetting = markValueJson.sysSMSsetting;
+        var evoRemind = markValueJson.evoRemind;
+        var shortMessageList = [];
+        var sendShortMessage = '';
+        if (sysSMSsetting && (sysSMSsetting == '1' || sysSMSsetting == '2')) {
+            if (sysSMSsetting == '2') {
+                shortMessageList.push({ value: "1", checked: true, content: '短信提醒', disable: false });
+            }
+            if (sysSMSsetting == '1') {
+                shortMessageList.push({ value: "1", checked: false, content: '短信提醒', disable: false });
+            }
+        }
+        if (evoRemind && (evoRemind == '1' || evoRemind == '2')) {
+
+            if (evoRemind == '2') {
+                shortMessageList.push({ value: "2", checked: true, content: '移动端提醒', disable: false });
+            }
+            if (evoRemind == '1') {
+                shortMessageList.push({ value: "2", checked: false, content: '移动端提醒', disable: false });
+            }
+        }
+        if (sysSMSsetting && sysSMSsetting == '2' && evoRemind && evoRemind == '2') {
+            sendShortMessage = '1,2';
+        } else if (sysSMSsetting && sysSMSsetting == '2') {
+            sendShortMessage = '1';
+        } else if (evoRemind && evoRemind == '2') {
+            sendShortMessage = '2';
+        } else {
+            sendShortMessage = '0';
+        }
+
         _this.state = {
             project: project,
             module: module, //模块
@@ -149,7 +184,8 @@ var PageHome = function (_React$Component) {
             savePhraseList: savePhraseList, //是否保存为常用语的选项列表
             savePhrase: [], //是否保存为常用语，1是，0否
             level: '',
-            shortMessageList: [{ value: "2", checked: true, content: '移动端提醒', disable: false }]
+            sendShortMessage: sendShortMessage,
+            shortMessageList: shortMessageList
         };
 
         // FlowCommon = require('pages/flow_common/'+module).default?require('pages/flow_common/'+module).default:require('pages/flow_common/'+module);
@@ -180,6 +216,7 @@ var PageHome = function (_React$Component) {
         // });
         return _this;
     }
+
     //初始化按钮
 
 

package/lib/process_info/processInfo.js

@@ -4109,6 +4109,7 @@ var PageHome = function (_React$Component) {
                 var dataId = t.state.dataId;
                 if (dataId == "") {
                     dataId = content.dataId;
+                    t.setState({ dataId: dataId });
                 }
                 if (typeof FlowCommon.operateCallBack === "function") {
                     // var type = 6;

package/package.json

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