fmui-base 2.0.80 → 2.0.82

package/README.md

@@ -2,7 +2,9 @@
 
 ---npm publish
 
-## 更新日志
+## 更新日志  
+- 2.0.82：移动表单支持宏值签名图片
+- 2.0.81：流程批量办理组件，办理后增加回调方法
 - 2.0.80：移动端样式修改
 - 2.0.79：移动端批量办理，选人和回调问题处理
 - 2.0.78：移动门户修改布局接口数据接收

package/lib/form/form.js

@@ -614,7 +614,9 @@ var PageHome = function (_React$Component) {
 
       itemParam.isVerifySing = isVerifySing;
       var isVerifySingValue = value; //验签真实数据记录
-
+      var context = document.getElementById("context").value;
+      var token = document.getElementById("token").value;
+      // var context + '/api/m/plugin/attachment/mobile/viewImage?token=' + token + '&fid=';
       if (itemType == 'text') {
         //单行文本框
         //alert('260=====');
@@ -625,6 +627,15 @@ var PageHome = function (_React$Component) {
         /*if(itemParam.dataAttr){
           alert("265====="+itemParam.dataAttr.textLineFeed);
         }*/
+        //宏值签名图片
+        if (itemParam.dataAttr && itemParam.dataAttr.dataSrc == '2' && itemParam.dataAttr.fromMacro.value == 'currentUserSignPic') {
+
+          if (value) {
+            value = value.split('_')[0];
+            value = context + '/api/m/plugin/attachment/mobile/viewImage?token=' + token + '&fid=' + value;
+            //alert("value==="+value);
+          }
+        }
         var calculateExpList = data.calculateExpList; //计算公式列表
         var calculateExp = form.calculateExp; //计算公式
         if (calculateExp) {
@@ -2819,7 +2830,23 @@ var PageHome = function (_React$Component) {
         this.state.itemParam.itemType == 'text' ? _react2.default.createElement(
           _Group2.default.List,
           { borderTopNone: true },
-          this.state.itemParam.dataAttr && this.state.itemParam.dataAttr.textLineFeed == 'yes' ? _react2.default.createElement(
+          this.state.itemParam.dataAttr && this.state.itemParam.dataAttr.dataSrc == '2' && this.state.itemParam.dataAttr.fromMacro.value == 'currentUserSignPic' ? _react2.default.createElement(
+            'div',
+            { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
+            _react2.default.createElement(
+              _Group2.default.List,
+              { borderTopNone: true },
+              _react2.default.createElement(
+                'div',
+                { className: 't-W100', id: t.state.prefixName + "_" + t.state.itemParam.key },
+                _react2.default.createElement(
+                  _Field2.default,
+                  { label: t.state.itemParam.title, required: t.state.itemParam.required, layout: 'h', multiLine: true },
+                  _react2.default.createElement('img', { className: 't-H64 t-W64 t-PR5', src: t.state.itemParam.value })
+                )
+              )
+            )
+          ) : this.state.itemParam.dataAttr && this.state.itemParam.dataAttr.textLineFeed == 'yes' ? _react2.default.createElement(
             'div',
             { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle == null ? {} : t.state.itemParam.formStyleObj.contentStyle },
             _react2.default.createElement(

package/lib/process_batch/processBatch.js

@@ -1171,6 +1171,11 @@ var PageHome = function (_React$Component) {
 
                                 var returnDataItem = returnData[i];
                                 var barStatus = returnDataItem.status;
+                                if (barStatus == '1') {
+                                    barStatus = '6';
+                                } else if (barStatus == '2') {
+                                    barStatus = '1';
+                                }
                                 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);

package/lib/react_grid/react_grid.less

@@ -15,6 +15,10 @@
     padding-top: 17px;
   }
 
+  .t-tab-content .t-tab-tabpane{
+    overflow: initial;
+  }
+
   .t-tab-bar {
     position: relative;
     padding-left: 16px;
@@ -504,7 +508,7 @@
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between;
-    padding: 16px 10px 0 10px;
+    padding: 10px;
 
     .banshi-item {
       width: calc(50% - 8px);
@@ -1325,6 +1329,7 @@
   .tp-content {
     width: 100%;
     height: 100%;
+    overflow: hidden;
 
     img {
       width: 100%;

package/package.json

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