fmui-base 2.1.30 → 2.1.32

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志  
+- 2.1.32：表单组件html编辑器移动端图片路径替换
+- 2.1.31：表单组件支持对单行文本进行关联字段赋值
 - 2.1.30：宏值字段可编辑时根据当前人变化
 - 2.1.29：委托办理被委托人批示，显示被委托人的签名
 - 2.1.28：统一审批跳转问题处理

package/lib/db/db.js

@@ -919,6 +919,21 @@ context.create('FlowModuleAPI', {
         duration: 800
       });
     }
+  },
+  getUserInfo: {
+    url: _variables2.default.URLS.getUserInfo,
+    method: 'GET',
+    postDataFomat: 'FORM',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    /*    header:{'content-Type':'application/x-www-form-urlencoded'},*/
+    willFetch: function willFetch() {
+      _Toast2.default.show({
+        content: _react2.default.createElement(_loading2.default, null),
+        duration: 800
+      });
+    }
   }
 
 });

package/lib/db/variables.js

@@ -121,7 +121,8 @@ exports.default = {
         getAllActivity: approveUrlPrefix + "getAllActivity" + '?', //获取所有节点
         getCategoryListByModule: approveUrlPrefix + "getCategoryListByModule" + '?', //获取所有节点
         cancelLimit: approveUrlPrefix + "cancelLimit" + '?', //取消超时
-        getCanCancelLimit: approveUrlPrefix + "getCanCancelLimit" + '?' //是否可以取消超时
+        getCanCancelLimit: approveUrlPrefix + "getCanCancelLimit" + '?', //是否可以取消超时
+        getUserInfo: approveUrlPrefix + "getUserInfo" + '?' //获取用户信息
     },
     nodataIcon: context + "/mobile/fmui/images/noData.png",
     loadingIcon: context + "/mobile/fmui/images/loading.gif",

package/lib/form/form.js

@@ -641,7 +641,7 @@ var PageHome = function (_React$Component) {
           alert("265====="+itemParam.dataAttr.textLineFeed);
         }*/
         //宏值签名图片
-        if (itemParam.dataAttr && itemParam.dataAttr.dataSrc == '2' && !readOnly) {
+        if (itemParam.dataAttr && itemParam.dataAttr.dataSrc == '2' && !readOnly && !itemParam.bizCodeRuleId) {
           value = form.defaultValue;
         }
         if (itemParam.dataAttr && itemParam.dataAttr.dataSrc == '2' && itemParam.dataAttr.fromMacro.value == 'currentUserSignPic') {
@@ -1335,6 +1335,22 @@ var PageHome = function (_React$Component) {
           });
           t.props.onChange(data, t.state.itemParam);
         }
+      } else if (itemType == 'html') {
+
+        // if(value){
+        //   value = value.split('_')[0];
+        //   value = context + '/api/m/plugin/attachment/mobile/viewImage?token=' + token + '&fid='+value;
+        //   //alert("value==="+value);
+        //  }
+        var updatedHtml = value.replace(/<img\s+([^>]*)src="([^"]*)"/gi, function (match, p1, p2, p3) {
+          console.log(p1);
+          if (p2 && p2.indexOf("/attachment/" > 0)) {
+            p2 = context + "/attachment/" + p2.split("/attachment/")[1];
+          }
+          return '<img ' + p1 + 'src="' + p2 + '"';
+        });
+        console.log(updatedHtml);
+        itemParam.value = updatedHtml;
       }
       itemParam = t.dealwithLinkField(itemParam, data, status);
       itemParam = t.dealwithRelaField(itemParam, allForm);
@@ -2475,6 +2491,14 @@ var PageHome = function (_React$Component) {
   }, {
     key: 'popuserChange',
     value: function popuserChange(code, newValue, oldValue) {
+      console.log("===popuserChange===");
+      var t = this;
+      var userId = "";
+      for (var i = 0; i < newValue.length; i++) {
+        if (newValue[i] && newValue[i].scopeType == 'user') {
+          userId = newValue[i].scopeValue;
+        }
+      }
       //alert(JSON.stringify(newValue));
       var data = this.props.data;
       if (newValue) {
@@ -2486,6 +2510,45 @@ var PageHome = function (_React$Component) {
       } else {
         newValue = "";
       }
+      var formItem = data.formItem;
+      var mainTblData = data.mainTblData;
+      if (userId) {
+        // t.refs[mainTblName+"_"+itemExt.key].reloadItemParam(itemExt.value);
+        _db2.default.FlowModuleAPI.getUserInfo({ userId: userId }).then(function (content) {
+          if (content && content.length > 0) {
+            var userInfo = content[0];
+            for (var i = 0; i < formItem.length; i++) {
+              var item = formItem[i];
+              if (item.dataAttr && item.dataAttr.relatepopuserField && item.dataAttr.relatepopuserField == code) {
+                var relatepopuservalue = item.dataAttr.relatepopuserValue;
+                for (var j = 0; j < mainTblData.length; j++) {
+                  var mainTblDataItem = mainTblData[j];
+                  if (mainTblDataItem.key == item.itemCode) {
+                    if (relatepopuservalue == 'relateuserorg') {
+                      mainTblDataItem.value = userInfo.orgName;
+                    } else if (relatepopuservalue == 'relateusercode') {
+                      mainTblDataItem.value = userInfo.userCode;
+                    } else if (relatepopuservalue == 'relateusertelphone') {
+                      mainTblDataItem.value = userInfo.telephone;
+                    } else if (relatepopuservalue == 'relateuserdutyname') {
+                      mainTblDataItem.value = userInfo.dutyName;
+                    } else if (relatepopuservalue == 'relateusercardid') {
+                      mainTblDataItem.value = userInfo.cardId;
+                    }
+                    t.props.reloadItemParam(data.mainTblName + "_" + mainTblDataItem.key, mainTblDataItem.value);
+                  }
+                }
+              }
+            }
+          } else {}
+        }).catch(function (error) {
+          _Toast2.default.show({
+            type: 'error',
+            content: error.errorMsg
+          });
+        });
+      }
+
       data = this.editData(code, newValue, data);
       var itemParam = this.state.itemParam;
       itemParam.value = newValue;

package/lib/form/table.js

@@ -309,6 +309,17 @@ var PageHome = function (_React$Component) {
 			// 	formData:formData
 			// });
 		}
+	}, {
+		key: 'reloadItemParam',
+		value: function reloadItemParam(key, value) {
+			var t = this;
+			var textValue = '';
+			var valueMap = {};
+			valueMap.key = 'value';
+			valueMap.value = value;
+
+			t.refs[key].reloadItemParam([valueMap]);
+		}
 	}, {
 		key: 'change',
 		value: function change(data, itemParam, subTblNo) {
@@ -1667,7 +1678,7 @@ var PageHome = function (_React$Component) {
 							return _react2.default.createElement(
 								'div',
 								{ className: "form_" + item2.uniqueName },
-								_react2.default.createElement(_form2.default, { keyNo: j, ref: item2.uniqueName, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this) })
+								_react2.default.createElement(_form2.default, { keyNo: j, ref: item2.uniqueName, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
 							);
 						}.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
 							'div',
@@ -1676,7 +1687,7 @@ var PageHome = function (_React$Component) {
 						) : _react2.default.createElement(
 							'div',
 							{ className: "form_" + item.uniqueName },
-							_react2.default.createElement(_form2.default, { ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this) })
+							_react2.default.createElement(_form2.default, { ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
 						);
 					}.bind(this)) : "" : _react2.default.createElement(
 						'div',
@@ -1703,7 +1714,7 @@ var PageHome = function (_React$Component) {
 									return _react2.default.createElement(
 										'div',
 										{ className: t.state.active == item.tabCode ? "" : "t-DN" },
-										_react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, keyNo: j, ref: item.uniqueName, operate: t.props.operate, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, newspyj: t.props.newspyj, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
+										_react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, keyNo: j, ref: item.uniqueName, operate: t.props.operate, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, newspyj: t.props.newspyj, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
 									);
 								}.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
 									'div',
@@ -1712,7 +1723,7 @@ var PageHome = function (_React$Component) {
 								) : _react2.default.createElement(
 									'div',
 									{ className: t.state.active == item.tabCode ? "" : "t-DN" },
-									_react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
+									_react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
 								);
 							}.bind(this))
 						)

package/package.json

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