fmui-base 1.0.18 → 1.0.20

package/README.md

@@ -0,0 +1,9 @@
+## 移动端组件
+
+---
+
+## 更新日志
+
+- 1.0.20：修改推送打开作废流程提示
+- 1.0.19：修改流程图请求参数，增加流程实例id
+

package/lib/process_info/FlowChart.js

@@ -61,7 +61,7 @@ var Page = function (_React$Component) {
       if (listType == "0") {
         dealwhithId = taskId;
       }
-      _db2.default.FlowModuleAPI.queryFlowChart({ taskId: dealwhithId, listType: listType }).then(function (content) {
+      _db2.default.FlowModuleAPI.queryFlowChart({ taskId: dealwhithId, listType: listType, processInstanceId: processInstanceId }).then(function (content) {
         // var allActivityList = content.allActivityList;//所有的流程节点
         // var processLogList = content.processLogList;//流程日志
         //var processLogList = content.processLogList;//流程已办节点

package/lib/process_info/processInfo.js

@@ -644,6 +644,7 @@ var PageHome = function (_React$Component) {
                 });
             }
             var messageType = '';
+            var isPush = this.state.isPush;
             //查询流程详情
             if (typeof FlowCommon.dealwithCommonFolowInfo === "function") {
                 FlowCommon.dealwithCommonFolowInfo(param, t.state, function (content) {
@@ -651,6 +652,32 @@ var PageHome = function (_React$Component) {
                      var evoRemind1=content['evoRemind'];
                      var shortMessageList1=[];
                      var readShortMessageList1=[];*/
+                    if (!content.code) {
+                        _Dialog2.default.alert({
+                            title: '',
+                            content: '此文件已作废'
+                        });
+                        if (isPush == '1') {
+                            if (_thirdMenuType == 'WX') {
+                                wx.ready(function () {
+                                    wx.closeWindow();
+                                });
+                            } else if (_thirdMenuType == 'MH' && typeof emp != "undefined") {
+                                emp.window.close({
+                                    id: 'this' //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
+                                });
+                            } else {
+                                setTimeout(function () {
+
+                                    backPage();
+                                }, 1500);
+                            }
+                        } else {
+                            setTimeout(function () {
+                                history.back();
+                            }, 1500);
+                        }
+                    }
                     var markValue = getSysMarkConfigValue('approve');
                     var markValueJson = JSON.parse(markValue);
                     messageType = content.message;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "fmui-base",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "title": "fmui-base",
-  "description": "批量办理报错修改",
+  "description": "fmui移动端组件",
   "main": "lib/index.js",
   "files": [
     "dist",