fmui-base 1.0.39 → 1.0.41

package/README.md

@@ -3,6 +3,8 @@
 ---
 
 ## 更新日志
+- 1.0.41：上传附件敏感词拦截;
+- 1.0.40：修复审批验签重复问题;
 - 1.0.39：移动审批扩展;选人组件问题修复
 - 1.0.38：移动审批自动通过;选人组件增加政治面貌和职务
 - 1.0.37：移动审批退回意见显示;级联字段功能实现;移动端选人组件适配pc新设置

package/lib/comment_list/List.js

@@ -108,10 +108,12 @@ var PageHome = function (_React$Component) {
         _db2.default.FlowApproval.verifySign(param).then(function (content) {
           var result = content.verifySignRes;
           if (result == 'success') {
+            $("#commentSign-" + item.id).removeClass('t-PR16');
             $("#" + item.id + "_sucess").show();
           }
         }).catch(function (error) {
           if (error.errorMsg == "签名值与原文不匹配") {
+            $("#commentSign-" + item.id).removeClass('t-PR16');
             $("#" + item.id + "_fail").show();
           }
           //  else{
@@ -294,7 +296,7 @@ var PageHome = function (_React$Component) {
         });
         return _react2.default.createElement(
           Box,
-          { style: { marginLeft: "auto", "text-align": "right" } },
+          { style: { marginLeft: "auto", "text-align": "right", width: '100%' } },
           _returnHtml
         );
       } else {
@@ -312,13 +314,13 @@ var PageHome = function (_React$Component) {
           return _react2.default.createElement(
             VBox,
             { className: 't-PB10 t-LH1_5 t-field t-FS14 t-PL10' },
-            item.type.indexOf('image') < 0 ? _react2.default.createElement(Box, { className: 't-FS16', dangerouslySetInnerHTML: { __html: item.fullMessage == null ? "" : item.fullMessage.replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/ /g, '&nbsp;') } }) : item.fullMessage == '' ? _react2.default.createElement(
+            item.type.indexOf('image') < 0 ? _react2.default.createElement(Box, { className: 't-FS16 t-PR16', dangerouslySetInnerHTML: { __html: item.fullMessage == null ? "" : item.fullMessage.replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/ /g, '&nbsp;') } }) : item.fullMessage == '' ? _react2.default.createElement(
               Box,
               null,
               '\'\''
             ) : _react2.default.createElement(
               HBox,
-              null,
+              { className: 't-PR16' },
               _react2.default.createElement('img', { width: '100%', height: '128', src: t.state.loadImg + item.fullMessage })
             ),
             _react2.default.createElement(
@@ -361,14 +363,11 @@ var PageHome = function (_React$Component) {
                 );
               }) : ""
             ),
-            item.inscriptionShow ? t.getCommentSign(item) : "",
             _react2.default.createElement(
               Box,
-              { vAlign: 'start', hAlign: 'end', className: 't-FAR t-omit' },
+              { vAlign: 'start', hAlign: 'end', id: 'commentSign-' + item.id, className: 't-FBH t-PR16' },
               ' ',
-              item.signPic == '' || item.signPic == null ? item.userName : '',
-              '\xA0',
-              item.time,
+              item.inscriptionShow ? t.getCommentSign(item) : "",
               _react2.default.createElement('i', { id: item.id + "_sucess", className: 'iconfont icon-checked t-PT10 t-PL3', style: { color: 'green', display: 'none' } }),
               _react2.default.createElement('i', { id: item.id + "_fail", className: 'iconfont icon-close t-PT10 t-PL3', style: { color: 'red', display: 'none' } })
             )

package/lib/comment_list/List.less

@@ -1,3 +1,6 @@
 .t-PR5 {
   padding-right: 5px;
 }
+.t-FBH.flex-comment.t-field-box{
+  padding-right:0px;
+}

package/lib/form/form.js

@@ -1074,7 +1074,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 +1217,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 +1819,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);
+      }
     }
 
     //时间
@@ -2756,7 +2779,7 @@ var PageHome = function (_React$Component) {
             { borderTopNone: true },
             _react2.default.createElement(
               HBox,
-              { className: 't-field-box' },
+              { className: 'flex-comment t-field-box' },
               _react2.default.createElement(
                 'div',
                 { className: 't-field-layout-h-label t-FS16 t-FBJ' },

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]);
 															}
 														}
 													}
@@ -1370,7 +1550,7 @@ var PageHome = function (_React$Component) {
 					{ className: t.props.commentDefaultList.length > 0 ? '' : 't-DN' },
 					_react2.default.createElement(
 						HBox,
-						{ className: 't-field-box' },
+						{ className: 'flex-comment t-field-box' },
 						_react2.default.createElement(
 							'div',
 							{ className: 't-field-layout-h-label t-FS16 t-FBJ' },

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.39",
+  "version": "1.0.41",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",