fmui-base 1.0.40 → 1.0.42

package/README.md

@@ -3,6 +3,8 @@
 ---
 
 ## 更新日志
+- 1.0.42：项目模块扩展开发;流程活动节点可以设置流程办理默认的提醒内容
+- 1.0.41：上传附件敏感词拦截;
 - 1.0.40：修复审批验签重复问题;
 - 1.0.39：移动审批扩展;选人组件问题修复
 - 1.0.38：移动审批自动通过;选人组件增加政治面貌和职务

package/lib/form/form.js

@@ -646,7 +646,12 @@ var PageHome = function (_React$Component) {
           // itemParam.readOnly=true;
           var selectOptions = [];
           if (value) {
-
+            var valueArray = [];
+            if (valueArray.indexOf("[") >= 0) {
+              valueArray = JSON.parse(value);
+            } else {
+              valueArray.push(value);
+            }
             var valueArray = JSON.parse(value);
             selectItem.map(function (selectI) {
               valueArray.map(function (item) {
@@ -1074,7 +1079,7 @@ var PageHome = function (_React$Component) {
         }
       }
 
-      itemParam = t.dealwithLinkField(itemParam);
+      itemParam = t.dealwithLinkField(itemParam, data, status);
       itemParam = t.dealwithRelaField(itemParam);
       if (itemType != 'weboffice') {
         itemParam.value = value;
@@ -1217,19 +1222,40 @@ var PageHome = function (_React$Component) {
 
   }, {
     key: 'dealwithLinkField',
-    value: function dealwithLinkField(itemParam) {
-
-      var form = this.props.form;
-      if (form.multiItemsLinkField) {
-        var selectOptions = [];
-        form.multiItemsLinkField.map(function (item) {
-          var option = {};
-          option.value = item.value;
-          option.text = item.name;
-          selectOptions.push(option);
-        });
-        itemParam.selectOptions = selectOptions;
+    value: function dealwithLinkField(itemParam, data, status) {
+      if (",radio,checkbox,select,".indexOf("," + itemParam.itemType + ",") != -1) {
+        if (status == '0') {
+          var form = this.props.form;
+          if (form.multiItemsLinkField) {
+            var selectOptions = [];
+            form.multiItemsLinkField.map(function (item) {
+              var option = {};
+              option.value = item.value;
+              option.text = item.name;
+              selectOptions.push(option);
+            });
+            itemParam.selectOptions = selectOptions;
+          }
+        } else if (status == '1') {
+          if (data.mainTblData && data.mainTblData.length > 0) {
+            var selectOptions = [];
+            for (var i = 0; i < data.mainTblData.length; i++) {
+              var item = data.mainTblData[i];
+              if (item.key == itemParam.key && item.multiItemsLinkField) {
+                var selectOptions = [];
+                item.multiItemsLinkField.map(function (multiItems) {
+                  var option = {};
+                  option.value = multiItems.value;
+                  option.text = multiItems.name;
+                  selectOptions.push(option);
+                });
+                itemParam.selectOptions = selectOptions;
+              }
+            }
+          }
+        }
       }
+
       // var linkFieldArray = linkFields[itemParam.fieldId];
       // if(linkFieldArray && linkFieldArray.length>0){
       //   var triggerFormFields = "";
@@ -1798,15 +1824,17 @@ var PageHome = function (_React$Component) {
   }, {
     key: 'selectChange',
     value: function selectChange(code, value) {
-      var data = this.props.data;
-      var selectValue = value.value;
-      data = this.editData(code, selectValue, data);
-      var itemParam = this.state.itemParam;
-      itemParam.value = value;
-      this.setState({
-        itemParam: itemParam
-      });
-      this.props.onChange(data, itemParam);
+      if (value) {
+        var data = this.props.data;
+        var selectValue = value.value;
+        data = this.editData(code, selectValue, data);
+        var itemParam = this.state.itemParam;
+        itemParam.value = value;
+        this.setState({
+          itemParam: itemParam
+        });
+        this.props.onChange(data, itemParam);
+      }
     }
 
     //时间

package/lib/form/table.js

@@ -308,6 +308,7 @@ var PageHome = function (_React$Component) {
 				var mainTblData = data.mainTblData;
 				var mainTblName = data.mainTblName;
 				var subTbl = data.subTbl;
+				var subTblNo = data.subTblNo;
 				//处理特有参数
 				if (typeof FlowCommon.dealwithFormItemChange === "function") {
 					FlowCommon.dealwithFormItemChange(itemParam, this);
@@ -441,18 +442,52 @@ var PageHome = function (_React$Component) {
 								if (formField.indexOf(fieldId) != -1) {
 									for (var j = 0; j < ffid.length; j++) {
 										var linkFormKey = "";
+										var linkFormTableKey = "";
+										var isSub = false;
 										for (var f = 0; f < formItem.length; f++) {
 											if (ffid[j] == formItem[f].fieldId) {
 												linkFormKey = formItem[f].itemCode;
+												linkFormTableKey = mainTblName;
+												continue;
+											} else if (formItem[f].itemType == 'detail') {
+												for (var g = 0; g < formItem[f].children.length; g++) {
+													if (ffid[j] == formItem[f].children[g].fieldId) {
+														linkFormKey = formItem[f].children[g].itemCode;
+														linkFormTableKey = formItem[f].itemCode;
+														isSub = true;
+														continue;
+													}
+												}
 											}
 										}
 										if (linkFormKey) {
-											for (var k = 0; k < mainTblData.length; k++) {
-												if (linkFormKey == mainTblData[k].key) {
-													var option = {};
-													option.value = mainTblData[k].value;
-													option.formField = ffid[j];
-													conditionArrayJSON.push(option);
+											var selectValue = "";
+											var isSelect = false;
+											if (isSub) {
+												for (var l = 0; l < subTbl.length; l++) {
+													if (subTbl[l].subTblName == linkFormTableKey) {
+														for (var g = 0; g < subTbl[l].subTblData[subTblNo].length; g++) {
+															if (subTbl[l].subTblData[subTblNo][g].key == linkFormKey) {
+																var option = {};
+																option.value = subTbl[l].subTblData[subTblNo][g].value;
+																option.formField = ffid[j];
+																conditionArrayJSON.push(option);
+																continue;
+															}
+														}
+													}
+												}
+											} else {
+												for (var k = 0; k < mainTblData.length; k++) {
+													if (linkFormTableKey + "_" + linkFormKey == mainTblName + "_" + mainTblData[k].key) {
+														var option = {};
+														selectValue = mainTblData[k].value;
+														option.value = mainTblData[k].value;
+														option.formField = ffid[j];
+														conditionArrayJSON.push(option);
+														isSelect = true;
+														continue;
+													}
 												}
 											}
 										}
@@ -470,66 +505,211 @@ var PageHome = function (_React$Component) {
 											for (var key in content) {
 												var contentValue = content[key];
 
-												var linkFormKey = "";
-												var linkFormType = "";
+												var tolinkFormKey = "";
+												var tolinkFormType = "";
+												var tolinkFormTableKey = "";
+												var toisSub = false;
 												for (var f = 0; f < formItem.length; f++) {
 													if (key == formItem[f].fieldId) {
-														linkFormKey = formItem[f].itemCode;
-														linkFormType = formItem[f].itemType;
+														tolinkFormKey = formItem[f].itemCode;
+														tolinkFormType = formItem[f].itemType;
+														tolinkFormTableKey = mainTblName;
+													} else if (formItem[f].itemType == 'detail') {
+														for (var g = 0; g < formItem[f].children.length; g++) {
+															if (key == formItem[f].children[g].fieldId) {
+																tolinkFormKey = formItem[f].children[g].itemCode;
+																tolinkFormType = formItem[f].children[g].itemType;
+																tolinkFormTableKey = formItem[f].itemCode;
+																toisSub = true;
+																continue;
+															}
+														}
 													}
 												}
-												if (linkFormKey) {
-													for (var m = 0; m < mainTblData.length; m++) {
-														if (linkFormKey == mainTblData[m].key) {
-															var relateItemParam = t.refs[mainTblName + "_" + mainTblData[m].key].getItemParam();
-															if (",text,textarea,datetime,datetimeStep,".indexOf("," + linkFormType + ",") != -1) {
-																var textValue = '';
-																var valueMap = {};
-																valueMap.key = 'value';
-																for (var c = 0; c < contentValue.length; c++) {
-																	textValue = textValue + "," + contentValue[c];
+												if (tolinkFormKey) {
+													if (!toisSub) {
+														for (var m = 0; m < mainTblData.length; m++) {
+															if (tolinkFormKey == mainTblData[m].key) {
+																var relateItemParam = t.refs[mainTblName + "_" + mainTblData[m].key].getItemParam();
+																if (",text,textarea,datetime,datetimeStep,".indexOf("," + tolinkFormType + ",") != -1) {
+																	var textValue = '';
+																	var valueMap = {};
+																	valueMap.key = 'value';
+																	for (var c = 0; c < contentValue.length; c++) {
+																		textValue = textValue + "," + contentValue[c];
+																	}
+																	valueMap.value = textValue.substring(1);
+
+																	t.refs[mainTblName + "_" + mainTblData[m].key].reloadItemParam([valueMap]);
+																	mainTblData[m].value = textValue.substring(1);
+																} else if (",radio,checkbox,select,".indexOf("," + tolinkFormType + ",") != -1) {
+																	var textValue = '';
+																	var resultMap = {};
+																	resultMap.key = 'selectOptions';
+
+																	var selectOptions = [];
+																	for (var c = 0; c < contentValue.length; c++) {
+																		textValue = textValue + "," + contentValue[c];
+																		var option = {};
+																		relateItemParam.selectItem.map(function (selectItemObj) {
+																			if (selectItemObj.value == contentValue[c]) {
+																				option.value = contentValue[c];
+																				option.text = selectItemObj.text;
+																				selectOptions.push(option);
+																			}
+																		});
+																	}
+																	resultMap.value = selectOptions;
+
+																	var valueMap1 = {};
+																	valueMap1.key = 'value';
+																	valueMap1.value = "";
+																	mainTblData[m].value = "";
+																	var tva = textValue.substring(1);
+																	if (containUniqueFlag == true) {
+																		valueMap1.value = tva;
+																		mainTblData[m].value = tva;
+																	} else {
+																		for (var f = 0; f < formItem.length; f++) {
+																			if (formItem[f].itemCode == mainTblData[m].key && formItem[f].value == tva) {
+																				valueMap1.value = tva;
+																				mainTblData[m].value = tva;
+																				break;
+																			}
+																		}
+																	}
+																	t.refs[mainTblName + "_" + mainTblData[m].key].reloadItemParam([resultMap, valueMap1]);
 																}
-																valueMap.value = textValue.substring(1);
-
-																t.refs[mainTblName + "_" + mainTblData[m].key].reloadItemParam([valueMap]);
-																mainTblData[m].value = textValue.substring(1);
-															} else if (",radio,checkbox,select,".indexOf("," + linkFormType + ",") != -1) {
-																var textValue = '';
-																var resultMap = {};
-																resultMap.key = 'selectOptions';
-
-																var selectOptions = [];
-																for (var c = 0; c < contentValue.length; c++) {
-																	textValue = textValue + "," + contentValue[c];
-																	var option = {};
-																	relateItemParam.selectItem.map(function (selectItemObj) {
-																		if (selectItemObj.value == contentValue[c]) {
-																			option.value = contentValue[c];
-																			option.text = selectItemObj.text;
-																			selectOptions.push(option);
+															}
+														}
+													} else {
+														if (isSub) {
+															for (var l = 0; l < subTbl.length; l++) {
+																if (subTbl[l].subTblName == tolinkFormTableKey) {
+																	for (var g = 0; g < subTbl[l].subTblData[subTblNo].length; g++) {
+																		if (subTbl[l].subTblData[subTblNo][g].key == tolinkFormKey) {
+																			var relateItemParam = t.refs["sub_" + tolinkFormTableKey].refs[tolinkFormTableKey + "_" + subTbl[l].subTblData[subTblNo][g].key + "_" + subTblNo].getItemParam();
+																			if (",text,textarea,datetime,datetimeStep,".indexOf("," + tolinkFormType + ",") != -1) {
+																				var textValue = '';
+																				var valueMap = {};
+																				valueMap.key = 'value';
+																				for (var c = 0; c < contentValue.length; c++) {
+																					textValue = textValue + "," + contentValue[c];
+																				}
+																				valueMap.value = textValue.substring(1);
+
+																				t.refs["sub_" + tolinkFormTableKey].refs[tolinkFormTableKey + "_" + subTbl[l].subTblData[subTblNo][g].key + "_" + subTblNo].reloadItemParam([valueMap]);
+																				subTbl[l].subTblData[subTblNo][g].value = textValue.substring(1);
+																			} else if (",radio,checkbox,select,".indexOf("," + tolinkFormType + ",") != -1) {
+																				var textValue = '';
+																				var resultMap = {};
+																				resultMap.key = 'selectOptions';
+
+																				var selectOptions = [];
+																				for (var c = 0; c < contentValue.length; c++) {
+																					textValue = textValue + "," + contentValue[c];
+																					var option = {};
+																					relateItemParam.selectItem.map(function (selectItemObj) {
+																						if (selectItemObj.value == contentValue[c]) {
+																							option.value = contentValue[c];
+																							option.text = selectItemObj.text;
+																							selectOptions.push(option);
+																						}
+																					});
+																				}
+																				resultMap.value = selectOptions;
+
+																				var valueMap1 = {};
+																				valueMap1.key = 'value';
+																				valueMap1.value = "";
+																				subTbl[l].subTblData[subTblNo][g].value = "";
+																				var tva = textValue.substring(1);
+																				if (containUniqueFlag == true) {
+																					valueMap1.value = tva;
+																					subTbl[l].subTblData[subTblNo][g].value = tva;
+																				} else {
+																					for (var f = 0; f < formItem.length; f++) {
+																						if (formItem[f].itemType == 'detail' && formItem[f].itemCode == tolinkFormTableKey) {
+																							for (var h = 0; h < formItem[f].children.length; h++) {
+																								if (formItem[f].children[h].itemCode == subTbl[l].subTblData[subTblNo][g].key && formItem[f].children[h].value == tva) {
+																									valueMap1.value = tva;
+																									subTbl[l].subTblData[subTblNo][g].value = tva;
+																									break;
+																								}
+																							}
+																						}
+																					}
+																				}
+																				t.refs["sub_" + tolinkFormTableKey].refs[tolinkFormTableKey + "_" + subTbl[l].subTblData[subTblNo][g].key + "_" + subTblNo].reloadItemParam([resultMap, valueMap1]);
+																			}
 																		}
-																	});
+																	}
 																}
-																resultMap.value = selectOptions;
-
-																var valueMap1 = {};
-																valueMap1.key = 'value';
-																valueMap1.value = "";
-																mainTblData[m].value = "";
-																var tva = textValue.substring(1);
-																if (containUniqueFlag == true) {
-																	valueMap1.value = tva;
-																	mainTblData[m].value = tva;
-																} else {
-																	for (var f = 0; f < formItem.length; f++) {
-																		if (formItem[f].itemCode == mainTblData[m].key && formItem[f].value == tva) {
-																			valueMap1.value = tva;
-																			mainTblData[m].value = tva;
-																			break;
+															}
+														} else {
+															for (var l = 0; l < subTbl.length; l++) {
+																if (subTbl[l].subTblName == tolinkFormTableKey) {
+																	for (var o = 0; o < subTbl[l].subTblData.length; o++) {
+																		for (var g = 0; g < subTbl[l].subTblData[o].length; g++) {
+																			if (tolinkFormKey == subTbl[l].subTblData[o][g].key) {
+																				var relateItemParam = t.refs["sub_" + tolinkFormTableKey].refs[tolinkFormTableKey + "_" + subTbl[l].subTblData[o][g].key + "_" + o].getItemParam();
+																				if (",text,textarea,datetime,datetimeStep,".indexOf("," + tolinkFormType + ",") != -1) {
+																					var textValue = '';
+																					var valueMap = {};
+																					valueMap.key = 'value';
+																					for (var c = 0; c < contentValue.length; c++) {
+																						textValue = textValue + "," + contentValue[c];
+																					}
+																					valueMap.value = textValue.substring(1);
+
+																					t.refs["sub_" + tolinkFormTableKey].refs[tolinkFormTableKey + "_" + subTbl[l].subTblData[o][g].key + "_" + o].reloadItemParam([valueMap]);
+																					subTbl[l].subTblData[o][g].value = textValue.substring(1);
+																				} else if (",radio,checkbox,select,".indexOf("," + tolinkFormType + ",") != -1) {
+																					var textValue = '';
+																					var resultMap = {};
+																					resultMap.key = 'selectOptions';
+
+																					var selectOptions = [];
+																					for (var c = 0; c < contentValue.length; c++) {
+																						textValue = textValue + "," + contentValue[c];
+																						var option = {};
+																						relateItemParam.selectItem.map(function (selectItemObj) {
+																							if (selectItemObj.value == contentValue[c]) {
+																								option.value = contentValue[c];
+																								option.text = selectItemObj.text;
+																								selectOptions.push(option);
+																							}
+																						});
+																					}
+																					resultMap.value = selectOptions;
+
+																					var valueMap1 = {};
+																					valueMap1.key = 'value';
+																					valueMap1.value = "";
+																					subTbl[l].subTblData[o][g].value = "";
+																					var tva = textValue.substring(1);
+																					if (containUniqueFlag == true) {
+																						valueMap1.value = tva;
+																						subTbl[l].subTblData[o][g].value = tva;
+																					} else {
+																						for (var f = 0; f < formItem.length; f++) {
+																							if (formItem[f].itemType == 'detail' && formItem[f].itemCode == tolinkFormTableKey) {
+																								for (var h = 0; h < formItem[f].children.length; h++) {
+																									if (formItem[f].children[h].itemCode == subTbl[l].subTblData[o][g].key && formItem[f].children[h].value == tva) {
+																										valueMap1.value = tva;
+																										subTbl[l].subTblData[o][g].value = tva;
+																										break;
+																									}
+																								}
+																							}
+																						}
+																					}
+																					t.refs["sub_" + tolinkFormTableKey].refs[tolinkFormTableKey + "_" + subTbl[l].subTblData[o][g].key + "_" + o].reloadItemParam([resultMap, valueMap1]);
+																				}
+																			}
 																		}
 																	}
 																}
-																t.refs[mainTblName + "_" + mainTblData[m].key].reloadItemParam([resultMap, valueMap1]);
 															}
 														}
 													}

package/lib/process_info/processInfo.js

@@ -416,6 +416,7 @@ var PageHome = function (_React$Component) {
         param.nextActivityName = '';
         param.backAttachId = ""; //退回增加附件
         param.backInitList = [];
+        param.dealReminderContent = [];
         _this.state = param;
         var t = _this;
         var key = "";
@@ -705,6 +706,38 @@ var PageHome = function (_React$Component) {
                     var formKey = form.formcode;
                     var formStyleObj = form.formStyle;
 
+                    //项目开发模块统一扩展
+                    var mobileModuleExt;
+                    try {
+                        if (t.state.module) {
+                            mobileModuleExt = typeof eval(t.state.module + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_mobileExt") : null;
+                        }
+                    } catch (e) {
+                        // alert("exception: "+e.message);
+                    }
+
+                    if (typeof mobileModuleExt !== 'undefined' && typeof mobileModuleExt["dealwithFolowInfoExt"] === "function") {
+                        mobileModuleExt["dealwithFolowInfoExt"](t.state, function () {
+                            //项目开发扩展
+                            var mobileExt;
+                            try {
+                                if (t.state.formKey) {
+                                    mobileModuleExt = typeof eval(t.state.module + "_" + t.state.formKey + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_" + t.state.formKey + "_mobileExt") : null;
+                                }
+                            } catch (e) {
+                                // alert("exception: "+e.message);
+                            }
+                            if (typeof mobileModuleExt !== 'undefined' && typeof mobileModuleExt["dealwithFolowInfoExt"] === "function") {
+                                content = mobileModuleExt["dealwithFolowInfoExt"](content);
+                            }
+                        }, function (error) {
+                            _Toast2.default.show({
+                                type: 'error',
+                                content: error
+                            });
+                        });
+                    }
+
                     //项目开发扩展
                     var mobileExt;
                     try {
@@ -717,6 +750,7 @@ var PageHome = function (_React$Component) {
                     if (typeof mobileExt !== 'undefined' && typeof mobileExt["dealwithFolowInfoExt"] === "function") {
                         content = mobileExt["dealwithFolowInfoExt"](content);
                     }
+
                     var markValue = getSysMarkConfigValue('approve');
                     var markValueJson = JSON.parse(markValue);
                     messageType = content.message;
@@ -1103,6 +1137,10 @@ var PageHome = function (_React$Component) {
                     if (activityId) {} else {
                         activityId = "";
                     }
+                    var dealReminderContent = "";
+                    if (content.dealReminderContent && typeof content.dealReminderContent != "undefined") {
+                        dealReminderContent = content.dealReminderContent;
+                    }
 
                     /*            let sysMailSetting=content.sysMailSetting;
                                 var remindersLists=[];
@@ -1205,7 +1243,8 @@ var PageHome = function (_React$Component) {
                         commentCasign: commentCasign,
                         caIsPrd: caIsPrd,
                         preCaFields: preCaFields,
-                        formRelaField: formRelaField
+                        formRelaField: formRelaField,
+                        dealReminderContent: dealReminderContent
                     });
                     t.dealWithButtons(content);
                 }, function (error) {
@@ -3729,6 +3768,7 @@ var PageHome = function (_React$Component) {
             var assignName = "";
             var orgIds = "";
             var nextTaskId = "";
+            var dealReminderContent = t.state.dealReminderContent;
             if (t.state.nextTaskId != "") {
                 nextTaskId = t.state.nextTaskId;
             }
@@ -3763,7 +3803,7 @@ var PageHome = function (_React$Component) {
             }
             param.circulateIds = assignId;
             param.circulateNames = assignName;
-
+            param.dealReminderContent = dealReminderContent;
             var editType = t.state.editType;
             // if(t.state.dataId == ''){
             //     editType = "add";

package/lib/upload/upload.js

@@ -59,11 +59,17 @@ var PageHome = function (_React$Component) {
             //如果组件没有设置则取后台默认
             extensions = setting.sysAttachmentCate;
         }
+        //累加
         // 可上传
         var canAdd = props.canAdd;
         // 可删除
         var canDel = props.canDel;
 
+        //单次返回,默认返回所有
+        var returnOnce = props.returnOnce;
+        if (!returnOnce) {
+            returnOnce = false;
+        }
         //预览类型，view：永中预览，download：下载
         var viewType = props.viewType;
         if (typeof viewType == 'undefined' || viewType == null || viewType == '') {
@@ -149,7 +155,8 @@ var PageHome = function (_React$Component) {
             isInit: false,
             addQueNum: 0,
             viewType: viewType,
-            initList: initList
+            initList: initList,
+            returnOnce: returnOnce
         };
         return _this;
     }
@@ -310,11 +317,26 @@ var PageHome = function (_React$Component) {
                     } else {
                         var json = file.response.getJson().data;
 
+                        if (typeof getSensitive === "function") {
+
+                            var returnMsg = getSensitive(json[0].fileDisplayName);
+                            if (returnMsg) {
+                                _Toast2.default.show({
+                                    type: 'error',
+                                    content: '附件名称包含' + returnMsg + '敏感词！'
+                                });
+                                return false;
+                            }
+                        }
                         //var checksum = json[0].checksum;
                         var initList = t.state.initList;
                         if (initList.length < _this2.state.limitNo) {
                             initList = initList.concat(json);
-                            t.props.onChange(initList);
+                            if (t.state.returnOnce) {
+                                t.props.onChange(json);
+                            } else {
+                                t.props.onChange(initList);
+                            }
                             t.setState({
                                 initList: initList
                             });

package/package.json

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