fmui-base 2.0.83 → 2.0.85

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志  
+- 2.0.85：表单未用到的批示意见默认隐藏  
+- 2.0.84：批量办理回调时报错问题处理
 - 2.0.83：同一字段关联字段，编辑方式相同时冲突  
 - 2.0.82：移动表单支持宏值签名图片
 - 2.0.81：流程批量办理组件，办理后增加回调方法

package/lib/form/form.js

@@ -1013,6 +1013,7 @@ var PageHome = function (_React$Component) {
       } else if (itemType == 'mulscale') {//矩阵量表
       } else if (itemType == 'comment') {
         //批示意见
+        itemParam.show = false;
         var commentFieldList = [];
         for (var _i = 0; _i < commentList.length; _i++) {
           var commentItem = commentList[_i];
@@ -1020,12 +1021,16 @@ var PageHome = function (_React$Component) {
             //评论id和code
             commentFieldList.push(commentItem);
           }
+          if (itemParam.uniqueName == commentItem.field) {
+            itemParam.show = true;
+          }
         }
         itemParam.topicType = itemType;
         value = commentFieldList;
 
         if (t.state.commentField == itemParam.uniqueName && t.state.hasCommentField == '1') {
           this.props.newspyj.documentId = t.state.prefixName + "_" + itemParam.key;
+          itemParam.show = true;
         }
       } else if (itemType == 'upload' || itemType == 'image') {
         //附件图片
@@ -3257,7 +3262,7 @@ var PageHome = function (_React$Component) {
               t.state.itemParam.isVerifySing == "1" ? _react2.default.createElement('i', { className: 'iconfont icon-checked t-PT10', style: { color: 'green' } }) : t.state.itemParam.isVerifySing == "2" ? _react2.default.createElement('i', { className: 'iconfont icon-close t-PT10', style: { color: 'red' } }) : ""
             )
           )
-        ) : this.state.itemParam.itemType == 'comment' ? _react2.default.createElement(
+        ) : this.state.itemParam.itemType == 'comment' && this.state.itemParam.show ? _react2.default.createElement(
           'div',
           { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
           _react2.default.createElement(

package/lib/process_batch/processBatch.js

@@ -479,6 +479,7 @@ var PageHome = function (_React$Component) {
                             var checkedItem = {};
                             var selectUserReadOnly = false;
                             var personValue = []; //选中的人
+                            var personValues = []; //备选的人
                             var participantMode = item.participantMode; //判断选人是单选还是多选
                             var commonUsedData = []; //自定义选人的范围,常用
                             var commonTreeData = [];
@@ -489,6 +490,7 @@ var PageHome = function (_React$Component) {
                             var commonHasUser = false; //常用是否有用户
                             var commonHasOrg = false; //常用是否有组织
                             var commonHasGroup = false; //常用是否有群组
+                            var type3ParNum = 0;
                             if (item.type == 3) {
                                 //指定人选择
                                 selectUserReadOnly = true;
@@ -1178,9 +1180,28 @@ var PageHome = function (_React$Component) {
                                 }
                                 var barDataId = returnDataItem.dataId;
                                 var barModules = returnDataItem.modules;
-                                var FlowCommon = require('pages/flow_common/' + barModules).default ? require('pages/flow_common/' + barModules).default : require('pages/flow_common/' + barModules);
-                                if (FlowCommon && typeof FlowCommon.operateCallBack === "function") {
-                                    FlowCommon.operateCallBack({ type: barStatus, dataId: barDataId, isBatch: 1 }, t.state);
+                                var formCode = returnDataItem.formCode;
+                                var FlowCommon;
+                                debugger;
+                                try {
+                                    FlowCommon = require('pages/flow_common/' + barModules).default ? require('pages/flow_common/' + barModules).default : require('pages/flow_common/' + barModules);
+                                    if (typeof FlowCommon !== 'undefined' && typeof FlowCommon.operateCallBack === "function") {
+                                        FlowCommon.operateCallBack({ type: barStatus, dataId: barDataId, isBatch: 1 }, t.state);
+                                    }
+                                } catch (e) {
+                                    // alert("exception: "+e.message);
+                                }
+
+                                var mobileExt;
+                                try {
+                                    if (barModules) {
+                                        mobileExt = typeof eval(barModules + "_" + formCode + "_mobileExt") !== 'undefined' ? eval(barModules + "_" + formCode + "_mobileExt") : null;
+                                    }
+                                    if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
+                                        mobileExt["operateCallBack"]({ type: barStatus, dataId: barDataId, isBatch: 1 }, t.state);
+                                    }
+                                } catch (e) {
+                                    // alert("exception: "+e.message);
                                 }
                             }
                         }

package/package.json

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