fmui-base 2.0.62 → 2.0.64

package/README.md

@@ -3,7 +3,9 @@
 ---npm publish
 
 ## 更新日志
-- 2.0.62： 移动端批示意见常用语编辑跳转
+- 2.0.64：移动端门户常用应用修改
+- 2.0.63：移动端门户常用应用更换接口
+- 2.0.62：移动端批示意见常用语编辑跳转
 - 2.0.61：移动端门户常用应用角标显示问题
 - 2.0.60：移动端部件修改
 - 2.0.59：待办待阅数量问题修改

package/lib/db/db.js

@@ -921,6 +921,20 @@ context.create('reactGrid', {
     }
   },
 
+  // 常用应用(频次)
+  getNewComAppInfo: {
+    url: _variables2.default.URLS.getNewComAppInfo,
+    method: 'GET',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    willFetch: function willFetch() {
+      _Toast2.default.show({
+        content: _react2.default.createElement(_loading2.default, null),
+        duration: 800
+      });
+    }
+  },
   getNewHomePageTodoData: {
     // mockUrl: 'query/getNewHomePageTodoData.json',
     url: _variables2.default.URLS.getNewHomePageTodoData,

package/lib/db/variables.js

@@ -112,6 +112,7 @@ exports.default = {
 
         getPortalPage: portalUrlPrefix + "getPortalPage" + '?token=' + getLoginUserInfo().token, //移动门户部件详情
         getComponentInfoListAll: portalAllUrlPrefix + "getComponentInfoList" + '?token=' + getLoginUserInfo().token, //获取首页部件信息
+        getNewComAppInfo: portalAllUrlPrefix + "getNewComAppInfo" + '?token=' + getLoginUserInfo().token, //首页部件常用应用
         getNewHomePageTodoData: portalAllUrlPrefix + "getNewHomePageTodoData" + '?token=' + getLoginUserInfo().token,
         getNewHomePageCollectAppInfoList: portalAllUrlPrefix + "getNewHomePageCollectAppInfoList" + '?token=' + getLoginUserInfo().token,
         getNewHomePageRemindCount: portalAllUrlPrefix + "getNewHomePageRemindCount" + '?token=' + getLoginUserInfo().token,

package/lib/react_grid/react_grid.js

@@ -113,13 +113,13 @@ var MyGrid = function (_React$Component) {
               _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)));
             } else if (item.portletCode == 'cyyy') {
               t.getShoucangAppInfo(item.id);
-              t.getComAppInfo(item.id);
+              t.getOftenList(item.id);
             } else if (item.portletCode !== 'tbgl') {
-              var params = {
+              var _params = {
                 code: item.portletCode,
                 ppId: item.id
               };
-              _db2.default.reactGrid.getComponentInfoListAll(params).then(function (res) {
+              _db2.default.reactGrid.getComponentInfoListAll(_params).then(function (res) {
                 _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, res));
               });
             }
@@ -138,6 +138,18 @@ var MyGrid = function (_React$Component) {
           duration: 2000
         });
       });
+
+      var params = {};
+      _db2.default.reactGrid.getNewHomePageTodoData(params).then(function (content) {
+        var openModule = content.hpOpenModule ? content.hpOpenModule : "";
+        localStorage.setItem('hpOpenModule', openModule);
+        var todoData = content.todoData != null ? content.todoData.entity : {};
+        var pageTitle = todoData.pageTitle;
+        if (!pageTitle || pageTitle == '') {
+          pageTitle = '一网通办管理平台';
+        }
+        setPageTitle(pageTitle);
+      });
     };
 
     _this.getShoucangAppInfo = function (id) {
@@ -148,26 +160,6 @@ var MyGrid = function (_React$Component) {
       }).catch(function (error) {});
     };
 
-    _this.getComAppInfo = function (id) {
-      var userId = getLoginUserInfo().userId;
-      var userAppOftenList = [];
-      var params = { userId: userId };
-      _db2.default.reactGrid.getComAppInfo(params).then(function (result) {
-        if (result.data) {
-          _this.setState(_defineProperty({}, 'cyyy' + '_' + id, JSON.parse(result.data)));
-          localStorage.setItem(['cyyy' + '_' + id], result.data);
-          userAppOftenList = JSON.parse(result.data);
-        }
-        if (userAppOftenList.length < 1) {
-          // 没有用户设置，取系统默认值
-          _this.getOftenList(id);
-        }
-      }).catch(function (error) {
-        _this.getOftenList();
-        console.error(error);
-      });
-    };
-
     _this.getOftenList = function (id) {
       var data = getLoginUserInfo();
       var thirdMenuType = data.thirdMenuType;
@@ -176,11 +168,12 @@ var MyGrid = function (_React$Component) {
         thirdMenuType = 'DING';
       }
       params.showClient = thirdMenuType;
-      _db2.default.reactGrid.getComponentInfoListAll(params).then(function (result) {
-        if (result.data) {
-          _this.setState(_defineProperty({}, 'cyyy' + '_' + id, result.data));
-          var appOftenListlocal = JSON.stringify(result.data);
-          localStorage.setItem(['cyyy' + '_' + id], appOftenListlocal);
+      _db2.default.reactGrid.getNewComAppInfo(params).then(function (content) {
+        if (content.data) {
+          _this.setState(_defineProperty({}, 'cyyy' + '_' + id, content.data));
+          var appOftenListlocal = JSON.stringify(content.data);
+          // localStorage.setItem(['cyyy' + '_' + id], appOftenListlocal);
+          localStorage.setItem('appOftenList', appOftenListlocal);
         }
       }).catch(function (error) {
         console.error(error);
@@ -225,6 +218,7 @@ var MyGrid = function (_React$Component) {
       undo: 0, //待办数量
       approveundo: 0, //审批数量
       toBeAttendedCount: 0, //会议数量
+      unreadMailCount: 0, //未读邮件 
       unreadPubMailCount: 0, //未读公共邮件
       appOftenList: [], //常用应用
       collectAppInfoList: [], //收藏应用
@@ -283,7 +277,27 @@ var MyGrid = function (_React$Component) {
 
 
     // 获取用户设置常用应用
-
+    // getComAppInfo = (id) => {
+    //   let userId = getLoginUserInfo().userId;
+    //   var userAppOftenList = [];
+    //   var params = { userId: userId };
+    //   DB.reactGrid.getComAppInfo(params).then((result) => {
+    //     if (result.data) {
+    //       this.setState({
+    //         ['cyyy' + '_' + id]: JSON.parse(result.data)
+    //       });
+    //       localStorage.setItem(['cyyy' + '_' + id], result.data);
+    //       userAppOftenList = JSON.parse(result.data);
+    //     }
+    //     if (userAppOftenList.length < 1) {
+    //       // 没有用户设置，取系统默认值
+    //       this.getOftenList(id);
+    //     }
+    //   }).catch((error) => {
+    //     this.getOftenList();
+    //     console.error(error);
+    //   });
+    // }
     // 获取默认系统常用应用
 
   }, {
@@ -291,13 +305,12 @@ var MyGrid = function (_React$Component) {
     value: function getRemindCount() {
       var _this2 = this;
 
-      _db2.default.reactGrid.getNewHomePageRemindCount({ codes: "undo,unreadMaild,unreadPubMail,toBeAttended" }).then(function (content) {
-        if (content.undo || content.approveundo || content.toBeAttendedCount || content.unreadPubMailCount) {
-          console.log('====================================');
-          console.log(content, 'contentcontentcontent');
-          console.log('====================================');
+      _db2.default.reactGrid.getNewHomePageRemindCount({ codes: "undo,unreadMail,unreadPubMail,toBeAttended,approveundo" }).then(function (content) {
+        if (content.undo || content.approveundo || content.toBeAttendedCount || content.unreadPubMailCount || content.unreadMailCount) {
+
           _this2.setState({
             undo: content.undo,
+            unreadMailCount: content.unreadMailCount,
             approveundo: content.approveundo,
             toBeAttendedCount: content.toBeAttendedCount,
             unreadPubMailCount: content.unreadPubMailCount
@@ -725,13 +738,13 @@ var MyGrid = function (_React$Component) {
                 t.state[item.portletCode + '_' + item.id].map(function (ele) {
                   return _react2.default.createElement(
                     'div',
-                    { className: 'systemItem', onClick: t.newPageSkip.bind(t, ele.dingUrl, ele.wxUrl, ele.mhUrl, ele.cocallUrl) },
+                    { className: 'systemItem', onClick: t.newPageSkip.bind(t, ele.dingUrl, ele.wxUrl, ele.mhUrl, ele.cocallUrl, ele.id) },
                     _react2.default.createElement(
                       'div',
                       { className: 'iconblock t-iconBC' + ele.iconColor },
                       _react2.default.createElement(
                         _Badge2.default,
-                        { count: ele.name == '会议' ? t.state.toBeAttendedCount * 1 : ele.name == '审批' ? t.state.approveundo : ele.name == '公共邮件' ? t.state.unreadPubMailCount * 1 : '' },
+                        { count: ele.name == '会议' ? t.state.toBeAttendedCount * 1 : ele.name == '审批' ? t.state.approveundo : ele.name == '公共邮箱' ? t.state.unreadPubMailCount * 1 : ele.name == '邮件' ? t.state.unreadMailCount : '' },
                         _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + ele.icon })
                       )
                     ),
@@ -775,13 +788,13 @@ var MyGrid = function (_React$Component) {
                 t.state['wdsc' + '_' + item.id].map(function (ele) {
                   return _react2.default.createElement(
                     'div',
-                    { className: 'systemItem', onClick: t.newPageSkip.bind(t, ele.dingUrl, ele.wxUrl, ele.mhUrl, ele.cocallUrl) },
+                    { className: 'systemItem', onClick: t.newPageSkip.bind(t, ele.dingUrl, ele.wxUrl, ele.mhUrl, ele.cocallUrl, ele.id) },
                     _react2.default.createElement(
                       'div',
                       { className: 'iconblock t-iconBC' + ele.iconColor },
                       _react2.default.createElement(
                         _Badge2.default,
-                        { count: ele.name == '会议' ? t.state.toBeAttendedCount * 1 : ele.name == '审批' ? t.state.approveundo : ele.name == '公共邮件' ? t.state.unreadPubMailCount * 1 : '' },
+                        { count: ele.name == '会议' ? t.state.toBeAttendedCount * 1 : ele.name == '审批' ? t.state.approveundo : ele.name == '公共邮箱' ? t.state.unreadPubMailCount * 1 : ele.name == '邮件' ? t.state.unreadMailCount : '' },
                         _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + ele.icon })
                       )
                     ),

package/lib/react_grid/react_grid.less

@@ -394,6 +394,11 @@
     .t-badge {
       width: 100%;
     }
+
+    .t-badge .badge-inner {
+      line-height: 13px;
+      border: 2px solid #fff;
+    }
   }
 
   .react-app-collect {

package/package.json

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