fmui-base 1.0.21 → 1.0.23

package/README.md

@@ -3,7 +3,8 @@
 ---
 
 ## 更新日志
-
+- 1.0.22：流程列表批量办理按钮增加配置项可控制隐藏
+- 1.0.22：修改流程列表统一待办和搜索
 - 1.0.21：修改流程列表统一待办
 - 1.0.20：修改推送打开作废流程提示
 - 1.0.19：修改流程图请求参数，增加流程实例id

package/lib/process_info/processInfo.js

@@ -102,6 +102,7 @@ var HBox = _Boxs2.default.HBox,
 var ButtonGroup = _Button2.default.ButtonGroup;
 //import UserInfo from '../approval-details/UserInfo';
 
+var extFile = "";
 var ActionSheetButton = void 0;
 var iconIndex = 0;
 var searchVal = '';

package/lib/process_list/processList.js

@@ -132,7 +132,7 @@ var ListItem = function (_React$Component) {
             if (module.indexOf("_") > 0) {
               var category = module.split("_")[0];
               mobilePath = module.substring(module.indexOf("_") + 1);
-              fullUrl = fullUrl.replace("/" + projectPath + "/", "/" + category + "/" + +"/").split('?_')[0].split('/approval/all')[0];
+              fullUrl = fullUrl.replace("/" + projectPath + "/", "/" + category + "/" + mobilePath + "/").split('?_')[0].split('/approval/all')[0];
             } else {
               fullUrl = fullUrl.replace("/" + projectPath + "/", "/modules/" + mobilePath + "/").split('?_')[0].split('/approval/all')[0];
             }
@@ -403,6 +403,7 @@ var PageHome = function (_React$Component2) {
     var activeIndex = props.activeIndex ? props.activeIndex : 0;
     var module = props.module ? props.module : "approve";
     var type = props.type ? props.type : "self"; //self：本应用，all:全模块
+    var hasBatch = eval(props.hasBatch ? props.hasBatch : "true"); //是否有批量办理
     var tabCodes = props.tabCodes ? props.tabCodes : "undo,unread,done,read,myself"; //标签页
     var searchVal = props.search;
 
@@ -464,7 +465,8 @@ var PageHome = function (_React$Component2) {
       unreadListUrl: unreadListUrl,
       doneListUrl: doneListUrl,
       readListUrl: readListUrl,
-      myselfListUrl: myselfListUrl
+      myselfListUrl: myselfListUrl,
+      hasBatch: hasBatch
     };
 
     /**
@@ -668,9 +670,18 @@ var PageHome = function (_React$Component2) {
   }, {
     key: 'onSearch',
     value: function onSearch(searchValue) {
+
       searchVal = searchValue;
-      var url = 'approval/transaction/' + this.state.activeTabIndex + '/' + searchVal;
-      location.hash = url;
+      var type = this.state.type;
+
+      if (type == "self") {
+        var url = 'approval/transaction/' + this.state.activeTabIndex + '/' + searchVal;
+        location.hash = url;
+      } else {
+        var url = 'approval/all/' + this.state.activeTabIndex + '/' + searchVal;
+        location.hash = url;
+      }
+
       console.log('onSearch>>' + searchValue);
       var noDataTip = '无搜索结果';
       if (this.state.activeTabIndex == 0) {
@@ -732,8 +743,15 @@ var PageHome = function (_React$Component2) {
       console.log('onExit!');
       var noDataTip = '暂无数据';
       var searchValue = '';
-      var url = 'approval/transaction/' + this.state.activeTabIndex;
-      location.hash = url;
+
+      var type = this.state.type;
+      if (type == "self") {
+        var url = 'approval/transaction/' + this.state.activeTabIndex;
+        location.hash = url;
+      } else {
+        var url = 'approval/all/' + this.state.activeTabIndex;
+        location.hash = url;
+      }
       searchVal = '';
       $('.empty-content').hide();
       if (this.state.activeTabIndex == 0) {
@@ -997,7 +1015,7 @@ var PageHome = function (_React$Component2) {
               ),
               _react2.default.createElement(
                 Box,
-                { className: this.state.isBatch ? "t-FCc t-PR16" : "t-FCddblue t-PR16", onClick: this.clickBatch.bind(this, this.state.isBatch) },
+                { className: this.state.hasBatch ? this.state.isBatch ? "t-FCc t-PR16" : "t-FCddblue t-PR16" : "t-DN", onClick: this.clickBatch.bind(this, this.state.isBatch) },
                 '\u6279\u91CF'
               )
             ),
@@ -1036,7 +1054,7 @@ var PageHome = function (_React$Component2) {
               ),
               _react2.default.createElement(
                 Box,
-                { className: this.state.isBatch ? "t-FCc t-PR16" : "t-FCddblue t-PR16", isBatch: this.state.isBatch, onClick: this.clickBatch.bind(this, this.state.isBatch) },
+                { className: this.state.hasBatch ? this.state.isBatch ? "t-FCc t-PR16" : "t-FCddblue t-PR16" : "t-DN", isBatch: this.state.isBatch, onClick: this.clickBatch.bind(this, this.state.isBatch) },
                 '\u6279\u91CF'
               )
             ),

package/package.json

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