fmui-base 1.0.21 → 1.0.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -3,7 +3,7 @@
3
3
  ---
4
4
 
5
5
  ## 更新日志
6
-
6
+ - 1.0.22:修改流程列表统一待办和搜索
7
7
  - 1.0.21:修改流程列表统一待办
8
8
  - 1.0.20:修改推送打开作废流程提示
9
9
  - 1.0.19:修改流程图请求参数,增加流程实例id
@@ -132,7 +132,7 @@ var ListItem = function (_React$Component) {
132
132
  if (module.indexOf("_") > 0) {
133
133
  var category = module.split("_")[0];
134
134
  mobilePath = module.substring(module.indexOf("_") + 1);
135
- fullUrl = fullUrl.replace("/" + projectPath + "/", "/" + category + "/" + +"/").split('?_')[0].split('/approval/all')[0];
135
+ fullUrl = fullUrl.replace("/" + projectPath + "/", "/" + category + "/" + mobilePath + "/").split('?_')[0].split('/approval/all')[0];
136
136
  } else {
137
137
  fullUrl = fullUrl.replace("/" + projectPath + "/", "/modules/" + mobilePath + "/").split('?_')[0].split('/approval/all')[0];
138
138
  }
@@ -668,9 +668,18 @@ var PageHome = function (_React$Component2) {
668
668
  }, {
669
669
  key: 'onSearch',
670
670
  value: function onSearch(searchValue) {
671
+
671
672
  searchVal = searchValue;
672
- var url = 'approval/transaction/' + this.state.activeTabIndex + '/' + searchVal;
673
- location.hash = url;
673
+ var type = this.state.type;
674
+
675
+ if (type == "self") {
676
+ var url = 'approval/transaction/' + this.state.activeTabIndex + '/' + searchVal;
677
+ location.hash = url;
678
+ } else {
679
+ var url = 'approval/all/' + this.state.activeTabIndex + '/' + searchVal;
680
+ location.hash = url;
681
+ }
682
+
674
683
  console.log('onSearch>>' + searchValue);
675
684
  var noDataTip = '无搜索结果';
676
685
  if (this.state.activeTabIndex == 0) {
@@ -732,8 +741,15 @@ var PageHome = function (_React$Component2) {
732
741
  console.log('onExit!');
733
742
  var noDataTip = '暂无数据';
734
743
  var searchValue = '';
735
- var url = 'approval/transaction/' + this.state.activeTabIndex;
736
- location.hash = url;
744
+
745
+ var type = this.state.type;
746
+ if (type == "self") {
747
+ var url = 'approval/transaction/' + this.state.activeTabIndex;
748
+ location.hash = url;
749
+ } else {
750
+ var url = 'approval/all/' + this.state.activeTabIndex;
751
+ location.hash = url;
752
+ }
737
753
  searchVal = '';
738
754
  $('.empty-content').hide();
739
755
  if (this.state.activeTabIndex == 0) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "1.0.21",
3
+ "version": "1.0.22",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",