fmui-base 1.0.19 → 1.0.21

package/README.md

@@ -4,5 +4,7 @@
 
 ## 更新日志
 
+- 1.0.21：修改流程列表统一待办
+- 1.0.20：修改推送打开作废流程提示
 - 1.0.19：修改流程图请求参数，增加流程实例id
 

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/lib/process_list/processList.js

@@ -106,6 +106,7 @@ var ListItem = function (_React$Component) {
           var processName = itemInfo.processName; // 流程名称
           var module = itemInfo.module; // 流程名称
           var type = this.props.fromType; //self：本应用，all:全模块
+          var projectPath = this.props.projectPath; //项目路径
 
           var taskId = '';
           var processInstanceId = itemInfo.processInstanceId;
@@ -131,9 +132,9 @@ var ListItem = function (_React$Component) {
             if (module.indexOf("_") > 0) {
               var category = module.split("_")[0];
               mobilePath = module.substring(module.indexOf("_") + 1);
-              fullUrl = fullUrl.replace(/mobileoffice/g, mobilePath).replace("/modules/", "/" + category + "/").split('?_')[0].split('/approval/all')[0];
+              fullUrl = fullUrl.replace("/" + projectPath + "/", "/" + category + "/" + +"/").split('?_')[0].split('/approval/all')[0];
             } else {
-              fullUrl = fullUrl.replace(/mobileoffice/g, mobilePath).split('?_')[0].split('/approval/all')[0];
+              fullUrl = fullUrl.replace("/" + projectPath + "/", "/modules/" + mobilePath + "/").split('?_')[0].split('/approval/all')[0];
             }
             //alert(fullUrl);
             var _url = "process/processDetails/" + taskId + "/" + param_formKey + "/" + param_businessKey + "/" + param_list_type + "/0/" + processInstanceId + "/" + module + "/" + loginUserId;
@@ -404,6 +405,8 @@ var PageHome = function (_React$Component2) {
     var type = props.type ? props.type : "self"; //self：本应用，all:全模块
     var tabCodes = props.tabCodes ? props.tabCodes : "undo,unread,done,read,myself"; //标签页
     var searchVal = props.search;
+
+    var projectPath = props.projectPath ? props.projectPath : "modules/mobileoffice";
     if (constIndex == '') {
       if (!activeIndex) {
         activeIndex = '0';
@@ -435,6 +438,7 @@ var PageHome = function (_React$Component2) {
       type: type,
       activeTabIndex: activeIndex, // 待办-0；待阅-1；已办-2；已阅-3；我的-4
       winHeight: winHeight,
+      projectPath: projectPath,
       page: 0,
       search0: searchVal,
       search1: searchVal,
@@ -1015,7 +1019,7 @@ var PageHome = function (_React$Component2) {
                   noDataTip: this.state.noDataTip0,
                   onLoad: this.onLoad.bind(this)
                 },
-                _react2.default.createElement(ListItem, { type: '0', isBatch: this.state.isBatch, ableClick: this.state.ableClick, fromType: this.state.type, updateAbleClick: this.updateAbleClick.bind(this) })
+                _react2.default.createElement(ListItem, { type: '0', isBatch: this.state.isBatch, ableClick: this.state.ableClick, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
               )
             )
           ) : "",
@@ -1052,7 +1056,7 @@ var PageHome = function (_React$Component2) {
                   currentPageKey: 'page',
                   noDataTip: this.state.noDataTip1
                 },
-                _react2.default.createElement(ListItem, { type: '1', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, updateAbleClick: this.updateAbleClick.bind(this) })
+                _react2.default.createElement(ListItem, { type: '1', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
               )
             )
           ) : "",
@@ -1084,7 +1088,7 @@ var PageHome = function (_React$Component2) {
                   currentPageKey: 'page',
                   noDataTip: this.state.noDataTip2
                 },
-                _react2.default.createElement(ListItem, { type: '2', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, updateAbleClick: this.updateAbleClick.bind(this) })
+                _react2.default.createElement(ListItem, { type: '2', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
               )
             )
           ) : "",
@@ -1116,7 +1120,7 @@ var PageHome = function (_React$Component2) {
                   currentPageKey: 'page',
                   noDataTip: this.state.noDataTip3
                 },
-                _react2.default.createElement(ListItem, { type: '3', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, updateAbleClick: this.updateAbleClick.bind(this) })
+                _react2.default.createElement(ListItem, { type: '3', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
               )
             )
           ) : "",
@@ -1148,7 +1152,7 @@ var PageHome = function (_React$Component2) {
                   currentPageKey: 'page',
                   noDataTip: this.state.noDataTip4
                 },
-                _react2.default.createElement(ListItem, { type: '4', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, updateAbleClick: this.updateAbleClick.bind(this) })
+                _react2.default.createElement(ListItem, { type: '4', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
               )
             )
           ) : ""

package/package.json

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