fmui-base 2.0.95 → 2.0.96

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志  
+- 2.0.96：流程列表页增加分类查询
 - 2.0.95：弹出选择内容高度优化
 - 2.0.94：子表字段支持计算，批示意见支持上传附件
 - 2.0.93：流程组件支持作废，表单组件关联字段支持绑定子表字段bug修复

package/lib/process_list/processList.js

@@ -41,6 +41,10 @@ var _Popup = require('saltui/lib/Popup');
 
 var _Popup2 = _interopRequireDefault(_Popup);
 
+var _Filter = require('saltui/lib/Filter');
+
+var _Filter2 = _interopRequireDefault(_Filter);
+
 var _AngleRight = require('salt-icon/lib/AngleRight');
 
 var _AngleRight2 = _interopRequireDefault(_AngleRight);
@@ -497,7 +501,13 @@ var PageHome = function (_React$Component2) {
       readListUrl: readListUrl,
       myselfListUrl: myselfListUrl,
       hasBatch: hasBatch,
-      categoryList: []
+      categoryList: [],
+      categoryListTitle: '全部分类',
+      category0: [],
+      category1: [],
+      category2: [],
+      category3: [],
+      category4: []
     };
     _this2.getTransactionTitleCount(module, "undo,unread");
     _this2.getCategoryListByModule(module);
@@ -635,11 +645,17 @@ var PageHome = function (_React$Component2) {
       data.corpId = corpid;
       // data.code = ;
       var search = from.title;
+      var cate = from.category;
       if (search == undefined) {
         data.title = this.state.search0;
       } else {
         data.title = from.title;
       }
+      if (cate == undefined) {
+        data.category = this.state.category0;
+      } else {
+        data.category = from.category;
+      }
       return data;
     }
   }, {
@@ -652,11 +668,17 @@ var PageHome = function (_React$Component2) {
       data.corpId = corpid;
       // data.code = ;
       var search = from.title;
+      var cate = from.category;
       if (search == undefined) {
         data.title = this.state.search1;
       } else {
         data.title = from.title;
       }
+      if (cate == undefined) {
+        data.category = this.state.category1;
+      } else {
+        data.category = from.category;
+      }
       return data;
     }
   }, {
@@ -669,11 +691,17 @@ var PageHome = function (_React$Component2) {
       data.corpId = corpid;
       // data.code = ;
       var search = from.title;
+      var cate = from.category;
       if (search == undefined) {
         data.title = this.state.search2;
       } else {
         data.title = from.title;
       }
+      if (cate == undefined) {
+        data.category = this.state.category2;
+      } else {
+        data.category = from.category;
+      }
       return data;
     }
   }, {
@@ -686,11 +714,17 @@ var PageHome = function (_React$Component2) {
       data.corpId = corpid;
       // data.code = ;
       var search = from.title;
+      var cate = from.category;
       if (search == undefined) {
         data.title = this.state.search3;
       } else {
         data.title = from.title;
       }
+      if (cate == undefined) {
+        data.category = this.state.category4;
+      } else {
+        data.category = from.category;
+      }
       return data;
     }
   }, {
@@ -703,11 +737,17 @@ var PageHome = function (_React$Component2) {
       data.corpId = corpid;
       // data.code = ;
       var search = from.title;
+      var cate = from.category;
       if (search == undefined) {
         data.title = this.state.search4;
       } else {
         data.title = from.title;
       }
+      if (cate == undefined) {
+        data.category = this.state.category4;
+      } else {
+        data.category = from.category;
+      }
       return data;
     }
 
@@ -754,7 +794,8 @@ var PageHome = function (_React$Component2) {
           noDataTip0: noDataTip
         });
         var param = {
-          title: searchValue
+          title: searchValue,
+          category: this.state.category0
         };
         this.refs.transaction_undo_ref.fetchData(param);
       } else if (this.state.activeTabIndex == 1) {
@@ -763,7 +804,8 @@ var PageHome = function (_React$Component2) {
           noDataTip1: noDataTip
         });
         var _param = {
-          title: searchValue
+          title: searchValue,
+          category: this.state.category1
         };
         this.refs.transaction_unread_ref.fetchData(_param);
       } else if (this.state.activeTabIndex == 2) {
@@ -772,7 +814,8 @@ var PageHome = function (_React$Component2) {
           noDataTip2: noDataTip
         });
         var _param2 = {
-          title: searchValue
+          title: searchValue,
+          category: this.state.category2
         };
         this.refs.transaction_done_ref.fetchData(_param2);
       } else if (this.state.activeTabIndex == 3) {
@@ -781,7 +824,8 @@ var PageHome = function (_React$Component2) {
           noDataTip3: noDataTip
         });
         var _param3 = {
-          title: searchValue
+          title: searchValue,
+          category: this.state.category3
         };
         this.refs.transaction_read_ref.fetchData(_param3);
       } else if (this.state.activeTabIndex == 4) {
@@ -790,7 +834,8 @@ var PageHome = function (_React$Component2) {
           noDataTip4: noDataTip
         });
         var _param4 = {
-          title: searchValue
+          title: searchValue,
+          category: this.state.category4
         };
         this.refs.transaction_myself_ref.fetchData(_param4);
       }
@@ -820,7 +865,8 @@ var PageHome = function (_React$Component2) {
       $('.empty-content').hide();
       if (this.state.activeTabIndex == 0) {
         this.refs.transaction_undo_ref.fetchData({
-          title: searchValue
+          title: searchValue,
+          category: this.state.category0
         });
         this.setState({
           search0: '',
@@ -828,7 +874,8 @@ var PageHome = function (_React$Component2) {
         });
       } else if (this.state.activeTabIndex == 1) {
         this.refs.transaction_unread_ref.fetchData({
-          title: searchValue
+          title: searchValue,
+          category: this.state.category1
         });
         this.setState({
           search1: '',
@@ -836,7 +883,8 @@ var PageHome = function (_React$Component2) {
         });
       } else if (this.state.activeTabIndex == 2) {
         this.refs.transaction_done_ref.fetchData({
-          title: searchValue
+          title: searchValue,
+          category: this.state.category2
         });
         this.setState({
           search2: '',
@@ -844,7 +892,8 @@ var PageHome = function (_React$Component2) {
         });
       } else if (this.state.activeTabIndex == 3) {
         this.refs.transaction_read_ref.fetchData({
-          title: searchValue
+          title: searchValue,
+          category: this.state.category3
         });
         this.setState({
           search3: '',
@@ -852,7 +901,8 @@ var PageHome = function (_React$Component2) {
         });
       } else if (this.state.activeTabIndex == 4) {
         this.refs.transaction_myself_ref.fetchData({
-          title: searchValue
+          title: searchValue,
+          category: this.state.category4
         });
         this.setState({
           search4: '',
@@ -1071,9 +1121,80 @@ var PageHome = function (_React$Component2) {
         });
       }
     }
+  }, {
+    key: 'filterConfirm',
+    value: function filterConfirm(data) {
+      var noDataTip = '暂无搜索结果';
+      var category = [];
+      if (data.sort) {
+        data.sort.map(function (item) {
+          category.push(item.value);
+        });
+      }
+
+      if (this.state.activeTabIndex == 0) {
+        this.setState({
+          category0: category.join(','),
+          noDataTip1: noDataTip
+          // categoryListTitle: category.join(',') || '全部分类'
+        });
+
+        var param = {
+          title: this.state.search0,
+          category: category.join(',')
+        };
+        this.refs.transaction_undo_ref.fetchData(param);
+      } else if (this.state.activeTabIndex == 1) {
+        this.setState({
+          category1: category.join(','),
+          noDataTip1: noDataTip
+          // categoryListTitle: category.join(',') || '全部分类'
+        });
+        var _param5 = {
+          title: this.state.search1,
+          category: category.join(',')
+        };
+        this.refs.transaction_unread_ref.fetchData(_param5);
+      } else if (this.state.activeTabIndex == 2) {
+        this.setState({
+          category2: category.join(','),
+          noDataTip1: noDataTip
+          // categoryListTitle: category.join(',') || '全部分类'
+        });
+        var _param6 = {
+          title: this.state.search2,
+          category: category.join(',')
+        };
+        this.refs.transaction_done_ref.fetchData(_param6);
+      } else if (this.state.activeTabIndex == 3) {
+        this.setState({
+          category3: category.join(','),
+          noDataTip1: noDataTip
+          // categoryListTitle: category.join(',') || '全部分类'
+        });
+        var _param7 = {
+          title: this.state.search3,
+          category: category.join(',')
+        };
+        this.refs.transaction_read_ref.fetchData(_param7);
+      } else if (this.state.activeTabIndex == 4) {
+        this.setState({
+          category4: category.join(','),
+          noDataTip1: noDataTip
+          // categoryListTitle: category.join(',') || '全部分类'
+        });
+        var _param8 = {
+          title: this.state.search4,
+          category: category.join(',')
+        };
+        this.refs.transaction_myself_ref.fetchData(_param8);
+      }
+    }
   }, {
     key: 'render',
     value: function render() {
+      var _this5 = this;
+
       var tabBarStyle = {};
       var winHeightStyle = { height: this.state.winHeight };
 
@@ -1131,6 +1252,19 @@ var PageHome = function (_React$Component2) {
                 '\u6279\u91CF'
               )
             ),
+            _react2.default.createElement(_Filter2.default, {
+              size: 1,
+              activeIndex: 1,
+              options: [{
+                name: 'sort',
+                title: this.state.categoryListTitle,
+                type: 'select',
+                multiSelect: true,
+                items: this.state.categoryList
+              }],
+              onConfirm: function onConfirm(data) {
+                _this5.filterConfirm(data);
+              } }),
             _react2.default.createElement(
               'div',
               { className: 'scrollHeight', style: winHeightStyle },
@@ -1168,6 +1302,19 @@ var PageHome = function (_React$Component2) {
                 '\u6279\u91CF'
               )
             ),
+            _react2.default.createElement(_Filter2.default, {
+              size: 1,
+              activeIndex: 1,
+              options: [{
+                name: 'sort',
+                title: this.state.categoryListTitle,
+                type: 'select',
+                multiSelect: true,
+                items: this.state.categoryList
+              }],
+              onConfirm: function onConfirm(data) {
+                _this5.filterConfirm(data);
+              } }),
             _react2.default.createElement(
               'div',
               { className: 'scrollHeight', style: winHeightStyle },
@@ -1200,6 +1347,19 @@ var PageHome = function (_React$Component2) {
                 _react2.default.createElement(_SearchBar2.default, _extends({ ref: 'search_done_ref', className: 'searchActive' }, this.searchBarProps))
               )
             ),
+            _react2.default.createElement(_Filter2.default, {
+              size: 1,
+              activeIndex: 1,
+              options: [{
+                name: 'sort',
+                title: this.state.categoryListTitle,
+                type: 'select',
+                multiSelect: true,
+                items: this.state.categoryList
+              }],
+              onConfirm: function onConfirm(data) {
+                _this5.filterConfirm(data);
+              } }),
             _react2.default.createElement(
               'div',
               { className: 'scrollHeight', style: winHeightStyle },
@@ -1232,6 +1392,19 @@ var PageHome = function (_React$Component2) {
                 _react2.default.createElement(_SearchBar2.default, _extends({ ref: 'search_read_ref', className: 'searchActive' }, this.searchBarProps))
               )
             ),
+            _react2.default.createElement(_Filter2.default, {
+              size: 1,
+              activeIndex: 1,
+              options: [{
+                name: 'sort',
+                title: this.state.categoryListTitle,
+                type: 'select',
+                multiSelect: true,
+                items: this.state.categoryList
+              }],
+              onConfirm: function onConfirm(data) {
+                _this5.filterConfirm(data);
+              } }),
             _react2.default.createElement(
               'div',
               { className: 'scrollHeight', style: winHeightStyle },
@@ -1264,6 +1437,19 @@ var PageHome = function (_React$Component2) {
                 _react2.default.createElement(_SearchBar2.default, _extends({ ref: 'search_myself_ref', className: 'searchActive' }, this.searchBarProps))
               )
             ),
+            _react2.default.createElement(_Filter2.default, {
+              size: 1,
+              activeIndex: 1,
+              options: [{
+                name: 'sort',
+                title: this.state.categoryListTitle,
+                type: 'select',
+                multiSelect: true,
+                items: this.state.categoryList
+              }],
+              onConfirm: function onConfirm(data) {
+                _this5.filterConfirm(data);
+              } }),
             _react2.default.createElement(
               'div',
               { className: 'scrollHeight', style: winHeightStyle },

package/package.json

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