fmui-base 2.0.57 → 2.0.59

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.59：待办待阅数量问题修改
+- 2.0.58：待办、待阅页签增加数量提醒
 - 2.0.57：表单子表删除计算修改；批量办理
 - 2.0.56：移动端在线编辑预览增加下载按钮
 - 2.0.55：流程页面发起按钮问题修改

package/lib/db/db.js

@@ -260,6 +260,21 @@ context.create('FlowApproval', {
         duration: 800
       });
     }
+  },
+
+  getApproveCount: {
+    mockUrl: 'query/getApproveCount.json',
+    url: _variables2.default.URLS.getApproveCount,
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    method: 'GET',
+    willFetch: function willFetch() {
+      _Toast2.default.show({
+        content: _react2.default.createElement(_loading2.default, null),
+        duration: 800
+      });
+    }
   }
 
 });

package/lib/db/variables.js

@@ -108,7 +108,7 @@ exports.default = {
         signCA: approveUrlPrefix + "signCA" + '?token=' + getLoginUserInfo().token, //CA加签
         verifySign: approveUrlPrefix + "verifySign" + '?token=' + getLoginUserInfo().token, //CA验签
         getPreTaskInfo: approveUrlPrefix + "getPreTaskInfo" + '?token=' + getLoginUserInfo().token, //获取上一环节CA配置
-
+        getApproveCount: approveUrlPrefix + 'getApproveCount?token=' + getLoginUserInfo().token, //获取审批数量
 
         getPortalPage: portalUrlPrefix + "getPortalPage" + '?token=' + getLoginUserInfo().token, //移动门户部件详情
         getComponentInfoListAll: portalAllUrlPrefix + "getComponentInfoList" + '?token=' + getLoginUserInfo().token, //获取首页部件信息
@@ -116,6 +116,7 @@ exports.default = {
         getNewHomePageCollectAppInfoList: portalAllUrlPrefix + "getNewHomePageCollectAppInfoList" + '?token=' + getLoginUserInfo().token,
         getNewHomePageRemindCount: portalAllUrlPrefix + "getNewHomePageRemindCount" + '?token=' + getLoginUserInfo().token,
         getComAppInfo: portalAllUrlPrefix + 'getComAppInfo?token=' + getLoginUserInfo().token //获取首页常用应用
+
     },
     nodataIcon: context + "/mobile/fmui/images/noData.png",
     loadingIcon: context + "/mobile/fmui/images/loading.gif",

package/lib/process_info/processInfo.js

@@ -1401,7 +1401,6 @@ var PageHome = function (_React$Component) {
     }, {
         key: 'dealwithButtonsFunc',
         value: function dealwithButtonsFunc(content, extensionButtonList) {
-            debugger;
             var t = this;
             var buttons = content.buttons; //按钮
             var startButtons = content.startButtons; //发起人节点按钮配置

package/lib/process_list/processList.js

@@ -498,7 +498,7 @@ var PageHome = function (_React$Component2) {
       myselfListUrl: myselfListUrl,
       hasBatch: hasBatch
     };
-
+    _this2.getTransactionTitleCount(module, "undo,unread");
     /**
      * 办理页面搜索框设置项
      * @type {{locale: string, instantSearch: boolean, hasHistory: boolean, searchDelay: number, onEnter: (()), onExit: (()), onChange: ((p1:*)), onSearch: ((p1?:*))}}
@@ -583,9 +583,20 @@ var PageHome = function (_React$Component2) {
 
   }, {
     key: 'getTransactionTitleCount',
-    value: function getTransactionTitleCount() {}
-    // this.dispatch('getTransactionListDate', this.state.activeTabItemIndex);
+    value: function getTransactionTitleCount(module, codes) {
+      var _this3 = this;
 
+      var t = this;
+      _db2.default.FlowApproval.getApproveCount({
+        module: module,
+        codes: codes
+      }).then(function (content) {
+        _this3.state.titleCount.undo = content.undo;
+        _this3.state.titleCount.unread = content.unread;
+      }).catch(function (error) {
+        console.log(error);
+      });
+    }
 
     /**
      * ScrollList 请求数据之前的函数
@@ -1050,7 +1061,30 @@ var PageHome = function (_React$Component2) {
           props.id + ' ' + props.name
         );
       };
-
+      var undoDiv = _react2.default.createElement(
+        'div',
+        null,
+        ' \u5F85\u529E',
+        this.state.titleCount.undo == 0 ? '' : _react2.default.createElement(
+          'span',
+          { style: { color: 'red' } },
+          '(',
+          this.state.titleCount.undo,
+          ')'
+        )
+      );
+      var unreadDiv = _react2.default.createElement(
+        'div',
+        null,
+        ' \u5F85\u9605',
+        this.state.titleCount.unread == 0 ? '' : _react2.default.createElement(
+          'span',
+          { style: { color: 'red' } },
+          '(',
+          this.state.titleCount.unread,
+          ')'
+        )
+      );
       return _react2.default.createElement(
         'div',
         { className: 'approve-list' },
@@ -1059,7 +1093,7 @@ var PageHome = function (_React$Component2) {
           { activeKey: this.state.activeTabIndex, onChange: this.handleTabChange.bind(this), destroyInactiveTabPane: false },
           this.state.tabCodes.indexOf('undo') >= 0 ? _react2.default.createElement(
             _Tab2.default.Item,
-            { title: "待办" + (this.state.titleCount.undo == 0 ? '' : '(' + this.state.titleCount.undo + ')') },
+            { title: undoDiv },
             _react2.default.createElement(
               HBox,
               { vAlign: 'center', className: 't-BCf' },
@@ -1096,7 +1130,7 @@ var PageHome = function (_React$Component2) {
           ) : "",
           this.state.tabCodes.indexOf('unread') >= 0 ? _react2.default.createElement(
             _Tab2.default.Item,
-            { title: "待阅" + (this.state.titleCount.unread == 0 ? '' : '(' + this.state.titleCount.unread + ')') },
+            { title: unreadDiv },
             _react2.default.createElement(
               HBox,
               { vAlign: 'center', className: 't-BCf' },

package/package.json

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